diff --git a/.bazelrc b/.bazelrc
index f7804b95e9fad..1f07b2fb6d1e2 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -74,8 +74,8 @@ test --test_output=errors
 # Trick bazel into treating BUILD files under integration/bazel as being regular files
 # This lets us glob() up all the files inside this integration test to make them inputs to tests
 # (Note, we cannot use common --deleted_packages because the bazel version command doesn't support it)
-build --deleted_packages=integration/bazel,integration/bazel/src,integration/bazel/src/hello-world,integration/bazel/test,integration/bazel/test/e2e
-query --deleted_packages=integration/bazel,integration/bazel/src,integration/bazel/src/hello-world,integration/bazel/test,integration/bazel/test/e2e
+build --deleted_packages=integration/bazel,integration/bazel/src,integration/bazel/src/hello-world,integration/bazel/test,integration/bazel/tools,integration/bazel/test/e2e
+query --deleted_packages=integration/bazel,integration/bazel/src,integration/bazel/src/hello-world,integration/bazel/test,integration/bazel/tools,integration/bazel/test/e2e
 
 ################################
 # Temporary Settings for Ivy   #
diff --git a/.bazelversion b/.bazelversion
index 44d4d72062f32..a57c344a29c88 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1,3 +1,3 @@
-3.2.0
+3.6.0
 # [NB: this comment has to be after the first line, see https://github.com/bazelbuild/bazelisk/issues/117]
 # When updating the Bazel version you also need to update the RBE toolchains version in package.bzl
diff --git a/.circleci/bazel.linux.rc b/.circleci/bazel.linux.rc
index 9ecef0e1c6039..9bbc339b2004a 100644
--- a/.circleci/bazel.linux.rc
+++ b/.circleci/bazel.linux.rc
@@ -14,8 +14,8 @@ build --repository_cache=/home/circleci/bazel_repository_cache
 # Bazel doesn't calculate the memory ceiling correctly when running under Docker.
 # Limit Bazel to consuming resources that fit in CircleCI "xlarge" class
 # https://circleci.com/docs/2.0/configuration-reference/#resource_class
-build --local_cpu_resources=8
-build --local_ram_resources=14336
+build --local_cpu_resources=20
+build --local_ram_resources=32768
 
 # All build executed remotely should be done using our RBE configuration.
 build:remote --google_default_credentials
diff --git a/.circleci/bazel.windows.rc b/.circleci/bazel.windows.rc
index ce3e53392c8a4..309b1cba13214 100644
--- a/.circleci/bazel.windows.rc
+++ b/.circleci/bazel.windows.rc
@@ -6,13 +6,9 @@
 # https://docs.bazel.build/versions/master/guide.html#bazelrc-syntax-and-semantics
 try-import %workspace%/.circleci/bazel.common.rc
 
-# Save downloaded repositories in a location that can be cached by CircleCI. This helps us
-# speeding up the analysis time significantly with Bazel managed node dependencies on the CI.
-build --repository_cache=C:/Users/circleci/bazel_repository_cache
-
 # Manually set the local resources used in windows CI runs
-build --local_ram_resources=13500
-build --local_cpu_resources=4
+build --local_ram_resources=120000
+build --local_cpu_resources=32
 
 # All windows jobs run on master and should use http caching
 build --remote_http_cache=https://storage.googleapis.com/angular-team-cache
diff --git a/.circleci/config.yml b/.circleci/config.yml
index c5347a6d6df39..b7053771f4bda 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -27,8 +27,6 @@ var_3: &cache_key v7-angular-node-12-{{ checksum ".bazelversion" }}-{{ checksum
 # folder will contain all previously used versions and ultimately cause the cache restoring to
 # be slower due to its growing size.
 var_4: &cache_key_fallback v7-angular-node-12-{{ checksum ".bazelversion" }}
-var_3_win: &cache_key_win v7-angular-win-node-12-{{ checksum ".bazelversion" }}-{{ checksum "yarn.lock" }}-{{ checksum "WORKSPACE" }}-{{ checksum "packages/bazel/package.bzl" }}-{{ checksum "aio/yarn.lock" }}
-var_4_win: &cache_key_win_fallback v7-angular-win-node-12-{{ checksum ".bazelversion" }}
 
 # Workspace initially persisted by the `setup` job, and then enhanced by `build-npm-packages` and
 # `build-ivy-npm-packages`.
@@ -157,23 +155,12 @@ commands:
   setup_win:
     description: Setup windows node environment
     steps:
-      # Use the Linux workspace directly, as it already has checkout, rebased and node modules.
-      - custom_attach_workspace
+      - checkout
       # Install Bazel pre-requisites that aren't in the preconfigured CircleCI Windows VM.
       - run: ./.circleci/windows-env.ps1
       - run: node --version
       - run: yarn --version
-      - restore_cache:
-          keys:
-            - *cache_key_win
-            - *cache_key_win_fallback
-      # Reinstall to get windows binaries.
       - run: yarn install --frozen-lockfile --non-interactive
-      # Install @bazel/bazelisk globally and use that for the first run.
-      # Workaround for https://github.com/bazelbuild/rules_nodejs/issues/894
-      # NB: the issue was for @bazel/bazel but the same problem applies to @bazel/bazelisk
-      - run: yarn global add @bazel/bazelisk@$env:BAZELISK_VERSION
-      - run: bazelisk info
 
   notify_webhook_on_fail:
     description: Notify a webhook about failure
diff --git a/.circleci/windows-env.ps1 b/.circleci/windows-env.ps1
index ece28bb8bfc17..014c2fcf97e22 100644
--- a/.circleci/windows-env.ps1
+++ b/.circleci/windows-env.ps1
@@ -2,8 +2,8 @@
 # https://docs.bazel.build/versions/master/install-windows.html
 # https://docs.bazel.build/versions/master/windows.html
 # Install MSYS2 and packages
-choco install msys2 --version 20180531.0.0 --no-progress --package-parameters "/NoUpdate"
-C:\tools\msys64\usr\bin\bash.exe -l -c "pacman --needed --noconfirm -S zip unzip patch diffutils git"
+choco install msys2 --version 20200903.0.0 --no-progress --package-parameters "/NoUpdate"
+C:\tools\msys64\usr\bin\bash.exe -l -c "pacman --needed --noconfirm -S zip unzip patch diffutils"
 
 # Add PATH modifications to the Powershell profile. This is the win equivalent of .bash_profile.
 # https://docs.microsoft.com/en-us/previous-versions//bb613488(v=vs.85)
@@ -41,7 +41,8 @@ copy .circleci\bazel.windows.rc ${Env:USERPROFILE}\.bazelrc
 ####################################################################################################
 # Install specific version of node.
 ####################################################################################################
-choco install nodejs --version 12.14.1 --no-progress
+nvm install 12.14.1
+nvm use 12.14.1
 
 # These Bazel prereqs aren't needed because the CircleCI image already includes them.
 # choco install yarn --version 1.16.0 --no-progress
diff --git a/.github/angular-robot.yml b/.github/angular-robot.yml
index 290d1b32347c9..7ecd1b6cd0de2 100644
--- a/.github/angular-robot.yml
+++ b/.github/angular-robot.yml
@@ -38,6 +38,7 @@ merge:
       - "modules/benchmarks/**"
       - "modules/system.d.ts"
       - "packages/**"
+      - "dev-infra/benchmark/driver-utilities/**"
     # list of patterns to ignore for the files changed by the PR
     exclude:
       - "packages/*"
@@ -47,7 +48,10 @@ merge:
       - "packages/bazel/src/ng_package/**"
       - "packages/bazel/src/protractor/**"
       - "packages/bazel/src/schematics/**"
+      - "packages/compiler-cli/src/ngcc/**"
+      - "packages/compiler-cli/linker/**"
       - "packages/compiler-cli/ngcc/**"
+      - "packages/compiler-cli/src/ngtsc/sourcemaps/**"
       - "packages/docs/**"
       - "packages/elements/schematics/**"
       - "packages/examples/**"
@@ -55,6 +59,8 @@ merge:
       - "packages/localize/**"
       - "packages/private/**"
       - "packages/service-worker/**"
+      - "packages/common/locales/**"
+      - "packages/http/**"
       - "**/.gitignore"
       - "**/.gitkeep"
       - "**/yarn.lock"
@@ -68,20 +74,20 @@ merge:
       - "packages/**/integrationtest/**"
       - "packages/**/test/**"
       - "packages/zone.js/*"
+      - "packages/zone.js/dist/**"
       - "packages/zone.js/doc/**"
       - "packages/zone.js/example/**"
       - "packages/zone.js/scripts/**"
 
   # comment that will be added to a PR when there is a conflict, leave empty or set to false to disable
-  mergeConflictComment: "Hi @{{PRAuthor}}! This PR has merge conflicts due to recent upstream merges.
-\nPlease help to unblock it by resolving these conflicts. Thanks!"
+  mergeConflictComment: "Hi @{{PRAuthor}}! This PR has merge conflicts due to recent upstream merges.\nPlease help to unblock it by resolving these conflicts. Thanks!"
 
   # label to monitor
-  mergeLabel: "PR action: merge"
+  mergeLabel: "action: merge"
 
   # adding any of these labels will also add the merge label
   mergeLinkedLabels:
-    - "PR action: merge-assistance"
+    - "action: merge-assistance"
 
   # list of checks that will determine if the merge label can be added
   checks:
@@ -94,17 +100,17 @@ merge:
 
     # whether the PR shouldn't have a conflict with the base branch
     noConflict: true
-    # list of labels that a PR needs to have, checked with a regexp (e.g. "PR target:" will work for the label "PR target: master")
+    # list of labels that a PR needs to have, checked with a regexp (e.g. "target:" will work for the label "target: master")
     requiredLabels:
-      - "PR target: *"
+      - "target: *"
       - "cla: yes"
 
     # list of labels that a PR shouldn't have, checked after the required labels with a regexp
     forbiddenLabels:
-      - "PR target: TBD"
-      - "PR action: cleanup"
-      - "PR action: review"
-      - "PR state: blocked"
+      - "target: TBD"
+      - "action: cleanup"
+      - "action: review"
+      - "state: blocked"
       - "cla: no"
 
     # list of PR statuses that need to be successful
@@ -121,12 +127,7 @@ merge:
   # the comment that will be added when the merge label is added despite failing checks, leave empty or set to false to disable
   # {{MERGE_LABEL}} will be replaced by the value of the mergeLabel option
   # {{PLACEHOLDER}} will be replaced by the list of failing checks
-  mergeRemovedComment: "I see that you just added the `{{MERGE_LABEL}}` label, but the following checks are still failing:
-\n{{PLACEHOLDER}}
-\n
-\n**If you want your PR to be merged, it has to pass all the CI checks.**
-\n
-\nIf you can't get the PR to a green state due to flakes or broken master, please try rebasing to master and/or restarting the CI job. If that fails and you believe that the issue is not due to your change, please contact the caretaker and ask for help."
+  mergeRemovedComment: "I see that you just added the `{{MERGE_LABEL}}` label, but the following checks are still failing:\n{{PLACEHOLDER}}\n\n**If you want your PR to be merged, it has to pass all the CI checks.**\n\nIf you can't get the PR to a green state due to flakes or broken master, please try rebasing to master and/or restarting the CI job. If that fails and you believe that the issue is not due to your change, please contact the caretaker and ask for help."
 
 # options for the triage plugin
 triage:
@@ -141,24 +142,28 @@ triage:
   # arrays of labels that determine if an issue has been fully triaged
   l2TriageLabels:
     -
-      - "type: bug/fix"
-      - "severity*"
-      - "freq*"
+      - "P0"
       - "comp: *"
     -
-      - "type: feature"
+      - "P1"
       - "comp: *"
     -
-      - "type: refactor"
+      - "P2"
       - "comp: *"
     -
-      - "type: RFC / Discussion / question"
+      - "P3"
       - "comp: *"
     -
-      - "type: confusing"
+      - "P4"
       - "comp: *"
     -
-      - "type: use-case"
+      - "P5"
+      - "comp: *"
+    -
+      - "feature"
+      - "comp: *"
+    -
+      - "discussion"
       - "comp: *"
 
 # options for the triage PR plugin
@@ -186,4 +191,4 @@ rerunCircleCI:
   # set to true to disable
   disabled: false
   # the label which when added triggers a rerun of the default CircleCI workflow
-  triggerRerunLabel: "PR action: rerun CI at HEAD"
+  triggerRerunLabel: "action: rerun CI at HEAD"
diff --git a/.github/workflows/lock-closed.yml b/.github/workflows/lock-closed.yml
index 4b88f003a7430..4a299ed90223e 100644
--- a/.github/workflows/lock-closed.yml
+++ b/.github/workflows/lock-closed.yml
@@ -10,6 +10,6 @@ jobs:
     if: github.repository == 'angular/angular'
     runs-on: ubuntu-latest
     steps:
-      - uses: angular/dev-infra/github-actions/lock-closed@66462f6
+      - uses: angular/dev-infra/github-actions/lock-closed@414834b2b24dd2df37c6ed00808387ee6fd91b66
         with:
           lock-bot-key: ${{ secrets.LOCK_BOT_PRIVATE_KEY }}
diff --git a/.gitignore b/.gitignore
index 5c592aed143aa..333dd7813c03a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,8 +40,14 @@ yarn-error.log
 # User specific bazel settings
 .bazelrc.user
 
+# User specific ng-dev settings
+.ng-dev.user*
+
 .notes.md
 baseline.json
 
 # Ignore .history for the xyz.local-history VSCode extension
 .history
+
+# CLDR data
+tools/gulp-tasks/cldr/cldr-data/
diff --git a/.gitmessage b/.gitmessage
index 46b6ffbd5caeb..536045e1d90f6 100644
--- a/.gitmessage
+++ b/.gitmessage
@@ -105,9 +105,9 @@ Fixes #<issue number>
 #   │       │
 #   │       └─⫸ Commit Scope: animations|bazel|benchpress|common|compiler|compiler-cli|core|
 #   │                          elements|forms|http|language-service|localize|platform-browser|
-#   │                          platform-browser-dynamic|platform-server|platform-webworker|
-#   │                          platform-webworker-dynamic|router|service-worker|upgrade|zone.js|
-#   │                          packaging|changelog|dev-infra|docs-infra|migrations|ngcc|ve
+#   │                          platform-browser-dynamic|platform-server|router|service-worker|
+#   │                          upgrade|zone.js|packaging|changelog|dev-infra|docs-infra|migrations|
+#   │                          ngcc|ve
 #   │                          https://github.com/angular/angular/blob/master/CONTRIBUTING.md#scope
 #   │
 #   └─⫸ Commit Type: build|ci|docs|feat|fix|perf|refactor|style|test
diff --git a/.ng-dev/caretaker.ts b/.ng-dev/caretaker.ts
new file mode 100644
index 0000000000000..6d6aaa9684e28
--- /dev/null
+++ b/.ng-dev/caretaker.ts
@@ -0,0 +1,19 @@
+import {CaretakerConfig} from '../dev-infra/caretaker/config';
+
+/** The configuration for `ng-dev caretaker` commands. */
+export const caretaker: CaretakerConfig = {
+  githubQueries: [
+    {
+      name: 'Merge Queue',
+      query: `is:pr is:open status:success label:"action: merge"`,
+    },
+    {
+      name: 'Merge Assistance Queue',
+      query: `is:pr is:open label:"action: merge-assistance"`,
+    },
+    {
+      name: 'Initial Triage Queue',
+      query: `is:open no:milestone`,
+    }
+  ]
+};
diff --git a/.ng-dev/commit-message.ts b/.ng-dev/commit-message.ts
index 25033dd704036..0d247628cdd51 100644
--- a/.ng-dev/commit-message.ts
+++ b/.ng-dev/commit-message.ts
@@ -7,19 +7,6 @@ export const commitMessage: CommitMessageConfig = {
   maxLineLength: 120,
   minBodyLength: 20,
   minBodyLengthTypeExcludes: ['docs', 'upstream'],
-  types: [
-    'build',
-    'ci',
-    'docs',
-    'feat',
-    'fix',
-    'perf',
-    'refactor',
-    'release',
-    'style',
-    'test',
-    'upstream',
-  ],
   scopes: [
     'animations',
     'bazel',
diff --git a/.ng-dev/config.ts b/.ng-dev/config.ts
index c620e02b730aa..4f059b5a6ec63 100644
--- a/.ng-dev/config.ts
+++ b/.ng-dev/config.ts
@@ -1,11 +1,15 @@
+import {caretaker} from './caretaker';
 import {commitMessage} from './commit-message';
 import {format} from './format';
 import {github} from './github';
 import {merge} from './merge';
+import {release} from './release';
 
 module.exports = {
   commitMessage,
   format,
   github,
   merge,
+  caretaker,
+  release,
 };
diff --git a/.ng-dev/merge.ts b/.ng-dev/merge.ts
index cb508bd3b121a..797c2d454752b 100644
--- a/.ng-dev/merge.ts
+++ b/.ng-dev/merge.ts
@@ -1,38 +1,28 @@
-import {MergeConfig} from '../dev-infra/pr/merge/config';
+import {DevInfraMergeConfig} from '../dev-infra/pr/merge/config';
+import {getDefaultTargetLabelConfiguration} from '../dev-infra/pr/merge/defaults';
+import {github} from './github';
+import {release} from './release';
 
 /**
  * Configuration for the merge tool in `ng-dev`. This sets up the labels which
  * are respected by the merge script (e.g. the target labels).
  */
-export const merge = (): MergeConfig => {
-  // TODO: resume dynamically determining patch branch
-  const patch = '10.0.x';
+export const merge: DevInfraMergeConfig['merge'] = async api => {
   return {
     githubApiMerge: false,
     claSignedLabel: 'cla: yes',
-    mergeReadyLabel: /^PR action: merge(-assistance)?/,
-    caretakerNoteLabel: 'PR action: merge-assistance',
+    mergeReadyLabel: /^action: merge(-assistance)?/,
+    caretakerNoteLabel: 'action: merge-assistance',
     commitMessageFixupLabel: 'commit message fixup',
-    labels: [
-      {
-        pattern: 'PR target: master-only',
-        branches: ['master'],
-      },
-      {
-        pattern: 'PR target: patch-only',
-        branches: [patch],
-      },
-      {
-        pattern: 'PR target: master & patch',
-        branches: ['master', patch],
-      },
-    ],
+    // We can pick any of the NPM packages as we are in a monorepo where all packages are
+    // published together with the same version and branching.
+    labels: await getDefaultTargetLabelConfiguration(api, github, release),
     requiredBaseCommits: {
       // PRs that target either `master` or the patch branch, need to be rebased
       // on top of the latest commit message validation fix.
       // These SHAs are the commits that update the required license text in the header.
       'master': '5aeb9a4124922d8ac08eb73b8f322905a32b0b3a',
-      [patch]: '27b95ba64a5d99757f4042073fd1860e20e3ed24'
+      '10.0.x': '27b95ba64a5d99757f4042073fd1860e20e3ed24',
     },
   };
 };
diff --git a/.ng-dev/release.ts b/.ng-dev/release.ts
new file mode 100644
index 0000000000000..12f5b4a71c7b2
--- /dev/null
+++ b/.ng-dev/release.ts
@@ -0,0 +1,33 @@
+import {join} from 'path';
+import {exec} from 'shelljs';
+import {ReleaseConfig} from '../dev-infra/release/config';
+
+/** Configuration for the `ng-dev release` command. */
+export const release: ReleaseConfig = {
+  npmPackages: [
+    '@angular/animations',
+    '@angular/bazel',
+    '@angular/common',
+    '@angular/compiler',
+    '@angular/compiler-cli',
+    '@angular/core',
+    '@angular/elements',
+    '@angular/forms',
+    '@angular/language-service',
+    '@angular/localize',
+    '@angular/platform-browser',
+    '@angular/platform-browser-dynamic',
+    '@angular/platform-server',
+    '@angular/platform-webworker',
+    '@angular/platform-webworker-dynamic',
+    '@angular/router',
+    '@angular/service-worker',
+    '@angular/upgrade',
+  ],
+  // TODO: Implement release package building here.
+  buildPackages: async () => [],
+  // TODO: This can be removed once there is an org-wide tool for changelog generation.
+  generateReleaseNotesForHead: async () => {
+    exec('yarn -s gulp changelog', {cwd: join(__dirname, '../')});
+  },
+};
diff --git a/.nvmrc b/.nvmrc
index 5c088ddb94afa..72eb55e33db6b 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-12.14.1
+12.19
diff --git a/.pullapprove.yml b/.pullapprove.yml
index b7f001b6a240b..9e6fa7ff9dcf6 100644
--- a/.pullapprove.yml
+++ b/.pullapprove.yml
@@ -186,6 +186,7 @@ groups:
          - IgorMinar               # Igor Minar
          - jbogarthyde             # Judy Bogart
          - jelbourn                # Jeremy Elbourn
+         - jessicajaniuk           # Jessica Janiuk
          - JiaLiPassion            # Jia Li
          - JoostK                  # Joost Koehoorn
          - josephperrott           # Joey Perrott
@@ -284,7 +285,7 @@ groups:
       users:
         - alxhub
         - crisbeto
-        - devversion
+        # OOO as of 2020-09-28 - devversion
 
 
   # =========================================================
@@ -303,8 +304,6 @@ groups:
           'packages/platform-browser/**',
           'packages/examples/platform-browser/**',
           'packages/platform-browser-dynamic/**',
-          'packages/platform-webworker/**',
-          'packages/platform-webworker-dynamic/**',
           'packages/examples/common/**',
           'packages/docs/**',
           'aio/content/guide/accessibility.md',
@@ -325,7 +324,10 @@ groups:
           'aio/content/guide/component-interaction.md',
           'aio/content/examples/component-interaction/**',
           'aio/content/images/guide/component-interaction/**',
+          'aio/content/guide/component-overview.md',
+          'aio/content/examples/component-overview/**',
           'aio/content/guide/component-styles.md',
+          'aio/content/guide/view-encapsulation.md',
           'aio/content/examples/component-styles/**',
           'aio/content/guide/dependency-injection.md',
           'aio/content/examples/dependency-injection/**',
@@ -378,6 +380,7 @@ groups:
           'aio/content/examples/binding-syntax/**',
           'aio/content/guide/property-binding.md',
           'aio/content/examples/property-binding/**',
+          'aio/content/guide/property-binding-best-practices.md',
           'aio/content/guide/attribute-binding.md',
           'aio/content/examples/attribute-binding/**',
           'aio/content/guide/two-way-binding.md',
@@ -406,6 +409,7 @@ groups:
           'aio/content/guide/structural-directives.md',
           'aio/content/examples/structural-directives/**',
           'aio/content/guide/svg-in-templates.md',
+          'aio/content/guide/style-precedence.md',
           'aio/content/images/guide/structural-directives/**',
           'aio/content/guide/template-statements.md',
           'aio/content/guide/user-input.md',
@@ -419,7 +423,7 @@ groups:
         - atscott
         - ~kara  # do not request reviews from Kara, but allow her to approve PRs
         - mhevery
-        - pkozlowski-opensource
+        # OOO as of 2020-09-28 - pkozlowski-opensource
 
 
   # =========================================================
@@ -509,8 +513,8 @@ groups:
       - >
         contains_any_globs(files, [
           'packages/core/src/i18n/**',
-          'packages/core/src/render3/i18n.ts',
-          'packages/core/src/render3/i18n.md',
+          'packages/core/src/render3/i18n/**',
+          'packages/core/src/render3/instructions/i18n.ts',
           'packages/core/src/render3/interfaces/i18n.ts',
           'packages/common/locales/**',
           'packages/common/src/i18n/**',
@@ -662,7 +666,7 @@ groups:
       users:
         - AndrewKushnir
         - IgorMinar
-        - pkozlowski-opensource
+        # OOO as of 2020-09-28 - pkozlowski-opensource
 
 
   # =========================================================
@@ -679,7 +683,7 @@ groups:
     reviewers:
       users:
         - IgorMinar
-        - pkozlowski-opensource
+        # OOO as of 2020-09-28 - pkozlowski-opensource
 
 
   # =========================================================
@@ -697,7 +701,7 @@ groups:
       users:
         - IgorMinar
         - jelbourn
-        - pkozlowski-opensource
+        # OOO as of 2020-09-28 - pkozlowski-opensource
 
 
   # =========================================================
@@ -723,7 +727,7 @@ groups:
         - IgorMinar
         - mhevery
         - jelbourn
-        - pkozlowski-opensource
+        # OOO as of 2020-09-28 - pkozlowski-opensource
     reviews:
       request: -1   # request reviews from everyone
       required: 2   # require at least 2 approvals
@@ -1115,11 +1119,13 @@ groups:
           'docs/DEBUG.md',
           'docs/DEBUG_COMPONENTS_REPO_IVY.md',
           'docs/DEVELOPER.md',
+          'docs/FIXUP_COMMITS.md',
           'docs/GITHUB_PROCESS.md',
           'docs/PR_REVIEW.md',
           'docs/SAVED_REPLIES.md',
           'docs/TOOLS.md',
           'docs/TRIAGE_AND_LABELS.md',
+          'docs/images/**',
           'goldens/*',
           'modules/*',
           'packages/*',
@@ -1150,7 +1156,7 @@ groups:
           ])
     reviewers:
       users:
-        - devversion
+        # OOO as of 2020-09-28 - devversion
         - filipesilva
         - gkalpak
         - IgorMinar
@@ -1184,7 +1190,7 @@ groups:
         - atscott
         - jelbourn
         - petebacondarwin
-        - pkozlowski-opensource
+        # OOO as of 2020-09-28 - pkozlowski-opensource
     reviews:
       request: 4 # Request reviews from four people
       required: 3 # Require that three people approve
@@ -1212,7 +1218,7 @@ groups:
         - atscott
         - jelbourn
         - petebacondarwin
-        - pkozlowski-opensource
+        # OOO as of 2020-09-28 - pkozlowski-opensource
     reviews:
       request: 4 # Request reviews from four people
       required: 2 # Require that two people approve
@@ -1240,7 +1246,7 @@ groups:
         - atscott
         - jelbourn
         - petebacondarwin
-        - pkozlowski-opensource
+        # OOO as of 2020-09-28 - pkozlowski-opensource
 
 
 ####################################################################################
diff --git a/.yarn/releases/yarn-1.22.4.js b/.yarn/releases/yarn-1.22.5.js
similarity index 99%
rename from .yarn/releases/yarn-1.22.4.js
rename to .yarn/releases/yarn-1.22.5.js
index 09eb37a2cbfcf..d31be0b947fbb 100755
--- a/.yarn/releases/yarn-1.22.4.js
+++ b/.yarn/releases/yarn-1.22.5.js
@@ -44654,7 +44654,7 @@ const FOLDERS_IGNORE = [
 const DEFAULT_IGNORE = (0, (_filter || _load_filter()).ignoreLinesToRegex)([...FOLDERS_IGNORE,
 
 // ignore cruft
-'yarn.lock', '.lock-wscript', '.wafpickle-{0..9}', '*.swp', '._*', 'npm-debug.log', 'yarn-error.log', '.npmrc', '.yarnrc', '.npmignore', '.gitignore', '.DS_Store']);
+'yarn.lock', '.lock-wscript', '.wafpickle-{0..9}', '*.swp', '._*', 'npm-debug.log', 'yarn-error.log', '.npmrc', '.yarnrc', '.yarnrc.yml', '.npmignore', '.gitignore', '.DS_Store']);
 
 const NEVER_IGNORE = (0, (_filter || _load_filter()).ignoreLinesToRegex)([
 // never ignore these files
@@ -44663,6 +44663,7 @@ const NEVER_IGNORE = (0, (_filter || _load_filter()).ignoreLinesToRegex)([
 function packWithIgnoreAndHeaders(cwd, ignoreFunction, { mapHeader } = {}) {
   return tar.pack(cwd, {
     ignore: ignoreFunction,
+    sort: true,
     map: header => {
       const suffix = header.name === '.' ? '' : `/${header.name}`;
       header.name = `package${suffix}`;
@@ -46678,7 +46679,7 @@ function mkdirfix (name, opts, cb) {
 /* 194 */
 /***/ (function(module, exports) {
 
-module.exports = {"name":"yarn","installationMethod":"unknown","version":"1.22.4","license":"BSD-2-Clause","preferGlobal":true,"description":"📦🐈 Fast, reliable, and secure dependency management.","dependencies":{"@zkochan/cmd-shim":"^3.1.0","babel-runtime":"^6.26.0","bytes":"^3.0.0","camelcase":"^4.0.0","chalk":"^2.1.0","cli-table3":"^0.4.0","commander":"^2.9.0","death":"^1.0.0","debug":"^3.0.0","deep-equal":"^1.0.1","detect-indent":"^5.0.0","dnscache":"^1.0.1","glob":"^7.1.1","gunzip-maybe":"^1.4.0","hash-for-dep":"^1.2.3","imports-loader":"^0.8.0","ini":"^1.3.4","inquirer":"^6.2.0","invariant":"^2.2.0","is-builtin-module":"^2.0.0","is-ci":"^1.0.10","is-webpack-bundle":"^1.0.0","js-yaml":"^3.13.1","leven":"^2.0.0","loud-rejection":"^1.2.0","micromatch":"^2.3.11","mkdirp":"^0.5.1","node-emoji":"^1.6.1","normalize-url":"^2.0.0","npm-logical-tree":"^1.2.1","object-path":"^0.11.2","proper-lockfile":"^2.0.0","puka":"^1.0.0","read":"^1.0.7","request":"^2.87.0","request-capture-har":"^1.2.2","rimraf":"^2.5.0","semver":"^5.1.0","ssri":"^5.3.0","strip-ansi":"^4.0.0","strip-bom":"^3.0.0","tar-fs":"^1.16.0","tar-stream":"^1.6.1","uuid":"^3.0.1","v8-compile-cache":"^2.0.0","validate-npm-package-license":"^3.0.4","yn":"^2.0.0"},"devDependencies":{"babel-core":"^6.26.0","babel-eslint":"^7.2.3","babel-loader":"^6.2.5","babel-plugin-array-includes":"^2.0.3","babel-plugin-inline-import":"^3.0.0","babel-plugin-transform-builtin-extend":"^1.1.2","babel-plugin-transform-inline-imports-commonjs":"^1.0.0","babel-plugin-transform-runtime":"^6.4.3","babel-preset-env":"^1.6.0","babel-preset-flow":"^6.23.0","babel-preset-stage-0":"^6.0.0","babylon":"^6.5.0","commitizen":"^2.9.6","cz-conventional-changelog":"^2.0.0","eslint":"^4.3.0","eslint-config-fb-strict":"^22.0.0","eslint-plugin-babel":"^5.0.0","eslint-plugin-flowtype":"^2.35.0","eslint-plugin-jasmine":"^2.6.2","eslint-plugin-jest":"^21.0.0","eslint-plugin-jsx-a11y":"^6.0.2","eslint-plugin-prefer-object-spread":"^1.2.1","eslint-plugin-prettier":"^2.1.2","eslint-plugin-react":"^7.1.0","eslint-plugin-relay":"^0.0.28","eslint-plugin-yarn-internal":"file:scripts/eslint-rules","execa":"^0.11.0","fancy-log":"^1.3.2","flow-bin":"^0.66.0","git-release-notes":"^3.0.0","gulp":"^4.0.0","gulp-babel":"^7.0.0","gulp-if":"^2.0.1","gulp-newer":"^1.0.0","gulp-plumber":"^1.0.1","gulp-sourcemaps":"^2.2.0","jest":"^22.4.4","jsinspect":"^0.12.6","minimatch":"^3.0.4","mock-stdin":"^0.3.0","prettier":"^1.5.2","string-replace-loader":"^2.1.1","temp":"^0.8.3","webpack":"^2.1.0-beta.25","yargs":"^6.3.0"},"resolutions":{"sshpk":"^1.14.2"},"engines":{"node":">=4.0.0"},"repository":"yarnpkg/yarn","bin":{"yarn":"./bin/yarn.js","yarnpkg":"./bin/yarn.js"},"scripts":{"build":"gulp build","build-bundle":"node ./scripts/build-webpack.js","build-chocolatey":"powershell ./scripts/build-chocolatey.ps1","build-deb":"./scripts/build-deb.sh","build-dist":"bash ./scripts/build-dist.sh","build-win-installer":"scripts\\build-windows-installer.bat","changelog":"git-release-notes $(git describe --tags --abbrev=0 $(git describe --tags --abbrev=0)^)..$(git describe --tags --abbrev=0) scripts/changelog.md","dupe-check":"yarn jsinspect ./src","lint":"eslint . && flow check","pkg-tests":"yarn --cwd packages/pkg-tests jest yarn.test.js","prettier":"eslint src __tests__ --fix","release-branch":"./scripts/release-branch.sh","test":"yarn lint && yarn test-only","test-only":"node --max_old_space_size=4096 node_modules/jest/bin/jest.js --verbose","test-only-debug":"node --inspect-brk --max_old_space_size=4096 node_modules/jest/bin/jest.js --runInBand --verbose","test-coverage":"node --max_old_space_size=4096 node_modules/jest/bin/jest.js --coverage --verbose","watch":"gulp watch","commit":"git-cz"},"jest":{"collectCoverageFrom":["src/**/*.js"],"testEnvironment":"node","modulePathIgnorePatterns":["__tests__/fixtures/","packages/pkg-tests/pkg-tests-fixtures","dist/"],"testPathIgnorePatterns":["__tests__/(fixtures|__mocks__)/","updates/","_(temp|mock|install|init|helpers).js$","packages/pkg-tests"]},"config":{"commitizen":{"path":"./node_modules/cz-conventional-changelog"}}}
+module.exports = {"name":"yarn","installationMethod":"unknown","version":"1.22.5","license":"BSD-2-Clause","preferGlobal":true,"description":"📦🐈 Fast, reliable, and secure dependency management.","dependencies":{"@zkochan/cmd-shim":"^3.1.0","babel-runtime":"^6.26.0","bytes":"^3.0.0","camelcase":"^4.0.0","chalk":"^2.1.0","cli-table3":"^0.4.0","commander":"^2.9.0","death":"^1.0.0","debug":"^3.0.0","deep-equal":"^1.0.1","detect-indent":"^5.0.0","dnscache":"^1.0.1","glob":"^7.1.1","gunzip-maybe":"^1.4.0","hash-for-dep":"^1.2.3","imports-loader":"^0.8.0","ini":"^1.3.4","inquirer":"^6.2.0","invariant":"^2.2.0","is-builtin-module":"^2.0.0","is-ci":"^1.0.10","is-webpack-bundle":"^1.0.0","js-yaml":"^3.13.1","leven":"^2.0.0","loud-rejection":"^1.2.0","micromatch":"^2.3.11","mkdirp":"^0.5.1","node-emoji":"^1.6.1","normalize-url":"^2.0.0","npm-logical-tree":"^1.2.1","object-path":"^0.11.2","proper-lockfile":"^2.0.0","puka":"^1.0.0","read":"^1.0.7","request":"^2.87.0","request-capture-har":"^1.2.2","rimraf":"^2.5.0","semver":"^5.1.0","ssri":"^5.3.0","strip-ansi":"^4.0.0","strip-bom":"^3.0.0","tar-fs":"^1.16.0","tar-stream":"^1.6.1","uuid":"^3.0.1","v8-compile-cache":"^2.0.0","validate-npm-package-license":"^3.0.4","yn":"^2.0.0"},"devDependencies":{"babel-core":"^6.26.0","babel-eslint":"^7.2.3","babel-loader":"^6.2.5","babel-plugin-array-includes":"^2.0.3","babel-plugin-inline-import":"^3.0.0","babel-plugin-transform-builtin-extend":"^1.1.2","babel-plugin-transform-inline-imports-commonjs":"^1.0.0","babel-plugin-transform-runtime":"^6.4.3","babel-preset-env":"^1.6.0","babel-preset-flow":"^6.23.0","babel-preset-stage-0":"^6.0.0","babylon":"^6.5.0","commitizen":"^2.9.6","cz-conventional-changelog":"^2.0.0","eslint":"^4.3.0","eslint-config-fb-strict":"^22.0.0","eslint-plugin-babel":"^5.0.0","eslint-plugin-flowtype":"^2.35.0","eslint-plugin-jasmine":"^2.6.2","eslint-plugin-jest":"^21.0.0","eslint-plugin-jsx-a11y":"^6.0.2","eslint-plugin-prefer-object-spread":"^1.2.1","eslint-plugin-prettier":"^2.1.2","eslint-plugin-react":"^7.1.0","eslint-plugin-relay":"^0.0.28","eslint-plugin-yarn-internal":"file:scripts/eslint-rules","execa":"^0.11.0","fancy-log":"^1.3.2","flow-bin":"^0.66.0","git-release-notes":"^3.0.0","gulp":"^4.0.0","gulp-babel":"^7.0.0","gulp-if":"^2.0.1","gulp-newer":"^1.0.0","gulp-plumber":"^1.0.1","gulp-sourcemaps":"^2.2.0","jest":"^22.4.4","jsinspect":"^0.12.6","minimatch":"^3.0.4","mock-stdin":"^0.3.0","prettier":"^1.5.2","string-replace-loader":"^2.1.1","temp":"^0.8.3","webpack":"^2.1.0-beta.25","yargs":"^6.3.0"},"resolutions":{"sshpk":"^1.14.2"},"engines":{"node":">=4.0.0"},"repository":"yarnpkg/yarn","bin":{"yarn":"./bin/yarn.js","yarnpkg":"./bin/yarn.js"},"scripts":{"build":"gulp build","build-bundle":"node ./scripts/build-webpack.js","build-chocolatey":"powershell ./scripts/build-chocolatey.ps1","build-deb":"./scripts/build-deb.sh","build-dist":"bash ./scripts/build-dist.sh","build-win-installer":"scripts\\build-windows-installer.bat","changelog":"git-release-notes $(git describe --tags --abbrev=0 $(git describe --tags --abbrev=0)^)..$(git describe --tags --abbrev=0) scripts/changelog.md","dupe-check":"yarn jsinspect ./src","lint":"eslint . && flow check","pkg-tests":"yarn --cwd packages/pkg-tests jest yarn.test.js","prettier":"eslint src __tests__ --fix","release-branch":"./scripts/release-branch.sh","test":"yarn lint && yarn test-only","test-only":"node --max_old_space_size=4096 node_modules/jest/bin/jest.js --verbose","test-only-debug":"node --inspect-brk --max_old_space_size=4096 node_modules/jest/bin/jest.js --runInBand --verbose","test-coverage":"node --max_old_space_size=4096 node_modules/jest/bin/jest.js --coverage --verbose","watch":"gulp watch","commit":"git-cz"},"jest":{"collectCoverageFrom":["src/**/*.js"],"testEnvironment":"node","modulePathIgnorePatterns":["__tests__/fixtures/","packages/pkg-tests/pkg-tests-fixtures","dist/"],"testPathIgnorePatterns":["__tests__/(fixtures|__mocks__)/","updates/","_(temp|mock|install|init|helpers).js$","packages/pkg-tests"]},"config":{"commitizen":{"path":"./node_modules/cz-conventional-changelog"}}}
 
 /***/ }),
 /* 195 */
@@ -98338,7 +98339,7 @@ var _buildSubCommands = (0, (_buildSubCommands2 || _load_buildSubCommands()).def
 
       const bundle = yield fetchBundle(config, bundleUrl);
 
-      const yarnPath = path.resolve(config.lockfileFolder, `.yarn/releases/yarn-${bundleVersion}.js`);
+      const yarnPath = path.resolve(config.lockfileFolder, `.yarn/releases/yarn-${bundleVersion}.cjs`);
       reporter.log(`Saving it into ${chalk.magenta(yarnPath)}...`);
       yield (_fs || _load_fs()).mkdirp(path.dirname(yarnPath));
       yield (_fs || _load_fs()).writeFile(yarnPath, bundle);
@@ -100190,7 +100191,7 @@ let main = exports.main = (() => {
 
     const config = new (_config || _load_config()).default(reporter);
     const outputWrapperEnabled = (0, (_conversion || _load_conversion()).boolifyWithDefault)(process.env.YARN_WRAP_OUTPUT, true);
-    const shouldWrapOutput = outputWrapperEnabled && !(_commander || _load_commander()).default.json && command.hasWrapper((_commander || _load_commander()).default, (_commander || _load_commander()).default.args);
+    const shouldWrapOutput = outputWrapperEnabled && !(_commander || _load_commander()).default.json && command.hasWrapper((_commander || _load_commander()).default, (_commander || _load_commander()).default.args) && !(commandName === 'init' && (_commander || _load_commander()).default[`2`]);
 
     if (shouldWrapOutput) {
       reporter.header(commandName, { name: 'yarn', version: (_yarnVersion || _load_yarnVersion()).version });
@@ -100604,7 +100605,7 @@ let start = (() => {
       });
 
       try {
-        if (yarnPath.endsWith(`.js`)) {
+        if (/\.[cm]?js$/.test(yarnPath)) {
           exitCode = yield (0, (_child || _load_child()).spawnp)(process.execPath, [yarnPath, ...argv], opts);
         } else {
           exitCode = yield (0, (_child || _load_child()).spawnp)(yarnPath, argv, opts);
diff --git a/.yarnrc b/.yarnrc
index 860f7e3a8be42..54b28414542d9 100644
--- a/.yarnrc
+++ b/.yarnrc
@@ -2,4 +2,4 @@
 # yarn lockfile v1
 
 
-yarn-path ".yarn/releases/yarn-1.22.4.js"
+yarn-path ".yarn/releases/yarn-1.22.5.js"
diff --git a/BUILD.bazel b/BUILD.bazel
index 73e67bea63ea4..4ff7e77c85f46 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -34,7 +34,7 @@ filegroup(
 filegroup(
     name = "angularjs_scripts",
     srcs = [
-        # We also declare the unminfied AngularJS files since these can be used for
+        # We also declare the unminified AngularJS files since these can be used for
         # local debugging (e.g. see: packages/upgrade/test/common/test_helpers.ts)
         "@npm//:node_modules/angular/angular.js",
         "@npm//:node_modules/angular/angular.min.js",
@@ -47,3 +47,9 @@ filegroup(
         "@npm//:node_modules/angular-mocks-1.6/angular-mocks.js",
     ],
 )
+
+# Detect if the build is running under --stamp
+config_setting(
+    name = "stamp",
+    values = {"stamp": "true"},
+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0a466e36b135a..afaf3d9be9862 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,171 +1,676 @@
-<a name="10.1.0-next.4"></a>
-# 10.1.0-next.4 (2020-08-04)
+<a name="11.0.0-rc.0"></a>
+# 11.0.0-rc.0 (2020-10-21)
 
 
 ### Bug Fixes
 
-* **common:** narrow `NgIf` context variables in template type checker ([#36627](https://github.com/angular/angular/issues/36627)) ([9c8bc4a](https://github.com/angular/angular/commit/9c8bc4a))
-* **compiler:** mark `NgModuleFactory` construction as not side effectful ([#38147](https://github.com/angular/angular/issues/38147)) ([7f8c222](https://github.com/angular/angular/commit/7f8c222))
+* **common:** update locales using new CLDR data ([#39343](https://github.com/angular/angular/issues/39343)) ([3738233](https://github.com/angular/angular/commit/3738233))
+* **compiler:** promote constants in templates to Trusted Types ([#39211](https://github.com/angular/angular/issues/39211)) ([6e18d2d](https://github.com/angular/angular/commit/6e18d2d))
+* **core:** guard reading of global `ngDevMode` for undefined. ([#36055](https://github.com/angular/angular/issues/36055)) ([f541e5f](https://github.com/angular/angular/commit/f541e5f))
+* **language-service:** [Ivy] create compiler only when program changes ([#39231](https://github.com/angular/angular/issues/39231)) ([8f1317f](https://github.com/angular/angular/commit/8f1317f))
+* **ngcc:** ensure that "inline exports" can be interpreted correctly ([#39267](https://github.com/angular/angular/issues/39267)) ([822b838](https://github.com/angular/angular/commit/822b838))
+* **platform-server:** Resolve absolute URL from baseUrl ([#39334](https://github.com/angular/angular/issues/39334)) ([b4e8399](https://github.com/angular/angular/commit/b4e8399))
+* **router:** incorrect signature for createUrlTree ([#39347](https://github.com/angular/angular/issues/39347)) ([161b278](https://github.com/angular/angular/commit/161b278))
 
 
-### Features
+### Code Refactoring
 
-* **core:** rename async to waitForAsync to avoid confusing ([#37583](https://github.com/angular/angular/issues/37583)) ([8f07429](https://github.com/angular/angular/commit/8f07429))
-* **core:** update reference and doc to change `async` to `waitAsync`. ([#37583](https://github.com/angular/angular/issues/37583)) ([8fbf40b](https://github.com/angular/angular/commit/8fbf40b))
+* **compiler:** remove support for TypeScript 3.9 ([#39313](https://github.com/angular/angular/issues/39313)) ([736e064](https://github.com/angular/angular/commit/736e064))
 
 
+### BREAKING CHANGES
 
-<a name="10.0.8"></a>
-## 10.0.8 (2020-08-04)
+* **platform-server:** If you use `useAbsoluteUrl` to setup `platform-server`, you now need to
+also specify `baseUrl`.
+We are intentionally making this a breaking change in a minor release,
+because if `useAbsoluteUrl` is set to `true` then the behavior of the
+application could be unpredictable, resulting in issues that are hard to
+discover but could be affecting production environments.
+* **compiler:** TypeScript 3.9 is no longer supported, please upgrade to TypeScript 4.0.
+
+
+
+<a name="10.2.0"></a>
+# 10.2.0 (2020-10-21)
 
 
 ### Bug Fixes
 
-* **compiler:** add PURE annotation to getInheritedFactory calls ([#38291](https://github.com/angular/angular/issues/38291)) ([03d8e31](https://github.com/angular/angular/commit/03d8e31))
-* **compiler:** update unparsable character reference entity error messages ([#38319](https://github.com/angular/angular/issues/38319)) ([cea4678](https://github.com/angular/angular/commit/cea4678)), closes [#26067](https://github.com/angular/angular/issues/26067)
+* **core:** guard reading of global `ngDevMode` for undefined. ([#36055](https://github.com/angular/angular/issues/36055)) ([02405f1](https://github.com/angular/angular/commit/02405f1))
+* **platform-server:** Resolve absolute URL from baseUrl ([#39334](https://github.com/angular/angular/issues/39334)) ([71fb99f](https://github.com/angular/angular/commit/71fb99f))
 
 
+### BREAKING CHANGES
+
+* **platform-server:** If you use `useAbsoluteUrl` to setup `platform-server`, you now need to
+also specify `baseUrl`.
+We are intentionally making this a breaking change in a minor release,
+because if `useAbsoluteUrl` is set to `true` then the behavior of the
+application could be unpredictable, resulting in issues that are hard to
+discover but could be affecting production environments.
 
-<a name="10.0.7"></a>
-## 10.0.7 (2020-07-30)
+
+
+<a name="11.0.0-next.6"></a>
+# 11.0.0-next.6 (2020-10-14)
 
 
 ### Bug Fixes
 
-* **compiler:** Metadata should not include methods on Object.prototype ([#38292](https://github.com/angular/angular/issues/38292)) ([879ff08](https://github.com/angular/angular/commit/879ff08))
+* **compiler-cli:** type checking of expressions within ICUs ([#39072](https://github.com/angular/angular/issues/39072)) ([0a16e60](https://github.com/angular/angular/commit/0a16e60)), closes [#39064](https://github.com/angular/angular/issues/39064)
+* **core:** migrate relative link resolution with single quotes ([#39102](https://github.com/angular/angular/issues/39102)) ([049b453](https://github.com/angular/angular/commit/049b453)), closes [#39082](https://github.com/angular/angular/issues/39082)
+* **core:** use Trusted Types policy in inert DOM builder ([#39208](https://github.com/angular/angular/issues/39208)) ([7d49299](https://github.com/angular/angular/commit/7d49299))
+* **core:** use Trusted Types policy in named_array_type ([#39209](https://github.com/angular/angular/issues/39209)) ([f6d5cdf](https://github.com/angular/angular/commit/f6d5cdf))
+* **router:** Allow undefined inputs on routerLink ([#39151](https://github.com/angular/angular/issues/39151)) ([b0b4953](https://github.com/angular/angular/commit/b0b4953))
+* **router:** create schematic for preserveQueryParams ([#38762](https://github.com/angular/angular/issues/38762)) ([93ee05d](https://github.com/angular/angular/commit/93ee05d))
+* **router:** remove preserveQueryParams symbol ([#38762](https://github.com/angular/angular/issues/38762)) ([783a5bd](https://github.com/angular/angular/commit/783a5bd))
+
+
+### Features
+
+* **core:** add automated migration to replace async with waitForAsync ([#39212](https://github.com/angular/angular/issues/39212)) ([5ce71e0](https://github.com/angular/angular/commit/5ce71e0))
+* **core:** add automated migration to replace ViewEncapsulation.Native ([#38882](https://github.com/angular/angular/issues/38882)) ([0e733f3](https://github.com/angular/angular/commit/0e733f3))
+* **core:** add initialNavigation schematic ([#36926](https://github.com/angular/angular/issues/36926)) ([0ec7043](https://github.com/angular/angular/commit/0ec7043))
+* **core:** add Trusted Types workaround for Function constructor ([#39209](https://github.com/angular/angular/issues/39209)) ([5913e5c](https://github.com/angular/angular/commit/5913e5c))
+* **core:** create internal Trusted Types module ([#39207](https://github.com/angular/angular/issues/39207)) ([0875fd2](https://github.com/angular/angular/commit/0875fd2))
+* **core:** depend on type definitions for Trusted Types ([#39207](https://github.com/angular/angular/issues/39207)) ([c4266fb](https://github.com/angular/angular/commit/c4266fb))
+* **core:** remove ViewEncapsulation.Native ([#38882](https://github.com/angular/angular/issues/38882)) ([4a1c12c](https://github.com/angular/angular/commit/4a1c12c))
+* **language-service:** [Ivy] getSemanticDiagnostics for external templates ([#39065](https://github.com/angular/angular/issues/39065)) ([63624a2](https://github.com/angular/angular/commit/63624a2))
+* **language-service:** Add getTypeDefinitionAtPosition (go to type definition) ([#39145](https://github.com/angular/angular/issues/39145)) ([a84976f](https://github.com/angular/angular/commit/a84976f))
+* **language-service:** Add module name to directive quick info ([#39121](https://github.com/angular/angular/issues/39121)) ([4604fe9](https://github.com/angular/angular/commit/4604fe9))
+* **router:** add new initialNavigation options to replace legacy ([#37480](https://github.com/angular/angular/issues/37480)) ([c4becca](https://github.com/angular/angular/commit/c4becca))
+
+
+### BREAKING CHANGES
 
+* **router:** * The `initialNavigation` property for the options in
+  `RouterModule.forRoot` no longer supports `legacy_disabled`,
+  `legacy_enabled`, `true`, or `false` as valid values.
+  `legacy_enabled` (the old default) is instead `enabledNonBlocking`
+* `enabled` is deprecated as a valid value for the
+  `RouterModule.forRoot` `initialNavigation` option. `enabledBlocking`
+  has been introduced to replace it
+* **router:** preserveQueryParams has been removed, use
+queryParamsHandling="preserve" instead
+* **router:**  If you were accessing the `RouterLink` values of `queryParams`,
+`fragment` or `queryParamsHandling` you might need to relax the typing to also
+accept `undefined` and `null`. ([#39151](https://github.com/angular/angular/issues/39151))
+* **core:** * `ViewEncapsulation.Native` has been removed. Use `ViewEncapsulation.ShadowDom` instead. Existing
+usages will be updated automatically by `ng update`.
+* **compiler-cli:** Expressions within ICUs are now type-checked again, fixing a regression
+in Ivy. This may cause compilation failures if errors are found in
+expressions that appear within an ICU. Please correct these expressions
+to resolve the type-check errors.
 
 
-<a name="10.1.0-next.3"></a>
-# 10.1.0-next.3 (2020-07-28)
+<a name="10.1.6"></a>
+## 10.1.6 (2020-10-14)
 
 
 ### Bug Fixes
 
-* **elements:** run strategy methods in correct zone ([#37814](https://github.com/angular/angular/issues/37814)) ([8df888d](https://github.com/angular/angular/commit/8df888d)), closes [#24181](https://github.com/angular/angular/issues/24181)
+* **compiler:** incorrectly encapsulating [@import](https://github.com/import) containing colons and semicolons ([#38716](https://github.com/angular/angular/issues/38716)) ([52a0c6b](https://github.com/angular/angular/commit/52a0c6b)), closes [#38587](https://github.com/angular/angular/issues/38587)
+* **compiler-cli:** support namespaced query types in directives ([#38959](https://github.com/angular/angular/issues/38959)) ([#39272](https://github.com/angular/angular/issues/39272)) ([f752ab9](https://github.com/angular/angular/commit/f752ab9))
+* **elements:** detect matchesSelector prototype without IIFE ([#37799](https://github.com/angular/angular/issues/37799)) ([952fd86](https://github.com/angular/angular/commit/952fd86)), closes [#24551](https://github.com/angular/angular/issues/24551)
+* **ngcc:** ensure that "inline exports" can be interpreted correctly ([#39272](https://github.com/angular/angular/issues/39272)) ([e08d021](https://github.com/angular/angular/commit/e08d021))
+* **ngcc:** handle aliases in UMD export declarations ([#38959](https://github.com/angular/angular/issues/38959)) ([#39272](https://github.com/angular/angular/issues/39272)) ([9963c5d](https://github.com/angular/angular/commit/9963c5d)), closes [#38947](https://github.com/angular/angular/issues/38947)
+* **ngcc:** map `exports` to the current module in UMD files ([#38959](https://github.com/angular/angular/issues/38959)) ([#39272](https://github.com/angular/angular/issues/39272)) ([13c4a7b](https://github.com/angular/angular/commit/13c4a7b))
+* **ngcc:** support inline export declarations in UMD files ([#38959](https://github.com/angular/angular/issues/38959)) ([#39272](https://github.com/angular/angular/issues/39272)) ([9c875b3](https://github.com/angular/angular/commit/9c875b3)), closes [#38947](https://github.com/angular/angular/issues/38947)
 
 
+### build
 
-<a name="10.0.6"></a>
-## 10.0.6 (2020-07-28)
+* upgrade angular build, integration/bazel and [@angular](https://github.com/angular)/bazel package to rule_nodejs 2.2.0 ([#39182](https://github.com/angular/angular/issues/39182)) ([7628c36](https://github.com/angular/angular/commit/7628c36))
+
+
+### Performance Improvements
+
+* **ngcc:** do not rescan program source files when referenced from multiple root files ([#39254](https://github.com/angular/angular/issues/39254)) ([5221df8](https://github.com/angular/angular/commit/5221df8)), closes [#39240](https://github.com/angular/angular/issues/39240)
+
+
+<a name="11.0.0-next.5"></a>
+# 11.0.0-next.5 (2020-10-07)
 
 
 ### Bug Fixes
 
-* **compiler:** share identical stylesheets between components in the same file ([#38213](https://github.com/angular/angular/issues/38213)) ([264950b](https://github.com/angular/angular/commit/264950b)), closes [#38204](https://github.com/angular/angular/issues/38204)
-* **compiler-cli:** Add support for string literal class members ([#38226](https://github.com/angular/angular/issues/38226)) ([b1e7775](https://github.com/angular/angular/commit/b1e7775))
-* **core:** `Attribute` decorator `attributeName` is mandatory ([#38131](https://github.com/angular/angular/issues/38131)) ([1c4fcce](https://github.com/angular/angular/commit/1c4fcce)), closes [#32658](https://github.com/angular/angular/issues/32658)
-* **core:** unify the signature between ngZone and noopZone ([#37581](https://github.com/angular/angular/issues/37581)) ([d5264f5](https://github.com/angular/angular/commit/d5264f5))
+* **common:** add boolean to valid json for testing ([#37893](https://github.com/angular/angular/issues/37893)) ([3c474ec](https://github.com/angular/angular/commit/3c474ec)), closes [#20690](https://github.com/angular/angular/issues/20690)
+* **core:** use single quotes for relative link resolution migration to align with style guide ([#39070](https://github.com/angular/angular/issues/39070)) ([8894706](https://github.com/angular/angular/commit/8894706))
+* **forms:** improve types of directive constructor arguments ([#38944](https://github.com/angular/angular/issues/38944)) ([246de9a](https://github.com/angular/angular/commit/246de9a))
+* **forms:** include null in .parent of abstract control ([#32671](https://github.com/angular/angular/issues/32671)) ([f4f1bcc](https://github.com/angular/angular/commit/f4f1bcc)), closes [#16999](https://github.com/angular/angular/issues/16999)
+* **language-service:** [Ivy] hybrid visitor should not locate let keyword ([#39061](https://github.com/angular/angular/issues/39061)) ([70e13dc](https://github.com/angular/angular/commit/70e13dc))
+* **router:** properly assign ExtraOptions to Router in RouterTestingModule ([#39096](https://github.com/angular/angular/issues/39096)) ([d8c0534](https://github.com/angular/angular/commit/d8c0534)), closes [#23347](https://github.com/angular/angular/issues/23347)
+
+
+### Features
 
+* **compiler-cli:** support getting resource dependencies for a source file ([#38048](https://github.com/angular/angular/issues/38048)) ([5dbf357](https://github.com/angular/angular/commit/5dbf357))
+* **forms:** add migration for AbstractControl.parent accesses ([#39009](https://github.com/angular/angular/issues/39009)) ([aeec223](https://github.com/angular/angular/commit/aeec223)), closes [#32671](https://github.com/angular/angular/issues/32671)
+* **language-service:** Add getDefinitionAndBoundSpan (go to definition) ([#39101](https://github.com/angular/angular/issues/39101)) ([3975dd9](https://github.com/angular/angular/commit/3975dd9))
+* **language-service:** add quick info for inline templates in ivy ([#39060](https://github.com/angular/angular/issues/39060)) ([904adb7](https://github.com/angular/angular/commit/904adb7))
 
 
-<a name="10.1.0-next.2"></a>
-# 10.1.0-next.2 (2020-07-22)
+### BREAKING CHANGES
+
+* **forms:** Directives in the `@angular/forms` package used to have `any[]` as a type of `validators` and
+`asyncValidators` arguments in constructors. Now these arguments are properly typed, so if your
+code relies on directive constructor types it may require some updates to improve type safety.
+* **forms:** Type of AbstractFormControl.parent now includes null
+
+`null` is now included in the types of .parent. If you don't already have a check for this case,
+the TypeScript compiler might compain. A v11 migration exists which adds the not-null assertion
+operator where necessary.
+
+In an unlikely case your code was testing the parnet against undefined with sitrct equality,
+you'll need to change this to `=== null` instead, since the parent is not explicily initialized
+with `null` instead of being left `undefined`.
+
+
+
+<a name="10.1.5"></a>
+## 10.1.5 (2020-10-07)
 
 
 ### Bug Fixes
 
-* **core:** Allow modification of lifecycle hooks any time before bootstrap ([#35464](https://github.com/angular/angular/issues/35464)) ([737506e](https://github.com/angular/angular/commit/737506e)), closes [#30497](https://github.com/angular/angular/issues/30497)
+* **router:** update getRouteGuards to check if the context outlet is activated ([#39049](https://github.com/angular/angular/issues/39049)) ([771f731](https://github.com/angular/angular/commit/771f731)), closes [#39030](https://github.com/angular/angular/issues/39030)
+* **compiler:** Recover on malformed keyed reads and keyed writes ([#39004](https://github.com/angular/angular/issues/39004)) ([f50313f](https://github.com/angular/angular/commit/f50313f)), closes [#38596](https://github.com/angular/angular/issues/38596)
+
+
+
+<a name="11.0.0-next.4"></a>
+# 11.0.0-next.4 (2020-09-30)
+
+
+### Bug Fixes
+
+* **common:** correct and simplify typing of `KeyValuePipe` ([#37447](https://github.com/angular/angular/issues/37447)) ([4dfe0fa](https://github.com/angular/angular/commit/4dfe0fa))
+* **common:** correct and simplify typing of AsyncPipe ([#37447](https://github.com/angular/angular/issues/37447)) ([5f815c0](https://github.com/angular/angular/commit/5f815c0))
+* **common:** correct and simplify typing of I18nPluralPipe ([#37447](https://github.com/angular/angular/issues/37447)) ([3b919ef](https://github.com/angular/angular/commit/3b919ef))
+* **common:** correct typing and implementation of `SlicePipe` ([#37447](https://github.com/angular/angular/issues/37447)) ([4744c22](https://github.com/angular/angular/commit/4744c22))
+* **common:** let case conversion pipes accept type unions with `null` ([#36259](https://github.com/angular/angular/issues/36259)) ([#37447](https://github.com/angular/angular/issues/37447)) ([c7d5555](https://github.com/angular/angular/commit/c7d5555))
+* **compiler-cli:** perform DOM schema checks even in basic mode in g3 ([#38943](https://github.com/angular/angular/issues/38943)) ([40975e0](https://github.com/angular/angular/commit/40975e0))
+* **language-service:** hybrid visitor returns parent node of BoundAttribute ([#38995](https://github.com/angular/angular/issues/38995)) ([323be39](https://github.com/angular/angular/commit/323be39))
+* **packaging:** remove polyfills needed to run tests on IE9 and IE 10 ([#38931](https://github.com/angular/angular/issues/38931)) ([4ca1c73](https://github.com/angular/angular/commit/4ca1c73))
+* **platform-webworker:** remove platform-webworker and platform-webworker-dynamic ([#38846](https://github.com/angular/angular/issues/38846)) ([93c3d8f](https://github.com/angular/angular/commit/93c3d8f))
+* **router:** make relativeLinkResolution corrected by default ([#25609](https://github.com/angular/angular/issues/25609)) ([837889f](https://github.com/angular/angular/commit/837889f)), closes [#22394](https://github.com/angular/angular/issues/22394)
+
+
+### Code Refactoring
+
+* **router:** Adjust type of parameter in navigateByUrl and createUrlTree to be more accurate ([#38227](https://github.com/angular/angular/issues/38227)) ([e4f4d18](https://github.com/angular/angular/commit/e4f4d18)), closes [#18798](https://github.com/angular/angular/issues/18798)
 
 
 ### Features
 
-* **common:** add ReadonlyMap in place of Map in keyValuePipe ([#37311](https://github.com/angular/angular/issues/37311)) ([3373453](https://github.com/angular/angular/commit/3373453)), closes [#37308](https://github.com/angular/angular/issues/37308)
-* **forms:** AbstractControl to store raw validators in addition to combined validators function ([#37881](https://github.com/angular/angular/issues/37881)) ([ad7046b](https://github.com/angular/angular/commit/ad7046b))
-* **localize:** allow duplicate messages to be handled during extraction ([#38082](https://github.com/angular/angular/issues/38082)) ([cf9a47b](https://github.com/angular/angular/commit/cf9a47b)), closes [#38077](https://github.com/angular/angular/issues/38077)
+* **common:** stricter types for DatePipe ([#37447](https://github.com/angular/angular/issues/37447)) ([daf8b7f](https://github.com/angular/angular/commit/daf8b7f))
+* **common:** stricter types for number pipes ([#37447](https://github.com/angular/angular/issues/37447)) ([7b2aac9](https://github.com/angular/angular/commit/7b2aac9))
+* **compiler:** Add keySpan to Variable Node ([#38965](https://github.com/angular/angular/issues/38965)) ([239968d](https://github.com/angular/angular/commit/239968d))
+* **router:** Add `relativeLinkResolution` migration to update default value ([#38698](https://github.com/angular/angular/issues/38698)) ([15ea811](https://github.com/angular/angular/commit/15ea811))
 
 
+### BREAKING CHANGES
+
+* **packaging:** In v10, IE 9, 10, and IE mobile support was deprecated. In v11, Angular framework removes IE 9,
+10, and IE mobile support completely.
+Supporting outdated browsers like these increases bundle size, code complexity, and test load,
+and also requires time and effort that could be spent on improvements to the framework.
+For example, fixing issues can be more difficult, as a straightforward fix for modern browsers
+could break old ones that have quirks due to not receiving updates from vendors.
+* **platform-webworker:** @angular/platform-webworker and @angular/platform-webworker-dynamic
+have been removed as they were deprecated in v8
+* **common:** The `slice` pipe now returns `null` for the `undefined` input value,
+which is consistent with the behavior of most pipes. If you rely on
+`undefined` being the result in that case, you now need to check for it
+explicitly.
+* **common:** The typing of the `keyvalue` pipe has been fixed to report that for
+input objects that have `number` keys, the result will contain the
+string representation of the keys. This was already the case and the
+code has simply been updated to reflect this. Please update the
+consumers of the pipe output if they were relying on the incorrect
+types. Note that this does not affect use cases where the input values
+are `Map`s, so if you need to preserve `number`s, this is an effective
+way.
+* **common:** The signatures of the number pipes now explicitly state which types are
+accepted. This should only cause issues in corner cases, as any other
+values would result in runtime exceptions.
+* **common:** The signature of the `date` pipe now explicitly states which types are
+accepted. This should only cause issues in corner cases, as any other
+values would result in runtime exceptions.
+* **common:** The async pipe no longer claims to return `undefined` for an input that
+was typed as `undefined`. Note that the code actually returned `null` on
+`undefined` inputs. In the unlikely case you were relying on this,
+please fix the typing of the consumers of the pipe output.
+* **common:** The case conversion pipes no longer let falsy values through. They now
+map both `null` and `undefined` to `null` and raise an exception on
+invalid input (`0`, `false`, `NaN`) just like most "common pipes". If
+your code required falsy values to pass through, you need to handle them
+explicitly.
+* **router:** While the new parameter types allow a variable of type
+`NavigationExtras` to be passed in, they will not allow object literals,
+as they may only specify known properties. They will also not accept
+types that do not have properties in common with the ones in the `Pick`.
+To fix this error, only specify properties from the `NavigationExtras` which are
+actually used in the respective function calls or use a type assertion
+on the object or variable: `as NavigationExtras`.
+* **router:** This commit changes the default value of
+`relativeLinkResolution` from `'legacy'` to `'default'`. If your
+application previously used the default by not specifying a value in the
+`ExtraOptions` and uses relative links when navigating from children of
+empty path routes, you will need to update your `RouterModule` to
+specifically specify `'legacy'` for `relativeLinkResolution`.
+See https://angular.io/api/router/ExtraOptions#relativeLinkResolution
+for more details.
+
+
+
+<a name="10.1.4"></a>
+## 10.1.4 (2020-09-30)
+
+
+### Bug Fixes
+
+* **compiler-cli:** enable [@types](https://github.com/types) discovery in incremental rebuilds ([#39011](https://github.com/angular/angular/issues/39011)) ([6e99427](https://github.com/angular/angular/commit/6e99427)), closes [#38979](https://github.com/angular/angular/issues/38979)
+
+
+
+<a name="11.0.0-next.3"></a>
+# 11.0.0-next.3 (2020-09-23)
+
+
+### Bug Fixes
+
+* **common:** add `params` and `reportProgress` options to `HttpClient.put()` overload ([#37873](https://github.com/angular/angular/issues/37873)) ([dd8d8c8](https://github.com/angular/angular/commit/dd8d8c8)), closes [#23600](https://github.com/angular/angular/issues/23600)
+* **compiler-cli:** generate `let` statements in ES2015+ mode ([#38775](https://github.com/angular/angular/issues/38775)) ([123bff7](https://github.com/angular/angular/commit/123bff7))
+* **core:** ensure TestBed is not instantiated before override provider ([#38717](https://github.com/angular/angular/issues/38717)) ([c8f056b](https://github.com/angular/angular/commit/c8f056b))
+* **forms:** type NG_VALUE_ACCESSOR injection token as array ([#29723](https://github.com/angular/angular/issues/29723)) ([2b1b718](https://github.com/angular/angular/commit/2b1b718)), closes [#29351](https://github.com/angular/angular/issues/29351)
 
-<a name="10.0.5"></a>
-## 10.0.5 (2020-07-22)
+
+### Features
+
+* **common:** Add ISO week-numbering year formats support to formatDate ([#38828](https://github.com/angular/angular/issues/38828)) ([984ed39](https://github.com/angular/angular/commit/984ed39))
+* **compiler:** Parse and recover on incomplete opening HTML tags ([#38681](https://github.com/angular/angular/issues/38681)) ([6ae3b68](https://github.com/angular/angular/commit/6ae3b68)), closes [#38596](https://github.com/angular/angular/issues/38596)
+* **router:** add migration to update calls to navigateByUrl and createUrlTree with invalid parameters ([#38825](https://github.com/angular/angular/issues/38825)) ([7849fdd](https://github.com/angular/angular/commit/7849fdd)), closes [#38227](https://github.com/angular/angular/issues/38227)
+* **service-worker:** add the option to prefer network for navigation requests ([#38565](https://github.com/angular/angular/issues/38565)) ([a206852](https://github.com/angular/angular/commit/a206852)), closes [#38194](https://github.com/angular/angular/issues/38194)
+
+
+### BREAKING CHANGES
+
+* **core:** If you call `TestBed.overrideProvider` after TestBed initialization, provider overrides are not applied. This
+behavior is consistent with other override methods (such as `TestBed.overrideDirective`, etc) but they
+throw an error to indicate that, when the check was missing in the `TestBed.overrideProvider` function.
+Now calling `TestBed.overrideProvider` after TestBed initialization also triggers an
+error, thus there is a chance that some tests (where `TestBed.overrideProvider` is
+called after TestBed initialization) will start to fail and require updates to move `TestBed.overrideProvider` calls
+before TestBed initialization is completed.
+
+
+
+<a name="10.1.3"></a>
+## 10.1.3 (2020-09-23)
 
 
 ### Bug Fixes
 
-* **compiler:** properly associate source spans for implicitly closed elements ([#38126](https://github.com/angular/angular/issues/38126)) ([e80278c](https://github.com/angular/angular/commit/e80278c)), closes [#36118](https://github.com/angular/angular/issues/36118)
-* **compiler-cli:** ensure file_system handles mixed Windows drives ([#38030](https://github.com/angular/angular/issues/38030)) ([dba4023](https://github.com/angular/angular/commit/dba4023)), closes [#36777](https://github.com/angular/angular/issues/36777)
-* **core:** Allow modification of lifecycle hooks any time before bootstrap ([#38119](https://github.com/angular/angular/issues/38119)) ([14b4718](https://github.com/angular/angular/commit/14b4718)), closes [#30497](https://github.com/angular/angular/issues/30497)
-* **core:** error due to integer overflow when there are too many host bindings ([#38014](https://github.com/angular/angular/issues/38014)) ([7b6e73c](https://github.com/angular/angular/commit/7b6e73c)), closes [#37876](https://github.com/angular/angular/issues/37876) [#37876](https://github.com/angular/angular/issues/37876)
-* **core:** incorrectly validating properties on ng-content and ng-container ([#37773](https://github.com/angular/angular/issues/37773)) ([17ddab9](https://github.com/angular/angular/commit/17ddab9))
+* **http:** Fix error message when we call jsonp without importing HttpClientJsonpModule ([#38756](https://github.com/angular/angular/issues/38756)) ([3902ec0](https://github.com/angular/angular/commit/3902ec0))
+* **ngcc:** fix compilation of `ChangeDetectorRef` in pipe constructors ([#38892](https://github.com/angular/angular/issues/38892)) ([093c3a1](https://github.com/angular/angular/commit/093c3a1)), closes [#38666](https://github.com/angular/angular/issues/38666) [#38883](https://github.com/angular/angular/issues/38883)
 
 
+### Reverts
 
-<a name="10.0.4"></a>
-## 10.0.4 (2020-07-15)
+* feat(router): better warning message when a router outlet has not been instantiated ([#38920](https://github.com/angular/angular/issues/38920)) ([04d0aa6](https://github.com/angular/angular/commit/04d0aa6))
+
+
+
+<a name="11.0.0-next.2"></a>
+# 11.0.0-next.2 (2020-09-16)
 
 
 ### Bug Fixes
 
-* **bazel:** ng_module rule does not expose flat module information in Ivy ([#36971](https://github.com/angular/angular/issues/36971)) ([b76a2dc](https://github.com/angular/angular/commit/b76a2dc))
-* **compiler:** check more cases for pipe usage inside host bindings ([#37883](https://github.com/angular/angular/issues/37883)) ([a94383f](https://github.com/angular/angular/commit/a94383f)), closes [#34655](https://github.com/angular/angular/issues/34655) [#37610](https://github.com/angular/angular/issues/37610)
-* **language-service:** non-existent module format in package output ([#37778](https://github.com/angular/angular/issues/37778)) ([12f1773](https://github.com/angular/angular/commit/12f1773))
-* **language-service:** remove completion for string ([#37983](https://github.com/angular/angular/issues/37983)) ([387e838](https://github.com/angular/angular/commit/387e838))
-* **ngcc:** report a warning if ngcc tries to use a solution-style tsconfig ([#38003](https://github.com/angular/angular/issues/38003)) ([e3b8010](https://github.com/angular/angular/commit/e3b8010)), closes [#36386](https://github.com/angular/angular/issues/36386)
-* **service-worker:** correctly handle relative base href ([#37922](https://github.com/angular/angular/issues/37922)) ([b186db7](https://github.com/angular/angular/commit/b186db7)), closes [#25055](https://github.com/angular/angular/issues/25055) [#25055](https://github.com/angular/angular/issues/25055)
-* **service-worker:** correctly serve `ngsw/state` with a non-root SW scope ([#37922](https://github.com/angular/angular/issues/37922)) ([dc42c97](https://github.com/angular/angular/commit/dc42c97)), closes [#30505](https://github.com/angular/angular/issues/30505)
+* **common:** do not round up fractions of a millisecond in `DatePipe` ([#38009](https://github.com/angular/angular/issues/38009)) ([26f2820](https://github.com/angular/angular/commit/26f2820)), closes [/www.ecma-international.org/ecma-262/5.1/#sec-15](https://github.com//www.ecma-international.org/ecma-262/5.1//issues/sec-15) [#37989](https://github.com/angular/angular/issues/37989)
+* **common:** mark locale data arrays as readonly ([#30397](https://github.com/angular/angular/issues/30397)) ([6acea54](https://github.com/angular/angular/commit/6acea54)), closes [#27003](https://github.com/angular/angular/issues/27003)
+* **compiler:** source span for microsyntax text att should be key span ([#38766](https://github.com/angular/angular/issues/38766)) ([8f349b2](https://github.com/angular/angular/commit/8f349b2))
+* **router:** Fix arguments order for call to shouldReuseRoute ([#26949](https://github.com/angular/angular/issues/26949)) ([3817e5f](https://github.com/angular/angular/commit/3817e5f)), closes [#16192](https://github.com/angular/angular/issues/16192) [#16192](https://github.com/angular/angular/issues/16192)
 
 
 ### Features
 
-* **bazel:** provide LinkablePackageInfo from ng_module ([#37778](https://github.com/angular/angular/issues/37778)) ([6cd10a1](https://github.com/angular/angular/commit/6cd10a1)), closes [/github.com/bazelbuild/rules_nodejs/blob/9a5de3728b05bf1647bbb87ad99f54e626604705/internal/linker/link_node_modules.bzl#L144-L146](https://github.com//github.com/bazelbuild/rules_nodejs/blob/9a5de3728b05bf1647bbb87ad99f54e626604705/internal/linker/link_node_modules.bzl/issues/L144-L146)
+* **compiler-cli:** `TemplateTypeChecker` operation to get `Symbol` from a template node ([#38618](https://github.com/angular/angular/issues/38618)) ([c4556db](https://github.com/angular/angular/commit/c4556db))
+* **compiler-cli:** Add ability to get `Symbol` of `Template`s and `Element`s in component template ([#38618](https://github.com/angular/angular/issues/38618)) ([cf2e8b9](https://github.com/angular/angular/commit/cf2e8b9))
+* **compiler-cli:** Add ability to get `Symbol` of AST expression in component template ([#38618](https://github.com/angular/angular/issues/38618)) ([f56ece4](https://github.com/angular/angular/commit/f56ece4))
+* **compiler-cli:** add ability to get symbol of reference or variable ([#38618](https://github.com/angular/angular/issues/38618)) ([19598b4](https://github.com/angular/angular/commit/19598b4))
+* **compiler-cli:** define interfaces to be used for TemplateTypeChecker ([#38618](https://github.com/angular/angular/issues/38618)) ([9e77bd3](https://github.com/angular/angular/commit/9e77bd3))
+
+
+### Performance Improvements
+
+* **compiler-cli:** only emit directive/pipe references that are used ([#38539](https://github.com/angular/angular/issues/38539)) ([077f516](https://github.com/angular/angular/commit/077f516))
+* **compiler-cli:** optimize computation of type-check scope information ([#38539](https://github.com/angular/angular/issues/38539)) ([297c060](https://github.com/angular/angular/commit/297c060))
+* **router:** use `ngDevMode` to tree-shake error messages in router ([#38674](https://github.com/angular/angular/issues/38674)) ([db21c4f](https://github.com/angular/angular/commit/db21c4f))
+
+
+### BREAKING CHANGES
+
+* **router:** This change corrects the argument order when calling
+RouteReuseStrategy#shouldReuseRoute. Previously, when evaluating child
+routes, they would be called with the future and current arguments would
+be swapped. If your RouteReuseStrategy relies specifically on only the future
+or current snapshot state, you may need to update the shouldReuseRoute
+implementation's use of "future" and "current" ActivateRouteSnapshots.
+* **common:** The locale data API has been marked as returning readonly arrays, rather
+than mutable arrays, since these arrays are shared across calls to the
+API. If you were mutating them (e.g. calling `sort()`, `push()`, `splice()`, etc)
+then your code will not longer compile. If you need to mutate the array, you
+should now take a copy (e.g. by calling `slice()`) and mutate the copy.
+* **common:** When passing a date-time formatted string to the `DatePipe` in a format that contains
+fractions of a millisecond, the milliseconds will now always be rounded down rather than
+to the nearest millisecond.
+
+Most applications will not be affected by this change. If this is not the desired behaviour
+then consider pre-processing the string to round the millisecond part before passing
+it to the `DatePipe`.
+
+
+
+<a name="10.1.2"></a>
+## 10.1.2 (2020-09-16)
+
+
+### Bug Fixes
+
+* **compiler:** detect pipes in ICUs in template binder ([#38810](https://github.com/angular/angular/issues/38810)) ([ec2dbe7](https://github.com/angular/angular/commit/ec2dbe7)), closes [#38539](https://github.com/angular/angular/issues/38539) [#38539](https://github.com/angular/angular/issues/38539) [#38539](https://github.com/angular/angular/issues/38539)
+* **core:** clear the `RefreshTransplantedView` when detached ([#38768](https://github.com/angular/angular/issues/38768)) ([edb7f90](https://github.com/angular/angular/commit/edb7f90)), closes [#38619](https://github.com/angular/angular/issues/38619)
+* **localize:** ensure that `formatOptions` is optional ([#38787](https://github.com/angular/angular/issues/38787)) ([a47383d](https://github.com/angular/angular/commit/a47383d))
+* **router:** Ensure routes are processed in priority order and only if needed ([#38780](https://github.com/angular/angular/issues/38780)) ([9c51ba3](https://github.com/angular/angular/commit/9c51ba3)), closes [#38691](https://github.com/angular/angular/issues/38691)
+* **upgrade:** add try/catch when downgrading injectables ([#38671](https://github.com/angular/angular/issues/38671)) ([5de2ac3](https://github.com/angular/angular/commit/5de2ac3)), closes [#37579](https://github.com/angular/angular/issues/37579)
+
+
+### Performance Improvements
+
+* **compiler-cli:** only emit directive/pipe references that are used ([#38843](https://github.com/angular/angular/issues/38843)) ([5658405](https://github.com/angular/angular/commit/5658405))
+* **compiler-cli:** optimize computation of type-check scope information ([#38843](https://github.com/angular/angular/issues/38843)) ([ebede67](https://github.com/angular/angular/commit/ebede67))
+* **ngcc:** introduce cache for sharing data across entry-points ([#38840](https://github.com/angular/angular/issues/38840)) ([58411e7](https://github.com/angular/angular/commit/58411e7))
+* **ngcc:** reduce maximum worker count ([#38840](https://github.com/angular/angular/issues/38840)) ([ea36466](https://github.com/angular/angular/commit/ea36466))
+
+
+
+<a name="11.0.0-next.1"></a>
+# 11.0.0-next.1 (2020-09-09)
+
+
+### Bug Fixes
+
+* **compiler-cli:** compute source-mappings for localized strings ([#38645](https://github.com/angular/angular/issues/38645)) ([7e0b3fd](https://github.com/angular/angular/commit/7e0b3fd)), closes [#38588](https://github.com/angular/angular/issues/38588)
+* **core:** remove CollectionChangeRecord symbol ([#38668](https://github.com/angular/angular/issues/38668)) ([fdea180](https://github.com/angular/angular/commit/fdea180))
+* **router:** support lazy loading for empty path named outlets ([#38379](https://github.com/angular/angular/issues/38379)) ([926ffcd](https://github.com/angular/angular/commit/926ffcd)), closes [#12842](https://github.com/angular/angular/issues/12842)
+
+
+### BREAKING CHANGES
+
+* **core:** CollectionChangeRecord has been removed, use IterableChangeRecord
+instead
+
+
+
+<a name="10.1.1"></a>
+## 10.1.1 (2020-09-09)
+
+
+### Bug Fixes
+
+* **compiler:** correct confusion between field and property names ([#38685](https://github.com/angular/angular/issues/38685)) ([a1c34c6](https://github.com/angular/angular/commit/a1c34c6))
+* **compiler-cli:** compute source-mappings for localized strings ([#38747](https://github.com/angular/angular/issues/38747)) ([b4eb016](https://github.com/angular/angular/commit/b4eb016)), closes [#38588](https://github.com/angular/angular/issues/38588)
+* **compiler-cli:** ensure that a declaration is available in type-to-value conversion ([#38684](https://github.com/angular/angular/issues/38684)) ([56d5ff2](https://github.com/angular/angular/commit/56d5ff2)), closes [#38670](https://github.com/angular/angular/issues/38670)
+* **core:** reset `tView` between tests in Ivy TestBed ([#38659](https://github.com/angular/angular/issues/38659)) ([efc7606](https://github.com/angular/angular/commit/efc7606)), closes [#38600](https://github.com/angular/angular/issues/38600)
+* **localize:** do not expose NodeJS typings in $localize runtime code ([#38700](https://github.com/angular/angular/issues/38700)) ([4de8dc3](https://github.com/angular/angular/commit/4de8dc3)), closes [#38692](https://github.com/angular/angular/issues/38692)
+* **localize:** enable whitespace preservation marker in XLIFF files ([#38737](https://github.com/angular/angular/issues/38737)) ([190dca0](https://github.com/angular/angular/commit/190dca0)), closes [#38679](https://github.com/angular/angular/issues/38679)
+* **localize:** install `[@angular](https://github.com/angular)/localize` in `devDependencies` by default ([#38680](https://github.com/angular/angular/issues/38680)) ([dbab744](https://github.com/angular/angular/commit/dbab744)), closes [#38329](https://github.com/angular/angular/issues/38329)
+* **localize:** render context of translation file parse errors ([#38673](https://github.com/angular/angular/issues/38673)) ([32f33f0](https://github.com/angular/angular/commit/32f33f0)), closes [#38377](https://github.com/angular/angular/issues/38377)
+* **localize:** render location in XLIFF 2 even if there is no metadata ([#38713](https://github.com/angular/angular/issues/38713)) ([ab4f953](https://github.com/angular/angular/commit/ab4f953)), closes [#38705](https://github.com/angular/angular/issues/38705)
+* **ngcc:** use aliased exported types correctly ([#38666](https://github.com/angular/angular/issues/38666)) ([6a28675](https://github.com/angular/angular/commit/6a28675)), closes [#38238](https://github.com/angular/angular/issues/38238)
+* **router:** If users are using the Alt key when clicking the router links, prioritize browser’s default behavior ([#38375](https://github.com/angular/angular/issues/38375)) ([309709d](https://github.com/angular/angular/commit/309709d))
+
+
+### Performance Improvements
+
+* **core:** use `ngDevMode` to tree-shake error messages ([#38612](https://github.com/angular/angular/issues/38612)) ([b084bff](https://github.com/angular/angular/commit/b084bff))
 
 
-<a name="10.1.0-next.1"></a>
-# 10.1.0-next.1 (2020-07-15)
+
+<a name="11.0.0-next.0"></a>
+# 11.0.0-next.0 (2020-09-02)
 
 
 ### Bug Fixes
 
-* **bazel:** ng_module rule does not expose flat module information in Ivy ([#36971](https://github.com/angular/angular/issues/36971)) ([1550663](https://github.com/angular/angular/commit/1550663))
-* **compiler:** check more cases for pipe usage inside host bindings ([#37883](https://github.com/angular/angular/issues/37883)) ([9322b9a](https://github.com/angular/angular/commit/9322b9a)), closes [#34655](https://github.com/angular/angular/issues/34655) [#37610](https://github.com/angular/angular/issues/37610)
-* **compiler-cli:** ensure file_system handles mixed Windows drives ([#37959](https://github.com/angular/angular/issues/37959)) ([6b31155](https://github.com/angular/angular/commit/6b31155)), closes [#36777](https://github.com/angular/angular/issues/36777)
-* **language-service:** remove completion for string ([#37983](https://github.com/angular/angular/issues/37983)) ([10aba15](https://github.com/angular/angular/commit/10aba15))
-* **ngcc:** report a warning if ngcc tries to use a solution-style tsconfig ([#38003](https://github.com/angular/angular/issues/38003)) ([b358495](https://github.com/angular/angular/commit/b358495)), closes [#36386](https://github.com/angular/angular/issues/36386)
-* **router:** ensure duplicate popstate/hashchange events are handled correctly ([#37674](https://github.com/angular/angular/issues/37674)) ([9185c6e](https://github.com/angular/angular/commit/9185c6e)), closes [/github.com/angular/angular/issues/16710#issuecomment-646919529](https://github.com//github.com/angular/angular/issues/16710/issues/issuecomment-646919529) [#16710](https://github.com/angular/angular/issues/16710)
-* **service-worker:** correctly handle relative base href ([#37922](https://github.com/angular/angular/issues/37922)) ([d19ef65](https://github.com/angular/angular/commit/d19ef65)), closes [#25055](https://github.com/angular/angular/issues/25055) [#25055](https://github.com/angular/angular/issues/25055)
-* **service-worker:** correctly serve `ngsw/state` with a non-root SW scope ([#37922](https://github.com/angular/angular/issues/37922)) ([2156bee](https://github.com/angular/angular/commit/2156bee)), closes [#30505](https://github.com/angular/angular/issues/30505)
+* **forms:** ensure to emit `statusChanges` on subsequent value update/validations ([#38354](https://github.com/angular/angular/issues/38354)) ([d9fea85](https://github.com/angular/angular/commit/d9fea85)), closes [#20424](https://github.com/angular/angular/issues/20424) [#14542](https://github.com/angular/angular/issues/14542)
+* **service-worker:** fix condition to check for a cache-busted request ([#36847](https://github.com/angular/angular/issues/36847)) ([5be4edf](https://github.com/angular/angular/commit/5be4edf))
+
+
+### Features
+
+* **service-worker:** add `UnrecoverableStateError` ([#36847](https://github.com/angular/angular/issues/36847)) ([036a2fa](https://github.com/angular/angular/commit/036a2fa)), closes [#36539](https://github.com/angular/angular/issues/36539)
+
+
+### BREAKING CHANGES
+
+* **forms:** Previously if FormControl, FormGroup and FormArray class instances had async validators
+defined at initialization time, the status change event was not emitted once async validator
+completed. After this change the status event is emitted into the `statusChanges` observable.
+If your code relies on the old behavior, you can filter/ignore this additional status change
+event.
 
 
 
-<a name="10.1.0-next.0"></a>
-# 10.1.0-next.0 (2020-07-08)
+<a name="10.1.0"></a>
+# 10.1.0 (2020-09-02)
+
+
+### Features
+
+* **bazel:** provide LinkablePackageInfo from ng_module ([#37623](https://github.com/angular/angular/issues/37623)) ([6898eab](https://github.com/angular/angular/commit/6898eab))
+* **common:** add ReadonlyMap in place of Map in keyValuePipe ([#37311](https://github.com/angular/angular/issues/37311)) ([3373453](https://github.com/angular/angular/commit/3373453)), closes [#37308](https://github.com/angular/angular/issues/37308)
+* **compiler-cli:** add `SourceFile.getOriginalLocation()` to sourcemaps package ([#32912](https://github.com/angular/angular/issues/32912)) ([6abb8d0](https://github.com/angular/angular/commit/6abb8d0))
+* **compiler-cli:** Add compiler option to report errors when assigning to restricted input fields ([#38249](https://github.com/angular/angular/issues/38249)) ([71138f6](https://github.com/angular/angular/commit/71138f6))
+* **compiler-cli:** add support for TypeScript 4.0 ([#38076](https://github.com/angular/angular/issues/38076)) ([0fc44e0](https://github.com/angular/angular/commit/0fc44e0))
+* **compiler-cli:** explain why an expression cannot be used in AOT compilations ([#37587](https://github.com/angular/angular/issues/37587)) ([712f1bd](https://github.com/angular/angular/commit/712f1bd))
+* **compiler:** support unary operators for more accurate type checking ([#37918](https://github.com/angular/angular/issues/37918)) ([874792d](https://github.com/angular/angular/commit/874792d)), closes [#20845](https://github.com/angular/angular/issues/20845) [#36178](https://github.com/angular/angular/issues/36178)
+* **core:** rename async to waitForAsync to avoid confusing ([#37583](https://github.com/angular/angular/issues/37583)) ([8f07429](https://github.com/angular/angular/commit/8f07429))
+* **core:** support injection token as predicate in queries ([#37506](https://github.com/angular/angular/issues/37506)) ([97dc85b](https://github.com/angular/angular/commit/97dc85b)), closes [#21152](https://github.com/angular/angular/issues/21152) [#36144](https://github.com/angular/angular/issues/36144)
+* **core:** update reference and doc to change `async` to `waitAsync`. ([#37583](https://github.com/angular/angular/issues/37583)) ([8fbf40b](https://github.com/angular/angular/commit/8fbf40b))
+* **forms:** AbstractControl to store raw validators in addition to combined validators function ([#37881](https://github.com/angular/angular/issues/37881)) ([ad7046b](https://github.com/angular/angular/commit/ad7046b))
+* **localize:** allow duplicate messages to be handled during extraction ([#38082](https://github.com/angular/angular/issues/38082)) ([cf9a47b](https://github.com/angular/angular/commit/cf9a47b)), closes [#38077](https://github.com/angular/angular/issues/38077)
+* **localize:** expose `canParse()` diagnostics ([#37909](https://github.com/angular/angular/issues/37909)) ([ec32eba](https://github.com/angular/angular/commit/ec32eba)), closes [#37901](https://github.com/angular/angular/issues/37901)
+* **localize:** implement message extraction tool ([#32912](https://github.com/angular/angular/issues/32912)) ([190561d](https://github.com/angular/angular/commit/190561d))
+* **platform-browser:** Allow `sms`-URLs ([#31463](https://github.com/angular/angular/issues/31463)) ([fc5c34d](https://github.com/angular/angular/commit/fc5c34d)), closes [#31462](https://github.com/angular/angular/issues/31462)
+* **platform-server:** add option for absolute URL HTTP support ([#37539](https://github.com/angular/angular/issues/37539)) ([d37049a](https://github.com/angular/angular/commit/d37049a)), closes [#37071](https://github.com/angular/angular/issues/37071)
+* **router:** better warning message when a router outlet has not been instantiated ([#30246](https://github.com/angular/angular/issues/30246)) ([1609815](https://github.com/angular/angular/commit/1609815))
 
 
 ### Bug Fixes
 
+* **bazel:** fix integration test for bazel building ([#38629](https://github.com/angular/angular/issues/38629)) ([dd82f2f](https://github.com/angular/angular/commit/dd82f2f))
 * **common:** date pipe gives wrong week number ([#37632](https://github.com/angular/angular/issues/37632)) ([ef1fb6d](https://github.com/angular/angular/commit/ef1fb6d)), closes [#33961](https://github.com/angular/angular/issues/33961)
+* **common:** narrow `NgIf` context variables in template type checker ([#36627](https://github.com/angular/angular/issues/36627)) ([9c8bc4a](https://github.com/angular/angular/commit/9c8bc4a))
+* **compiler-cli:** avoid creating value expressions for symbols from type-only imports ([#37912](https://github.com/angular/angular/issues/37912)) ([18098d3](https://github.com/angular/angular/commit/18098d3)), closes [#37900](https://github.com/angular/angular/issues/37900)
 * **compiler-cli:** ensure source-maps can handle webpack:// protocol ([#32912](https://github.com/angular/angular/issues/32912)) ([decd95e](https://github.com/angular/angular/commit/decd95e))
 * **compiler-cli:** only read source-map comment from last line ([#32912](https://github.com/angular/angular/issues/32912)) ([07a07e3](https://github.com/angular/angular/commit/07a07e3))
+* **compiler-cli:** type-check inputs that include undefined when there's coercion members ([#38273](https://github.com/angular/angular/issues/38273)) ([7525f3a](https://github.com/angular/angular/commit/7525f3a))
+* **compiler:** incorrectly inferring namespace for HTML nodes inside SVG ([#38477](https://github.com/angular/angular/issues/38477)) ([0dda97e](https://github.com/angular/angular/commit/0dda97e)), closes [#37218](https://github.com/angular/angular/issues/37218)
+* **compiler:** mark `NgModuleFactory` construction as not side effectful ([#38147](https://github.com/angular/angular/issues/38147)) ([7f8c222](https://github.com/angular/angular/commit/7f8c222))
+* **core:** Allow modification of lifecycle hooks any time before bootstrap ([#35464](https://github.com/angular/angular/issues/35464)) ([737506e](https://github.com/angular/angular/commit/737506e)), closes [#30497](https://github.com/angular/angular/issues/30497)
+* **core:** detect DI parameters in JIT mode for downleveled ES2015 classes ([#38463](https://github.com/angular/angular/issues/38463)) ([ca07da4](https://github.com/angular/angular/commit/ca07da4)), closes [#38453](https://github.com/angular/angular/issues/38453)
 * **core:** determine required DOMParser feature availability ([#36578](https://github.com/angular/angular/issues/36578)) ([#36578](https://github.com/angular/angular/issues/36578)) ([c509243](https://github.com/angular/angular/commit/c509243))
 * **core:** do not trigger CSP alert/report in Firefox and Chrome ([#36578](https://github.com/angular/angular/issues/36578)) ([#36578](https://github.com/angular/angular/issues/36578)) ([b950d46](https://github.com/angular/angular/commit/b950d46)), closes [#25214](https://github.com/angular/angular/issues/25214)
+* **core:** move generated i18n statements to the `consts` field of ComponentDef ([#38404](https://github.com/angular/angular/issues/38404)) ([cb05c01](https://github.com/angular/angular/commit/cb05c01))
+* **elements:** run strategy methods in correct zone ([#37814](https://github.com/angular/angular/issues/37814)) ([8df888d](https://github.com/angular/angular/commit/8df888d)), closes [#24181](https://github.com/angular/angular/issues/24181)
 * **forms:** handle form groups/arrays own pending async validation ([#22575](https://github.com/angular/angular/issues/22575)) ([77b62a5](https://github.com/angular/angular/commit/77b62a5)), closes [#10064](https://github.com/angular/angular/issues/10064)
 * **language-service:** non-existent module format in package output ([#37623](https://github.com/angular/angular/issues/37623)) ([413a0fb](https://github.com/angular/angular/commit/413a0fb))
+* **localize:** ensure required XLIFF parameters are serialized ([#38575](https://github.com/angular/angular/issues/38575)) ([f0af387](https://github.com/angular/angular/commit/f0af387)), closes [#38570](https://github.com/angular/angular/issues/38570)
+* **localize:** extract the correct message ids ([#38498](https://github.com/angular/angular/issues/38498)) ([ac461e1](https://github.com/angular/angular/commit/ac461e1))
+* **localize:** render ICU placeholders in extracted translation files ([#38484](https://github.com/angular/angular/issues/38484)) ([81c3e80](https://github.com/angular/angular/commit/81c3e80))
+* **localize:** render text of extracted placeholders ([#38536](https://github.com/angular/angular/issues/38536)) ([14e90be](https://github.com/angular/angular/commit/14e90be))
+* **ngcc:** detect synthesized delegate constructors for downleveled ES2015 classes ([#38463](https://github.com/angular/angular/issues/38463)) ([3b9c802](https://github.com/angular/angular/commit/3b9c802)), closes [#38453](https://github.com/angular/angular/issues/38453) [#38453](https://github.com/angular/angular/issues/38453)
+* **router:** defer loading of wildcard module until needed ([#38348](https://github.com/angular/angular/issues/38348)) ([8f708b5](https://github.com/angular/angular/commit/8f708b5)), closes [#25494](https://github.com/angular/angular/issues/25494)
 * **router:** fix navigation ignoring logic to compare to the browser url ([#37716](https://github.com/angular/angular/issues/37716)) ([a5ffca0](https://github.com/angular/angular/commit/a5ffca0)), closes [#16710](https://github.com/angular/angular/issues/16710) [#13586](https://github.com/angular/angular/issues/13586)
 * **router:** properly compare array queryParams for equality ([#37709](https://github.com/angular/angular/issues/37709)) ([#37860](https://github.com/angular/angular/issues/37860)) ([1801d0c](https://github.com/angular/angular/commit/1801d0c))
 * **router:** remove parenthesis for primary outlet segment after removing auxiliary outlet segment ([#24656](https://github.com/angular/angular/issues/24656)) ([#37163](https://github.com/angular/angular/issues/37163)) ([71f008f](https://github.com/angular/angular/commit/71f008f))
+* **router:** restore 'history.state' object for navigations coming from Angular router ([#28108](https://github.com/angular/angular/issues/28108)) ([#28176](https://github.com/angular/angular/issues/28176)) ([df76a20](https://github.com/angular/angular/commit/df76a20))
 
+### Code Refactoring
+* **router:** export DefaultRouteReuseStrategy to Router public_api ([#31575](https://github.com/angular/angular/issues/31575)) ([ca79880](https://github.com/angular/angular/commit/ca79880))
 
-### Features
 
-* **bazel:** provide LinkablePackageInfo from ng_module ([#37623](https://github.com/angular/angular/issues/37623)) ([6898eab](https://github.com/angular/angular/commit/6898eab))
-* **compiler-cli:** add `SourceFile.getOriginalLocation()` to sourcemaps package ([#32912](https://github.com/angular/angular/issues/32912)) ([6abb8d0](https://github.com/angular/angular/commit/6abb8d0))
-* **compiler-cli:** explain why an expression cannot be used in AOT compilations ([#37587](https://github.com/angular/angular/issues/37587)) ([712f1bd](https://github.com/angular/angular/commit/712f1bd))
-* **core:** support injection token as predicate in queries ([#37506](https://github.com/angular/angular/issues/37506)) ([97dc85b](https://github.com/angular/angular/commit/97dc85b)), closes [#21152](https://github.com/angular/angular/issues/21152) [#36144](https://github.com/angular/angular/issues/36144)
-* **localize:** expose `canParse()` diagnostics ([#37909](https://github.com/angular/angular/issues/37909)) ([ec32eba](https://github.com/angular/angular/commit/ec32eba)), closes [#37901](https://github.com/angular/angular/issues/37901)
-* **localize:** implement message extraction tool ([#32912](https://github.com/angular/angular/issues/32912)) ([190561d](https://github.com/angular/angular/commit/190561d))
-* **platform-browser:** Allow `sms`-URLs ([#31463](https://github.com/angular/angular/issues/31463)) ([fc5c34d](https://github.com/angular/angular/commit/fc5c34d)), closes [#31462](https://github.com/angular/angular/issues/31462)
-* **platform-server:** add option for absolute URL HTTP support ([#37539](https://github.com/angular/angular/issues/37539)) ([d37049a](https://github.com/angular/angular/commit/d37049a)), closes [#37071](https://github.com/angular/angular/issues/37071)
 
 
 ### Performance Improvements
-
+* **compiler-cli:** don't emit template guards when child scope is empty ([#38418](https://github.com/angular/angular/issues/38418)) ([1388c17](https://github.com/angular/angular/commit/1388c17))
 * **compiler-cli:** fix regressions in incremental program reuse ([#37641](https://github.com/angular/angular/issues/37641)) ([5103d90](https://github.com/angular/angular/commit/5103d90))
+* **compiler-cli:** only generate directive declarations when used ([#38418](https://github.com/angular/angular/issues/38418)) ([fb8f4b4](https://github.com/angular/angular/commit/fb8f4b4))
+* **compiler-cli:** only generate type-check code for referenced DOM elements ([#38418](https://github.com/angular/angular/issues/38418)) ([f42e6ce](https://github.com/angular/angular/commit/f42e6ce))
+* **forms:** use internal `ngDevMode` flag to tree-shake error messages in prod builds ([#37821](https://github.com/angular/angular/issues/37821)) ([201a546](https://github.com/angular/angular/commit/201a546)), closes [#37697](https://github.com/angular/angular/issues/37697)
 * **ngcc:** shortcircuit tokenizing in ESM dependency host ([#37639](https://github.com/angular/angular/issues/37639)) ([bd7f440](https://github.com/angular/angular/commit/bd7f440))
 * **ngcc:** use `EntryPointManifest` to speed up noop `ProgramBaseEntryPointFinder` ([#37665](https://github.com/angular/angular/issues/37665)) ([9318e23](https://github.com/angular/angular/commit/9318e23))
 * **router:** apply prioritizedGuardValue operator to optimize CanLoad guards ([#37523](https://github.com/angular/angular/issues/37523)) ([d7dd295](https://github.com/angular/angular/commit/d7dd295))
 
 
 
+<a name="10.0.14"></a>
+## 10.0.14 (2020-08-26)
+
+
+<a name="10.0.12"></a>
+## 10.0.12 (2020-08-24)
+
+
+### Bug Fixes
+
+* **compiler-cli:** adding references to const enums in runtime code ([#38542](https://github.com/angular/angular/issues/38542)) ([814b436](https://github.com/angular/angular/commit/814b436)), closes [#38513](https://github.com/angular/angular/issues/38513)
+* **core:** remove closing body tag from inert DOM builder ([#38454](https://github.com/angular/angular/issues/38454)) ([5528536](https://github.com/angular/angular/commit/5528536))
+* **localize:** include the last placeholder in parsed translation text ([#38452](https://github.com/angular/angular/issues/38452)) ([57d1a48](https://github.com/angular/angular/commit/57d1a48))
+* **localize:** parse all parts of a translation with nested HTML ([#38452](https://github.com/angular/angular/issues/38452)) ([07b99f5](https://github.com/angular/angular/commit/07b99f5)), closes [#38422](https://github.com/angular/angular/issues/38422)
+
+
+### Features
+
+* **language-service:** introduce hybrid visitor to locate AST node ([#38540](https://github.com/angular/angular/issues/38540)) ([66d8c22](https://github.com/angular/angular/commit/66d8c22))
+
+
+<a name="10.0.11"></a>
+## 10.0.11 (2020-08-19)
+
+
+### Bug Fixes
+
+* **router:** ensure routerLinkActive updates when associated routerLinks change (resubmit of [#38349](https://github.com/angular/angular/issues/38349)) ([#38511](https://github.com/angular/angular/issues/38511)) ([0af9533](https://github.com/angular/angular/commit/0af9533)), closes [#18469](https://github.com/angular/angular/issues/18469)
+
+
+
+<a name="10.0.10"></a>
+## 10.0.10 (2020-08-17)
+
+
+### Bug Fixes
+
+* **common:** Allow scrolling when browser supports scrollTo ([#38468](https://github.com/angular/angular/issues/38468)) ([b32126c](https://github.com/angular/angular/commit/b32126c)), closes [#30630](https://github.com/angular/angular/issues/30630)
+* **core:** detect DI parameters in JIT mode for downleveled ES2015 classes ([#38500](https://github.com/angular/angular/issues/38500)) ([863acb6](https://github.com/angular/angular/commit/863acb6)), closes [#38453](https://github.com/angular/angular/issues/38453)
+* **core:** error if CSS custom property in host binding has number in name ([#38432](https://github.com/angular/angular/issues/38432)) ([cb83b8a](https://github.com/angular/angular/commit/cb83b8a)), closes [#37292](https://github.com/angular/angular/issues/37292)
+* **core:** fix multiple nested views removal from ViewContainerRef ([#38317](https://github.com/angular/angular/issues/38317)) ([d5e09f4](https://github.com/angular/angular/commit/d5e09f4)), closes [#38201](https://github.com/angular/angular/issues/38201)
+* **ngcc:** detect synthesized delegate constructors for downleveled ES2015 classes ([#38500](https://github.com/angular/angular/issues/38500)) ([f3dd6c2](https://github.com/angular/angular/commit/f3dd6c2)), closes [#38453](https://github.com/angular/angular/issues/38453) [#38453](https://github.com/angular/angular/issues/38453)
+* **router:** ensure routerLinkActive updates when associated routerLinks change ([#38349](https://github.com/angular/angular/issues/38349)) ([989e8a1](https://github.com/angular/angular/commit/989e8a1)), closes [#18469](https://github.com/angular/angular/issues/18469)
+
+
+
+<a name="10.0.9"></a>
+## 10.0.9 (2020-08-12)
+
+
+### Bug Fixes
+
+* **common:** ensure scrollRestoration is writable ([#30630](https://github.com/angular/angular/issues/30630)) ([#38357](https://github.com/angular/angular/issues/38357)) ([58f4b3a](https://github.com/angular/angular/commit/58f4b3a)), closes [#30629](https://github.com/angular/angular/issues/30629)
+* **compiler:** evaluate safe navigation expressions in correct binding order ([#37911](https://github.com/angular/angular/issues/37911)) ([f5b9d87](https://github.com/angular/angular/commit/f5b9d87)), closes [#37194](https://github.com/angular/angular/issues/37194)
+* **compiler-cli:** avoid creating value expressions for symbols from type-only imports ([#38415](https://github.com/angular/angular/issues/38415)) ([ca2b4bc](https://github.com/angular/angular/commit/ca2b4bc)), closes [#37912](https://github.com/angular/angular/issues/37912)
+* **compiler-cli:** infer quote expressions as any type in type checker ([#37917](https://github.com/angular/angular/issues/37917)) ([5b87c67](https://github.com/angular/angular/commit/5b87c67)), closes [#36568](https://github.com/angular/angular/issues/36568)
+* **compiler-cli:** mark eager `NgModuleFactory` construction as not side effectful ([#38320](https://github.com/angular/angular/issues/38320)) ([016a41b](https://github.com/angular/angular/commit/016a41b)), closes [#38147](https://github.com/angular/angular/issues/38147)
+* **compiler-cli:** match wrapHost parameter types within plugin interface ([#38004](https://github.com/angular/angular/issues/38004)) ([df01a82](https://github.com/angular/angular/commit/df01a82))
+* **compiler-cli:** preserve quotes in class member names ([#38387](https://github.com/angular/angular/issues/38387)) ([c9acb7b](https://github.com/angular/angular/commit/c9acb7b)), closes [#38311](https://github.com/angular/angular/issues/38311)
+* **core:** prevent NgModule scope being overwritten in JIT compiler ([#37795](https://github.com/angular/angular/issues/37795)) ([3acebdc](https://github.com/angular/angular/commit/3acebdc)), closes [#37105](https://github.com/angular/angular/issues/37105)
+* **core:** queries not matching string injection tokens ([#38321](https://github.com/angular/angular/issues/38321)) ([32109dc](https://github.com/angular/angular/commit/32109dc)), closes [#38313](https://github.com/angular/angular/issues/38313) [#38315](https://github.com/angular/angular/issues/38315)
+* **core:** Store the currently selected ICU in `LView` ([#38345](https://github.com/angular/angular/issues/38345)) ([ee5123f](https://github.com/angular/angular/commit/ee5123f))
+* **platform-server:** remove styles added by ServerStylesHost on destruction ([#38367](https://github.com/angular/angular/issues/38367)) ([7f11149](https://github.com/angular/angular/commit/7f11149))
+* **router:** prevent calling unsubscribe on undefined subscription in RouterPreloader ([#38344](https://github.com/angular/angular/issues/38344)) ([4151314](https://github.com/angular/angular/commit/4151314))
+* **service-worker:** fix the chrome debugger syntax highlighter ([#38332](https://github.com/angular/angular/issues/38332)) ([f5d5bac](https://github.com/angular/angular/commit/f5d5bac))
+
+
+<a name="10.0.8"></a>
+## 10.0.8 (2020-08-04)
+
+
+### Bug Fixes
+
+* **compiler:** add PURE annotation to getInheritedFactory calls ([#38291](https://github.com/angular/angular/issues/38291)) ([03d8e31](https://github.com/angular/angular/commit/03d8e31))
+* **compiler:** update unparsable character reference entity error messages ([#38319](https://github.com/angular/angular/issues/38319)) ([cea4678](https://github.com/angular/angular/commit/cea4678)), closes [#26067](https://github.com/angular/angular/issues/26067)
+
+
+
+<a name="10.0.7"></a>
+## 10.0.7 (2020-07-30)
+
+
+### Bug Fixes
+
+* **compiler:** Metadata should not include methods on Object.prototype ([#38292](https://github.com/angular/angular/issues/38292)) ([879ff08](https://github.com/angular/angular/commit/879ff08))
+
+
+
+<a name="10.0.6"></a>
+## 10.0.6 (2020-07-28)
+
+
+### Bug Fixes
+
+* **compiler:** share identical stylesheets between components in the same file ([#38213](https://github.com/angular/angular/issues/38213)) ([264950b](https://github.com/angular/angular/commit/264950b)), closes [#38204](https://github.com/angular/angular/issues/38204)
+* **compiler-cli:** Add support for string literal class members ([#38226](https://github.com/angular/angular/issues/38226)) ([b1e7775](https://github.com/angular/angular/commit/b1e7775))
+* **core:** `Attribute` decorator `attributeName` is mandatory ([#38131](https://github.com/angular/angular/issues/38131)) ([1c4fcce](https://github.com/angular/angular/commit/1c4fcce)), closes [#32658](https://github.com/angular/angular/issues/32658)
+* **core:** unify the signature between ngZone and noopZone ([#37581](https://github.com/angular/angular/issues/37581)) ([d5264f5](https://github.com/angular/angular/commit/d5264f5))
+
+
+
+<a name="10.0.5"></a>
+## 10.0.5 (2020-07-22)
+
+
+### Bug Fixes
+
+* **compiler:** properly associate source spans for implicitly closed elements ([#38126](https://github.com/angular/angular/issues/38126)) ([e80278c](https://github.com/angular/angular/commit/e80278c)), closes [#36118](https://github.com/angular/angular/issues/36118)
+* **compiler-cli:** ensure file_system handles mixed Windows drives ([#38030](https://github.com/angular/angular/issues/38030)) ([dba4023](https://github.com/angular/angular/commit/dba4023)), closes [#36777](https://github.com/angular/angular/issues/36777)
+* **core:** Allow modification of lifecycle hooks any time before bootstrap ([#38119](https://github.com/angular/angular/issues/38119)) ([14b4718](https://github.com/angular/angular/commit/14b4718)), closes [#30497](https://github.com/angular/angular/issues/30497)
+* **core:** error due to integer overflow when there are too many host bindings ([#38014](https://github.com/angular/angular/issues/38014)) ([7b6e73c](https://github.com/angular/angular/commit/7b6e73c)), closes [#37876](https://github.com/angular/angular/issues/37876) [#37876](https://github.com/angular/angular/issues/37876)
+* **core:** incorrectly validating properties on ng-content and ng-container ([#37773](https://github.com/angular/angular/issues/37773)) ([17ddab9](https://github.com/angular/angular/commit/17ddab9))
+
+
+
+<a name="10.0.4"></a>
+## 10.0.4 (2020-07-15)
+
+
+### Bug Fixes
+
+* **bazel:** ng_module rule does not expose flat module information in Ivy ([#36971](https://github.com/angular/angular/issues/36971)) ([b76a2dc](https://github.com/angular/angular/commit/b76a2dc))
+* **compiler:** check more cases for pipe usage inside host bindings ([#37883](https://github.com/angular/angular/issues/37883)) ([a94383f](https://github.com/angular/angular/commit/a94383f)), closes [#34655](https://github.com/angular/angular/issues/34655) [#37610](https://github.com/angular/angular/issues/37610)
+* **language-service:** non-existent module format in package output ([#37778](https://github.com/angular/angular/issues/37778)) ([12f1773](https://github.com/angular/angular/commit/12f1773))
+* **language-service:** remove completion for string ([#37983](https://github.com/angular/angular/issues/37983)) ([387e838](https://github.com/angular/angular/commit/387e838))
+* **ngcc:** report a warning if ngcc tries to use a solution-style tsconfig ([#38003](https://github.com/angular/angular/issues/38003)) ([e3b8010](https://github.com/angular/angular/commit/e3b8010)), closes [#36386](https://github.com/angular/angular/issues/36386)
+* **service-worker:** correctly handle relative base href ([#37922](https://github.com/angular/angular/issues/37922)) ([b186db7](https://github.com/angular/angular/commit/b186db7)), closes [#25055](https://github.com/angular/angular/issues/25055) [#25055](https://github.com/angular/angular/issues/25055)
+* **service-worker:** correctly serve `ngsw/state` with a non-root SW scope ([#37922](https://github.com/angular/angular/issues/37922)) ([dc42c97](https://github.com/angular/angular/commit/dc42c97)), closes [#30505](https://github.com/angular/angular/issues/30505)
+
+
+### Features
+
+* **bazel:** provide LinkablePackageInfo from ng_module ([#37778](https://github.com/angular/angular/issues/37778)) ([6cd10a1](https://github.com/angular/angular/commit/6cd10a1)), closes [/github.com/bazelbuild/rules_nodejs/blob/9a5de3728b05bf1647bbb87ad99f54e626604705/internal/linker/link_node_modules.bzl#L144-L146](https://github.com//github.com/bazelbuild/rules_nodejs/blob/9a5de3728b05bf1647bbb87ad99f54e626604705/internal/linker/link_node_modules.bzl/issues/L144-L146)
+
+
 <a name="10.0.3"></a>
 ## 10.0.3 (2020-07-08)
 
@@ -447,12 +952,12 @@ https://github.com/microsoft/TypeScript/issues/38374 for more
 information and updates.
 
 If you used Closure Compiler with Angular in the past, you will likely
-be better off consuming Angular packages built from sources directly 
+be better off consuming Angular packages built from sources directly
 rather than consuming the version we publish on npm,
 which is primarily optimized for Webpack/Rollup + Terser build pipeline.
 
 As a temporary workaround, you might consider using your current build
-pipeline with Closure flag `--compilation_level=SIMPLE`. This flag 
+pipeline with Closure flag `--compilation_level=SIMPLE`. This flag
 will ensure that your build pipeline produces buildable and
 runnable artifacts, at the cost of increased payload size due to
 advanced optimizations being disabled.
@@ -460,17 +965,17 @@ advanced optimizations being disabled.
 If you were affected by this change, please help us understand your
 needs by leaving a comment on https://github.com/angular/angular/issues/37234.
 
-* **core:** make generic mandatory for ModuleWithProviders 
+* **core:** make generic mandatory for ModuleWithProviders
 
 A generic type parameter has always been required for the `ModuleWithProviders` pattern to work with Ivy, but prior to this commit, View Engine allowed the generic type to be omitted (though support was officially deprecated).
-If you're using `ModuleWithProviders` without a generic type in your application code, a v10 migration will update your code for you. 
+If you're using `ModuleWithProviders` without a generic type in your application code, a v10 migration will update your code for you.
 
 However, if you are using View Engine and also depending on a library that omits the generic type, you will now get a build time error similar to:
 
 ```
 error TS2314: Generic type 'ModuleWithProviders<T>' requires 1 type argument(s).
 ```
- 
+
 In this case, ngcc won't help you (because it's Ivy-only) and the migration only covers application code.
 You should contact the library author to fix their library to provide a type parameter when they use this class.
 
@@ -1798,7 +2303,7 @@ API surface going forward.
 * **core:** Injector.get now accepts abstract classes to return
 type-safe values. Previous implementation returned `any` through the
 deprecated implementation.
-* Angular now compiles with Ivy by default ([#32219](https://github.com/angular/angular/issues/32219)) ([ec4381d](https://github.com/angular/angular/commit/ec4381d)). 
+* Angular now compiles with Ivy by default ([#32219](https://github.com/angular/angular/issues/32219)) ([ec4381d](https://github.com/angular/angular/commit/ec4381d)).
 
 If you aren't familiar with Ivy, read our [blog post about the Ivy preview](https://blog.angular.io/its-time-for-the-compatibility-opt-in-preview-of-ivy-38f3542a282f?gi=8bfeb44b05c) and see the list of changes [here](https://docs.google.com/document/d/1Dije0AsJ0PxL3NaeNPxpYDeapj30b_QC0xfeIvIIzgg/preview).
 
diff --git a/WORKSPACE b/WORKSPACE
index 291208ba84589..7054692cfbda9 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -8,8 +8,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 # Fetch rules_nodejs so we can install our npm dependencies
 http_archive(
     name = "build_bazel_rules_nodejs",
-    sha256 = "84abf7ac4234a70924628baa9a73a5a5cbad944c4358cf9abdb4aab29c9a5b77",
-    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/1.7.0/rules_nodejs-1.7.0.tar.gz"],
+    sha256 = "4952ef879704ab4ad6729a29007e7094aef213ea79e9f2e94cbe1c9a753e63ef",
+    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/2.2.0/rules_nodejs-2.2.0.tar.gz"],
 )
 
 # Check the rules_nodejs version and download npm dependencies
@@ -17,7 +17,7 @@ http_archive(
 # assert on that.
 load("@build_bazel_rules_nodejs//:index.bzl", "check_rules_nodejs_version", "node_repositories", "yarn_install")
 
-check_rules_nodejs_version(minimum_version_string = "1.7.0")
+check_rules_nodejs_version(minimum_version_string = "2.2.0")
 
 # Setup the Node.js toolchain
 node_repositories(
@@ -39,23 +39,18 @@ yarn_install(
     yarn_lock = "//:yarn.lock",
 )
 
-# Install all bazel dependencies of the @npm npm packages
-load("@npm//:install_bazel_dependencies.bzl", "install_bazel_dependencies")
-
-install_bazel_dependencies()
-
 # Load angular dependencies
 load("//packages/bazel:package.bzl", "rules_angular_dev_dependencies")
 
 rules_angular_dev_dependencies()
 
 # Load protractor dependencies
-load("@npm_bazel_protractor//:package.bzl", "npm_bazel_protractor_dependencies")
+load("@npm//@bazel/protractor:package.bzl", "npm_bazel_protractor_dependencies")
 
 npm_bazel_protractor_dependencies()
 
 # Load karma dependencies
-load("@npm_bazel_karma//:package.bzl", "npm_bazel_karma_dependencies")
+load("@npm//@bazel/karma:package.bzl", "npm_bazel_karma_dependencies")
 
 npm_bazel_karma_dependencies()
 
@@ -68,11 +63,6 @@ load("//dev-infra/browsers:browser_repositories.bzl", "browser_repositories")
 
 browser_repositories()
 
-# Setup the rules_typescript tooolchain
-load("@npm_bazel_typescript//:index.bzl", "ts_setup_workspace")
-
-ts_setup_workspace()
-
 # Setup the rules_sass toolchain
 load("@io_bazel_rules_sass//sass:sass_repositories.bzl", "sass_repositories")
 
@@ -91,14 +81,14 @@ rbe_autoconfig(
     # Need to specify a base container digest in order to ensure that we can use the checked-in
     # platform configurations for the "ubuntu16_04" image. Otherwise the autoconfig rule would
     # need to pull the image and run it in order determine the toolchain configuration. See:
-    # https://github.com/bazelbuild/bazel-toolchains/blob/3.2.0/configs/ubuntu16_04_clang/versions.bzl
-    base_container_digest = "sha256:5e750dd878df9fcf4e185c6f52b9826090f6e532b097f286913a428290622332",
+    # https://github.com/bazelbuild/bazel-toolchains/blob/3.6.0/configs/ubuntu16_04_clang/versions.bzl
+    base_container_digest = "sha256:f6568d8168b14aafd1b707019927a63c2d37113a03bcee188218f99bd0327ea1",
     # Note that if you change the `digest`, you might also need to update the
     # `base_container_digest` to make sure marketplace.gcr.io/google/rbe-ubuntu16-04-webtest:<digest>
     # and marketplace.gcr.io/google/rbe-ubuntu16-04:<base_container_digest> have
     # the same Clang and JDK installed. Clang is needed because of the dependency on
     # @com_google_protobuf. Java is needed for the Bazel's test executor Java tool.
-    digest = "sha256:f743114235a43355bf8324e2ba0fa6a597236fe06f7bc99aaa9ac703631c306b",
+    digest = "sha256:dddaaddbe07a61c2517f9b08c4977fc23c4968fcb6c0b8b5971e955d2de7a961",
     env = clang_env(),
     registry = "marketplace.gcr.io",
     # We can't use the default "ubuntu16_04" RBE image provided by the autoconfig because we need
diff --git a/aio/README.md b/aio/README.md
index 88177f89a6a74..3c8c851496551 100644
--- a/aio/README.md
+++ b/aio/README.md
@@ -6,6 +6,7 @@ Todo en esta carpeta es parte del proyecto de documentación. Esto incluye:
 * La configuración de dgeni para convertir los archivos de origen a archivos renderizados que se pueden vizualizar en el sitio web.
 * Las herramientas para establecer ejemplos para el desarrollo; y generar archivos en tiempo real y archivos zip desde los ejemplos.
 
+<a name="developer-tasks"></a>
 ## Tareas de desarrollador
 
 Nosotros usamos [Yarn](https://yarnpkg.com) para gestionar las dependencias y crear tareas de compilación.
@@ -35,8 +36,9 @@ Aquí están las tareas más importantes que podrías necesitar usar:
 
 * `yarn boilerplate:add` - generar todo el código boilerplate para los ejemplos, para que puedan ejecutarse localmente.
 * `yarn boilerplate:add:viewengine` - igual que `boilerplate:add` pero también enciende el modo `ViewEngine` (pre-Ivy).
-
 * `yarn boilerplate:remove` - eliminar todo el código boilerplate que fue añadido a través`yarn boilerplate:add`.
+* `yarn create-example` - crear un nuevo directorio de ejemplo que contenga los archivos fuente iniciales.
+
 * `yarn generate-stackblitz` - generar los archivos stackblitz que están usados por la etiqueta `live-example` en documentos.
 * `yarn generate-zips` - generar los archivos zip desde los ejemplos. Zip está disponible a través de la etiqueta `live-example` en los documentos.
 
diff --git a/aio/aio-builds-setup/dockerbuild/scripts-js/lib/verify-setup/mock-external-apis.ts b/aio/aio-builds-setup/dockerbuild/scripts-js/lib/verify-setup/mock-external-apis.ts
index 34875e22a0eb0..d32cee96bf10b 100644
--- a/aio/aio-builds-setup/dockerbuild/scripts-js/lib/verify-setup/mock-external-apis.ts
+++ b/aio/aio-builds-setup/dockerbuild/scripts-js/lib/verify-setup/mock-external-apis.ts
@@ -16,13 +16,6 @@ import {BuildNums, PrNums, SHA} from './constants';
 
 const logger = new Logger('mock-external-apis');
 
-const log = (...args: any[]) => {
-  // Filter out non-matching URL checks
-  if (!/^matching.+: false$/.test(args[0])) {
-    logger.log(...args);
-  }
-};
-
 const AIO_CIRCLE_CI_TOKEN = getEnvVar('AIO_CIRCLE_CI_TOKEN');
 const AIO_GITHUB_TOKEN = getEnvVar('AIO_GITHUB_TOKEN');
 
@@ -91,8 +84,8 @@ const createArchive = (buildNum: number, prNum: number, sha: string) => {
 };
 
 // Create request scopes
-const circleCiApi = nock(CIRCLE_CI_API_HOST).log(log).persist();
-const githubApi = nock(GITHUB_API_HOST).log(log).persist().matchHeader('Authorization', `token ${AIO_GITHUB_TOKEN}`);
+const circleCiApi = nock(CIRCLE_CI_API_HOST).persist();
+const githubApi = nock(GITHUB_API_HOST).persist().matchHeader('Authorization', `token ${AIO_GITHUB_TOKEN}`);
 
 //////////////////////////////
 
diff --git a/aio/aio-builds-setup/dockerbuild/scripts-js/package.json b/aio/aio-builds-setup/dockerbuild/scripts-js/package.json
index 3d1533b926125..1f42dbc4ebf52 100644
--- a/aio/aio-builds-setup/dockerbuild/scripts-js/package.json
+++ b/aio/aio-builds-setup/dockerbuild/scripts-js/package.json
@@ -27,28 +27,28 @@
     "body-parser": "^1.19.0",
     "delete-empty": "^3.0.0",
     "express": "^4.17.1",
-    "jasmine": "^3.5.0",
-    "nock": "^12.0.3",
-    "node-fetch": "^2.6.0",
+    "jasmine": "^3.6.1",
+    "nock": "^13.0.4",
+    "node-fetch": "^2.6.1",
     "shelljs": "^0.8.4",
     "source-map-support": "^0.5.19",
-    "tar-stream": "^2.1.2",
-    "tslib": "^1.11.1"
+    "tar-stream": "^2.1.3",
+    "tslib": "^2.0.1"
   },
   "devDependencies": {
     "@types/body-parser": "^1.19.0",
-    "@types/express": "^4.17.6",
-    "@types/jasmine": "^3.5.10",
+    "@types/express": "^4.17.8",
+    "@types/jasmine": "^3.5.14",
     "@types/nock": "^11.1.0",
-    "@types/node": "^13.13.2",
+    "@types/node": "^14.6.4",
     "@types/node-fetch": "^2.5.7",
-    "@types/shelljs": "^0.8.7",
-    "@types/supertest": "^2.0.8",
-    "nodemon": "^2.0.3",
+    "@types/shelljs": "^0.8.8",
+    "@types/supertest": "^2.0.10",
+    "nodemon": "^2.0.4",
     "npm-run-all": "^4.1.5",
     "supertest": "^4.0.2",
-    "tslint": "^6.1.1",
+    "tslint": "^6.1.3",
     "tslint-jasmine-noSkipOrFocus": "^1.0.9",
-    "typescript": "^3.8.3"
+    "typescript": "^4.0.2"
   }
 }
diff --git a/aio/aio-builds-setup/dockerbuild/scripts-js/test/common/github-api.spec.ts b/aio/aio-builds-setup/dockerbuild/scripts-js/test/common/github-api.spec.ts
index 61df1ad4b77ab..71af2f379a4d2 100644
--- a/aio/aio-builds-setup/dockerbuild/scripts-js/test/common/github-api.spec.ts
+++ b/aio/aio-builds-setup/dockerbuild/scripts-js/test/common/github-api.spec.ts
@@ -214,23 +214,24 @@ describe('GithubApi', () => {
     });
 
 
-    it('should call \'https.request()\' with the correct options', () => {
+    it('should call \'https.request()\' with the correct options', async () => {
       const requestHandler = nock('https://api.github.com')
         .intercept('/path', 'method')
         .reply(200);
 
-      (api as any).request('method', '/path');
+      await (api as any).request('method', '/path');
       requestHandler.done();
     });
 
 
-    it('should add the \'Authorization\' header containing the \'githubToken\'', () => {
+    it('should add the \'Authorization\' header containing the \'githubToken\'', async () => {
       const requestHandler = nock('https://api.github.com')
         .intercept('/path', 'method', undefined, {
           reqheaders: {Authorization: 'token 12345'},
         })
         .reply(200);
-      (api as any).request('method', '/path');
+
+      await (api as any).request('method', '/path');
       requestHandler.done();
     });
 
@@ -244,12 +245,13 @@ describe('GithubApi', () => {
     });
 
 
-    it('should \'JSON.stringify\' and send the data along with the request', () => {
+    it('should \'JSON.stringify\' and send the data along with the request', async () => {
       const data = {key: 'value'};
       const requestHandler = nock('https://api.github.com')
         .intercept('/path', 'method', JSON.stringify(data))
         .reply(200);
-      (api as any).request('method', '/path', data);
+
+      await (api as any).request('method', '/path', data);
       requestHandler.done();
     });
 
diff --git a/aio/aio-builds-setup/dockerbuild/scripts-js/yarn.lock b/aio/aio-builds-setup/dockerbuild/scripts-js/yarn.lock
index ac21400c64a0e..01b93fcb31c9a 100644
--- a/aio/aio-builds-setup/dockerbuild/scripts-js/yarn.lock
+++ b/aio/aio-builds-setup/dockerbuild/scripts-js/yarn.lock
@@ -23,6 +23,19 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
+"@mrmlnc/readdir-enhanced@^2.2.1":
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
+  integrity sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==
+  dependencies:
+    call-me-maybe "^1.0.1"
+    glob-to-regexp "^0.3.0"
+
+"@nodelib/fs.stat@^1.1.2":
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
+  integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
+
 "@sindresorhus/is@^0.14.0":
   version "0.14.0"
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
@@ -69,10 +82,10 @@
     "@types/node" "*"
     "@types/range-parser" "*"
 
-"@types/express@^4.17.6":
-  version "4.17.6"
-  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.6.tgz#6bce49e49570507b86ea1b07b806f04697fac45e"
-  integrity sha512-n/mr9tZI83kd4azlPG5y997C/M4DNABK9yErhFM6hKdym4kkmd9j0vtsJyjFIwfRBxtrxZtAfGZCNRIBMFLK5w==
+"@types/express@^4.17.8":
+  version "4.17.8"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.8.tgz#3df4293293317e61c60137d273a2e96cd8d5f27a"
+  integrity sha512-wLhcKh3PMlyA2cNAB9sjM1BntnhPMiM0JOBwPBqttjHev2428MLEB4AYVN+d8s2iyCVZac+o41Pflm/ZH5vLXQ==
   dependencies:
     "@types/body-parser" "*"
     "@types/express-serve-static-core" "*"
@@ -86,10 +99,10 @@
     "@types/minimatch" "*"
     "@types/node" "*"
 
-"@types/jasmine@^3.5.10":
-  version "3.5.10"
-  resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.5.10.tgz#a1a41012012b5da9d4b205ba9eba58f6cce2ab7b"
-  integrity sha512-3F8qpwBAiVc5+HPJeXJpbrl+XjawGmciN5LgiO7Gv1pl1RHtjoMNqZpqEksaPJW05ViKe8snYInRs6xB25Xdew==
+"@types/jasmine@^3.5.14":
+  version "3.5.14"
+  resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.5.14.tgz#f41a14e8ffa939062a71cf9722e5ee7d4e1f94af"
+  integrity sha512-Fkgk536sHPqcOtd+Ow+WiUNuk0TSo/BntKkF8wSvcd6M2FvPjeXcUE6Oz/bwDZiUZEaXLslAgw00Q94Pnx6T4w==
 
 "@types/mime@*":
   version "1.3.0"
@@ -118,10 +131,10 @@
   version "7.0.31"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.31.tgz#80ea4d175599b2a00149c29a10a4eb2dff592e86"
 
-"@types/node@^13.13.2":
-  version "13.13.2"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.2.tgz#160d82623610db590a64e8ca81784e11117e5a54"
-  integrity sha512-LB2R1Oyhpg8gu4SON/mfforE525+Hi/M1ineICEDftqNVTyFg1aRIeGuTvXAoWHc4nbrFncWtJgMmoyRvuGh7A==
+"@types/node@^14.6.4":
+  version "14.6.4"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.6.4.tgz#a145cc0bb14ef9c4777361b7bbafa5cf8e3acb5a"
+  integrity sha512-Wk7nG1JSaMfMpoMJDKUsWYugliB2Vy55pdjLpmLixeyMi7HizW2I/9QoxsPCkXl3dO+ZOVqPumKaDUv5zJu2uQ==
 
 "@types/qs@*":
   version "6.9.1"
@@ -140,10 +153,10 @@
     "@types/express-serve-static-core" "*"
     "@types/mime" "*"
 
-"@types/shelljs@^0.8.7":
-  version "0.8.7"
-  resolved "https://registry.yarnpkg.com/@types/shelljs/-/shelljs-0.8.7.tgz#a2a606b185165abadf8b7995fea5e326e637088e"
-  integrity sha512-Mg2qGjLIJIieeJ1/NjswAOY9qXDShLeh6JwpD1NZsvUvI0hxdUCNDpnBXv9YQeugKi2EHU+BqkbUE4jpY4GKmQ==
+"@types/shelljs@^0.8.8":
+  version "0.8.8"
+  resolved "https://registry.yarnpkg.com/@types/shelljs/-/shelljs-0.8.8.tgz#e439c69929b88a2c8123c1a55e09eb708315addf"
+  integrity sha512-lD3LWdg6j8r0VRBFahJVaxoW0SIcswxKaFUrmKl33RJVeeoNYQAz4uqCJ5Z6v4oIBOsC5GozX+I5SorIKiTcQA==
   dependencies:
     "@types/glob" "*"
     "@types/node" "*"
@@ -154,10 +167,10 @@
   dependencies:
     "@types/node" "*"
 
-"@types/supertest@^2.0.8":
-  version "2.0.8"
-  resolved "https://registry.yarnpkg.com/@types/supertest/-/supertest-2.0.8.tgz#23801236e2b85204ed771a8e7c40febba7da2bda"
-  integrity sha512-wcax7/ip4XSSJRLbNzEIUVy2xjcBIZZAuSd2vtltQfRK7kxhx5WMHbLHkYdxN3wuQCrwpYrg86/9byDjPXoGMA==
+"@types/supertest@^2.0.10":
+  version "2.0.10"
+  resolved "https://registry.yarnpkg.com/@types/supertest/-/supertest-2.0.10.tgz#630d79b4d82c73e043e43ff777a9ca98d457cab7"
+  integrity sha512-Xt8TbEyZTnD5Xulw95GLMOkmjGICrOQyJ2jqgkSjAUR3mm7pAIzSR0NFBaMcwlzVvlpCjNwbATcWWwjNiZiFrQ==
   dependencies:
     "@types/superagent" "*"
 
@@ -223,6 +236,21 @@ argparse@^1.0.7:
   dependencies:
     sprintf-js "~1.0.2"
 
+arr-diff@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
+  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
+
+arr-flatten@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
+
+arr-union@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
+  integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
+
 array-filter@~0.0.0:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-0.0.1.tgz#7da8cf2e26628ed732803581fd21f67cacd2eeec"
@@ -239,10 +267,25 @@ array-reduce@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/array-reduce/-/array-reduce-0.0.0.tgz#173899d3ffd1c7d9383e4479525dbe278cab5f2b"
 
+array-unique@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
+  integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
+
+assign-symbols@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
+  integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
+
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
 
+atob@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
+  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
+
 balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
@@ -252,6 +295,19 @@ base64-js@^1.0.2:
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"
   integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==
 
+base@^0.11.1:
+  version "0.11.2"
+  resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
+  integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
+  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"
+
 binary-extensions@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.0.0.tgz#23c0df14f6a88077f5f986c0d167ec03c3d5537c"
@@ -303,6 +359,22 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
+braces@^2.3.1:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
+  integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
+  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"
+
 braces@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
@@ -331,6 +403,21 @@ bytes@3.1.0:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
   integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
 
+cache-base@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
+  integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
+  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"
+
 cacheable-request@^6.0.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912"
@@ -344,6 +431,11 @@ cacheable-request@^6.0.0:
     normalize-url "^4.1.0"
     responselike "^1.0.2"
 
+call-me-maybe@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b"
+  integrity sha1-JtII6onje1y95gJQoV8DHBak1ms=
+
 camelcase@^5.3.1:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
@@ -394,6 +486,16 @@ ci-info@^2.0.0:
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
   integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
 
+class-utils@^0.3.5:
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
+  integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
+  dependencies:
+    arr-union "^3.1.0"
+    define-property "^0.2.5"
+    isobject "^3.0.0"
+    static-extend "^0.1.1"
+
 cli-boxes@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.0.tgz#538ecae8f9c6ca508e3c3c95b453fe93cb4c168d"
@@ -406,6 +508,14 @@ clone-response@^1.0.2:
   dependencies:
     mimic-response "^1.0.0"
 
+collection-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
+  integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
+  dependencies:
+    map-visit "^1.0.0"
+    object-visit "^1.0.0"
+
 color-convert@^1.9.0:
   version "1.9.2"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.2.tgz#49881b8fba67df12a96bdf3f56c0aab9e7913147"
@@ -449,6 +559,11 @@ component-emitter@^1.2.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
 
+component-emitter@^1.2.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
+  integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
+
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
@@ -489,6 +604,11 @@ cookiejar@^2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.2.tgz#dd8a235530752f988f9a0844f3fc589e3111125c"
 
+copy-descriptor@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
+  integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
+
 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"
@@ -509,7 +629,7 @@ crypto-random-string@^2.0.0:
   resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5"
   integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==
 
-debug@2.6.9:
+debug@2.6.9, debug@^2.3.3:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   dependencies:
@@ -541,6 +661,11 @@ debug@^4.1.0:
   dependencies:
     ms "^2.1.1"
 
+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"
+  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
+
 decompress-response@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3"
@@ -563,6 +688,28 @@ define-properties@^1.1.2:
   dependencies:
     object-keys "^1.0.12"
 
+define-property@^0.2.5:
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
+  integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
+  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"
+  integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
+  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"
+  integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
+  dependencies:
+    is-descriptor "^1.0.2"
+    isobject "^3.0.1"
+
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
@@ -671,6 +818,19 @@ etag@~1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
 
+expand-brackets@^2.1.4:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
+  integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
+  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"
+
 express@^4.17.1:
   version "4.17.1"
   resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
@@ -707,10 +867,61 @@ express@^4.17.1:
     utils-merge "1.0.1"
     vary "~1.1.2"
 
+extend-shallow@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
+  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
+  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"
+  integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
+  dependencies:
+    assign-symbols "^1.0.0"
+    is-extendable "^1.0.1"
+
 extend@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
 
+extglob@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
+  integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
+  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"
+
+fast-glob@^2.2.6:
+  version "2.2.7"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.7.tgz#6953857c3afa475fff92ee6015d52da70a4cd39d"
+  integrity sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==
+  dependencies:
+    "@mrmlnc/readdir-enhanced" "^2.2.1"
+    "@nodelib/fs.stat" "^1.1.2"
+    glob-parent "^3.1.0"
+    is-glob "^4.0.0"
+    merge2 "^1.2.3"
+    micromatch "^3.1.10"
+
+fill-range@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
+  integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+    to-regex-range "^2.1.0"
+
 fill-range@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
@@ -731,6 +942,11 @@ finalhandler@~1.1.2:
     statuses "~1.5.0"
     unpipe "~1.0.0"
 
+for-in@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
+
 form-data@^2.3.1:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
@@ -757,6 +973,13 @@ forwarded@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
 
+fragment-cache@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
+  integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
+  dependencies:
+    map-cache "^0.2.2"
+
 fresh@0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
@@ -792,6 +1015,19 @@ get-stream@^5.1.0:
   dependencies:
     pump "^3.0.0"
 
+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"
+  integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
+
+glob-parent@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
+  integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
+  dependencies:
+    is-glob "^3.1.0"
+    path-dirname "^1.0.0"
+
 glob-parent@~5.1.0:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229"
@@ -799,6 +1035,11 @@ glob-parent@~5.1.0:
   dependencies:
     is-glob "^4.0.1"
 
+glob-to-regexp@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
+  integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=
+
 glob@^7.0.0, glob@^7.0.5, glob@^7.1.1:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
@@ -810,18 +1051,6 @@ glob@^7.0.0, glob@^7.0.5, glob@^7.1.1:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.1.4:
-  version "7.1.6"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
-  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
-  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"
-
 global-dirs@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-2.0.1.tgz#acdf3bb6685bcd55cb35e8a052266569e9469201"
@@ -859,6 +1088,37 @@ has-flag@^4.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
+has-value@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
+  integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
+  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"
+  integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
+  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"
+  integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
+
+has-values@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
+  integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
+  dependencies:
+    is-number "^3.0.0"
+    kind-of "^4.0.0"
+
 has-yarn@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77"
@@ -958,6 +1218,20 @@ ipaddr.js@1.9.1:
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
   integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
 
+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"
+  integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
+  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"
+  integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
+  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"
@@ -969,6 +1243,11 @@ is-binary-path@~2.1.0:
   dependencies:
     binary-extensions "^2.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"
+  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
+
 is-builtin-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
@@ -986,11 +1265,55 @@ is-ci@^2.0.0:
   dependencies:
     ci-info "^2.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"
+  integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
+  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"
+  integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
+  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-extglob@^2.1.1:
+is-descriptor@^0.1.0:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
+  integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
+  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"
+  integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
+  dependencies:
+    is-accessor-descriptor "^1.0.0"
+    is-data-descriptor "^1.0.0"
+    kind-of "^6.0.2"
+
+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"
+  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
+
+is-extendable@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
+  integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
+  dependencies:
+    is-plain-object "^2.0.4"
+
+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"
 
@@ -1003,7 +1326,14 @@ is-fullwidth-code-point@^3.0.0:
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
-is-glob@^4.0.1, is-glob@~4.0.1:
+is-glob@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
+  integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
+  dependencies:
+    is-extglob "^2.1.0"
+
+is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
   integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
@@ -1023,6 +1353,13 @@ is-npm@^4.0.0:
   resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-4.0.0.tgz#c90dd8380696df87a7a6d823c20d0b12bbe3c84d"
   integrity sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig==
 
+is-number@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+  integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
+  dependencies:
+    kind-of "^3.0.2"
+
 is-number@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
@@ -1038,6 +1375,13 @@ is-path-inside@^3.0.1:
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.2.tgz#f5220fc82a3e233757291dddc9c5877f2a1f3017"
   integrity sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg==
 
+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"
+  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
+  dependencies:
+    isobject "^3.0.1"
+
 is-regex@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
@@ -1053,12 +1397,17 @@ is-typedarray@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
 
+is-windows@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
+
 is-yarn-global@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232"
   integrity sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==
 
-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"
 
@@ -1066,18 +1415,30 @@ isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
 
-jasmine-core@~3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.5.0.tgz#132c23e645af96d85c8bca13c8758b18429fc1e4"
-  integrity sha512-nCeAiw37MIMA9w9IXso7bRaLl+c/ef3wnxsoSAlYrzS+Ot0zTG6nU8G/cIfGkqpkjX2wNaIW9RFG0TwIFnG6bA==
+isobject@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
+  dependencies:
+    isarray "1.0.0"
 
-jasmine@^3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-3.5.0.tgz#7101eabfd043a1fc82ac24e0ab6ec56081357f9e"
-  integrity sha512-DYypSryORqzsGoMazemIHUfMkXM7I7easFaxAvNM3Mr6Xz3Fy36TupTrAOxZWN8MVKEU5xECv22J4tUQf3uBzQ==
+isobject@^3.0.0, isobject@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
+  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
+
+jasmine-core@~3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.6.0.tgz#491f3bb23941799c353ceb7a45b38a950ebc5a20"
+  integrity sha512-8uQYa7zJN8hq9z+g8z1bqCfdC8eoDAeVnM5sfqs7KHv9/ifoJ500m018fpFc7RDaO6SWCLCXwo/wPSNcdYTgcw==
+
+jasmine@^3.6.1:
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-3.6.1.tgz#a20456b309a669b547a3c24bb2120f16f70cfc65"
+  integrity sha512-Jqp8P6ZWkTVFGmJwBK46p+kJNrZCdqkQ4GL+PGuBXZwK1fM4ST9BizkYgIwCFqYYqnTizAy6+XG2Ej5dFrej9Q==
   dependencies:
-    glob "^7.1.4"
-    jasmine-core "~3.5.0"
+    fast-glob "^2.2.6"
+    jasmine-core "~3.6.0"
 
 js-tokens@^4.0.0:
   version "4.0.0"
@@ -1116,6 +1477,30 @@ keyv@^3.0.0:
   dependencies:
     json-buffer "3.0.0"
 
+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"
+  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
+  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"
+  integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
+  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"
+  integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
+
+kind-of@^6.0.0, kind-of@^6.0.2:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
+  integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
+
 latest-version@^5.0.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face"
@@ -1132,6 +1517,11 @@ load-json-file@^4.0.0:
     pify "^3.0.0"
     strip-bom "^3.0.0"
 
+lodash.set@^4.3.2:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/lodash.set/-/lodash.set-4.3.2.tgz#d8757b1da807dde24816b0d6a84bea1a76230b23"
+  integrity sha1-2HV7HagH3eJIFrDWqEvqGnYjCyM=
+
 lodash@^4.17.13:
   version "4.17.15"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
@@ -1158,6 +1548,18 @@ make-dir@^3.0.0:
   dependencies:
     semver "^6.0.0"
 
+map-cache@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
+  integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
+
+map-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
+  integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
+  dependencies:
+    object-visit "^1.0.0"
+
 media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
@@ -1170,10 +1572,34 @@ merge-descriptors@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
 
+merge2@^1.2.3:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
+  integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
+
 methods@^1.1.1, methods@^1.1.2, methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
 
+micromatch@^3.1.10:
+  version "3.1.10"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
+  integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
+  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.44.0:
   version "1.44.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"
@@ -1220,6 +1646,14 @@ minimist@^1.2.5:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
   integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
 
+mixin-deep@^1.2.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
+  integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
+  dependencies:
+    for-in "^1.0.2"
+    is-extendable "^1.0.1"
+
 mkdirp@^0.5.3:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
@@ -1241,6 +1675,23 @@ ms@^2.1.1:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
+nanomatch@^1.2.9:
+  version "1.2.13"
+  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
+  integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
+  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"
+
 negotiator@0.6.2:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
@@ -1250,7 +1701,7 @@ nice-try@^1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
 
-nock@*, nock@^12.0.3:
+nock@*:
   version "12.0.3"
   resolved "https://registry.yarnpkg.com/nock/-/nock-12.0.3.tgz#83f25076dbc4c9aa82b5cdf54c9604c7a778d1c9"
   integrity sha512-QNb/j8kbFnKCiyqi9C5DD0jH/FubFGj5rt9NQFONXwQm3IPB0CULECg/eS3AU1KgZb/6SwUa4/DTRKhVxkGABw==
@@ -1260,15 +1711,25 @@ nock@*, nock@^12.0.3:
     lodash "^4.17.13"
     propagate "^2.0.0"
 
-node-fetch@^2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
-  integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==
+nock@^13.0.4:
+  version "13.0.4"
+  resolved "https://registry.yarnpkg.com/nock/-/nock-13.0.4.tgz#9fb74db35d0aa056322e3c45be14b99105cd7510"
+  integrity sha512-alqTV8Qt7TUbc74x1pKRLSENzfjp4nywovcJgi/1aXDiUxXdt7TkruSTF5MDWPP7UoPVgea4F9ghVdmX0xxnSA==
+  dependencies:
+    debug "^4.1.0"
+    json-stringify-safe "^5.0.1"
+    lodash.set "^4.3.2"
+    propagate "^2.0.0"
+
+node-fetch@^2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
+  integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
 
-nodemon@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-2.0.3.tgz#e9c64df8740ceaef1cb00e1f3da57c0a93ef3714"
-  integrity sha512-lLQLPS90Lqwc99IHe0U94rDgvjo+G9I4uEIxRG3evSLROcqQ9hwc0AxlSHKS4T1JW/IMj/7N5mthiN58NL/5kw==
+nodemon@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-2.0.4.tgz#55b09319eb488d6394aa9818148c0c2d1c04c416"
+  integrity sha512-Ltced+hIfTmaS28Zjv1BM552oQ3dbwPqI4+zI0SLgq+wpJhSyqgYude/aZa/3i31VCQWMfXJVxvu86abcam3uQ==
   dependencies:
     chokidar "^3.2.2"
     debug "^3.2.6"
@@ -1321,10 +1782,33 @@ npm-run-all@^4.1.5:
     shell-quote "^1.6.1"
     string.prototype.padend "^3.0.0"
 
+object-copy@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
+  integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
+  dependencies:
+    copy-descriptor "^0.1.0"
+    define-property "^0.2.5"
+    kind-of "^3.0.3"
+
 object-keys@^1.0.12:
   version "1.0.12"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.12.tgz#09c53855377575310cca62f55bb334abff7b3ed2"
 
+object-visit@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
+  integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
+  dependencies:
+    isobject "^3.0.0"
+
+object.pick@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
+  integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
+  dependencies:
+    isobject "^3.0.1"
+
 on-finished@~2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
@@ -1364,6 +1848,16 @@ parseurl@~1.3.3:
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
   integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
 
+pascalcase@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
+  integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
+
+path-dirname@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
+  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
+
 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"
@@ -1405,6 +1899,11 @@ pify@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
 
+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"
+  integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
+
 prepend-http@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
@@ -1525,6 +2024,14 @@ rechoir@^0.6.2:
   dependencies:
     resolve "^1.1.6"
 
+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"
+  integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
+  dependencies:
+    extend-shallow "^3.0.2"
+    safe-regex "^1.1.0"
+
 registry-auth-token@^4.0.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.1.1.tgz#40a33be1e82539460f94328b0f7f0f84c16d9479"
@@ -1539,6 +2046,21 @@ registry-url@^5.0.0:
   dependencies:
     rc "^1.2.8"
 
+repeat-element@^1.1.2:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
+  integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
+
+repeat-string@^1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
+
+resolve-url@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
+  integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
+
 resolve@^1.1.6:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.3.3.tgz#655907c3469a8680dc2de3a275a8fdd69691f0e5"
@@ -1558,6 +2080,11 @@ responselike@^1.0.2:
   dependencies:
     lowercase-keys "^1.0.0"
 
+ret@~0.1.10:
+  version "0.1.15"
+  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+  integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
+
 rimraf@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d"
@@ -1579,6 +2106,13 @@ safe-buffer@~5.2.0:
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519"
   integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==
 
+safe-regex@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+  integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
+  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"
@@ -1641,6 +2175,16 @@ serve-static@1.14.1:
     parseurl "~1.3.3"
     send "0.17.1"
 
+set-value@^2.0.0, set-value@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
+  integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-extendable "^0.1.1"
+    is-plain-object "^2.0.3"
+    split-string "^3.0.1"
+
 setprototypeof@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
@@ -1679,6 +2223,47 @@ signal-exit@^3.0.2:
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
   integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
 
+snapdragon-node@^2.0.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
+  integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
+  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"
+  integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
+  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"
+  integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==
+  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"
+
+source-map-resolve@^0.5.0:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
+  integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==
+  dependencies:
+    atob "^2.1.2"
+    decode-uri-component "^0.2.0"
+    resolve-url "^0.2.1"
+    source-map-url "^0.4.0"
+    urix "^0.1.0"
+
 source-map-support@^0.5.19:
   version "0.5.19"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
@@ -1687,6 +2272,16 @@ source-map-support@^0.5.19:
     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"
+  integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
+
+source-map@^0.5.6:
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
+
 source-map@^0.6.0:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
@@ -1713,10 +2308,25 @@ 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"
+  resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
+  integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
+  dependencies:
+    extend-shallow "^3.0.0"
+
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
 
+static-extend@^0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
+  integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
+  dependencies:
+    define-property "^0.2.5"
+    object-copy "^0.1.0"
+
 "statuses@>= 1.5.0 < 2", statuses@~1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
@@ -1822,10 +2432,10 @@ supports-color@^7.1.0:
   dependencies:
     has-flag "^4.0.0"
 
-tar-stream@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.2.tgz#6d5ef1a7e5783a95ff70b69b97455a5968dc1325"
-  integrity sha512-UaF6FoJ32WqALZGOIAApXx+OdxhekNMChu6axLJR85zMMjXKWFGjbIRe+J6P4UnRGg9rAwWvbTT0oI7hD/Un7Q==
+tar-stream@^2.1.3:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.3.tgz#1e2022559221b7866161660f118255e20fa79e41"
+  integrity sha512-Z9yri56Dih8IaK8gncVPx4Wqt86NDmQTSh49XLZgjWpGZL9GK9HKParS2scqHCC4w6X9Gh2jwaU45V47XTKwVA==
   dependencies:
     bl "^4.0.1"
     end-of-stream "^1.4.1"
@@ -1838,11 +2448,26 @@ term-size@^2.1.0:
   resolved "https://registry.yarnpkg.com/term-size/-/term-size-2.2.0.tgz#1f16adedfe9bdc18800e1776821734086fcc6753"
   integrity sha512-a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw==
 
+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"
+  integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
+  dependencies:
+    kind-of "^3.0.2"
+
 to-readable-stream@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771"
   integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==
 
+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"
+  integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
+  dependencies:
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+
 to-regex-range@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
@@ -1850,6 +2475,16 @@ to-regex-range@^5.0.1:
   dependencies:
     is-number "^7.0.0"
 
+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"
+  integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
+  dependencies:
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    regex-not "^1.0.2"
+    safe-regex "^1.1.0"
+
 toidentifier@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
@@ -1861,15 +2496,20 @@ touch@^3.1.0:
   dependencies:
     nopt "~1.0.10"
 
-tslib@^1.10.0, tslib@^1.11.1:
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35"
-  integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==
+tslib@^1.13.0:
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043"
+  integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==
 
 tslib@^1.8.1:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
 
+tslib@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.1.tgz#410eb0d113e5b6356490eec749603725b021b43e"
+  integrity sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ==
+
 tslint-jasmine-noSkipOrFocus@^1.0.9:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/tslint-jasmine-noSkipOrFocus/-/tslint-jasmine-noSkipOrFocus-1.0.9.tgz#a562d3a6b3aa5c51e5ad29211a6eeb06ad1a082f"
@@ -1877,10 +2517,10 @@ tslint-jasmine-noSkipOrFocus@^1.0.9:
   dependencies:
     rimraf "^2.6.1"
 
-tslint@^6.1.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/tslint/-/tslint-6.1.1.tgz#ac03fbd17f85bfefaae348b353b25a88efe10cde"
-  integrity sha512-kd6AQ/IgPRpLn6g5TozqzPdGNZ0q0jtXW4//hRcj10qLYBaa3mTUU2y2MCG+RXZm8Zx+KZi0eA+YCrMyNlF4UA==
+tslint@^6.1.3:
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/tslint/-/tslint-6.1.3.tgz#5c23b2eccc32487d5523bd3a470e9aa31789d904"
+  integrity sha512-IbR4nkT96EQOvKE2PW/djGz8iGNeJ4rF2mBfiYaR/nvUWYKJhLwimoJKgjIFEIDibBtOevj7BqCRL4oHeWWUCg==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     builtin-modules "^1.1.1"
@@ -1893,7 +2533,7 @@ tslint@^6.1.1:
     mkdirp "^0.5.3"
     resolve "^1.3.2"
     semver "^5.3.0"
-    tslib "^1.10.0"
+    tslib "^1.13.0"
     tsutils "^2.29.0"
 
 tsutils@^2.29.0:
@@ -1923,10 +2563,10 @@ typedarray-to-buffer@^3.1.5:
   dependencies:
     is-typedarray "^1.0.0"
 
-typescript@^3.8.3:
-  version "3.8.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz#409eb8544ea0335711205869ec458ab109ee1061"
-  integrity sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==
+typescript@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.2.tgz#7ea7c88777c723c681e33bf7988be5d008d05ac2"
+  integrity sha512-e4ERvRV2wb+rRZ/IQeb3jm2VxBsirQLpQhdxplZ2MEzGvDkkMmPglecnNDfSUBivMjP93vRbngYYDQqQ/78bcQ==
 
 undefsafe@^2.0.2:
   version "2.0.2"
@@ -1934,6 +2574,16 @@ undefsafe@^2.0.2:
   dependencies:
     debug "^2.2.0"
 
+union-value@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
+  integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==
+  dependencies:
+    arr-union "^3.1.0"
+    get-value "^2.0.6"
+    is-extendable "^0.1.1"
+    set-value "^2.0.1"
+
 unique-string@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d"
@@ -1945,6 +2595,14 @@ 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"
+  integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
+  dependencies:
+    has-value "^0.3.1"
+    isobject "^3.0.0"
+
 update-notifier@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-4.1.0.tgz#4866b98c3bc5b5473c020b1250583628f9a328f3"
@@ -1964,6 +2622,11 @@ update-notifier@^4.0.0:
     semver-diff "^3.1.1"
     xdg-basedir "^4.0.0"
 
+urix@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
+  integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
+
 url-parse-lax@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c"
@@ -1971,6 +2634,11 @@ url-parse-lax@^3.0.0:
   dependencies:
     prepend-http "^2.0.0"
 
+use@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
+  integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
+
 util-deprecate@^1.0.1, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
diff --git a/aio/aio-builds-setup/docs/image-config--environment-variables.md b/aio/aio-builds-setup/docs/image-config--environment-variables.md
index 43ba7e70a542b..8d380ff70d108 100644
--- a/aio/aio-builds-setup/docs/image-config--environment-variables.md
+++ b/aio/aio-builds-setup/docs/image-config--environment-variables.md
@@ -22,7 +22,7 @@ you don't need to specify values for those.
   The domain name of the server.
 
 - `AIO_GITHUB_ORGANIZATION`:
-  The GitHub organization whose teams are whitelisted for accepting build artifacts.
+  The GitHub organization whose teams are trusted for accepting build artifacts.
   See also `AIO_GITHUB_TEAM_SLUGS`.
 
 - `AIO_GITHUB_REPO`:
diff --git a/aio/aio-builds-setup/docs/overview--security-model.md b/aio/aio-builds-setup/docs/overview--security-model.md
index 453ad412b9ff1..c26f2c1a3568b 100644
--- a/aio/aio-builds-setup/docs/overview--security-model.md
+++ b/aio/aio-builds-setup/docs/overview--security-model.md
@@ -98,7 +98,7 @@ This section describes how each of the aforementioned sub-tasks is accomplished:
       Such a label can only have been added by a maintainer (with the necessary rights) and
       designates that they have manually verified the PR contents.
    2. We can verify (again using the GitHub API) the author's membership in one of the
-      whitelisted/trusted GitHub teams. For this operation, we need a Personal Access Token with the
+      trusted GitHub teams. For this operation, we need a Personal Access Token with the
       `read:org` scope issued by a user that can "see" the specified GitHub organization.
       Here too, we use the token by @mary-poppins.
 
diff --git a/aio/content/examples/.gitignore b/aio/content/examples/.gitignore
index 75300b0bdd5d0..6d98f0cc41e0a 100644
--- a/aio/content/examples/.gitignore
+++ b/aio/content/examples/.gitignore
@@ -17,6 +17,7 @@
 **/e2e/tsconfig.e2e.json
 **/src/karma.conf.js
 **/.angular-cli.json
+**/.browserslistrc
 **/.editorconfig
 **/.gitignore
 **/angular.json
@@ -30,8 +31,9 @@
 **/tslint.json
 **/karma-test-shim.js
 **/browser-test-shim.js
-**/browserslist
 **/node_modules
+**/yarn.lock
+**/package-lock.json
 
 # built files
 *.map
diff --git a/aio/content/examples/accessibility/e2e/src/app.e2e-spec.ts b/aio/content/examples/accessibility/e2e/src/app.e2e-spec.ts
index f1bf72fb8f522..7da554198d197 100644
--- a/aio/content/examples/accessibility/e2e/src/app.e2e-spec.ts
+++ b/aio/content/examples/accessibility/e2e/src/app.e2e-spec.ts
@@ -12,7 +12,7 @@ describe('Accessibility example e2e tests', () => {
 
   it('should take a number and change progressbar width', () => {
     element(by.css('input')).sendKeys('16');
-    expect(element(by.css('input')).getAttribute('value')).toEqual('016');
+    expect(element(by.css('input')).getAttribute('value')).toEqual('16');
     expect(element(by.css('app-example-progressbar div')).getCssValue('width')).toBe('48px');
   });
 
diff --git a/aio/content/examples/accessibility/src/app/app.component.html b/aio/content/examples/accessibility/src/app/app.component.html
index 4869298570260..eac0b319c10f6 100755
--- a/aio/content/examples/accessibility/src/app/app.component.html
+++ b/aio/content/examples/accessibility/src/app/app.component.html
@@ -3,7 +3,7 @@ <h1>Accessibility Example</h1>
 <label>
   Enter an example progress value
   <input type="number" min="0" max="100"
-      [value]="progress" (input)="progress = $event.target.value">
+      [value]="progress" (input)="setProgress($event)">
 </label>
 
 <!-- The user of the progressbar sets an aria-label to communicate what the progress means. -->
diff --git a/aio/content/examples/accessibility/src/app/app.component.ts b/aio/content/examples/accessibility/src/app/app.component.ts
index dd635acc9c14a..d9e6d230c9d16 100755
--- a/aio/content/examples/accessibility/src/app/app.component.ts
+++ b/aio/content/examples/accessibility/src/app/app.component.ts
@@ -7,4 +7,8 @@ import { Component } from '@angular/core';
 })
 export class AppComponent  {
   progress = 0;
+
+  setProgress($event: Event) {
+    this.progress = +($event.target as HTMLInputElement).value;
+  }
 }
diff --git a/aio/content/examples/attribute-binding/src/app/app.component.html b/aio/content/examples/attribute-binding/src/app/app.component.html
index 69f82857fdb43..7514b871c1cb7 100644
--- a/aio/content/examples/attribute-binding/src/app/app.component.html
+++ b/aio/content/examples/attribute-binding/src/app/app.component.html
@@ -3,8 +3,10 @@ <h1>Attribute, class, and style bindings</h1>
 <h2>Attribute binding</h2>
 <!-- #docregion attrib-binding-colspan -->
 <table border=1>
+  <!-- #docregion colspan -->
   <!--  expression calculates colspan=2 -->
   <tr><td [attr.colspan]="1 + 1">One-Two</td></tr>
+  <!-- #enddocregion colspan -->
 
   <!-- ERROR: There is no `colspan` property to set!
     <tr><td colspan="{{1 + 1}}">Three-Four</td></tr>
@@ -32,31 +34,31 @@ <h2>Styling precedence</h2>
 <!-- #docregion basic-specificity -->
 <h3>Basic specificity</h3>
 
-<!-- The `class.special` binding will override any value for the `special` class in `classExpr`.  -->
-<div [class.special]="isSpecial" [class]="classExpr">Some text.</div>
+<!-- The `class.special` binding overrides any value for the `special` class in `classExpression`.  -->
+<div [class.special]="isSpecial" [class]="classExpression">Some text.</div>
 
-<!-- The `style.color` binding will override any value for the `color` property in `styleExpr`.  -->
-<div [style.color]="color" [style]="styleExpr">Some text.</div>
+<!-- The `style.color` binding overrides any value for the `color` property in `styleExpression`.  -->
+<div [style.color]="color" [style]="styleExpression">Some text.</div>
 <!-- #enddocregion basic-specificity -->
 
 <!-- #docregion source-specificity -->
 <h3>Source specificity</h3>
 
-<!-- The `class.special` template binding will override any host binding to the `special` class set by `dirWithClassBinding` or `comp-with-host-binding`.-->
+<!-- The `class.special` template binding overrides any host binding to the `special` class set by `dirWithClassBinding` or `comp-with-host-binding`.-->
 <comp-with-host-binding [class.special]="isSpecial" dirWithClassBinding>Some text.</comp-with-host-binding>
 
-<!-- The `style.color` template binding will override any host binding to the `color` property set by `dirWithStyleBinding` or `comp-with-host-binding`. -->
+<!-- The `style.color` template binding overrides any host binding to the `color` property set by `dirWithStyleBinding` or `comp-with-host-binding`. -->
 <comp-with-host-binding [style.color]="color" dirWithStyleBinding>Some text.</comp-with-host-binding>
 <!-- #enddocregion source-specificity -->
 
 <!-- #docregion dynamic-priority -->
 <h3>Dynamic vs static</h3>
 
-<!-- If `classExpr` has a value for the `special` class, this value will override the `class="special"` below -->
-<div class="special" [class]="classExpr">Some text.</div>
+<!-- If `classExpression` has a value for the `special` class, this value overrides the `class="special"` below -->
+<div class="special" [class]="classExpression">Some text.</div>
 
-<!-- If `styleExpr` has a value for the `color` property, this value will override the `style="color: blue"` below -->
-<div style="color: blue" [style]="styleExpr">Some text.</div>
+<!-- If `styleExpression` has a value for the `color` property, this value overrides the `style="color: blue"` below -->
+<div style="color: blue" [style]="styleExpression">Some text.</div>
 
 <!-- #enddocregion dynamic-priority -->
 
diff --git a/aio/content/examples/attribute-binding/src/app/app.component.ts b/aio/content/examples/attribute-binding/src/app/app.component.ts
index ab35bb09a02f7..57c9f28718cb8 100644
--- a/aio/content/examples/attribute-binding/src/app/app.component.ts
+++ b/aio/content/examples/attribute-binding/src/app/app.component.ts
@@ -9,7 +9,7 @@ export class AppComponent {
   actionName = 'Go for it';
   isSpecial = true;
   canSave = true;
-  classExpr = 'special clearance';
-  styleExpr = 'color: red';
+  classExpression = 'special clearance';
+  styleExpression = 'color: red';
   color = 'blue';
 }
diff --git a/aio/content/examples/attribute-binding/src/app/comp-with-host-binding.component.ts b/aio/content/examples/attribute-binding/src/app/comp-with-host-binding.component.ts
index b93c478f6b2ff..b604e44454b74 100644
--- a/aio/content/examples/attribute-binding/src/app/comp-with-host-binding.component.ts
+++ b/aio/content/examples/attribute-binding/src/app/comp-with-host-binding.component.ts
@@ -11,6 +11,9 @@ export class CompWithHostBindingComponent {
   @HostBinding('style.color')
   color = 'green';
 
+  // #docregion hostbinding
   @HostBinding('style.width')
   width = '200px';
+  // #enddocregion hostbinding
+
 }
diff --git a/aio/content/examples/bootstrapping/src/app/app.module.ts b/aio/content/examples/bootstrapping/src/app/app.module.ts
index 9b8a4fcaef0b2..3059978a826e9 100644
--- a/aio/content/examples/bootstrapping/src/app/app.module.ts
+++ b/aio/content/examples/bootstrapping/src/app/app.module.ts
@@ -21,11 +21,13 @@ import { ItemDirective } from './item.directive';
     ItemDirective
   ],
   // #enddocregion declarations
+  // #docregion imports
   imports: [
     BrowserModule,
     FormsModule,
     HttpClientModule
   ],
+  // #enddocregion imports
   providers: [],
   bootstrap: [AppComponent]
 })
diff --git a/aio/content/examples/comparing-observables/e2e/src/app.e2e-spec.ts b/aio/content/examples/comparing-observables/e2e/src/app.e2e-spec.ts
new file mode 100644
index 0000000000000..ac89f882d0a62
--- /dev/null
+++ b/aio/content/examples/comparing-observables/e2e/src/app.e2e-spec.ts
@@ -0,0 +1,9 @@
+/*
+ * This example project is special in that it is not a cli app. To run tests appropriate for this
+ * project, the test command is overwritten in `aio/content/examples/observables/example-config.json`.
+ *
+ * This is an empty placeholder file to ensure that `aio/tools/examples/run-example-e2e.js` runs
+ * tests for this project.
+ *
+ * TODO: Fix our infrastructure/tooling, so that this hack is not necessary.
+ */
diff --git a/aio/content/examples/comparing-observables/example-config.json b/aio/content/examples/comparing-observables/example-config.json
new file mode 100644
index 0000000000000..3aa2059b4d004
--- /dev/null
+++ b/aio/content/examples/comparing-observables/example-config.json
@@ -0,0 +1,12 @@
+{
+  "tests": [
+    {
+      "cmd": "yarn",
+      "args": ["tsc", "--project", "tsconfig.spec.json", "--module", "commonjs"]
+    },
+    {
+      "cmd": "yarn",
+      "args": ["jasmine", "out-tsc/**/*.spec.js"]
+    }
+  ]
+}
diff --git a/aio/content/examples/comparing-observables/src/observables.spec.ts b/aio/content/examples/comparing-observables/src/observables.spec.ts
new file mode 100644
index 0000000000000..e27ee9ced1a20
--- /dev/null
+++ b/aio/content/examples/comparing-observables/src/observables.spec.ts
@@ -0,0 +1,26 @@
+import { docRegionChain, docRegionObservable, docRegionUnsubscribe } from './observables';
+
+describe('observables', () => {
+  it('should print 2', (doneFn: DoneFn) => {
+    const consoleLogSpy = spyOn(console, 'log');
+    const observable = docRegionObservable(console);
+    observable.subscribe(() => {
+      expect(consoleLogSpy).toHaveBeenCalledTimes(1);
+      expect(consoleLogSpy).toHaveBeenCalledWith(2);
+      doneFn();
+    });
+  });
+
+  it('should close the subscription', () => {
+    const subscription = docRegionUnsubscribe();
+    expect(subscription.closed).toBeTruthy();
+  });
+
+  it('should chain an observable', (doneFn: DoneFn) => {
+    const observable = docRegionChain();
+    observable.subscribe(value => {
+      expect(value).toBe(4);
+      doneFn();
+    });
+  });
+});
diff --git a/aio/content/examples/comparing-observables/src/observables.ts b/aio/content/examples/comparing-observables/src/observables.ts
index f0e8c1a138f87..ffa1777279180 100644
--- a/aio/content/examples/comparing-observables/src/observables.ts
+++ b/aio/content/examples/comparing-observables/src/observables.ts
@@ -1,40 +1,72 @@
-import { map } from 'rxjs/operators';
+// #docplaster
+
 import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
 
-// #docregion observable
+export function docRegionObservable(console: Console) {
+  // #docregion observable
 
-// declare a publishing operation
-const observable = new Observable<number>(observer => {
-  // Subscriber fn...
-});
+  // declare a publishing operation
+  const observable = new Observable<number>(observer => {
+    // Subscriber fn...
+    // #enddocregion observable
+    // The below code is used for unit testing only
+    observer.next(2);
+    // #docregion observable
+  });
 
-// initiate execution
-observable.subscribe(() => {
-  // observer handles notifications
-});
+  // initiate execution
+  observable.subscribe(value => {
+    // observer handles notifications
+    // #enddocregion observable
+    // The below code is used for unit testing only
+    console.log(value);
+    // #docregion observable
+  });
 
-// #enddocregion observable
+  // #enddocregion observable
+  return observable;
+}
 
-// #docregion unsubscribe
+export function docRegionUnsubscribe() {
+  const observable = new Observable<number>(() => {
+    // Subscriber fn...
+  });
+  // #docregion unsubscribe
 
-const subscription = observable.subscribe(() => {
-  // observer handles notifications
-});
+  const subscription = observable.subscribe(() => {
+    // observer handles notifications
+  });
 
-subscription.unsubscribe();
+  subscription.unsubscribe();
 
-// #enddocregion unsubscribe
+  // #enddocregion unsubscribe
+  return subscription;
+}
 
-// #docregion error
+export function docRegionError() {
+  const observable = new Observable<number>(() => {
+    // Subscriber fn...
+  });
 
-observable.subscribe(() => {
-  throw Error('my error');
-});
+  // #docregion error
+  observable.subscribe(() => {
+    throw new Error('my error');
+  });
+  // #enddocregion error
+}
 
-// #enddocregion error
+export function docRegionChain() {
+  let observable = new Observable<number>(observer => {
+    // Subscriber fn...
+    observer.next(2);
+  });
 
-// #docregion chain
+  observable =
+  // #docregion chain
 
-observable.pipe(map(v => 2 * v));
+  observable.pipe(map(v => 2 * v));
 
-// #enddocregion chain
+  // #enddocregion chain
+  return observable;
+}
diff --git a/aio/content/examples/comparing-observables/src/promises.spec.ts b/aio/content/examples/comparing-observables/src/promises.spec.ts
new file mode 100644
index 0000000000000..9d10092f1dc23
--- /dev/null
+++ b/aio/content/examples/comparing-observables/src/promises.spec.ts
@@ -0,0 +1,23 @@
+import { docRegionError, docRegionPromise } from './promises';
+
+describe('promises', () => {
+  it('should print 2', (doneFn: DoneFn) => {
+    const consoleLogSpy = spyOn(console, 'log');
+    const pr = docRegionPromise(console, 2);
+    pr.then((value) => {
+      expect(consoleLogSpy).toHaveBeenCalledTimes(1);
+      expect(consoleLogSpy).toHaveBeenCalledWith(2);
+      expect(value).toBe(4);
+      doneFn();
+    });
+  });
+
+  it('should throw an error', (doneFn: DoneFn) => {
+    const promise = docRegionError();
+    promise
+      .then(() => {
+        throw new Error('Promise should be rejected.');
+      },
+        () => doneFn());
+  });
+});
diff --git a/aio/content/examples/comparing-observables/src/promises.ts b/aio/content/examples/comparing-observables/src/promises.ts
index 0ad68d99dafa4..d24bba12ae4f6 100644
--- a/aio/content/examples/comparing-observables/src/promises.ts
+++ b/aio/content/examples/comparing-observables/src/promises.ts
@@ -1,25 +1,44 @@
-// #docregion promise
-// initiate execution
-const promise = new Promise<number>((resolve, reject) => {
-  // Executer fn...
-});
-
-promise.then(value => {
-  // handle result here
-});
-
-// #enddocregion promise
-
-// #docregion chain
-
-promise.then(v => 2 * v);
-
-// #enddocregion chain
-
-// #docregion error
-
-promise.then(() => {
-  throw Error('my error');
-});
-
-// #enddocregion error
+// #docplaster
+
+export function docRegionPromise(console: Console, inputValue: number) {
+  // #docregion promise
+  // initiate execution
+  let promise = new Promise<number>((resolve, reject) => {
+    // Executer fn...
+    // #enddocregion promise
+    // The below is used in the unit tests.
+    resolve(inputValue);
+    // #docregion promise
+  });
+  // #enddocregion promise
+  promise =
+  // #docregion promise
+  promise.then(value => {
+    // handle result here
+    // #enddocregion promise
+    // The below is used in the unit tests.
+    console.log(value);
+    return value;
+    // #docregion promise
+  });
+  // #enddocregion promise
+  promise =
+  // #docregion chain
+  promise.then(v => 2 * v);
+  // #enddocregion chain
+
+  return promise;
+}
+
+export function docRegionError() {
+  let promise = Promise.resolve();
+  promise =
+  // #docregion error
+
+  promise.then(() => {
+    throw new Error('my error');
+  });
+
+  // #enddocregion error
+  return promise;
+}
diff --git a/aio/content/examples/component-interaction/e2e/src/app.e2e-spec.ts b/aio/content/examples/component-interaction/e2e/src/app.e2e-spec.ts
index 903691f898312..d5727cc70c64a 100644
--- a/aio/content/examples/component-interaction/e2e/src/app.e2e-spec.ts
+++ b/aio/content/examples/component-interaction/e2e/src/app.e2e-spec.ts
@@ -1,12 +1,8 @@
-import { browser, element, by } from 'protractor';
+import { browser, by, element } from 'protractor';
 
 describe('Component Communication Cookbook Tests', () => {
 
-  // Note: '?e2e' which app can read to know it is running in protractor
-  // e.g. `if (!/e2e/.test(location.search)) { ...`
-  beforeAll(() => {
-    browser.get('?e2e');
-  });
+  beforeEach(() => browser.get(browser.baseUrl));
 
   describe('Parent-to-child communication', () => {
     // #docregion parent-to-child
@@ -15,7 +11,7 @@ describe('Component Communication Cookbook Tests', () => {
     const masterName = 'Master';
 
     it('should pass properties to children properly', () => {
-      const parent = element.all(by.tagName('app-hero-parent')).get(0);
+      const parent = element(by.tagName('app-hero-parent'));
       const heroes = parent.all(by.tagName('app-hero-child'));
 
       for (let i = 0; i < heroNames.length; i++) {
@@ -35,7 +31,7 @@ describe('Component Communication Cookbook Tests', () => {
     it('should display trimmed, non-empty names', () => {
       const nonEmptyNameIndex = 0;
       const nonEmptyName = '"Dr IQ"';
-      const parent = element.all(by.tagName('app-name-parent')).get(0);
+      const parent = element(by.tagName('app-name-parent'));
       const hero = parent.all(by.tagName('app-name-child')).get(nonEmptyNameIndex);
 
       const displayName = hero.element(by.tagName('h3')).getText();
@@ -45,7 +41,7 @@ describe('Component Communication Cookbook Tests', () => {
     it('should replace empty name with default name', () => {
       const emptyNameIndex = 1;
       const defaultName = '"<no name set>"';
-      const parent = element.all(by.tagName('app-name-parent')).get(0);
+      const parent = element(by.tagName('app-name-parent'));
       const hero = parent.all(by.tagName('app-name-child')).get(emptyNameIndex);
 
       const displayName = hero.element(by.tagName('h3')).getText();
@@ -70,38 +66,36 @@ describe('Component Communication Cookbook Tests', () => {
       expect(actual.logs.get(0).getText()).toBe(initialLog);
     });
 
-    it('should set expected values after clicking \'Minor\' twice', () => {
+    it('should set expected values after clicking \'Minor\' twice', async () => {
       const repoTag = element(by.tagName('app-version-parent'));
       const newMinorButton = repoTag.all(by.tagName('button')).get(0);
 
-      newMinorButton.click().then(() => {
-        newMinorButton.click().then(() => {
-          const actual = getActual();
+      await newMinorButton.click();
+      await newMinorButton.click();
+
+      const actual = getActual();
 
-          const labelAfter2Minor = 'Version 1.25';
-          const logAfter2Minor = 'minor changed from 24 to 25';
+      const labelAfter2Minor = 'Version 1.25';
+      const logAfter2Minor = 'minor changed from 24 to 25';
 
-          expect(actual.label).toBe(labelAfter2Minor);
-          expect(actual.count).toBe(3);
-          expect(actual.logs.get(2).getText()).toBe(logAfter2Minor);
-        });
-      });
+      expect(actual.label).toBe(labelAfter2Minor);
+      expect(actual.count).toBe(3);
+      expect(actual.logs.get(2).getText()).toBe(logAfter2Minor);
     });
 
-    it('should set expected values after clicking \'Major\' once', () => {
+    it('should set expected values after clicking \'Major\' once', async () => {
       const repoTag = element(by.tagName('app-version-parent'));
       const newMajorButton = repoTag.all(by.tagName('button')).get(1);
 
-      newMajorButton.click().then(() => {
-        const actual = getActual();
+      await newMajorButton.click();
+      const actual = getActual();
 
-        const labelAfterMajor = 'Version 2.0';
-        const logAfterMajor = 'major changed from 1 to 2, minor changed from 25 to 0';
+      const labelAfterMajor = 'Version 2.0';
+      const logAfterMajor = 'major changed from 1 to 2, minor changed from 23 to 0';
 
-        expect(actual.label).toBe(labelAfterMajor);
-        expect(actual.count).toBe(4);
-        expect(actual.logs.get(3).getText()).toBe(logAfterMajor);
-      });
+      expect(actual.label).toBe(labelAfterMajor);
+      expect(actual.count).toBe(2);
+      expect(actual.logs.get(1).getText()).toBe(logAfterMajor);
     });
 
     function getActual() {
@@ -118,110 +112,125 @@ describe('Component Communication Cookbook Tests', () => {
     }
     // ...
     // #enddocregion parent-to-child-onchanges
-
   });
 
   describe('Child-to-parent communication', () => {
     // #docregion child-to-parent
     // ...
     it('should not emit the event initially', () => {
-      const voteLabel = element(by.tagName('app-vote-taker'))
-        .element(by.tagName('h3')).getText();
-      expect(voteLabel).toBe('Agree: 0, Disagree: 0');
+      const voteLabel = element(by.tagName('app-vote-taker')).element(by.tagName('h3'));
+      expect(voteLabel.getText()).toBe('Agree: 0, Disagree: 0');
     });
 
-    it('should process Agree vote', () => {
+    it('should process Agree vote', async () => {
+      const voteLabel = element(by.tagName('app-vote-taker')).element(by.tagName('h3'));
       const agreeButton1 = element.all(by.tagName('app-voter')).get(0)
         .all(by.tagName('button')).get(0);
-      agreeButton1.click().then(() => {
-        const voteLabel = element(by.tagName('app-vote-taker'))
-          .element(by.tagName('h3')).getText();
-        expect(voteLabel).toBe('Agree: 1, Disagree: 0');
-      });
+
+      await agreeButton1.click();
+
+      expect(voteLabel.getText()).toBe('Agree: 1, Disagree: 0');
     });
 
-    it('should process Disagree vote', () => {
+    it('should process Disagree vote', async () => {
+      const voteLabel = element(by.tagName('app-vote-taker')).element(by.tagName('h3'));
       const agreeButton1 = element.all(by.tagName('app-voter')).get(1)
         .all(by.tagName('button')).get(1);
-      agreeButton1.click().then(() => {
-        const voteLabel = element(by.tagName('app-vote-taker'))
-          .element(by.tagName('h3')).getText();
-        expect(voteLabel).toBe('Agree: 1, Disagree: 1');
-      });
+
+      await agreeButton1.click();
+
+      expect(voteLabel.getText()).toBe('Agree: 0, Disagree: 1');
     });
     // ...
     // #enddocregion child-to-parent
   });
 
-  // Can't run timer tests in protractor because
-  // interaction w/ zones causes all tests to freeze & timeout.
-  xdescribe('Parent calls child via local var', () => {
-    countDownTimerTests('countdown-parent-lv');
+  describe('Parent calls child via local var', () => {
+    countDownTimerTests('app-countdown-parent-lv');
   });
 
-  xdescribe('Parent calls ViewChild', () => {
-    countDownTimerTests('countdown-parent-vc');
+  describe('Parent calls ViewChild', () => {
+    countDownTimerTests('app-countdown-parent-vc');
   });
 
   function countDownTimerTests(parentTag: string) {
     // #docregion countdown-timer-tests
     // ...
-    it('timer and parent seconds should match', () => {
+    // The tests trigger periodic asynchronous operations (via `setInterval()`), which will prevent
+    // the app from stabilizing. See https://angular.io/api/core/ApplicationRef#is-stable-examples
+    // for more details.
+    // To allow the tests to complete, we will disable automatically waiting for the Angular app to
+    // stabilize.
+    beforeEach(() => browser.waitForAngularEnabled(false));
+    afterEach(() => browser.waitForAngularEnabled(true));
+
+    it('timer and parent seconds should match', async () => {
       const parent = element(by.tagName(parentTag));
-      const message = parent.element(by.tagName('app-countdown-timer')).getText();
-      browser.sleep(10); // give `seconds` a chance to catchup with `message`
-      const seconds = parent.element(by.className('seconds')).getText();
-      expect(message).toContain(seconds);
+      const startButton = parent.element(by.buttonText('Start'));
+      const seconds = parent.element(by.className('seconds'));
+      const timer = parent.element(by.tagName('app-countdown-timer'));
+
+      await startButton.click();
+
+      // Wait for `<app-countdown-timer>` to be populated with any text.
+      await browser.wait(() => timer.getText(), 2000);
+
+      expect(await timer.getText()).toContain(await seconds.getText());
     });
 
-    it('should stop the countdown', () => {
+    it('should stop the countdown', async () => {
       const parent = element(by.tagName(parentTag));
-      const stopButton = parent.all(by.tagName('button')).get(1);
+      const startButton = parent.element(by.buttonText('Start'));
+      const stopButton = parent.element(by.buttonText('Stop'));
+      const timer = parent.element(by.tagName('app-countdown-timer'));
+
+      await startButton.click();
+      expect(await timer.getText()).not.toContain('Holding');
 
-      stopButton.click().then(() => {
-        const message = parent.element(by.tagName('app-countdown-timer')).getText();
-        expect(message).toContain('Holding');
-      });
+      await stopButton.click();
+      expect(await timer.getText()).toContain('Holding');
     });
     // ...
     // #enddocregion countdown-timer-tests
   }
 
-
   describe('Parent and children communicate via a service', () => {
     // #docregion bidirectional-service
     // ...
-    it('should announce a mission', () => {
+    it('should announce a mission', async () => {
       const missionControl = element(by.tagName('app-mission-control'));
       const announceButton = missionControl.all(by.tagName('button')).get(0);
-      announceButton.click().then(() => {
-        const history = missionControl.all(by.tagName('li'));
-        expect(history.count()).toBe(1);
-        expect(history.get(0).getText()).toMatch(/Mission.* announced/);
-      });
+      const history = missionControl.all(by.tagName('li'));
+
+      await announceButton.click();
+
+      expect(history.count()).toBe(1);
+      expect(history.get(0).getText()).toMatch(/Mission.* announced/);
     });
 
-    it('should confirm the mission by Lovell', () => {
-      testConfirmMission(1, 2, 'Lovell');
+    it('should confirm the mission by Lovell', async () => {
+      await testConfirmMission(1, 'Lovell');
     });
 
-    it('should confirm the mission by Haise', () => {
-      testConfirmMission(3, 3, 'Haise');
+    it('should confirm the mission by Haise', async () => {
+      await testConfirmMission(3, 'Haise');
     });
 
-    it('should confirm the mission by Swigert', () => {
-      testConfirmMission(2, 4, 'Swigert');
+    it('should confirm the mission by Swigert', async () => {
+      await testConfirmMission(2, 'Swigert');
     });
 
-    function testConfirmMission(buttonIndex: number, expectedLogCount: number, astronaut: string) {
-      const confirmedLog = ' confirmed the mission';
+    async function testConfirmMission(buttonIndex: number, astronaut: string) {
       const missionControl = element(by.tagName('app-mission-control'));
+      const announceButton = missionControl.all(by.tagName('button')).get(0);
       const confirmButton = missionControl.all(by.tagName('button')).get(buttonIndex);
-      confirmButton.click().then(() => {
-        const history = missionControl.all(by.tagName('li'));
-        expect(history.count()).toBe(expectedLogCount);
-        expect(history.get(expectedLogCount - 1).getText()).toBe(astronaut + confirmedLog);
-      });
+      const history = missionControl.all(by.tagName('li'));
+
+      await announceButton.click();
+      await confirmButton.click();
+
+      expect(history.count()).toBe(2);
+      expect(history.get(1).getText()).toBe(`${astronaut} confirmed the mission`);
     }
     // ...
     // #enddocregion bidirectional-service
diff --git a/aio/content/examples/component-interaction/example-config.json b/aio/content/examples/component-interaction/example-config.json
index 05e262817d211..e69de29bb2d1d 100644
--- a/aio/content/examples/component-interaction/example-config.json
+++ b/aio/content/examples/component-interaction/example-config.json
@@ -1,13 +0,0 @@
-{
-  "tests": [
-    {
-      "cmd": "yarn",
-      "args": [
-        "e2e",
-        "--protractor-config=e2e/protractor-puppeteer.conf.js",
-        "--no-webdriver-update",
-        "--port={PORT}"
-      ]
-    }
-  ]
-}
diff --git a/aio/content/examples/component-interaction/src/app/app.component.html b/aio/content/examples/component-interaction/src/app/app.component.html
index 907e0181fa617..88d05abdb1e40 100644
--- a/aio/content/examples/component-interaction/src/app/app.component.html
+++ b/aio/content/examples/component-interaction/src/app/app.component.html
@@ -30,22 +30,21 @@ <h1 id="top">Component Communication Cookbook</h1>
   <app-vote-taker></app-vote-taker>
 </div>
 <a href="#top" class="to-top">Back to Top</a>
-<hr>
 
+<hr>
 <div id="parent-to-child-local-var">
   <app-countdown-parent-lv></app-countdown-parent-lv>
 </div>
 <a href="#top" class="to-top">Back to Top</a>
-<hr>
 
+<hr>
 <div id="parent-to-view-child">
   <app-countdown-parent-vc></app-countdown-parent-vc>
 </div>
 <a href="#top" class="to-top">Back to Top</a>
-<hr>
 
+<hr>
 <div id="bidirectional-service">
   <app-mission-control></app-mission-control>
 </div>
 <a href="#top" class="to-top">Back to Top</a>
-<hr>
diff --git a/aio/content/examples/component-interaction/src/app/app.module.ts b/aio/content/examples/component-interaction/src/app/app.module.ts
index d1b4570665ed5..caecee59e5d95 100644
--- a/aio/content/examples/component-interaction/src/app/app.module.ts
+++ b/aio/content/examples/component-interaction/src/app/app.module.ts
@@ -1,4 +1,4 @@
-import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 
 import { AppComponent } from './app.component';
@@ -15,10 +15,17 @@ import { VersionParentComponent } from './version-parent.component';
 import { VoterComponent } from './voter.component';
 import { VoteTakerComponent } from './votetaker.component';
 
-const directives: any[] = [
+
+@NgModule({
+  imports: [
+    BrowserModule,
+  ],
+  declarations: [
     AppComponent,
     AstronautComponent,
+    CountdownLocalVarParentComponent,
     CountdownTimerComponent,
+    CountdownViewChildParentComponent,
     HeroChildComponent,
     HeroParentComponent,
     MissionControlComponent,
@@ -27,28 +34,8 @@ const directives: any[] = [
     VersionChildComponent,
     VersionParentComponent,
     VoterComponent,
-    VoteTakerComponent
-  ];
-
-const schemas: any[] = [];
-
-// Include Countdown examples
-// unless in e2e tests which they break.
-if (!/e2e/.test(location.search)) {
-  console.log('adding countdown timer examples');
-  directives.push(CountdownLocalVarParentComponent);
-  directives.push(CountdownViewChildParentComponent);
-} else {
-  // In e2e test use CUSTOM_ELEMENTS_SCHEMA to suppress unknown element errors
-  schemas.push(CUSTOM_ELEMENTS_SCHEMA);
-}
-
-@NgModule({
-  imports: [
-    BrowserModule
+    VoteTakerComponent,
   ],
-  declarations: directives,
   bootstrap: [ AppComponent ],
-  schemas
 })
 export class AppModule { }
diff --git a/aio/content/examples/component-interaction/src/app/countdown-timer.component.ts b/aio/content/examples/component-interaction/src/app/countdown-timer.component.ts
index dcc88334d0201..cba4de07ac42a 100644
--- a/aio/content/examples/component-interaction/src/app/countdown-timer.component.ts
+++ b/aio/content/examples/component-interaction/src/app/countdown-timer.component.ts
@@ -1,19 +1,16 @@
 // #docregion
-import { Component, OnDestroy, OnInit } from '@angular/core';
+import { Component, OnDestroy } from '@angular/core';
 
 @Component({
   selector: 'app-countdown-timer',
   template: '<p>{{message}}</p>'
 })
-export class CountdownTimerComponent implements OnInit, OnDestroy {
+export class CountdownTimerComponent implements OnDestroy {
 
   intervalId = 0;
   message = '';
   seconds = 11;
 
-  clearTimer() { clearInterval(this.intervalId); }
-
-  ngOnInit()    { this.start(); }
   ngOnDestroy() { this.clearTimer(); }
 
   start() { this.countDown(); }
@@ -22,6 +19,8 @@ export class CountdownTimerComponent implements OnInit, OnDestroy {
     this.message = `Holding at T-${this.seconds} seconds`;
   }
 
+  private clearTimer() { clearInterval(this.intervalId); }
+
   private countDown() {
     this.clearTimer();
     this.intervalId = window.setInterval(() => {
diff --git a/aio/content/examples/component-overview/e2e/src/app.e2e-spec.ts b/aio/content/examples/component-overview/e2e/src/app.e2e-spec.ts
new file mode 100644
index 0000000000000..c6047b3a6907d
--- /dev/null
+++ b/aio/content/examples/component-overview/e2e/src/app.e2e-spec.ts
@@ -0,0 +1,13 @@
+import { browser, element, by } from 'protractor';
+
+describe('Component Overview', () => {
+
+  beforeAll(() => {
+    browser.get('');
+  });
+
+  it('should display component overview works ', () => {
+    expect(element(by.css('p')).getText()).toEqual('component-overview works!');
+  });
+
+});
diff --git a/aio/content/examples/component-overview/example-config.json b/aio/content/examples/component-overview/example-config.json
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/aio/content/examples/component-overview/src/app/app.component.css b/aio/content/examples/component-overview/src/app/app.component.css
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/aio/content/examples/component-overview/src/app/app.component.html b/aio/content/examples/component-overview/src/app/app.component.html
new file mode 100644
index 0000000000000..c940e3dc20710
--- /dev/null
+++ b/aio/content/examples/component-overview/src/app/app.component.html
@@ -0,0 +1 @@
+<app-component-overview></app-component-overview>
\ No newline at end of file
diff --git a/aio/content/examples/component-overview/src/app/app.component.spec.ts b/aio/content/examples/component-overview/src/app/app.component.spec.ts
new file mode 100644
index 0000000000000..1ccf30def47e3
--- /dev/null
+++ b/aio/content/examples/component-overview/src/app/app.component.spec.ts
@@ -0,0 +1,31 @@
+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', () => {
+    const fixture = TestBed.createComponent(AppComponent);
+    const app = fixture.componentInstance;
+    expect(app).toBeTruthy();
+  });
+
+  it(`should have as title 'component-overview'`, () => {
+    const fixture = TestBed.createComponent(AppComponent);
+    const app = fixture.componentInstance;
+    expect(app.title).toEqual('component-overview');
+  });
+
+  it('should render title', () => {
+    const fixture = TestBed.createComponent(AppComponent);
+    fixture.detectChanges();
+    const compiled = fixture.nativeElement;
+    expect(compiled.querySelector('.content span').textContent).toContain('component-overview app is running!');
+  });
+});
diff --git a/aio/content/examples/component-overview/src/app/app.component.ts b/aio/content/examples/component-overview/src/app/app.component.ts
new file mode 100644
index 0000000000000..29cfb38dc3768
--- /dev/null
+++ b/aio/content/examples/component-overview/src/app/app.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-root',
+  templateUrl: './app.component.html',
+  styleUrls: ['./app.component.css']
+})
+export class AppComponent {
+  title = 'component-overview';
+}
diff --git a/aio/content/examples/component-overview/src/app/app.module.ts b/aio/content/examples/component-overview/src/app/app.module.ts
new file mode 100644
index 0000000000000..e22e3e1854dfd
--- /dev/null
+++ b/aio/content/examples/component-overview/src/app/app.module.ts
@@ -0,0 +1,18 @@
+import { BrowserModule } from '@angular/platform-browser';
+import { NgModule } from '@angular/core';
+
+import { AppComponent } from './app.component';
+import { ComponentOverviewComponent } from './component-overview/component-overview.component';
+
+@NgModule({
+  declarations: [
+    AppComponent,
+    ComponentOverviewComponent
+  ],
+  imports: [
+    BrowserModule
+  ],
+  providers: [],
+  bootstrap: [AppComponent]
+})
+export class AppModule { }
diff --git a/aio/content/examples/component-overview/src/app/component-overview/component-overview.component.1.ts b/aio/content/examples/component-overview/src/app/component-overview/component-overview.component.1.ts
new file mode 100644
index 0000000000000..3e6d5d1fd2716
--- /dev/null
+++ b/aio/content/examples/component-overview/src/app/component-overview/component-overview.component.1.ts
@@ -0,0 +1,14 @@
+// #docplaster
+import { Component } from '@angular/core';
+
+// #docregion template
+@Component({
+  selector: 'app-component-overview',
+  template: '<h1>Hello World!</h1>',
+})
+// #enddocregion template
+
+export class ComponentOverviewComponent {
+
+}
+
diff --git a/aio/content/examples/component-overview/src/app/component-overview/component-overview.component.2.ts b/aio/content/examples/component-overview/src/app/component-overview/component-overview.component.2.ts
new file mode 100644
index 0000000000000..50153f8fbe5f9
--- /dev/null
+++ b/aio/content/examples/component-overview/src/app/component-overview/component-overview.component.2.ts
@@ -0,0 +1,16 @@
+// #docplaster
+import { Component } from '@angular/core';
+
+// #docregion templatebacktick
+@Component({
+  selector: 'app-component-overview',
+  template: `<h1>Hello World!</h1>
+             <p>This template definition spans
+              multiple lines.</p>`
+})
+// #enddocregion templatebacktick
+
+export class ComponentOverviewComponent {
+
+}
+
diff --git a/aio/content/examples/component-overview/src/app/component-overview/component-overview.component.3.ts b/aio/content/examples/component-overview/src/app/component-overview/component-overview.component.3.ts
new file mode 100644
index 0000000000000..b1b8b3706cac9
--- /dev/null
+++ b/aio/content/examples/component-overview/src/app/component-overview/component-overview.component.3.ts
@@ -0,0 +1,15 @@
+// #docplaster
+import { Component } from '@angular/core';
+
+// #docregion styles
+@Component({
+  selector: 'app-component-overview',
+  template: '<h1>Hello World!</h1>',
+  styles: ['h1 { font-weight: normal; }']
+})
+// #enddocregion styles
+
+export class ComponentOverviewComponent {
+
+}
+
diff --git a/aio/content/examples/component-overview/src/app/component-overview/component-overview.component.css b/aio/content/examples/component-overview/src/app/component-overview/component-overview.component.css
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/aio/content/examples/component-overview/src/app/component-overview/component-overview.component.html b/aio/content/examples/component-overview/src/app/component-overview/component-overview.component.html
new file mode 100644
index 0000000000000..ffe09040176f1
--- /dev/null
+++ b/aio/content/examples/component-overview/src/app/component-overview/component-overview.component.html
@@ -0,0 +1 @@
+<p>component-overview works!</p>
diff --git a/aio/content/examples/component-overview/src/app/component-overview/component-overview.component.spec.ts b/aio/content/examples/component-overview/src/app/component-overview/component-overview.component.spec.ts
new file mode 100644
index 0000000000000..61d3e433c64d6
--- /dev/null
+++ b/aio/content/examples/component-overview/src/app/component-overview/component-overview.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ComponentOverviewComponent } from './component-overview.component';
+
+describe('ComponentOverviewComponent', () => {
+  let component: ComponentOverviewComponent;
+  let fixture: ComponentFixture<ComponentOverviewComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ ComponentOverviewComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ComponentOverviewComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/aio/content/examples/component-overview/src/app/component-overview/component-overview.component.ts b/aio/content/examples/component-overview/src/app/component-overview/component-overview.component.ts
new file mode 100644
index 0000000000000..7e1e3597a120b
--- /dev/null
+++ b/aio/content/examples/component-overview/src/app/component-overview/component-overview.component.ts
@@ -0,0 +1,22 @@
+// #docplaster
+// #docregion import
+import { Component } from '@angular/core';
+// #enddocregion import
+
+// #docregion decorator, decorator-skeleton, selector, templateUrl
+@Component({
+// #enddocregion decorator-skeleton
+  selector: 'app-component-overview',
+// #enddocregion selector
+  templateUrl: './component-overview.component.html',
+// #enddocregion templateUrl
+  styleUrls: ['./component-overview.component.css']
+// #docregion decorator-skeleton, selector, templateUrl
+})
+// #enddocregion decorator, decorator-skeleton, selector, templateUrl
+
+// #docregion class
+export class ComponentOverviewComponent {
+
+}
+// #enddocregion class
diff --git a/aio/content/examples/component-overview/src/index.html b/aio/content/examples/component-overview/src/index.html
new file mode 100644
index 0000000000000..743fd8d693afc
--- /dev/null
+++ b/aio/content/examples/component-overview/src/index.html
@@ -0,0 +1,13 @@
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>ComponentOverview</title>
+  <base href="/">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="icon" type="image/x-icon" href="favicon.ico">
+</head>
+<body>
+  <app-root></app-root>
+</body>
+</html>
diff --git a/aio/content/examples/component-overview/src/main.ts b/aio/content/examples/component-overview/src/main.ts
new file mode 100644
index 0000000000000..c7b673cf44b38
--- /dev/null
+++ b/aio/content/examples/component-overview/src/main.ts
@@ -0,0 +1,12 @@
+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)
+  .catch(err => console.error(err));
diff --git a/aio/content/examples/component-overview/stackblitz.json b/aio/content/examples/component-overview/stackblitz.json
new file mode 100644
index 0000000000000..865a94123aff6
--- /dev/null
+++ b/aio/content/examples/component-overview/stackblitz.json
@@ -0,0 +1,8 @@
+{
+  "description": "Component Overview",
+  "files":[
+    "!**/*.d.ts",
+    "!**/*.js"
+  ],
+  "tags":["overview", "component"]
+}
diff --git a/aio/content/examples/component-styles/src/app/quest-summary.component.ts b/aio/content/examples/component-styles/src/app/quest-summary.component.ts
index 25765ed16ddd6..6d7b580582da6 100644
--- a/aio/content/examples/component-styles/src/app/quest-summary.component.ts
+++ b/aio/content/examples/component-styles/src/app/quest-summary.component.ts
@@ -13,8 +13,8 @@ import { Component, ViewEncapsulation } from '@angular/core';
 export class QuestSummaryComponent { }
 // #enddocregion
 /*
-  // #docregion encapsulation.native
+  // #docregion encapsulation.shadow
   // warning: few browsers support shadow DOM encapsulation at this time
-  encapsulation: ViewEncapsulation.Native
-  // #enddocregion encapsulation.native
+  encapsulation: ViewEncapsulation.ShadowDom
+  // #enddocregion encapsulation.shadow
 */
diff --git a/aio/content/examples/http/src/app/uploader/uploader.service.ts b/aio/content/examples/http/src/app/uploader/uploader.service.ts
index 8bc659f26f664..b461f6d87693f 100644
--- a/aio/content/examples/http/src/app/uploader/uploader.service.ts
+++ b/aio/content/examples/http/src/app/uploader/uploader.service.ts
@@ -24,7 +24,7 @@ export class UploaderService {
   // }
 
   upload(file: File) {
-    if (!file) { return; }
+    if (!file) { return of<string>(); }
 
     // COULD HAVE WRITTEN:
     // return this.http.post('/upload/file', file, {
diff --git a/aio/content/examples/i18n/doc-files/messages.fr.xlf.html b/aio/content/examples/i18n/doc-files/messages.fr.xlf.html
index 03635103b746d..213dc74bb3799 100644
--- a/aio/content/examples/i18n/doc-files/messages.fr.xlf.html
+++ b/aio/content/examples/i18n/doc-files/messages.fr.xlf.html
@@ -41,7 +41,6 @@
       <!-- #enddocregion translated-plural -->
       <!-- #docregion translated-select -->
       <!-- #docregion translate-select-1 -->
-      </trans-unit>
       <trans-unit id="f99f34ac9bd4606345071bd813858dec29f3b7d1" datatype="html">
         <source>The author is <x id="ICU" equiv-text="{gender, select, male {...} female {...} other {...}}"/></source>
         <target>L'auteur est <x id="ICU" equiv-text="{gender, select, male {...} female {...} other {...}}"/></target>
diff --git a/aio/content/examples/observables-in-angular/src/main.ts b/aio/content/examples/observables-in-angular/src/main.ts
index 0eaca6bc625eb..3c846a598f199 100644
--- a/aio/content/examples/observables-in-angular/src/main.ts
+++ b/aio/content/examples/observables-in-angular/src/main.ts
@@ -1,3 +1,4 @@
+// TODO: Add unit tests for this file.
 // tslint:disable: no-output-native
 // #docregion
 import { Component, Output, OnInit, EventEmitter, NgModule } from '@angular/core';
diff --git a/aio/content/examples/observables/example-config.json b/aio/content/examples/observables/example-config.json
index c07fa9794c5b5..3aa2059b4d004 100644
--- a/aio/content/examples/observables/example-config.json
+++ b/aio/content/examples/observables/example-config.json
@@ -2,7 +2,11 @@
   "tests": [
     {
       "cmd": "yarn",
-      "args": [ "tsc", "--project", "./tsconfig.app.json" ]
+      "args": ["tsc", "--project", "tsconfig.spec.json", "--module", "commonjs"]
+    },
+    {
+      "cmd": "yarn",
+      "args": ["jasmine", "out-tsc/**/*.spec.js"]
     }
   ]
 }
diff --git a/aio/content/examples/observables/src/creating.spec.ts b/aio/content/examples/observables/src/creating.spec.ts
new file mode 100644
index 0000000000000..e1718a9585ba0
--- /dev/null
+++ b/aio/content/examples/observables/src/creating.spec.ts
@@ -0,0 +1,55 @@
+import { docRegionFromEvent, docRegionSubscriber } from './creating';
+
+describe('observables', () => {
+  it('should create an observable using the constructor', () => {
+    const console = {log: jasmine.createSpy('log')};
+    docRegionSubscriber(console);
+    expect(console.log).toHaveBeenCalledTimes(4);
+    expect(console.log.calls.allArgs()).toEqual([
+      [1],
+      [2],
+      [3],
+      ['Finished sequence'],
+    ]);
+  });
+
+  it('should listen to input changes', () => {
+    let triggerInputChange;
+    const input = {
+      value: 'Test',
+      addEventListener: jasmine
+        .createSpy('addEvent')
+        .and.callFake((eventName: string, cb: (e) => void) => {
+          if (eventName === 'keydown') {
+            triggerInputChange = cb;
+          }
+        }),
+      removeEventListener: jasmine.createSpy('removeEventListener'),
+    };
+
+    const document = { getElementById: () => input };
+    docRegionFromEvent(document);
+    triggerInputChange({keyCode: 65});
+    expect(input.value).toBe('Test');
+
+    triggerInputChange({keyCode: 27});
+    expect(input.value).toBe('');
+  });
+
+  it('should call removeEventListener when unsubscribing', (doneFn: DoneFn) => {
+    const input = {
+      addEventListener: jasmine.createSpy('addEvent'),
+      removeEventListener: jasmine
+        .createSpy('removeEvent')
+        .and.callFake((eventName: string, cb: (e) => void) => {
+          if (eventName === 'keydown') {
+            doneFn();
+          }
+        })
+    };
+
+    const document = { getElementById: () => input };
+    const subscription = docRegionFromEvent(document);
+    subscription.unsubscribe();
+  });
+});
diff --git a/aio/content/examples/observables/src/creating.ts b/aio/content/examples/observables/src/creating.ts
index 83003b99bfecf..7a673228cc8fe 100644
--- a/aio/content/examples/observables/src/creating.ts
+++ b/aio/content/examples/observables/src/creating.ts
@@ -1,38 +1,39 @@
+// #docplaster
 
 import { Observable } from 'rxjs';
 
-// #docregion subscriber
-
-// This function runs when subscribe() is called
-function sequenceSubscriber(observer) {
-  // synchronously deliver 1, 2, and 3, then complete
-  observer.next(1);
-  observer.next(2);
-  observer.next(3);
-  observer.complete();
+export function docRegionSubscriber(console) {
+  // #docregion subscriber
+  // This function runs when subscribe() is called
+  function sequenceSubscriber(observer) {
+    // synchronously deliver 1, 2, and 3, then complete
+    observer.next(1);
+    observer.next(2);
+    observer.next(3);
+    observer.complete();
+
+    // unsubscribe function doesn't need to do anything in this
+    // because values are delivered synchronously
+    return {unsubscribe() {}};
+  }
+
+  // Create a new Observable that will deliver the above sequence
+  const sequence = new Observable(sequenceSubscriber);
+
+  // execute the Observable and print the result of each notification
+  sequence.subscribe({
+    next(num) { console.log(num); },
+    complete() { console.log('Finished sequence'); }
+  });
 
-  // unsubscribe function doesn't need to do anything in this
-  // because values are delivered synchronously
-  return {unsubscribe() {}};
+  // Logs:
+  // 1
+  // 2
+  // 3
+  // Finished sequence
+  // #enddocregion subscriber
 }
 
-// Create a new Observable that will deliver the above sequence
-const sequence = new Observable(sequenceSubscriber);
-
-// execute the Observable and print the result of each notification
-sequence.subscribe({
-  next(num) { console.log(num); },
-  complete() { console.log('Finished sequence'); }
-});
-
-// Logs:
-// 1
-// 2
-// 3
-// Finished sequence
-
-// #enddocregion subscriber
-
 // #docregion fromevent
 
 function fromEvent(target, eventName) {
@@ -51,16 +52,18 @@ function fromEvent(target, eventName) {
 
 // #enddocregion fromevent
 
-// #docregion fromevent_use
+export function docRegionFromEvent(document) {
+  // #docregion fromevent_use
 
-const ESC_KEY = 27;
-const nameInput = document.getElementById('name') as HTMLInputElement;
+  const ESC_KEY = 27;
+  const nameInput = document.getElementById('name') as HTMLInputElement;
 
-const subscription = fromEvent(nameInput, 'keydown')
-  .subscribe((e: KeyboardEvent) => {
+  const subscription = fromEvent(nameInput, 'keydown').subscribe((e: KeyboardEvent) => {
     if (e.keyCode === ESC_KEY) {
       nameInput.value = '';
     }
   });
+  // #enddocregion fromevent_use
+  return subscription;
+}
 
-// #enddocregion fromevent_use
diff --git a/aio/content/examples/observables/src/geolocation.ts b/aio/content/examples/observables/src/geolocation.ts
index 841fea556e451..e1f0a2e40f6ad 100644
--- a/aio/content/examples/observables/src/geolocation.ts
+++ b/aio/content/examples/observables/src/geolocation.ts
@@ -1,5 +1,5 @@
+// TODO: Add unit tests for this file.
 import { Observable } from 'rxjs';
-
 // #docregion
 
 // Create an Observable that will start listening to geolocation updates
diff --git a/aio/content/examples/observables/src/multicasting.spec.ts b/aio/content/examples/observables/src/multicasting.spec.ts
new file mode 100644
index 0000000000000..90bab9615110f
--- /dev/null
+++ b/aio/content/examples/observables/src/multicasting.spec.ts
@@ -0,0 +1,48 @@
+import { docRegionDelaySequence, docRegionMulticastSequence } from './multicasting';
+
+describe('multicasting', () => {
+  let console;
+  beforeEach(() => {
+    jasmine.clock().install();
+    console = {log: jasmine.createSpy('log')};
+  });
+
+  afterEach(() => {
+    jasmine.clock().uninstall();
+  });
+
+  it('should create an observable and emit in sequence', () => {
+    docRegionDelaySequence(console);
+    jasmine.clock().tick(10000);
+    expect(console.log).toHaveBeenCalledTimes(12);
+    expect(console.log.calls.allArgs()).toEqual([
+      [1],
+      ['1st subscribe: 1'],
+      ['2nd subscribe: 1'],
+      [2],
+      ['1st subscribe: 2'],
+      ['2nd subscribe: 2'],
+      [3],
+      ['Finished sequence'],
+      ['1st subscribe: 3'],
+      ['1st sequence finished.'],
+      ['2nd subscribe: 3'],
+      ['2nd sequence finished.']
+    ]);
+  });
+
+  it('should create an observable and multicast the emissions', () => {
+    docRegionMulticastSequence(console);
+    jasmine.clock().tick(10000);
+    expect(console.log).toHaveBeenCalledTimes(7);
+    expect(console.log.calls.allArgs()).toEqual([
+      ['1st subscribe: 1'],
+      ['1st subscribe: 2'],
+      ['2nd subscribe: 2'],
+      ['1st subscribe: 3'],
+      ['2nd subscribe: 3'],
+      ['1st sequence finished.'],
+      ['2nd sequence finished.']
+    ]);
+  });
+});
diff --git a/aio/content/examples/observables/src/multicasting.ts b/aio/content/examples/observables/src/multicasting.ts
index 2d622e41ff2ac..fe821edd2a8e5 100644
--- a/aio/content/examples/observables/src/multicasting.ts
+++ b/aio/content/examples/observables/src/multicasting.ts
@@ -1,155 +1,160 @@
+// #docplaster
 
 import { Observable } from 'rxjs';
 
-// #docregion delay_sequence
+export function docRegionDelaySequence(console) {
+  // #docregion delay_sequence
+  function sequenceSubscriber(observer) {
+    const seq = [1, 2, 3];
+    let timeoutId;
+
+    // Will run through an array of numbers, emitting one value
+    // per second until it gets to the end of the array.
+    function doInSequence(arr, idx) {
+      timeoutId = setTimeout(() => {
+        observer.next(arr[idx]);
+        if (idx === arr.length - 1) {
+          observer.complete();
+        } else {
+          doInSequence(arr, ++idx);
+        }
+      }, 1000);
+    }
 
-function sequenceSubscriber(observer) {
-  const seq = [1, 2, 3];
-  let timeoutId;
+    doInSequence(seq, 0);
 
-  // Will run through an array of numbers, emitting one value
-  // per second until it gets to the end of the array.
-  function doInSequence(arr, idx) {
-    timeoutId = setTimeout(() => {
-      observer.next(arr[idx]);
-      if (idx === arr.length - 1) {
-        observer.complete();
-      } else {
-        doInSequence(arr, ++idx);
+    // Unsubscribe should clear the timeout to stop execution
+    return {
+      unsubscribe() {
+        clearTimeout(timeoutId);
       }
-    }, 1000);
+    };
   }
 
-  doInSequence(seq, 0);
+  // Create a new Observable that will deliver the above sequence
+  const sequence = new Observable(sequenceSubscriber);
 
-  // Unsubscribe should clear the timeout to stop execution
-  return {unsubscribe() {
-    clearTimeout(timeoutId);
-  }};
-}
-
-// Create a new Observable that will deliver the above sequence
-const sequence = new Observable(sequenceSubscriber);
-
-sequence.subscribe({
-  next(num) { console.log(num); },
-  complete() { console.log('Finished sequence'); }
-});
-
-// Logs:
-// (at 1 second): 1
-// (at 2 seconds): 2
-// (at 3 seconds): 3
-// (at 3 seconds): Finished sequence
+  sequence.subscribe({
+    next(num) { console.log(num); },
+    complete() { console.log('Finished sequence'); }
+  });
 
-// #enddocregion delay_sequence
+  // Logs:
+  // (at 1 second): 1
+  // (at 2 seconds): 2
+  // (at 3 seconds): 3
+  // (at 3 seconds): Finished sequence
 
-// #docregion subscribe_twice
+  // #enddocregion delay_sequence
 
-// Subscribe starts the clock, and will emit after 1 second
-sequence.subscribe({
-  next(num) { console.log('1st subscribe: ' + num); },
-  complete() { console.log('1st sequence finished.'); }
-});
+  // #docregion subscribe_twice
 
-// After 1/2 second, subscribe again.
-setTimeout(() => {
+  // Subscribe starts the clock, and will emit after 1 second
   sequence.subscribe({
-    next(num) { console.log('2nd subscribe: ' + num); },
-    complete() { console.log('2nd sequence finished.'); }
+    next(num) { console.log('1st subscribe: ' + num); },
+    complete() { console.log('1st sequence finished.'); }
   });
-}, 500);
-
-// Logs:
-// (at 1 second): 1st subscribe: 1
-// (at 1.5 seconds): 2nd subscribe: 1
-// (at 2 seconds): 1st subscribe: 2
-// (at 2.5 seconds): 2nd subscribe: 2
-// (at 3 seconds): 1st subscribe: 3
-// (at 3 seconds): 1st sequence finished
-// (at 3.5 seconds): 2nd subscribe: 3
-// (at 3.5 seconds): 2nd sequence finished
-
-// #enddocregion subscribe_twice
-
-// #docregion multicast_sequence
-
-function multicastSequenceSubscriber() {
-  const seq = [1, 2, 3];
-  // Keep track of each observer (one for every active subscription)
-  const observers = [];
-  // Still a single timeoutId because there will only ever be one
-  // set of values being generated, multicasted to each subscriber
-  let timeoutId;
-
-  // Return the subscriber function (runs when subscribe()
-  // function is invoked)
-  return (observer) => {
-    observers.push(observer);
-    // When this is the first subscription, start the sequence
-    if (observers.length === 1) {
-      timeoutId = doSequence({
-        next(val) {
-          // Iterate through observers and notify all subscriptions
-          observers.forEach(obs => obs.next(val));
-        },
-        complete() {
-          // Notify all complete callbacks
-          observers.slice(0).forEach(obs => obs.complete());
-        }
-      }, seq, 0);
-    }
 
-    return {
-      unsubscribe() {
-        // Remove from the observers array so it's no longer notified
-        observers.splice(observers.indexOf(observer), 1);
-        // If there's no more listeners, do cleanup
-        if (observers.length === 0) {
-          clearTimeout(timeoutId);
-        }
-      }
-    };
-  };
+  // After 1/2 second, subscribe again.
+  setTimeout(() => {
+    sequence.subscribe({
+      next(num) { console.log('2nd subscribe: ' + num); },
+      complete() { console.log('2nd sequence finished.'); }
+    });
+  }, 500);
+
+  // Logs:
+  // (at 1 second): 1st subscribe: 1
+  // (at 1.5 seconds): 2nd subscribe: 1
+  // (at 2 seconds): 1st subscribe: 2
+  // (at 2.5 seconds): 2nd subscribe: 2
+  // (at 3 seconds): 1st subscribe: 3
+  // (at 3 seconds): 1st sequence finished
+  // (at 3.5 seconds): 2nd subscribe: 3
+  // (at 3.5 seconds): 2nd sequence finished
+
+  // #enddocregion subscribe_twice
 }
 
-// Run through an array of numbers, emitting one value
-// per second until it gets to the end of the array.
-function doSequence(observer, arr, idx) {
-  return setTimeout(() => {
-    observer.next(arr[idx]);
-    if (idx === arr.length - 1) {
-      observer.complete();
-    } else {
-      doSequence(observer, arr, ++idx);
-    }
-  }, 1000);
-}
+export function docRegionMulticastSequence(console) {
+  // #docregion multicast_sequence
+  function multicastSequenceSubscriber() {
+    const seq = [1, 2, 3];
+    // Keep track of each observer (one for every active subscription)
+    const observers = [];
+    // Still a single timeoutId because there will only ever be one
+    // set of values being generated, multicasted to each subscriber
+    let timeoutId;
+
+    // Return the subscriber function (runs when subscribe()
+    // function is invoked)
+    return observer => {
+      observers.push(observer);
+      // When this is the first subscription, start the sequence
+      if (observers.length === 1) {
+        timeoutId = doSequence({
+          next(val) {
+            // Iterate through observers and notify all subscriptions
+            observers.forEach(obs => obs.next(val));
+          },
+          complete() {
+            // Notify all complete callbacks
+            observers.slice(0).forEach(obs => obs.complete());
+          }
+        }, seq, 0);
+      }
+
+      return {
+        unsubscribe() {
+          // Remove from the observers array so it's no longer notified
+          observers.splice(observers.indexOf(observer), 1);
+          // If there's no more listeners, do cleanup
+          if (observers.length === 0) {
+            clearTimeout(timeoutId);
+          }
+        }
+      };
+    };
+  }
 
-// Create a new Observable that will deliver the above sequence
-const multicastSequence = new Observable(multicastSequenceSubscriber());
+  // Run through an array of numbers, emitting one value
+  // per second until it gets to the end of the array.
+  function doSequence(observer, arr, idx) {
+    return setTimeout(() => {
+      observer.next(arr[idx]);
+      if (idx === arr.length - 1) {
+        observer.complete();
+      } else {
+        doSequence(observer, arr, ++idx);
+      }
+    }, 1000);
+  }
 
-// Subscribe starts the clock, and begins to emit after 1 second
-multicastSequence.subscribe({
-  next(num) { console.log('1st subscribe: ' + num); },
-  complete() { console.log('1st sequence finished.'); }
-});
+  // Create a new Observable that will deliver the above sequence
+  const multicastSequence = new Observable(multicastSequenceSubscriber());
 
-// After 1 1/2 seconds, subscribe again (should "miss" the first value).
-setTimeout(() => {
+  // Subscribe starts the clock, and begins to emit after 1 second
   multicastSequence.subscribe({
-    next(num) { console.log('2nd subscribe: ' + num); },
-    complete() { console.log('2nd sequence finished.'); }
+    next(num) { console.log('1st subscribe: ' + num); },
+    complete() { console.log('1st sequence finished.'); }
   });
-}, 1500);
-
-// Logs:
-// (at 1 second): 1st subscribe: 1
-// (at 2 seconds): 1st subscribe: 2
-// (at 2 seconds): 2nd subscribe: 2
-// (at 3 seconds): 1st subscribe: 3
-// (at 3 seconds): 1st sequence finished
-// (at 3 seconds): 2nd subscribe: 3
-// (at 3 seconds): 2nd sequence finished
-
-// #enddocregion multicast_sequence
+
+  // After 1 1/2 seconds, subscribe again (should "miss" the first value).
+  setTimeout(() => {
+    multicastSequence.subscribe({
+      next(num) { console.log('2nd subscribe: ' + num); },
+      complete() { console.log('2nd sequence finished.'); }
+    });
+  }, 1500);
+
+  // Logs:
+  // (at 1 second): 1st subscribe: 1
+  // (at 2 seconds): 1st subscribe: 2
+  // (at 2 seconds): 2nd subscribe: 2
+  // (at 3 seconds): 1st subscribe: 3
+  // (at 3 seconds): 1st sequence finished
+  // (at 3 seconds): 2nd subscribe: 3
+  // (at 3 seconds): 2nd sequence finished
+
+  // #enddocregion multicast_sequence
+}
diff --git a/aio/content/examples/observables/src/subscribing.spec.ts b/aio/content/examples/observables/src/subscribing.spec.ts
new file mode 100644
index 0000000000000..43d0307e5da1e
--- /dev/null
+++ b/aio/content/examples/observables/src/subscribing.spec.ts
@@ -0,0 +1,19 @@
+import { docRegionObserver } from './subscribing';
+
+describe('subscribing', () => {
+  it('should subscribe and emit', () => {
+    const console = {log: jasmine.createSpy('log')};
+    docRegionObserver(console);
+    expect(console.log).toHaveBeenCalledTimes(8);
+    expect(console.log.calls.allArgs()).toEqual([
+      ['Observer got a next value: 1'],
+      ['Observer got a next value: 2'],
+      ['Observer got a next value: 3'],
+      ['Observer got a complete notification'],
+      ['Observer got a next value: 1'],
+      ['Observer got a next value: 2'],
+      ['Observer got a next value: 3'],
+      ['Observer got a complete notification'],
+    ]);
+  });
+});
diff --git a/aio/content/examples/observables/src/subscribing.ts b/aio/content/examples/observables/src/subscribing.ts
index 06a21575d1cfe..47677b5d9e2ef 100644
--- a/aio/content/examples/observables/src/subscribing.ts
+++ b/aio/content/examples/observables/src/subscribing.ts
@@ -1,32 +1,35 @@
+// #docplaster
+import { of } from 'rxjs';
 
-import { Observable, of } from 'rxjs';
+export function docRegionObserver(console) {
+  // #docregion observer
 
-// #docregion observer
+  // Create simple observable that emits three values
+  const myObservable = of(1, 2, 3);
 
-// Create simple observable that emits three values
-const myObservable = of(1, 2, 3);
+  // Create observer object
+  const myObserver = {
+    next: x => console.log('Observer got a next value: ' + x),
+    error: err => console.error('Observer got an error: ' + err),
+    complete: () => console.log('Observer got a complete notification'),
+  };
 
-// Create observer object
-const myObserver = {
-  next: x => console.log('Observer got a next value: ' + x),
-  error: err => console.error('Observer got an error: ' + err),
-  complete: () => console.log('Observer got a complete notification'),
-};
+  // Execute with the observer object
+  myObservable.subscribe(myObserver);
 
-// Execute with the observer object
-myObservable.subscribe(myObserver);
-// Logs:
-// Observer got a next value: 1
-// Observer got a next value: 2
-// Observer got a next value: 3
-// Observer got a complete notification
+  // Logs:
+  // Observer got a next value: 1
+  // Observer got a next value: 2
+  // Observer got a next value: 3
+  // Observer got a complete notification
 
-// #enddocregion observer
+  // #enddocregion observer
 
-// #docregion sub_fn
-myObservable.subscribe(
-  x => console.log('Observer got a next value: ' + x),
-  err => console.error('Observer got an error: ' + err),
-  () => console.log('Observer got a complete notification')
-);
-// #enddocregion sub_fn
+  // #docregion sub_fn
+  myObservable.subscribe(
+    x => console.log('Observer got a next value: ' + x),
+    err => console.error('Observer got an error: ' + err),
+    () => console.log('Observer got a complete notification')
+  );
+  // #enddocregion sub_fn
+}
diff --git a/aio/content/examples/practical-observable-usage/example-config.json b/aio/content/examples/practical-observable-usage/example-config.json
index c07fa9794c5b5..3aa2059b4d004 100644
--- a/aio/content/examples/practical-observable-usage/example-config.json
+++ b/aio/content/examples/practical-observable-usage/example-config.json
@@ -2,7 +2,11 @@
   "tests": [
     {
       "cmd": "yarn",
-      "args": [ "tsc", "--project", "./tsconfig.app.json" ]
+      "args": ["tsc", "--project", "tsconfig.spec.json", "--module", "commonjs"]
+    },
+    {
+      "cmd": "yarn",
+      "args": ["jasmine", "out-tsc/**/*.spec.js"]
     }
   ]
 }
diff --git a/aio/content/examples/practical-observable-usage/src/backoff.spec.ts b/aio/content/examples/practical-observable-usage/src/backoff.spec.ts
new file mode 100644
index 0000000000000..0390a476d1346
--- /dev/null
+++ b/aio/content/examples/practical-observable-usage/src/backoff.spec.ts
@@ -0,0 +1,70 @@
+import { interval } from 'rxjs';
+import { tap } from 'rxjs/operators';
+import { backoff } from './backoff';
+
+describe('backoff()', () => {
+  beforeEach(() => jasmine.clock().install());
+  afterEach(() => jasmine.clock().uninstall());
+
+  it('should retry in case of error', () => {
+    const mockConsole = {log: jasmine.createSpy('log')};
+    const source = interval(10).pipe(
+      tap(i => {
+        if (i > 0) {
+          throw new Error('Test error');
+        }
+      }),
+      backoff(3, 100),
+    );
+    source.subscribe({
+      next: v => mockConsole.log(`Emitted: ${v}`),
+      error: e => mockConsole.log(`Errored: ${e.message || e}`),
+      complete: () => mockConsole.log('Completed'),
+    });
+
+    // Initial try:
+    // Errors on second emission and schedules retrying (with delay).
+    jasmine.clock().tick(10);
+    expect(mockConsole.log.calls.allArgs()).toEqual([['Emitted: 0']]);
+
+    jasmine.clock().tick(10);
+    expect(mockConsole.log.calls.allArgs()).toEqual([['Emitted: 0']]);
+    mockConsole.log.calls.reset();
+
+    // First re-attempt after 100ms:
+    // Errors again on second emission and schedules retrying (with larger delay).
+    jasmine.clock().tick(100);
+    expect(mockConsole.log).not.toHaveBeenCalled();
+
+    jasmine.clock().tick(10);
+    expect(mockConsole.log.calls.allArgs()).toEqual([['Emitted: 0']]);
+
+    jasmine.clock().tick(10);
+    expect(mockConsole.log.calls.allArgs()).toEqual([['Emitted: 0']]);
+    mockConsole.log.calls.reset();
+
+    // Second re-attempt after 400ms:
+    // Errors again on second emission and schedules retrying (with even larger delay).
+    jasmine.clock().tick(400);
+    expect(mockConsole.log).not.toHaveBeenCalled();
+
+    jasmine.clock().tick(10);
+    expect(mockConsole.log.calls.allArgs()).toEqual([['Emitted: 0']]);
+
+    jasmine.clock().tick(10);
+    expect(mockConsole.log.calls.allArgs()).toEqual([['Emitted: 0']]);
+    mockConsole.log.calls.reset();
+
+    // Third re-attempt after 900ms:
+    // Errors again on second emission and gives up (no retrying).
+    jasmine.clock().tick(900);
+    expect(mockConsole.log).not.toHaveBeenCalled();
+
+    jasmine.clock().tick(10);
+    expect(mockConsole.log.calls.allArgs()).toEqual([['Emitted: 0']]);
+    mockConsole.log.calls.reset();
+
+    jasmine.clock().tick(10);
+    expect(mockConsole.log.calls.allArgs()).toEqual([['Errored: Test error']]);
+  });
+});
diff --git a/aio/content/examples/practical-observable-usage/src/backoff.ts b/aio/content/examples/practical-observable-usage/src/backoff.ts
index e9e88e7cb20bc..68d724d0972ca 100644
--- a/aio/content/examples/practical-observable-usage/src/backoff.ts
+++ b/aio/content/examples/practical-observable-usage/src/backoff.ts
@@ -1,23 +1,32 @@
-
-import { pipe, range, timer, zip } from 'rxjs';
+// #docplaster
+// #docregion
+import { of, pipe, range, throwError, timer, zip } from 'rxjs';
 import { ajax } from 'rxjs/ajax';
-import { retryWhen, map, mergeMap } from 'rxjs/operators';
+import { map, mergeMap, retryWhen } from 'rxjs/operators';
 
-function backoff(maxTries, ms) {
- return pipe(
-   retryWhen(attempts => zip(range(1, maxTries), attempts)
-     .pipe(
-       map(([i]) => i * i),
-       mergeMap(i =>  timer(i * ms))
-     )
-   )
- );
+export function backoff(maxTries, delay) {
+  return pipe(
+    retryWhen(attempts =>
+      zip(range(1, maxTries + 1), attempts).pipe(
+        mergeMap(([i, err]) => (i > maxTries) ? throwError(err) : of(i)),
+        map(i => i * i),
+        mergeMap(v => timer(v * delay)),
+      ),
+    ),
+  );
 }
 
+// #enddocregion
+/*
+  This function declaration is necessary to ensure that it does not get called
+  when running the unit tests. It will not get rendered into the docs.
+  The indentation needs to start in the leftmost level position as well because of how
+  the docplaster combines the different regions together.
+*/
+function docRegionAjaxCall() {
+// #docregion
 ajax('/api/endpoint')
   .pipe(backoff(3, 250))
-  .subscribe(data => handleData(data));
-
-function handleData(data) {
-  // ...
+  .subscribe(function handleData(data) { /* ... */ });
+// #enddocregion
 }
diff --git a/aio/content/examples/practical-observable-usage/src/typeahead.spec.ts b/aio/content/examples/practical-observable-usage/src/typeahead.spec.ts
new file mode 100644
index 0000000000000..285dd7e12e302
--- /dev/null
+++ b/aio/content/examples/practical-observable-usage/src/typeahead.spec.ts
@@ -0,0 +1,72 @@
+import { of } from 'rxjs';
+import { docRegionTypeahead } from './typeahead';
+
+describe('typeahead', () => {
+  let document;
+  let ajax;
+  let triggertInputChange;
+
+  beforeEach(() => {
+    jasmine.clock().install();
+    const input = {
+      addEventListener: jasmine
+        .createSpy('addEvent')
+        .and.callFake((eventName: string, cb: (e) => void) => {
+          if (eventName === 'input') {
+            triggertInputChange = cb;
+          }
+        }),
+      removeEventListener: jasmine.createSpy('removeEvent'),
+    };
+
+    document = { getElementById: (id: string) => input };
+    ajax = jasmine.createSpy('ajax').and.callFake((url: string) => of('foo bar'));
+  });
+
+  afterEach(() => {
+    jasmine.clock().uninstall();
+  });
+
+  it('should make an ajax call to the corrent endpoint', () => {
+    docRegionTypeahead(document, ajax);
+    triggertInputChange({ target: { value: 'foo' } });
+    jasmine.clock().tick(11);
+    expect(ajax).toHaveBeenCalledWith('/api/endpoint?search=foo');
+  });
+
+  it('should not make an ajax call, when the input length < 3', () => {
+    docRegionTypeahead(document, ajax);
+    triggertInputChange({ target: { value: '' } });
+    jasmine.clock().tick(11);
+    expect(ajax).not.toHaveBeenCalled();
+    triggertInputChange({ target: { value: 'fo' } });
+    jasmine.clock().tick(11);
+    expect(ajax).not.toHaveBeenCalled();
+  });
+
+  it('should not make an ajax call for intermediate values when debouncing', () => {
+    docRegionTypeahead(document, ajax);
+    triggertInputChange({ target: { value: 'foo' } });
+    jasmine.clock().tick(9);
+    triggertInputChange({ target: { value: 'bar' } });
+    jasmine.clock().tick(9);
+    triggertInputChange({ target: { value: 'baz' } });
+    jasmine.clock().tick(9);
+    triggertInputChange({ target: { value: 'qux' } });
+    expect(ajax).not.toHaveBeenCalled();
+    jasmine.clock().tick(10);
+    expect(ajax).toHaveBeenCalledTimes(1);
+    expect(ajax).toHaveBeenCalledWith('/api/endpoint?search=qux');
+  });
+
+  it('should not make an ajax call, when the input value has not changed', () => {
+    docRegionTypeahead(document, ajax);
+    triggertInputChange({ target: { value: 'foo' } });
+    jasmine.clock().tick(11);
+    expect(ajax).toHaveBeenCalled();
+    ajax.calls.reset();
+    triggertInputChange({ target: { value: 'foo' } });
+    jasmine.clock().tick(11);
+    expect(ajax).not.toHaveBeenCalled();
+  });
+});
diff --git a/aio/content/examples/practical-observable-usage/src/typeahead.ts b/aio/content/examples/practical-observable-usage/src/typeahead.ts
index 153ab7f23ed5c..adbddd66c4468 100644
--- a/aio/content/examples/practical-observable-usage/src/typeahead.ts
+++ b/aio/content/examples/practical-observable-usage/src/typeahead.ts
@@ -1,18 +1,32 @@
-import { fromEvent } from 'rxjs';
-import { ajax } from 'rxjs/ajax';
-import { debounceTime, distinctUntilChanged, filter, map, switchMap } from 'rxjs/operators';
+/*
+  Because of how the code is merged together using the doc regions,
+  we need to indent the imports with the function below.
+*/
+// #docplaster
+// #docregion
+  import { fromEvent } from 'rxjs';
+  import { ajax } from 'rxjs/ajax';
+  import { debounceTime, distinctUntilChanged, filter, map, switchMap } from 'rxjs/operators';
 
+// #enddocregion
+/* tslint:disable:no-shadowed-variable */
+/* tslint:disable:align */
+export function docRegionTypeahead(document, ajax) {
+  // #docregion
+  const searchBox = document.getElementById('search-box');
 
-const searchBox = document.getElementById('search-box');
+  const typeahead = fromEvent(searchBox, 'input').pipe(
+    map((e: KeyboardEvent) => (e.target as HTMLInputElement).value),
+    filter(text => text.length > 2),
+    debounceTime(10),
+    distinctUntilChanged(),
+    switchMap(searchTerm => ajax(`/api/endpoint?search=${searchTerm}`))
+  );
 
-const typeahead = fromEvent(searchBox, 'input').pipe(
-  map((e: KeyboardEvent) => (e.target as HTMLInputElement).value),
-  filter(text => text.length > 2),
-  debounceTime(10),
-  distinctUntilChanged(),
-  switchMap(() => ajax('/api/endpoint'))
-);
+  typeahead.subscribe(data => {
+    // Handle the data from the API
+  });
 
-typeahead.subscribe(data => {
- // Handle the data from the API
-});
+  // #enddocregion
+  return typeahead;
+}
diff --git a/aio/content/examples/property-binding/src/app/app.component.ts b/aio/content/examples/property-binding/src/app/app.component.ts
index cfe9abe4ddaaf..5b58a8c6b3ef5 100644
--- a/aio/content/examples/property-binding/src/app/app.component.ts
+++ b/aio/content/examples/property-binding/src/app/app.component.ts
@@ -7,9 +7,15 @@ import { Component } from '@angular/core';
   styleUrls: ['./app.component.css']
 })
 export class AppComponent {
+  // #docregion item-image
   itemImageUrl = '../assets/phone.png';
+  // #enddocregion item-image
+  // #docregion boolean
   isUnchanged = true;
+  // #enddocregion boolean
+  // #docregion directive-property
   classes = 'special';
+  // #enddocregion directive-property
   // #docregion parent-data-type
   parentItem = 'lamp';
   // #enddocregion parent-data-type
diff --git a/aio/content/examples/rx-library/example-config.json b/aio/content/examples/rx-library/example-config.json
index c07fa9794c5b5..3aa2059b4d004 100644
--- a/aio/content/examples/rx-library/example-config.json
+++ b/aio/content/examples/rx-library/example-config.json
@@ -2,7 +2,11 @@
   "tests": [
     {
       "cmd": "yarn",
-      "args": [ "tsc", "--project", "./tsconfig.app.json" ]
+      "args": ["tsc", "--project", "tsconfig.spec.json", "--module", "commonjs"]
+    },
+    {
+      "cmd": "yarn",
+      "args": ["jasmine", "out-tsc/**/*.spec.js"]
     }
   ]
 }
diff --git a/aio/content/examples/rx-library/src/error-handling.spec.ts b/aio/content/examples/rx-library/src/error-handling.spec.ts
new file mode 100644
index 0000000000000..9dc82b45e8c9d
--- /dev/null
+++ b/aio/content/examples/rx-library/src/error-handling.spec.ts
@@ -0,0 +1,46 @@
+import { Subject, throwError } from 'rxjs';
+import { docRegionDefault } from './error-handling';
+
+describe('error-handling', () => {
+  let mockConsole;
+  let ajaxSubject;
+  let ajax;
+
+  beforeEach(() => {
+    mockConsole = {log: jasmine.createSpy('log')};
+    ajaxSubject = new Subject();
+    ajax = jasmine
+      .createSpy('ajax')
+      .and.callFake((url: string) => ajaxSubject);
+  });
+
+  afterEach(() => ajaxSubject.unsubscribe());
+
+  it('should return the response object', () => {
+    docRegionDefault(mockConsole, ajax);
+
+    ajaxSubject.next({response: {foo: 'bar'}});
+    expect(mockConsole.log.calls.allArgs()).toEqual([
+      ['data: ', {foo: 'bar'}]
+    ]);
+  });
+
+  it('should return an empty array when using an object without a `response` property', () => {
+    docRegionDefault(mockConsole, ajax);
+
+    ajaxSubject.next({foo: 'bar'});
+    expect(mockConsole.log.calls.allArgs()).toEqual([
+      ['data: ', []]
+    ]);
+  });
+
+  it('should return an empty array when the ajax observable errors', () => {
+    ajax.and.returnValue(throwError('Test Error'));
+
+    docRegionDefault(mockConsole, ajax);
+
+    expect(mockConsole.log.calls.allArgs()).toEqual([
+      ['data: ', []]
+    ]);
+  });
+});
diff --git a/aio/content/examples/rx-library/src/error-handling.ts b/aio/content/examples/rx-library/src/error-handling.ts
index c7b6c2dc9ff35..4daca5de8fce9 100644
--- a/aio/content/examples/rx-library/src/error-handling.ts
+++ b/aio/content/examples/rx-library/src/error-handling.ts
@@ -1,25 +1,36 @@
-
-import { of } from 'rxjs';
-
+// #docplaster
+/*
+  Because of how the code is merged together using the doc regions,
+  we need to indent the imports with the function below.
+*/
+/* tslint:disable:no-shadowed-variable */
+/* tslint:disable:align */
 // #docregion
+  import { of } from 'rxjs';
+  import { ajax } from 'rxjs/ajax';
+  import { map, catchError } from 'rxjs/operators';
 
-import { ajax } from 'rxjs/ajax';
-import { map, catchError } from 'rxjs/operators';
-// Return "response" from the API. If an error happens,
-// return an empty array.
-const apiData = ajax('/api/data').pipe(
-  map(res => {
-    if (!res.response) {
-      throw new Error('Value expected!');
-    }
-    return res.response;
-  }),
-  catchError(err => of([]))
-);
+// #enddocregion
 
-apiData.subscribe({
-  next(x) { console.log('data: ', x); },
-  error(err) { console.log('errors already caught... will not run'); }
-});
+export function docRegionDefault(console, ajax) {
+  // #docregion
+  // Return "response" from the API. If an error happens,
+  // return an empty array.
+  const apiData = ajax('/api/data').pipe(
+    map((res: any) => {
+      if (!res.response) {
+        throw new Error('Value expected!');
+      }
+      return res.response;
+    }),
+    catchError(err => of([]))
+  );
 
-// #enddocregion
+  apiData.subscribe({
+    next(x) { console.log('data: ', x); },
+    error(err) { console.log('errors already caught... will not run'); }
+  });
+
+  // #enddocregion
+  return apiData;
+}
diff --git a/aio/content/examples/rx-library/src/operators.1.spec.ts b/aio/content/examples/rx-library/src/operators.1.spec.ts
new file mode 100644
index 0000000000000..04fb0b8de0537
--- /dev/null
+++ b/aio/content/examples/rx-library/src/operators.1.spec.ts
@@ -0,0 +1,14 @@
+import { docRegionDefault } from './operators.1';
+
+describe('squareOdd - operators.1.ts', () => {
+  it('should return square odds', () => {
+    const console = {log: jasmine.createSpy('log')};
+    docRegionDefault(console);
+    expect(console.log).toHaveBeenCalledTimes(3);
+    expect(console.log.calls.allArgs()).toEqual([
+      [1],
+      [9],
+      [25],
+    ]);
+  });
+});
diff --git a/aio/content/examples/rx-library/src/operators.1.ts b/aio/content/examples/rx-library/src/operators.1.ts
index be37217d9dbf1..1ed029309878c 100644
--- a/aio/content/examples/rx-library/src/operators.1.ts
+++ b/aio/content/examples/rx-library/src/operators.1.ts
@@ -1,23 +1,30 @@
-import { of, pipe } from 'rxjs';
-
+// #docplaster
+/*
+  Because of how the code is merged together using the doc regions,
+  we need to indent the imports with the function below.
+*/
+/* tslint:disable:align */
 // #docregion
+  import { of, pipe } from 'rxjs';
+  import { filter, map } from 'rxjs/operators';
 
-import { filter, map } from 'rxjs/operators';
-
-const nums = of(1, 2, 3, 4, 5);
-
-// Create a function that accepts an Observable.
-const squareOddVals = pipe(
-  filter((n: number) => n % 2 !== 0),
-  map(n => n * n)
-);
+// #enddocregion
 
-// Create an Observable that will run the filter and map functions
-const squareOdd = squareOddVals(nums);
+export function docRegionDefault(console) {
+  // #docregion
+  const nums = of(1, 2, 3, 4, 5);
 
-// Subscribe to run the combined functions
-squareOdd.subscribe(x => console.log(x));
+  // Create a function that accepts an Observable.
+  const squareOddVals = pipe(
+    filter((n: number) => n % 2 !== 0),
+    map(n => n * n)
+  );
 
-// #enddocregion
+  // Create an Observable that will run the filter and map functions
+  const squareOdd = squareOddVals(nums);
 
+  // Subscribe to run the combined functions
+  squareOdd.subscribe(x => console.log(x));
 
+  // #enddocregion
+}
diff --git a/aio/content/examples/rx-library/src/operators.2.spec.ts b/aio/content/examples/rx-library/src/operators.2.spec.ts
new file mode 100644
index 0000000000000..f9d1d14103c96
--- /dev/null
+++ b/aio/content/examples/rx-library/src/operators.2.spec.ts
@@ -0,0 +1,14 @@
+import { docRegionDefault } from './operators.2';
+
+describe('squareOdd - operators.2.ts', () => {
+  it('should return square odds', () => {
+    const console = {log: jasmine.createSpy('log')};
+    docRegionDefault(console);
+    expect(console.log).toHaveBeenCalledTimes(3);
+    expect(console.log.calls.allArgs()).toEqual([
+      [1],
+      [9],
+      [25],
+    ]);
+  });
+});
diff --git a/aio/content/examples/rx-library/src/operators.2.ts b/aio/content/examples/rx-library/src/operators.2.ts
index 9559ea8525bba..fd792bff99eb5 100644
--- a/aio/content/examples/rx-library/src/operators.2.ts
+++ b/aio/content/examples/rx-library/src/operators.2.ts
@@ -1,16 +1,25 @@
-import { Observable, of } from 'rxjs';
-
+// #docplaster
+/*
+  Because of how the code is merged together using the doc regions,
+  we need to indent the imports with the function below.
+*/
+/* tslint:disable:align */
 // #docregion
+  import { of } from 'rxjs';
+  import { filter, map } from 'rxjs/operators';
 
-import { filter, map } from 'rxjs/operators';
+// #enddocregion
 
-const squareOdd = of(1, 2, 3, 4, 5)
-  .pipe(
-    filter(n => n % 2 !== 0),
-    map(n => n * n)
-  );
+export function docRegionDefault(console) {
+  // #docregion
+  const squareOdd = of(1, 2, 3, 4, 5)
+    .pipe(
+      filter(n => n % 2 !== 0),
+      map(n => n * n)
+    );
 
-// Subscribe to get values
-squareOdd.subscribe(x => console.log(x));
+  // Subscribe to get values
+  squareOdd.subscribe(x => console.log(x));
 
-// #enddocregion
+  // #enddocregion
+}
diff --git a/aio/content/examples/rx-library/src/operators.spec.ts b/aio/content/examples/rx-library/src/operators.spec.ts
new file mode 100644
index 0000000000000..2842d7680693c
--- /dev/null
+++ b/aio/content/examples/rx-library/src/operators.spec.ts
@@ -0,0 +1,14 @@
+import { docRegionDefault } from './operators';
+
+describe('squaredNums - operators.ts', () => {
+  it('should return square odds', () => {
+    const console = {log: jasmine.createSpy('log')};
+    docRegionDefault(console);
+    expect(console.log).toHaveBeenCalledTimes(3);
+    expect(console.log.calls.allArgs()).toEqual([
+      [1],
+      [4],
+      [9],
+    ]);
+  });
+});
diff --git a/aio/content/examples/rx-library/src/operators.ts b/aio/content/examples/rx-library/src/operators.ts
index 461482a4bc62b..d650413c3cfff 100644
--- a/aio/content/examples/rx-library/src/operators.ts
+++ b/aio/content/examples/rx-library/src/operators.ts
@@ -1,20 +1,28 @@
-
-import { Observable, of } from 'rxjs';
-
+// #docplaster
+/*
+  Because of how the code is merged together using the doc regions,
+  we need to indent the imports with the function below.
+*/
+/* tslint:disable:align */
 // #docregion
+  import { of } from 'rxjs';
+  import { map } from 'rxjs/operators';
 
-import { map } from 'rxjs/operators';
+// #enddocregion
 
-const nums = of(1, 2, 3);
+export function docRegionDefault(console) {
+  // #docregion
+  const nums = of(1, 2, 3);
 
-const squareValues = map((val: number) => val * val);
-const squaredNums = squareValues(nums);
+  const squareValues = map((val: number) => val * val);
+  const squaredNums = squareValues(nums);
 
-squaredNums.subscribe(x => console.log(x));
+  squaredNums.subscribe(x => console.log(x));
 
-// Logs
-// 1
-// 4
-// 9
+  // Logs
+  // 1
+  // 4
+  // 9
 
-// #enddocregion
+  // #enddocregion
+}
diff --git a/aio/content/examples/rx-library/src/retry-on-error.spec.ts b/aio/content/examples/rx-library/src/retry-on-error.spec.ts
new file mode 100644
index 0000000000000..89b9f3145a899
--- /dev/null
+++ b/aio/content/examples/rx-library/src/retry-on-error.spec.ts
@@ -0,0 +1,69 @@
+import { of, throwError } from 'rxjs';
+import { mergeMap, tap } from 'rxjs/operators';
+import { docRegionDefault } from './retry-on-error';
+
+describe('retry-on-error', () => {
+  let mockConsole;
+  beforeEach(() => mockConsole = { log: jasmine.createSpy('log') });
+
+  it('should return the response object', () => {
+    const ajax = () => of({ response: { foo: 'bar' } });
+
+    docRegionDefault(mockConsole, ajax);
+    expect(mockConsole.log.calls.allArgs()).toEqual([
+      ['data: ', { foo: 'bar' }],
+    ]);
+  });
+
+  it('should return an empty array after 3 retries + 1 initial request', () => {
+    const ajax = () => {
+      return of({ noresponse: true }).pipe(tap(() => mockConsole.log('Subscribed to AJAX')));
+    };
+
+    docRegionDefault(mockConsole, ajax);
+    expect(mockConsole.log.calls.allArgs()).toEqual([
+      ['Subscribed to AJAX'],
+      ['Error occurred.'],
+      ['Subscribed to AJAX'],
+      ['Error occurred.'],
+      ['Subscribed to AJAX'],
+      ['Error occurred.'],
+      ['Subscribed to AJAX'],
+      ['Error occurred.'],
+      ['data: ', []],
+    ]);
+  });
+
+  it('should return the response if the request succeeds upon retrying', () => {
+    // Fail on the first two requests, but succeed from the 3rd onwards.
+    let failCount = 2;
+    const ajax = () => of(null).pipe(
+      tap(() => mockConsole.log('Subscribed to AJAX')),
+      // Fail on the first 2 requests, but succeed from the 3rd onwards.
+      mergeMap(() => {
+        if (failCount > 0) {
+          failCount--;
+          return throwError('Test error');
+        }
+        return of({ response: { foo: 'bar' } });
+      }),
+    );
+
+    docRegionDefault(mockConsole, ajax);
+    expect(mockConsole.log.calls.allArgs()).toEqual([
+      ['Subscribed to AJAX'],  // Initial request   | 1st attempt overall
+      ['Subscribed to AJAX'],  // 1st retry attempt | 2nd attempt overall
+      ['Subscribed to AJAX'],  // 2nd retry attempt | 3rd attempt overall
+      ['data: ', { foo: 'bar' }],
+    ]);
+  });
+
+  it('should return an empty array when the ajax observable throws an error', () => {
+    const ajax = () => throwError('Test Error');
+
+    docRegionDefault(mockConsole, ajax);
+    expect(mockConsole.log.calls.allArgs()).toEqual([
+      ['data: ', []],
+    ]);
+  });
+});
diff --git a/aio/content/examples/rx-library/src/retry-on-error.ts b/aio/content/examples/rx-library/src/retry-on-error.ts
index b1a5389c1b146..eaa8539379d36 100644
--- a/aio/content/examples/rx-library/src/retry-on-error.ts
+++ b/aio/content/examples/rx-library/src/retry-on-error.ts
@@ -1,26 +1,35 @@
-
-import { Observable, of } from 'rxjs';
-
-
+// #docplaster
+/*
+  Because of how the code is merged together using the doc regions,
+  we need to indent the imports with the function below.
+*/
+/* tslint:disable:no-shadowed-variable */
+/* tslint:disable:align */
 // #docregion
+  import { of } from 'rxjs';
+  import { ajax } from 'rxjs/ajax';
+  import { map, retry, catchError } from 'rxjs/operators';
 
-import { ajax } from 'rxjs/ajax';
-import { map, retry, catchError } from 'rxjs/operators';
+// #enddocregion
 
-const apiData = ajax('/api/data').pipe(
-  retry(3), // Retry up to 3 times before failing
-  map(res => {
-    if (!res.response) {
-      throw new Error('Value expected!');
-    }
-    return res.response;
-  }),
-  catchError(err => of([]))
-);
+export function docRegionDefault(console, ajax) {
+  // #docregion
+  const apiData = ajax('/api/data').pipe(
+    map((res: any) => {
+      if (!res.response) {
+        console.log('Error occurred.');
+        throw new Error('Value expected!');
+      }
+      return res.response;
+    }),
+    retry(3), // Retry up to 3 times before failing
+    catchError(err => of([]))
+  );
 
-apiData.subscribe({
-  next(x) { console.log('data: ', x); },
-  error(err) { console.log('errors already caught... will not run'); }
-});
+  apiData.subscribe({
+    next(x) { console.log('data: ', x); },
+    error(err) { console.log('errors already caught... will not run'); }
+  });
 
-// #enddocregion
+  // #enddocregion
+}
diff --git a/aio/content/examples/rx-library/src/simple-creation.1.spec.ts b/aio/content/examples/rx-library/src/simple-creation.1.spec.ts
new file mode 100644
index 0000000000000..8c2944dd44fdb
--- /dev/null
+++ b/aio/content/examples/rx-library/src/simple-creation.1.spec.ts
@@ -0,0 +1,14 @@
+import { of } from 'rxjs';
+import { docRegionPromise } from './simple-creation.1';
+
+describe('simple-creation.1', () => {
+  it('should create a promise from an observable and return an empty object', () => {
+    const console = {log: jasmine.createSpy('log')};
+    const fetch = () => of({foo: 42});
+    docRegionPromise(console, fetch);
+    expect(console.log.calls.allArgs()).toEqual([
+      [{foo: 42}],
+      ['Completed'],
+    ]);
+  });
+});
diff --git a/aio/content/examples/rx-library/src/simple-creation.1.ts b/aio/content/examples/rx-library/src/simple-creation.1.ts
new file mode 100644
index 0000000000000..6388b18cc0250
--- /dev/null
+++ b/aio/content/examples/rx-library/src/simple-creation.1.ts
@@ -0,0 +1,24 @@
+// #docplaster
+/*
+  Because of how the code is merged together using the doc regions,
+  we need to indent the imports with the function below.
+*/
+/* tslint:disable:align */
+// #docregion promise
+  import { from } from 'rxjs';
+
+// #enddocregion promise
+
+export function docRegionPromise(console, fetch) {
+  // #docregion promise
+  // Create an Observable out of a promise
+  const data = from(fetch('/api/endpoint'));
+  // Subscribe to begin listening for async result
+  data.subscribe({
+    next(response) { console.log(response); },
+    error(err) { console.error('Error: ' + err); },
+    complete() { console.log('Completed'); }
+  });
+
+  // #enddocregion promise
+}
diff --git a/aio/content/examples/rx-library/src/simple-creation.2.spec.ts b/aio/content/examples/rx-library/src/simple-creation.2.spec.ts
new file mode 100644
index 0000000000000..4716482a48d86
--- /dev/null
+++ b/aio/content/examples/rx-library/src/simple-creation.2.spec.ts
@@ -0,0 +1,21 @@
+import { docRegionInterval } from './simple-creation.2';
+
+describe('simple-creation.2', () => {
+  beforeEach(() => jasmine.clock().install());
+  afterEach(() => jasmine.clock().uninstall());
+
+  it('should create an Observable that will publish a value on an interval', () => {
+    const console = {log: jasmine.createSpy('log')};
+    const subscription = docRegionInterval(console);
+    jasmine.clock().tick(1000);
+    expect(console.log).toHaveBeenCalledWith('It\'s been 1 seconds since subscribing!');
+    console.log.calls.reset();
+
+    jasmine.clock().tick(999);
+    expect(console.log).not.toHaveBeenCalled();
+
+    jasmine.clock().tick(1);
+    expect(console.log).toHaveBeenCalledWith('It\'s been 2 seconds since subscribing!');
+    subscription.unsubscribe();
+  });
+});
diff --git a/aio/content/examples/rx-library/src/simple-creation.2.ts b/aio/content/examples/rx-library/src/simple-creation.2.ts
new file mode 100644
index 0000000000000..fb186d693b4ab
--- /dev/null
+++ b/aio/content/examples/rx-library/src/simple-creation.2.ts
@@ -0,0 +1,22 @@
+// #docplaster
+/*
+  Because of how the code is merged together using the doc regions,
+  we need to indent the imports with the function below.
+*/
+/* tslint:disable:align */
+// #docregion interval
+  import { interval } from 'rxjs';
+
+// #enddocregion interval
+
+export function docRegionInterval(console) {
+  // #docregion interval
+  // Create an Observable that will publish a value on an interval
+  const secondsCounter = interval(1000);
+  // Subscribe to begin publishing values
+  const subscription = secondsCounter.subscribe(n =>
+    console.log(`It's been ${n + 1} seconds since subscribing!`));
+
+  // #enddocregion interval
+  return subscription;
+}
diff --git a/aio/content/examples/rx-library/src/simple-creation.3.spec.ts b/aio/content/examples/rx-library/src/simple-creation.3.spec.ts
new file mode 100644
index 0000000000000..7c1ed586a4e96
--- /dev/null
+++ b/aio/content/examples/rx-library/src/simple-creation.3.spec.ts
@@ -0,0 +1,53 @@
+import { docRegionEvent } from './simple-creation.3';
+
+describe('simple-creation.3', () => {
+  let triggerMousemove;
+  let mockConsole;
+  let input;
+  let mockDocument;
+
+  beforeEach(() => {
+    mockConsole = {log: jasmine.createSpy('log')};
+    input = {
+      addEventListener: jasmine
+        .createSpy('addEventListener')
+        .and.callFake((eventName, cb) => {
+          if (eventName === 'mousemove') {
+            triggerMousemove = cb;
+          }
+        }),
+      removeEventListener: jasmine.createSpy('removeEventListener'),
+    };
+    mockDocument = { getElementById: () => input };
+  });
+
+  it('should log coords when subscribing', () => {
+    docRegionEvent(mockConsole, mockDocument);
+
+    expect(mockConsole.log).not.toHaveBeenCalled();
+
+    triggerMousemove({ clientX: 50, clientY: 50 });
+    triggerMousemove({ clientX: 30, clientY: 50 });
+    triggerMousemove({ clientX: 50, clientY: 30 });
+    expect(mockConsole.log).toHaveBeenCalledTimes(3);
+    expect(mockConsole.log.calls.allArgs()).toEqual([
+      ['Coords: 50 X 50'],
+      ['Coords: 30 X 50'],
+      ['Coords: 50 X 30']
+    ]);
+  });
+
+  it('should call unsubscribe when clientX and clientY are below < 40 ', () => {
+    docRegionEvent(mockConsole, mockDocument);
+
+    expect(mockConsole.log).not.toHaveBeenCalled();
+
+    // Ensure that we have unsubscribed.
+    triggerMousemove({ clientX: 30, clientY: 30 });
+    expect(input.removeEventListener).toHaveBeenCalledWith('mousemove', triggerMousemove, undefined);
+    mockConsole.log.calls.reset();
+
+    triggerMousemove({ clientX: 50, clientY: 50 });
+    expect(mockConsole.log).not.toHaveBeenCalled();
+  });
+});
diff --git a/aio/content/examples/rx-library/src/simple-creation.3.ts b/aio/content/examples/rx-library/src/simple-creation.3.ts
new file mode 100644
index 0000000000000..63a36517273f4
--- /dev/null
+++ b/aio/content/examples/rx-library/src/simple-creation.3.ts
@@ -0,0 +1,32 @@
+// #docplaster
+/*
+  Because of how the code is merged together using the doc regions,
+  we need to indent the imports with the function below.
+*/
+/* tslint:disable:align */
+// #docregion event
+  import { fromEvent } from 'rxjs';
+
+// #enddocregion event
+
+export function docRegionEvent(console, document) {
+  // #docregion event
+  const el = document.getElementById('my-element');
+
+  // Create an Observable that will publish mouse movements
+  const mouseMoves = fromEvent(el, 'mousemove');
+
+  // Subscribe to start listening for mouse-move events
+  const subscription = mouseMoves.subscribe((evt: MouseEvent) => {
+    // Log coords of mouse movements
+    console.log(`Coords: ${evt.clientX} X ${evt.clientY}`);
+
+    // When the mouse is over the upper-left of the screen,
+    // unsubscribe to stop listening for mouse movements
+    if (evt.clientX < 40 && evt.clientY < 40) {
+      subscription.unsubscribe();
+    }
+  });
+
+  // #enddocregion event
+}
diff --git a/aio/content/examples/rx-library/src/simple-creation.spec.ts b/aio/content/examples/rx-library/src/simple-creation.spec.ts
new file mode 100644
index 0000000000000..8de9a846e2730
--- /dev/null
+++ b/aio/content/examples/rx-library/src/simple-creation.spec.ts
@@ -0,0 +1,14 @@
+import { of } from 'rxjs';
+import { docRegionAjax } from './simple-creation';
+
+describe('ajax', () => {
+  it('should make a request and console log the status and response', () => {
+    const console = {log: jasmine.createSpy('log')};
+    const ajax = jasmine.createSpy('ajax').and.callFake((url: string) => {
+      return of({status: 200, response: 'foo bar'});
+    });
+
+    docRegionAjax(console, ajax);
+    expect(console.log).toHaveBeenCalledWith(200, 'foo bar');
+  });
+});
diff --git a/aio/content/examples/rx-library/src/simple-creation.ts b/aio/content/examples/rx-library/src/simple-creation.ts
index ef83631dbaeb9..bc2ef499943e2 100644
--- a/aio/content/examples/rx-library/src/simple-creation.ts
+++ b/aio/content/examples/rx-library/src/simple-creation.ts
@@ -1,65 +1,19 @@
-
-// #docregion promise
-
-import { from } from 'rxjs';
-
-// Create an Observable out of a promise
-const data = from(fetch('/api/endpoint'));
-// Subscribe to begin listening for async result
-data.subscribe({
-  next(response) { console.log(response); },
-  error(err) { console.error('Error: ' + err); },
-  complete() { console.log('Completed'); }
-});
-
-// #enddocregion promise
-
-// #docregion interval
-
-import { interval } from 'rxjs';
-
-// Create an Observable that will publish a value on an interval
-const secondsCounter = interval(1000);
-// Subscribe to begin publishing values
-secondsCounter.subscribe(n =>
-  console.log(`It's been ${n} seconds since subscribing!`));
-
-// #enddocregion interval
-
-
-// #docregion event
-
-import { fromEvent } from 'rxjs';
-
-const el = document.getElementById('my-element');
-
-// Create an Observable that will publish mouse movements
-const mouseMoves = fromEvent(el, 'mousemove');
-
-// Subscribe to start listening for mouse-move events
-const subscription = mouseMoves.subscribe((evt: MouseEvent) => {
-  // Log coords of mouse movements
-  console.log(`Coords: ${evt.clientX} X ${evt.clientY}`);
-
-  // When the mouse is over the upper-left of the screen,
-  // unsubscribe to stop listening for mouse movements
-  if (evt.clientX < 40 && evt.clientY < 40) {
-    subscription.unsubscribe();
-  }
-});
-
-// #enddocregion event
-
-
+// #docplaster
+/*
+  Because of how the code is merged together using the doc regions,
+  we need to indent the imports with the function below.
+*/
+/* tslint:disable:no-shadowed-variable */
+/* tslint:disable:align */
 // #docregion ajax
-
-import { ajax } from 'rxjs/ajax';
+  import { ajax } from 'rxjs/ajax';
 
 // Create an Observable that will create an AJAX request
-const apiData = ajax('/api/data');
-// Subscribe to create the request
-apiData.subscribe(res => console.log(res.status, res.response));
-
 // #enddocregion ajax
-
-
+export function docRegionAjax(console, ajax) {
+  // #docregion ajax
+  const apiData = ajax('/api/data');
+  // Subscribe to create the request
+  apiData.subscribe(res => console.log(res.status, res.response));
+  // #enddocregion ajax
+}
diff --git a/aio/content/examples/service-worker-getting-started/src/app/handle-unrecoverable-state.service.ts b/aio/content/examples/service-worker-getting-started/src/app/handle-unrecoverable-state.service.ts
new file mode 100644
index 0000000000000..2754fa052a158
--- /dev/null
+++ b/aio/content/examples/service-worker-getting-started/src/app/handle-unrecoverable-state.service.ts
@@ -0,0 +1,17 @@
+import { Injectable } from '@angular/core';
+import { SwUpdate } from '@angular/service-worker';
+
+function notifyUser(message: string): void { }
+
+// #docregion sw-unrecoverable-state
+@Injectable()
+export class HandleUnrecoverableStateService {
+  constructor(updates: SwUpdate) {
+    updates.unrecoverable.subscribe(event => {
+      notifyUser(
+        `An error occurred that we cannot recover from:\n${event.reason}\n\n` +
+        'Please reload the page.');
+    });
+  }
+}
+// #enddocregion sw-unrecoverable-state
diff --git a/aio/content/examples/styleguide/src/05-17/app/heroes/hero-list/hero-list.component.avoid.ts b/aio/content/examples/styleguide/src/05-17/app/heroes/hero-list/hero-list.component.avoid.ts
index f0075129494d7..0b704d2b8787a 100644
--- a/aio/content/examples/styleguide/src/05-17/app/heroes/hero-list/hero-list.component.avoid.ts
+++ b/aio/content/examples/styleguide/src/05-17/app/heroes/hero-list/hero-list.component.avoid.ts
@@ -10,8 +10,8 @@ import { Hero } from '../shared/hero.model';
   template: `
     <section>
       Our list of heroes:
-      <hero-profile *ngFor="let hero of heroes" [hero]="hero">
-      </hero-profile>
+      <toh-hero *ngFor="let hero of heroes" [hero]="hero">
+      </toh-hero>
       Total powers: {{totalPowers}}<br>
       Average power: {{totalPowers / heroes.length}}
     </section>
diff --git a/aio/content/examples/testing/src/app/demo/demo.testbed.spec.ts b/aio/content/examples/testing/src/app/demo/demo.testbed.spec.ts
index a6bbd1aafc030..9510eb8f51c64 100644
--- a/aio/content/examples/testing/src/app/demo/demo.testbed.spec.ts
+++ b/aio/content/examples/testing/src/app/demo/demo.testbed.spec.ts
@@ -28,7 +28,7 @@ import {
   ComponentFixture, fakeAsync, inject, TestBed, tick, waitForAsync
 } from '@angular/core/testing';
 
-import { addMatchers, newEvent, click } from '../../testing';
+import { addMatchers, click } from '../../testing';
 
 export class NotProvided extends ValueService { /* example below */ }
 beforeEach(addMatchers);
@@ -274,9 +274,11 @@ describe('demo (with TestBed):', () => {
         expect(comp.name).toBe(expectedOrigName,
           `comp.name should still be ${expectedOrigName} after value change, before binding happens`);
 
-        // dispatch a DOM event so that Angular learns of input value change.
+        // Dispatch a DOM event so that Angular learns of input value change.
         // then wait while ngModel pushes input.box value to comp.name
-        input.dispatchEvent(newEvent('input'));
+        // In older browsers, such as IE, you might need a CustomEvent instead. See
+        // https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent/CustomEvent#Polyfill
+        input.dispatchEvent(new Event('input'));
         return fixture.whenStable();
       })
         .then(() => {
@@ -312,9 +314,11 @@ describe('demo (with TestBed):', () => {
       expect(comp.name).toBe(expectedOrigName,
         `comp.name should still be ${expectedOrigName} after value change, before binding happens`);
 
-      // dispatch a DOM event so that Angular learns of input value change.
+      // Dispatch a DOM event so that Angular learns of input value change.
       // then wait a tick while ngModel pushes input.box value to comp.name
-      input.dispatchEvent(newEvent('input'));
+      // In older browsers, such as IE, you might need a CustomEvent instead. See
+      // https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent/CustomEvent#Polyfill
+      input.dispatchEvent(new Event('input'));
       tick();
       expect(comp.name).toBe(expectedNewName,
         `After ngModel updates the model, comp.name should be ${expectedNewName} `);
@@ -335,10 +339,12 @@ describe('demo (with TestBed):', () => {
       // simulate user entering new name in input
       input.value = inputText;
 
-      // dispatch a DOM event so that Angular learns of input value change.
+      // Dispatch a DOM event so that Angular learns of input value change.
       // then wait a tick while ngModel pushes input.box value to comp.text
       // and Angular updates the output span
-      input.dispatchEvent(newEvent('input'));
+      // In older browsers, such as IE, you might need a CustomEvent instead. See
+      // https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent/CustomEvent#Polyfill
+      input.dispatchEvent(new Event('input'));
       tick();
       fixture.detectChanges();
       expect(span.textContent).toBe(expectedText, 'output span');
diff --git a/aio/content/examples/testing/src/app/hero/hero-detail.component.spec.ts b/aio/content/examples/testing/src/app/hero/hero-detail.component.spec.ts
index 0015c96d5225e..8f4ee4f6d7e11 100644
--- a/aio/content/examples/testing/src/app/hero/hero-detail.component.spec.ts
+++ b/aio/content/examples/testing/src/app/hero/hero-detail.component.spec.ts
@@ -3,7 +3,7 @@ import { ComponentFixture, fakeAsync, inject, TestBed, tick, waitForAsync } from
 import { Router } from '@angular/router';
 
 import {
-  ActivatedRoute, ActivatedRouteStub, asyncData, click, newEvent
+  ActivatedRoute, ActivatedRouteStub, asyncData, click
 } from '../../testing';
 
 import { Hero } from '../model/hero';
@@ -99,7 +99,10 @@ function overrideSetup() {
        const newName = 'New Name';
 
        page.nameInput.value = newName;
-       page.nameInput.dispatchEvent(newEvent('input'));  // tell Angular
+
+       // In older browsers, such as IE, you might need a CustomEvent instead. See
+       // https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent/CustomEvent#Polyfill
+       page.nameInput.dispatchEvent(new Event('input')); // tell Angular
 
        expect(component.hero.name).toBe(newName, 'component hero has new name');
        expect(hdsSpy.testHero.name).toBe(origName, 'service hero unchanged before save');
@@ -197,9 +200,10 @@ function heroModuleSetup() {
       // simulate user entering a new name into the input box
       nameInput.value = 'quick BROWN  fOx';
 
-      // dispatch a DOM event so that Angular learns of input value change.
-      // use newEvent utility function (not provided by Angular) for better browser compatibility
-      nameInput.dispatchEvent(newEvent('input'));
+      // Dispatch a DOM event so that Angular learns of input value change.
+      // In older browsers, such as IE, you might need a CustomEvent instead. See
+      // https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent/CustomEvent#Polyfill
+      nameInput.dispatchEvent(new Event('input'));
 
       // Tell Angular to update the display binding through the title pipe
       fixture.detectChanges();
diff --git a/aio/content/examples/testing/src/app/hero/hero-list.component.spec.ts b/aio/content/examples/testing/src/app/hero/hero-list.component.spec.ts
index b8c0278bf6428..b65eaada82aa8 100644
--- a/aio/content/examples/testing/src/app/hero/hero-list.component.spec.ts
+++ b/aio/content/examples/testing/src/app/hero/hero-list.component.spec.ts
@@ -6,7 +6,7 @@ import { DebugElement } from '@angular/core';
 
 import { Router } from '@angular/router';
 
-import { addMatchers, newEvent } from '../../testing';
+import { addMatchers } from '../../testing';
 import { HeroService } from '../model/hero.service';
 import { getTestHeroes, TestHeroService } from '../model/testing/test-hero.service';
 
@@ -53,7 +53,10 @@ describe('HeroListComponent', () => {
   it('should select hero on click', fakeAsync(() => {
        const expectedHero = HEROES[1];
        const li = page.heroRows[1];
-       li.dispatchEvent(newEvent('click'));
+
+       // In older browsers, such as IE, you might need a CustomEvent instead. See
+       // https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent/CustomEvent#Polyfill
+       li.dispatchEvent(new Event('click'));
        tick();
        // `.toEqual` because selectedHero is clone of expectedHero; see FakeHeroService
        expect(comp.selectedHero).toEqual(expectedHero);
@@ -62,7 +65,10 @@ describe('HeroListComponent', () => {
   it('should navigate to selected hero detail on click', fakeAsync(() => {
        const expectedHero = HEROES[1];
        const li = page.heroRows[1];
-       li.dispatchEvent(newEvent('click'));
+
+       // In older browsers, such as IE, you might need a CustomEvent instead. See
+       // https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent/CustomEvent#Polyfill
+       li.dispatchEvent(new Event('click'));
        tick();
 
        // should have navigated
diff --git a/aio/content/examples/testing/src/app/shared/highlight.directive.spec.ts b/aio/content/examples/testing/src/app/shared/highlight.directive.spec.ts
index bd068c5c685ba..1ab8d68a6c7aa 100644
--- a/aio/content/examples/testing/src/app/shared/highlight.directive.spec.ts
+++ b/aio/content/examples/testing/src/app/shared/highlight.directive.spec.ts
@@ -3,7 +3,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 
 import { HighlightDirective } from './highlight.directive';
-import { newEvent } from '../../testing';
 
 // #docregion test-component
 @Component({
@@ -59,9 +58,12 @@ describe('HighlightDirective', () => {
     const input = des[2].nativeElement as HTMLInputElement;
     expect(input.style.backgroundColor).toBe('cyan', 'initial backgroundColor');
 
-    // dispatch a DOM event so that Angular responds to the input value change.
     input.value = 'green';
-    input.dispatchEvent(newEvent('input'));
+
+    // Dispatch a DOM event so that Angular responds to the input value change.
+    // In older browsers, such as IE, you might need a CustomEvent instead. See
+    // https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent/CustomEvent#Polyfill
+    input.dispatchEvent(new Event('input'));
     fixture.detectChanges();
 
     expect(input.style.backgroundColor).toBe('green', 'changed backgroundColor');
diff --git a/aio/content/examples/testing/src/testing/index.ts b/aio/content/examples/testing/src/testing/index.ts
index e9e139a9064b2..bcea4482a219b 100644
--- a/aio/content/examples/testing/src/testing/index.ts
+++ b/aio/content/examples/testing/src/testing/index.ts
@@ -14,18 +14,6 @@ export function advance(f: ComponentFixture<any>): void {
   f.detectChanges();
 }
 
-/**
- * Create custom DOM event the old fashioned way
- *
- * https://developer.mozilla.org/en-US/docs/Web/API/Event/initEvent
- * Although officially deprecated, some browsers (phantom) don't accept the preferred "new Event(eventName)"
- */
-export function newEvent(eventName: string, bubbles = false, cancelable = false) {
-  const evt = document.createEvent('CustomEvent');  // MUST be 'CustomEvent'
-  evt.initCustomEvent(eventName, bubbles, cancelable, null);
-  return evt;
-}
-
 // See https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent/button
 // #docregion click-event
 /** Button events to pass to `DebugElement.triggerEventHandler` for RouterLink event handler */
diff --git a/aio/content/examples/toh-pt6/src/app/hero-detail/hero-detail.component.ts b/aio/content/examples/toh-pt6/src/app/hero-detail/hero-detail.component.ts
index 6bcb8f014d0e1..8c3eab261ae52 100644
--- a/aio/content/examples/toh-pt6/src/app/hero-detail/hero-detail.component.ts
+++ b/aio/content/examples/toh-pt6/src/app/hero-detail/hero-detail.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, Input } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { Location } from '@angular/common';
 
@@ -11,7 +11,7 @@ import { HeroService } from '../hero.service';
   styleUrls: [ './hero-detail.component.css' ]
 })
 export class HeroDetailComponent implements OnInit {
-  @Input() hero: Hero;
+  hero: Hero;
 
   constructor(
     private route: ActivatedRoute,
diff --git a/aio/content/examples/tslint.json b/aio/content/examples/tslint.json
index bf1abc0372d71..4cfd9cae6bebd 100644
--- a/aio/content/examples/tslint.json
+++ b/aio/content/examples/tslint.json
@@ -1,5 +1,8 @@
 {
   "extends": "tslint:recommended",
+  "rulesDirectory": [
+    "codelyzer"
+  ],
   "rules": {
     "align": {
       "options": [
@@ -13,22 +16,6 @@
     "deprecation": {
       "severity": "warning"
     },
-    "component-class-suffix": true,
-    "component-selector": [
-      true,
-      "element",
-      // TODO: Fix the code and change the prefix to `"app"` (or whatever makes sense).
-      "",
-      "kebab-case"
-    ],
-    "contextual-lifecycle": true,
-    "directive-class-suffix": true,
-    "directive-selector": [
-      true,
-      "attribute",
-      ["app", "toh"],
-      "camelCase"
-    ],
     "eofline": true,
     "import-blacklist": [
       true,
@@ -56,6 +43,8 @@
         ]
       }
     ],
+    // TODO(gkalpak): Fix the code and enable this.
+    // "no-any": true,
     "no-console": [
       true,
       "debug",
@@ -95,6 +84,11 @@
         "named": "never"
       }
     },
+    // TODO(gkalpak): Fix the code and enable this.
+    // "typedef": [
+    //   true,
+    //   "call-signature"
+    // ],
     "typedef-whitespace": {
       "options": [
         {
@@ -130,6 +124,9 @@
         "check-typecast"
       ]
     },
+    "component-class-suffix": true,
+    "contextual-lifecycle": true,
+    "directive-class-suffix": true,
     "no-conflicting-lifecycle": true,
     "no-host-metadata-property": true,
     "no-input-rename": true,
@@ -141,9 +138,19 @@
     "template-banana-in-box": true,
     "template-no-negated-async": true,
     "use-lifecycle-interface": true,
-    "use-pipe-transform-interface": true
-  },
-  "rulesDirectory": [
-    "codelyzer"
-  ]
+    "use-pipe-transform-interface": true,
+    "directive-selector": [
+      true,
+      "attribute",
+      ["app", "toh"],
+      "camelCase"
+    ],
+    "component-selector": [
+      true,
+      "element",
+      // TODO: Fix the code and change the prefix to `"app"` (or whatever makes sense).
+      "",
+      "kebab-case"
+    ]
+  }
 }
diff --git a/aio/content/examples/upgrade-lazy-load-ajs/src/app/angularjs-app/index.ts b/aio/content/examples/upgrade-lazy-load-ajs/src/app/angularjs-app/index.ts
index 4d43a7fa09e8c..51eed5229c196 100644
--- a/aio/content/examples/upgrade-lazy-load-ajs/src/app/angularjs-app/index.ts
+++ b/aio/content/examples/upgrade-lazy-load-ajs/src/app/angularjs-app/index.ts
@@ -1,9 +1,7 @@
 import * as angular from 'angular';
 import 'angular-route';
 
-const appName = 'myApp';
-
-angular.module(appName, [
+const appModule = angular.module('myApp', [
   'ngRoute'
 ])
 .config(['$routeProvider', '$locationProvider',
@@ -25,5 +23,5 @@ angular.module(appName, [
 );
 
 export function bootstrap(el: HTMLElement) {
-  return angular.bootstrap(el,  [appName]);
+  return angular.bootstrap(el,  [appModule.name]);
 }
diff --git a/aio/content/guide/angular-compiler-options.md b/aio/content/guide/angular-compiler-options.md
index 90101d8eff210..390147cc1dd6c 100644
--- a/aio/content/guide/angular-compiler-options.md
+++ b/aio/content/guide/angular-compiler-options.md
@@ -31,7 +31,7 @@ For example:
 
 ```json
 {
-  "extends": "../tsconfig.base.json",
+  "extends": "../tsconfig.json",
   "compilerOptions": {
     "experimentalDecorators": true,
     ...
diff --git a/aio/content/guide/aot-compiler.md b/aio/content/guide/aot-compiler.md
index df846a9209d31..9e8a7f67c8217 100644
--- a/aio/content/guide/aot-compiler.md
+++ b/aio/content/guide/aot-compiler.md
@@ -62,7 +62,7 @@ In the following example, the `@Component()` metadata object and the class const
 @Component({
   selector: 'app-typical',
   template: '<div>A typical component for {{data.name}}</div>'
-)}
+})
 export class TypicalComponent {
   @Input() data: TypicalData;
   constructor(private someService: SomeService) { ... }
diff --git a/aio/content/guide/architecture-components.md b/aio/content/guide/architecture-components.md
index bedc446a511cf..df3de2d587296 100644
--- a/aio/content/guide/architecture-components.md
+++ b/aio/content/guide/architecture-components.md
@@ -89,7 +89,7 @@ This example from the `HeroListComponent` template uses three of these forms.
 
 <code-example path="architecture/src/app/hero-list.component.1.html" header="src/app/hero-list.component.html (binding)" region="binding"></code-example>
 
-* The `{{hero.name}}` [*interpolation*](guide/displaying-data#interpolation)
+* The `{{hero.name}}` [*interpolation*](guide/interpolation)
 displays the component's `hero.name` property value within the `<li>` element.
 
 * The `[hero]` [*property binding*](guide/property-binding) passes the value of
@@ -166,8 +166,8 @@ The example template uses two built-in structural directives to add application
 
 <code-example path="architecture/src/app/hero-list.component.1.html" header="src/app/hero-list.component.html (structural)" region="structural"></code-example>
 
-* [`*ngFor`](guide/displaying-data#ngFor) is an iterative; it tells Angular to stamp out one `<li>` per hero in the `heroes` list.
-* [`*ngIf`](guide/displaying-data#ngIf) is a conditional; it includes the `HeroDetail` component only if a selected hero exists.
+* [`*ngFor`](guide/structural-directives#inside-ngfor) is an iterative; it tells Angular to stamp out one `<li>` per hero in the `heroes` list.
+* [`*ngIf`](guide/structural-directives#ngif-case-study) is a conditional; it includes the `HeroDetail` component only if a selected hero exists.
 
 #### Attribute directives
 
diff --git a/aio/content/guide/binding-syntax.md b/aio/content/guide/binding-syntax.md
index 0bd41cf77d7ce..d5f4747cdff1c 100644
--- a/aio/content/guide/binding-syntax.md
+++ b/aio/content/guide/binding-syntax.md
@@ -154,7 +154,7 @@ Attributes can be changed by `setAttribute()`, which re-initializes correspondin
 </div>
 
 For more information, see the [MDN Interfaces documentation](https://developer.mozilla.org/en-US/docs/Web/API#Interfaces) which has API docs for all the standard DOM elements and their properties.
-Comparing the [`<td>` attributes](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/td) attributes to the [`<td>` properties](https://developer.mozilla.org/en-US/docs/Web/API/HTMLTableCellElement) provides a helpful example for differentiation.
+Comparing the [`<td>` attributes](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/td) to the [`<td>` properties](https://developer.mozilla.org/en-US/docs/Web/API/HTMLTableCellElement) provides a helpful example for differentiation.
 In particular, you can navigate from the attributes page to the properties via "DOM interface" link, and navigate the inheritance hierarchy up to `HTMLTableCellElement`.
 
 
@@ -195,7 +195,7 @@ To control the state of the button, set the `disabled` *property*,
 
 <div class="alert is-helpful">
 
-Though you could technically set the `[attr.disabled]` attribute binding, the values are different in that the property binding requires to a boolean value, while its corresponding attribute binding relies on whether the value is `null` or not. Consider the following:
+Though you could technically set the `[attr.disabled]` attribute binding, the values are different in that the property binding requires to be a boolean value, while its corresponding attribute binding relies on whether the value is `null` or not. Consider the following:
 
 ```html
 <input [disabled]="condition ? true : false">
diff --git a/aio/content/guide/browser-support.md b/aio/content/guide/browser-support.md
index b4e315b97b2aa..a26ce9bab418d 100644
--- a/aio/content/guide/browser-support.md
+++ b/aio/content/guide/browser-support.md
@@ -53,18 +53,7 @@ Angular supports most recent browsers. This includes the following specific vers
       IE
     </td>
     <td>
-      <div> 11, 10*, 9* ("compatibility view" mode not supported) </div>
-      <div>*deprecated in v10, see the {@link guide/deprecations#ie-9-10-and-mobile deprecations guide}.</div>
-    </td>
-  </tr>
- <tr>
-   <tr>
-    <td>
-      IE Mobile*
-    </td>
-    <td>
-      11
-      <div>*deprecated in v10, see the {@link guide/deprecations#ie-9-10-and-mobile deprecations guide}.</div>
+      <div>11</div>
     </td>
   </tr>
  <tr>
@@ -185,7 +174,7 @@ These are the polyfills required to run an Angular application on each supported
 
     <td>
       Chrome, Firefox, Edge, <br>
-      Safari, Android, IE 10+
+      Safari, Android, IE 11
     </td>
 
     <td>
@@ -196,20 +185,6 @@ These are the polyfills required to run an Angular application on each supported
 
   </tr>
 
-  <tr style="vertical-align: top">
-
-    <td>
-      IE 9
-    </td>
-
-    <td>
-
-      ES2015<br>[classList](guide/browser-support#classlist)
-
-    </td>
-
-  </tr>
-
 </table>
 
 
@@ -272,30 +247,7 @@ Some features of Angular may require additional polyfills.
     </td>
 
     <td>
-      IE 10, IE 11
-    </td>
-
-  </tr>
-
-  <tr style="vertical-align: top">
-
-    <td>
-
-      [Http](guide/http) when sending and receiving binary data
-    </td>
-
-    <td>
-
-      [Typed&nbsp;Array](guide/browser-support#typedarray)<br>
-
-      [Blob](guide/browser-support#blob)<br>
-
-      [FormData](guide/browser-support#formdata)
-
-    </td>
-
-    <td>
-      IE 9
+      IE 11
     </td>
 
   </tr>
@@ -437,60 +389,6 @@ The following polyfills are used to test the framework itself. They are a good s
 
   </tr>
 
-  <tr>
-
-    <td>
-
-      <a id='typedarray' href="https://github.com/inexorabletash/polyfill/blob/master/typedarray.js">Typed Array</a>
-
-    </td>
-
-    <td>
-      MIT
-    </td>
-
-    <td>
-      4KB
-    </td>
-
-  </tr>
-
-  <tr>
-
-    <td>
-
-       <a id='blob' href="https://github.com/eligrey/Blob.js">Blob</a>
-
-    </td>
-
-    <td>
-      MIT
-    </td>
-
-    <td>
-      1.3KB
-    </td>
-
-  </tr>
-
-  <tr>
-
-    <td>
-
-       <a id='formdata' href="https://github.com/francois2metz/html5-formdata">FormData</a>
-
-    </td>
-
-    <td>
-      MIT
-    </td>
-
-    <td>
-      0.4KB
-    </td>
-
-  </tr>
-
 </table>
 
 
diff --git a/aio/content/guide/built-in-directives.md b/aio/content/guide/built-in-directives.md
index d1a954169d11f..987939144b0ef 100644
--- a/aio/content/guide/built-in-directives.md
+++ b/aio/content/guide/built-in-directives.md
@@ -194,7 +194,7 @@ which explains the following:
 * Using [`<ng-container>`](guide/structural-directives#ngcontainer "<ng-container>")
 to group elements when there is no suitable host element for the directive.
 * How to write your own structural directive.
-* That you can only apply [one structural directive](guide/structural-directives#one-per-element "one per host element") to an element.
+* Why you [can only apply one structural directive](guide/structural-directives#one-per-element "one per host element") to an element.
 
 </div>
 
@@ -281,7 +281,7 @@ You define a block of HTML that defines how a single item should be displayed
 and then you tell Angular to use that block as a template for rendering each item in the list.
 The text assigned to `*ngFor` is the instruction that guides the repeater process.
 
-The following example shows `NgFor` applied to a simple `<div>`. (Don't forget the asterisk (`*`) in front of `ngFor`.)
+The following example shows `NgFor` applied to a simple `<div>`.
 
 <code-example path="built-in-directives/src/app/app.component.html" region="NgFor-1" header="src/app/app.component.html"></code-example>
 
diff --git a/aio/content/guide/component-overview.md b/aio/content/guide/component-overview.md
new file mode 100644
index 0000000000000..a0ecb998dddd9
--- /dev/null
+++ b/aio/content/guide/component-overview.md
@@ -0,0 +1,182 @@
+# Angular Components Overview
+
+Components are the main building block for Angular applications. Each component consists of:
+
+* An HTML template that declares what renders on the page
+* A Typescript class that defines behavior
+* A CSS selector that defines how the component is used in a template
+* Optionally, CSS styles applied to the template
+
+This topic describes how to create and configure an Angular component.
+
+<div class="alert is-helpful">
+
+To view or download the example code used in this topic, see the <live-example></live-example>.
+
+</div>
+
+## Prerequisites
+
+To create a component, verify that you have met the following prerequisites:
+
+1. Install the Angular CLI.
+1. Create an Angular project.
+   If you don't have a project, you can create one using `ng new <project-name>`, where `<project-name>` is the name of your Angular application.
+
+## Creating a component
+
+The easiest way to create a component is with the Angular CLI. You can also create a component manually.
+
+### Creating a component using the Angular CLI
+
+To create a component using the Angular CLI:
+
+1. From a terminal window, navigate to the directory containing your application.
+1. Run the `ng generate component <component-name>` command, where `<component-name>` is the name of your new component.
+
+By default, this command creates the following:
+
+* A folder named after the component
+* A component file, `<component-name>.component.ts`
+* A template file, `<component-name>.component.ts`
+* A CSS file, `<component-name>.component.css`
+* A testing specification file, `<component-name>.component.spec.ts`
+
+Where `<component-name>` is the name of your component.
+
+<div class="alert is-helpful">
+
+You can change how `ng generate component` creates new components.
+For more information, see [ng generate component](cli/generate#component-command) in the Angular CLI documentation.
+
+</div>
+
+### Creating a component manually
+
+Although the Angular CLI is the easiest way to create an Angular component, you can also create a component manually.
+This section describes how to create the core component file within an existing Angular project.
+
+To create a new component manually:
+
+1. Navigate to your Angular project directory.
+1. Create a new file, `<component-name>.component.ts`.
+1. At the top of the file, add the following import statement.
+
+   <code-example
+        path="component-overview/src/app/component-overview/component-overview.component.ts"
+        region="import">
+   </code-example>
+
+1. After the `import` statement, add a `@Component` decorator.
+
+   <code-example
+        path="component-overview/src/app/component-overview/component-overview.component.ts"
+        region="decorator-skeleton">
+   </code-example>
+
+1. Choose a CSS selector for the component.
+
+   <code-example
+        path="component-overview/src/app/component-overview/component-overview.component.ts"
+        region="selector">
+   </code-example>
+
+   For more information on choosing a selector, see [Specifying a component's selector](#specifying-a-components-css-selector).
+
+1. Define the HTML template that the component uses to display information.
+   In most cases, this template is a separate HTML file.
+
+   <code-example
+        path="component-overview/src/app/component-overview/component-overview.component.ts"
+        region="templateUrl">
+   </code-example>
+
+   For more information on defining a component's template, see [Defining a component's template](#defining-a-components-template).
+
+1. Select the styles for the component's template.
+   In most cases, you define the styles for you component's template in a separate file.
+
+   <code-example
+        path="component-overview/src/app/component-overview/component-overview.component.ts"
+        region="decorator">
+   </code-example>
+
+1. Add a `class` statement that includes the code for the component.
+
+   <code-example
+        path="component-overview/src/app/component-overview/component-overview.component.ts"
+        region="class">
+   </code-example>
+
+## Specifying a component's CSS selector
+
+Every component requires a CSS _selector_. A selector instructs Angular to instantiate this component wherever it finds the corresponding tag in template HTML. For example, consider a component, `hello-world.component.ts` that defines its selector as `app-hello-world`. This selector instructs angular to instantiate this component any time the tag, `<app-hellow-world>` in a template.
+
+To specify a component's selector, add a `selector` statement to the `@Component` decorator.
+
+<code-example
+    path="component-overview/src/app/component-overview/component-overview.component.ts"
+    region="selector">
+</code-example>
+
+## Defining a component's template
+
+A template is a block of HTML that tells Angular how to render the component in your application.
+You can define a template for your component in one of two ways: by referencing an external file, or directly within the component.
+
+To define a template as an external file, add a `templateUrl` property to the `@Component` decorator.
+
+<code-example
+    path="component-overview/src/app/component-overview/component-overview.component.ts"
+    region="templateUrl">
+</code-example>
+
+To define a template within the component, add a `template` property to the `@Component` decorator that contains the HTML you want to use.
+
+<code-example
+    path="component-overview/src/app/component-overview/component-overview.component.1.ts"
+    region="template">
+</code-example>
+
+If your want your template to span multiple lines, you can use backticks (<code> ` </code>).
+For example:
+
+<code-example
+    path="component-overview/src/app/component-overview/component-overview.component.2.ts"
+    region="templatebacktick">
+</code-example>
+
+<div class="alert is-helpful">
+
+An Angular component requires a template defined using `template` or `templateUrl`. You cannot have both statements in a component.
+
+</div>
+
+## Declaring a component's styles
+
+You can declare component styles uses for its template in one of two ways: by referencing an external file, or directly within the component.
+
+To declare the styles for a component in a separate file, add a `stylesUrls` property to the `@Component` decorator.
+
+<code-example
+    path="component-overview/src/app/component-overview/component-overview.component.ts"
+    region="decorator">
+</code-example>
+
+To select the styles within the component, add a `styles` property to the `@Component` decorator that contains the styles you want to use.
+
+<code-example
+    path="component-overview/src/app/component-overview/component-overview.component.3.ts"
+    region="styles">
+</code-example>
+
+The `styles` property takes an array of strings that contain the CSS rule declarations.
+
+
+## Next steps
+
+* For an archictural overview of components, see [Introduction to components and templates](guide/architecture-components).
+* For additional options you can use when creating a component, see [Component](api/core/Component) in the API Reference.
+* For more information on styling components, see [Component styles](guide/component-styles).
+* For more information on templates, see [Template syntax](guide/template-syntax).
+
diff --git a/aio/content/guide/component-styles.md b/aio/content/guide/component-styles.md
index 03677ce0ce8c8..dc7b1b9f77fe7 100644
--- a/aio/content/guide/component-styles.md
+++ b/aio/content/guide/component-styles.md
@@ -119,13 +119,13 @@ The `/deep/` combinator also has the aliases `>>>`, and `::ng-deep`.
 
 Use `/deep/`, `>>>` and `::ng-deep` only with *emulated* view encapsulation.
 Emulated is the default and most commonly used view encapsulation. For more information, see the
-[Controlling view encapsulation](guide/component-styles#view-encapsulation) section.
+[View Encapsulation](guide/view-encapsulation) section.
 
 </div>
 
 <div class="alert is-important">
 
-The shadow-piercing descendant combinator is deprecated and [support is being removed from major browsers](https://www.chromestatus.com/features/6750456638341120) and tools.
+The shadow-piercing descendant combinator is deprecated and [support is being removed from major browsers](https://www.chromestatus.com/feature/6750456638341120) and tools.
 As such we plan to drop support in Angular (for all 3 of `/deep/`, `>>>` and `::ng-deep`).
 Until then `::ng-deep` should be preferred for a broader compatibility with the tools.
 
@@ -267,89 +267,3 @@ as explained in the [CLI wiki](https://github.com/angular/angular-cli/wiki/stori
 Style strings added to the `@Component.styles` array _must be written in CSS_ because the CLI cannot apply a preprocessor to inline styles.
 
 </div>
-
-{@a view-encapsulation}
-
-## View encapsulation
-
-As discussed earlier, component CSS styles are encapsulated into the component's view and don't
-affect the rest of the application.
-
-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:
-
-* `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 [Inspecting generated CSS](guide/component-styles#inspect-generated-css) below.
-
-* `None` means that Angular does no view encapsulation.
-  Angular adds the CSS to the global styles.
-  The scoping rules, isolations, and protections discussed earlier don't apply.
-  This is essentially the same as pasting the component's styles into the HTML.
-
-To set the components encapsulation mode, use the `encapsulation` property in the component metadata:
-
-<code-example path="component-styles/src/app/quest-summary.component.ts" region="encapsulation.native" header="src/app/quest-summary.component.ts"></code-example>
-
-`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.
-
-{@a inspect-generated-css}
-
-## Inspecting generated CSS
-
-When using emulated view encapsulation, Angular preprocesses
-all component styles so that they approximate the standard shadow CSS scoping rules.
-
-In the DOM of a running Angular application with emulated view
-encapsulation enabled, each DOM element has some extra attributes
-attached to it:
-
-<code-example format="">
-  &lt;hero-details _nghost-pmm-5>
-    &lt;h2 _ngcontent-pmm-5>Mister Fantastic&lt;/h2>
-    &lt;hero-team _ngcontent-pmm-5 _nghost-pmm-6>
-      &lt;h3 _ngcontent-pmm-6>Team&lt;/h3>
-    &lt;/hero-team>
-  &lt;/hero-detail>
-
-</code-example>
-
-There are two kinds of generated attributes:
-
-* An element that would be a shadow DOM host in native encapsulation has a
-  generated `_nghost` attribute. This is typically the case for component host elements.
-* An element within a component's view has a `_ngcontent` attribute
-that identifies to which host's emulated shadow DOM this element belongs.
-
-The exact values of these attributes aren't important. They are automatically
-generated and you never refer to them in application code. But they are targeted
-by the generated component styles, which are in the `<head>` section of the DOM:
-
-<code-example format="">
-  [_nghost-pmm-5] {
-    display: block;
-    border: 1px solid black;
-  }
-
-  h3[_ngcontent-pmm-6] {
-    background-color: white;
-    border: 1px solid #777;
-  }
-</code-example>
-
-These styles are post-processed so that each selector is augmented
-with `_nghost` or `_ngcontent` attribute selectors.
-These extra selectors enable the scoping rules described in this page.
diff --git a/aio/content/guide/creating-libraries.md b/aio/content/guide/creating-libraries.md
index f35ac775835c9..7370486f9958a 100644
--- a/aio/content/guide/creating-libraries.md
+++ b/aio/content/guide/creating-libraries.md
@@ -26,7 +26,7 @@ The `ng generate` command creates the `projects/my-lib` folder in your workspace
 
 </div>
 
-When you generate a new library, the workspace configuration file, `angular.json`, is updated with a project of type 'library'.
+When you generate a new library, the workspace configuration file, `angular.json`, is updated with a project of type `library`.
 
 <code-example format="json">
 "projects": {
@@ -109,7 +109,7 @@ If you want a dropdown that would contain different passed-in values each time,
 
 Suppose you want to read a configuration file and then generate a form based on that configuration.
 If that form will need additional customization by the developer who is using your library, it might work best as a schematic.
-However, if the forms will always be the same and not need much customization by developers, then you could create a dynamic component that takes the configuration and generates the form.
+However, if the form will always be the same and not need much customization by developers, then you could create a dynamic component that takes the configuration and generates the form.
 In general, the more complex the customization, the more useful the schematic approach.
 
 To learn more, see [Schematics Overview](guide/schematics) and [Schematics for Libraries](guide/schematics-for-libraries).
@@ -156,7 +156,7 @@ The library must be rebuilt on every change.
 When linking a library, make sure that the build step runs in watch mode, and that the library's `package.json` configuration points at the correct entry points.
 For example, `main` should point at a JavaScript file, not a TypeScript file.
 
-## Use TypeScript path mapping for peer dependencies
+### Use TypeScript path mapping for peer dependencies
 
 Angular libraries should list all `@angular/*` dependencies as peer dependencies.
 This ensures that when modules ask for Angular, they all get the exact same module.
diff --git a/aio/content/guide/deployment.md b/aio/content/guide/deployment.md
index 0bdbef63e40a3..f3e1432723963 100644
--- a/aio/content/guide/deployment.md
+++ b/aio/content/guide/deployment.md
@@ -97,7 +97,7 @@ For the simplest deployment, create a production build and copy the output direc
   </code-example>
 
 
-2. Copy _everything_ within the output folder (`dist/` by default) to a folder on the server.
+2. Copy _everything_ within the output folder (`dist/project-name/` by default) to a folder on the server.
 
 3. Configure the server to redirect requests for missing files to `index.html`.
 Learn more about server-side redirects [below](#fallback).
@@ -211,11 +211,11 @@ modified to serve `index.html`:
   # .
   # -- server.rb
   # -- public
-  #    |-- dist
+  #    |-- project-name
   #        |-- index.html
 
   get '/' do
-      folderDir = settings.public_folder + '/dist'  # ng build output folder
+      folderDir = settings.public_folder + '/project-name'  # ng build output folder
       send_file File.join(folderDir, 'index.html')
   end
   ```
@@ -383,11 +383,11 @@ Build your app for production _including the source maps_
 
 </code-example>
 
-List the generated bundles in the `dist/` folder.
+List the generated bundles in the `dist/project-name/` folder.
 
 <code-example language="none" class="code-shell">
 
-  ls dist/*.bundle.js
+  ls dist/project-name/*.js
 
 </code-example>
 
@@ -396,7 +396,7 @@ The following example displays the graph for the _main_ bundle.
 
 <code-example language="none" class="code-shell">
 
-  node_modules/.bin/source-map-explorer dist/main.*.bundle.js
+  node_modules/.bin/source-map-explorer dist/project-name/main*
 
 </code-example>
 
@@ -511,9 +511,9 @@ Each script tag has a `type="module"` or `nomodule` attribute. Browsers with nat
 
 To include differential loading in your application builds, you must configure the Browserslist and TypeScript configuration files in your application project.
 
-The following examples show a `browserlistrc` and `tsconfig.json` file for a newly created Angular application. In this configuration, legacy browsers such as IE 9-11 are ignored, and the compilation target is ES2015.
+The following examples show a `.browserslistrc` and `tsconfig.json` file for a newly created Angular application. In this configuration, legacy browsers such as IE 9-11 are ignored, and the compilation target is ES2015.
 
-<code-example language="none" header="browserslistrc">
+<code-example language="none" header=".browserslistrc">
 # This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
 # For additional information regarding the format and rule options, please see:
 # https://github.com/browserslist/browserslist#queries
@@ -527,10 +527,10 @@ The following examples show a `browserlistrc` and `tsconfig.json` file for a new
 last 1 Chrome version
 last 1 Firefox version
 last 2 Edge major versions
-last 2 Safari major version
+last 2 Safari major versions
 last 2 iOS major versions
 Firefox ESR
-not IE 9-11 # For IE 9-11 support, remove 'not'.
+not IE 11 # Angular supports IE 11 only as an opt-in. To opt-in, remove the 'not' prefix on this line.
 </code-example>
 
 <code-example language="json" header="tsconfig.json">
diff --git a/aio/content/guide/deprecations.md b/aio/content/guide/deprecations.md
index d4e2320411bfb..2a2c04d720589 100644
--- a/aio/content/guide/deprecations.md
+++ b/aio/content/guide/deprecations.md
@@ -38,18 +38,14 @@ v9 - v12
 | `@angular/bazel`              | [`Bazel builder and schematics`](#bazelbuilder)                               | v10 |
 | `@angular/common`             | [`ReflectiveInjector`](#reflectiveinjector)                                   | <!--v8--> v11 |
 | `@angular/common`             | [`CurrencyPipe` - `DEFAULT_CURRENCY_CODE`](api/common/CurrencyPipe#currency-code-deprecation) | <!--v9--> v11 |
-| `@angular/core`               | [`CollectionChangeRecord`](#core)                                             | <!--v7--> v11 |
 | `@angular/core`               | [`DefaultIterableDiffer`](#core)                                              | <!--v7--> v11 |
 | `@angular/core`               | [`ReflectiveKey`](#core)                                                      | <!--v8--> v11 |
 | `@angular/core`               | [`RenderComponentType`](#core)                                                | <!--v7--> v11 |
-| `@angular/core`               | [`ViewEncapsulation.Native`](#core)                                           | <!--v6--> v11 |
 | `@angular/core`               | [`WrappedValue`](#core)                                                       | <!--v10--> v12 |
 | `@angular/forms`              | [`ngModel` with reactive forms](#ngmodel-reactive)                            | <!--v6--> v11 |
-| `@angular/router`             | [`preserveQueryParams`](#router)                                              | <!--v7--> v11 |
 | `@angular/upgrade`            | [`@angular/upgrade`](#upgrade)                                                | <!--v8--> v11 |
 | `@angular/upgrade`            | [`getAngularLib`](#upgrade-static)                                            | <!--v8--> v11 |
 | `@angular/upgrade`            | [`setAngularLib`](#upgrade-static)                                            | <!--v8--> v11 |
-| `@angular/platform-webworker` | [All entry points](api/platform-webworker)                                    | <!--v8--> v11 |
 | template syntax               | [`<template`>](#template-tag)                                                 | <!--v7--> v11 |
 | polyfills                     | [reflect-metadata](#reflect-metadata)                                         | <!--v8--> v11 |
 | npm package format            | [`esm5` and `fesm5` entry-points in @angular/* npm packages](guide/deprecations#esm5-fesm5) | <!-- v9 --> v11 |
@@ -61,7 +57,6 @@ v9 - v12
 | `@angular/core/testing`       | [`async`](#testing)                                                     | <!--v9--> v12 |
 | `@angular/router`             | [`ActivatedRoute` params and `queryParams` properties](#activatedroute-props) | unspecified |
 | template syntax               | [`/deep/`, `>>>`, and `::ng-deep`](#deep-component-style-selector)            | <!--v7--> unspecified |
-| browser support               | [`IE 9 and 10, IE mobile`](#ie-9-10-and-mobile)                               | <!--v10--> v11 |
 
 For information about Angular CDK and Angular Material deprecations, see the [changelog](https://github.com/angular/components/blob/master/CHANGELOG.md).
 
@@ -89,11 +84,9 @@ Tip: In the [API reference section](api) of this doc site, deprecated APIs are i
 
 | API | Replacement | Deprecation announced | Notes |
 | --- | ----------- | --------------------- | ----- |
-| [`CollectionChangeRecord`](api/core/CollectionChangeRecord) | [`IterableChangeRecord`](api/core/IterableChangeRecord) | v4 | none |
 | [`DefaultIterableDiffer`](api/core/DefaultIterableDiffer) | n/a | v4 | Not part of public API. |
 | [`ReflectiveInjector`](api/core/ReflectiveInjector) | [`Injector.create`](api/core/Injector#create)  | v5 | See [`ReflectiveInjector`](#reflectiveinjector) |
 | [`ReflectiveKey`](api/core/ReflectiveKey) | none | v5 | none |
-| [`ViewEncapsulation.Native`](api/core/ViewEncapsulation#Native) | [`ViewEncapsulation.ShadowDom`](api/core/ViewEncapsulation#ShadowDom) | v6 | Use the native encapsulation mechanism of the renderer. See [view.ts](https://github.com/angular/angular/blob/3e992e18ebf51d6036818f26c3d77b52d3ec48eb/packages/core/src/metadata/view.ts#L32).
 | [`defineInjectable`](api/core/defineInjectable) | `ɵɵdefineInjectable` | v8 | Used only in generated code. No source code should depend on this API. |
 | [`entryComponents`](api/core/NgModule#entryComponents) | none | v9 | See [`entryComponents`](#entryComponents) |
 | [`ANALYZE_FOR_ENTRY_COMPONENTS`](api/core/ANALYZE_FOR_ENTRY_COMPONENTS) | none | v9 | See [`ANALYZE_FOR_ENTRY_COMPONENTS`](#entryComponents) |
@@ -119,26 +112,6 @@ Tip: In the [API reference section](api) of this doc site, deprecated APIs are i
 | --- | ----------- | --------------------- | ----- |
 | [`ngModel` with reactive forms](#ngmodel-reactive) | [`FormControlDirective`](api/forms/FormControlDirective) | v6 | none |
 
-{@a router}
-### @angular/router
-
-| API | Replacement | Deprecation announced | Notes |
-| --- | ----------- | --------------------- | ----- |
-| [`preserveQueryParams`](api/router/NavigationExtras#preserveQueryParams) | [`queryParamsHandling`](api/router/NavigationExtras#queryParamsHandling) | v4 | none |
-
-{@a platform-webworker}
-### @angular/platform-webworker
-
-| API | Replacement | Deprecation announced | Notes |
-| --- | ----------- | --------------------- | ----- |
-| [All entry points](api/platform-webworker) | none | v8 | See [platform-webworker](#webworker-apps). |
-
-{@a platform-webworker-dynamic}
-### @angular/platform-webworker-dynamic
-
-| API | Replacement | Deprecation announced | Notes |
-| --- | ----------- | --------------------- | ----- |
-| [All entry points](api/platform-webworker-dynamic) | none | v8 | See [platform-webworker](#webworker-apps). |
 
 {@a upgrade}
 ### @angular/upgrade
@@ -394,28 +367,6 @@ These two properties have subtle differences, so switching to `textContent` unde
 
 All of the `wtf*` APIs are deprecated and will be removed in a future version.
 
-{@a webworker-apps}
-### Running Angular applications in platform-webworker
-
-The `@angular/platform-*` packages enable Angular to be run in different contexts. For examples,
-`@angular/platform-server` enables Angular to be run on the server, and `@angular/platform-browser`
-enables Angular to be run in a web browser.
-
-`@angular/platform-webworker` was introduced in Angular version 2 as an experiment in leveraging
-Angular's rendering architecture to run an entire web application in a
-[web worker](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API). We've learned a lot
-from this experiment and have come to the conclusion that running the entire application in a web
-worker is not the best strategy for most applications.
-
-Going forward, we will focus our efforts related to web workers around their primary use case of
-offloading CPU-intensive, non-critical work needed for initial rendering (such as in-memory search
-and image processing). Learn more in the
-[guide to Using Web Workers with the Angular CLI](guide/web-worker).
-
-As of Angular version 8, all  `platform-webworker` APIs are deprecated.
-This includes both packages: `@angular/platform-webworker` and
-`@angular/platform-webworker-dynamic`.
-
 {@a entryComponents}
 ### `entryComponents` and `ANALYZE_FOR_ENTRY_COMPONENTS` no longer required
 Previously, the `entryComponents` array in the `NgModule` definition was used to tell the compiler which components would be created and inserted dynamically. With Ivy, this isn't a requirement anymore and the `entryComponents` array can be removed from existing module declarations. The same applies to the `ANALYZE_FOR_ENTRY_COMPONENTS` injection token.
@@ -464,20 +415,6 @@ export class MyModule {
 }
 ```
 
-
-{@a ie-9-10-and-mobile}
-### IE 9, 10, and IE mobile support
-
-Support for IE 9 and 10 has been deprecated, as well as support for IE Mobile. These will be dropped in a future version.
-Supporting outdated browsers like these increases bundle size, code complexity, and test load, and also requires time and effort that could be spent on improvements to the framework.
-For example, fixing issues can be more difficult, as a straightforward fix for modern browsers could break old ones that have quirks due to not receiving updates from vendors.
-
-The final decision was made on three key points:
-* __Vendor support__: Microsoft dropped support of IE 9 and 10 on 1/12/16, meaning they no longer provide security updates or technical support. Additionally, Microsoft dropped support for Windows 10 Mobile in December 2019.
-* __Usage statistics__: We looked at usage trends for IE 9 and 10 (as well as IE Mobile) from various sources and all indicated that usage percentages were extremely small (fractions of 1%).
-* __Feedback from partners__: We also reached out to some of our Angular customers and none expressed concern about dropping IE 9, 10, nor IE Mobile support.
-
-
 {@a wrapped-value}
 ###  `WrappedValue`
 
@@ -544,15 +481,13 @@ This section contains a complete list all of the currently deprecated CLI flags.
 {@a removed}
 ## Removed APIs
 
-The following APIs have been removed starting with version 10.0.0*:
+The following APIs have been removed starting with version 11.0.0*:
 
 | Package          | API            | Replacement | Notes |
 | ---------------- | -------------- | ----------- | ----- |
-| `@angular/core`  | Undecorated base classes that use Angular features | Add Angular decorator | See [migration guide](guide/migration-undecorated-classes) for more info |
-| `@angular/core`  | `ModuleWithProviders` without a generic             | `ModuleWithProviders` with a generic | See [migration guide](guide/migration-module-with-providers) for more info |
-| `@angular/core`  | Style Sanitization | no action needed | See [style sanitization API removal](#style-sanitization) for more info
+| `@angular/router` | `preserveQueryParams` | [`queryParamsHandling`](api/router/UrlCreationOptions#queryParamsHandling) | |
 
-*To see APIs removed in version 9, check out this guide on the [version 9 docs site](https://v9.angular.io/guide/deprecations#removed).
+*To see APIs removed in version 10, check out this guide on the [version 10 docs site](https://v10.angular.io/guide/deprecations#removed).
 
 
 {@a esm5-fesm5}
@@ -603,18 +538,6 @@ In practical terms, the `package.json` of all `@angular` packages has changed in
 
 For more information about the npm package format, see the [Angular Package Format spec](https://goo.gl/jB3GVv).
 
-{@a removed}
-## Removed APIs
-
-The following APIs have been removed starting with version 10.0.0*:
-
-| Package          | API            | Replacement | Notes |
-| ---------------- | -------------- | ----------- | ----- |
-| `@angular/core`  | Undecorated base classes that use Angular features | Add Angular decorator | See [migration guide](guide/migration-undecorated-classes) for more info |
-| `@angular/core`  | `ModuleWithProviders` without a generic             | `ModuleWithProviders` with a generic | See [migration guide](guide/migration-module-with-providers) for more info |
-
-*To see APIs removed in version 9, check out this guide on the [version 9 docs site](https://v9.angular.io/guide/deprecations#removed).
-
 {@a style-sanitization}
 ### Style Sanitization for `[style]` and `[style.prop]` bindings
 Angular used to sanitize `[style]` and `[style.prop]` bindings to prevent malicious code from being inserted through `javascript:` expressions in CSS `url()` entries. However, most modern browsers no longer support the usage of these expressions, so sanitization was only maintained for the sake of IE 6 and 7. Given that Angular does not support either IE 6 or 7 and sanitization has a performance cost, we will no longer sanitize style bindings as of version 10 of Angular.
diff --git a/aio/content/guide/displaying-data.md b/aio/content/guide/displaying-data.md
deleted file mode 100644
index e7e78b1bf5b3b..0000000000000
--- a/aio/content/guide/displaying-data.md
+++ /dev/null
@@ -1,312 +0,0 @@
-# Displaying data in views
-
-Angular [components](guide/glossary#component) form the data structure of your application.
-The HTML [template](guide/glossary#template) associated with a component provides the means to display that data in the context of a web page.
-Together, a component's class and template form a [view](guide/glossary#view) of your application data.
-
-The process of combining data values with their representation on the page is called [data binding](guide/glossary#data-binding).
-You display your data to a user (and collect data from the user) by *binding* controls in the HTML template to the data properties of the component class.
-
-In addition, you can add logic to the template by including [directives](guide/glossary#directive), which tell Angular how to modify the page as it is rendered.
-
-Angular defines a *template language* that expands HTML notation with syntax that allows you to define various kinds of data binding and logical directives.
-When the page is rendered, Angular interprets the template syntax to update the HTML according to your logic and current data state.
-Before you read the complete [template syntax guide](guide/template-syntax), the exercises on this page give you a quick demonstration of how template syntax works.
-
-In this demo, you'll create a component with a list of heroes.
-You'll display the list of hero names and conditionally show a message below the list.
-The final UI looks like this:
-
-<div class="lightbox">
-  <img src="generated/images/guide/displaying-data/final.png" alt="Final UI">
-</div>
-
-<div class="alert is-helpful">
-
-The <live-example></live-example> demonstrates all of the syntax and code snippets described in this page.
-
-</div>
-
-{@a interpolation}
-
-## Showing component properties with interpolation
-The easiest way to display a component property is to bind the property name through interpolation.
-With interpolation, you put the property name in the view template, enclosed in double curly braces: `{{myHero}}`.
-
-Use the CLI command [`ng new displaying-data`](cli/new) to create a workspace and app named `displaying-data`.
-
-Delete the <code>app.component.html</code> file. It is not needed for this example.
-
-Then modify the <code>app.component.ts</code> file by
-changing the template and the body of the component.
-
-When you're done, it should look like this:
-
-<code-example path="displaying-data/src/app/app.component.1.ts" header="src/app/app.component.ts"></code-example>
-
-You added two properties to the formerly empty component: `title` and `myHero`.
-
-The template displays the two component properties using double curly brace
-interpolation:
-
-<code-example path="displaying-data/src/app/app.component.1.ts" header="src/app/app.component.ts (template)" region="template"></code-example>
-
-<div class="alert is-helpful">
-
-The template is a multi-line string within ECMAScript 2015 backticks (<code>\`</code>).
-The backtick (<code>\`</code>)&mdash;which is *not* the same character as a single
-quote (`'`)&mdash;allows you to compose a string over several lines, which makes the
-HTML more readable.
-
-</div>
-
-Angular automatically pulls the value of the `title` and `myHero` properties from the component and
-inserts those values into the browser. Angular updates the display
-when these properties change.
-
-<div class="alert is-helpful">
-
-More precisely, the redisplay occurs after some kind of asynchronous event related to
-the view, such as a keystroke, a timer completion, or a response to an HTTP request.
-
-</div>
-
-Notice that you don't call **new** to create an instance of the `AppComponent` class.
-Angular is creating an instance for you. How?
-
-The CSS `selector` in the `@Component` decorator specifies an element named `<app-root>`.
-That element is a placeholder in the body of your `index.html` file:
-
-<code-example path="displaying-data/src/index.html" header="src/index.html (body)" region="body"></code-example>
-
-When you bootstrap with the `AppComponent` class (in <code>main.ts</code>), Angular looks for a `<app-root>`
-in the `index.html`, finds it, instantiates an instance of `AppComponent`, and renders it
-inside the `<app-root>` tag.
-
-Now run the app. It should display the title and hero name:
-
-<div class="lightbox">
-  <img src="generated/images/guide/displaying-data/title-and-hero.png" alt="Title and Hero">
-</div>
-
-The next few sections review some of the coding choices in the app.
-
-
-## Choosing the template source
-
-The `@Component` metadata tells Angular where to find the component's template.
-You can store your component's template in one of two places.
-
-* You can define the template *inline* using the `template` property of the `@Component` decorator. An inline template is useful for a small demo or test.
-* Alternatively, you can define the template in a separate HTML file and link to that file in the `templateUrl` property of the `@Component` decorator. This configuration is typical for anything more complex than a small test or demo, and is the default when you generate a new component.
-
-In either style, the template data bindings have the same access to the component's properties.
-Here the app uses inline HTML because the template is small and the demo is simpler without the additional HTML file.
-
-<div class="alert is-helpful">
-
-  By default, the Angular CLI command [`ng generate component`](cli/generate) generates components with a template file.
-  You can override that by adding the "-t" (short for `inlineTemplate=true`) option:
-
-  <code-example hideCopy language="sh" class="code-shell">
-    ng generate component hero -t
-  </code-example>
-
-</div>
-
-
-## Initialization
-
-The following example uses variable assignment to initialize the components.
-
-<code-example path="displaying-data/src/app/app-ctor.component.1.ts" region="class"></code-example>
-
- You could instead declare and initialize the properties using a constructor.
- This app uses more terse "variable assignment" style simply for brevity.
-
-
-{@a ngFor}
-
-## Add logic to loop through data
-
-The `*ngFor` directive (predefined by Angular) lets you loop through data. The following example uses the directive to show all of the values in an array property.
-
-To display a list of heroes, begin by adding an array of hero names to the component and redefine `myHero` to be the first name in the array.
-
-
-<code-example path="displaying-data/src/app/app.component.2.ts" header="src/app/app.component.ts (class)" region="class"></code-example>
-
-
-Now use the Angular `ngFor` directive in the template to display each item in the `heroes` list.
-
-
-<code-example path="displaying-data/src/app/app.component.2.ts" header="src/app/app.component.ts (template)" region="template"></code-example>
-
-
-This UI uses the HTML unordered list with `<ul>` and `<li>` tags. The `*ngFor`
-in the `<li>` element is the Angular "repeater" directive.
-It marks that `<li>` element (and its children) as the "repeater template":
-
-
-<code-example path="displaying-data/src/app/app.component.2.ts" header="src/app/app.component.ts (li)" region="li"></code-example>
-
-<div class="alert is-important">
-
-Don't forget the leading asterisk (\*) in `*ngFor`. It is an essential part of the syntax.
-Read more about `ngFor` and `*` in the [ngFor section](guide/built-in-directives#ngfor) of the [Built-in directives](guide/built-in-directives) page.
-
-</div>
-
-Notice the `hero` in the `ngFor` double-quoted instruction;
-it is an example of a template input variable. Read
-more about template input variables in the [microsyntax](guide/built-in-directives#microsyntax) section of
-the [Built-in directives](guide/built-in-directives) page.
-
-Angular duplicates the `<li>` for each item in the list, setting the `hero` variable
-to the item (the hero) in the current iteration. Angular uses that variable as the
-context for the interpolation in the double curly braces.
-
-<div class="alert is-helpful">
-
-In this case, `ngFor` is displaying an array, but `ngFor` can
-repeat items for any [iterable](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols) object.
-
-</div>
-
-Now the heroes appear in an unordered list.
-
-<div class="lightbox">
-  <img src="generated/images/guide/displaying-data/hero-names-list.png" alt="After ngfor">
-</div>
-
-
-## Creating a class for the data
-
-The app's code defines the data directly inside the component, which isn't best practice.
-In a simple demo, however, it's fine.
-
-At the moment, the binding is to an array of strings.
-In real applications, most bindings are to more specialized objects.
-
-To convert this binding to use specialized objects, turn the array
-of hero names into an array of `Hero` objects. For that you'll need a `Hero` class:
-
-<code-example language="sh" class="code-shell">
-  ng generate class hero
-</code-example>
-
-This command creates the following code.
-
-
-<code-example path="displaying-data/src/app/hero.ts" header="src/app/hero.ts"></code-example>
-
-You've defined a class with a constructor and two properties: `id` and `name`.
-
-It might not look like the class has properties, but it does.
-The declaration of the constructor parameters takes advantage of a TypeScript shortcut.
-
-Consider the first parameter:
-
-
-<code-example path="displaying-data/src/app/hero.ts" header="src/app/hero.ts (id)" region="id"></code-example>
-
-That brief syntax does a lot:
-
-* Declares a constructor parameter and its type.
-* Declares a public property of the same name.
-* Initializes that property with the corresponding argument when creating an instance of the class.
-
-
-### Using the Hero class
-
-After importing the `Hero` class, the `AppComponent.heroes` property can return a _typed_ array
-of `Hero` objects:
-
-
-<code-example path="displaying-data/src/app/app.component.3.ts" header="src/app/app.component.ts (heroes)" region="heroes"></code-example>
-
-
-
-Next, update the template.
-At the moment it displays the hero's `id` and `name`.
-Fix that to display only the hero's `name` property.
-
-
-<code-example path="displaying-data/src/app/app.component.3.ts" header="src/app/app.component.ts (template)" region="template"></code-example>
-
-
-The display looks the same, but the code is clearer.
-
-{@a ngIf}
-
-## Conditional display with NgIf
-
-Sometimes an app needs to display a view or a portion of a view only under specific circumstances.
-
-Let's change the example to display a message if there are more than three heroes.
-
-The Angular `ngIf` directive inserts or removes an element based on a _truthy/falsy_ condition.
-To see it in action, add the following paragraph at the bottom of the template:
-
-
-<code-example path="displaying-data/src/app/app.component.ts" header="src/app/app.component.ts (message)" region="message"></code-example>
-
-
-<div class="alert is-important">
-
-Don't forget the leading asterisk (\*) in `*ngIf`. It is an essential part of the syntax.
-Read more about `ngIf` and `*` in the [ngIf section](guide/built-in-directives#ngIf) of the [Built-in directives](guide/built-in-directives) page.
-
-</div>
-
-
-The template expression inside the double quotes,
-`*ngIf="heroes.length > 3"`, looks and behaves much like TypeScript.
-When the component's list of heroes has more than three items, Angular adds the paragraph
-to the DOM and the message appears.
-If there are three or fewer items, Angular omits the paragraph, so no message appears.
-
-For more information, see [template expression operators](guide/interpolation#template-expressions).
-
-
-<div class="alert is-helpful">
-
-Angular isn't showing and hiding the message. It is adding and removing the paragraph element from the DOM. That improves performance, especially in larger projects when conditionally including or excluding
-big chunks of HTML with many data bindings.
-
-</div>
-
-Try it out. Because the array has four items, the message should appear.
-Go back into <code>app.component.ts</code> and delete or comment out one of the elements from the heroes array.
-The browser should refresh automatically and the message should disappear.
-
-
-## Summary
-Now you know how to use:
-
-* **Interpolation** with double curly braces to display a component property.
-* **ngFor** to display an array of items.
-* A TypeScript class to shape the **model data** for your component and display properties of that model.
-* **ngIf** to conditionally display a chunk of HTML based on a boolean expression.
-
-Here's the final code:
-
-<code-tabs>
-
-  <code-pane header="src/app/app.component.ts" path="displaying-data/src/app/app.component.ts" region="final">
-
-  </code-pane>
-
-  <code-pane header="src/app/hero.ts" path="displaying-data/src/app/hero.ts">
-
-  </code-pane>
-
-  <code-pane header="src/app/app.module.ts" path="displaying-data/src/app/app.module.ts">
-
-  </code-pane>
-
-  <code-pane header="main.ts" path="displaying-data/src/main.ts">
-
-  </code-pane>
-
-</code-tabs>
diff --git a/aio/content/guide/elements.md b/aio/content/guide/elements.md
index 7e84417df2037..28a2751f9d0a3 100644
--- a/aio/content/guide/elements.md
+++ b/aio/content/guide/elements.md
@@ -119,7 +119,14 @@ The recently-developed [custom elements](https://developer.mozilla.org/en-US/doc
 
 In browsers that support Custom Elements natively, the specification requires developers use ES2015 classes to define Custom Elements - developers can opt-in to this by setting the `target: "es2015"` property in their project's [TypeScript configuration file](/guide/typescript-configuration). As Custom Element and ES2015 support may not be available in all browsers, developers can instead choose to use a polyfill to support older browsers and ES5 code.
 
-Use the [Angular CLI](cli) to automatically set up your project with the correct polyfill: `ng add @angular/elements --project=*your_project_name*`.
+Use the [Angular CLI](cli) to automatically set up your project with the correct polyfill: 
+
+<code-example language="sh">
+
+ng add @angular/elements --project=*your_project_name*
+
+</code-example>
+
 - For more information about polyfills, see [polyfill documentation](https://www.webcomponents.org/polyfills).
 
 - For more information about Angular browser support, see [Browser Support](guide/browser-support).
diff --git a/aio/content/guide/entry-components.md b/aio/content/guide/entry-components.md
index fee65e466f855..fb73792aaa1ae 100644
--- a/aio/content/guide/entry-components.md
+++ b/aio/content/guide/entry-components.md
@@ -4,7 +4,7 @@ An entry component is any component that Angular loads imperatively, (which mean
 
 <div class="alert is-helpful">
 
-To contrast the two types of components, there are components which are included in the template, which are declarative. Additionally, there are components which you load imperatively; that is, entry components.
+    To contrast the two types of components, there are components which are included in the template, which are declarative. Additionally, there are components which you load imperatively; that is, entry components.
 
 </div>
 
@@ -75,6 +75,11 @@ All router components must be entry components. Because this would require you t
 
 
 ## The `entryComponents` array
+<div class="alert is-helpful">
+
+   Since 9.0.0 with Ivy, the `entryComponents` property is no longer necessary. See [deprecations guide](guide/deprecations#entryComponents).
+
+</div>
 
 Though the `@NgModule` decorator has an `entryComponents` array, most of the time
 you won't have to explicitly set any entry components because Angular adds components listed in `@NgModule.bootstrap` and those in route definitions to entry components automatically. Though these two mechanisms account for most entry components, if your app happens to bootstrap or dynamically load a component by type imperatively,
diff --git a/aio/content/guide/event-binding.md b/aio/content/guide/event-binding.md
index 40af4f6055ab7..dc17ec9b46955 100644
--- a/aio/content/guide/event-binding.md
+++ b/aio/content/guide/event-binding.md
@@ -99,7 +99,7 @@ in the `$event` variable.
 
 ## Template statements have side effects
 
-Though [template expressions](guide/interpolation#template-expressions) shouldn't have [side effects](guide/property-binding#avoid-side-effects), template
+Though [template expressions](guide/interpolation#template-expressions) shouldn't have [side effects](guide/property-binding-best-practices#avoid-side-effects), template
 statements usually do. The `deleteItem()` method does have
 a side effect: it deletes an item.
 
diff --git a/aio/content/guide/feature-modules.md b/aio/content/guide/feature-modules.md
index 0b8d5d137f34d..961c7915807c2 100644
--- a/aio/content/guide/feature-modules.md
+++ b/aio/content/guide/feature-modules.md
@@ -79,7 +79,7 @@ To incorporate the feature module into your app, you have to let the root module
 <code-example path="feature-modules/src/app/app.module.ts" region="app-module" header="src/app/app.module.ts"></code-example>
 
 
-Now the `AppModule` knows about the feature module. If you were to add any service providers to the feature module, `AppModule` would know about those too, as would any other feature modules. However, NgModules don’t expose their components.
+Now the `AppModule` knows about the feature module. If you were to add any service providers to the feature module, `AppModule` would know about those too, as would any other feature modules. However, NgModules don’t expose their components by default.
 
 
 ## Rendering a feature module’s component template
diff --git a/aio/content/guide/file-structure.md b/aio/content/guide/file-structure.md
index e6ebea01673a9..6aad26517b3e0 100644
--- a/aio/content/guide/file-structure.md
+++ b/aio/content/guide/file-structure.md
@@ -40,8 +40,7 @@ The top level of the workspace contains workspace-wide configuration files, conf
 | `package-lock.json`     | Provides version information for all packages installed into `node_modules` by the npm client. See [npm documentation](https://docs.npmjs.com/files/package-lock.json) for details. If you use the yarn client, this file will be [yarn.lock](https://yarnpkg.com/lang/en/docs/yarn-lock/) instead. |
 | `src/`                  | Source files for the root-level application project. |
 | `node_modules/`         | Provides [npm packages](guide/npm-packages) to the entire workspace. Workspace-wide `node_modules` dependencies are visible to all projects. |
-| `tsconfig.json`         | The `tsconfig.json` file is a ["Solution Style"](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-3-9.html#support-for-solution-style-tsconfigjson-files) TypeScript configuration file. Code editors and TypeScript’s language server use this file to improve development experience. Compilers do not use this file. |
-| `tsconfig.base.json`    | The base [TypeScript](https://www.typescriptlang.org/) configuration for projects in the workspace. All other configuration files inherit from this base file. For more information, see the [Configuration inheritance with extends](https://www.typescriptlang.org/docs/handbook/tsconfig-json.html#configuration-inheritance-with-extends) section of the TypeScript documentation.|
+| `tsconfig.json`         | The base [TypeScript](https://www.typescriptlang.org/) configuration for projects in the workspace. All other configuration files inherit from this base file. For more information, see the [Configuration inheritance with extends](https://www.typescriptlang.org/docs/handbook/tsconfig-json.html#configuration-inheritance-with-extends) section of the TypeScript documentation.|
 | `tslint.json`           | Default [TSLint](https://palantir.github.io/tslint/) configuration for projects in the workspace. |
 
 
@@ -96,14 +95,13 @@ Angular components, templates, and styles go here.
 | `app/app.component.css`     | Defines the base CSS stylesheet for the root `AppComponent`. |
 | `app/app.component.spec.ts` | Defines a unit test for the root `AppComponent`. |
 | `app/app.module.ts`         | Defines the root module, named `AppModule`, that tells Angular how to assemble the application. Initially declares only the `AppComponent`. As you add more components to the app, they must be declared here. |
-| `app/package.json`              | This file is generated only in applications created using `--strict` mode. This file is not used by package managers. It is used to tell the tools and bundlers whether the code under this directory is free of non-local [side-effects](guide/strict-mode#side-effect). |
 
 ### Application configuration files
 
 The application-specific configuration files for the root application reside at the workspace root level.
 For a multi-project workspace, project-specific configuration files are in the project root, under `projects/project-name/`.
 
-Project-specific [TypeScript](https://www.typescriptlang.org/) configuration files inherit from the workspace-wide `tsconfig.base.json`, and project-specific [TSLint](https://palantir.github.io/tslint/) configuration files inherit from the workspace-wide `tslint.json`.
+Project-specific [TypeScript](https://www.typescriptlang.org/) configuration files inherit from the workspace-wide `tsconfig.json`, and project-specific [TSLint](https://palantir.github.io/tslint/) configuration files inherit from the workspace-wide `tslint.json`.
 
 | APPLICATION-SPECIFIC CONFIG FILES    | PURPOSE |
 | :--------------------- | :------------------------------------------|
diff --git a/aio/content/guide/i18n.md b/aio/content/guide/i18n.md
index 5d56815072c62..2a1b46901670a 100644
--- a/aio/content/guide/i18n.md
+++ b/aio/content/guide/i18n.md
@@ -766,8 +766,10 @@ The HTML `base` tag with the `href` attribute specifies the base URI, or URL, fo
     "i18n": {
       "sourceLocale": "en-US",
       "locales": {
-        "fr": "src/locale/messages.fr.xlf"
-        "baseHref": ""
+        "fr": {
+          "translation": "src/locale/messages.fr.xlf",
+          "baseHref": "" 
+        }
       }
     },
     "architect": {
diff --git a/aio/content/guide/inputs-outputs.md b/aio/content/guide/inputs-outputs.md
index 6841f7b7146b6..c1442c5c578c8 100644
--- a/aio/content/guide/inputs-outputs.md
+++ b/aio/content/guide/inputs-outputs.md
@@ -208,7 +208,7 @@ about the event and gives that data to the parent.
 The child's template has two controls. The first is an HTML `<input>` with a
 [template reference variable](guide/template-reference-variables) , `#newItem`,
 where the user types in an item name. Whatever the user types
-into the `<input>` gets stored in the `#newItem` variable.
+into the `<input>` gets stored in the `value` property of the `#newItem` variable.
 
 <code-example path="inputs-outputs/src/app/item-output/item-output.component.html" region="child-output" header="src/app/item-output/item-output.component.html"></code-example>
 
@@ -218,7 +218,7 @@ an event binding because the part to the left of the equal
 sign is in parentheses, `(click)`.
 
 The `(click)` event is bound to the `addNewItem()` method in the child component class which
-takes as its argument whatever the value of `#newItem` is.
+takes as its argument whatever the value of `#newItem.value` property is.
 
 Now the child component has an `@Output()`
 for sending data to the parent and a method for raising an event.
diff --git a/aio/content/guide/ivy-compatibility.md b/aio/content/guide/ivy-compatibility.md
index ee4632316d5ec..025410c67f20b 100644
--- a/aio/content/guide/ivy-compatibility.md
+++ b/aio/content/guide/ivy-compatibility.md
@@ -11,11 +11,11 @@ That said, some applications will likely need to apply some manual updates.
 In version 10, [a few deprecated APIs have been removed](guide/updating-to-version-10#removals) and there are a [few breaking changes](guide/updating-to-version-10#breaking-changes) unrelated to Ivy.
 If you're seeing errors after updating to version 9, you'll first want to rule those changes out.
 
-To do so, temporarily [turn off Ivy](guide/ivy#opting-out-of-angular-ivy) in your `tsconfig.base.json` and re-start your app.
+To do so, temporarily [turn off Ivy](guide/ivy#opting-out-of-angular-ivy) in your `tsconfig.json` and re-start your app.
 
 If you're still seeing the errors, they are not specific to Ivy. In this case, you may want to consult the [general version 10 guide](guide/updating-to-version-10). If you've opted into any of the new, stricter type-checking settings, you may also want to check out the [template type-checking guide](guide/template-typecheck).
 
-If the errors are gone, switch back to Ivy by removing the changes to the `tsconfig.base.json` and review the list of expected changes below.
+If the errors are gone, switch back to Ivy by removing the changes to the `tsconfig.json` and review the list of expected changes below.
 
 {@a payload-size-debugging}
 ### Payload size debugging
diff --git a/aio/content/guide/lazy-loading-ngmodules.md b/aio/content/guide/lazy-loading-ngmodules.md
index 8931cf8b8e641..479c0a5567f34 100644
--- a/aio/content/guide/lazy-loading-ngmodules.md
+++ b/aio/content/guide/lazy-loading-ngmodules.md
@@ -87,7 +87,7 @@ To make one, enter the following command in the terminal, where `customers` is t
 ng generate module customers --route customers --module app.module
 </code-example>
 
-This creates a `customers` folder with the new lazy-loadable module `CustomersModule` defined in the `customers.module.ts` file. The command automatically declares the `CustomersComponent` inside the new feature module.
+This creates a `customers` folder having the new lazy-loadable feature module `CustomersModule` defined in the `customers.module.ts` file and the routing module `CustomersRoutingModule` defined in the `customers-routing.module.ts` file. The command automatically declares the `CustomersComponent` and imports `CustomersRoutingModule` inside the new feature module.
 
 Because the new module is meant to be lazy-loaded, the command does NOT add a reference to the new feature module in the application's root module file, `app.module.ts`.
 Instead, it adds the declared route, `customers` to the `routes` array declared in the module provided as the `--module` option.
diff --git a/aio/content/guide/lifecycle-hooks.md b/aio/content/guide/lifecycle-hooks.md
index 68ce23394067a..be4695717a48c 100644
--- a/aio/content/guide/lifecycle-hooks.md
+++ b/aio/content/guide/lifecycle-hooks.md
@@ -62,6 +62,8 @@ Angular executes hook methods in the following sequence. You can use them to per
 
       Called before `ngOnInit()` and whenever one or more data-bound input properties change.
 
+      Note that if your component has no inputs or you use it without providing any inputs, the framework will not call `ngOnChanges()`.
+
     </td>
   </tr>
   <tr style='vertical-align:top'>
diff --git a/aio/content/guide/lightweight-injection-tokens.md b/aio/content/guide/lightweight-injection-tokens.md
index d8fc94dac4726..c401c6b917f53 100644
--- a/aio/content/guide/lightweight-injection-tokens.md
+++ b/aio/content/guide/lightweight-injection-tokens.md
@@ -141,7 +141,7 @@ Because the token is now an abstract class, and the injectable component impleme
 The implementation of the method (with all of its code overhead) resides in the injectable component that can be tree-shaken.
 This allows the parent to communicate with the child (if it is present) in a type-safe manner.
 
-For example, the `LibCardComponent` now queries`LibHeaderToken` rather than `LibHeaderComponent`.
+For example, the `LibCardComponent` now queries `LibHeaderToken` rather than `LibHeaderComponent`.
 The following example shows how the pattern allows `LibCardComponent` to communicate with the `LibHeaderComponent` without actually referring to `LibHeaderComponent`.
 
 ```
diff --git a/aio/content/guide/migration-solution-style-tsconfig.md b/aio/content/guide/migration-solution-style-tsconfig.md
deleted file mode 100644
index 211ff5f98664a..0000000000000
--- a/aio/content/guide/migration-solution-style-tsconfig.md
+++ /dev/null
@@ -1,55 +0,0 @@
-# Solution-style `tsconfig.json` migration
-
-## What does this migration do?
-
-This migration adds support to existing projects for TypeScript's new ["solution-style" tsconfig feature](https://devblogs.microsoft.com/typescript/announcing-typescript-3-9/#solution-style-tsconfig).
-
-Support is added by making two changes:
-
-1. Renaming the workspace-level `tsconfig.json` to `tsconfig.base.json`.
-All project [TypeScript configuration files](guide/typescript-configuration) will extend from this base which contains the common options used throughout the workspace.
-
-2. Adding the solution `tsconfig.json` file at the root of the workspace.
-This `tsconfig.json` file will only contain references to project-level TypeScript configuration files and is only used by editors/IDEs.
-
-As an example, the solution `tsconfig.json` for a new project is as follows:
-```json
-// This is a "Solution Style" tsconfig.json file, and is used by editors and TypeScript’s language server to improve development experience.
-// It is not intended to be used to perform a compilation.
-{
-  "files": [],
-  "references": [
-    {
-      "path": "./tsconfig.app.json"
-    },
-    {
-      "path": "./tsconfig.spec.json"
-    },
-    {
-      "path": "./e2e/tsconfig.json"
-    }
-  ]
-}
-```
-
-## Why is this migration necessary?
-
-Solution-style `tsconfig.json` files provide an improved editing experience and fix several long-standing defects when editing files in an IDE.
-IDEs that leverage the TypeScript language service (for example, [Visual Studio Code](https://code.visualstudio.com)), will only use TypeScript configuration files that are named `tsconfig.json`.
-In complex projects, there may be more than one compilation unit and each of these units may have different settings and options.
-
-With the Angular CLI, a project will have application code that will target a browser.
-It will also have unit tests that should not be included within the built application and that also need additional type information present (`jasmine` in this case).
-Both parts of the project also share some but not all of the code within the project.
-As a result, two separate TypeScript configuration files (`tsconfig.app.json` and `tsconfig.spec.json`) are needed to ensure that each part of the application is configured properly and that the right types are used for each part.
-Also if web workers are used within a project, an additional tsconfig (`tsconfig.worker.json`) is needed.
-Web workers use similar but incompatible types to the main browser application.
-This requires the additional configuration file to ensure that the web worker files use the appropriate types and will build successfully.
-
-While the Angular build system knows about all of these TypeScript configuration files, an IDE using TypeScript's language service does not.
-Because of this, an IDE will not be able to properly analyze the code from each part of the project and may generate false errors or make suggestions that are incorrect for certain files.
-By leveraging the new solution-style tsconfig, the IDE can now be aware of the configuration of each part of a project.
-This allows each file to be treated appropriately based on its tsconfig.
-IDE features such as error/warning reporting and auto-suggestion will operate more effectively as well.
-
-The TypeScript 3.9 release [blog post](https://devblogs.microsoft.com/typescript/announcing-typescript-3-9/#solution-style-tsconfig) also contains some additional information regarding this new feature.
diff --git a/aio/content/guide/migration-update-module-and-target-compiler-options.md b/aio/content/guide/migration-update-module-and-target-compiler-options.md
index 259f85d93a5fa..e5a2cd588b38c 100644
--- a/aio/content/guide/migration-update-module-and-target-compiler-options.md
+++ b/aio/content/guide/migration-update-module-and-target-compiler-options.md
@@ -9,7 +9,7 @@ This process helps ensure that intentional changes to the options are kept in pl
 
 TypeScript Configuration File(s) | Changed Property | Existing Value | New Value
 ------------- | ------------- | ------------- | ------------- | -------------
-`<workspace base>/tsconfig.base.json` | `"module"` | `"esnext"` | `"es2020"`
+`<workspace base>/tsconfig.json` | `"module"` | `"esnext"` | `"es2020"`
 Used in `browser` builder options (`ng build` for applications) | `"module"` | `"esnext"` | `"es2020"`
 Used in `ng-packgr` builder options (`ng build` for libraries) | `"module"` | `"esnext"` | `"es2020"`
 Used in `karma` builder options (`ng test` for applications) | `"module"` | `"esnext"` | `"es2020"`
diff --git a/aio/content/guide/ngmodule-faq.md b/aio/content/guide/ngmodule-faq.md
index cc9c858776772..d8ccf16490480 100644
--- a/aio/content/guide/ngmodule-faq.md
+++ b/aio/content/guide/ngmodule-faq.md
@@ -101,7 +101,7 @@ should import `BrowserModule` from `@angular/platform-browser`.
 `BrowserModule` provides services that are essential to launch and run a browser app.
 
 `BrowserModule` also re-exports `CommonModule` from `@angular/common`,
-which means that components in the `AppModule` module also have access to
+which means that components in the `AppModule` also have access to
 the Angular directives every app needs, such as `NgIf` and `NgFor`.
 
 Do not import `BrowserModule` in any other module.
@@ -140,7 +140,7 @@ declared in this NgModule.
 You _can_ export any declarable class&mdash;components, directives, and pipes&mdash;whether
 it's declared in this NgModule or in an imported NgModule.
 
-You _can_ re-export entire imported NgModules, which effectively re-exports all of their exported classes.
+You _can_ re-export entire imported NgModules, which effectively re-export all of their exported classes.
 An NgModule can even export a module that it doesn't import.
 
 <hr/>
@@ -192,7 +192,7 @@ Its only purpose is to add http service providers to the application as a whole.
 
 The `forRoot()` static method is a convention that makes it easy for developers to configure services and providers that are intended to be singletons. A good example of `forRoot()` is the `RouterModule.forRoot()` method.
 
-Apps pass a `Routes` object to `RouterModule.forRoot()` in order to configure the app-wide `Router` service with routes.
+Apps pass a `Routes` array to `RouterModule.forRoot()` in order to configure the app-wide `Router` service with routes.
 `RouterModule.forRoot()` returns a [ModuleWithProviders](api/core/ModuleWithProviders).
 You add that result to the `imports` list of the root `AppModule`.
 
diff --git a/aio/content/guide/pipes.md b/aio/content/guide/pipes.md
index 837765f5bbc52..f36ae52cd5900 100644
--- a/aio/content/guide/pipes.md
+++ b/aio/content/guide/pipes.md
@@ -397,7 +397,7 @@ The following code example binds an observable of message strings
 ## Caching HTTP requests
 
 To [communicate with backend services using HTTP](/guide/http "Communicating with backend services using HTTP"), the `HttpClient` service uses observables and offers the `HTTPClient.get()` method to fetch data from a server.
-The aynchronous method sends an HTTP request, and returns an observable that emits the requested data for the response.
+The asynchronous method sends an HTTP request, and returns an observable that emits the requested data for the response.
 
 As shown in the previous section, you can use the impure `AsyncPipe` to accept an observable as input and subscribe to the input automatically.
 You can also create an impure pipe to make and cache an HTTP request.
diff --git a/aio/content/guide/property-binding-best-practices.md b/aio/content/guide/property-binding-best-practices.md
new file mode 100644
index 0000000000000..8713d5d77b9f7
--- /dev/null
+++ b/aio/content/guide/property-binding-best-practices.md
@@ -0,0 +1,65 @@
+# Property binding best practices
+
+By following a few guidelines, you can use property binding in a way that helps you minimize bugs and keep your code readable.
+
+<div class="alert is-helpful">
+
+See the <live-example name="property-binding"></live-example> for a working example containing the code snippets in this guide.
+
+</div>
+
+## Avoid side effects
+
+Evaluation of a template expression should have no visible side effects.
+Use the syntax for template expressions to help avoid side effects.
+In general, the correct syntax prevents you from assigning a value to anything in a property binding expression.
+The syntax also prevents you from using increment and decrement operators.
+
+### An example of producing side effects
+
+If you had an expression that changed the value of something else that you were binding to, that change of value would be a side effect.
+Angular might or might not display the changed value.
+If Angular does detect the change, it throws an error.
+
+As a best practice, use only properties and methods that return values.
+
+## Return the proper type
+
+A template expression should evaluate to the type of value that the target property expects.
+For example, return a string if the target property expects a string, a number if it expects a number, or an object if it expects an object.
+
+### Passing in a string
+
+In the following example, the `childItem` property of the `ItemDetailComponent` expects a string.
+
+<code-example path="property-binding/src/app/app.component.html" region="model-property-binding" header="src/app/app.component.html"></code-example>
+
+You can confirm this expectation by looking in the `ItemDetailComponent` where the `@Input()` type is `string`:
+
+<code-example path="property-binding/src/app/item-detail/item-detail.component.ts" region="input-type" header="src/app/item-detail/item-detail.component.ts (setting the @Input() type)"></code-example>
+
+The `parentItem` in `AppComponent` is a string, which means that the expression, `parentItem` within `[childItem]="parentItem"`, evaluates to a string.
+
+<code-example path="property-binding/src/app/app.component.ts" region="parent-data-type" header="src/app/app.component.ts"></code-example>
+
+If `parentItem` were some other type, you would need to specify `childItem`  `@Input()` as that type as well.
+
+### Passing in an object
+
+In this example, `ItemListComponent` is a child component of `AppComponent` and the `items` property expects an array of objects.
+
+<code-example path="property-binding/src/app/app.component.html" region="pass-object" header="src/app/app.component.html"></code-example>
+
+In the `ItemListComponent` the `@Input()`, `items`, has a type of `Item[]`.
+
+<code-example path="property-binding/src/app/item-list/item-list.component.ts" region="item-input" header="src/app/item-list.component.ts"></code-example>
+
+Notice that `Item` is an object that it has two properties; an `id` and a `name`.
+
+<code-example path="property-binding/src/app/item.ts" region="item-class" header="src/app/item.ts"></code-example>
+
+In `app.component.ts`, `currentItems` is an array of objects in the same shape as the `Item` object in `items.ts`, with an `id` and a `name`.
+
+<code-example path="property-binding/src/app/app.component.ts" region="pass-object" header="src/app.component.ts"></code-example>
+
+By supplying an object in the same shape, you satisfy the expectations of `items` when Angular evaluates the expression `currentItems`.
diff --git a/aio/content/guide/property-binding.md b/aio/content/guide/property-binding.md
index 673be0e3dcf9d..c9240da7aec44 100644
--- a/aio/content/guide/property-binding.md
+++ b/aio/content/guide/property-binding.md
@@ -1,8 +1,8 @@
 
-# Property binding `[property]`
+# Property binding
 
-Use property binding to _set_ properties of target elements or
-directive `@Input()` decorators.
+Property binding in Angular helps you set values for properties of HTML elements or directives.
+With property binding, you can do things such as toggle button functionality, set paths programatically, and share values between components.
 
 <div class="alert is-helpful">
 
@@ -10,219 +10,194 @@ See the <live-example></live-example> for a working example containing the code
 
 </div>
 
-## One-way in
+## Prerequisites
 
-Property binding flows a value in one direction,
-from a component's property into a target element property.
+To get the most out of property binding, you should be familiar with the following:
 
-You can't use property
-binding to read or pull values out of target elements. Similarly, you cannot use
-property binding to call a method on the target element.
-If the element raises events, you can listen to them with an [event binding](guide/event-binding).
+* [Basics of components](guide/architecture-components)
+* [Basics of templates](guide/glossary#template)
+* [Binding syntax](guide/binding-syntax)
 
-If you must read a target element property or call one of its methods,
-see the API reference for [ViewChild](api/core/ViewChild) and
-[ContentChild](api/core/ContentChild).
+<hr />
 
-## Examples
+## Understanding the flow of data
 
-The most common property binding sets an element property to a component
-property value. An example is
-binding the `src` property of an image element to a component's `itemImageUrl` property:
+Property binding moves a value in one direction, from a component's property into a target element property.
 
-<code-example path="property-binding/src/app/app.component.html" region="property-binding" header="src/app/app.component.html"></code-example>
+<div class="alert is-helpful">
 
-Here's an example of binding to the `colSpan` property. Notice that it's not `colspan`,
-which is the attribute, spelled with a lowercase `s`.
+For more information on listening for events, see [Event binding](guide/event-binding).
 
-<code-example path="property-binding/src/app/app.component.html" region="colSpan" header="src/app/app.component.html"></code-example>
+</div>
 
-For more details, see the [MDN HTMLTableCellElement](https://developer.mozilla.org/en-US/docs/Web/API/HTMLTableCellElement) documentation.
+To read a target element property or call one of its methods, see the API reference for [ViewChild](api/core/ViewChild) and [ContentChild](api/core/ContentChild).
 
-For more information about `colSpan` and `colspan`, see the [Attribute binding](guide/attribute-binding#colspan) guide.
+## Binding to a property
 
-Another example is disabling a button when the component says that it `isUnchanged`:
+To bind to an element's property, enclose it in square brackets, `[]`, which identifies the property as a target property.
+A target property is the DOM property to which you want to assign a value.
+For example, the target property in the following code is the image element's `src` property.
 
-<code-example path="property-binding/src/app/app.component.html" region="disabled-button" header="src/app/app.component.html"></code-example>
+<code-example path="property-binding/src/app/app.component.html" region="property-binding" header="src/app/app.component.html"></code-example>
 
-Another is setting a property of a directive:
 
-<code-example path="property-binding/src/app/app.component.html" region="class-binding" header="src/app/app.component.html"></code-example>
+In most cases, the target name is the name of a property, even when it appears to be the name of an attribute.
+In this example, `src` is the name of the `<img>` element property.
 
-Yet another is setting the model property of a custom component&mdash;a great way
-for parent and child components to communicate:
+The brackets, `[]`, cause Angular to evaluate the right-hand side of the assignment as a dynamic expression.
+Without the brackets, Angular treats the the right-hand side as a string literal and sets the property to that static value.
 
-<code-example path="property-binding/src/app/app.component.html" region="model-property-binding" header="src/app/app.component.html"></code-example>
+<code-example path="property-binding/src/app/app.component.html" region="no-evaluation" header="src/app.component.html"></code-example>
 
-## Binding targets
+Omitting the brackets renders the string `parentItem`, not the value of `parentItem`.
 
-An element property between enclosing square brackets identifies the target property.
-The target property in the following code is the image element's `src` property.
+## Setting an element property to a component property value
+
+To bind the `src` property of an `<img>` element to a component's property, place the target, `src`, in square brackets followed by an equal sign and then the property.
+The property here is `itemImageUrl`.
 
 <code-example path="property-binding/src/app/app.component.html" region="property-binding" header="src/app/app.component.html"></code-example>
 
-There's also the `bind-` prefix alternative:
+Declare the `itemImageUrl` property in the class, in this case `AppComponent`.
 
-<code-example path="property-binding/src/app/app.component.html" region="bind-prefix" header="src/app/app.component.html"></code-example>
+<code-example path="property-binding/src/app/app.component.ts" region="item-image" header="src/app/app.component.ts"></code-example>
 
+{@a colspan}
 
-In most cases, the target name is the name of a property, even
-when it appears to be the name of an attribute.
-So in this case, `src` is the name of the `<img>` element property.
+#### `colspan` and `colSpan`
 
-Element properties may be the more common targets,
-but Angular looks first to see if the name is a property of a known directive,
-as it is in the following example:
+A common point of confusion is between the attribute, `colspan`, and the property, `colSpan`.
+Notice that these two names differ by only a single letter.
 
-<code-example path="property-binding/src/app/app.component.html" region="class-binding" header="src/app/app.component.html"></code-example>
+If you wrote something like this:
 
-Technically, Angular is matching the name to a directive `@Input()`,
-one of the property names listed in the directive's `inputs` array
-or a property decorated with `@Input()`.
-Such inputs map to the directive's own properties.
+<code-example language="html">
+  &lt;tr&gt;&lt;td colspan="{{1 + 1}}"&gt;Three-Four&lt;/td&gt;&lt;/tr&gt;
+</code-example>
 
-If the name fails to match a property of a known directive or element, Angular reports an “unknown directive” error.
+You'd get this error:
 
-<div class="alert is-helpful">
+<code-example language="bash">
+  Template parse errors:
+  Can't bind to 'colspan' since it isn't a known native property
+</code-example>
 
-Though the target name is usually the name of a property,
-there is an automatic attribute-to-property mapping in Angular for
-several common attributes. These include `class`/`className`, `innerHtml`/`innerHTML`, and
-`tabindex`/`tabIndex`.
+As the message says, the `<td>` element does not have a `colspan` property. This is true
+because `colspan` is an attribute&mdash;`colSpan`, with a capital `S`, is the
+corresponding property. Interpolation and property binding can set only *properties*, not attributes.
 
-</div>
+Instead, you'd use property binding and write it like this:
 
+<code-example path="attribute-binding/src/app/app.component.html" region="colSpan" header="src/app/app.component.html"></code-example>
 
-## Avoid side effects
 
-Evaluation of a template expression should have no visible side effects.
-The expression language itself, or the way you write template expressions,
-helps to a certain extent;
-you can't assign a value to anything in a property binding expression
-nor use the increment and decrement operators.
+Another example is disabling a button when the component says that it `isUnchanged`:
 
-For example, you could have an expression that invoked a property or method that had
-side effects. The expression could call something like `getFoo()` where only you
-know what `getFoo()` does. If `getFoo()` changes something
-and you happen to be binding to that something,
-Angular may or may not display the changed value. Angular may detect the
-change and throw a warning error.
-As a best practice, stick to properties and to methods that return
-values and avoid side effects.
+<code-example path="property-binding/src/app/app.component.html" region="disabled-button" header="src/app/app.component.html"></code-example>
 
-## Return the proper type
+Another is setting a property of a directive:
 
-The template expression should evaluate to the type of value
-that the target property expects.
-Return a string if the target property expects a string, a number if it
-expects a number, an object if it expects an object, and so on.
+<code-example path="property-binding/src/app/app.component.html" region="class-binding" header="src/app/app.component.html"></code-example>
 
-In the following example, the `childItem` property of the `ItemDetailComponent` expects a string, which is exactly what you're sending in the property binding:
+Yet another is setting the model property of a custom component&mdash;a great way
+for parent and child components to communicate:
 
 <code-example path="property-binding/src/app/app.component.html" region="model-property-binding" header="src/app/app.component.html"></code-example>
 
-You can confirm this by looking in the `ItemDetailComponent` where the `@Input` type is set to a string:
-<code-example path="property-binding/src/app/item-detail/item-detail.component.ts" region="input-type" header="src/app/item-detail/item-detail.component.ts (setting the @Input() type)"></code-example>
-
-As you can see here, the `parentItem` in `AppComponent` is a string, which the `ItemDetailComponent` expects:
-<code-example path="property-binding/src/app/app.component.ts" region="parent-data-type" header="src/app/app.component.ts"></code-example>
-
-### Passing in an object
 
-The previous simple example showed passing in a string. To pass in an object,
-the syntax and thinking are the same.
+## Toggling button functionality
 
-In this scenario, `ItemListComponent` is nested within `AppComponent` and the `items` property expects an array of objects.
+To disable a button's functionality depending on a Boolean value, bind the DOM `disabled` property to a property in the class that is `true` or `false`.
 
-<code-example path="property-binding/src/app/app.component.html" region="pass-object" header="src/app/app.component.html"></code-example>
+<code-example path="property-binding/src/app/app.component.html" region="disabled-button" header="src/app/app.component.html"></code-example>
 
-The `items` property is declared in the `ItemListComponent` with a type of `Item` and decorated with `@Input()`:
+Because the value of the property `isUnchanged` is `true` in the `AppComponent`, Angular disables the button.
 
-<code-example path="property-binding/src/app/item-list/item-list.component.ts" region="item-input" header="src/app/item-list.component.ts"></code-example>
+<code-example path="property-binding/src/app/app.component.ts" region="boolean" header="src/app/app.component.ts"></code-example>
 
-In this sample app, an `Item` is an object that has two properties; an `id` and a `name`.
 
-<code-example path="property-binding/src/app/item.ts" region="item-class" header="src/app/item.ts"></code-example>
+## Setting a directive property
 
-While a list of items exists in another file, `mock-items.ts`, you can
-specify a different item in `app.component.ts` so that the new item will render:
+To set a property of a directive, place the directive within square brackets , such as `[ngClass]`, followed by an equal sign and the property.
+Here, the property is `classes`.
 
-<code-example path="property-binding/src/app/app.component.ts" region="pass-object" header="src/app.component.ts"></code-example>
+<code-example path="property-binding/src/app/app.component.html" region="class-binding" header="src/app/app.component.html"></code-example>
 
-You just have to make sure, in this case, that you're supplying an array of objects because that's the type of `Item` and is what the nested component, `ItemListComponent`, expects.
+To use the property, you must declare it in the class, which in this example is `AppComponent`.
+The value of `classes` is `special`.
 
-In this example, `AppComponent` specifies a different `item` object
-(`currentItems`) and passes it to the nested `ItemListComponent`. `ItemListComponent` was able to use `currentItems` because it matches what an `Item` object is according to `item.ts`. The `item.ts` file is where
-`ItemListComponent` gets its definition of an `item`.
+<code-example path="property-binding/src/app/app.component.ts" region="directive-property" header="src/app/app.component.ts"></code-example>
 
-## Remember the brackets
+Angular applies the class `special` to the `<p>` element so that you can use `special` to apply CSS styles.
 
-The brackets, `[]`, tell Angular to evaluate the template expression.
-If you omit the brackets, Angular treats the string as a constant
-and *initializes the target property* with that string:
+## Bind values between components
 
-<code-example path="property-binding/src/app/app.component.html" region="no-evaluation" header="src/app.component.html"></code-example>
+To set the model property of a custom component, place the target, here `childItem`, between square brackets `[]` followed by an equal sign and the property.
+Here, the property is `parentItem`.
 
+<code-example path="property-binding/src/app/app.component.html" region="model-property-binding" header="src/app/app.component.html"></code-example>
 
-Omitting the brackets will render the string
-`parentItem`, not the value of `parentItem`.
+To use the target and the property, you must declare them in their respective classes.
 
-## One-time string initialization
+Declare the target of `childItem` in its component class, in this case `ItemDetailComponent`.
 
-You *should* omit the brackets when all of the following are true:
+For example, the following code declares the target of `childItem` in its component class, in this case `ItemDetailComponent`.
 
-* The target property accepts a string value.
-* The string is a fixed value that you can put directly into the template.
-* This initial value never changes.
+Then, the code contains an `@Input()` decorator with the `childItem` property so data can flow into it.
 
-You routinely initialize attributes this way in standard HTML, and it works
-just as well for directive and component property initialization.
-The following example initializes the `prefix` property of the `StringInitComponent` to a fixed string,
-not a template expression. Angular sets it and forgets about it.
+<code-example path="property-binding/src/app/item-detail/item-detail.component.ts" region="input-type" header="src/app/item-detail/item-detail.component.ts"></code-example>
 
-<code-example path="property-binding/src/app/app.component.html" region="string-init" header="src/app/app.component.html"></code-example>
+Next, the code declares the property of `parentItem` in its component class, in this case `AppComponent`.
+In this example the type of `childItem` is `string`, so `parentItem` needs to be a string.
+Here, `parentItem` has the string value of `lamp`.
 
-The `[item]` binding, on the other hand, remains a live binding to the component's `currentItems` property.
+<code-example path="property-binding/src/app/app.component.ts" region="parent-data-type" header="src/app/app.component.ts"></code-example>
 
-## Property binding vs. interpolation
+With this configuration, the view of `<app-item-detail>` uses the value of `lamp` for `childItem`.
 
-You often have a choice between interpolation and property binding.
-The following binding pairs do the same thing:
+## Property binding and security
 
-<code-example path="property-binding/src/app/app.component.html" region="property-binding-interpolation" header="src/app/app.component.html"></code-example>
+Property binding can help keep content secure.
+For example, consider the following malicious content.
 
-Interpolation is a convenient alternative to property binding in
-many cases. When rendering data values as strings, there is no
-technical reason to prefer one form to the other, though readability
-tends to favor interpolation. However, *when setting an element
-property to a non-string data value, you must use property binding*.
+<code-example path="property-binding/src/app/app.component.ts" region="malicious-content" header="src/app/app.component.ts"></code-example>
 
-## Content security
+The component template interpolates the content as follows:
 
-Imagine the following malicious content.
+<code-example path="property-binding/src/app/app.component.html" region="malicious-interpolated" header="src/app/app.component.html"></code-example>
 
-<code-example path="property-binding/src/app/app.component.ts" region="malicious-content" header="src/app/app.component.ts"></code-example>
+The browser doesn't process the HTML and instead displays it raw, as follows.
 
-In the component template, the content might be used with interpolation:
+<code-example language="bash">
+"Template &lt;script&gt;alert("evil never sleeps")&lt;/script&gt; Syntax" is the interpolated evil title.
+</code-example>
 
-<code-example path="property-binding/src/app/app.component.html" region="malicious-interpolated" header="src/app/app.component.html"></code-example>
 
-Fortunately, Angular data binding is on alert for dangerous HTML. In the above case,
-the HTML displays as is, and the Javascript does not execute. Angular **does not**
-allow HTML with script tags to leak into the browser, neither with interpolation
-nor property binding.
+Angular does not allow HTML with `<script>` tags, neither with [interpolation](guide/interpolation) nor property binding, which prevents the JavaScript from running.
 
-In the following example, however, Angular [sanitizes](guide/security#sanitization-and-security-contexts)
-the values before displaying them.
+In the following example, however, Angular [sanitizes](guide/security#sanitization-and-security-contexts) the values before displaying them.
 
 <code-example path="property-binding/src/app/app.component.html" region="malicious-content" header="src/app/app.component.html"></code-example>
 
-Interpolation handles the `<script>` tags differently than
-property binding but both approaches render the
-content harmlessly. The following is the browser output
-of the `evilTitle` examples.
+Interpolation handles the `<script>` tags differently than property binding, but both approaches render the content harmlessly.
+The following is the browser output of the sanitized `evilTitle` example.
 
 <code-example language="bash">
-"Template <script>alert("evil never sleeps")</script> Syntax" is the interpolated evil title.
-"Template alert("evil never sleeps")Syntax" is the property bound evil title.
+"Template Syntax" is the property bound evil title.
 </code-example>
+
+## Property binding and interpolation
+
+Often [interpolation](guide/interpolation) and property binding can achieve the same results.
+The following binding pairs do the same thing.
+
+<code-example path="property-binding/src/app/app.component.html" region="property-binding-interpolation" header="src/app/app.component.html"></code-example>
+
+You can use either form when rendering data values as strings, though interpolation is preferable for readability.
+However, when setting an element property to a non-string data value, you must use property binding.
+
+<hr />
+
+## What's next
+
+* [Property binding best practices](guide/property-binding-best-practices)
diff --git a/aio/content/guide/reactive-forms.md b/aio/content/guide/reactive-forms.md
index ca73e5fad4657..353b88bf65a18 100644
--- a/aio/content/guide/reactive-forms.md
+++ b/aio/content/guide/reactive-forms.md
@@ -180,7 +180,7 @@ A form group tracks the status and changes for each of its controls, so if one o
 
 <code-example path="reactive-forms/src/app/profile-editor/profile-editor.component.1.html" region="formgroup" header="src/app/profile-editor/profile-editor.component.html (template form group)"></code-example>
 
-Note that just as a form group contains a group of controls, the *profile form* `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 `FormGroup`. The form controls communicate with their respective elements. They also communicate changes to the form group instance, which provides the source of truth for the model value.
+Note that just as a form group 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 `FormGroup`. The form controls communicate with their respective elements. They also communicate changes to the form group instance, which provides the source of truth for the model value.
 
 **Save form data**
 
diff --git a/aio/content/guide/releases.md b/aio/content/guide/releases.md
index 1a42c7c5dd147..e4b87b0c8f12d 100644
--- a/aio/content/guide/releases.md
+++ b/aio/content/guide/releases.md
@@ -94,7 +94,7 @@ All of our major releases are supported for 18 months.
 
 * 6 months of *active support*, during which regularly-scheduled updates and patches are released.
 
-* 12 months of *long-term support (LTS)*, during which only critical fixes and security patches are released.
+* 12 months of *long-term support (LTS)*, during which only [critical fixes and security patches](#lts-fixes) are released.
 
 The following table provides the status for Angular versions under support.
 
@@ -102,11 +102,18 @@ The following table provides the status for Angular versions under support.
 Version | Status | Released     | Active Ends  | LTS Ends
 ------- | ------ | ------------ | ------------ | ------------
 ^10.0.0 | Active | Jun 24, 2020 | Dec 24, 2020 | Dec 24, 2021
-^9.0.0  | Active | Feb 06, 2020 | Aug 06, 2020 | Aug 06, 2021
+^9.0.0  | LTS    | Feb 06, 2020 | Aug 06, 2020 | Aug 06, 2021
 ^8.0.0  | LTS    | May 28, 2019 | Nov 28, 2019 | Nov 28, 2020
 
 Angular versions ^4.0.0, ^5.0.0, ^6.0.0 and ^7.0.0 are no longer under support.
 
+### LTS fixes
+
+As a general rule, a fix is considered for an LTS version if it resolves one of:
+
+* a newly identified security vulnerability,
+* a regression, since the start of LTS, caused by a 3rd party change, such as a new browser version.
+
 {@a deprecation}
 ## Deprecation practices
 
diff --git a/aio/content/guide/router-tutorial-toh.md b/aio/content/guide/router-tutorial-toh.md
index b802cf38b6230..110762effac28 100644
--- a/aio/content/guide/router-tutorial-toh.md
+++ b/aio/content/guide/router-tutorial-toh.md
@@ -1656,7 +1656,7 @@ _before_ the `AppRoutingModule`:
 
 </code-tabs>
 
-Remove the initial crisis center route from the `app-routing.module.ts` because now the `HeroesModule` and the `CrisisCenter` modules provide teh feature routes.
+Remove the initial crisis center route from the `app-routing.module.ts` because now the `HeroesModule` and the `CrisisCenter` modules provide the feature routes.
 
 The `app-routing.module.ts` file retains the top-level application routes such as the default and wildcard routes.
 
diff --git a/aio/content/guide/router.md b/aio/content/guide/router.md
index abf916b369359..b7aea18a7bbef 100644
--- a/aio/content/guide/router.md
+++ b/aio/content/guide/router.md
@@ -2,10 +2,9 @@
 
 In a single-page app, you change what the user sees by showing or hiding portions of the display that correspond to particular components, rather than going out to the server to get a new page.
 As users perform application tasks, they need to move between the different [views](guide/glossary#view "Definition of view") that you have defined.
-To implement this kind of navigation within the single page of your app, you use the Angular **`Router`**.
 
-To handle the navigation from one [view](guide/glossary#view) to the next, you use the Angular _router_.
-The router enables navigation by interpreting a browser URL as an instruction to change the view.
+To handle the navigation from one [view](guide/glossary#view) to the next, you use the Angular **`Router`**.
+The **`Router`** enables navigation by interpreting a browser URL as an instruction to change the view.
 
 To explore a sample app featuring the router's primary features, see the <live-example></live-example>.
 
diff --git a/aio/content/guide/rx-library.md b/aio/content/guide/rx-library.md
index 8aed26dccef71..c5462381f8364 100644
--- a/aio/content/guide/rx-library.md
+++ b/aio/content/guide/rx-library.md
@@ -15,11 +15,11 @@ RxJS provides an implementation of the `Observable` type, which is needed until
 RxJS offers a number of functions that can be used to create new observables. These functions can simplify the process of creating observables from things such as events, timers, promises, and so on. For example:
 
 
-<code-example path="rx-library/src/simple-creation.ts" region="promise" header="Create an observable from a promise"></code-example>
+<code-example path="rx-library/src/simple-creation.1.ts" region="promise" header="Create an observable from a promise"></code-example>
 
-<code-example path="rx-library/src/simple-creation.ts" region="interval" header="Create an observable from a counter"></code-example>
+<code-example path="rx-library/src/simple-creation.2.ts" region="interval" header="Create an observable from a counter"></code-example>
 
-<code-example path="rx-library/src/simple-creation.ts" region="event" header="Create an observable from an event"></code-example>
+<code-example path="rx-library/src/simple-creation.3.ts" region="event" header="Create an observable from an event"></code-example>
 
 <code-example path="rx-library/src/simple-creation.ts" region="ajax" header="Create an observable that creates an AJAX request"></code-example>
 
@@ -53,7 +53,7 @@ RxJS provides many operators, but only a handful are used frequently. For a list
 
 | Area | Operators |
 | :------------| :----------|
-| Creation |  `from`,`fromEvent`, `of` |
+| Creation |  `from`, `fromEvent`, `of` |
 | Combination | `combineLatest`, `concat`, `merge`, `startWith` , `withLatestFrom`, `zip` |
 | Filtering | `debounceTime`, `distinctUntilChanged`, `filter`, `take`, `takeUntil` |
 | Transformation | `bufferTime`, `concatMap`, `map`, `mergeMap`, `scan`, `switchMap` |
diff --git a/aio/content/guide/service-worker-communications.md b/aio/content/guide/service-worker-communications.md
index 384803216b029..d38287973b572 100644
--- a/aio/content/guide/service-worker-communications.md
+++ b/aio/content/guide/service-worker-communications.md
@@ -67,6 +67,33 @@ Therefore, it is recommended to reload the page once the promise returned by `ac
 
 </div>
 
+### Handling an unrecoverable state
+
+In some cases, the version of the app used by the service worker to serve a client might be in a broken state that cannot be recovered from without a full page reload.
+
+For example, imagine the following scenario:
+- A user opens the app for the first time and the service worker caches the latest version of the app.
+  Let's assume the app's cached assets include `index.html`, `main.<main-hash-1>.js` and `lazy-chunk.<lazy-hash-1>.js`.
+- The user closes the app and does not open it for a while.
+- After some time, a new version of the app is deployed to the server.
+  This newer version includes the files `index.html`, `main.<main-hash-2>.js` and `lazy-chunk.<lazy-hash-2>.js` (note that the hashes are different now, because the content of the files has changed).
+  The old version is no longer available on the server.
+- In the meantime, the user's browser decides to evict `lazy-chunk.<lazy-hash-1>.js` from its cache.
+  Browsers may decide to evict specific (or all) resources from a cache in order to reclaim disk space.
+- The user opens the app again.
+  The service worker serves the latest version known to it at this point, namely the old version (`index.html` and `main.<main-hash-1>.js`).
+- At some later point, the app requests the lazy bundle, `lazy-chunk.<lazy-hash-1>.js`.
+- The service worker is unable to find the asset in the cache (remember that the browser evicted it).
+  Nor is it able to retrieve it from the server (since the server now only has `lazy-chunk.<lazy-hash-2>.js` from the newer version).
+
+In the above scenario, the service worker is not able to serve an asset that would normally be cached.
+That particular app version is broken and there is no way to fix the state of the client without reloading the page.
+In such cases, the service worker notifies the client by sending an `UnrecoverableStateEvent` event.
+You can subscribe to `SwUpdate#unrecoverable` to be notified and handle these errors.
+
+<code-example path="service-worker-getting-started/src/app/handle-unrecoverable-state.service.ts" header="handle-unrecoverable-state.service.ts" region="sw-unrecoverable-state"></code-example>
+
+
 ## More on Angular service workers
 
 You may also be interested in the following:
diff --git a/aio/content/guide/service-worker-config.md b/aio/content/guide/service-worker-config.md
index 389033844ed20..6135f2f2184cf 100644
--- a/aio/content/guide/service-worker-config.md
+++ b/aio/content/guide/service-worker-config.md
@@ -267,6 +267,12 @@ By default, these criteria are:
 1. The URL must not contain a file extension (i.e. a `.`) in the last path segment.
 2. The URL must not contain `__`.
 
+<div class="alert is-helpful">
+
+To configure whether navigation requests are sent through to the network or not, see the [navigationRequestStrategy](#navigation-request-strategy) section.
+
+</div>
+
 ### Matching navigation request URLs
 
 While these default criteria are fine in most cases, it is sometimes desirable to configure different rules. For example, you may want to ignore specific routes (that are not part of the Angular app) and pass them through to the server.
@@ -285,3 +291,32 @@ If the field is omitted, it defaults to:
   '!/**/*__*/**',  // Exclude URLs containing `__` in any other segment.
 ]
 ```
+
+{@a navigation-request-strategy}
+
+## `navigationRequestStrategy`
+
+This optional property enables you to configure how the service worker handles navigation requests:
+
+```json
+{
+  "navigationRequestStrategy": "freshness"
+}
+```
+
+Possible values:
+
+- `'performance'`: The default setting. Serves the specified [index file](#index-file), which is typically cached.
+- `'freshness'`: Passes the requests through to the network and falls back to the `performance` behavior when offline.
+  This value is useful when the server redirects the navigation requests elsewhere using an HTTP redirect (3xx status code).
+  Reasons for using this value include:
+    - Redirecting to an authentication website when authentication is not handled by the application.
+    - Redirecting specific URLs to avoid breaking existing links/bookmarks after a website redesign.
+    - Redirecting to a different website, such as a server-status page, while a page is temporarily down.
+
+<div class="alert is-important">
+
+The `freshness` strategy usually results in more requests sent to the server, which can increase response latency.
+It is recommended that you use the default performance strategy whenever possible.
+
+</div>
\ No newline at end of file
diff --git a/aio/content/guide/service-worker-getting-started.md b/aio/content/guide/service-worker-getting-started.md
index a005edd9e177e..d947479f6265f 100644
--- a/aio/content/guide/service-worker-getting-started.md
+++ b/aio/content/guide/service-worker-getting-started.md
@@ -107,7 +107,7 @@ Notice that all of the files the browser needs to render this application are ca
 <div class="alert is-helpful">
 Pay attention to two key points:
 
-1. The generated `ngsw-config.json` includes a limited list of cacheable fonts and images extentions. In some cases, you might want to modify the glob pattern to suit your needs.
+1. The generated `ngsw-config.json` includes a limited list of cacheable fonts and images extensions. In some cases, you might want to modify the glob pattern to suit your needs.
 
 1. If `resourcesOutputPath` or `assets` paths are modified after the generation of configuration file, you need to change the paths manually in `ngsw-config.json`.
 </div>
diff --git a/aio/content/guide/strict-mode.md b/aio/content/guide/strict-mode.md
index 3cfe153cb959f..4b0961cf61f53 100644
--- a/aio/content/guide/strict-mode.md
+++ b/aio/content/guide/strict-mode.md
@@ -1,17 +1,15 @@
 # Strict mode
 
-When you create a new workspace or a project you have an option to create them in a strict mode using the `--strict` flag.
+When you create a new workspace or an application you have an option to create them in a strict mode using the `--strict` flag.
 
-Enabling this flag initializes your new workspace or project with a few new settings that improve maintainability, help you catch bugs ahead of time, and allow the CLI to perform advanced optimizations on your application.
+Enabling this flag initializes your new workspace or application with a few new settings that improve maintainability, help you catch bugs ahead of time.
 Additionally, applications that use these stricter settings are easier to statically analyze, which can help the `ng update` command refactor code more safely and precisely when you are updating to future versions of Angular.
 
 Specifically, the `strict` flag does the following:
 
 * Enables [`strict` mode in TypeScript](https://www.staging-typescript.org/tsconfig#strict), as well as other strictness flags recommended by the TypeScript team. Specifically, `forceConsistentCasingInFileNames`, `noImplicitReturns`,  `noFallthroughCasesInSwitch`.
-* Turns on strict Angular compiler flags [`strictTemplates`](guide/angular-compiler-options#stricttemplates) and [`strictInjectionParameters`](guide/angular-compiler-options#strictinjectionparameters)
-* [Bundle size budgets](guide/build#configuring-size-budgets) have been reduced by ~75%
-* Turns on [`no-any` tslint rule](https://palantir.github.io/tslint/rules/no-any/) to prevent declarations of type `any`
-* [Marks your application as side-effect free](https://webpack.js.org/guides/tree-shaking/#mark-the-file-as-side-effect-free) to enable more advanced tree-shaking
+* Turns on strict Angular compiler flags [`strictTemplates`](guide/angular-compiler-options#stricttemplates), [`strictInjectionParameters`](guide/angular-compiler-options#strictinjectionparameters) and [`strictInputAccessModifiers`](guide/template-typecheck#troubleshooting-template-errors).
+* [Bundle size budgets](guide/build#configuring-size-budgets) have been reduced by ~75%.
 
 You can apply these settings at the workspace and project level.
 
@@ -30,17 +28,3 @@ To create a new application in the strict mode within an existing non-strict wor
 ng generate application [project-name] --strict
 
 </code-example>
-
-{@a side-effect}
-
-### Non-local side effects in applications
-
-When you create projects and workspaces using the `strict` mode, you'll notice an additional `package.json` file, located in `src/app/` directory.
-This file informs tools and bundlers that the code under this directory is free of non-local side effects. Non-local side effects in the application code are not common and using them is not considered a good coding pattern.
-More importantly, code with these types of side effects cannot be optimized, resulting in increased bundle sizes and applications that load more slowly.
-
-If you need more information, the following links may be helpful.
-
-* [Tree-shaking](https://webpack.js.org/guides/tree-shaking/)
-* [Dealing with side effects and pure functions in JavaScript](https://dev.to/vonheikemen/dealing-with-side-effects-and-pure-functions-in-javascript-16mg)
-* [How to deal with dirty side effects in your pure function JavaScript](https://jrsinclair.com/articles/2018/how-to-deal-with-dirty-side-effects-in-your-pure-functional-javascript/)
\ No newline at end of file
diff --git a/aio/content/guide/style-precedence.md b/aio/content/guide/style-precedence.md
new file mode 100644
index 0000000000000..be5d92150a365
--- /dev/null
+++ b/aio/content/guide/style-precedence.md
@@ -0,0 +1,133 @@
+# Style Precedence
+
+When there are multiple bindings to the same class name or style attribute, Angular uses a set of precedence rules to determine which classes or styles to apply to the element.
+These rules specify an order for which style- and class-related bindings have priority.
+This styling precedence is as follows, from the most specific with the highest priority to least specific with the lowest priorty:
+
+1. Template bindings are the most specific because they apply to the element directly and exclusively, so they have the highest precedence.
+  <table width="100%">
+    <col width="40%"></col>
+    <col width="60%"></col>
+    <thead>
+      <tr>
+        <th>Binding type</th>
+        <th>Example</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td>Property binding</td>
+        <td><code>&lt;div [class.foo]="hasFoo"&gt;</code><br><code>&lt;div [style.color]="color"&gt;</code></td>
+      </tr>
+      <tr>
+        <td>Map binding</td>
+        <td><code>&lt;div [class]="classExpression"&gt;</code><br><code>&lt;div [style]="styleExpression"&gt;</code></td>
+      </tr>
+      <tr>
+        <td>Static value</td>
+        <td><code>&lt;div class="foo"&gt;</code><br><code>&lt;div style="color: blue"&gt;</code></td>
+      </tr>
+    </tbody>
+  </table>
+1. Directive host bindings are less specific because you can use directives in multiple locations, so they have a lower precedence than template bindings.
+  <table width="100%">
+    <col width="40%"></col>
+    <col width="60%"></col>
+    <thead>
+      <tr>
+        <th>Binding type</th>
+        <th>Example</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td>Property binding</td>
+        <td><code>host: {'[class.foo]': 'hasFoo'}</code><br><code>host: {'[style.color]': 'color'}</code></td>
+      </tr>
+      <tr>
+        <td>Map binding</td>
+        <td><code>host: {'[class]': 'classExpr'}</code><br><code>host: {'[style]': 'styleExpr'}</code></td>
+      </tr>
+      <tr>
+        <td>Static value</td>
+        <td><code>host: {'class': 'foo'}</code><br><code>host: {'style': 'color: blue'}</code></td>
+      </tr>
+    </tbody>
+  </table>
+1. Component host bindings have the lowest precedence.
+    <table width="100%">
+    <col width="40%"></col>
+    <col width="60%"></col>
+    <thead>
+      <tr>
+        <th>Binding type</th>
+        <th>Example</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td>Property binding</td>
+        <td><code>host: {'[class.foo]': 'hasFoo'}</code><br><code>host: {'[style.color]': 'color'}</code></td>
+      </tr>
+      <tr>
+        <td>Map binding</td>
+        <td><code>host: {'[class]': 'classExpression'}</code><br><code>host: {'[style]': 'styleExpression'}</code></td>
+      </tr>
+      <tr>
+        <td>Static value</td>
+        <td><code>host: {'class': 'foo'}</code><br><code>host: {'style': 'color: blue'}</code></td>
+      </tr>
+    </tbody>
+  </table>
+
+## Precedence and specificity
+
+In the following example, binding to a specific class, as in `[class.special]`, takes precedence over a generic `[class]` binding.
+Similarly, binding to a specific style, as in `[style.color]`, takes precedence over a generic `[style]` binding.
+
+<code-example path="attribute-binding/src/app/app.component.html" region="basic-specificity" header="src/app/app.component.html"></code-example>
+
+## Precedence and bindings from different sources
+
+Specificity rules also apply to bindings even when they originate from different sources.
+An element can have bindings that originate from its own template, from host bindings on matched directives, and from host bindings on matched components.
+
+<code-example path="attribute-binding/src/app/app.component.html" region="source-specificity" header="src/app/app.component.html"></code-example>
+
+## Precedence of bindings and static attributes
+
+Bindings take precedence over static attributes because they are dynamic.
+In the following case, `class` and `[class]` have similar specificity, but the `[class]` binding takes precedence.
+
+<code-example path="attribute-binding/src/app/app.component.html" region="dynamic-priority" header="src/app/app.component.html"></code-example>
+
+{@a styling-delegation}
+
+## Delegating to styles with lower precedence
+
+Higher precedence styles can defer to lower precedence styles using `undefined` values.
+For example, consider the following template:
+
+<code-example path="attribute-binding/src/app/app.component.html" region="style-delegation" header="src/app/app.component.html"></code-example>
+
+Imagine that the `dirWithHostBinding` directive and the `comp-with-host-binding` component both have a `[style.width]` host binding.
+
+<code-example path="attribute-binding/src/app/comp-with-host-binding.component.ts" region="hostbinding" header="src/app/comp-with-host-binding.component.ts and dirWithHostBinding.directive.ts"></code-example>
+
+If `dirWithHostBinding` sets its binding to `undefined`, the `width` property falls back to the value of the `comp-with-host-binding` host binding.
+
+<code-example header="dirWithHostBinding directive">
+@HostBinding('style.width')
+width = ''; // undefined
+</code-example>
+
+<div class="alert is-helpful">
+
+  If `dirWithHostBinding` sets its binding to `null`, Angular removes the `width` property entirely.
+
+  <code-example header="dirWithHostBinding">
+  @HostBinding('style.width')
+  width = null;
+  </code-example>
+
+</div>
diff --git a/aio/content/guide/template-reference-variables.md b/aio/content/guide/template-reference-variables.md
index 1f3fd5db2844d..31f2cd140e223 100644
--- a/aio/content/guide/template-reference-variables.md
+++ b/aio/content/guide/template-reference-variables.md
@@ -37,9 +37,9 @@ by HTML.
 
 <code-example path="template-reference-variables/src/app/app.component.html" region="ngForm" header="src/app/hero-form.component.html"></code-example>
 
-The reference value of itemForm, without the ngForm attribute value, would be
+The reference value of `itemForm`, without the `ngForm` attribute value, would be
 the [HTMLFormElement](https://developer.mozilla.org/en-US/docs/Web/API/HTMLFormElement).
-There is, however, a difference between a Component and a Directive in that a `Component`
+There is, however, a difference between a `Component` and a `Directive` in that a `Component`
 will be referenced without specifying the attribute value, and a `Directive` will not
 change the implicit reference (that is, the element).
 
diff --git a/aio/content/guide/template-typecheck.md b/aio/content/guide/template-typecheck.md
index 5ef322932982e..d5612bb76a043 100644
--- a/aio/content/guide/template-typecheck.md
+++ b/aio/content/guide/template-typecheck.md
@@ -114,6 +114,7 @@ In case of a false positive like these, there are a few options:
 |Strictness flag|Effect|
 |-|-|
 |`strictInputTypes`|Whether the assignability of a binding expression to the `@Input()` field is checked. Also affects the inference of directive generic types. |
+|`strictInputAccessModifiers`|Whether access modifiers such as `private`/`protected`/`readonly` are honored when assigning a binding expression to an `@Input()`. If disabled, the access modifiers of the `@Input` are ignored; only the type is checked.|
 |`strictNullInputTypes`|Whether `strictNullChecks` is honored when checking `@Input()` bindings (per `strictInputTypes`). Turning this off can be useful when using a library that was not built with `strictNullChecks` in mind.|
 |`strictAttributeTypes`|Whether to check `@Input()` bindings that are made using text attributes (for example, `<mat-tab label="Step 1">` vs `<mat-tab [label]="'Step 1'">`).
 |`strictSafeNavigationTypes`|Whether the return type of safe navigation operations (for example, `user?.name`) will be correctly inferred based on the type of `user`). If disabled, `user?.name` will be of type `any`.
diff --git a/aio/content/guide/testing-components-basics.md b/aio/content/guide/testing-components-basics.md
index ca70d13559529..316aba4f6d5e7 100644
--- a/aio/content/guide/testing-components-basics.md
+++ b/aio/content/guide/testing-components-basics.md
@@ -375,6 +375,5 @@ Some noteworthy observations:
 When you're filtering by CSS selector and only testing properties of a browser's _native element_, the `By.css` approach may be overkill.
 
 It's often easier and more clear to filter with a standard `HTMLElement` method
-such as `querySelector()` or `querySelectorAll()`,
-as you'll see in the next set of tests.
+such as `querySelector()` or `querySelectorAll()`.
 
diff --git a/aio/content/guide/testing-components-scenarios.md b/aio/content/guide/testing-components-scenarios.md
index fb0ec07f9ee00..28e40876a8f44 100644
--- a/aio/content/guide/testing-components-scenarios.md
+++ b/aio/content/guide/testing-components-scenarios.md
@@ -190,7 +190,7 @@ It knows who the user is based on a property of the injected `UserService`:
 <code-example path="testing/src/app/welcome/welcome.component.ts" header="app/welcome/welcome.component.ts"></code-example>
 
 The `WelcomeComponent` has decision logic that interacts with the service, logic that makes this component worth testing.
-Here's the testing module configuration for the spec file, `app/welcome/welcome.component.spec.ts`:
+Here's the testing module configuration for the spec file:
 
 <code-example path="testing/src/app/welcome/welcome.component.spec.ts" region="config-test-module" header="app/welcome/welcome.component.spec.ts"></code-example>
 
@@ -415,7 +415,7 @@ You do have to call [tick()](api/core/testing/tick) to advance the (virtual) clo
 Calling [tick()](api/core/testing/tick) simulates the passage of time until all pending asynchronous activities finish.
 In this case, it waits for the error handler's `setTimeout()`.
 
-The [tick()](api/core/testing/tick) function accepts milliseconds and tickOptions as parameters, the millisecond (defaults to 0 if not provided) parameter represents how much the virtual clock advances. For example, if you have a `setTimeout(fn, 100)` in a `fakeAsync()` test, you need to use tick(100) to trigger the fn callback. The tickOptions is an optional parameter with a property called `processNewMacroTasksSynchronously` (defaults to true) represents whether to invoke new generated macro tasks when ticking.
+The [tick()](api/core/testing/tick) function accepts milliseconds and tickOptions as parameters, the millisecond (defaults to 0 if not provided) parameter represents how much the virtual clock advances. For example, if you have a `setTimeout(fn, 100)` in a `fakeAsync()` test, you need to use tick(100) to trigger the fn callback. The tickOptions is an optional parameter with a property called `processNewMacroTasksSynchronously` (defaults to true) that represents whether to invoke new generated macro tasks when ticking.
 
 <code-example
   path="testing/src/app/demo/async-helper.spec.ts"
@@ -594,11 +594,6 @@ Then you can assert that the quote element displays the expected text.
 To use `waitForAsync()` functionality, you must import `zone.js/dist/zone-testing` in your test setup file.
 If you created your project with the Angular CLI, `zone-testing` is already imported in `src/test.ts`.
 
-The `fakeAsync()` utility function has a few limitations.
-In particular, it won't work if the test body makes an `XMLHttpRequest` (XHR) call.
-XHR calls within a test are rare so you can generally stick with [`fakeAsync()`](#fake-async).
-But if you ever do need to call `XMLHttpRequest`, you'll want to know about `waitForAsync()`.
-
 <div class="alert is-helpful">
 
 The `TestBed.compileComponents()` method (see [below](#compile-components)) calls `XHR`
@@ -1231,7 +1226,7 @@ and provide for _all_ services injected in _any_ component in the tree.
 That's too much effort just to answer a few simple questions about links.
 
 This section describes two techniques for minimizing the setup.
-Use them, alone or in combination, to stay focused on the testing the primary component.
+Use them, alone or in combination, to stay focused on testing the primary component.
 
 {@a stub-component}
 
@@ -1340,7 +1335,7 @@ The `HostListener` wires the click event of the host element
 Clicking the anchor should trigger the `onClick()` method,
 which sets the stub's telltale `navigatedTo` property.
 Tests inspect `navigatedTo` to confirm that clicking the anchor
-set the expected route definition.
+sets the expected route definition.
 
 <div class="alert is-helpful">
 
@@ -1573,7 +1568,7 @@ calls to other `TestBed` static methods such as `compileComponents()`.
 In this example, the `BannerComponent` is the only component to compile.
 Other examples configure the testing module with multiple components
 and may import application modules that hold yet more components.
-Any of them could be require external files.
+Any of them could require external files.
 
 The `TestBed.compileComponents` method asynchronously compiles all components configured in the testing module.
 
diff --git a/aio/content/guide/testing-utility-apis.md b/aio/content/guide/testing-utility-apis.md
index 0c1b6ddd12925..b79419a60fa37 100644
--- a/aio/content/guide/testing-utility-apis.md
+++ b/aio/content/guide/testing-utility-apis.md
@@ -19,7 +19,7 @@ Here's a summary of the stand-alone functions, in order of likely utility:
 
   <tr>
     <td style="vertical-align: top">
-      <code>async</code>
+      <code>waitForAsync</code>
     </td>
 
     <td>
diff --git a/aio/content/guide/testing.md b/aio/content/guide/testing.md
index a0ded806165f9..d601187525724 100644
--- a/aio/content/guide/testing.md
+++ b/aio/content/guide/testing.md
@@ -75,7 +75,7 @@ The tests run again, the browser refreshes, and the new test results appear.
 
 The CLI takes care of Jasmine and Karma configuration for you.
 
-You can fine-tune many options by editing the `karma.conf.js` and
+You can fine-tune many options by editing the `karma.conf.js` in the root folder of the project and
 the `test.ts` files in the `src/` folder.
 
 The `karma.conf.js` file is a partial Karma configuration file.
@@ -217,7 +217,7 @@ script:
   - npm run e2e -- --protractor-config=e2e/protractor-ci.conf.js
 ```
 
-This does the same things as the Circle CI configuration, except that Travis doesn't come with Chrome, so we use Chromium instead.
+This does the same things as the CircleCI configuration, except that Travis doesn't come with Chrome, so use Chromium instead.
 
 Step 2: Commit your changes and push them to your repository.
 
diff --git a/aio/content/guide/typescript-configuration.md b/aio/content/guide/typescript-configuration.md
index 3561008b200aa..1d058045c33f6 100644
--- a/aio/content/guide/typescript-configuration.md
+++ b/aio/content/guide/typescript-configuration.md
@@ -18,32 +18,7 @@ that are important to Angular developers, including details about the following
 ## Configuration files
 
 A given Angular workspace contains several TypeScript configuration files.
-At the root level, there are two main TypeScript configuration files: a `tsconfig.json` file and a `tsconfig.base.json` file.
-
-The `tsconfig.json` file is a ["Solution Style"](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-3-9.html#support-for-solution-style-tsconfigjson-files) TypeScript configuration file.
-Code editors and TypeScript’s language server use this file to improve development experience.
-Compilers do not use this file.
-
-The `tsconfig.json` file contains a list of paths to the other TypeScript configuration files used in the workspace.
-
-<code-example lang="json" header="tsconfig.json" linenums="false">
-{
- "files": [],
- "references": [
-   {
-     "path": "./tsconfig.app.json"
-   },
-   {
-     "path": "./tsconfig.spec.json"
-   },
-   {
-     "path": "./projects/my-lib/tsconfig.lib.json"
-   }
- ]
-}
-</code-example>
-
-The `tsconfig.base.json` file specifies the base TypeScript and Angular compiler options that all projects in the workspace inherit.
+At the root `tsconfig.json` file specifies the base TypeScript and Angular compiler options that all projects in the workspace inherit.
 
 The TypeScript and Angular have a wide range of options which can be used to configure type-checking features and generated output.
 For more information, see the [Configuration inheritance with extends](https://www.typescriptlang.org/docs/handbook/tsconfig-json.html#configuration-inheritance-with-extends) section of the TypeScript documentation.
@@ -55,9 +30,9 @@ For details about configuration inheritance, see the [Configuration inheritance
 
 </div>
 
-The initial `tsconfig.base.json` for an Angular workspace typically looks like the following example.
+The initial `tsconfig.json` for an Angular workspace typically looks like the following example.
 
-<code-example lang="json" header="tsconfig.base.json" linenums="false">
+<code-example lang="json" header="tsconfig.json" linenums="false">
 {
   "compileOnSave": false,
   "compilerOptions": {
diff --git a/aio/content/guide/universal.md b/aio/content/guide/universal.md
index d9f1bea9df9f7..a96a9788df50f 100644
--- a/aio/content/guide/universal.md
+++ b/aio/content/guide/universal.md
@@ -48,8 +48,7 @@ src/
   app/ ...                   <i>application code</i>
     app.server.module.ts     <i>* server-side application module</i>
 server.ts                    <i>* express web server</i>
-tsconfig.json                <i>TypeScript solution style configuration</i>
-tsconfig.base.json           <i>TypeScript base configuration</i>
+tsconfig.json                <i>TypeScript base configuration</i>
 tsconfig.app.json            <i>TypeScript browser application configuration</i>
 tsconfig.server.json         <i>TypeScript server application configuration</i>
 tsconfig.spec.json           <i>TypeScript tests configuration</i>
diff --git a/aio/content/guide/updating-to-version-10.md b/aio/content/guide/updating-to-version-10.md
index 24abe1fa4001b..b8e62cd679898 100644
--- a/aio/content/guide/updating-to-version-10.md
+++ b/aio/content/guide/updating-to-version-10.md
@@ -37,10 +37,10 @@ If you're curious about the specific migrations being run by the CLI, see the [a
 {@a deprecations}
 ### New Deprecations
 
-| Area                          | API or Feature                                                                 | May be removed in |
-| ----------------------------- | ---------------------------------------------------------------------------    | ----------------- |
-| `@angular/core`               | [`WrappedValue`](guide/deprecations#wrapped-value)                                     | <!--v10--> v12 |
-| browser support               | [`IE 9, 10, and IE Mobile`](guide/deprecations#ie-9-10-and-ie-mobile-support) | <!--v10--> v11 |
+| Area                          | API or Feature                                     | May be removed in |
+| ----------------------------- | -------------------------------------------------- | ----------------- |
+| `@angular/core`               | [`WrappedValue`](guide/deprecations#wrapped-value) | <!--v10--> v12 |
+| browser support               | IE 9, 10, and IE Mobile                            | <!--v10--> v11 |
 
 
 {@a removals}
@@ -77,6 +77,5 @@ Read about the migrations the CLI handles for you automatically:
 
 * [Migrating missing `@Directive()`/`@Component()` decorators](guide/migration-undecorated-classes)
 * [Migrating `ModuleWithProviders`](guide/migration-module-with-providers)
-* [Solution-style `tsconfig.json` migration](guide/migration-solution-style-tsconfig)
 * [`tslib` direct dependency migration](guide/migration-update-libraries-tslib)
 * [Update `module` and `target` compiler options migration](guide/migration-update-module-and-target-compiler-options)
diff --git a/aio/content/guide/upgrade.md b/aio/content/guide/upgrade.md
index 93ec769c97de3..3293f4eb12595 100644
--- a/aio/content/guide/upgrade.md
+++ b/aio/content/guide/upgrade.md
@@ -479,6 +479,15 @@ using the `downgradeComponent()` method. The result is an AngularJS
 <code-example path="upgrade-module/src/app/downgrade-static/app.module.ts" region="downgradecomponent" header="app.module.ts">
 </code-example>
 
+<div class="alert is-helpful">
+
+By default, Angular change detection will also run on the component for every
+AngularJS `$digest` cycle. If you wish to only have change detection run when
+the inputs change, you can set `propagateDigest` to `false` when calling
+`downgradeComponent()`.
+
+</div>
+
 Because `HeroDetailComponent` is an Angular component, you must also add it to the
 `declarations` in the `AppModule`.
 
diff --git a/aio/content/guide/user-input.md b/aio/content/guide/user-input.md
index e5aacd44436cd..19907e16a1a73 100644
--- a/aio/content/guide/user-input.md
+++ b/aio/content/guide/user-input.md
@@ -234,8 +234,8 @@ To fix this issue, listen to both the _Enter_ key and the _blur_ event.
 
 
 ## Put it all together
-The previous page showed how to [display data](guide/displaying-data).
-This page demonstrated event binding techniques.
+
+This page demonstrated several event binding techniques.
 
 Now, put it all together in a micro-app
 that can display a list of heroes and add new heroes to the list.
@@ -324,5 +324,5 @@ These techniques are useful for small-scale demonstrations, but they
 quickly become verbose and clumsy when handling large amounts of user input.
 Two-way data binding is a more elegant and compact way to move
 values between data entry fields and model properties.
-The next page, `Forms`, explains how to write
+The [`Forms`](guide/forms-overview) page explains how to write
 two-way bindings with `NgModel`.
diff --git a/aio/content/guide/using-libraries.md b/aio/content/guide/using-libraries.md
index caf43ea7f94a2..07d3c9ebbe96e 100644
--- a/aio/content/guide/using-libraries.md
+++ b/aio/content/guide/using-libraries.md
@@ -32,7 +32,7 @@ To do this:
 
 1. Create a `typings.d.ts` file in your `src/` folder. This file is automatically included as global type definition.
 
-2. Add the following code in `src/typings.d.ts`.
+2. Add the following code in `src/typings.d.ts`:
 
 ```
 declare module 'host' {
@@ -45,7 +45,7 @@ declare module 'host' {
 }
 ```
 
-3. In the component or file that uses the library, add the following code.
+3. In the component or file that uses the library, add the following code:
 
 ```
 import * as host from 'host';
@@ -129,7 +129,7 @@ interface JQuery {
 }
 ```
 
-If don't add the interface for the script-defined extension, your IDE shows an error:
+If you don't add the interface for the script-defined extension, your IDE shows an error:
 
 ```
 [TS][Error] Property 'myPlugin' does not exist on type 'JQuery'
diff --git a/aio/content/guide/view-encapsulation.md b/aio/content/guide/view-encapsulation.md
new file mode 100644
index 0000000000000..b0e95d4eca4f6
--- /dev/null
+++ b/aio/content/guide/view-encapsulation.md
@@ -0,0 +1,81 @@
+# View encapsulation
+
+In Angular, component CSS styles are encapsulated into the component's view and don't
+affect the rest of the application.
+
+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:
+
+* `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.
+
+* `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 [Inspecting generated CSS](guide/view-encapsulation#inspect-generated-css) below.
+
+* `None` means that Angular does no view encapsulation.
+  Angular adds the CSS to the global styles.
+  The scoping rules, isolations, and protections discussed earlier don't apply.
+  This is essentially the same as pasting the component's styles into the HTML.
+
+To set the components encapsulation mode, use the `encapsulation` property in the component metadata:
+
+<code-example path="component-styles/src/app/quest-summary.component.ts" region="encapsulation.shadow" header="src/app/quest-summary.component.ts"></code-example>
+
+`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.
+
+{@a inspect-generated-css}
+
+## Inspecting generated CSS
+
+When using emulated view encapsulation, Angular preprocesses
+all component styles so that they approximate the standard shadow CSS scoping rules.
+
+In the DOM of a running Angular application with emulated view
+encapsulation enabled, each DOM element has some extra attributes
+attached to it:
+
+<code-example format="">
+  &lt;hero-details _nghost-pmm-5>
+    &lt;h2 _ngcontent-pmm-5>Mister Fantastic&lt;/h2>
+    &lt;hero-team _ngcontent-pmm-5 _nghost-pmm-6>
+      &lt;h3 _ngcontent-pmm-6>Team&lt;/h3>
+    &lt;/hero-team>
+  &lt;/hero-detail>
+
+</code-example>
+
+There are two kinds of generated attributes:
+
+* An element that would be a shadow DOM host in native encapsulation has a
+  generated `_nghost` attribute. This is typically the case for component host elements.
+* An element within a component's view has a `_ngcontent` attribute
+that identifies to which host's emulated shadow DOM this element belongs.
+
+The exact values of these attributes aren't important. They are automatically
+generated and you never refer to them in application code. But they are targeted
+by the generated component styles, which are in the `<head>` section of the DOM:
+
+<code-example format="">
+  [_nghost-pmm-5] {
+    display: block;
+    border: 1px solid black;
+  }
+
+  h3[_ngcontent-pmm-6] {
+    background-color: white;
+    border: 1px solid #777;
+  }
+</code-example>
+
+These styles are post-processed so that each selector is augmented
+with `_nghost` or `_ngcontent` attribute selectors.
+These extra selectors enable the scoping rules described in this page.
diff --git a/aio/content/guide/web-worker.md b/aio/content/guide/web-worker.md
index cdf2dd8a8e3a6..8151625e987a8 100644
--- a/aio/content/guide/web-worker.md
+++ b/aio/content/guide/web-worker.md
@@ -14,12 +14,16 @@ The CLI does not support running Angular itself in a web worker.
 
 To add a web worker to an existing project, use the Angular CLI `ng generate` command.
 
-`ng generate web-worker` *location*
+```bash
+ng generate web-worker <location>
+```
 
 You can add a web worker anywhere in your application.
 For example, to add a web worker to the root component, `src/app/app.component.ts`, run the following command.
 
-`ng generate web-worker app`
+```bash
+ng generate web-worker app
+```
 
 The command performs the following actions.
 
diff --git a/aio/content/guide/zone.md b/aio/content/guide/zone.md
index 7b17ef9b8a28c..acafca0602b44 100644
--- a/aio/content/guide/zone.md
+++ b/aio/content/guide/zone.md
@@ -9,7 +9,7 @@ To understand the benefits of `NgZone`, it is important to have a clear grasp of
 
 ### Displaying and updating data in Angular
 
-In Angular, you can [display data](guide/displaying-data) by binding controls in an HTML template to the properties of an Angular component.
+In Angular, you can display data by binding controls in an HTML template to the properties of an Angular component.
 
 <code-example path="displaying-data/src/app/app.component.1.ts" header="src/app/app.component.ts"></code-example>
 
@@ -102,13 +102,13 @@ In Angular, this step is unnecessary. Whenever you update the data, your HTML is
 
 To understand how change detection works, first consider when the application needs to update the HTML. Typically, updates occur for one of the following reasons:
 
-1. Component initialization. For example, when bootstrapping an Angular application, Angular loads the bootstrap component and triggers the [ApplicationRef.tick()](api/core/ApplicationRef#tick) to call change detection and View Rendering. Just as in the [displaying data](guide/displaying-data) sample, the `AppComponent` is the bootstrap component. This component has the properties `title` and `myHero`, which the application renders in the HTML.
+1. Component initialization. For example, when bootstrapping an Angular application, Angular loads the bootstrap component and triggers the [ApplicationRef.tick()](api/core/ApplicationRef#tick) to call change detection and View Rendering.
 
-2. Event listener. The DOM event listener can update the data in an Angular component and also trigger change detection, as in the following example.
+1. Event listener. The DOM event listener can update the data in an Angular component and also trigger change detection, as in the following example.
 
 <code-example path="user-input/src/app/click-me.component.ts" region="click-me-component" header="src/app/click-me.component.ts"></code-example>
 
-3. HTTP Data Request. You can also get data from a server through an HTTP request. For example:
+1. HTTP Data Request. You can also get data from a server through an HTTP request. For example:
 
 ```typescript
 @Component({
diff --git a/aio/content/images/bios/fmalcher.jpg b/aio/content/images/bios/fmalcher.jpg
new file mode 100755
index 0000000000000..8c12213cdca8e
Binary files /dev/null and b/aio/content/images/bios/fmalcher.jpg differ
diff --git a/aio/content/images/bios/jessicajaniuk.jpg b/aio/content/images/bios/jessicajaniuk.jpg
new file mode 100644
index 0000000000000..6026d84611a1d
Binary files /dev/null and b/aio/content/images/bios/jessicajaniuk.jpg differ
diff --git a/aio/content/images/bios/johanneshoppe.jpg b/aio/content/images/bios/johanneshoppe.jpg
new file mode 100755
index 0000000000000..83ec2461c9699
Binary files /dev/null and b/aio/content/images/bios/johanneshoppe.jpg differ
diff --git a/aio/content/images/bios/sajee.jpg b/aio/content/images/bios/sajee.jpg
index bbdfa0926dc6c..820c92bacfcd8 100644
Binary files a/aio/content/images/bios/sajee.jpg and b/aio/content/images/bios/sajee.jpg differ
diff --git a/aio/content/images/bios/samvloeberghs.jpg b/aio/content/images/bios/samvloeberghs.jpg
new file mode 100644
index 0000000000000..b88025ebfb5c4
Binary files /dev/null and b/aio/content/images/bios/samvloeberghs.jpg differ
diff --git a/aio/content/images/bios/thekiba.jpg b/aio/content/images/bios/thekiba.jpg
new file mode 100644
index 0000000000000..0edab3bff9f72
Binary files /dev/null and b/aio/content/images/bios/thekiba.jpg differ
diff --git a/aio/content/images/marketing/home/loved-by-millions.svg b/aio/content/images/marketing/home/loved-by-millions.svg
index e3d5c67832d45..d2e8cfd240e51 100644
--- a/aio/content/images/marketing/home/loved-by-millions.svg
+++ b/aio/content/images/marketing/home/loved-by-millions.svg
@@ -1,571 +1,175 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="1185px" height="594px" viewBox="0 0 1185 594" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>Loved by Millions Copy</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect x="0" y="0" width="1163" height="565" id="rect-1"></rect>
-        <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-2">
-            <feOffset dx="0" dy="5" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
-            <feGaussianBlur stdDeviation="2.5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
-            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.25 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
-        </filter>
-        <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-3">
-            <feOffset dx="0" dy="6" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
-            <feGaussianBlur stdDeviation="5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
-            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.3 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
-            <feMerge>
-                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
-                <feMergeNode in="SourceGraphic"></feMergeNode>
-            </feMerge>
-        </filter>
-        <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-4">
-            <feOffset dx="0" dy="6" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
-            <feGaussianBlur stdDeviation="5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
-            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.3 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
-            <feMerge>
-                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
-                <feMergeNode in="SourceGraphic"></feMergeNode>
-            </feMerge>
-        </filter>
-        <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-5">
-            <feOffset dx="0" dy="6" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
-            <feGaussianBlur stdDeviation="5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
-            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.3 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
-            <feMerge>
-                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
-                <feMergeNode in="SourceGraphic"></feMergeNode>
-            </feMerge>
-        </filter>
-        <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-6">
-            <feOffset dx="0" dy="6" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
-            <feGaussianBlur stdDeviation="5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
-            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.3 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
-            <feMerge>
-                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
-                <feMergeNode in="SourceGraphic"></feMergeNode>
-            </feMerge>
-        </filter>
-        <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-7">
-            <feOffset dx="0" dy="6" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
-            <feGaussianBlur stdDeviation="5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
-            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.5 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
-            <feMerge>
-                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
-                <feMergeNode in="SourceGraphic"></feMergeNode>
-            </feMerge>
-        </filter>
-        <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-8">
-            <feOffset dx="0" dy="6" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
-            <feGaussianBlur stdDeviation="5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
-            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.5 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
-            <feMerge>
-                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
-                <feMergeNode in="SourceGraphic"></feMergeNode>
-            </feMerge>
-        </filter>
-        <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-9">
-            <feOffset dx="0" dy="6" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
-            <feGaussianBlur stdDeviation="5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
-            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.3 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
-            <feMerge>
-                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
-                <feMergeNode in="SourceGraphic"></feMergeNode>
-            </feMerge>
-        </filter>
-        <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-10">
-            <feOffset dx="0" dy="6" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
-            <feGaussianBlur stdDeviation="5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
-            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.3 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
-            <feMerge>
-                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
-                <feMergeNode in="SourceGraphic"></feMergeNode>
-            </feMerge>
-        </filter>
-        <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-11">
-            <feOffset dx="0" dy="6" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
-            <feGaussianBlur stdDeviation="5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
-            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.3 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
-            <feMerge>
-                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
-                <feMergeNode in="SourceGraphic"></feMergeNode>
-            </feMerge>
-        </filter>
-        <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-12">
-            <feOffset dx="0" dy="6" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
-            <feGaussianBlur stdDeviation="5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
-            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.3 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
-            <feMerge>
-                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
-                <feMergeNode in="SourceGraphic"></feMergeNode>
-            </feMerge>
-        </filter>
-        <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-13">
-            <feOffset dx="0" dy="6" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
-            <feGaussianBlur stdDeviation="5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
-            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.3 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
-            <feMerge>
-                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
-                <feMergeNode in="SourceGraphic"></feMergeNode>
-            </feMerge>
-        </filter>
-        <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-14">
-            <feOffset dx="0" dy="6" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
-            <feGaussianBlur stdDeviation="5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
-            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.3 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
-            <feMerge>
-                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
-                <feMergeNode in="SourceGraphic"></feMergeNode>
-            </feMerge>
-        </filter>
-        <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-15">
-            <feOffset dx="0" dy="6" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
-            <feGaussianBlur stdDeviation="5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
-            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.3 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
-            <feMerge>
-                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
-                <feMergeNode in="SourceGraphic"></feMergeNode>
-            </feMerge>
-        </filter>
-        <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-16">
-            <feOffset dx="0" dy="6" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
-            <feGaussianBlur stdDeviation="5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
-            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.3 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
-            <feMerge>
-                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
-                <feMergeNode in="SourceGraphic"></feMergeNode>
-            </feMerge>
-        </filter>
-        <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-17">
-            <feOffset dx="0" dy="6" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
-            <feGaussianBlur stdDeviation="5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
-            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.3 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
-            <feMerge>
-                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
-                <feMergeNode in="SourceGraphic"></feMergeNode>
-            </feMerge>
-        </filter>
-        <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-18">
-            <feOffset dx="0" dy="6" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
-            <feGaussianBlur stdDeviation="5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
-            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.3 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
-            <feMerge>
-                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
-                <feMergeNode in="SourceGraphic"></feMergeNode>
-            </feMerge>
-        </filter>
-        <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-19">
-            <feOffset dx="0" dy="6" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
-            <feGaussianBlur stdDeviation="5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
-            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.3 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
-            <feMerge>
-                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
-                <feMergeNode in="SourceGraphic"></feMergeNode>
-            </feMerge>
-        </filter>
-        <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-20">
-            <feOffset dx="0" dy="6" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
-            <feGaussianBlur stdDeviation="5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
-            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.3 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
-            <feMerge>
-                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
-                <feMergeNode in="SourceGraphic"></feMergeNode>
-            </feMerge>
-        </filter>
-        <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-21">
-            <feOffset dx="0" dy="6" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
-            <feGaussianBlur stdDeviation="5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
-            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.3 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
-            <feMerge>
-                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
-                <feMergeNode in="SourceGraphic"></feMergeNode>
-            </feMerge>
-        </filter>
-        <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-22">
-            <feOffset dx="0" dy="6" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
-            <feGaussianBlur stdDeviation="5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
-            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.3 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
-            <feMerge>
-                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
-                <feMergeNode in="SourceGraphic"></feMergeNode>
-            </feMerge>
-        </filter>
-        <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-23">
-            <feOffset dx="0" dy="6" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
-            <feGaussianBlur stdDeviation="5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
-            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.3 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
-            <feMerge>
-                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
-                <feMergeNode in="SourceGraphic"></feMergeNode>
-            </feMerge>
-        </filter>
-        <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-24">
-            <feOffset dx="0" dy="6" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
-            <feGaussianBlur stdDeviation="5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
-            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.3 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
-            <feMerge>
-                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
-                <feMergeNode in="SourceGraphic"></feMergeNode>
-            </feMerge>
-        </filter>
-        <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-25">
-            <feOffset dx="0" dy="6" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
-            <feGaussianBlur stdDeviation="5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
-            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.3 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
-            <feMerge>
-                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
-                <feMergeNode in="SourceGraphic"></feMergeNode>
-            </feMerge>
-        </filter>
-        <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-26">
-            <feOffset dx="0" dy="6" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
-            <feGaussianBlur stdDeviation="5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
-            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.3 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
-            <feMerge>
-                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
-                <feMergeNode in="SourceGraphic"></feMergeNode>
-            </feMerge>
-        </filter>
-        <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-27">
-            <feOffset dx="0" dy="6" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
-            <feGaussianBlur stdDeviation="5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
-            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.3 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
-            <feMerge>
-                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
-                <feMergeNode in="SourceGraphic"></feMergeNode>
-            </feMerge>
-        </filter>
-        <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-28">
-            <feOffset dx="0" dy="6" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
-            <feGaussianBlur stdDeviation="5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
-            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.3 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
-            <feMerge>
-                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
-                <feMergeNode in="SourceGraphic"></feMergeNode>
-            </feMerge>
-        </filter>
-        <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-29">
-            <feOffset dx="0" dy="6" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
-            <feGaussianBlur stdDeviation="5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
-            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.3 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
-            <feMerge>
-                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
-                <feMergeNode in="SourceGraphic"></feMergeNode>
-            </feMerge>
-        </filter>
-        <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-30">
-            <feOffset dx="0" dy="6" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
-            <feGaussianBlur stdDeviation="5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
-            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.3 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
-            <feMerge>
-                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
-                <feMergeNode in="SourceGraphic"></feMergeNode>
-            </feMerge>
-        </filter>
-        <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-31">
-            <feOffset dx="0" dy="6" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
-            <feGaussianBlur stdDeviation="5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
-            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.3 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
-            <feMerge>
-                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
-                <feMergeNode in="SourceGraphic"></feMergeNode>
-            </feMerge>
-        </filter>
-        <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-32">
-            <feOffset dx="0" dy="6" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
-            <feGaussianBlur stdDeviation="5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
-            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.3 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
-            <feMerge>
-                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
-                <feMergeNode in="SourceGraphic"></feMergeNode>
-            </feMerge>
-        </filter>
-        <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-33">
-            <feOffset dx="0" dy="6" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
-            <feGaussianBlur stdDeviation="5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
-            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.3 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
-            <feMerge>
-                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
-                <feMergeNode in="SourceGraphic"></feMergeNode>
-            </feMerge>
-        </filter>
-        <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-34">
-            <feOffset dx="0" dy="6" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
-            <feGaussianBlur stdDeviation="5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
-            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.3 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
-            <feMerge>
-                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
-                <feMergeNode in="SourceGraphic"></feMergeNode>
-            </feMerge>
-        </filter>
-        <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-35">
-            <feOffset dx="0" dy="6" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
-            <feGaussianBlur stdDeviation="5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
-            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.3 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
-            <feMerge>
-                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
-                <feMergeNode in="SourceGraphic"></feMergeNode>
-            </feMerge>
-        </filter>
-        <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-36">
-            <feOffset dx="0" dy="6" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
-            <feGaussianBlur stdDeviation="5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
-            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.3 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
-            <feMerge>
-                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
-                <feMergeNode in="SourceGraphic"></feMergeNode>
-            </feMerge>
-        </filter>
-    </defs>
-    <g id="Loved-by-Millions" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Loved-by-Millions-Copy">
-            <g id="map" transform="translate(13.000000, 13.000000)">
-                <g>
-                    <use fill="black" fill-opacity="1" filter="url(#filter-2)" xlink:href="#rect-1"></use>
-                    <image x="0" y="0" width="1163" height="565" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAB1EAAAOPCAYAAACaaDh3AAAABGdBTUEAA1teXP8meAAAQABJREFUeAHsveGu5SiWbpu3boe6jyqPlPkj3v/NzgvsH53S6VZ3qqp0b43t/iJmEIDBxja2P6S9vZaNYTLAMJkTvP6f//N//s//94uDCZiACZhAlcD//t//+5d/+7d/q8bRxf/+7//+5f/+3/+rr6vHI9Nezfx/Inz58uWXf/mXf/n8xvH//X+Xz3/88e8/JEG8v/3tb9/Opd+/XQgf/tf/+l+//Prrr9/OfHx8fPv822+///Lly5IXJ//jP/7jl//6r//6vJ5e+3bTzT7QHv7+979/K9dW8b9+/br1Vt9nAiZgAsMJxP66JXHGC0IcQ1rucxwTeCKBVDcaUca//e3vv6R6Wy1dnsm//vXXH/SwWnyuRR1uLa6vm4AJmIAJmMCMBNbm1Yynf/75399EZy4fw1G6bM3+0TvGR3n92QRMwARMYD+B75br/Wk5BRMwARP4RgDDjJxycop9u3jDDzhFUZ6jM7BUDJytPU5U4uK0jM7EWtpc60m/lFY8z0SgZTKQxkm/xzT1mfqnLaSTD67HMjMxiHHiNaV1x6Oc7zDYU284Y5XWHTlYZhMwgWcRiP11a8l+++23f441fY6e1rQdzwTuQgAduUWf7C1PNPiu3YsMPI+9gftadL/edB3fBEzABEzABM4gwCKmWrhST/3P//yPTWNzrTy+ZgImYAImMIaAnahjODoVE3gtAYwprGInsPo9t3ruCU5Uykc5MBq3GJ3WjExcxyGmHZ89DkPdg0x3CTnnIRMYJikY/dI2sja5KZWb9HpYltI54jxO0D1hi8NiT36+1wRMwARGEpDjBQORgwk8nQB6Xou+OJJDqkvV0uZ5nFlnqsnuayZgAiZgAiawlYAW+ufuv9KBijy1sXlWG0eOo8+ZgAmYwBMJ2In6xFp1mUzgYAIYhlA+//Vf/+0Hh1XptShrDsWDxR2avIzAexMlnd5XqCnPpxigMfblDH60ly07NP74449Px/SMEwxee7m37cAKLqS1hY/aj48mYAImcBWBEX3hVbI7XxNoJXCmA1WL0Vpli/FYxPbly/efW4jX/NkETMAETMAEnkaA8bn0Zqfen2Q6ik3Pa/mPksHpmoAJmIAJ/EzgLz+f8hkTMAETKBPg9ztZWY8TZ0ZnVVnycVcwWK2F2gpH3bvFGYpyv9cZp/xnPLIDdevODbiUJkVXlpX2knMWb5FJv0HI0cEETMAEriJAv7ZlLBrVF15VbudrAi0EWnTAlnRa4/BcbXm2uKdFp41ynF22mLc/m4AJmIAJmMAeAqUxbBYH6p6y+V4TMAETMIFjCXgn6rF8nboJTEmAV+7+4x/L70/yitAWQyjO060OKpTVljymhLVRqJKCHpODCcarVmc0cXOvxY1p3vkzDtQ9OyxZWcoEaGs7HcmOujpiFamMpBzTneAj5XdaJmACJlAjgA7hYAImcD2BVh2yJCm6yh4dv5Suz5uACZiACZjAbARyc2g7UGerJctjAiZgAnMSsBN1znqxVCZwGAEcTRhcotGlpDjuNaqQLk5aOX4OK9TJCWM8jvxy2bf+bim7UVt2XmoHYi6vJ5yjXe5xoJ7FAOeofsMVmUvO8jN+vzS2nR5n/FmsnI8JmMBzCTC+x6D+8GnjfSyjP5vAjAQY//cGFuiht67ptuQjXc3P+l7qvt8ETMAETOAKAkcsdL6iHM7TBEzABEzgXAJ2op7L27mZwOUEck4fdu5hEI27Rdmt2mJMSQskJ1PrDtf0/lm+1wzCsFrb7djKDuY4SGWUgh9OWhmzyCutm1kYtchR4xjvTznEay2fYUgaLQ7plvRKcXBc6jnhqM+l+EeeJ2/KLYft0WU/sixO2wRM4F4EYt9HPx/7HztX7lWXlnY8AY3L41P+MUX0w1FvKGlZIKjc0VnvruerLD6agAmYgAmYgAmYgAmYgAmYwBoBO1HXCPm6CbyEAE5BGUUxiLY6ASOekcacmO5Zn9l5K+dlzDM1CMPpjz/++HSk5pypcnzGNGqfSV+vZo1Outo9s1+jDcFGfOQkru2ojRx6y8e9vA746ICjgLrXs3J0fmvpp20zjY9Tnjb117++9zeMUyb+bgImsI8AY1wM9C8Kdq6IhI9vJoCOwPi7pkujE0n/g5cW0uGgjOdLLNGxRjlRpa+V8krP89x7N09Kxd9NwARMwARMwARMwARMwASeSMBO1CfWqstkAhUCOF3YjZoaS/iOYRTDT263aiXJx1zKOVDl/EudVYuB7G+fzDAk8YpXQhqvFQ6OLrjP4pxrlTsXr/Ya6BJPpQOHuKNJ52tHjI4EDI5nhFnrKTXYalHD1kURZ7B0HiZgAvcjEHfZsXgldRTNttjkfoQt8RMIrO3s1IIs9EbGaYJ0QPSo9LkqMeFe3VeKs3Z+yyI05Pv69eu3pFWebyf8wQRMwARMwARMwARMwARMwAQeQsBO1IdUpIthAj0Ecr99JAdqTzppXByxGFe3OhLT9M7+XjJ41Rx/GK5GrMQnnZIRDAMZjlrtUuU7jrwZX6WGIS510Kf1uMaTtriWRkwTBzZMWg2O8d4tn3HWztjGteOUdhyf5x6WW3j4HhMwgXcRUP9Hv6v+PCWAI7X25oE0vr+bwNMI5HQZFjvpd9VjeaP+V1uIFu8Z+XnvIjTKFcswUjanZQImYAImYAImYAImYAImYAJXE7AT9eoacP4mcBEBHH/63dPU0Bl3mfSKh0E1GlU/Pj56k2iOjwF3pNEmZ/CSMCqTjMc6f/QxGtNklJYsMW9kJ7CbljDCsfuZ0EH/VIa9PDHckQaczgo4a0e3vRGy8yyk9Y6cdqKOoOs0TMAEIECfq7D21gr6ef4Yn+68wErl9dEEeggwJqNfK9QWvkVdT/Fbj3vfjoGesHcRGou3HEzABEzABEzABEzABEzABEzgqQTsRH1qzbpcJtBAAIdLzhk00jHZIMbmKHIOjZJ3cUL98cPrZDEYYxzC+LXHubylkDmjmpyPaXpiofPcO+p3spTm6KPKEh2pvU4/vUZZzuPRMpbS22u0LKU7+nz8rcLRaTs9EzCB9xFQn9tTco1P9Juzj0s95XJcE1gjEPWbNC76DmP0XgfmXt10bTFEKnfuO884iyVG6eO5PHzOBEzABEzABEzABEzABEzABK4iYCfqVeSdrwlMQuDuBo/Rv70GD3YO1HYMnFV1exyDVxm0eo15OFKjkRH+tR3BKXvuHbGLIk137fusr/RN5dZCCRlJxTrnoE/vTb+zoCA6UEhTzpE0rr+bgAk8k0BrH5/rx68al55ZEy7V3Qkwhu51oMLg7nr83evR8puACZiACZhASkBvfIvn/dvhkYY/m4AJmMD9CNiJer86s8QmcAoBHCZ7jTvxtX9HCC1jrl5zKwfR3rxGpbNXjr382eGQvt51TSY517a+flFOaO0yXcuP6+lu6JzxvZbOFY486obff52lrdT4UCcysiJzrm5gzh/PUi7wLJfa0hX8czL6nAmYwPEE6CPoD3hDQ2mhj34iINen0F+oPzpeWudgAs8nMIMuwjPv5/r5bc0lNAETMAETKBNgPMY+ha6bs+Nssc2Uc/MVEzABEzCBswn85ewMnZ8JmMA9CMQdZ7NKLCcq8uEYQnF9SsCxuDf0/kYV/OQQ4whTVlH2BhyLPQ507ZJUPhjiML6vBVZzwkkyr8UffZ3dqHcKOMhzDlTKUGNYc6Dyas6eur4TL8tqAiaQJ4BhiD4jZyCiX9biEvpyvsdQcrzGOP5sAm8ggA47YvzU87aVWaqDpemsyahFE+l9/m4CJmACJmACbyGAzWSxnfxWnFejN4+w8byFqctpAiZgArMRsBN1thqxPCawg8BIpWyvUYZi9DrxeouernpHcR3JoFeekfHXjFotebU4ItfSQdnH+dYbepzwubKuyY7RjlDaOdkr75b4//mfiwxb7j37Hu0wruWLUyTlXnOgKq2eutY9PpqACTyTwOJc/b4ISI5U+hL6l9KO9mfScKlMYCHAGJzTT4/Wk2v8kefr169FYy/P68fHxy81XccO1BphXzMBEzABE3gDgdyre0vlxnZR0glK9/i8CZiACZjAHAT8Ot856sFSmMAuAhhC5EwaadDAgFLbobYmdOqQWYu/5TqG2bgb5imvScGJzU7HWLYePrBPncw998e4tAF2TIxwrMd09Tm3M4k85SiNO45VptjmlU7pSDqlHZile9bOk6ZkWYs7w3V2jOp5rj3TxKE+MOy21jntYjTfGZhZBhMwgX4C9C/0IdFZujhS/70/Md9hAg8goEVMei56jK2l4o/Qa3IL2MgPvRrHqXQcjtIfUnmifpZe83cTMAETMAETeDqBLWM6ujJ/jLcsRj7KxvJ09i6fCZiACZxNwE7Us4k7PxMYTABnUnSK4MzAqCHjx57sthpHUgPMHhnW7kXx/PLl12/RtjodvyUw0QeM0DK+9YqFwWtk6G1XPW2HOqMdq83ymftLE4oeByoMSGuEwVE8ad8l2RRnxiN8ozFU/QbliQ6P+Lm1HKTxpGevtdyOZwIm8DOB2s61n2P7jAk8l0D8mQTGyC3G1pSOdJCRegg6Y03vyul0vKpbelsqo7+bgAmYgAmYwNMJLDtKt5vUFxvIYscaOaY/nbvLZwImYAJXEdje418lsfM1ARP4RqDkTBq1G1PKXOsuMww7Z6+myxl2okPuG6ybfmAHIX+1QHnZUSAWW41apV0JypvrW9NWGqVjmrbaXi4+7bsnkDbp7dnZG/Ob3UGA0Zay8izSJtI64zt/tCvi1ljHcpc+751AltL1eRMwgfsRQA9I+5z7lcISm8AYAtLLlNqIxUajdBBka3WE5vRDP+eqVR9NwARMwATeRmDrQvccJ+bte+fjuXR9zgRMwARMYCwB/ybqWJ5OzQROJYABAwNIGrTaPT2/5TsKHbv41gKGUww7MyiA2mG3JvNTrtMO4M5xj1Er91rdsxjhqGcyQkjLgKNPf1zvNSDK+McOS9rpntBqcNyTx4h76QNgymu+2fkCv1zY+7yS7tuetxxHnzMBE1gIjHASmaUJPIVAqs/sLdfInxLo0RlT/TA399hbNt9vAiZgAiZgAncgMNKBSnnRnVkU72ACJmACJjA3Ae9Enbt+LN2LCcTdhXICpbvKtOPy4+Pjp1eEyZG65dWcKXYcLeSt313lul79lcqU3nv098UI9OOrRHHqIN9o49XRZbk6/fTVyKk81HVrEHuclvy+Jga4NeM69Ua8dDdz3EHKs0Dd8rfFecfzgOMvplkrE/IjD/Eph8pVu+fqa9QThta9z6b6IJir/mZ57q9m7PxNwATKBFi4UdoJX77LV0zgmQS26is5GpoP5K6dde4ui8nO4uF8TMAETMAE3kNgtAP1PeRcUhMwARO4PwE7Ue9fhy7BwwjguOB1pSWHk5w6OEgwphCXnXm5+CMdqTiPcNbOGCh/dPAiI99t6OmrLZzltKktzslcTrG94LiMv12bi8852izxcFpSr7Q7nJdq38jWKp+cranjk3LyV3Om5u7lnjsEypuWuUVueESHae6eyD7Wby6uz5mACbyTgPpxSo/OMmIx1ztJutRPINCzAG2tvCPTWssrXpcONnInbEzfn03ABEzABExgdgLY6eJceJS8tlmNIul0TMAETOBYAnaiHsvXqZtAFwGcGGu/PxqNk0o8dSDq/FuOOIxyK/3hYkdPXyvQ76/mJghbHHN9uX+PTTun/jDAbwncp7LE+3nGtENTzlStKNUChZyzNHcupnvnzyp/bxmYSDqYgAmYQI3A0pf//oMjlT6HfvjJ/WqNia+9iwDtfE23byVyhROVsT63sKxVZsczARMwARMwgScQYPPC6ODFSaOJOj0TMAETOI6AnajHsXXKJtBNYPRrujB65BxJ3YLd4IacE/UGYk8lIoYyHKVqM9GRutWZubeA2v3Qm86y2GApj+6NzkI5TDFIUl6VWXHfdOTZIcT6bin/2xdvtDByHBMwgeUNA/S/6mfV16Dz6Jw5mcCTCaBzbNVnIheemTMXtJE3+Z2dZyyzP5uACZiACRxPIC7mf5MNqZUseuyIcTzmB2cvKIxE/NkETMAE5iZgJ+rc9WPpXkZAhsURxWZV25uUMgw8lHnUav8RdXDHNPgtO16ji2Fbjml+D/OOr2Nktajkplxx4rM4WZfVpBg3KTMBA6UWM9zduI9TXGWptUUcyZosM4Fu/b3YWpq+ZgImYAKRgPQb+hoFzvHdDhoR8fGpBNZ+c7613G/S61uZOJ4JmIAJmMA+AswZow2Fub/DdwLwkR77/ey+T9gf7m5r2EfAd5uACZjA/Qh4dLxfnVnihxJgdduIgEImx9GI9O6UBsYlnEajldw7MdgjqwzZMOSz/vakqXuvqJvFUVr/jWHJR5tJ281dnccqU+23lRUnPdJ/EDhGp3Maz99NwARMoJdArp/tTcPxTeCOBNCB9CreLWPzHctsmU3ABEzABO5B4IjX1B5Rcr0164i0a2mO5MPiQfQBL4qqEfc1EzABE5iTgJ2oc9aLpXoZAXZ/pQ6crQhY7f7moBV9OMD+8Y9tv6f5Zn7syJQzdSsH2jOBHY0KVznkWl45uzhbfx4O5YTdy0MMzjxSB1uYb7nnzHI5LxMwgWcR0KKdZ5XKpTGBnwlIl2ChY/x5gZ9j+owJmIAJmIAJnEMgvqaWRbTYkmZ08DG3Zbfsx8fHOWD+Jxcct3vnx+KK81S6wKmFcGYmYAImYAJDCPxsNR6SrBMxARNoJZC+PqX1vlI8HFczKr4leY84L0fqEWk/Pc29iv2TDINMePbyuKq9RAf2VTI4XxMwARNYI2CdZY2Qrz+RgPTUngWU/GSFgwmYgAmYgAmMJLA49uZ1nlLWK+0LI3ahjlikPrLOnZYJmIAJmMA2AnaibuPmu0xgGIGWnXI9me1dKdeTl+MeTwAnOzt1ZneMI+fTXlF3113dI1bMHt+ynYMJmIAJmIAJvJdA6kjVK/7i79KJDg7U2fVAyeqjCZiACZjAfQgwtsw6vqT2BRY4nxlGzalr9j7GfukD7Lb1btUza9h5mYAJmEAfATtR+3g5tgkMJcCquiPCb7/9/trfRT2C5xVpokSzQ0dOcYxqUcm+QqZSnkwwapOD0n0zn2eSNuuEco1bz86WtbR83QRMwASOJKAx7sg8nLYJzEpAhlPk02cWzqXjuHdsz1qDlssETMAETOAIAtG+wLz8it2cI3ahrrHBvpPutKW8/CyVfzt1jZ6vm4AJmMC5BOxEPZe3czOBbwRQDFMjybeLOz9glEQZk0FmZ3K+/SQCahOldsF5/mZypur3SU5CdFo2a7tQqatZX/XL7wE7mIAJmMBdCMzcn96FoeW8L4Goq/Ms6NWKcYEBn/2c3LeOLbkJ3JFA6tihDH/88ce08587MrbMZQIsKLqyvTHmxnG4LOn2KzhLcwvRlzF/mc+ziIrfUncwARMwARO4noAtrdfXgSV4KYGjVrahbJJ2NMq8FPHtip1TonOFmMWZmptc5+S94zkmbjiICfG1Okyo9OzOOqFhpS4y5iZ+vBIw96rAO9aRZTYBE5iLwMfHx6ejh/6TPxZ05PqhVGrizrooJZXV303gKAJP1qmOYuZ0TcAEjiHAW61y4zdz1SsdW8eU1qnOSODqN0Jpvn8km9wzluZHHG+OSKn4uwmYgAlcQ8BO1Gu4O9eXE8A506I0bcGEMbLXuYM8VyuqW8r69nvkTNVvZeHgo/6j0+8oRqXJ9VH5nZ0ubBXY+YuBPzVwzvrcICt9QCov7cTBBEzABI4kQP8THaKMS2sLhBizHEzgrQRanhHpIW9l5HKbgAmcQ0CLRWt2CsZ0zT3Pkcq5mMC5BHgOas/AudL88rko8ew8nZ8JmIAJmMDPBOxE/ZmJz5jA4QR4LcdRgV1mPU40OcOQ6YrfmjiKw5vSpc7j7kJeDdPrSO/hhXNupolFj+xb4rKbKnVIks7sv1HGbnQ5g2Xs4Hl3MAETMIG9BNiJQmDhDn1haUxYFnX8UXWkRqfrXrl8vwncjUBL+/fbZe5Wq5bXBO5HgMWhcT5ZK0GvvaGWlq+ZgAmYgAmYgAmYwB0I/OUOQlpGEzCBhQDOsZawtuuDNJaV799f1YMBlPs4f3RgksYfjimH8QSoy1H1SDqqL0n6tt/chKeckWJwlyOODjlQkbnk6LhLeSynCZjANQToS+Q4RQL6RJw/vMWCRTu8yrcUiEc/tOym+/s/71v+iM85BxN4OwGej1oYpdPV8vA1EzCB9xJgTt7qQBWlM153qrx8NIEzCbQsbjpTnj//tK58Jm/nZQImYAIlAt6JWiLj8yZwAAGMIKXfKqxlh8HxH//4+7BXeeRWmmLIPGOlOwziJI1ds36VcK32t10b8RtzaTvRDmc74pY6ucOEhkmgJoLUp4MJmIAJ9BKIrxJFH9HCkh6dweN8L3XHfxMBng90rC1zhDdxcllNwATGE8i9baclF88HWyg5zl0JoPvOsIgaOaxD37UVWe43E8DuTR8S59Fv5vGUstuJ+pSadDmmJqAOdKsiplezMskZMWGRsQZHG+EsxQwO6S5ZHKpn5T+ikeh1qDi1ewzII/LuSWPEq2Yx6MWg9hLP8Vk7pEe0zTTtnu9ny3GndgtHPfc20va0Ksc1gXcToF+NYx2v/dc4zsKMu/WD765Nl35mAix4yv2eOTKPWBg3c9ktmwmYwDUE9LM+W3Nnbq/FmlvT8H0mMCOBGZyoqQ4eOa3p4Dybst1w5E1iOVtNfGNVTN+fTcAEthGItn+eYY+R2zjOepedqLPWjOV6DIGc47CncPH1ealTqyedNC6d+dkdesmJfJcJWHRiz74LESV5L9e0fUgRT9sSLLiWU8zTuEd+J38mPGfIQT53DNQpRtp0l3EsC8pedJTEa/5sAibwLgIsGIph0R2W3agjFuvEtP3ZBEzgl89FC6m+PFL/N2MTMAETgADzxL1zJvqqdL5ouibwBAIztGvm47nAs8tGBP6Yt8sWU3KU5tLQOdLAjhMXTOqajyZgAn0E0jc7lJ7hvlQdeyYCdqLOVBuW5ZEE9v5eSJyclJxYdwGX+y1NnMRHKqkMZOSLcrlnxwzKqoxaR63YI10U2VGB9lJiS3nUnjCEM4nOlQvFXBPsXP0hK+nMYuBbnpfvMo9imaZzVyeqysGzsPY8xLrXfT6agAm8iwB9ampY0SILxgbGktI48y5SLq0JjCOQ7oDxMzaOrVMyARNYCGheu4fH3edDe8rue59NAP326tAy9i+6+D77EX0Bdh70+5Y8r+bi/E1gVgLMmXmWeC6xpfl5mrWmtstlJ+p2dr7TBJoIyAHVFDkTKRowS06s9DacYbMFFNGUBXIeObDElUBfvvz66ejbmh/OcAbCVLmkXJqEpobm3jrAqYUzctTrVrVLCBlxdPKnQT0nGw5c8o+McD7DTiHXBjk30yQ6bWeSfeQxMhqZ7kxpncFxpvJaFhMwgTwBxpDY5/FZiywY/+K1fAo+awIm0ENA+iTP14w6fU9ZHNcETGBOArk5Xa+kHv97iTm+CbQRONu2wryfn+sgXy2OX1tw3VYSxzKBdxHQT3Oc/Qy/i/J1pbUT9Tr2zvkFBDA8jgw1p4YUntQJNjL/rWnBIbcjN+e025pHeh95yrmpayiGud2Wul468urT1HnKOe3g1H3UgSaTus6rEKmT1nrh/rXXrSq/tSPt5evXr2vRfrgOo7g7WEr0D5GSLzhaVe7k0tCv1F26UxfmaT2TqQz8IwRI0+L700L6jFKnDiZgAiYAATlKGddYjIODhzExN663ECMdgo0zLbQc560EeM6iXvlWDi63CZjAMQSYo9ZsC2u50j85mMBTCaDvXhlqz9eRskW7Sqv96kpOztsEZiSgxZAzymaZ9hH4y77bfbcJmMARBHDSyFETV6DrXMyT6x8fH59GTQySZzizYv4tn1H09kzSWvJI48Ahp3zi+OwNkSvOJhyTOPPSMkWDMvdwHUWUuDgnl99UbXOsc3/8PdxemffEj+WI6VAeHLyxTXIdWQm59vl5IfMvTSONkpadtMknrdP0e0xnLY8Yt/YZh2JMC+fBkwJtmvZJ/eovdVY/qbwuiwmYQB8BxrHffvv9cyyTcUULfnoniThQ3b/08Xfs9xKYUad/b2245CbwDAKMw/zV5lAtJd17f0sejmMCVxC4WlfF7lEa/5m3n6VHl2xCV9SJ8zQBEzCBGQhcu7xmBgKWwQQOIoCCI2NjbxY4bRYn3I+v0MPBkQY5sNLzpe/IhVOz975SemvnlV8pHrKUlMTSPa3nMe6mdQBDnJlM/HrzpSw4m0qBtFG6xRYFONYZsvAXd3qW0uJ8r3y1tNauIRN1wR8ywgh+yICTPtYj5eMvvi6Z9Gm38dW/nEsZcI5APrXAdWQSb+2MpN5inSJfek7pIqPKwzni1V5nrPvSo1ZhMmHBmXpmvaSyjP6+1qZH5+f0TMAE7kkgjmX0G1v7wZa3G9yTkKU2ARMwARMwgXkJpPO2vZJu1QP25uv7TeAoAui3OA7RebEbELbYDkbIJ11bzy02FXaPRzvIiHxqaUTdvxbP10zABEzgLQTqVuy3UHA5TWAgAZxo0XGzJWn9lmXL5EQKVi0fZEpfPcv39BW1tTS2XEM2OcG23D/inpyDDeWTv1ZnpuRoqQ8cbTjvYF56TRLKOTs6Zwq0WeQm4Dyl7mLbouxp+YmnCQb3pcZxrhFHyj9xWgMcqR+clmLKvcigc0wmCGm+nIM9gfy5rrJxrrddqty97YW8Zg60Udg6mIAJmEAPAcZP9Ys99xF36329+Ti+CZiACZiACZjAMu+RY2gUjzj/G5Wm0zGBowgw98fWUQs5+x3tHL2Vt7Gc6VAkL+0CVb4c9blWDl8zARMwARM4jkB9JDkuX6dsAo8iIMfpqJVqKEgoayMcbSUH1pLHtt8Ibam8VmVTDuOWNLfEyTnYlE7NEIyyTZDCLSecHHhKI3fMOa1jPNgTR2nGa+lnlPdR7SpNO37HmcYf+WnCEK+XPkeDOJ8jH9Ih4MgkwJuA87NWL5+R/vkPBzy7YNO4cFO9EFccaUsE+MZ7dP3z4j//IWdph6zi6Eh5FGJZde6uR9q3Hah3rT3LbQLXEqAvV7++RRItgNlyr+8xARMwARMwARNoI3DUgknN8dqkcCwTuJ5A77wXXZc/2jobD0YvRFgjgj3DwQRMwARMYC4C7pnnqg9Lc1MC6S7PEcXIKU45xw/OpJJzp8WRiUKZOplGyN+aBuXkN0bP3uUHy5IRODfhxCkHZ1itKeFr12HTylwy4vRCkT/aoaoJA3x4ha7K3VqflIt7SCe2S8rBedjoddWkSfutlam0mEBcJBf5tjLVPbUj5R+xiKGWx5XXqJvo8L5SFvLO9W1Xy+T8TcAE8gR4XvcEvZ59Txq+1wRMwARMwARMoEygxQ5Qvrt85ew5e1kSXzGBNgLMe7fONWUbwZl69ut020p3bCxsUNGmc2xuTt0ETMAE5iZgJ+rc9WPpbkAAxSLn8OwRHWcGziSUtBjS3YoYHv/xj+9OJ5RBHFOlUHqdbCn+yPO9edecwSPlIi241Rxk2tFYypfJ49mvKV6U/799ikSbq+VP+eBP2+Bvy8pJ2rR+35RJA+m0OimjrJGhHKxSxGN6Occ19yIHu6lTp2lMd8vn2jNLeUfnt0XGo++Bf67fOSpfnhvySxcZ0P8hS2nX/FHyOF0TMIFrCDCepPrONZI4VxMwARMwARN4FgHmiVvmfi0UmCNpHtcS33FM4AgCtHFCT1vEjibbxhaZ3qq3nmmj21IvvscETMAEziRgJ+qZtJ3XIwmMUKhQTpiUpGlFJxPw4vfUwZqDi6HyqkB5ajsMU7mOeq0vzCI38kXxhh98WpVv6kZxOV65iy9tJ5QJ3pQnV6ZehzbpxaD8cH6Rzx4HoxjG9PlMHSE7zwKBzwqle3S990jdl4IceqXrTztPXfY8p7ny5/quNB6OfeqRv9SJqucTWUirtkAgTdffTcAEzifAmBJD7FNzY1CMy2f6Af3WU3rN303ABEzABEzABNoJxDH4iLdjSRJ0+T1zQKXjowm0EpCzVPYBzRn5zl+PjYB7j3w+Wst0t3jRJnM32S2vCZiACYwmYCfqaKJO73UE5GDaU3CcGGnAmVALUiJb4qBk1uREQZUSykSM+JKptmOzljfpcS/ppU6T3H2pUTYXZ8Q5yhqdNEwI+Z0LlZ88crsU4UedKB7817jW5IVLSx2maWi3HrKg1LYYrIlbq/80j9p30jlqAg1b8a3JsPda2h5pA4S0HezN5y73U+74TPTILYMKbYJni2ci5Ut68fWd3KNnDKd1DNzPdeKrbR/1OrKYrz+bgAn0EeB5ZzwojS08x4zrR40XfdI6tgmYgAmYgAnMTUBzvFTK0utzGYeP2nGaysCYvtUmkKbl7ybQQiA3/8MJSjuUDaZFx9T8FLvLnjlvi8xPi8Nzf4Zt5mncXB4TMIHnEvjZc/PcsrpkJjCcQFz5uZb4miMLBSXG4fPWgLJIQMEk4IxgAoaxs7TrrDQR2/sqVRRW/nKK8Kdw//MPGY8OOYcuzhwcSPCWIi7HjhR0yUW8OJElfomn7ikdcTTJSVSKk56njqKc6fXS99HKL3KMTrMk+9Hnt/A8Wqaz06cuW3dWqx+R44TJqALpqM/RubVjupBA/UW8j8lyybAU4/mzCZjAOQRqzlNJwNjKn8ZVndfxrIVTys9HEzABEzABE5iZgBYwpzIy/9SbcpiDoWunc9T0npHfPVcaSdNptRCgnWvBbYy/2G1+/7yGg2/NJhFtP9heaMv8aR4b0/bnnwlYV/+Zic+YgAm8m4CdqO+uf5d+JwFWw7UElLWak1BKIsZGKXZbnFQokrUdZaS97Aj7tx8U09o9crzuXX3K/SVHqiaGLSy3xllzwsT6kWMHedPAit/Iolau9N70OxPgnnruiZvmpXaVnk+/Uxew0ARdE3raqNrxHjnS/K74jiOQ8vU6sa+Q9aw8afMtrzii7lX/tAd9lpwtfaL6oLg7VfeXjvSN/Ml41CJrKS2fNwETuJ4A/e+a8et6KS2BCZiACZiACZxDAIeFbAJpjjiArtB90fVLi6FSGf3dBEYRYH7JfD21UeE4bX1zVM7uhF0LW0erXWRUee6aDrzQ12Ub0zxc3+9aLst9HQHZV6M99TppnLMJ9BOwE7Wfme8wgW8EUOJwxqxNalDU1oKMidFJsXZPen3tN8a2rrpjQif50jx7vpcmhyhnR4acEp3ml1MGcxNZzsXduXzOxUvTz30/utwxz9a8mKQzacnxiOnd+fOeZ+zO5V6THWV2bbGBXkOdM6jQR+hZSI0uXFOgbW1tX6o77l+TVfn5aAImMB8BxqTehUTzlcISmYAJmIAJmMAYAujWtbm6dOwxua2ncsYi53UpHOOJBGpvc9OC3Njee9si6cf7I0PtSI3n/LlMAF6yI+HUbrFrllPzlTcTiHZTPufsSW/m47Lfg4CdqPeoJ0s5KQEZ9KXs5cSMvyWwvHZk32MnZwR5x1BTFmO8rZ9HGDtLq/7SsmyVMXdfTUlXfBTznJO4VF/pqjyl03s8stypLFJ+0/O57yjIvZOVXDp3P0fb2ersu2vZUWb5o+w886kxh4kUoZfLEW0dOelTzvo9qLvWqeU2gRkJ0CfQxziYgAmYgAmYgAn88jkXnYEDujV/R+juM5TPMlxLgDmm5pOtkhC/Z+5Zs82RZzq/bZXjrfHijmC9peytLFzubQR47uNzt9WeSjo837zRrKdP2Ca17zKBnwnYevEzE58xgW4CWummSUc06sffEijtxCTDFiellE52CqaBQaRXIU3TqH1X2nsGq5LB9OvXrz9kXXLgUX6CHIItkzvklczcjwz6HVPqi0DZcJj2vFaCe5CDNKJC8Jlgwz/yOzPAquQUzskxor5z6d7lHE51FDS1nbvIPUpOlVsOVdLVhFRtP33++E7fRP/HfWeEJc/1HbRnyOI8TMAEvhNoGVM1ln+/y59MwARMwARM4H0ENMe/quSM2dgp7Dy9qgaemy87ztD3+MMOIxtDT4l77CYtbyDrydtxTcAEthPAphZt4zGlkk0pxuEzaWBvjTbXL18WW2xqj0rv9XcTGE3ATtTRRJ3e6wgsOxh//H0GnHGaDMlRB5iawVBOixJApYcSWRostjr0Snmm5xnoUH63OkhKTtQ0n5zzCs6p0t1ipI1pi3FuII7Obt3DCqd//OO701XndWRV3sfHR5dzUvfm8tO1o46UB4WjFjSJ1mSnFvfJ11D2rqijGZnqudGxJqOcmrU4R1yjT6LNpn3EEXk5TRMwgToBdJGtekI9ZV81ARMwARMwgecQYH7PvFcLsq8oWWnx8hWyOM/nERgxP+MntAiL3e3729j4jn0p2thanyV01RGyPa/GXCITGEOg5aeXsKeyCL9k30aSuBM6Soa9rmcTTLzXn01gKwE7UbeS830mEAjkOm8cDihmcUCICl64/XPVZ/weP6McxoGj5NiRYzDee8RnVgCxkzNX5lJ+yFZagZS7R4pyvJZzwKIk975PX8o2ijN/tSCnkX4APReXya9+G7fHgVNqC7k8aufIX3LW4nGNeDUZe53Sa/nd9TpMaVs4nR3uQ4D2zZ9XIN+nzizpMwjExTet4xElj/rRM0i4FCZgAiZgAiZQJ8A8g3lt3FVTv+OYqywEdjCBowms2R/W8sfJj74oh4zaLc9Rza6xlu6aHWjt/rdeb3VSv5WPy/3Lt81ErSywdW+xQ26xBbfK5HgmUCJgJ2qJjM+bQCOBmhEwvcZ3BohU+SgpcTnlsBS3ZSJG3oQ0/8aifovG/Tgj0/J9ixA+9Do0kJF0KTshdUSHpD8/Um7itBpulzr4voJRCnlp4KacNV5S3sU2le/I78iOQ7u17MiCnKXy4KDXxF6/d0HcN61Qpr5Vp6Mc3Ue2Aaf9M4H4JoCfr/qMCZjAaAKLTrBMKeg/0VO8E3U0ZadnAiZgAiZwVwJxflWah51VNsbokj3hLBmcz7sIsNMsbgpoLb3aafrTT7LftKaTixftTbnrPlcmQH1Y1y/zefsV/QTUCA7Y5mpBNnDPO2uUfG0kATtRR9J0WibQQEA7STnipCk5CaMzR8nKwajv8cjAkQ4epJHu4BwxqGlFYMy/9Jldmq27UOXIjI5XnSulz3mMtiWOtfvgo4E3ndBqwE75ldJL7y/FG3U+yt6TZu2VvjhOxSOmGfmSb4vzPN5/t8+asD29nHerlx55WVhAn9Da9/Sk7bgmYAJ1Aowj/NnAUufkqyZgAiZgAs8nEOe1V5a2ZU59pXzO+7kEmFPjSCX0zM1ytokRz5Pm+iPsYs+ttXrJ0PNT22P9Dl99CwHs3L22UdnItzCS/TJtjyxe2mIj3iKD73kPATtR31PXLukkBNLOvSSWBoN4Pfea23hdn7WLUzvqdH7EUUonebTsgFyU5n//9gqWmgw4+Eg3N+gyAI4OcUUkE0sFZBC7xWHcrwgoraOOcEU25OxxbNY45rhLflhpFena7xboniOOtXYHByZmhLVFCiXZ4Mqfw/0J9PQ99y+tS2AC8xFAj+HvyjFjPiqWyARMwARM4A0E4nzyyvIyx2WO3TJvv1JO5/1MAjwHLErHIVqzNeRKn4ufO5e7t3YOexZ2gxFp1fK58zV095rDO9rO7lxOyz6eAM9XzpZdy0lzRu7lr9cex/30MfqZtfhb46TXaoOvyehrJgABO1HdDkxgQgIodbmBJzeYEDc6A48uTpQLB16rcZSBCweenJM5OeNgp+tSblt3hOq+tSOvgSGgADLYim36epiavGt5lK6T54iJrHbblfLJnaecWxQb0lI7Q6Hu+U3cnBxbzmnlKXUSXzEs56naCmnHz3yHOY7VLUoZ9zvcl0Bt4cB9S2XJTeA+BBi/NcbeR2pLagImYAImYALbCKTzyW2p7L8rzpf2p+YUTKCNgGxZ0W7Uduc5sZBrVtnOIbCeC/ae2hvl9uwcXM/dMe5MYI/dVs/mlrEL+5/slZEfaeJgvcJ+GeXw52cQsBP1GfXoUjyIQGnVKs6fXLhaAewxjspxmHOWUrbU8aXywmTtdSu9Blp4pg41OemU71HH1h3FLfn3lps09zqVSvXUIu/WOBgjYr44UtUm4vlS+sThr/Qcle7z+fsT0GID+ir+tqyEvj8Fl8AETMAETMAETMAETOBoAsxbr56f5+a5R5fb6b+TAA7T1GlyxCL0kXSvfj5HluWotLCbwAnHU25RyF570lFyO93jCPCs12yPuY0NW6WhD6GNpX1LLT02TZTsgpzH1mtHao2gr7UQsBO1hZLjmMCJBEpKZ8n506oE1gaVPcXrGdjIB4cGfzllrCZHaUDUPUxY5aTVudoxVQC4fy2PWno911ghRX1cNYjDqeTIbi3HmhLVmk5LvJIxore+YJ7We0v+jnN/AtR7rPuzFkzcn5xLYAImYAImYAImYAImsEaAuRHz8ta5+Vp6rdeZ3/C6XgJG56jvtqbheCawlQC2oJL9amuavm8OAvRl9Cl6FWrs2+xEnaOOzpKC8Q0b5sfHRzFL+oJe+1wxsX9eIL+SDVz3pTtWJaeuxyOyYQOKbyGM1/3ZBFoI2InaQslxTOAkAjiLcoHBIzchKsVXGtyHgoPTjAFjpoBsURGryaYdh7U4exW5ljyUP5PV9Dc3tziF77gaSmUXC45HlgNFaOTErPTM9DjgY9n9+Z4EeH5HKvn3pGCpTaCdAGO2xu3WsVupM766jxUNH03ABEzABJ5GgPlK7fcDjyov87KrFuUeVSanOy+B3Dy6x4Yyb8ksWYkAdhh0eByp/KmvK8X3+WcToP5zdumjSt0751yTbXGkLs5ZLQ44Snan+0wCdqI+s15dqpsSKO3qxHCZCyWllfhxUEDhPcphwKsxt4S1AS6muSY7E8ie9GLaa59Jm5A6TeN9KBO9Azz358olxTS3QoprtBHVO/enq6+iXLXPubxr8blWmqiTFm0MBRsZFdSee43nKif3b+Gq/NMjcn758mt6+rNcvTL+lIhP3IrA1n7rVoW0sCYwkID6YukW+t6SxZbxpiVdxzEBEzABEzCBGQgwD2U3aG6ecZR86Xz/qHycrgkwz8f+YH3ufW0B+w+bBZg7x5+kOsr29j7C9yix7HrM/2aq+60baSgHbZpx23bAe7TBWaTc5v2YRXrLYQIPI4BxkglRXMn6xx9/FAeqtZWnOKNyP649EltUpuX8In0NaKVBNjrb9sqjVxjtSSeWA2URpyl1UZI/5rWFMc5PMVJasb5IMzpImbzkdmRyjnRa5FQ+pLU1aMdtOnFHjpx85IPSJcN7KV/KLmUm1kUp/sjz5Ef+PQxH5u+0TMAETOAOBOQ4pf9n4nl2X30HRpbRBEzABEzgfQSYR2iR6xmlT+dhZ+TpPN5HgHYd7VLvI+ASL3aSxW1AW8BGtmaDNLXnEmAuuGbXu7L02Cpbw9K2+22prek73jMJ2In6zHp1qW5MAEcOiglKK86nrY4d7t/i3NuCTqvTagZV7egkfZSvkTvBRqweklNzC2/KVit7yrTkGNcKrzR+yYGqeNRzKU3FicdSPjFO7nNUonsUKDlHcwq3nLK5/M48x6QgJ9+ZMjiv8whQ11+/fj0vQ+dkAg8hoP6c1eg9OgY6yZbx9SHYXAwTMAETMIEHEjjbyYTzlD+Ppw9sTJMVaZY5+mRYXi2O7F3W6d/XDLbaD88kRbtkntoTsOPWxlPssCNszT0yOe7cBOxEnbt+LN2LCdCZ1zp00NCpM6DJISnF5mxsLYNVlC1+PlvWUn5bB0cG657y1AbquII5OkXj+ZL8PY7Ulvoq5RPP9/wWKozS+DNNzpAPedjVu7UtRDb+bAImYAJPJUB/uSw8+aPLkfpUHi6XCZiACZjAewn0zAO3UmL+mPupl63p+b5zCdxpjol9ya/uPbd93Cm3xabz2y8fHx93Etuy7iQgezM2yllDz+JelSG+olrndNRGFuztM+++lbw+nkPgL+dk41xMwARGE1CnjkMMZWbPBG7mwXAvNyYtOO+OCDhQtwzW3FcKTJJRSuVA73HSYtReC7W81+5Nr9Pm4NsaiE+7JSDHKGdua/5r8ZDnDqvs1srh6yZgAiZwNAH6c8Yc3uLgYAImYAImYAJvJKD52lFlZ17IPJ03qByd11FleHu6mvO2LIq+khVyYjPh53n22JWuLIPzPocA/ZLD+wjETR6zlF7jYo9NUrKvlUd2wcXe/qP9lv4SuyZHh3cR8E7Ud9W3S/sQAnTWpd+f3FJEBh8ZQkemu0WW3nt4pVEpwEmOOj5rkC3F7zkvJ3bPPcStTUp4zXG6yknyt+QjJ2VtJ6WUgZb0WuL0yEd6tC/ka3H4tuQ/Oo5W2Y1O1+nNRUDO/LmksjQmcC8CjDl//vnL56sFe8eCe5XU0pqACZiACZhAngAOhdr8Ln/X+lnm5rU53XoKjjEDAS24po2MtkeMKt9Wu8ao/J2OCZjA3AT+/HP9NfKj7Yw9RLbY8NZsw3Fuu7yBafnJPT6nYz56QM6W21MGx70HATtR71FPltIEfiAgZfyHkzu/MEl72m8ERkedBr6dmL7dvlVJYEJcGrBTByqZ9SoEOCl5JW0pjxlWwc7czlCImEjaaPGtqT/yw9bn95EwXCgT2EGAMYe3JzBWpRPKUrIYEXkG43jEvTYYl4j5vAmYgAmYwNUEGLs0B8dgilGZOReG09bxr6cMnov00Jozbro7Ct2nNEe/qgR2oF5F/r750uc5vIvA2njE+BidjmfTYTz+8mX9rXxRrp5FLYzx9Oel+S7X+cvZc2Oe/nx/Anai3r8OXQIT2ERAOzjlpGMQuWNQOVLZKU+c0PJ5pHOMAbI0iKaybP2elqE1HRSY0gQtMmlN723xMOyvKYpvY/K08l6p5D+NpctjAkwqedUgYyyBPjQda6LhkM+5t15gjHYwARMwARMwgdkIpI4mxrheg21LmXDOMp46PIOA7CyzlgZbQ04fm1VeyzUHAevrc9TDTFJcZVuRfXdLm4xz0xzL9C0TLWWkTy3ZYXN5+Nz9CPg3Ue9XZ5bYBP7ZMe83NKLU4whk1Q6hNCi05MUulJIz88jqQrbSIBV3oUqGuOtF5/Ycl9+n6asLJioMrmuBOLkyrN3H9VJdysDdkobjmMCTCVzRXz2Zp8v2bgKMOYxZLD7h7z//c9vvpJbG83fTdelNwARMwASuJKDxjd9POzpsHT+PlsvpbyMgO4vu3mLo172jj7Rr7awenbbTezaBmdrxs0nfp3RXLRjRIhDmkL32Hbfj+7SvmSS1E3Wm2rAsJtBIgAlWbpBYnIptTr1lBe1i9CTb2sBHXiVnqs7n5GkszuZotVeJpLtgyIRzoxyJ7Lz57bffP9PsLUCLc3QxSvtlAb1sR8S3AWMExbnTuKK/mpuIpTOBfQTiuJZOZNET1iaq0iX2SeG7TcAETMAETGAsAS3w0XFs6ktqGgOPzOMIuZ1mncCsbzayA7Veb75aJlD7aaryXb7ydALpgpEzyyv77tpcM8q02Lf/Fk/99Llma/4p8v+cYD6MPNiJ9cdPmfG32I7XN9OU0vb5OQjYiTpHPVgKE+giwASLXaSsiEWRUWBnJH+tDoJo9CwNfJyPO1aVF0fy0SuHSrsfY/zRn1vLGfMduRs156iNeeU+S+b0N1LSuDWndhq39XuPYtGa5tPiYcSwAeNptfpzeahjGax+vuozJmACvQTSRUroDegnvKlieWvD+Ilqr4yObwImYAImYAItBDB2yjCr+GtzN8XbcmS+zXjp8DwCmvvPUjI7UGepifvJQVuedWHA/Wg+S2LaxVW2Fe1G7ZGhpV9uiZPWIvPh5c2Dy2+kRnsxn9n9Tx/scF8C3uZ037qz5Cbw6ezBGYBzjHe6K2C8lFMTIybXcMrFTpy4ccedBh+lwZF7pSiRhxy2csaRN4MAztg07ZjOUZ9rzi4GPTFQ/gzscvrq3NajGPTeT92cEaiXlA/fYXBFXZ1R5hF5xGdiRHpOY14CrC70szBv/Viy+xDQuBL1EKSX/tBSEsbrOGbbmNxCzXFMwARMwASOIIB+yG+eMt/TfDeOUSPzZAztGS9H5u20jifA3J92xELudG5+dO4sBlBg3oMcOZuP4vg4lgD2KNX93eec9FNn2bHG1oJTO4sAdrSrXhHOoifGUWy9LHiqjdfYtFv6YuIwH112kH63te/lCSNkoG9ATo7WAfZSPe/+cS3hPJmdkwmYQEKADr42EEjh4TUCCihCuXuk7NGZx+u5PPauZMw5OiXf2pF7a4Ey88eAyqQFxXWkg4yBbm0SIsOy5JQTWt9rx6MUbTuOytRLz0T5Dl+5M4E9/c+dy23ZTWAkAZ4j6Rgj03VaJmACJmACJnA1ARk71+Z8W+Vkbmjj6VZ697mPOr6inpn3y5lwlG3hPrVwvqToyNjQsKtd5VwaVeqRdrRRMjmduQjQ1hnTjhova6VVnvSzzEt55nQu3scz2dsX45gd7UiNsp3xe+uRgT/vI2An6j5+vtsEpiUgBx4ORA0UOscx3ZG5ZdeHlPJeCDH/dIesZKyl2WO0pewqfy3NLdeQI8eAMkjRlMLcM2Af+YqHksxbyv+0e0qvtH5aOV2ehQCKPkrrVTvpXQ8mcEcCcQxhrPMK2jvWomU2ARMwAROoEYjz0WjsrN2z5RqGXgcTOIoAOhshZ684Kk+nuxCgD2GuSdBxuXK//8yX716G+1G/p8TYXXkz0RV9DmM1f/R7jK3Yt9lQo7cypvbvHsItO1x70lPc2E/onI9zE7ATde76sXQmsJkAHb1ea6BEcBL9+Wf7K/Zw5jHoaOAhHVYx0tnHlY1Kv+XIvXEAQyZel0SIq3HT1T7xWks+Z8RhlZMmJzAiMGBHJXOLc/pI2aNsR+Zzx7RRulh0ENvnHcthmdsJ8DyorzzSSNYukWOawNwEWPikVcba1aBnRwuW9AaIUl+qxU3pgiGNo3MTsHQmYAImYAJPJ8D89I8//mv1tYBbOTCOpnPGrWn5PhMoEfBC0RKZ48+ni7PjIsTjcx+XA32V7UfjeL4hJb2h6EhHKs8Tf9qwErmSLzZnzTfjtT2fjyiXNt7skcv3nkvATtRzeTs3EziVgAyayjT9rvO5Y+1VvRhOZTzN3Vs7lw4UyIThlIkkfwoYX3mfPQZblNAe2ZXGGUcplTqekefePFAqttbf3rxnvx8utDspSbPLa/nGEKB/of/JKeJjcnAqJvAMAsv4vyx8iiXCkcozxHgupyp6RG1sTK+l32P6/mwCJmACJmACZxHQvPMoIzBjpfI4q0zOxwRM4DoC2BbSN7BdJ01bznJEtcV2LBP4TkC2tJYxFEc9QfPH76n8+AmnKXNNjZ3xN59jTOIp/3h+xGfSJX0vUBlB855p2Il6z3qz1CZwOIHRzoR0B2osQGmQK52P9z7xM4ZkvX5Cv+c6spxP+F1UKVFrytYWbih7pG+D/hZ6972H+vbrfe9bf5b8egLpTlK+ux+9vl4sgQmYgAmYQD+B9G0J/SmU7/Bco8zGV7YR0FtAuJu5PnNZhzYC2KlYtD/S7oKNgvTYQCBdWJsEWhxLbZIfEwsetKG32uKOofq+VOmD1tp6dNQzb0zj69mU4zRS5NlKbdY4ZHNx4317Py82o+Wtj3tskd7lvbcmrrnfTtRruDtXE5iSAJNFBq/UELpFWA143MuKISmPW9J66z0oAPxRLygUqVJR41IzXrcoNLW0Z7gGCxzNo3cPwoY/t9cZavl8GaQUp68TP18S52gC9yOgnaiSfIQuobR8NAETMAETMIGzCDD3YqfJkYG5jOcbRxJ+V9rYDNJ5sd881dYGcBjm+LXdXY6V449jknqKYY8jJqYz4jM2vNLPcYxI32m8hwDjW7GTD7wAAEAASURBVI/dMT4XLTY50scRyfNDu40LFs6gvKfPoHzc73A/Anai3q/OLLEJDCfAysWRytsZK4CGQ5g4QRSEqIT0OFNzxVrS2/9K3x6lKCfHiHOjyuIJw4jacBomYAIm8J0Ary1zMAETMAETMIG7ETj6VX3MobzL626tYn55mRfzVh2O/DyNQxsB6atwGx1yaWrRIYsNlffofLeml/701tZ0fJ8JQGDNXsgCBgU5FXXU+dpRcXWsxT3iGs+3HLm19LE1Ulae/atkrcnna+0EbN1oZ+WYJvBIAijYe51yEYxX1UQaYz8zSPM34vc0RrxOJipFKAa51ZZjCfyYGqvE4TEi36jA/ZiLv72NAO1qRJt6GzeX1wREgLGBSWJcUaxrPpqACZiACZjA7AR4ted//ufyJiX0wvSVgVvk11yJox2oWwj6nhYCzI0JI+07LfneOU6c90X7xtYykQZ/BPoPnKVymMa8tqZ/1H30TWo/R+XhdN9FgPbEwg76o1yflM4VtzgYt9wzshbInz+9Ul3PeJwP+7kaSfzatOxEvZa/czeBSwmMdqB6UnhOdeIArb1ulHpIFZKcZEzgGdy3rrZGGSAvDA1MDKQw5PI64hx5jlJINNE5Qk6neT8CtIecon+/klhiEziPwDImjF/Ff14JnJMJmIAJmIAJ/PLDTpE9cw2Mx3LAMl/6888f0zZrE9hDQA5+zcflTMCY77CNwJ45IPUQXyn69evXbUL8z12kd6Z9xbtQd1WXby4Q0PwQ22O0P9O+1WcVbr3VaTlTbyW0he0mYCdqNzLfYALPITDSSYDC6VW157UN7SRlV6peDYHjtHeiT3zS2vpKZ00UcOreOfRyu3NZLXudgBR9nqd//dd/O3XyWpfMV01gbgIYi5gQxzEprr7XeDF3KSydCZiACZjAmwlsnROVmMmRumWeVkrT500AAvrdXhxtX778+jlvQddi/uLQRwCHtOaAemZ7Ujji56y08GLkz26lZaKstoOkVPz9KALRXhw/H5Wf0zWB0QTsRB1N1OmZwI0IbFEQc8WzAzVH5fhzIxWP0sqpuFosloiJAuFKpVu7bfesGKUM3O9gAikBnokrdlincvi7CdyJwGLIy08vWLh15ZhxJ46W1QRMwARM4P4E0CPRJ5k3efy7f33OVgItqtbCeHQw7XyeTdY7ycOz+vHx8U/H9JdPsXmOY5ANgnPxuZbdRAsK4z1bP9N/kN8R9YoNJMq/VUbfZwI9BEbaMHvydVwTGEHgx9FgRIpOwwRM4DYEUJpGOKA8EN6myrsFpW75i6+juXLFIpMSVmXG1dzIFyczpdWaR6wQ7QbqG25FQEaJWwltYU1gUgI8T9YXJq0ci2UCJmACJnAYARwhDiZwBAFsOcyD/facfXRxlKYORX3XsZSDnKe6XltQqDitRzly99rs0vywqVgnT6n4uwmYgAnUCdiJWufjqybQRQAlBwWMP71mdXblRA6okuOpBADFi9WPDu8gwGrMWmCyQJsg8FlBO1Z5JtYcUpoE6t70GB2n6bVonCAeeSk/5PJrJFNi/r5GwL8ntEbI102gn4Bel9Z/p+8wARMwARMwgeMJMI9g/tI7N04lY/4R5yfpdX83gREEcPDxR1tLnXkj0n9LGi3Pajo3bLFv7OG3tw8q5Y3NpWSjVBui/9LPc5BOzQ5TysfnTcAETOBpBL5bup9WMpfHBE4igEEQZw1O0+g8Inu+c352Bw5KI4pRy2tC5OhqUTRPqgJnMwGB6GTVYgLEiu0EZZ3JRzx3hOiaTNJWmdwcnd8RZXCa1xPw7wldXweWYG4CGFh4M4DC0cYk5eOjCZiACZiACRxFQPMI0t/ixOCNPZ5/HFU7TrdEQDap0nWfLxPAZhADLAnpc/yE3b4tDlTKjh0ztW3W7uUeBxMwARN4OgE7UZ9ewy7fEALRKSTlqXWFKsoHzsnZXyXKhBFHGE4ulTGuQPPqsyFN6RWJRONDWuAzHZo1OVK5/N0EUgLstFffrz4xjePvJvBWAjKk6BmBAwtlcgvKxAg9iH7ZwQRMwARMwARmJRDnwltlPHO+s1VG3/ccArTZLQ7/5xDYV5LoREWvjRsLog2MnZmpY3FfzufeXbNHUm69xaskFddLO1hL9/i8CZiACTyJgJ2oT6pNl2UogTVltFdRJT6r2WZXPJj0eeI3tCk5MRMwgZsSkCOevvvOk+ab4rfYkxJggRXO0vhb2RKVN29E45POc491C9Hw0QRMwARMYEYCepXlHtnQGb1gaA9B39tD4LfffvccpQdYEhf9ND6vfMapKociR13HoXrXwA55lSNXhr/+9dfc6Z/O4WytpfPTDT5hAiZgAg8i8JcHlcVFMYEhBJbVZ78fspoPJWxRdJdXhAwR2ImYgAmYgAkcRoAFNZpIH5aJEzaBmxDA2MSCgtyiAi0uiyv6VSycqw4mYAImYAImYAImYAJjCGC3yuljY1J/TyrM9WCpEDc9xDngHZ2o7D7lbXM1x6fbkWreRxMwAROoE7ATtc7HV19IAAXjSGWUtNmlwUrXqKy9ELWLbAImYAJTE1h7I8HUwls4ExhMQA7UWrIYmzA+RUcqn2vGm1p6vmYCJmACJmACZxBA5+MtC3sDPwHhYAJnEEC3YochjjKHbQSwzbEIEPscb1ihHyBEPZZNEAR4x/OfJ1/0L921+6Kiu6gmYAIm8Elgv5ZokCbwQAIootpRcVTxMDTyhzKiHRqpkREnq+JJDuL/+ed/+7V4AuKjCZiACRxAgP6XcUCTZfpiBxN4M4GW34LiOeGZwZHKH8Yov8b3za3GZTcBEzCBuQmg7/EqyyMXUc9NwNLdmQD2I/7YJZn7OYU7l+0o2WV/yz33zP1giS6ruR99Axsg0Gt17ijZYrrISTi6b6L94IzP8YjyyGYZz/nz8wnQ9llg9Mcf/35KYZk7ajESbX/tVdSnCOVMTOB/CHgnqpuCCWQInPmqDgYGlDGtftPuVFa8cS5V1Ii/rJZbVsRlxPcpEzABEzCBHQS0gAWlnQmzgwmYwLIqn2dCCwtKTOLvKtmBWqLk8yZgAiZgAjMQWBwI/746trXIKudMS1zHMYGRBOQIG5nmU9NiQwK8WByYC9jfuB7DYq87z/6Gvo3Tir+tO43R11v18LV+EBlSJpGPPz+XALZxbNA4U48OWsROfvwR+J1xBxOYhYCdqLPUhOV4NYHoKNUgoUGjBIbrerVIKY7Pz0lAr4kZKR1potjQJngVDUe+c16O+ZH5OS0TeCoBnhf6YZynmizGPvqp5Xa5TKBGAMMwzwN/PBs5ZyrGGowsXqleI+lrJmACJmACMxHQ/KlXJsbBNDD+SXdMr/m7CRxNgLa31eF2tGwzpc+GBOZ7pUWBeq13en3NPjeyjHsXJKK3b1kILB1fu2A50te1OmNHMnBacxCg7mkH2ENsV5yjTizFdQTs0r+OvXOemMBdJj8ockz8tihIE+N/pGgoHCgecsbsVUTl6OFVFzmFnnPpeRTgu7TtRzYCF+oWBHhG0ueEiUP6PN2iMBbSBAYRYNV+DHpO0D9YrMMq5fS5ifH92QRMwARMwARmI8A8WnOzXj2PMQ8ni+73PGu22n2nPLIx4Ch0qBMo6a3qC+LzXU9p/FVkkJ2vZ+MEc1Z22O6xD8KFHbDo92pP40voFO9EgAVCvCWRvyPHOm0oimzOfEtkzNefTSBHwE7UHBWfM4F/ErhKaWKQQGFpDZq47VGUWvNyvH4C1GXJ0dmf2nIHDlQUmN7AisazfsugVzbHN4GZCeBA+vLFxoiZ68iyHUtgeZXTskubnKJRJX4+VgqnbgImYAImYAJjCOCYkLNkS4rMx5h/s2uNdEoOmS1p+x4T2EMAvcxO1DpBOWtKNj+eb57pKxfSYudT/1IvzXKVsvTYBLUon7tziyGt37dQf0ccngU9K2faFHn+PLa+o43dpZR2ot6lpizn6QRQQOSgPDPzLc4xydmjNJ1ZpjfmhfO0NHlBGdgTtrQR8mOCn64olPLMREKvrsFhZKV5Tw353qcR4HkYvRjiaYxcnmcTSMcdxrdeY82zCbl0JmACJmACdyHA/GePA5VyypDMAlXSczABE7gPgZKdRiXANoLzhl2de/sKpbnl2JN3zhYYF/RHvZ0+C90eu5QW2XPODqsttfSOe2Qfz9kURxFIbS7pm5BG5eN0TGArATtRt5Lzfa8goNU2dygsjtSc4nQH2Z8mY3w1VFq2qKim11q/k0aPQh3TZcIgh2kpDXbcyUDOM2BlOhL057cS8G7Ut9a8y10igN7BH7+/5YU3JUo+bwImYAImMBsBLUDeIxfzKHaz4oDwXGkPSd97BIE99oIj5LlbmnqFqI6zy5/7LVycotFZLL0d+86y8/S7A5XylfoxO1dnr/3z5KOdxTZ1RM56dTB9mOeXRxB2mnsI/GXPzb7XBJ5OAKcknfddQs/vJdylTHeUU0ppKjsKq1Yro4xuDayI3BNQoEsO1Jgu8Vhl7WACbyTAM0qfygpegpX4N7YCl7mFAJNpFg/xrPC3Z3xryc9xTMAETMAETGArgdpi161p+j4TmI0AjgiFO9mzJPOVx7iI/A5O1JKzqbRYhPPo7tiDWnR27EGaD19ZL877egLYQ3g+jrSL4Mznd1e1Q/r6UlsCE/hOwDtRv7PwJxPIEqDz3vubKdmEDziJIoSCc+SgdoDYt08S5ovj9G+fZYE/fyil+r0NFTK2JRSQLbuHz1Tmj3iFRlTWI5/IULx8NIGrCNA2l8nl953ZTFJbFiBcJbPzNYGrCERDDauUS6vZr5LP+ZqACZiACZjAXgeqdntpJ451QrepGQgwt0YPS38/k3kLc3m11xlkvYMM0mmxTZxpd9nKJjrMlYbahL6XjrzSF4fVmt5OG7KtpkTxXee32C97CeXaIzZX2qEWhbCxRM9oLn5vno5vAi0E7ERtoeQ4rydwp9c4Skm2I3V8s5UyqgkKAzhOdn4r8ddfl+40OkYZzPljwM/9nqImOyi+PQP/mcr8qHYkpaelVmDIXw+TlnQdxwR6CND29azhUM09wz3pOa4JzESA8YvJpwxFI2XTczMyTadlAiZgAiZgAnsI7HWgkjfzbBypHx8fn/M7zbv3yOV7TWALAebWzE9KehztlLkM7d6hn0CJa39Kx95RWrjY8zYx/b5zSVL9LiztzfaZEiWfP4oANljaqBYtpUfyVX93lAxO1wREwE5UkfDRBB5EgAkdRswnKzkMpjGg1CmMcvwpvXiMCjUD+NevX+Plz4kMDkDJsza5Jo3WFYAq81n1ijKyN6RKT0t6MD6j/WpSecZqupZyO858BPSsccSJ6mACTyCgBUCUJY5pTyiby2ACJmACJmACkcCWuUi8P/2seXZcbJfG8XcTGEUAZykhzo3XFidHh4L1vFE1MV866PM9di/is3gfO1W0UWGPwi6yZhNhLtyT33zE2iRizJAtL70jPofpNX8fT4C6wFa6FjQuy3azFt/XTWArge9eh60p+D4TeAGB0iA6c9HXVpTNLHtJttZB9CjlrnVQjiulSmWJ51t2XcbJEgow9xw9KdrLccSK78hp7bMU3tyOwTiZVDrixxGeLfWge300ARMwgbsS2Pu72mvlbh0r19LxdRMwARMwARPYS4AxSTup9qaV3u/xLiXi7yMIMKdlfqq5akwTO0AtxDmvHLC1+L52XwK51/iqNFyLzifsHHKSYqtKg9pbbF+8jQ87qNqhdgCm9+a+yy5zR6dj6mROywcj/15nSuWY72p7Lak/0f7dUm7HOZeAnajn8nZuNyQgJfZuoi87HH//XG32lAleTuHL1UvLSrrcfS3nWpyXPQomSpgU2lL+tMF0tWBPHqV0a+f5bYytITp8t6aBwt0ayC/nOI33pysn00mlJg7RmQp3ghZRcNSrnFt+OyTm788mYAImMAsB+jkHEzABEzABE3gLAeZajH2aS2oxUY+BNs4BnzK3fkv936GcsjlprlmSuWYDiA5U7mf+6/AsAtiO6L/WnJP0Ubx2PA2//fb7t9eiptf4HtvXly8/O1uxoawttM/ZgqLca7Ln5JrpHIxaOMwk811l6RmjqRfatx3cd63te8htJ+o96slSXkhADpQLRdicNQPJU1bk4BiNSl0NCoMtE93RE1wmN0zCUfyiU7MmS+1a6yq2s9vgHnY5pbnGIHeNCeBa3ZEPXFoVq1TZLU0qSa8lTVZ2phPVXFl87jkEUMhHtO/nEHFJ7kog9q/RKDyiPIxrDiZgAiZgAiYwGwHGPhlX97wtx+PcbDU7pzzYDZirri30HSW95qXKl7xbbSejZHA64wnQ37AjdITjsceeVioJcsSg9qZzJfsMbTFtj5RNDmHuV9pxnqJ0zzxShrXg18euEdp/nbbVG2hj/NyaNzz0knP8VgLrvUNrSo5nAg8lwCCKUnqWAjwaY6qsjE7/jPQYQFscW1EW4o9SwOJEWxOUEU5UTeSj3LnPUihz1444t7YztpQn9bSXi/iW8uB8rI9avPQaz/Daysn0ntp3lXVkmrX8fO06AnGCyITvCf3qdTSd85UEUuOv+vveMfbKMjhvEzABEzABE9hKYOs8gnGSecrZ87Kt5fR95xLQXOEKmxHtEpsVzgOHZxHgtbwjbFpb+71IkzmEZKG9s1ljz5yYe2v3a86Co3XPIv9YhpbP7AZvCaXNKrARp5Z0HCdPQG+OyF+tny3VTf0uXzWBdQJtvcN6Oo5hAo8kwK4jGRYZxEfv2DgL2t0HcpQQ+NeUrJQl9TZC2YKd2gB54DhjcrQ3UB7a12wOOJhtCXCKv7uxJY0WByrptiq2qQyx/aCMx+9p3NbvtAeMKVaUW4ndMx6GCTnN71kCS/0kAr3jocpO/57r43Gkrr0+TmmsHelbHUzABEzABExgRgLpvK5XRnTBPT950puf49+DwJVvqkEn9BzlHu1ki5QjbAwjHKjIzo5Ywqj0PhOr/JOthmNu/lK5ddcl5buWCPFYuIBszKUYX+T4y22WoJ/ApsCcC5az2QHXynvmdVi11kNOrj335tLzORMQATtRRcJHE8gQiAopHbE74wykk06hiKz9hkMqCkrKXsUz58Ad0Q6W9vTr56Qn93sVaVnO+r5FQd1rkKBsaw5UFCkCdbqHP7JSp9Ex/pnwjn84j/3KkB0Ab3grz8nINnRDBBb5QgKsSie0LFzBuNYyUe8dY3kGcrtxcucuROWsTcAETMAETGAYAcbUvXPLYcLcICHNEbUANudYuEExVkW8UvfZMy9eLZgjXEpgi10GgXnusJnIYTeqjaidXzEPnrnfxSbAX1zkKpsTNqzc7nT93qwdqT8/YrCLdvifY7SdUR20xXYsE2gjYCdqGyfHeiEBOW3uXHQG8lGvAJmBAxOvs1a+xfLCsMVYHe+54+ethgFW3O1RzmsOVJSfO7D3K0Pu2OK3ySyHOStOr+iPtkntu55EgD4RA8aaEYM+XeMmi5AI9NWcz70aS3HXFgiQr14D/CSuLosJmIAJmMCzCayNb2ul106stXi+/svnG5dSQzi7tqSbPInRzA6eJ3F+W1nktGwtN/bL9Jlrvbcl3uIo5A1x/L70H6fZaJh33CFEe5g2c9TqQ9fsSP2xdtW+jlgI8GNO/mYC/QTsRO1n5jteQmDEK1uvRFUzcuKY0iTyboZQySv5z2DMQM6ETwHjM0otf3scfKTZMhk/a2LWIosY6EhbigqjzrceYZBTHLVq7y4rlmGAk+Iu8rbWj+N9J/BEo8/30vnT3QhoDKRdlvpg+nT6UsVVGYnPH+fTRSyMsfyxQCD3il/y0zis9Hw0ARMwARMwgdkJ5MbDHplLc5aeNN4Sl/mhHARpmRcd5Fm/GYjO5GACown0OFHPWNjLvAEb42Ib+9vqYs5RPHo4jMpzRDqMOWtB/WTOHrZ275Ovq42pjFvatxzZSsNHExhBwE7UERSdxuMIMOCVjJKzF5YJXm33aToAzWgMRUaUpZIygcypUThXLyMVrpJzrGbAzsmkc9rNpu8zHLfwaqmHWtlKjlu99gTH5FbGuXyPVKboM2i7Mz5TORY+105g6Y/+/acb9Hqyny74hAmcRIB+B4MGbVT9JlnL2KsdqBKH8ywEUt/N5J1+Me239B19SOlyb2ksVPo+moAJmIAJmMCMBJhXMt5p/OuRMV1w1HPvG+PCuRaog7MWCdfkGHEtLk4fkZ7TeDcBdHo5KltI0P72vhWsJR/F0du3zmz3JZugZBp9HGF70typRTY7UtcpMS/luWDs2DKGr+fgGCbQRqCu3bSl4Vgm8DgCDHp3DKUJXk254tosk5icnFKacE4RZNhde4UIys8Z5cIY3etwp556ZZPScFS73MJrhPKs+o3lIl0x1TFe3/NZk3p+h1byj1TElJba6R5Zfe88BHqf13kktyRPJ0Dfrf5G/Sl9G31d7EvFgT6VP+5j/CLQb7EgIOcgJU3+SMvPgSj6aAImYAImcAcCGg+3zu2ZsxE0vt6hzHeQEb1Dussd5LWMJnAGgZItL5c3fRvPkWwPuThHnGOzBkE2lSPyiGkyXzk7jPgpr14blh2p67XMPJQ/xg7t8tXY3st7PTfHMIE8ATtR81x89sUE7roLtaR0pTtP06pF8ZrBMAp3KQ+SUd/ZYSMFUSvzkLnmWJSCp7SOOK6xzeWJzFsm4ip/Ls0R50o7Qmtp75VJhok0j7W6TeP3fEdmnAXara289ryWOc2fPGwYSKk887sV9mfW611KxXiS62vo1/hLd6HGctF21X7lUK05SknPwQRMwARMwATuQoAxUOPcVpmZi7Jw12E8gZrOMT6341K0fnQc2zelXLLl5RhssUHl0tlyDucpbV7Oqy1p9NyjBZ899+yNS/mYG+0dP3rlkO1zi62wN6+7xxcjHVUexhUC7XTLW/aUjo8mUCJgJ2qJjM+/lsBZCsFIwDmlK76Cr5bXLA4fKQ2prOl5vUKEeCUnKuePntBsUV5RxnIGb8rCRF+OPb7HoJVW8dzoz6kCspa+Vj+uxatdryk2cOJvC+danlxDIcZpqlcq01Z4htK2tpZO7fpTDAO1Mr79Gm3TwQSuIlAbT+h/lp2obWo+fSJ/WhjDGHrGOHoVO+drAiZgAibwbAKMg2cbwJ9NdFzp0F9Kc95xuZybUskmca4Uzu2uBHgmZIvB7oONBPsE/ZiCdn5ylL6ua2cesZUi31n9K2XlLzc3YS6un9ZhQ4AYjuCx5W1zI/KVPWpkWUbIdZc0ZAPW8S5yW877EGizrtynPJbUBHYTYAD+8uXX3emckQAKV/r6PZSt3t9F4J6rBxrK0qKMEQflEsUCmXP3oWQdHeQM7VFiS7tjKQ/lwrGH7EpbZZAype+jj1t4SZHfKgt5ltoc7TGyOMqZGh3yoxkjf25xw1Zevm8uAkc49+cqoaWZncAyZvz+CzoL/TFGhNIYSn+LwWOtn2M8xWhQW+AyOxfLZwImYAImYAIjCZTmKyPzeENa6BijHB3MFTUXncHZgJ7VYxN4Q327jO0EtNuSdr2mq7enekxM2ayOSb2cas6ZGuc+2G/lfC6n8vOVGeygqVS0gS1lSdPxdxMwgfEE7EQdz9Qp3pwAivjsyguTkHQFJwqAlIveKmAScvUEscd5Tf2wCg4G6X0151wrFxwkqSMzd6/itEyacKiVGMtgTb0qzVx+R51T/j3p792xTT2VgibFas+adHMsOQlKaV15nnY6w8T+SgZPzJu+1saSJ9bs/cpEf9iy6AsjA2ML/RGLdui/uVd9q0ouZyx9r/ro0rile3w0ARMwARMwgdkItMzNWmTWWNgS13F+JICOoYVZo+dDccH46LR/LMXyjTdGpQvXYzx0pbvNU6P8/nwtAfUzsoFcK83cuUf70B67UJwPwT/a4GRXvZJEXOx/pRzO2wRM4EcCdqL+yMPfTOCTAAPpqMnXaKQo6FGJ1yA/Wl4UCznXthpRSaN1YqO8WnmhNKFcpLs7owLUmlaMpx1myFOTHe5waZWbtLiHHYoyXHOv2KbKW5Tp6M+1cpby3vOKE8qvcufSRx4mEWrTrY6CXFq1czjgjwyU0+F5BGi79BMEnlv+ojHneSV2ie5OgD5Ui4PoX/njO87V0qIxGSmuHJvuzt3ym4AJmIAJXEOA8W1vQI9nDHToJyBdo//Otjui80Rz8rY7+2OhL5Hfml1jz9y4Xyrf8SQCsovw3Gih45PKd0RZYh+g9GU7Ek+dj0fNf+L93Edfr/uUTrzv7M9H26nOLo/zM4GnENivXT6FhMthAoEAg+gMg2cQ6fNjasxECThCTiYJqWE1zTuVLX7nfimAHKPTN8bb+xnlJ5YfGfcE5FZ6yI0iWwpy8rU6UUkHByoBubV7SFyltH1GOPEfvwu6JewxTpSUQibBOKOYhKouVR9bZFy7J9YdHFQ/a/f5ugnQdj4+Pr6BSHfEf7vgDyYwAYGcIZgFRzIM1kSkD6a/T99+UbvH10zABEzABEzgKgLMJ6KBfKscpHHV/GyrzG+5j3mi5ojM35jHHVFXtCXls2YbiDK9pR5czv0EZPNQStjNjrLxKY+nHnlW+WPew9xcb9ihvGtjAv0Ic/v4zF/JKdqprpTDeZuACfxI4C8/fvU3E3g3AQZNlJYZnSlMDuIuS14rI6V+dK0xSUgDeX39+vVzFWZ6LX6HIQ5YKSockXUtbJ34RAapErqWZ7wuuXUOuXGq1gJ5p87mUnzaVS70OiNlDOe4N8BrK3fV7xYZSs5pnjvShSufUR55DfJRAYetAhxa2g/ckSn+leqi5CxWnj7el0Dahj3RuW9dPlly9VcYZOhX0zENnWIxPNbHk2Ucp3/+8mRcLpsJmIAJmMDNCTBOjZrHt8wLbo5rqPhn6gjoL7F+4pxuVKHStrQ29906px4lr9O5JwFsQbQ1dHTp6dLP71mi66XmWcVGx9yHz2vPriTGXndEX6L0e46zyNEjs+OawBsIeCfqG2rZZWwikCrKTTedEIkJQnSekiWytioDLSJGhwDKWy1tFBJWdaUyKR8mEOmuPtJb+y0R7sfgW8tbeYw+luqesuIcGTEpQonLBcpL/q15sEtT7PeuUlQ6Oblq55B3ayg5HHNptjqot8qStkt4lOoJuXGKxmdF+eocZeDZ0KpHnVc8H59FQBNdleqq/kv5+/geAiziUP9Cv8NEO46d6q8gwhjGAigCY7OCzum7jm7HIuGjCZiACZjAnQigl42cO3iBXHvt97JH1yAwt9o612betjigFicJMkg3ape8HDPnjEfnKs3Zc3PZcuq+YgILgcUesbytjDP0YdLj0fdH9mlmXidQsgPV7zrmKu1idJ92jKTHpUqfqn44ZxM/LmenbAJlAnailtn4iglMQSB1dMXBZISAKGcx5Hahxut8RsHgLxpyY5ytjtS9vyVSmtRE2Xo/U84j0o1yYACvvfIYpUFKXdy5GiePKNvwYyKqSX906EUDO3lHY3qUpeUz6T4lpApqugCAcpbaecqAdnJ0W0nz9PfzCTChoZ9Mn6nzJXGObyWAQYU/xgb6e8YPtUsttNEiG8YG+jDabEv/VGvXZ4yHb61Tl9sETMAETGA7AebHo50Nmk9tl+odd25hL10j/XmbXmLoPyzUJj3qnzpr0XVa8onzb8VnDlxK/0nzY5XXx2sI0J71bFwjgXO9mgDzt5GLQq4uz5b86WvhwPPAHJS/Vrvclvx8jwm0EHiOJbyltI5jAjciwACRTt6OcKCmgzO/e6YVP2u4mKwwYUgdvdzHoEcZ4oSWAbC2IzUt71r+8ToD7NaArLmJEukxWHONOPAnUOYWZ/Nn5AH/xBdZYBhXpam+ZDiP2SGzAvcgt5yw8ZritB73lH22V9ymCipc4m9drjGJXKkbK3ZrxO57nec/3fF339JY8icQYEwgMM4yTmkxjhyoXKNfwhDD9b1B48fedHy/CZiACZiACcxIgHmBxtIZ5ZtRphGvnUSfQcfY8vvr1JferkE6e+a4kS/zb3Qn5s+aQ9dsFcRxMIE1AtgKvBh3jZKvz2Yzu6pGZOtU/jX7s+L4aAJHEvBIfyRdp30rAjMpvuyGSycAox2oVE7qQOWcjLJ8bgnEZ0KRSys30ag5UnPxW2Qgzl5Fg0lSqeytTuVWWXPxtIo2V/fEj7tOUbzhTZug3TLhR3b+Svfn6icnx9o58qQOt4bSc1Y6vzWf1vtQzLaEkkNNiwZG8d4im+8ZTyDX/6aLRMbn6hRNoJ2AxmL1QemdXGecS3WLNF78ztiiPvKqPjrK488mYAImYAImkCPA2MaYtWeOQrrcz0IkLWDN5eVz3wmwmHQvc6VGOsy5S3NZxcsdVffoOiPrbmlX3xcl5/LWOS80EwkfcwSiTv3rr9ttKbm0fe5ZBGgrtiUtdZqbt9LP80eAlYLeyqfv0bacS0fxfDSBHgLuvXtoOe6jCcxiIMxNHHIG/L2VgQNAgfTjYKTzrcc4QMV7SoPVMkn6/aeVvqX4Mc3S5731R95XOUXi5JN6KHHQSlvia8VtymPt1cBp/N7vUlh671N87h85uVW6W469DgXlEXd56Vw84uTmmSjVY4zrz/cgQF1qoYUmwZzzSuJ71N9bpCw5UFX+OL7QjuPYozjxuIzVi0HTk/lIxp9NwARMwARmI8CC2r2vwGRsnGWeMhvfnDx759+lNHvnUBjPpdPENzbl0j/qnPI/Kn2ne18CzCHVr7Bw3uF9BGgDJdtTalvSAtb3Ueovcex34+dSSozxcrbaXlei5PM1Anai1uj42qsIzLJ6MJ00HOFAZfAg7HWeqoFEmUmToHMlQy2DXO7VvqX4yqt0HFF/GImvdopg5C4pWKWyx/NwpQ7EP17b+1ntZW86uXovOeL35lW7H869QTuGa/ctbfu3zyjkobJZUatRm/8ak1/q0M6k+evKEuYJxEUsPcZmdoawyMhtP8/VZ03ABEzABK4nwBi1tphoTcq9bzZaS/9p10fMv1MmWxyzzLfQcQh6Y1Oabum7nFrU/R49J8pQysvn30UAuxYOMdllcJa1OHreRem5paX+9ZNb2NGYT+kcNgXZho7oR59LdV/JFlvpdzeY6oP+W8/pvhx899MJfG89Ty+py2cCKwRmUGjoxNOgCUF6fs/3ZfD4dU8S3+5l56yClAO+UxYmI3FlqOLpmGNei6/7csdcWrl4a+dQdM94fW9NDuq8NIi3TNCO2o06qi1SV+mrsijvmTuByavEuFQ3W15ZlTKj/uyIKxGe/3w0rngiPH99WcKfCWiRDW0ZQ2XaR/18x3JGhun4DJTi+rwJmIAJmIAJXEGgZZ5Ukwsd3aGdwKj5d8xxr0OhR6aoy2sX81Y9Z2/biwz8+f4EaA/afUppaGutOvf9S//uEsgOqr4k2kjpn9b6qKNsee+ulXzpVR88m2m95e/w2bcTsBP17S3A5f8kgFIzQ8itfp1Z2YqvHo7KASyXAanfUXv15BXHGgPomnJzZHuhzqPSHfO6coI2si3mJsi9Rv3Ipecz9Uteva97YmXz3iCGWnm4Nz3ffw0B+jvV5TUSOFcT6CPA2JH2OxpnWtsyjlQZBPpyd2wTMAETMAETmJvAlgWWc5foWOnQhWcJvQtjkZt5YKr/oOekulJrGZHhynl6q5yOdywB2gB/apO0My1EPDZnpz4LAX6CK4a0n4nXcp8XO+oxb5bL5Xf1OWzx2Ab1ml3Jw2LfnM1Q10cfZb/G5rf3zQSjZXN68xCwE3WeurAkFxI4s3PuKSZK16whTjRTB+oemfc4UZFDCuseGWbYjbqnLDln/B4e3Dt6olxyUmPU53ksXd9bDu6HD69u6uW0dZd0TmaU6RFtNZe2zx1PIO5Wv3rRxfGldQ53JEC7pM9KDTlpWehzicOq5yP73TRffzcBEzABEzCB0QS2zukZB71IaHRtzJse89qcYwvdac/8jHbU6zCZl5Il6yWAfUz9CG3MunUvwfvHpw9JA3Mt/mgTOAZbfj7sLbtR4w7tK+ahqq+YN595MwFjRNw0lNarv7+TgJ2o76x3lzoQYDCLnWa4dPrH1IGIEtYyyJ4u6D8zjApidChcIYvyRCnZM/FROqRx5SQoOqglk46UcS2obtbi9VxvybcnPSksuXtYvRcVqlycPee0ozRyoh+gHVPvKLnp77ZynfM8o7lJd688W408vfk4/jEEYv+AM16vADsmN6dqAv0E0GtwohLov2TIof9SP6dUGfPod2M8XYsGIZ3z0QRMwARMwARmI8AYtnVOb728vzZHzw37Jdh2B+2kZLvQAlstZO/dlbroU398OlKPXhS8rfTvvgv7g/Rd2u+IOb2IoluTJjaErf2Q0vLxOQTSnci0E+1UrfVFtCHujfaq51BZSnKkva+FVZzj5ubALWk4zvsIrFvj38fEJX4ZAQyLVwcUuvij81Geox1KMa+ezwzqTCxKk5DWtBiwouMzfm5NQ/Fwjo1SNOQwk2N7tKItmdPj3tVOKGZ3CDLul2SF/1EreVFKUZoUonK7THgXIwyKHXIQaOc8p0yuuXfvpMuTK9G/51Ht4qg2ek8qlno2ArTPnBGP8/yVnKmxT6SvY2wt6SizldnymIAJmIAJmEAvAfTydE7am8bb4h/lRD16joStAf0np8Oj75TmeMwD0zd85Oqc9GXPiPpULq7PnUsAXZagOirV9Rapcu1pSzq+594EtBBDpZAtUd9pJ8zNsPHSDmt2paP6WMly5ZHx9qpnJp3/woG6kHM75YKsihOvcV511LvgJqbjz/ciYCfqverL0g4mQMd3tKK+JrJWxNXiYbDPGUJr9xx9baTSmcoKky31MnoCPMohm5av9p2BWBOvWrzStbs4UVOFMpaHCSfsa0pljL/ls+qWPiC2ZdqQFgag2EWeS/sas+iCNu5wbwL0y7QPKc/3Lo2lfyqB2lhKH8cffa36RDjwmT5au1fVL358fDwVk8tlAiZgAiZwcwJ7DbLcv2cOdnN83eJjm7hrQIfnT8Zx6UM1nWmZB/5LVm8qcUj1qVI8nzcBE3gGgdQukBtT6Eu0WJ8+gnty4xd91JvCVhtwD6N0w4rGAOqAPzm4sUfqO/XFfem5XL6UgcU2zKPj3DoX1+fuSeC+ms89eVvqyQhcuQs1NVqW0NCxy5BZinPn8wxOqXLBwFObxNTKm0uvFr/1GjIyeGqS1XpfbzwcelsH3FQp6M27Fr/m9KzdV7qWSy+2dTjwjBwVyIs6XesDcKjCdXRY24k7Oj+ndxyB6IQ/LhenbALHEaAN0yfHsXgZ8459tfpxJXLKJmACJmACbyKAcTNnhO5hwP1vM1r38Enjbp2rp+mk3/cuNO25X3rP2nwwlRG9CZtDS3uRPuXXvKYUz/9OPWu3GX2GgwmMJsA4wiJr9S2kn3MOaryiD+Fvtg0zo7mk6dF/KsALBtjntJlB10YeqQe412zr2B9LrxlusfkwLmpsJP6R9tmRbJxWO4G/tEd1TBN4HgF1cFeUrMVRhnLHQHKlnEez0e9TxnxyDrZ4vfY5l14tfs81lCEG+COcapKjZeIXd0fqPo5RWYvnR3wm7VK+W9KPipPu51xs6ygeLTx0f88xl3/ufvKn7CPkgJ8cw3vaeE5OnzufwNGK/vklco5vJrDoGsvriiIHjXkj+sCYrj+bgAmYgAmYwEwERs5zZirX3WRJX4fZIj9Gb4XeharYW+L8U+msHTHG4xhtDTjv3MZaaR0Tj3qmrXz9+vWHN1Edk5tTfSsBOUhV/lKfRjw58/Wqad3DEVvDUwO2cNnGmGsSUm6jy87zTx61/h4bHfLEeS/2u62ylebXo8vm9M4jYCfqeayd02QErhyUYqdcwoJ8LatdSvff5XxuENvjYMqlN5rFaIdilG9t4ofCkfKhPR3p2EU+2uNW5SGWr/Y559g8oj5RhOBImVrSb41XK5ucpzj59ZmJN4rzMnl/rpJc43LXa7SJ1pWSNpjctZbfJ3dpJwZjnlbuv4+KS2wCJmACJjAbATlCOKKT5eYQvTKn86ve+98UH+ZHhd56QJY4R+25n3uZmzGX1vysp1zMI3scqXIW9OThuGMJxLYyNmWnZgILAdpYXNhR65Ow99IPMdeiD4p/T+dJfxg3Fl39bDIOUA8EObU5R/3tkQ2bkZzlT6/TN5Tv+x7qN5TWZTSBSQiUViNF8UrGzBjnKZ+lOKg8Grz0fcYjjpE9g2muTAzSLZMr7bYlPgP8GbxGt8do7ECpoEwtDs0ct63nWsq05tRuyRtlmPKqvXz58v13VeNnv+6jheb1ceivWh2oSFubOF1fGkswIwE53tVnnCUjfTCT/pZx6CyZnI8JmIAJmIAJpAQ0PnLU5zRO73fra+3E4jyu/a71mNGIvR57WeSb6uQ99cgcOi4S2zIflSM1plOTnXnhGxbK1xj4mgk8nQDjkn5fc62s9GEfHx8/OBTX7nna9RmcjNHupzEOW2uLzXCtPtTnR6fx2j2+PicB70Sds14s1QkE6BhR1GWsPCHLb1msKffLqtr3rHHQIPUN0D8/7NlZecYgzKRrdNuJA3dkET/jwJGz8SwHasx/1GeUSgXqX2XSuSOPKDE9v0uzxzhDH0P5WtLIPQdHcnDa5xGgHTiYQCsB+gv0BCbUo8eZNRnIm9ecMdY4mIAJmIAJmMBsBM6Y581W5tnkOWrO0rLQXCxoB6kDlWu5xcXYVtBt+KvtHO3JX3Jw1CK0eK702Ub0EhmfN4FnEVC/cITd8FmkfvncUHF1mVJ7nTZCjLJTaiPM1eV0/vsI2Im6j5/vvjEBFFhWDLLjQg67swzdOeVeKDFcph24rj31mJuI7VE2cukdwY62M7LNRMdiSd6r2kaLg7ckc+58VEbgeLajIOafk0/n4L2HOfm03n9Wu1XZfNxGgL4J51br63ao161GmW0S+q4nEGCxBwZC+scrnKkYJuOrqJ7A1GUwARMwARO4P4GjDJHWw9vbRuvcpj3FJebaQnOlhyNUO3t0jqNsOvEcukyUl7lZyZHamn9MX5/Jo1VvYg7hYAIm8HwC9AvYd9fshm9fvNpqmzuixWDP5Q97pOoBXwF/uXFmqwy2B20lN9d9dqLOVR+W5iICGMVRuvXu84vE+Mz2jRO4kvNw60QmTpSOrksc8aMcgC3KQyxb/Hx0OUeVMcoZJ5primW876mfS8/BU8v7lHKtKdfU69a+7CmMXI5tBGhby6759cn3thzqdzHGlAyN9Tt91QRMwARMwATGE8DA2TJf2pLzG+fgWzjJyLzl3to9iyF7+T26UjwWly1vy/j+RqNSXM4TPzdfrjlSa+mtXSMv8lwLGOdxpB4xv17L29dNwATOJaAd89gNSxswjhx/sLm19EvnUpkjN3wA1Is2V8XNTtFWuUda+nn6e/p9h/sTsBP1/nXoEgwiQIfJ39HKbGngVDHeaGw/YjJ8pqLQ4gBsWXGaWz2rdsExLdOZTreoUESZ9nxOJ7UzLGLYU54999IvvLn8e9hddS87IdYcqMjGLm6eH57vo8eXq1g43+MILIa+ZVcoE7yzg1fNnk3c+ZmACZiACZQIHGloPnNeVSrfHc4fVQdr+gYG7Ra9OzKs2VXkSGV+zR+LxuTsiGn0fkbGFkczBvUWG0Jv/o5vAiYwHwH1CaW3u7X2G70lI19sbkel3ytPKf6ajbx0397zJRunuO1P/++f/bwdqHtJznO/najz1IUlmYQAyqwN3edXhhQL5cz33omS7uV41KueYh7xc23i19KecLCUBnHlk5YpOp9Tfrpn1PGo9I9Kd1S5j04HhVEr4FT/MGEy/3Y2R7M/I32efcYUAvVrY8kZ1J+ZBxNgDHwtC3JGEaB/8qRvFE2nYwImYAImsJdAzSm2N23mVda91ymm89H1O/bHQP9JF9/mUk0dvOjeNeM8dY69YXEwtO1uzeWbnsMZ29qWarvT0nT93QRM4N4Eav3YX//66/DCxfzi5+EZ7Uyw5FzemWz19pKNlgU7IxbUkPkVC6CrhfbF3QTsRN2N0Ak8kQCG7sWp9fcnFm/KMsVBfVkN+tsuOc+eCGNoLk3S9DrP0kDNfXKglQrNRCw6TRVveaXRl8+BvnWypntnOMZJJgze9tyx+1R1j8JGfcKEybzOz1BPluE7AdVT7nn8HuuXT2eXHKjxvHccRxr+3ENAxr6zHKlMaOmTln7p9+bf+uopk+OagAmYgAmYQCsBdOPSfKs1jVq81AlXi/vWa2v67xFcWg3sufprvXe03JrjLnP4ZYEsNo7FQP/7N92K654bjKbv9ExgLgL0TTz/tUDfSv8wKtC3RBsrn2e1Fx65QKrEM337hGw8kVnp3pbz2DUdnkfATtTn1alLNIjA4tAZ93uXEmtNkY+OE5xu/C1Otmc7dBmstPtuzw5UceaYm0jF66M/lyZAKESUT8756Ezl89oKJZSd2mooXTti9ZoYHckyyh2fO7V/yfDEo8pO248KW2wjTyz3XcuUTkZK5aj97gVt/OPj44cdhfTxrvMSTZ+PBNS2zmgvsU9iHLtighvL7s8mYAImYAImsDaX3kPoyPnOHrlmuffI30mv6RipsbvEIxfvDH2pJA9zdP1pxyu6lRzRshEwNzhrgVxJVp83ARM4jgA7+Ft28dM/rDlbW6WM8zjdI9uTvs9yrPX/R8lI/8uYNtp5irzYdmA9q9P6KKZvSHfcOyveQMtlfCUBHF8o5FJ290JoGSBkJE3zopMfJUea9gzfRzlPVRYUlTNfRagJUK4cKDHU/bJjdXmtp+RcO+YUoNw9tA2UgNzut1z8Wc7l5FYZRimRs5Q1lUOGoLTNXDnhT2X09+8EeMZbQosRjr6APoG4/OUMPy15Oc57CNAvSIcYrZvUKDIRXFvsU7vf10zABEzABExgFAHGwta5UW+e1sXKxJhjHmWHWN5ElNexMUK35puLh+6OHpO7Vi7teVc055V+d17OzskETOAsAj39D3Yh+oNWu0OpDLnxDDnoU3vSJj6LQehH+QmzmmxyGsoWEm2xXON87f5SWY46v/AY7xZTfVNeWGPHx+6H/tLD/qhyO93tBMa3lu2y+E4TmJYAg8WXL2PeUd+iIMfBRlCWXZp9jywDHUGduNJ6y3GLkrCXDXWXOsSU5laFKKcAKc30KKOCJmTp9Vm/31XuvTzpD1JHcapcSeFUXnK40b6Jm8ZXPB+PIQBvtddSDlxfqxeMUWvplNL3+XcSoL3wx9jOmw9wbNJ/qE+IVEaN++RlB2ok688mYAImYAJXEsAAydikcQ59i7mSvu+RjTTQu23k/JEiusZROiuLx2u8e3ZOyfbxo/S/fBr+R9ly0rT3fI+vezyK7x75fK8JmMA1BJb5Xn5hSatEpTGRPrV1bsd4qLfeLePjd5u45qPqv2NcyRjt2pRJ/RzjdrRXpuO67r/7kTm67PjwW+p1cUZHNncv55vk7/PIvImMy2oCgUDNMRairX5cM6qvJrASgYEsXR105KrRFXGmuKzVP2cKw2Qw50ilfqRk9MiDsVzKS8t9DM4YE1qVo5Y0W14/0pJOLc4Rctfym+EaTtS0buknYkivx2sw4y9VRGMcfx5LANYwr4W1Z90O1Bo9X1sjwCRM/QJtjcDYT4ire3OT2c9IHf+0W77jFkc1ARMwARMwgUMJLGPe8lpUGWJH6VY9BuZDCzlJ4ugSuXntCPHQqWuGZBmfW/Mq6SzK46hytMqXxot2gbW5RXqvv5uACTyXQM8mihwF+u1SYB5J36p+sRSPOLU+U/NR+nH+6M9SO2gpDZWP608OuX4dbizqwb6KnTeOA09m8ZSy2Yn6lJp0OQ4nkA4ItQxZVUiHqU4TI+coh5YGKQyopJs6TaNcoyaTMc27fW7Z+Tu6TCgkDIoMkAp72gADK/Wu9qQ0a0fy/vr16z/b3R9DBmba2RkreBdl7PdvDoEznLc1jkdfS+uUeubZpr9ZU2yjbKQz2nEe0/fn7wTiBIHnGoMN7OPzLofW97u+f3K//J2FP+0noHaX9s8ac3rHjlQi+hYZqPVbaKP0mTQvfzcBEzABEzCBFgLoyKmezFgVx7xUx25JlzgaV1vjPzneiMVYNT5Rx8jFqxnwc/Gp/1KgvWAXWH6n7vscvRT/zPNPdyScydJ5mcATCOwdh9hIUgvqW9NxVPeUnJ+6Ho/04/zR/zIOq5/FHlKy5VG+t9tEYAA3O1Fja5r/c/3Jml9+S2gCpxFggNFgU8uUwYOOkD8GEQag0uBUSye9xmAUHSsfHx9plB++ky+d8tvDVYNS3D0qY3ZvXfQoL6W0Rw3MtOHUMVzKc+95FIrUIbA3zVnvT59RfaevKSmdpbLAbVR/U8rD5xcCPA9pvw57JixyOOVYEUcTDF1/+wRCHHwcS2DpR7/8YFDemgPtFh2ENB1MwARMwARMYEYC0oE192Pcapm758qitHLX3nIOBlv59TAqsa7tpOpJP8albbAQjEVhV+s02AcUeud8us9HEzCB5xKgD9R41lvKNScq6dG/80dfFBeAc69sUj35co8W9WvBbW0M2ZJHjzx3iLssxJ/vt2LvwO4qGXdZQ6TYbH2wryq08zWBrQQwfq919sSJITW0x2s9n3nOas/aWROdHpmvjhsnJ2fLQl2xC3TrK6HoX2tKR2t5aK81p05rOsRDGbLDp4fYvrhbJve0mVF9zj7p33f3Gve0j5YzFeWZwCKZsxYqvK923llijT96k0aLDpMjRbv813/9fmXPpP57Kv5kAiZgAiZgAvsJoF9Jf+KIMRidDCfq1kA6a3rd1rTvcN+Z870Sa+bS0l9amclOU7OZkNaVc1o5LNS+0Km2zPlamTieCZjAPQngzFzry0olk32hdD2ep/8ZtYFhSeu785f+zv1bpP3jZ9joJ3q4EjdN/RjT32YhsMuJqldhyBA4S6EshwkcRWDNAEmnt3Wg2yozireexa1pPPW+0u+inFVe2oJWYfXkSZ3GwbTn3qPj4pDlDxlR7GS0IF85rXOvNz1aLqe/EFAdmMd8BFJjHuOJDCdSmHmmPNGYr+7uLhGGOhnraHe944vb5N1bgOU3ARMwgecSiLrTMl4tDtA9c3LSKe2QfC7JpWRn79KENfpwrr7QXdCfW/UWnKj8tdgnmc8Sj/bDnxywR9ZvTq4z8j2yTE7bBEzgGALaUKE5XGsusi+0xh8dT4t4WYzjOWQfXeqc8WjUJpi+3B27hcBmJ2p8IKSsyAjYkrHjmMAdCaDc51bTcO7sH4VmcNSzd0eWZ8icOi3OyHPGPEoT0z2yLs/C374Z5tO0MDyMWtGWpu3vZQJXLxwoS/bOK+hKUoJ5ZjCe0G9z5DvPZvzdYvdZ72wnR5UavSQNsR2m11q/M7kjHQcTMAETMAETuJoAehb6kxxh0SknvWuLjKUdklvSuss9VxnfZXTPcdqit6BrsxNrzT5D2tJnpK8fuQs3p+cjq4MJmIAJ5AjgVKPfUD+Vi5Oeu7pPYQz++vVrKpa/NxJQ/WlMarzN0U4isMmJinFcFRvl5AFH2VxTVuI9/mwCdyNA+46rIXMrCo8qkx2nfWRzE5W+FK6JjRHg7uGu7O/MncUcVrbmqUGt5JfDFMlk6NOK0nRC5Odmnvq7uyT0B2n7Uplohzk9Xtd9NAETMAETMIE7EZBetfy+2LKzkDFQepd29PSUKTpje+67c9yrdANYozeX7Ihb9OMlzd8+qwOdiMBiU6WlY6or9bwG8zPRjn/KM96yx9Ef0/FnEzCBZxKoLTLJlfiqfjwni89tI3DkOLRNIt8lAn/Rh9YjTpyaEhqVFdIkvoMJPIkAijY7h9h5zd9ZTgtWReK89aDY3prSSVH7ndfGZDHKyDDaKbvsMq337XpONGkdWR6nlSeA4UGBsZc+w+E6ArE+ohQy9MVz+sxzgzHFwQRSAh8fH/90iq7/vhvtBx1l7VXyxNmaWaUEAABAAElEQVQSkKHWhrek6XtMwATeQWBZXFTXHyFh+8E72sMRpZTuFZ1VjFnM2bcEjNdvClfaGWRHzD3/sT631Adp80f5sGXyh11l+fv9hySJd2bYW7YzZXVeJmAC5xOgT8L+1hJy/WfLfY4zF4GeOp9L8udL060htCiSUlJ50FFQ+G6Dy/Mb05tKiKH7TAddaff3m5hvKSvc7tj3nD1528I27sbGqM7K3nRBweJI/fdPZ96Vk/It5bvLPSX2qh8m5nd8Bu7CvyYn7V/6UC1ees0rD1Mi/g4BJsU4RnOvR6If+PPP//72rDP20QfgUE37ZdHcqsPIQK10fDQBEzCBFgIs7EK/XXsduOwHab/WkofjmIB0rzjGMX7WNgHUqNFmabulsbR27x2v8dxdPQ/N9RHU51GyUd5oM2CRmeZRZ9Qh87St7fMM+ZyHCZjA9QTe+Hr566lfKwHjwig7HnoQYyvtqGWMZ7zFvostIepT1xKZI/cuJ6omPzXRgayK1m4qKh9DruHXyPmaCZjAaALue0YTXdJLJ3sMxBqMUyMD44YdqMfUg4wJqVMD5gpe3SwS1xylD12Tu3O9OwGecZyjMUTjHjp3nNwwQWKxY6k/junwWX1Ier72PWfcrMX3NRMwAROgb0IXpM9pHRcX3fLXT6NPqluaqAnUCKRtbO88hPvfsigRo6l0iBrjI6+hZ+QC852jnJvYDMj36IWMJXvoFn0sx8jnTMAEnkmAfjku9iiVcu94V0rX588lwPwevQP9uTRu1CSS3s2YtmVMX3Tw5e0N5JPaHGp5P/1aXkNJSp0aZZLL374y+GuSwwMeK6vlPd4tncK3zPzBBEzABBoItPQ9DcmcGuUOEykG0lRJ43t67lRwL8os8seggGMFBUsKk1BsUbp0r48mYALXE0iNwTzTet6jdDz7qXGRc7U+YIuxtGTcjLL4swmYwHsJMJ+Pi6fVN6G3yE7QQwe9kntrfVlPeo77PgIjHGNvWJibziGuaiml+qIPOHKOfMYcNvaPfCbQX7Jg7suXd706+qr25XxN4K4EGIcI6dxQ5ZmlD5c8Pm4nIN23VNe5lBlTtBgo+uJycXvPIY9kertOvupEpSL0sK6BxhhD4OFN76ESSUuNgDhUcFrJ3Ld1krUmn6+bgAm8jwB9z91ewzR6InWE0bs0wX1fC7umxLmJfjpeY2hIA2OvDZEplbm+88pW6rL1dStzSW9pRhLI6c6po7SWH/1E7XnHcNcb3Pf3EnN8E3gfAfop/ZwPixnjQmtoyNC3xan6Ppou8V4Co4yJcdHiXplmvJ9ndYZQq68jd6OeUXYtMIn2Umyf/DmYgAmYwBoB/CX8oVfFn3Lhvln68LUy+HobAebxzLsZ93Lz+ehTy9kG23Lpi0U+/GncysnVl+L9Yv9LalDlO0EOzp7KENASBgyCLUZBpWNnaomkz7+NAIsPWp6dt3FpLa86+jd28jA6ovy1CW5rvTjeOAI5x4oWNikXFhN4ki4axx3hXFN4W3Kmz+ePtHh+Hd5LgImyjG69k2Pazmgnhfv+97ZFl9wEegjQd2nukv4+OH0Tf4yVLByKgXti4F7p79gpNCaO7ttinv78LALovrS1EePXkx2pWsTLM6dnd7aWQF9w5G7Uo8ur/ivO22ibdy/X0dycvgmYwI8EGM/Yva45IguwR4xxP+bib1cToE4ZL9Bj4uLnq8do6fFv9Nn9C4XHKHPGA9ebB7JRKZo4Xd2Anb8JXEkAI8Nvv/1+yrN6ZTmPyvtOk944QI7iQX86si+98wR2FNPZ02H8JMgRFw2Rs8t+V/liHy0DSW6laGv5ZCTm+XV4LwG9TaBXj4ZYulgyUtw61tTSjOn7swmYwLMIMMalTs9aCdVn6U1UiqsxLf1N9ziGEhc9RvfS72hc1bWReq1k8/F5BKRLyQmv9re1pLRDdGq1za3pzHYf5ZFBHtlmfb3snXej0vbS9qd+Uk7s2dqF5TEBE5iXgMYjFq45PJdAOm7MUlLkyi2InEW+I+T4C4XWwH1EBrU0mRihgH58fGR3x2B49OSoRtDX3kYAw4UcI6PKvjxnf/98FkenPUrGUemgZLBKa/ZwRL+39PXLmwZGlD81fI1I88w01O45aiw6M/+j8+I3EwkYJKl7yohxBAMSz0D6d7Q8b0i/tAIUHYuJzdevXz8d2tSBgwn0EMCoyXO8JdTu2zrW1NLcIqPvMQETmJ8AC7K2hHRuIT08neeTfmqTwDCjkO7Epx+Kuozi+WgCJQKMeThUsT1hg4qB9piei9fTz+h1T9TnpBfM7CBGRurrSeGJbelJ9eOymMDMBOxAnbl2ni8buvvWOcId6XyfmZwsPRMqrQokaz7zF1eg3t1IfzJSZ/cSAnpuckZMJhS8wjNe0ySD89p1EleZ5rDF+3PX73wOJWOt/DOUDydYXHE/QiatVBsxMWYCi7Hhzkqbngm1h6tfizGijklDRiC1H/oAyhjH1zQvys6YK+NJet3f1wnwXK09D/St/FEn6e+YpDlgUDnrTSFp3v4+DwE9z0eNy+jjvWlHx8Y8pCyJCZjAUQT0RgucT6WAjpH+jABx0T9i0DiJ0YVxTnpHrl+RYYa5T+pgjf0WY+oI3TbK6c/PJkC7jPMY6cCLvvzbt8JLX0vnCMzT1Ha/RfaH0wg8cddm2leeBtMZmYAJmIAJmMAOAujkjGFv0MUvc6LmJ0pffpog7ahH32oCjyXw/7N3LkuS41a2rVYrTW2mGlQN8v8/MAaVg5bplkllfWuFa2eeQAAkQIIkQG6YRdCdDzwWXucB0LXooFRAOVpL15fOK25Wd/MKQfpqarhYen6GaziX0oUco+UbxXyLcXutHD2dyEySqVFhLf1Rrr+Mdx+nQAwlo4Ro2KnJk9qzDJIYMxVeZV1+xQv3zNAvVKZRj7V9VnVCf8wZ4hh/ZWgetazO1/EE5BjYurqTcWRNmZG8EB0SayWj/TqYgAncnwBzkeS8JRmJ+17z2sexgTkxjkHcFwN6hhxRuXGFNDVGxefSz6+0fzhk0+v+bgIpAdodfxj9mP/UDjkil9E2Y9uNn9O47vjdOyPPrVXam52o5zJ3aiZgAiZgAv0I9LQz98tV/5g+ajr94y/GmFN20tf0aBcNkchAXIzQFx5NAAMjbUQK0KNhdCp8VBZRpFAw7+RQpTz80W5GXTWTW2zSo3qjsWBvfKzcjmP13viufD5nwKN9wOvMIKeaDJc1aZNHtWPGw1xZauPxWFpDKn8Pxt7WcVLOa3PPM33iWdpCbA9LYxD30ff54z7+OFfjeBBb3buUju7VUQs29N1HEzCBexFAlmBcYcfXP/7x+omd6ASVnsBYUFr0o7EFMrn7iL8UcKCSNmniYFgL2BHYCcscvPamh7W4fP05BLAdpPaD3LnnEHFJryDAGIrs5mACJmACJmACsxLAlpDKVLOWpZTvdY2k9GTleRSgkjE3Gg6BXbqPpLguI1GsFBQyQjyHshWVOQQS/uI97w/5320I0D74q9l1cZtCn1gQ+o76D0YVWN8lqCw4rPjN2VEC49jSmLgnnz2ds7QLnH53fO1odESonezhXvNsnKtaHdSa9/bklTFUfb0mv77nMwHGkaVXJ39+4iXjUG9qcxinkXnu2K9y5fe5FwHqnz8cBvzRF5FzOSfnvBwLtI+0r/Kde9PzNXzl7ND4QTpp0CvQ0/P+bgImcD8CGhNUstQJKgfo0kI6ZFk5W9PF0sTLs4w1udcAIwN/+bL8Fg3ljePr/pdp448/DjdxxKT92QRuR6Bm4cJRhUaOWQtX5m8tb1uvS/7a+ryfMwETMAETMIErCTCPpfrDlfk5Iu3/+rOA/3dExIoTIYi/noZAKVsyKJEWht81g6PyssW4pPL4OCaB6NizI/X4Ooq8j0/tvBQYW0ZwpGKoWjJK9SCy9LtWW+Mn36WxXgrxDAoi7UC/jSQWV7Z58sOuCgwGR/Ibpf2L+exH7Z7ZUmdxHruy7c1eBzPln/6nXVRaQKO+zyIfBV3T9zXZlnHZcq9o+WgCJrCVQOviINKRrJkucN6ah9rnLM/UkvJ9RxKgz8y6K/rsPhvrQW/kiefSz1+/fk1PTfmdsqInbNEVpiywM20CJmACJnBrAjVz+MwADl+miUCAgQfHRC9hJ640FXztwNH33DEKKDJMaXVs7n6fm4cAbUzCJ20ht0NjntKMn1OtLhHz8XNcl0PGFhwWKl/dU/3vOoPrEYZ1DPWM9cSNw09OPzmEOE9f5XzNmN2fbF2MtAPtjpAzlXwzrpyZb+YppQ+7o9L2fFjXLlrvknyhNt/yembqmvsxvvXcOd5aBt9/HoGcbPs6t7wTi/ahOSM6SxkztPNrhMVB55F0SiZgAlsJMG7EcUTx4FBhPCIgM7DgQ+OO7kmP3KcQF4LonI8mcGcC9KU4h0smnKXMV/VZZObcGBS5MR7dIaisKu/amHqHMrsMJmACJmAC9ybAXKZ57Y4lPdyJCjQM5kBEmZICdjVMCbV2tl1dE33ST9vX3TvuFmooc/RFghQj+oEcKJynPxC4r6TsSXHRve8P3OgfbQejtJxXVxRtdiXq1R//9Y4uOqRHnkxRZPmLO2npH3zHAXFF3pU+bfGoncmllWIjLCa4ou/tSZMxVs53nJ+SL9QfGFNbVvZLTtmTJz97XwJanJIrYa6dRRmgNL/n4vI5EzCBZxCQfI8MyvylcSK+DQGdAZlECzSWyDAPEuRMWrq39zXmTwcTuJJA7CNaBKk+dWW+Rk876o2lvIpn6fos59E74/g6S76dTxMwARMwARMoEbj7BoBTNAw5bkqQrzyPgKvfeLJge2VN7E9bO+AwYmMA0Oq+/THPFwOGEPodA9iaIaFkqEdB0Spy9RGcr2vxzUfrc44pY3SG3G1sKDnOPpM45gxOJfrnSM5i+gr5oq3HNv7qH6+dGS9n2I+dFRgIj1bk1RaPqAmcMJQpDYwf1A1MvIMtpZP/Ho0grzbz2j2oRSoaQ3Q8ut3kc+mzdyEgB6qcpXJs0J9jW1R50zfBMJczfqk96j4fTcAE7k9ACypi/8+9qlfzFOMNfwSeqXWKarHlFbKe8nv/2nQJRyTAPBx1CfJIf9LiuhHznOYpzX96/ajvjC853UTpabGHvs96ZIyinFeMj7Myc75NwARMwARM4GoCpzhR5YlOjdNXF570X8bOFwaEWwz7NSvgRsi78/CRAEJ3FET5vCSEf3x6/m9ynEYGe0slBUrHvfHN9vxrfPj5XfG9y9gwyuICxtmebXVv26Kuc0ZE4mVBgsaS1KkoI+Pe9M98Xg4X+GPoIcRdJ3GnOkzSMp+Z11nSkpyT5ldjCEzFESM0vI/aXZzmwd/vRQDDmxwZGn9e49cv1QWN7fLKty5UZ9g3moAJdCPAAmLGgOhEXdLRNc7IMVm7OFpyU2l+7FagEBHyjebacNofTeBUAqU2j9x39ULWWhD0JcaJs8Oa/Ubj0dn56p2exl8tNukdv+MzARMwARMwgSsI6E00V6R9RpqnSkYzCAkIbmuGfRmgpRyuVVS6Yg4Otc+uxX2n65GTBMva8uFATQ3S1OPdHeIwe8ru0Nq2cNR9Z7anIxVXFPu1Vb5HMCRNGd7UvzEkxH4rA53S79W2cRy/yr085ZWMBcq38jXzERbMQTKiqixiTz1FDny2I1WUysclAzRPpRyRAdL2X47dV0zgRSAaX+PYuZXPq13+8qdM+vqNQ8npllO3EvVzJjA+Ac3xURaUvrSmA1M6jRNLJUXWIOR25C09t3ZNYxXxSzaTrMg1O1DXCPr6GQQwIH75kv8981kcqUf+lMhSHSzp29FWtBTHDNekW6ETawybId/OowmYgAmYgAksEZCtd+mema8tW5Q7lUzKWqfoLo9GRiftBihlKPdKNd279qzue8oxZYVijJJeY8hDoC6tSuTaXTsxxo9SuZ/Sbs4uZzQ4HZn2kYqrxi8MUDKaHVkWxY3TKP4+EP0ydSTl+nvJCKF4a44o5DgfFFLDm86XjksKfemZUc/jTF4yksY6UhlebcY7UsUjd6wxKsORuU79Tu2f+liqk1x6Pvc8AsiNjF20ldIul61UaJv85UJ0WtBmHUzABMYlwBzD+KBV4Dm5SoumGE9in2ZuQjbssUCDPJTe7rGHXhyryCv5R568s763h5efvYYAbXJJR6ePvb29XZO5ylTpW8z/JdmgMpqut0l/6xrpRZHBlZ9aQD9l8UdqCzsiW4z9S+3yiDQdpwmYgAmYwHMIIJvfPeQtJgeVusbIeFDSh0SLEIIwR7lUNgTOGiFIz8qYekgGJ4kUx1RqQI7f1xzOS8IgK/vu6kS9kyIxSVM9LZuMI0xAsR/0TvyKCS63Q4CylgwJ9F31X8aJNMQ+UFrFq3LKKIiyqjh1JG7i4q/E/C4GupwxRGMsHHLX4c55rlNfDp8J0JZKbTDeTftCXlDbgyd/URZQW1f7XprjYtz+fG8CV7QDOVBps+77925fLt09CEiGiQvQkIPiHMP8wzzDoinNRSo9/RyZLLdAVbqr5Co9kzuWZIncvVvOUU7+yAt/aTm2xOlnTKAnAdql+mMu3rioLnf9qnOMDepbR/fj1jL2XkDWmv4R92tnssbopTazJ329yaRGV9mTjp81ARMwARN4LoEaHWFUOug+zJEEFqOWdIvTnKgyCo4KbGu+9gg6PIsw+OTfo6JdyLmR1gHGu6XGm96f+47w3+L8kFFhb7q5vPQ+J8d973gd3xgE1pTvPbmkb81mEM/lN55jksstYJFSCi/GXP7ic5znu87FMV1j0N0dCAgLNQ4anHriBDeHjwRqjU1iXRLMxFhH2l9pnvyYA38zgT4EGPueLJv2oehYTOBcAi26NvN5ac4iHs1TaQkkR6Xnr/qu/CAzR3mvJj+UU/Nszf2+xwRaCKg9Rr0iPs952u2IbVD9KuZ3hM+lMWuEvO3JAzI+C1qP0v1jO8PGFRfZ7Mm3nzWBpxOgb6Gne3HC01uCyw+BONfMRiTVfZgn0YUoU1qu05yoQBxRSLy6chEGJTiVDKpX5/GI9HPOjpgODVXKRzyffuZVUWuBSa2GLR1Hhmo6Tc0za2kfeZ3+hKHzrgrFkeyW4kaJiTsSezOm7RPW2jf1S16OEMowjs8SWARR68SEKfcS4IaiqCDeGAb0WdfiEea16cXnZv7sMWR/7TF/tAQZqJfmGeJkpxD9lRXkmp9a0vG9JrCVgGX2reT8nAlcQyB9HT+6FPKM5KK4qFRvOmCe4bPmJD3TW/Y9mogcVamhYyldePF75ksy4dLzvmYCawRoW2pf9D/1Mz1HG8y9pUfXrzhqbLgi7aU0W+XspbhGvEbbQAc9Yuy94w7es+qQOUXzy1lpOp05CNBf0eMZ221LmaPOnMtjCcw815TGec7zx9wsee1UJ+qxVTZ37AhOCK0StOcuTTn3MgovTTSakGIsOUcKzqilePQ895DumkEwdhw6yVogT0thyTi+9FzLNZT/GgYtcT75Xr3qBgZMArDFgSHnBX10rR2t8VM7I34NxKVnaEMSzlLFu/TM2vmXgjb2K1npr5qwVB76ZM3OKPU7HfU8R42v9N3cde4pnedaLvDaO/JL2+BP9Zu7d/ZztQtSZi/nlvxT961B837O6EubYtyh3WvMsSO1lbDv30qgVm7aGr+fMwET6EuAOSPqA8h6OE8lt3KdOYd5HNlTho5U1ppZhqFMlJe5k3k1N7eKunjBrEYe13M+msBWAugX9Ekcp+qrHKWT8PuYBOS+K9+IxRgxYtgiZ49YjqU8MUbX2KCW4shdi+0sd93nygTos9a/ynyefIW2IdnqyRxcdhMQAeYaNrmt2bh1/yhH+nGL/tNu9dtY0icIPhvRfH9Mimx05Hy/eIMPKAlrjqDUgZruWJVRQKxqsXC/DNG5Z9KOg3NyKdRMmNoJ1+qUWUo3vebVcSmR7d/TfsfgT5ul3RzBmUmG9i3H3lLOpXjLmbt079I1FLMj2+NS2rXXmHhhk4bXpPxyKtU4U9Pn9R3e1KsCn5mfZFDkPGmlY5Huf13/uCiDNqLxhXhy+Y/Pz/A5GiA1PkZGM5ThzDxulXE0l6Xjj3YUMQ7Bf2/fP5OF05qfQHTez18al8AE7k0AOSZ1fER9C7lPc4r0G8kpzEF3CZTp999fpdHcyrcoz6is4sF3nsOBdbXzSnnz8b4E0BWQ66TrSC9DzlOgPeo1clwn0G8x2BM4Sud4P9H5n8aGztE6ukoCJf6ygaFvxPG9Mtr3OYK5YKu+UpvOHe+jv8F/C/c78nCZXgRoF1r8YiYmYAIvAsxhRzlSJSv1loGiTlCqR+lPXP9sqS495fOnEahZQXtaZgoJ0YBrG68cFmuChxQJkkydp8rGWhy6Lz2iTC85q9KOI+WbPOVWUtQIoFKCMGzscfqkZYnfLdRFGvWfqdeopGBgybVnORy5jgNJCmx9Sh/v1MCvs2vtUvdxJH/pSsi0HPH+3OdXm6zvu7k4jj4X6yWXFtcZI6VM5uot91w8p3rlHP0zl2a8Jz6rsSl1eukexouZBeqcsRHGWziLyd2PzHH05T2BOSUyjm2yZr7Zk7afNYFIoCT3xHv82QRMYAwCzD9ruhFyi+YU7ZwYI/f9c5E6k0kh6nTs8GNOFY80ByXZL73P301gDwF0hbiQtiTnqZ3qGNNEXl+ybcR77/CZvrk21t2hnLkyUNcE7FW5tpB7Jj3Hc9gh9toy0nif8p32Rz/dq+89hdfdy4muJBv33cvq8plAKwHmm96OVOYvbSoo2WFb88n9UUdaej7Onac5UUvC4VJGn3xNCh8MGKRR+qi4aGS9ko8cvSXhPTbytXxSvuhklJNi7bnW6+Qpx4/zJYE0/qZia3q6/zWIvJw+RyjnxEnb0KCidH0sE6BOcMJJGJZyUnqCdpNzppfubzlPe6f+atrGKx/fvv9OIt+1mrk2TdpJbuKhHxByfaQ27r33KQ818UiR3js+0sdZ8U0biJNjLg+1Y1Pq7M7FNdq5pxljevI/QrGmXWteIn619575dlwmkBLwOJAS8XcTmJ9AavS9s06ueTNXa1xD3lNgnmVlOYskOZZ0Wt3vown0JIDOsWfRpWxFzNv89dLfovzZs7w94qKc6XjWI97R4+hVZuJZ03VHZ3FV/rBR9KqHq8rgdPsRQGawbt6Pp2O6HwFkbr3lhdJhc12yd9faWYkLeza2/KX4uG8tpGlqkw56En/xDYNx7jzNidrrNYAjC3ZrlbT1eqr0xXh6C84x7rXPEsRyjXdJQacO5Zxk8kmdU0cJKKzeS9OijOkuVJWbfObKxvXcSmc9Vzpqoi3FWXqu5jyKE51eadQ88/R7qEPaQ0/Fs8QUwZs6yvULtXcG5hoFmHtiO2YBQqsDnTZPH1SacQKBx0yGpDg+amxp6WPcKw6l+uO8dhvCZ+3+Vx19a66XpfSPvIbTl3aIoDNb/R/JpSVu+gx/tJPS7ual+GhTMaCc0bYVqBeNFTrnownsJUC7koLgvr+Xpp83gfMJpHPHWg6433PJD0rwmEnm/ZFzfzKBFwH6M39bdKAcQ/RK9FWNLeg0UU/MPXPWOeXprPTulg7tBFnPoZ1AyV7YHpOfuAMBy1F3qEWX4QwCsmexiLFko90iY+D3iLJKrizIDCX7ei7Nl2/q24d8YscnnRjPDwtdLtXO5/Y6UhEOtzgMOhdjqOh6C85rhaMRRYeNnHZphyg5GVMjHc/LwUTaNOajAh2YXXtx1ytpq2On6crRm57ne+mZ3L3xHOVd6szx3tbP1AEd3JN6HTnqEIdHbLsaJOO5utjW74orcXJ3l3aI5u6N5xjQ6Vex3hkrl9oo1+Jq/Bgf8TBWx34Srx/5mfa7J6hcrfUXJ8VS+q9+W29sI85ZFjbEMV31Hx31JSY+/5kAbY8/xhJYxn75+e7XGfpr2gbllOUO4lL7W+rXpfh93gRKBOQ8SOfC0v0+bwImcD0B5gQMupLT3t7eqne0MdfEOf/60lyXA8mM5KBVbrwu1/dK2XNPv/pUe8YGs2dnNWNETiZF10RPk+2nX87rY0IWdthHoEYv2ZfC/Z5mnLL+db96dYlMwASOI1CyR6PDRBmj9a2KMce18xl5QS5ChuBvyUaXOkxzMtE+i3UswcpnJh4yvzXI+QZ0h88EJDi/DK3/+nzDjjM4Nom3tLsGYZrGRh3RyLi/JGhwTxrUUKnb2o6QxlH7nXxhPKjZ/l1SqPc6erc6y2rKiEFUu0pq7p/tHtqPyqdX0qZjAu2Jv5q2FJ3a1Gt8plT/e5iV+oXipG1orNO5miP1Th+NoeQkjfeUPqufiHHpvt7n0zJsjf8Iowxj25pjkXTjGKw2dKXBYQtD6l9O/yhwRIFnS7xPeYYxiTGItsBcU5o74bHW32lTs7Wfp9Tz7OWkbSporNJ3H03ABMYjwNyC81SypGTGl9yxvHiO0tDnU5l5vFKenyPmWP6Yj2EZ5bjzc/OMFJFtJBtx1IKAZ5T+VUrm3SPkO8YH/tCX1/SWFt7oAMi2VwbyUDLMXpkvp31fArU2pfsScMlMwARMoJ0Ach16Shqwt3MeneQIGShNj++Si3LXtpw7VRKS0tea0WhkvFp4a8372ffTIFmR3CukjqVSvHQG/pYEWzpKzgivOs11slJ6e8/TYUkX51Mpzxga0vzW8ljLH2U9SllHYcIBcsdAfVEv8KO9qe3Eskopj+eWPhNXqQ0sPXfUNcq1RfFFGYcNTHpNSK8+3XdRxhK3Xsox5T/bCAZ7cWesk1OCY2ubXGJ05rWcwEFfeaKxq4U77XhpPoPh2u9CKL3cGKdrPprAVgK0QY1RW+PwcyZgAucRKC2oke6F7L+2mhtZ5G9/Oy/Ps6UESwXLOiLR/5i2U2RNZKYoO/dPdcwYjzQivrj+2tWROgJF5Oc9C4VHKIPzMA+BOC/Mk2vn1ARMwASuI4CfA3sYx3QMxc5NkN30ulxuT/lUJ+r2bPLjsb++P77VEVtKm51WS8bO0nMjn4fV3pWHOAQIaaNfK3epfpYUIzrS3t2da/nKXads6sS560e3i8i2xaiey2t6Tr9xSPlKdZI+M/p3ykRgQO6tdB7NqNU5SH5a+/ERjvOl/nFUe+mlHJ9tkIm/lYIDN4bSSqx4zyyfX23zlz/nmG+fFpnMUoYz8skYlTrPl+bBUp7UB2XQPXpeKuXD5+9FgDHJwQRMYDwC6F/IjGlgPikFyYyl6zp/tKyrdO5whBWLmHJ1cYfyXVUGFgOU2iEGNZizYPYp4eiFlhob9tqFRqoPLy4cqTacFxMwARMwARP4SED2q9SJuiQDfoxh7G9TOFGjs6k3ziMcMr3z2BofAjNOya1KCAp8T0NtNBzTcRB+o3OP/JYUqtayt95/VbppPl8MXq+TwljOKzS1giO9t+b7y2n3wwhDnUrpkIOHe3Q+rZOaNM68J2VxtNKJIt9zlw79sbWttd5Pu2l9plSH9FnCktGu9Oze82qfe+PheeqRMpyxc1KOUuohNbrxPRUiepTvyjiYl9NyXpmf0dJm/NAYwrynz1vySdvRfE7fnHnl3pby+5n9BGg3jK1a7OG+u5+pYzCB3gSYK7bKQL3kv95l6hEfcyBcrpj70l2TlMeLyLbX6lodaoHzGXL79lL0fVL6Q99Yf8TG2EA7vgtTGWd/lPDzJ8aMaGv6fIfPmIAJmIAJmIAJHEFAcke6gGtNBjwiL0fEOYUT9YiCK06cSDJu3qVSKRtKCH9bFD0528Roz1EO1N6O2T15Gv1ZBh3+qD/x25tnDKY5o2l6HgPOiP1ADoTI4XilM78bIOah5vOeV0DTb3L1lksXxzvtZm/ACagxUcc0TvJFqM1b+vzSd+Ls6XB8TeL7d05igFh6BSv5pr+Wxs+eZVri1+sa+VWeGYsIWuCBMbPUNnqlf6d49rCiX8fxj7j4G3WsvlO93aksLCb55z9/2/2WkjsxcVlMYCQCyFXI33rrSilvPRfMldIY6XzUgxjHesi5teVDnsulx0Jj5KOSw3vPnF+btzvfB/Mj9ItRmVHWo/u1dCHabZQpR2WyNV9wTJ3FyMv0ZekyW+P2cyZgAiZgAiZgAnUEXnLH622ydU+McVe6iSgn0++3uI9R1s25QKhCeAXOHQWss19pmVYECqaNvSmV+u8YVM7aSVefq3PvLBmU6Ldco9+ebViJBDB8kYc4wNLmNQDnDDDx+aXP9N/ahRByeC3FV3ON/JL/WJ74HOXVTnWU1SXHYnyu5bMU/J4KLzuw0tVQtXnSTuJ//OPja3rT50vMuI/2ijFwxEUKsRzRYKl8qz7iff58DoHInr5HO94zppyTa6cyGgG3mdFqxPkxgY8ElnaJM/bThzU/71mc9zHVsb+pvORSctiZOV6SQZeuoRPEufvMPI+cFu3YIU+g10+Z5GP/cZZ2y99WZyp6zpU6NyUpyTOlMkk3o0/SBsXgBxV/MgETMAETMAET6E2gNF/3TqdnfOQ5/u46Mk9q7368ExWDNsoOzj6Eqzu++kNlrFXoSitrWxsnwqwNvq3UPt9PR77aGf45V+ecoQ3hfCoFrvEnBannalPGhaW0MehovCCfCrlXf+naluNaPhQn9/UKjBmMA7nyy9BHWnGSUR30ygPj1ZKRqjWdV17rd/YqftqUDA45Hrpv6SjDUc86WkpvzzUEhd51uSc/T36WdhPbzOgO+CfX1ehlj3PU6Hl1/kzgaQSQM5BRSosGkUHigrqa11nOzDDdTTab05j6oo7SHXEz18mZeaf+nxaQu890Tu5po0e/CWqt7t/e3tZuKV5Hj+NP+nvxRl8wARMwARMwARN4PAHZu5HRtCHnr1FQ5bVxcqBxjMY70eNcTnkj8lkDgiQBAyWGppnLUqoDyshfXNVbuhfhEgEVpX6LQE8aPCeupXR8vo1AqzO8LfZx7taYlL7GsiaHKKG0272BPGgszMWllay6Fg3UvceP3DisdHU8wsBEujmnYa58cu70dr4xlihulXXrMRoga+Ognkmf9lC7CEVxq43MNg5SvywEkJCg8vh4PgH6YK/2f37uneLVBBi33I+vrgWnbwLrBF6K+beszMXTUf6Qw3U91jnvQJ5OyzubHAX5lyz1eu0vZcrJ03PW0PG5xkn3xHC2czK20djn1tjTlnvqZ2vpHXEd2aj3oucj8uk4TcAETMAETMAEricQbeB/jV/iZ7IpZwbbVwk4FfgrKQJbnW7vkQ/yb0ZFrQUdBlmU9XRLci4OHCJbDLi0EX576wjHTi6fTzpH++SPvkkdLvVHuNAn1+65mh/GBfLYkk/K1dthB4fUeFNiEx2b1EUcE4mDOuLIn159W4pr7Xxu0Ur6jMYt5R8+W/pujJfnU8Y4BktB6aXPlO6vOU+b6BHSOqqNk123PLvFEbFU77H/jugoQxagrmO7rmXm+/oRiONMv1gd01MISHZ/SnldThOYlQDOk5dsX37zisrWSy5SfKMdkWNjmL281Ct/WxbyRQ53+Fwj0+Cc6y17Is+SNn+0J/56p5HWj2xiNfYWPVvDR/f2PKqNwr5Wh+O+LQvte+Z7LS7VO/dpHIn1jm7XQ19ey4evm4AJmIAJmIAJ3IfA4vZROVXjO4FVdIzABAmHCCoyouseH8ck8DKQ/3CmprmMAjT1rHaQ3rf2nVWNPZxIa+k88brqUGWPThkpCKliQF3wp+t69soj+W5Z/co4o1dEo7xheErLQ/tFWZKyzPWoSPEcIW3XLcpjZMaO2RhgjOMzLdfWvkQ+qUuF2D85F69JSbxKEWcO6GWcoM6WHJHiUXOEYevuStLPta+a9LinVN9pO7uqrpRH2i8GFAXyzbm0X+m6j+cRiPVyXqpO6Q4E6MfpXHGHcrkMJnAXAl+/fn2XEzDkIwcw3kcZHdnuiX0YGT8uXLuLLPLUn2Vp6a9HzFta0E3ce2T62nKkuotsaDV9WfppbVq970OHK+nWubTkhOSZVKfO3d9ybs/4Rx3IVpBLM74OmHpBb5UjOXe/z5mACTybAPNH7zHu2URdehOYm8CiE3WpaBpIfv8dZ0Q/Y/dSmr7WlwB1KOE+xowwLOc4x9w98f70M8YAKb0ccRrYwZ5S6vs9rUsm+zRIQUidOOl9Z35Hoa0NUoR1P2XGKIHR6bPD8vWbJ7qXdqg2GRVZxi7aa87xxzU9o3h0lLOS76QfA89EA5DaP2UlrS19Qc8QVxqIk0CdK181u1fTeHp9p056rLjv5UBVuWgvtKG0reh6eizVfXpf7fdcO+XZK40mMKFdqg33LnMtG9/3mUBcHPH5qs+YQJkAc0Gcg8p3+ooJmMAVBDS+MwcTJLtJf0L+lNwXZVae0/kr8n1GmjCR/J3K/Wekf2QaqrtYp0emN1rcaue5fJVk5Ny9NefoK9G5R7tKHfQ18bTcQ7vN6S7UO2VfkrF5VuNBS5q97yUPlKHWViAnZK7ce/K2pa/AULaOlrSpF/541uEHATuOfrDwp2cTYHH5COPzs2vBpTeB6wkgWyL3bHaiUgQmVyJhh4/DfQgwSeA4ReCnfiXI1paQ+1ufqY3b99URWJroqRsUy5yRdUnBrUu5/i4UtCWFUjGhFC2tKEXpUVvVM7VHKU7p/YxpS7vxeA6FH2flWhmkYK7dl+YhfictypirH87FVbXxuT2fGd/TIIdtej79LkNger72O4azI8KZzmUJ3HBcWv3Otd7GhxZ2pN3beNWSvu/NE6APaQFG/g6fNYGPBBhrGHdqF4p8fNrfTMAEziIQZSlk3PidPCDzxrAmB8d77/BZ5V/SZWYtp/RjdIOnBfQgFlnK0SXdpjcL+os4R8YsDD8qkOaSLF/Si3hOPI7K25Z44Yd+WaO7puPXlvRyz7TkoWXBRWlBLTLUHcecHNvac/RX6jcuSKh91veZwF0InGk/ugszl8ME7kgAuYT5cJcT9WX8/dUCxx1byJ9lQhlAeELJ8eq8e1UySkJOiUBZOrK+UVC0y3mN6FWKJenWKFFwqg1SQmVAWFK0c3EuGcVzxoea/OfSWToHl5xRIvcM9+Xylbs3nmtRguNztZ+PNKCkecD4sLSSG560h61tIk1vz3fGdxSEJWfvnvj97EcC1D1GCf7gnhsT6fPc52ACawRa5tW1uHzdBEzgeALSqei7BMlW74r5n/OCZDjmiKPlouNL256Cyt/+5Ocn5LRjru0Z7+eU6s+ovrfIyfWpjHmn5N4lvWZPzkv9hb52BG/ktBqdjr4d0093yu4p81HP1u7cpWxHBdmiaDe5UMs/Psv4i44W6yNe9+cXAcZL2gC64T//+fr9WK5o/DInE3gCAclpTyiry2gCJrBOgLlxsxOVAQUhZBSFZL24vmMLART4rUGTjtvIMkEUfITUsznRf3EEpooJim0PY4Pqn50xKCtrK1rlWEAZO5tFrCE5tbQSPl6Ln1Nu8drSZ55j52hJ0U+fbXHW6tkjHOF7xgLla+mIQUGGxaX79lyjDZ4V1pRzKaa0B/6u3nVIn1szVpzF7gnp0J/U3vXK/LTN6PoTeLiM7QSYY3NvlGiPyU+YgAmcSQC5n5DKkczDUf71HNCnVuSw2+Jw6ZODz7HIEZHO+5/vPO4MPGhjOV3wuFSPi1nlyaWALtoSpJOmz6T1VeNAJY64iBN9R/Wfxj/Sd8YidFX1n1Le4phVumfP+SXdZOsYCf/ULqE3CO3J692epW5r2/jdyu7ymIAJmIAJmECOwGYPGcLgDAJgrtA+V08AAXOr80S7mmZRFuqp9L0TIwr9SYb0vrEvx4YjJ2eE5dzSKlmMt3KOpimkSkl6Pfe91qEYnyUPcKN9pit8431bPlMntN8jA0ophgvqgHKkzmPKpz7Umg+c4HtDanA42gG5dZypKeceljXxt96DcQbFlDLLiCrDzNXzKsoy7TIaTcgvQXltLa/v/0EAlvT51OhE/1cfU1/Yahz6kZo/nUHgjAUQcrrQNvhjjM/N3WeU12mYgAnsIxDnUuRfh+MIMI/CWzrNcSm1xyx5T/Jfewz7nlA7RO6TTkVeJPNJFtmi1+3L2banld/c07V6kcpechxRZ8jI/NXKaMzfYp3L28jnKCP1X2qj9KszgvpxmlZtvabP8T21gUgGz93rcyZgAs8lkOrszyXhkpuACUBgk6UdQVuCvzHelwD1jNBaqyTkSKCMuK3kyPw4B6OrBHeEAhSgnHLEOf6kICmPRyiCLW1MyqvyQf6iEgVPFCMCzslc2X7QL39S/OU7tl8hj5SZfMtRSj7j+a0Gcn7PtYewp/reXsq2J2Mdtj2Zv5t2Qpx72kA+5v1nZehJnf+0Aa619If9ufkcA+nzh3Mo5gem0bn6+UmfqSGQ65+cKxntauL0PdcQoE/Qb9NFMD1zQz/UfKRjz/gdlwmYwDUEJPPF1OXMYkwhMDdInsnNHfFZf/5MQLL2qOykI2/VVT6XuO0McwpOPuQPFvMqP2ksapdX5ZP8SB9V3jTv1simNfVP/KXyK02OkpHjuZbP6tstz1x5L0zQCXPyx1ll6a0jwpM2QZ2rTXOMOs+VzGdNm3Gipq/NWj7n+3kEvEP9eXXuEpvAGoFNTlRPjmtY73Gdet5b13Jm3YPIPUuxpBxRYikXR5U+VYqX0kE4j06cuIMVYxQKHn84Jml7R+d9Ka9L16KzhM9apaz8Lz27dA0ee/us4pejT98xGswSeF3yyEGKes4ooPY9Au/UmCRj5FYH/8h1clbeckaos9J2Ov0J0CfosyzW6P02CQzD/LnN9K83x2gCVxFAVkW+yhnrozMoJ7/WOnmuKtuo6faSi48qH7IW7UHy31HplOJljll7o8LLJvByssZ2Woqz9/mlti95eW3xp/TEXN64lsq8ufu2nCN/cR4fvT3myoiumtY7zGYsS658OkcZ1Z50zsc8AVgRoi57t/aQL7nPPolAbN9PKrfLagImUCawyYlajs5XTOAHgego+nHWn1ICKM5ril/6zJ2+165ijcpbTpmmvWEEwPCEsjqqoyf36jYcvtqRurVuo0N5axzxOZRIBEfyRbBSGens/4yxjF3DucA12I+ojKavec7l3+eWCdhIs8xntquMvfRZ7YqpzX+605vnOEfIOVDeL/ifCZjAlARyMpp291GguNML5wQyLdeZc5kzkBNHlAmmrIwBMy2Z+yrdRXNOjSORvNJe9czROHM6X5omeZJTJ7229l39be2+rdfFC2bo/LOGtI3y/awgXTRNr/eYGJ3daVpP/I5MKjsNrOOcBI9ow6oZO57I0GWem4B3os5df869CRxBYF5J7ggajtMELiCAcPrzz9d1RQTiq5SG3CpWlOCoCEtAVx6XlOmrV3MvNZ8lJR3FBGVUZVyKJ3eNuI9QZsmXDHm5dNNztCUU3S0LKHorwmnezv5OnWgnPrvUtFAi1vGSsYxrvV7NfHbZnd4yAbWF5bt8dRYCjL3MWfRZ5qdaZ6qM0Bq7ieMso/QsbJ1PE5iVAGOBgozLkpHWFs5JhkIuknyouHy8LwHq+uvXr9/fTnN2SZl/0Lk0Jy2lT5tmDosy7dL9W68hS6v/rMWxlG+cQTGv9E/Nt0vPraVZe722DLXxXXUfbRR21P0Z3CgnslGsu1h2ru3JR04e3xtnzN9on5mDpJPCVLoq9VoKUVdV3XOv5qnScz5vArMT4E1xe8aX2cvv/JuACeQJlGfM/P0+awIm0JnAkuDaOanv0SFEE1hdlVMgvt94wgdevYpQLgUTYSUqTFFx4j6tiCxljefZxReF/tK9Z51HSVlTNsg3fzKyxXKv5XMt7rXn167XtlHaE/lG6FwK8CC0lHEpvvQa8R8Vd5pW7nta3+lrPjHmyHiTe17naMPEhVGr1rClZ4860kYJV7127qhynRkvda/x7sx0ndZxBF5j97/e+zX1iyE8DVrRr/EURwp9nPNnGKPT/Pi7CZjAcQTiGK++L7lUx1zqubeV5O7zufsSQKavlRN7U2jRCTWH9c6D4ktlaZ1vPaJTqlzSI5mHkauRZSXXtsb75PvPZLakb/R2eObeGHCXeoZVyvKls5cX7TKP0XfoK7ULBO/Cy+V4NgHmYPqHFsQ/m4ZLbwImEAnYiRpp+LMJ3JjAFufc0Tjk6MLozB/KS+m3B1oUG5Tjqx1pkR3KR20g7xhQcspOLo6RDG4yUqheS/lF+ZZwmrtn7zk5NPbGs/X5Nae2jKu0+RhybRaW4nmm0SLmK/1MPkZbqJDmcfTvjMdypo2eV+dvnUCct+jHCozjXKOuMUBppz71/3pF1JeqBRWKz0cTMIHxCeCoUZAzLJ3vdT0eGTtGmedjvvz5fALIiXLynZl6q76Sk1t75Jd412Tp2nToU7l+lTtXG+eT7xvJmYZ+xBgrvaq1XqRf9WxvrXk4637au5yozFH0dcmnyKSl0KsfluL3eRMYjYDkNsYF6+qj1Y7zYwLXE6i37F+fV+fABExgBwFe3yJlYUc0hz4q4T4mggBTUoDjfelnOSIxYqflJs70XPp8z+8tRgmlS5lxSi4Z3sRGz1x9lBO1lA+UtjOMFkoj155Keet1vtaprdW9aoew4dyS85xrKluv/G6N5+Xs/3WoHd9by3Lmc/TZtVWtWvBCXY9S32cymjGtqGQz3tNX49wjgxX9nbcvOJiACdybQDoG1JTWxuoaSs+5h/n/7AVrcUFQDemjdqOuyUk1eau5xzJWDaWP90R55+OVY76t6ezoyXsdu09pB2KZOp3PrtNjWopjNYE+BLBnyS7TJ0bHYgImcCcCdqLeqTZdFhO4CQE5orRCcmuxUIr4kzGLeFDMURa0ymxr3C3P9VLOUH4wsmkXU694W8qydK8cgkv35K4hqPYOsLnCidpSJzhbxEwKLc/zl2ufa07q3gzX4qMf8butS68mXIvjadc1/iyVmwUvBNovfy278Jfi9bXjCMRV/LmFL7lzx+XGMZuACVxJYEt/l9x7Zb6d9ngEkLN4PTwyITKgZMZRckr+kOG3tPlcGbTQjHgdTKCWAHJz+tMpNc/Kqdi6eKAm7hHvQe/csrB7xLI4TyZwBAH0OfqI7DJHpOE4TcAE5iZgCXXu+nPuTaCKAALBFQ4YlBMEkVblusURVQNAjql4L8JRa77i87Wfcw5C6kOvdVyKJ60zrczGuDCigUHK6FKZ0mt3WumXq+u0vPG76jf3HO2TldXRQUl7HU2opx1i/L3CYR1ZzvCZeq7pt6pjxgkMQ7Clrej8DGV1Hk3ABEzABOoIIDv1lnvrUvZdsxDQ/M+i0NHkLfLWQ5/ygrFZWuO5+cSOsLZ4YK9jsEY2P7fU/VNj7KCfesFOf7aO8T4E+KkVzbf3KZVLYgIm0JOAnag9aTouExiUwJmv8sVRkL5Wp4dyfQTaM5w/lB3lTgayaADhtY7s5KtR3jCy1dx3BKfaOGsU3RgXZbqToLpViae/5EKuvmk/aku5Z644R37IVzRyULfiMWr/P5tVa1un/llZz3M4VB3GJaDdw+Pm0DkzARMYjYDmyda5YbRyOD/nEUDeOvsVv2ul2yuf0A/8Kus1yr6+RGDrTtJWvXUpDyNfo49q8cVWViOXz3kzgV4ERrOx9CqX4zEBE+hHwE7UfiwdkwkMSwADDYqCBOijMlpyiuFYrXWk5HblHZVfBCU5gFrYyPBFvrSbkM/RicR3BTm+ohKja+w0rFl9rV2oem7EI87A2nqmPR5tODz7VbOtgrfaS82uZNV3bG86N8JRv0GMcp46f2kXOJlq28YI5emdh9LKb8aGHLM0/ZRpet3fryHAmP70tn0NeadqAvMSqJH55i2dc340AeSBFr3qqPww/7FrZ49cSjmO1gWOKr/jnZ8AbRed/s6BfhrfamR94s617bKZgAmYgAkcTcBO1KMJO34TGIQADh6M9Rh8pfDKidOaRTk64w66JaEcBbnGgVJywrbmr/X+6EzN7agjPu2qo8xLZUVZwSlGEHPdzzFn+FB9vD+U+QcXxZG5PMyptTzSBigrDuFWh+OWQpKfM3Ybb8lbfIZ++O3bt+9tLF5LP8NwVINTqU6pB3ZU0neiIp+W7Y7f6bulHRaMFfQH/n7//XPpOX/GYoPPKftMDYHUMFXzjO8xARMwgdJcaTImUEsAeapGr6qNT/etyfHch56EfLI3/at0PpXVx/EJIGftbWelUhI3+hft8M7Bb0q5c+26bCZgAiZgAmcTsBP1bOJOzwQuJCBnRi4LKBMStDHc5173UqNc5+LmHM4s7bhCAW/Z+VmKs/d5DFt7jVswKjlNyC8OMIwPNQ7smnt6M9gbX85JHON8OQx/++nr16/x9GGfqc8exp7DMvifiOFSW9/0n73t9Ojy5OJ/jT9fqsuZi2O2c0v1pPGYsZeFF7H+Merw7NLzs7G4S36pL3bfjDiH3YWxy2ECTyAw61z+hLoZvYzID8jRZ85H//u//9vVoTXDG3ZGbwd3z58WJa+Vk/7QGnhGC235eZ27vyHAu75bW4jvNwETMAETMIHPBNoljs9x+IwJmMANCMigf1RRojOAzxiPotOAdPnOjrwlJ+RR+TszXr36VDvNIhvlA8OIwkxctEtybeUw5dui9IpJy7HFcd0S7557Y/22xkO7mTXQ1tN+P2tZavKdW4ySPkc/YEyQMZTruTEhfc7fryGQOryvyYVTNQETmJWAnFF6q8us5XC+ryfw0t36/FzL2o68Nbl+iQZx177RZykeX3sOAcbJGn1hrd0uEUPWRk7nLTksjOOPcTkuJj9LV13K555r7Fpfe4vWnvj9rAmYgAmYgAk8iYCdqE+qbZfVBAYigIKC8pLuEkRhesLq/CUnCc6U9LWnM3GpcVqyk+tMxRQnFQ76GoV8oG6SzQqGLDmrszcMfJJ27x18+QqSMTR/1WdHILBn8cMI+XceTMAErifAHH73XU/XU3YOWgnIyZl7DofWnnD3xbF72PjZzwSwA9Q47XGg7m1byN6//PLrd707TXf2sfpMXftzTfqMCcxDQIuZl2x085TGOTUBEziKwF+OitjxmoAJmMASAZxAJSFl5p12S2Xee20mLmuv6arZobeXV/r8koEovffo7ziR94SZnTlP2n1j48WeVj7es96FOl6dOEcmMBsBDPYl+Xe2sji/9yFQkpG1c3prSffsFNyapp+bm0DNYsseDlRRei1i/PK+C5XXZDNG84e+4rFalHw0gXsTYByoGXvuTcGlMwETWCNgJ+oaIV83ARM4lEBJaT800cEjR4hDeZs5UIaSswzFl+t3Cy2OTVZZ7wl7nbB70t777EyLAfaW1c/fi4Dnq3vVp0tjAmcTYFfTHeWfszk6vY8EejgqS86idGfex5TXv3neXGfkO34Q4K1Ba6GnA1Vp0f71lh/GaP70Xff4aAImcG8CPebSexNy6UzABOxEdRswARO4lABKS+owtJPlp3flLTohEepmU+b4DZY0UI61XarpM7N8//33Osdo7e/8LJXbfWSJzhjXrIiNUQ/OhQmYgAmMQIA5oeSoGiF/zsO8BPY6KpfklaVrNcT25q0mDd9zDwIsMK352ZUjxtEj4rxHrbgUJvAcAh4HnlPXLqkJbCVgJ+pWcn7OBEygGwFWe0ZHao0C1S3xgSOSowxn6t7ffLmimNSrHMEcX69I+uW2uzBYrb+0w5RrrLDeu6qfulTbuKJe96bp/r2XoJ+/isDM/e4qZk7XBEyAhXH7f7vPHE2gRCC3aLF0b+78kqNz6VourvTcFT/fkebB38cnwNt8al+laUfH+PXpHJrAjASYr/b+BviM5XaeTcAE6gnc732K9WX3nQ8mwOQ4266+u1cXDjdecyYFynX00/cdm7CZNdDPMO7MXIYW9mq/qbOlh+O0JR8j34szPQb6+h35YHjEcU5b4LONPrHW5/qMcY+d5l4AMFe9ObcmMAqBu76BYxS+T88HMjaO+q1z1JITlmt7UpLY5wAAQABJREFUZLSnyP9Pb4N7y1/7MyVanLs3PT9vAiZgAikB5qt//OPf745U24pTOv5uAiYAAe9EdTt4HIG7GuzvUJE4Gawc/ajJl1FkXgeqSjKKASV1bCp/vY84UjE4xb+eaXhHS0+ax8VF/dPmMEDagXoc5zNiZgyzMn0GaadhAvcj4N9BvV+djliiPTtGlxxYzH/xbUEtZd/7KuCWtHzv3AS8Y3nu+nPuTeAuBPbMpXdh4HKYgAmUCdiJWmbjKzcl8NoV9+WmpbtPsc5yeN2HmEuyRmDrCv21eM+8bgfqmbT3pYXhHMfbKIsI9pXGT7MAy8EETMAEWgl4EU0rMd+/hcDSbtK1+Fj8x89NlAJyDDJNa3DbbyX23Pv/8Q/LWM+tfZfcBMYiYDvkWPXh3JjASATsRB2pNpyXUwi8VtT+ckpaS4nwesCl309cevZu12CBgTr+XiQOL847mEAPAnfoa7UOVI8tPVrM/jju0Ob2U7hHDHFuukeJXAoTMIEzCGxxPJ2RL6fxkQA6yNMXyqB3LTlScYi2tmfvLvzYzvwtT4C+d4eFrvnS+awJmIAJmIAJmMBdCMz/nsi71ITLcTgBHAuscuR3ia7cGUQ++G01/b4Mq395he1rh+wzuyT1we8PRAXKr4A6vEs8IgEUc1YTxrY1a8FrXi/D+PLt22/vRZx5B4D6P2Wg/jRezlR3Mkj+8sv1i3Zm4jZSXmN/GilfzosJmMD4BJjHZp6HxyfcJ4cseJKMMfNr29Et94Y1uaVFJqP9X6lv72Xh548nkNpE1lKkTc3cR9fK5+smYAImYAImYAJjE3imx2bsOnHuDiKg33u5SqFbUhRQ3vlDOXiqwR3nNs4fGZ1seDqoIzwoWhyoMozdodg1r2rTOEd5Kf/oxgbySNBCEj7nxuhZHeFrBknK6zAugR5G6XFL55yZgAkcSQC51mF8AnG3JDsxZ9XDer1+cG3R4dqCPvQ47qmRWcdvHc7hGgHsG4Sc7L70bKuO9mQbyRJHXzMBE+hPYG0e7J+iYzQBE5iFgJ2os9SU87mbAEryFY65JedpWqgnG1xQvn755ddmJSxl6O8mIAJ3cqCqTGvHaESj/KPvcK918mLUxLg5o1JDnmdwaK+1rSdep/88cRx5Yl27zCbQkwALg1qdCj3Td1z1BKR/sJCT+RpZ4+q3FtXn/nUnuuZZ8hG6NDp1XGSE05RzbvOtNTf3/bQ7vf2GkqwtiIylXXPGx3uJt1ZfiM/5swmYgAm0EmgZm1rj9v0mYALzE7ATdf46dAkqCaDYnancoVjw+uBapZbfmTkzf5XYTr3t6eU/FfbNE9MOxzsVs6Z/RCcqZWcMmnVXRVp3lKN15Xoax1XfccRRN3epi6s4npkuc3jc2X1m2k7LBExgbgLehTdX/SFfsZDzhyN1rjfjRIfmGeTh9eWLd1qfwXrUNJCRaHc4OLXYTLIuTog//ng51pGjkH/TRZ0443mV9pqdxA7UUVuA82UC9yTA2MTPrTE+XbEB555UXSoTuA8BO1HvU5cuyUAEWg393oF5TeVRT3ZsXMP+yFTj71sdmc5Zcbe8wio1RvD97e3tT2PX67fZZlcGWIlOn03LeVZdOJ37E0h3Vty/xC6hCZhATwLMtzWLnnqm6bj2E4iOVGJDzuAPmRKnUOoE2p9inxiYs+TE6hEj7dfBBNYIREd6bH/qK9qhKv0jHRNpt2uyvB2oa7Xg6yZgAkcQYNzC3uBgAiZgAikBO1FTIv5uAjsIoGjzt6YUxCS8AzXSOPfz61WNvL7r3zZ4nYv+sNSoS1YP3iUgxLfsXuT+3PjDOf5gg1FiVGPgXerN5ZiXwNk7euYl5ZybgAnkCDz5pzlyPGY6h6Mn7qwj75KfcBQhY+Ek4m+URWm8ccTBBK4kEPsMfSP2o9yrsbGVLOlq1lOurE2nbQImwPzOOOVgAiZgAikBO1FTIv5uAg0EmFxZpbRnZxS/IVMTSIu/FodKTbxPvkdKHqtlcWaPYhB5Qp3QluGN05Og1z2t/eYNu4dzxiv1xbgaenaOrQ5UygubnBM1soARf7O2+bXyxbL6swmYgAmYgAmcRQDjf7rj6qy0nc7xBORQJSWcQFe/SQjZt7dMhBzpYAItBNDdov6Fbqd2hJMfR6r0vDWbyay6SQsv32sCJjA2AWxUzPHeaDF2PTl3JnAFAUvJV1B3mtMTQGldWkFZW0CcJDXGlm/fvn1Xkj2Z19Ktu0+vB1V9nulIpV4JT3OM63XXYh5rCuV6jQfPsfhAfUfxxXhm/7zFgUqZX7ur/1lV/JTj2kOMe4Qz+0iaJznd0/Mjf7dBaOTacd5mIvD169f37DIO6FWBM+Xfeb0/AeZgh7kJtMhRVy7CZBzMydGRPrIkDiwcWbXOVjm/Yjz+bAJrBFhQwJs80jZJu2uZr2sXl6/lx9dNwARMYA8B5k8Wf8jetCcuP2sCJnAfAn+5T1FcEhM4ngBOBH5fMFUQtqZco6iiJEfFl8ncoS8BnHYISnIS9Y29HJucUWenW87R8Vdoz3G1cpoibX2JB05v6kqv3MQRvRRfGv8M39nJsuZILpUDQR8+tUEcS/fDFyc1AQc3Y5++l57pcZ52QjvgGMOM45/6eSyHP49FgDb9mmuXx6excn1sbhiH4t+xqdXFrvGAcY68OZjASARokza2jVQj2/JCHeIQqg3IRVoUWfvM3vsYC2scUy/9hvL88l4mjeml9JEfLbOU6Pj8EgH6DToai51YPPgaD+v1EcXtMVQkfDQBE7iSAHbaJZvUlXlz2iZgAtcR8E7U69g75QkIoKTq9TNHOGpyceKoUIjOU52L13XOx/0Etjqt9qSMoYI/GYb3xDXLsyjHKNa5tq8yYJBaMuIg1PI8fSHXRxTPjEfYYITYE+BTwwVjWU1asI4LPlR3Nc/uKUdcrEJeyYPHvz1E7/ksxmvaBn9xh3pLaWnTatctz935XnjEV1XCN/bJq8vO+HPHOeBqrk5/OwH6iMM9CMiRWruDE5mLRbaSVfbMR2sEMerWjMU4smKgTF++vORLdtvmynaFLhTz6M/3IBB1OHRcLdiMMnxOT0nb7D1ouBQmYAKzEsiNU7OWxfk2ARPoQ8DaXh+OjuUGBCTkn22Us+H2Bo1nZxGetuoW43fJgCOUOEaiMQejkZRyGSrvJtj2cKDCLxopMOjlONW+YhbWPI/BjrgUGLdIJ9aRrh1xJA+5chyRluOci0DaNqLjr6YkT1rEUsND99Df49zE+Eufv1JmwRArJwD55DWVNbuxVCYfTeAIArXz6RFpO87jCLwcqb+8v32jdtxL5yNyFx2rkmO35rrWgUqaS2ltKdvWPPu5ZxOgrcV5O9JA/mIOp70yn0eZI97nz9sJyL519MLX7Tn0kyYwNoFogxo7p86dCZjAGQTsRD2DstOYggDGuVolWQXC6YEzKAr9R/8+oxxIyoOPJjAjARlwSgYhDFH0JfUvnHj80efu2AcwIPRScOVsJE6cnDDWbwyxs37JsJa2pbjbS/HqHr7j7F4zfKDAxzFSzz/l+PTyn1nPjA+1bY1+wV/ars/M72hpMWYQSkzieLAn76TDON6yaC3nqHrNI7/akbqnMvzsbgKaX3dH5AiGJMC4x3hVs/szVwDGU42pzDnIYC1yGDIEslvtfCXZL5eX9Bwydqvum8bh7yawlQBzuH7rfGscfm6ZgJzUy3f5qgmYQEpA9qa4OD29x99NwASeR+C//lQI/u95xXaJTeAzgSXnJwopCi+GEv0m35ICvBTX55Trz7QoxvWx+k4TuJYAjjgZmHI50eudthqwcnGOdq5X38bYJoW55y7RtTFtaRctz25xEKsso9VVa35yzp/WOHx/mQCvUCTU9iEM0XceS8qklq+IX+x3nEsXScTryzHmr2qsIB4Wr2mhDHfnxpna/kO91joZ8jnzWRPYRsBOgG3cZnuq59zB2Cq9srTwZ8uYpvG1lS3jMa/37Sk3tubB95uACfQnoHHEfbs/W8d4fwLSMS3n3b+uXUITqCXgnai1pHzfIwmgjEYDHxBKym4EdNTKXoyZDiZwJwIYzZccqJQVhwfCK4sY/OrG5dpnkYecIct3tl1d24HGToboKJVBjrqVE7wtxddYyxg8+y4J71Jqrflt9y8tbIoxYlByKBNAxqHPMu7Sfxlzo/EgXi/FoufT64xNGieI5/fff3qPX69gjuNMrfNUaVD//MlguDav6DkfTWAPAdq0wzMIyOnZQw5lfErHKNqSdr5skXu2OlCpPcZjO1me0Y5dymcRkGz0rFK7tCbQh4DsEOgW9CUHEzABE7AT1W3ABP5DAOMdzk/tNMXwjVK5FphUMTZK+Y1xrD3bev3lIFnPU2u8vt8EriBA36k1FGk3I8b2HgasK8q7lCbGtB4C+pHKcmrwS8uD45TAbgbuZUyUcyS9t+Y7PGRQrLl/1HvS33EcNZ+z5Sv93eQa5XZt1/tsDHrlNzW+w5LXV5Vet6txpsQT+Ym+r7FA+UwXgql/xz6CIX/PWKi8r41XypOPJrCHgNrwnjj87DwEXs7GY+RQxqwt4xYLTmp11nlIO6cmYAImYAImcC0B7MPYqvxK32vrwambwEgE7I0ZqTacl8sJoBzXOE7TjOIskPLLRMv3I0KNkfiIdJfi3GPsXIrX18YhgHMMBz4CJAbDHu2QOEuv1MSgT4gOVj4jyB5pwLqauHj04NurLLHu1+KMzu3UKbP2bHp9qX2k947+nbabvtFg9DzPkL/XnPty3K/NubQnHHVbDNQzsNibx5xxgPEWbksyEQ5Pveoq5oH5gnGM63pFL3WUxsU9yBAa3xXH3jEwVx7F7aMJ9CRgJ2pPmnPExTim3SlX57h1x/7V+XX6JmACJmACJjATAeZ76xUz1ZjzagLHEvjLsdE7dhO4PwEZClFkFY4w1MqxpDRGOWIAZTeKw30JsJsIBx+Gbo4YxfcGHBoxsGtJbRxBFQO+vus+pZs+q+t3OMKXPjVCoF/jGFXdt+QJp+GeQJu7U7hzm72qnphz1U5SRwbOP5x7jBmvOeq3D4syrsrzqOlGh3TMY+r0jNf4DOdciMYGxnJCugtVz+l8KS7d13I8QgZrSd/3PofA3V/XzhjKX+yfo8goe1qZ5oatcaRzztZ49jzHwpS9C072pO9nTcAETMAETODuBF6LSnlTRF7nuXv5XT4TMIGPBLwT9SMPfzOBzQT2GhVQhlHKMT7mDIDRKLk5kwc8iAEUBwEGa6+IPgDwAFHq9Yo40wg4Uwkyjr9/afwX2zPOUoz1X768jO0x/rQ/IMDqemOS09wuzjMbx3Bu0W62hJfB9l9bHh32mdjeh83kZBmjf2jejQZt2o/GCB0nK9ol2WUe1xhcmwE5sdfuRzYoOWQ5HxehrcW1dp02oZ3JOVlq7XlfN4EWAqV23RLHyPdqDOWIrCaZTHJKzPssOkCcI7bKWVc7zxnjtspYsc782QRMwARMwARMYJkA8s8WPWk5Vl81AROYkYCdqDPWmvM8HIG9Rn8m5tQhhbNIu5dGNsDL+cXOMwyq5DUty3AV5gw1E8DQhNFIr2yVYW1LXdO2o3E7xqHPGMJJkz/dS5pKt7kAkz2AgXKrca9XUXFMiX1rnDxHPbcamO/qJN/KsZX70+5nEQ9jEmMTbYc5yKzbWgHyByE6otdigLXmgrV7ub42lq1dr0lD9xCX4ovOEl330QR6EZCzvld8o8WjRSrK15r8hdwSZTc9N9IxlTEYIyR3jpTPpbzM4qxeKoOvmYAJmIAJmIAJmIAJmMBsBOxEna3GnN/hCGAwWDMsLGUaI0xOgZdzcunZka6RX/3+2YxGiZFYjpqXVx3/+t14TrvHad6yGp7+Encw5IyQ9AdeJYtjZOQFBEfXE8a+VidkzzzJqSKDHXXS4qDasmKzdmdbz3KeFZfHxTbSjBX0f/5od2qHiiWOJfwGZxxXdI+P6wRy8sfaU+lcEO/PLQqL18/8TNkYx9w2zqT+nLQ0R961xFvkL8Zq/hifWeRypQyTqxeNXVpwgxy75TfLryoXP31xVdo5nj5nAiZgAiZgAncnsEUeujsTl88EnkrATtSn1rzL3YUATo5a4xzOIr36NjpdOXenIAfYncrksvwggPEGI7naMMYynGs1jtTo9PgR4+dPOJte8f72+eKDzuAYutJYFnd0MdZRJy2hReGobRst6Y92L32Gv9QZOFo+R8gP7Y02Edscc60M8zKAK6+187Du9/EHAZhq5ybcWfxA38VBpCOfdY+eTOcC5oUtzgjFd9SRfLMgJ20zR6XneE3gLgRa5vC0zJLhRpzvGLuQWSV3MDbUyLCxjDx7dmCMvVImPLu8Ts8ETMAETMAETMAETMAERiJgJ+pIteG8TEcAxXstyHkqxZffHMMwIeMwr8Qb0ciwVq6l6ziGvetqidDc13CUxzb8MpYtO1JbFhzMTWd77jGQ4azA4H+HQLug3hn7dMyVi7FCTvnc9budw+FH/9myA/BuLErlwZGnOTLe8xprnr24IvLo8VmOEjkUFKf460i7TR2l2ok3ugwjp0nrbnqx8NEEnkZAi9n2ljsu0tgbV+/ntcDiNd/UL1q7Sp7VeNubg+MzARMwARMwARNYJiB9aPkuXzUBE7g7gXtYau9eSy7ftARKr11KJ+GRjQxb4GOw/OMPDy9b2M3yDI7y+Jt4tOm3t7fvCwIwMhHYTYmRvuQkyxmF5FziGRYhYOgafacZTgQ5P7WTK+3nubrFKaFyqty5+64+93JC/HiVc21+qH8Wm1DPLCBJw9McqCo/dc4f9T9yvSu/Zx9z48LZeXhKerTDuChmqdy6V7u2tDtVx6Vnr77GnFQzJl+dT6dvAlcSoJ/03LU9ep9DtsnJJkt1EGXfpft6X5thnO1dZsdnAiZgAiZgAlcTkCyDjITc4GACJvBcAh4Bnlv3LnkHAhh6Namm0eH8yU2y7ISIgftkkIznZ/+Msm9BY/ZaLOefto3jEOO7djJxN87OFodnyVkix1J8PWRLvOWcH3MFB6r6uwxyLI7gLzdGxJ1bsYxbc4czskc8S+lTPsarXHlKz41cZ6U8n3XeDtQyaeYPt50yn95Xavo0fZ/FMxrnlIdZDPs1bw5RmXw0gacS6O0gZNy4W2iVg3qV3zpVL5KOxwRMwARMwATaCbBQXnae9qf9hAmYwB0I2Il6h1p0GU4ngCLLJMqujFLIOYfSV8mhiC85UJUOcc1iqIw8UmNrvObP8xNYa5O0X8LSbtSlOORIJQ7uw1HZ28BH3D1Crq2TZ/5wpMrRnOvLuWdb80T8//zn8a8Gr3G2tOb9qffTFmp/T/ipjFzuMQjcweGPrJXKYGPQdS5MYAwCktl65gaZgXh7yDk987UnLubuK2QhFoIs6Yx7yuRnTcAETMAETMAE8gRY/M7iXmy/0T6Vv9tnTcAE7kzATtQ7167L1p0AhoDa11yxKyyG9PeF1hyo0diHAdPBBGYjIKMZR/rO0qKDmrIRD6/IHs2RimC9FJYcxUvPtVyTQU+7945K86odGC0sZrlXdTVLfs/MJwsPHMYhkMoz4+SsLSdXOT/acum7TeAaAiwOPSKwkE7y4BHxnx0n48gVATmPufEo+e6KMjlNEzABEzABExidgBbFMw9j07UjdfQac/5M4DgCfzkuasdsAvcjgBGA19ktOTVfztFfPxgMUHqjA4nn11YTRyU9fr4fVZfIBOoJ0Ae/fv262AfrY9t3p/r6CAatOCbhnDvKCcVYRLlbg5y8rc/5/vsTYIEF7ZUjgaMdzGPVO4vHjhpTzippj4U8Z+XV6YxL4CW///r+cwbj5nKsnM0+dqQ0t8h8khejrJbGW/OduVFzZc39vscETMAETMAETGA/AWzABGy6nof383QMJjArgWuWUs5Ky/k2gT8J4MThXfjszIiv9EVBzv1eWGoQRoGuWb1E/HK8blHYXVkmMBIBdiL0DPQh+kjtzvCeaRPXyyD2S+9oN8cXxwsiwdAWf6d1c8TJg3BnTNuyG/jt7e09NnYT32lXSoKo+Ss8n8qD1bya5wBHv7LDvbkJnfIAjhBeG85YM1t7Je92zJ/STG6fiOT32frA7Svm5AJumatoM+iPtKE9Y5Jf63tyZTs5EzABEzCBxxNgDseOi96KHYQ3kdlG+/hmYQAPJGAn6gMr3UXuQyAqw6UYU2dDy2T7it8G5RJbn5+LgH4TtGeu6SPs6N5jjNqSn9EcqJQhN14cZWiLaaFMULctji8UD57DGePwbALpWxZa2tGzyR1TesY21cmMztISFeYIBxNoITDiPN+S/9Z76SNxQUvr86X778qRcbJlvkoNrfq+ZXEH6VJfiqPE3udNwARMwARMwAT6EWARlGQlzd+ei/vxdUwmMAMBO1FnqCXncVoC2n3X4jyNhWVnKw6HJ+9Uijz8eV4CEjhjCTCu9QgIr+y6PGtXqpwMPfK+Nw7GBsqdM+hhaDtq7CA9uEtxIB3GOykUa+WiPfDXqw2spefrYxKg/WAMbjFGj1mSuXOlRQ0skLhjyI2Pdyyny9SPAGPSU373ivm7du5uIXxXByoMWuTA0ts3mP9YhJaTj9c4U1+Sv9bu9XUTMAETMAETMIE+BLDrSmbieMSbv/rk1LGYgAkcQcC/iXoEVcdpAv8hwKTK7zduVXQxaGLclDPWYE1gRgIYIo8O9BV2pSLYPi1g7C0Z4XCwHhFYiRnHNfjzvZW/nWdH1M5ccdJv7Uy/ts4YP/h5Asbql1Ob3eWvv2tz1if1I96E0CdnjmVkAvQL+sPdQ2854eU8/fVdJrsrO/S7mgCLpcUpyFKe/2pI+h4TMAETMAETuJ4A9o44b2vDy/U5cw5MwATOIFCnAZyRE6dhAjcksKQ41xYXBRtjpoMJzEiAtlty8LWs5K8tO4Itxq34e8W1z854H2NMXBFJGbSr7CXUn/vaN/h7Z2FbS2KRTI+5oi3Vse7GkZr+PupYObx/bkrjNCV/OUXG+Q3o1trwYo1WYr5fBJ6wy6DnTu3ZxwrV+9qxds6u2dHM/Cc9D3mARR9rP5PQumBtrTy+bgImYAImYAImUEdAbwvU3SxGYy53MAETuD8B70S9fx27hDcgUKus36CoLsLNCCztcDjqNzHpL09a3R9XRGJYe5Wdnbm/vrems3dhWYlo68Sl+sEZjWMR4yqfv3379tPb21tb5BPd/aQ+O1G1vGf1iAUvRzOgz9Bf7txnjmbo+F8LCO4ugzP29grIIw4fCbBARU7Sj1d+fKON8Qc/6gM5KucofTmpf/3wJpAfsfiTCZiACZiACZjA0QSYr+MczYIp9HQHEzCB+xOwE/X+dewSmsApBNLXAJ6S6ASJyPkBn6cFjEZLO4CONkyySvCIUHJ6raVFW+DviIDBDadpNGDCl3NXOECiYnFEee8eJ4oYO6AwvrIzJdbr3cvu8o1HYOuYd2VJZszzlbyc9mcCT9lVSckp695AHJ6r8hSXFhTmn/jpnSU/CcPbRQgckfWOlp1L+fF5EzABEzABEzCBFwHkHewsmqP15gnzMQETuDcBO1HvXb8unQmcRgBHzcth+NufK7F+e9/9sbby+rTMXZQQjlMcIUuOxIuydkqyS0ajHga7tUJgaJJgu3Zvy3Xqc4szlGdoD1uerclfzrDGuSuMmqR5Rh3XcJntHtqHxgwY6rfXXsbTL6s7WmYrr/K7tuhC9/l4PoEZDQN2op7fTu6UImMvY+5TQg85YeuCLea8o+SiI+uvRb7cKjeSf3am4kztuWP4SC6O2wRMwARMwASeQAA7y+vtEb++2z1Y/DyjPPOEunIZTaAXATtRe5F0PCbwcAKv1Viv109hfHr9PfdnlxGgeF0tK9SeaPyg/HIEXdk1jnplcKuAHBcU4EjlFZMxDq7zPZ67kluPtI/aCdwjbyPHEdsADKNz/M67UJYWXYxcX0/J22yGga0OnafUp8tZJvA0Byok9jpRcShudfKRNnIRb2CIslK5hsa4QnlpK7Uhzu21z/g+EzABEzABEzCBsQmgq6Oj+01cY9eTc2cCPQg818PRg57jMAET+EQAY0iLMQaDSXQSfIpw0hMtDCYt4mK214xFZxm4aVsYuXo7dLUzCyftWvuFBQbCNHAud/4ObYd+zY50hzYCtBW11acsRCn1jzZyvvsMAoxX7IxeG/POyEtMgzYUx02+4/R1MIEtBJ60A1V86DNbA3PVVgeq0pSchtyAQ5b+yyLE0cYa5VdH2srL+fuv91Mqh67Ho+TGeI7Pe9ml8fm7CZiACZiACZjA+QSiLnJ+6k7RBEzgDAJ2op5B2WmYgAkUCWAwwejwRKNVEUq4gDPq99//30+8mhADDMYlHJAjC2m8xliOoFCUyz7C6oj8YOTjj/ZLnfAnB4PqbYshH36zG9W8q7C+udNGVN9yqqtN1ccyz512ms5TV7mcMmfzdoVRAuMlfYh2xc5txp4jxvtRyut8HEvgibsIkFc097TS7SW/p3LaDA5UsUJ/Yfx5lWF5AVlOJtT8r/h8NAETMAETMAETMAETMAETGI+Anajj1YlzZAK3IcDqbIwK/OUCxk+CDZ6f6ZR28skAg8Frz+vTPqfY5wz5Vh6XYjzz9+r0m5JL+dlzjfbbsw3Db3ajGg7lnkz21M8Mz2osnMlwvJWr5gSMzvy5nWwl6efkQIUE7ci7390m9hDAIViSV/fEO/qze/pNrwWQ4q7j6MzS/Cnf7JzFEd/ilEZuHn3HbVpefzcBEzABEzABEzABEzCBpxHwb6I+rcZdXhM4iQDGTYyaS86y6GzDmE7AmKDPJ2V1yGRkiFnKHPxwVI8SSo7fq/M3465IOdWuZrc1/dmdwFvLvfU5+jJ/r110/94azVTPYXTGAI/BGeeFwxwERqkr5r4oQ8xBz7kcmUAvh+DIZUzztkfWYNFPzyBHZM84r4iLcrDI0cEETMAETMAETODZBLCP8edgAiZwDwLeiXqPenQpTOAyAggFuRXUGDcxtpacKTyHkUFOVhlPtCIeR+pdDVoYrfgtTUKOnSoTJuyi5HW+BLHic9y9BSvx49pRQc5tvbI2psO1lpX38dktn2k/f/zx73cmcGHnY66tkS9Y0Ra5h8BR57ekfcYzOedArnxn5GVrGjjHqBv+YnvdGt8TnoMTY+ATdqSqPhm7+Ht7e9MpHwclMMLbDxj7/creQRvIxNl64mt8qa6crFFTja/FLzYjlFghr1n2KdHxeRMwARMwARN4BgFsfeguLP68q23zGTXpUprAi8B//Wn0/j/DMAET6E8ARxnOmjOcW/1zXxfjSyD47f1mDCoqq3ZHbhEUSnHW5Wj8u1JnY+Q2cu5jvezJJ85MOU32xJNzuOQM/PDOOX17lWdPGVqfhd2WPtWazhH3Mx5uNdYekZ/R43ySE5W6mLE/jt6GeuZvhHmKNsKCIo8jPWvWcUFg5rl1Tw2m8mhtXDlZq/bZp90HY/6WFpKZ59NahctrAiZgAibwNALIAiyumm1R/NPqyeU1gTUCfp3vGiFfN4GNBDD0MVneOWjXKGVkFyLOU5wlGAv+/vefNxWd1VoYFAh35IcDUeUbwTBdW0k9XolLeXECytlem3buPoyeaaDPyYGva6SV2+3Lud6volOaRx1fuxTHeX1zbTlxftjxUUvrZdDPtdn6GOa782nlnamGrpynGDuQAxjXkTc8jszUcubJ61Z5dZ4S5nO6RcZG9rIBMM8zdxYZFLmXcTSVW1/O+1+/v5km97zPmYAJmIAJmIAJzE9A9q/UVjV/yVwCE3gWAb+H51n17dKeRADD35N2EmEIYNctr6jFGL7XwHL312BRPrE6qUnuSob2vLSKviZy2oiEx5r71+6hveXyxDnyW+OU4R4MW2e+hnitXGvX5UidaUcqDngZD6k3O0KWaxlGDiYwCgEcLXotN3nKjbssDOo9p3n3+igt4N75YG6qkRfuRAEZacsrsb1j8vXWBHbEt+o5yL/8iT2O+6e1uzv1IZfFBEzABEzABFoJIDug3+BItRzQSs/3m8AYBPw63zHqwbkwgSkJYFzt6RhLIRwdf5qev+cJIOjlDOf5u/NnlxYVYFQi1BiUZIAq5QeDaIuDcS2+fGmuOYvDl4BDg4AgTv75bdgj++F7Yp3+9WhLnbIybDRPNVS7bQzbJKsz1mPX6kxjcjUY3zgsgSXZZNhM78gYcvWWhWOtstWOLA79qBZ3mMfQ1eTMmYAJmIAJmMCwBCRL9NCbhi2kM2YCNyVgJ+pNK9bFMgETMIEeBHo5NnJCIsZy/cZdjUGqxfhXszNKAuxeTuRduweP3mUZOUYePRxvRztkY373Mr/z8z3qcjY+9EUWB5QWR8xWnifnl/Fw6+pqjxFPbjnHl522GccYvhO0S1A5oB3qvM7d4bhVnoNTy+K0O7AqlQE5ST9l8sS5usTF503ABEzABEzABOoJyA5lWaKeme80gREI+J1xI9SC82ACCwRQ2Ak1u/QWovGlDgSeVBfRUNQB3fedD//93399d5ymDpNo2Myl12pcx5nJH4Jp7jWTElxzabWeI+8ywpKWDGyt8dTczw4S2LELVWlSVzijOW4dJyIP0tDunF5tvrX+aljc9R7aLU75WXYX96iHoxcf9Mij46gjwHjIGNjqTI1jUF1KvssE6ghEJ2B0JOLs500O2pmJfKLX3PLMncZg+teanJWjGdnlrj/tHDIWTGCpt4I8jYHLOy+BXjL9vASccxMwARMYg4B+FkA6sL6PkTvnwgRMoETAO1FLZHzeBAYhIMNi3IE2SNYekw0cQBhLJOTIwXRHAHLIqaxnlvHr16/Z5MjTXsckRi/tjlKfyia246T66BkOwyNWLaZcKA+B8mzdhZLGuQPv4x59kvH67e3tcfX7lALHsTdXZsZ3Oa5y133OBPYSSOdL5jQcplp0lBt/7jL+ymmyVYYqyWV766TH85RNddgjvpY4SJvFa7lFei3x+F4TOJMAi0i2yvNn5tNpmYAJmMBTCMhWgtypN5tRdj5HWfUpPFxOExidgHeijl5Dzt+jCaCky5mllfJ3Whk/Q+VKsIl5xeB7ZyVUbS6W+crP8N4b4u6oLbsxlD4OdAK7V6JjnXPqowi8RwfqiPTlGO6RHisgiVN8KA8CPd/pB1tWSBKfwzYCUZHaFsMcT8nIP0dunctWAnHspU3zJznmjAUnrfn1/fcjwHzJnxbAqf2ppJzHIXa3gMOEoDl9S/mudFSu5RfHsOp07d7e1187Un/uHa3jM4HDCDAePEWuPAyiIzYBEzCBzgSwr+RsLMhf2JsIVy0Y61xUR2cCtyBwvKX3FphcCBO4hkDqPMKpgdGxp+PkmpKVU0VgwJiVEybKTx1zJedAJaXUAHdM6tfEipDGro0rHKk5Yx11sMcAmFLcG5faZhRmIys5UtN0j/gu50RPIyKLA+LrDsWLMkbnxxHlcZwfCbDD5QkhneeeUOYnlpGxROPJmePkE1m7zJ8JINfEeTvewfkvX+7lEENXUH+LZb3TZ+oUR6reAnKnsrksJtCTAPoV4wH2AwcTMAETMIHxCbxkU7trxq8p5/BpBP7ytAK7vCYwEwGUHYwD7AZTQAnCaIBCdMcwikEdR1J0jok1Rps7O1Ep5yjOG4yAuTpQXVxxHC0/MOg9HpTatxZxtHD3qvcWWh/v1erTj2fv9e0Jhv571ZhLYwLzEUCGHmFh3lnk0A+2LlRAxuWPxVm8yrfkeD6rLEvpUKfU7RbZZCleXzOBuxHQTvuR+/PdmLs8JmACJmACJmAC9yPgpQ33q1OX6EYEtAIJpwbG5mhwRiG628p5rZQtOXHOqtq4Ey+m+RRD3FVKNk4jpb3HCBjr7IjP9MOr22harp67MTTe5HaxyDBbW347UdOaqv8+Yjurz/36nSP38fXc+w4TMIFRCeAEZO7Rq/UlV4ya3175YkxFFtgaZpRxWWxKme8+X26tUz9nAhDgpzUYFx1MwARMwARMwARMwAS2E7ATdTs7P2kCpxLAaSHHBYaSO+5SejmGv3wv56mA/5MYbHPOI4xLNb+DakPO9lqDHYp+/F3O7bEd9ySOxBHz2ergXCJEWy8ZZElHjlaNSUtx+do2AoxDW3+LdluK5z1Valvn5cApmYAJ3JHAU1/tivwkGWBrvc646AkHOTtmmSstf2+teT/3BAIz9u8n1IvLaAImYAImYAImMA8Bv853nrpyTk3gOwGMBiXnBbsoZwwY1XFM1TgqjywfbHGYpgGHBgaapUAZMGLNWgcqG+W4IsCY1+XmnNhX5GcpzVHzSft7/Y7s/jqkL/BKv1ygjZMWfWKpvaz1mVzcPveDAO3stTN+f33+iPXaT7TPPbulrs29UzcBExiVAPNVSTYeNc898iXZc29co/yUw5ZyPOl1zVv4+JlnE2BcfOLY+Oxad+lNYJ2A9fR1Rr7DBEzABCKB//rTCPp/8YQ/m4AJzE0Agzuvt8IBckVAGMMZqqBXqq3lByPQ2j2K8+gjeSkZ+THSlfL5cnb86/2VSbMadJbKfjT3vfHj/MZIoFf48fu6Mzhk95a79HyvHTm1bSJND2fZiL8hW+I1+vmlsWf0vCt/bhMi4aMJmEAvArVvCumV3mjxSPbcky9e9Tmr3Lqn3H7WBEzABEzABJ5KAPnh6g0MT2XvcpuACcxJwE7UOevNuTaBIgGcmPydLRAp3SWnlZxcM6yGzTmO1oxMCKKEJfbEy2uLcS6PxoE6ZHfhLEFOJfJdYvn29jZLcbrlk36mftjLuNzSNkiT9m0HarcqfY9obfzpm1r/2HJjav9UHKMJmMCTCMw+Lu6tqx7jai85YW9Z/LwJmIAJmIAJmMB5BLCTpIugz0vdKZmACZjAfASu2ao2Hyfn2ASmIYAzCYcHO37OWlWe7i7CIEPQ76/oNy5x7Mi5U3J6jQKa3aY46eKO1DWeS85TyhV3C2D4uyJEp2JaTzM5vci7dgSX2hLGxScG+hhtl99NZizQKlN4cK7Ea4mVnqlxssd+vhSnr7URoH/yukW1+7anr7mbNqf8sjPcwQRMwAR6EbDh76efeoyra7Jrr/q6SzzMa+JudnepVZfDBEzABJ5FQHaSpcXozyLi0pqACZjAOgE7UdcZ+Q4TmI4ADg+cHWf8xqh2X2LM4jWqMpin0KKjdRZhjbLIGaVXxKblavkuB3LLM73vjY5h5UfH3mkdGZ8c9Etp4DB8asDAh3GPsYD+Fp3nfN9i+GtxpD6V+9Hlpk2Xxtij094av5T0GceZrWX2cyZgAscSsAP1p/e5vce4Ghe7HFtr94od9uhAV/6Eyr2IujQmYAImYAJnE2AuO3Pzxdnlc3omYAL3IiDb0lU2Mb/O917tyaUxge8EtOuRHXtHKfhxAONz3LWpjMRXrXHP1p1wim/mI84r7eSLXK4oU3RqX5H+3jS/fv26GEWpPS4+dLOLWtiw1i9biz1722kt70j3Xz1utLJwP2wl5vtNwATWCLAY7CrFeS1vZ16Pi6P2pDvbvLKnrD2flZ5FnOhaWxan9cyP4zIBEzABEzCBWgLRLrVmV6mN0/eZgAmYwFEEsCuxUUQLSK9aUPuXowroeE3ABK4lgDKPUv9aKf3b+4r1I3KEIQshLHXUvAwKv354pTD3ajfbEXkZPU7KjvHv6kB9sUt51sCEuRRw8qXtcen+u17DYV/iwKthaQdbAq+1xujqcD6Bmfvt+bScogmYwN0IMP/bgfr6eYhedet5ZRtJ6Vk8rV2p22LyUyZgAiZgAiZwDQHr9Ndwd6omYAJ1BHCeyr4rBypPYuvcas+sSzl/l1/nm+fisyZwCwIo+No1pkGm165U4uX3+RR/BHbVqpCYh1E/Y/wbwZEaJ6BRWeXyhaC/5Ihnkj3zt11ZLMCrhfnT66zJw++//7/N+SBOwtF1xJigPOdYL53DkYrh9eg8LuXhidfgTfuaxYmg3417Yl25zCZgAn0JMDcuzf99Uxs3NuaAnnNvz7jGpXZMzqKeBUd2p3LOwQRMwARMwARGJoA8hS6PPc/BBEzABEYkgJMUm2UpaHMQtsmzgp2oZ5F2OiZwEQENKDiWXgr+bz/Jycmgs8UghQEHoevf//6xnZ7i+ZVgdZV8hQMEZzdBzr66nM5119oku1aauBJzzRH72mmdN5RRv1++/PyulLQ6U2Mfyi1QWCtD63V2qmo8aH0WQ2Gv1wm2pv3k+2f5XdTehv4n17nLbgJPJsB8i/xq59SrFRyxOGWmxTkj9AXkM+lXOq7JjSPk23kwARMwARMwARHQ/KXvPpqACZjAKATWbKFX/byLnaijtBDnwwQOJICAFJV7VnPEFR2tjtT4LnKyjeOHVWxXOAcPxHarqO+ya5B2jCM4tlmMf2mb3FJ5qSIR+0waHzu610J0puL4wslL3kt1kTozyQ/3x766luaW68RPntLy18SF8FJ6ZXDN876nnYDqSwsiRh13yRdt+uj2207QT5jAOARwEGpeIFfeFfi5bphvPc+8uCBHHNFGWPDF4i+HOgLIh1HvQX5CjqIvO5iACZiACZiACZiACZiACWwngFxdCtiYrrKBWdIv1YrPm8BDCMjAHZ1SS0VnRYgMOKnTZ+k5X7uWgOrs2lz0SV0TKs7T1p2epRzQlmsDiwZaJm3u5S/2MeWdsnA+Xov50Hn103it52cMgvzJoF/roKNcdpT1rIm6uOTgf7XFcQ3ftF/auPJbVzrfZQLPIhAXsDA32GH4o/6Zk15z6Os19z+uPPMTY+oR8oCdf/XtiT5KYPGe5rj6p32nCZiACZiACZiACZiACZjAFgLYv2Qj3fL83mfsRN1L0M+bwCQElnaMySCzNBjFV6XaeTpJpf8nmzi+7xRwyvC7U70cw1dMxC+jcJ3zi37Jb5eeYViHacoVIzZ5KI0PnLej7PweRr1E58v5OahL0Q7UOk6+65kE4nhrB+rnNqB5p+btD5+fvt8ZZPEjAjKGwzoB+ijyG0F9V0fOuZ1CwcEETMAETMAETMAETMAEthOI8rViGcH+ZY1JteGjCdycAEr/FkdqfBd5dJ5qJbaMCTfHN23xqKe7OTFyE2rvChptV8Za/+1d/hgfvPljsQUO5/gKO92HE9XhXAKvevlh0D03dadmAibQiwDzNK9814K2XvHOHo8W8FAOy5qv2jzKiWq+db0l/T3aVB41xzqOvssETMAETMAETMAETMAEcgTka0ivjWCjtRM1rRV/N4EbE0C5X3r1JgY8OUM4yjiAIYsBi3PaAci5X3755ca05i4aE0+P3wmdm8L23B9lqNyeo5cRean/7om79lkc8vzR/9lxIYOhxoraeHxfHwLsTmZxjOqhT6x9Y6GtuH30ZerY7kXAc/Xn+mTc0C7Uz1d9pjcBZMaR55He5d0T39J8huzodruHrp81ARMwARMwARMwARN4MgF+sm3UYCfqqDXjfJnAAQQwkqztdMjtWsRgkBoNtr6yygaGAyo2iVKO7uS0vzYQSNt7w6OH3irj3Fo/PjQTf0YOHxx47EwdYUXY0eUdOf7RDd+0j1H708j16rw9h4D7x8e6jm89+XjF345qKzjyj1wYeRfZHxlsqQ6QzSSnubWagAmYgAmYgAmYgAmYwN0IINfzR0j1B3wO2Am/fv26udja2JVGMILd8S9ppvzdBEzgngQ0mPUoHQauFsM9aSsw2OLkcziOABMZdeSwjYAEgtLTpUm9dH/v8xjoEEpwYF4dWHRxtUP3agZXpx/H16vzkkv/6v6Sy5PPmYAJmMBsBI4c63EMHhU/8d5FTqj57dijOM7WXp1fEzABEzABEzABEzCBexDgZ/74w5aPXP/SHdhY8cO2jwyMA5WwVR7mudKCxRo5/Gja3ol6NGHHbwIXE2AQ6vmquNYdAnEgBQXPjzD4XVwthyYPczOuR4wjkFVN2j2wZuwrTer1Kfa58+eff35/xfYo+elTKsfSSoDXnXz58nPrY6fd7/Z5GmonZAK3IMBCJs3HtyhQp0Lwu7lHhqPmkqPzfSSTNO6aBaRHcUzz4u8mYAImYAImYAImYAIm0JNAq/8AWw/PIO9HOyrfa+TmNO/4LnKBn3rZEl8urj3nvBN1Dz0/awITELjSgQoeBjp+s48gB+wIg997hm76DwOOVgDdtIjdi/VaTcWqpzoj5dvb2/dXWHTPTEOE7DoeYUdqLsvkyzuic2T6nsu9gr1vCttjW9vVvT1mP2kCJnBXAijjHjs+1i6ySTRMfLw69rer6hJmrJhHXuPYK6zJNczJtbJkrzw5HhMwARMwARMwARMwARPYQ+C10/S34k7QUtz4HFI9pXVTD/rC0s/SjbLA1jtRS63A503gJgR67QKSA3QLFpyme96JviXNpz7D5DOyU2Xkeml1PEtQuHpCH3FHqsYLGxLPafH0+6vboUpKnbOQg9f49pp/FLePJmACzyAw0pg2AnHG1KPDUa9ev2IeYB6KMh1yMeVLf7dpC1PmWgxD1ElJ3saY1COtLfnzMyZgAiZgAiZgAiZgAibQQgAHakmuXYsnlfVbd40uOU+VdqtTVs/1Pnonam+ijs8EBiKAEWpLeA16X74/KofI9xP+MCQBjEZy7A2ZwRtmapTJPBVcrkZNO2T8YQEF44nDsQSOMn5vyTV1jmPfBuQt9PyMCZiACVxDgJ81OCKcLQMge0QHqsqEnLRVL1IcOv6Y515v2tF5HUkr/kaUzvtoAiZgAiZgAiZgAiZgAiMR2ONAzZXj73+v/6mpGgdqLo2rztmJehV5p2sCJxDYYizA2IHxmz+cp7yKd5QdTicgmzqJM3YqTA3ogMxjSHPIE8CR2vMVevlUfBYCW1cNmp4JmIAJjEZAcuho+boyP0c5OGOZ/va3/4lfu31uMaT0SHRJ9+m90BAZUD9Zkua9p9M2jdvfTcAETMAETMAETMAETKAHgZ62JHwItTZSbIW1m0FGsXXbidqjxTkOE7iYADsQ+UtD7YAUn4vGDpyntQNgjOPJn+00ek7tn727YkayCGRbxqEZy3p1njX2lOaDs/O3ZMg+Oy9OzwRMYB4CUQ6dJ9fH5vSMt14cJe8T71m/3c68syZz9N4hSvkwGOXCGfWWS9fnTMAETMAETMAETMAETGCNQM6PsPbM0vVa2RfbVYvztuXepfztvTb9FhoqPL6yB6M2q3V5lZyDCTyJAP1A7X/rinWeP8qI8pS6YHDv9btLrcxGeqVna959/z4C/OZwqyCyL0U/PRoBCZY6sjvG4/loteT8mIAJLBHA2eZxa4nQMdeOXhR2tF6OPYDfIV1zoEKPe97e3t4dn73etEM86S5X61THtFXHagImYAImYAImYAIm0IdA7x2exPfly7I/bovd8qwFmWtUp96JmjpQKSyKEQZE7chYA+DrJnAHAhicGFTU/lHkU2W+ppy9jAk1ad31Hjmye6/oqeFVYzyqicf31BEYrb+8focSx5l/g7SuBu93lxyolAyD8lWB3UBb5qCr8ut0TcAErifA3HW0s+36Um7LwR9/fH7bzLaY7vkUelDrAlLmKJypR701wTuq79nWXCoTMAETMAETMAETuAMBbNbRftSjTGvxbXGgjqQjTutEzTlQY4VTcWtODCpv7ZU+RylWMa/+bAI9COz9LSMGptGcQj24nB0HDDECnr2TYm0sO5vDE9KrfVXFmSxod6/fNP71fZdFzqHKuVFWcp3J5mlpsajiigVldqA+raW5vCbQhwBjFrIMf9a/PjI9+k0jd5D/kb23yDY4U3vOlchYLb8H9bGm/c0ETMAETMAETMAETMAEjiXw8of9dkgi6HE5fxxprjlZ0wwhV2PfHCVM9zpfKuNVIf/6xDBVnNhG/PvvPxVXNZcqj8rmWRTW1lWtnzLlEyZwEgGcJyjttbt/GIxi+46fT8ryVMkw7tQYmWruOaLg3oV6BNVynPSfsx3l5dx8vkLe+FN7pP0yNjBPYmjsaTD8nLrPjEIAOYcFNme21REXF4xSH86HCZjAMgFkGWRZzV3Ldz/nKuN4SW/tQeEuvJFv0N9bZWLY8uyegFwIx7uw3MPCz5qACZiACZiACZiACYxJYIszs6UksjvG1/oenWZL/vbcO5UTVUbgtMAYhfcYCXGaYmCU8/RIJTXNu7+bQE8CKO4YsOPvBMf46Ss4S7nnTKN6zMNsn+O4M6phhDw6nEtg1LZQoqCxwf2+ROi+55d+l0IrBN0u7lv/LpkJzETAv+Wcr62jx2jpwvnU5zrLa3RLetBSSZCl98h2I62SXyqnr5mACZiACZiACZiACTyTAPLuGT6vuDgRPWNrmiyMHElPmcaJCrTcDrstynZ0itBtULRwLuUqlQrbq1Q9s2u61FcRwNDy9evXq5K/VbpaLTP6rojc2HirinBhuhA42gjbJZOOpDsByTbanRPfQqBrW2SpUkav/C3WUp583gRMYA4C/Pan56rz62ppsc35udmXIu2n5c08Su3oVyYrHR9NwARMwARMwARMwARM4AoC+LfOCNHxudU+tHfD5BHlnMaJmoO+9XWKrDLlTw4SwMqQmIOMg8I793JkfM4E7kuAyQWDyugOacYxh/MJzL64xsbC89vMlSlGGee1mu/jTyKwmKyXIxX5qvVVileycdomYALjEJh9bh2HZFtO7iYTMA/RllrmIubJuGq+jaDvNgETMAETMAETMAETMIGxCbTIxntKgg9PPxnYmubIm5j+sgfKWc/iJMhBR0HaE1oUJQyM5OPbt297kvSzJmACgxNgxQyB8WWGV3NF58jgaG+VPeYktZXZCka+c3PqbOVwfvsSQM7B6Lwn0La8M34PQT9rAs8mMPPcenTNYVB4atgib8lw08Js7xzYkpbvNQETMAETMAETMAETMIGzCJy5AQedDlt1q72ahf17fX1H8hx+JypKUwn6XrCtClkpH0dWkOM2ARM4jwCLJDC6xB/Ark2d8eTsV9DZ2FNbO8fcN+trB3lt31LQyq+3t7el23zthgTkAN0iXzEG4oh1MAETMIE9BFi5PMMitj1l3PIs4zJvRoKPPvcac69cWMXcgTxF0JufOIeswg5Z5a31bQl/+9v/FG0IW/j7GRMwARMwARMwARMwAROYkQCy9ag+Ld4yi26zxQbVoy6wq6Nz6M080j14nTD+AeknpDW8E7Vk7KUwe4MUttZ4AHxV5bbm1febgAm0EdDA2fbUT+/Gnn/849+nGv7sRG2tpb73zzoXrLVxzW8IMxIg+pJzbCMTwJEqZ6oc6jX57WXMr0nL95iACdyXAPMOiv7ZC9NmIAqT6GBmjNZ4vTf/ZzInLfRw5JFag06rcx1WrXKM5J+9LP28CZiACZiACZiACZiACVxNAJl7ZDsNsnrUbc7khT2Xv5LNM+oososN/zrfmOkIs+VVvPG5+HnNkBzvjZ9RVtmhYwdGpOLPJjA/AVaZlAbQmtLx7JmvSNjyqrKacvieOgIy9NbdPc5dS+0GIcbBBLYQYJeQgwmYgAn0IFBaRNsj7jvFgdNvbWEx11H818LWxcVr8cbr6M7o0Bhz0KdLen58Rp+RuVp/VmdJ3lG8Oq5x1H0+moAJmIAJmIAJmIAJmMDoBEZ3oCJ7H+VAReco2eZfXL696yK19n/0Fp4b2olaclL2UnJKTlQMgTXKpp2pow8Zzp8JtBFoMeaUYiYOBtczQmkMOyNtp/EiMKOhl1fclYIMjr3aME5Z5tOaObWUJ5+/jkBJDsvliF0/ruccGZ8zARNoJXCmLNWat9HuZ2Hx2gIonK1fv35dvO8omRJ5AiMGDlB05z0BQ0fLvLQk76T56LFAO43T303ABEzABEzABEzABEzgbALI3yPvQIVHi5xey+9V7pfOkdNtXjrJb5s2T/FWnKFf51tStI4ArQrBQYshEDi1gXzyh/HQrwGqpeb7TGA8AvR/Ge4YB1oCxhccUBGXpeYAAEAASURBVIwFra8ca0kn3lu7aiY+4899CeQm5r4p9I9tabcJ7Z+/XoE5UfNiaU7vlZbj6U+AMQZBs9a47DruXweO0QSeSgDFH+fg3/+Ok7BNJnsaM+bZJZkQgwKy6dI9veUZnJ1HzAnEGX+baKmuc+1G+jpMtBBOC8iW4vI1EzABEzABEzABEzABExidwAwO1CMYruke2LX22DrRo4bVSEurTFGmcwrRUgXQgNJniD+nSOKgZaVs7tpSGlxDqeNPytna/UvXc3leut/XTMAE9hOQowAnUzpm1MQuhxH91+EZBLbMFVeTKc2vR+QLQ6fD3AQQNJGN1sZEj3tz17NzbwIjEmCO3SqTjVieo/KE/FnSbXGO/vOfv60mLXlGYzkOxpqxP42YfBzhPI3p5FbWl/RvbAcqG3FoYRdz2pcvP8do/dkETMAETMAETMAETMAEpibQsinwqoLyBtg1+1Jt3tBdcotF4yLJvQ5U5WVY62bJyCvFRwVYO+q3U9L3LOeUO5SvHPi1NNLrcqbG1w7nVvdGhS7eS3wYLVH60nynaamxrN2XPufvJmACeQI4UmVAyt9RPstzL6PM8UPr1jyWc+8rWwmo3rc+f/Zzce45Mu100VNqyDwybcfdlwAGa14F6WACJmACZxIoOcbOzMMsabFjN+dcbJnz+b3SGNBHl+oA+QdnK3ouhgqOLenFtPZ+xnawZidI9e29afp5EzABEzABEzABEzABExiFQGlR5Sj5Ix/oFlscqJQNXYM/ZH7J/egiOf2D+3CeEvbsQH2P4D//jrf0x9QqPy9VesuulhgPztTohU6zgnG3t+LXUkm5e2kEpdfoobTK4UveHUzABPoRaB3QGWtYPIFx5qxV7UuvZO1HwjHVEJhtl8xZzkwJNWKIgRcBJzff6R4fxyWAHBWFVXKKLEL7Rzajbh1MwARMoBeBJeddrzTuFA+yK3Jo7zkW+RYdWW9r0bgf9Ww45owXR/GlnOSHPJA3/koB2UM685E/CVRK3+dNwARMwARMwARMwARM4AwCyMYjh636XfrGWPQOypraHGPZuae3fjKsEzUWPH5ucW7E3aY18HornTHfWz+Tp/gqpeg83Rqnn5uDAHXd0t7nKNX9chlfC7BkxOld8pYFJb3Tdnw/COCQXJq4f9w5zify21uYSEuXE44Yz1hkMOJcm+bf3z8TkBylBSMsTIty1ucnfMYETMAEthHIzSHbYnrWU0fJoczbxM24f/UcHttGjfyF7OE3Nj2rH7i0JmACJmACJmACJvA0AukCx9HKH2X42rxRppLNSfap2rh63DecExXHUcm427LjknhaQinNljiOupdXM/G+aK2iTdNZ2mGb3uvvcxCQY27LIDNHCe+TSxY5YFgaeQy5D+3xSsIOh9nC0Q54doiUDJujr4ybrS6vyu/VRvSryu10TcAEziFw9Dx1TinOT+VIWZS4j4w/R0u6P+lq92nuPp8zARMwARMwARMwARMwgdEI4JvijV34bUo2stHyfER+tvg2YFdyoB6Rx5o4D3WiYizFuRCNbdq1kzae3L25Auh9xlzTa4XS++SASs/P/D33Gzczl8d5XyZA28Y559cjLnMa4apWuC+tkDkin36d7xFU2+LEoDfjbvEr84xhHG5RLmij7rtNwARMwATuTmC21+SPUB+tC4hHyPNaHjA4lfT9tWd93QRMwARMwARMwARMwASuICDnabR7YTPGF4ZN7Aib3KiLULc4UKmzEf0hhzhRl5yYudfppO82LjXwuAKWSsiFpbRz99/h3Ai/78IAccQgcIf62VoGeJ71+5pb89jyHG1Ev53Hc3drL5oMW5j4XhO4I4Gl1wlqXPPu7TvWvMtkAiZgAn0IyMjQJ7Y5Y2llwBuLHEzABEzABEzABEzABEzABK4jUPJLpT6tuLkQuf8o5+p1JH5630ARy9mSlyW7Yks8Pe/t7kSl4qOnfS2z3N/6aqCcF5t4tsS1lr8Zrl/tjMIJTsg5yGfg5zweT4C+mW7D1670O00UZ/bFUVcZHd+anMIdCCBItc79dyi3y2ACJmACJrBO4Kr5AXl1FLmUvOSMB5xLd2iyUPEqZmlt6hW8nI8/OcPnKLsiM2uBJWXib5QypGXydxMwARMwARMwARMwARNYI1C7SRD7OHIxG42iLyvn71pLU9eRrXnrG2EEuRqdYM8bZUbUCw5xoqoCOQINpSlVnFCaWl9RS1z8/lzqqMg5aGIe7v6ZTgrfPY1zKyMp7VFh3hqXn7snAdpI6kClpAyIcVBMx4q0n9+TzvZSmc92dk9/kj55dcCJGoXFq/Pj9E3ABEzABMYjwHylt5gcLfdEffKXX379pG+20CGuvc7YuDg15o18oPfFAKOrwxajD3Ua61X1TVn28ruah9M3ARMwARMwARMwARM4lwAyMw7ErUF+lSh7y98RfVvIr+w4VeA55Nho49a10jHnE8N2Tto531cpnnhe+de5t7c3fTz9SBnuFj5qYB1Kh2FUoKJSlEbdquzRaKMyqfhGMAYrL1cd5YxioMgxOiNfqTJ/RppOYw4Cta8XUztWqVhBo1dVM7kwBmydSBTnnY4e+66tTdpnKqBcm6P61Fvn3/qYX3fWzkP055zg2Jqe7zcBEzABE7gfgaj0M+ce/RMXGCwU+A2eLemlr+/qJSugX+NUJF+5Nz7FvKsMZx63OFBz+Uudqrl7fM4ETMAETMAETMAETMAEIoHo9IznWz/j20DujhuB5BjVMRcnz+1x3sY4SQc7WS89IsZ91md0gyWf4Fo+rtZtSvk7xIlaSiyebwVCI+IZFEicMmqgS404pveEz6+O9u1URxOdgs5BvTiYQEqg9lUGPKedqDhO08H269evadSP/z7ij2w/qVJmdaBSRzLGMpdeOYfSzxEMcwbhJ7Ull9UETMAETGCZQC+jRCmVdOU481LrPI+ems5nW+Ip5ZE5E8duLl9XzOXM3zmZvZR/nzcBEzABEzABEzABEzCBngSQv6PDc2/cxMdfa+CZ3vI4esQWWZu8XPlGF3QEbI57wpY62JNe7bOXeb7YqZKu1l3LdOwYvRvnWtqzXIdLz117arhLHWDp2izcnM/+BOjfS/1UTlOt9OmfA8doAscQYOHI7AFjLPNwy0KHmjK3skEoTI3ONen4HhMwARMwARPoRSC3MA05tsVwcbSjt1TWK95Mggyfc+aW8ujzJmACJmACJmACJmACJtCTQKtPqSbtJRv20vNbn0vjxAGpgK083WCka/hq0D2kf/CWN944x/leeVFaLce9OgJ6DXpZqQzEr00hV7zV7jInKpWA8kWjiM7RlsrxvWUCNLge279ZvUA8V65iKJfSV0YlkE5mcphijCKUJoJRyzNivux8uqZWNGlfk3rfVNOdNz1ib11U89pZ86UoJPXIk+MwARMwgacR0C7BK5TLI1iXFOkeaTEX5hbzcA7DRO0r6mXE6JGnpTjIr+RoDCVX6NH66Z6lfPraMgHqkaC6XL7bV03ABEzABEzABEzABEQAGTgnv+v6rMfcAk5kRhyL6BolnWgUnW+vjoBc/O3bP7PV98svv36XmyVHZ2888OQnJyoZwXvdagjdmkd5kK9+reDW/I/+nAaVrauFpdjRYbf8NtDofJy//gTSnW3sTDtrPOlfmnFjpG9iJFUfHzen98rZndpybufNntpq3YWqtI7YEau4fTQBEzCBpxJgjLecUK59dN5e+mfp7StxNXk5J21XyDOyyJUrzclDrXO5pnSxLrQAQDpozfMz3kP5aDd//PH67a0Zy+A8m4AJmIAJmIAJmMDZBJAbr1hEeHQ52bAh+Rc5/0pZf0tZsQcq/1ue5xnKnAvoBzFu/JZXhA9OVO0ew7ubC3Kw9t6VCAh2pJY86rm8+Fw9AZwsNU5U1W/qJKAjE0duRUR9LnznEwhEByrthlUocaB7AoMzy+jdqGfSfqWVjo/n52BfinGcp/1obtD8vzX2vTt07UjdSt7PmYAJmMBnAndbYFXSTT+XvO4Mc2HNiu0a3TTKvmnqzLM9g5y1NfnqmW4aF+lj5OglE2EIUZlou/x9/fo1TfZ235HB3t7e3ncWSB67XSFdIBMwARMwARMwARPoSIDFfHcNe+1yV3HZaw8k3+hnJed4qlOVnK1Hl/+DE1WJochExwcFYTWzFPLeSg3xK27lwce+BOiIS8pZ7Kipk1wObu9G7Vsnd4tNq2TsPD2vZhmn4Y3hiSOB/qrgcVUk+hyP2FHSJ2d1saRG42j8ZH5AMNmyK4e2F9tdXW58lwmYgAmYgAmsE0hXHq8/sX5Hi/GFuTPqxTH2JQcqc2PuuTWdLMYfP4+mL/d0oiKPpEaTJe6Ry+yfaSeS15d09dnL6fybgAmYgAmYgAmYwF4CyNFaeLc3rtGep1yzlm3vG2pSW2WsG+mC3BN9k/Gesz7/FeUvLayUGJxpaQZzRmQpkNGQyruaUYiikTZXqCVQuft9bhsBlDOM3KX6kNImJS6mYuN4pOHPSwTiO8qX7vO1fgTS8TuNOden03v8vY5Auvqp7qlx7sKYyys2ND+nOeM67YldEbWB+CQr1D5Tum9WgbFUHp83ARMwARPYRwDdUjrKvph+PN3L+IIOW5q3yHdOPtOiVeSJnIP1Ry4/fsJhKf3845XrvpV0yq05glmJ59Y4Z3gOPZtyI68jn+XazQzlcB5NwARMwARMwARM4EgCyN62bx5JeFvcPd4YtPSGIGRl+R235bDfU39FaM+tiC0pajkjMkpU6mjj3JpyZQdqv4qsiUl1WqoXjBTUY6rUc7+erUnH9zyTQKldPZPGGKVmvLaQ0a8u2Lky+yuqa/opjtGaMZ/7FF+P38xG+FoSnvrVpGMyARMwgXsR0EJW5HiNyy0LYu5Fo1yaLQp46U08pd/iiXNjzIkcqJxL3/oU70s/X+VApU3RlvhDZyfPNbJBmv/a7690/vX99hZG3x+a7ANcY8Auk1vgHu/xZxMwARMwARMwARN4GgH7j8asce0S3ZM7ZN9SQB85Uv8opVs6//7ex1ojO5lPHWxELGW9lEju/FUKYS4vTzpH44N9aZVrqS6pewcTuBsBBmvafKndz15exmv67hNX9h9Rd3DEkVoaP49I84o46Q/sLi292pc2dYQzmfaK8Zk5ym32ipp3miZgAqMT6P2TKqOXV06lHnPOFgdqCx+MCEs7TNll2BowGF1hOEjfLPOSJ//6YX4mXz3lZ+SOJ4XoVI/lVpu/u6wZy+zPJmACJmACJmACJlAiYP9Ricy157EL9nhj0JLtb+naFaX/ixLFkbrmTE13m+rZLUc6QSlQESiiuVcHl57x+XoCNEJWp6O8pStgS7H0rPtSGj5vAmcRoN2/2v+/3l+ddVa6V6TT08B1Rf5HS5Pxk7Zz94DBFAMeTk0F5mYMq5zn+hGB9uo2ewRZx2kCJjA7AcbgltB6f0vcZ97LvMtbCpZ0x7X87HGglpyfzFXSWZkbMSKU5kbkThkBuLd2nrvi7QyUqVSOlHNcOf5aANXuKFacpCndnzzUMtLza8danXctHl83ARMwARMwARMwARM4hwCy5hULCs8p3bypIKv3WPC3R7+7gl6TFbSnI02KZK7QpCNvNorr0r25532ujoAc5+lqYxox3FP2KLZc663U1uXWd5lAPwJXGKX65b4tJvrry7D14xVpbTH47pSAFhxpnkqv3+k77Ue7Q2qNqnvLbyF5L0E/bwImMCsBFNIees8ep+Go7JgbpIe06CJaNLe1XEv1UWs84JXABBYmtcylvdpDS9lz+j7cc3MzbLiGnMD11vKl+ZJcpWN6fet32gCyG/lraTtb06t5TmWUTBmfydVBvO7PJmACJmACJmACJnB3AnfUZ+5QZ70cqLDI6RcjM2pyosqQurdAa7t44u+uougsKa978+Lnf/oJxf7333/65DRN2cixylFBCqC++2gCoxN44kp0j6P9WyVGL8bCWgNq/xycF2OLwXdvrjDGOpiACZjAkwigiDJPv+bqfxd/G7rWsXJngwM6oRx3S6/4RdZj7pLzbG97kvN2azzIC6rnljio87P1YOQb0kXvr/kd1Gj86GEr6K1bUnfiL4fvmXLNUn2rrKkjtbavL8XtayZgAiZgAiZgAiYwK4G9iyBnLffo+WZzneTXvXmd0TZf7URF8euhcPx/9t5ux3LcSLjt6XHBBroHKF/U+7+ZXyAvXMC4ccbwNL4zK7eji8nUHyVKIqlFIHPvLVFkcJGighEkVTKYLYl7tPKefH0M3KhjZujGoJmBZj5wx2FAQ8fxGoNsjD4GCfRCAINQhJoPgEizxU/u0dTI1aKMPcpE/8jW6Plq/h7L0orMtNWpZ08r8imHBCQggTMIhC7Nu6jnwhbHylMMDjx/2VUk1+PSMQrjmnwcM8d27Tg6VNTRWtz8PDIhB2Os0rClzkvT3BJ/JJ2Rettbd1tYHY0ThqgYj5NeDWf0Ubm8XgISkIAEJCABCdxFINWL7pLBfD8SyMddH88+49dmJ+rcII7BOue2DE62OkVx1o48i7rFpoWhIV1RRR1QpxizYyAdhgjOffny63u9c35L3bdYZmV6JoFYSf20B0BNY+IzW858qTHktrRF3LykfZxhddGTttzuo1aUUgISOItA6NdrE0jWHCtPHDthYOEPHYfxaGpwCa616g2+6Vhpa7qxle+e8VLorFvzujtejQnXd5fhjvxxpIYz9Y78zVMCEpCABCQgAQm0QqDHFYqtsDtDDsZZjGP2jGWW5EkXOC3Fa+ncZidqusVuFICGHYNVBv5z2yoRj5nVWwazODbWjAiRv5/nE4gbJRzg1GUMkDmHg5VzDvzOrwtzqEOAvgyjlG22Dk9TeRGgL8TAHf2jXPYTgCFO6TAeh56xP0WvlIAEJNA2AcY+/O0NT3SgpqwYY24ZZ6bXlH7fmz7OXca3e0I8B/dc6zUSkIAEJCABCUhAAhLojUCPzrXeGG+RN19st+WaI3F6WPiz2Yk6ZxiOQjKwxFGaz9DFIBArGadgYigNp2ms5MFRx/aIBFejTFE75xj1MDezAIfTlCGb+ue4Dqlz6sRU6xOgL8v7qciFewCDVWq0mosb1/TyiRFvrwGwlzLeLefUM/BumXrNP30WTT17ei2XcktAAhKYIjA3Vkqdb3NjMdLz+T5Ftf6xdDLp1tSZYLW2inhrWkvxGDtveYfpUhqek4AEJCABCUhAAhKQwF0E0LXnxkV3yfTEfK/YuRGbH7Z37H2RH/Ufr49skftmJ+rUoDGcEVHIvIBrDlTiM6hkBSuDvjCahpGA6w3XEMD4wt/USqq0fqmnqB8ko864jvcChhP8GonNRQJ1CdDOpx7WU31f3ZyvSQ0nquFcAq9+9GMfeW6Oz0g9Jms9o7SWUgISeBKBtf7NSYpttYZ8HLRFunTctCV+Gge9YkuId7OT15QuuyWNo3FoywYJSEACEpCABCQgAQnsIYDt1YV0e8jVvSbGFXVTnU6NsW463mUsw+sj2UGyxbbw83Qxyo5SyLTgOD/ZVmpqEJcOsPj+AjT9TtUrZu2WlXT82DTS3HlNHYUDJj8Xjm/IUN/5+fGJWcIrCbweqt/f+5fa+bKKMA9MDKD9jxDSe3WE8rRahnj3Wavy9ShXPH96lF2ZJSABCUwRYAz07du3qVPVjr3GWV/eZ/Yyuzf+0rFYtcwGSWiNTbpTSStFTnVV9ORagfbyMqLoHK3F1HQkIAEJSEACEpCABD4T0IH6mckdR17jx/tt4FP2+Tt45HluJoNhGG/wUqDRU9C5WbNUBltjbr05cF4wMJxyxi7J4bljBKYMBOEcdaXVMbZevZ9AvJc3UmCiRs2tdvN+i/5qNMcjBjG3Ro0WdM4nfJk1NYrz/RxKZalOPZPKUjC2BCQggbYIxOSQXPfYK2Vs5RoTUNeeQU9/h2rOOcao6JpLddLa8yjfBejoRK7QfdOdidgxastM8GjTOVt/S0ACEpCABCQgAQlIYI7AVh/R3PUer0cAvf/ugP9paTx2p3ybVqIyQEuX104JTKNn4LZU0KgMBvbMvl5ygLxuounVrFP5e6weAZwA4TSNVNOBcTpAx9iQhjDepMf8LoGjBHIH6tH0tlxf04HK/YTB8u6w1o/fLd8o+ad95ChlurMc6fPnTjnMWwISkEAtAjjjGOuk4eXI++uuFaqMrdBb+FxzoJLn0ngtlekJ38OBSlmZBNVTyHXVo05exubRjoID7YlJeIZxCOR9zzglsyQSkIAEJCABCfRGoNVVh71xPCov+v6WceTRfNaub3kh5eJKVABuWVGDg6BmIWunt1ZBnv9MgPpMZyGH8yVfxZb/buGG+1waj/RMgP4gjEIYugg4Vc42dNWcEPAylv7rfXJCbvC6sm40mlxDm34x+sxrchw7F+71/FkzdoktnQQk8AQC+YQbdJtUjz7LcYVeZXgRSB2oW5hc6XzeU09H5GPS9FxApwlddi5O6Opz5z3eDgFWFuermNuRTkkkIAEJSEACEngCAX0/bdXy2Tb2LaVtYfHRkpyzTtStL5LFKL/Vgfr77//7wTgwJdgdK86m5PDYT+9bN6XtIDdk5407HFyyk0BNAjgdr3Y8YlhIDZlHyxOGpfg8mp7Xt0+AZ2PNNtR+ic+TUI7nsTVlCUjgHgJTzi4mi6Br0+ed+b7UPc65eyidm+uUA3XL84ax6hUTpbbUU6pr5OOyUnpruvbatr5TbbpUBuNLQAISkIAEJCABCYxNAP116VWQY5e+zdK1sgq19fHE5Ha+JQ6EkmXXOFsZeHLDTAUGf642mSJz37H0HTipYYGBfd643XLxvnoy53oEas3Mjn6Oz7hX7r5HmMgyFXhgUm4mTfB51uqXqbxHPZavMBq1nFeVyzZ5FWnzkYAEriIQukGaH3r30lgpjbvne6qT7Ll+hGtwnr50nq+firPFcXnFWHVqnPVJ2ORAafzk0s1fGQcuTZiFqaEfAmtO835KoqQSkIAEJCABCfRCAJ2V8c7UOKiXMowo5xUTREfg9mklKoOjrUr1ngEbA0/+YoUjg/nUUTcC1NHKQB2FA5X2wWq6KQMCx3ASbW0/o3GyPH0TiL6vRvuNfo2VJOG4xLhUI+0jlF9bdH95V1iivOm23aQd9zoPUfr4ufv9iBxeK4FSAqHUTT17StMyvgQkIIGWCdDP8cfkkej7asn71Ak+6DyMUWKl7xxP9J4t4ezVqCWvlEDn3Lor1JayLcXhnamUHd0wNX61oOMuye25jwScmPaRh78kIAEJSEACEjifwJU66/mlGScHJ0Jur8tPTlS26tkajgzYWMG6ti3QVjmMdy4BDC5fvvxoF+mgGaNEtBniMahmcL1mpDhXYlOXQDkBDEO1QkwMCUNTK8YlHKQl5QynL/czgXtcJ1atVmI6pQRwJtj+SqkZXwIS6JUA/V1tfRo9/Wlhqw5WMjmYuqnt4E7rJSa04ezKHZZpvBh7pcf2fC8xnqTlxhjGZMHQF/fk7TXXE3hiP3A9ZXOUgAQkIAEJSCAlULKTaXqd388jsHWcdJ4EH1PGx5T6nD6evf/X5Ha+W8Q6+t4VoISjYUt+xmmDQGxHSsNmYE89xrtuGVTHH4P6rbO52yiZUkigDoHoG2PVA4al3o1LGPP44/5mdS0PWspnkMDVBFw9cTVx85OABO4i8HrWfprvulucEifh7kwavHCrDlbqWAp974wi45xEz0odllP54Mw9amg4YjxBN9zKd0p+j91DgPG84/R72JurBCQgAQlI4IkEWGByVGd9Irczy3xkDHCmXC2n/cGJumScZDDHYJFPG3/LVXqubLEijcEXA3u2ZZ4ahHHuZax53oz3c2vA1FsmkBooWaE9ggN1ijflYkWrztQpOh47kwDPFh34ZxI2bQlIoAUC9HO1nVOlTsIWOFwpQ0wU3Zrna0Lw963Ri+OhZzHuPtvgVLudFRfUCy4nQFsv2TL6cgHNUAISkIAEJCCBYQjgQ3JHsbaqs1UHaul47Gqq79Obt8BjteFrsPj3q2U0v5sJpFtWxfZSYYjh99z2oByns/z9d2cp31yFZn8RgVGdpnP4orw4j49s7z6XvsclMEWAZ8trUte/pk57TAISkED3BM5wbGm8WG4WMC/VZRgbM9ZZWzG6nPPns1dtd+akpM/sn3AEB2qM6Z9QXssoAQlIQAISkMA9BJgQ6BjkHvZzubKA8oyx5lx+Jcdbd6L+zNaMS/AwVL69vRUPKksgGbd9AhgI0oDRgM6QwCdtZG5F6lL7StP0uwQk0CcB7nFWpWuM67P+epTa50qPtabMEpDAXQTO3Hr2rjKt5Rs6ydT4ZO7auGbu/NRxDEMxJpo6X3osdjV5jbWcLFTKz/jrBHSgrjMyhgQkIAEJSEACxwnwqj9DWwRih9G2pHpJg51vaZfcu2VefNFODOLuFtL87ycQK09TIwGd4Zcvv/4UnSKzt/mLBs81GAC2rHS+v4QfJaCcDjA/MvGXBJYIxKp0nhulKzmW0vWcBFICtC91k5SI3yUggREJ1Nxqk4mQ6ONPC7xWAd3k9czYptczcN/Dih2bao0bkNcgAQlIQAISkIAEJCABCUigJgEmjNYas9SUK00rdvhpcQXzpBMVB9L3727bm1bi079jUGBQH85UeMT3+AxGeUPHodLbqiE6FR2pUaN+SmA7Ae51jL8+Q376Y3V+b/3f9tq+LibPH53z1/E2JwlIYBwCuV4+TsmWSxIGgpJncE3n9bJ002dfDt/rHN6tb5k1TcmjrRFwzNxajSiPBCQgAQlIoA0Cub+gDameK0Wruj+6ZLzOhNd34UhtcQz781TT0fg9RcVjDOzTZd80bBr62oxttvk0SEACzyGA4XLPlnijEQrHH/2k4RgBle9j/LxaAhLoiwArG312XF9ne/WXWs5X9AaDBHojgNErf/VPb2VQXglIQAISkIAE6hJ46m44dSnWTa1FJyrtBD8kviV2EorQok35kxPVwVtUl585ARp06mDn/UoxUyCPG7/ZyjdmgsexXj6RmzJ6T/RSY8rZEoH04deSXFfJwoSTmGASW56v5a3BfI2Q5yUgAQk8gwAr79G5397edKburPLSZyrxSx1BDO5f74Sf3NypSHINTUW4jNwQASZWExwzN1QpiiIBCVQlEPoBukL8ccx+rypmExuIALb0FlcSDoR4V1FqTfzclfnERfSj0U54NWTr/qNPIz4fAhO16qFJAuEgyE/S8OMmyM/19ptZGq6A6q3WlLcFArGaY66faEHGs2SI9wzE+6HXZnvx3OUPVlwT7wA4S74e04UJf3ByW98ea1CZJSCBvQSYiPPly49ZuSXphNGv5JpR4pZyI/6e8UvJYB/DKxNQc90IvSE/dkU9OMa5gvIz8kBHo30bJCABCYxGgL4N/SB0BMbrTJhmjN+aQ2I09panPwKpbas/6ceXuGTccgWNdCxCHxv65NR46Qp51vL44EQNI+7aRZ6XwBIBGj1KBTPoMXbzh6LBzREzVZeub+lclAOZKJdBAhLYToD7PZ1ZtP3KvmPGKtytfQaDr3C0br2mb0JKLwEJSEACWwjgXNv7XAij35Z8RowTA/HaZWNME4ZTHK/oOVvqaEkfusOBWpuL6UmgNcOcNSIBCUigBoF0971UL7PPq0HXNEYiwNjDCe/t1ij9V0thygfJCuaWx0V/OFFd3dFSU+pfFhQKtreK7X8xZLR2w26hTDkwlpxliNkig3Ek0DMBDItMRti7wqO3stPPlQ6oiL93lVFvfI7K+5e//OV9xm88W46m5/USkIAERiXAs+Xbt29/FA/DxtP6Tsq89ZmczoT+A1r2JTWecuqf//xp0xhhyYGaZXHpz5aNFJeCMLMhCMTql94mbQ8B30JIYFACqZEfHcD+ZdCKtliHCbSq6x4umAmcRmBq7NX62ORn3rXDn7MFTmsXj0sYgwUBowWO1AgYv3sMOIAIUa4ey6DMEriTAH0BzlSMua/3JLc1A6omm1iFWjNN0/pIIJ4tTHAxSEACEhiZQAwkMUwc1UOj7xyZV1q2kklNL77/Si//9H3JeMr1S2HKSLAU/8pzR9vVlbKalwSWCMR9htPDIAEJSKAGgXS73t7G+azoMkjgCgI6UK+gfDyP2P3ueEp1Ugi9rU5q16Ty8zXZmMtTCWCwwWlCCCfqmqGhNVaUAecPnwYJSOAYAfoBZnAywWI0h+qrPPYTx1rItqvpj8Mxj2HbIAEJSGBEAtG/sSMKq0iPOrzoO9MJjiMyKy3TnOEH9jzX4fX6+/op6Rj8Uz9LIZzhS3HuOvf7777H8i725luXAHohY4ywOdRN3dQkIIEnEkj1pnRb39ZZpCtoW5dV+fomMKdH912qMaWPBWKtlK7l8dEcI52oc2Q8vptAPhiPgQyGH2ZDrRkadmfshRKQQDcEGJCEQzUmWnQj/ISgGFujr5s47aETCWAwG6ENnYjIpCUggU4J5DOGcaQeXWXF8/cJfSYD8y0TN5fGJTzX4cVfHlIDZTi78zj8PlpfU2nWPNa6fDXLaloSkIAEJCCBUgKhN23VK0rTrx0fu6s7TdamanpTBNjVdEmPnrrGY/cRmBrP3CXN0YnBd8n9eUR4lyTmOwyBmJWdFgjjQryHacnQkF7j93oEooPivZTM0jVIoCUC4XzsVdlnW1nvq3tbFG2I7ZbiOXOvNOYuAQlIoA4BnKi5k4tnJf3dkYHwU/pMDDvMup5jhX6MQzndri+eIxhLOT93bVovocfktc71res2Pc4Czzn7WwISkIAEJHAmAZ7zPPexdS7pBmfKsDXtnlbMbi2T8doj4HbR7dVJTxLhm+gx6ETtsdYalxmDBUaf1KDA7xik57PqGy9Ol+Kh2KE8BfO0ECh+rNwySKAlAr0adJkUogO1jZbUqyLWBj2lkIAEWiSAc2/KGDbn2CspQ400SvK7Ky7Phi9fpicQwiDnwNa94Uhld538fJQj1bFTJyzn0cO5tnUHapTFTwncQYD7hEAfF+MAfnPvMF51zAoNgwT6IdC6c3ELybCj8f7T/Pnfgw0NR2+qn2wps3EkUEqAnV5sZ6XUjJ8SQMfrMehE7bHWOpCZh3fqRGUWeCzzn3KydlCkrkRE4UPJQwkMx0J0UjzsRlBwu6oQhd1EgHbL+4d7ea8CDtQeBlOb4A8QKd7xEM+aAYpkESQggYcTQIfLjRTsflAr8BzL06+Vdivp8ExYmuyUj1nQRYJLfi7KhB6dBpxAMUnUZ1BKxu8SWCYQk36jH1K3XublWQm0TCAmfU05IFuWO5Ut9K6Y3JHaNNN4rX5Hb4lAf2qQQG0Cvdjqapd7hPT0AxyvRZ2oxxmawgQBBkKp4QGDBNtlxYxsPvnjwY5i0ptyMlHkJg+9DEHTs++bFLiCULS7aGc9DMR9kH2udIydYfDMDZXEjhnq6ZVMEggDTHr8rO9u4XsW2fJ04x6K/g5DdvQB5al5hQQkIIF7CKCz5I64KYdcPB/vkbLPXNMxSV6CeF5MjUXQK+IZk14XExTj2Cvev+KnnxKQwEYCqe6ubr0RmtEk0CABnrPoMEtb6Dco9ieRKAM7UjCu7C2gr6R9auiUvZVDedsloAO13bpRsmsI9PdkuIaLuVQggFECZSpWauVbXZFFPOSnDBcVRDCJBxKIdtb6QBwlN1YuzG0z98Dq+1TkqQHM1LG4EK5nb6HHhBD7rCB+/2feHqgb/lDyY/AYRvL7pVUCCUjgqQTi3Zt5nzXFY25iUM1VqORLHxm6+JQcoxwL3XCuPPGMmHq2s7Uv3FPDcOzuMpeexyUggXUCsWqNmOrW67yMIYGWCGDn41nIH7rEKBO8pvSAlrgvyYINJA0xDk6P+V0Cewhwv4euvOd6r5FATgA/0dvbW364+d86UZuvor4FxDDDC6e5QeaMRsSZmuXdd8mV/i4CtLPWB+Ixg4tVJ7EF6V28RsuX+ucPRa+mYdhV8/21lHQwjwE93nHXX0mUWAIS6J1A6aoGjHg1n2Fz/NBBpla7zsXv9fjcGITy8HyHNcYhjMFTPDjGX+iXV9RNr6yVWwJbCMSKqXyCwpZrjSMBCdxHgDF2jLO5f3veuvc+iufkTL2kYW0CWRrX7xKYIxC2y7nz+XH6BfRpdeWczP2/2UmnpQU8jKt6c87rRL2/HQ8vQXSeDJbmAjfz77//ydVdc4A8XkSg9RmEzArk3Z+G9gnoPG2/jpRQAhKQQMsEMCYsOfGmZEePCSNler72qoLXxKPx34uaMlz6PuVATeNjFCKE4zU918N35I42FJP4SttmD+VUxvYJsGKqdHJJ+6VSQgmMTyB0E3SbdMLq+CVvu4QxMSWk5Hnv8z1o+HklAXRlFlGVOl+vlNG82iDAeFcnaht1oRSNEeChnm8vkYqI0SKcFelxv0tgRAKtO3lHYI6RMCZw7CkP/dFoM2ujH2bwSxtkdupTBleUk8H+moF8T1vxGglIQAJLBMLxthRn6hzPoHwFPQNN+vB4PkW/Th6RD/17iZ4xlc+UPE88FitP07KHATk9dsf30mfaVFnukNs8JUC/RX9V0k9JTQISaIMA42vGyTpQ26iPkCJ/V3tMmIrzfkpAAhKIsWIrJNAHewuuRO2txjqVFyMQytZSQCGLrX+X4nlOAhL4QYAHD0pzPBBLjac/UhrrW/DYW6p4l/Pe61u8LjXG099igP3tt9dMwRblrS0Tg33+MICn7YPvRxzuteU0PQlIYCwC9C88q0snrczFf+nLf5+FhFO0JJAPOvrI/SCz4fcYfHFa85c6IHmG3BWop1TPw0ja2wzuu9iZbxsE6AvRR9FBDRJ4IgHuAd4HnPblPXHgOTTiOLmnOshlpU3lE4V1ouaU/H0Vgdc45fvQ44qrWI6ez9JCu1bLrhO11ZoZUK4txhni7DV0DIjMIklgEwGcQCjKbM02Z3TdlNAgkRhIbOlvBinupmLAhIDRinYSCgsDLs49qd1MrXxwu5lNzchIEpDATgL0uXv62VLnJvH35BP94qjPTp51c05U9Ke1cocztbQ+djaXD5eR55yOR71tXRkbztao6w+Z+EMCFxBA34wJfbGd9AXZmoUEmiEQ9wD9eq/vq9SB+rk5xTh7j/71ObXyI/kqVFLotX2Vl77PK3LbA31Cq/cW+jPP7Fi4gc6MvAT006kJ6Wt6dZ+11r/ULdUL/WaMTXoiqxO1p9pSVglIQAIZAZT1VhWuTNTLfk4NJC7LvNGMXu3kr+8zn3/99bWNb6ym2WvcLy0qgwXCnCG7NL2a8ZFpagBQMw/TkoAEnkkAQ8Nex9UWB19Klfh7AvKFQ67HAe2WMtfY7eZK40NMelozyqIDvr29rSLw/ZOriIxwMoFUP19r1yeLYvISuIUAK1Dti29Bf2qmMTn5jn4NR0S+ChW98w5ZToU8UOLoo6k+SZ/QeqA9ffkyvdMNNp60PK2XRfmuJZDvAhe55/1WHG/9c99Iu/VSKZ8EJCABCTyWAM4ww2cCGK9QcFFkwmB+5XtRw0nZohNV5f9ze/GIBCRwnMDRmeWlTtGjzz+eDTwXYrXYcQLtpDC3zXHMsMcICr94Vt0lOW0m3nm7VQa2G55zfqdbEW9Nz3gSOIMA/RmTA1rUA88or2lKICWAs8uJzymRcb7HxGR0qKtDOjkl8i7VHeM6P68hgI4XejY6Wu8O76Njj2uom0sQ4Fl0RZsjHyYOjeZg14kaLclPCUhAAhIYgkCNB/VVysVVwNMtY8KJSt5XKVAxUCDPGquBSOdoiFlxvc6CO1p+r5eABOoSwDkQhoR4Dh01ZJVux0a+9PdHnBQ8F5accnWpXZfa0q4LlDl/HuYrBXJJcwc5z5Q5R2Z+7dzvvQ6mmBgV6YbsOlCDiJ8tELjDwdBCuZVBAhDInzFSGYdA6Hx32A+mxrGhi45DeKyShJ5NqXwujlW3PZRmaTxUS/4aY6JastRORydqbaKmd5iAD/3DCE3gIgLhhDlirLxIVLMpJIDTb1TjYwz0CpEURWcQGTNj8/dekX8rjlSfN0XVamQJSGCGAA61M3SB6Ednsp08jEHtqCwYdY46BCeFu/FgaX+frhTIxZ5ydoYjM520lF839Zu2g7OdZ2UtIzurndBRNc5NEfeYBCQgAQlIoA4BxrwRrnBORF58om9MhaMT+KbS9FhdAiPpZyW2JexrMUE0doCB7NRkgLrETS0IlI6H4rqtn/SJo40h07LrRE1p+L0aAfZ1p1NkAF/SqSIA8e+YxVWt8Cb0GALRvmsavh4D78SCYpAs7XemxOHhf3S726Mrgqbk2nMMgzoKU3A5u4/F8B/KMPlicI7fyI8cV7GJAWbuVAiDN/dx3Mt72HqNBCQggTMIxGrCPWnHOzLz1ZIlaeX9dsm1LcYtMRrwjGQLqjTAA8Pkml7Aswa9cGkLqzMcp6msfB/JQJeXzd8SkIAEJCCBFghg84zAePKqZy96Sjq2Dhn4LNF30uv8LoFSArTDkpDq0OnEwTW9uSQP4y4TOLt/2DMBeFnits7qRG2rPoaSJgzUFKrUSM2NN/fi6qEgWZiuCWBMwxm0tb1eqVh3Dfag8PQ94Sw8mNT7ZJBUwduaXhhgW5oJysqUI0b5rWXP41EX1Em+PSQDv7MnIOBAjQEmCuPUu4jiWRV1Vqvt5Bz8LQEJjEugZl+f9ltHidG/7Q30z9F/7k2jpevm3ok6J2PUKZ/5JJy5a+I4ekOsBk1nY+OIPfu5FzL4KQEJSEACEpDAuQTQs2Iy7pVjyNEdFefWmqm3RiD05ppjoNbK+BR5znbS3s1RJ+rdNfCQ/MNIvbVTDMPFQ/BYzE4JhIERIyNtdspYiWMmnHAxmWDKkdMpgibFji1C7hIu7efm2gQDn7k2c6bctD3k2+r4ryELK26CA3UT70fFqRr3Ro188jTSeuBcyJDHi9/IsrR9Y8TzUwISkMCZBGoNPtO+d4+8Z/bPe+Q5ck3p84ay15jMyXOH5x4rVdaeQUfK57USkIAEJCABCdxDgOd7OFBT289Z0pDH0iS30kljZ8lpuuMTSFdixy4r2LhiYkFOYG1ske+ell+/9DufsL8U98nnoq86gwF905npnyFzaZo6UUuJGX8TATrTqQ6STnHpgU/izNLW0LAJs5FuJvAyss1vHRtOnFAoEHf0h8rNVfKe/Vq9lMi4xZiNskDAMUn8tI7zvgyFMl2Vkm5pUiLXkbilK2r25EUeKNB5+agbtnufej7syWfumnzFLUp1XhdT19ZsO1Ppe0wCEhiPAHprzX6VvjN9juwlRjpHwwgGibvHFa/nyvG6OFqXXi8BCUhAAhKQQH0CjHcjnD1RGbtDTEiOPNNPdJ6zx9lpfn5/NgHafm7bye0wpYT2TmrH1pPa2UrzNf5xAvR/o4cfvf3oJbV8lxKYczyEs2FJGFb3GSTQCwEe8nOKakwYwBiaGkS5D+au6aXcrctZywg915dF+XOnaBznE+d5GohLQNEkjN4G5pyWZ5c7Vdypg6V79L0isn/ITfvJHeJZNH9KQAISeN+mfK6vGwFPahhsuTwYDe2zW64hZZOABCQgAQmMSYCxbUw6W7MdHCGw5kAlbW2pRwh7bSmB3K7DIpLU7lmaHvFJE70+bKlb0iC+YTsB6qnmBODI+cz+L/K4+1Mn6t018LD8nzAz4WFV+tjiosQubc8WDrMpQGfPUJzK82nHaqzAgdmaEojxnLqeipdvpTOyob2V9pU6UFGm9yiHeT1xr3PPlijyrfBQDglI4DwC+czrWjnVen4dlWeLse5oHrWuT/v66LPDqdoKz1plNR0JSEACEpCABNoiEOPHM1fC/fbbP1YLnTu1Vi8wggQqEUD/JjCJHdsYthh0cCZkYksp0cdDr99if0ltPpF3pSKZjAQ+EdCJ+gmJB2oQoLPjb4+BCeVg7p2ROCswikSnWkNW05BACQGUA9po6jQLpTlNZ2kWDveGbTilVf87dXLmICaVON4zyrFQFB3ApISu+R4TF5gJjLJeqw5IJ96Nt0WRv6a05iIBCdxNYElfPSJbK6s/6ftiZcWR8px9bT77PO2zz87b9CUgAQlIQAISkAAEsD+gw2EvqjUODbLpROE4ln/m+lB+3t8SOJPAkv4dtpSS/MNeOmd/ob1jc12yu5bk96S4ZzHDFprayUdkqhN1xFptqEz5irstNys3HcZwFJBY6Zc6rvItMhsqrqI8gECuEOOom3LYrLV12viU8/UBCC8r4pUz0ULJu6xwZvSJAPfc3AScT5F3HCiZPbkjeS+RgAQ6I4C+ilHrzH7nbiToKfStcwaMq+TjeR59MFvVoYvFe+fduu6qWjAfCUhAAhKQgASWCOS2oqW4W89t3SJVfWgrUeP1QgAbG+OQ3DGXrj7tpSxPkJM+6O4x49mcdaKeTdj0/yCAIzTv/P44mX0JBxMOKr5vvS5Lxp8SOIUABtN0NuD3739/X3XNpAEe9FvaerTxUwQ00XcCGH/tO57TGM4eONKerlrd/Jxas6QS6JsAz5ja75UpMcDlzkVocj06Rq0wZ8Colf5aOnOGEuTizyABCUhAAhKQgARGJBATxtbKxs4hJfrjWnqel0DLBObsPk9YCVmjXs6ykT6hD9KJWqMFmsYmAqwq3boyjJs6buz4JBOuH3nG/yaQRrqVAA5S2nK87zK29sWRSuCBzvm18Grj9bd6Wcv3SedfK4Rfq1dQqPi9592W1PkTFILe24Z11HsNKr8E+iTAjNuYdYuein5wtD/aoi9jMJvb0WLu+F7C6N5vb297L999HRx0lO7G54USkIAEJCABCXRKoMSBWlvv6xSZYj+EwNw4K3ateQiGQ8WsYeNk0i4rhWO18Gsyx+uduIeEa/hinagNV84IomFUoiPjoR5/6Qq+EcpoGZ5DIG+7GPdo1xhMcc5F4NiWFdT5dtdxvZ/HCcQWi/mki3gfQxi8t+RkPW2hZBwJSEACzyaATpA/c84kMvc6gbPy3OLYrZ13TFirna7pSUACEpCABCQggVYJbHWgfv3618MT91ploFwSgEC6qIrfjEfmAnZYdw6bo1PneDhOp+ypT2D/cx2MpiKBeQLcSOm2YhpE5ll5pm0C+cwmHui0b1ahco7VEjErCkPqt2/f3v/mHvRTD562CfQjHXWDIzXte0L6Vz3NK18RLz6ZWWWQAATm7mXpSEACEsh1hCNEtqaF/sFM4isCMtEH8scWu/ydGV55Od/3TMamLQEJSEACEpBAWwTQ69bsROhIOlDbqjelOYcAbb0klMYvSXukuFt2T8zLi20V+/da/5RfN9Jvnagj1WbDZeFGCyPPnps1ipbPQonjfkrgCgJLRk3a+FSg3S+127gvpq712H4CDCrCyc0WhMzmTB2qzFLbGpbqb2saxuufwNq93H8JLYEEJHCEwJKOcCTdtWvTnTDW4h45zwQkJojxx/fX778eSfLDtWEQZCsoAs9eJkMZJCABCUhAAhKQwFMI8LqopfDSl77+MXl/Ka7nJNA7gdJFWCV2vt7ZHJF/z0IRXo/29KAT9ekt4MLyhzKw52ZNxdTplNLw+5UEeCDH6outKzCi3c/JeZXxcy7/UY+zIjitI2ZL4ejGkUofogIwas2fUy7aTbz3+JwcTFUCEuidQM1Be4muXBK3NmOetUxaqhHgR3rp87km0xoymoYEJCABCUhAAhI4i8DLVvGv2eSxb1z56ohZQTwhgYsIMDYoWV2ajiMuEvEx2VAXTw8SeHoLuLD8MaOcmSRHln/jlFJxuLDizOoDAVZepGGtLbMyZWklI9f/+c8vw2Gart+PE6CuMC6n/GPFcOpgPZ6TKYxOAEM+bWntfh+dg+WTgASmCcTqyemzZUfXDGh5aukzLj93xW8G1DxTj/aPYfSIAToGE52oV9SgeUhAAhKQgAQkcDcBJnqHrSKVBR0Lm5I6UUrF708lsLbzTzhd7x4ftV4/d07CbZ3Nknw6UZfoeK46AToytvM9YmwhDbbnjEBauWMrzvkpgTMJRLtbMhxOOfJymViN+uXLR+dsHsff+wgwaWNqBeFSne3LyatGJ7DlXh6dgeWTgAQ+E6jt7MOJ2luoMRAP52mUvXT7rrjOTwlIQAISkIAEJNATAV49lNsntHP2VIPKehYBX6l0DlmdzPu4up3vPm5edYAAs6tYeWeQwAgE0rY8t9U0K6eXtqBAYZ67dgRGd5YhZqIdlcH3sh0lOMb1azMfxyilpZCABEoI1HT27TEU1FwFW1LumnFzHQnDYe5UrZmfaUlAAhKQgAQkIIEWCGBnyB2o6HYxYb8FGZVBAncRYBFWGtbsMUxI0EGYEpv/XmqDLo0/n3O/Z3Si9lt3XUs+tTKs6wIp/GMJ5A/1ORBrW1D7btQ5csePr7HfkgOKGAqZ4dkEaqy2ejZBSy+BsQjg/Kvp7NuqUwRFjGwtbO921FiRloEBuobDqGE/JSABCUhAAhIYlUDu8EGv5F3zqV40atktlwS2EMjvhXj9x9y1+YSEuXge/+l9l9ASDqXj1JK0e4mrE7WXmlLOWQIatWfReOICAiXtL19pkYpXkk56nd+3ERhhpc62khrrTAI1V5ydKadpS0AC1xBYmw29RQqchhjRWIkw9S6suTRacaDOyVdyPDWQ1HRKl8hgXAlIQAISkIAEJHAVAfS/1OHDLhyvHcx8695VdWA+fRDg3jDUJ1D6CpnS+PUlvj9Fe+f760AJJCCBjgmkzk9m5iwZ/zASzq3WmDveMZqmRA8DbYmBOi0ADnBXxqREnvn9t99cjfzMmrfUEpgmkG7pPx3j81GMZuw+gf6w99nfkgP16C4NrLgwSEACEpCABCQggScRyMeV2hqeVPuWtYQA90Y64aDkWuPWI7B33FpPgvtT0ol6fx0ogQQk0DGB9EGSOlSnirS29QSG1SUn7FSaHttOYK8j9bWtztftGRlzSALcn+n9PmQhLZQEJFBEoPSZzQzevZN5EKwl5yny4EA9YtSgPKUMydcgAQlIQAISkIAEeiQQk+nScaUr7XqsSWW+ikC6AtJxQz3qaR+0lmpaB2txRz6vE3Xk2rVsEpDA6QRwsMXDB0Miq1LmHuwcZ8VFvP80X4WytpL19MI8IAMcqTizS97LXOOdqg9AO3QRGeyWtJmhYVg4CUjgncDSFv1TiI46HEkzJgNNpX/1MfrFow7UlspzNT/zk4AEJCABCUhgfALoS9h5sP3M6U2uQh2/HVjC/QTWFqukKaf22fS436cJ0D/N2a/jiqOTgCOdET51oo5Qi5ZBAhK4jQAGwHCiIgSOlqWVIjygvnz59Q95U+cMDycNin+gOe1LOLN1iv1AvEV5+hH7Wd/Se/RZJbe0EpBADQL0IWzZluoKNdK9O418G7oSeVhxob5TQsy4EpCABCQgAQn0QgDdb+urG1yF2kutKuddBFInKpNSlyYd5PbZu2TuJV/6qdQ+PSX3kV2UptLr+ZhO1J5rT9nfCYxmlLJa+yLAQ5qVjamBlIdMPGi+ffu2WKCXU/W1mpW2rDNrEVe1kyn3tURHr5NYHeW2xZ9bgrPuPjPxiAQk8CLAM/v79+8//fLLr7MzeGv3IaRHCB2Dfhs95GqHJM/Fvfo3Mi8ZP150/S8BCUhAAhKQgAT6I4BuuFVHwoGqTtRfHSvxdQSwVaX309ruf2uvULtO8jFyoj8z/CCgE/UHC791TABjDk6sJUNWx8VT9MYJvFY2ft39brB0ttSWmUCN4+hGvJR7N0JXFpS+E0WU1dMonKM7jEvw1XZ+lORtXAlIoA8CL0fq339KjWD0HcyY5i8d9NcoUThPIy3S5488c2cq/Tk6xZ/+9KfqTla2pdsTnKyzh5rXSEACEpCABCTQCwFeBRT2ySk98K4JcL3wU04JBIG5CQnY/udeuVWyWCLy8XOaQO7Ano71rKM6UZ9V38OWNrblXOpMhy28BWtohGm7AABAAElEQVSGALMIMVamRs4tTikMn3HN2syqZgo7gCBzs9RiS50wgI/s2KZsvKcXZTMCyuqcUhpxRvqMlV3RHmCROlDDwRyMuKfjmTMSB8siAQnsJ8Czm7+7QupMZUIhfXtMkEHHqB1SvaUkbeRkQL70/viS9IwrAQlIQAISkIAEWiPAuDHG04wdY/IZ480YU7Yms/JIoDUCU5MQkHHueMjPvff29hY//dxBgH7rzrHtDpEvueSH1fSS7MxEAucSWOtMz83d1CXw0/tqD5TjcLJsdcDhuIuHlJMBrmlJUwOYFrcZRIGhTeSrjGpQmjJkMxHgCQFHKX9Lz438/capc/UJjCyjBCTQFwH6s9A/8v6rdkl4Xi71n2l+xE2fLehGv/9ef4VsmqffJSABCUhAAhKQwN0EsDlM2R3ulsv8JdAyAewuSwEb2dJ9VTJOWcpn9HPp+2ajrNq8gsTnz2dYSj+X2yMDE+CGP2PW/cDILFplAjzMMV6yunTqoTSVXRpvq1FyKh2PlRFgFSYzQ+HPHyt4WgkohrGaCCUwVkrWlI+2mr7ngL5z9PeyhFN67T7LV+iqTNZseaYlAQnUIpDunkCa9G1nO1DJh+fFWj9KvHSrY34bJCABCUhAAhKQgAQkIAEJzBFYc6JuXawyl77HXwQYy6U+FHYMisU9MvpMQCfqZyYe6ZwAjiu3yei8EgcQH+NiuiJ1rUhbDJFraXi+nABOxKUZbOUp1rkiddidbYDGcRwrl2LboTqlaC+VrUohTuu8XZzhxG6PkBJJQAK9Ebhr4stan0g/ii7En0ECEpCABCQgAQlIQAISkMAWAkfto+yAczSNLXKOEAfbI+O6WMAxQpnOKoNO1LPImu6tBNwO9Vb8Zv5vAjhhvn37Jg8JFBFIHX0Yoc82kNNOWbW0NtuvqBCNRWb1aTiKt4g2ZfTPnapb0jGOBCQggTMJ0HffEeb6VJ5ZGC34m+pH75DVPCUgAQlIQAISkIAEJCCBcQikO/lNlSp9jcjUeY/9IICzucRW9uPK533Tifq8On9EiekEcERMve/vEQAsZBMEMDKyVayGxCaqoxshUoXwqu2FR2+jTKwpCVMrrLifDRKQgARaIZBvOX6VXOlOCWmeV2whnObndwlIQAISkIAEJCABCUjgeQTWVplO2XOeR8kS1yagE7U2UdO7nEDMeg+HaaziYh9v/u4yMl0OwgybI8DKNZw3GBxxhrmSrbkqalogtvG9ss2M6kjl/ltTstOGgCMg5z7nNEiv87sEJCCBqwjUfD7EhK90Ag/f6TdjS14MEUwK45UZU0EH6hQVj0lAAhKQgAQkIAEJSEACJQS2TF5njLIUcnvOUtynnYNdiX3saXyWyqsTdYmO57ogkDun2PqSpfth6HFr3y6qcVghaYs489keYcnImD7IMI4anksgDNdnb+P7BMIlzk/uwbl3wpKOQQISkEALBOirtjwfMECgA6OHpPHpz3CShqN0qUw8j7YMskedhLPExnMSkIAEJPDT/z0jXs+aOR1aRhKQgAQkIIHaBLZs15vaWGvn33N6PK+/f/++aYzXcznPkF0n6hlUTfNSAlPOKYw5/IWhCOXemSiXVouZ/ZtA+nDHsT9naCTeGc4zVmaTdp4v9wYrS7wv2mqqMevuqm182yp9XWlo4zGZZkvK6b2axqdOtjgR0mv8LgEJSOAMAkuTPSK/MGhHv8Unk7kMEpCABCQggZoEQtd2AnBNquOkFba4dCLXOKWzJBKQQOsEwsbaupxXyhfP6xgnXpn3CHnpRB2hFi3DH4by3FGU/xaVBK4mkO/Fj1NzaSBR23nGNtdMNGAQw4wjPvnjoTm1benVfMzvIwG2S3QL8o9MSn/hQPjnP/+nyGmwtLKr9H2qpfIaXwISkMBWAms6QrzSYmt6xpOABCQgAQnsIZCuYpmbiLgnXa/pnwC2hnQia7x2q/+SWQIJSKAnAj6bPtZW2Lzoow37COhE3cfNqxokQEeg07TBinm4SKz0TLeRSN85lqM5w6lJ/qTLQObt7e2PLJHJ++UPHM18sU6OVQUOVCYNlIY5BTsmHJSmZ3wJSEACtQmk70HFWRqB/otnR2rQjnNXfKJPGCQgAQlI4FkEePYwKdcx5bPqfa20U7oIk1t/+ukv7oC1Bs/zEpDAO4FXn3EcBuMj7TkvjowjYzGPTtT9bUsn6n52XikBCUhgE4F0Bejc+2LigbYpwcJIKA/8YXTFiRu/C5MxugQ+Edi76hPDC3+xpTSKXLyjj0w4t3XWMjIQSlefvl/073/kNxVUMKeoeEwCEriSAAZq+qjQE6ZWm6YrPq6UjbzWVsdeLY/5SUACEpDA+QTQ0wnxbDo/R3PogQD6ytQ2kb5CqIfaU0YJjEdgrk8ar6TrJZqa5LJ+lTFSAtNWwzSG3yXQEQEM3mGU3yN2GONV8vbQ85olAi04Ls8Y5MbKvzDybnV8LbHyXPsE6Gv5mxokr0nPNWvXcT7e4RdtK9KN1dxraUT8LZ/cn3nAUVEzjzx9f0tAAhLYQoDBP89WnrdsL95Sv3TGDhpbmBhHAhKQgATuJfDabenXe4Uw9+YIYG+IMRzCoSdMjbOaE1yBJCCBrgjQz2yxbzKOMvz0oV+Wx34Ctqb97LyyMQIYlVLD0rdv3zZLmBqmMNjPrRbcnKARJfAQAvG+yPT++/LFAfXI1X/1DLa0bZ3Bla1NpkJqACBO+nsqvsckIAEJnEGAvofJI6mOe0Y+pWmiL2sYLaVmfAlIQAISkMDYBHCcorc4uXrserZ0EuiBAGOVO3fs6YGRMm4noBN1OytjdkYAQ/9WZygzKcM4xScrkLbMaukMieJKoCoBJh/EfRMJxyrB+O3nWAT2rj4NCl+//vX9fTikQ1tpwTG51tfHDGriITe7Hex572ow8FMCEpBAKYH8WVt6fc34TCphVrcO1JpUTUsCEpCABCQwBgH1gzHq0VJI4C4CW2yKTObcGojb0lhqq9zGa4+ATtT26kSJKhGgkyxxpGIojxkqMesfI9Gagb2SuCYjgWICsYJ662SB4gxWLvj999e7KNNoKicpjfG+40Q8EnhvKSuVY3BN/0o75jjK8tXtZ24VapQxnL7xG7mZZGOQgAQk8CQCser0yCsznsTLskpAAhKQgAQkIAEJSEAC9xPArn+1nen+UivBGQR0op5B1TSbIUBH+fb29i5PrCaaEw7jeLrKimv5c7b9HDGP30kAx1OshuP7He/xxZiah5IZYfm1/m6fwFHlM1aeppNT0ncq0QfHZJa7aeQOVOThXosy3C2f+UtAAhLYS4BnNfotYcsElrsma+0tn9dJQAISkIAEJCABCUhAAucRiMnwqW3nvNw+phzjmI9Hp3+xtbg2nGk2Hi0j8HNZdGNLoF8CWwzzv/zy+V2OXHd09VW/1JS8VQLxLlLkm1oReoXcOL9wNKWr+WKF4RX5m8e1BGr1gyiw7BIwFWg/L+fl9u1ZptLZcgwnwpLCPzUxYelecwLBFurGkYAEWiFA/8cfDlL7r1ZqRTmuIMCOEvxh/DNIQAISkIAEJCABCZQTSG2S5VfPX3F04n6e8pRdJ4/jbwlsIaATdQsl4wxDYM5wHwUMp1BuTMKRyorWWk6EyM9PCewhgNEnVSzubJfcMxhhv3379tPaau89ZfWadgjUbGe037n++NUPf31vT3lfXJNGyezFyBcnL+2cvzTwG0cEn2fKnObpdwlIQAJ7CdAHpw4k+q90QtTedL1OAj0QQG9lBTY7uuBMranf9FB+ZZSABCQgAQlIQAJHCKA/YRtBp+ohOM7poZbal/E//va3v/2/9sVUQgnUI4CBe8u2ZAyo+UudVUgRna/b/NarE1MqI4DCkm9HMbX1aFmqxpbARwJhYGf1JcbGvM19jL3/F30qW6zMzRDE2Zr3w/tz+3Hl1mfBjys+fkMuBg5T7wiE3V3vef0opb8kIAEJTBNg0gd9WBrou6LPp98nsEvLXP+cXut3CfRGgHFe6DfoBNwP+T3RW5mUVwISkIAEJCABCZxJIOwgZ+lM8Uq+pTIs2T/DjoU9JuxMHIvXoS2l6zkJLBH4/EK7pdiek8AABGIF1JojNQbSDLDTrYDDkRDO1AGQWITOCEQbTMVmK421Np3G97sE5giUKpgYHplUkiqoKKyEqbaa50sc/uacqaR9hhP1aJpL9xsOhy9fXrMytwwCcib+loAEJHA2AfTb3Pjx6rscHp7N3vTbIBDtn1UU6D7oLnw6aaCN+lEKCUhAAhJ4DgH0Uv6WxtjPodFuSakj7Chn1RN62JYwpatN2bGwM2GvMkigBgFHyTUomkZ3BOj0Wc0XRv+lAjDAZqVRPmuFzriXrQuWyue5vgigtEwF2rSGnykyHishQPtKJ43MXbu0YiN1IIZhkpVNa+mGMzXyjIkqsRoqjtf6zLfkrZWu6UhAAhLogYB6Qw+1pIxXEUh1l6vyNB8JSEACEpCABH56d56u2Qrk1AYB6ulMpyR2o70hJvLn1zPmMUigBgGdqDUomkaXBFKDfRjr55yir4H1l/cZN2lhcTjELOb0uN8lcBaBKSdqOLSmZmOdJcdcut4Tc2TaPz61TXQu9dxq0Txe+vvVf77UjZLBEX30WWFqG8sz8oKpQQISkECrBDBUtKA7tMpHuSQgAQlIQAISkIAEziPAQoCwEYRd9rzcTPkIAWwbYQ86ks7StUcm0J9pP1qS2XPPIaAT9Tl1bUkXCNDZrj2wcZbmM1h0GC1A9dQpBNg2A0UzZmhNvY/xlIw3JooCHLPTYhW3BtqN8G6Mtvbe0RpOR9oDfWbej15d7KX3Z9SWRUW+NlHTk4AEahI4YqioKYdpSUACEpCABCQgAQk8i0C6/SoLA+YWtTyLSrulvaJ+toxNplbC0pYMEjibgE7UswmbflcE6HjnHD44AGKGVBTKrdCChJ9XEkhX9l2Z71pe6aq7170xvW0GExauUMDW5L37PA5FlETe+Un/cldYcqDWcJ6m5Trr/aZpHkvfaXtzffzSdXvOUb8GCUhAAlcSwKjwyy+/vk+04vmyNpFji6HiSvnNSwISkIAEJCABCUjgeQTQXw3PJoA9fu+E+1hk8myClv5sAjpRzyZs+t0QwNDE35LTgHO5I5V917988YHfTUUr6CkEUHjWjLWRMfHudhyGLHd9plvnxnbMd8gy50Bd6gfvkLNWnrS9qxz4OMZxUPDu7Qi//faP3QODSMNPCUhAAikB+mt2pSDEJJH4pP+h3+GZa5CABCQgAQlIoD0CSxP525NWiSRQjwD6KpOc0VNDd62Xuin1RmCrI3RqXOME9t5qu095HVH3WW9KfSIBnKR0wBjAt6wOu9Iof2KxTVoChwhgpC0JMRlhyz1Wkm4PcelfUofz3tl2R8uKIzfPG4cuW0afFVpY9RT9+1llTNNNHbZTvNO4fpeABCRQSmBtEg4GqTP79FJ5jS8BCUhAAhKQwEcCOA74e+K4+CMJfz2RQDpefmL5LfMPAlsdoVM2pdyu9SNVv0mgHgGdqPVYmtJABOiA+cPREwYqZvnPderOHhyo8i3KZgK0e1ZiE/YoLVc6szYX6oKIDJBR/MKRuvY+5jNEgn3kH+mfvfq0BSdi9OdR5qs+p3hflbf5SEAC4xKYmok9bmktmQQkIAEJSGA8AtiZvn//+/uuEq7GG69+LZEEJLBOYG6HtKkrsT2mtkS+GyRwBQGdqFdQNo/uCOBMIISjY81BxMxBFd7uqlmBdxJASeFv7b5YS57rnzoBIWZc0sfE9zVetc7DPFYCkyaORd5BclYfRltJ86tVjtJ07noXb867VG7jS0ACEpCABCQgAQlIQALjEYhxNeMxgwQkIIEnEtgz2T5djUo/apDAFQR0ol5B2Ty6I5BupYKDI1bcRUfNzH++hxMJB0F6TXcFVmAJFBCo4UCN7J78TuGrnafBnJnOaaix1SN95NQ2VCjE+YrXNO+rvt/lQKV8pVtdX8XEfCQggf4JuBK1/zq0BBKQgAQk8FwCqU2JMRpjFt5nftbk1ueStuQSkECLBLAtHrUXhV2+xfIp01gEdKKOVZ+WpgKBqa01UWK/fPn1U+p0+LHl76eTHpDAgARqOlDBg8LkQPG+hvL1618PZU57SNsE31nVikO1hdWnFI6Z3Xc5rNNZlcihgn+ouXmxBCSQEWALQIMEJCABCUhAAn0SYIzCWJhJl4wTGBvzx7ihxkTXPqkotQQk8AQC7tj1hFoeq4yOvMeqT0tTgUCsNt2SFKtPcRoYJDA6gViNfXSW2BSnmHWbntOxmtI45zvblh+d5Rzvdw3nIJ/5StdzpN+eKk7du0LcLxhCkKM1NndxMV8JSKAOAYyu9MPuhlKHp6lIQAISkIAEribAeAyHKXalmITKmIrx99Gx2tVlMT8JSEACWwloG9lKynitENCJ2kpNKEczBF5OgO+bZ/6FE6GZAiiIBCoSYDDHXzjJKib9IalwNqUHp1Z/p+f9Xk4gJn2w4r6W0Z0Z1GwpGYP+kKqVlZdXGx8weBBYjRvhTkduyOCnBCQwHoGXkfVf7/0v/Tp9ca2+fTxalkgCEpCABCTQLgGe3+wwEY6FJ7/2pt1aUjIJSKAGAXbsMkigNwI6UXurMeW9hABGKZwNWwxRxAmj+SXCmYkELiBwlfP0gqKYxb8J0E/F9uO1t7elH+QvlGFWEuNEPNv5vqdyw5GMkWKLgxVuU+97ncs7DB84NGIFKvlEvnPXeVwCEpDAEQIxGYl+nv7HHR2O0PRaCUhAAhKQwPUEGDN8+/bt3b6UTsi8XhJzlIAEJHAOAewrMW7ZmwMTRyMw7jmaXqTlpwSWCPxodUuxPCeBBxLY6kQFzRZD/AMRWuROCeAIUwnptPJmxEZRDefemasiaztnZ4pTdPjt7W01Ps5OQqqMs7V76gTGMcE7ZMMhyjOC+GmZw4kcGebvMoqVYlybph3x/ZSABCRQgwDPcP7o2+indKjWoGoaEpCABCQggWsIMN7QxnQNa3ORgASuJcAq+6OBCfERGOdovwwafp5J4EerOzMX05aABCQggS4ItOJARQnS6FunyaR1WuM9qHWkaiuVcGjG55x0vH8wjZM6XVPOU9enOxvkWx9PxfeYBCQggaME6K/445kak0COpun1EpCABCQgAQlIQAISkIAE9hBgsvrRkE4yeU06+fLBTnM0fa+XwBSBn6cOekwCEvjJDthG8DgCa06gJSCsdmHroZeR9rWqbyn+lnOsnGQFpWE/AVY8xmokHKipI29/qtuuTBXbbVe0Hyt1oLKqNFahfv/+ffPsR+rEIAEJSOBqAjVmfV8ts/lJQAISkIAEJCABCUhAAmMQwOaY2lRqlSqd3F4rTdORQE5AJ2pOxN8SSAjowElg+HVoAkccqDiTYtvSVt+DOXTlzRSO/osVjzhPqZ8rHagzIg1zmEkDqQN1aiDASuqpoBN1iorHJCCBswm4zdXZhE1fAscIoLehjzMxyyABCUhAAhKQgARGInDE5phyiFcxpcfmbC9pHL9L4CgBt/M9StDrhyaAQ2jE1VRDV5qFKyZwRJlJV+OF065YgJkLUI68/2bgbDjMqqO7t2+kDqccjBvEbzJKvNM0HNIYOqfKRzzaLvcWIRyufJ+Kz3GDBCQggbMJMIkj+q+z8zJ9CUhgmgD6cqwMjy3tct0A/SImKE6n4lEJSEACEpCABCTQBwF0nzMndGJ7Gc321EfNPktKnajPqm9LW0iAVVy8sFpHTiE4o3dBAEUmf8fjVsFRUH755dcP90YYhLamsSUeMnr/bSH1MQ7cUsfdx7Nj/WKl7RXvGKXNB1P40t5zoydkIx5xGCiwzXUEjhkkIAEJ3EVAJ+pd5M1XAi8CaxMX0SHYks5t6X60mNCdmNyM05nVJo4NfvDxmwQkIAEJSKB1AjVthXM6EhNFp+wzrbNRvn4I6ETtp66U9CYCrka9CbzZnkoAQ2rqeAqjzdrsMOLlztMQFAcThg3uGdI/qsBwPe9FJU9n4wflbZ+tGJdQcPN2wCpNjGD58W0l+xiLtGJVVdqeP8aq8+vVHl9b7C3Jzrm3t7fJTLk3DBKQgAQkIAEJPIsAevGSbrykXz+L1I/S4jxlHJAHxirofzGxLT/vbwlIQAISkIAE2iEQk8vPlgi70Nk2obPLYPptE9CJ2nb9KF0DBGKbpQZEUQQJVCOAcoHBBkUjXW2NE3TKYLHVuIPzjj/SzR21S8KTPiFmlaVOtnCSLV3vuTYJRH0iXd6G1lZjrJWI9MKARhu+Iiw5T+fyjy19Ob82SWEuDY9LQAISqEGAPow+KfrOGmmahgQk8JEAxsJYNZnqsx9jffy1R7/4mMJYv+YcqFFK9Cn+2I3EcUJQeebnlvEEY4Z8zLtEKyY9EKfkuqU0PScBCUjgqQTY/a5myN9/Sp8dusBVu5TVLI9p9UPgGqtjPzyUVAKfCOhE/YTEAwMQSLcYTYuDAxTFgxCOqb2rGlFkuH+mHEcxmA1lJ5UhvsegOOSI4372QyBtAxgI05X9GPFxsu6dLciK6Ag1t4eJNGt9TrX/WmmbjgQkIIFSAtEn6UgtJWf83gikzsxcdvSPJR00j7/ld8nkQdJDF0YO/tIJjVvyGjnOmgM1LTs6JNzndslJ47b0nXfeEnqTuyWGtJOtr6VhDBITFeK+mytLPCPjfFw3N3aOeH5KQAISkMA0gehHp88eO8rzlPTRB2Ji1ZwN8lhOXi2B/1v0IwQJSGCZwJkd/nLOnpXAPQRqGpXCSBsz8bc4T6PUXOt7j4JGv5/UY9R/OEyjjfGJ4XDOCZobMoIC7Sh17s/Fi/h+SkACEpDADwLRZ8Yz+scZv0lgDAJbHHGhixwtcanzNPIj/1oyRJq9f+5hyVidXXTY4reHcQNtM+wLPcndUtva0k7mnKVhXOd81MNa2b5+/etaFM9LQAISkMAEAfrr2iHsQKSd9uPYmvhDHyjp42vLZ3rjEtCJOm7dWrJKBOiADRKQwH4CR4y0oSDtz90rWyDATPvYJjp3pFLHX778WFUa8sYs/fidfqarUNPjfpeABCQggW0EcKRiTPad49t4GasvAmtbx2FcqxFiBcSetNCHnr4CFQNoOJK3OMaWONOn8RcrUZbi3n0O+0JMMOxJ7ru5kf/SPcd9TXvacl/hzGYMwieTOaM+yIN0WCFO4HPPeDR2VCItn7PvKP0nAQk8kEDYfmoWPfpv+u2pwHPVIIEzCOhEPYOqaQ5FYK5jHqqQFkYCHRB4e3t7lzIGtm5/1kGl/VtEjA/p+ylQpjGWzW1jhuEhnVWYlpR0cmNGTHZRYU5J+V0CEpDAMgH6WQzSGniXOXm2LwJLOkRakjDCpce2fA+nSw2dgwlmrHLL9ZotcvQeJ5xh6IPo9DV4wqT1sTt1nU8epE3xyou9bbL3trBFftoJYWl8EA75LenFPTdVH1uuX4sT7RB5rdc1Wp6XgARGJMBz/ozAxBeeo9HPnpGHaUpgioBO1CkqHpNAQmBOUU+i+FUCEriAAI4yDCyvwei/FnMk7pEVsIuJe3IXAQwbYdyI2dlT25hhJJkzpM29jyjqmm3ctr4faVchvEgCEpDAYAR4ptInRz86WPEszsMILOkQKQraPTpITMxLz+HQC30lPc730F/y40d+I0cPqyePlDG/lnqKMfYWvT6/frTfL0eeprmlel1azdT6RIQw+C+Vz3MSkIAERiKQPudrlwtbEXaf0CNqp296EpgjoKY2R8bjEpCABCRwKoGYdc0MMv5CCcKgFQFDFgElCQNvGi/iTH2GYsWsbrZ0IsSM46n4HruWQBjrqaf4w4BIXS0ZSbbM5I52dG2JzE0CEpBAvwScyd1v3Sn5DwIY7JZ0iB8xf3xbcuDljtRYUZFuxfojpX3fnrjVJ7pcaT3to3v/VZSV4BjkWF0ExzyVXu4fn7F5zflbAhIYmcAVz/m11zaMzNey3UdAJ+p97M1ZAhKQwGMJLBm6UidYfMfRtjWks/nzVYnhoMU5i2NWo8ZWqsfioUjnrHGkUg9hSIvPIzmxmsMgAQlIQAJlBOJZW3aVsSXQDoHaBjv01Py9ium21+RXQ+dI02yH5rmSnG34RL9vIcRYZ+o1FC3I15MMTIrNQ+u7DnFvRxvwGZvXnr8lIIGRCZz9nIed/erILajdsulEbbdulEwCEpDAUAQwOBHY0qjEKVoCId/OiVUEqYIV3/lkVvATjVclPGvEDQNC6tyOdKkfjJS0ialVxji9cbTGDG6MKLkzNtKKFSLx208JSEACEthGAGO0oQ4Bnnn5CsY6KZvKHIFaDk3SR++g/tbqcE4XmZNx6jh60dPC1vfV7uVCX1ajbvbmH9eFU39K9404fm4nEOOA/IrW+9t0nNO6rDlbf0tAAhLYQ+Ds5/wembxGArUI6EStRdJ0JCABCUhglgAOrnBgzkaaOYFBZKvTNVYFcA3Ot9jKdypp5MHI0YKxZUq+EY7Fu8PCKDlVJvh/+fLrh1PUCw7TNSNmxJtywH5I0B8SkIAEJDBLgGcsz8y1Pnc2gYefwDjOcyh0lXwF48PxnF780P2OZlTq8CrRT3PZSvPKr+/hN/dFjV1GSsrayipUVuHkEztLymHcjwSmnKjR33IuXhPy8ao2fk2Nc9qQTCkkIAEJ1CUQtp+6qZqaBNohoBO1nbpQEglIQAJDEsCIsseBinEqttzlM9+adwlWDKyX4nBuaWXj2rWeXyYQjnPqsdS48TI4TKsotKe9bWpZYs9KQAISeC4BnB06/7bXP8+h1HGaXqlukdLo4zu6SukkAnTTrfpmSmFPXun1PXyPlZhXygrXFiZGYkT+5ZdfP8jy9vb2jmKPTnwlwx7yil1q4t6bcrD2UA5llIAEJDASgSsdqDwH9tgXR+JtWe4hMG2hvEcWc5WABCQggQEJYGgsDfnsbYwibL1bWzlDtlKjWWlZnhYfpvnKA+ptKpSufLrDKDclt8ckIAEJjEYAg0QLDogeuK7pIhr1r6tF9IIaAYdMqU7C/YJTLJw5yBEOHtIi5PoQ50snlr0n1Nm/M9+HFo7IqHsmLbSyGhGZaA9pHYecnVVhU+LilE5XnMM3ZdyUsAojAQlIoBECPH+u0O3X9OKaOGInj5iwXzPt0rTQR9D3Yvc79JFc7ytN0/htE9CJ2nb9KJ0EJCCBrgmgUJXOEkMZmVP2GDBjKClNcw4i6aCA+W7UOULrx1HO595pytWpcTFNjXoOhTM9vvT9TKPcUr6ek4AEJDAyARw7Pgfr1bBO1Hosr0wpDF8lk+vQS8OAluuu6JdpCOdfemzE73t0/60cUid08I7PrWmcGS919J2Zz9PSpo4xnHOP1hoDPo2h5ZWABJ5FABsNz6SzdfwrHajUYOhojFtil4c7ajacuZH31RwiXz+vJaAT9Vre5tYhAR46BglIoJwAitucA20ptbWZxbUVJgbjKD1r+S7J/MRz1O+WLZbpQ1F2cZgSH2NjbNNcwq2F2YYl8hpXAhKQQC8EYtVcL/IqpwTOIrDHkRoGvVQmduVInT2p8y+NN9r3vbr/Vg49TvZgZUoEJ1gEifJP7rO4r9xJqJyfV0hAAs8hkO4Mdqati3z22Ptq1QS7190xeYlJcaH7bbWJ1Sqz6dxLQCfqvfzNXQISkMCwBPasGmRG15ZQW2HKt97aIsMVcVDKWOXZkoN3q6IYztNQMOG1x/iFcs5faoy8gr15SEACEpCABPYQCIPV1M4Z+esK9qTvNT8IpA6qH0ePfcORWvJ+4Fh9EBNvmZSQGxVpE0wGy9+VeUzS9q7eo/tvLQX3TssB/Xgq6DidorLvWGzrK9N9/LxKAhJ4BoGYEBalPavPzPOJ/K76ZJeC2nbBNdnTSXGps3rtOs+PQUAn6hj1aCkkIAEJNEWg1OmFMlJiWEq3dWqq4JWFOdMYtUdUDERbZvvl25uU5hXO49wIWZqO8SUgAQlIYJ3AWcaV9ZzHjTH3/GJi1Jcvv45b8ItLdlbbRdf59u3bYmly41lM9orP/OKXI/Xv79uSphPM8ni9/saZPFf2o2VCr2xp296j5fH6fQRi/Me9Z5CABCQggW0EsLPVDjzzWwjxXLjKoQvLrYsKWuCjDHUJ6ESty9PUJCABCUjg/wjE4Bbn6JpBZe87ojBAlShL5IOxbU2e1iqwlW0Wc2PhFKe9dRlp6TwNEn5KQAISuI5Ab8/F68jUzwnn6p4t7etL0n+K6CVzzuozS7dFH1rKH90VfbSlXUaW5N1yLlbjbom7J07PTuezHP17OI5wDW2BP8YMOtZHqFHLIAEJnEngjElI9L936F9znHgmoJudPZ7B1sUOKCU2yDmZPd4nAZ2ofdabUl9IoBUHxoVFNisJHCIQs9Ji262llYtHViyivJUEjJa//vp67PXirEMRbKEP2vI+0qN1yarbsxXfkvZiXAlIQAISkMAZBFyNeowqOtwdOsNR52laaoyPONf2vOYgTaeF73c5s1soeyrD675+7ayTHvf7OQR0oJ7D1VQlIIH+CcQWtyxoOGMSUmu7pVFjsd37WbUHS4IO1LMI95GuTtQ+6kkpJSABCXRDIHVWYliZC0ecbqRZoryh9KSDbb6znR6rAHD6tuConOKE3PC8OmCgZJbd1hl9WxR00sShHnF53xjhDkPo1TzNTwISkEDLBOiXDdsJ8Fw+MgOfa0dahbid3PGYZ694nJKwpvM0TZ+JY0xSG8GRmpar1ndWfHCvnfHe21oypumk45/0eDpBMP2exvG7BCQgAQlIoBYBbF3Y2sLeUitd0kEPa/FZFmU+y8lJmVssd826Na11AjpR1xkZQwISkIAECgikzsqlLayOKHU45EqUmKUZeC0bMkveE1tQRZ+iYsQjhDO51Di8xDcyY4Y+QQU0iPgpAQlIoA0C0fe3Ic05UsTkoC3PqzUJUj1nLe7ceeSpkc5c+iMev9qBumUXjqOc0Yne3t66fk8q9xT6fqnuuMSOiR2hn/dyn8zJyYogdOCafJbYeU4CEpCABCRQQ9/NKV6hF+V5lvymzNgYl3bC25IeDujaes2WfI3TPgGdqO3XkRLeTOCOVWA3F9nsJVCNwJITdc7YsCXzcMhtiUucM5TIrXkfiXeE0dZ809WmJY7pNP01hzjGYo1HKTG/S0ACEmiHwMi6Ls+49DnHd3SCo3oBTp69z0xqnl0YXIFYdg8s6ZRlKW2LfaR+t+XwIxYrJ/g7ukvLjxSv/YbDk/qpxYx04l69tiT1c0OXj91vKJNBAhKQgAQk0BuB1h2owZNn7pHJS7GC92qdM+T3s20CP7ctntJJ4H4CVzgx7i+lEkjgHAK1jCmpdKUOuSu3KcQ4wooCVkv0Eo5uecJ2a2v9ZKnTuxd2yikBCUigdwI8I9f68F7LiMGHZ1yqi/CdYy9jUNm71VMOR52wyIE+Y5BASiDaZnqsl+9MCqipc8OiJ316Sz0d7Te25GEcCUhAAhKQQE0C6KupLl0z7TPSYlzD5K5v3769T07bqpvgQCWwktUFAGfUTP9p6kTtvw4twYkEtna2J4pg0hLolsCScfDIvVXqkDvDYEHZcJimM8r5jsGHgNLVgzN1qY5qNTzyUAmtRdN0JCABCdQlwLbxIwaeyUsGH85hJNnrpEG3YBLRkVDybvcj+Yxy7VJ9jlJGyvFqm6/XLPRWrtqrq9EfmfBgkIAEJCABCUjgHgKl9rd7pJzOFX0d3YTVqa/J/18mI3IutedNRvLg4wm4ne/jm4AAlgg84R1RS+X3nASOEDhL2UodcihDBPKa20bsqBMVJ+Dvv//ve/pTeXAslSll1uI2IOE4pUypEziVu+T7WhmPvpOiRBbjSkACEpBAGYERV6GWGEF4fvO3ZxtVZrmzFTLO0D0OPq5B1qN6SlmNG7sHAuFIre2UvKLssRUeuvmcflwiByzQXUfsq0o4GFcCEpCABCRwB4Eaz/IacsdK0T1poUOwtT4B3Tu14bHAo5Uy7imb11xHQCfqdazNqUMCOlE7rDRFbobAmnNtj6Cp0w8HahhUQiFi9Wcajqx4ZXXKFmVqS5xUpru+n/UeizlDHwYvV9ncVdvmKwEJSGCdwNGVlOs5XBMjJjuhI/BM2hP26izoITi6yDt2oyjJn2t4r3joMyXXPiluTAB7VplZLf39vX31VO6YFPDbb/W2q/Ydwj21AGWVgAQkIIFRCLSyG0Rq+zvKNvQU7P3o4XvHDkfl8Pr+COhE7a/OlPhCAhg1DBKQwD4CZygj3JMYfVF4pgyOOE3TfENBKi3BVgfqWrp7819Lt/Q85Um5lF6/Fp+0U0PfXmPyWj6el4AEJNAjgXhu8UzAGVRrhdYRFsjESsreQ63n9VEO1C1/e+Rhx4Y9K2GPyuz17RPI9av2JX5JSD9XU+8kLXTLVvTqXupBOSUgAQlIQAJ7CRyZnLg3z6nrsPFN2f6m4pYc095fQsu4ENBDZDuQwAKBMzrqhew8JYFhCKytGNi7ypt7MladTsEi3dRos8fYUmvFZisGUZTfK1bLwh3jMeGK/Kbq32MSkIAEWiPAwD91VsZzLD22JjPP1NhWfqp/JY94rk6dz9PPZcrPn/07HMnkw3a4e/XtPQ7LubLtXYmap0e9klaqi+Rxpn4zE57nNfV4hMlU2iMcO+sVET2woS2lE9V6kJn+qnbgHtmj19eWw/QkIAEJSEACoxNAV+e5O3J4jck+LsIYubyW7TgBnajHGZqCBCQgAQlkBFowdmEkLg0YZOcMn5HeFkN1ze1GSsuQx79S+d1ivM/l87cEJCCB0QiEU5PnRY1Zzq9B/mvYhpMunJBTzrb0HZ3x3vBwwIaj8M73LOaOz3huxDOWZ/CWZ2ieztE2RL61Vrrh6JnTJZbk5Br+gkm6gnnpupHPUc97nNKjMaFd4Ej95Zdfd086uJJJ9DW186Tv2zvporYspicBCUhAAhIYkUBtHbtlRozV9ujsLZdJ2c4joBP1PLam3DmBMOZ0XgzFl8AtBNaMJxgIS1bhbC0ExuMwPpbOVscwQ4h7H2VqaTUpeeEsTo3krRl2UIANEpCABCRwHQGeIWc7KV9O1emteDmX59/Cs4lnLO81nDNUpMfZ3hYH4pSTmJo8y7hTa6Ub+keNLdD26jPXtfZzczqrns+V+rzUuUfi3jhDh64p+do4YG9eTAhpoT/bK7/XSUACEpCABM4iwGQrdNBSO1jIg+565QT8yDf9DP0/nQAaixjSeLW+M9Zwsl4tmuOnoxN1/Dq2hBKQgAQuJ5AaQ+cyP3s2eenqnyWj9FQZSuNPpXHmMfiGAfbMfExbAhKQgAR+EGClmOEjgT1GGZ5f8QzDoJKGOJ4eq/W91rapNWe2v729LU7qqlX21tI5yxHXWjlL5Yl7Y2miX2mateNvGQfsyRPjLn9bVqvvSd9rJCABCUhAAj0SYOIZz17+0J9KJ1uh/5717C7h+ZKdV3id765am+BZIrdxn0Hg/Fb5DI6WckACZ852GRCXRZJAMQFWcS6937Q4wf+7AGULoxIO1CsUrz0yXnUNK34MEpCABCQggbsJHHWGnek0zdm8DFDHV7ulO2Pkeez5HSsD9q4u2JPnndfUWMl7p/xX5E2bgFMvW/zWZIKOm6+4r5m+aUlAAhKQgAR6IZBPnkdvRvfeoh+gR7Skc53lyKWMscgi7GRn5dVLu1HOcgI6UcuZecVDCOhEfUhFW8xTCLCd4V1KyREDIwpohNhCpHQWX1x/9+dd/O8ut/lLQAISuJOA203eSb9O3jUcNK/dKurqQk9ypGLsMqwTQNdji9/WVqWyUhS5zgqUG5396RMmz+JruhKQgAQk0A+BcAqmEq/pB605T5H9rFei+HqItGX4/QgBnahH6Hnt0ARilsrQhbRwEpDA6rvV5t7JJjoJSEACEpBATuDoqss8vRF+116VeTYTDE8YXI5OomJSF2nVDE9wpOIcq82tZh20mFasSm1ldWbsDBPt9QxmOGkxuBJi8vPRe/YMOU2zbQL0NzFxFkltQ23Xl9JJQAIfCaytIuU5zF/s1kZ/t3bNxxyu+XWWA7WVbYqvoWguZxPQiXo2YdOXgAQkIIFJAhhVrwxTq0zJf2mbQJRNZ7lfWUvmJQEJSKBvAjpR26w/3quaToriPaNLAd0Ax8yR3S249gwnEmnSzkY09qOrnbmCcanOez+H4xl+reittP+zDbXhbOczHKq916Pyn0eA9kjfyV+0nTy3EfvVvIz+loAE+icQE0C26plb491Fhq2Hawb4sEJ3rq+vmZdpPYeATtTn1LUlLSTQygC0UGyjS0ACGYE923dgiNnyDoksK39KQAISkMDDCTBYb8mR8fDqeC8+DtTcMM5zfs2wEganI47Us7Y1jfddtbLysFY7Y4WEYT+B1rYT595Zu8/2l/bjlUfu048p+Ws0AluN6UyeNUhAAhJoncAe+1bLZUJPD/t7OIdjZ0iOx7F0EsyUbp+W0Ql5KQ2/1yKgE7UWSdMZjgAzFR2MDVetFugiAqzeWDOahKJ0pkilCqbO0zNrw7QlIAEJPINAjXdqPoPUfaXcoqcg3VFHKroOhp6lXS/2UkDPYkUtjtordKq9cpZcF2Ov4F5yrXF/el9h1xIH6vOqugyDa0vlV5b7CWx1oI7Uj95PXQkkIIEzCNCf/fOf/3OKTnmGvHvS3Or8XJpMCCeDBM4goBP1DKqmOQQBZrkYJCCBPglsHTBH6XSeBgk/JSABCUjgKIG1SURH0/f64wRK9PxwAoWDrzT3WAV7hiMVWTA4sYJqr3yl5Tk7vs6w/YRL2vX+XMquPGs1dioFevyVEwliW9i4t1NZ/N4WAdoFK/bnnA8j9Z1tkVcaCUigNoGtDsba+Z6dXqq7lEw8ZLzFO0/zHeRwNBskcAYBnahnUDXNIQhg6HBgNERVWogbCLDCYymcuV0Sho0weC7JwLmRnaffvn17Vyo15q+1As9LQAISqEsAA4DhB4ErnRs/cv3xLTXOcBRjeumzMfSKvY7KGFOc5UhFPsoZ+fwofX/faC/oZ6V1dHVJW5SxRWbUJ3p/3ENn1NPUuIP7/IwJBrHLDfVv6IfAq1/5dYg+sh/qSioBCdQigLNw1JDqLuixf/7zXza/z5Rredandr1c7x+Vm+W6nsCylft6ecxRAk0RcEvfpqpDYToigJGR+ydViEJ8FJy9RshIIz5LHKZxDZ+pkpUeH+07M69RuKfqYbSyWh4JSEACrRBw8N5KTUzLsfe9m+EE2qvDhGGI/Gkj/NV8Pi9tbTZNot2jMK7JZmtJ0Q+nHHLp9ZyPNtCijoXz8O6JCykvvsOL9n7WJIKpPpdt1Qnct6xursGEcUeU4Y72+V4g/0lAAhKQwKMIzNnVRoKQ6i48r0ufscQPZ2rptSNxtCznEtCJei5fU++cwNSArPMiKb4ELiOQG8DCMFVrlQSKVhg0txaK1UHMbKthSNma593xcKTGrPm7ZTF/CUhAAhJ4HgGeQS0FjFF7Q+gd4UQrTQf9Y04HiZVzpWmm8TEc8Z5U9J1a+laa/lXf4Rusr8hz7+S6XNe9Qta1PHDSz7WxtWvPPE97rD1xYE5e+pzUiIphtcY7L6lvHLI4aEk/NfrOyeJxCUhAAhKQwF4Ce2xee/O687pUdzmip6fP/jvLY95jEtCJOma9WqpKBJhp2rMBohIGk5HALgJhYKw1+zsXImaY58fz3xjGwujRolEpl/eM39GPxez5M/IwTQlIQAISeBFwAP/igBHkSkfYlvaXO1e2XJPHiTKFnpOf3/u75jucRhjDnL0FLPW013kadUwbSI19rFK9W9dq+Z2yZ+2Qkve5U3XAuIH8jwbGEqRDvadG36Pper0EJCABCUggJ1BTN8zTbul3uoAp1ataklFZJKAT1TYgAQlIQAKnEahtYEwFxYDBzDwUyyljyRNXnaZ8YHPWloFpPn6XgAQkIIHPBJ6+QqmlHRBwsCAPO1FM6Qufa2/9CI7UmpPEaC+1ZFuXvo8YMQEuVv3VlPqo8zSVJXfM4UgNR3sa74rv6L6tTxj85Zdf37fcq82De5xJg3xOhegHYmLhVJySY2eOcUrkMK4EJCABCYxLIHUujlvKHyVDH84nRv046zcJ3EtAJ+q9/M29cQIMsJ8eGIjy4Gag6GDx6a2hvfJjKPry5dd3owkz1vh7YlvVYdpe21QiCUhAAk8kwHP4LgfSEm8clLWdlPHuJZxCNRxXjDtqGY5GGcPEqj/GIzXqr6bzdK69oYdyH9Sqy7l88uOUrZaDME+75u+X7l6vrYdstI+1lcARxzFtUPNTAhKQgAQkcD8BbM61dL37S6MEoxLQiTpqzVouCVQiwMMMIwB/NWfcVxLPZCTwB4GRnafhJI17MH5zf8Y9+gcIv0hAAhKQwO0EnrbNY0xkutpxdHdFU95wpuLA4S+e1SWyhbPwqRzXWIVz8IjOg5MxXzW6lu/e82ettpySp8f3357FZ8sEjoijI3WqNXlMAhKQgARaIvAUvZpyPqWsLbUvZSkjoBO1jJexJfBoArXeJfNoiBZeAoUEnJFXCMzoEpCABBoggLNn9MCEHrbUP+LYupoRjrQzjDS58WevYysmhLW6ovfq+krzC0cqx0onk13pQEU+nOLfvn37ICfHo1+o0QYpU61V0Mh2ZThrNerWMuBI3TPZYWv6xpOABCQgAQlIQAISGIuATtSx6tPSSKA6AWbU1xjoVxfMBCUwOIE5AypGM4L35eANwOJJQAJdEwhnSdeFmBG+x9WSqcMJBxyrR88MsfVs6vgryS+cqU+dSEUdEeLd7oxH0pWDLydc+6aMJTmp26kJCKHnUea5kPOYi9fy8bNWo24pM4ypmycH+nHaXzyruL90LD+5RVh2CUhAAm0Q4BmtrauNulCKjwSerTl+ZOEvCXwisDR4/RR50AN//vNf/ngHUWq8GLS4FksCTRD4/v37H4ojSiR9EfcixkSMHiqVTVSTQkhAAhJ4HAGcW7EdZi+F/6//+q9PDjhWioaj86xykD4OiiNbyOKE5fnPbjAtP/vDIRMswzET+stWh9WSg5t2R72N4ECEUzjYKTP63dMcWLQJ7s2r+5O9q8SjbY/yybietvenP7369LR/YezR6yrnUerHckhAAscJ9P58Rf6nBZ4/6M1MNEP/JfS2683T6uxJ5f2Pv/3tb//vSQW2rBIoIeAg60UrVhwcMQKVcDeuBJ5OgHsuNabFPZgaOJ7OyPJLQAISaJ0A23mOFtJJPq2XLXeepvJimDp7NWrkFwah+L33s0QXuGIME8Y9HIBrjrAtDCjfWjopu3CopvpSet7vfRC4sk9Z6hP6oHWelOFsiAkQkVM4++O3nxKQgARaJzCl46Ez4JTbOqnr7jKW6kR3y1sj/yXddapOa+RpGhIoIeBK1BJaxn0cgZj58riCZwVmpqqrUDMo/pTASQTe3t7+T7l/rT795z9/On2lzEnFMFkJSEACjyZAPz5auNLZcZQd/Jd0V4xoxLlichJ5wO7oZMTQx1sxrLEyYOtqXhhgAJszXpa0rdCRaCM4UA19E+C+KKn/pdLSNvL7jHZHW+3JeL5UxrPOvfpE76ez+JquBCRwHYGpSXLoK/z1MJmm1jPxOuLHc/r69a+zOiKpX6m3Hy+NKYxK4OdRC2a5JFCDwNxAv0bapiEBCUggJ4Chh4CxMRT9PI6/JSABCUigfQKjvRICx90VDsdaNRtOu6X0rqwj5MEoVhrQC0I3iGtxpmJsujvkK9bW5GFL4qlQ0rZYpYCTjNVx/On4mSLa3zG2jq0Rpu5p2ki0lRp5mIYEJCABCbRLAJ1iKZTqLktpnXGObWx70rdrMdhie6+lK9SS2XSeR8CpZs+rc0u8kQAzWQ0SkIAEriTAlngGCUhAAhLon8Bou5mUbLPaSu2x+uzLl3nnzNZVlLXKE47UfKXcXPo4T2M1Ray+jPeBYmzCkRrn59I4ehxjHiHyPZJeOLZzQxlO4a1GzSkn2RGZvLYNArQJ2vhRw7Hto436VAoJSEACdxFYc6K2rJ+jc12tm95VT3m+6Ly5fpjHqaUr5On6WwJbCehE3UrKeI8j4CDscVVugSVwO4GtRsTbBVUACUhAAhJYJLBmCFi8uLGT4UhrTKxVcTBEzb3Pb83Itpr4zgg4ieA5J1eabOogfTkg//V+GtlxxNLG5hyptfQJxkPhQOcTRxdOT7bR3ePwYjXqlBN5C4+Ujd/HIsA9sac95RTc3jkn4m8JSEACzyGAfrT0LEGHaVU/f+IWvntaJnrpUh3vSdNrJLCVgE7UraSM9zgCGF7ooDEUGCQgAQlcQaCW0fMKWc1DAhKQgASmCWCkGSUwM7znWfEY1FrT5YPnkuNwycmL8SjKNbeDBXF4x/rRd3/BLpyotGnSPWK8el2/vtpglPvHcqwTqLnyplXj+DoFY0hAAhKQwF4C6Kpb3tPe2kIZ5GZy2RG9ai+zXq9Dd8ZmJrNea7BvuXWi9l1/Sn8yAYwGzGh1QHYyaJOXgATeCagM2hAkIAEJ9E+gNafdEaJz77E8kuaV186tTJs7fpVsOFIxAtFWpsYaa5OqcKJy3ZKzlbKEA/RIm+Q9pOH4rcFnbZvlGnmYRj8EarYtVvKEkTy2bHQc309bUFIJSEACWwnggGQiGXrQFhsKExyXJq/N5RuT1ubO7z1OuqGj7U1jpOuoy63Pa1ejjlTzfZVFJ2pf9aW0NxBgKy22ytraod8gollKQAIDEGAgYJCABCQggf4JHHFYtVT6GltsshKScJehqMQoczV7jH5h+MvHGmtOVK7bunoB9kfaJEbHmo6uqzmbX7sEauu+6T1Fm43+x3F8u21AySQgAQmUEuDZkb7yYO16HKhTrxKYuw4HJ3pY6D78Lrl+Ll2OkxZ/of8txX3SuTW990ksLGu7BH5uVzQlk0A7BEoe0O1IrSQSkEBPBOa25OupDMoqAQlI4OkERtnKFwNVGI/21mlsJYsDDyfhHWFuxWlrTpVcB9ji9CwxwLFC70hgNapBArUJsCr5rECb5T5q7V4/q7ymKwEJSOApBEp2SdnqQMWxyeRBXoXA5LNUB0bf4tzRgG5N2iX629E8e7k+5d2LzMr5PAKuRH1enVtiCUhAAhJojAAKNYq7QQISkIAE+iawxfnVQwlLDFRT5cFolbLInYRT15xxrBcHCjpAyovvOIBrTeTEYIeusZdH7dWoyEKbmNrK+Ix2YJrPIxDb+T6v5JZYAhKQwLgESlZxrjlQ0UW2vEsVmjj5WC3JVrL87dFfzpw41HuNl0zWq62T9s5O+a8j4ErU61ibkwQkIAEJSGCSwNYt+SYv9qAEJCABCTRBIFZeNiHMzULgtGP1IwYqZu/ftZ3vHIajKzPn0t17PJyc6fU4PGuu4D3qGC8xcKXlyL9jiMQ53FqbyOX09/kEztq+D8P53gkD55faHCQgAQlIYC+BWroDzlh0kZIVkOhqxEeGPZPcznrm7WXZ0nXxPvMtMrn4YAsl45xBQCfqGVRNUwISkIAEJDBBAGMyW8TwGaFkNmVc46cEJCABCbRHIF1J2J50ZRKVGDPmUn45UssMVHNp1Txe412vNeWJtKZWKOAIwiFUI1AfR7ajq9Em8nLo6MqJPOc3ujBt8ozw6nu+u8vLGXBNUwISkMBNBEp1GJ4FUw43JtIddcaW6mZnPvNuqo6q2c69fmMqk6N1N5WmxySwhYBO1C2UjCMBCUhAAhKoQCCMocxcDIU+PiskbxISkIAEJHATgVJjyk1ibs52lK0w00lLFB7DWcmqg83AKkS8YoXCaxVouXPprNXE6kAVGk6HSVDve1bxlBQV47mG1hJixpWABCRwPwH0tilnKcf26G+pnsH314T24xN4SieW3fVai/trdF2Ckt0jcr1+PXVjSKAeAZ2o9ViakgQkIAEJSGCVwC+//PoeOvS5ogAAQABJREFU57UNDFsdHlfiVzM1ggQkIAEJnEqg1JhyqjAVEh9lhWC6hS0GuJafuXMrJmq3rXAulWxpzPunam3nmzZPdKHWDGIYWVuTKWU2wvfUqH12eUra+dmymL4EJCABCSwTiHeU0nfHs3ivA5Wc0HlIC+dpzYk1pboZu9XwiobRJl0u1+a2syU7+aR6/bbUjSWBegR0otZjaUqDE7hysDc4SosngeEJoOinin9a4FiNyrGWjbmpzH6XgAQkIIHnETjDaXY1RZ6zGM54Ju9ZwXC1vCXbmR2VDTYl4xscqWcYAFsziMFk1BUj6KfcD3FPHG1De6+/Uv8tbed7y+R1EpCABCRwnEDsykHfzY4FNfS3M545e/Q17EBfv349ZVLacfL3pbCVJfrZGXV5X8nNuTcCOlF7qzHlvY0As5ZKDA23CWrGEpBAEwRQ8Kbeb4ZwsRq1CUEVQgISkIAEDhPowUFXWsjSWfal6V8ZvwejC07rfAUwY48z21YYK7fWxRkGwJZ0Ila9IE/Jqoit7O6KRxuKVTjRlv7rv/7r3ZB7l0xX5+sY/mri5icBCUignAB9da6v5b/LUz3nilxfK8klJqWVXDNy3K0sa64kHpmnZTuPgE7U89ia8oAEWtxyakDMFkkCwxPYqigOD8ICSkACEhiIgIb6gSrz4qKwvRtGtTTQns42GIVTLc13y3dk/fbt2/vfnq3puIZVrVOO4y35nxUH/Ww0He01fv3x6ggcqCM5ibe0hZEmhGwpr3EkIAEJ9EigdGLXXWXco/fksqJrjLDjS16u0t/oJFsCO2kYJHA3AZ2od9eA+XdHgC0lYm/+7oRXYAlI4BICawMA+5BLqsFMJCABCVxKYCQnKivXznbgXVo5jWeWO7WucKAGkqPtNpc90l365BoMiDhj1YmWSB07B9vc2Lt127xjOXu1BCQgAQlIoIzAmg2lLLXzYteamIMOlD+jz5O6vZQp+xYdEl1m76S/9kqtRD0T+FPPwiu7BO4igCP19U4gb6G76sB8JdAiAWbIbVHwRn3XVot1okwSkIAEriLAlmM4pLYYBK6SaU8+OFBb3T5tT3l6uCZ1bGEsutKBTV60W4yC4dSM1xFwbK49vxx0f/oplX0L69xoNtrKzy0MrooDW96/RqC+eP+svK+ibz4SkIAEJFBCgOcV+gh/LeuhtZyosEHHarmsJfVXGjf0k7Xr0F0MEmiBgCtRW6gFZeiSAI5UHu4GCUhAAkEgnz2JQ3Wqn5g6Fmn4KQEJSEAC/RLovX/H0fJUY86RVodjcOu2bMTjL7azTfOFP2OMqwN1HkZBnGx8R4fBwfr29japyyAj58LhWiIz5TRcSyB1qF6b8+fcnrzy5jMNj0hAAhKQQBDAqYhzbes2r3HdlZ+lk8eWZKO8T3wmbq1fxlWOS5ZakOeuJOAyuitpm9dwBDAs4DRh1rZBAhKQwC+//PrJ+BmrSV6zDF+rAFQEbSsSkIAExiRA/46DqNfVXu6UUNYucYamqzUZE2DwSZ3pnOcPo1veLr5////eM3w5Iv/ySYcok2Z/7HyHHXQW/igHegx/ufxRli07cKSScY+Eozj45Wmn8f1+L4Foz1tXjGyRlvtBXXgLKeNIQAISeCaBVA+Jieql+sZZ5EJXDj3oaD5TNqSjabZ8fb4jyZKsqT69FM9zEriCgE7UKyibx9AEeJDzUK85sBwamIWTwMAEUKSZVReO0ygqv+knWlH8Qy4/JSABCUigPgG2nepVL9RYsb098LzHyJeHMPzlx/PfKWv0g7t0hNyBmsoZZWFiAO06HF84P3EY83lE7vTab9++pVn7vQEC1HvotD1PDgkDfANIFUECEpCABAoIpHpWqjMUJFE9ajwXSRiHIBODCH/+8+t97+8/Cv7N2ZAKkugq6tYxEnpy6J1dFVBhhyXgdr7DVq0Fu5JAPDSvzNO8JCCBNgmg6GNUzEMrSn8ul78lIAEJSKAugZ4H/D3LXrcW11M7up1bK46dLSspiJOOd9BpeHduK2VYry1j7CFAvcc2g3u2bZ7LE0OzQQISkIAEJFBCYMrGMnV9PLemztU+ht6MTvTSi/7+/poDJh2VBmxIV8pdKl+t+Fu38SW/1IFeK3/TkcARAjpRj9DzWgn8m4ADQZuCBCSQEmB1xhOU4LTMfpeABCQggReBXvv/dGWkdblOgO3c9hjKIuVWJlf94x//CJEWP/PXl2A4rOl0P8JyUXBPHiLAihGMnjXbK87ZrcbwQ8L/++Ka7bSGPKYhAQlIQALlBNYmbqF/s7sGz60rnzF5Sdi5Y09gW9+RA/VT6hjtdUw1cj0+uWxu5/vk2rfs1QhsmcFdLTMTkoAEuiCA8v729taFrAopAQlIQALPI4DTFINUGKV0NJS1gdjODQMPqzRLtnFryWGIc4w2MLe9WrQTyodRsqYzrYy4se8igNGTlde021rjXpzytDv7nbtq1XwlIAEJ9EUAXWvumZG/YoFnDH+pvsXkN547Z+sxyIjuVO4wfO3+MFfGvmrro7QvB/fXjwf9JYHOCOhE7azCFLdNAjUHlG2WUKkkIIFSAqnCXnqt8SUgAQlIQAJnEsC4E07AM/NpNe2Y2V7DUEUa/GGUy414c+WvuTXqXB4lx5F/zuCH84y2QvmCW0naxh2DQC3naUoDx3046c92qDpeT8n7XQISkEB/BGJHjNQJuuacS59d8Z10ztaD53SqNeqsRv3+/e9r0bo6v1ZHS4VZcpwvXec5CZxBQCfqGVRN83EE2K5hbvb242BYYAlIQAISkIAEJPBgAum7I+cwYNDHkVayenEurdLj5P1UByqGHFYGxOoAtrJNjXGlLPP4cMUZFIa+/Hz8Jk5rYe4drxgd4RbO4rPkZoVIGDjPysN02yMQ9yKS0TfRDjA+094MEpCABM4k4OSKM+mek3boV+hu7I4Rv8/JbX+qL52pXK9BD+pt14/QEadobZ1cOHUtx2rq6HN5eFwCWwnoRN1KyngSWCDAA/L79+8fjDIL0T0lAQk8gABGIIMEJCABCTyPAAN+/jAqREgdq6lBIL7zDqerHEh739UUZbnzE6awDG4lskwZcjC+1V4Bh2z8YQRD1tRJhLwYbVt0EC05MSnH2TK36FguaV/GPU7g5bB/3TO1Vwktte/jkpuCBCTQGwHsdzzXpnSD3sryNHnR3ab0q60czp5MiK7KitK9ej0TLPfouVvLXzNe6OW5jsjxowuN0AMMEmiJgE7UlmpDWbomwEODPzr6ow+LrkEovAQk8E5AY6ANQQISkMCzCaQGhfT7FBW27rrCkNeqA2+KSX4s5YMBjbLgGMFJGd959sbzN5in1+Vp8hu9nRWpXBfXTMUrPRYGMFanpjK0tpVvlIsxDKtRg2kc5xPeUZ70eM3vpJ/n0fIqk5plN63PBLiv+au1Wjz6hc85eUQCEngaAfqVeN5v3UHiaYxaL28+QW2LvOiK6GC5rrHl2q1xUn1v6zV5vNeEotcOIPm51n7jLEZvjFBTb9OJGlT9bIWATtRWakI5hiEQytgwBbIgEpDALgIYHMPIO9p7LXYB8SIJSEACElgkgLFgr1EoTxiDRu40YNb+ndv4xmx15MBZFzP0MWoRQubUmYkxKo2bljNWrXEs/Z7G2fqd53UE5GG1bk2dHu7UL8amvF4i37s/KW8YF+eY3y1jSf7whjvtLhxyJddPxQ0DbLThiEP7I78RuEWZWvnk3mRVTuk9Sb0TqCv+9vStrTBQDglIoC4B+hRCONP45NnsYoi6nFtJjWf3FfaY0DdqlJvnVk09tIZMeRo4TEP/Dt021afz+CW/qbPWy19SHuOOQUAn6hj1aCkkIAEJSKBRAunMvEZFVCwJSEACEuiMwFUGoT1YwlnKtWGoxMgyF+JcfBKP8vH8vMPxgRxnGG5I8woj3hznLcfDoIzDCmMyjsFw/m65vnYcjHKsGErDFodYbNPIdXDnj3IccaZy/ZZJCLR/DfFpjR3/zj0Z7TGtg7SvoV3gxCakfcnx3E1BAhIYjQB9xJcvrwkaMXnojOf+aNx6LM/WZ3eNsr30vO9VdIBwStaQ64w0eP6mDtP0e438Wt21pUbZTKNfAvOj2X7LpOQSuJ0Ahh8Hb7dXgwJIoAkCrSvATUBSCAlIQAISeHf04PxZcsCgY5auyDoDLbPP0xAOjFr678vAec9QNXfapeV8yncMgXBAh3kZBf9+S9HJm788LDnXuUemrom0KFOpsY80U+ddLk/6m3vBcA6BI07wcyQyVQlIoGcC4UzlmYCzzTAWgSsdqEEOXQP9qVTPiOt7+VzSw2qUISb11UjLNCRQi4Aafi2SpiOBhAAz52sZkZJku/uKwYEgi+6qToErEtCJWhGmSUlAAhIYnADGlylHKjpVrJa4G8HXr38dVreDs4abVwtrmcOSgXJtB5Ao11YDJ22iZAVxrL6++z41fwlIQAIS2E7gbKfQdkmMWYMAekI872ukV5JGDfvP1GSwEhnOjMsq1LPvF/JomcGZfE27XQI6UdutGyXrmAAzns5+qHSMR9El8CgCKn+Pqm4LKwEJSOAwAZ4bqZPojpn0U4Xg/aSj67es8jW0TwDDaLr6OSZu4kDdspqI6zFyLq36hsKee8/Jo+23HyWUgAQkIIFxCaRb+t9RytHtP2u6Uw3m6Hijc6zByTSuJaAT9Vre5vYQAnb2r4rWiPCQBm8xZwlsMeTNXuwJCUhAAhJ4LIFw8rSgUz7BeUpDwxHXAu/HNvrCgm/dXncuWeoaQysTA/hDZ8OxGitI9rSFfJvrubw9LgEJSEACEpBAXQLocS288qJGqVpdicmY4IrgqxGuoGwepQR0opYSM74ENhKY2opt46VGk4AEBiGAUQ5j3F1byQyC0WJIQAISeCSBPU6c2qCe4kCtzc30+iDAPcbfUYdslFajX5DwUwISkIAEJHAdgT07R5wpHQ7d0RaVXLGNb9TJf/6n7qpg4Wc7BH5uRxQlkcBYBBiQ40g1SEACzybAO7dcmfDsNmDpJSABCewhgLHiqhnfuXyR9+jb96blxtjF+14NEthL4En3y15GXicBCUhAAhKoSaA1ByplW3s/e83yX5XWL7/8elVWwzmgLwNnRqcS0Il6Kl4TfzoBHalPbwGWXwIvAq5MsCVIQAISkEAJAZyYvHMIp8yVE3HIC0di5F0i8whxdaSOUIuWQQISkIAEJCCBJxD4xz/+UW03iZZ4tWY/Ynxw5cpaFyS11BqVJQi4PjpI+CmBkwiEI/WKl2+fVASTlYAEDhBocWbkgeJ4qQQkIAEJXEAg1RvZ0eDsbeExjvz5z3+51EByAcZdWYQj9fv3v++6/kkX4exnrDN64P44+x4cnaHlk4AEJCABCdQkgKOtRR0E3ailnSmQZ4tTNt4JH3UUbLmeschVAcd45H1VnuYjgS0EdKJuoWQcCRwkwAOAB8GVD56DInu5BCSwkwDvv/jnP//n/V2oKn87IXqZBCQggQcTmNrC99u3b++viaj9XPGdpw9uaBWKTnvEwZiHERyOlAujI4ZQdLsRypTXk78lIAEJSEACPRJo1YEKyy0OyyXmNXUOHKDpxMylfFs4xwIE9a0WakIZpgjoRJ2i4jEJSEACEpDATgI4UFX8dsLzMglIQAIS+Ok//3N6iIYRhEl5a8+YmHG+FI84vNvoyq25eqpanuWGbQRoZ7kzPp84ikGQwDvCMJDVngywTdLlWHHfTK3I/u23fyxf7FkJSEACEpCABC4h0PpKxaNO1Fo6aMsOVJzgU+OQfDXsJQ3KTCSwkcD0CH3jxUaTgAS2E8DAMDUo356CMSUgAQlIQAISkIAERiaAwWPJsYlzKndQzfEgXuq8wjARK+vmrvH4i4BGnLKW8N///d/vFzABYKr9xjE+YduKE3XJcRoEWnX6hnx+SkACEpCABJ5EYGmSYAsc5iZDTsmGns5ELfRz/ri2Rvlac6BSTpzDMTZBD+S1Gez6EeMaV6FOtRCPtURAJ2pLtaEswxPg4djTVgrDV4gFlMAJBJgs0ZKB8IQimqQEJCABCZxEoPY7lFLn1UkiD5lsK06+nuCGIzXd3jd3RrfGdWoVRMocg16UKz3udwlIQAISkIAErifAKtRRAo5FHImEmvpR6phsgVW6iw62snSlLQ7j0BVrMmih3MowHgGdqOPVqSVqmIAPhYYrR9EkUJGA93pFmCYlAQlI4EEEajtRH4SuWlFHMtBVg1KQUI0VFAXZHYqK8TLfihjHKQa9PeXAIBoTFw4J5sUSkIAEJCABCXwiEA63TycaOjClB6BbpDr+WZO0cp3maiy5HsTvVJ/itQ7pb+TTdnZ1LZnfXgI6UfeS8zoJSEACEpBAQuCI0S1Jxq8SkIAEJPBQAukKvociuL3YPMtz487tQinAqQRYaUq9s43e0bpndcWXL7+eKq+JS0ACEhiFAH1v9L+xpecoZbMc5xBgZz/aTMu7RPC+z3QHwliJidxnyr/HgRr3II7MLa84WKpVHKaxNXHEy/WqlustZPZTAnMEdKLOkfG4BE4iwAPUd6OeBNdkJXADAZTF2IblhuzNUgISkIAEBiGAfmi4jwDPc4079/G/M2eMhzVWQvSwQuZOzuYtAQlIICVAnxn9L9/XtlhPr/X7cwmwopO/cE62RuLVpl87U+BQDf2Cz/R3Tbm/fv3r5p0wcJxyv+UOzrgX4/iW96pSB3EfR3mivPHbTwmMQkAn6ig1aTm6IcADKX0oIXi8RDzd3qGbAimoBB5MQAfqgyvfoktAAhKoSABDxdT2XxWzMKkVAsyeN0hgL4Etxsa9aXudBCQggREJsPqUCWQ8f18Ops9brI9YbstUh0DefuqkWicVtq2Ndp2mWNPBGI5TbFJTYwgcnLHCmzjslpE6PNFbCHMyMalhKeCMDdv2UjzPSWAUAjpRR6lJy9ElgXhYxSeF0JHaZVUq9AMJ6EB9YKVbZAlIQAInEVgzVJyUrcn+m8BZKwME/BwC6dZ9LZc632awZVmVTQISGJ8Azp/Y4hSnDDtC4OgJ58/4BCzhEQLRflrT487e2SSdfDnlQE0dnKnjNGUdesuUg5V4U+lynPhTDmLOGSQwMoGfRy6cZZNAbwR40PLwN0hAAm0T0IHadv0onQQkIIGeCPAu1DlDRU/l6FVWZuqnExp7LYdyS2ArAcebW0kZTwISuIoAiwlw6vBeR1a32U9dRX6MfJ62GIXdDJdCOHG5l9BxX2ON18pTruM+i8AYhEkLWyd06kANcn4+jcDyXfc0GpZXAg0Q4AH39vb2f8a0L74TooH6UAQJBAEcp2zLwkw+ty0JKn5KQAISkMARAuh7rrY4QvD4tWuGqOM5mMLoBDBO9hQYb6bb/PUku7JKQAJjE8AZ9p//+af3rUexi8WWpWOX2tIdJUCbeVLAJhV245gIyJgiXhWXskBHScca2LXmJm+SRqTHatbcOc2xOJ/m4XcJPIHAs3qZJ9SoZRyGAA+m79///j5jiPdEzD3khimwBZFAowRQMnl/hI7TRitIsSQgAQl0SAAjBYaJ3DjRYVG6FznqIGbtd18gC3Apgd4mQmBg1QB6aRMxMwlIoJAAtq8vX368L1V9qRDgA6O/2swPB+CoCHCIhn0438KYZ3v+fJ/SUeZsyywYSK/HUZsHnKgGCTyVgE7Up9a85e6GAI4b/thuIYw83QivoBLonIDb9nZegYovAQlIoEEC6nTtVQo6NqsY3KKsvbppXaLexmesRsEAa5CABCTQOgGcPfG+VFfPt15bync2gXz8gP7BxCjsxekK0lSOeO9pemzuez6ZMHei+vqLOXIefwqB//jb3/72/55SWMspgd4J8GAseQj2Xl7ll8DdBFAUXYF6dy2YvwQkIIH+CaDDYezozeHSP/nyEuQz+8tT8IonEfj27duTimtZJSABCdxGgFVwTHiaW0l3m2Bm3ASBUSfAs/oUZ+nSGGLKbpU7XZcqaUn3ZQwTztqlNDwngdEJuBJ19Bq2fEMRYGsFHm46UoeqVgvTKAGUcB2ojVaOYklAAhLohIDO004qKhETPXvKGJVE8asE3gn09i5Uq00CEpBAzwTCicQ4XUdqzzV5juy0CZ7LI9lwKE/6PtMScnG/pNeEszQcs/H+4XQb3zQ+3zm3dD6P728JjEpAJ+qoNWu5hiWgI3XYqrVgjRHgPagGCUhAAhKQwF4CRwwfe/P0ujoEMFgx655VLxqO6jAdMRW3xR2xVi2TBCTQOgEdqK3X0H3y8VwexYnKRMytDtTYqv/797//AT+fbJDqtKMw+qOwfpHABQR+viAPs5CABCoTCEdq5WRNTgIS+DcBV6DYFCQgAQlI4AiBEsPHkXy89jwCzOBnVerXr399X9lAnRokEARoDxryg4afEpCABCQggfsJjPRcZjJfScjLni8KwIlqkIAE9hMouyP35+OVEpBAZQI4UvOZRZWzMDkJPI4A99Rvv/3DVSePq3kLLAEJSKAeAZwrvnqhHs+7U8Io9eXLr+9ioCdglPrf//3fD7oCq47zY3fLXZI/bTaMdT2Xo6TMR+MGr6PpeL0EJCABCUhAAvUIoNOMsIsIq0XRydA3+Pzll1+LJm9xPdcyKRD9dQQm9VqJKUmgnIBO1HJmXiEBCUhAAgMSYGbef//3fw9YMoskAQlIQAJXEdCBehXpe/LJHaq///6/78apVBr0CYxdrW+VRltdMsiFw7j1cqTsr/zuVr5X0jYvCUhAAhKQwDYCOA5HcRi+Fs/8673gTPYvnaSJfcsVqNvajbEksEZAJ+oaIc9LoGECGG7yLRsaFlfRJNAsAbfvbbZqFEwCEpBAVwRKjRtdFU5hPxB4OVQ/D6eZ8U/g/VThiGxpdeea8zQKmTqMdaQGldcnDB2DfWTiLwlIQAISkEALBOI9oiPqLuiVc/oHNq2pMIpDeapsHpPAlQQ+j/quzN28JCCBQwSYURSGmkMJebEEHkzg+/fvw8xUfHA1WnQJSEACtxPAsWKQQEogdURi+GIC5J2rVNl2OIyLqZxL3yP+iMbIpXIvnXMr3yU6npOABCQgAQncSwDdhWf1CDuNbZ38hn5pkIAEziOgE/U8tqYsgdMJMKNIR+rpmM1gUAIYM33/6aCVa7EkIAEJ3EDAiW03QO8oy5dD9TX8vsOwt8eBGnh1pAaJ16dO1I88/CUBCUhAAhJojQB6+f/P3tuEapacd55vVWbqZk5mtt9sc6EaamMogQa0UFHVYA+zsHY22FAFvTfeSUhCq4ZhPAO9aQzj3UjC3hntBVUgQS9tepppGEvICy1Eq0hvBKPmwuR1q7JVqcpUTf7foydv3HPPR8Q5EefExy/g3vfjnBPxPL+I95yI+MfHrVu3D5eXT3IzLdiesdmnFpH6tphxajR4hUAaAq+niZZYIQCBrQiwvv1WpEmnJgL63agyTUWzplzFFwhAAAL7ElBHDQECPgTUsbflzGWlZUKoj31D5+j6hw8fHiTGKr4t7R+yZ8/vGDCxJ33ShgAEIAABCPgR6Aawlb1SjE2emfL42bNPpg5zDAIQiECAln4EiEQBgT0J2AOVxvyeuUDaJRHQKL0alnUpiTm2QgACEKidQCcq0bSqPZ9j+qfZjFsM5lLZjLVX71h7Q3Urhb2XK46ZP2NxSUQmQAACEIAABCBQBoH79x8UPxt1bqneueNl5BRWQiBvAsxEzTt/sA4CXgQQhLwwcRIETgS0hC8BAhCAAAQgEJOAOmgIEAghcHZ2N+T0xedusfSsLVUskXUrvxYDWXlh7f6txMPlEIAABCAAgawIqI6ilTRKDoikJecettdCABG1lpzEj+YJfPxxmDBkI8abBweApgiwV0RT2Y2zEIAABDYhoI6Zub2KNjGERIoiUMMSc0PA5VetszW7pYyZcT6U73wHAQhAAAIQyJWABnmVXDeZW7lk7niu+YJdECiJAC2AknILWyEwQeBXv/rVaeS3Tyee9oPU7FUt76WZE1p6S2Fsia6JZDkEgaIIMAu1qOzCWAhAAALZE1BdivpT9tmUrYEqO6k7vvaYvaDZmmqb6PdhwZ0RK5tS+23pxnqVL2v3lY1lC/FAAAIQgAAEIBBGYI/6UJiF02e7E2Hcft/Ly8vpCzkKAQhEIYCIGgUjkUAgDwLaTPzOnfnl5CSiKqjz4vLyySvj9b1EVfeB/OogbyBQOAFmoRaegZgPAQhAIEMCCKgZZkpBJqn8qP5dmqA4h1htifPz88nTVC9T20Via6wgodMVa4fiXZoev/UhmnwHAQhAAAIQyJ9ADX1Btu+8aFu/rwTU2uqQ+ZcmLGyVACJqqzmP31US8JmNOtVRY6KqlrlgpHWVRaRpp5iF2nT24zwEIACBJAQQVpJgbSpSlSEJfzZDopXOMAmt6gRUm0PtE/m/VOCUeOo7EFSzZEPFWy3ZzW+9qZ8lzkIAAhCAQEUEbPW9kl1SXcmtL2pLt1bqjCXnG7bXQwARtZ68xBMInAj4zkadwmUdGAipU5Q4VhoBKpil5Rj2QgACEIAABOonMCbO2bJtNvPA6uc1EjEGEjjl79Sgz77/oQKnibdKSwPsVD+0ZYdtFqteb93qukpYoadPnM8QgAAEIACBsgionqEtzUoOqq9Yn5YE1JrrhSXnE7bXSwARtd68xbNGCehBOiV+WodAo3hwGwIQgAAEIAABCEAAAtkTMPHOXpfMoJST1uGWvcMvDewEztunWZ8SkU1AHtpDNWT26ZDvSut4PA4d4jsIQAACWRLQABMTgo7HR6d7ZpaGYhQEMiSgekNJdaIphAioU3Q4BoE0BBBR03AlVgjsSkCdDtbh0jdk7Pv+eXyGQG0Eaqo015Y3+AMBCECgVAJTda5SfcLuPAl0AuODgzuDMk9L41jV+Xu9u8KEVaVgs1fjpEYsEIAABPInoPueBsWzTU3+eYWF+RDQ4IOQFS7ysRxLIACBnAi8npMx2AIBCMQhoCV9p4ItWTV1ju3LNHUOxyAAAQhAAAIQgEDLBOjIbDn39/Fd4qJmUGoZW5/ge55PXHufI98lIiCg7p0TpA8BCOxFwJ4BeiVAAALjBDTw6vLy8jR7u5YZqOPecgQCEEhNgKduasLED4EdCMwJoNrnZ64SoeMarUUnxQ4ZWGiSqqRKwFf5UxkbWlbanUGgUbQ0/grNbMyGAAQgAIETAdWX9GzjeUaB2JqAOyNprF4ful/o1j6QHgQgAAEIQAACEIhNwF36OnbcxAcBCLRJABG1zXzH68oJzHXoSeDyCYioPpTaPMcqpZrVrPLU36tKZdDE1P4xl5iuZ0aBS4T3EIAABCBQGgHt24iIWlqu1WGvyp1mpVq9zPWK/fJcGryHAAQgAAEIQKAFAhrcqD6oe/fundxl/9AWch0fIZCegJ+Skt4OUoAABCIT0PJy6lQZCpoB6BPmxFifODinLgKqkF5ePnnlVFdGPn312X0zdczOs3PU+TdWXu3cta8+M7DXpsH1EIAABCDQHgFW7Wgvz3PzmAFpueUI9swR6M/g73+eu57jEIAABCAAgSECGmB2586DV4emBvW/Ook3EIAABGYIsCfqDCAOQ6BUAiaADtkfMltibn/Vofj5rl4CKjs2oi+mlyqv2q9iKKhT5eOPPz7Nshg6zncQgAAEIACBvQikeCbu5QvpQgACENiCgA3KVN1f7zWYUoM0x9oCW9hEGhCAAAQgUCcBDdbXCmgECEAAAmsIIKKuoce1EMicgGajjgUt8eUTNGqLAAGXgPY6TVEJHRJSrVNFS7D88pe/PHWuqLNlSfBdxnpJ3FwDAQhAAAJtEuDZ0ma+4zUEILCMgAmourqr+z851fHts+r+BAhAAAIQgEBMAhJStU88AQIQgMBSAoioS8lxHQQKIDA3G9VHSFUcNGbzy2wbtT1kmR1Tvg0JjmPfD8Xlfqe4NCP04uLi1OnhHov13i1vSkvCqRuss0XHQoPvMtah8XI+BCAAAQi0ScD29W7Te7yGAAQgEEZAbRB3W5Chq1X3H2q/DJ3LdxCAAAQgAAFfAvQH+ZLiPAhAYIiA38aIQ1fyHQQgUAQBNVQ14mpovy4tzSohda4xqwbv0PVFAKjQSOWHKy6qMqhll8f2elAnr2bKnJ3dPdGwa63z1yqTY8s8qyND8Ws26BZB9nVC7/Beq7JBtsinkHIp/+SzhFgCBCAAAQhAYC2B+/ev9ltaGxfXQwACEKiZgAZA+rYltJqSZg0RIAABCEAAArEIzPV7xkqHeCAAgToJIKLWma94BYFrBEyUUmdfXyjzEVIlOklI6197LRE+bEbARE8laILoVOJd/n16o+PCvte1EheHOiv6gu1UOjGP+Qid5nuIkCrh1SfumL4QFwQgAAEI1EdAz03qRfXlKx61RYCBotvkd7f3qf8gRtXVJbpqCxECBCAAAQhAYC0BPe8JEIAABNYQYDnfNfS4FgIFEVBjVCOvhioPJqROufPixbJ9KKfi5NgyAinyQuVDy/S65UPvTahcZmn6q2RfyJJfNhs3vWWkAAEIQAACtRIYG3hUq7/4BYGaCfTrv3O+htQ75+Jq4bjaE0sGMGrWKqxbKCH4CAEIQCA9AbefK31qpAABCNRIABG1xlzFJwhMEBgTxeaEVC0VS8VjAuxGh1ILmyofGi2uv7GyspGr3slocIBvJ4vK+b1797zj5kQIQAACEICAS0DPkKGVG9xzeA8BCJRBwFYzUZ1XMx99QorBjD7plnqOGGvgyZLA0otLqHENBCAAAQi4BJYO5nHj4D0EIAABRFTKAAQaJCCBbChIYNL+qUNBo4HVwYCQOkRnm+8kFG4hbGq0+JIR49tQGE4lREjV0mBLO3OGU+dbCEAAAhBogYDqSCwv2UJO42NLBKxOqLaOr5DaEp8Yvmo7jaWBPFlKjusgAAEIQEAE3O2wIAIBCEBgKQFE1KXkuA4CBROQQDYmhs6NFpaI5zvrr2BE2Zmu/GI09nS2PHvmv8+F9gcmQAACEIAABHwIdMv3PjrYrDWfazgHAhAog4BbJ9TKO3PB55y5OFo7vmY7DYnbBAhAAAIQgMBSAposQoAABCCwlgAi6lqCXA+BQglMzWh0OxOG3Hv61G+5q6Fr+c6PgIRqCacafa29mqbyyy/G+s8K6dRiWd/6ywMeQgACEIhBwJbvpQMmBk3igEB+BPTbPh4feRsWUt/0jrTyE8XYZvwucZXZqEuocQ0EIAABCEAAAhCAQCwCiKixSBIPBAokMLWs79S+kZrJOnZtgRiyMrmbcao9SZ+chFNGX/tnT+gSxGuWFvO3ijMhAAEIQKBUAizfW2rOYTcEwghI5NPvfa4uyWo8YVzds9fM5Kc95JLkPQQgAAEIQAACEIDA1gQQUbcmTnoQyIjA1LK+c/tG6lpGBcfNTNvzdK4DJ26qdcUW0rnF3hh15T3eQAACEIhFgOV7Y5EkHgiUQ0AinwaRTg0U1dYRDMJblqdrRFSlSLtzGXeuggAEINA6gZA+otZZ4T8EIDBOABF1nA1HINAEgallYucauxoVPLa3ahPwIjrJnqdxYIbsixonRWKBAAQgAIGaCHQC6vHl0pPsn1RTvuILBHwIaBCpwpiQylK+PhTHz5la6Wj8qu4Is1HnCHEcAhCAAAT6BOhn6xPhMwQgsJQAIupSclwHgQoI2EyLMVckos7tXyMRlpFdYwT9vldHzZSY7RcLZ4lASOcWHeSUGQhAAAIQMAKq72g5z+PxaF/xCgEINEjA7gEIqfEz/+zs7qpIGby7Ch8XQwACEGiGgPoo6WdrJrtxFAKbEGCI9SaYSQQCeRFQR6EE0rmZprJaS1bNLS+r/TvV8ajlURGmwvKapanCeMU+W7+FufIdO03igwAEIACBfAhoZpQ69qm/5JMnWAKBvQmojaQBjuqANVFVdXarM15cXJzaPj5tqb19ySl93WfX1L2VJxJS1T7lvp1TzmILBCAAgXwI6DnBJIV88gNLIFALAUTUWnISPyDgSUBiZ0iDXw1Un+WT3ErK+fm5pzVtn6bRcT5s26YU5r11bvle5TNIwDcuzoMABCAAgTIIhAwmK8MjrIQABGISMBFV9UqbkdqvY6rto7/QtlVMO0uMS2z7LEP80LX6UxuKe3kIOc6FAAQg0AYBVi1oI5/xEgJbE2A5362Jkx4Ediag2aIhQSOGj8dHIZdwLgSKISARlQABCEAAAu0QUKe7ZpaFDChrhw6eQgACRsD27zTRzr7vv0pIZWuTPpXxz7r3iq3uxWuD8kb8TeheGx/XQwACEIBA2QTcVSPK9gTrIQCB3AggouaWI9gDgcQEtPRuaENfQqpGWRPiEnjx4nncCIktmEDooILgBLgAAhCAAASyIoB4mlV2YAwEsiUQMtDu6dOPs/UjR8MePHhwGswSQ0iVfxJTEVJzzGlsggAEILAdAVZ62441KUGgRQKIqC3mOj43T0BCaugSFzZq2AeeGrGhQq1PvLWd8/w5IureeWp7M+1tB+lDAAIQgMA2BBg8sw1nUoFA6QTU9vEV+brZqtTrQ/P8/v0HoZeMnq880AwkAgQgAAEItEmAAU1t5jteQ2ArAoioW5EmHQhkRkBLH4UKqRo17NOZ0I0GfsKI4MzyHHMgAAEIQAACLRNQHUaDZwgQgAAEfAgwG9WH0vJzdD+2ZZOXx3J1pfZJjSGkajCw4tHA4ND28pU1vIMABCAAga0IdBM5Pt0qOdKBAAQaJICI2mCm4zIEjIDtIRPSONQ+Yj5CqtKwpZWYlWrEed2CQEh5lj0s7bhFrpAGBCAAgf0JcL/fPw+wAAIlETg7u+ttLjMhvVFdO1GDdGMLqUtXRVIbQtdq1SYJsspTay/Tnr2WbXyAAAQgkA0B3bt1vyZAAAIQSEkAETUlXeKGQAEE+o1DNRDnGp5aeilMSA1fPrgAdJiYKQF1doR0dLC0Y6YZiVkQgAAEIhPgfh8ZKNFBoHICods+dMIby/qGFovYQqratxJCQ2al6tyuDXGzI97iCx2oGcqB8yEAAQhAIIyA7su6dxMgAAEIpCbAelapCRM/BAohYI1DM/fZs09eCqXD+9SoQ0EzUkOWzFDFRnuAqpFMgEBqAtoPQ2XUJ7C0ow8lzoEABCBQLgEN/Or2N6TpU24uYjkE9iGgJX3VTvINIXVQ3zhbOE9tRLUVQ1jPcZGorT8L9izQgBqr/2vgpfLMJ13ZR4AABCAAgTwIaPCLe4/PwyqsgAAEaiVAT0KtOYtfEFhJwCojU6KnZqRqlK9vUJzqiGA5vY5YyD5Lvow5ryOgjhBVqqfKr8tKnSo+nSfuNbyHAAQgAIH8CWiZSN9nQf7eYCEEILA1Ad0/rF3kk7bqkxLmTKTzuYZzOgJqI6asj3d50wniqvurLRaSt4iolFQIQAACEIAABCDQJgGW820z3/EaAl4E1KicWtp3SecAS+ldoUdMvmKR4p3Kr++yWwjaKXKAOCEAAQjsR0Ad5MfjIwTU/bKAlCFQDYHQPTs1s5EQTmDLdqIE1RABVd6YQB7uGVdAAAIQgAAEIAABCJRMABG15NzDdghsQECNRc02HdtjUp2UIWGJ8BoSf2nnhnbKlObf3vb67o/KyPK9c4r0IQABCMQj0AmoR2aCxUNKTBBomkDobHa1n0L242wabqbOj7VxX7xgSd9MswyzIACBxgjQh9NYhuMuBHYmgIi6cwaQPARKISAhdWhWX8hsSgTDm7lNxe8mk9jfzM0G0AABdXYRIAABCECgDgLaboAAAQhAICaB0HaMregT04ba48ppsK2eI0NC6lB7uPZ8wT8IQAACuRGgDye3HMEeCNRPABG1/jzGQwhEI6BZff0QsuySOhPGZrT2423hMxW/bXJ5bjbAs2efbGMIqUAAAhCAwCYEcuqI38RhEoEABJITCJ2NKoPm6qDJjS4wgSGxWmLmw4cPD0PHUrio9PQcGdruQ3mKkJqCOnFCAAIQ8CfAqgD+rDgTAhCIQwARNQ5HYoFAswTUwBwapTsGZGxG69j5NX+PeLdd7k4J+MwG3i4fSAkCEIBAagIhdZLUthA/BCBQF4ElIl7ovpt1EQv35uzs7rWLdE8/Ho8HrX7UP3btxEgflMdKT2FIRNX3Glh8cXFxWrIZQVVECBCAAAS2JcC9d1vepAYBCBwOiKiUAghAYDWB0GXz1PBkn6DDAfFuddELimBsb1+W8g3CyMkQgAAEIAABCECgSQJLZqMKFO0e/+LSH6AbsnWMfyrDZ2q2q5vHcysuSSA3QfXy8vI0Q7WUVZdkJyLEcDngWwhAIG8Cut/Sh5N3HmEdBGokcLtGp/AJAhDYloAauxq1GzLSWudKROz2m2nvVqTOFCp+25ZTpSYhVR0kW3bIbO8lKUIAAhBolwD393bzHs8hsAWB0DaPbFK7xxXntrCz5DTUPlSdXcG9p6vNmSoMtQ9C0lO7ztp2mj07Nou1b79m14ak07/e57MEUy19qba3/sxOXSshtdX2uA87zoEABPIioHuWew/LyzqsgQAEaiaQrhZaMzV8gwAEbhBQx0C/UXbjpN4Xqvy0KmqFCM49bHxcSUAjxlVWfTs3VibH5RCAAAQgsCGBuZlDG5pCUhCAQIUE1OZZUo/XAEqEVL8CIVFxTIjU97E70IcEVLN0SXqyz9dGlaWh9F3h02wJffVpm1t7/Pz8PDR6zocABCCwKQHdF9WXExLsWbLkuR2SDudCAAL1E0BErT+P8RACmxHQSGHfBqNrlIlarXQsqPJH2JfA0kq0KuEq56GV9329JXUIQAAC7RBIPaOnHZJ4CgEIjBFgNuoYmXjfh24XszTlIQHTjUuDLpe0b9045t6rXaHZVUrLR/ici2/JcbVPeX4uIcc1EIDAFgQ0ECm0D8e9v2vW/9OnrAa3RV6RBgRqJcCeqLXmLH5BIBGBqT19JC5JZFoSVCHS3gYECORMQJ0ba8p5zr5hGwQgAIHSCSytg5TuN/ZDAALbElg68JOBlP751M1GvTnmP+ZKMm4Hu79lac6UUKv2cGrBdsx6iQsECEAAAjkS0LMzVEA9Hh9tthx8jsywCQIQiE8AETU+U2KEQNUEusZdmpmUajROibS1gNWeNIQyCWgEo8JWo+PLpITVEIAABPYhELNzfR8PSBUCECiFgGajhgbaAKHEbp6vmZoxgvJPAyPngtX9584r/bja4RcXF6cZsaX7gv0QgEBdBEIHeej+PjSzfq9BKnXlBt5AoF0CiKjt5j2eQ2AxAe1jOjaSem3FJKVIu9jhyBfGavxHNovoAgioUr6k8ywgCU6FAAQgAIFAAq10dgdi4XQIQCABgSWzUWkDrMsItT/XtjVlgerwvvk31BG/zou8r2bLkrzzB+sg0BIBLXOuSRah9/2h9sBY/2VLPPEVAhBYRwARdR0/roZAswQkpKpS0w9aFmltCB1ptja9ra8fqtRtbQPpLSNg5V6VcGY8LWPIVRCAAARSENCyXa11dqfgSJwQgIA/gdABdYio/myHznz27Gbbc+i8qe+07LuvgGrxtLZUfAsrQ1ne8goBCORJQPchDeoIXcZ3bBYqK0Hkmc9YBYGSCCCilpRb2AqBzAioUtMXUrUskjoy1wSNNKt5f1Q6edeUjv2vVbmXmMpI7f3zAgsgAAEIiAACKuUAAhDYg0CoGKc2Tr/ttIfdraYpMfR4PAa7r2tCBfPgRDK6IFS0yMh0TIEABCogoL7AJfehqUEyDGKqoGDgAgR2JoCIunMGkDwESicgIak/WlUi4fn5+arGpjoZ+vGWzgr7IQABCEAAAhCIS0ArYDA4KS5TYoMABPwJhA4eVdtJe0+qncPygv6cdaZE6ykxUx3o+tM5dp773RIB1SxU2oqrlUA7vJWcxk8I5EVAAmro8r3mwf37D+ztjVdE1BtI+AICEAgk8Nrjx48/C7yG0yEAAQjcIKBG5VDDVJ0DmrW3NKgBHDrKe2laW16nzhMCBCAAAQhAAALLCUhA1QoYBAhAAAJ7EpDgtGTWjGxmJn14ztls3lu3bp8u3nIgzZoO/nBP971C7XDbhmZLxvt6TeoQgMBeBNbcX6f6Ddf2Se7Fg3QhAIG8CHS1zrxswhoIQKBAArYEr0Z/uY0svVfnwFIhVR0S2nuSTtICCwUmQwACEIAABBIRQEBNBJZoIQCBYAJrZriojcT9LAz5nu1CDRpWh7z211O+62/prKkwr7c/W+1wd3AAgv/2eUCKEGiFQLc6w6eL3NWEjqmJFzH2015kGBdBAAJVEUBErSo7cQYC+xLohNQnN0ZUS0hV58DSPSR1nUYau+Lsvp6SOgQgAAEIQAACexHQaPM9O9H38pt0IQCB+AQkiO3dxqCtEz9fU8ao8tIvM66w6gqPKe3YOu6nTz8eXHlqaztIDwIQqIeA7p26t6wZjKJJF1NhzUCnqXg5BgEItEWAPVHbym+8hcAmBDSi2pZZsgTV2alOz6VBcaqCRYAABCAAAQhAoG0Ctrxg2xTwHgIQiEEgRhtjTeev+aCZjYRyCUhUVXt3bt/Wcj08nESOfhu/ZH+wHQIQ2JeA7ifdM3jZDFQf69WHGOMZ7ZMW50AAAnUTQEStO3/xDgK7EdCI6tiNLFWwCBCAAAQgAAEItEtAA7L6M4DapYHnEIDAGgLWVtEsmDVBy5yuDWbL2ni4fn8CElK1vGSNgXJaY67iEwS2J6B7ydKV6vrWTs00ZSnfPi0+QwACSwkgoi4lx3UQgMAsgX4ja6pyMxvZb0/QZvMECEwRUAd718l+p9oOjCn/OQYBCECgZgLMQq05d/ENAtsSsLaKZqnY+yUWaGDHmhV3lOZaG5bYzTXpCNy//yBd5DvGrHKqvQsJEIAABJYS0D0kloA6Z0OMPsi5NDgOAQi0QWB64fA2GOAlBCCQiIAaWbYE79p9DsxExSkh9Xg82le8Nk5AnVbaB2Nq31yVQy2Tpkq0e646zPSnckWAAAQgAIG8CWhmD7NQ884jrINAKQSs/vfw4cOTyfq8Zq9lzT5UPXNNndI6ldfYUQr/2u3Us0ozlGtcSUl7vlqbytpVlp88o40ErxCAwBABCaix940ee+6ylO9QDvAdBCCwlAAi6lJyXAcBCHgRiCWeuokhpLo02nyvjnR1MPl2MqlBP9SotzgQU9ssR3gNAQiURcD3nl+WV1gLAQjsQUAikEQuqx/q/rJWSNUgz4uLi1XuyC5CHQRUtiTSmzheh1edF2qPjwkX8pnndU25jS8QCCfQH8RuA5fCY1p+xdql+penzJUQgECNBBBRa8xVfIJARgTGGldrTVS8azs61trA9dsTkHiq5bGsw2vMApUNGyHt04jXOfpTZT+F8D9mJ99DAAIQgIA/AZ/7uX9snAkBCLRIwOqImjnaDzHuMWtnHyKi9nOl7M8qU8rT2DOvcqYS43eUs3/Y1hHQjMKh+yh82iawV39Kf7U6lc9UfZFt5zDeQ6BdAoio7eY9nkOgeAKIqMVnYZAD7myB/oXuSEfrpNAyv6GNeImzmkWg+J49+6SpDo8+Uz5DAAIQyInA2v0Gc/IFWyAAgX0IqJNVdcOUHf+qS+p+ZfXRUE/V6at66NyAwdB4OX8/AjGWet7P+rCUeVaH8Sr1bN1Lda/SAAG2WSo1F5fZPfR8kmCpsrCnaKm0XSF16TN4GRWuggAEWiCAiNpCLuMjBColoIoSQmqlmdtzSw3yoc6kqQq7Ks6qzGuvHtuvZyiOXlKnjzrvzp0Hp042m7FgFXHNhlV89nnoer6DAAQgAIG4BM7O7saNkNggAIGmCKg+57OaSQwoJtIurSu+eIGIGiMfcopDQpMJTznZFcMWaxupfRQ6gDVG+sSxLQG3HNMfsy37HFLTPs/u6mDqj1n6rIvtjwmpuhcRIAABCMQmwJ0lNlHigwAENiWgPWZorG2KfJfE1HmuUY8KmiGq4DPaURVp/VlwK/z23dyrlS/ZoLStY0zX5dJgmPOB4xCAAARKJqD91XwHwZTsJ7ZDAALpCFh9Ll0K12NeM/tQdVwCBEogwP6nJeRSPBuHlkjlfhWPbykxdWJlJ6a6fS052N/v/8nBJmyAAATqIICIWkc+4gUEmiagyrwrbDUNo1LnNeIxRrAKv+Ky5aZ8y47NTjU77DqEVCPCKwQgAIH4BOigjc+UGCEAgW0IaObrkjososQ2+bNlKkPi05bp557WxcXFy2VhHzFgKtOMmtrqhvtVppkWySybaWozzt1ocxNQXdt4DwEIQCA2AUTU2ESJDwIQ2JyARCzNEmSWyuboi07QxE81/JYu74aQWnQRwHgIQCBzAuqw2Xr2WOZIMA8CECiIgNoma/ZHLchVTJ0goKWkrd0xcVqRh7QqlEKMZ/XTpx+zv2aiUqAyuGRJc7tuSiybOpbIHaLdgIDy3n7fSk75TF5vAJ4kIACBbAkgomabNRgGAQiEENAyq9rDspRAh0o+OaXGgO3toQ6AW7e6R6OvKI+Qmk9eYgkEIFAXAfY0qis/8QYCLRJQPVED9kI6n0PObZFpST5rBp8rRJRku6+t5t9aIVXlXsLN2nh87W7lPJtJKH/V5rXVmPR5aBYp9x+RyT/ot6L8i7UXscVX64CP/HMUCyEAgdwJIKLmnkPYBwEIeBEobTbqkg4VLxA7nTS0vEtoh9FOpr9KVg3GfqNRfimocWJi6asLnDd2jEaHA4W3EIAABCAAAQhAAAKnFU+WLOsLuvIJaHZlC2GNkCrxxsKQqGfHePUnMLX8bor2qtLzHYDs7wVn9glIEB/qY9HvT+K4+iw0IHxuVreVD4t/KE47xisEIAABCHQEEFEpCRCAQDUESpuNqlG2fdGuhMwwwdQq6XMNJlXSFZQ/KRptKZlZ/uh1bsloCak6p0Q/UzIkbghAAAJLCdCZupQc10EAAjkRYFnfnHJjO1suLy+LbOstJSQhRwLOXNvQjV/tRBNg3e95v5yAmDJoYzm/XK/UYIOpvpT+Md1/jsfjDXcUD7+5G1j4AgIQgMAsAUTUWUScAAEIQCANAVs2Nk3scWPVyMY5EXEsxauG9N3Jiv/Y9bl8PzeiU3bKVy0rLUFVDRT9mRCbix/YAQEIQKAUAtw/S8kp7IQABOYIqG7Y7+Seu4bj5RLQjLEWn2ES747HR95Can+mLoOn1pf5PtP1Mc7HUNpg9nmP8jtD/Qohwb3/0C8RQo5zIQABCAwTeH34a76FAAQgAIHUBK7ExdQprYtfDWF1/Ky198WLbkbqOmv2u1oNEY3o9A2aaazRn+fn59f2nvG9nvMgAAEIQOBwGowCBwhAAAKtEbCVXFrzuxZ/WxbMJaT6lN9WheZayrjrB+K3SyP+e/2eXFE0NAUGdocS43wIQAACNwkgot5kwjcQgAAENiMggTLn8PDhw9XiqflXQ+NKjZeLiwuvjgHzW68SoTWblwABCEAAAmEEtORY6Oj7sBQ4GwIQgEB+BHyFqPwsxyKJg60Hld9OuLk5iFbfqz01JDSvEYpaZ27+a8udrYPyjXIfj7pYavC2/vReM32XBgTUpeS4DgIQgMB1Ats/Xa+nzycIQAACTRPQ7E4JlTnuS6G9TzWbMkbQ6MmhhnKMuPeIQx0DriiqxuocKwmpOs/EZL3SUbBH7pEmBCBQGgE9I0P3WSvNR+yFAAQg0Ceg+mbI0qj96/m8PYHa2jxrCFr7Vm1KE/Z82oNiuHYFpDV2l36ttuDx4RzbT6W5dPuf2LaUHp/bT7C2v0B9FIpvjzJRej5gPwQgAAGXACKqS4P3EIBA0QSscVaaE7lWbGPyVCdQbaHfEPHp4O8LrRpZ2o+nNk74AwEIQCAGAT1HtDw6AQIQgEBLBHTv04DLfh2yJQal+Eq9fjinJAKFCEHsrznM0ffbNbMWfdMYO4+62hgZ/+/XLt07lNJewvqQLXwHAQhAoFQCiKil5hx2QwAC1wjEnDV5LeKNPmiWojvicPs6ayoAAEAASURBVKNkN0kmZB/RTQxKkIjK35IR08p3NWqePv04qHMhgQtECQEIQAACEIAABCCQIQGb0YeQmmHmvDRJy2VaHuVpYVlWxRzIW5bn661VuztEsF6f4s0YZMPxeLx5gG+8CLx4cXMJbK8LB05SXuj3pD/1V+xdNgZM5CsIQAACxRCIvidqt9zMnWIAYCgEIFAHgfv3HxTvSA0+9DNBI7Jrr6yrQbKmoSjxVde7ywP3OfIZAhCAAAQOL58n8TqW4AkBCECgJAIS6VoYmFhSnshW5QkCarxcK31gdDwSYTGpfqSymEO7WzZoYAEhnEDsARnKC616pXtUDmUjnAhXQAACEMiHQPSZqNYZHPvmnw8yLIEABHIjIPFpySzA3PyQDzntjxpjFHDtS9WGCqh9AUAjTTUDWcFecyuX2AMBCEAAAhCAAAQgsD8BdYJLKFkzeG9/L+qyAGEibn7GaH/GtSj/2DoBNa+tcyTa+Wx1kz/dbSxUHqZamUr9Ffa7qr1vZpvcIhUIQKBVAtFFVAOppWb0x74QRoRXCEAgFQFVBrUkag1Cqu6bEtP2ruDGGAXcwghUe871y7YriK7pXLF8sEaoGlgmvA6VEbeRJBvWpN33ic8QgAAE9iag+18Nz/q9OZI+BCBQLgHV7dTHoi0hCPsS6A+O3NcaUm+RQM6TV7Q/qhvY196lcfU+tgiuCQYSTa3/4Cql7t1QH0L/HD5DAAIQgMBNAslEVEuq5n3+zEdeIQCB/Qlo5B6jsuPlg8TBtaEFEXWL5bvcvJB4YAKCnq9qdD179snoIAJXdEVUXVuiuR4CEIAABCAAAQgsJ6DBbjEGuFknOELq8rzgyjwJuANR87RwX6s0gMJCaW07tUutHWs+8Ho4DZCOxaHbXm+8m1/PDHt+xEqTeCAAAQi0QmD87hqRgISNXNbnj+gWUUEAAhkRqGlUti23sideV7jb047W01a5vri4eNngHN53tRNVx2ciuKKrWPIsbr1E4T8EyiagUfUECEAAAhA4nDrCJaIwiJTSUBOBGIMMauLh+lJ6O47VRNzcvHofa+CA7xZXOg8h9Yo/7yAAAQj4Enjd98Q152k2EpWhNQS5FgIQ8CGgyqBGOJYe9hYwVbGOEXIQg2P4kUMceobGKNv3748Lrjn4iQ0QgAAExghoMAkzGMbo8D0EIFACgdh1Y9UPW1j5pYS8xUYIpCRQQ59qLLEwJec94o7BRXVk35UJEFD3yGXShAAEaiCQXETVchNbLHdYQ2bgAwQgsJ6A9t7QfSeG4LTemuUxaCmWvYL2l40RYncUxbCp5Di0ZPXaIAFCZSuWUL7WHq6HAAQgAAEIQAACrRBIUTdGRN2v9GhmHSE+gdLb8bGJiEcNfaoS77hfXS8dytsYE458B0q7y0Fft4RPEIAABCAwRyC6iNotMfH89HDUEoSMcpnLAo5DAAKxCei+U7qYamKXRhVuGXyXgfGxiWUXfSj5nxOjgaXUVLY0UhUx1Z89Z0IAAvsTYMbV/nmABRCAwDoCKerGujciOq3Ll6VXx5hBtjTtmq9DnL6euzEG0l6Pcb9PEoO5X13xf/bsk6sPC989fPjQa6UWcad/fiFkLoMABCDwkkD0jYVUiZd4QYAABCCwNwFVEvUnYdB3eZO9bXbT74TU42lQyhZL+IQsA+PaOfRe9tYwYnbItz2/00ClWHtfqXzdufPg9NtQfm1RxvZkR9oQgED5BPRc2XvJ+/Ip4gEEILAXAdW9UgR1xKtOR0hLQHVlVzh136dNua3Y4XqV390KW59efVHBO/UXazBvqvthSYi2LOs1ifEl5TG2QgAC9RCIPhO1HjR4AgEI1EJAQmrJS5eow1jCWTfKMN3M1FjiHAJqul+OBiqlKMtWxrae+ZyOFDFDAAK1EmAGQ605i18QaIOA6vOxA7OLYhO9GZ+ePRrIY4N09ap6OSE+gS2FpfjWx4tRbepaf9tMvOnKie8yvFOlymd2r+5f3K+mKHIMAhCAwDyBNEMh59PlDAhAAAKbElADRA2yWELhpsb/NjEJXfpbIlKO7YEpJqpQx+rQkcBXa2MvZZ5LvFQjSstXKU8sX4bSFF/tWxt79G6NI52H+PEdBCBQNgHdJ2Pf/8omgvUQgEBJBKw+322DFE+EU/tAcRPSEED0ScOVWIcJmGg/fLSOb7lnddvsqB9m7QpemmU61M+lcqSVClrqn+n3e031q9TxS8ILCEBgKwKIqFuRJh0IQGB3AhILYy6HupdD6iDRnkpDjXmJcbdv3z792b5LW3U2x+4M2ovvXLpirEaKGiUWbD+TpZV0Gxna7/yyNExcVd72zzEb+q/WaOp/P/bZp3E1tfRSK/k/xo/vIQCBbQjQ6bYNZ1KBAATSElBdMubgQ+6N6fJLdVzCdgSsXbRdinmlpN/yWlEtL4+GrVG7mXA4te3FwqctPsZLvxk9T7SFlcqP4lvaLzGWRinfD23jZf0iaxiX4j92QgAC6Qi89vjx48/SRU/MEIAABPIkYGJjihl9W3msCrL+XNF0K8F0zMeYnUFjaeTwvUaMjomZVklf0nBRuVRQntqrxPB+vioNCasKfTusXKTogJgSUWULQqooECAAgZQEbCBLyjSIGwIQgMBWBFRviyWYzNXTtvKppnRaadvklmeaTTYkhuRmZ2x7Yt4PYtuWIr7z8/MU0RYZJ+3o9dk210Zo7fe1nigxQAACLgFmoro0eA8BCDRDQAKT/mw0mhpqIbP8cgAl8awvoOVgVws2WGfX0GxfCZ537jw4jQYNFTLtfHv1YanGgLt8jz6HXO+Thp0ztowmDRIjxCsEIJCaQKr7W2q7iR8CEIDAEAHV5cdWmBk6f+o7rYyiOighDgENWrS2YpwYicWXgAajthTUlkrZhsuVpXymP6PLHbXnEVLXldS5sqTjLf7O1lHlaghAwAggohoJXiEAgaYJWANZ4pgE1ZJnqO6ZkS01eE1INd7uLNIls1AtntBXCQru8j0pBQb53Pc71F7OhwAEILCGgN1r18TBtRCAAARyIqABeJpFOrRVR4idas+oDuoOrgu5vuVzbSUZl4G1D93veA+B2ARanu3cUt+BT7lBSPWhNH7OnIiqK3VOyv6Sces4AgEIlE4AEbX0HMR+CEAgOgE1mPU3txxI9IQLj7D1UX1WGbfXLbPTOnnsdcu0SQsCEIDAlgRsufMt0yQtCEAAAqkJdCuZ3Fnduat6qGYzIaT655gE1LUCtn9qnOlDYI/2lI9dsc9pfeYhdbqbJer+/Qfcj25iifaNRFQGhUfDSUQQaIrA6015i7MQgAAEAghYJ4TEQcI8AUaSzjNKeQYCakq6xA0BCORCQCtFECAAAQjUSMBnFo2P32rDaHYbwY8AAqofp63Pkrhda5BvFxcXqwdNlM7HtsYp3Y+Y9tuAmphxEtd1Alp5jgABCEAglAAiaigxzocABJoioE4IjVTrRonW25BrKlNxFgIQgAAEiiWgziUCBCAAgRoJxBQUNLiuZhGqxvzHpzYIaIA2wn0beb3US81GJaQjwIDMdGyJGQI1E0BErTl38Q0CEIhGoJuV+uQkpjIzNRpWIoIABCAAAQh4E2DkuDcqToQABAokEHsGEkLNfCFAaJ5ntNcZL17UN4BZM8RZSnR9idIA95pD7GdBzayW+AbfJdS4BgIQQESlDEAAAhAIIGAzU7X8DmLqdXAs53udB58gAAEIQCAuAfbOisuT2CAAgfwIxL7P0V7p8lhiqQQs/YmJPusVoTm/34BZVHrb0sqclTeVPbZfsdztXpesLtLx7PZ+vh5bXZ+YjZo2P2M/a9NaS+wQgEAOBFgPK4dcwAYIQKBIAhpFqj/NjNGSIEsaAUU6PmK0BGYCBCAAAQhAIBWBWPsFprKPeCEAAQisJRC7Y1eCQ8v3TglZT59+3Pzek2vL5R7Xly6idn0DdxHqIxceKxe19z2o/ByPjyg/kcuPRWflyD7zCgEIQGCOADNR5whxHAIQgMAMAY0o1ShmLStjI01nLqnusDooCBCAAAQgAAEIQAACEIDAcgKxBU8JDWqftBTkr2b9qW2mNlrtYktLeVuaryaElWZ3zva64lftfRCUnzQlUeWG50IatsQKgZoJMBO15tzFNwhAYFMCqohZZezOnTunUd+xO0I2dSggsRr3rAlwn1MhAAEIQCAxAT1XCRCAAARaIKD7nbUpYvjbwmxUdYo/e/YJy6XGKDCZxBHzN7CnSxLCHj58yF6ovUwIqdfZ71sCqlsuNEhCq4I9ePCgF3s9H01IZenxeHlK31U8lsQEgZYIIKK2lNv4CgEIbEZAlXv9ablfNZpSiKnqELl163YWywi3NsJ9s4JEQhCAAAQgcCIQe4lLsEIAAhDIlYDud65QsNbOrl3yPIs2w1pfhq7XjNOYvIbS4Lt9CEg8k4hUajDxj71Ql+eg+hnUpzIWjC1C6hghvu8ToO+qT4TPEICAD4FyayM+3nEOBCAAgQwIqNKvipqE1LViquLRn9tRsPeerFouy7UnA+SYAAEIQAAClRFARK0sQ3EHAhAYJXB2djf6jErN0rxzp77ZWgioo8WoigPaz/Z4PBbpi9rsU+JfkU5FNNqnXuf7+3aX+I1oYlZRaTDB+fn5aalyE46zMnAHY2w2s/qi7P2cGRrYQN/VHCWOQwACQwQQUYeo8B0EIACByARUUdOfGlP37z9YNKJWYuVQhVnf6S/VjNcpFGM2TV3DMQhAAAIQgEAoAa28QIAABCDQAoEUM+8kzNYW+gNLa/MPfw6v2s9rByJvyRLx1I+2hE+xGltZy1dA9UutnrNsxu1Qv1A9Xvp7okEW6pMyLmNXSjzVoAwE1DFCfA8BCMwRoDdijhDHIQABCEQkoEqb9rPQSDkbfalOjbHOEjUs1MDo7/8xZJLNeF0q0g7FOfeddciEVuLNfzEYazgpbfM/NP45uzkOAQhAAAJlERh7TpblBdZCAAIQ8COglWao/06zYnDNNJ9ajqqNm7OIakKgeCPS+Jc6G2TuXmGzCdVHgNjlkrn+XoKhT//Q9avq+2RlZE5AlefsKVtf/uMRBLYmgIi6NXHSgwAEIPCSgNtosA4SExYFaGmlWPGqgqiOF5/K5NrMUKe2lgZTWiZ4mjCquNd2eluDWWItFd+1ucX1EIAABMokoGcaAQIQgEBLBGJ3kq+tk+fI/sWL5zmahU0JCPjMNEuQ7GyUrMo0iyjoBBPF7NX34tDzfePN+TwNnKd/RP1q8/sm6xwCBCAAgbUEEFHXEuR6CEAAApEIqPIfqwFgwuwWQqq5b4KnfY75qo4fRuTHJEpcEIAABMohsOWzrBwqWAoBCNROQHXrWG2D2lhp8Cb7TdaWq+P+aIBxbkHCjLW5c7MNe+onoP4RbefU+n1Qg2nmBglpT3ACBCAAgbUEXl8bAddDAAIQgECeBNSo014itQR1otsSP7X4hB8QgAAEIDBNgFmo03w4CgEI1EtAImqsum8tM3Eknl5cXDQvHNRb6oc902AC5X1OQUv3EvIhUMs9LoRozGdESLo5nZvjAIuc+GALBCAQjwAiajyWxAQBCEAgOwJqcNYkpB6Px2idSdllFgZBAAIQgMA1AhIPmIV6DQkfIACBxghoycYYg0lKnokjcQTxtLGCP+BuTiKqbGGW+EAm8dXmBPSMaDkgorac+/gOgW0JsJzvtrxJDQIQgMDmBNTA04jt4/HR7FInmxu3IEEJqWq4tr50zQJ0XAIBCECgKAKtdwwVlVkYCwEIJCGgZQrv3HlwGlCi+u9S8aakjmaJplqiUTazXGqSYlVkpDYbNeUWMkWCwegTAZ9lXWtExbK+NeYqPkEAAjkSQETNMVewCQIQgEACApeXT6oRUtV4vnXr9stZtk8SkCJKCEAAAhDYm4BmXs3tcbS3jaQPAQhAYEsCqv/qTyKjZpaGCIy5z5pbIxBvmQektS8BlZMcRFS1Qwl5EShpoEhscvpNtDrA3OfZdnZ2N+h5GTt/iA8CEKiDAMv51pGPeAEBCEDAi4BEx1r2C6Fz3SvLOQkCEIBAkQRa7gwrMsMwGgIQ2IyA6sBa6vz8/Pzw8OFD73QlQOUWZJPtcerTGZ6b/dizLQGVkY8/3n8vUtqh2+a7T2qt1xtj7Z/twzq3c+a2r9LvtWU+ueUX9kCgVAKIqKXmHHZDAAIQWEhAQmqOnSih7tQiBof6zfkQgAAEIAABCEAAAhAQAc1A8hVScxEZVIeXEGbiKTkJgRACITOwQ+Ll3LIJSGCvoY9jaS7cvt3u7Gjl/ZyQmsMM9qV5y3UQgEAeBBBR88gHrIAABCCwKQEt99JyI2NT2CQGAQhAAALBBJiRFIyMC3YmIFFInXh6ZaDXzpnRWPLqHPaZZZODiNr9Tp6wtGJjZTS2u3u3Y7nHx87ROPHtXS7ieLEslpZFVBGbm6WOiLqsXHEVBCBwRQAR9YoF7yAAAQg0RaB0IfXFi+dN5RfOQgACEGiNAJ2UreV4uf5KGNLsKHXi6VWrfug7AgS2InA8HmeTUvnc674qcUMzT5lFOJtNnOBBIIcBAR5mcsrGBPa8x23s6o3k2Kf3cHq+TAnp9+7de8VN77WKw/H4yGsQ0qsLeQMBCDRLABG12azHcQhAAAKHg4TUUjv5aDxTgiEAAQjUTYDBMnXnb03eDdVJEItqyuEyfPFZ1nfL+6oEW3Voa4a22hwECMQiMHTPjRW3Tzxb/o587OGcKwLPnuW39/OVdenesU9vx3ZqosDZWbdqg/YT177i3SoOtw82i1eCKgECEIDAGIF2F00fI8L3EIAABBojoE6+sY6+bmReno+KvRvPjRUT3IUABCCwOQF1vrP81ubYSXABAc0CtNmo7uUSkejYdInwPiUBu19OCZZb3FeHfgsp/Sbu9gjYjMO97q+0Q/Mtc+rXkEDWYtCy7vpttB70DNTMXLs/6Lmn36z+3FUbrI4mcVXlRudrMNLUM7R1tvgPgZYJMBO15dzHdwhAAAIzBHJdjk4VXhoIM5nHYQhAAAKFE9B9XjOYdM8nQCB3AkOdtk+fsj9q7vlWm30SUqdm06SsP9us07HBmbWxxp99Cew549Bmru1LgNTHCOheRGibgPVjaRl5iaJ6Llm7wsiojmarsml2qoINRrJzeIUABCBgBPKcXmTW8QoBCEAAArsTUIVTo/bUWNQoPQUb1beXcXs2mvfymXQhAAEItEig6/B4crDOjRYZ4HM5BPqzQKz8ygMds7rU3vWocohi6RICKl8SUjsR/+asJJt9syRu9xrFo2VN1U5AOHXJ8H4LAip3ewUJLRLqUg5K2Mu3GtJV3viKYTrX8jLnVbh88kU+t1omVcdScP0fei519bLL04xU8TKBVTNQrcz063I+7DkHAhConwAiav15jIcQgAAEVhNQZVN/bkXUOgPdyK0xq3Pdiqh7Toz3jP6NQZE4IAABCEAAAhCISeD+/QcvZ08/GYzSrUuV3lE76CBfZkWgE1KPv53Nf11IlfC5VMiX2KD6vv5UpgkQ2ItAd09dXpbX2t2yYOXDbk8hyrdsdKudXN3H9Pwu+fmsJWxbDcpzyzsN8NGg+7HnlM5V3rt9ShJTTUTVkr/9stEqV/yGAASuCLR7h71iwDsIQAACEFhAoGucXDU6+lGkrMSnjLvvB58hAAEIQGBfAja6fF8rSB0C8wQkTN27d+/aoLP+VdbJ1/+ezxBIQWBov96QWVqyyZ2plcJG4oTAUgJrBgQsTdOuoz1qJIZf9xaZ58qGlnFVf0Y/LB1g0o9nj88l2x6Dl1Zf0DNPHO7c6fbF1fNraI/Tob4slQnbmmFqUFwMW4kDAhAojwB7opaXZ1gMAQhAoAgCKSvxKeMuAi5GQgACEGiIgI0Mb8hlXC2YgDrgxoR/rdJBHabgzC3UdJVJlT0LQ8KBHXNfNZvH9pPzvca9nvcQSE1AAsleQYINYZiAnoG2QtXwGem/nSsb7izE9NaQwhYE9JyyPU4tvZDBDlp1TeXGlrwfq8tZ3LxCAAJtEWAmalv5jbcQgAAENiPgjuSLnagqtgQIQAACEGiDQEgHSBtE8DJ3Aib8q5NWfyrDiKe551rd9qlMqhzactNaqlAzdvpBHcgSP1Ruh2bv9M/nMwT2JIC4vyf98bR1/9hbRFXZMDFsyFLqlkNUyv9OQujZ2d1XdS7VvSSG+t4r7Lmna1SOfa8rnxweQAACcwQQUecIcRwCEIAABBYRUAVWjScthRK741DL8xAgAAEIQKB+AurEiP0MqZ8aHu5NQIKVCal720L6EDACupdqOWkJqeoY1ixT6yjWOaq319RhrKW11ZmuvfFq9O/kFP9OM8e2vt92s9VuLgVLduRFYG5J3yFr3b0y7Z6oe4kt8zp0TS7fMdC8ywlb1tfyZYkYqmdhTc9DY8ErBCCwnAAi6nJ2XAkBCEAAAjMEVPFUR42WEIvZuN17ZOuM25sfntt/bXODSBACEIBAJALq+CBAAAIQgEAcAv1BKTV3FNuATptxi/AVpwzlFsse7UKVJcI4AQ1e+NWvnoyfsNGRJWVj6J7Yv5dsZH5wMjZgJPjCyi5QHtqqaBKWlX8+wQYVDZ2v/ha1SWxlEcU/dJ5POpwDAQiUSYBeiTLzDashAAEIFEXAlkWJJaQuaRAVBSzAWBOoVak3zgGXcyoEIACBrAlYB4W7NFfWBmMcBCAAAQhkQ6Ab0Hl5skfvCfURUD1hyzqCRBnK0nQ5KkHM6w8omfbocMpzzVJNscrWXNq+x+kjuSKl+0Jo/4j6qqy/ytofinFoJrJmJrvnXKXMOwhAoFYCr9fqGH5BAAIQgEBeBCTwxRq1S8O1y1sTUPVJFX4t0TYUNKqSAAEIQKBUAuqk0KoGGvXNUmWl5iJ2QwACENiHgNoNtB32Yb9Vqlq+c6tQgkC4FYvW0tF9pFsOPc+thbjPXS+RSweYSyCVcGpB7ZCh9gd9LEaIVwi0QQARtY18xksIQAACWRAYElLVKa5RnXr1CbGEWJ+0cj5HgqmNlDQ7x/aK1ShMCa4ECEAAAiUTMDFVzwyeBSXnJLZDAAJ7ERjqCN7Llrl01UFNJ/UcJY6LgMQj37bkWmLM9psnWAKjNeVFQmpu9dCS7u3zJWifM9RXpb3CbV9c9/kzlOfqYyFAAALtEOAX305e4ykEIACBLAjYiEATANXIUsPXRk5q5N9UKKFRNmX/2mOqzA8tI6SG4NiSMmImrtrDQyO1jfVaW7geAhCAwB4E7Jlh97Y9bCBNCEAAAqURUKe/1cNzt91dbUUd2tRdc8+x/e1TOyj1sr76DVEW98/rtRZIcBxrN/vGrXup7Y/pe03K85gh7UfXZphO5b+1M/oxKs/1Z8+nbu9fv/1W+3HxGQIQKI8AM1HLyzMshgAEIFA8AVU+h0ZvqjKrjpKp0KqIKvFUFfbj8fhyVP7VGCg1AsVsqiFgPHWdrrfGg33PKwQgAIESCbT6PCgxr7AZAhDYl4Dq3UN1732tupm66qjn5+fXVltR3ZUAAR8CqZf1pd7hkwvdzGC/M/c5K1Y5yUm4pGz6lyUNLteqXu5MU9+rdY1NBnD7ZHyv5zwIQKBcAle9sOX6gOUQgAAEIFAgAQmpCuoYcUeYa+SfZlXOzUgt0OXFJttox34E6gwzjv1j7uf+iOkhtj4irBsn7yEAAQhAAAIQgAAEyiCgTl/r+PWtP6b2TJ3R7nKIqWcRpvaH+PcnkLod6ZbX/b3FgiUENAC53zZeEo+uUfs5h/tWTJ+WsijtOhtc7vZDzfmgZ1Z/UI++i1We5tLnOAQgsC8BRNR9+ZM6BCAAgaYJmACoyqjboTM1krKVSqp1LKmxbp1e/cKiJYSmgsWhxl0/9IVUpWP50T+XzxCAAARyJKDngTqOGAmeY+5gEwQgkCsBq1duWe/TDFPVNXNa/jLX/MGudQRSCltzba91lnP1FgRizx5VfHfuTG9HlNKvqS19Uqa7Z9zq41BY0i/UHwihbZK036lP6AuoPtdwDgQgUA+B6d7XevzEEwhAAAIQyJSAdeCoQ0cNUzVEpkTUTN1YbJYJnUs6liQcaJaqMTQj1FEVOirW+Ps2IiwtXiEAAQjsSUD3rG5JLpo1e+YDaUMAAmURUL1PAxiXdEKPeao6reLVnwa4qE6v+q0+EyCwJQEt15pC8FDbS+U85u9mSy6tpdUXzOR/7H4GifYanKz76Zb3OncAemv5Ks7KxyW/w/5AiLHf9NTvXMK1laMlNrSWX/gLgVoI0NtQS07iBwQgAIGCCVhltqvETo/kHBINS3R9bIneUF/UiFAjSo3EtR1VY6JsqE2cDwEIQGBLAgipW9ImLQhAoBYCITNwpnx2xVM7z6dOb+fyCoHYBBA2YhMtLz67L7mWxx44YnFrSViFLURUDVDRIIGWy7j6jkzEtDxY8uqyVHlRX4ptcWR5OcZ57PsldnANBCBQBgFE1DLyCSshAAEIVE1AHS2+wUTDUiuumiXaX0rX1/ex82KOtM6Zrxo36vB78eL5jdm3Y2z4HgIQaIOAhNRYg1PaIIaXEIBA6wRCBs+p/uoGdTSbSGGdze5x3kNgbwKpZgaW2gbdOz+2Tl9txn6IIbz149RnlQndD1OHFpfuHWLa9R3dfSV4Dp0z9p31O7kzed3+GZvhqueavbe4bAsRrfhlYqsd4xUCEKifgH+vdf0s8BACEIAABHYgsKTBEWvk/NbuytfYAqp8UINKIVbcxlf2Di2DpO80AlSNEDVAQkb1unHaksNqkEgYVUNlqkGixozS1F9/CeMTAP5BAAJNE7D7Ah36TRcDnIcABAII6H6pP7dDWZdbfW1slZNYdU4fU2UbAQKhBFRuYtcH1GYhlEtgqp251isJqdYmV1xj907fdNzy278/+8ZR43l6NimYGBrqo1jqzx0MoT4JN9igoX55UX/F0nTd+HkPAQiUSQARtcx8w2oIQAACTRNQ5VWV237FNncoQ4LkWpvVmDcOsTq0xPf8/NzLtLHOt/7FavDYuTePdcKo68vNc7rr+9/zGQIQgIBLACHVpcF7CEAAAn4ErI6mzmUbKOd3ZfqzZBMBAqEEXJEk9Nqx8yWiEMogoD2Z79y5mo26xX3E2uRGSGlqcHKo8KY2seqzZnOKsmw2lvSq/gRbgcsVrEN8sHbC0DXiLtbKs6H4U81kHrKF7yAAgfwIvJ6fSVgEAQhAAAIQmCcQSzCcTynvM7QnioWhyr4dS/2qzrfj8dHLRuLNpYwkeKvBo3OmghqYQ9frmrlrp+LlGAQg0BYBdZDseT9sizbeQgACNRFQfSu0wz+l/9apnTIN4q6XgIlQMTzUvpdTAkyMNIgjHoEhQTNe7H4xSZDTdhOhdVIT63U9AmrH2gRU/aYvLi5eDSL3y4nps+yZ1800vXNaIatffhSDvrP9b6dj5CgEIFAjAWai1pir+AQBCECgIAJd4+Ly1ajCENMl2qlhUkqIPRNVjQi3YaWK/Z7ishogNjpUnV5qiITOZrClhN08lQirkZ/WaHF9ds/jPQQgAAEjYJ0fe94TzRZeIQABCEBgGQETE5ZdzVWtE1BbKcZATLVBaH+UV5rc/N8z/1QnVVtWZXGsPLq26j3hioAroMYeyOAO4BZ3lZOpsqJjJfU/XVHkHQQgsJYAM1HXEuR6CEAAAhBYTUCVUY0olPAWEiTaPXz4MOSSXc+VoBgzDDUiQke6xrTHjUt5s2Q2QyfEPjot16wlhSWUK6jhOdeocdPnPQQgAAF1WuVyTyQ3IAABCEAgnABiQjgzrrgi0LUdwtqXV1d371SPUDyE8gi4gqUrlu3hyVwZkq0qa9zzrueOCajqJxrq+7h+dtgni9uucvNIx6wvQv1Ne5cfs5FXCEBgPwJxe3P384OUIQABCECgAgIa1adZhwq254TNbBxzzxpHsSvVY+nl9L0q825lX7YZt5zsDLVFQqrtYeO+V+OJkZ+hNDkfAm0TsNH/c8+StinhPQQgAIE8CfTruXlaiVU5E+iW6FzW9SlRy1a2yNlHbLtJwPoUbh7Z5xvZY/0WUxa02KcxxkPMtKJMij6AvoDaF6/17NF3Ngh+6FlkZYx7xFgO8j0E6iKwrCZRFwO8gQAEIACBjAj0K6FaPkkNjqlGh3tsTcNDFWGb8RgbiSrqEgRjBvndr9C7LGKmlUNc4qcRoWrQrMnnHHzBBghAYDsCuk/qWYKQuh1zUoIABCAAAQjkQEDthiXtIwk3/XZpDv5ggx+Bs7O7fidudNbctj4I9tczwgRUffv06cfXDyb41BdRlcRcf4P6jdS2UFljoHeCTCFKCGRGIG5vbmbOYQ4EIAABCJRPQJ3f+lPFVvtljgmR1jjW65J9a7RMi8Uhamo4a+SyKsdrGtAST6fsXpNDstet3Cst14c1ced8rfno+p6zvdgGAQjsTwAhdf88wAIIQAACEIDA1gS6tuTz0TbkmD0++/HatjK0ScYo7vd9v89AIqbKwl7BZjQOpY+Aep2KK6Au6de5Htvwp367YEnZsGtU1nQv4D4wzJpvIVALAUTUWnISPyAAAQhUTkCVVI1C9JlJpHN8Zyuqkq7Rg/2Glj7bd7aMjImqvrNV+8vEpMgit8IusbaVMNUQbYUBfkIAAmEE9BxRR5Xu6QQIQAACEMibgO7XBAjEIBC6pO9cO7I/SFbtEmaixcipOHEof/pB7X3fNnz/2lSfNWj72bNPVg3YTmXbXvG6AqqeASZUprBHcduqZ0vid8uZBnmvHXy/xAaugQAEtiOAiLoda1KCAAQgAIGVBFTRVWPDxM2p6FSRVYNWwutQ5bs/89SNy5Zz0fWWliuq6lyfUZFbiJryU3++XFw/S35v+VKyD9gOAQhAAAIQgAAEIDBMYM1KMMMx8m2rBNS2U3tpLsyJp3a94nLbInov8Ycya4T2fR1aOld5ZIOx9xAv3fIiOr5lbV+S26YuUdIGr4/14cS2qOtfCp+hLFutPMW2ifggAIE8CSCi5pkvWAUBCEAAAiMEQkYSW2PJXSJnSjxVkkPi6PH46FpDWeep0jx0ro4pqCHdbyx1R9L83zKtNB6Ex6rGy5BAHh4TV0AAAq0Q0ChxAgQgAAEI5E2AWah5509p1vkOxPVdjnNoRRyJP4ioZZSMrt18d9P8cu9puc2IzSXXQlYT28tm9T9IpGdVm71ygHQhsB8BRNT92JMyBCAAAQgsIOA7ktiNWpXcuYquRqSOjXjU8kxD4qsq+q5Aa2naKEr7zGsaAnvvbZPGK2KFAAQgAAEIQAACbRNAjGo7/1N4r2VT79wZX85fbUzfMDZ4VQNvWdbXl2K684ZmovZTUx5uOXuYe1o/B65/Vl/L1AD162fv88ldanjIAp9yN3Qd30EAAmUQQEQtI5+wEgIQgAAEfktAI4klXNoIziFxMxSWz3I6GpmsNPtirH22hhFLu4TSX35+XxzPveG13FOuhAAEYhFg9nosksQDAQhAIA0Bd8ZWmhSItUUC1laztlufga+IqrbeWJAwp7ap74zWsXj4fh2BoZnCQzFqn1QrF0PH+W4bAvpN7f2bkQ1aptu2c7q4uHjlvB2bWxLcrmcgxSt0vIFAVQQQUavKTpyBAAQg0AYBt7Fj4qY81+g/azSNjRDuExqaSdo/xz4rXQmp/f0v1Bg3UXeucm1x8RqfQAlLAMX3mhghAAEIQAACEIBAHQRC6uV1eIwXWxIYastJPNWf7yCrfjuwb7/agnsLQn2bWvxsovhU21z9BRLIfPO+RY5b+Lwn/zGBVN8r3L//IGiLJm09RYAABOokgIhaZ77iFQQgAIGmCLiiquu4Kr9TFd8lMxfHlmlRA00NgKmGmmsb79MQEH/9hXaIpLGGWCEAgRwJ6N4/1wmao93YBAEIQKBmAgioNeduPr6pvaZ6gNp0Y23ItdYizK0luO56dyagzSwci9Ha8GPH+b5eAvqdjrUHpvqQpohYP8SewvCUfRyDAASWE3h9+aVcCQEIQAACEMibQNdIfnJa/nfIUlWOQ8PYElCqMGv5JkIeBJQfahRpbyICBCAAAZeAng0sF+kSufleA1HUyQynm2z4BgIQiE8AATU+U2IcJ6B6QCoBVamqHULIg4AE1U8/HZ8dSF7lkU9bWzEloMoW31XNhuweG3Q/dC7fQQAC5RBARC0nr7AUAhCAAAQWElAjWfta9DuDbd8a32jv3bs3eSqNsEk8uxxUHiOk7oKeRCGQNQE9F2ypt6wN3ck4Pc+sk3mq83En80gWAhCojEBKQasyVLizMwGfZ6KeoRJpCHkQePr04zwMwYpsCGgwPe2AbLIDQyBQBAFE1CKyCSMhAAEIQCAGAXXQ9IVUNXJ9Z5Dqep+GcwxbiSMeAYTUeCyJCQI1EdCeZdzTx3PUBg49e/bJ+EkcgQAEILCSQL9uvjI6LodAFgSWrHiUheEVGsEKJBVm6gqX1Pej/gG1A7TqioLaAxJV9TzSd/b9imS4FAIQqIwAImplGYo7EIAABCAwTaA/+0iV5ZBRiHNLAk2nztG9CCCk7kWedCGQNwHu6eP5c3bGcoTjdDgCAQjEIsAs1FgkiScnAmp72GCknOxq1ZZ+H4DLgXxyadT9XjPENYjeRFIJ7FqxTO0BiardoPlPT6uxMMCn7rKAdxAIJYCIGkqM8yEAAQhAoHgCqiCrUqwKczcT6dMgn1gSKAhXNierM4OltbLJDgyBQDYE1HESMpgmG8MTG8IM1MSAiR4CELixQgxIIFATgefPx/firMnPUnxRu38oPHjwYOhrvquQQLddxfOTSDrnXieozv+GWdVmjiTHIVAHAUTUOvIRLyAAAQhAIJDAmlHvLAkUCDuj02/fvp2RNZgCAQjkQkAdaxqVTkfIVY7Q+XvFgncQgEAaAmvq42ksIlYITBN48WJeVLEY1GYk5EXAZiD2rfLd3qd/HZ/LIaDB1KrbxhwQr3aDBmMya7WccoClEFhKgJ7EpeS4DgIQgAAEmiagTh8JchrNSCiHAKJAOXmFpRDYmoA6O9URomXdtJStZq+3GtQpZJ2/LOvbainAbwikJUCnc1q+xJ6GgG9bghUu0vBfG6vqNsqbfhten/WnY2MzVtemzfXXCVh9W3XvLYLy3uq2PunZ3qlj55qAquPqG1J9eStfxmziewhAIB0BZqKmY0vMEIAABCBQOQEaWOVlsBpOahAx2ri8vMNiCGxFQB0h6gRpuQM05ij9rfKNdCAAgbIIMAu1rPzC2jACLdchwkhtf/ZUG15C6vn5OW3FxNmitriWUdaAxePxUeLUlkU/N2Civ+0FdedlnLkKAqUQuP23X/ziydb3v/e9w/ELX3hl93/4sz87/OJHP3r1eerNG++8c/jj73536hSOQQACEIAABKokoBGILc9WKilT1ZmhRprl161btxktWlIGYisENiagTjbdN+7f7zp5Nk5+1+RshoYGntg9c1eDSBwCEKiKALNQq8rOppyZE1YMRsiMN7uG1+0IaFnf4/E4miAzU0fRrD7gtscVmeqZElWnxO3ViW4QAb/5DSCTBAR2JPDa48ePP1ub/kcffnB4673310bD9RCAAAQgAIHiCKjCb53NxRmPwaf9DzVqlEYPhQECEJgioH2Upjrbpq4t+ZhE5JBnnAYWab84dTLrrxNh75wQuHtS670Gsigg0p4w8A8CTRG4uLhoyl+crYtAXwTqe6dnZ+mCUN+nGj/P5aP5TH4aifWvU8w1uCa3FQpKs3d9DhEDBCAwRiCKiDoWOd9DAAIQgAAEaifQasd6bfmq0cgIqbXlKv5AIC4B7vc3eUo01XJmJpjePMPvGwYk+XHiLAjUQgARtZacbNcP1QlscJDto24DiRBQyygX2pNTS8r6BOUt+136kBo/x4d3jkLqWB01R1vH6XMEAhBYS6Ab/rs2Fq6HAAQgAAEIQAACBRPQDDMaQgVnIKZDYAMCGmihjv+pUekbmLF7ErGEU9cR63AOmfXqXs97CECgHAKa1UWAQOkEVCewAZi5zZ4rne1W9ivffEVUrZqh+h8rGC3LHQ068GGtc9YOzFtm4fhVqqPKJrNf9WACBCDQHgFE1PbyHI8hAAEIQCAiAWs8R4ySqHYioIaR/mwUuRpLCtaQU+NPeyMqaOaVgi1JqYZ1CmHhlAj/IACBrAhoJsLYqPSsDI1ojEQP3QtTdhSrk0pL/LK8b8SMIyoIZEjABk1kaBomQQACjRFQ/cZ3AFcnpB5fzkhlBaPQYmJtaJ/rNLg5t9UKVP9VPVhtf72XoE6AAATaIhB1Od+//eIXD+9/73uH4xe+0BZFvIUABCAAgaYJnJ+fN+0/zt8kgKB6kwnfQKA2ArULqXYfSymcDpWJ1mf6DjHhOwjUQgDxoZacxA8I1EFg6VYNrGDkn/9L68s5M5ZPqQcX+hPmTAhAYAsCr8dM5Etf/9rhn/7+72JGSVwQgAAEIAABCECgOAIaqaxZrRpJK0FAe8CokU6AAATqIaDZVOrgqTHIL8243VpAFUulKwGXAAEI1EVAM75YwaWuPMUbCMQmoDaT2k4SqXJuO6mdJ1sJ0wTEyHembz+mri39KMtyYEv89m3mMwQgUC+BqCLq7/3hlw//+O3v1EsLzyAAAQhAAAIQgEAgAVdQpbEdCI/TIZA5AYmMmllVQ5BwKfFUS6jtIZ66DLXnGAECEKiLAMv41pWfeAOBFAQknKntJOHNHYyaIq21cXa2Mkh2jKNEcDFaE2wJ5Rzb0AwKWpOzXAuB8ghE3RNVy/i+8c47h48+/ODw1nvvl0cDiyEAAQhAAAIQgEBCAmpIai8VOhITQiZqCGxMQJ0oEh6XLlfmY64tratzbZ9mu85maujeYsHdr9m+G3vV7LDcZoiJacg+ZWO+8T0EIJAHgVoGm+RBEysgUC8B1XcknFnQ+zt3HpzEONULVAdyw9pBX2vrG9rrUytoEG4SCNkH9ebV178xMXZtfl+PlU8QgAAE/AlcPZn8r5k88/Pvv3f42QcfIqJOUuIgBCAAAQjUQsA6r2vxBz/SE7AljRBS07MmBQhsSUC/aXXwqdPI7QAMtUEdiC9ePD91FPYF06G4bCS8vbrnaOT+2dndG/bIztzvQbLP7peuT7yHAATKIqD7zdD9qSwvsBYCENiCgOo/Y3WooTqB6jhrRcxbt5Z3jctW1bUQ966Xjm455uVcr8d2OG3z0BfQ++fwGQIQgEBKAlGX85WhNgP18qc/TWk3cUMAAhCAAAQgAIFiCXRLVD0q1n4MhwAEhglIKFBnnpbFlRjqG3SuLaWr6yUgqkNurfCgOBSfZoF1QkaXTu4CqnFj9pqR4BUC5RIo5X5TLmEsh0A9BFRXCQkSMbWH6pog4XZNsFmSa+Io/VoNLJeYLPFU+TEkeC/xUfVj1QVVl11bJ16SPtdAAAIQMALxhoVYjC9f3/iD3z/809//3eHtl8v7EiAAAQhAAAIQgAAEbhKwRr/2/qNReJMP30CgZAISL/U3NhPUfFPn0LNnnySfwaB7TIn3mc7u8VkpxpFXCEAgTwIMhMgzX7AKArkS0HNfg8pChElrU0loWxIk3K4V/VqdjSrxdO0KLGN5pudHiXXXMX/4HgIQKJvAa48fP/4stguahfrBv/k3hz//yU9iR018EIAABCAAgawIqMEU0sjLyniMyYaAhBTE1GyyA0MgEJ2APSv0W1eQcOqzVG90QwqMUB10x+Nx0HLjacsf6ySXq67V/rD6W9tBOmgAX0IAAqMEJEwwC3UUDwcgAIEJAlPP/rHL1txzNHtSYuzS0KLgtySPQvhKTNeARAIEIACBHAgkEVHl2I//5q8PD99449Xyvjk4iw0QgAAEIACB2ASsYzx2vMTXJgEai23mO15DAALTBPSsVbD9sJbMTDg/P59OhKMQiEBAHeljon+E6IuJQgMcls4KK8ZJDIUABJISWCLSLRVS17bpWxNR1/KaKjh6fmhwHINwpihxDAIQ2JpA9D1RzYHf+8MvH372wYf2kVcIQAACEIBAlQQ0OlKNNQIEYhDQrGZ1GBAgAAEIQOCKgC2P3C3v++nVgYB36uAkQCAlAQ2EWiLwp7Rpj7gRUPegTpoQqI+A7qehz26tOqF9OUOD6hm2ukXota2dn1JAVX5rAA4CamulCn8hkD+BZCLq8bf7oWppXwIEIAABCECgZgKq5NPoqjmHt/VNM1gQUrdlTmoQgED9BNQZe3FxcdprTa8ECMQmYMsOtlwnRECNXaqIDwJtE9hSSNXWKktDKwNoUguorXBcWs64DgIQ2I9AMhFVLv3xd797MDF1PxdJGQIQgAAEIAABCJRFQPv3ESAAAQhAID4BE7rix0yMEOgIaBnCFgMCaou5js8QSE/AhNSQASqakdrtc+q/wo/SWbrCVAsDYOWjVk0iQAACEGiRQFIRtUWg+AwBCEAAAu0R0IjMO3cQvdrLeTyGAAQgAIFSCSztKC3VX+xOT8A60W/daq9OiICavnyRAgRaJtAJqU9Oy/v6iqlqn2uFH7XVfcPSZWRbGACbcr9vlsP3LaGcBwEI7EUAEXUv8qQLAQhAAAJVEGBEZhXZiBMQgAAEINAYAZbibyzDN3D3/v1uhk5rA+sQUDcoXCQBAQicCJiYGjIQSrMnQ/ZJlaBHuE5As3pTBlYJSUmXuCEAgRgENhFR2Rc1RlYRBwQgAAEI5EjAOsxytA2byiXQwmjmcnMHyyEAgVoIPHv2SS2u4EcGBCSeasZTSOd+BmavMgEBdRU+LoYABBYS0ECokHutLe/rMytVgp7vbNeF5hd1mQTolIODYF1UccBYCDRLYBMR9T//5V8ePvrwg2Yh4zgEIAABCNRJgGV868zXHLxqcSnAHLhjAwQg0BYBBqy0ld9beHt2dvcQ2rm/hV0p0kBATUGVOCEAAV8CoStKSAjUrFSfvVJbHmSllbbUzyFO5+fnBwnQBAhAAAKtE9hERP38++8dfvbBh62zxn8IQAACEKiMgBphBAikIKBGvu2tliJ+4oQABCAAgcOBASuUgtgEbDZq7UIqAmrskkN8EIDAEgKXl08GL5ua3aj79NxqUqGzUUsflCXRVDNOJZxq71P1c4jTFkHppF4ueAs/SAMCEKibwCYi6lvvvX/4xY9+dGBZ37oLE95BAAIQaIlAyL4qLXHB13gEGPUbjyUxQQACEIAABLYioM5ndUhLSK0xIKDWmKv4BIFyCQwJphLmpvY29REInz713xtV7bYSB8CqT0OzTfXc6nzYRjjtlzaE1D4RPkMAArkR2EREldNf+vrXDv/093+Xm//YAwEIQAACEPAiYA0MNTJY1sYLGSetJICIuhIgl0MAAhCYIeDTiToTBYchMEjAhNTBgwV/qT0Ix2Z+FewWpkMAAgUTePHi+aj1l5eXo8fmZj9++umnL+93l957r2oGZ0lCqgb75NTeVJ2sJH6jBYsDEIBAlQQ2E1F/7w+/fPjHb3+nSog4BQEIQAAC9RNgyb/68zhHD2lI5pgr2AQBCEAAAhCYJyAhtaYgMaHW2bU15RO+QKA1AhrcMRTsHjw0U1XnS7SbW11KQqrue7r/jcXjpi0htZRgfEqxFzshAAEI7ElgMxH1+IUvHN54553DRx9+sKe/pA0BCEAAAhAIJiAhi9kqwdi4IAKBnEYHR3CHKCAAAQhkQ4BBKtlkBYZkTkACxcXFxUsB4dPMLcU8CECgRQJTM0a72aHjS9SqraUZqaoTSFAdqxt0aTzxmpU6FkdOeaNZqDmG0veWzZEpNkEAAnEIbCaiytzPv//e4WcffBjHcmKBAAQgAAEIJCagBpD+qMwnBk30owQQUUfRcAACEIAABCAAgcQEtKcgs08TQyZ6CEBgNYHQGaNughosLbG1E1SPpz2t3ePue90Pp/Za1bl7t998RNxc+zdytcstA2vfz81+Xhs/10MAAmkIbCqivvXe+ycvLn/60zTeECsEIAABCEAgIgFV4tWgYqmbiFCJKpiA9uClsRWMjQsgAAEITBJooaNuEgAHITBBQMtWavnKX/3qVxNncQgCEIBAXgRsxqiETp/ld4esV9t/qu2l+2I3O394L9Y9RVTZ3c2+vTPk2qvv9rTxlREDb2RXrrNkB8wN/mqqXAVHxgUQgMCmBDYVUeWZZqP+09//3aZOkhgEIAABCEAAAhAomYAalIipJecgtkMAAjkR0CwNBkjllCPYkhMBLd97efmE5XtzyhRsgQAEgghI6OzuY8NC51xkPm0vxT82K9VnNuicDaHHlaaJoxJSJdhJkNT3rj25i5Sqn+Vqo/EMzRudr2uVP8+fLyuTS9LkGghAIB6B8YXh46VxLSbNRv3bL37x8PZXvnrtez5AAAIQgAAEIAABCEwTUMOLZfWmGXEUAhCAwBwBZqHOEeJ4iwQ0a+vpU83eYu/TFvMfnyEAgZsE1PbSnwaXDLXBJNZKFLt//8FLofKqi13XbH0vlQ1ukA39ID+Gvu+ft/dnG+iW02oIEkHNLq3UEJq/Vvd0RVSJ26Hx7J03pA+BVglsPhNVoL/09a8dPvrwg1aZ4zcEIAABCEAAAhCAAAQgAAEIQAACEMiCALNPs8gGjIAABAIJzC2P+uJFnFl/Eh7H0pIIZrNSNTNVf65QFujSotO7GZJXIu5YJCUIqGa7BMsx5nbO2OuaGaNDcUrsNAFVA46WCJ+3bl3PH/mmGcOylQABCORP4PoveCN7mYW6EWiSgQAEIACBRQRUSe6P5FwUERdBAAIQgAAEIAABCEAgYwLq8M9ptk/GqDANAhDIjICEKYlQY/ewmDMvJUAqPQmmQ2HMhqFzY393dnZz1mnsNPaIz0TfoVnAY/ZInLTrJHg+e/bJSdReInwqDfUNSey0oBUblgSbqSw7XBuXxMU1EIDA9gR2EVG3d5MUIQABCEAAAvME1ABTA8QquPNXcAYEtiWghiABAhCAAAQgAAEIrCVgnct7dvyv9YHrIQABCGiG4Nh9bKlwNkZV/QTH46NRIXXsutTf19x/YYLonJBqA+FdFnp/5871ZY7d9rRmKtusYb265UXxaQledwbqmIDum79K2xVQJfKPlV3fODkPAhDYhgAi6jacSQUCEIAABDIm0B9dmLGpmNY4gVhLUjWOEfchAAEIQAACTRNQR+7azuCmAeI8BCCQBQHdxyRKbTUbVU7nJqSqL6OWIFFRYqn5ZPuITgmNoQPh+yKry07PRrW3NePYPS/GM1NxdKLulRTTX+LXtYX3EIBAXgR22RPVEGhf1Muf/tQ+8goBCEAAAhDYhQBL9+6CnUQXELCRsgsu5RIIQAACEPgtAeuUAwgEWiQQozO4RW74DAEI5ElAottUG0nCXOwgMUzibQ6hljqNCahiqhmh+pN4OiWgSmzVTFFX8FyTJ4pHM1/d+GI9M7WscD8oHYnABAhAIH8CV8MfdrD1l7/4xUF/b3/hCzukTpIQgAAEIACBbo8Lt5IMEwjkRECNNo2GtWWMpjoIcrIbWyAAAQjkTICR/znnDralJBCrMziljcQNAQhAIJSAuwxr/9pOkOtmAfaPrfls7TPVKbRP5pQNa9Jp4Vo9m+aW6x3i4ArIl5eXpzzoz2LVdW4beiif3CV2LR1rhy+xy+JwX80Gi9fqotpOakooduPgPQQgsB+BXUXU3/vDLx/+81/+5eHwla/uR4CUIQABCECgaQJuxbtpEDifHQEbjat9dyyovFqZpbFlVHiFAAQg4E9AnWsMnvLn1cKZet6qc1PPVbfzVc9b6ySvgQMCag25iA8QgMASApoF2N8bc0k8/WvsGaHXIXGuf36Kz3p22b6dKeLfIs6hWZo+6Vq72ARUXWP5YK8+8Ugo1Z/qAIozZTtbvqaM38dfzoEABMIJ3P7x3/z16FVv98TNqXOHIvG5/hc/+tFhLF6f64fSte+4/ro4PcbZePVf4Qc/t0xQfsbvlS4ne9/q76fZJWlcAABAAElEQVREvx/cvVo+5X/6t//WsvD0+n//1V9d+zz3gevh55aRNeVHHbr/8a/+j1N0bhl14//4k1+5Hw8l/v5cB7CfeodbHqh3UO9wy8Pc+5D7x0kYu319/zCe320+vz95/ulJPHXLjzpd3fvP2DPYLZOllB/z17Vd713/9dn1X5/nAtfz/HbLCOWH57dbHubeb33/6N/TY92/bVbhXuVfIuLxeDysaX8qr/a63mZphvL78v/yvx4+/vhqFnDo9f3y9/986/+cK7LXjvevn0vfyp+140Ovv5b4yw9cz/PXLRNz5c89V+8pP2HlZ9c9UZVhX/r61w7/+O3v6C0BAhCAAAQgAAEIQOAlgbllgz7pCahAgwAEIAABPwJ3ewKq31WcVRMBdV7qzzptp3yzc6fOKeGYr78l+IKNEIAABJYSqOWe3vc/ZNZl/9qSP2tlEWZ1lpyD2A6Bcgi89vjx48/2Nvc//NmfHf7nf//vDw/ffHNvU0gfAhCAAAQaIqDlWjRikwCBnAi4yxH5llHbW8WWI8zJH2yBAAQgkAsB33tqLvZiR3wCtlR+aMxD+6WFxrHX+W69Yi8bSBcCEIBATgS0XUrspf0vLi52c/HevXtFL+m7hJ3V6Up6xlk+lWTzboWahCGQGYHdZ6KKxxt/8PuHj37w/czQYA4EIAABCNROwPYwqd1P/CuHgLsckay2fV7mPFAngMqz9sNRg5IAAQhAAAI3CfDcv8mktW8koi4JPrNWl8Sb+pp+vSJ1esQPAQhAoAQCT59+HN3MPdtgmo2pQbWlhj3ZbclM+aR6SOr6qMRaDf46Pz8/vbbCd8u8JK32CGQhor71J3/Kkr7tlT08hgAEILA7Adu7ZHdDMAACLwmo4Xt2dvfU2FGDR38SRUPD0HJOajipMUUDKpQm50MAAjURSN1pVROrWn0ZekbO+WozR+bOy+24BFSWOcwtV7AHAhDIgYCeBbpH1hQuL5/U5M6sLzbY2F5nL8jkhLlte5aYaW19zbC2PgSr8+pVq69JVKUvYAldroFAR+B2DiC0jO8b77xz+OjDDw5vvfd+DiZhAwQgAAEIVE5AFcjYS/hUjgz3EhOIUR6tM0AdvmpQaqBAP96lSxkmdp/oIQABCCQlQMdRUrxFRL50lo4GOJUW9KxHQC0t17AXAhDYkoDukbq/99tKS21Q22vJQJ2l6Q1dp+dcLH+G4s/pO3s2LxVRVS/UtXs8KyWkKv215UVtft8yLDFVfyojz5751xGUhoU9WFnavEJgbwJZzEQVhLe/8Y3Dzz74cG8epA8BCEAAAo0QWFrZbgQPbhZIQA0ia9hoBqsaSUONaH1vS/sU6CYmQwACEFhEQPc+QtsE1GkYGkoddLd02eJQPpwPAQhAoGQCMZf1lZglwWnPQVt6zi0dMLRHPsrWJfuDdpy7eWGq37lCX98PzcDUDE296jybranZmXuGtQKqbPcVUF0/1T+gvgL1B/iUVfUvqO/MRGs3Lt5DoCUC2Yiob7z77on7L374w5b44ysEIAABCOxEgErgTuBJNhkB6wSYakS6iZuYqoakTwPKvZb3EIAABEojgIhaWo7Ft3dJ3e/+/fBl9eNbHhbjkg7psBQ4GwIQgEAdBCRkxRp0YuKUxLm92lcSvLSs78XFRfYZJO6yNVRMVLu1v+WNPg+1ZyWcqv6nvNFrd14nvpa+5L38HRowHZLxvkKyZs5KoB9iHJIe50KgZALZiKiC+Pn33zv8vz/8h5J5YjsEIAABCBRCYG2FsxA3MbMRAmqEWgM0tJNYv4U9G/uNZBFuQgACOxMoaWbGzqiqTT607hejg3JrmOoUtvrA1mmTHgQgAIESCaTZo7JrX+3JI+d6j55VS7mPDW5Se7aboXrnhN0E1H4e2OxXW8GpfzzV565O0dkWI40xDjHiHopDvKhfDJHhu1YIZLEnqsFmP1QjwSsEIAABCKQk4DtTL6UNxJ2OgATFlmYcyV9rhKqxGNpJbDlhYqoaljarda99YswmXiEAAQjEIqD7mu+I+1hpEk9eBEI7lEurS5Q+qyav0oI1EIBASwR0/+zPbozhv4QzhKfrJPUsXipgdiLpuJQxl4duu/m6Vek/WR00lg2axavypfb68+fPDxJVl/YDpPeeFCBQPoHxO0/5vuEBBCAAAQhAAAINElAjogUhVT7qTw1zNaBiNZxMTLWio5mtaqQRIAABCJRMQPfKFp4NJedRattD9kTVc7UkEVVle2mndGruxA8BCEAgdwK6f84JcDF9cMWvVCJrt/xqfkvShzyLYzG3QcKpWPvYaQO5bt26fZoxG+OZLX/Mp70HC1qZlqgrH9WnoLqJ+mb0Z3b6sOIcCORIABE1x1zBJghAAAIQSEpAlThCvQRsNGa9Hl55psaIRuSmbPR3ouojhNQr7LyDAAQKJWCz9ksSxwpFnaXZIfW/ksqIOimtbGcJHqMgAAEIFEAgxWxUPUv64pHEJpuVKCwS11oasLpGPFQ7PzTkwjd1HqucydetZ6NO9UW4dSnZJqG3/3sIzU/Oh8BeBLLaE9Ug/PLnPz/ojwABCEAAAhCAAARCCaiynlJUDLUn1fndCM87m/iqxpiWCiZAAAIQKJ2AxCaJToT2CIR03LkdfzmTUqckAmrOOYRtEIBAKQTWiHtjPupZcjw+enW4L6DqgNpZ+j52kD+51XfW2qP2b2jYY+ZrqI2xzrcteWLFNxeP+gd8+126gdlH+hTmoHI8WwJZiqj/9Yf/cPhPf/EX2ULDMAhAAAIQgAAEILA3AWuIbGWHOgHYT3gr2qQDAQikJCDRSeITAQJDBFJ0Zg+ls/Y7leHUM1vW2sj1EIAABFon0LXZOiFVg3kuLi5Of5r5akHbsqQIISswpEi/H+cSEbQfR+hniXylPNdDfeufr/J1eXl5UNmSYO3WdfVef/p+rZitdDU4YMmAM11zfn5Ov0I/8/icPYHwIRwbuPTWe+8f/q//7X8/zUZ9+OabG6RIEhCAAAQg0BIBVS5VgVSDhgCBpQSsUdJSORpriEtc1bGQWT5LuXMdBCAAgRgE9t47KoYPxBFGQJ2otTyn1AHKDNSw/OdsCEAAAnMEUizpqzTVXtSsPbctpZmiNotPx1M8o9z05nwv4fjSdreWT5a4WEsdYCqvur6uT6dOOR2zfUtVLkPrExJQl+aFGaayf3Z299CfKZxiRrilySsE1hC49c1vfvPfrYkg2bWvv3b4//7Lfzn8q3f/dbIkiBgCEIAABNoloM6nW7duHZbsq9EuNTx3Cfzyl//tZUPs14tGYLrxlPJeovF//+9PX5mrhv79+/cPv/M7v3P43Oc+d+Kg39Rnn312+M1vfvPqPN5AAAIQyJGA7lO6X+n+RWiHgPL8d3/3d1/m+9nL59a9U6e1nl16ptnfvXv/w8s6YpaLdr2sd2j53v92oJOxnTKLpxCAwHYEJDrq+ZDiGaB+B9U59Pfaa6+fZgO6/REStWLMEHRpKf4lswXdOGK+1/NraTtRg3bX1tl+/etfx3SniLi6PUsfXqvzPHjw8JUIqnIp4dU3X2IIqAZOvzP7Tdir+hfoUzBCvOZE4LXHjx9/lpNBZov2RP3eH/3R4c9/8hP7ilcIQAACEIBAdAIaeZdTwyK6g0SYjIBGs6rstFJ+bNZLJ55qWaTxmdzq5NWoUjp5kxU/IoYABCIRoB4QCSTRJCegZyvL9ybHTAIQgAAETrNGU7fxNOtVbSW3HjI1W1Li1ZJngJZOzSVoKeMlQe1PzSadC3pOaqWRsTb60vTn0s3tuHiNMRiy1bd+4ZbVoXhif0efQmyixLeGwHjv15pYI1yrZXzfeOedw0cffnDQ8r4ECEAAAhCAAAQgkBMBjdhMtX9NTn6aLRJRfRtO3ZJUD14tUaUGkBtevHj+ajkrjX615YSs4dvCUksuD95DAAL7EdASZnYP2s8KUobAPAE9OwkQgAAEIJCegC1vmlJI1VKmElGVlv7UzrJZgX0PdWxqAGv/fPezu/eq+73ey4al8fbjmvu8ZpbtnIDab0OqLTmUd0uF6Dnflh7vZomO74drImLotjkqR0P+j9mpMiBbpgZA+/YDjKWx5Hu3T0HlR3/0EywhyTUxCGQrosq5t7/xjcOPv/UtRNQYOU0cEIAABCAwSEAdpwQIhBJQg6Zb9q+d8iPBeGkju39d/7Px1/dqJNNIMiK8QgACWxDQzI6cZmps4TNplEegtr3tyssBLIYABFoikFpIVbtH7UkThSy9IcZqGy19BkwJY3ZsTMyzNpkEubUDzhTX0tC1vcfb3f0ZuuI6FMR8Tiwcui7kO6UtEVPB+A5dr/NsT9yh4/quKyOdyGqC6lScFo+dMxe/na9XO9eudY/tIaC66eu9yqD+Qjj04+AzBNYQGL8DrYk10rVvvPvuKSYt7auZqQQIQAACEIAABCCQAwFbJigHW7ayQY24rYI1kqzhbp0LW6VPOhCAQHsEtITe3EyH9qjgcU4Ehjo2c7IPWyAAAQjURkDC5lrxcIrJ2MzT/jVqC6VsD+n5IpHWrQdJrDJh19IeE1v79g59tjiGjs19p5UYQtqiJmIOxTt1bOj8kO+GxMahZ7c4mh3irL4FhalByyaoDsU3ZKPOUxpqV/sGE1JVFnSt/lKWf1+73POMg2ylr8Alw/vUBLbrDVvoyRt/8PuHj37w/cPbX/nqwhi4DAIQgAAEIDBMQKP/Qirjw7HwbYsE1Ah0G5ktMtjCZ1dMtUb8FumSBgQg0B4B3de15J11ILVHoAyP1dmo0Fr9bWo5xjJyDishAAEIlElAsxy1DGztzx3Vg+b2DDWxVedKCAxZDlh9L7puSZBY5s7E7dfV+nHLrrGg9qXiW2rLWLz63neVMxNC5ZO91/Uqa/JF4qWODXEOmUlr7eclQqrsyT1YX4Frp/LW/Ha/5z0E1hJ4fW0Eqa9/60/+9PCP3/5O6mSIHwIQgAAEGiOgyikiWGOZHtFdjTIlbEdADSQttQn37ZiTEgRaJKCOLHW+EPIloNkoNmMjXyvjW+Z2ssaPnRghAAEIQGCKQH+52Klzaz9m4qOeS+LiM8jHBkAtZaM0lZ79zcUzJ3hLpEwZ5K9WOJl7dg8dN1/7nBWf6qh9AXnOD1d81rlm29x1pR63fgOJzQQIxCRw65vf/Oa/ixlh7LjO/sW/OBxef+3w9OWSvv/yC/9j7OiJDwIQgAAEGiSAgNpgpkd2OXXDK7K51UTXLSl06/DrX/+6Gp9wBAIQyIuA7i+f+9zZy9kE2Y83zgvcRtaoA/HZs2cvl7y7v1GK+yejDup+J+j+VmEBBCAAgbYISNQKmdHnQ0d1jtLv77K//0yWUPfpp78+iX7//M//fHr9zW9+44PE65x+PU11Azd+EyDH2uyvvfZ6kkFzsuOzzz57KSz/8po9Xk7NnCT/VF7k261bt7zjf+21116V205AfXK6VnZ+7nOfm0m13MPyTZzETP1/Z2dnRf7WJAaXfo8otxRdt7yIluG/evdfH372wYfXLecTBCAAAQhAYAEBBNQF0LgEAhkRUOcFM1IzyhBMgUCFBDSzQh1hhHwJqCOwlTA0U6UV3/ETAhCAQC4EJF5pNiDhJgEN9hEb/WlJYNWjtKRqqufXs2fTdTTlldIfqytopqr6hVKEVD6brfJNf76hO//5qV7rzqiWncov5d0YJ980cj3PZqVqBTrN4NWy3KUFCaj0feSRa689fvz4szxMwQoIQAACEIBAegJaEpQAAQiUT8BG0pbvCR5AAAK5EtDo79Bl03L1pRa71Nmnjr9W8sb8rSX/8AMCEIBA6QRiDsrmHr+sNPTrAGMc++f1Uxu7rn9e6Z9VZueEV7EK2eO2VCYl9iFIRNXgzrk8LDVPSrG7iJmopcDETghAAAIQyJtAqtGGeXuNdRCok4BGEJc4mrTO3MArCNRJwEbp1+ldmV7Z0nzKm9pnC8s/+UmAAAQgAIF8CEjIkPgWI7BMZwyK43HoGTo1y7KVgXI+4ltX5/Xb43aceP5HrA8hx75B9W1IMJWg7dqn+uD9+w/yh1u5hYiolWcw7kEAAhCAAAQgAIFaCVgjqFb/8AsCENifgDqeWL5v/3wwC27dum1vq94jSp2+WoqQAAEIQAAC+RGQ4BRLSM3Pu/Is0gzKsfDixfXl//V8dYVVCVaEKwIq21qSWeW7m/14nd/VmePvXL7jZ+13pOtDOGa5TK6WIO6WHj4ebBU9tUVkM2V1vzKjlK9aIPva4ZX6L3/+88N//eE/HN56732v8zkJAhCAAAQgAAEIQKBuAmpQqIHRynJMdecm3kEgTwLqvFCHkO43hH0JtJIH7r5l+xIndQhAAAIQGCIgsUl/mjkm4WNJ8JkhuCTe2q+xVSl8/NRsXxsMZ7y7mX7dzD4JVspHwnUCfSY2M1Ls55b97fasvZt9vVm/Ww3Oe/pU+8L67zN7ndQ2n1idZBvOU6kUNxP1Zx98OOUPxyAAAQhAAAKjBEIq26ORcAACEMiSQDdi89G1pW+yNBSjIACBIgn0ZzIU6UQlRltHXq3LIKqjjAABCEAAAmUQ0KoBzErdNq/6onUn2g3bIDGwGwx3JZL1l/Flht8wO/dbYyieGuglYXqqvjKUJznOUNXgvOPxmEUfgstMrEz8Vz6wOolbGvd5X5SI+vDNN0+UfvHDH+5Di1QhAAEIQAACEIAABLIlYI0gjQgnQAACEIhJQJ0XbmdGzLiJK4yADYrLfdZAmFdXZ9cqDl95yDsIQAACdRGQsISQuk2e2kAqNzWrF7jfjb0fur4/63LsWr6/IqA6mOrGWvpX9WP9SfgzodSty0hs1XHN+FToC4RXsbb5TiK+9kM1cb/j9eQk/rdJJE+vi1uP6PPvv3f48be+dfjj7343T6JYBQEIQAAC2RJQ5dgqJtkaiWEQgMBqAhqd3B+h7EbK0r8uDd5DAAK+BGoV7Xz9z/E8dTRN3e9ztHnOJjpz5whxHAIQgEB+BOzeTX9D2rwZeua7+6WHpj41mzI0rlbPt/qxRNL79x8cTNQWW3cGpQnYmnGpa9Qmb/33IiZ9BmvKc6tlcAu/i5qJKiDaD/UXP/rRQfujEiAAAQhAAAKhBKgkhxLjfAjUR6DfUKnPQzyCAAQgUC8B7cVlwZ3pYN+V/GozOEr2AdshAAEItEpAQiqrVqTN/dgCE/1D8fJLwqjt6a72dr+OZuKqvpd46Nbn4lmxLCYTgpddPX+VCcj9MyU694NW1xo7v38un7cjUNxMVKH50te/dvjoB98/vP2Vr25HipQgAAEIQAACEIAABKohoGVzbMR4NU7hCAQgAIEGCKhzyUK/g86+L/XV3Q+rVB+wGwIQgEDLBDoh6fK0z6I42OAY99nVMp+1vmuPepel+IbsW9+fAZlaPFvrb4nXu7NPZb/a3RJQbRaxhEM3D3PwUcvpqg6meuXSMtEXPk00ln82iNvuB1Zm+xz6s3eXsJEdS31Ykl4r17z2+PHjz0pzVrNQv/dHf3T485/8pDTTsRcCEIAABHYmcH5+vrMFJA8BCORCQHu4ECAAAQiEEKAeEUIr3bnu/VsdX/1OqHQpp42521Ps07SJEDsEIAABCCQnICHjeDz+dq/I7r6u7ySs6E8zKm3WXnJjKktAotwasUs4EJquF4oUA4xLrZ9J6JSg6jvgWuxMJL1O1f+T0tRyyDHET9mjWb4hPvhb2u6ZxS3nq6x6+Oabhzfeeefw0YcftJtzeA4BCEAAAsEEVFEmQAACEDACamAQIAABCIQQ0P5NhH0J9Jfes9H8+1q1PnV1oMXoPFtvCTFAAAIQgMBaArqf9wfG6DsJM5qph4C6nLAYrn1err1+ufX5Xak2cYqVPUpdXUMD8ySKauDkw4cPT4L7VK6pPHa/9edTp40eU9tC94NYZVL2mA/0d4xiDz5QpIgqL9/+xjcOP/vgw2CHuQACEIAABCAAAQhAAAIisHbEKBQhAIH2CKhjgrAvAXc/NHVu2fJw+1q1PvVaxOD1JIgBAhCAQB0E5kQRCRz602Bvd8C3nm2axecj4NRBCi/2JJCqTVxDnVl1TM0on/st6rcuIdRXTNXAuU48vfSe8RpSRmzQp/IWITWE3Pi5V5uJjJ+T5ZE33n33ZJeW9tXMVAIEIAABCEBgjkBXsbk85LgHw5ztHIcABNIQUKOihgZeGjrECgEIDBFQx0SqDqeh9PjuOgF36V7NSq1FRJUfmgnCM+l6fvMJAhCAQI0EJJrO1SX0vNOzwZYXXbuEbY0c8WkdgdQCWy11Zv0O9ad6p/7GBkiYmKrfd7/fccvfseqSWtLXZqSqlFC/XPdbKXYmqtx+4w9+//DRD76/jgBXQwACEIBAUwSsUtNfCq4pCDgLAQi8IqA9iQgQgAAEQgjQCRFCK8251ulnA+TSpLJ9rMwY2J45KUIAAhDYg4AEGd9gQojPjDjfODkPAiJgbeExUXAtJdWZJR7WEvS7lTg6F6zf8eLi4mB/mqna8ej2SJ6LY+1x7bFqYW7Ahp3H6ziBokXUt7/y1XHPOAIBCEAAAhCYIKB9SFSZQUydgMQhCDRAwF0WsgF3cRECEIhEwJbJihQd0QQS0Oh6CzUKqe6yjuYnrxCAAAQgUAcB3eNDRFTXa10nMZXnhEuF90sJqC2cuk7rinlL7czpulq2X+AeElaqXnv8+PFnYZdwNgQgAAEIQKAuAqo8qCFCgAAE2iSgARUECEAAAqEEzs/PQy/h/IgE1OnnzgqurT7X7au1zWyFiNlCVBCAAAQgMENA+526S9PPnD54WLP7NLPNN2gFB806tAGkSt+WF3Wfpb7xcV4dBLba2iZGmd+LuH4nEk61nHaJS2orjzX4sH+/UL1Z9wR+/34lCxHVjxNnQQACEIBA5QRq63irPLtwDwJRCdBRHRUnkUGgGQIPHz5cPJOkGUgJHR3qQK6tPscgn4QFiKghAAEI7EjABAwTNteKqmtd0QpdEojc0P+caslXN03e10mg5DpzzXUxE1g1W5jf9/Rvj02gpvlwFAIQgAAEGiGgCoMaDkuX1WkEE25CoEoC6ryg0VBl1uIUBJISoN6QFO9s5OpwVie0e/92389GkPkJEokJEIAABCBQJwE9r9xn1t6DgIb6Qew59OzZJ9cywbX72gE+7EKgXxfaxYiZRIfK18wl2Rwuge9SWJqFqlmqWpmvv8LL0jhrva7oPVEtU375858ffvw3f20feYUABCAAAQgsIqB9Uq2hsCgCLoIABIokIBGVAAEIQCCUgDoR2Vs9lFrc8+/ffxA3woxiq2XPrYyQYgoEIACBbAl0omo+g2dstQctASqhRX+djSwzn1MhksBXQl1IKz+VGkoWgH2Y6zeu9ozEVM0YJgwTqEJEffjmm4d//PZ3DhJTCRCAAAQgAIE1BGrb9H4NC66FQCsEbG+gVvzFTwhAIB4BRNR4LJfEpNmoWorMDbUMiOsvo+j6yHsIQAACEKiPgGZ8ql6Rw3Ns6PlaH/HyPZKAmuugK9XPJMppP1TNdCw1SESVWF1z0IQSial6JQwTqEJElWtf+vrXDh/94PvDXvItBCAAAQhAwJOARldqGQsCBCAAAQhAAAIQmCOQ28yROXtrPP7gwfXZqLUMiENErbG04hMEIACBcQKa7WlihvZh1Ow9/al/Qn8msG4lsur5Wrt4NJ4b+R+RQCmxO8cBfSo3Kj+dAFn+qk8SgZmlmf9vIqWF5Zfi39J560/+9PCf/uIvDoevfDUlL+KGAAQgAIEGCNi+AKqQEiAAgfoJ5Dp6t37yeAiBOghItCt5hH0NuaDZDqq/KZiwTT2uhpzFBwhAAALtEtDzTMFex0iY0GlblOhVK+3EeA6qfmMina3eY/Gyh+JYjmzzvQZbdcJ6XkssqzzmUC9W+RQj/R5sYJp+S7JP4m7oMr06X78B1fvnfpPblABS2ZJANb3DWtJX4Rc//OHhjXff3ZIhaUEAAhCAQIUE6BCtMFNxCQIjBKxRNXKYryEAAQhMElBHimaFWKfi5MkcTEJAsx10L7dOrRrqceZLEmBECgEIQAAC1RCw54W9mmNLxSK73l7HxCZbCcIGMdn5vG5DIFfuOQioqpcbn/7vQp/1p1nfGoSnvUB96/A6zwYWsPTtNuU8l1SqWc5XQD///nuHH3/rW7mwxQ4IQAACECiYgCpVWjqHAAEI1E8AEbX+PMZDCKQmoH3MCPsScDt5uw6y5/satCL1rZZqXGEil0IAAhCAQOYETCjS0sC2JLCeLzGfMRJSz8/P///27p43kiS/EzB3mkSz0STAMQisIXPPW2ex+yG0gARIwPmSPMnQp5EheVr5B0ie9A3uDAnryBTaXqCNLoBsTBPDxt78yImeYnWRlVWVLxGZTwIzLFZlxcsTya6o+EdEPmx1moBU+a9yGsUbSCDt3+XINZhVtGWVc5f37HNOJtN1ORJozb1AM/a3T1nS58y9Xh3LEfjZu3fv/jin6v7zL3958r//4z9OysrUOdVNXQgQIEBgfIF0jLrOShu/dHIkQKAPgQwsOAgQIHCsQAYRHdMKZBAsg8Y5MpBXVslMW6r9c89AnhUO+7t5BwECBAjsJ7C5FXBW5eXIGEgCXeW2J9u2B87rmUS2bSXf+ufxY3qPW6jm8618Tj9kdOT/ymrblC9lzeTYsgLxyKS9/UCB9L/KdVTapExa3tb2acO3b3P/3eM2TM31eOxWuynLPitpbWl94EXS4NtmF0T9/T/940Mz/Mq9URu8HBWZAAEC9Qm0PABXn6YSEahPIF+2MvvUQYAAgWME9h10OSYv731ZYH1Aq9XA9nodXq6tVwkQIECAwDgC6wHLEvAqwdKMm+Tek2VXiPXJQJeXlw/Prz+XEuc9zwU8k1e5x+v6dv3rNS3prj9XHievErjLc+uP8/u2YF6e73qkfDlKGfO4BA5LANp3zKh0P/pYwFCux+65fn3mPmOAxhK+9ivPvPT3Xc5p6edxIf4Ka/qLP/vzk//zp396IohaYeMoEgECBBoU2OxsN1gFRSZA4AWBMrv6hVO8RIAAAQINCWT1aQYy8+97BrfKQG9DVXgyKNtSuZWVAAECBOYrkMBjCT6WgGqCpnmuBEMzfpL/ynlFI5/H6zsslIBZPrPzWj6zyyrV9eDoZjC0pJf8s/r0uaMEc9dfL/mUMZ7NMq6f+9zj5NtlpWL6HnMLIj1n0tfzCTqvt/0h6Zbr8ZD3lvfkWt62urq8vv5TO69rPH0cw23/Fjw9q53fnv/Xpp06PClptvH9+a9/ffI///avJ7/4i7988ppfCBAgQIDAvgLpWKfjvq0Tvm9azidAoD6B/H07CBAgcKzA+kqEY9Py/uMFMqjVYvC01Dz9zvXB5vK8nwQIECBAoAaBjJNsC0KWYOp6GTe/byVQtv4ZXR7nsy/9qQRedu3IkLzLSs8EK/O+suXwerC07yBOtp196ShB320OL73Pa48C6fukzQ69HUNf/adsC9wlWJ5SJ1iovb++gjMxIoZ9rA7+OvXxn5ldEDWEv/r7vz/5/T/8gyDq+NeTHAkQIDBLgXTiHAQIzE8gX3K3ffmfX03ViACBoQUEUYcWXl76VrAsr83VmAABAnMU2Py+VQKNqWsfQc4xAlhl5W0J+K63U6nPGOVYz3euj+OY66JrELM4JHie4GcfR67ZBPK7BHNzTeT6KEeZCLB53ZfXl/KzjKNm4kGZ8NBy3WcZRP35b35z8r/+8i9abhdlJ0CAAIGKBNKJ69J5qqjIikKAwA6BfMmyymcHkpcJEOgs8NKWcp0TcSKBNQGB+TUMDwkQIEBgNgIJLrUSYCqrXDd3Jst3ybu7T1YgDnRV5vp4//79Q+qbAco8ub7dbgme9n1NlWBugoDbgufrVd8M+Gb15dKP+JV2Shv23T5j+/7s3bt3fxw7U/kRIECAAIHWBI69N0Nr9VVeAnMWyBetOcyGnHMbqRuB1gSur69bK7LyNiAwly3QGqBWRAIECBCoXCABzbK6LUUdMiiToM9mYKzw7NpquJzn57ACJbg65HVQarDveKD+W5E7ebg3cH5LULXlY5YrUVtuEGUnQIAAgToFskXL5uzDOkuqVAQI7BIQQN0l5HUCBPYV0E/YV6yN86du16xGHWNwsI3WUEoCBAgQWLJAAqibqwLzOd337kIvBVAFx+q5AsfsH5VrzJjg1+2fyQ2bO/eVVcQ5u/XgaanxN+WBnwQIECBAgMDzAumgZfWagwCBtgVsrdN2+yk9gVoFMojnmJ9ABs2m/NzINmgOAgQIECBA4HHlaSbDZiVoORLUyirBvo6XAqjJd8zAXV91kk4/AiWQ2iW1rGIuK2W7nN/yOQmSbvaV51j3WQdR//2v/qrla1DZCRAgQKAygc+fBVEraxLFIbCXgC++e3E5mQCBPQRMttoDq6FTMwg0ZdvmHlxzHIhq6BJQVAIECBCoTCBBm6x0KxPY+lwduO1+5I+3glnNZkVdZc3ZVHHWA/i7Cp5AalZpLuFIXzl/kwmm7mPUks2sg6h/+K//aqktlJUAAQIEKhconfTKi6l4BAhsEcjf71y2ktlSPU8RIFCBwN2d1agVNEOvRSgDsx8//rTqpdcMOiRWytDhVKcQIECAAIHFCJTdIhLkHGrCUQJCWf1qBepiLqsXK1pWXXbdpS7b3Gal9JKCqTGa49+Le6K++KfhRQIECBAg8JNAWYmQVQEOAgTaEciXnH2232mnZkpKgEBNAhk02LwnUE3lU5b9BRLAzOfHlH3AlOHVq9OHQdz9a+AdBAgQIEBgvgL5fE6Qs+8gaibg+v443+vmmJqVa24zjVyDZSVzfqbvlrHDMhku3xEyLpGJeUnD0ZaAUeC22ktpCRAgQGBigXR4si2HgwCBNgTyRSVfrB0ECBAYQyArFgRSx5AeL48MimWwKyuNz84uxst4LacMwl1dfevzbM3EQwIECBAgUAT6Ckrd398/bEta0vWTQFeBXIPbrsP038pCjPKza5pzOi+rcV+/Pn/oT+fvbJtVzfWd9Xa+NcMrGwECBAi0KfDYMXJv1DZbT6mXJpAZxAKoS2t19SUwrYBtw6f1HyL3sqogAz5THhl463ulzZT1kTcBAgQIEKhNoLXATm1+yvO1QMYjMskyk7szPrHUayz96PRlM9m0xfvFnv7zL3/5dev++MzPf/3rk9/+y798ef0P//mfJ//+13/95fddD156/29/97uTn//mN7uS8DoBAgQIEKhOwGrU6ppEgQh8JZAvKoIZX7F4ggCBEQSsRh0BeYIsahj0evv2wuSgCdpelgQIECBAgACBQwUyLrH0sYn0o9+/f/9wf9gEUsskxUNNx37fz969e/fHsTP9/T/940OWv/rbvxs06wSI/+a//3vQPCROgAABAssUWN+SY5kCak2gXoHVarXYGZ71toqSEViWwPX19bIqPOPark/KqaFdfcbN+GJTNQIECBAgQKCTwOXlpfvWdpJyUh8CtvPtQ1EaBAgQILA4gaxGdRAgUJ/AkrfIqa81lIjAMgVsuTrfds9nzNRHazP3p/aSPwECBAgQIDAvgdxf8/z8/OF+8fOqmdrUKiCIWmvLKBcBAgQIVC2QrShyTwMHAQJ1Cdzc3NRVIKUhQIAAgaYFXr8+/1L+fMbo/33h8IAAAQIECBAgMKpAJitmO9gcucdmAqoOAkMLnA6dgfQJECBAgMBcBXKD+GwhkhlwDgIEphfIFocOAgQITC1gpeDULTBs/tmN5OrqathMpE6AAAECBAgQ+FEggcJM6krQcP14aYv/vGeO9+E0/rZ+BXg8lsDTv7yxcv0hnz/83/938vu1/H7xZ39+cvknf/Llmf/5t389ufnDH778vuvBtvfveo/XCRAgQIDAsQJZkZCt3QymHSvp/QSOE8jKoKwQdxAgQIAAgT4FPn+280ifntIiQIAAAQIEugusr7xcf9eu778Juua/u7tPJ/f38/iuHAtB1PWrwOOxBCYJov7qb//uSQB1qMr+9ne/Gypp6RIgQIAAgS8CCdwkkKoz94XEAwKjC7hP8ejkMiRAgMAiBDLwuH7o761reEyAAAECBAgMKZAdTm5vbx+yyONXr04fVqTu+v6bSWDps5ydPW59m6Br6wHVbbu9bHtuyPaQ9jIFfvbu3bs/LrPqak2AAAECBPoTyIw4q1H785QSgX0F3r9/v+9bnE+AAIFBBGz1PwjrZIlubpV3dfXtV9vpjVm4DKTOcXu+MQ3lRYAAAQIE5i6wqz+ahQCZKNZSn+KlPthmf23u7at+4wpMshJ13CrKjQABAgQIDC9gNerwxnIg8JxAvgA6CBAgUIOAbcZqaIX+ypDPl/Wt4tO+m/cj6y+35aSUgd3cEsNBgAABAgQI9C/QpT9adta4uLh42FktAdX13TfKCs88t94Xmupeq7v6YCnvejn7V5XikgUEUZfc+upOgAABAr0K2NK3V06JEegkkG2JDMR2onISAQIjCLx9+7hl2ghZyWIEgfXBxGRXBhRHyHq2WZSB3WxHuFp9mG09VYwAAQIECAwlsGuV6b75loDqc+8ru2DkMzxB1xxjr2DdVcbnyu55An0IfNNHItIgQIAAAQIETh5mvSWg4yBAYByBTFwwADuOtVwIENgtkJn5VinudmrpjNevz58UdzOo+uRFv3QSKBMN8reSQWAHAQIECBAg0E0gn5vX19cP9zrt9o5+zkp/KHmXW1ht9o/6yeXlVHYFUaco08sl9uqcBARR59Sa6kKAAAECkwvc3dlWdPJGUIBFCGQ2rBWoi2hqlSTQhEACqGVmfhMFVshOAgn0pW0d/QhsbsWXAdE85yBAgAABAgReFuh79enLuT19Nf2hEsTMwoEaJzKnjLlnqoPAEAKCqEOoSpMAAQIEFiuQLU2sRl1s86v4SAKr1Wr07YNGqppsCBBoUCADNgKoDTZcxyKvb+HrXlsd0fY4raxM3eMtTiVAgAABAosSmDKAugld88KBBFIdBIYQEEQdQlWaBAgQILBogZo7lYtuGJWfhUACqAaxZ9GUKkFgFgIZ1DJgM4umfLYSZeXFsyd4obPAekC6vCl/P1ajFg0/CRAgQIDAU4HsiFFLXyQLBsa+F+pTjd2/6VPsNnLG/gKCqPubeQcBAgQIEHhRoPZO5YuF9yKBigXypU0AteIGUjQCCxOoaVXAwuhHr64BuX7In7tfmdWo/fhKhQABAgQIDClQ4za+Q9ZX2gSKgCBqkfCTAAECBAj0KGBL3x4xJUXgR4GPH29ZECBAoAqBmlYFVAGyoELo4x3e2M+t2rYa9XBT7yRAgAABAmMIZEeoqQ6T2aaSl28REEQtEn4SIECAAIEeBT5/vu8xNUkRIGAVqmuAAAECBKYSWN+G1m0bDmuFrNx+6Vg3fuk8rxEgQIAAgSUJ1PD5eHt7O+mOUPsY7HPukq4jdT1OQBD1OD/vJkCAAAECWwXu7wVRt8J4ksCBAlahHgjnbQQIECBwtMDFxcVJVh/nmPq2Dc9tiXt0JQdKIG7X19c77+dm0HOgBpAsAQIECDQrUMutI1oa39KfaPZyr7rggqhVN4/CESBAgECrAi11Mls1Vu5lCbgX6rLaW20J1C5ggKb2Fuq/fOuB1E+fPvWfQccUn9sSt+PbRz0t2+/Frctxfn7e5TTnECBAgACBRQhcXX27cwLSGBCt7QilPzHGVbG8PARRl9fmakyAAAECBAgQaE6grABqruAKTIDALAUM0MyyWXdWqgRSpwyi7ixkRSdcXV3tVRr3PNuLy8kECBAgUIlAvquuf4blcVaRJhC6azv7bVXI+2qZNNXibQyMHWy7qjx3jMDpMW/2XgIECBAgQGC7gFVz2108S+BQgam3Tzy03N5HgMD8BNYHyeZXOzXaJZBA6uO9we4nG+DMNVh7X/OQAcys8K69XruuD68TIECAwLIE8plcdl3IJKtXr06f9A8SDM1zq9WHTjCPAdl6QjYtfg/PrQ9aLHenC8RJkwhYiToJu0wJECBAYAkCq9VqCdVURwIECBAgsCgBq1AX1dxbK1sGS7e+OMKTLWwnPbXRCM0gCwIECBAg8GTL3fQRt60gzXNZXdrlqOnWUK3uvBHvMukxPx9X9p514XcOga0CgqhbWTxJgAABAgSOF8hMeoHU4x2lQIAAAQIEahLIagIHgW2DpGOpZIVFzcchq1BTn9rrVbO5shEgQIDA+AL5vOs6ua5rILWmHRlqCuju27pv3148BE9za4FH+/wUSN3X0fmPAoKorgQCBAgQIDCggEDqgLiSXpSALzyLam6VJVCtQP4tmjJ4Vi2MghFYE7AKdQ3DQwIECBCYlUD6grnP6fX19ZdtfLtWsHsg9b5rkoOe13IQNdabffYEVA+d6DUotMSrFxBErb6JFJAAAQIEWhcQSG29BZWfAAECBAg8CrSwjaq2mr/A5891DK5uk87A8qHH5mDnoel4HwECBAgQGEogKxy7rj7dVobH4N7jFrPZZjZBvc3AXi2f88fUc1vda3guE72O6avUUAdlGF/APkTjm8uRAAECBBYokEDq7e3t3jMVF0ilygQIECBAoFoBQdRqm2ZRBavxHmVZmZOB5WMDoUmnpq0MF3VhqSwBAgQIvCiQz6hjj3yGpz9ZPi/Pzi4ekkxw7/vv708SQM05NQQwU4aUZW6fy6lXbs+xWn04tjm9fyECVqIupKFVkwABAgSmF/juu+8eAqnTl0QJCBAgQIAAgUMEahjQOqTc3jMfgQyw1jaYmRU05Z5jx0onEOsgQIAAAQK1CWT73r4+657b9j6B1fQ1a/osTJ0dBFoVKKu9jy2/IOqxgt5PgAABAgT2EKghkFrj6oU9CJ26UAGrvxba8KpNoCKBza3WKiqaoixI4O7uUzW1zYqcDE49NxhcTUEVhAABAgQIHCGQz7q+ji4T8soq1b7yPDadPut/SFmGGAuoZcvkQzy8p7vAx4+POwIe+z3Odr7dzZ1JgAABAgR6EUgg9f7+vpctz/YtULYUTv4JpJpRuK+e8wkQIEBgyQKvX58vufpN1z2rN3NkwCx9sBxpz9oGKR8KtuN/6cfVcGQwaojgaU1B4hqclYEAAQIEphXI/TNb7C/0qZb6J5A61fa32XrXQeAQgezeku8Bj1toH37LCFfgIfreQ4AAAQIEjhTIB3k6oEMNQG0rXgmg5rXk7x6t25Q8R4AAAQIEvhbIirulD6B9rVLvMxksSTAuAdNtW9+2OiCavlstR58B1LJLSlbn1BIkrsVZOQgQIEBgOoGM13RZOTpdCcfLecpA6hB9cIHZ8a6dqXPqI/gviDp1K8qfAAECBBYtkIGi/JfBvCE75xlMLCsvCnjyzXNWpBYRPwkQIECAwHaBIbYR256TZ/sQeBxsy8rhTw/9qzJQNsQgXB/l7ZLG+mS4LucPdU4mFPT595A+6s3NzUNxN/uqQ9VBugQIECBAoItAxkz6nDTUJc+az5kikJp+xxBH6pK0t022GyI/abYtIIjadvspPQECBAjMRCCDR5mFn0DqEMHUx87u1UMeyad0FPNztVoJpM7kOlINAgQIEBhGoM+g0TAllOqmwOPg2MXm003+PlUAtQRMc/0nEB3Tvo/17XszWO0gQIAAAQI1CZRxmprKNGVZ0he4vr7+YUzp5V0/pixj17zTvyljY13f47x2BUq/9pD+Zv894HYdlZwAAQIECEwqkM5b/iud9CGCqSVIWzq86TwkT1v7Ttr0Mu8gYHVKBySnECAwmEBZyThYBhIm8IzAmAHUbFs4ZMD0mSp6mgABAgQIVCswxLhMtZXdo2Cbk9XWx5j2SGbnqfx3Ejmho0DGPrMTX8aW8nifQxB1Hy3nEiBAgACBEQTyYZ7/sjo1g1mvX5/3PvO/dHhtTTNCg8qiF4F9O7m9ZCoRAgQIECAwocCYAdRUc4g+5y4+q7x3CXmdAAECBMYSyPhLxkgSEPz8+X6sbGeRTxljSmUOWen3HIIg6nMynj9EIH/bCaRmR759xpgEUQ/R9h4CBAgQIDCSQDqf+S/bTpRVpCNlLRsC1QhkENlBgAABAssTKLtzLK/mJw+7hPQ5CLnLMH3NDICOfVjlPba4/AgQIEAgAtu29iy7Hz0GBMf/TJxDy5SJ+n30YRLUHvIwkWtI3TrT/vjxcWxpnwBqauJfgzrbU6kIECBAgMATgXzA578ymGg23hMevxAgQIAAgUEFpgguDVqhyhNPfyf/Zab4Eo+xV6DGWN9yiVeaOhMgQGCZAgmglj7G+tae+wZWlqm3u9YJpCZAmb7cMaYlILs7x8POSN8n7d9HwPewEnjX2AKHXo+CqGO3lPwIECBAgMARAvnAz3/pjL59ezHJioEjiu+tBA4SKDOCD3qzNxEgQIBAUwLZXitHGdxsqvA9FHaKAGqKbUVoD40nCQIECBBoQiBjKeXI49XqQ/n1h/GWe+MsXzQOf1B2UsvY1SGByqFXoZaalUCtQGoR8XObwDfbnvQcAQIECBAgULdAAqnp6KdD6iBAgAABAgQIzEFgyQHU9OlS/ykG8TJQOcVq68c6/zRwPYdrWB0IECBAoG6By8vLJ595+fxbD9i5F2q/7ZdgagKVV1ffPnHelUvu0z7WUQKpY+Unn/YErERtr82UmAABAgQIfBG4ubl5mNWn0/eFxIMZChy65coMKVSJAIGJBKxKGB6+3P96SStQc13d3X2aJHC63qJT3RPMThPrreAxAQIECIwhsG37+oyn5DMp3zvtzDBMKzzeZ/ZxBfCuCWNTTO5KnrvKNYyMVFsQEERtoZWUkQABAgQIvCCQjl46/EsadHyBw0sECBAgQIBAYwIJJuZYQl8mdc0ql6zCrGWS0FQDxoKojf2hKi4BAgQaF1hfcbpZlbL97BQ7M2yWZc6/J2CdyVtZEPDcMeYq1FKG5CmIWjT83BQQRN0U8TsBAgQIEGhQoJZBuAbpFJkAAQIECBCYWCCrMee+q0Ytq063NbUB420qniNAgACBuQm8tPPCthWqc6t/LfWJdSZwffx4+2RC2dnZ2Ulem6Jf8rhS9uxJeWrxUo7pBQRRp28DJSBAgAABAr0IZHBuis5mL4WXCIFnBNz39xkYTxMgQGAmAvl3fu4B1NTxpRUXUzZlBiwdBAgQIEBgCQICpfW0csausgNJ+kgJqNYwlpUguwUK9VwjNZXkm5oKoywECBAgQIDA4QKr1YeHDujhKXgngboEMjGg1kHnuqSUhgCBoQWyUtIxjMDcBzRzr1efZcNcO1IlQIAAAQL7CJT7r+/zHucOKzDVytNttbKd7zYVz0VAENV1QIAAAQIEZiSQQbrVavXD7LnHe4vNqGqqskCBTAxwECBAgACBVgUyWFv7gNxLWxsO7W61x9DC0idAgACBdYHaP5PXy+rxuALG0Mb1bi03QdTWWkx5CRAgQIDADoEMSFmVugPJy9ULmCVcfRMpIIFFCdzfm5y0qAbvobItBFB7qKYkCBAgQIBAMwKXl5fNlFVBxxX4/Flff1zxtnITRG2rvZSWAAECBAh0FiirUju/wYkEKhIQsKioMRSFAIGH+yOZ3OFC6CrQUgB1qs9bKz66Xk3OI0CAAIE+BK6uvj2Z+y0E+nBaahq5NnKNOAhsExBE3abiOQIECBAgMBOBrErtY5Dq/fv3MxFRjVYEbPHXSkspJ4HlCGQLuD4+U58TS9oJvtmW/zmhNp5vKYAa0b76ivu2jvsM7yvmfAIECBA4VCArUM/OTg99u/ctRCDXyJs3bxZSW9XcR0AQdR8t5xIgQIAAgQUKfPr06aHWGdR1ECBAgACBJQt8/Hjbe/UTPM1nbLbifwzUfn9iS7HemUdJsLUAakEZO6CZa9596Yq+nwQIECAwpMDZ2ZkVqEMCzyztqXbomBnj7KojiDq7JlUhAgQIECDwVODYgdhsa5KZm1mpkMFBBwECBAgQWKrAUJ+F66vv85lru7n2rrBWA6iRHnvAcOygbXtXkxITIECAQF8Cb99e9JWUdBYgsN4nX0B1VbGjgHXsHaGcRoAAAQIEWhXoY2Asg7mvXp2eDLECp1VX5SZAgACBZQpkBd3p6Wlvgc6ydVifaS6zZaardcsB1KhlwDCrQ8fa6tAq1OmuVTkTIEBgSQLZmnWsz7Yluc65rrkvanaHcRBYF7ASdV3DYwIECBAgMEOBPoKoYcmXj6urqxkKqRIBAgQIENhP4ObmZr837Dj74uKit6Dsjqy83LNA6wHUwjHW6tBym4iSr58ECBAgQGAIgWzjm/6Vg8A+Ahn3ur6+ftiNbZ/3OXfeAoKo825ftSNAgAABAgQINCeQ1TAOAgQI1C5gi/vaW2j48s0lgBqpsVaH9jW5b/jWlQMBAgQItCqQAKoJ4K22Xh3lzm5sJZj6uKL5rI6CKcUkAoKok7DLlAABAgQIjCfgng7jWcupHwHbRvfjKBUCBIYVGCvoNGwtpH6owJwCqIcaHPI+fzeHqHkPAQIECHQVEEDtKuW8LgIJpmZFc4LyubYcyxRwT9RltrtaEyBAgAABAgSqFMgqVIH/KptGoQgQ2CKQQJqt4rbAzPwpAdTDGthOE4e5eRcBAgQI7BbIasHXr8/dA3U3lTMOFEhA1VjFgXiNv00QtfEGVHwCBAgQIECAwJwErEKdU2uqC4H5C9iadP5tvF7DBAFXqw/rT3m8h8BY913do0hOJUCAAIGGBbIyMIGt/OcgMLRArrNXr05P0p+xs8bQ2nWlL4haV3soDQECBAgQIEBgsQJWoS626VWcQLMCmY3+6dMng3fNtuB+Bf/82T279xN7erZJB089/EaAAAEC3QSurr61wrQblbMGFjg7O/3hWrx4WPWcCeBWpg4MXkny7olaSUMoBgECBAgQIEBg6QJWoS79ClB/Am0KJIjqWIbAnIOAl5eXgzaiiVKD8kqcAAECsxXI51MCVw4CNQnkmsx9UrONtGP+Av4Fmn8bqyEBAgQIECBAoHoBg6vVN5ECEiDwjIDVqM/AzPDpuQZRy3aIQzaZVbxD6kqbAAEC8xIon0vZOlUAdV5tO7faXFxcPFTJ9r7Dt2wJWE9hLYg6fPvKgQABAgQIECBAYIeAVag7gLxMgEDVArb0rbp5FG6HwNu3jwOAO0476mUrto/i82YCBAjMXiABktPT04d7Tgqczr65Z1XBBFKnCOzNCrFDZTKZMat/8+/Ezc1Nh3f0d4ogan+WUiJAgAABAgQIEDhAwCrUA9C8hQCBqgSsRq2qOQYrTAZuVqvVrO5/lUHrMQar3TNssMtSwgQIEGhGoKwkWy9wAiLn5+frT3lMoDmBrJ7W1xm22Ta/b40ZSBVEHbZtpU6AAAECBAgQILBDwCrUHUBeJkCgCQGrUZtopqMLmVWbq9WHo9OpJYGyDd2Q5bEKdUhdaRMgQKANgaurb0eZtNOGhlLOTaBMBBBIHbZly/eteGe777H65N8MWy2pEyBAgAABAgQIEHheYG4rep6vqVcIEJi7QJkdPfd6Lr1+WbW5bSVNiy6Xl5ejFHuu95IdBU8mBAgQaFwgK/QEUBtvRMXfKZCgXnYsyfXuGE5g/ftW+uT5t2WMQxB1DGV5ECBAgAABAgQIfCVwe3try5uvVDxBgEDLAlbctdx6yyp7BvnKqomhay6IOrSw9AkQIFCnQCYdPQaWbIZZZwspVd8CY/Wt+i53S+mtf98qgdShg9eCqC1dIcpKgAABAgQIEJiJQDq+33333UxqoxoECBB4FMjs6Nzn2TFvgdy/rfUj2xKPcbjv+RjK8iBAgEB9AtntYIwt4+uruRItWUAQdfjWz/etTMgvx2Mg9WrQVamCqEXbTwIECBAgMFOBoWdkzZRNtQgQIECAwEEC7vN8EFtTb2p9gCwrgzLgNMbx+bNJBWM4y4MAAQK1CGT8IVtstv5ZWYuncrQnMJfbPtQsnwn579+/P9lclTrU00jO1QAADfBJREFUrSrG6TXXLK5sBAgQIECAAAECowu8eqUbOjq6DAkQGEWgzI62+mIU7skyySBx2rq1I+Ue89pcH9xqzUp5CRAgQKCbQD5bEjTNd7yxJul0K5mzCIwv8Pr1uV23RmK/ubl5CKRmh5X821P+Hcqk1j776VaijtSgsiFAgAABAgQIECBAgACBZQjYrnz+7dzqCpuxy93nANb8ryo1JECAQHsCWfmV+57m80UAtb32U+L+BfJ3kIkFjnEE0tdcrT58WZUa//yb1OeKYEHUcdpSLgQIECBAYDKBOdy3azI8GQ8mYHu/wWglTIBAJQLr9+qppEiK0aNAqzsqjFnu1WrVo7ikCBAgQKAGgfXgUFmBWkO5Wi5D7h9u54aWW/Drso89ae3rEizvmaxKTd8zf085svNKX9v7CqIu73pSYwIECBAgQIDAZAL5cpiObTq4DgIECMxZ4P7evSDn3L6trjIYcxKTVahz/gtQNwIEliiQoGlWeJUjW2g6jhN4/H780yq641Lz7loEBFGnaYmyKrVMZk079LEi1c2opmlPuRIgQIAAgdEErEQdjVpGLwhkNmC2WHEQIEBgKQL5Ep9/+2xtN98WTx+rtUDhWMH9sgpgvq2vZgQIEFiewHpgKAFVfZzjroEEesotINZtj0vVu2sRuL6+fvgukAlsJpGP2yr5u0qfN39XffR9BVHHbT+5ESBAgACB0QXG3LZt9MrJsAmBzK71paGJplJIAgR6Fri7+/TDAKNVGj2zVpNcixPV+hhI6tIAY6547VIe5xAgQIDA8QIl0JctMsvj41NdbgrZbjRHCfYsV2K+NX/cueT04e8l4yL5r7UJeK22zuOE1u97Kb7tfHthlAgBAgQIECBAgMBzAvmi4CBAgMASBcrqgiXWfQl1NlHt+VYeK1j7fAm8QoAAAQJDCQig9iebQKptkfvzrDml/N1kO+y+7tNZc13nVjZB1Lm1qPoQIECAAAECBCoQSOA02xPl/qdmWlbQIIpAgMBkAiaSTEY/eMYtbmM41meyIOrgl58MCBAgMKpAtu91DCPQYn9iGIllpGoSQnvtbDvf9tpMiQkQIECAwF4COuR7cTn5GYHc2yxb860Piq4/HmtQ9pnieZoAAQLVCqz/W1ltIRXsIIFW7/uZwP6QA3hJX7/goEvKmwgQIECAAAECBCoTEEStrEEUhwABAgQI9CXw5s2bk3KPjb7SlM4yBbKi1JaUy2x7tSZA4HiBFu+beXytl5FCq/f9HDqIauLAMq5/tSRAgAABAgQILEHAdr5LaGV1JECAAAECBAgcKCCAeiCctxEgQOBHAffNnO+l0GqwMKtEW11FO9+rSc0IECBQt4BJYXW3j9IRIDCcgCDqcLZSJkCAAAECBAg0LZD7mVqB2nQTKjwBAgQIDCjQahA1JHd3nwaTadllMBQJEyBAgAABAgQINCkgiNpksyk0AQIECBDYLWAAa7eRM54XSADV/cye9/EKAQIECBDwObn9GuCy3cWzBAgQIECAAIEIXF5egmhIwD1RG2osRSVAgAABAgQIDCGQe6NtBt0NgA4hLU0CBJYocHbma/cS232pdU6fwkGAAAEC8xOwne/82lSNphM4Pz8/yS0/VqsP0xVCzp0FfJvrTOVEAgQIECBAgMC8BHI/tI8fb604nVezqg0BAgQIEJhMQBB1MnoZEyBAYFAB93gflFfiCxTIRMurq28fbrHgNkp1XwCCqHW3j9IRIECAAAECBAYRyCDnzc3NIGlLlAABAgR+EsiEFatRf/LwaL4CudbtZDHf9lUzAgQIECBAoF+BfEc4O7s4yUpv4zP92vaZmiBqn5rSIkCAAAECBAhULpABTlvGVN5IikeAwKwE7u4+PQyOzKpSKvNDsPCewoZArnUHAQIECBAgQIDAfgK2993Pa+yzvxk7Q/kRIECAAAECBAhMIyCAOo27XAkQWLaA7bnm1/4+T7e3qWt9u4tnCRAgMAcBu2rMoRXVoWaBsr1vzWVcatkEUZfa8upNgAABArMXsJ3a7Jt4rwpm+14rUPciczIBAgR6E3CfyN4oJ09oLp+nCXj2uZr29vZ28rZRAAIECBAgQIBAywKP2/uetVyFWZZdEHWWzapSBAgQIECAAIGfBDKw6f4aP3l4RIAAgbEFBFHHFu8/vwQc045z+jzta3JVbKxC7f+akyIBAgRqEjBZpqbWUJY5C1xdXZ28efNmzlVsrm6CqM01mQITIECAAAECBLoJPG43uDKw2Y3LWQQIEBhMILtDCKQOxjtowvkszcBxAo5zCqAWtNVqVR4e/PPjR6tQD8bzRgIECDQiYLJMIw2lmLMQuLi4ODk7e7oidfP3WVS0kUqcNlJOxSRAgAABAgQIENhD4DGA+mGPdziVAAECBIYUuL+/HzJ5afcskKB3/pv77RFSvwSJM1i375G+RgKoczfa18X5BAgQmKvAoZ8Xc/VQLwJDCpyfnz/pY52enj75fci8pf1UQBD1qYffCBAgQIDAbATMUptNU+5dkbltN7g3gDcQIECAAIEDBBIUvLv7tLgdHLK6KP9dXl6eZMBu17GUAPMuB68TIEBgaQL5rDhk0s3SnNSXQB8CpU+WnVAyvpcgqmMaAfLTuMuVAAECBAgQIDCIgADqIKwSJUCAwNECVqIeTThoAllds/StCjNIl/9yH64M1L169ThkdHaWlQ/LDDAPetFJnAABAg0KWI3aYKMpcrMCCaRmjOft24uHiX7NVqTxgguiNt6Aik+AAAECBJ4TMEvtOZl5P58OtoMAAQIECBDoLpD7gtqS9ievpQeTf5LwiAABAgQ2BaxG3RTxO4FhBa6urh4y+PjRrUGGlX4+9W+ef8krBAgQIECAAAECrQkYBG6txZSXAAECBKYUyIoan51TtoC8CRAgQKA1gXx2OggQILAUAUHUpbS0ehIgQIAAAQKzF8hWew4CBAgQIECgm0BWoFp12c3KWQQIECBAoAj47CwSfhIYT8Ckv/GsN3MSRN0U8TsBAgQIEJiJwOvX5zOpiWp0Ffj8WRC1q5XzCBAgMLaAgY+xxV/OLxOPtMnLRl4lQIAAAQLbBM7OzrY97TkCBAjMUkAQdZbNqlIECBAgQIDAEgVevXK7+yW2uzoTIECAwP4CZ2enJ1dX3+7/Ru8gQIAAAQILFzg/N2F74ZeA6hNYlIAg6qKaW2UJECBAYEkCGRx0ECBAgAABAvUIuIdYPW2RkqSvZDVNXW2iNAQIECBQt8Dl5eWJybt1t5HSESDQr4Agar+eUiNAgAABAgQITCZwd/dpsrxlTIAAAQK7BXIPMfev3u005hlW04ypLS8CBAgQaFngzZs3J/ncNGG75VZUdgIE9hUQRN1XzPkECBAgQKABAasqGmikAYqYwXkHAQIECNQtYMJLXe0jiFpXeygNAQIECNQpkC3wLy4u6iycUhEgQGBAAUHUAXElTYAAAQIEphI4PbWV71T2U+YreD6lvrwJECDQTeD+/r7bic4aRcDK4FGYZUKAAAECjQt8/HjbeA0UnwABAocJCKIe5uZdBAgQIECgaoHXr8+rLp/CDSMgeD6Mq1QJECDQp8D333/fZ3LSOlLg82dB7SMJvZ0AAQIEFiCQ/ot7uy+goVWRAIGvBARRvyLxBAECBAgQaF/APUrab0M1IECAAIH5Clj9WE/bfvrkfuL1tIaSECBAgEDNAu7tXnPrKNucBXx3mLZ1BVGn9Zc7AQIECBDoXcCWrr2TSpAAAQIECPQqYPVjr5wSI0CAAAECBEYS0IcZCVo2BAhUIyCIWk1TKAgBAgQIEOhH4PzcVr79SEqFAAECBAgMI+C+qMO47ptqZvXbXnlfNecTIECAwJIF7OCw5NZX96kEstucBRNT6Z+cCKJOZy9nAgQIECAwiMCrV6eDpCvR+gUMytffRkpIgACBCNgOr47rwGqaOtpBKQgQIECgHYFMPrK1aDvtpaTzEXj79mI+lWmsJoKojTWY4hIgQIAAgV0C7oe6S2i+r1tNM9+2VTMCBOYn8PHj7fwq1ViNTD5qrMEUlwABAgSqEDAJqYpmUIiFCViNOl2DC6JOZy9nAgQIECDQu4DtPXonbSpB7d9UcyksAQILF8jEl9VqtXCFaasviDqtv9wJECBAoE0BW/q22W59lvrxlgj3fSYprQ4Cbt/VAWmAUwRRB0CVJAECBAgQmEpAh2oq+TryPT21lXMdLaEUBAgQ6CaQQOrtrRWp3bT6Pcv9UPv1lBoBAgQILEfAlr7Laevnanp39+mHyYAfHiYECqo/p9T/8xnzM3m+f9ddKQqi7hLyOgECBAgQaEjA/VAbaqyei5rB4Nxjz0GAAAECbQnk326DT+O3ma0IxzeXIwECBAjMRyBBNAeBBNRvbm5MChzxUjB5fkTsH7MSRB3fXI4ECBAgQGAwAfdDHYy2+oQzC9RBgAABAm0KZPApk2Ec4wjEOuYOAgQIECBA4DABE3gPc5vru1wPc21Z9YqAIKrrgAABAgQIzETgzZs3M6mJauwr4J56+4o5nwABAvUJZDKMQOrw7RJjE4+Gd5YDAQIECMxfwE4a82/jrjW0xWxXKee1KCCI2mKrKTMBAgQIENgiYEuPLSgLeCr30ssWOg4CBAgQaF8gwT0DksO1owDqcLZSJkCAAIHlCeizLK/N1ZjAEgUEUZfY6upMgAABArMUqPl+qL5cDXPJJYBq25xhbKVKgACBqQR8Zg4jL4A6jKtUCRAgQGC5ApnMq9+yzPbPJH6rT5fZ9kus9f8HQgVzg6u3nfgAAAAASUVORK5CYII="></image>
-                </g>
-                <rect id="overlay" fill-opacity="0.810000002" fill="#3BA8CF" style="mix-blend-mode: overlay;" x="0" y="0" width="1163" height="565"></rect>
-            </g>
-            <g id="angular" filter="url(#filter-3)" transform="translate(602.000000, 155.000000)">
-                <g id="Group" transform="translate(0.800000, 0.880000)">
-                    <polygon id="Shape" fill="#DD0031" points="15.12 0 15.12 0 15.12 0 0.144765957 5.3784 2.42885106 25.3206 15.12 32.4 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                    <polygon id="Shape" fill="#C3002F" points="15.12 0 15.12 3.5964 15.12 3.5802 15.12 19.9908 15.12 19.9908 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                    <path d="M15.12,3.5802 L5.75846809,24.7212 L5.75846809,24.7212 L9.24893617,24.7212 L9.24893617,24.7212 L11.1308936,19.9908 L19.0769362,19.9908 L20.9588936,24.7212 L20.9588936,24.7212 L24.4493617,24.7212 L24.4493617,24.7212 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 Z M17.8544681,17.0748 L12.3855319,17.0748 L15.12,10.449 L17.8544681,17.0748 L17.8544681,17.0748 Z" id="Shape" fill="#FFFFFF"></path>
-                </g>
-            </g>
-            <g id="pins" transform="translate(99.000000, 97.000000)">
-                <g id="angular" filter="url(#filter-4)" transform="translate(1021.000000, 0.000000)">
-                    <g id="Group" transform="translate(0.800000, 0.880000)">
-                        <polygon id="Shape" fill="#DD0031" points="15.12 0 15.12 0 15.12 0 0.144765957 5.3784 2.42885106 25.3206 15.12 32.4 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <polygon id="Shape" fill="#C3002F" points="15.12 0 15.12 3.5964 15.12 3.5802 15.12 19.9908 15.12 19.9908 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <path d="M15.12,3.5802 L5.75846809,24.7212 L5.75846809,24.7212 L9.24893617,24.7212 L9.24893617,24.7212 L11.1308936,19.9908 L19.0769362,19.9908 L20.9588936,24.7212 L20.9588936,24.7212 L24.4493617,24.7212 L24.4493617,24.7212 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 Z M17.8544681,17.0748 L12.3855319,17.0748 L15.12,10.449 L17.8544681,17.0748 L17.8544681,17.0748 Z" id="Shape" fill="#FFFFFF"></path>
-                    </g>
-                </g>
-                <g id="angular" filter="url(#filter-5)" transform="translate(96.000000, 238.000000)">
-                    <g id="Group" transform="translate(0.800000, 0.880000)">
-                        <polygon id="Shape" fill="#DD0031" points="15.12 0 15.12 0 15.12 0 0.144765957 5.3784 2.42885106 25.3206 15.12 32.4 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <polygon id="Shape" fill="#C3002F" points="15.12 0 15.12 3.5964 15.12 3.5802 15.12 19.9908 15.12 19.9908 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <path d="M15.12,3.5802 L5.75846809,24.7212 L5.75846809,24.7212 L9.24893617,24.7212 L9.24893617,24.7212 L11.1308936,19.9908 L19.0769362,19.9908 L20.9588936,24.7212 L20.9588936,24.7212 L24.4493617,24.7212 L24.4493617,24.7212 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 Z M17.8544681,17.0748 L12.3855319,17.0748 L15.12,10.449 L17.8544681,17.0748 L17.8544681,17.0748 Z" id="Shape" fill="#FFFFFF"></path>
-                    </g>
-                </g>
-                <g id="angular" filter="url(#filter-6)" transform="translate(460.000000, 128.000000)">
-                    <g id="Group" transform="translate(0.800000, 0.880000)">
-                        <polygon id="Shape" fill="#DD0031" points="15.12 0 15.12 0 15.12 0 0.144765957 5.3784 2.42885106 25.3206 15.12 32.4 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <polygon id="Shape" fill="#C3002F" points="15.12 0 15.12 3.5964 15.12 3.5802 15.12 19.9908 15.12 19.9908 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <path d="M15.12,3.5802 L5.75846809,24.7212 L5.75846809,24.7212 L9.24893617,24.7212 L9.24893617,24.7212 L11.1308936,19.9908 L19.0769362,19.9908 L20.9588936,24.7212 L20.9588936,24.7212 L24.4493617,24.7212 L24.4493617,24.7212 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 Z M17.8544681,17.0748 L12.3855319,17.0748 L15.12,10.449 L17.8544681,17.0748 L17.8544681,17.0748 Z" id="Shape" fill="#FFFFFF"></path>
-                    </g>
-                </g>
-                <g id="angular" transform="translate(64.000000, 84.000000)">
-                    <g id="Group" filter="url(#filter-7)" transform="translate(0.800000, 0.880000)">
-                        <polygon id="Shape" fill="#DD0031" points="15.12 0 15.12 0 15.12 0 0.144765957 5.3784 2.42885106 25.3206 15.12 32.4 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <polygon id="Shape" fill="#C3002F" points="15.12 0 15.12 3.5964 15.12 3.5802 15.12 19.9908 15.12 19.9908 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <path d="M15.12,3.5802 L5.75846809,24.7212 L5.75846809,24.7212 L9.24893617,24.7212 L9.24893617,24.7212 L11.1308936,19.9908 L19.0769362,19.9908 L20.9588936,24.7212 L20.9588936,24.7212 L24.4493617,24.7212 L24.4493617,24.7212 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 Z M17.8544681,17.0748 L12.3855319,17.0748 L15.12,10.449 L17.8544681,17.0748 L17.8544681,17.0748 Z" id="Shape" fill="#FFFFFF"></path>
-                    </g>
-                </g>
-                <g id="angular" transform="translate(16.000000, 111.000000)">
-                    <g id="Group" filter="url(#filter-8)" transform="translate(0.800000, 0.880000)">
-                        <polygon id="Shape" fill="#DD0031" points="15.12 0 15.12 0 15.12 0 0.144765957 5.3784 2.42885106 25.3206 15.12 32.4 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <polygon id="Shape" fill="#C3002F" points="15.12 0 15.12 3.5964 15.12 3.5802 15.12 19.9908 15.12 19.9908 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <path d="M15.12,3.5802 L5.75846809,24.7212 L5.75846809,24.7212 L9.24893617,24.7212 L9.24893617,24.7212 L11.1308936,19.9908 L19.0769362,19.9908 L20.9588936,24.7212 L20.9588936,24.7212 L24.4493617,24.7212 L24.4493617,24.7212 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 Z M17.8544681,17.0748 L12.3855319,17.0748 L15.12,10.449 L17.8544681,17.0748 L17.8544681,17.0748 Z" id="Shape" fill="#FFFFFF"></path>
-                    </g>
-                </g>
-                <g id="angular" transform="translate(98.000000, 121.000000)">
-                    <g id="Group" filter="url(#filter-9)" transform="translate(0.800000, 0.880000)">
-                        <polygon id="Shape" fill="#DD0031" points="15.12 0 15.12 0 15.12 0 0.144765957 5.3784 2.42885106 25.3206 15.12 32.4 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <polygon id="Shape" fill="#C3002F" points="15.12 0 15.12 3.5964 15.12 3.5802 15.12 19.9908 15.12 19.9908 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <path d="M15.12,3.5802 L5.75846809,24.7212 L5.75846809,24.7212 L9.24893617,24.7212 L9.24893617,24.7212 L11.1308936,19.9908 L19.0769362,19.9908 L20.9588936,24.7212 L20.9588936,24.7212 L24.4493617,24.7212 L24.4493617,24.7212 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 Z M17.8544681,17.0748 L12.3855319,17.0748 L15.12,10.449 L17.8544681,17.0748 L17.8544681,17.0748 Z" id="Shape" fill="#FFFFFF"></path>
-                    </g>
-                </g>
-                <g id="angular" transform="translate(188.000000, 161.000000)">
-                    <g id="Group" filter="url(#filter-10)" transform="translate(0.800000, 0.880000)">
-                        <polygon id="Shape" fill="#DD0031" points="15.12 0 15.12 0 15.12 0 0.144765957 5.3784 2.42885106 25.3206 15.12 32.4 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <polygon id="Shape" fill="#C3002F" points="15.12 0 15.12 3.5964 15.12 3.5802 15.12 19.9908 15.12 19.9908 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <path d="M15.12,3.5802 L5.75846809,24.7212 L5.75846809,24.7212 L9.24893617,24.7212 L9.24893617,24.7212 L11.1308936,19.9908 L19.0769362,19.9908 L20.9588936,24.7212 L20.9588936,24.7212 L24.4493617,24.7212 L24.4493617,24.7212 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 Z M17.8544681,17.0748 L12.3855319,17.0748 L15.12,10.449 L17.8544681,17.0748 L17.8544681,17.0748 Z" id="Shape" fill="#FFFFFF"></path>
-                    </g>
-                </g>
-                <g id="angular" transform="translate(151.000000, 130.000000)">
-                    <g id="Group" filter="url(#filter-11)" transform="translate(0.800000, 0.880000)">
-                        <polygon id="Shape" fill="#DD0031" points="15.12 0 15.12 0 15.12 0 0.144765957 5.3784 2.42885106 25.3206 15.12 32.4 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <polygon id="Shape" fill="#C3002F" points="15.12 0 15.12 3.5964 15.12 3.5802 15.12 19.9908 15.12 19.9908 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <path d="M15.12,3.5802 L5.75846809,24.7212 L5.75846809,24.7212 L9.24893617,24.7212 L9.24893617,24.7212 L11.1308936,19.9908 L19.0769362,19.9908 L20.9588936,24.7212 L20.9588936,24.7212 L24.4493617,24.7212 L24.4493617,24.7212 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 Z M17.8544681,17.0748 L12.3855319,17.0748 L15.12,10.449 L17.8544681,17.0748 L17.8544681,17.0748 Z" id="Shape" fill="#FFFFFF"></path>
-                    </g>
-                </g>
-                <g id="angular" filter="url(#filter-12)" transform="translate(56.000000, 162.000000)">
-                    <g id="Group" transform="translate(0.800000, 0.880000)">
-                        <polygon id="Shape" fill="#DD0031" points="15.12 0 15.12 0 15.12 0 0.144765957 5.3784 2.42885106 25.3206 15.12 32.4 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <polygon id="Shape" fill="#C3002F" points="15.12 0 15.12 3.5964 15.12 3.5802 15.12 19.9908 15.12 19.9908 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <path d="M15.12,3.5802 L5.75846809,24.7212 L5.75846809,24.7212 L9.24893617,24.7212 L9.24893617,24.7212 L11.1308936,19.9908 L19.0769362,19.9908 L20.9588936,24.7212 L20.9588936,24.7212 L24.4493617,24.7212 L24.4493617,24.7212 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 Z M17.8544681,17.0748 L12.3855319,17.0748 L15.12,10.449 L17.8544681,17.0748 L17.8544681,17.0748 Z" id="Shape" fill="#FFFFFF"></path>
-                    </g>
-                </g>
-                <g id="angular" filter="url(#filter-13)" transform="translate(86.000000, 180.000000)">
-                    <g id="Group" transform="translate(0.800000, 0.880000)">
-                        <polygon id="Shape" fill="#DD0031" points="15.12 0 15.12 0 15.12 0 0.144765957 5.3784 2.42885106 25.3206 15.12 32.4 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <polygon id="Shape" fill="#C3002F" points="15.12 0 15.12 3.5964 15.12 3.5802 15.12 19.9908 15.12 19.9908 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <path d="M15.12,3.5802 L5.75846809,24.7212 L5.75846809,24.7212 L9.24893617,24.7212 L9.24893617,24.7212 L11.1308936,19.9908 L19.0769362,19.9908 L20.9588936,24.7212 L20.9588936,24.7212 L24.4493617,24.7212 L24.4493617,24.7212 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 Z M17.8544681,17.0748 L12.3855319,17.0748 L15.12,10.449 L17.8544681,17.0748 L17.8544681,17.0748 Z" id="Shape" fill="#FFFFFF"></path>
-                    </g>
-                </g>
-                <g id="angular" filter="url(#filter-14)" transform="translate(138.000000, 203.000000)">
-                    <g id="Group" transform="translate(0.800000, 0.880000)">
-                        <polygon id="Shape" fill="#DD0031" points="15.12 0 15.12 0 15.12 0 0.144765957 5.3784 2.42885106 25.3206 15.12 32.4 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <polygon id="Shape" fill="#C3002F" points="15.12 0 15.12 3.5964 15.12 3.5802 15.12 19.9908 15.12 19.9908 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <path d="M15.12,3.5802 L5.75846809,24.7212 L5.75846809,24.7212 L9.24893617,24.7212 L9.24893617,24.7212 L11.1308936,19.9908 L19.0769362,19.9908 L20.9588936,24.7212 L20.9588936,24.7212 L24.4493617,24.7212 L24.4493617,24.7212 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 Z M17.8544681,17.0748 L12.3855319,17.0748 L15.12,10.449 L17.8544681,17.0748 L17.8544681,17.0748 Z" id="Shape" fill="#FFFFFF"></path>
-                    </g>
-                </g>
-                <g id="angular" filter="url(#filter-15)" transform="translate(163.000000, 209.000000)">
-                    <g id="Group" transform="translate(0.800000, 0.880000)">
-                        <polygon id="Shape" fill="#DD0031" points="15.12 0 15.12 0 15.12 0 0.144765957 5.3784 2.42885106 25.3206 15.12 32.4 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <polygon id="Shape" fill="#C3002F" points="15.12 0 15.12 3.5964 15.12 3.5802 15.12 19.9908 15.12 19.9908 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <path d="M15.12,3.5802 L5.75846809,24.7212 L5.75846809,24.7212 L9.24893617,24.7212 L9.24893617,24.7212 L11.1308936,19.9908 L19.0769362,19.9908 L20.9588936,24.7212 L20.9588936,24.7212 L24.4493617,24.7212 L24.4493617,24.7212 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 Z M17.8544681,17.0748 L12.3855319,17.0748 L15.12,10.449 L17.8544681,17.0748 L17.8544681,17.0748 Z" id="Shape" fill="#FFFFFF"></path>
-                    </g>
-                </g>
-                <g id="angular" filter="url(#filter-16)" transform="translate(567.000000, 284.000000)">
-                    <g id="Group" transform="translate(0.800000, 0.880000)">
-                        <polygon id="Shape" fill="#DD0031" points="15.12 0 15.12 0 15.12 0 0.144765957 5.3784 2.42885106 25.3206 15.12 32.4 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <polygon id="Shape" fill="#C3002F" points="15.12 0 15.12 3.5964 15.12 3.5802 15.12 19.9908 15.12 19.9908 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <path d="M15.12,3.5802 L5.75846809,24.7212 L5.75846809,24.7212 L9.24893617,24.7212 L9.24893617,24.7212 L11.1308936,19.9908 L19.0769362,19.9908 L20.9588936,24.7212 L20.9588936,24.7212 L24.4493617,24.7212 L24.4493617,24.7212 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 Z M17.8544681,17.0748 L12.3855319,17.0748 L15.12,10.449 L17.8544681,17.0748 L17.8544681,17.0748 Z" id="Shape" fill="#FFFFFF"></path>
-                    </g>
-                </g>
-                <g id="angular" filter="url(#filter-17)" transform="translate(591.000000, 88.000000)">
-                    <g id="Group" transform="translate(0.800000, 0.880000)">
-                        <polygon id="Shape" fill="#DD0031" points="15.12 0 15.12 0 15.12 0 0.144765957 5.3784 2.42885106 25.3206 15.12 32.4 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <polygon id="Shape" fill="#C3002F" points="15.12 0 15.12 3.5964 15.12 3.5802 15.12 19.9908 15.12 19.9908 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <path d="M15.12,3.5802 L5.75846809,24.7212 L5.75846809,24.7212 L9.24893617,24.7212 L9.24893617,24.7212 L11.1308936,19.9908 L19.0769362,19.9908 L20.9588936,24.7212 L20.9588936,24.7212 L24.4493617,24.7212 L24.4493617,24.7212 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 Z M17.8544681,17.0748 L12.3855319,17.0748 L15.12,10.449 L17.8544681,17.0748 L17.8544681,17.0748 Z" id="Shape" fill="#FFFFFF"></path>
-                    </g>
-                </g>
-                <g id="angular" filter="url(#filter-18)" transform="translate(567.000000, 15.000000)">
-                    <g id="Group" transform="translate(0.800000, 0.880000)">
-                        <polygon id="Shape" fill="#DD0031" points="15.12 0 15.12 0 15.12 0 0.144765957 5.3784 2.42885106 25.3206 15.12 32.4 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <polygon id="Shape" fill="#C3002F" points="15.12 0 15.12 3.5964 15.12 3.5802 15.12 19.9908 15.12 19.9908 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <path d="M15.12,3.5802 L5.75846809,24.7212 L5.75846809,24.7212 L9.24893617,24.7212 L9.24893617,24.7212 L11.1308936,19.9908 L19.0769362,19.9908 L20.9588936,24.7212 L20.9588936,24.7212 L24.4493617,24.7212 L24.4493617,24.7212 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 Z M17.8544681,17.0748 L12.3855319,17.0748 L15.12,10.449 L17.8544681,17.0748 L17.8544681,17.0748 Z" id="Shape" fill="#FFFFFF"></path>
-                    </g>
-                </g>
-                <g id="angular" transform="translate(241.000000, 343.000000)">
-                    <g id="Group" filter="url(#filter-19)" transform="translate(0.800000, 0.880000)">
-                        <polygon id="Shape" fill="#DD0031" points="15.12 0 15.12 0 15.12 0 0.144765957 5.3784 2.42885106 25.3206 15.12 32.4 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <polygon id="Shape" fill="#C3002F" points="15.12 0 15.12 3.5964 15.12 3.5802 15.12 19.9908 15.12 19.9908 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <path d="M15.12,3.5802 L5.75846809,24.7212 L5.75846809,24.7212 L9.24893617,24.7212 L9.24893617,24.7212 L11.1308936,19.9908 L19.0769362,19.9908 L20.9588936,24.7212 L20.9588936,24.7212 L24.4493617,24.7212 L24.4493617,24.7212 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 Z M17.8544681,17.0748 L12.3855319,17.0748 L15.12,10.449 L17.8544681,17.0748 L17.8544681,17.0748 Z" id="Shape" fill="#FFFFFF"></path>
-                    </g>
-                </g>
-                <g id="angular" filter="url(#filter-20)" transform="translate(269.000000, 384.000000)">
-                    <g id="Group" transform="translate(0.800000, 0.880000)">
-                        <polygon id="Shape" fill="#DD0031" points="15.12 0 15.12 0 15.12 0 0.144765957 5.3784 2.42885106 25.3206 15.12 32.4 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <polygon id="Shape" fill="#C3002F" points="15.12 0 15.12 3.5964 15.12 3.5802 15.12 19.9908 15.12 19.9908 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <path d="M15.12,3.5802 L5.75846809,24.7212 L5.75846809,24.7212 L9.24893617,24.7212 L9.24893617,24.7212 L11.1308936,19.9908 L19.0769362,19.9908 L20.9588936,24.7212 L20.9588936,24.7212 L24.4493617,24.7212 L24.4493617,24.7212 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 Z M17.8544681,17.0748 L12.3855319,17.0748 L15.12,10.449 L17.8544681,17.0748 L17.8544681,17.0748 Z" id="Shape" fill="#FFFFFF"></path>
-                    </g>
-                </g>
-                <g id="angular" filter="url(#filter-21)" transform="translate(174.000000, 310.000000)">
-                    <g id="Group" transform="translate(0.800000, 0.880000)">
-                        <polygon id="Shape" fill="#DD0031" points="15.12 0 15.12 0 15.12 0 0.144765957 5.3784 2.42885106 25.3206 15.12 32.4 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <polygon id="Shape" fill="#C3002F" points="15.12 0 15.12 3.5964 15.12 3.5802 15.12 19.9908 15.12 19.9908 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <path d="M15.12,3.5802 L5.75846809,24.7212 L5.75846809,24.7212 L9.24893617,24.7212 L9.24893617,24.7212 L11.1308936,19.9908 L19.0769362,19.9908 L20.9588936,24.7212 L20.9588936,24.7212 L24.4493617,24.7212 L24.4493617,24.7212 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 Z M17.8544681,17.0748 L12.3855319,17.0748 L15.12,10.449 L17.8544681,17.0748 L17.8544681,17.0748 Z" id="Shape" fill="#FFFFFF"></path>
-                    </g>
-                </g>
-                <g id="angular" transform="translate(0.000000, 34.000000)">
-                    <g id="Group" filter="url(#filter-22)" transform="translate(0.800000, 0.880000)">
-                        <polygon id="Shape" fill="#DD0031" points="15.12 0 15.12 0 15.12 0 0.144765957 5.3784 2.42885106 25.3206 15.12 32.4 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <polygon id="Shape" fill="#C3002F" points="15.12 0 15.12 3.5964 15.12 3.5802 15.12 19.9908 15.12 19.9908 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <path d="M15.12,3.5802 L5.75846809,24.7212 L5.75846809,24.7212 L9.24893617,24.7212 L9.24893617,24.7212 L11.1308936,19.9908 L19.0769362,19.9908 L20.9588936,24.7212 L20.9588936,24.7212 L24.4493617,24.7212 L24.4493617,24.7212 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 Z M17.8544681,17.0748 L12.3855319,17.0748 L15.12,10.449 L17.8544681,17.0748 L17.8544681,17.0748 Z" id="Shape" fill="#FFFFFF"></path>
-                    </g>
-                </g>
-                <g id="angular" filter="url(#filter-23)" transform="translate(754.000000, 184.000000)">
-                    <g id="Group" transform="translate(0.800000, 0.880000)">
-                        <polygon id="Shape" fill="#DD0031" points="15.12 0 15.12 0 15.12 0 0.144765957 5.3784 2.42885106 25.3206 15.12 32.4 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <polygon id="Shape" fill="#C3002F" points="15.12 0 15.12 3.5964 15.12 3.5802 15.12 19.9908 15.12 19.9908 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <path d="M15.12,3.5802 L5.75846809,24.7212 L5.75846809,24.7212 L9.24893617,24.7212 L9.24893617,24.7212 L11.1308936,19.9908 L19.0769362,19.9908 L20.9588936,24.7212 L20.9588936,24.7212 L24.4493617,24.7212 L24.4493617,24.7212 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 Z M17.8544681,17.0748 L12.3855319,17.0748 L15.12,10.449 L17.8544681,17.0748 L17.8544681,17.0748 Z" id="Shape" fill="#FFFFFF"></path>
-                    </g>
-                </g>
-                <g id="angular" filter="url(#filter-24)" transform="translate(738.000000, 275.000000)">
-                    <g id="Group" transform="translate(0.800000, 0.880000)">
-                        <polygon id="Shape" fill="#DD0031" points="15.12 0 15.12 0 15.12 0 0.144765957 5.3784 2.42885106 25.3206 15.12 32.4 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <polygon id="Shape" fill="#C3002F" points="15.12 0 15.12 3.5964 15.12 3.5802 15.12 19.9908 15.12 19.9908 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <path d="M15.12,3.5802 L5.75846809,24.7212 L5.75846809,24.7212 L9.24893617,24.7212 L9.24893617,24.7212 L11.1308936,19.9908 L19.0769362,19.9908 L20.9588936,24.7212 L20.9588936,24.7212 L24.4493617,24.7212 L24.4493617,24.7212 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 Z M17.8544681,17.0748 L12.3855319,17.0748 L15.12,10.449 L17.8544681,17.0748 L17.8544681,17.0748 Z" id="Shape" fill="#FFFFFF"></path>
-                    </g>
-                </g>
-                <g id="angular" filter="url(#filter-25)" transform="translate(859.000000, 218.000000)">
-                    <g id="Group" transform="translate(0.800000, 0.880000)">
-                        <polygon id="Shape" fill="#DD0031" points="15.12 0 15.12 0 15.12 0 0.144765957 5.3784 2.42885106 25.3206 15.12 32.4 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <polygon id="Shape" fill="#C3002F" points="15.12 0 15.12 3.5964 15.12 3.5802 15.12 19.9908 15.12 19.9908 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <path d="M15.12,3.5802 L5.75846809,24.7212 L5.75846809,24.7212 L9.24893617,24.7212 L9.24893617,24.7212 L11.1308936,19.9908 L19.0769362,19.9908 L20.9588936,24.7212 L20.9588936,24.7212 L24.4493617,24.7212 L24.4493617,24.7212 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 Z M17.8544681,17.0748 L12.3855319,17.0748 L15.12,10.449 L17.8544681,17.0748 L17.8544681,17.0748 Z" id="Shape" fill="#FFFFFF"></path>
-                    </g>
-                </g>
-                <g id="angular" filter="url(#filter-26)" transform="translate(833.000000, 172.000000)">
-                    <g id="Group" transform="translate(0.800000, 0.880000)">
-                        <polygon id="Shape" fill="#DD0031" points="15.12 0 15.12 0 15.12 0 0.144765957 5.3784 2.42885106 25.3206 15.12 32.4 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <polygon id="Shape" fill="#C3002F" points="15.12 0 15.12 3.5964 15.12 3.5802 15.12 19.9908 15.12 19.9908 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <path d="M15.12,3.5802 L5.75846809,24.7212 L5.75846809,24.7212 L9.24893617,24.7212 L9.24893617,24.7212 L11.1308936,19.9908 L19.0769362,19.9908 L20.9588936,24.7212 L20.9588936,24.7212 L24.4493617,24.7212 L24.4493617,24.7212 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 Z M17.8544681,17.0748 L12.3855319,17.0748 L15.12,10.449 L17.8544681,17.0748 L17.8544681,17.0748 Z" id="Shape" fill="#FFFFFF"></path>
-                    </g>
-                </g>
-                <g id="angular" filter="url(#filter-27)" transform="translate(966.000000, 433.000000)">
-                    <g id="Group" transform="translate(0.800000, 0.880000)">
-                        <polygon id="Shape" fill="#DD0031" points="15.12 0 15.12 0 15.12 0 0.144765957 5.3784 2.42885106 25.3206 15.12 32.4 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <polygon id="Shape" fill="#C3002F" points="15.12 0 15.12 3.5964 15.12 3.5802 15.12 19.9908 15.12 19.9908 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <path d="M15.12,3.5802 L5.75846809,24.7212 L5.75846809,24.7212 L9.24893617,24.7212 L9.24893617,24.7212 L11.1308936,19.9908 L19.0769362,19.9908 L20.9588936,24.7212 L20.9588936,24.7212 L24.4493617,24.7212 L24.4493617,24.7212 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 Z M17.8544681,17.0748 L12.3855319,17.0748 L15.12,10.449 L17.8544681,17.0748 L17.8544681,17.0748 Z" id="Shape" fill="#FFFFFF"></path>
-                    </g>
-                </g>
-                <g id="angular" filter="url(#filter-28)" transform="translate(533.000000, 118.000000)">
-                    <g id="Group" transform="translate(0.800000, 0.880000)">
-                        <polygon id="Shape" fill="#DD0031" points="15.12 0 15.12 0 15.12 0 0.144765957 5.3784 2.42885106 25.3206 15.12 32.4 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <polygon id="Shape" fill="#C3002F" points="15.12 0 15.12 3.5964 15.12 3.5802 15.12 19.9908 15.12 19.9908 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <path d="M15.12,3.5802 L5.75846809,24.7212 L5.75846809,24.7212 L9.24893617,24.7212 L9.24893617,24.7212 L11.1308936,19.9908 L19.0769362,19.9908 L20.9588936,24.7212 L20.9588936,24.7212 L24.4493617,24.7212 L24.4493617,24.7212 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 Z M17.8544681,17.0748 L12.3855319,17.0748 L15.12,10.449 L17.8544681,17.0748 L17.8544681,17.0748 Z" id="Shape" fill="#FFFFFF"></path>
-                    </g>
-                </g>
-                <g id="angular" filter="url(#filter-29)" transform="translate(802.000000, 181.000000)">
-                    <g id="Group" transform="translate(0.800000, 0.880000)">
-                        <polygon id="Shape" fill="#DD0031" points="15.12 0 15.12 0 15.12 0 0.144765957 5.3784 2.42885106 25.3206 15.12 32.4 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <polygon id="Shape" fill="#C3002F" points="15.12 0 15.12 3.5964 15.12 3.5802 15.12 19.9908 15.12 19.9908 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <path d="M15.12,3.5802 L5.75846809,24.7212 L5.75846809,24.7212 L9.24893617,24.7212 L9.24893617,24.7212 L11.1308936,19.9908 L19.0769362,19.9908 L20.9588936,24.7212 L20.9588936,24.7212 L24.4493617,24.7212 L24.4493617,24.7212 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 Z M17.8544681,17.0748 L12.3855319,17.0748 L15.12,10.449 L17.8544681,17.0748 L17.8544681,17.0748 Z" id="Shape" fill="#FFFFFF"></path>
-                    </g>
-                </g>
-                <g id="angular" filter="url(#filter-30)" transform="translate(833.000000, 224.000000)">
-                    <g id="Group" transform="translate(0.800000, 0.880000)">
-                        <polygon id="Shape" fill="#DD0031" points="15.12 0 15.12 0 15.12 0 0.144765957 5.3784 2.42885106 25.3206 15.12 32.4 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <polygon id="Shape" fill="#C3002F" points="15.12 0 15.12 3.5964 15.12 3.5802 15.12 19.9908 15.12 19.9908 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <path d="M15.12,3.5802 L5.75846809,24.7212 L5.75846809,24.7212 L9.24893617,24.7212 L9.24893617,24.7212 L11.1308936,19.9908 L19.0769362,19.9908 L20.9588936,24.7212 L20.9588936,24.7212 L24.4493617,24.7212 L24.4493617,24.7212 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 Z M17.8544681,17.0748 L12.3855319,17.0748 L15.12,10.449 L17.8544681,17.0748 L17.8544681,17.0748 Z" id="Shape" fill="#FFFFFF"></path>
-                    </g>
-                </g>
-                <g id="angular" filter="url(#filter-31)" transform="translate(571.000000, 123.000000)">
-                    <g id="Group" transform="translate(0.800000, 0.880000)">
-                        <polygon id="Shape" fill="#DD0031" points="15.12 0 15.12 0 15.12 0 0.144765957 5.3784 2.42885106 25.3206 15.12 32.4 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <polygon id="Shape" fill="#C3002F" points="15.12 0 15.12 3.5964 15.12 3.5802 15.12 19.9908 15.12 19.9908 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <path d="M15.12,3.5802 L5.75846809,24.7212 L5.75846809,24.7212 L9.24893617,24.7212 L9.24893617,24.7212 L11.1308936,19.9908 L19.0769362,19.9908 L20.9588936,24.7212 L20.9588936,24.7212 L24.4493617,24.7212 L24.4493617,24.7212 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 Z M17.8544681,17.0748 L12.3855319,17.0748 L15.12,10.449 L17.8544681,17.0748 L17.8544681,17.0748 Z" id="Shape" fill="#FFFFFF"></path>
-                    </g>
-                </g>
-                <g id="angular" filter="url(#filter-32)" transform="translate(909.000000, 128.000000)">
-                    <g id="Group" transform="translate(0.800000, 0.880000)">
-                        <polygon id="Shape" fill="#DD0031" points="15.12 0 15.12 0 15.12 0 0.144765957 5.3784 2.42885106 25.3206 15.12 32.4 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <polygon id="Shape" fill="#C3002F" points="15.12 0 15.12 3.5964 15.12 3.5802 15.12 19.9908 15.12 19.9908 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <path d="M15.12,3.5802 L5.75846809,24.7212 L5.75846809,24.7212 L9.24893617,24.7212 L9.24893617,24.7212 L11.1308936,19.9908 L19.0769362,19.9908 L20.9588936,24.7212 L20.9588936,24.7212 L24.4493617,24.7212 L24.4493617,24.7212 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 Z M17.8544681,17.0748 L12.3855319,17.0748 L15.12,10.449 L17.8544681,17.0748 L17.8544681,17.0748 Z" id="Shape" fill="#FFFFFF"></path>
-                    </g>
-                </g>
-                <g id="angular" filter="url(#filter-33)" transform="translate(878.000000, 122.000000)">
-                    <g id="Group" transform="translate(0.800000, 0.880000)">
-                        <polygon id="Shape" fill="#DD0031" points="15.12 0 15.12 0 15.12 0 0.144765957 5.3784 2.42885106 25.3206 15.12 32.4 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <polygon id="Shape" fill="#C3002F" points="15.12 0 15.12 3.5964 15.12 3.5802 15.12 19.9908 15.12 19.9908 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <path d="M15.12,3.5802 L5.75846809,24.7212 L5.75846809,24.7212 L9.24893617,24.7212 L9.24893617,24.7212 L11.1308936,19.9908 L19.0769362,19.9908 L20.9588936,24.7212 L20.9588936,24.7212 L24.4493617,24.7212 L24.4493617,24.7212 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 Z M17.8544681,17.0748 L12.3855319,17.0748 L15.12,10.449 L17.8544681,17.0748 L17.8544681,17.0748 Z" id="Shape" fill="#FFFFFF"></path>
-                    </g>
-                </g>
-                <g id="angular" filter="url(#filter-34)" transform="translate(828.000000, 15.000000)">
-                    <g id="Group" transform="translate(0.800000, 0.880000)">
-                        <polygon id="Shape" fill="#DD0031" points="15.12 0 15.12 0 15.12 0 0.144765957 5.3784 2.42885106 25.3206 15.12 32.4 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <polygon id="Shape" fill="#C3002F" points="15.12 0 15.12 3.5964 15.12 3.5802 15.12 19.9908 15.12 19.9908 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <path d="M15.12,3.5802 L5.75846809,24.7212 L5.75846809,24.7212 L9.24893617,24.7212 L9.24893617,24.7212 L11.1308936,19.9908 L19.0769362,19.9908 L20.9588936,24.7212 L20.9588936,24.7212 L24.4493617,24.7212 L24.4493617,24.7212 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 Z M17.8544681,17.0748 L12.3855319,17.0748 L15.12,10.449 L17.8544681,17.0748 L17.8544681,17.0748 Z" id="Shape" fill="#FFFFFF"></path>
-                    </g>
-                </g>
-                <g id="angular" filter="url(#filter-35)" transform="translate(496.000000, 145.000000)">
-                    <g id="Group" transform="translate(0.800000, 0.880000)">
-                        <polygon id="Shape" fill="#DD0031" points="15.12 0 15.12 0 15.12 0 0.144765957 5.3784 2.42885106 25.3206 15.12 32.4 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <polygon id="Shape" fill="#C3002F" points="15.12 0 15.12 3.5964 15.12 3.5802 15.12 19.9908 15.12 19.9908 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                        <path d="M15.12,3.5802 L5.75846809,24.7212 L5.75846809,24.7212 L9.24893617,24.7212 L9.24893617,24.7212 L11.1308936,19.9908 L19.0769362,19.9908 L20.9588936,24.7212 L20.9588936,24.7212 L24.4493617,24.7212 L24.4493617,24.7212 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 Z M17.8544681,17.0748 L12.3855319,17.0748 L15.12,10.449 L17.8544681,17.0748 L17.8544681,17.0748 Z" id="Shape" fill="#FFFFFF"></path>
-                    </g>
-                </g>
-            </g>
-            <g id="angular" filter="url(#filter-36)" transform="translate(549.000000, 284.000000)">
-                <g id="Group" transform="translate(0.800000, 0.880000)">
-                    <polygon id="Shape" fill="#DD0031" points="15.12 0 15.12 0 15.12 0 0.144765957 5.3784 2.42885106 25.3206 15.12 32.4 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                    <polygon id="Shape" fill="#C3002F" points="15.12 0 15.12 3.5964 15.12 3.5802 15.12 19.9908 15.12 19.9908 15.12 32.4 15.12 32.4 27.8111489 25.3206 30.095234 5.3784"></polygon>
-                    <path d="M15.12,3.5802 L5.75846809,24.7212 L5.75846809,24.7212 L9.24893617,24.7212 L9.24893617,24.7212 L11.1308936,19.9908 L19.0769362,19.9908 L20.9588936,24.7212 L20.9588936,24.7212 L24.4493617,24.7212 L24.4493617,24.7212 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 L15.12,3.5802 Z M17.8544681,17.0748 L12.3855319,17.0748 L15.12,10.449 L17.8544681,17.0748 L17.8544681,17.0748 Z" id="Shape" fill="#FFFFFF"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1300 700">
+  <style>
+    .land { fill: #f2f2f2; }
+    .water { fill: #ddd; }
+  </style>
+  <title>Loved by Millions</title>
+  <defs>
+    <symbol id="angular-logo" viewBox="0 0 200 200" width="32" height="32">
+      <polygon points="100,0 6.9,33.2 21.1,156.3 100,200 178.9,156.3 193.1,33.2" fill="#dd0031" />
+      <polygon points="100,0 100,200 178.9,156.3 193.1,33.2 100,0" fill="#c3002f" />
+      <path d="M100,22.1L41.8,152.6h21.7l11.7-29.2h49.4l11.7,29.2h21.7L100,22.1z M117,105.4H83l17-40.9L117,105.4z"
+        fill="#fff" />
+    </symbol>
+  </defs>
+  <rect class="water" width="1300" height="700" />
+  <path class="land"
+    d="M413.09,113.78c.61.85,3.19.18,4,1.66-6.27,1.7,7.05,3.1,5.89-2.39.33-2.85-14.63-10.75-8.22-2.42C413.5,110.08,411.89,111.52,413.09,113.78Z" />
+  <path class="land"
+    d="M410.09,246.78,410,247c-1.31-1.72-5.81,2.57-5.24,4.75-1.07.52-3.12,4.14-2.15,6.12-.55-.74-2.78,1-.66,1.39.09,0-.92.73,0,1.29-1.27-2.26-3,3.5-2.91,1.28-.12.15-.9.3-1.23,1.19.14,0,1.58,0,2.95,0-1.55.39-7.26,7,0,4.14.05.08,0,0,0,.28,2.41,0,5.93,1.34,8.71-.74-.12.52.6,1.1-.95,1.64,1.55.33,2.55-.68,4.72-.84.06,1.06-4.58,2.73-3.73,4.07,2.27.36,2.6-2,4.82-3.46.11,0,0,.05-.31.89,2.42-4.74,2.3-1.44,1.71,2.84.92-.47,2.24-3.08,1.66.19,1.26,4.56,5.46-8.24,1.7-3.44-1.78-1.39,4.41-5.78-2.52-1.41-.71-.2,1.9-1.84-.11-1.52.15-.18,1.71-.21.91-1,1.66-.89,4.61-3.58-1.77-1,0-.19,1.2-.34,1.46-1.51-.16-.17-1.57.19-.54-.69-.05,0-.22.07-1.09.12,2.18-.48,3.23-5-1-2.88-.06-.17-.12-.26-.07-1.08-.47.16-1,.92-1.92,1.45-.15-.78-.62.55-1.19,1,.29-1.74.95-1.2-.08-2.19-.65.57-.78-.37-2.5.2.07-.22.69-.31.77-1.17-.17-.09-.39-.14-1,.27,1.31-.75,3-2.94-.08-1.73.31-1.85-.62-.23-2.32,1.76-.66-3.3,5.08-6.47,2.78-9.4C409.46,248.59,412,245.37,410.09,246.78Z" />
+  <path class="land"
+    d="M376,684.85c-.86,2.37-13.84-9.27-10.1-9.18-1.18-4.47-4.09-2.29-7.52-1.91,2.7,2.35-4.82,2,3.61,4.23-7.88,3,3.29,4.6.14,6.49-.22-2.72-2.78.67-4.63-3.38a1.67,1.67,0,0,0,.88-.11,8.09,8.09,0,0,1-.53-2.13c0,.22-.89-.15-.4,1.15-1.77.6-.14,2.36,1.17,4.21-.15-.12-.28-.06-1.37-.25.45-1.89-1.72.42-3.87-.31-1.83.73,4.55,3.12,7.31,1.67C358.52,685.81,379.31,688.78,376,684.85Z" />
+  <path class="land"
+    d="M483.37,482.52c-1.56-6,1.12-6.75-8.74-9.37-4.35-2.78-8.22-8-15.25-6.39-2.52-.15-6.1-3.22-9-.25.18-2.11.4-1.28-1.86,1.38-.28-1,1.17-2.44,1-3.61-.27.16-.44-.1-.8.72,0,0,0,0-.33-.38.43-.27,1.27-.67.37-1.81,0-.05,0,.15-.45.19l.21-.23c-.69,0-1.11-1.92-2.14-.06.31-1.15-2-1.55-3.13-2.38-.47.64-4-2.39-4.22-.92-.36-.05-1.22-.74-1.91,0-.8-.46-.66.43-1.72,1.31.46.07-.68.86.36,1.17.09.11-.35-.23-.4.45-1.33-1.26-2.6,1.81-4.13,3.63.5-.8.33-1.06,1.14-3.22-2.77.88-4.37,1.92-5.9-2.59-1.35,1-3.17,2.68-5.88,2,3.14-.27,2.87-2.88,5.49-5.29,1.35-2,7.77-4.58,1.36-7.53-.87-1.7-.36-6-2.93-7.58-.06.31.08.11-.37.87-.13-.32-.36-3.45-1.23-1,0-.67.64-.6-.76-1.78l-.37.32c.17-1-5.42-5.28-6.44-2.05,2.43-1.84-5.55-3.68-6.12-1.19-.47-.58-4.44-2.29-4.52.59.86-1.57-3.73-7.27-5.24-3,1.4-2.63,0-5.56-3.75-7v.14c-1.57-2-4.25.31-6.61-.91,2.16-.11,4.14-3,.11-4.57-.13.13.07.39-.62.29-.06.1.13.13.1.64-.35-.23-.36-1.14-1.47-1.22.1.1-.12,0,0,.55-.1-.05-.09,0-.24-.21-.5,1-.48-.68-1.33-1.19-.12.15.27.54-.49.57.51-.29.08-1.24-.61-1.68.7-.19,2.48.12,3.64-.74-2.22.07-5.23.19-8.51.38l.18.32a2.22,2.22,0,0,1,1.81.14c-6.94,3.53-5.63-1.36-14,0-2.92.79-.79-2.09-3.87-3.3-.93-.54-3.46.87-3.82-2.43-2.32-.21-.9,1.17.38,2.27-1.69,0-3.07,1.14-5.85,1.81-.95-.49,4.17,10.12-1.42,5.43-2.14-1.67,1.87-3,.5-5.54a.41.41,0,0,0,.31-.06c-2.65-1.89.89-1.89,1.71-4.09-1.68-3.22-5.32,3.26-8.86,3.17-1.14-1.26-3.67,2.8-2.3,1-2-.65-3.42.35-4.85,3,.06-.07,0,.09.53-.33.14,3.82-4,3.48-4.55,7.55-2.25-2.49-6.66-7-11-4.4-1.51.57-4.52,3.54-6.74.71,0,.27-.06-.14.4.65-2.7-.66-8.13-6.65-7-11a.33.33,0,0,1,.3.12c.23-.32-.5-1.67.31-2.45-.13,3.55,1.17-7.82,1-7.48.11,0,.23-.43.51-.69-.54-.13-.53-1.11-1.82-1.34-.06.05.24-.06.62.52-.57.39-3.77-1.92-.94-.66-.81-.52-.74-1.4-2.65-1.69.09.05,0,.1.33.15-1.51-.47-3-.17-5.48-.7,0,0,.1-.06.17.26-2.29.63-6.34,1.08-9.34,0-2.67,2.93,3.94-7.66.86-8.77.19-.08.29-1.41,1.11-1.76.51,4,1,.66,2.14-2.74-3.79,1,6.48-7.62.13-7.32,3.31.76-10.19-1.08-10.72,3-.26,2.34-.35,5.69-3.63,7.12.15,0,0,.05.44-.25.42.58-.12,2.52-2.11,1.24-2.26-1.55-7.53,3.24-13.28-.75.08,0-.13,0,.5.28a1.59,1.59,0,0,1-1.23-.58,1.49,1.49,0,0,0,.53.16c-2.28-3.18-5.43-7.19-6.95-12,.21.69,1.34,1.31,1.21,2.82-4.06-6.83,3.18-16.36-1.26-23.64.41.89,2.69.16,1.18-1.49.32-.46,1,.57,1.4-1l-.38.13c-.23-.48.22-.19.74-.65,0,0-.08,0,.14.26.25-.26.3,0,.42-1,0,0,.56.68,1.24-.14-.36-.12-.43-.15-.77-1,.27-.31.52.91.93.21.13-.08.27.13,1.28.1a3.68,3.68,0,0,0-.79.56c1.46-.89,5.46-2,4.26-4.83.34.27,1.49-.83.86.62.13.15.1-.14.89,0a2,2,0,0,0-.82.65c.55.07,4.43-2.89,3.08-1.7,1.55-.1,3.67,1.1,6.41.77-.45-2,1.46.47,2.85.21,0,.27-.11.18.35,1,.09.09-.43-.26-.49.11.4.18,5.81,1.38,4-1,.6.41,2.74.7,2.76,2.22.19-.1.07,0,.49-.4,0,.06,0-.1.28.26,2-1.19-3.25-1.55-1.42-2.72l-.11-.11c.14-.12.06-.13.83-.38.06-.07-.15-.45-.16-.91-.64-.13-1.39,1.68-1.18-.51-.57.06-1,1.15-2.38.13-.08-1.84,7.3,1,8.45-2.24.26.21.28.92.77,1.63a5.47,5.47,0,0,0-.76.24c.36-.14,1,.25,2-.65,0,.13.09.06-.19.34-.22.1,1.15.07,1.16-.93,0,.09,0-.19.35.16,0,0,0-.15.26-.29.2.32.16.5-.72.94.74.25,2.89-1.25,3.79-.27-.33,0-.2-.19-1.16,0a10,10,0,0,1,2.46.93c.11-.14-.14-.46.53-.48-.37.08.2.74-.25.66s1.42.71,1.19,1.54c0-.08,0,.12-.27-.41.87,2.28,3.08-1.83,5.43-.7,4.09,4,4.36,2.92,4,9.17.24-.14.88-.1.24-1,.23-.38.31.53.8.24.29.34.05.77-.94,1.58.61.23.54,2.09,1.88,2.58,0-.1.08-.06,0-.37.06,0,0-.13.59-.1-.23-.1-.55,2.62.65,1.07-1.15,1.94,1.83,3.3,3,5.66-1.92-1.24,1,3.08,2.83-2.52.05,0,0,0,.12.17,1.14-3.43-1.52-7.46-2.5-11.45.5.37.26.49.51,1.63.14,0,0-.38.3-.7,0,.07-.28,1.69.53,2.46-.39-3.93-4.33-8.07-3.47-13.21.08.3.88-.08.22-.63.11,0,.41-.12.72-.72-.08-.07,0,.05-.29,0,0-.34.81-.81.51-1.39a1.68,1.68,0,0,0,1.09-2.35l.33.46c.1,0,0-.08.22-.24-.15.8,1.47,0,0-.48.26-.23,2.8.24,2.47-1.23a2.82,2.82,0,0,0,2.48-2.48c.11.18-.24.08.12.67-.13-2.54,3.81-1.89,4.36-3.87a2.84,2.84,0,0,1,.09,1,3.35,3.35,0,0,1,1.93-2.47c-.15-.33-.12-.06-.12-.86,0,.57,2.6.51,3.69-.88-.47-.66-1.67.9-2.49-.92.56.57,1.22,1.23,2-.5-.24-.48-1-.19-1.85-1.1,1.11-.15,2.33,1.55,3.78.09.81,0,1.1-3.88-.42-.79.35-1.37-.31-1.23-2.26-1.14.06-.18,0-.23,0-1.17,0,1.09.69.69,1.78.48l-.15-.31a1.5,1.5,0,0,0,.42.19,1.37,1.37,0,0,0,0-.58c0,.17.68.06,1.15.72.2-.08-.93-1.53-.44-2.37.43.81.35,2.15,1.45,3.63-2.08-4,.63-3.72-6-6.55,1.72,0,5.07,2.85,1.73-.77-.07-.13,1.34,1.81,1.26.52l.48.13c-.16,0,.45-.53-.36-.76l.21-.18c-1-.33-1.25-1.09-2.83-2.63.5-.42,2.59,4,3,1.21-.94-1.69-5.29-1-2.69-4.43.57.28-2,2.71.1,2,.07.12-.11.18.39.68,0-.07.08.11.08-.43-.15.28,1,.64,1.85,1.34.24-.81-1.11-1-1.18-2.33.09.06.14,1,1,1.08-.56-.43-.23-1.79-.58-3.11.4.1.81.21,0-.92l.53.2c0-.12.15-.4.31-.8l.2.36c.07-.16.07,0,.1-.52,0,.06.11,0,.11.26.54,0,.25-.85.9-.92l0,.36.34,0c0,.11-.11,0-.45.46.05,0-.07-.09.44.15-.31.2-1.44-.38-1.19,1.41l.29-.27c0,.2.06.08-.19.59-.14-.08-.63-.22-.5.37,0,.14.44-.56.57.25-.07.27-.46-.32-.61.64.08-.06.11,0,.22-.28.24,0,.24.3,1,.76-1-.67-1.5,1.6.06,1.21l.06.18c.06,0,0-.12.38-.32-.15.11.19.39-.24.86.19.18.66.12.27.87,0,.06.11-.12.68.08-.07.69-1.74,2.08-1,3.53.69-1.48,2-3.61,3-5.62,0,.07.07,0,.05.27,0,.06.51-1.14-.39-1,1.56-.8-4.05-4.22.39-6.27-3,2.12-.78,1.7.42,4.67a4.35,4.35,0,0,0,1.93-2.7c.63.28.72-1.13,1.2-2a6.52,6.52,0,0,0-.05.93c-.13-.2.64-1.93.29-3-2.25.11,1.08-1.38.1-3.67.44.33.49.94-.06,2.3,1.65-3.69,8.62-.5,9.13-4.84.2.06.1.07.41.53,0,.07,0-.17.43-.3.12,0-.42.21-.06,1.19.3.21,2.06-2,1.79-.21a5.86,5.86,0,0,1,2.49-.66s.4-1.82-1-1.94c0,.09,0,0,.15.26l.09-.13c1.39,3.06-1.37.51-3.07-1.26,1.61-1.36,0-2,2.73-6.39a1.57,1.57,0,0,1,1.07-.89.78.78,0,0,0,0,.33s0,.05.36-.16c0,0,0,0,.23.23.06-.09,0-.1,0-.67.1,0,0,.13.23.29.06.07-.11-.25.27-.69,0,.07,0,0,.11.55.17-.06.08.08.23-.5.07.13,0,0,.13.42,1.47-.45,1.4-1.38,2.66-3.28.14,0-.36.68.19.63a.8.8,0,0,0-.36.5,1.13,1.13,0,0,1,1,.39c.11-.2-.08-.42.29-1.21.22.78,1-.89,1.39.6,0-.09.21.07.33-.39l.19,0c.3-1.47,4.06,0,2.75-3.52.13.28,3.68,1,3.32-.82a3.74,3.74,0,0,0,.54-.41s.05,0-.29.5c.81.76,5.26-1,5.2-3.14.11-.13.22,1,1.11.56-.23.7-1.28,1-2.1,2.29,1.29.16,2.82-.43,5.43.05-.24.62-3.24-.3-2.7,1.7.18-.16-1.24-.51-.68-1.42l-.42-.14c0,.86-3.4,1.63-4.5,3.16a2.35,2.35,0,0,0,.8-.31c-.2.71-1.67.24-2.27,1.59.19,0,.24-.66,1-.65-.6.66-1.92,2.4-.59,4a1.46,1.46,0,0,0,.2-.35c.52,0,.79,1.88,2.23,1.27.41-1.21,2.2-1.44,3.4-3.65.91.17-.64-.81.74-1.38l.24.49c.06,0,.09-.21.35-.77,0,.38,2.17,1.69,1.39-.19-1,1.05,12.27-3.41,7.54-3.38,1.86-1.22-1.66-2.5-4.54-1.4,0-.05.09,0,.18-.46-1.27-.31-2.73,0-4.77-1.4l.79-.44c-1.78-.58-4.2-1.58-3.51-4.84-.14-.34-1,.27-1.72-.2.94-.41,1.32-1.66,2.17-3.22-.12.16.08-.45-1.21-.35l.16-.28c-2.15,1.83-2.92-1.37-6-.92.52-1,11.25.74,7.7-4.3a1.89,1.89,0,0,1,1.08.18C373,252,356.77,272.13,343.11,281c.39-.18,1.25-1.37,2.58-1.69-.07-.21.25-.33-1.2-.92.15,0,25-13.06,11.59-15,7.44,2.21,2.48,1.66,9.84-3.67l-.22-.26c6.78-.17-.62-7.55,16.51-5.72,7.47-1,7.57,4.28,19.33-5.82.35-.36,11.59-3,7.31-6.12.89.58,2.3-.84-1.1-.86,3.88.37,1.12-11.13-3.54-5.36-.11.15.14-.72-.69-.77,5.48-3-6.41-4.71-1.41-3-2.93.29-5.16,3.16-8.44,4.93,0,0,0,0-.06-.13s.17,0,.33-.32c-.27-.17-.34-.09.53-.84,0-.18-.2,0-1-1,2-.74,8.58-2.82,10.24-5.88-2.28-1.83-2.94.52-6.24-3.4-.37.73-1,1.07-2,2.35.08-.61.65-1.06,1.41-2.2-1.15-.5-2.18-1.21-4.15.7,1-1.07,1.24-2.41,1-4.46,0-.05,0,.11-.48-.12l-.3.48c.7-1.27-3.85-1-2.6-2,.54-1.15-3-1-.44-2-.29-.37-.59.11-2.05-.59,0,0,.15-.27.95-.45-.57-.65-1.62-.58-2.67-1.76.12,0,0-.25.71-.19.13,2.57,7,.14,1.12-2.67,1.07-1.23-.39-1.09-1.82-1.56,3.73.23,1.4-6.39-2.69-3.44.39-.12,4.89-4.65.45-2.63,0-.92-.64.16-1.42.54-.05-.65,4.68-3.07.89-3.6.64-.18-.49-1,.21-1.29-.51-.63-1.2.65-2.63,0,1.14.8,3.11-2.65.69-1.52.07-.38.19-.29-.69-.9,1-.33.47-1.26-.3-2.86,0,.15,0-.28-.6.57.15-.36.75-3.32-1.9-1.89,3.59-1.65-2.43-4.15-.91,1.68l-.1.13c-.87-1-3,.41.06,2.51.3.65-2.41-2.22-1.31.5l-.36-.24c-.08.07,0,.13-.33.94-1.38,0,1.78,1.14.22,1.37.19.12-1-.5-.56.28.11-.12-1.36-.08-.47.74-1.61.32.37,1.19-.63,2.89.58-3.91-4.32-.68-5.84,2.91-.19-.25.19-1.52-.28-2.74-.29.31-.2,1.2-1.08,1.77,1.27-4.65-.51.6-3.43,1.56,3.44-2.2,5.67-7.54-3.3-6.09.88-.06.11-2,1.3-.09.16-.37,1.95-3.88-.26-3.48-.3-2.16,2.16-4-3.42-4.74,3.91.22,3.39.94,3.86-7.34-.39-.09-.81,2.56-2.07,1,1.1-1.74-6.3-.37-5.27-3.56-1.81.51,2.07-3-2.12-1.38,1.41-.19-.21-3.42-1.84-1.76,1.58-1.63-4.25-7.58-6.54-2.05-.73-.62-2.21-2.4-4.07-.48l-.07-.1.47-.42c-4-3.84-13.11-2.53-6.47,5.14-1.14,1.11-.45,3.33-2.34,5.35a3.75,3.75,0,0,0,2,0l.05.11c-1.16,2.21,1,4.83.84,8.65-1.12-2-2.79,2.73-4.06,6.33,8.44,5.53,11.09,18.46-1.84,24.2-4.76,1.26-.6,2.1-.75,4.53.85.07.44.94,1,1.59-1.3.36.5,5.92,1.75,9.12-2,1.61-1.11,3.25-1.6,6-.38-3.72-4.91-2.07-1.56,2.43-.91-1.29-2.94-4.72-5.29-2,2.8-1.48,0-6-3.43-6.19,2.86-1.51-2.63-1.42-1.14-8.78-1.78-3.08,3.43-13.17-11.3-8,2-3.17-4.2-4.24-7.72-6-3-4.75-10.71-9.69-16.92-5.82-.1,0,.26,0,.24-.45-.18-.13-.84.31-1.73.8,3.31-1-2.89-20-5.4-9,.39-2.28.09-3.21-2.2-5.19,1-2.09,1-6.86.69-9.92,1.77-1.09,2.17-5,3.34-7.53.61-1.44,2.69-.51.81-2.95-.44.33,4.13-1.32,1.32-3.17.65,0,1.33.56,2.39,1.48-1-1.57-1-3,2.08-3.2.64-.49-3.56-1-.62-2.05,6.79,2.37,6.43-8.13-1.24-5.38,3.35-3-4-.31-4.33-4.69-.54.57,15.11,8.34,12.4,1.34.31.13,2.12.49.31-1.19.2-1.21,3.95,2.93,3.09.11,1.09,4.34,12.11-10,5.42-9.45-5.11,1.72-8-7.3-11.89-4.73-2.88-1.75.76-1.15,4.2-.36l-.34-.53c2.94-.68,9.81,13,13.47-2.51-1.61-.36-4.09-3.19.65-2.63-.46-1.31,14.49,9.06,3.62-3.54-1.15,2.1-.91-3.38,2.2.78,1.82,2.62,2.73,7.35,8.43-1.33,4.79-.81-.8-9.58-2-12.12-2.47-1.88,9.45-2.84,1.66-5.53,3.73-3.48,1.8-2.21-2.8-6,4.57-1.62-6.35-3.55-9.78-3.43,1,2.35-1,5.67,2.37,7.58.22.9-1.82,1.84,0,2.93-4.8-1.4-2.74,11.52-8.88,14.76-2.67-6.91-5.13-5.3-1.53-11.65-3-8.4-5.19-12.62-8.36,1.81-1.93-1.63-.54-3.86-1.34-6.61.66-.71-3.35-3.42-1.54-3.61.53,1.65.53-1.42,2.14-1.41-.63-.64-1.94-.86-3.6-.69,0-.19.31-.23,1-1.11-.84-.73-3.1,2.61-3.8-.17-.2-.57-1.24.18-2.31-.15.49-.9,5.47-4.24,1.32-4.42a5.58,5.58,0,0,1,.78-1.41c4.16,3.92,1-3.15-2.43-6.43,1.9-5.22-3.46-9.38-6.16-12.41-3.7,1.66-3.45,3.85-2.92,7.18-3.14-3.62-5.63,8.42-1.13,6.91.29-.09-.95.69,0,1.53-5.35-.2-.14,11.46,4.23,9.17.69,2.73,3.47.79,4.38,2.81-.24.45.14.1-1.12,1.48-.52-.4.12-.76.46-1.89-.35,0-4.21,1.66-1.63,2.78-2.45,1.4-1.94,7.28.95,1.4,1.2.67-.52,3.23,1.28,3.61-4.85,6.91-8.61,2.08-6.7,15.17-1.71,2-3.12-2.31-1.56,3.23.77-.92-4.65-4.87-.78-3.57,1.14,1.87,4.05-2,.85-1.49-1.89-2.07-2.43-3.31-.68-9.82-.87-.1-1.46,1.52-2.64,2-.12-.48.89-1.47,1-2.56-.15,2.48-6.39-4.85-4.79-.73-.78.64-1.63.22-3,.23,0,.63.65.93.93,2.34l-.4-.16c1,3.55,1.07.07,4.54,2.58.29,5.45-3.58-1.11-5.32-1.74,1.82,3.2,0,3.28-5.25,1.9-2.64.23-6,2.43-9.24-.13-4-6.28-1.88,5.1-11.68-10.13-6.82,2-15.73,9.55-1.56,5.4,2.55-6.31,5.75.73-4.19,3-.78,3.16.64,6.4,2.26,10.54-.14.06,0,0-.86-.59-2.41-1.1-.86,2.61.5,4.85-1.39-1.37-2.59-3.85-4.35-6.14,4.21,2.56-.57-7.57-1.25-3-.76-1.33.08-3.09-2.93-3-.71-.54-.78-3.47-3.18-1.31-.3,1.36-18.09,4.34-16.16-1.78,10.33-3-3.9-11.58-3.07-7.17-8.91-.26-15-9.81-24.49-9.64-.68,1.21-.23,4.75-3.61,4.39-3.53.67,1.08-2.3-1.05-3.62-1.19-.48,1.18-6.65-2.25-3,.24.29,0,0,.78.37-.46.16-.62,2-1.52,1.64.89,17.08-11.17-15.75-9.81-5.49-.31.33-.17.84,1.08,1.07-2.2.67-2.26,4.56-5,5.55,2-4.37-5.76.27-6.57,5.07,0-.31.07-4.21-1.25-1.51,1.54-2.86-7.46,3.23-4.28,4.63.5,1.62-4.24-.68-2.09,1.38-5.06-4.18,13.81-9.52,12.17-14.42-6.54,2.25-8.91,5.12-15.81,9.48.84-.7,1.13-5-1.06-3.78.39,1.57-1.91,1.46-4,3.41l-.27-.2c0,.52-1.73,2.5.41,2.79-3,1,.12.16,1.11,3.32-6.32-1.45-11.28-7.67-18.09-9-6.65-.07-5.77-7.25-16.32-4-8.61-2.62-14.64-5.78-24.26-4.65a3.55,3.55,0,0,0,.62-1.14c-7.46-.61,6.3-3.87-10.6-3.54.43-5.8-2.86,2.6-4.79-.36,5.38-2.37-2.72-3.09-.87-5.07-1.73,1.46-8.62,10-10,5.62-.75,0-1.93,1.34-3,2.57.74-.17.66,1.43,2.45,1.16-.32-.12-.47.81-1.51.29a11.18,11.18,0,0,0-.18,2.27c-.24.17.52-.71-.8-.57-.24-.17.82-.81,0-1.45l.5-1c-2.23.15-3.78,3.72-7.42,4.23.1-.15.33-.28,1.1-1a7.28,7.28,0,0,0-.42-.77c-1.56,2.58-4.45,5.63-4.59,9.66l-.07-.12c-1.18,4.1-5.71,5.68-10.56,5-.15.7.43,4.68-1.54,4.91l.36-.48c-.27.15-.24,0-.85.61,11.34,4.45,9.84,15.16,15.39,11.59a1.74,1.74,0,0,0,.06.76c.55.18,1.28-1,2.71.36-4,5.44,4.92.76,4.89,4.94-1.23.31-4.48.12-6.15-1.69-.61-.8-.09-3.83-2.21-2.49.84,3,3.89,3.45,5.54,6.19l-.27-.44c-2.43.53-11.24,5-9.79-2.93.28-.05.1-.12.9,0,.58-1.22-10.24,1.5-6.76,3.55-2.85.09-4.64,1.46-8.28,4.17a4.23,4.23,0,0,1-.05-.57c-1.85,2.66,4.4,2.84,6.36,4.11-.86-.76-1,1.47-2.84.86,4.54,10,5.94,2.16,13.31,6a1.84,1.84,0,0,1,.32-.78c.15-.06-1.57-.16-.53-1.08.22.34,1.28.73,1.39,2.26a46.88,46.88,0,0,1,3.69-3.6c2.41-.91,5.61,0,.94,3.12,2.67,0,4.44,10.12-2.78,7.2-.68,1.9-2.09,3.33-5.12,4,2.05-1.52-4-3.08-2.27-.11-.77-.27-2.22.64-1.44,3.12a2.16,2.16,0,0,1,.72-.66c-.21.06.41.45-.9,1a1.17,1.17,0,0,0,.3.64l-.07.11c-1.07-1.13-4.33,2.49-2.93,4.59a8.29,8.29,0,0,0-1.64.49c.22.29-.07.37.95.79-.19.49-2.07-.18-1,1.39,1.28-2,.88,5.72,3,1.73-.33,0-.38,1.36.41.56,0,.26-.11.94.91.58-.1.45-.06,0-1.08,1.06,1.33,1,3.87.2,5.59.45-.05.21-.21,0-1.12.35.6.17,3,.47.62,1.88-.6-.55-.32-2.31-2.26,0,1-1.83-1.79-3.14-3.45.36.43-.13,9.36,10.48,9.38,1.93.84,0,1-3.18,2.6-3-3,2.67.93,6.79.19,11.2.12.07,0-.32.87-.23-1.08.44.75,2.48-1.76,3.15,2.36.67,3.19-1.07,6.26-2.75,2.11.15,6.55,8.59,5.47.53.93,1,.78-2.11,2.56,0-3.23-1.52-.86,6.24,4.47-1.06.09.39-1.07,1.68-.58,2.69-.61.44-3.71,2.65-.77,3.62-1.28-.39-2.73,3.4-.94,4.52-2.43-1.87-4.13,5.33-5.12,4-1,1.58-7.74,3.3-4.83,6.79-1.11-1-2.72,1.58-2.14-1.18.44-.13-1.52.74-1-.13-2.5.75-6.68,4.12-7.59,7.24.3,0,1-.31.76-1.38,2,2.33,1.4-2.86,2.58.08,1.72.46,2-4.79,4.17-3-2.69,1.08.28,1,2.47,0,.12.1,3.41-3.94,3-.54.17-.51,4-4,4.06-2.71a6.64,6.64,0,0,1,.8-.85c-.18-.09-.08-.94-1-.73-.63-.54,3.15-1.44,1.67-1.51,4.56-1.9,6.59-6.12,13.61-11.27,7.57-8.11-3-1.61,1.89-9.12-.47-.85,3.76.35,1.61-1.44.83-.28,3.79-1.37.63-3.13,3.41,2,.63-4.82,13-8.67-2.15,1.46-4,2.56.89,4.5-1.63-.35-7.71-2.27-7.88,2.3,1,2.11-5.4,7.1.7,6-2.15,2.07-5.49,5,.93,2.5.72-.61,2.65-2.75,3.7-2.73.31-.11-.41-.37.31-1.26.09.15,0-.15.35,1.06a18.82,18.82,0,0,0,.77-2.37c1.78,4.12,8.08-4.78,2.65-2.7.27-1.08,2.78-.05.3-2.41.65.48,1.86-2,.51-1.32.54-.93,1.15,0,2.32-1.5-.45.09-1.66,4.14.65,1.62,1.33,1.33,2.11-1.15,4.5-.85-.49,0-2.53,1.22-.37,2.17a7,7,0,0,1-.63.58c1.14-.13,1,.42,3.15.56a2.51,2.51,0,0,1-.79,1.23c1.48-.1,1.62,2,4.25-1.36-3.49,4.3,8.58,5.77,11.54,3.9.09.24,1,.33,0,1.5,3.53,3.75,5.07-2,8.51.47-.7,0-1,0-1,1.56.71-4.7-4.86.69,2.71,3,0,.09,0,.06-.16.25,2.63,1.14,3.21,4.46,6.87,6-.43-.31,4.6-1,.44-2.49.53-.37-.56-2-2-1.73,0-.13.64-.3.25-1.09,1-.34,3.73,4.27,3-.09.22.22,0,0,.47,1.18.09.1-.12-.28.67-.16-2.83.5,5.85,10.78,1.14-2.07,0,0,.08-.08.36,0a1.81,1.81,0,0,0-.3-.68c.27-.11.23,0,.42-.76.07,1.16,2.31,11.35,5.23,6.1-1.22,2-.73,4.55,2.4,4.25-1.27,0-2,0,.27,2-4.46-3.09,1.81,7.19,5.51,8.69-.7-.88-3.94,5.61-1.12,3.49,0-1.47,1-1.91,2.94-2.75-.43,2.73,1.81,16.64,3.54,1.25-.47,1.38.19,2.88-.08,5.12a5.31,5.31,0,0,0,.89-3.08c.09,0,0,1.17.83.6-.51,1.46-6.44,8.4-.23,7.47-1.34.82-4.25,2.17.22,5.78,1.22-.42,1.26-4.66,3.62-3.57-2.58,1.76,1,1.45,2.13,3.43-.4-1-1.93-.7-3.44-1.66-1.44-3.37.37,5.1,3,3.78a9.06,9.06,0,0,0-.77,3.15c.41,0-.09-.3,1.15-1.08-.65.58.15,1.32-1.45,2.24a4.92,4.92,0,0,1,.9,2.1c-.1-2.51,3.41-3.3,3.8-6,1.11,2.24-2.63.19,1.08,4.48a26.32,26.32,0,0,0-1.86-1.9c-.25.28-2.29.39-2.17,2.3h.46c-.2.09-1.07,2.31.29,2.9.33-1,1.43-1.65,3.36-1.27-4.86-1-4.2,7.26.61,3.62.29-.15-.44,1.28.5,1.21-1.15,1.33.13.66,1.68.85-3.39,0-.09,2.61,1.26.19-.33,1.17,2,1.65,2.39-1.23-1.55,1.57,2.16,10.25,3.21,3.78,1.4-.22-1.35,3.1,1.28,2.73-3.45-.65-.21,3.42,1.39,0-.13.39-.78,3,1.08,1.51,0,.34-.21.6-1.23.75.23-.17-.2,1,.52.69-.31,2.2.43-2.31,2,3.05-.35.94-.7-.09.39,1.5-.15,0-1,.43,0,1,.1-.06,0,.05-.07-.52.46.86,1,6-2.15,5.41.14,0,.6-1.95.91-.4a2.1,2.1,0,0,1,.21-.51c.36.57,1-.44.12-1.53.09-.08,1-1.08.31-1.63.17.87-1.42,1.27-1.69,2.73a1.33,1.33,0,0,0,.53-.09c-.58.61-1.48.47.33-1.94.07.07.06,0,.07.3.3.15.55-1.16.08-2.1-1.88.46-4,0-6.79-1.27-.19,2,1.71,4.4,2,7.39a1.33,1.33,0,0,0,.1-.42c.38,0,0,.21.94.37-2.06.72.35.77-.36,2.7,0-.08-.15.06-.35-.87a8.19,8.19,0,0,1-.1,1.65,4.3,4.3,0,0,1,3,.63c-.82-.21-1-.07-2.7-.33a51.38,51.38,0,0,1-1.05,13.82c0,.08.05-.23.32-.07-3.08,3.09,1.67,7.34-.09,12.45h.11a.63.63,0,0,0-.1.35l-.11,0s.08-.05,0-.17c0,3.48,1.91,8,4.84,11.81l-.36-.46a2.73,2.73,0,0,1-.07,1.06l.23-.3c.18,0,.83.91,1.64,1-.66-1.57,1.48-1.27,3.31-1-1.14.53-4.47-1.38-1.92,2.55-.25-.16-1.17-.31-1.1-1.37-2.42.42,5.1,8.81,6.41,14,1.46.73,11,1.77,11.66,7.86.13.1,2.26,3.14,1.84,3.83,1.56,2.34,2.49,5.06,4.06,8.32,2.07,1.56,6.33,3.69,5,7,.13.22-.39.32.32,1-.05,0-.9,0-.82-.77-.84.43-.39.38-2.59.12.8.57,4.48,5.94,6.62,3.51.26,2.7,2.77.4,4.67,8.95,1.92-.37,7.5,10.42,8.46,4.39-1.4-3-3.4-1.78-4.62-4.23,1.25,1.37-4.84-12.34-3.39-7.69-2.14-1.73-3.53-7.44-6.33-9.22-2.65-3.47-5-6.52-5-12,1.34,1.4,5.47,1.32,6.42,3.36,1.19,4.38,3.39,11.44,9.06,12.85-1.44,2.51,3.56,3.61,5,6.3-.08,0-.14.07-.29-.2-1.1.26-1,4.1,1.1,2.21-1.05,1.06.95,1.17,3,2.69-.15.09-.4.13-.86-.18-.82.18,5,4,1.81,2.34,3.25,2.67,10.48,8.84,7.93,13.81-.72,4.39,4.94,8.71,13.18,10.94,6.61,3.82,16.1,10.17,24.53,5.87-.87.38-.78-1.51,0-.21.09.15.44-.46.72-.11l-.34.32a20.54,20.54,0,0,1,2.39.76c-2.61-3.64,3.51,6.7,19.4,10.14.06,0-.29-.11-.71-.3,1,1.06,3.48-.85,4.18,0,2.22,2.31-2.28-.29.13,1.85,0,.66,7.17,5.25,5.46,6.61,2.08.84-.75.9.8,3.32,1,.49,4.38,2.51,1.47-1.05.75,1.73,6.5,2.66,5.37,5.78a2.05,2.05,0,0,0,1.56.74c0-.41,0-.13-.63-1.06,1-.13,1.05,1,2.08,2.23.09-1,.48-.7,2.26-.84,1.27-.15,2.91,3.68,4.12,1.44-.49,2.09,3,3.41,3.48.82.34-.24-3.63-1.48,1.14-3.26l-.23-.15c.94-3,4.68.26,5,.47s.6.58,1.06,0c.15.36.08.48,1.19,1.27-1-.05-.8-1.67-2.33.26-.12,1.93,4.62,4.27,3.34,6.22-.63.5,2.21,1.45-.22,2.62.6.49,1.48,3.37.05,4.62l.39-.13c.17.37-.45.17.18,1.06l.28-.4c.3-.22-.32,1.18.71.51a41.05,41.05,0,0,1-2.59,4.17c-1,1.57-3.48-.64-2.68,3.28.06.24-.91-1-1.58.52,3.07,2.72-4.52-.82-4.42,7.8-.06-.06,0,.16-.61-.12-1.59.32-2.45,10.1,1.58,6.15,0,1,.38.72.58-1,1.89,4.28-4.39,4.6-5.26,9.06,2.09,3.22-.5,4.7,5,7.8,3.65,7.36,11.09,16.72,12.4,24.63,13.58,20.71,31-4.85,16.42,63.33,1.61,8-.91,21.17-6.66,27.56-.81,3.26,1.69,6.51,1,10.75-.62,1.94-4.11,6.57-1,9.07.09.24-.3,0-.39.75,1.08.73,1.9-.17,3-1,.41-.14,1.12,2,2-.09.92.32-4.06,2.45-.63,2.25a20.73,20.73,0,0,1,.24,2.13c.26-.5-2.34-2-.71.36-.83-.34-.82,1-.44,2.52-.75.93-3.45,5.71.33,6.74.6,1.84-2.53,1.8-2.75,3.94a2.22,2.22,0,0,1,1.8,1.07c-4.22-2-1,3.35-3.55,5.62.18-2.29,3-5.12-1.58-1.79.71.85,3.22-4.87,1-3.79,1.34,3-5,.51-2.9,3.5-.14.6-4.46,2.36-2,4,.3.07.82-.68-.24-1.08.31-.62.78-.06,2-1.1-1.06,3,3.42-.36,2.9,3.42-1.74.51,0,1.81-.29,2.56-2.86-2.37,0,4.61,1.85-.12.23.59.1,1.82,1.16,2.71-1,0-2.1-.93-4.22-.93.06.8-.36,2.87,2,2.49-1.62.14-1.91,3.64-.75,5.46.25-.2.08-2.15,1-2.57-.31.9-1,1.84.35,3.15-.84-.75-3.26.71-.62,1.73l.19.36c-.7.23-1.32-.56-2.36,1.08a6.14,6.14,0,0,0,2.38,1.73L345,661c.06.24-.29.72.73,1.89.49,0,.31-1.25,1.13-1.85.05,0-.3.23.13.88-.2.12-.77,0-.66,1.58-3.41-1.3-.15-4.53-4.53-1.42-.25,3.12,5,1.58,4.1,5.21-.22.05-.46-.67-.94.36,0-.23-.05.57,1.06.43.52,2.38,7.54.67,2.45-1.57,1.8-.58,3.28,3,1.83,5.13.59-4.2-.46-.57-3.54-1.75.14,2-3.2-1.2-1.64,1.74.36.87,2,3.2,3.4.6.86,0-.14,1.57-1.62,2,2.43,4.09,1.9-2.66,4.24-1.22.37-.57,1.76-1,3.26-.11-.87.6-2.11.19-3.92,1.22-.05-1.53-3.06,3.18.27,3.74.33-2.51,8.66-7.83,2.31.37-1.84-6.16-2.79,5.06,3.24.89-1-4.38,3.76-9.37,8.89-7.65-.15-1.09-1.32-4.25-3.6-4.37,1.61,0,1.9-1,.93-3.3-.05.07,0-.12-.53.29-1-.65,5.85-6.61,1.31-5.73-.24-.33,1.61.21,1.1-1.35,3.55,5.62.86-3.45,10-9.61,0-.68-.78-.38-1.46-.6,8.27-3.43-16.68-6.49,2.2-14.92,1-2.25.27-7.51,4.5-9.23a7.19,7.19,0,0,1-2.49-1c1.53-2.67,2.38.89,4.69.22.52-.55.82-4.86-2-2.62l.68.07c-.87,3.63-6.55-5.45-2.62-7,0,0,.09.07-.17.27,5.06,1.85,9.55,4.16,9.4-6.54l.44,0c-7.31-3.72,22,1,18-13.34-3-.8.7-4-2.14-5.72-5-1.65-3-5.87-2.3-10.67,1.81,1.27-6.86,9.17,10,9.78,6.69,1.89,10.19-10.39,14.11-17.13,0,.05.08,0,.26.32,0-.64.48-1.42-.05-2.9.07,1.93,2.76,0,2.52,1.63-.41,1.84-3.93,4.76-5.13,6.83,6.34-6.08,14-16,11.82-24.86.72-.8,1.65-.61-.19-2,.91.92.56-.61,1.92-.23l-.2.36c.33.11.89-.59,1.18-1.29,0-.06-.08.13-.29-.12,3.65-3,7.28-4.78,12-6.72-1.23-.52,1.3-1.84,3.14-1a4.68,4.68,0,0,1-1.05.18c.88.52,2.44-.42,3.12-1.26-.51,1.19,2.87,1.44,4,.24,6.09-7.8,11.31-19.64,10.46-32.24l-.15.35c-.4.52.43-2-.28-1.84-.34-.58,1.68-1.71.83-2.85.27-.1.37.08.57-.59,1.33,2.79,3.59-1.61,4.81-5,.05.11-.07.26-.12.67-.18,0,.35.29.61-1.19.85-1.14,4.12-2.44,4.54-4.88C482,490,483.29,485.5,483.37,482.52ZM328.45,291.62c-3.65,3-9.2,6.67-14.59,6.32a4.91,4.91,0,0,1,1.15-.31c-3.45-.24-2.32-2.48.05-5.52.08.82,2.65,2-1,1.75-1.6,1.36.52,1.13,1.61,1.85.07-.87.9-1.17,2.24-1.8.06,0,0,0,0,.28,1-2.32,2.93-2,6.42-1.41-4.37-1.51,5.11-.59,3.5-2.62C328.25,290.16,328.46,290.87,328.45,291.62Zm-2.58-3.41c1.26-1.69,4.58-2.35,7.27-2.42l-.08,0c.15.28.3.23,1.08.21-.15,0-.35.42.24.08-.27.49.38.57,1.13-.08,0,0-.07-.11-.61.11-.09-.19.27-.23.63-.77-.79.28-.91-.26-1.58-.2-.37-.05-.17-.06-1,.28.06-.35,1.22-.49,2-.55l0,.2c0,.14.19-.22.48-.15-2.16,1.83,7.75-3.86,1.91.39-.05,0,.11.05.16.31,0,.07.9-.53.4.19,0,.07,0,0,.43,0,0-.05-.48.88-.57.5.41,3.07-3.54,3.25-7.33,2.43C330.27,288.11,323.78,291.62,325.87,288.21ZM281.94,272a38.19,38.19,0,0,1,9.34-6.72c.2-.51,3.2-4.57,1.82-1.27,1.28.3.79-2.93,2-2.56.58.62-.77.78-.66,2,.38-.92.5-.18,1.41-1.26-.92-3.29.86-.54,5.48-.38,2.92.7-1.06,4.58,6.09,4.34a4.62,4.62,0,0,0-.4.94c-.82,1.05,1.31,1.32,1.21,2.47-1.26,1.27.41,1.42.74,2.17-2.16,2.33,4.57,3,9.29,4,0-.15,1.41-.53.44.09-.06.12.36.11,0,.31,1.63-.59,3.15.8,4.21,1.77.25,1,.1,1.12,1.37,1.4-.43.25.34,2.59,1.21,2.31.12.06-.25.24.07.53-4.27-1.22,2.76,2-4.33.74-.26-.11.59-1.5-.78-.75,0-.09.85-.81.42-1-1.1,1-.46-2.71-2.36-1.16,1.84,1.17,1.57,3,.12,4.95-.74,1.48.77,4.94-2.71,5.66-.89-.84.28-6.86-3.41-4.32.46,1.56-4.31,2.52-.26-1.69,1.47-.38-.56-3.91.65-3.83-.68-1.85-3.51-3.34-6-3.58.31.31-1.22,1.25.18,1.77-1.85.17-1.25,1.17-2.18,3.16,0,0,.27-1.77,0-.64-.05,0,.1.16-.26.48s.79-3-.23-1.59c-5.09,3.43-.21,9.35-3.11,15.11-3.68,5.15-5.28-3.31-4.31-7.36-.52,0,4-10.35-.6-4.92-.39-1.74,2.42-3.6,3.47-6.76,0,1.42,0,.88,1.48.17.37.37-1,.78-.21,1.3,1.24-1.94,4.34-3.25,6.71-1.24-.78-1.59,4.91.42,1.67-1.77,1-2.5-3.84.23-2.56-2.77-2.51-.22-5.28,1.64-7.75,1.3-1,.51-2-4-4.49-1.46-.09-5.17-3.61,2.1-8.11.6-1,1,.08-.56-.3-1.42C285.57,270.85,283.23,273.49,281.94,272Z" />
+  <path class="land"
+    d="M350.62,1.26c-2.26,4,4.3,9.83,8.76,7.91-2.79.56.39,7.14,3.89,5.55.76-2.05,1.68-1.14,4-.47,3.93-1.95,5.51-5.93,5.08,3.87-2.51-3-7.84-1.52-9.72,1.21-3.07-1-9.93.29-5.56,4.29-.89,2.81,2.32,1.44,3.66-.93-2.46,4.18,2.23,4.37,5.44,5.42-9.42,2.63-1.18,9.28,5.18,9.73-.19-1.13-4-4.6,1.1-2.58,1.62-2.67,1.39.11,3.68.13,5.16-2.61,9.44-3.6,16.84,1.47,7,5.25,6.18,2.63,8.49,11.84,1.88,5,9.89,8.35,3.09,14.29,2.66-1.72,5.66,1.74,4.44,4.62-.81,1.72-.05,2.31.81,4.65a4.61,4.61,0,0,0,1-.94c1.78-.46-3.07,8.76,1.31,5.4,2.41,1.8,1,5.7-1.75,6.81,1.45-.39-2.16,6.28,2.37.5-.41,2.7-7,13.27,2.54,11,.52-.08,1.41-.67.54-2.66,4.15-.42-1.14-6.3,1.29-8-1.49,1.61,1.38,3.51,1.12,6.51l.67-.2c-1.78,3.71-1.37,2.81,4.8,1.4-14.18,7.12,8.67,6.1,0,7.35,2.92,1.34-.16,4.1,3.84,6.49-3.22,1.47-8.87-7.83-13.54-3.17,2.65,4.36,9.23,7.91,14.8,7-.4,2.28-2,4.19-2.65,8.21,5.34-.09-.95-.11-.61,4.58.32,0,.79-.08,1.55-.75-1.94,7.09-6.38-4.18-9.05,5,2-.55,3.29,1.58,6.15.23-.09-.2,1.89-2.8,1.5-.49-2,7.55-6.29-5.81-8.89,7.23,4.1-2.11,1.49-2.57,10-2.16-1.7.6-.38,1.08,1,2.35-2.21-1-3-.92-6.68-2.15-3.52,1-9.11,7.87.44,8-3.87-.9-9.8,14.26,4.09,0-1.71,2.33-4.68,4.7-7.62,7.3.32-.08-.06.68,1,.61-1.74,6.62,3.05,2.76,7.09,1.93-1.17-.11-5.21,2.37-4.78,4.46,2.67.59-1.16,15.11,4.61,3.61a6.36,6.36,0,0,1-.29,1.28c1.91-.41,1.86-2.17.92-4.72.33,2.5,2.87,3.16,3.34,6.2-.34-.07-2.13-4.1-2.9-.91-1.94-1.17-6.13,7,1.4,2,0,.28-.65,1.28.62.8-.71.61-2.7.78-4.53,1.66-.14,2.8,2,6.13,4.07,9.25.54-.17.62-1.2,2.1-1.71-1,.79-1.69,2-1.85,4.37a8.15,8.15,0,0,0,2.69,1.81c-1.05,2.31,0,1.25,2.55,1.14-1.67.31-1.76,1.8-1.62,3.63.61,1.4,3,2.13,3.18,4.25a11,11,0,0,1,2.16,0c-.38.25-3.5,2.22.15,1.93a2,2,0,0,1-.24-.71,7,7,0,0,0,6.77-2.81c-1.15,2-.83,8.1,3.92,4a2.32,2.32,0,0,1-2.15,2.07c-.26,1.41,2.79,4.11,4,.71.65.27-2.48,3.25.56,2.44,0,.06-.1-.06-.18.65a2.79,2.79,0,0,0,1.61-.19c-.06-.28-.71-.47-1-1.16,3,2.12,4.86-2.07.11-4,5.09,2,4.17-3.55,5.62-7.87l-.92-.26c2.77-.5.39-3.47,1.52-6.37-.62-.25-1.4.06-2.77-1.15,2.18.15,6.75.24,2.7-3.76.66.45,3.48,3.49,4-2.37,1.47.84,3-6.14.06-4.81a12.31,12.31,0,0,0-1.93-1.43c.44-.54,3.16,1.77,3.1-.25,2,0,1.92-2.32.15-4.78a2.09,2.09,0,0,1-1.09.39c0-.52-.38-.64-.42-1.92,3.69.64,5.63,0,3.95-3.82,1.82-.8,8.6.64,5.07-3.86a7.46,7.46,0,0,1,1.33.91c.4-.55.18-1.93,1.37-3.09-.54-.44-.14.14-1.42-1.08-.54,0,4.11-.11,2.72,1.19-1.85,1.28-3.29,8.94.23,4,.39,0,.14.23.89-.7.25,1.17,2.06,1,1.88-1.16.1.26.62,0,.53,1.51,1-1.51,3.62-2,1.8-5.27,3.68,5.09,7.35-5.25,9.28-10,1.92-4.55,4.76-.18,3.16-8.22.25,0,6.39,6.89,5.65,1.76,1.21.83,19.45-3.38,19.45-9.74.74-.39,4.14-1.11,3.14-3.24.56,0,3.22.91,1.51-1.52-.75.69,7.92-3.09,5.08-3.94-11.23,0-7.78-5.42-18.31,1,5.23-6.42,5-3.54-5.07-4.31,1.57-1,6.3-3.12,2.37-5.8,2.15.53,13.79.51,8.17-5.5-.36,0-5.15.4-3.3-1.46,9.86-1.93,12.47,23,16.09,8.38,0,1.2.11,2.23.18,4.2,5.09,3.63,2.51-18.26-.12-8.39-.59-1.8-.21-2.7,1.61-5.46-1.8.59-7.73-9.47-11.1-6.84,2.73-7.68,2.88-6.38-5.41-4.29,13.39-7.82,1-1,15.34,6.9,1.19-8.21,3.3-9.35-7.26-15.32-3.65.17-6.34,3.37-10.74,4.23-3-2.89,7.12,1.25.5-4.47,3.53,3.76,11.58.72,6.15-5.16,1.26.19,2.74,6.07,4.8,1.09,2.45,9.84,16.08,4.37,12.73-1.35-8.13-3.32-6.39,1.14-5.09-8.94.37,2.06,1.69,10.09,6.07,3.7,6.22,1.84,2.5-5.05,1-9.13-2.34-2.76-1.23,5.57-3.71,4.08,2.81-9.49-1.75-1.18-4.2-6,2.06,3.06,4.21-1.23,6.65-2.63,6.19,6.06,2.48-6.22,1.26-12.2-1.35-3-4.46.15-5.9-2.61.15-4.73-4.42-3-2.75-6.23,8.88,1.49,1.61-6.4,13.5,0,3.1-8.77,1-5.48-6.13-10.09-3.59-8.82,2.23-1.39,3.7-3.45-1.67-3.22-5.62-7.69-8-.5-1.65-3.12,1.42-7.48,1.31-12H350.12C350.22.29,350,.17,350.62,1.26Z" />
+  <path class="land"
+    d="M546.25,165.29c2.34-2.19,8.68-3.11,9-7.29.26,1.19,4.23-2.8,2.21-3.7-.16.35,1.12-3.27-.1-2.85-.14-.24-.84-1.76-2.42-.36,1.76-1.66-1.48-1.23-1-2.19,1.61-1.8-3.62-1.88.56-4.73-4.34,4-5.53-5.87-6.65,1.61-1.19,1.29-2.1-1.39-3.74,2-4.14-5.69-.6,5-3.18,0-2-4.53-2.84.49-4.2,1.4-2-2.52-2-4.9-2.94,2-.92-1.36-1.73-.45-2.27,2.53,0-1-1.11-1.49-.9-2.74-.28,0-.07-.09-1-1.11.62.69,2.2-1.38.5-2.09.91.33-1.65-4.08-4.82-4.1-.37.16-1.86,1.5.71.9,0,.3.07.16.71.62-4.06.42,2.1,1.07-.46,3.44-.18.13.43-1.2-.38-1.47,0,0-.22.55-1,.49.71-1.2-3.25-2.81-1.46-.37-.21.08-2.54-.92-.32,1.24-.31-.26-2.69.73.84,1.11-.95,1.38-4.33-1.79-2,1.79-.88-1.14-4.42,0,.22,1,.76-1,10.58-2.31,4.52,1.89a1.91,1.91,0,0,0,2.57.08c.09,2-2.75.55-4.68,1.84-5.64,1.06-3,1.05,3,2-.53,1.55.16,1.77,2.31.82,0,.1-2.36,1.23-1.09,1.91.12,0-.4.18-.53.63.41.34,1.08-1.08,2.07-.53-1.3-.18-2.18,4.82-4.35,2.38-.13.48-.33.62.17,2,1.1-.26,4,.05,5.48-.84-.55.11,1.41,2.42,2.39,1-1.54,1.66,4.81,3.87,7.71,2.61C542.33,167.8,543.34,165.78,546.25,165.29Z" />
+  <path class="land"
+    d="M893.51,430.85c-1.51-1.76-2.88-8.28-6.6-8.14,0,.53.77,0,1.66.92-.43.05-.31.07-1.2-.34.29,1.65-.83,3-1.06,5.49-.21-.21-.1.07-.12-1C884.26,433.41,891.84,441.46,893.51,430.85Z" />
+  <path class="land"
+    d="M782.69,509.27c-.06.73-1.68-13.6-5-8.87-.25.81-.06,4.87-3.37,4.3.49,1.12-1.38,2.15.08,3.62-.83-.59-.92.72-1.88,1.16.53-2.51-.89.44-1.41,1.65.86-1.56-3.45,0-2.06,1.6-5.82-1.21-11.36,3.91-7,13.35.34,3.37-3.93,6-4.2,10.15,1,14.26,13,19.28,17.07-1.09,2.46-8.17,5.83-15.6,5.74-24C781.35,511.31,784,515.76,782.69,509.27Z" />
+  <path class="land"
+    d="M341.67,386.11c2.76-1.24,6.85-.3-1.69-3.47.16-1.18-2.5-1.54-4.46-1.84,0,0-.09.05.11-.26a7.87,7.87,0,0,1-.93-.71c-.28.17-.26.81-.94-.09-.09-.12.51.35.78-.11-.51-.08-.35-.42-1.54-.92,0,.05,0,0,.3.38-2.23-1.37-5.64-1.86-8.27-3.91l.11-.23a50.55,50.55,0,0,1-5.07-1c-2.86.1-10.37,0-11.37,4.21-1.63.84-.67,0,0,1,.41-.8,12.63-5.72,8.53-2.3.13.25,2.79,1.81,3.14.45.21.74,1.28,1.26,2.46.55,3,3.36,4.52-.34,8.74,5.26.33.24,5.87-.72,1,3.19,2.15-.57,6.17.11,9-.57A.93.93,0,0,1,341.67,386.11Z" />
+  <path class="land"
+    d="M353.93,393.93c2.07,1.38-1.06-1.52,6.54-2.45,2.71,1,9.66-.37.52-2.48-.13-.71.48.08,1.37-.57-2.15,0-3.31-2.2-6.5-2.28,1.53,1-14.13-1.32-5.7,1.66-.23.05.06.79-.38,1.36,4.84,4.47-4.64,0-5.8,2.49C345.4,394,352.21,390.08,353.93,393.93Z" />
+  <path class="land"
+    d="M584.8,215.9c.18,1.24,1.29,1.3,2.74-.44-.35,1.2-2.41,4.56-1.12,6,.09-.16-2,3.36-.28,2.82,1-1.38-.2-4.15,2.08-5.48-.25.41-1.17.85-.82,2.17.32-.61.85-.38,1.51-1.7,0,.27-.55.79.76,1.38-1.9-.54.34,2.67-1.66,5.85-.54-.31-.75.69.51,1.81-.44-.7,3.62-1,6.59-1.6-4.36,2.3.26,3.57.39,7.31-.28.27-1.12,1.94.62,2.49-.47,0-.49.41-1.11-.69-.23.22-.58-.09-.12,1-1.41-1-4.66.2-5.57,2.63.44.1.73-.69,2-.63.13.31-.22,1.61.43,2.16-.42,2-2.69,2.14-4.51,3.77.57,2.09,1.75.38,4.12,1.24,0,.13,0-.25-.5.51,2.65-.9,1.13,3.2,6.33-1-1.23,1.82-2.21,3.45-6.17,3.09-.76,2-3.59,4.18-5,6.27,2,.11,2.39-1.91,7.16-1.48.14-2.89,3.24-1.71,5.71-1.68,0-.08,0,.12-.25-.54.35-.12,1.21.44,2.45-.52l-.28-.42c1.75,2.07,16.51-1.48,6.47-3.17,0-.32,3.15-.42,1.15-1.48,3.16-.65,7.06-8.38-2.48-6.72,1.93-1.34.46-4.59-2.48-4.78a4.45,4.45,0,0,1,2.72.67c.4,0-2-2-.7-3-6-3.05-2.67-11.52-13-12.07,1.07,1.55,6.88-2.53,1.69-1.69,3.09-.74,11.29-12.05-2.9-7.78-.51-.13,2-1.79.35-1.79.57-2.06,8.81-7.15-1.4-4.38-.19-.18-3.41-1.4-2,1.67-.93-.07-2.16.94-.53,2.52-.29-.48-3.43.56-1.49,2.18-1.44.32.39,1.05-.52,4.48C585.93,215,583.19,215.8,584.8,215.9Z" />
+  <path class="land" d="M647.86,2.53l.53-.13c-.28-.38.21-2.69-1.6-2.23A14.65,14.65,0,0,1,647.86,2.53Z" />
+  <path class="land"
+    d="M656.24,127.9a8.8,8.8,0,0,0,3.47-1.89c1.77,3.74,7.31-10.31,1.53-1.68,0-1.78,1.43-5.55.68-7.27-2.18,2-1.1,4-2.23,7.11C659.3,126.34,655.18,125.25,656.24,127.9Z" />
+  <path class="land"
+    d="M313.84,163.84c2.32.74,3.43,4,7.31,4.29.1-.8,4.42-2.5,1-3.32,2.32-2.48-5.88.2-3.7-1.74,2.67-.6-9.67-13.09-10.72-9.71-1.76,1.92-.3-7-3.67-4.45-2.06,4-1.08,10.14-2.13,14.7-.72.3-3.87,2.47-2.23,3.8,8.57-3.73,2.4,5.48,7.36,2.92C307.36,171.89,313.54,159.36,313.84,163.84Z" />
+  <path class="land"
+    d="M570.78,243.25l.16.08c0,.67-1.65.22-1.51,1.83a3.52,3.52,0,0,0,2.61-.42,5.49,5.49,0,0,0-1.84,1.54c.45,0,1-.53,2.1-.45-.15.46,0-.52-1.1,1.11-.24-.09,6-.05,5-2.28,1.43.63,3.25-1,5.07-2,.1.33,1,.62,2.26,0l-.49-.56c2.9-1.77-.11-7.71,1.08-9.74-.07,0,.13.07-.22-.43.69.45,1.58-.48,2.32-1.68-.42-.09-.25.22-.39-1.08.19,0,.25.15.65.65.09-.36,0-2-1.38-1.2.82-.39,0-4.72-2.89-3.35-.79,0-2.7,1.55-.92-.27-.14.13-.67-.76-1.42-.75l.22.37c-1.27-.12,0,1.55-1.25,2-.18,0,.47-.15.08-.52.19,0,.57-1.41-.45-1.18l0,.39c-2-.65-1.94,1.78-3.56,3.06a2.73,2.73,0,0,0,2.22.25c.06,1-2.23,1-1.45,2.4-.19.52-4.45-1.55-5.44.51l.41-.19c0,.08.12,0,.15.66l.27-.11c.06.36,0,.32-.2,1.37.13.1-.15-.26,1.18-.1,0,0-.11,0,0,.45.17-.1-2.52.68-.5,1.18.33.12-2.09-.09-1.18.74-.24.41-.22.45.91.49l-.28.31a15.84,15.84,0,0,0,3.33.79c-.42.57-1.28.15-1.87,1.51.46.61-.38,1.25-1.6,2.18.88-.64,2.29.35,3.26-1.07.17.13.07.25.72.43-1,.62-2.39.11-3.94,1.59.25,0-.07.2.47.87-.4.24-1.89-.82-2.18.66A6.2,6.2,0,0,0,570.78,243.25Z" />
+  <path class="land"
+    d="M307.24,2.28c.93-.13,1.11-.45,2.42,1.09-9.89,2.88-1.19,21.56,5.72,3.11-1.84,9.26-7,16.47-14,2.61-7.44-3.68-5.73,5.81-.85,10.54-4.89-.49-15.74,9.38-6.09,11.71.13-1.22-.57-2.81.17-5.32a39.09,39.09,0,0,0,.35,5.55,8.13,8.13,0,0,1,3.16.28l0-3c.32,2,.29,2.05,2.85,3.14a15.8,15.8,0,0,1,.79-3.12c1.59,5.39,9.39,5.69,7.84-1.37-.59,4.59,10.42,5.68,6-.73,1.29,2.43,3.79,2.7,6,4.74.26.53-2.2,5.28,1.81,2.73,5.95-2.85,13.48-9.7,3.51-11.42,1.27-4.17-2.7-2.34-5.76-4.46-1.45-.75-2.8,2.83-3.87-.51,1.56-.06,3.55.38,1.4-3.68,2.27,3.57,11.45,6.31,12.65-.68.79-1.73-1.93-6.25,1.62-6.26,4.82,2.36,9.29-6.18,7.89-7.07h-33.4Z" />
+  <path class="land"
+    d="M298,3.36c1.44,2.18,4.6-.26,5.74-2.86A26.65,26.65,0,0,1,302.64,5c2.24,0,3.83-1.78,4.39-4.81h-8.87A16.53,16.53,0,0,1,298,3.36Z" />
+  <path class="land"
+    d="M336.9,81.24c-2.64-3-11.77.09-3.66,5.27a16.25,16.25,0,0,1-4.16-2c-.73,1.29-.79,3,.4,5.36-2.16-.72-.52-4.14-2.6-5.81.07,2.13-4.18-3.49-2,2.45-1.62-1.12-2.2,1.76-3.66,3.06.15-.39-.68-2.16.82-2.22-1.84-.81,2.23-6.69-1.93-2,3.12-6.6,4.93-2.5.09-13.76.92-5.59-9.78-4.46-9,.25-5.42-1.11-7.64,4.38-1.67,7.46-5.26-5.43-7.66,4.22-1.29,4.91-1.46.93.05,1.91,1.19,3.8-1.78-3-7.3-2-4.32,2.57,2.35,2.21,4.06,4,2.26,8.94,0-.15-1.12-.4-.46-1.46-1.93-1.12-3.34,1.3-5.58,1.37,10.24-6.56,2.39,1.37-.28-19.73.62-4.16,3.06-7.86,6.05-11.63C303.63,63.82,295,68,293.32,73.5a36,36,0,0,0-3.44,20.71c1.94,3.25,6.33,1.89,9.52,5.23-2.09,1.87-4.82-.72-8.14-.54.88,3.89,3.33,9.56,8.41,7.79-.91-1.69.92.19,2.34-1.46-3.86,6.5,16.05,3.66,19.25,7.54.76-1.21-1.08-2.57-2.56-3.7,19.42,6.21,3.52-5.94,9.67-4.3,1.33,4,4.54.76,4.6,6.84.51.49,3.36-1.37,2,2.31,6.39-1-2.12-.7,4.33,3,2.16,2.69-2.64,1.89-2.79,4-1.19,5.26,4-1.1,6.56-1.31-.05-.45-1.14,2.8.06,2.31.85,2.58,1.17,3.52,3,1,.8.08-1.39,5.46,1.92,3.19,2.44,9.53,7.69,8.62-3.76,19.57-.8,2,3,3.24,2.9,6.17-1.83-.43-5.43,1.46-7.81,1.92.59.55,1.95,1.8,1.12,3.44.55-2.46-7.12-8.3-7-2.65-3.54,1.46-6.22,10,9,5.72.85,0,1.12-1.06-.08-2.66.68-.65,2.38,1.23,3.13,3,.53-.82.45-1.71,2.65-1.3-1.43,2,2.8,6.21,6.65,8-2,.7-2.16,4.5,1.53,3.59-1.74,2.67,4.71,1.49,5.55,4.2,1.16,1.34,12.47,8,11.91,2.74.81,1-18.45-18.61-6.13-9.29a11.25,11.25,0,0,0-.6-2.44c-.19-.75,5.54,8.3,4.36,3.67-.17,0,1.83,3.77,1.42,1.21,1,0,5.19,6.5,3.93,1.2,2.32,1.77.45-2.31-.21-6.33,1.12.92,2.95,8.45,2.22.67,0-.07,0,.14.53-.21-.25.28,0-1.83-1.37-1.66,1.06-.61-.88-.68-2.79-3.16,1.1.65,3.22-2,.22-1.57-.38-.49,1.84-.29.35-1.81-.85,1-1-3.38-2.76,0-.61-.68.75-1.21-1.48-2.29-.18.37-.09.39-.14,1.54-.69-1.27-.35-2.92-2.32-4.42,0-.31.29,0,.77-.79-1,.22-.15-2.74-3-1.19.09-.94-.28-4.69-2.77-5.29,1.36-2,3.62,5,5.51,1.43-.6-1-2.13-1.27-2.41-4,.4-.19,3.63,4.25,2-.7-.05.18,1.78.9,1-.46,1.16-.18,2.12,6.19,4.66,3.57l.12.08c-2,2.91,1.33,2.36,4.25-1-.78,3.19-6.35,2.51-.38,10.21a5.84,5.84,0,0,1,1-2.38c.06.46-.86,1.86.42,2.8.59-.77,1-.45,1.91,1.14.92-1,.83-3.44.95-5.76-1.61-.51-.26.13-.43-2,.18,2.94,5.44,1.9,2.94-1.4.2-.47.82.55,2.22-.16-1.09-1.58-1.4-.42-2-3.22,1.35.59,6.06,1.45,1.51-2.08,5.29,2.15,2.5-5.69-5.55-1.58,1.41-1.36,1.08-1.25,2.32-3.7-.27-.23-2.16-2.43-2.79-.26a15.68,15.68,0,0,0-1.83.07c0-.42.05-.16-1.21-.85l2.43,0c.07-.31-.73-1.31.56-2l-.6-.82-.48.3c-.21-2.12-3.09-.7-3.06-2.49,1.94-1.92-2.14-1.67-1.32,2-1-.21.59-4.35-1.62-2.29-.06-.12-.58,0-.28-1.39-2.45,2.51-1.43,2.74-.95-2-1.25.35-1.24-.15-1.66,2.36a1.69,1.69,0,0,0-.16-.93,1.78,1.78,0,0,1-.68.59c1-1-1.37-2.69.74-3.58-.73.23-16.46-6.23-4.11-3.25,1.53-2.38-1.08-4.57-4.07-3.05,1.78-2.27,4.51-.53,8.2-.69,1.14-2.47-5.47-4.48-8.94-3.41,1.42-2.24,5.45-1.74,7.31-2.89,0-.58-2.48-8.19-4.06-3.89.54.14-.86,3.08-2.4,2.06,4.27-6.06-5.56,1.59-3.07-1.54,12.64-4.62-3.21-13.38-5.44,0-.13-2.73,2.52-5.43-1.62-3.15,4-2.89,9-10.75-2.61-4.21,1.77-3.37,11.38-4.62-1-9.22-.94,1-1.74,1.75-1,4.35-.65-.77-.91-1.78-1.87-3.35-.1-.1-.53,1.38-1.7,2,4.1-6.42-.81-4.66-2.81,2,.37-1.48.28-2.46,1-5,.1-.22-.81.61-1.78-.38,7-.87,1.81-9.34-2.52-.09C339.59,88,346.44,83.87,336.9,81.24Z" />
+  <path class="land" d="M956.26,2.38c-4.13,8.84,3.35,1.19,18.22-2.21C972.46.74,956-1.58,956.26,2.38Z" />
+  <path class="land"
+    d="M1122.38,50.64c2.88,3.36,12.94,7.19,13.7-1.28-.41-.11-.26-.14-1,.78-2.59-4.23-6,.71-7.89-4.37-4.9-1.64-3.82,3.75-6.14-2.3C1119.72,45.65,1118.62,49.09,1122.38,50.64Z" />
+  <path class="land"
+    d="M1087.5,48.29c3.55,4.45,5.69,11.64,10.12,4.15,3.66,3.7,3.92-3.4,9.64,1.24,4.87-1.8-6.31-9.43-.26-12.17,4.18-1.84-4.3,11,6.53,8.59,2.3-1.31,0-4.66,3.34-5.91-10.23-10.17-3.28,1.51-13.62-8.67-2.45.57-.75,7.82-3.3,6.81-1-3.49-9.92-13.3-10-1.37-2.56-1.35-1.54,3.73-1.47,5.76-.29,0-.28.18-1.08-.23A2.48,2.48,0,0,0,1087.5,48.29Z" />
+  <path class="land"
+    d="M1109.79,70c-7.28-9.07-5.28-2.36-12.87,1.76.49,2.17,2.42-1.3,4.51.1C1103.52,73,1112.77,77.43,1109.79,70Z" />
+  <path class="land" d="M651,.7c.15,2,4.29,2.38,5.28-.53h-5.63C650.73.25,650.82.16,651,.7Z" />
+  <path class="land"
+    d="M664.77.37C663.93.5,660-.4,661,2.48c-.08-.23-6,2.19-4.89,3.78-1.82-3.29-3.64.87-.76,3.9,1.41,1.32,9.55-4.72,10.35-.43-2.29,0-8.35.66-8.23,4.46-7.42-3.9,3.73,11.6,6.64,14.55,2,2.22,1.69-7,3.5-11.81C671,11.16,670.4,9.51,673,.17,672.37.32,665.42-.15,664.77.37Z" />
+  <path class="land"
+    d="M678.87,2.06a7.23,7.23,0,0,0,3,5.57c-1.15,4.55-6.95,10.4,3.63,6.1-3.16,10.6,3.93-.66,7.79-3.32-2.45-4.49-6.35,1.44-5.86-7.67C686.34.93,683.56,4.33,684,.17H678C678,.73,677.94.93,678.87,2.06Z" />
+  <path class="land"
+    d="M786.9,92.48c.89,4,5.05-1.1,7.42,3.48-.22.59.7,1.29,1.88,2.25.26.71-1.41-1-1.05.59-1.38-.65-.17,1.33-1.67,2.12,1,.73,2.39.62,4.28,2,.07,0-.14,0,.16-.65.77.9,3.38,1,4.56,1l.51.32a1,1,0,0,1,.19-.42c.11.48,2.94,2.15.42-.6,11.27,4.53-5-7.55-3-15.28-1.1-5.06,3.08-7.66,3.33-13.13-2-1.19-13.53-3.41-10.48,3.71-.87-.51-5.12,2.19-1.6,2.93C792.52,86.34,785.17,86.24,786.9,92.48Z" />
+  <path class="land"
+    d="M796.37,70.32c-.2.55-.37.88.34,2.34,1-3.82,11.85,6.35,10.59-6,.82.43,2.68,2.29,1.6-2.22,2.67-1.42,3.55-2.11,2.69-6.26,1.7.62,1.9.86,2.49-2.55.44,0,2.27,2.86,1.78-.7,0,.5,4.54-1.94,1.73-3,6.24-9.47,20.57-10.66,28.94-20.45,6-7.46-5-14.13-9.55-2.48-5.74,3.3-8.13,5.79-16.16,4.56.27,3.69-10.84,4.55-12.49,13.31-3-2.13-2.06,1.6-3.94,3.36-.79-2.51-4.91-.43.05,1.88-1.15,1.14-5.49,4.92-1.27,6.12-3.73.77-3.4,3.08-5.26,6.91C796,65.77,793.52,67.72,796.37,70.32Z" />
+  <path class="land"
+    d="M168.48,263.06c.8.52,5,2,3.37-1-.21.08,0,0-.28.62-.51-2-3.78-5.14-8.24-9.67-.55-.59-14-4.17-6.65-.84a1.05,1.05,0,0,1-.07-.4,4,4,0,0,1,1,.14c-.05.08-.38.24-.07,1-1.28-1.75-2.89,2.09.77,1.51.6,1.1,1.37,1.72,4,2.47-2,.33-2.31,1.53.69,1.46-.27.59.07.72,1,1.15,0,0,0,.15-.65.51.59.61,3.17,1.4,3.57-.65C167.69,261.13,163.05,261.2,168.48,263.06Z" />
+  <path class="land"
+    d="M237.27,89.63c-3.17-9.55.48-13.51-11.32-16.94a1.17,1.17,0,0,0,.33,1.6c-2.22,3.19.37,10.65,2.22,15.44-5.13,10.37-1.21-12.15-11.8-12.93-1.14,1.28,3.68,3.09.78,4.44-.26-.34-3.29,5.48-2.9,2-.44.11-.37.41-1.45,1.83-.16,0,.29-.12-.77-.64,6.56-2.94-5.65-12.5-5.64-3.94.2-.31-3.33,1.93-3.51.8,8.9-16.93-17.67-2.21-13.05,3.93-1.62,1.71-6.35,8.45,1.64,7.1-5.67,6.23,6.38.09,8.58,1.83.41.75-3.94-.68-2.07,1.23-7.11.91-14,7.69-.68,8.49,5-.45,11.19-2.13,15.65,3-4.69,2.37-26.57-4.17-17.16,9,1.94,2.81,8.14-.33,10.09,3.15-.09,7.32,3,6.44,11.17,4.81,3.6-.36,7.48-2.48,11.35-4.67.75-.35,2.49-6.77,3.11-1.57,4.39,2,8.81,6.94,15.81,2.23.15-1.93-.62-8.06-4.44-1.77,2.22-2-4.85-6.38,1.76-3.44.28-6.06,3,.83,4-3,.29,2.94,3.79,1.74,1.17-3-2.23-.13-4-2.63-6.82-5.23-.49-.37,1.83,3.07-1.74.2C235.62,97.31,241,98.55,237.27,89.63Z" />
+  <path class="land" d="M267.22,48.51c-1.14.89-1.41,2.35.08,4.05l.31-.41C284.38,69.44,275.79,28.68,267.22,48.51Z" />
+  <path class="land"
+    d="M265.27,26.73c1.06-.18,2.32,3.25,4.2,2.15-3.84,2.43,4.52,7.16,8.24,3.37,1.6.28,1.21,2.39,2.72,5,2.72.78-1.33,25.43,5.82,16.71-1.51,2,6.29,6.36,5.93,1,.74.59.75-2.16,1.2.73,4.29-5.71-4,4.91,7.69,2.64l-.23-.89c.91-.07,3.9,2,4.42-.57,0-.17,1.54,2.5,1.45-.08,1.69,2.57,8,.55,5.41-3.92.34-.06.71,1,1.47,1.14-2.37,5.82,13.81,5.63,9.69-1.16.53.82,5,1.2,2.41-1.59-.05.12-4.14,1-1.78-.87,7-2.26-4.3-13.07-10.79-9.25-1.12-1.6-9.85,2-9.54,5-1.32,0-3.23-1.38-4.59-3.11-.43.4-.45.48-1,1.86-.23-.07.1-.15-.67-1.27l-1.66.89c-1.87-2.5-1.8-3.35-2.52.81-.6-.46-.92-2.06-2.56-1.55,4.08-3.73-2.43-6-6.19-9.4,12.47,2.11,7-1.74-.13-4.13,8.22,1.85-1.59-7-7.35.76,6.84-6.34-15.08-14-10.09-5.29-.25.18-.45,1.24-1.67-.08C265.24,25.51,264.86,26.25,265.27,26.73Z" />
+  <path class="land" d="M231.81,68.12c-2.88,1.41-2.05,2.59.88,5.67C236,85.37,243.44,64.28,231.81,68.12Z" />
+  <path class="land" d="M341.83,129.11c-2.26-9.59-14.21,7.49-3.93,7.26C342,136.55,341.74,132.72,341.83,129.11Z" />
+  <path class="land"
+    d="M257.83,120.68c3,1.66,6.65,7.68,12.89,1.24,0,.06.27-1.75-1-.29-.22-1.64-11.68-17.43-8.63-6.11-.3.15-2.56-2.53-1.43-.23,1.16,3.32-5.78,2.29-3.06,5.94C257,121.56,257.14,121.27,257.83,120.68Z" />
+  <path class="land"
+    d="M262.38,66c-2.86,2.16-5.87,1.59-8.68-.52,1.31,3.61-5.63-2.47-1.35,6-.85-3.55-8.52-.5,2.45,2.87-5.69-2.71,1.49,5.31-2,2.85-1.32,9.9-5.23-6.1-7.85.79a3.52,3.52,0,0,0,.8,3.73c2.07,2.78,3.78,3.12,6.6,5.54,2.9,4.08,8.3,16.64,7.74,3-.1,5.22,8.59,1.69,5.35-5.34,1.66.17,2.18-6.87-1.15-3.55.27-1.4-1-7.4-4.35-3.62-.52-.3-.28-1.22.67-2.18.76-3,4.81-1.93,2-5.13C264.45,70.77,266,66.28,262.38,66Z" />
+  <path class="land"
+    d="M285,73.23c.54-1.87,7.81-10.93-3.42-8.3-1.27-3.73-14.21-3.09-9,3.6,1,1.28-1.58-1.37-2.72-.53-.41.25-.32,22.72,3.37,20.06,2.5,1.33,6-6.6,1.41-8.27,5.18-2,8.44,4.53,9.34-5.73C284,73.89,284.42,73.89,285,73.23Z" />
+  <path class="land"
+    d="M245.09,44.43A59.75,59.75,0,0,1,257,41.83c-.86,1.1-8.29,4-3.37,6.45-1.8-.29-1.38,3.59,1.28,3.3,1.73-1.25,7.22,1.69,6.13-2.82,2.46,3.26-.54-2.23,1.37-4.25,1.77,2,.41-.06-.3-11.9,1.63-1.91-6-9.11-4.05-1.94-2.1-3-11.63-3-3.82,2.28-1.9,1.12-2.28,1.1,1.54,2.44-4.15-1.61,3.59,10.48-7.05-4.31-2-.92-3.22,3.32.06,3.27-.52.42-2.53,2.85.34,3.28-.15.38-.76,3.57,1.61,2.78C251,42.58,245.07,35.05,245.09,44.43Z" />
+  <path class="land"
+    d="M324.89,68.34c-.56.27-5-3.33-3,2.7,4.48,13.58,2.27,5.8,15.24,8C339.78,74,331.48,68,324.89,68.34Z" />
+  <path class="land"
+    d="M163.59,89c14.16,2.43.37,15.82,18.44,4.51.13-7,2.59-6.23,5.08-12.33,3.49-3.81,9.28-6.13,12.95-10.35-1.73-3.3-9-15.34-13.1-6.42-.11-.66.29-4.42-2.14-1.19-.12-.39.08-.64.58-1.59-2.9.19-4.18-3.83-7.68-4-2.59,1.7-12.24,1-9.94,3.8,1.81,8.43,4.51,2.34-.53,13.51-1.73,1.34,2.15,1.94-.11,3.24-1.42,2.18-1.78,4.91-2.91,8.29C164.13,86.25,162.91,88.34,163.59,89Z" />
+  <path class="land"
+    d="M174.64,35.08c.84.64-1.7,5.28,2.51,1.93,1.89,1.31,3.15.63,3.85-2.11,1.26,1.72.35,8.41,4.49,2.87.11-1.3-1.28-2.77,0-5.24,2.66,8.23,1.89-3.07,5.08-6.5,1.59-3.47-1,13.11,3.7,5.57-.71-2.75,2.77-1.77,3.8-4.64.47-.62-1.44-1.91-.84-3.13.34.08,2.19.1.77-1.3-2.83-2.38.28-2.83,1.72-5.11-1-2.28-6.75-6.62-4.64-.36,0,0-.13.41-1.24-.23-11.31-1.68-8.71,9.87-17.66,14.65-1.86.23-1.73,2.08-2.57,4.08A7,7,0,0,1,174.64,35.08Z" />
+  <path class="land"
+    d="M198.7,32.17c-1,2.25,1.76,1.6,3.52,2.83-6.9-2.21-10.29,5.25-.75,4-7.79.73-11.65,7.14-.46,2.71-1.47,5-16.94,2.43-3.89,8.75,2.65,4.37,1.71-2.55,3.71.36,2.06,3.72,2.15-4.63,3.54-2.6a23.43,23.43,0,0,1,.53-2.69c.36.66.52.86,1.93.25-7.44,10,12.43-1.13,7.34,4.46-19.56,5.5-7.63,16.28,9,.36-.23,0,1.47.46.28,1,18.32,6.2,9.41-28.13,6.46-9.5-.37-2-.33-5-3.89-1.78,1.15-2.84,2-2.27-1.27-4.48.89-2.61-.23-20-6.69-3.2.82,2.3,5,1.69,1.59,6.37.84,2,5.77,3.51,2.27,5.47-13,1.2-7-12.57-16.3-10C204.49,34,204.78,26.27,198.7,32.17Z" />
+  <path class="land"
+    d="M207.81,11c-2.32,9.9,18.17,4.2,8.2-1.69.37-1.49,3.13-.69,4.14-3C221.44,2.52,204.7,5.74,207.81,11Z" />
+  <path class="land"
+    d="M1232.91,598.2c-.76-1.73-3.43,4.12-7.85-.14-.62-.71-.75-2.26-1.26-3.73-.06.18-.54,0-1.09-1.12-1,1.33,2.92,4.62-2,1.88-1-.93.24-2.82-1.76-4.91a1.52,1.52,0,0,0,.67.05c-.23-.11.08-1-.69-1.79h0c-.5-.93-2.07-.83-3.33-2.23,0,0-.15.25-.57.58.18-.56-1.51-1.07-.85-2.34a4.11,4.11,0,0,0-1.19.11c.82.41,1.6,3.15,2.36,4.45.1.1.27-.88.88-.78-2.14.58,3.73,7.54,1,2.53.34.22-.3.75,1.28,1.44.07,0-.17-.05,0-.34a1.81,1.81,0,0,1,.47,1.9c0,.17-.07-.41-.75-.48.9,1.15.18,1.39,2.6,2.58,0,.1-.64-.17-.68.57,0,.12.06-.31-.44-.64-.22.15,0,.76.55,1.18-.12.7-.31.39.57,2-1.48,1.56.74,3.58-4.09,6.51,1.67,4,7.37.24,3.78,9.25-.06,0-.15-.53.21-.22,1.58,4.42,5.75-2.64,7.77-7.19-1.86-.61,1.1-4.4,2.81-2C1230.69,604,1234.39,600.35,1232.91,598.2Z" />
+  <path class="land"
+    d="M1218.06,614.58l-.35,0a1.77,1.77,0,0,0,.93-1l-.28,0,0-.18c-.18,0-.18.21-.75,0,0,0-.1,0,.09.37-.47,0,0,.62-.8.92.28-.24.13-1,.72-1.63-.67-.5-2.38,2.58-3.28,1.24,1-.7-3-2.76-.44-3.08-.91-1.25-5.34,5.41-5.73,9-.68.1-.92.91-1.06,2-.08,0,.21-.33-.15-.79.25-.05-.94.67-.82,1.48.17-.26-1.36-.48-.44.3-.15,0-.42-.61-1.09.07,0,.08.2-.13.33.36-.82-.42-.51.37-1.89,1.17l.18.1c-.07,0,0,.1-.26.06,0,0-.09-.06,0,.37-.07.27-2.59.26-2.31,1.82-.94-.23-4.6.84-4.46,3.66-.23-.74-1.73.28-1.56,1.44l-.19-.64c.1.08-1.43.73-.54,1.25,0-.12-.07.33-.46-.15,0,0-1,1,.36,1.18.06.1-.8-.12-.26.6-.09,0-.1-.09-1-.49.08,0-.17.06.18.48.08.14-.74-.42-.65.67.07-.06,0,.15.9-.06.28-.14-1.85,1,0,.9-.06.63-2.18-.16-1.79,1.26,0-.17,0,.38.79-.37,0,.29.19.24-.24.76.13,0,.17.2.94-.42-2,2.24,1.39.64,4.08,2,3.39,3.9,10.47-1.33,10.27-7.19.62.44,1.22-2.18.85-3.17.77-.44,1.73-.9,3.3-1.79,0-.06-.12-.14-.5-.93.57,1,1.18.21,1.92.34l-.37.29c.83.21,4.76.43.17-1.78.06-.27,1.33-.16.35-.92-.55,1.08,7-6.42,5.13-7.57-.13-.94.49-1.47,1-2.64C1218.75,614,1219,614,1218.06,614.58Z" />
+  <path class="land"
+    d="M1145.76,559.2c-3.09-5,1.37-10.88-9.09-18-.87.13-.6-6-1.44-4-.8.15-2.65-3.19-2.13,0a4.55,4.55,0,0,1-.53-.61c-.88.71-.94-3-3.85-7.18.07-.06-.07.15.55,0-3.54-4.27-10.5-2.66-10.45-13.1-1.42-.22-1.45-1.71-1.89-3.74,0-3.06-1.72-6.32-5.69-5.52-.32-2.47-1.72-5.83-2-8.55-1.43.09-1-2.34-2-4.28-1.54-.28-2,2.54-2.27,4.63,0,0,0,.08-.31-.28-.83.87-.53,1.72.17,2.95-3.45.37,1.78,10.91-5,17.38-1.33,1.4-9.93-4.84-17.79-9.79-1-1.78,9-12,2.8-9.84,1.54,1.35-3.37.38-1.24-.72l-.22-.07c.06-.17-.06-.09.31-.44-3.3,4.93-19.19-7.8-11.28,1.06-.17.2-.89-.52-1.06.61-.58-1.06-3.17,1.13-3.94-.81.12.57-1,0-.94,1a1.36,1.36,0,0,0-.53.09c-.1,0,.22.35,0,.67-.85-1-2.39,1-2.57,3.18-.07-.22-4.3,3.48-1.54,4,0,.13,0,0-.33.32a1.75,1.75,0,0,0,.86.65c-.36.08-1.06-.1-.76,1.12-.21-.23-1.58-2.09-1.47.08.22-1.49-4.51-2.09-3.38.5,0,0,0-.14-.35-.27,0-.08.06.23-.3.38,1-2.78-2.82-7.13-6.37-4.2-.12.18,0-.88-.72-.66a2.47,2.47,0,0,1-.57,2.3c-.33,0,.14-.45-.53-.63,0-.08,0,.3-.27.31,1.25-1.81-3.19.68-1,1.75,0,.49-.25.35-1.22-.05-.13.37,0,.19-.7.57.16.17.12.8.83.52-.09,0,.23.36-.2.58-.15-.06.22-.2-1.14-.69.11,1-2,.44-.66,2.52a1.36,1.36,0,0,1,.5-.6c.08.26-.21.28-.25,1.11-1.12,0-.72.77.69,1.05-1.82.21-3.59-1.36-4.51.32,1.91,2.3.85.56.26,3.74-5.22-10.49-1.89,5.91-11.84,8.78-7,1.58-15.86,3-21.29,9.6.07-.29-.13-1.36-.06-2.46-1.6,2.39-2.13,6.74-2.19,10.48.1-.62,4.7,10.44,1.24,5.46a1.06,1.06,0,0,1-.31.57c-3-6.85,2.25,6-1.44-.31-.18.16.25.94-.6.39.9-.86,14.64,31.52,6.36,29.48-1.2,3.46,5.54,7.84,11,6.2A19.09,19.09,0,0,1,1039,582.6c4.43-3.9,6.34-7,17.09-8,4.08-3.2,19.52-2.21,21.21,2.82.33,1.62,6.87,6.29,3.59,7.69.56-.16,1.06.52,1.85,1.5.3-.27.47-.47,1.13.18-.86-4.19,5.83-4.72,6.37-10.08,1.53,2.42-.72,7.88-3.16,11.17,2.63.28,3.36-1.39,4.24-4.53,1,1.49,2.42,3.8.34,6.13.43,1.22,4.5-2.78,3.88,0-.43-.25-.18-.34-1.13-.13,3.75,2.4,1.63,7,5.42,10.36,5,1.08,9.28,5.82,14.61,1.1-.15-.12,0-.15-1-.32.77-1.5,4.71-.44,1.14.9.63,1.89,2.4-1.76,2.9.24-1.44,1,.63.3,1.38,2.26.8-.82,2.47,2.43,1.73-.36l-.32.33c1.27-2.78,7.94-4.53,12.64-6.06a30.8,30.8,0,0,1,4.57-15s0,0-.38-.1c0,.07.12-.35.43-.09.49-1.75.82-4.1,3.31-5.27.08,0-.19,0-.18-.18C1143.87,574.12,1144.68,566.09,1145.76,559.2Z" />
+  <path class="land"
+    d="M1127.36,618.61c-1-1.79,2.56-9.44-5.25-4.4-2-.06-4.63-1.14-7.49-2.28-.95,2.05,1.25,4.59,1.82,7.09,0-.1.1.21.33-.24-.36.41,1,.33.49,1.63-.24-.36.22-.39-1-1.23.2,1.88,1.22,4.72,3.61,5.34-.05.2-1.33-.51-.64.92.82-1,3.06,1.91,3.63-1.3.14,0-.48-.14-.28-.57.36.72,1.63-.22,1.06-1.75,0,.22.2-.36.54,1.16.94-1,.5-1.59,1.17.89,1.46.16-.35-3.38,1.31-5.36,0-.11-.22,0,.2-.56-.05,0,.24.18-.11.44.39,0,.19.77.52.93C1127.37,619.26,1127.31,619.14,1127.36,618.61Z" />
+  <path class="land" d="M1191.45,536.19c4.92,1.84-5.19-6.09-8.83-7.92C1183.47,531.53,1187.92,534.27,1191.45,536.19Z" />
+  <path class="land"
+    d="M1274.61,146.24c-.41-.2-.49-.2-1.64-.23.24-.26.18-1.89-1.26-.69-.35-2.79-4.06-6.49-8.45-7.2,2,1.23,2,1.41-.78.87.61,1.21-1.47,1.86.25-.9-.58-.27-4.34-1.13-4.79.17,1.73.25,2.21,2.13,1.14,4.16.75.36,2.41,1.53.46,3.07-.12-.62.49-.44-.07-2.12-.28.18-.36-.1-1.09,1.12-1.79-2.74-1.31-5.37-2.14-9.74-.54.14.29.74-1.31.73,2.83-3.48-7.64-7.32-7.57-8.68a13,13,0,0,0-3-2.58c-.11.63,3.49,2,1.12,2.86,1-1.85-2-1.39-2.45-3.77a2.38,2.38,0,0,0,.75.72c-6.62-6.07-19.24-15.79-28.78-12.2-2.33-1.59-6-2.49-9.81-2.89a6.29,6.29,0,0,1-1.14,4.88c5.2,2.08,3.15,18-8.91-1.14-5.16,6.88-16.91-5.76-21.62,4.4.12,2.07.88,5.86-2.19,7.4,3.05-4,.69-10.47-4-13.12,5.09-22-25.54-6.89-28-11.61a2.54,2.54,0,0,0,1.17-.44c-.9-2.54-3.83-5.52-7-2.2,3.83-3.49.18-2.79-4-5.7,5.53-1.62,4.37-4.18-1.94-6.43-7.32-2.52-5,7.15-11.7,6.84-1.31-3.11,1.87-.81,2.4-3.52-.16-.71-1.18-3.31,1.66-1.33l-.78,2.18a5.43,5.43,0,0,0,2.9-4c-2.38-1.17-7.9,2.55-9.36.42,1.89-1.21,3.91-1.79,7.26-1-.13-3.71-12.77-3.54-16.09-4.92-2.42-1.5-4.67-3.05-2,2.17-1.64,1.85-8-.28-6.69,4.89.67.28,1.79-1.49,3.56-.32-1.28,0-1.17,1.81-2.91,2.73,1.74.53.89,2.77,2.19,5.12-3.61,1.92-3.16-3-5.13-.78-.49-1.23-4.08,1.84-.74,2.61-.16-.06-.68.22-1.65,1.07,1.36,3.16-4-4.73-6.89-4.43-4,1.31-7.81,6.76-11.36-3.31-1.69.27-3.62,18.89-6.67,10.59-.08,3.45-10.17-9.85-4.56-8.49a21.34,21.34,0,0,0-1.19-2.4c-.16-.07.68,1.54-.74,2.22-.66-2.5-3.74-5-3.89-7.72,5.2,7.78,9.25,1.33,2.16-1.18,1.72,0,4.92-3.77.63-4.24.23-.64,1.65-1,1.77-2.6-1.13.49-.35-2.21-3-1.87-.17-2.14-4.47-5.42-6-.82-1.21-.54-.57-1.09-1-2.62a14,14,0,0,1-2.31,1.24c.13-1.37-4.57-6.2-6.33-2.21-4.39-2.57,2.34,10.77-4.16,7.3-.54.24-.59.43.49,1.45-.83,1-22.22-2.62-13.42-7-4.82-3-13.23-3.21-19.08-.3a2.1,2.1,0,0,0,1.32,2c-.7,1.63-4,6.51-.61,8.28-4.39,2,2-10.33-3.08-15.93,3,4.65-8.63,3.47-4.52-.85-.17,0,.2-.16-1.48-.31l-.26,1.44c-4.07-3.32-8.09,4.75-.9,2.26.08.69-2.9,4.55-5.16,3.38-4,4.63-7.11,1.78-14.73,8.56,2.45-7.62,40.4-35.33,27.47-35.94-3.21-5.73.42-3.61,1.86.11.91-.79,1.31-2.85,1.31-5.07l-1,.42c-.61-.75.31-6-2-5a1.62,1.62,0,0,1-1.16,2.72c.69-.59.47-7.62-2.51-4.8,1.85-6.36-8.92-5.72-13.76-5.09-.12,2.81-2.19,3.85-5.68,3.12l-.1-1.16c0,.09.2-.2.89.24,5.47-10,1.16-4.48-3.49-8.1a34.52,34.52,0,0,1-5.08,0c13.33-4.35-.07-12.14-2.25-8.48-4.86.72-13.93,15.44-6.6,17.92l-.3.69c.8-.43-12.33-2.13-9.25.13,1.51,1.72,5.42,6.9,1.67,9.15,3.08-3.36-2.26-10.14-6.83-2.54-.65-1.46-1.51.54-3.53,1.28,1.12-2.29-1.22-1.49-2.65.27l-.31-.28c3.21-4.13.53-2.88-3.79-3.76-.32,1.48-4.45-.12-5.18,1.83l-.46-.71c-.27.11-.82,4.1.72,1.68l.8.83c.12,0-.19,0,.59-.79.38.52.5.58,2.05,0-7.62,4.21-19.75,7.21-25.37,12.47,2.75-.32,1.55,3.77-1,5.17L908.87,54c-.23-.34.21,1.67-1.13,1l-.31,1.26c1.9.1,3.33,1.77,5.06,3.68-7.57-2.94-2,3,1.2,7.06-1.72,4.52-9.52,1.28-3.15,8.65-8.53-5,3.39-6.65.24-9.65-11.59,5.26-24.73-1.45-21.92,9.9,3.26,2-3.21,7,5,9.29,1.73,3.41,3,3.52,5.6,6.92-3.18,6.61,4.36,13.31-2.7,16.38,1.49-3.76.73-14.43-1.92-2.51-1.33-5.1,2.19-9.51,3.11-14.27-6.56,2.62-15.16-15.58-19.74-4,2.14-2.29,5.58,5.51-3,.6-5.61,1.15.8,8.08,5.5,8.36.58,1.07.3,3.85,3.07,2.86-1.83,3.83-5.34-4.05-7.58-1.36C864.47,96,875.65,86.8,870,78.66c-3-.37,2,5.23-1.22,9-12.7,7.42.35,10.33-2.35,18.24-2.58,4.59-2,8.55-.56,13,24.79-3.22,5,13.23,17.39,14.47-9.38,2.34-3.33-6.69-7.69-11.18.14-3.78-9.19-.94-8.24,3.42,3.12,4.47-.66,8.74-2.6,13.73-2.93,1.94-3.84,3.86-6.1,6-.84-.4-16.09-3.2-7.66-5,1-1.12.67,2,3.35.61-2.11,1.49-.77,2.58,3,.55a4.65,4.65,0,0,0-.61-2.47c5.21-3.36,10.09-13.44,4.17-19.26-1.18-9.18,3.37-18-2.41-25.2,5.64-13.24,5.5-17.37-8.9-16.63-4.86,17-.48,8.87-9.29,21.15l.54-.23c-.1.53-1.73,3.85,1,2.42.37,1.74,1.19,7.3-.76,8.59,0,1-.94,2.59-.1,4.66,3.53-4.91,3.36,7.2,7.89,6-.69,1.47-.72,4.41-2.71,6.1-3.35-3.09-7-7.71-12.22-9-1.61-5.07-21.6-10.25-14.88,1.36l.69-.35c.39,1.36-.13,4.94-3.39,4.27.56,3.63-2.43,6.65-3-2.9-.59.29-2.29,0-2.88,1.67l-.23-.54c-5.27,6.1-2.93.43-10.15,3.52-3.38,2.68,1.86,3.22-7.12,2.44,4.05-1.61-.36-5.4,4.33-7-2.47-.63-5.24,1.44-7.55,3.72,2-.54.89,5.22-1,.64-3.9.35-7.27,6.3-11.61,6.08-.63.35.79.92.27,2-5.41-1.17-1.33,7.6-8.23,8-4-2.57-9.44-7.17.69-10.07-1.66-7.68-6.41-5.19-11.79-7.22,5,4.52,2.74,6.76,1.58,13.23,3.87,2,1.66,6.18,1.13,11-.27.08-.69-2.07-2-1,.15-7.17-11.33,1-13.34,5.76-.81.79,4.78,6.07,1.09,5.62-3.2,5.31-9.19-7.45-12.39-1.38-.5,3.3,4,3.62,5.08,6,2.43,6.4-12.29-.72-10.64-4.45-3.14-3.64,2.55-12.13-5.6-13.29.08-.2.61.22,1-1-2.68-1.06-2.84-4.67-6.19-6.38a9.77,9.77,0,0,1,3.64.67c-.81,2.22,2.4,2.87,5.35,3.87,10.52,8.66,35.07,4.32,18.61-13.75,0,.14,0-.21.28,1-6.69-2.85-15.59-17.83-23.5-9.67.48-.33,2.57-5.34-.57-2.94-.23-.1,0,0,.07-1-.6.3,0-.28-2.18-.09-2.8-3.13,7.24,0-1.39-4.79-.14.11.12.22,0,1.46-2.24.71-.16,1.58-5.32.16l-.2.73c-.42-.19.3-.78-.67-1.42-.67,3.87-2.82-1.66-5.12-2.89,2.92,1.55,12.21-1.47,5-4.14-.82-1.27-6-7.57-7.11,3.07-.4-1,.38-3,.08-4.77.06-.25-.25.62-1.11.28,5.57-3.38-4.47-7-1.24-1.33-1.83-.48-1,3.29-3.38,4.15-.18-1.52.65-3.23.27-5.6-2.44,1.44-3.07,6.43-5.69,8.71-1.6-1.84,4.19-7.2,1.38-8.41-.72,2.33-2.07-3-3.5.21.39,2.91-4.48,5.24-3.82,9.49-1.36.2-1.2-6.58-3.63-2.89l-.36-.47c.08-.24-.26.59-.79.17-4.43,1.62-.39.13-.22,4.91-.51-2.26-7.26-2-4.19,3-.86-.74-1.39,1-2.41,1.87.38-1.53,1.68-3.7,1-6.16-1.79.82-1.46,2.91-2.4,5.25-.17-.82.52-2.11.16-3.82-.89.29-5.5,3.1-2.72,4.7-.8,1.55-2.2-2.92-2.75-.44,1.29,3.35-10.81,9.68-2,9.06-.6,1.35-7.08-.84-4.15,3.36-.11.46-.69.69-.28,2-.71-.35-.46-1.77-1.07-3.25-.52.9-3.21.37-1.76,2.83-1.7-2-4.34,4.4-.72,1.5.32.1-1.26,2.81,1.26,2,.42.54-.4-.31-.23,1.77-.75-4.19-8,1.28-.57.93-.44.63-8.39,1-5.18,4-.77.24-2.81,0-2.7,2.27l-.31,0a7.42,7.42,0,0,0,0,2.69c.44.26,2.14-.8,3.22-.58-2-1.09-11.48,11.94-3.93,8.18-.34.3-1.49,3.5-2.66,1.34-.88,1.06-3.07,1-3,3.5.11.09.13-.3,1.18-.48-2.39,2.19-6.11,5-7.17,9.13.62,1.22,5.18,1.29,4.64-1.92,0,.32,1.09-1.79,1.91-.65a6.14,6.14,0,0,0-1,.83c2.47,1.25-2.68.93-1.46,3.45-2.57,1.27-3.46-2.43-5.89,0,.33-.85-.46-2.44-2.42-.56,2.6,3.62-3.36-.51.79,5.34-1.66-4.56-12.55,1.84-1.85.87,0-.07-3.47.34-1.42,1.11-.78,1-5.1-2.22-5.47,1.35.55,0,0-.08,2-.46-1.63,1.85-1.89-.83-5.11,2.11-2,1.75,2,2.6,5.24,2.37-.69,2.23-10.21-3.52-4.89,2.83-4.12.94,2.73,4.73,4.43,1.43.35.94,2,2.06,3-1.06.26.39-1.2,1.64.57,1.64,0,.52-2.35.27-2,1.86.79-1.24-6.45-2.08-7.08.12,0,.86-.07,3.9,2.2,1.78-.73.81-3.79,2.77.14,4a2.19,2.19,0,0,0-1.77,3.35c2.06-1.8,2.27-5.67,6.36-6.09a3,3,0,0,0-1.65,2.53c-.19-.29.44-1,0-1.79,0-.11-5.25,5.51-1.07,4-2.7-.06-7.73,8.34.67,1.87-.6.36-3.69,4.79-.14,3.83-3.58.28-5,2.33,1.16,5.21-.42.32-.92,1.46.77.54.41,2.85,8.35-2,8.43-4.77.16-.36,2.25-.57.87-1.74.05,0,.49-.35,1,1,.15.24.34-.5,1.19-.34,1-1.42.74-2.5,1.46-5.19-.11,2.08.28,3.72,2.79,5-1.41-1.33-.32,2.3-.5,4.49,1,.67,1.49,3.38,2.51,6.2l.33-.14c-.78,1.76,4.54,5.53,2.12,6.45-.18.15,1.6,2.06-.66.94.29,1.24,2.61,3.28,1.46,5.47,9.12.94,1.43-1.19,6.57-3.85,1.35-3.87,5.09,6,6.83-12.08-.25-1.06.57-1-.16-3.43a1.86,1.86,0,0,0,1-.39c0-.37-1.23-.88-2.49-1,3.12.15,6.05-2.14,8.45-4.68-6.48-1.11,6.76.54-2.33-8.81-3.11,1-3-4.52-2.67-8.22.08-.06-.06.19.94.29a4.31,4.31,0,0,1,.6-4.08,1.7,1.7,0,0,1-.79-2.07c.7.53.93.52,2.21-.7-.42-.39-.35-.93-.46-2.18.17-.15-.35.55.65.38,0,0,0,0-.06.35a2.08,2.08,0,0,0,1.5-1.52l-.67-.06c0-.27,2-1.49,1.69-1.86a2.12,2.12,0,0,0,2-1.87l.49.42a1.89,1.89,0,0,1,0-.67c.17,1.31,7.71-5.5,6.65-8.26-1.88-2,1.37-4,.06-6.38.1.5,2-1.1,2.37-2.47l.59.11c.13-.34.06-3.25,1-1.67.29-.14.19.09.73-.65-.16.66,4.07,1.35,6.62.1-1,2.61,3.58-.2,2.32,8.37-2.65-1.58-4.63,6.55-10.44,10.89.07,0-.18,0,.09.48.6,1.73-3.34.87-2.44,3.13l-.62,0c-2.27,3.09-.18,7.11.32,11.63h-.21c.58,1.38-1.75,4.87.38,6.87,0,.1,0-.27.67-.44a2.78,2.78,0,0,0,2.75,1.51c-.52.43-.53,4.85,1,1.16,0,.44,2.12,1.47.34,2.72,2.64-1.29,6-1.45,9.46-3.55.2.61.25.25,1.34-.05,0-.22.17-.1-.28-.94.74.16,1.5,1.12,2.28-1.1.1.37-.41.34-.25,1.53-.91.57,8.62-3.16,7.34-.56L706,190c.19,3,5.61,1.47,5.74,4.69-1.85-1.61-3.39.31-5.64.16-3.29,3.36-1.42,3.52-10.58,1.46-.27,1.5-3.26.52-5.12,1.84l.1.55c-1.35-.65-3.62,2.71-1.41,3.43-1.77,2,1,2.91,3,3.37-1.15,3.66.15,15-7,3.68-9.56.36-1.25,20.38-6.89,17.3.42-.79,1.83-1.68,1.83-3.89.65-.37-7.35,13-9.42,5.33.24-.05.08,0,1.28.67-3.7-5.12-12.51,7.11-17.49,3-.33,2.25,2.42.49,2.66,2.89-2.22.24-4.39-6.34-7.75-4.21-1.22,1-2.74,2.5-5.14,2.1-1.88-.17,4.05-2-3.69-2.85.92-.08.13-3.11-1.45-3.43.17-1.06,1.6-3.69,1.58-4.95,1.4.18.76-1.23,1.84-2.71.48,1.6,3.52-1.95.22-1.54-1.53-1.51-.07-4.66.42-7.83.68-.09-13.13,7.36-6.46,6.53-.07-.76,2.08-4.13,1.49.15-.38-.86-1.34-.6-1.84,1.31-4.32-2.82-.47,6.28-.35,8.46,1.76,4-.84,6,4.26,9.46-1.24-.61-4.94-4.64-4.53.94-.17.1.43-.73-.57-1.24-.25-.32.11,1.56-.79.81,1.08-2.07-5.5-1.94-3.21,1.09-2.72-2.54-5.58.76-8.54,2,.36,2.41-3.72,5.22-2.06,7.6l-.62.08c-.07.08.53.27.94.69-.74.5-1.35-1.52-2.9-.38.47.79,1.19.4,2.74.86-1.49-.17-11.24,1.26-9.26,6.27.47,1.28-8.12,3-4.06,4.22-2.84,2.94-5.94-2.16-8.12-.66,1,1.11.45,3.45,1.74,5-.2,0-1.26.44-1.86-.24a1.28,1.28,0,0,0-.35.61c.8-.78-14.14-1.52-7.87,1.46.14.09-.72-.07-1.18.07.19.35,0,.12.87.63,0,.31-.61.12-1.23.68,1.56,1.14,4.22,1.59,6.85,2.28.51.84.92,1.42,3.48,2-4.51-.75,2.39,4.37,2.5,7.47-.09,0,.13-.13-.63-.15a8.77,8.77,0,0,1,2.33,3.83c-.92-.48-.16-1.66-1.88-2.64a20.05,20.05,0,0,0-.57,4.28c.14-.1,0-.05.32-.48l.27.37c-3.55,8.91,3.69,6.57-24.36,4.84.26,1.29-6.92,2.08-3.24,4.29.25-.12-1.33,1.71.4.75.19.1-.34.63.29,1.08.07.05-.27.15-.3.6a.62.62,0,0,1,.44.05c-.16,0-1.36,1.43-.3,1.56.22-.15-1.13,1,.07,1.14,2.15,1.39-5.87,18.62-.13,12-.41,1.2-3.54,2.61.44,2.92l-.75-.09c.17,1.62.73,3.77-.41,6.23,2.13-.55,4.66.34,7.5-1.08-.16.8.69.44,1.65,2,.09.12-.14-.37.63-.35-1.26,7.41,5.59-.56,11.65.74,3.41.76,3.44-3.64,7.67-3.89-1.15-1.92,2.06-3.47,3.08-5.29-4.78-2,2.18-7.06,2-9.07,2.15-2.39,8.62-2.33,9.11-6.83-2.09-2.5.37-7.59,5.21-5.19.16-.21.23-.1,1-.31,7.52,7.85,12.65-17.13,21.24,4.9,2.58.17,3.88,3.7,6.82,5.38,1.21-.11,3.11-.22,3.64,2.18-.35-.07,2.29-.5.93.9,2.55-1.13,1.19,1.09,3.35,2.42,4.23,1.44,2.23,5.84,1.51,9.55,1.45.27,3.89-3.53,4.91-5.88-3.29-3.46-1.58-8.67,4.3-2.54,2.5-5.14-10.13-5.18-8-9.72-2.43.21-4.24.06-6.61-2.72-.46-5.48-9.56-7-5.79-14.74l-.36.38c1.45.24,3.16-3,4.75-.79-1.57-.22-.25,7.65,1.86,1.44,2.62.19,1.23,3.74,4.07,5.24a1.84,1.84,0,0,0-1.22.07c1.71,3.57,5.91,3.21,9.14,6.77-.2.06-1.48-1.08-2.38-.78,1.55.25,3.5,1.9,5.63,2.71,2.8,3.91,3.27.26,2.79,9.61,0,0-.13-.17-.42-.14,2.15,1.51,3,6,6.41,6.47-2.23-.25-.4,3.22.66,2.19.25.85,2.59.83,3.83.22-.41.41,4.82,1.4,1.66,1.72,0,.06.07-.09.09.41-3.91-2-8.36-3-3.61,5.35.41-2,1-1.24,2.1,1.26.35-1.53.14-2.26,2.36,0-.14-1.31-1.2-3.06-1.36-5,1.35,1.05,3.55,1.89,1-1.4,1.18-1.14,2.42.23,3.54.85.4-2.55-2.06-4-5.22-5.14.46-.45.59.37,1.75-.77l-.36,0c.08-.31-1-1.11.1-1.34,4,3.32-4.29-4.32-.25-5.73-.44.41,1.06,2.67,2.64,2.88-1.21-1-1.45-2,1.15-.29-.74-.94-1.68-2.75,1.21-.57-5-4,1.91-4,8.61-2.19-.35.67-2.08.76-2.07,2.52,2.26-3.48,7-3.77,10-5.3-3.89-.7-2.41-2.74-5.53-5.8a28.27,28.27,0,0,0,4.94-10.13l-.29.05c.48-.2-.25-2.24,1-2-.26.1.06.42-.17,1.07,2.2.08,2.63-1.87,2-4.78,3-.15,3-3.83,6.8-5.32l-.11.57c1.28.54,1.9-.82.8-2.8,1.2.58-.29,4.32,2.88,3.05-.54.94-1.41.55-3.6.32,0,.43,2.87.66.79,1.16,2.1,2.51,12-1.37,2.56,4.61,7.88.32-2,8.91,10,2.11.31-.94,1-.32,2.45-.26.57.2,1.42-.23,1.83-1.8-2.15.25-8.82-.13-4.72-5.25.35.37.28,1-.76,1.69,1.61-1,3.24-3.92,6.26-3.08,1.45-1.79,4.22-1.63,6.91-2.8-.12.29-.12-.08-.73.57,1.08-.55,5.5-.52-.4,1.73a1.58,1.58,0,0,1,.22.76c-.46-.28-1.23.07-2.59.14-.07,1,1.58,1.31,2.56,2.76-.43.22-1.1-.6-1.46.78.28-1.54-1.83,1.27-1.43,2.23-.12,1.53-2,.4-3.34.58.28.2.15,0,.77.41-4.45.53,15.58,8.93,16.61,15.17,2.3,8.21-20.82,5.94-22.89.56-5-.13-9.85.58-14.49,4.34-1.52-.4-12.32-1.1-4.16,1.55-.71.58-2.06-.25-3.74,1,.18.2.29.08.94.5-.52.41-2.41,0-4,.2.31-.22.26-1-.69-.46l.41.45c-2.11-.07-6.49-.4-6.1,4.16,4.34-.71.85-.61,3.17,2.61-.33.16-1.75,2.08.46,1.94,0,.6-1.59-.2-1.66.52-.12-.45-1.32-2.78-.9-.14-1.5.85,1.92.53,2.94,2.15-.7.91-.31,1.91,1,3.15.19.23-1.34-.28-1,.82.82-.32,1.61-.08,3.45-.23-.29.82-1.73.89-2.78,1.38.42.36.92-.1,2.22-.17.1,0-.24.08-.23.51,2.2-3.09,7.47,6.74,9.23-1a15.9,15.9,0,0,1,2.49.28c7.71,6.6,6,.12,17,.25-1.51-2-.36,29.05-14,22.92.46.9-.25.81-1.57,0a1.4,1.4,0,0,0,.43-.77c0-.15.07.33.86.57-.64-1-3.27-.85-5.53-.31.12-.15.62,0,1.26-.61-6,2.07-3.35,4.37-15.7.22-6.31,1.35-19.28-13.29-22.84-.17,1.85,6.7-4.14,5.13-9.7,1.79-6.14-1.29-3.78.5-7.73-5.35-5-2.19-8.33-1.17-13.37-3.43.05,0-.07,0,.24-.15-.46-.2,0-.38-1.1-1.42-.07-.07,0,.58-.82.47a1.46,1.46,0,0,1,0-.73c-5.31-.21.92-4,1.17-7,.6-2.47-4.86-1.47.29-6.64,0-.14-.07.21-.26-.87-.38-.42-1.48,1.68-2.67,1.27,0,.24.15-2.46-1.47-2.06-.14.11.35.19-.16.52,0,0-.3-.23,0-.76-3.19,0-5,3.4-9.26,1l.12.54c-10.87,1.35-19-1.36-32.18,8.07-.58-.3-3.63.75-3.72-1.33-.7.91-8.56,2.41-8.11-2.13-3.78-.2-3,6.16-6.14,8.51-16.24,6.31-2.33,13.92-16.68,23.11-8.71,2.16-8.54,11.46-14.81,17.61,0,0,.18-.21.63-.65-.72,3.52-4.93,6.64-4.39,11.42.23-1.44.76-.81,1.71.75,0-.05.09.07.11-.39.78.46,1.69,2.58.31,4.58l.49-.14c.33,3.33,2.07,13.75-4.33,17.32l.32.37c.32-.76,1.65.33,2.3,2.32.06,0,.12,0,.61-.13-1.08,2,1.19,2.52,4.18,2.05-.15.27-2-.34-2.66.67-1.37.67-2.69-3-2,2.48.16,0,.18-.09.52-.46,1.46.28-3,1.13,1.24,1.7-1.29,1.38,1.33.43,1.06,1.61.32.41,2.13-1.1,3-.46-.29.15-3.23.43.1,1.13-.21.22-.7-.34-1.43.66.9-.09-.44.82.92.9l0,.45c.11.06,0,0,.59-.4-.4,1.91.81-.3,1.33,1.61l.29-.28c-.36,1.27,1.79,3,3.18,3-.17.32.37.33,0,1.38,1.17-.43.86,1.95,2.22,2.31-.58,0-1.17,1.53.54.79a.82.82,0,0,1-1.25.59c.41.34,1.16,3.06,2.74,2.58-1.77,0,12.62,9.81,14.85,11.06,3.41,2.15,6.24-1.94,11.24-1.89-.14-.08-.06-.17-1.08-.07.79-.41,2.73.21,4.68-.27-.46-.25-.53,0-2,0,1.1-1.11,3.68,1.37,5.13-.4.09,0-.4.55.46.76,0,.11-.2-.17-.8.06,5.17,2.78,14.83-4.32,24.61-5.13.16-.06-.5.21-1.06.54,2.62-1,4.78,2.11,6.6,2.52,0,.09-.14.34.45.33-.63-.11-1.61,1,.33.48.21.28-1.56.65-.26,1.12-1.11-.44,1.61,4.51,2.79,2.52-.37.27.83,1.05,1.09-.15.26.19-.1.78,1,.36-.1,0-.26-.51-.33-1.23-.11.71,1.74,2.08,1.09,0,.3.17,1.09,1.14,1.59.21.09.57,3.65,1.17,2.54-.93,0-.1.57.91,1.12.6-.45.16.58,1.61.32.28.66-.36,1.54,3.91,2.89,2.11.22-.09.09.43.65,0l.07.07c-.23.22-.2.29.18.71a.55.55,0,0,0-.64.19c.21-.12-.14.85.73.61l-.33.3c1.73,1.54.58,5.1-1,8.34,2.81.73-2.84,2.86,2.16,3.29.21.09-.54-.18-.72.52.08-.26-1.43-.1-1.55-1-.15.52,0,4.81-2.29,3.25.45.33.57,3,2.26,2.55-.35.46.08.64.62.95-.51.23-.88.15-1.71-1a5.65,5.65,0,0,0,1.57,2.28.93.93,0,0,0-.65-.21c.66.64,1,1.81,2.68,2.25-.33.2.15.22-1.19-.29,2.54,3,8.08,6.17,8.56,11,.46,1.62,1.35,1.09,3.2.82-6.55.46,4,7.29-.05,11,0-.06,0-.06.14-.37,6.84,16.84-3.24,6.33-4.78,31.66,2.38,5.91,8,12.25,9.71,19.19,0,0,0,.08-.2-.15.57,6,1.15,13.23,4.5,19.61.66-.53,12.91,19.4,7.9,19.14-1.23.84,1.73,2.62,1.75,6.85-.47-.47,1.53-2.5,1.3.07.12,0,2.18-.22,1.64,1.06,2.13,1.42,6.75-1.4,12.08-2.55,5.14.69,8.59.29,14.45-1.66,5.34-2.48,21.69-19.26,21.49-30.27-.28.14-.15,0-.38.72-4-4.23,10.65-4.72,9.19-9.29-.56,1,1-9.62-.28-5.29-.25-3-2-6.65-2.58-10.26,1.63,1.12,3.81-2.5,5.68-3.62,2.5-3.11,7.13-5.55,12.59-8.33-1,.78,5.69-7.45,2.82-6.85.11-1.39-.49-3.1-.27-5.56H748c1.26-1.86-1-4.92.57-7.65l-.39-.23a1.75,1.75,0,0,0,.44-.37,5.53,5.53,0,0,0-3.12-2.33c-.17-2.07-1.24-5.66-1.54-7.79,3.4-5.89-8.23,0,5.64-20.12,0,0-.09,0,.21.11,27.68-27.84,17.1-9,36.69-43.45,0-.35.09-.21-.68-.6,0,.18.06.42-.57.39,1-1.1-.36-2.61.79-4.91-7.17.85-15.84,4.11-24.53,4.81-2.12-.85-2.5-4.52-6.18-3.89.15-.4,5.4-.92,1.68-4.73l-.1.33A110.71,110.71,0,0,0,746,402.29c-.3.11-.08.57-.28,1.25-2.56-2.77-1.62-8.39-5.28-11.49-3.58-1.12-4-6-4-10.41,0,.05.08-.07.37.24.73-2.75-9.19-8.31-5.18-10.91-3.78-3.77-6.17-10-8.05-15.63-1.5-1.44-4.85-5.42-3.26-8,2.37,4.14,4.83,15.45,8.46,1.68a40.88,40.88,0,0,1-1.22,5.92c2.2-2.22,8.52,12,15.17,20h-.2c2.1,3.24-2.46,6.16,6.66,11.82,1.53,5.66,8.26,9.31,7.07,16.24,0,0,0,.05-.32-.22l-.14.34c1.86,1.47,1.41,5.5,2.92,9.08,9.15-.36,18.1-6.39,28.81-9.61,2.9-.56-.27-3.77,7.36-5.34,3.48-1.48,2.44,1.23,7.14-3.85,4.36.52.52-3.59,6.79-3.91.58-1-.94-4.89,1.79-6-.48,2.63,3.94-3.23,5.55-6.37-.18-1.16-2.24-1.75-3.49-4.13-2.32-2.55-9.66.6-8.74-11.19-2,2-8.63,12.78-16.67,7.61-.16.24-.26.21-1,0-.11.09.3-.42.36-.88,0-.1,0,.24-.5-.14,3.2-1-1.14-12.26-1.63-.7-1-1.19-3.4-5.84-2.31-7.23-.67-.92-2.38-1.5-3.42-3l.22-.22c-2.72-.36-2.19-6.76-5.33-7.52,0,.05.49-1.11,1.48-.72-1.79-3.83,1.31.72,3.14-3.53l-.12-.23c0-.17,2,.46,0,.54,7.63,1.33,3.71,7.38,12.66,11.46,4.08,5.1,7.53,2.88,14.5,1.43,4.09,3.17-5,5.88,17.09,7.47l-.07.06c2,.54,3.81-.67,6.76-.09,1.73-1.2,6.41.08,10.47-.91-.44-.22-.09-.31-1.19-.18,1.06-2.37,3.41,4.88,5.33,6-.12.21.27.85.75.06,0-.15.24.52.63.21a1.56,1.56,0,0,1,.27.36c0-.08,0,.14.18-.4.06.14-.12-.19.24,1,.51,0,.55-.61,1.91-1-3.58,1.3,2.8,6,6,2.9,0,2.34-4,2.48-5.34,3,.78,3.63,12.13,9.39,10.78,1.76,0-.4,1.68-1.11.51-1.68a10.92,10.92,0,0,1,2.2.14c-.2.38-1-.56-1,1,0,0,0,.11.62,0-.32.31-.36.06-.55,1a4,4,0,0,0,2-.2c-.08.19-.82.14-1.75,1.08,0,0,0,.09.42,0,.5,1.67-.2,4.39.23,7.25-.07.43-.44.55.66.89,0,.06-1.15-.38-.54,1.12.2-.16.2,0,.49-.66.09,3.39.13,9.47,3,12.74l-.21.31c.21.17,0,.06.56.64h-.46c3,5.89,5.9,13.7,9.35,20.88-.61.37.12-.8-.76-1.38,4.6,12.79,3.81,2.53,11.14,2.59-5.37-1.47,4.35-4.31,1-7.49.42-2.42,3-5.91,1.63-8.56,0-.07.18.38.53.82,0,.36-2.57-10.22,1.82-8.2,4.54-2,14.2-13.45,16.42-14.35,0-.18,3.24-.29,2.64-1.32.15,0,.09-.08.46.17,3.92-3-1.52-2.67,6.27-7.89,0-.27-.75,0-.77-.95,1.18-.05.11,3.86,1.22,2.32.45.81,1.2.59,1.24-1.37.64.35-.1,1.06.37,2-.08-.07.25.07.39-.6.07-.1,0,.6.68.34-.1-.11.2-.32-.36-1.07h.28l.08-.59c-.09.89,1.78,3.09,1.52-.68a9.54,9.54,0,0,1,.3,1.9c1-.46.61-1.4,1.47-2.62a1.53,1.53,0,0,0-.11,1.67,2.52,2.52,0,0,1,.89-.51c-1.39,1.39,1.18,2.55,1.21-2.82-1-.7,1.65-.94-1-2.08a3.49,3.49,0,0,0,1,.13c.11,0-.14-.45.17-.65.08.9.36,6,3.08,2.68,0,.64.64,1.07,1.12,2.21a.74.74,0,0,1,.23-.2,11.27,11.27,0,0,0,3,7.68,2,2,0,0,0,0-1c0,.08,1.08.68.29,1.31.17.31.53.32.86-.72.18.19.13-.05-.07.82a.54.54,0,0,1,.28,0c-.26.18-.66.58.34,1.23,0-.24.07,0-.12-.71.59-.36.68.29,1.93.48a2.38,2.38,0,0,0-.33.5c.74.54,2.71,2.73-.42,1.5.11-.09.28,1.3,1.53,1.73.25-.2-.12-.67.41-1.42.26,0-.67,1.1.71,2l-.27,0c2.88.7-1.66,14.16,1.87,8.1.2.36-.25,1.12-.14,2.2a1.21,1.21,0,0,0,.81-1c.06.54-.18.36.18,1.32.22-.22,1.09.45,1.42-1-1.36,2.73,3.81-.56,3-2.43.61,1.8,3,.66,2.33-2.3.1,0,.49.5,1.22,1.11-.07.22.12,2.85,1.85,1.92-.9,1.41.23,3.93.51,6.61.19,0,.19-.31.52.31l-.31-.16c0,.68.56,2,.77,3.76l.18-1.19c.5,1.51,1.73,3.45,1.68,5.83,0,0-.69.53.06.44.22.56-1,2,.64,1.79-.58,1.53-1.74,3.58-1.11,6,0,.12,0-.28.5-.55-.92,4.37-4.39,4.6,3.14,10,1.63,2.64,3,7.19,4.22,11.65,0,0,0,0-.29.2,2.24,3.13,6.07,8.84,11.52,8.74a1.93,1.93,0,0,0,0-.59c3,2.91-2.26-3.29-2.38-12,.06-2.55-12.73-8.88-10.62-8.72.76-.12-.08.39.92,1.13-.61-.86-.45-3.06-1.35-4.49-.92,1-.27-2.36-1.54-2.84-1.69.71-2,0-1.88-3.36,2.43-2.62,1.33-10.34,5-11.73,2.12-.32,0,3.35,1.71,3.19,1,.42,2.79-.65,4,1.22,0,0,0,0,.1-.23a2.09,2.09,0,0,0,1,1,1.17,1.17,0,0,0,.19-.33c.31.05.53,1,1.19,1.76,0,0-.08,0,.06-.24,1.29.93-.91,4,2.48,2.54.78-.06-1.66,3.26.76,1.43,3.92,1.88,3.6.48,3.6,6.73l-.44.52c.27.09,7.48-3,3.73-4.94.35.56,4.77,3.5,1.07-.78,0,1.23,4.29,1.26,1.16-.27,0,.14,2.18-.16.49-.59l.43-.25c.15,0,.91,1.44,1-.44-.3,2,7.53-1.42,7.77-4.79.05,0-.11-.05.11.36.09-.46-.21-.62-.14-1.8l.34.09c.14-.18-.77-.8.11-1.29.08,0-.13,0,.39.54,0-1.15-.73-2-.7-4.48l.15.32c-.52-6.47-5.44-9.55-10.31-14.46l.43.17c-2.28-5-5.13-2.37,1-12.07-.36.59,6.3-2.07,6-3.41.08.6,2.31.81,2.12,1.74.13-.21,1.88.54,1.55-.95.15-.35.32.78.83.5.1-.1-.14.33.61.3a2.75,2.75,0,0,0,.18,4s0,.09-.34,0c3.09,2,.73-1.66,1.84-3.44.68.51,4.06-.57,5.39-1.91.25-.15,2,1.2,1.47-.49.52.69,1.85,1,2.56-.86,0,.68,1,.3,1.61-.05h0a2.87,2.87,0,0,0-.76-2.59c.5.08.11-.7,1-.82-.23.64.07,1.71,1.39,2.33-.34.59-.73.3.88.81a.7.7,0,0,0,0-.92c.09-.16.37-.25,1,0,0-1.78,7.11.34,7.3-3.11.41-.23.81.23,1-1.12.43.66,1.46-.75,1.6.23a.56.56,0,0,0,.23-.78c.05,0,0-.41.69-.17-.19-.69,2.79-1.28.75-2.43.21-.79,3.47.35,2.8-1.38,1.42,0,.3-1.72,2.28-1.53-1.83-2.21,2.15.68.89-1.38.41-1.8.71-.81-1.41-2.05.82.54,3.71-.22,1.58-2.58.15.1.46.44.83-.24-.29,2.88,3.57-2.83,3.25-4.56.85.29.62-.59,1.65-1.33.14.52.15.4,1.38.21-.78-.79.52-1.83-.25-2.53.36.18,1-.38-.32-.8,1,.09,3.61-2.28.2-1.41.66-.36.71-.76,2-1.55-2.12-1.29-3.8-1.57-6.64-1.49,3.3-1.08,11.08-4.45-.56-6.89,1.89-1.43,3.53.56,6.44.95a34.41,34.41,0,0,1-5.85-10.89c-2-1.57-6.85-1.05.29-7.07-1.33-1.37,0-.2,1.39-.79.09,0,.24-2.47,1.31-1.92,2.44-2.15,4.81.32,5.68-3.45-2.63.65-5-2.35-8.48-1.22-.58,1.61-4.73,5.65-4.63-1.6-.91-.78-4.26.35-4.86-2.59.11-3.29,2-1.85,5.21-2.67a20.45,20.45,0,0,1,9.83-8c2.64,3,.72,2.46-1.12,6.1-.38.06-.21-.06-.87.43,0,.18.23,0,0,.72.34.14,1-.08,1.91,0,.09.22-1,.18-.48,1.25.08.31-2.84.36-1.82,1.68,2.58-1.07,5.14-3.79,8.75-5.18a1.73,1.73,0,0,0,2.45-.59c-.12.7.58.39,1,1.8,4-1.71.6,3.66,3.22,4.18-1.69,0-1.59.85-3,2.47.26.22,1,0,2,.33-.31.14,0,0-.91.55,0,.32.94-.2,1.3.91.93.16,1.28-2.49,2.67-.08,1.08-2,2.8,2.39,2.65,4,0-1.92-4.59.59-1.35.57,0,.66.44,2.26.56,3.34,1.35.24-1.42,1.24-.12,1.51-.56.2-2,3-.07,3.18-.06,0,.09.09-.42.29,0,0,.09-.06.18.25-1.42-1.1-1,3.33,2.54-.25-.43,1.21.41,2,.81-.37,2,1.79-1.39-1.8,3.4-.12-.62-2.76,3,2.1,4-5,.26-3.81-4.7-12-7.21-14.66-.83-3.4,6.5-3.2,7.7-8-1.56-3.28,4-4.68,3.5-7.18,2.17,1,2.32-2.41,4.59-3a1.75,1.75,0,0,0-.52.88c.44-.1.42.24,1.56-1,.14.54.06.55,0,2.05,7,5,27.32-23,28.86-34.81-2-6.32,6.06-12.76,1.15-18.63,5.14,2.11-2.86-8.07-7.67-7.14.17.78.87,4.36-1.43,4.59,5.21-6.51-7.4,4.72-1.46-2.49a2.37,2.37,0,0,1-1.75-.92c.58-.38.43.06,1.15-1.09-1.73-.15-1.75.44-1.79,2.75-3.07.86-.42-2.71-1.55-4.8-2.89.48-9-.14-1.9-4.42,3.91-1.54,19.15-26,25.84-25.88,2.61-2.27,9.57,2.55,10.27-.59.1-.15,10.54,2,8.08.39.22-.12-.53.12.19-1.09.09-.1.09.68,1.43.3-1.28-2.67,2.81-1.81,5.15-.47,0,.05-.22,0-.65.43,2.57.72.16-2.63,6.25,1.86-.86.78-1.91,0-4,1,1.07,3.6,6.26-1.16,14.2-.73,1.24-3.48-5.47,0-2.71-4.73,4-4.85,10.39-18.46,18.16-13.21,4.85-3.3,1.84.65.83,5.56.34.51.69-1.07,2.07-.5a7.81,7.81,0,0,0-.72,2.78c4.75-2.05,6.11-8.56,10.63-7.28-1.44-3.12.77-11.45,7.81-6,0,.06-.92-.48-.74.55-3.94-3.21-5,7.17-5.27,10.73-8.25,3.45-12.38,13-19.1,20-13.61,4-8.62,28.61-5.38,42.44,2.25-1.87,8-6.94,5.93-11.26.08-.29.42-1.08,1.1.28.79-.71,2.48-2.86,4.5-1.28-1.62-6.24,0-7.09,7.31-9.62-2-3.36-1.21-9.63,3.28-11-4.35,4.08,4.84,4-.87-2.25-.5-1.94.72-3.71,1.53-5.92-.59-.33-2.41-2.28-2.93.48,0,0-.07,0,.07-.4-3.88-1.59,1-7.29,2.37-9,.59-.05,1.13-9.25,3.61-5.28.89-.71.78-2.2,3,.38.52-1.78,2.26-3.34,4.91-4.51,0,1.13-1,2.56-.58,4.46,6.39-6.93,8-6.7,14.9-1.38.06-4.55,8.19-5.94,8.55-10.17,3.86-.9,9.32-5.62,15.24-8.36-3.32-2.84,3.87,1,6.79,2.05,2.13-3.21,1.26-5.1-1.15-9.37-.17.17.15.17-.18,1.14-.79-.21.67-1-1.06-1.65,1.81-.49.47-3.61-.75-6.05-3.57,4.23-.07-6-7.34-1.8,2.3-3.61-1.92-1.49-5.6-.8,1.71-2.29,15.33-.14,6.31-3,3-1.43,4.43,4,8.28,3.42,6.22-4.9,6.91-3.07,5.69-13.05.5,1.31,1.4-.42,1.9-1.65.16,1.31.53,3,2.17-.24a11.59,11.59,0,0,1-.77,3.37c0,.1-.07-.29-.68-.17,2.66,6.92,1.21,3.36,9.21,4.46,3,1,.3,3.8,3.09,5.76,2.77-1.58,5.36,6.3,7.43,2.27-.62,1.16,1,4.11,1.49.11.17.15,1.53,2,1.79.42-1.58-.58-1.14-2.77-2.43-2.8,0-.58,6.11-1.86,1.49-3.57.46-.06,1.9-.1,1.51-1.74-.09,0,0,.11-.65.05.35-.49-.14-1.18-1.29-2-.85-1.26,8.78,5.15,5-1,1,.67,2.36,3.53,3.43-1.06C1272.71,146.81,1275.32,148.37,1274.61,146.24ZM728.46,496.62c1.3,1.93-2.84,2.38,1.3,10.28.32.85-.82,0-1.16-.84-1.75,2.57-1.29-3.36-3.14-6.4.67-1.69,1.66-5.27-.18-7.89C725.35,486.21,727.51,494.92,728.46,496.62Zm-8.81-40.11s0-.07.19-.09c.23.41.35-.07.73-.56,0-.06,0,.17.23.26a.45.45,0,0,0-.14.22c.62-.15,1.56.41,1.81-1.08,0-.06.26-.06.62-.16,0,.92.75.84,2.15.9a2.18,2.18,0,0,0,1.26,1.92c.1-.42,1.46-1.6,1.64-.15-2,0-3.31,2.43-3.09,4.24-1-.35-.92.87-2.19,1.42-.17.05.68-.2.8.25-3.19,1,3.6-.45-.33,1.62.11.87-3.08-1.48-1.65,1.35-.11,0-.17-.08-.71.47.12-.22.74-2.38-.74-1.66-.71-.95-2.07-.68-1.92.87-.14.14-.45-.76-.65.14-.06-.13-.29,0,0-.61C717.15,464,716.48,457.77,719.65,456.51Zm78.5-156c-.12.63-1.92-.47-1.17.92-1.28-.3-3.76.45-5-1.59,0,1-1.83,3.72.32,5.78-.94-1,1.3-1.91,2,1-.06-.09-.73.39-1.3-.28.2-.12-.7.65-.27,1.55.32-.66.9-.19,1.92.25-.3-1.3,2.36,12.07-.09,10.43,0-.08.18.14.83-.34-6.29,2.57-20.3,0-17.23-9.75-.06,0,.38,0,.38.59,1.76-1.41-.68-7.1,4.37-5.78-3.41-3.82-11.59-9.72-9.56-16.94-.39.31-.33.36-.64,1.59,1-2.79-4.32-3.81-1.62-6.43,0,0-.06.08.28.29,0-1,2-2.59,1.34-4.27.21,0,.06-.12.6.47a30.85,30.85,0,0,0,5.67-3.55c-.06-.1-.33-1,.4-.59,1.86-1.12,6.29-5.18,9.58-2.19.8.15,2.56-2.12,3.7.5,1,2.07-2.8,5.53.22,7.09-1.6-.53-11.58-.53-5.83,3.94.7.48-6.93-1.86-3.77,1.16,2.87.47,1.76,7.13,7.31,7.16.87,2.21-1.53,4.44,1.06,7.53C791,295.88,793.47,290.57,798.15,300.55Zm23.05-26.31c-1.19.9-2.44,3-4.86,2.15-.27.14-.15.46-.41,1,.63.56,2.71,7.56-.84,7.64,1.3-1.7-2.52-1.16-.29-4.88a4.44,4.44,0,0,0-1.11-3.19c-.07,0-.07.06-.27.56-.13,0,0-.07-.13-.44-2.35,2.83.68,4.2-2.28,6.68-1.63-.59,2-11.67,3.46-6.25-.07,0,.22-.62.25,0,1.1-.62,1.08-1.34.54-3.16.94.56,2.07,2.23,4.34.83,1.19-1.72-4.7-.11-2.19-2.57.35-.12.45-.2.85.75-.07-.61,2,0,.49-1.26A23.89,23.89,0,0,1,821.2,274.24Z" />
+  <path class="land"
+    d="M659.11,315.42a9.38,9.38,0,0,1,1.65-3c-2.71.48-7.06,1.81-10.2.38-3.43,1.85,4.1,4.86,8.36,6.56-.45-.84,1.32-1.26.22-2.27l.2-.16C659.09,316.6,658.54,316.4,659.11,315.42Z" />
+  <path class="land"
+    d="M1061.82,333.52c-1.15.32.44.71,1,2.11-.42,0-.36,0-1.1-.86-.48.59.89.92.32,2,.25-1.11,2,0,2-1-1.88-.36.33-3.56.51.63.08,0-.12.1.5.16-1.48,1.28-1,3.68-1.73,5,1.48,3,2.42-4.56,1.89,1.6,2.09-.81,3.53-5,4.31-8,.47-.45-.6-.28,0-1.17-.16-.06.2.13-1.27-.08.93-1.65.71-1.07-1.68-1.67,0-2.09-3.46,0-4.27,1.47Z" />
+  <path class="land"
+    d="M1081.38,323.53c-4.83.43-12.79,1.81-15.28,7.41,1.28.17,2.29-.88,4.32.58-1.48-.8,8.3-5.23,11.48-3-1.45.89-1.92,8.35,5.16.48-.85-.25-2.09-2,.06-2.55-1.39,1.81,2.88.33.58,1.92a6.93,6.93,0,0,1,4-.05c.26-.28,1.23-3.27,2.51-1.82-.72,3.45.18-.14,2-1.17,1.13.88.29.5,1-.95,2.32-2.22-.7,1.69.52,2.65,1.68-.76,1.16-2.79,3.35-3.52-1.72-1.25-.1-10.2,3.41-14.77,2.24-3.39-2.47-6.23-1.36-10.57-.68.69-2.55-1.85-2.31,1.23,3.72-1.84,0,3.94-.83-.34-1.3-.37-.17,1.27-2.25,2.83.91,1.64-1.22,2.78.46,3.87,2.58,3.2-14.12,20.3-9.6,9.94C1086.89,313.9,1084,328.12,1081.38,323.53Z" />
+  <path class="land"
+    d="M1025,420.12c-2,2.35-5.35,4-7.05,7.43,2.65-2.53,9.58-5.75,8-10.51C1025.26,417.75,1025.46,418.72,1025,420.12Z" />
+  <path class="land"
+    d="M1028,373.72a7.32,7.32,0,0,0,.84,2.53l0,0c1,.25.91,1.67,1.84,2.34C1033.89,373.5,1036.4,355.33,1028,373.72Z" />
+  <path class="land"
+    d="M1027.66,399.6c-2.46-3,2.06,10.89,2.1,4.81,2.75,1.58-.1.57.19,3.87,1-1.14.86,1.85,4-.48.68-.59,3.08,3.85,3.13,1.94-2.43-4.68,2.63,1.24,4.89,3-.09-.23.26.33.29-1.67-.29.21-.34-.37-1.25-.27.74-1-2.19-1.77.25-2.46-1.4-1.46-2,.3-2.81-.17.83-1.26-3.39-2.76-2.71-.54-1.22,1.3-3.83-3.54-2.38-6.22-1.19-.85,5.18-2.93,2.32-6.06-1.17.22,1.08-5.41-.68-3.57C1024.8,387.75,1031.87,400.48,1027.66,399.6Z" />
+  <path class="land"
+    d="M989.14,452.56c-.6.46-.84,2.9.8,4.08-1.72,2.63,1.28,2.34,2.68,5,.31,1.07-.5,6.71,3.09,5.25-1,.76,1.46.47,2.8-.07.77,0,.07,1.66.74,2.31.7-1.47,3.35.7,4-2.15l1.08,1.08c1.69-1.07-.34,2,3.52,0-.05-.18-.29,1.74.64.49-.46,4.1,4.22,2,6.09-.87.15,0-.47-.24-.32-.67.4.25.79,0,.73-1.24l-.24.09c.25-.28,2-1,0-1.62a.94.94,0,0,0,.39-1.23c-.08,0,.12-.05-.53,0,.35-.59,2-1.16,1.64-2.58,2.65,2.07,2.79-5,4.12-7.45-.14.57,7.94,3.18-.43-3.22,1.23-.4,1.07-1.69-.53-2.78,0,0-.07,0,.2-.22-.07,0,.11,0-.45-.14l.24-.08c-1-.71-.53-1.58-2-2.34-.05-.26,1.25.41,1.59-.37,3.31,1-4.06-1.94,3.65-2.26.73-.31-3.16-2.46,0-2.06-.41,0,3.23,0,2.36-1.55-1.55.4-2.45-2.16-4.4-1-.56-.46,1.2-.25.11-1.21a2.91,2.91,0,0,1-1.77.59c1.51-.78-.71-5.36-2.5-2.52.64-4.22-2.25,4.11-4.17,3.5-1.62.42,1.68,2.43-2,2.46,0,0,.08,0,.08-.41-3.15,1-4.63,3.31-7.25,6.47-1.87.29-5.09,1.52-6.13,2.52.46,1-1.47,2.82-.07,3.62-1.41-.91-4.2-.29-5.61-2.2a3.59,3.59,0,0,0-2.17,2.74,2.1,2.1,0,0,1,.42-.05C989.42,452.39,989.63,452.39,989.14,452.56Z" />
+  <path class="land"
+    d="M1123.06,480.16c5.72.54.69-3.43-3.94-4.28-1.67.2.4-1.75-1.94-3.48-3.39-2.3-18.81-9.07-28.36-9.8.54-1.45-8.53,9.74-8.92,4.26-.75.65-1-2.88-1.35-.27-1.83-1.74-.11-5.3-1.71-7.26-1.38.48-4.35-2.73-9.41.31-.14,1.81-3,1.89,2.23,2.53,0,2.61,3.16,3.11,7,1.88,0,.31,0,.09-.46.67l.38,0c.19.53-.62.09-.7,1.11-1.83-1.22-2.13.25-6.08.57,2.43-.5,3.66,8.83,5.44,2.17.77.42.07-1.41,1.14-1.24-1.68,1.62,1.08,3.6,3.67,3.08-2.86.71,4.65,2.74,8.41,3.51.85.28,2.63,2.59,3.73,2.55,0,.09-.19-.18-.49.45.09,0-.13.1.61.13-.77.51.69,2.39,1.73,3.55-1-.19-1.24,1.18,1.09,1.17-.06.23-.94-.16-1.5.21,2.32.06-1.23,5.55,1.76,2.56,0,1,1.95.95,3-.2-2.64,5.93,20.4,5.78,7.35.95a8,8,0,0,0,5,0,2.64,2.64,0,0,0-.34-.7c.1-.2.57.15,1.3.06l-.17-.27s0,.07.36,0a6.57,6.57,0,0,0-1-1.7c1.19,1.6,2.31.39,4.25.6.46,1.44,2.76.34,4.38,1.89.89.42,1.08,3.21,3,3.13,0,3.39,8.51,5.26,13,5.15-.13-.23-.13.1-.83-.64.17-.39.37.41,1.55-.36.24.16-5.93-.58-3-1.94-1.46-.81-2.4.74-3.06-2.37-.81-.25-2,1.49-2.43-1.12C1127.59,485.19,1121.51,482.94,1123.06,480.16Z" />
+  <path class="land"
+    d="M1104.37,240.86c-.79.93-.29,3.44-.29,4.66,3.88,2.21-.73,20.7,1.25,30.89.25-2.29,3.58-7.11,4.76-.56,1.58-2.8-1.46-4.77-3.07-8.73.22-3.92,2.55-14,7.58-4.72-5.2-9.7-3.91-21.79-7.1-32.46-.37.21.42,1-1.26.81,0,.51,1.91,1.84,1.08,3.23l.16,0C1106.67,238.65,1104.49,231,1104.37,240.86Z" />
+  <path class="land"
+    d="M1099.18,291.3c-2.76,1.24-1,3.26-.85,6.74,1.28.17.78-1.75,3.75-1.73-6.64-4.15.5-4.58,7.48-1.09.38-5,5.17-3.52,9-6.4-3.72,2.32-1.4-4.29-2.15-4.18-3.72,7.19-11.48-10.1-12.79-4.44.67-.17,1.14,12.48-3.51,9C1098.59,288.82,1100.38,290.09,1099.18,291.3Z" />
+  <path class="land"
+    d="M1133.57,474.62l.22-.23c-1.43,2.18-2.09,1.45-6.42,1.66,3.46,4.84,13.93,2,14.28-4.2,0,.26-2.75-1.24-3,0C1140.92,472.87,1133.48,478.65,1133.57,474.62Z" />
+  <path class="land"
+    d="M976.2,476.06c1.79,3.37,3.95-9.06.17-11-.52-.91-2.83,1.46-2.64.17,1.46-1.39-.46-.7-1-4.84a3,3,0,0,1-3.36-2.35c1.19-1.6,2.46-4.05-3-2,1.57-.64,2.8-.87-1.15-2.79,1,.52-5.84-6.93-4.69-3.23-3.73-3.65-8.08-6.83-11.91-11.43-1.2,1.44-11.1-4.46-7.05,1.63,13.56,9.61,17,26.88,32.31,37.09.14,0-.32-.46-.16-1.3C974.41,476,974.8,477.56,976.2,476.06Z" />
+  <path class="land"
+    d="M1005.53,486.32c0,.06,2.06.58,3.14,1-2.45-3.61,3.21-3.18-6.3-4.27,0-3.32-3.91-1.78-6.3-3.81-4.14,3.33-7.59.63-13.91-2-.83,2.05-2.86-1.91-4.89,2,.11-.29-.59,2.08-1,.68-1.46,1.1,1.63.11,4,1.37C977.31,483.2,997.18,485,1005.53,486.32Z" />
+  <path class="land"
+    d="M1027,459.4l-.27-.29c-.29,1.5-6.31,10.34-.76,10,1.82,2.58-3.61,8.4,3.29,7.1.25.79-2.13-13.91,2.24-9.45-.88,2.08.12,2.8,1.82,4.63-1.12,3.86,1.41,1.07,4,.7,0,0,0,0,0-.24,1.86.41-.72-1.62-1.65-2.67,1.55-2.2-2.13-4.08-3-6.06-.57,1.09,12-5.52,5.05-4.09,0,.07.12,0,.21.34-2.63-.36-4.88,1.07-7.36,2.12-1-.17-5.24-5-.77-6.58,4.69-.66,14.7,3.8,16.13-3.88-3.3,2.28-8.3,3.91-13.39,1.35-3.14.26-6.71,2.43-5.32,7.36Z" />
+  <path class="land"
+    d="M1046.61,425.36c-2.26-.14-2.61,2.07-5.71,3.28,2.71-4.25-8,0-6.06,4,1.65-.24-.44-2.56,3.76-2.71.37.44-.14.52,1,1-.07-1.67,2-2.17,2.81.49-2.19,1.23,1.07,6.4,3.52,4.22,2.06,5.16,0-3.22,2.23-4.45a24.42,24.42,0,0,1,1.28,3.59c-.5-1.77,2-2.59,1.25-5-.79-1.69-.81-3-1.24-5.46C1047.08,423.72,1047.45,420.55,1046.61,425.36Z" />
+  <path class="land"
+    d="M1040.54,492.28c-.86,2.4,6.87-3.41,12.82-6.14-.23-.77-13.46,1.12-12.58,5.82C1040.72,492,1040.87,492,1040.54,492.28Z" />
+  <path class="land" d="M640.15,301.39c-6.31-13.5-5,18.75-.08.92h.09C640.16,302,640.18,301.69,640.15,301.39Z" />
+
+  <use href="#angular-logo" x="130" y="119" />
+  <use href="#angular-logo" x="146" y="196" />
+  <use href="#angular-logo" x="194" y="169" />
+  <use href="#angular-logo" x="228" y="206" />
+  <use href="#angular-logo" x="186" y="247" />
+  <use href="#angular-logo" x="216" y="265" />
+  <use href="#angular-logo" x="268" y="288" />
+  <use href="#angular-logo" x="226" y="323" />
+  <use href="#angular-logo" x="293" y="294" />
+  <use href="#angular-logo" x="281" y="215" />
+  <use href="#angular-logo" x="318" y="246" />
+  <use href="#angular-logo" x="304" y="395" />
+  <use href="#angular-logo" x="335" y="423" />
+  <use href="#angular-logo" x="364" y="575" />
+  <use href="#angular-logo" x="371" y="428" />
+  <use href="#angular-logo" x="399" y="469" />
+  <use href="#angular-logo" x="580" y="272" />
+  <use href="#angular-logo" x="590" y="213" />
+  <use href="#angular-logo" x="626" y="230" />
+  <use href="#angular-logo" x="663" y="203" />
+  <use href="#angular-logo" x="633" y="143" />
+  <use href="#angular-logo" x="697" y="100" />
+  <use href="#angular-logo" x="721" y="173" />
+  <use href="#angular-logo" x="701" y="208" />
+  <use href="#angular-logo" x="697" y="369" />
+  <use href="#angular-logo" x="868" y="360" />
+  <use href="#angular-logo" x="884" y="269" />
+  <use href="#angular-logo" x="932" y="266" />
+  <use href="#angular-logo" x="963" y="257" />
+  <use href="#angular-logo" x="963" y="309" />
+  <use href="#angular-logo" x="989" y="304" />
+  <use href="#angular-logo" x="1008" y="207" />
+  <use href="#angular-logo" x="1039" y="213" />
+  <use href="#angular-logo" x="958" y="100" />
+  <use href="#angular-logo" x="1151" y="85" />
+  <use href="#angular-logo" x="1096" y="518" />
+</svg>
diff --git a/aio/content/marketing/contributors.json b/aio/content/marketing/contributors.json
index 98d8b337febc5..f3ba0d7a40ca6 100644
--- a/aio/content/marketing/contributors.json
+++ b/aio/content/marketing/contributors.json
@@ -53,6 +53,9 @@
   },
   "kyliau": {
     "name": "Keen Yee Liau",
+    "twitter": "liauky",
+    "website": "https://github.com/kyliau",
+    "bio": "Keen works on language service and CLI. He also maintains Karma and Protractor.",
     "groups": ["Angular"],
     "lead": "igorminar",
     "picture": "kyliau.jpg"
@@ -86,24 +89,6 @@
     "groups": ["Angular"],
     "lead": "kara"
   },
-  "matsko": {
-    "name": "Matias Niemela",
-    "picture": "matias.jpg",
-    "twitter": "yearofmoo",
-    "website": "http://yearofmoo.com",
-    "bio": "Matias Niemela is a fullstack web developer who has been programming & building websites for over 10 years, and a core team member of AngularJS for two years. In the spring of 2015 Matias joined Angular full time at Google. In his free time Matias loves to build complex things and is always up for public speaking, travelling and tweaking his current Vim setup.",
-    "groups": ["Angular"],
-    "lead": "kara"
-  },
-  "kara": {
-    "name": "Kara Erickson",
-    "picture": "kara-erickson.jpg",
-    "twitter": "karaforthewin",
-    "website": "https://github.com/kara",
-    "bio": "Kara is a software engineer on the Angular team at Google and a co-organizer of the Angular-SF Meetup. Prior to Google, she helped build UI components in Angular for guest management systems at OpenTable.  She enjoys snacking indiscriminately and probably other things too.",
-    "groups": ["Angular"],
-    "lead": "igorminar"
-  },
   "pkozlowski-opensource": {
     "name": "Pawel Kozlowski",
     "picture": "pawel.jpg",
@@ -476,8 +461,8 @@
     "name": "Sajeetharan Sinnathurai",
     "picture": "sajee.jpg",
     "twitter": "kokkisajee",
-    "website": "https://sajeetharan.herokuapp.com/",
-    "bio": "Sajeetharan is a Developer, Top contributor on stackoverflow for #Angular, ng-SriLanka organizer. He makes use of his extensive knowledge over the past years to contribute to community to make the world a better place.",
+    "website": "https://sajeetharan.com/",
+    "bio": "Sajeetharan is a Cloud Architect, Top contributor on stackoverflow for #Angular, ng-SriLanka organizer. He makes use of his extensive knowledge over the past years to contribute to community to make the world a better place.",
     "groups": ["GDE"]
   },
   "lacolaco": {
@@ -618,26 +603,6 @@
     "bio": "Justin (aka Schwarty) is a Google Developer Expert in Web Technologies and Angular, the host and maintainer of the weekly AngularAir live video broadcast, educator, writer and content creator. He has Angular courses available on LinkedIn Learning and Pluralsight and loves passing on years of full stack development knowledge to help empower others to find their inner awesomeness!",
     "groups": ["GDE"]
   },
-  "dennispbrown": {
-    "name": "Denny Brown",
-    "picture": "denny.jpg",
-    "bio": "Denny is founder of Expert Support, a professional services firm specializing in technical communication, and leads the Angular technical writing team. His lifelong passion has been to reduce the time and effort required to understand complex technical information. Early on, he was Associate Chairman of the Computer Science Department at Stanford, where he taught introductory courses in programming. He also plays old-timers baseball in local leagues and national tournaments.",
-    "groups": ["Angular"],
-    "lead": "aikidave"
-  },
-  "jbogarthyde": {
-    "name": "Judy Bogart",
-    "picture": "judy.png",
-    "groups": ["Angular"],
-    "lead": "dennispbrown"
-  },
-  "rockument69": {
-    "name": "Tony Bove",
-    "picture": "rockument69.jpg",
-    "bio": "Tony is a technical writer with Expert Support. His lifelong passions are helping people use technology, writing fiction, and playing music. When he's not working or playing the harmonica with friends in a bluegrass band, he's swimming and snorkeling on a Kauai beach and playing ball with his Irish Wolfhound. He's worked at home for decades before it became a thing.",
-    "groups": ["Angular"],
-    "lead": "aikidave"
-  },
   "kapunahelewong": {
     "name": "Kapunahele Wong",
     "picture": "kapunahele.jpg",
@@ -751,9 +716,9 @@
   "santosh": {
     "name": "Santosh Yadav",
     "picture": "santoshyadav.jpg",
-    "twitter": "Santosh19742211",
+    "twitter": "SantoshYadavDev",
     "website": "https://www.santoshyadav.dev",
-    "bio": "Santosh is a GDE for Angular and Web Technologies and loves to contribute to Open Source. He is the creator of ng deploy for netlify and core team member for NestJS Addons. He writes for AngularInDepth, mentors for DotNetTricks, organizes Pune Tech Meetup, and conducts free workshops on Angular.",
+    "bio": "Santosh is a GDE for Angular and loves to contribute to Open Source. He is the creator of ng deploy for netlify and core team member for NestJS Addons. He writes for AngularInDepth, mentors for DotNetTricks, organizes Pune Tech Meetup, and conducts free workshops on Angular.",
     "groups": ["GDE"]
   },
   "josephperrott": {
@@ -848,5 +813,46 @@
     "website": "kreuzercode.com",
     "bio": "Kevin is a passionate freelance front-end engineer and Google Developer Expert based in Switzerland. He is a JavaScript enthusiast and fascinated by Angular. Kevin always tries to learn new things, expand his knowledge, and share it with others in the form of blog posts, workshops, podcasts, or presentations. He is a writer for various publications and the most active writer on Angular in-depth in 2019. Contributing to multiple projects and maintaining 7 npm packages, Kevin is also a big believer in open source. Furthermore, Kevin is a big football fan. Since his childhood, he has supported Real Madrid, which you might notice in a lot of his blog posts and tutorials.",
     "groups": ["GDE"]
+  },
+  "samvloeberghs": {
+    "name": "Sam Vloeberghs",
+    "picture": "samvloeberghs.jpg",
+    "groups": ["GDE"],
+    "twitter": "samvloeberghs",
+    "website": "https://samvloeberghs.be",
+    "bio": "Sam is a freelance software architect and Internet entrepreneur, currently focusing on frontend technologies. Co-organiser of the Belgian Angular conference NG-BE and Angular Belgium Meetup group."
+  },
+  "thekiba": {
+    "name": "Andrew Grekov",
+    "picture": "thekiba.jpg",
+    "twitter": "thekiba_io",
+    "website": "https://thekiba.io",
+    "bio": "Andrew is a software engineer using Angular and .NET. He spends most of his spare time staying up-to-date, helping other people, and experimenting with web tech.",
+    "groups": ["GDE"]
+  },
+  "fmalcher": {
+    "name": "Ferdinand Malcher",
+    "picture": "fmalcher.jpg",
+    "twitter": "fmalcher01",
+    "website": "https://angular.schule",
+    "bio": "Ferdinand is a developer, trainer, and international speaker from Leipzig, Germany. He is co-author of the German Angular book and loves to share knowledge – that's why he writes books and blog posts, speaks at meetups and conferences, does Angular training and works as a consultant in his company \"Angular.Schule\".",
+    "groups": ["GDE"]
+  },
+  "johanneshoppe": {
+    "name": "Johannes Hoppe",
+    "picture": "johanneshoppe.jpg",
+    "twitter": "johanneshoppe",
+    "website": "https://angular.schule",
+    "bio": "Johannes works as a software architect and consultant for Angular. He is co-author of the German Angular book and a passionate speaker. With his company \"Angular.Schule\" he offers public Angular training and consulting. Johannes is head of the Angular Meetup in Heidelberg, Germany, and is engaged in a couple of open source projects.",
+    "groups": ["GDE"]
+  },
+  "jessicajaniuk": {
+    "name": "Jessica Janiuk",
+    "picture": "jessicajaniuk.jpg",
+    "twitter": "thepunderwoman",
+    "website": "https://github.com/jessicajaniuk",
+    "bio": "Jessica is a software engineer at Google. In her free time she is a historical fencer, astromech droid builder, photographer, pun purveyor, occasional cosplayer, and full time cat mom.",
+    "groups": ["Angular"],
+    "lead": "jelbourn"
   }
 }
diff --git a/aio/content/marketing/events.json b/aio/content/marketing/events.json
new file mode 100644
index 0000000000000..4526b786fad82
--- /dev/null
+++ b/aio/content/marketing/events.json
@@ -0,0 +1,245 @@
+[
+  {
+    "name": "ng-china",
+    "location": "Online",
+    "linkUrl": "https://ng-china.org/",
+    "date": {
+      "start": "2020-11-21",
+      "end": "2020-11-22"
+    }
+  },
+  {
+    "name": "EnterpriseNG",
+    "location": "Online",
+    "linkUrl": "https://www.ng-conf.org/",
+    "date": {
+      "start": "2020-11-19",
+      "end": "2020-11-20"
+    }
+  },
+  {
+    "name": "ngrome",
+    "location": "Online",
+    "linkUrl": "https://ngrome.io/",
+    "date": {
+      "start": "2020-10-20",
+      "end": "2020-10-20"
+    }
+  },
+  {
+    "name": "DevReach",
+    "location": "Online",
+    "linkUrl": "https://www.telerik.com/devreach/online/agenda-thursday#sessions",
+    "date": {
+      "start": "2020-10-19",
+      "end": "2020-10-23"
+    }
+  },
+  {
+    "name": "ngVikings",
+    "location": "Oslo, Norway",
+    "linkUrl": "https://ngvikings.org/",
+    "date": {
+      "start": "2020-05-25",
+      "end": "2020-05-26"
+    },
+    "workshopsDate": {
+      "start": "2020-05-27",
+      "end": "2020-05-27"
+    }
+  },
+  {
+    "name": "ng-conf",
+    "location": "Salt Lake City, Utah",
+    "linkUrl": "https://ng-conf.org/",
+    "date": {
+      "start": "2020-04-01",
+      "end": "2020-04-03"
+    }
+  },
+  {
+    "name": "ngIndia",
+    "location": "Delhi, India",
+    "linkUrl": "https://www.ng-ind.com/",
+    "date": {
+      "start": "2020-02-29",
+      "end": "2020-02-29"
+    }
+  },
+  {
+    "name": "ReactiveConf",
+    "location": "Prague, Czech Republic",
+    "linkUrl": "https://reactiveconf.com/",
+    "date": {
+      "start": "2019-10-30",
+      "end": "2019-11-01"
+    }
+  },
+  {
+    "name": "NG Rome MMXIX",
+    "location": "Rome, Italy",
+    "linkUrl": "https://ngrome.io",
+    "tooltip": "NG Rome MMXIX - The Italian Angular Conference",
+    "date": {
+      "start": "2019-10-07",
+      "end": "2019-10-07"
+    },
+    "workshopsDate": {
+      "start": "2019-10-06",
+      "end": "2019-10-06"
+    }
+  },
+  {
+    "name": "AngularConnect",
+    "location": "London, UK",
+    "linkUrl": "https://www.angularconnect.com/?utm_source=angular.io&utm_medium=referral",
+    "date": {
+      "start": "2019-09-19",
+      "end": "2019-09-20"
+    }
+  },
+  {
+    "name": "NG-DE",
+    "location": "Berlin, Germany",
+    "linkUrl": "https://ng-de.org/",
+    "date": {
+      "start": "2019-08-30",
+      "end": "2019-08-31"
+    },
+    "workshopsDate": {
+      "start": "2019-08-29",
+      "end": "2019-08-29"
+    }
+  },
+  {
+    "name": "ng-japan",
+    "location": "Tokyo, Japan",
+    "linkUrl": "https://ngjapan.org/",
+    "date": {
+      "start": "2019-07-13",
+      "end": "2019-07-13"
+    }
+  },
+  {
+    "name": "ngVikings",
+    "location": "Copenhagen, Denmark",
+    "linkUrl": "https://ngvikings.org/",
+    "date": {
+      "start": "2019-05-27",
+      "end": "2019-05-28"
+    },
+    "workshopsDate": {
+      "start": "2019-05-26",
+      "end": "2019-05-26"
+    }
+  },
+  {
+    "name": "ng-conf",
+    "location": "Salt Lake City, Utah",
+    "linkUrl": "https://ng-conf.org/",
+    "date": {
+      "start": "2019-05-01",
+      "end": "2019-05-03"
+    }
+  },
+  {
+    "name": "ng-India",
+    "location": "Gurgaon, India",
+    "linkUrl": "https://www.ng-ind.com/",
+    "date": {
+      "start": "2019-02-23",
+      "end": "2019-02-23"
+    }
+  },
+  {
+    "name": "ngAtlanta",
+    "location": "Atlanta, Georgia",
+    "linkUrl": "https://ng-atl.org/",
+    "date": {
+      "start": "2019-01-09",
+      "end": "2019-01-12"
+    }
+  },
+  {
+    "name": "AngularConnect",
+    "location": "London, United Kingdom",
+    "linkUrl": "https://past.angularconnect.com/2018",
+    "date": {
+      "start": "2018-11-05",
+      "end": "2018-11-07"
+    }
+  },
+  {
+    "name": "ReactiveConf",
+    "location": "Prague, Czech Republic",
+    "linkUrl": "https://reactiveconf.com/",
+    "date": {
+      "start": "2018-10-29",
+      "end": "2018-10-31"
+    }
+  },
+  {
+    "name": "AngularMix",
+    "location": "Orlando, Florida",
+    "linkUrl": "https://angularmix.com/",
+    "date": {
+      "start": "2018-10-10",
+      "end": "2018-10-12"
+    }
+  },
+  {
+    "name": "Angular Conf Australia",
+    "location": "Melbourne, Australia",
+    "linkUrl": "https://www.angularconf.com.au/",
+    "date": {
+      "start": "2018-06-22",
+      "end": "2018-06-22"
+    }
+  },
+  {
+    "name": "ng-japan",
+    "location": "Tokyo, Japan",
+    "linkUrl": "https://ngjapan.org/en.html",
+    "date": {
+      "start": "2018-06-16",
+      "end": "2018-06-16"
+    }
+  },
+  {
+    "name": "WeAreDevelopers",
+    "location": "Vienna, Austria",
+    "linkUrl": "https://www.wearedevelopers.com/",
+    "tooltip": "WeAreDevs",
+    "date": {
+      "start": "2018-05-16",
+      "end": "2018-05-18"
+    }
+  },
+  {
+    "name": "ng-conf",
+    "location": "Salt Lake City, Utah",
+    "linkUrl": "https://ng-conf.org/",
+    "date": {
+      "start": "2018-04-18",
+      "end": "2018-04-20"
+    }
+  },
+  {
+    "name": "ngVikings",
+    "location": "Helsinki, Finland",
+    "linkUrl": "https://ngvikings.org/",
+    "date": {
+      "start": "2018-03-01",
+      "end": "2018-03-02"
+    }
+  },
+  {
+    "name": "ngAtlanta",
+    "location": "Atlanta, Georgia",
+    "linkUrl": "https://ng-atl.org/",
+    "date": {
+      "start": "2018-01-30",
+      "end": "2018-01-30"
+    }
+  }
+]
diff --git a/aio/content/marketing/resources.json b/aio/content/marketing/resources.json
index d2ec90a6ff960..649776030c3d1 100644
--- a/aio/content/marketing/resources.json
+++ b/aio/content/marketing/resources.json
@@ -30,10 +30,10 @@
             "url": "https://dev.to/t/angular",
             "title": "DEV Community"
           },
-          "angular-in-depth": {
-            "desc": "The place where advanced Angular concepts are explained",
-            "url": "https://blog.angularindepth.com",
-            "title": "Angular In Depth"
+          "indepth-dev": {
+            "desc": "Peer-reviewed Angular articles and tutorials.",
+            "url": "https://indepth.dev/angular/",
+            "title": "Angular inDepth"
           }
         }
       },
@@ -63,6 +63,12 @@
             "logo": "",
             "title": "NgRuAir",
             "url": "https://github.com/ngRuAir/ngruair"
+          },
+          "the-deep-dive": {
+            "desc": "The advanced web development podcast about Angular, RxJS, TypeScript and other technologies. English, audio only.",
+            "logo": "https://i.imgur.com/mmE5Feq.jpg",
+            "title": "The Deep Dive",
+            "url": "https://thedeepdive.simplecast.com"
           }
         }
       }
@@ -429,6 +435,12 @@
             "desc": "Jigsaw provides a set of web components based on Angular. It is supporting the development of all applications of Big Data Product of ZTE (https://www.zte.com.cn).",
             "title": "Awade Jigsaw (Chinese)",
             "url": "https://jigsaw-zte.gitee.io"
+          },
+          "material-dayjs-adapter": {
+            "desc": "A DayJS implementation of @angular/material's DateAdapter that results in smaller bundle sizes than its MomentJS counterpart.",
+            "rev": true,
+            "title": "material-dayjs-adapter",
+            "url": "https://www.npmjs.com/package/@tabuckner/material-dayjs-adapter"
           }
         }
       }
diff --git a/aio/content/start/index.md b/aio/content/start/index.md
index 26992786de5a3..3b3dd4220fcef 100644
--- a/aio/content/start/index.md
+++ b/aio/content/start/index.md
@@ -1,4 +1,4 @@
-# Part 1: Getting started with a basic Angular app
+# Getting started with a basic Angular app
 
 Welcome to Angular!
 
diff --git a/aio/content/start/start-data.md b/aio/content/start/start-data.md
index 3a5a3cf196436..781fc1961fa2c 100644
--- a/aio/content/start/start-data.md
+++ b/aio/content/start/start-data.md
@@ -1,4 +1,4 @@
-# Try it: Manage data
+# Managing data
 
 At the end of [In-app Navigation](start/start-routing "Try it: In-app Navigation"), the online store application has a product catalog with two views: a product list and product details.
 Users can click on a product name from the list to see details in a new view, with a distinct URL, or route.
@@ -40,7 +40,7 @@ A later part of this tutorial, [Use forms for user input](start/start-forms "Try
 
         <code-example header="src/app/cart.service.ts" path="getting-started/src/app/cart.service.1.ts"></code-example>
 
-    <div class="alert is-helpful>
+    <div class="alert is-helpful">
 
     The StackBlitz generator might provide the cart service in `app.module.ts` by default. That differs from the example, which uses a bundle-optimization technique, an  `@Injectable()` decorator with the `{ providedIn: 'root' }` statement.
     For more information about services, see [Introduction to Services and Dependency Injection](guide/architecture-services "Concepts > Intro to Services and DI").
@@ -236,7 +236,7 @@ For more information about services, see [Introduction to Services and Dependenc
 <!-- Accessing data with the HTTP client -->
 
 Servers often return data in the form of a stream.
-Streams are useful because they make it easy to transform the returned data and  make modifications to the way you request that data.
+Streams are useful because they make it easy to transform the returned data and make modifications to the way you request that data.
 The Angular HTTP client, `HttpClient`, is a built-in way to fetch data from external APIs and provide them to your app as a stream.
 
 This section shows you how to use the HTTP client to retrieve shipping prices from an external file.
diff --git a/aio/content/start/start-deployment.md b/aio/content/start/start-deployment.md
index 94b99c39e4659..b1c41c8e032f7 100644
--- a/aio/content/start/start-deployment.md
+++ b/aio/content/start/start-deployment.md
@@ -1,4 +1,4 @@
-# Try it: Deployment
+# Deploying an application
 
 
 To deploy your application, you have to compile it, and then host the JavaScript, CSS, and HTML on a web server. Built Angular applications are very portable and can live in any environment or served by any technology, such as Node, Java, .NET, PHP, and many others.
diff --git a/aio/content/start/start-forms.md b/aio/content/start/start-forms.md
index 00f2c98191270..b1981df4fc38f 100644
--- a/aio/content/start/start-forms.md
+++ b/aio/content/start/start-forms.md
@@ -1,4 +1,4 @@
-# Try it: Use forms for user input
+# Using forms for user input
 
 At the end of [Managing Data](start/start-data "Try it: Managing Data"), the online store application has a product catalog and a shopping cart.
 
diff --git a/aio/content/start/start-routing.md b/aio/content/start/start-routing.md
index 42a4ce2ae0509..7a9afd80bc510 100644
--- a/aio/content/start/start-routing.md
+++ b/aio/content/start/start-routing.md
@@ -1,4 +1,4 @@
-# In-app navigation
+# Adding navigation
 
 At the end of [part 1](start "Get started with a basic Angular app"), the online store application has a basic product catalog.
 The app doesn't have any variable states or navigation.
diff --git a/aio/firebase.json b/aio/firebase.json
index ae07bfe70fc07..033674d538358 100644
--- a/aio/firebase.json
+++ b/aio/firebase.json
@@ -31,6 +31,7 @@
       {"type": 301, "source": "/guide/quickstart", "destination": "/start"},
       {"type": 301, "source": "/getting-started", "destination": "/start"},
       {"type": 301, "source": "/getting-started/:rest*", "destination": "/start/:rest*"},
+      {"type": 301, "source": "/guide/displaying-data", "destination": "/start#template-syntax"},
 
       // Renaming of Getting Started topics
       {"type": 301, "source": "/start/data", "destination": "/start/start-data"},
@@ -128,7 +129,8 @@
       // The below paths are referenced in users projects generated by the CLI
       {"type": 301, "source": "/config/tsconfig", "destination": "/guide/typescript-configuration"},
       {"type": 301, "source": "/config/solution-tsconfig", "destination": "https://devblogs.microsoft.com/typescript/announcing-typescript-3-9/#solution-style-tsconfig"},
-      {"type": 301, "source": "/config/app-package-json", "destination": "/guide/strict-mode#non-local-side-effects-in-applications"}
+      {"type": 301, "source": "/config/app-package-json", "destination": "/guide/strict-mode#non-local-side-effects-in-applications"},
+      {"type": 301, "source": "/strict", "destination": "/guide/strict-mode"}
     ],
     "rewrites": [
       {
diff --git a/aio/ngsw-config.json b/aio/ngsw-config.json
index c3977373aafb2..28fd8f79c9f95 100644
--- a/aio/ngsw-config.json
+++ b/aio/ngsw-config.json
@@ -102,6 +102,9 @@
     "!/guide/cli-quickstart",
     "!/guide/cli-quickstart.html",
     "!/guide/cli-quickstart/",
+    "!/guide/displaying-data",
+    "!/guide/displaying-data.html",
+    "!/guide/displaying-data/",
     "!/guide/learning-angular",
     "!/guide/learning-angular.html",
     "!/guide/learning-angular/",
@@ -148,6 +151,7 @@
     "!/styleguide/**",
     "!/testing",
     "!/testing/**",
-    "!/config/**"
+    "!/config/**",
+    "!/strict"
   ]
 }
diff --git a/aio/package.json b/aio/package.json
index ec8a353b67e59..078cc2e7554bf 100644
--- a/aio/package.json
+++ b/aio/package.json
@@ -23,7 +23,7 @@
     "build-local-with-viewengine": "yarn ~~build",
     "prebuild-local-with-viewengine-ci": "node scripts/switch-to-viewengine && yarn setup-local-ci",
     "build-local-with-viewengine-ci": "yarn ~~build --progress=false",
-    "extract-cli-command-docs": "node tools/transforms/cli-docs-package/extract-cli-commands.js b0b27361d",
+    "extract-cli-command-docs": "node tools/transforms/cli-docs-package/extract-cli-commands.js 9d53eac1b",
     "lint": "yarn check-env && yarn docs-lint && ng lint && yarn example-lint && yarn tools-lint",
     "test": "yarn check-env && ng test",
     "pree2e": "yarn check-env && yarn update-webdriver",
@@ -63,13 +63,14 @@
     "tools-lint": "tslint --config \"tools/tslint.json\" --project \"tools/firebase-test-utils\"",
     "tools-test": "./scripts/deploy-to-firebase.test.sh && yarn docs-test && yarn boilerplate:test && jasmine tools/ng-packages-installer/index.spec.js && yarn firebase-utils-test",
     "preserve-and-sync": "yarn docs",
-    "serve-and-sync": "run-p \"start\" \"docs-watch --watch-only\"",
+    "serve-and-sync": "run-p \"docs-watch --watch-only\" \"start {@}\" --",
     "boilerplate:add": "node ./tools/examples/example-boilerplate add",
     "boilerplate:add:viewengine": "yarn boilerplate:add --viewengine",
     "boilerplate:remove": "node ./tools/examples/example-boilerplate remove",
     "boilerplate:test": "node tools/examples/test.js",
     "generate-stackblitz": "node ./tools/stackblitz-builder/generateStackblitz",
     "generate-zips": "node ./tools/example-zipper/generateZips",
+    "create-example": "node ./tools/examples/create-example.js",
     "build-404-page": "node scripts/build-404-page",
     "update-webdriver": "node ../scripts/webdriver-manager-update.js",
     "~~audit-web-app": "node scripts/audit-web-app",
@@ -86,32 +87,31 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "10.0.2",
-    "@angular/cdk": "10.0.1",
-    "@angular/common": "10.0.2",
-    "@angular/compiler": "10.0.2",
-    "@angular/core": "10.0.2",
-    "@angular/elements": "10.0.2",
+    "@angular/animations": "10.1.3",
+    "@angular/cdk": "10.2.2",
+    "@angular/common": "10.1.3",
+    "@angular/compiler": "10.1.3",
+    "@angular/core": "10.1.3",
+    "@angular/elements": "10.1.3",
     "@angular/fire": "~6.0.3",
-    "@angular/forms": "10.0.2",
-    "@angular/material": "10.0.1",
-    "@angular/platform-browser": "10.0.2",
-    "@angular/platform-browser-dynamic": "10.0.2",
-    "@angular/router": "10.0.2",
-    "@angular/service-worker": "10.0.2",
+    "@angular/forms": "10.1.3",
+    "@angular/material": "10.2.2",
+    "@angular/platform-browser": "10.1.3",
+    "@angular/platform-browser-dynamic": "10.1.3",
+    "@angular/router": "10.1.3",
+    "@angular/service-worker": "10.1.3",
     "@webcomponents/custom-elements": "1.2.1",
     "firebase": "~7.18.0",
     "first-input-delay": "^0.1.3",
     "proxy-polyfill": "^0.3.2",
     "rxjs": "^6.5.3",
-    "tslib": "^1.10.0",
+    "tslib": "^2.0.0",
     "zone.js": "~0.10.3"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "0.1000.1",
-    "@angular/cli": "10.0.1",
-    "@angular/compiler-cli": "10.0.2",
-    "@angular/language-service": "10.0.2",
+    "@angular-devkit/build-angular": "0.1001.3",
+    "@angular/cli": "10.1.3",
+    "@angular/compiler-cli": "10.1.3",
     "@types/jasmine": "^3.4.2",
     "@types/jasminewd2": "^2.0.8",
     "@types/lunr": "^2.3.2",
@@ -122,7 +122,7 @@
     "canonical-path": "1.0.0",
     "chalk": "^2.1.0",
     "cjson": "^0.5.0",
-    "codelyzer": "^6.0.0-next.1",
+    "codelyzer": "^6.0.0",
     "cross-spawn": "^5.1.0",
     "css-selector-parser": "^1.3.0",
     "dgeni": "^0.4.11",
@@ -139,8 +139,8 @@
     "html": "^1.0.0",
     "ignore": "^3.3.3",
     "image-size": "^0.5.1",
-    "jasmine": "^3.4.0",
-    "jasmine-core": "^3.4.0",
+    "jasmine": "~3.6.0",
+    "jasmine-core": "~3.6.0",
     "jasmine-spec-reporter": "~5.0.0",
     "jsdom": "^9.12.0",
     "json-schema-traverse": "^0.4.1",
@@ -148,7 +148,7 @@
     "karma": "~5.0.0",
     "karma-chrome-launcher": "^3.1.0",
     "karma-coverage-istanbul-reporter": "^2.1.0",
-    "karma-jasmine": "^3.1.1",
+    "karma-jasmine": "~4.0.0",
     "karma-jasmine-html-reporter": "^1.4.2",
     "light-server": "^2.6.2",
     "lighthouse": "6.1.0",
@@ -157,7 +157,7 @@
     "lunr": "^2.1.0",
     "npm-run-all": "^4.1.5",
     "protractor": "~5.4.4",
-    "puppeteer": "3.3.0",
+    "puppeteer": "5.1.0",
     "rehype": "^6.0.0",
     "rehype-slug": "^2.0.0",
     "remark": "^9.0.0",
@@ -168,7 +168,7 @@
     "tree-kill": "^1.1.0",
     "ts-node": "^8.4.1",
     "tslint": "~6.1.0",
-    "typescript": "~3.9.5",
+    "typescript": "~4.0.2",
     "uglify-js": "^3.0.15",
     "unist-util-filter": "^0.2.1",
     "unist-util-source": "^1.0.1",
@@ -176,6 +176,6 @@
     "unist-util-visit-parents": "^1.1.1",
     "watchr": "^3.0.1",
     "xregexp": "^4.0.0",
-    "yargs": "^7.0.2"
+    "yargs": "^16.1.0"
   }
 }
diff --git a/aio/src/app/app.component.spec.ts b/aio/src/app/app.component.spec.ts
index cffcd9d80dd27..108fb8e552939 100644
--- a/aio/src/app/app.component.spec.ts
+++ b/aio/src/app/app.component.spec.ts
@@ -781,7 +781,7 @@ describe('AppComponent', () => {
         it('should grab focus when the / key is pressed', () => {
           const searchBox: SearchBoxComponent = fixture.debugElement.query(By.directive(SearchBoxComponent)).componentInstance;
           spyOn(searchBox, 'focus');
-          window.document.dispatchEvent(new KeyboardEvent('keyup', { 'key': '/' }));
+          window.document.dispatchEvent(new KeyboardEvent('keyup', { key: '/' }));
           fixture.detectChanges();
           expect(searchBox.focus).toHaveBeenCalled();
         });
@@ -790,7 +790,7 @@ describe('AppComponent', () => {
           const searchBox: SearchBoxComponent = fixture.debugElement.query(By.directive(SearchBoxComponent)).componentInstance;
           spyOn(searchBox, 'focus');
           component.showSearchResults = true;
-          window.document.dispatchEvent(new KeyboardEvent('keyup', { 'key': 'Escape' }));
+          window.document.dispatchEvent(new KeyboardEvent('keyup', { key: 'Escape' }));
           fixture.detectChanges();
           expect(searchBox.focus).toHaveBeenCalled();
         });
@@ -967,23 +967,23 @@ describe('AppComponent', () => {
 
         // Initially, `isTransitoning` is true.
         expect(component.isTransitioning).toBe(true);
-        expect(toolbar.classes['transitioning']).toBe(true);
+        expect(toolbar.classes.transitioning).toBe(true);
 
         triggerDocViewerEvent('docRendered');
         fixture.detectChanges();
         expect(component.isTransitioning).toBe(false);
-        expect(toolbar.classes['transitioning']).toBeFalsy();
+        expect(toolbar.classes.transitioning).toBeFalsy();
 
         // While a document is being rendered, `isTransitoning` is set to true.
         triggerDocViewerEvent('docReady');
         fixture.detectChanges();
         expect(component.isTransitioning).toBe(true);
-        expect(toolbar.classes['transitioning']).toBe(true);
+        expect(toolbar.classes.transitioning).toBe(true);
 
         triggerDocViewerEvent('docRendered');
         fixture.detectChanges();
         expect(component.isTransitioning).toBe(false);
-        expect(toolbar.classes['transitioning']).toBeFalsy();
+        expect(toolbar.classes.transitioning).toBeFalsy();
       });
 
       it('should update the sidenav state as soon as a new document is inserted (but not before)', () => {
@@ -1030,15 +1030,15 @@ describe('AppComponent', () => {
 
         navigateTo('guide/pipes');
         expect(component.pageId).toEqual('guide-pipes');
-        expect(container.properties['id']).toEqual('guide-pipes');
+        expect(container.properties.id).toEqual('guide-pipes');
 
         navigateTo('news');
         expect(component.pageId).toEqual('news');
-        expect(container.properties['id']).toEqual('news');
+        expect(container.properties.id).toEqual('news');
 
         navigateTo('');
         expect(component.pageId).toEqual('home');
-        expect(container.properties['id']).toEqual('home');
+        expect(container.properties.id).toEqual('home');
       });
 
       it('should not be affected by changes to the query', () => {
@@ -1049,7 +1049,7 @@ describe('AppComponent', () => {
         navigateTo('guide/other?search=http');
 
         expect(component.pageId).toEqual('guide-other');
-        expect(container.properties['id']).toEqual('guide-other');
+        expect(container.properties.id).toEqual('guide-other');
       });
     });
 
@@ -1124,7 +1124,7 @@ describe('AppComponent', () => {
 
       function checkHostClass(type: string, value: string) {
         const host = fixture.debugElement;
-        const classes: string = host.properties['className'];
+        const classes: string = host.properties.className;
         const classArray = classes.split(' ').filter(c => c.indexOf(`${type}-`) === 0);
         expect(classArray.length).toBeLessThanOrEqual(1, `"${classes}" should have only one class matching ${type}-*`);
         expect(classArray).toEqual([`${type}-${value}`], `"${classes}" should contain ${type}-${value}`);
@@ -1305,42 +1305,42 @@ class TestHttpClient {
 
   // tslint:disable:quotemark
   navJson = {
-    "TopBar": [
+    TopBar: [
       {
-        "url": "features",
-        "title": "Features"
+        url: 'features',
+        title: 'Features',
       },
       {
-        "url": "no-title",
-        "title": "No Title"
+        url: 'no-title',
+        title: 'No Title',
       },
     ],
-    "SideNav": [
+    SideNav: [
       {
-      "title": "Core",
-      "tooltip": "Learn the core capabilities of Angular",
-      "children": [
+        title: 'Core',
+        tooltip: 'Learn the core capabilities of Angular',
+        children: [
           {
-            "url": "guide/pipes",
-            "title": "Pipes",
-            "tooltip": "Pipes transform displayed values within a template."
+            url: 'guide/pipes',
+            title: 'Pipes',
+            tooltip: 'Pipes transform displayed values within a template.',
           },
           {
-            "url": "guide/bags",
-            "title": "Bags",
-            "tooltip": "Pack your bags for a code adventure."
-          }
-        ]
+            url: 'guide/bags',
+            title: 'Bags',
+            tooltip: 'Pack your bags for a code adventure.',
+          },
+        ],
       },
       {
-        "url": "api",
-        "title": "API",
-        "tooltip": "Details of the Angular classes and values."
-      }
+        url: 'api',
+        title: 'API',
+        tooltip: 'Details of the Angular classes and values.',
+      },
     ],
-    "docVersions": TestHttpClient.docVersions,
+    docVersions: TestHttpClient.docVersions,
 
-    "__versionInfo": TestHttpClient.versionInfo,
+    __versionInfo: TestHttpClient.versionInfo,
   };
 
   get(url: string) {
diff --git a/aio/src/app/app.component.ts b/aio/src/app/app.component.ts
index 42826349bf7e6..bc07be293075c 100644
--- a/aio/src/app/app.component.ts
+++ b/aio/src/app/app.component.ts
@@ -147,7 +147,7 @@ export class AppComponent implements OnInit {
     // Compute the version picker list from the current version and the versions in the navigation map
     combineLatest([
       this.navigationService.versionInfo,
-      this.navigationService.navigationViews.pipe(map(views => views['docVersions'])),
+      this.navigationService.navigationViews.pipe(map(views => views.docVersions)),
     ]).subscribe(([versionInfo, versions]) => {
       // TODO(pbd): consider whether we can lookup the stable and next versions from the internet
       const computedVersions: NavigationNode[] = [
@@ -167,10 +167,10 @@ export class AppComponent implements OnInit {
     });
 
     this.navigationService.navigationViews.subscribe(views => {
-      this.footerNodes = views['Footer'] || [];
-      this.sideNavNodes = views['SideNav'] || [];
-      this.topMenuNodes = views['TopBar'] || [];
-      this.topMenuNarrowNodes = views['TopBarNarrow'] || this.topMenuNodes;
+      this.footerNodes = views.Footer || [];
+      this.sideNavNodes = views.SideNav || [];
+      this.topMenuNodes = views.TopBar || [];
+      this.topMenuNarrowNodes = views.TopBarNarrow || this.topMenuNodes;
     });
 
     this.navigationService.versionInfo.subscribe(vi => this.versionInfo = vi);
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 0c7a18a667075..fb97db2c38767 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
@@ -223,77 +223,77 @@ class TestApiService {
 // tslint:disable:quotemark
 const apiSections: ApiSection[] = [
   {
-    "name": "common",
-    "title": "common",
-    "path": "api/common",
-    "deprecated": false,
-    "items": [
+    name: 'common',
+    title: 'common',
+    path: 'api/common',
+    deprecated: false,
+    items: [
       {
-        "name": "class_1",
-        "title": "Class 1",
-        "path": "api/common/class_1",
-        "docType": "class",
-        "stability": "experimental",
-        "securityRisk": false,
+        name: 'class_1',
+        title: 'Class 1',
+        path: 'api/common/class_1',
+        docType: 'class',
+        stability: 'experimental',
+        securityRisk: false,
       },
       {
-        "name": "class_2",
-        "title": "Class 2",
-        "path": "api/common/class_2",
-        "docType": "class",
-        "stability": "stable",
-        "securityRisk": false,
+        name: 'class_2',
+        title: 'Class 2',
+        path: 'api/common/class_2',
+        docType: 'class',
+        stability: 'stable',
+        securityRisk: false,
       },
       {
-        "name": "directive_1",
-        "title": "Directive 1",
-        "path": "api/common/directive_1",
-        "docType": "directive",
-        "stability": "stable",
-        "securityRisk": true,
+        name: 'directive_1',
+        title: 'Directive 1',
+        path: 'api/common/directive_1',
+        docType: 'directive',
+        stability: 'stable',
+        securityRisk: true,
       },
       {
-        "name": "pipe_1",
-        "title": "Pipe 1",
-        "path": "api/common/pipe_1",
-        "docType": "pipe",
-        "stability": "stable",
-        "securityRisk": true,
+        name: 'pipe_1',
+        title: 'Pipe 1',
+        path: 'api/common/pipe_1',
+        docType: 'pipe',
+        stability: 'stable',
+        securityRisk: true,
       },
-    ]
+    ],
   },
   {
-    "name": "core",
-    "title": "core",
-    "path": "api/core",
-    "deprecated": false,
-    "items": [
+    name: 'core',
+    title: 'core',
+    path: 'api/core',
+    deprecated: false,
+    items: [
       {
-        "name": "class_3",
-        "title": "Class 3",
-        "path": "api/core/class_3",
-        "docType": "class",
-        "stability": "experimental",
-        "securityRisk": false,
+        name: 'class_3',
+        title: 'Class 3',
+        path: 'api/core/class_3',
+        docType: 'class',
+        stability: 'experimental',
+        securityRisk: false,
       },
       {
-        "name": "function_1",
-        "title": "Function 1",
-        "path": "api/core/function 1",
-        "docType": "function",
-        "stability": "deprecated",
-        "securityRisk": true,
+        name: 'function_1',
+        title: 'Function 1',
+        path: 'api/core/function 1',
+        docType: 'function',
+        stability: 'deprecated',
+        securityRisk: true,
       },
       {
-        "name": "const_1",
-        "title": "Const 1",
-        "path": "api/core/const_1",
-        "docType": "const",
-        "stability": "stable",
-        "securityRisk": false,
-      }
-    ]
-  }
+        name: 'const_1',
+        title: 'Const 1',
+        path: 'api/core/const_1',
+        docType: 'const',
+        stability: 'stable',
+        securityRisk: false,
+      },
+    ],
+  },
 ];
 
 function getApiSections() { return apiSections; }
diff --git a/aio/src/app/custom-elements/api/api.service.ts b/aio/src/app/custom-elements/api/api.service.ts
index ae94866a4b1f7..b6ca5ea26d5a9 100644
--- a/aio/src/app/custom-elements/api/api.service.ts
+++ b/aio/src/app/custom-elements/api/api.service.ts
@@ -67,7 +67,7 @@ export class ApiService implements OnDestroy {
   * API sections is an array of Angular top modules and metadata about their API documents (items).
   * Updates `sections` observable
   *
-  * @param {string} [src] - Name of the api list JSON file
+  * @param [src] - Name of the api list JSON file
   */
   fetchSections(src?: string) {
     // TODO: get URL by configuration?
diff --git a/aio/src/app/custom-elements/code/pretty-printer.service.ts b/aio/src/app/custom-elements/code/pretty-printer.service.ts
index 24538d8702b03..0f234dd7871d4 100644
--- a/aio/src/app/custom-elements/code/pretty-printer.service.ts
+++ b/aio/src/app/custom-elements/code/pretty-printer.service.ts
@@ -20,13 +20,13 @@ export class PrettyPrinter {
   }
 
   private getPrettyPrintOne(): Promise<PrettyPrintOne> {
-    const ppo = (window as any)['prettyPrintOne'];
+    const ppo = (window as any).prettyPrintOne;
     return ppo ? Promise.resolve(ppo) :
       // `prettyPrintOne` is not on `window`, which means `prettify.js` has not been loaded yet.
       // Import it; ad a side-effect it will add `prettyPrintOne` on `window`.
       import('assets/js/prettify.js' as any)
         .then(
-          () => (window as any)['prettyPrintOne'],
+          () => (window as any).prettyPrintOne,
           err => {
             const msg = `Cannot get prettify.js from server: ${err.message}`;
             this.logger.error(new Error(msg));
@@ -37,9 +37,9 @@ export class PrettyPrinter {
 
   /**
    * Format code snippet as HTML
-   * @param {string} code - the code snippet to format; should already be HTML encoded
-   * @param {string} [language] - The language of the code to render (could be javascript, html, typescript, etc)
-   * @param {string|number} [linenums] - Whether to display line numbers:
+   * @param code - the code snippet to format; should already be HTML encoded
+   * @param [language] - The language of the code to render (could be javascript, html, typescript, etc)
+   * @param [linenums] - Whether to display line numbers:
    *  - false: don't display
    *  - true: do display
    *  - number: do display but start at the given number
diff --git a/aio/src/app/custom-elements/contributor/contributor-list.component.spec.ts b/aio/src/app/custom-elements/contributor/contributor-list.component.spec.ts
index 48d9bd20805f0..ccf426558a634 100644
--- a/aio/src/app/custom-elements/contributor/contributor-list.component.spec.ts
+++ b/aio/src/app/custom-elements/contributor/contributor-list.component.spec.ts
@@ -1,4 +1,4 @@
-import { ReflectiveInjector } from '@angular/core';
+import { Injector } from '@angular/core';
 
 import { of } from 'rxjs';
 
@@ -12,20 +12,22 @@ import { LocationService } from 'app/shared/location.service';
 describe('ContributorListComponent', () => {
 
   let component: ContributorListComponent;
-  let injector: ReflectiveInjector;
+  let injector: Injector;
   let contributorService: TestContributorService;
   let locationService: TestLocationService;
   let contributorGroups: ContributorGroup[];
 
   beforeEach(() => {
-    injector = ReflectiveInjector.resolveAndCreate([
-      ContributorListComponent,
-      {provide: ContributorService, useClass: TestContributorService },
-      {provide: LocationService, useClass: TestLocationService }
-    ]);
-
-    locationService = injector.get(LocationService);
-    contributorService = injector.get(ContributorService);
+    injector = Injector.create({
+      providers: [
+        {provide: ContributorListComponent, deps: [ContributorService, LocationService] },
+        {provide: ContributorService, useClass: TestContributorService, deps: [] },
+        {provide: LocationService, useClass: TestLocationService, deps: [] }
+      ]
+    });
+
+    locationService = injector.get(LocationService) as unknown as TestLocationService;
+    contributorService = injector.get(ContributorService) as unknown as TestContributorService;
     contributorGroups = contributorService.testContributors;
   });
 
@@ -61,7 +63,7 @@ describe('ContributorListComponent', () => {
   it('should set the query to the "GDE" group when user selects "GDE"', () => {
     component = getComponent();
     component.selectGroup('GDE');
-    expect(locationService.searchResult['group']).toBe('GDE');
+    expect(locationService.searchResult.group).toBe('GDE');
   });
 
   it('should set the query to the first group when user selects unknown name', () => {
@@ -69,7 +71,7 @@ describe('ContributorListComponent', () => {
     component.selectGroup('GDE'); // a legit group that isn't the first
 
     component.selectGroup('foo'); // not a legit group name
-    expect(locationService.searchResult['group']).toBe('Angular');
+    expect(locationService.searchResult.group).toBe('Angular');
   });
 
   //// Test Helpers ////
diff --git a/aio/src/app/custom-elements/contributor/contributor-list.component.ts b/aio/src/app/custom-elements/contributor/contributor-list.component.ts
index e6887d5ac9630..fd0116fe971fb 100644
--- a/aio/src/app/custom-elements/contributor/contributor-list.component.ts
+++ b/aio/src/app/custom-elements/contributor/contributor-list.component.ts
@@ -29,7 +29,7 @@ export class ContributorListComponent implements OnInit {
     private locationService: LocationService) { }
 
   ngOnInit() {
-    const groupName =  this.locationService.search()['group'] || '';
+    const groupName =  this.locationService.search().group || '';
     // no need to unsubscribe because `contributors` completes
     this.contributorService.contributors
       .subscribe(grps => {
diff --git a/aio/src/app/custom-elements/element-registry.ts b/aio/src/app/custom-elements/element-registry.ts
index 57b12bf5eab30..be4036687f516 100644
--- a/aio/src/app/custom-elements/element-registry.ts
+++ b/aio/src/app/custom-elements/element-registry.ts
@@ -40,6 +40,10 @@ export const ELEMENT_MODULE_LOAD_CALLBACKS_AS_ROUTES = [
   {
     selector: 'live-example',
     loadChildren: () => import('./live-example/live-example.module').then(m => m.LiveExampleModule)
+  },
+  {
+    selector: 'aio-events',
+    loadChildren: () => import('./events/events.module').then(m => m.EventsModule)
   }
 ];
 
diff --git a/aio/src/app/custom-elements/events/events.component.html b/aio/src/app/custom-elements/events/events.component.html
new file mode 100644
index 0000000000000..17e5f10b22fd4
--- /dev/null
+++ b/aio/src/app/custom-elements/events/events.component.html
@@ -0,0 +1,43 @@
+<p>Where we'll be presenting:</p>
+<table class="is-full-width">
+  <thead>
+    <tr>
+      <th>Event</th>
+      <th>Location</th>
+      <th>Date</th>
+    </tr>
+  </thead>
+  <tbody >
+    <tr *ngFor="let event of upcomingEvents">
+      <th><a href="{{event.linkUrl}}" title="{{event.tooltip}}">{{event.name}}</a></th>
+      <td>{{event.location}}</td>
+      <td>
+        <div>
+          {{getEventDates(event)}}
+        </div>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+<p>Where we already presented:</p>
+<table class="is-full-width">
+  <thead>
+    <tr>
+      <th>Event</th>
+      <th>Location</th>
+      <th>Date</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr *ngFor="let event of pastEvents">
+      <th><a href="{{event.linkUrl}}" title="{{event.tooltip}}">{{event.name}}</a></th>
+      <td>{{event.location}}</td>
+      <td>
+        <div>
+          {{getEventDates(event)}}
+        </div>
+      </td>
+    </tr>
+  </tbody>
+</table>
diff --git a/aio/src/app/custom-elements/events/events.component.spec.ts b/aio/src/app/custom-elements/events/events.component.spec.ts
new file mode 100644
index 0000000000000..e84f25053bbea
--- /dev/null
+++ b/aio/src/app/custom-elements/events/events.component.spec.ts
@@ -0,0 +1,231 @@
+import { Injector } from '@angular/core';
+import { Subject } from 'rxjs';
+import { Duration, Event, EventsComponent } from './events.component';
+import { EventsService } from './events.service';
+
+describe('EventsComponent', () => {
+  let component: EventsComponent;
+  let injector: Injector;
+  let eventsService: TestEventsService;
+
+  beforeEach(() => {
+    injector = Injector.create({
+      providers: [
+        { provide: EventsComponent, deps: [EventsService] } ,
+        { provide: EventsService, useClass: TestEventsService, deps: [] },
+      ]
+    });
+    eventsService = injector.get(EventsService) as unknown as TestEventsService;
+    component = injector.get(EventsComponent) as unknown as EventsComponent;
+  });
+
+  it('should have no pastEvents when first created', () => {
+    expect(component.pastEvents).toBeUndefined();
+  });
+
+  it('should have no upcoming when first created', () => {
+    expect(component.upcomingEvents).toBeUndefined();
+  });
+
+  describe('ngOnInit()', () => {
+    beforeEach(() => {
+      jasmine.clock().install();
+      jasmine.clock().mockDate(new Date(2020, 5, 15, 23, 59, 59));
+      component.ngOnInit();
+    });
+
+    afterEach(() => jasmine.clock().uninstall());
+
+    it('should separate past and upcoming events', () => {
+      eventsService.events.next([
+        createMockEvent(
+            'Upcoming event 1',
+            {start: '2020-06-16', end: '2020-06-17'},
+            {start: '2020-06-18', end: '2020-06-18'}),
+        createMockEvent(
+            'Upcoming event 3',
+            {start: '2222-01-01', end: '2222-01-02'}),
+        createMockEvent(
+            'Past event 2',
+            {start: '2020-06-13', end: '2020-06-14'}),
+        createMockEvent(
+            'Upcoming event 2',
+            {start: '2020-06-17', end: '2020-06-18'},
+            {start: '2020-06-16', end: '2020-06-16'}),
+        createMockEvent(
+            'Past event 1',
+            {start: '2020-05-30', end: '2020-05-31'}),
+        createMockEvent(
+            'Past event 3',
+            {start: '2020-06-14', end: '2020-06-14'},
+            {start: '2020-06-16', end: '2020-06-17'}),
+      ]);
+
+      expect(component.pastEvents.map(evt => evt.name)).toEqual(jasmine.arrayWithExactContents(
+          ['Past event 1', 'Past event 2', 'Past event 3']));
+
+      expect(component.upcomingEvents.map(evt => evt.name)).toEqual(jasmine.arrayWithExactContents(
+          ['Upcoming event 1', 'Upcoming event 2', 'Upcoming event 3']));
+    });
+
+    it('should order past events in reverse chronological order (ignoring workshops dates)', () => {
+      eventsService.events.next([
+        createMockEvent(
+            'Past event 2',
+            {start: '1999-12-13', end: '1999-12-14'},
+            {start: '1999-12-11', end: '1999-12-11'}),
+        createMockEvent(
+            'Past event 4',
+            {start: '2020-01-16', end: '2020-01-17'},
+            {start: '2020-01-14', end: '2020-01-15'}),
+        createMockEvent(
+            'Past event 3',
+            {start: '2020-01-15', end: '2020-01-16'},
+            {start: '2020-01-17', end: '2020-01-18'}),
+        createMockEvent(
+            'Past event 1',
+            {start: '1999-12-12', end: '1999-12-15'}),
+      ]);
+
+      expect(component.pastEvents.map(evt => evt.name)).toEqual(
+          ['Past event 4', 'Past event 3', 'Past event 2', 'Past event 1']);
+    });
+
+    it('should order upcoming events in chronological order (ignoring workshops dates)', () => {
+      eventsService.events.next([
+        createMockEvent(
+            'Upcoming event 2',
+            {start: '2020-12-13', end: '2020-12-14'},
+            {start: '2020-12-11', end: '2020-12-11'}),
+        createMockEvent(
+            'Upcoming event 4',
+            {start: '2021-01-16', end: '2021-01-17'},
+            {start: '2021-01-14', end: '2021-01-15'}),
+        createMockEvent(
+            'Upcoming event 3',
+            {start: '2021-01-15', end: '2021-01-16'},
+            {start: '2021-01-17', end: '2021-01-18'}),
+        createMockEvent(
+            'Upcoming event 1',
+            {start: '2020-12-12', end: '2020-12-15'}),
+      ]);
+
+      expect(component.upcomingEvents.map(evt => evt.name)).toEqual(
+          ['Upcoming event 1', 'Upcoming event 2', 'Upcoming event 3', 'Upcoming event 4']);
+    });
+
+    it('should treat ongoing events as upcoming', () => {
+      eventsService.events.next([
+        createMockEvent(
+            'Ongoing event 1',
+            {start: '2020-06-14', end: '2020-06-16'}),
+        createMockEvent(
+            'Ongoing event 2',
+            {start: '2020-06-14', end: '2020-06-15'},
+            {start: '2020-06-13', end: '2020-06-13'}),
+      ]);
+
+      expect(component.pastEvents).toEqual([]);
+      expect(component.upcomingEvents.map(evt => evt.name)).toEqual(jasmine.arrayWithExactContents(
+          ['Ongoing event 1', 'Ongoing event 2']));
+    });
+  });
+
+  describe('getEventDates()', () => {
+    describe('(without workshops)', () => {
+      it('should correctly format the main event date', () => {
+        const testEvent = createMockEvent('Test', {start: '2020-06-20', end: '2020-06-20'});
+        expect(component.getEventDates(testEvent)).toBe('June 20, 2020');
+      });
+
+      it('should correctly format the main event date spanning mupliple days', () => {
+        const testEvent = createMockEvent('Test', {start: '2019-09-19', end: '2019-09-21'});
+        expect(component.getEventDates(testEvent)).toBe('September 19-21, 2019');
+      });
+
+      it('should correctly format the main event date spanning mupliple months', () => {
+        const testEvent = createMockEvent('Test', {start: '2019-10-30', end: '2019-11-01'});
+        expect(component.getEventDates(testEvent)).toBe('October 30 - November 1, 2019');
+      });
+    });
+
+    describe('(with workshops)', () => {
+      it('should correctly format event dates with workshops after main event', () => {
+        const testEvent = createMockEvent(
+            'Test',
+            {start: '2020-07-25', end: '2020-07-26'},
+            {start: '2020-07-27', end: '2020-07-27'});
+
+        expect(component.getEventDates(testEvent))
+            .toBe('July 25-26 (conference), July 27 (workshops), 2020');
+      });
+
+      it('should correctly format event dates with workshops before main event', () => {
+        const testEvent = createMockEvent(
+            'Test',
+            {start: '2019-10-07', end: '2019-10-07'},
+            {start: '2019-10-06', end: '2019-10-06'});
+
+        expect(component.getEventDates(testEvent))
+            .toBe('October 6 (workshops), October 7 (conference), 2019');
+      });
+
+      it('should correctly format event dates spanning multiple days', () => {
+        const testEvent = createMockEvent(
+            'Test',
+            {start: '2019-08-30', end: '2019-08-31'},
+            {start: '2019-08-28', end: '2019-08-29'});
+
+        expect(component.getEventDates(testEvent))
+            .toBe('August 28-29 (workshops), August 30-31 (conference), 2019');
+      });
+
+      it('should correctly format event dates with workshops on different month before the main event',
+        () => {
+          const testEvent = createMockEvent(
+              'Test',
+              {start: '2020-08-01', end: '2020-08-02'},
+              {start: '2020-07-30', end: '2020-07-31'});
+
+          expect(component.getEventDates(testEvent))
+              .toBe('July 30-31 (workshops), August 1-2 (conference), 2020');
+        });
+
+      it('should correctly format event dates with workshops on different month after the main event',
+        () => {
+          const testEvent = createMockEvent(
+              'Test',
+              {start: '2020-07-30', end: '2020-07-31'},
+              {start: '2020-08-01', end: '2020-08-02'});
+
+          expect(component.getEventDates(testEvent))
+              .toBe('July 30-31 (conference), August 1-2 (workshops), 2020');
+        });
+
+      it('should correctly format event dates spanning multiple months', () => {
+        const testEvent = createMockEvent(
+            'Test',
+            {start: '2020-07-31', end: '2020-08-01'},
+            {start: '2020-07-30', end: '2020-08-01'});
+
+        expect(component.getEventDates(testEvent))
+            .toBe('July 30 - August 1 (workshops), July 31 - August 1 (conference), 2020');
+      });
+    });
+  });
+
+  // Helpers
+  class TestEventsService {
+    events = new Subject<Event[]>();
+  }
+
+  function createMockEvent(name: string, date: Duration, workshopsDate?: Duration): Event {
+    return {
+      name,
+      location: '',
+      linkUrl: '',
+      date,
+      workshopsDate,
+    };
+  }
+});
diff --git a/aio/src/app/custom-elements/events/events.component.ts b/aio/src/app/custom-elements/events/events.component.ts
new file mode 100644
index 0000000000000..9c9555054e931
--- /dev/null
+++ b/aio/src/app/custom-elements/events/events.component.ts
@@ -0,0 +1,102 @@
+import { Component, OnInit } from '@angular/core';
+
+import { EventsService } from './events.service';
+
+const DAY = 24 * 60 * 60 * 1000;
+const MONTHS = [
+  'January',
+  'February',
+  'March',
+  'April',
+  'May',
+  'June',
+  'July',
+  'August',
+  'September',
+  'October',
+  'November',
+  'December',
+];
+
+export type date = string; // of the format `YYYY-MM-DD`.
+export interface Duration {
+  start: date;
+  end: date;
+}
+
+export interface Event {
+  name: string;
+  location: string;
+  linkUrl: string;
+  tooltip?: string;
+  date: Duration;
+  workshopsDate?: Duration;
+}
+
+@Component({
+  selector: 'aio-events',
+  templateUrl: 'events.component.html'
+})
+export class EventsComponent implements OnInit {
+
+  pastEvents: Event[];
+  upcomingEvents: Event[];
+
+  constructor(private eventsService: EventsService) { }
+
+  ngOnInit() {
+    this.eventsService.events.subscribe(events => {
+      this.pastEvents = events
+          .filter(event => new Date(event.date.end).getTime() < Date.now() - DAY)
+          .sort((l: Event, r: Event) => isBefore(l.date, r.date) ? 1 : -1);
+
+      this.upcomingEvents = events
+          .filter(event => new Date(event.date.end).getTime() >= Date.now() - DAY)
+          .sort((l: Event, r: Event) => isBefore(l.date, r.date) ? -1 : 1);
+    });
+  }
+
+  getEventDates(event: Event) {
+    let dateString;
+
+    // Check if there is a workshop
+    if (event.workshopsDate) {
+      const mainEventDateString = `${processDate(event.date)} (conference)`;
+      const workshopsDateString = `${processDate(event.workshopsDate)} (workshops)`;
+      const areWorkshopsBeforeEvent = isBefore(event.workshopsDate, event.date);
+
+      dateString = areWorkshopsBeforeEvent ?
+          `${workshopsDateString}, ${mainEventDateString}` :
+          `${mainEventDateString}, ${workshopsDateString}`;
+    } else {
+      // If no work shop date create conference date string
+      dateString = processDate(event.date);
+    }
+    dateString = `${dateString}, ${new Date(event.date.end).getFullYear()}`;
+    return dateString;
+  }
+}
+
+function processDate(dates: Duration) {
+  // Covert Date sting to date object for comparisons
+  const startDate = new Date(dates.start);
+  const endDate = new Date(dates.end);
+
+  // Create a date string in the start like January 31
+  let processedDate = `${MONTHS[startDate.getMonth()]} ${startDate.getDate()}`;
+
+  // If they are in different months add the string '- February 2' Making the final string January 31 - February 2
+  if (startDate.getMonth() !== endDate.getMonth()) {
+    processedDate = `${processedDate} - ${MONTHS[endDate.getMonth()]} ${endDate.getDate()}`;
+  } else if (startDate.getDate() !== endDate.getDate()) {
+    // If not add - date eg it will make // January 30-31
+    processedDate = `${processedDate}-${endDate.getDate()}`;
+  }
+
+  return processedDate;
+}
+
+function isBefore(duration1: Duration, duration2: Duration): boolean {
+  return (duration1.start < duration2.start) ||
+      (duration1.start === duration2.start && duration1.end < duration2.end);
+}
diff --git a/aio/src/app/custom-elements/events/events.module.ts b/aio/src/app/custom-elements/events/events.module.ts
new file mode 100644
index 0000000000000..04803e7e6a668
--- /dev/null
+++ b/aio/src/app/custom-elements/events/events.module.ts
@@ -0,0 +1,15 @@
+import { NgModule, Type } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { EventsComponent } from './events.component';
+import { EventsService } from './events.service';
+import { WithCustomElementComponent } from '../element-registry';
+
+@NgModule({
+  imports: [ CommonModule ],
+  declarations: [ EventsComponent ],
+  entryComponents: [ EventsComponent ],
+  providers: [ EventsService]
+})
+export class EventsModule implements WithCustomElementComponent {
+  customElementComponent: Type<any> = EventsComponent;
+}
diff --git a/aio/src/app/custom-elements/events/events.service.spec.ts b/aio/src/app/custom-elements/events/events.service.spec.ts
new file mode 100644
index 0000000000000..5102e017035fd
--- /dev/null
+++ b/aio/src/app/custom-elements/events/events.service.spec.ts
@@ -0,0 +1,56 @@
+import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+import { Injector } from '@angular/core';
+import { TestBed } from '@angular/core/testing';
+
+import { EventsService } from './events.service';
+import { Logger } from 'app/shared/logger.service';
+import { MockLogger } from 'testing/logger.service';
+
+describe('EventsService', () => {
+
+  let injector: Injector;
+  let eventsService: EventsService;
+  let httpMock: HttpTestingController;
+  let mockLogger: MockLogger;
+
+  beforeEach(() => {
+    injector = TestBed.configureTestingModule({
+      imports: [HttpClientTestingModule],
+      providers: [
+        EventsService,
+        { provide: Logger, useClass: MockLogger }
+      ]
+    });
+
+    eventsService = injector.get<EventsService>(EventsService);
+    mockLogger = injector.get(Logger) as any;
+    httpMock = injector.get(HttpTestingController);
+  });
+
+  afterEach(() => httpMock.verify());
+
+  it('should make a single connection to the server', () => {
+    eventsService.events.subscribe();
+    eventsService.events.subscribe();
+    httpMock.expectOne('generated/events.json');
+    expect().nothing();  // Prevent jasmine from complaining about no expectations.
+  });
+
+  it('should handle a failed request for `events.json`', () => {
+    const request = httpMock.expectOne('generated/events.json');
+    request.error(new ErrorEvent('404'));
+    expect(mockLogger.output.error).toEqual([
+      [jasmine.any(Error)]
+    ]);
+    expect(mockLogger.output.error[0][0].message).toMatch(/^generated\/events\.json request failed:/);
+  });
+
+  it('should return an empty array on a failed request for `events.json`', done => {
+    const request = httpMock.expectOne('generated/events.json');
+    request.error(new ErrorEvent('404'));
+    eventsService.events.subscribe(results => {
+      expect(results).toEqual([]);
+      done();
+    });
+  });
+});
diff --git a/aio/src/app/custom-elements/events/events.service.ts b/aio/src/app/custom-elements/events/events.service.ts
new file mode 100644
index 0000000000000..c4d8ecd0e257d
--- /dev/null
+++ b/aio/src/app/custom-elements/events/events.service.ts
@@ -0,0 +1,32 @@
+import { Injectable } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+
+import { ConnectableObservable, Observable, of } from 'rxjs';
+import { catchError, publishLast } from 'rxjs/operators';
+
+import { Event } from './events.component';
+import { CONTENT_URL_PREFIX } from 'app/documents/document.service';
+import { Logger } from 'app/shared/logger.service';
+
+const eventsPath = CONTENT_URL_PREFIX + 'events.json';
+
+@Injectable()
+export class EventsService {
+  events: Observable<Event[]>;
+
+  constructor(private http: HttpClient, private logger: Logger) {
+    this.events = this.getEvents();
+  }
+
+  private getEvents() {
+    const events = this.http.get<any>(eventsPath).pipe(
+      catchError(error => {
+        this.logger.error(new Error(`${eventsPath} request failed: ${error.message}`));
+        return of([]);
+      }),
+      publishLast()
+    );
+    (events as ConnectableObservable<Event[]>).connect();
+    return events;
+  }
+}
diff --git a/aio/src/app/custom-elements/resource/resource-list.component.spec.ts b/aio/src/app/custom-elements/resource/resource-list.component.spec.ts
index 60a9374252423..11c31ff2413dc 100644
--- a/aio/src/app/custom-elements/resource/resource-list.component.spec.ts
+++ b/aio/src/app/custom-elements/resource/resource-list.component.spec.ts
@@ -1,4 +1,4 @@
-import { ReflectiveInjector } from '@angular/core';
+import { Injector } from '@angular/core';
 
 import { of } from 'rxjs';
 
@@ -12,20 +12,22 @@ import { Category } from './resource.model';
 describe('ResourceListComponent', () => {
 
   let component: ResourceListComponent;
-  let injector: ReflectiveInjector;
+  let injector: Injector;
   let resourceService: TestResourceService;
   let locationService: TestLocationService;
   let categories: Category[];
 
   beforeEach(() => {
-    injector = ReflectiveInjector.resolveAndCreate([
-      ResourceListComponent,
-      {provide: ResourceService, useClass: TestResourceService },
-      {provide: LocationService, useClass: TestLocationService }
-    ]);
-
-    locationService = injector.get(LocationService);
-    resourceService = injector.get(ResourceService);
+    injector = Injector.create({
+      providers: [
+        {provide: ResourceListComponent, deps: [ResourceService, LocationService] },
+        {provide: ResourceService, useClass: TestResourceService, deps: [] },
+        {provide: LocationService, useClass: TestLocationService, deps: [] }
+      ]
+    });
+
+    locationService = injector.get(LocationService) as unknown as TestLocationService;
+    resourceService = injector.get(ResourceService) as unknown as TestResourceService;
     categories = resourceService.testCategories;
   });
 
@@ -61,7 +63,7 @@ describe('ResourceListComponent', () => {
   it('should set the query to the "education" category when user selects "education"', () => {
     component = getComponent();
     component.selectCategory('education');
-    expect(locationService.searchResult['category']).toBe('education');
+    expect(locationService.searchResult.category).toBe('education');
   });
 
   it('should set the query to the first category when user selects unknown name', () => {
@@ -69,7 +71,7 @@ describe('ResourceListComponent', () => {
     component.selectCategory('education'); // a legit group that isn't the first
 
     component.selectCategory('foo'); // not a legit group name
-    expect(locationService.searchResult['category']).toBe('development');
+    expect(locationService.searchResult.category).toBe('development');
   });
 
   //// Test Helpers ////
diff --git a/aio/src/app/custom-elements/resource/resource-list.component.ts b/aio/src/app/custom-elements/resource/resource-list.component.ts
index 6b48195fa8c11..63be0ec155003 100644
--- a/aio/src/app/custom-elements/resource/resource-list.component.ts
+++ b/aio/src/app/custom-elements/resource/resource-list.component.ts
@@ -20,7 +20,7 @@ export class ResourceListComponent implements OnInit {
   }
 
   ngOnInit() {
-    const category =  this.locationService.search()['category'] || '';
+    const category =  this.locationService.search().category || '';
     // Not using async pipe because cats appear twice in template
     // No need to unsubscribe because categories observable completes.
     this.resourceService.categories.subscribe(cats => {
diff --git a/aio/src/app/custom-elements/resource/resource.service.spec.ts b/aio/src/app/custom-elements/resource/resource.service.spec.ts
index 2d9f3a4d5ba7a..032c11d32509d 100644
--- a/aio/src/app/custom-elements/resource/resource.service.spec.ts
+++ b/aio/src/app/custom-elements/resource/resource.service.spec.ts
@@ -86,62 +86,61 @@ describe('ResourceService', () => {
 });
 
 function getTestResources() {
-  // tslint:disable:quotemark
   return {
-    "Cat 3": {
-      "order": 3,
-      "subCategories": {
-        "Cat3 SubCat1": {
-          "order": 2,
-          "resources": {
-            "Cat3 SubCat1 Res1": {
-              "desc": "Meetup in Barcelona, Spain. ",
-              "title": "Angular Beers",
-              "url": "http://www.meetup.com/AngularJS-Beers/"
+    'Cat 3': {
+      order: 3,
+      subCategories: {
+        'Cat3 SubCat1': {
+          order: 2,
+          resources: {
+            'Cat3 SubCat1 Res1': {
+              desc: 'Meetup in Barcelona, Spain. ',
+              title: 'Angular Beers',
+              url: 'http://www.meetup.com/AngularJS-Beers/',
             },
-            "Cat3 SubCat1 Res2": {
-              "desc": "Angular Camps in Barcelona, Spain.",
-              "title": "Angular Camp",
-              "url": "http://angularcamp.org/"
-            }
-          }
+            'Cat3 SubCat1 Res2': {
+              desc: 'Angular Camps in Barcelona, Spain.',
+              title: 'Angular Camp',
+              url: 'http://angularcamp.org/',
+            },
+          },
         },
-        "Cat3 SubCat2": {
-          "order": 1,
-          "resources": {
-            "Cat3 SubCat2 Res1": {
-              "desc": "A community index of components and libraries",
-              "title": "Catalog of Angular Components & Libraries",
-              "url": "https://a/b/c"
-            }
-          }
+        'Cat3 SubCat2': {
+          order: 1,
+          resources: {
+            'Cat3 SubCat2 Res1': {
+              desc: 'A community index of components and libraries',
+              title: 'Catalog of Angular Components & Libraries',
+              url: 'https://a/b/c',
+            },
+          },
         },
-      }
+      },
     },
-    "Cat 1": {
-      "order": 1,
-      "subCategories": {
-        "Cat1 SubCat1": {
-          "order": 1,
-          "resources": {
-            "S S S": {
-              "desc": "SSS",
-              "title": "Sssss",
-              "url": "http://s/s/s"
+    'Cat 1': {
+      order: 1,
+      subCategories: {
+        'Cat1 SubCat1': {
+          order: 1,
+          resources: {
+            'S S S': {
+              desc: 'SSS',
+              title: 'Sssss',
+              url: 'http://s/s/s',
             },
-            "A A A": {
-             "desc": "AAA",
-              "title": "Aaaa",
-              "url": "http://a/a/a"
+            'A A A': {
+              desc: 'AAA',
+              title: 'Aaaa',
+              url: 'http://a/a/a',
             },
-            "Z Z Z": {
-             "desc": "ZZZ",
-              "title": "Zzzzz",
-              "url": "http://z/z/z"
-            }
-          }
+            'Z Z Z': {
+              desc: 'ZZZ',
+              title: 'Zzzzz',
+              url: 'http://z/z/z',
+            },
+          },
         },
       },
-    }
+    },
   };
 }
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 2661dfc5338e7..0fce7f88cd431 100644
--- a/aio/src/app/layout/doc-viewer/doc-viewer.component.ts
+++ b/aio/src/app/layout/doc-viewer/doc-viewer.component.ts
@@ -21,7 +21,7 @@ const initialDocViewerContent = initialDocViewerElement ? initialDocViewerElemen
   selector: 'aio-doc-viewer',
   template: ''
   // TODO(robwormald): shadow DOM and emulated don't work here (?!)
-  // encapsulation: ViewEncapsulation.Native
+  // encapsulation: ViewEncapsulation.ShadowDom
 })
 export class DocViewerComponent implements OnDestroy {
   // Enable/Disable view transition animations.
diff --git a/aio/src/app/navigation/navigation.service.spec.ts b/aio/src/app/navigation/navigation.service.spec.ts
index 028b357979adb..96fc80b95bbf9 100644
--- a/aio/src/app/navigation/navigation.service.spec.ts
+++ b/aio/src/app/navigation/navigation.service.spec.ts
@@ -86,7 +86,7 @@ describe('NavigationService', () => {
     ];
 
     beforeEach(() => {
-      navService.navigationViews.subscribe(views => view = views['sideNav']);
+      navService.navigationViews.subscribe(views => view = views.sideNav);
       httpMock.expectOne({}).flush({sideNav});
     });
 
@@ -254,7 +254,7 @@ describe('NavigationService', () => {
         {...v, ...{ tooltip: v.title + '.'}})
       );
 
-      navService.navigationViews.subscribe(views => actualDocVersions = views['docVersions']);
+      navService.navigationViews.subscribe(views => actualDocVersions = views.docVersions);
     });
 
     it('should extract the docVersions', () => {
diff --git a/aio/src/app/search/search-box/search-box.component.ts b/aio/src/app/search/search-box/search-box.component.ts
index 737b3ac1fba33..bced17ccf8d6c 100644
--- a/aio/src/app/search/search-box/search-box.component.ts
+++ b/aio/src/app/search/search-box/search-box.component.ts
@@ -41,7 +41,7 @@ export class SearchBoxComponent implements AfterViewInit {
    * When we first show this search box we trigger a search if there is a search query in the URL
    */
   ngAfterViewInit() {
-    const query = this.locationService.search()['search'];
+    const query = this.locationService.search().search;
     if (query) {
       this.query = this.decodeQuery(query);
       this.doSearch();
diff --git a/aio/src/app/search/search.service.spec.ts b/aio/src/app/search/search.service.spec.ts
index 4fad506ac05de..906236f16178c 100644
--- a/aio/src/app/search/search.service.spec.ts
+++ b/aio/src/app/search/search.service.spec.ts
@@ -1,4 +1,4 @@
-import { ReflectiveInjector, NgZone } from '@angular/core';
+import { Injector, NgZone } from '@angular/core';
 import { fakeAsync, tick } from '@angular/core/testing';
 import { of } from 'rxjs';
 import { SearchService } from './search.service';
@@ -6,7 +6,7 @@ import { WebWorkerClient } from 'app/shared/web-worker';
 
 describe('SearchService', () => {
 
-  let injector: ReflectiveInjector;
+  let injector: Injector;
   let service: SearchService;
   let sendMessageSpy: jasmine.Spy;
   let mockWorker: WebWorkerClient;
@@ -16,10 +16,13 @@ describe('SearchService', () => {
     mockWorker = { sendMessage: sendMessageSpy } as any;
     spyOn(WebWorkerClient, 'create').and.returnValue(mockWorker);
 
-    injector = ReflectiveInjector.resolveAndCreate([
-        SearchService,
-        { provide: NgZone, useFactory: () => new NgZone({ enableLongStackTrace: false }) }
-    ]);
+    injector = Injector.create({
+      providers: [
+        { provide: SearchService, deps: [NgZone]},
+        { provide: NgZone, useFactory: () => new NgZone({ enableLongStackTrace: false }), deps: [] }
+      ]
+    });
+
     service = injector.get(SearchService);
   });
 
diff --git a/aio/src/app/search/search.worker.ts b/aio/src/app/search/search.worker.ts
index 2482bb9085627..153416a680d40 100644
--- a/aio/src/app/search/search.worker.ts
+++ b/aio/src/app/search/search.worker.ts
@@ -26,7 +26,7 @@ function createIndex(loadIndexFn: IndexLoader): lunr.Index {
   // The lunr typings are missing QueryLexer so we have to add them here manually.
   const queryLexer = (lunr as any as { QueryLexer: { termSeparator: RegExp } }).QueryLexer;
   queryLexer.termSeparator = lunr.tokenizer.separator = /\s+/;
-  return lunr(/** @this */function() {
+  return lunr(function() {
     this.ref('path');
     this.field('topics', { boost: 15 });
     this.field('titleWords', { boost: 10 });
@@ -44,7 +44,7 @@ function handleMessage(message: { data: WebWorkerMessage }): void {
   const payload = message.data.payload;
   switch (type) {
     case 'load-index':
-      makeRequest(SEARCH_TERMS_URL, function(searchInfo: PageInfo[]) {
+      makeRequest(SEARCH_TERMS_URL, (searchInfo: PageInfo[]) => {
         index = createIndex(loadIndex(searchInfo));
         postMessage({ type, id, payload: true });
       });
@@ -94,7 +94,7 @@ function queryIndex(query: string): PageInfo[] {
         results = index.search(query + ' ' + titleQuery);
       }
       // Map the hits into info about each page to be returned as results
-      return results.map(function(hit) { return pages[hit.ref]; });
+      return results.map(hit => pages[hit.ref]);
     }
   } catch (e) {
     // If the search query cannot be parsed the index throws an error
diff --git a/aio/src/app/shared/deployment.service.spec.ts b/aio/src/app/shared/deployment.service.spec.ts
index 34df4ec92e952..5c19ee20164a3 100644
--- a/aio/src/app/shared/deployment.service.spec.ts
+++ b/aio/src/app/shared/deployment.service.spec.ts
@@ -1,4 +1,4 @@
-import { ReflectiveInjector } from '@angular/core';
+import { Injector } from '@angular/core';
 import { environment } from 'environments/environment';
 import { LocationService } from 'app/shared/location.service';
 import { MockLocationService } from 'testing/location.service';
@@ -15,7 +15,7 @@ describe('Deployment service', () => {
     it('should get the mode from the `mode` query parameter if available', () => {
       const injector = getInjector();
 
-      const locationService: MockLocationService = injector.get(LocationService);
+      const locationService = injector.get(LocationService) as unknown as MockLocationService;
       locationService.search.and.returnValue({ mode: 'bar' });
 
       const deployment = injector.get(Deployment);
@@ -25,8 +25,8 @@ describe('Deployment service', () => {
 });
 
 function getInjector() {
-  return ReflectiveInjector.resolveAndCreate([
-    Deployment,
-    { provide: LocationService, useFactory: () => new MockLocationService('') }
-  ]);
+  return Injector.create({providers: [
+    { provide: Deployment, deps: [LocationService] },
+    { provide: LocationService, useFactory: () => new MockLocationService(''), deps: [] }
+  ]});
 }
diff --git a/aio/src/app/shared/deployment.service.ts b/aio/src/app/shared/deployment.service.ts
index 3a77b91c93b2e..651f27cf4699d 100644
--- a/aio/src/app/shared/deployment.service.ts
+++ b/aio/src/app/shared/deployment.service.ts
@@ -11,7 +11,7 @@ export class Deployment {
    * The deployment mode set from the environment provided at build time;
    * or overridden by the `mode` query parameter: e.g. `...?mode=archive`
    */
-  mode: string = this.location.search()['mode'] || environment.mode;
+  mode: string = this.location.search().mode || environment.mode;
 
   constructor(private location: LocationService) {}
 }
diff --git a/aio/src/app/shared/location.service.ts b/aio/src/app/shared/location.service.ts
index df59d4d48d1a1..a3c193a818c2b 100644
--- a/aio/src/app/shared/location.service.ts
+++ b/aio/src/app/shared/location.service.ts
@@ -97,7 +97,7 @@ export class LocationService {
   /**
    * Handle user's anchor click
    *
-   * @param anchor {HTMLAnchorElement} - the anchor element clicked
+   * @param anchor The anchor element clicked
    * @param button Number of the mouse button held down. 0 means left or none
    * @param ctrlKey True if control key held down
    * @param metaKey True if command or window key held down
diff --git a/aio/src/app/shared/logger.service.spec.ts b/aio/src/app/shared/logger.service.spec.ts
index d676cc4e3769b..2dedb6e228db6 100644
--- a/aio/src/app/shared/logger.service.spec.ts
+++ b/aio/src/app/shared/logger.service.spec.ts
@@ -1,4 +1,4 @@
-import { ErrorHandler, ReflectiveInjector } from '@angular/core';
+import { ErrorHandler, Injector } from '@angular/core';
 import { Logger } from './logger.service';
 
 describe('logger service', () => {
@@ -10,10 +10,10 @@ describe('logger service', () => {
   beforeEach(() => {
     logSpy = spyOn(console, 'log');
     warnSpy = spyOn(console, 'warn');
-    const injector = ReflectiveInjector.resolveAndCreate([
-      Logger,
-      { provide: ErrorHandler, useClass: MockErrorHandler }
-    ]);
+    const injector = Injector.create({providers: [
+      { provide: Logger, deps: [ErrorHandler] },
+      { provide: ErrorHandler, useClass: MockErrorHandler, deps: [] }
+    ]});
     logger = injector.get(Logger);
     errorHandler = injector.get(ErrorHandler);
   });
diff --git a/aio/src/app/shared/reporting-error-handler.spec.ts b/aio/src/app/shared/reporting-error-handler.spec.ts
index a7389824d4083..39fb790e30645 100644
--- a/aio/src/app/shared/reporting-error-handler.spec.ts
+++ b/aio/src/app/shared/reporting-error-handler.spec.ts
@@ -1,4 +1,4 @@
-import { ErrorHandler, ReflectiveInjector } from '@angular/core';
+import { ErrorHandler, Injector } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 import { WindowToken } from 'app/shared/window';
 import { AppModule } from 'app/app.module';
@@ -14,11 +14,12 @@ describe('ReportingErrorHandler service', () => {
     onerrorSpy = jasmine.createSpy('onerror');
     superHandler = spyOn(ErrorHandler.prototype, 'handleError');
 
-    const injector = ReflectiveInjector.resolveAndCreate([
-      { provide: ErrorHandler, useClass: ReportingErrorHandler },
-      { provide: WindowToken, useFactory: () => ({ onerror: onerrorSpy }) }
-    ]);
-    handler = injector.get(ErrorHandler);
+    const injector = Injector.create({providers: [
+      { provide: ErrorHandler, useClass: ReportingErrorHandler, deps: [WindowToken] },
+      { provide: WindowToken, useFactory: () => ({ onerror: onerrorSpy }), deps: [] }
+    ]});
+
+    handler = injector.get(ErrorHandler) as unknown as ReportingErrorHandler;
   });
 
   it('should be registered on the AppModule', () => {
diff --git a/aio/src/app/shared/scroll-spy.service.spec.ts b/aio/src/app/shared/scroll-spy.service.spec.ts
index 4563683c72163..9184839fa564e 100644
--- a/aio/src/app/shared/scroll-spy.service.spec.ts
+++ b/aio/src/app/shared/scroll-spy.service.spec.ts
@@ -1,4 +1,4 @@
-import { Injector, ReflectiveInjector } from '@angular/core';
+import { Injector } from '@angular/core';
 import { fakeAsync, tick } from '@angular/core/testing';
 import { DOCUMENT } from '@angular/common';
 
@@ -151,11 +151,11 @@ describe('ScrollSpyService', () => {
   let scrollSpyService: ScrollSpyService;
 
   beforeEach(() => {
-    injector = ReflectiveInjector.resolveAndCreate([
+    injector = Injector.create({providers: [
       { provide: DOCUMENT, useValue: { body: {} } },
       { provide: ScrollService, useValue: { topOffset: 50 } },
-      ScrollSpyService
-    ]);
+      { provide: ScrollSpyService, deps: [DOCUMENT, ScrollService] }
+    ]});
 
     scrollSpyService = injector.get(ScrollSpyService);
   });
diff --git a/aio/src/app/shared/scroll.service.spec.ts b/aio/src/app/shared/scroll.service.spec.ts
index bd3ffd71f1151..1a8c19db7369f 100644
--- a/aio/src/app/shared/scroll.service.spec.ts
+++ b/aio/src/app/shared/scroll.service.spec.ts
@@ -1,7 +1,7 @@
 import {Location, LocationStrategy, PlatformLocation, ViewportScroller} from '@angular/common';
 import {DOCUMENT} from '@angular/common';
 import {MockLocationStrategy, SpyLocation} from '@angular/common/testing';
-import {ReflectiveInjector} from '@angular/core';
+import {Injector} from '@angular/core';
 import {fakeAsync, tick} from '@angular/core/testing';
 
 import {ScrollService, topMargin} from './scroll.service';
@@ -15,7 +15,7 @@ describe('ScrollService', () => {
   };
 
   const topOfPageElem = {} as Element;
-  let injector: ReflectiveInjector;
+  let injector: Injector;
   let document: MockDocument;
   let platformLocation: MockPlatformLocation;
   let scrollService: ScrollService;
@@ -41,21 +41,25 @@ describe('ScrollService', () => {
       jasmine.createSpyObj('viewportScroller', ['getScrollPosition', 'scrollToPosition']);
 
   beforeEach(() => {
-    injector = ReflectiveInjector.resolveAndCreate([
-      {
-        provide: ScrollService,
-        useFactory: createScrollService,
-        deps: [DOCUMENT, PlatformLocation, ViewportScroller, Location],
-      },
-      {provide: Location, useClass: SpyLocation}, {provide: DOCUMENT, useClass: MockDocument},
-      {provide: PlatformLocation, useClass: MockPlatformLocation},
-      {provide: ViewportScroller, useValue: viewportScrollerStub},
-      {provide: LocationStrategy, useClass: MockLocationStrategy}
-    ]);
+    injector = Injector.create( {
+      providers: [
+        {
+          provide: ScrollService,
+          useFactory: createScrollService,
+          deps: [DOCUMENT, PlatformLocation, ViewportScroller, Location],
+        },
+        {provide: Location, useClass: SpyLocation, deps: [] },
+        {provide: DOCUMENT, useClass: MockDocument, deps: []},
+        {provide: PlatformLocation, useClass: MockPlatformLocation, deps: []},
+        {provide: ViewportScroller, useValue: viewportScrollerStub},
+        {provide: LocationStrategy, useClass: MockLocationStrategy, deps: []}
+      ]
+    });
+
     platformLocation = injector.get(PlatformLocation);
-    document = injector.get(DOCUMENT);
+    document = injector.get(DOCUMENT) as unknown as MockDocument;
     scrollService = injector.get(ScrollService);
-    location = injector.get(Location);
+    location = injector.get(Location) as unknown as SpyLocation;
 
     spyOn(window, 'scrollBy');
   });
@@ -95,7 +99,7 @@ describe('ScrollService', () => {
       if (original !== undefined) {
         Object.defineProperty(window.history, 'scrollRestoration', original);
       } else {
-        delete window.history.scrollRestoration;
+        delete (window.history as any).scrollRestoration;
       }
     }
   });
diff --git a/aio/src/app/shared/toc.service.spec.ts b/aio/src/app/shared/toc.service.spec.ts
index ffe765e8200e8..be5cd36fe5977 100644
--- a/aio/src/app/shared/toc.service.spec.ts
+++ b/aio/src/app/shared/toc.service.spec.ts
@@ -1,5 +1,5 @@
 import { DOCUMENT } from '@angular/common';
-import { ReflectiveInjector } from '@angular/core';
+import { Injector } from '@angular/core';
 import { DomSanitizer, SafeHtml } from '@angular/platform-browser';
 import { Subject } from 'rxjs';
 
@@ -7,7 +7,7 @@ import { ScrollItem, ScrollSpyInfo, ScrollSpyService } from 'app/shared/scroll-s
 import { TocItem, TocService } from './toc.service';
 
 describe('TocService', () => {
-  let injector: ReflectiveInjector;
+  let injector: Injector;
   let scrollSpyService: MockScrollSpyService;
   let tocService: TocService;
   let lastTocList: TocItem[];
@@ -21,13 +21,14 @@ describe('TocService', () => {
   }
 
   beforeEach(() => {
-    injector = ReflectiveInjector.resolveAndCreate([
-      { provide: DomSanitizer, useClass: TestDomSanitizer },
+    injector = Injector.create({providers: [
+      { provide: DomSanitizer, useClass: TestDomSanitizer, deps: [] },
       { provide: DOCUMENT, useValue: document },
-      { provide: ScrollSpyService, useClass: MockScrollSpyService },
-      TocService,
-    ]);
-    scrollSpyService = injector.get(ScrollSpyService);
+      { provide: ScrollSpyService, useClass: MockScrollSpyService, deps: [] },
+      { provide: TocService, deps: [DOCUMENT, DomSanitizer, ScrollSpyService] },
+    ]});
+
+    scrollSpyService = injector.get(ScrollSpyService) as unknown as MockScrollSpyService;
     tocService = injector.get(TocService);
     tocService.tocList.subscribe(tocList => lastTocList = tocList);
   });
@@ -330,7 +331,7 @@ describe('TocService', () => {
     });
 
     it('should have bypassed HTML sanitizing of heading\'s innerHTML ', () => {
-      const domSanitizer: TestDomSanitizer = injector.get(DomSanitizer);
+      const domSanitizer: TestDomSanitizer = injector.get(DomSanitizer) as unknown as TestDomSanitizer;
       expect(domSanitizer.bypassSecurityTrustHtml)
         .toHaveBeenCalledWith('Setup to develop <i>locally</i>.');
     });
diff --git a/aio/src/app/sw-updates/sw-updates.service.spec.ts b/aio/src/app/sw-updates/sw-updates.service.spec.ts
index e99330d663f08..fa35b19931e60 100644
--- a/aio/src/app/sw-updates/sw-updates.service.spec.ts
+++ b/aio/src/app/sw-updates/sw-updates.service.spec.ts
@@ -1,4 +1,4 @@
-import { ApplicationRef, ReflectiveInjector } from '@angular/core';
+import { ApplicationRef, Injector } from '@angular/core';
 import { discardPeriodicTasks, fakeAsync, tick } from '@angular/core/testing';
 import { SwUpdate } from '@angular/service-worker';
 import { Subject } from 'rxjs';
@@ -8,7 +8,7 @@ import { SwUpdatesService } from './sw-updates.service';
 
 
 describe('SwUpdatesService', () => {
-  let injector: ReflectiveInjector;
+  let injector: Injector;
   let appRef: MockApplicationRef;
   let service: SwUpdatesService;
   let swu: MockSwUpdate;
@@ -21,16 +21,16 @@ describe('SwUpdatesService', () => {
   //   run `setup()`/`tearDown()` in `beforeEach()`/`afterEach()` blocks. We use the `run()` helper
   //   to call them inside each test's zone.
   const setup = (isSwUpdateEnabled: boolean) => {
-    injector = ReflectiveInjector.resolveAndCreate([
-      { provide: ApplicationRef, useClass: MockApplicationRef },
-      { provide: Logger, useClass: MockLogger },
-      { provide: SwUpdate, useFactory: () => new MockSwUpdate(isSwUpdateEnabled) },
-      SwUpdatesService
-    ]);
-
-    appRef = injector.get(ApplicationRef);
+    injector = Injector.create({providers: [
+      { provide: ApplicationRef, useClass: MockApplicationRef, deps: [] },
+      { provide: Logger, useClass: MockLogger, deps: [] },
+      { provide: SwUpdate, useFactory: () => new MockSwUpdate(isSwUpdateEnabled), deps: [] },
+      { provide: SwUpdatesService, deps: [ApplicationRef, Logger, SwUpdate] }
+    ]});
+
+    appRef = injector.get(ApplicationRef) as unknown as MockApplicationRef;
     service = injector.get(SwUpdatesService);
-    swu = injector.get(SwUpdate);
+    swu = injector.get(SwUpdate) as unknown as MockSwUpdate;
     checkInterval = (service as any).checkInterval;
   };
   const tearDown = () => service.ngOnDestroy();
diff --git a/aio/src/app/sw-updates/sw-updates.service.ts b/aio/src/app/sw-updates/sw-updates.service.ts
index f44df3286bda5..38ea8c4658da7 100644
--- a/aio/src/app/sw-updates/sw-updates.service.ts
+++ b/aio/src/app/sw-updates/sw-updates.service.ts
@@ -13,14 +13,13 @@ import { Logger } from 'app/shared/logger.service';
  * 1. Checks for available ServiceWorker updates once instantiated.
  * 2. Re-checks every 6 hours.
  * 3. Whenever an update is available, it activates the update.
- *
- * @property
- * `updateActivated` {Observable<string>} - Emit the version hash whenever an update is activated.
  */
 @Injectable()
 export class SwUpdatesService implements OnDestroy {
   private checkInterval = 1000 * 60 * 60 * 6;  // 6 hours
   private onDestroy = new Subject<void>();
+
+  /** Emit the version hash whenever an update is activated. */
   updateActivated: Observable<string>;
 
   constructor(appRef: ApplicationRef, private logger: Logger, private swu: SwUpdate) {
diff --git a/aio/src/polyfills.ts b/aio/src/polyfills.ts
index 7d239456a5f3a..d8d53e062fae8 100644
--- a/aio/src/polyfills.ts
+++ b/aio/src/polyfills.ts
@@ -18,7 +18,7 @@
  * BROWSER POLYFILLS
  */
 
-/** IE10 and IE11 requires the following for NgClass support on SVG elements */
+/** IE11 requires the following for NgClass support on SVG elements */
 // import 'classlist.js';  // Run `npm install --save classlist.js`.
 
 /**
diff --git a/aio/src/styles/0-base/_typography.scss b/aio/src/styles/0-base/_typography.scss
index 5a1b50e61d83b..20619f775e8a3 100755
--- a/aio/src/styles/0-base/_typography.scss
+++ b/aio/src/styles/0-base/_typography.scss
@@ -214,7 +214,7 @@ code {
         margin-left: 2px;
         position: relative;
         @include line-height(24);
-        vertical-align: bottom; 
+        vertical-align: middle;
       }
     }
 
diff --git a/aio/src/styles/2-modules/_api-pages.scss b/aio/src/styles/2-modules/_api-pages.scss
index 33ca56a9e47d3..34aeb94fc7d9a 100644
--- a/aio/src/styles/2-modules/_api-pages.scss
+++ b/aio/src/styles/2-modules/_api-pages.scss
@@ -38,7 +38,11 @@
         margin: 0;
         clear: left;
       }
-
+      .actions {
+        display: flex;
+        color: $blue;
+        @include font-size(14);
+      }
       .show-all {
         display: initial;
       }
diff --git a/aio/src/styles/2-modules/_modules-dir.scss b/aio/src/styles/2-modules/_modules-dir.scss
index 157e80121e6bb..76302968a5cdb 100644
--- a/aio/src/styles/2-modules/_modules-dir.scss
+++ b/aio/src/styles/2-modules/_modules-dir.scss
@@ -25,7 +25,6 @@
    @import 'progress-bar';
    @import 'presskit';
    @import 'resources';
-   @import 'scrollbar';
    @import 'search-results';
    @import 'select-menu';
    @import 'table';
diff --git a/aio/src/styles/2-modules/_scrollbar.scss b/aio/src/styles/2-modules/_scrollbar.scss
deleted file mode 100644
index dd9b27e9bd0ac..0000000000000
--- a/aio/src/styles/2-modules/_scrollbar.scss
+++ /dev/null
@@ -1,27 +0,0 @@
-body::-webkit-scrollbar, mat-sidenav.sidenav::-webkit-scrollbar, .mat-sidenav-content::-webkit-scrollbar {
-  height: 6px;
-  width: 6px;
-}
-
-body::-webkit-scrollbar-track, mat-sidenav.sidenav::-webkit-scrollbar-track, .mat-sidenav-content::-webkit-scrollbar-track {
-  -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
-}
-
-body::-webkit-scrollbar-thumb, mat-sidenav.sidenav::-webkit-scrollbar-thumb, .mat-sidenav-content::-webkit-scrollbar-thumb {
-  background-color: $mediumgray;
-  outline: 1px solid $darkgray;
-}
-
-.search-results::-webkit-scrollbar, .toc-container::-webkit-scrollbar {
-  height: 4px;
-  width: 4px;
-}
-
-.search-results::-webkit-scrollbar-track, .toc-container::-webkit-scrollbar-track {
-  -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
-}
-
-.search-results::-webkit-scrollbar-thumb, .toc-container::-webkit-scrollbar-thumb {
-  background-color: $mediumgray;
-  outline: 1px solid slategrey;
-}
diff --git a/aio/src/styles/2-modules/_toc.scss b/aio/src/styles/2-modules/_toc.scss
index 20fed744e9bc0..6a71ed21bc6d6 100644
--- a/aio/src/styles/2-modules/_toc.scss
+++ b/aio/src/styles/2-modules/_toc.scss
@@ -105,9 +105,7 @@
 
     li {
       box-sizing: border-box;
-      @include font-size(12);
-      @include line-height(16);
-      padding: 3px 0 3px 12px;
+      padding: 7px 0 7px 12px;
       position: relative;
       transition: all 0.3s ease-in-out;
 
@@ -129,6 +127,7 @@
         color: lighten($darkgray, 10);
         overflow: visible;
         @include font-size(12);
+        @include line-height(16);
         display: table-cell;
       }
 
@@ -168,11 +167,11 @@
       }
 
       &:first-child:before {
-        top: 13px;
+        top: 15px;
       }
 
       &:last-child:before {
-        bottom: calc(100% - 14px);
+        bottom: calc(100% - 15px);
       }
 
       &:not(.active):hover a:before {
diff --git a/aio/src/testing/dom-utils.ts b/aio/src/testing/dom-utils.ts
index 54510abeced1c..8e296fe352f68 100644
--- a/aio/src/testing/dom-utils.ts
+++ b/aio/src/testing/dom-utils.ts
@@ -5,7 +5,7 @@ export function createCustomEvent(doc: Document, name: string, detail: any): Cus
   const bubbles = false;
   const cancelable = false;
 
-  // On IE9-11, `CustomEvent` is not a constructor.
+  // On IE11, `CustomEvent` is not a constructor.
   if (typeof CustomEvent !== 'function') {
     const event = doc.createEvent('CustomEvent');
     event.initCustomEvent(name, bubbles, cancelable, detail);
diff --git a/aio/tests/deployment/shared/URLS_TO_REDIRECT.txt b/aio/tests/deployment/shared/URLS_TO_REDIRECT.txt
index 23a6370555a3d..887ad52883b74 100644
--- a/aio/tests/deployment/shared/URLS_TO_REDIRECT.txt
+++ b/aio/tests/deployment/shared/URLS_TO_REDIRECT.txt
@@ -177,6 +177,7 @@
 /getting-started/forms	/start/start-forms
 /getting-started/deployment	/start/start-deployment
 /guide/cli-quickstart	/start
+/guide/displaying-data	/start#template-syntax
 /guide/learning-angular	/start
 /guide/learning-angular.html	/start
 /guide/metadata	/guide/aot-compiler
diff --git a/aio/tests/e2e/src/api-pages.e2e-spec.ts b/aio/tests/e2e/src/api-pages.e2e-spec.ts
index b97e89e4f30ee..636b7b0b62168 100644
--- a/aio/tests/e2e/src/api-pages.e2e-spec.ts
+++ b/aio/tests/e2e/src/api-pages.e2e-spec.ts
@@ -1,6 +1,6 @@
 import { ApiPage } from './api.po';
 
-describe('Api pages', function() {
+describe('Api pages', () => {
   it('should show direct subclasses of a class', () => {
     const page = new ApiPage('api/forms/AbstractControlDirective');
     expect(page.getDescendants('class', true)).toEqual(['ControlContainer', 'NgControl']);
diff --git a/aio/tests/e2e/src/app.e2e-spec.ts b/aio/tests/e2e/src/app.e2e-spec.ts
index 73f6c0532c5d1..3f14cbc7bcc2c 100644
--- a/aio/tests/e2e/src/app.e2e-spec.ts
+++ b/aio/tests/e2e/src/app.e2e-spec.ts
@@ -1,7 +1,7 @@
 import { browser, by, element, ElementFinder } from 'protractor';
 import { SitePage } from './app.po';
 
-describe('site App', function() {
+describe('site App', () => {
   let page: SitePage;
 
   beforeEach(() => {
@@ -99,10 +99,11 @@ describe('site App', function() {
   describe('scrolling to the top', () => {
     it('should scroll to the top when navigating to another page', () => {
       page.navigateTo('guide/security');
-
       page.scrollTo('bottom');
       expect(page.getScrollTop()).toBeGreaterThan(0);
-
+      // Navigate to Reference section, then check
+      // Find the navigation item that has the text "api"
+      page.click(page.getNavItem(/reference/i));
       page.click(page.getNavItem(/api/i));
       expect(page.locationPath()).toBe('/api');
       expect(page.getScrollTop()).toBe(0);
diff --git a/aio/tools/README.md b/aio/tools/README.md
index e44c358091e2b..1a949daea41c3 100644
--- a/aio/tools/README.md
+++ b/aio/tools/README.md
@@ -29,41 +29,38 @@ sub-folder. Also there are a number of common boilerplate files that are needed
 example's project. We maintain these common boilerplate files centrally to reduce the amount of effort
 if one of them needs to change.
 
-This `examples` tool folder contains two utilities:
+This `examples` tool folder contains three utilities:
 
 * example-boilerplate.js - install/remove the npm dependencies and boilerplate files into/from each of the
   examples' subfolders.
 * run-example-e2e.js - run the e2e tests for one or more examples
+* create-example.js - create a new example from the `example-scaffold/` directory or by importing files from a CLI project.
 
 See the [README.md](examples/README.md) for more details.
 
 ## example-zipper
 
-In the AIO application, we offer the reader the option to download each example as a full self-contained
-runnable project packaged as a zip file. These zip files are generated by the utility in this folder.
+In the AIO application, we offer the reader the option to download each example as a full self-contained runnable project packaged as a zip file.
+These zip files are generated by the utility in this folder.
 
 See the [README.md](example-zipper/README.md) for more details.
 
 ## stackblitz-builder
 
 In the AIO application, we can embed a running version of the example as a [Stackblitz](https://stackblitz.com/) session.
-We can also provide a link to create a runnable version of the example in the [Stackblitz](https://stackblitz.com/)
-editor.
+We can also provide a link to create a runnable version of the example in the [Stackblitz](https://stackblitz.com/) editor.
 
 See the [README.md](stackblitz-builder/README.md) for more details.
 
 ## transforms
 
-All the content that is rendered by the AIO application, and some of its configuration files, are
-generated from source files by [Dgeni](https://github.com/angular/dgeni). Dgeni is a general purpose
-documentation generation tool.
+All the content that is rendered by the AIO application, and some of its configuration files, are generated from source files by [Dgeni](https://github.com/angular/dgeni).
+Dgeni is a general purpose documentation generation tool.
 
-Markdown files in `/aio/content`, code comments in the core Angular source files and example files are
-processed and transformed into files that are consumed by the AIO application.
+Markdown files in `/aio/content`, code comments in the core Angular source files and example files are processed and transformed into files that are consumed by the AIO application.
 
-Dgeni is configured by "packages", which contain services and processors. Some of these packages are
-installed as `node_modules` from the [dgeni-packages](https://github.com/angular/dgeni-packages) and
-some are specific to the AIO project.
+Dgeni is configured by "packages", which contain services and processors.
+Some of these packages are installed as `node_modules` from the [dgeni-packages](https://github.com/angular/dgeni-packages) and some are specific to the AIO project.
 
-The project specific packages are stored in the `aio/tools/transforms` folder. See the
-[README.md](transforms/README.md) for more details.
+The project specific packages are stored in the `aio/tools/transforms` folder.
+See the [README.md](transforms/README.md) for more details.
diff --git a/aio/tools/RELEASE.md b/aio/tools/RELEASE.md
deleted file mode 100644
index 419d2597db10e..0000000000000
--- a/aio/tools/RELEASE.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Docs releases
-
-This document explains how to update the documentation examples after an Angular release. This is only needed for major and minor versions.
-
-All the packages for the docs' examples are specified in `/aio/tools/examples/shared/package.json`
-
-**1)** So within the `shared` folder, you need to issue the following command:
-
-```
-$ yarn upgrade-interactive --tilde
-```
-
-There, select all the packages that are updated on the new Angular release.
-
-**2)** Changes to the tsconfig.json? There are several files in `/aio/tools/examples/shared/boilerplate/*/tsconfig.json` (based on the example type).
-
diff --git a/aio/tools/cli-patches/README.md b/aio/tools/cli-patches/README.md
index e92303bf249df..9767ce32de77d 100644
--- a/aio/tools/cli-patches/README.md
+++ b/aio/tools/cli-patches/README.md
@@ -1,7 +1,5 @@
 # Overview
 
-The AIO application is built using the Angular CLI tool. We are often trialling new features for the CLI, which
-we apply to the library after it is installed.  This folder contains git patch files that contain these new features
-and a utility to apply those patches to the CLI library.
+The AIO application is built using the Angular CLI tool. We are often trialling new features for the CLI, which we apply to the library after it is installed.  This folder contains git patch files that contain these new features and a utility to apply those patches to the CLI library.
 
-**Currently, we have no patches to run.**
\ No newline at end of file
+**Currently, we have no patches to run.**
diff --git a/aio/tools/example-zipper/README.md b/aio/tools/example-zipper/README.md
index 344f68fe2b3bb..1a1f5f01ecaf1 100644
--- a/aio/tools/example-zipper/README.md
+++ b/aio/tools/example-zipper/README.md
@@ -1,13 +1,14 @@
 # Overview
 
-In the AIO application, we offer the reader the option to download each example as a full self-contained
-runnable project packaged as a zip file. These zip files are generated by the utility in this folder.
+In the AIO application, we offer the reader the option to download each example as a full self-contained runnable project packaged as a zip file.
+These zip files are generated by the utility in this folder.
 
 ## Example zipper
 
-The `exampleZipper.js` tool is very similar to the Stackblitz's `builder.js`. The latter creates an HTML file
-with all the examples' files and the former creates a zip file instead. They both use the `stackblitz.json` file
-to flag an example as something to stackblitz or zip. For example:
+The `exampleZipper.js` tool is very similar to the Stackblitz's `builder.js`.
+The latter creates an HTML file with all the examples' files and the former creates a zip file instead.
+They both use the `stackblitz.json` file to flag an example as something to stackblitz or zip.
+For example:
 
 ```json
 {
@@ -41,8 +42,7 @@ The `exampleZipper.js` won't include any `System.js` related files for CLI-based
 As mentioned, the tool uses the `stackblitz.json` as a flag and also a configuration file for the zipper.
 The problem is that not all examples have a stackblitz but they could offer a zip instead.
 
-In those cases, you can create a `zipper.json` file with the same syntax. It will be ignored by the
-stackblitz tool.
+In those cases, you can create a `zipper.json` file with the same syntax. It will be ignored by the stackblitz tool.
 
 ## Executing the zip generation
 
@@ -50,5 +50,4 @@ stackblitz tool.
 
 Where? At `src/generated/zips/`.
 
-Then the `<live-example>` embedded component will look at this folder to get the zip it needs for
-the example.
+Then the `<live-example>` embedded component will look at this folder to get the zip it needs for the example.
diff --git a/aio/tools/examples/README.md b/aio/tools/examples/README.md
index 85a83bdc8ab66..12bf0830ab0a1 100644
--- a/aio/tools/examples/README.md
+++ b/aio/tools/examples/README.md
@@ -1,110 +1,165 @@
 # Overview
 
-Many of the documentation pages contain snippets of code examples. Extract these snippets from
-real working example applications, which are stored in subfolders of the `/aio/content/examples`
-folder. Each example can be built and run independently. Each example also provides e2e specs, which
-are run as part of our CircleCI legacy build tasks, to verify that the examples continue to work as
-expected, as changes are made to the core Angular libraries.
+Many of the documentation pages contain snippets of code examples.
+These snippets are extracted from real working example applications, which are stored in sub-folders of the [aio/content/examples/](.) folder.
+Each example can be built and run independently.
+Each example also provides tests (mostly e2e and occasionally unit tests), which are run as part of our CircleCI `test_docs_examples*` jobs, to verify that the examples continue to work as expected, as changes are made to the core Angular libraries.
 
-In order to build, run and test these examples independently you need to install dependencies into
-their sub-folder. Also there are a number of common boilerplate files that are needed to configure
-each example's project. Maintain these common boilerplate files centrally to reduce the amount
-of effort if one of them needs to change.
+In order to build, run and test these examples independently, you need to install dependencies into their sub-folder.
+Also there are a number of common boilerplate files that are needed to configure each example's project.
+These common boilerplate files are maintained centrally to reduce the amount of effort if one of them needs to change.
 
 > **Note for Windows users**
 >
-> Setting up the examples involves creating some [symbolic links](https://en.wikipedia.org/wiki/Symbolic_link) (see [here](#symlinked-node_modules) for details). On Windows, this requires to either have [Developer Mode enabled](https://blogs.windows.com/windowsdeveloper/2016/12/02/symlinks-windows-10) (supported on Windows 10 or newer) or run the setup commands as administrator.
+> Setting up the examples involves creating some [symbolic links](https://en.wikipedia.org/wiki/Symbolic_link) (see [here](#symlinked-node_modules) for details).
+> On Windows, this requires to either have [Developer Mode enabled](https://blogs.windows.com/windowsdeveloper/2016/12/02/symlinks-windows-10) (supported on Windows 10 or newer) or run the setup commands as administrator.
+
 
 ## Boilerplate overview
 
-As mentioned, many of the documentation pages contain snippets extracted from real example applications.
-To achieve that, all those applications needs to contain a basic boilerplate. E.g. a `node_modules`
-folder, `package.json` with scripts, etc.
+As mentioned above, many of the documentation pages contain snippets extracted from real example applications.
+To achieve that, all those applications need to contain some basic boilerplate, such as a `node_modules/` folder, a `package.json` file with scripts and dependencies, etc.
+
+There are also different project types, each with its own boilerplate.
+For example, there are projects based on the Angular CLI, projects that use AngularJS, Custom Elements, i18n, server-side rendering, etc.
+(See the [example configuration section](#example-config) below for more info on how to specify the project type.)
+
+To avoid having to maintain the boilerplate in each example, we use the [example-boilerplate-js](./example-boilerplate.js) script to provide a set of files that works across all the examples of a specific type.
 
-No one wants to maintain the boilerplate on each example, so the goal of this tool is to provide a set of files that works across all the examples.
 
 ### Boilerplate files
 
-Inside `/aio/tools/examples/shared/boilerplate` you will find a set of folders representing each project type.
+Inside [shared/boilerplate/](./shared/boilerplate) there is a sub-folder with boilerplate files for each of the different project types.
+
+Currently, the following project types are supported:
 
-Currently you will find the next project types:
+- `cli`: For example apps based on the Angular CLI. This is the default type and is used in the majority of the examples.
+- `cli-ajs`: For CLI-based examples that also use AngularJS (but not via `@angular/upgrade`).
+- `elements`: For CLI-based examples that also use `@angular/elements`.
+- `getting-started`: For the "Getting started" tutorial. Essentially the same as `cli` but with custom CSS styles.
+- `i18n`: For CLI-based examples that also use internationalization.
+- `schematics`: For CLI-based examples that include a library with schematics.
+- `service-worker`: For CLI-based examples that also use `@angular/service-worker`.
+- `systemjs`: For non-CLI legacy examples using SystemJS. This is deprecated and only used in few examples.
+- `testing`: For CLI-based examples that are related to unit testing.
+- `universal`: For CLI-based examples that also use `@nguniversal/express-engine` for SSR.
 
-* cli - For CLI based examples. This is the default one, to be used in the majority of the examples.
-* getting-started - CLI-based with its own set of styles.
-* i18n - CLI-based with additional scripts for internationalization.
-* schematics - CLI-based with additional scripts for building schematics.
-* service-worker - CLI-based with additional packages and configuration for service workers.
-* systemjs - Currently in deprecation, only used in a few examples.
-* testing - CLI-based with additional styles for jasmine testing.
-* universal - CLI-based with an extra server target.
-* viewengine - Additional configuration for running CLI-/SystemJS-based examples with `ViewEngine` (the pre-Ivy compiler/renderer).
+There are also the following special folders:
+- `common`: Contains files used in many examples.
+  (See the [next section](#example-config) for info on how to exclude common files in certain examples.)
+- `viewengine/cli`: Additional configuration for running CLI-based examples with `ViewEngine` (the pre-Ivy compiler/renderer).
+  This applies to all CLI-based examples, such as `cli-ajs`, `elements`, `getting-started`, etc.
+- `viewengine/systemjs`: Additional configuration for running SystemJS-based examples with `ViewEngine` (the pre-Ivy compiler/renderer).
 
-There is also a `common` folder that contains files used in all different examples.
 
-### The example-config.json
+<a name="example-config"></a>
+### The `example-config.json`
 
-Each example is identified by an **example-config.json** configuration file in its root folder.
-This configuration file indicates what type of boilerplate this example needs. E.g.
+Each example is identified by an `example-config.json` configuration file in its root folder.
+This configuration file indicates what type of boilerplate this example needs and how to test it.
+For example:
 
 ```json
 {
-  "projectType": "cli",
-  "useCommonBoilerplate": true
+  "projectType": "cli"
 }
 ```
 
-If the file is empty then the default type of cli is assumed.
-When the boilerplate tooling runs, it will copy into the example folder all of the appropriate files based on the project type.
+The file is expected to contain a JSON object with zero or more of the following properties:
+
+- `projectType: string`: One of the supported project types (see above).
+  Default: `"cli"`
+- `useCommonBoilerplate: boolean`: Whether to include common boilerplate from the [common/](./shared/boilerplate/common) folder.
+  Default: `true`
+
+**SystemJS-only properties:**
+- `build: string`: The npm script to run in order to build the example app.
+  Default: `"build"`
+- `run: string`: The npm script to run in order to serve the example app (so that e2e test can be run against it).
+  Default `"serve:e2e"`
+
+**CLI-only properties:**
+- `tests: object[]`: An array of objects, each specifying a test command. This can be used to run multiple test commands in series (for example, to run unit and e2e tests).
+  The commands are specified as `{cmd: string, args: string[]}` and must be in a format that could be passed to Node.js' `child_process.spawn(cmd, args)`. You can use a special `{PORT}` placeholder, that will be replaced with the port on which the app is served during the actual test.
+  Default:
+
+  ```json
+  [
+    {
+      "cmd": "yarn",
+      "args": [
+        "e2e",
+        "--prod",
+        "--protractor-config=e2e/protractor-puppeteer.conf.js",
+        "--no-webdriver-update",
+        "--port={PORT}"
+      ]
+    }
+  ]
+  ```
+
+An empty `example-config.json` file is equivalent with `{"projectType": "cli"}`.
+
 
 <a name="symlinked-node_modules"></a>
-### A node_modules to share
+### A `node_modules/` to share
 
-With all the boilerplate files in place, the only missing piece are the installed packages. For
-that you have a `/aio/tools/examples/shared/package.json` which contains **all** the packages
-needed to run all the examples through all different boilerplates.
+With all the boilerplate files in place, the only missing piece is the installed packages.
+For that we have [shared/package.json](./shared/package.json), which contains **all** the packages needed to run any example type.
 
-After installing these dependencies, a `node_modules/` folder will be created at
-`/aio/tools/examples/shared/node_modules/`. This folder will be **symlinked** into each example.
+Upon installing these dependencies, a [shared/node_modules/](./shared/node_modules) folder is created.
+This folder will be **symlinked** into each example.
 So it is not a copy like the other boilerplate files.
 
-### End to end tests
 
-End to end changes between boilerplates.
+### End-to-end tests
 
-For CLI applications, create a `app.e2e-spec.ts` inside the `e2e` folder. The tooling will run
-`ng e2e` for each CLI based examples.
+End-to-end infrastructure is slightly different between CLI- and SystemJS-based examples.
 
-For SystemJS, each example contains an `e2e-spec.ts` file. You can find all the related configuration files
-in the `/aio/tools/examples/shared` folder.
+For CLI-based examples, create an `app.e2e-spec.ts` file inside the `e2e/` folder.
+This will be picked up by the default testing command (see the [example configuration section](#example-config) above).
+If you are using a custom test command, make sure e2e specs are picked up (if applicable).
 
-### example-boilerplate.js
+For SystemJS-based examples, create an `e2e-spec.ts` file inside the example root folder.
+These apps will be tested with the following command:
 
-This script installs all the dependencies that are shared among all the examples, creates the
-`node_modules` symlinks and copy all the boilerplate files where needed. It won't do anything
-about stackblitz nor e2e tests.
+```sh
+yarn protractor aio/tools/examples/shared/protractor.config.js \
+  --specs=<example-folder>/e2e-spec.ts \
+  --params.appDir=<example-folder>
+```
 
-It also contains a function to remove all the boilerplate. It uses a `git clean -xdf` to do
-the job. It will remove all files that don't exist in the git repository, **including any
-new file that you are working on that hasn't been stage yet.** So be sure to save your work
-before removing the boilerplate.
 
-### run-example-e2e.js
+### `example-boilerplate.js`
 
-This script will find all the `e2e-spec.ts` files and run them.
+The [example-boilerplate.js](./example-boilerplate.js) script installs the dependencies for all examples, creates the `node_modules/` symlinks and copies the necessary boilerplate files into example folders.
 
-To not run all tests, you can use the `--filter=name` flag to run the example's e2e that contains
-that name.
+It also contains a function to remove all the boilerplate.
+It uses `git clean -xdf` to do the job.
+It will remove all files that are not tracked by git, **including any new files that you are working on that haven't been stageg yet.**
+So, be sure to commit your work before removing the boilerplate.
 
-It also has an optional `--setup` flag to run the `example-boilerplate.js` script and install
-the latest `webdriver`.
 
-It will create a `/aio/protractor-results.txt` file when it finishes running tests.
+### `run-example-e2e.js`
 
-### Updating example dependencies
+The [run-example-e2e.js](./run-example-e2e.js) script will find and run the e2e tests for all examples.
+Although it only runs e2e tests by default, it can be configured to run any test command (for CLI-based examples) by using the `tests` property of the [example-config.json](#example-config) file.
+It is named `*-e2e` for historical reasons, but it is not limited to running e2e tests.
 
-With every major release, we update the examples to be on the latest version. The following steps to update are:
+See [aio/README.md](../../README.md#developer-tasks) for the available command-line options.
+
+Running the script will create an `aio/protractor-results.txt` file with the results of the tests.
+
+### `create-example.js`
+
+The [create-example.js](./create-example.js) script creates a new example under the `aio/content/examples` directory.
+
+You must provide a new name for the example.
+By default the script will place basic scaffold files into the new example (from [shared/example-scaffold](./shared/example-scaffold)).
+But you can also specify the path to a separate CLI project, from which the script will copy files that would not be considered "boilerplate".
+See the [Boilerplate overview](#boilerplate-overview) for more information.
+
+### Updating example dependencies
 
-* In the `shared/package.json` file, bump all the `@angular/*`, `@angular-devkit/*`, `rxjs`, `typescript`, and `zone.js` package versions to the version that corresponds with the [framework version](../../../package.json).
-* In the `shared` folder, run `yarn` to update the dependencies for the shared `node_modules` and the `yarn.lock` file.
-* In the `boilerplate` folder, go through each sub-folder and update the `package.json` dependencies if one is present.
-* Follow the [update guide](./shared/boilerplate/UPDATING_CLI.md) to update the common files used in the examples based on project type.
+With every major Angular release, we update the examples to be on the latest version.
+See [UPDATING.md](./UPDATING.md) for instructions.
diff --git a/aio/tools/examples/UPDATING.md b/aio/tools/examples/UPDATING.md
new file mode 100644
index 0000000000000..2c823e7422ad6
--- /dev/null
+++ b/aio/tools/examples/UPDATING.md
@@ -0,0 +1,55 @@
+# Update example dependencies
+
+Follow these steps to update the examples to the latest versions of Angular (and related dependencies):
+
+- In [shared/package.json](./shared/package.json), bump all the `@angular/*` and `@nguniversal/*` package versions to the version you want to update to and update their peer dependencies (such as `@angular-devkit/*`, `rxjs`, `typescript`, `zone.js`) and other dependencies (e.g. `@types/*`) to the latest compatible versions.
+
+  > NOTE:
+  > The [angular-cli-diff](https://github.com/cexbrayat/angular-cli-diff) repo can be a useful resource for discovering what dependency versions are used for a basic CLI app at a specific CLI version.
+
+- In the [shared/](./shared) directory, run `yarn` to update the dependencies in the [shared/node_modules/](./shared/node_modules) directory and the [shared/yarn.lock](./shared/yarn.lock) file.
+
+- In the [shared/](./shared) directory, run `yarn sync-deps` to update the dependency versions of the `package.json` files in each sub-folder of [shared/boilerplate/](./shared/boilerplate) to match the ones in [shared/package.json](./shared/package.json).
+
+- Follow the steps in the following section to update the rest of the boilerplate files.
+
+
+## Update other boilerplate files
+
+The Angular CLI default setup is updated using `ng update`.
+Any necessary changes to boilerplate files will be done automatically through migration schematics.
+
+> NOTE:
+> Migrations affecting source code files will not happen automatically, because `ng update` does not know about all the examples in `aio/content/examples/`.
+> You have to make these changes (if any) manually.
+> Again, the [angular-cli-diff](https://github.com/cexbrayat/angular-cli-diff) repo can be a useful resource for discovering changes between versions.
+
+- In the [shared/boilerplate/cli/](./shared/boilerplate/cli) directory, run the following commands to migrate the the project to the current versions of Angular CLI and the Angular framework (updated in previous steps):
+  ```sh
+  # Ensure dependencies are installed.
+  yarn install
+
+  # Migrate project to new versions.
+  yarn ng update @angular/cli --migrate-only --from=<previous-cli-version>
+  yarn ng update @angular/core --migrate-only --from=<previous-core-version>
+  ```
+
+  > NOTE:
+  > In order for `ng update` to work, there must be a `node_modules/` directory with installed dependencies inside the [shared/boilerplate/cli/](./shared/boilerplate/cli) directory.
+  > This `node_modules/` directory is only needed during the update operation and is otherwise ignored (both by git and by the [example-boilerplate.js](./example-boilerplate.js) script) by means of the [shared/boilerplate/.gitignore](./shared/boilerplate/.gitignore) file.
+
+- The previous command made any necessary changes to boilerplate files inside the `cli/` directory, but the same changes need to be applied to the other CLI-based boilerplate directories.
+  Inspect the changes in `cli/` and manually apply the necessary ones to other CLI-based boilerplate directories.
+
+- Also ensure that any relevant changes in the [shared/boilerplate/cli/](./shared/boilerplate/cli) directory are copied to the [shared/example-scaffold/](./shared/example-scaffold) directory, which is used when creating new examples (via `yarn create-example ...`).
+  Only files that would not be considered boilerplate should be added to the `example-scaffold/` directory.
+
+- Ensure any changes to [cli/tslint.json](./shared/boilerplate/cli/tslint.json) are ported over to [systemjs/tslint.json](./shared/boilerplate/systemjs/tslint.json) and also [aio/content/examples/tslint.json](../../content/examples/tslint.json).
+  This last part is important, since this file is used to lint example code on CI.
+
+- Inspect the changes and determine whether some of them need to be applied to the `systemjs` boilerplate files.
+
+- Inspect the changes and determine whether any updates to guides are necessary.
+  For example, if a file is renamed or moved, any guides mentioning that file may need updating to refer to the new name/location.
+
+- Commit all changes to the repository.
diff --git a/aio/tools/examples/constants.js b/aio/tools/examples/constants.js
new file mode 100644
index 0000000000000..c7d590d9d93f7
--- /dev/null
+++ b/aio/tools/examples/constants.js
@@ -0,0 +1,6 @@
+const path = require('canonical-path');
+
+exports.EXAMPLES_BASE_PATH = path.resolve(__dirname, '../../content/examples');
+exports.EXAMPLE_CONFIG_FILENAME = 'example-config.json';
+exports.SHARED_PATH = path.resolve(__dirname, 'shared');
+exports.STACKBLITZ_CONFIG_FILENAME = 'stackblitz.json';
diff --git a/aio/tools/examples/create-example.js b/aio/tools/examples/create-example.js
new file mode 100644
index 0000000000000..7db729e1f5243
--- /dev/null
+++ b/aio/tools/examples/create-example.js
@@ -0,0 +1,140 @@
+const fs = require('fs-extra');
+const glob = require('glob');
+const ignore = require('ignore');
+const path = require('canonical-path');
+const shelljs = require('shelljs');
+const yargs = require('yargs');
+
+const {EXAMPLES_BASE_PATH, EXAMPLE_CONFIG_FILENAME, SHARED_PATH, STACKBLITZ_CONFIG_FILENAME} =
+    require('./constants');
+const BASIC_SOURCE_PATH = path.resolve(SHARED_PATH, 'example-scaffold');
+
+shelljs.set('-e');
+
+if (require.main === module) {
+  const options =
+      yargs(process.argv.slice(2))
+          .command(
+              '$0 <name> [source]',
+              [
+                'Create a new <name> example.',
+                '',
+                'If [source] is provided then the relevant files from the CLI project at that path are copied into the example.',
+              ].join('\n'))
+          .strict()
+          .version(false)
+          .argv;
+
+  const exampleName = options.name;
+  const examplePath = path.resolve(EXAMPLES_BASE_PATH, exampleName);
+
+  console.log('Creating new example at', examplePath);
+  createEmptyExample(exampleName, examplePath);
+
+  const sourcePath =
+      options.source !== undefined ? path.resolve(options.source) : BASIC_SOURCE_PATH;
+  console.log('Copying files from', sourcePath);
+  copyExampleFiles(sourcePath, examplePath, exampleName);
+
+  console.log(`The new "${exampleName}" example has been created.`);
+  console.log('Now run "yarn boilerplate:add" to set it up for development.');
+  console.log(
+      'You can find more info on working with docs examples in aio/tools/examples/README.md.')
+}
+
+/**
+ * Create the directory and marker files for the new example.
+ */
+function createEmptyExample(exampleName, examplePath) {
+  ensureExamplePath(examplePath);
+  writeExampleConfigFile(examplePath);
+  writeStackBlitzFile(exampleName, examplePath);
+}
+
+/**
+ * Ensure that the new example directory exists.
+ */
+function ensureExamplePath(examplePath) {
+  if (fs.existsSync(examplePath)) {
+    throw new Error(
+        `Unable to create example. The path to the new example already exists: ${examplePath}`);
+  }
+  fs.ensureDirSync(examplePath);
+}
+
+/**
+ * Write the `example-config.json` file to the new example.
+ */
+function writeExampleConfigFile(examplePath) {
+  fs.writeFileSync(path.resolve(examplePath, EXAMPLE_CONFIG_FILENAME), '');
+}
+
+/**
+ * Write the `stackblitz.json` file into the new example.
+ */
+function writeStackBlitzFile(exampleName, examplePath) {
+  const config = {
+    description: titleize(exampleName),
+    files: ['!**/*.d.ts', '!**/*.js', '!**/*.[1,2].*'],
+    tags: [exampleName.split('-')]
+  };
+  fs.writeFileSync(
+      path.resolve(examplePath, STACKBLITZ_CONFIG_FILENAME),
+      JSON.stringify(config, null, 2) + '\n');
+}
+
+/**
+ * Copy all the files from the `sourcePath`, which are not ignored by the `.gitignore` file in the
+ * `EXAMPLES_BASE_PATH`, to the `examplePath`.
+ */
+function copyExampleFiles(sourcePath, examplePath, exampleName) {
+  const gitIgnoreSource = getGitIgnore(sourcePath);
+  const gitIgnoreExamples = getGitIgnore(EXAMPLES_BASE_PATH);
+
+  // Grab the files in the source folder and filter them based on the gitignore rules.
+  const sourceFiles =
+      glob.sync('**/*', {
+            cwd: sourcePath,
+            dot: true,
+            ignore: ['**/node_modules/**', '.git/**', '.gitignore'],
+            mark: true
+          })
+          // Filter out the directories, leaving only files
+          .filter(filePath => !/\/$/.test(filePath))
+          // Filter out files that match the source directory .gitignore rules
+          .filter(filePath => !gitIgnoreSource.ignores(filePath))
+          // Filter out files that match the examples directory .gitignore rules
+          .filter(filePath => !gitIgnoreExamples.ignores(path.join(exampleName, filePath)));
+
+  for (const sourceFile of sourceFiles) {
+    console.log(' - ', sourceFile);
+    const destPath = path.resolve(examplePath, sourceFile)
+    fs.ensureDirSync(path.dirname(destPath));
+    fs.copySync(path.resolve(sourcePath, sourceFile), destPath);
+  }
+}
+
+function getGitIgnore(directory) {
+  const gitIgnoreMatcher = ignore();
+  const gitignoreFilePath = path.resolve(directory, '.gitignore');
+  if (fs.existsSync(gitignoreFilePath)) {
+    const gitignoreFile = fs.readFileSync(gitignoreFilePath, 'utf8');
+    gitIgnoreMatcher.add(gitignoreFile);
+  }
+  return gitIgnoreMatcher;
+}
+
+/**
+ * Convert a kebab-case string to space separated Title Case string.
+ */
+function titleize(input) {
+  return input.replace(
+      /(-|^)(.)/g, (_, pre, char) => `${pre === '-' ? ' ' : ''}${char.toUpperCase()}`);
+}
+
+exports.createEmptyExample = createEmptyExample;
+exports.ensureExamplePath = ensureExamplePath;
+exports.writeExampleConfigFile = writeExampleConfigFile;
+exports.writeStackBlitzFile = writeStackBlitzFile;
+exports.copyExampleFiles = copyExampleFiles;
+exports.titleize = titleize;
\ No newline at end of file
diff --git a/aio/tools/examples/create-example.spec.js b/aio/tools/examples/create-example.spec.js
new file mode 100644
index 0000000000000..79b1992449ec8
--- /dev/null
+++ b/aio/tools/examples/create-example.spec.js
@@ -0,0 +1,130 @@
+const path = require('canonical-path');
+const fs = require('fs-extra');
+const {glob} = require('glob');
+
+const {EXAMPLES_BASE_PATH, EXAMPLE_CONFIG_FILENAME, SHARED_PATH, STACKBLITZ_CONFIG_FILENAME} =
+    require('./constants');
+
+const {
+  copyExampleFiles,
+  createEmptyExample,
+  ensureExamplePath,
+  titleize,
+  writeExampleConfigFile,
+  writeStackBlitzFile
+} = require('./create-example');
+
+describe('create-example tool', () => {
+  describe('createEmptyExample', () => {
+    it('should create an empty example with marker files', () => {
+      spyOn(fs, 'existsSync').and.returnValue(false);
+      spyOn(fs, 'ensureDirSync');
+      const writeFileSpy = spyOn(fs, 'writeFileSync');
+
+      createEmptyExample('foo-bar', '/path/to/foo-bar');
+      expect(writeFileSpy).toHaveBeenCalledTimes(2);
+      expect(writeFileSpy)
+          .toHaveBeenCalledWith(`/path/to/foo-bar/${EXAMPLE_CONFIG_FILENAME}`, jasmine.any(String));
+      expect(writeFileSpy)
+          .toHaveBeenCalledWith(
+              `/path/to/foo-bar/${STACKBLITZ_CONFIG_FILENAME}`, jasmine.any(String));
+    });
+  });
+
+  describe('ensureExamplePath', () => {
+    it('should error if the path already exists', () => {
+      spyOn(fs, 'existsSync').and.returnValue(true);
+      expect(() => ensureExamplePath('foo/bar'))
+          .toThrowError(
+              `Unable to create example. The path to the new example already exists: foo/bar`);
+    });
+
+    it('should create the directory on disk', () => {
+      spyOn(fs, 'existsSync').and.returnValue(false);
+      const spy = spyOn(fs, 'ensureDirSync');
+      ensureExamplePath('foo/bar');
+      expect(spy).toHaveBeenCalledWith('foo/bar');
+    });
+  });
+
+  describe('writeExampleConfigFile', () => {
+    it('should write a JSON file to disk', () => {
+      const spy = spyOn(fs, 'writeFileSync');
+      writeExampleConfigFile('/foo/bar');
+      expect(spy).toHaveBeenCalledWith(`/foo/bar/${EXAMPLE_CONFIG_FILENAME}`, '');
+    });
+  });
+
+  describe('writeStackBlitzFile', () => {
+    it('should write a JSON file to disk', () => {
+      const spy = spyOn(fs, 'writeFileSync');
+      writeStackBlitzFile('bar-bar', '/foo/bar-bar');
+      expect(spy).toHaveBeenCalledWith(`/foo/bar-bar/${STACKBLITZ_CONFIG_FILENAME}`, [
+        '{',
+        '  "description": "Bar Bar",',
+        '  "files": [',
+        '    "!**/*.d.ts",',
+        '    "!**/*.js",',
+        '    "!**/*.[1,2].*"',
+        '  ],',
+        '  "tags": [',
+        '    [',
+        '      "bar",',
+        '      "bar"',
+        '    ]',
+        '  ]',
+        '}',
+        '',
+      ].join('\n'));
+    });
+  });
+
+  describe('copyExampleFiles', () => {
+    it('should copy over files that are not ignored by git', () => {
+      const examplesGitIgnorePath = path.resolve(EXAMPLES_BASE_PATH, '.gitignore');
+      const sourceGitIgnorePath = path.resolve('/source/path', '.gitignore');
+
+      spyOn(console, 'log');
+      spyOn(fs, 'existsSync').and.returnValue(true);
+      const readFileSyncSpy = spyOn(fs, 'readFileSync').and.callFake(p => {
+        switch (p) {
+          case examplesGitIgnorePath:
+            return '**/a/b/**';
+          case sourceGitIgnorePath:
+            return '**/*.bad';
+          default:
+            throw new Error('Unexpected path');
+        }
+      });
+      spyOn(glob, 'sync').and.returnValue([
+        'a/', 'a/b/', 'a/c', 'x.ts', 'x.bad', 'a/b/y.ts', 'a/b/y.bad'
+      ]);
+      const ensureDirSyncSpy = spyOn(fs, 'ensureDirSync');
+      const copySyncSpy = spyOn(fs, 'copySync');
+
+      copyExampleFiles('/source/path', '/path/to/test-example', 'test-example');
+
+      expect(readFileSyncSpy).toHaveBeenCalledWith(examplesGitIgnorePath, 'utf8');
+      expect(readFileSyncSpy).toHaveBeenCalledWith(sourceGitIgnorePath, 'utf8');
+
+      expect(ensureDirSyncSpy.calls.allArgs()).toEqual([
+        ['/path/to/test-example/a'],
+        ['/path/to/test-example'],
+      ]);
+
+      expect(copySyncSpy.calls.allArgs()).toEqual([
+        ['/source/path/a/c', '/path/to/test-example/a/c'],
+        ['/source/path/x.ts', '/path/to/test-example/x.ts'],
+      ]);
+    });
+  });
+
+  describe('titleize', () => {
+    it('should convert a kebab-case string to title-case', () => {
+      expect(titleize('abc')).toEqual('Abc');
+      expect(titleize('abc-def')).toEqual('Abc Def');
+      expect(titleize('123')).toEqual('123');
+      expect(titleize('abc---def')).toEqual('Abc - Def');
+    });
+  });
+});
diff --git a/aio/tools/examples/example-boilerplate.js b/aio/tools/examples/example-boilerplate.js
index bc1c939656426..5a2909f0ec511 100644
--- a/aio/tools/examples/example-boilerplate.js
+++ b/aio/tools/examples/example-boilerplate.js
@@ -1,10 +1,11 @@
 const fs = require('fs-extra');
 const glob = require('glob');
+const ignore = require('ignore');
 const path = require('canonical-path');
 const shelljs = require('shelljs');
 const yargs = require('yargs');
+const {EXAMPLES_BASE_PATH, EXAMPLE_CONFIG_FILENAME, SHARED_PATH} = require('./constants');
 
-const SHARED_PATH = path.resolve(__dirname, 'shared');
 const SHARED_NODE_MODULES_PATH = path.resolve(SHARED_PATH, 'node_modules');
 
 const BOILERPLATE_BASE_PATH = path.resolve(SHARED_PATH, 'boilerplate');
@@ -12,9 +13,6 @@ const BOILERPLATE_CLI_PATH = path.resolve(BOILERPLATE_BASE_PATH, 'cli');
 const BOILERPLATE_COMMON_PATH = path.resolve(BOILERPLATE_BASE_PATH, 'common');
 const BOILERPLATE_VIEWENGINE_PATH = path.resolve(BOILERPLATE_BASE_PATH, 'viewengine');
 
-const EXAMPLES_BASE_PATH = path.resolve(__dirname, '../../content/examples');
-const EXAMPLE_CONFIG_FILENAME = 'example-config.json';
-
 class ExampleBoilerPlate {
   /**
    * Add boilerplate files to all the examples
@@ -23,6 +21,8 @@ class ExampleBoilerPlate {
     // Get all the examples folders, indicated by those that contain a `example-config.json` file
     const exampleFolders =
         this.getFoldersContaining(EXAMPLES_BASE_PATH, EXAMPLE_CONFIG_FILENAME, 'node_modules');
+    const gitignore = ignore().add(fs.readFileSync(path.resolve(BOILERPLATE_BASE_PATH, '.gitignore'), 'utf8'));
+    const isPathIgnored = absolutePath => gitignore.ignores(path.relative(BOILERPLATE_BASE_PATH, absolutePath));
 
     if (!fs.existsSync(SHARED_NODE_MODULES_PATH)) {
       throw new Error(
@@ -48,22 +48,22 @@ class ExampleBoilerPlate {
       // boilerplate files first.
       // (Some of these files might be later overwritten by type-specific files.)
       if (boilerPlateType !== 'cli' && boilerPlateType !== 'systemjs') {
-        this.copyDirectoryContents(BOILERPLATE_CLI_PATH, exampleFolder);
+        this.copyDirectoryContents(BOILERPLATE_CLI_PATH, exampleFolder, isPathIgnored);
       }
 
       // Copy the type-specific boilerplate files.
-      this.copyDirectoryContents(boilerPlateBasePath, exampleFolder);
+      this.copyDirectoryContents(boilerPlateBasePath, exampleFolder, isPathIgnored);
 
       // Copy the common boilerplate files (unless explicitly not used).
       if (exampleConfig.useCommonBoilerplate !== false) {
-        this.copyDirectoryContents(BOILERPLATE_COMMON_PATH, exampleFolder);
+        this.copyDirectoryContents(BOILERPLATE_COMMON_PATH, exampleFolder, isPathIgnored);
       }
 
       // Copy ViewEngine (pre-Ivy) specific files
       if (viewengine) {
         const veBoilerPlateType = boilerPlateType === 'systemjs' ? 'systemjs' : 'cli';
         const veBoilerPlateBasePath = path.resolve(BOILERPLATE_VIEWENGINE_PATH, veBoilerPlateType);
-        this.copyDirectoryContents(veBoilerPlateBasePath, exampleFolder);
+        this.copyDirectoryContents(veBoilerPlateBasePath, exampleFolder, isPathIgnored);
       }
     });
   }
@@ -89,25 +89,30 @@ class ExampleBoilerPlate {
 
   loadJsonFile(filePath) { return fs.readJsonSync(filePath, {throws: false}) || {}; }
 
-  copyDirectoryContents(srcDir, dstDir) {
+  copyDirectoryContents(srcDir, dstDir, isPathIgnored) {
     shelljs.ls('-Al', srcDir).forEach(stat => {
       const srcPath = path.resolve(srcDir, stat.name);
       const dstPath = path.resolve(dstDir, stat.name);
 
+      if (isPathIgnored(srcPath)) {
+        // `srcPath` is ignored (e.g. by a `.gitignore` file): Ignore it.
+        return;
+      }
+
       if (stat.isDirectory()) {
         // `srcPath` is a directory: Recursively copy it to `dstDir`.
         shelljs.mkdir('-p', dstPath);
-        return this.copyDirectoryContents(srcPath, dstPath);
-      } else {
-        // `srcPath` is a file: Copy it to `dstDir`.
-        // (Also make the file non-writable to avoid accidental editing of boilerplate files).
-        if (shelljs.test('-f', dstPath)) {
-          // If the file already exists, ensure it is writable (so it can be overwritten).
-          shelljs.chmod(666, dstPath);
-        }
-        shelljs.cp(srcPath, dstDir);
-        shelljs.chmod(444, dstPath);
+        return this.copyDirectoryContents(srcPath, dstPath, isPathIgnored);
+      }
+
+      // `srcPath` is a file: Copy it to `dstDir`.
+      // (Also make the file non-writable to avoid accidental editing of boilerplate files).
+      if (shelljs.test('-f', dstPath)) {
+        // If the file already exists, ensure it is writable (so it can be overwritten).
+        shelljs.chmod(666, dstPath);
       }
+      shelljs.cp(srcPath, dstDir);
+      shelljs.chmod(444, dstPath);
     });
   }
 }
diff --git a/aio/tools/examples/example-boilerplate.spec.js b/aio/tools/examples/example-boilerplate.spec.js
index cff911a1c38d3..f716f5c434492 100644
--- a/aio/tools/examples/example-boilerplate.spec.js
+++ b/aio/tools/examples/example-boilerplate.spec.js
@@ -56,10 +56,10 @@ describe('example-boilerplate tool', () => {
 
       expect(exampleBoilerPlate.copyDirectoryContents).toHaveBeenCalledTimes(4);
       expect(exampleBoilerPlate.copyDirectoryContents.calls.allArgs()).toEqual([
-        [`${boilerplateDir}/systemjs`, 'a/b'],
-        [`${boilerplateDir}/common`, 'a/b'],
-        [`${boilerplateDir}/systemjs`, 'c/d'],
-        [`${boilerplateDir}/common`, 'c/d'],
+        [`${boilerplateDir}/systemjs`, 'a/b', jasmine.any(Function)],
+        [`${boilerplateDir}/common`, 'a/b', jasmine.any(Function)],
+        [`${boilerplateDir}/systemjs`, 'c/d', jasmine.any(Function)],
+        [`${boilerplateDir}/common`, 'c/d', jasmine.any(Function)],
       ]);
     });
 
@@ -71,10 +71,10 @@ describe('example-boilerplate tool', () => {
 
       expect(exampleBoilerPlate.copyDirectoryContents).toHaveBeenCalledTimes(4);
       expect(exampleBoilerPlate.copyDirectoryContents.calls.allArgs()).toEqual([
-        [`${boilerplateDir}/cli`, 'a/b'],
-        [`${boilerplateDir}/common`, 'a/b'],
-        [`${boilerplateDir}/cli`, 'c/d'],
-        [`${boilerplateDir}/common`, 'c/d'],
+        [`${boilerplateDir}/cli`, 'a/b', jasmine.any(Function)],
+        [`${boilerplateDir}/common`, 'a/b', jasmine.any(Function)],
+        [`${boilerplateDir}/cli`, 'c/d', jasmine.any(Function)],
+        [`${boilerplateDir}/common`, 'c/d', jasmine.any(Function)],
       ]);
     });
 
@@ -86,10 +86,10 @@ describe('example-boilerplate tool', () => {
 
       expect(exampleBoilerPlate.copyDirectoryContents).toHaveBeenCalledTimes(4);
       expect(exampleBoilerPlate.copyDirectoryContents.calls.allArgs()).toEqual([
-        [`${boilerplateDir}/cli`, 'a/b'],
-        [`${boilerplateDir}/common`, 'a/b'],
-        [`${boilerplateDir}/cli`, 'c/d'],
-        [`${boilerplateDir}/common`, 'c/d'],
+        [`${boilerplateDir}/cli`, 'a/b', jasmine.any(Function)],
+        [`${boilerplateDir}/common`, 'a/b', jasmine.any(Function)],
+        [`${boilerplateDir}/cli`, 'c/d', jasmine.any(Function)],
+        [`${boilerplateDir}/common`, 'c/d', jasmine.any(Function)],
       ]);
     });
 
@@ -101,12 +101,12 @@ describe('example-boilerplate tool', () => {
 
       expect(exampleBoilerPlate.copyDirectoryContents).toHaveBeenCalledTimes(6);
       expect(exampleBoilerPlate.copyDirectoryContents.calls.allArgs()).toEqual([
-        [`${boilerplateDir}/cli`, 'a/b'],
-        [`${boilerplateDir}/i18n`, 'a/b'],
-        [`${boilerplateDir}/common`, 'a/b'],
-        [`${boilerplateDir}/cli`, 'c/d'],
-        [`${boilerplateDir}/i18n`, 'c/d'],
-        [`${boilerplateDir}/common`, 'c/d'],
+        [`${boilerplateDir}/cli`, 'a/b', jasmine.any(Function)],
+        [`${boilerplateDir}/i18n`, 'a/b', jasmine.any(Function)],
+        [`${boilerplateDir}/common`, 'a/b', jasmine.any(Function)],
+        [`${boilerplateDir}/cli`, 'c/d', jasmine.any(Function)],
+        [`${boilerplateDir}/i18n`, 'c/d', jasmine.any(Function)],
+        [`${boilerplateDir}/common`, 'c/d', jasmine.any(Function)],
       ]);
     });
 
@@ -118,12 +118,12 @@ describe('example-boilerplate tool', () => {
 
       expect(exampleBoilerPlate.copyDirectoryContents).toHaveBeenCalledTimes(6);
       expect(exampleBoilerPlate.copyDirectoryContents.calls.allArgs()).toEqual([
-        [`${boilerplateDir}/cli`, 'a/b'],
-        [`${boilerplateDir}/universal`, 'a/b'],
-        [`${boilerplateDir}/common`, 'a/b'],
-        [`${boilerplateDir}/cli`, 'c/d'],
-        [`${boilerplateDir}/universal`, 'c/d'],
-        [`${boilerplateDir}/common`, 'c/d'],
+        [`${boilerplateDir}/cli`, 'a/b', jasmine.any(Function)],
+        [`${boilerplateDir}/universal`, 'a/b', jasmine.any(Function)],
+        [`${boilerplateDir}/common`, 'a/b', jasmine.any(Function)],
+        [`${boilerplateDir}/cli`, 'c/d', jasmine.any(Function)],
+        [`${boilerplateDir}/universal`, 'c/d', jasmine.any(Function)],
+        [`${boilerplateDir}/common`, 'c/d', jasmine.any(Function)],
       ]);
     });
 
@@ -148,12 +148,12 @@ describe('example-boilerplate tool', () => {
 
         expect(exampleBoilerPlate.copyDirectoryContents).toHaveBeenCalledTimes(6);
         expect(exampleBoilerPlate.copyDirectoryContents.calls.allArgs()).toEqual([
-          [`${boilerplateDir}/systemjs`, 'a/b'],
-          [`${boilerplateDir}/common`, 'a/b'],
-          [`${boilerplateDir}/viewengine/systemjs`, 'a/b'],
-          [`${boilerplateDir}/systemjs`, 'c/d'],
-          [`${boilerplateDir}/common`, 'c/d'],
-          [`${boilerplateDir}/viewengine/systemjs`, 'c/d'],
+          [`${boilerplateDir}/systemjs`, 'a/b', jasmine.any(Function)],
+          [`${boilerplateDir}/common`, 'a/b', jasmine.any(Function)],
+          [`${boilerplateDir}/viewengine/systemjs`, 'a/b', jasmine.any(Function)],
+          [`${boilerplateDir}/systemjs`, 'c/d', jasmine.any(Function)],
+          [`${boilerplateDir}/common`, 'c/d', jasmine.any(Function)],
+          [`${boilerplateDir}/viewengine/systemjs`, 'c/d', jasmine.any(Function)],
         ]);
       });
 
@@ -165,12 +165,12 @@ describe('example-boilerplate tool', () => {
 
         expect(exampleBoilerPlate.copyDirectoryContents).toHaveBeenCalledTimes(6);
         expect(exampleBoilerPlate.copyDirectoryContents.calls.allArgs()).toEqual([
-          [`${boilerplateDir}/cli`, 'a/b'],
-          [`${boilerplateDir}/common`, 'a/b'],
-          [`${boilerplateDir}/viewengine/cli`, 'a/b'],
-          [`${boilerplateDir}/cli`, 'c/d'],
-          [`${boilerplateDir}/common`, 'c/d'],
-          [`${boilerplateDir}/viewengine/cli`, 'c/d'],
+          [`${boilerplateDir}/cli`, 'a/b', jasmine.any(Function)],
+          [`${boilerplateDir}/common`, 'a/b', jasmine.any(Function)],
+          [`${boilerplateDir}/viewengine/cli`, 'a/b', jasmine.any(Function)],
+          [`${boilerplateDir}/cli`, 'c/d', jasmine.any(Function)],
+          [`${boilerplateDir}/common`, 'c/d', jasmine.any(Function)],
+          [`${boilerplateDir}/viewengine/cli`, 'c/d', jasmine.any(Function)],
         ]);
       });
 
@@ -182,14 +182,14 @@ describe('example-boilerplate tool', () => {
 
         expect(exampleBoilerPlate.copyDirectoryContents).toHaveBeenCalledTimes(8);
         expect(exampleBoilerPlate.copyDirectoryContents.calls.allArgs()).toEqual([
-          [`${boilerplateDir}/cli`, 'a/b'],
-          [`${boilerplateDir}/elements`, 'a/b'],
-          [`${boilerplateDir}/common`, 'a/b'],
-          [`${boilerplateDir}/viewengine/cli`, 'a/b'],
-          [`${boilerplateDir}/cli`, 'c/d'],
-          [`${boilerplateDir}/elements`, 'c/d'],
-          [`${boilerplateDir}/common`, 'c/d'],
-          [`${boilerplateDir}/viewengine/cli`, 'c/d'],
+          [`${boilerplateDir}/cli`, 'a/b', jasmine.any(Function)],
+          [`${boilerplateDir}/elements`, 'a/b', jasmine.any(Function)],
+          [`${boilerplateDir}/common`, 'a/b', jasmine.any(Function)],
+          [`${boilerplateDir}/viewengine/cli`, 'a/b', jasmine.any(Function)],
+          [`${boilerplateDir}/cli`, 'c/d', jasmine.any(Function)],
+          [`${boilerplateDir}/elements`, 'c/d', jasmine.any(Function)],
+          [`${boilerplateDir}/common`, 'c/d', jasmine.any(Function)],
+          [`${boilerplateDir}/viewengine/cli`, 'c/d', jasmine.any(Function)],
         ]);
       });
     });
@@ -214,10 +214,12 @@ describe('example-boilerplate tool', () => {
 
   describe('copyDirectoryContents', () => {
     const spyFnFor = fnName => (...args) => { callLog.push(`${fnName}(${args.join(', ')})`); };
+    let isPathIgnoredSpy;
     let callLog;
 
     beforeEach(() => {
       callLog = [];
+      isPathIgnoredSpy = jasmine.createSpy('isPathIgnored').and.returnValue(false);
       spyOn(shelljs, 'chmod').and.callFake(spyFnFor('chmod'));
       spyOn(shelljs, 'cp').and.callFake(spyFnFor('cp'));
       spyOn(shelljs, 'mkdir').and.callFake(spyFnFor('mkdir'));
@@ -226,17 +228,17 @@ describe('example-boilerplate tool', () => {
 
     it('should list all contents of a directory', () => {
       const lsSpy = spyOn(shelljs, 'ls').and.returnValue([]);
-      exampleBoilerPlate.copyDirectoryContents('source/dir', 'destination/dir');
+      exampleBoilerPlate.copyDirectoryContents('source/dir', 'destination/dir', isPathIgnoredSpy);
       expect(lsSpy).toHaveBeenCalledWith('-Al', 'source/dir');
     });
 
-    it('should use copy files and make them read-only', () => {
+    it('should copy files and make them read-only', () => {
       spyOn(shelljs, 'ls').and.returnValue([
         {name: 'file-1.txt', isDirectory: () => false},
         {name: 'file-2.txt', isDirectory: () => false},
       ]);
 
-      exampleBoilerPlate.copyDirectoryContents('source/dir', 'destination/dir');
+      exampleBoilerPlate.copyDirectoryContents('source/dir', 'destination/dir', isPathIgnoredSpy);
 
       expect(callLog).toEqual([
         `test(-f, ${path.resolve('destination/dir/file-1.txt')})`,
@@ -249,6 +251,22 @@ describe('example-boilerplate tool', () => {
       ]);
     });
 
+    it('should skip files that are ignored', () => {
+      spyOn(shelljs, 'ls').and.returnValue([
+        {name: 'file-1.txt', isDirectory: () => false},
+        {name: 'file-2.txt', isDirectory: () => false},
+      ]);
+      isPathIgnoredSpy.and.callFake(path => path.endsWith('file-1.txt'));
+
+      exampleBoilerPlate.copyDirectoryContents('source/dir', 'destination/dir', isPathIgnoredSpy);
+
+      expect(callLog).toEqual([
+        `test(-f, ${path.resolve('destination/dir/file-2.txt')})`,
+        `cp(${path.resolve('source/dir/file-2.txt')}, destination/dir)`,
+        `chmod(444, ${path.resolve('destination/dir/file-2.txt')})`,
+      ]);
+    });
+
     it('should make existing files in destination writable before overwriting', () => {
       spyOn(shelljs, 'ls').and.returnValue([
         {name: 'new-file.txt', isDirectory: () => false},
@@ -256,7 +274,7 @@ describe('example-boilerplate tool', () => {
       ]);
       shelljs.test.and.callFake((_, filePath) => filePath.endsWith('existing-file.txt'));
 
-      exampleBoilerPlate.copyDirectoryContents('source/dir', 'destination/dir');
+      exampleBoilerPlate.copyDirectoryContents('source/dir', 'destination/dir', isPathIgnoredSpy);
 
       expect(callLog).toEqual([
         `cp(${path.resolve('source/dir/new-file.txt')}, destination/dir)`,
@@ -283,7 +301,7 @@ describe('example-boilerplate tool', () => {
           {name: 'file-4.txt', isDirectory: () => false},
         ]);
 
-      exampleBoilerPlate.copyDirectoryContents('source/dir', 'destination/dir');
+      exampleBoilerPlate.copyDirectoryContents('source/dir', 'destination/dir', isPathIgnoredSpy);
 
       expect(callLog).toEqual([
         // Copy `file-1.txt`.
@@ -317,6 +335,33 @@ describe('example-boilerplate tool', () => {
         `chmod(444, ${path.resolve('destination/dir/file-2.txt')})`,
       ]);
     });
+
+    it('should skip ignored directories', () => {
+      spyOn(shelljs, 'ls')
+        .withArgs('-Al', 'source/dir').and.returnValue([
+          {name: 'file-1.txt', isDirectory: () => false},
+          {name: 'sub-dir-1', isDirectory: () => true},
+        ])
+        .withArgs('-Al', path.resolve('source/dir/sub-dir-1')).and.returnValue([
+          {name: 'file-2.txt', isDirectory: () => false},
+          {name: 'sub-dir-2', isDirectory: () => true},
+        ])
+        .withArgs('-Al', path.resolve('source/dir/sub-dir-1/sub-dir-2')).and.returnValue([
+          {name: 'file-3.txt', isDirectory: () => false},
+        ]);
+      isPathIgnoredSpy.and.callFake(path => path.endsWith('sub-dir-1'));
+
+      exampleBoilerPlate.copyDirectoryContents('source/dir', 'destination/dir', isPathIgnoredSpy);
+
+      expect(callLog).toEqual([
+        // Copy `file-1.txt`.
+        `test(-f, ${path.resolve('destination/dir/file-1.txt')})`,
+        `cp(${path.resolve('source/dir/file-1.txt')}, destination/dir)`,
+        `chmod(444, ${path.resolve('destination/dir/file-1.txt')})`,
+
+        // Skip `sub-dir-1` and all its contents.
+      ]);
+    });
   });
 
   describe('loadJsonFile', () => {
diff --git a/aio/tools/examples/shared/boilerplate/.gitignore b/aio/tools/examples/shared/boilerplate/.gitignore
index ceed8f2aed2ab..908cc874638c1 100644
--- a/aio/tools/examples/shared/boilerplate/.gitignore
+++ b/aio/tools/examples/shared/boilerplate/.gitignore
@@ -1,2 +1,3 @@
+**/node_modules/
+**/package-lock.json
 **/yarn.lock
-**/package-lock.json
\ No newline at end of file
diff --git a/aio/tools/examples/shared/boilerplate/UPDATING_CLI.md b/aio/tools/examples/shared/boilerplate/UPDATING_CLI.md
deleted file mode 100644
index e905b4a3167c3..0000000000000
--- a/aio/tools/examples/shared/boilerplate/UPDATING_CLI.md
+++ /dev/null
@@ -1,50 +0,0 @@
-# How to update the CLI project
-
-The Angular CLI default setup is updated using `ng update`. Any necessary file changes will be done automatically through migration schematics.
-
-In the `cli` folder, update the Angular CLI depedencies to the latest version:
-
-```
-ng update @angular/cli --next
-```
-
-Then update the Angular Framework dependencies to the latest version:
-
-```
-ng update @angular/core --next
-```
-
-Commit any changes to the `cli` folder to the repository.
-
-## Updating other CLI-based projects
-
-Along with the boilerplate files for the `cli` folder, the other cli-based projects need to be updated also. Each cli-based project has slightly modified files specific to the project type. Make sure any necessary changes to these projects are made also to be in alignment with the `cli` project files.
-
-The specific changes to each project type are listed below:
-
-* i18n
-  - angular.json
-    - Includes additional configurations for `build`, `serve`, and `e2e` for different locales
-  - package.json
-    - Includes custom scripts for building and serving different locales
-* ivy
-  - cli/tsconfig.app.json
-    - Includes an `angularCompilerOptions` object with `enableIvy` set to `true`
-* schematics
-  - angular.json
-    - Includes a `my-lib` project that contains a library with example schematics
-* service-worker
-  - angular.json
-    - Has `serviceWorker` set to `true` in the `production` build target
-  - package.json
-    - Includes `@angular/service-worker` in `dependencies`
-* testing
-  - angular.json
-    - Includes `src/test.css` in the `styles` for the `test` target
-* universal
-  - angular.json
-    - Includes a `server` target in the `build` architect runners
-  - package.json
-    - Includes custom scripts for building the `server`
-    - Includes additional `dependencies` on `@angular/platform-server`, `@nguniversal/express-engine`, and `express`
-    - Includes additional `devDependencies` on `@nguniversal/builders` and `@types/express`
diff --git a/aio/tools/examples/shared/boilerplate/cli-ajs/package.json b/aio/tools/examples/shared/boilerplate/cli-ajs/package.json
index d025bc756a285..5b4bb2eca221a 100644
--- a/aio/tools/examples/shared/boilerplate/cli-ajs/package.json
+++ b/aio/tools/examples/shared/boilerplate/cli-ajs/package.json
@@ -13,43 +13,42 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "~9.1.4",
-    "@angular/common": "~9.1.4",
-    "@angular/compiler": "~9.1.4",
-    "@angular/core": "~9.1.4",
-    "@angular/forms": "~9.1.4",
-    "@angular/platform-browser": "~9.1.4",
-    "@angular/platform-browser-dynamic": "~9.1.4",
-    "@angular/router": "~9.1.4",
-    "angular": "1.7.9",
+    "@angular/animations": "~10.1.3",
+    "@angular/common": "~10.1.3",
+    "@angular/compiler": "~10.1.3",
+    "@angular/core": "~10.1.3",
+    "@angular/forms": "~10.1.3",
+    "@angular/platform-browser": "~10.1.3",
+    "@angular/platform-browser-dynamic": "~10.1.3",
+    "@angular/router": "~10.1.3",
+    "angular": "1.8.0",
     "angular-in-memory-web-api": "~0.11.0",
-    "angular-route": "1.7.9",
-    "rxjs": "~6.5.4",
-    "tslib": "^1.10.0",
+    "angular-route": "1.8.0",
+    "rxjs": "~6.6.0",
+    "tslib": "^2.0.0",
     "zone.js": "~0.10.3"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.901.4",
-    "@angular/cli": "~9.1.4",
-    "@angular/compiler-cli": "~9.1.4",
-    "@angular/language-service": "~9.1.4",
-    "@types/angular": "^1.6.57",
-    "@types/angular-route": "^1.7.0",
+    "@angular-devkit/build-angular": "~0.1001.3",
+    "@angular/cli": "~10.1.3",
+    "@angular/compiler-cli": "~10.1.3",
+    "@types/angular": "1.7.3",
+    "@types/angular-route": "1.7.1",
     "@types/jasmine": "~3.5.0",
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "^12.11.1",
-    "codelyzer": "^5.1.2",
-    "jasmine-core": "~3.5.0",
+    "codelyzer": "^6.0.0",
+    "jasmine-core": "~3.6.0",
     "jasmine-marbles": "~0.6.0",
-    "jasmine-spec-reporter": "~4.2.1",
+    "jasmine-spec-reporter": "~5.0.0",
     "karma": "~5.0.0",
     "karma-chrome-launcher": "~3.1.0",
-    "karma-coverage-istanbul-reporter": "~2.1.0",
-    "karma-jasmine": "~3.0.1",
-    "karma-jasmine-html-reporter": "^1.4.2",
-    "protractor": "~5.4.3",
+    "karma-coverage-istanbul-reporter": "~3.0.2",
+    "karma-jasmine": "~4.0.0",
+    "karma-jasmine-html-reporter": "^1.5.0",
+    "protractor": "~7.0.0",
     "ts-node": "~8.3.0",
     "tslint": "~6.1.0",
-    "typescript": "~3.8.3"
+    "typescript": "~4.0.3"
   }
 }
diff --git a/aio/tools/examples/shared/boilerplate/cli/browserslist b/aio/tools/examples/shared/boilerplate/cli/.browserslistrc
similarity index 52%
rename from aio/tools/examples/shared/boilerplate/cli/browserslist
rename to aio/tools/examples/shared/boilerplate/cli/.browserslistrc
index b23d6dc5bd905..427441dc93085 100644
--- a/aio/tools/examples/shared/boilerplate/cli/browserslist
+++ b/aio/tools/examples/shared/boilerplate/cli/.browserslistrc
@@ -2,14 +2,16 @@
 # For additional information regarding the format and rule options, please see:
 # https://github.com/browserslist/browserslist#queries
 
+# For the full list of supported browsers by the Angular framework, please see:
+# https://angular.io/guide/browser-support
+
 # You can see what browsers were selected by your queries by running:
 #   npx browserslist
 
-# Googlebot uses an older version of Chrome
-# For additional information see: https://developers.google.com/search/docs/guides/rendering
-
-> 0.5%
-last 2 versions
+last 1 Chrome version
+last 1 Firefox version
+last 2 Edge major versions
+last 2 Safari major versions
+last 2 iOS major versions
 Firefox ESR
-not dead
-not IE 9-11 # For IE 9-11 support, remove 'not'.
\ No newline at end of file
+not IE 11 # Angular supports IE 11 only as an opt-in. To opt-in, remove the 'not' prefix on this line.
diff --git a/aio/tools/examples/shared/boilerplate/cli/angular.json b/aio/tools/examples/shared/boilerplate/cli/angular.json
index 243a463309980..0aebc63a978b0 100644
--- a/aio/tools/examples/shared/boilerplate/cli/angular.json
+++ b/aio/tools/examples/shared/boilerplate/cli/angular.json
@@ -5,7 +5,11 @@
   "projects": {
     "angular.io-example": {
       "projectType": "application",
-      "schematics": {},
+      "schematics": {
+        "@schematics/angular:application": {
+          "strict": true
+        }
+      },
       "root": "",
       "sourceRoot": "src",
       "prefix": "app",
@@ -18,6 +22,7 @@
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
             "tsConfig": "tsconfig.app.json",
+            "aot": true,
             "assets": [
               "src/favicon.ico",
               "src/assets"
@@ -40,20 +45,19 @@
               "sourceMap": false,
               "extractCss": true,
               "namedChunks": false,
-              "aot": true,
               "extractLicenses": true,
               "vendorChunk": false,
               "buildOptimizer": true,
               "budgets": [
                 {
                   "type": "initial",
-                  "maximumWarning": "2mb",
-                  "maximumError": "5mb"
+                  "maximumWarning": "500kb",
+                  "maximumError": "1mb"
                 },
                 {
                   "type": "anyComponentStyle",
-                  "maximumWarning": "6kb",
-                  "maximumError": "10kb"
+                  "maximumWarning": "2kb",
+                  "maximumError": "4kb"
                 }
               ]
             }
diff --git a/aio/tools/examples/shared/boilerplate/cli/e2e/protractor.conf.js b/aio/tools/examples/shared/boilerplate/cli/e2e/protractor.conf.js
index ec47c8ae2e510..09a96840f2319 100644
--- a/aio/tools/examples/shared/boilerplate/cli/e2e/protractor.conf.js
+++ b/aio/tools/examples/shared/boilerplate/cli/e2e/protractor.conf.js
@@ -2,7 +2,7 @@
 // Protractor configuration file, see link for more information
 // https://github.com/angular/protractor/blob/master/lib/config.ts
 
-const { SpecReporter } = require('jasmine-spec-reporter');
+const { SpecReporter, StacktraceOption } = require('jasmine-spec-reporter');
 
 /**
  * @type { import("protractor").Config }
@@ -27,6 +27,10 @@ exports.config = {
     require('ts-node').register({
       project: require('path').join(__dirname, './tsconfig.json')
     });
-    jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
+    jasmine.getEnv().addReporter(new SpecReporter({
+      spec: {
+        displayStacktrace: StacktraceOption.PRETTY
+      }
+    }));
   }
 };
diff --git a/aio/tools/examples/shared/boilerplate/cli/e2e/tsconfig.json b/aio/tools/examples/shared/boilerplate/cli/e2e/tsconfig.json
index 39b800f789619..426058ef0fbe7 100644
--- a/aio/tools/examples/shared/boilerplate/cli/e2e/tsconfig.json
+++ b/aio/tools/examples/shared/boilerplate/cli/e2e/tsconfig.json
@@ -1,9 +1,10 @@
+/* To learn more about this file see: https://angular.io/config/tsconfig. */
 {
   "extends": "../tsconfig.json",
   "compilerOptions": {
     "outDir": "../out-tsc/e2e",
     "module": "commonjs",
-    "target": "es5",
+    "target": "es2018",
     "types": [
       "jasmine",
       "jasminewd2",
diff --git a/aio/tools/examples/shared/boilerplate/cli/package.json b/aio/tools/examples/shared/boilerplate/cli/package.json
index fbdd7de6f88e1..5c157c87f64c4 100644
--- a/aio/tools/examples/shared/boilerplate/cli/package.json
+++ b/aio/tools/examples/shared/boilerplate/cli/package.json
@@ -13,39 +13,38 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "~9.1.4",
-    "@angular/common": "~9.1.4",
-    "@angular/compiler": "~9.1.4",
-    "@angular/core": "~9.1.4",
-    "@angular/forms": "~9.1.4",
-    "@angular/platform-browser": "~9.1.4",
-    "@angular/platform-browser-dynamic": "~9.1.4",
-    "@angular/router": "~9.1.4",
+    "@angular/animations": "~10.1.3",
+    "@angular/common": "~10.1.3",
+    "@angular/compiler": "~10.1.3",
+    "@angular/core": "~10.1.3",
+    "@angular/forms": "~10.1.3",
+    "@angular/platform-browser": "~10.1.3",
+    "@angular/platform-browser-dynamic": "~10.1.3",
+    "@angular/router": "~10.1.3",
     "angular-in-memory-web-api": "~0.11.0",
-    "rxjs": "~6.5.4",
-    "tslib": "^1.10.0",
+    "rxjs": "~6.6.0",
+    "tslib": "^2.0.0",
     "zone.js": "~0.10.3"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.901.4",
-    "@angular/cli": "~9.1.4",
-    "@angular/compiler-cli": "~9.1.4",
-    "@angular/language-service": "~9.1.4",
+    "@angular-devkit/build-angular": "~0.1001.3",
+    "@angular/cli": "~10.1.3",
+    "@angular/compiler-cli": "~10.1.3",
     "@types/jasmine": "~3.5.0",
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "^12.11.1",
-    "codelyzer": "^5.1.2",
-    "jasmine-core": "~3.5.0",
+    "codelyzer": "^6.0.0",
+    "jasmine-core": "~3.6.0",
     "jasmine-marbles": "~0.6.0",
-    "jasmine-spec-reporter": "~4.2.1",
+    "jasmine-spec-reporter": "~5.0.0",
     "karma": "~5.0.0",
     "karma-chrome-launcher": "~3.1.0",
-    "karma-coverage-istanbul-reporter": "~2.1.0",
-    "karma-jasmine": "~3.0.1",
-    "karma-jasmine-html-reporter": "^1.4.2",
-    "protractor": "~5.4.3",
+    "karma-coverage-istanbul-reporter": "~3.0.2",
+    "karma-jasmine": "~4.0.0",
+    "karma-jasmine-html-reporter": "^1.5.0",
+    "protractor": "~7.0.0",
     "ts-node": "~8.3.0",
     "tslint": "~6.1.0",
-    "typescript": "~3.8.3"
+    "typescript": "~4.0.3"
   }
 }
diff --git a/aio/tools/examples/shared/boilerplate/cli/src/app/package.json b/aio/tools/examples/shared/boilerplate/cli/src/app/package.json
new file mode 100644
index 0000000000000..5d098bf337448
--- /dev/null
+++ b/aio/tools/examples/shared/boilerplate/cli/src/app/package.json
@@ -0,0 +1,9 @@
+{
+  "name": "angular.io-example",
+  "private": true,
+  "description_1": "This is a special package.json file that is not used by package managers.",
+  "description_2": "It is used to tell the tools and bundlers whether the code under this directory is free of code with non-local side-effect. Any code that does have non-local side-effects can't be well optimized (tree-shaken) and will result in unnecessary increased payload size.",
+  "description_3": "It should be safe to set this option to 'false' for new applications, but existing code bases could be broken when built with the production config if the application code does contain non-local side-effects that the application depends on.",
+  "description_4": "To learn more about this file see: https://angular.io/config/app-package-json.",
+  "sideEffects": false
+}
diff --git a/aio/tools/examples/shared/boilerplate/cli/src/polyfills.ts b/aio/tools/examples/shared/boilerplate/cli/src/polyfills.ts
index cd7cfe977d651..f38ef7d0e5994 100644
--- a/aio/tools/examples/shared/boilerplate/cli/src/polyfills.ts
+++ b/aio/tools/examples/shared/boilerplate/cli/src/polyfills.ts
@@ -18,7 +18,7 @@
  * BROWSER POLYFILLS
  */
 
-/** IE10 and IE11 requires the following for NgClass support on SVG elements */
+/** IE11 requires the following for NgClass support on SVG elements */
 // import 'classlist.js';  // Run `npm install --save classlist.js`.
 
 /**
diff --git a/aio/tools/examples/shared/boilerplate/cli/tsconfig.app.json b/aio/tools/examples/shared/boilerplate/cli/tsconfig.app.json
index eb271da2d8063..cf23efe4272a5 100644
--- a/aio/tools/examples/shared/boilerplate/cli/tsconfig.app.json
+++ b/aio/tools/examples/shared/boilerplate/cli/tsconfig.app.json
@@ -1,3 +1,4 @@
+/* To learn more about this file see: https://angular.io/config/tsconfig. */
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
diff --git a/aio/tools/examples/shared/boilerplate/cli/tsconfig.json b/aio/tools/examples/shared/boilerplate/cli/tsconfig.json
index 30956ae7ea265..b7d7a9ad985b6 100644
--- a/aio/tools/examples/shared/boilerplate/cli/tsconfig.json
+++ b/aio/tools/examples/shared/boilerplate/cli/tsconfig.json
@@ -1,26 +1,31 @@
+/* To learn more about this file see: https://angular.io/config/tsconfig. */
 {
   "compileOnSave": false,
   "compilerOptions": {
     "baseUrl": "./",
     "outDir": "./dist/out-tsc",
+    "forceConsistentCasingInFileNames": true,
+    // TODO(gkalpak): Fix the code and enable this.
+    // "strict": true,
+    "noImplicitReturns": true,
+    "noFallthroughCasesInSwitch": true,
     "sourceMap": true,
     "declaration": false,
     "downlevelIteration": true,
     "experimentalDecorators": true,
-    "module": "esnext",
     "moduleResolution": "node",
     "importHelpers": true,
     "target": "es2015",
-    "typeRoots": [
-      "node_modules/@types"
-    ],
+    "module": "es2020",
     "lib": [
       "es2018",
       "dom"
     ]
   },
   "angularCompilerOptions": {
-    "fullTemplateTypeCheck": true,
-    "strictInjectionParameters": true
+    "strictInjectionParameters": true,
+    "strictInputAccessModifiers": true,
+    // TODO(gkalpak): Fix the code and enable this (i.e. switch from `fullTemplateTypeCheck` to `strictTemplates`).
+    "fullTemplateTypeCheck": true,// "strictTemplates": true
   }
 }
diff --git a/aio/tools/examples/shared/boilerplate/cli/tsconfig.spec.json b/aio/tools/examples/shared/boilerplate/cli/tsconfig.spec.json
index 6400fde7d5440..092345b02e807 100644
--- a/aio/tools/examples/shared/boilerplate/cli/tsconfig.spec.json
+++ b/aio/tools/examples/shared/boilerplate/cli/tsconfig.spec.json
@@ -1,10 +1,10 @@
+/* To learn more about this file see: https://angular.io/config/tsconfig. */
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "./out-tsc/spec",
     "types": [
-      "jasmine",
-      "node"
+      "jasmine"
     ]
   },
   "files": [
diff --git a/aio/tools/examples/shared/boilerplate/cli/tslint.json b/aio/tools/examples/shared/boilerplate/cli/tslint.json
index bf1abc0372d71..4cfd9cae6bebd 100644
--- a/aio/tools/examples/shared/boilerplate/cli/tslint.json
+++ b/aio/tools/examples/shared/boilerplate/cli/tslint.json
@@ -1,5 +1,8 @@
 {
   "extends": "tslint:recommended",
+  "rulesDirectory": [
+    "codelyzer"
+  ],
   "rules": {
     "align": {
       "options": [
@@ -13,22 +16,6 @@
     "deprecation": {
       "severity": "warning"
     },
-    "component-class-suffix": true,
-    "component-selector": [
-      true,
-      "element",
-      // TODO: Fix the code and change the prefix to `"app"` (or whatever makes sense).
-      "",
-      "kebab-case"
-    ],
-    "contextual-lifecycle": true,
-    "directive-class-suffix": true,
-    "directive-selector": [
-      true,
-      "attribute",
-      ["app", "toh"],
-      "camelCase"
-    ],
     "eofline": true,
     "import-blacklist": [
       true,
@@ -56,6 +43,8 @@
         ]
       }
     ],
+    // TODO(gkalpak): Fix the code and enable this.
+    // "no-any": true,
     "no-console": [
       true,
       "debug",
@@ -95,6 +84,11 @@
         "named": "never"
       }
     },
+    // TODO(gkalpak): Fix the code and enable this.
+    // "typedef": [
+    //   true,
+    //   "call-signature"
+    // ],
     "typedef-whitespace": {
       "options": [
         {
@@ -130,6 +124,9 @@
         "check-typecast"
       ]
     },
+    "component-class-suffix": true,
+    "contextual-lifecycle": true,
+    "directive-class-suffix": true,
     "no-conflicting-lifecycle": true,
     "no-host-metadata-property": true,
     "no-input-rename": true,
@@ -141,9 +138,19 @@
     "template-banana-in-box": true,
     "template-no-negated-async": true,
     "use-lifecycle-interface": true,
-    "use-pipe-transform-interface": true
-  },
-  "rulesDirectory": [
-    "codelyzer"
-  ]
+    "use-pipe-transform-interface": true,
+    "directive-selector": [
+      true,
+      "attribute",
+      ["app", "toh"],
+      "camelCase"
+    ],
+    "component-selector": [
+      true,
+      "element",
+      // TODO: Fix the code and change the prefix to `"app"` (or whatever makes sense).
+      "",
+      "kebab-case"
+    ]
+  }
 }
diff --git a/aio/tools/examples/shared/boilerplate/elements/package.json b/aio/tools/examples/shared/boilerplate/elements/package.json
index a0b396cf8a0fd..94dbbe498107e 100644
--- a/aio/tools/examples/shared/boilerplate/elements/package.json
+++ b/aio/tools/examples/shared/boilerplate/elements/package.json
@@ -13,41 +13,40 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "~9.1.4",
-    "@angular/common": "~9.1.4",
-    "@angular/compiler": "~9.1.4",
-    "@angular/core": "~9.1.4",
-    "@angular/elements": "~9.1.4",
-    "@angular/forms": "~9.1.4",
-    "@angular/platform-browser": "~9.1.4",
-    "@angular/platform-browser-dynamic": "~9.1.4",
-    "@angular/router": "~9.1.4",
-    "@webcomponents/custom-elements": "^1.4.1",
+    "@angular/animations": "~10.1.3",
+    "@angular/common": "~10.1.3",
+    "@angular/compiler": "~10.1.3",
+    "@angular/core": "~10.1.3",
+    "@angular/elements": "~10.1.3",
+    "@angular/forms": "~10.1.3",
+    "@angular/platform-browser": "~10.1.3",
+    "@angular/platform-browser-dynamic": "~10.1.3",
+    "@angular/router": "~10.1.3",
+    "@webcomponents/custom-elements": "^1.4.2",
     "angular-in-memory-web-api": "~0.11.0",
-    "rxjs": "~6.5.4",
-    "tslib": "^1.10.0",
+    "rxjs": "~6.6.0",
+    "tslib": "^2.0.0",
     "zone.js": "~0.10.3"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.901.4",
-    "@angular/cli": "~9.1.4",
-    "@angular/compiler-cli": "~9.1.4",
-    "@angular/language-service": "~9.1.4",
+    "@angular-devkit/build-angular": "~0.1001.3",
+    "@angular/cli": "~10.1.3",
+    "@angular/compiler-cli": "~10.1.3",
     "@types/jasmine": "~3.5.0",
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "^12.11.1",
-    "codelyzer": "^5.1.2",
-    "jasmine-core": "~3.5.0",
+    "codelyzer": "^6.0.0",
+    "jasmine-core": "~3.6.0",
     "jasmine-marbles": "~0.6.0",
-    "jasmine-spec-reporter": "~4.2.1",
+    "jasmine-spec-reporter": "~5.0.0",
     "karma": "~5.0.0",
     "karma-chrome-launcher": "~3.1.0",
-    "karma-coverage-istanbul-reporter": "~2.1.0",
-    "karma-jasmine": "~3.0.1",
-    "karma-jasmine-html-reporter": "^1.4.2",
-    "protractor": "~5.4.3",
+    "karma-coverage-istanbul-reporter": "~3.0.2",
+    "karma-jasmine": "~4.0.0",
+    "karma-jasmine-html-reporter": "^1.5.0",
+    "protractor": "~7.0.0",
     "ts-node": "~8.3.0",
     "tslint": "~6.1.0",
-    "typescript": "~3.8.3"
+    "typescript": "~4.0.3"
   }
 }
diff --git a/aio/tools/examples/shared/boilerplate/elements/src/polyfills.ts b/aio/tools/examples/shared/boilerplate/elements/src/polyfills.ts
index 031fc3d0c083a..08b4d9cd60651 100644
--- a/aio/tools/examples/shared/boilerplate/elements/src/polyfills.ts
+++ b/aio/tools/examples/shared/boilerplate/elements/src/polyfills.ts
@@ -18,7 +18,7 @@
  * BROWSER POLYFILLS
  */
 
-/** IE10 and IE11 requires the following for NgClass support on SVG elements */
+/** IE11 requires the following for NgClass support on SVG elements */
 // import 'classlist.js';  // Run `npm install --save classlist.js`.
 
 /**
diff --git a/aio/tools/examples/shared/boilerplate/i18n/angular.json b/aio/tools/examples/shared/boilerplate/i18n/angular.json
index 8934ab45e6b77..63e865b85c87b 100644
--- a/aio/tools/examples/shared/boilerplate/i18n/angular.json
+++ b/aio/tools/examples/shared/boilerplate/i18n/angular.json
@@ -5,7 +5,11 @@
   "projects": {
     "angular.io-example": {
       "projectType": "application",
-      "schematics": {},
+      "schematics": {
+        "@schematics/angular:application": {
+          "strict": true
+        }
+      },
       "root": "",
       "sourceRoot": "src",
       "prefix": "app",
@@ -20,12 +24,12 @@
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
             "localize": true,
-            "aot": true,
             "outputPath": "dist",
             "index": "src/index.html",
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
             "tsConfig": "tsconfig.app.json",
+            "aot": true,
             "assets": [
               "src/favicon.ico",
               "src/assets"
@@ -48,20 +52,19 @@
               "sourceMap": false,
               "extractCss": true,
               "namedChunks": false,
-              "aot": true,
               "extractLicenses": true,
               "vendorChunk": false,
               "buildOptimizer": true,
               "budgets": [
                 {
                   "type": "initial",
-                  "maximumWarning": "2mb",
-                  "maximumError": "5mb"
+                  "maximumWarning": "500kb",
+                  "maximumError": "1mb"
                 },
                 {
                   "type": "anyComponentStyle",
-                  "maximumWarning": "6kb",
-                  "maximumError": "10kb"
+                  "maximumWarning": "2kb",
+                  "maximumError": "4kb"
                 }
               ]
             },
diff --git a/aio/tools/examples/shared/boilerplate/i18n/package.json b/aio/tools/examples/shared/boilerplate/i18n/package.json
index d0944e64c4b37..e1e511f0add4b 100644
--- a/aio/tools/examples/shared/boilerplate/i18n/package.json
+++ b/aio/tools/examples/shared/boilerplate/i18n/package.json
@@ -16,40 +16,39 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "~9.1.4",
-    "@angular/common": "~9.1.4",
-    "@angular/compiler": "~9.1.4",
-    "@angular/core": "~9.1.4",
-    "@angular/forms": "~9.1.4",
-    "@angular/localize": "^9.1.4",
-    "@angular/platform-browser": "~9.1.4",
-    "@angular/platform-browser-dynamic": "~9.1.4",
-    "@angular/router": "~9.1.4",
+    "@angular/animations": "~10.1.3",
+    "@angular/common": "~10.1.3",
+    "@angular/compiler": "~10.1.3",
+    "@angular/core": "~10.1.3",
+    "@angular/forms": "~10.1.3",
+    "@angular/localize": "~10.1.3",
+    "@angular/platform-browser": "~10.1.3",
+    "@angular/platform-browser-dynamic": "~10.1.3",
+    "@angular/router": "~10.1.3",
     "angular-in-memory-web-api": "~0.11.0",
-    "rxjs": "~6.5.4",
-    "tslib": "^1.10.0",
+    "rxjs": "~6.6.0",
+    "tslib": "^2.0.0",
     "zone.js": "~0.10.3"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.901.4",
-    "@angular/cli": "~9.1.4",
-    "@angular/compiler-cli": "~9.1.4",
-    "@angular/language-service": "~9.1.4",
+    "@angular-devkit/build-angular": "~0.1001.3",
+    "@angular/cli": "~10.1.3",
+    "@angular/compiler-cli": "~10.1.3",
     "@types/jasmine": "~3.5.0",
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "^12.11.1",
-    "codelyzer": "^5.1.2",
-    "jasmine-core": "~3.5.0",
+    "codelyzer": "^6.0.0",
+    "jasmine-core": "~3.6.0",
     "jasmine-marbles": "~0.6.0",
-    "jasmine-spec-reporter": "~4.2.1",
+    "jasmine-spec-reporter": "~5.0.0",
     "karma": "~5.0.0",
     "karma-chrome-launcher": "~3.1.0",
-    "karma-coverage-istanbul-reporter": "~2.1.0",
-    "karma-jasmine": "~3.0.1",
-    "karma-jasmine-html-reporter": "^1.4.2",
-    "protractor": "~5.4.3",
+    "karma-coverage-istanbul-reporter": "~3.0.2",
+    "karma-jasmine": "~4.0.0",
+    "karma-jasmine-html-reporter": "^1.5.0",
+    "protractor": "~7.0.0",
     "ts-node": "~8.3.0",
     "tslint": "~6.1.0",
-    "typescript": "~3.8.3"
+    "typescript": "~4.0.3"
   }
 }
diff --git a/aio/tools/examples/shared/boilerplate/i18n/src/polyfills.ts b/aio/tools/examples/shared/boilerplate/i18n/src/polyfills.ts
index d06dbf69c5428..3424b9d3f41be 100644
--- a/aio/tools/examples/shared/boilerplate/i18n/src/polyfills.ts
+++ b/aio/tools/examples/shared/boilerplate/i18n/src/polyfills.ts
@@ -22,7 +22,7 @@ import '@angular/localize/init';
  * BROWSER POLYFILLS
  */
 
-/** IE10 and IE11 requires the following for NgClass support on SVG elements */
+/** IE11 requires the following for NgClass support on SVG elements */
 // import 'classlist.js';  // Run `npm install --save classlist.js`.
 
 /**
diff --git a/aio/tools/examples/shared/boilerplate/schematics/angular.json b/aio/tools/examples/shared/boilerplate/schematics/angular.json
index 368c748ff0ade..bfdd1d0c857d9 100644
--- a/aio/tools/examples/shared/boilerplate/schematics/angular.json
+++ b/aio/tools/examples/shared/boilerplate/schematics/angular.json
@@ -5,7 +5,11 @@
   "projects": {
     "angular.io-example": {
       "projectType": "application",
-      "schematics": {},
+      "schematics": {
+        "@schematics/angular:application": {
+          "strict": true
+        }
+      },
       "root": "",
       "sourceRoot": "src",
       "prefix": "app",
@@ -18,6 +22,7 @@
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
             "tsConfig": "tsconfig.app.json",
+            "aot": true,
             "assets": [
               "src/favicon.ico",
               "src/assets"
@@ -40,20 +45,19 @@
               "sourceMap": false,
               "extractCss": true,
               "namedChunks": false,
-              "aot": true,
               "extractLicenses": true,
               "vendorChunk": false,
               "buildOptimizer": true,
               "budgets": [
                 {
                   "type": "initial",
-                  "maximumWarning": "2mb",
-                  "maximumError": "5mb"
+                  "maximumWarning": "500kb",
+                  "maximumError": "1mb"
                 },
                 {
                   "type": "anyComponentStyle",
-                  "maximumWarning": "6kb",
-                  "maximumError": "10kb"
+                  "maximumWarning": "2kb",
+                  "maximumError": "4kb"
                 }
               ]
             }
diff --git a/aio/tools/examples/shared/boilerplate/service-worker/angular.json b/aio/tools/examples/shared/boilerplate/service-worker/angular.json
index e9d884e0bfcb9..75f201a3941e8 100644
--- a/aio/tools/examples/shared/boilerplate/service-worker/angular.json
+++ b/aio/tools/examples/shared/boilerplate/service-worker/angular.json
@@ -5,7 +5,11 @@
   "projects": {
     "angular.io-example": {
       "projectType": "application",
-      "schematics": {},
+      "schematics": {
+        "@schematics/angular:application": {
+          "strict": true
+        }
+      },
       "root": "",
       "sourceRoot": "src",
       "prefix": "app",
@@ -18,6 +22,7 @@
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
             "tsConfig": "tsconfig.app.json",
+            "aot": true,
             "assets": [
               "src/favicon.ico",
               "src/assets"
@@ -40,7 +45,6 @@
               "sourceMap": false,
               "extractCss": true,
               "namedChunks": false,
-              "aot": true,
               "extractLicenses": true,
               "vendorChunk": false,
               "buildOptimizer": true,
@@ -48,13 +52,13 @@
               "budgets": [
                 {
                   "type": "initial",
-                  "maximumWarning": "2mb",
-                  "maximumError": "5mb"
+                  "maximumWarning": "500kb",
+                  "maximumError": "1mb"
                 },
                 {
                   "type": "anyComponentStyle",
-                  "maximumWarning": "6kb",
-                  "maximumError": "10kb"
+                  "maximumWarning": "2kb",
+                  "maximumError": "4kb"
                 }
               ]
             }
diff --git a/aio/tools/examples/shared/boilerplate/service-worker/package.json b/aio/tools/examples/shared/boilerplate/service-worker/package.json
index 9c30e90cea4d0..9dae5937ea8b0 100644
--- a/aio/tools/examples/shared/boilerplate/service-worker/package.json
+++ b/aio/tools/examples/shared/boilerplate/service-worker/package.json
@@ -13,40 +13,39 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "~9.1.4",
-    "@angular/common": "~9.1.4",
-    "@angular/compiler": "~9.1.4",
-    "@angular/core": "~9.1.4",
-    "@angular/forms": "~9.1.4",
-    "@angular/platform-browser": "~9.1.4",
-    "@angular/platform-browser-dynamic": "~9.1.4",
-    "@angular/router": "~9.1.4",
-    "@angular/service-worker": "~9.1.4",
+    "@angular/animations": "~10.1.3",
+    "@angular/common": "~10.1.3",
+    "@angular/compiler": "~10.1.3",
+    "@angular/core": "~10.1.3",
+    "@angular/forms": "~10.1.3",
+    "@angular/platform-browser": "~10.1.3",
+    "@angular/platform-browser-dynamic": "~10.1.3",
+    "@angular/router": "~10.1.3",
+    "@angular/service-worker": "~10.1.3",
     "angular-in-memory-web-api": "~0.11.0",
-    "rxjs": "~6.5.4",
-    "tslib": "^1.10.0",
+    "rxjs": "~6.6.0",
+    "tslib": "^2.0.0",
     "zone.js": "~0.10.3"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.901.4",
-    "@angular/cli": "~9.1.4",
-    "@angular/compiler-cli": "~9.1.4",
-    "@angular/language-service": "~9.1.4",
+    "@angular-devkit/build-angular": "~0.1001.3",
+    "@angular/cli": "~10.1.3",
+    "@angular/compiler-cli": "~10.1.3",
     "@types/jasmine": "~3.5.0",
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "^12.11.1",
-    "codelyzer": "^5.1.2",
-    "jasmine-core": "~3.5.0",
+    "codelyzer": "^6.0.0",
+    "jasmine-core": "~3.6.0",
     "jasmine-marbles": "~0.6.0",
-    "jasmine-spec-reporter": "~4.2.1",
+    "jasmine-spec-reporter": "~5.0.0",
     "karma": "~5.0.0",
     "karma-chrome-launcher": "~3.1.0",
-    "karma-coverage-istanbul-reporter": "~2.1.0",
-    "karma-jasmine": "~3.0.1",
-    "karma-jasmine-html-reporter": "^1.4.2",
-    "protractor": "~5.4.3",
+    "karma-coverage-istanbul-reporter": "~3.0.2",
+    "karma-jasmine": "~4.0.0",
+    "karma-jasmine-html-reporter": "^1.5.0",
+    "protractor": "~7.0.0",
     "ts-node": "~8.3.0",
     "tslint": "~6.1.0",
-    "typescript": "~3.8.3"
+    "typescript": "~4.0.3"
   }
 }
diff --git a/aio/tools/examples/shared/boilerplate/systemjs/package.json b/aio/tools/examples/shared/boilerplate/systemjs/package.json
index 1a609f6626505..909e3d57567b1 100644
--- a/aio/tools/examples/shared/boilerplate/systemjs/package.json
+++ b/aio/tools/examples/shared/boilerplate/systemjs/package.json
@@ -27,45 +27,44 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "~9.1.4",
-    "@angular/common": "~9.1.4",
-    "@angular/compiler": "~9.1.4",
-    "@angular/core": "~9.1.4",
-    "@angular/forms": "~9.1.4",
-    "@angular/platform-browser": "~9.1.4",
-    "@angular/platform-browser-dynamic": "~9.1.4",
-    "@angular/router": "~9.1.4",
-    "@angular/upgrade": "~9.1.4",
+    "@angular/animations": "~10.1.3",
+    "@angular/common": "~10.1.3",
+    "@angular/compiler": "~10.1.3",
+    "@angular/core": "~10.1.3",
+    "@angular/forms": "~10.1.3",
+    "@angular/platform-browser": "~10.1.3",
+    "@angular/platform-browser-dynamic": "~10.1.3",
+    "@angular/router": "~10.1.3",
+    "@angular/upgrade": "~10.1.3",
     "core-js": "^2.5.4",
-    "rxjs": "~6.5.4",
-    "tslib": "^1.10.0",
+    "rxjs": "~6.6.0",
+    "tslib": "^2.0.0",
     "zone.js": "~0.10.3"
   },
   "devDependencies": {
-    "@angular/compiler-cli": "~9.1.4",
-    "@angular/language-service": "~9.1.4",
-    "@types/angular": "1.6.47",
+    "@angular/compiler-cli": "~10.1.3",
+    "@types/angular": "1.7.3",
     "@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/angular-mocks": "1.7.0",
+    "@types/angular-resource": "1.5.16",
+    "@types/angular-route": "1.7.1",
     "@types/jasmine": "~3.5.0",
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "^12.11.1",
     "concurrently": "^5.0.1",
     "http-server": "^0.12.0",
-    "jasmine-core": "~3.5.0",
-    "karma": "~4.3.0",
+    "jasmine-core": "~3.6.0",
+    "karma": "~5.0.0",
     "karma-chrome-launcher": "~3.1.0",
-    "karma-jasmine": "~2.0.1",
-    "karma-jasmine-html-reporter": "^1.4.2",
+    "karma-jasmine": "~4.0.0",
+    "karma-jasmine-html-reporter": "^1.5.0",
     "lite-server": "^2.2.2",
-    "protractor": "~5.4.3",
+    "protractor": "~7.0.0",
     "rollup": "^1.1.0",
     "rollup-plugin-commonjs": "^9.2.1",
     "rollup-plugin-node-resolve": "^4.0.0",
     "rollup-plugin-terser": "^5.3.0",
-    "tslint": "~5.18.0",
-    "typescript": "~3.7.5"
+    "tslint": "~6.1.0",
+    "typescript": "~4.0.3"
   }
 }
diff --git a/aio/tools/examples/shared/boilerplate/systemjs/tslint.json b/aio/tools/examples/shared/boilerplate/systemjs/tslint.json
index bf1abc0372d71..4cfd9cae6bebd 100644
--- a/aio/tools/examples/shared/boilerplate/systemjs/tslint.json
+++ b/aio/tools/examples/shared/boilerplate/systemjs/tslint.json
@@ -1,5 +1,8 @@
 {
   "extends": "tslint:recommended",
+  "rulesDirectory": [
+    "codelyzer"
+  ],
   "rules": {
     "align": {
       "options": [
@@ -13,22 +16,6 @@
     "deprecation": {
       "severity": "warning"
     },
-    "component-class-suffix": true,
-    "component-selector": [
-      true,
-      "element",
-      // TODO: Fix the code and change the prefix to `"app"` (or whatever makes sense).
-      "",
-      "kebab-case"
-    ],
-    "contextual-lifecycle": true,
-    "directive-class-suffix": true,
-    "directive-selector": [
-      true,
-      "attribute",
-      ["app", "toh"],
-      "camelCase"
-    ],
     "eofline": true,
     "import-blacklist": [
       true,
@@ -56,6 +43,8 @@
         ]
       }
     ],
+    // TODO(gkalpak): Fix the code and enable this.
+    // "no-any": true,
     "no-console": [
       true,
       "debug",
@@ -95,6 +84,11 @@
         "named": "never"
       }
     },
+    // TODO(gkalpak): Fix the code and enable this.
+    // "typedef": [
+    //   true,
+    //   "call-signature"
+    // ],
     "typedef-whitespace": {
       "options": [
         {
@@ -130,6 +124,9 @@
         "check-typecast"
       ]
     },
+    "component-class-suffix": true,
+    "contextual-lifecycle": true,
+    "directive-class-suffix": true,
     "no-conflicting-lifecycle": true,
     "no-host-metadata-property": true,
     "no-input-rename": true,
@@ -141,9 +138,19 @@
     "template-banana-in-box": true,
     "template-no-negated-async": true,
     "use-lifecycle-interface": true,
-    "use-pipe-transform-interface": true
-  },
-  "rulesDirectory": [
-    "codelyzer"
-  ]
+    "use-pipe-transform-interface": true,
+    "directive-selector": [
+      true,
+      "attribute",
+      ["app", "toh"],
+      "camelCase"
+    ],
+    "component-selector": [
+      true,
+      "element",
+      // TODO: Fix the code and change the prefix to `"app"` (or whatever makes sense).
+      "",
+      "kebab-case"
+    ]
+  }
 }
diff --git a/aio/tools/examples/shared/boilerplate/testing/angular.json b/aio/tools/examples/shared/boilerplate/testing/angular.json
index 6c1cb0b102500..3226b2e5155f2 100644
--- a/aio/tools/examples/shared/boilerplate/testing/angular.json
+++ b/aio/tools/examples/shared/boilerplate/testing/angular.json
@@ -5,7 +5,11 @@
   "projects": {
     "angular.io-example": {
       "projectType": "application",
-      "schematics": {},
+      "schematics": {
+        "@schematics/angular:application": {
+          "strict": true
+        }
+      },
       "root": "",
       "sourceRoot": "src",
       "prefix": "app",
@@ -18,6 +22,7 @@
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
             "tsConfig": "tsconfig.app.json",
+            "aot": true,
             "assets": [
               "src/favicon.ico",
               "src/assets"
@@ -41,20 +46,19 @@
               "sourceMap": false,
               "extractCss": true,
               "namedChunks": false,
-              "aot": true,
               "extractLicenses": true,
               "vendorChunk": false,
               "buildOptimizer": true,
               "budgets": [
                 {
                   "type": "initial",
-                  "maximumWarning": "2mb",
-                  "maximumError": "5mb"
+                  "maximumWarning": "500kb",
+                  "maximumError": "1mb"
                 },
                 {
                   "type": "anyComponentStyle",
-                  "maximumWarning": "6kb",
-                  "maximumError": "10kb"
+                  "maximumWarning": "2kb",
+                  "maximumError": "4kb"
                 }
               ]
             }
diff --git a/aio/tools/examples/shared/boilerplate/testing/tsconfig.app.json b/aio/tools/examples/shared/boilerplate/testing/tsconfig.app.json
index fdc41f9303fc6..dd00a4b966d76 100644
--- a/aio/tools/examples/shared/boilerplate/testing/tsconfig.app.json
+++ b/aio/tools/examples/shared/boilerplate/testing/tsconfig.app.json
@@ -1,3 +1,4 @@
+/* To learn more about this file see: https://angular.io/config/tsconfig. */
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
diff --git a/aio/tools/examples/shared/boilerplate/testing/tsconfig.spec.json b/aio/tools/examples/shared/boilerplate/testing/tsconfig.spec.json
index 0e279f52310df..04c116ecd68b7 100644
--- a/aio/tools/examples/shared/boilerplate/testing/tsconfig.spec.json
+++ b/aio/tools/examples/shared/boilerplate/testing/tsconfig.spec.json
@@ -1,10 +1,10 @@
+/* To learn more about this file see: https://angular.io/config/tsconfig. */
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "./out-tsc/spec",
     "types": [
-      "jasmine",
-      "node"
+      "jasmine"
     ]
   },
   "files": [
diff --git a/aio/tools/examples/shared/boilerplate/universal/angular.json b/aio/tools/examples/shared/boilerplate/universal/angular.json
index 1816501f6cf62..f763842ea5da4 100644
--- a/aio/tools/examples/shared/boilerplate/universal/angular.json
+++ b/aio/tools/examples/shared/boilerplate/universal/angular.json
@@ -5,7 +5,11 @@
   "projects": {
     "angular.io-example": {
       "projectType": "application",
-      "schematics": {},
+      "schematics": {
+        "@schematics/angular:application": {
+          "strict": true
+        }
+      },
       "root": "",
       "sourceRoot": "src",
       "prefix": "app",
@@ -18,6 +22,7 @@
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
             "tsConfig": "tsconfig.app.json",
+            "aot": true,
             "assets": [
               "src/favicon.ico",
               "src/assets"
@@ -40,20 +45,19 @@
               "sourceMap": false,
               "extractCss": true,
               "namedChunks": false,
-              "aot": true,
               "extractLicenses": true,
               "vendorChunk": false,
               "buildOptimizer": true,
               "budgets": [
                 {
                   "type": "initial",
-                  "maximumWarning": "2mb",
-                  "maximumError": "5mb"
+                  "maximumWarning": "500kb",
+                  "maximumError": "1mb"
                 },
                 {
                   "type": "anyComponentStyle",
-                  "maximumWarning": "6kb",
-                  "maximumError": "10kb"
+                  "maximumWarning": "2kb",
+                  "maximumError": "4kb"
                 }
               ]
             }
diff --git a/aio/tools/examples/shared/boilerplate/universal/package.json b/aio/tools/examples/shared/boilerplate/universal/package.json
index 9b503635f9998..f1d1348fb9518 100644
--- a/aio/tools/examples/shared/boilerplate/universal/package.json
+++ b/aio/tools/examples/shared/boilerplate/universal/package.json
@@ -17,44 +17,43 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "~9.1.4",
-    "@angular/common": "~9.1.4",
-    "@angular/compiler": "~9.1.4",
-    "@angular/core": "~9.1.4",
-    "@angular/forms": "~9.1.4",
-    "@angular/platform-browser": "~9.1.4",
-    "@angular/platform-browser-dynamic": "~9.1.4",
-    "@angular/platform-server": "~9.1.4",
-    "@angular/router": "~9.1.4",
-    "@nguniversal/express-engine": "~9.0.1",
+    "@angular/animations": "~10.1.3",
+    "@angular/common": "~10.1.3",
+    "@angular/compiler": "~10.1.3",
+    "@angular/core": "~10.1.3",
+    "@angular/forms": "~10.1.3",
+    "@angular/platform-browser": "~10.1.3",
+    "@angular/platform-browser-dynamic": "~10.1.3",
+    "@angular/platform-server": "~10.1.3",
+    "@angular/router": "~10.1.3",
+    "@nguniversal/express-engine": "~10.1.0",
     "angular-in-memory-web-api": "~0.11.0",
     "express": "^4.15.2",
-    "rxjs": "~6.5.4",
-    "tslib": "^1.10.0",
+    "rxjs": "~6.6.0",
+    "tslib": "^2.0.0",
     "zone.js": "~0.10.3"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.901.4",
-    "@angular/cli": "~9.1.4",
-    "@angular/compiler-cli": "~9.1.4",
-    "@angular/language-service": "~9.1.4",
-    "@nguniversal/builders": "^9.0.2",
-    "@types/express": "^4.17.0",
+    "@angular-devkit/build-angular": "~0.1001.3",
+    "@angular/cli": "~10.1.3",
+    "@angular/compiler-cli": "~10.1.3",
+    "@nguniversal/builders": "~10.1.0",
+    "@types/express": "^4.17.8",
     "@types/jasmine": "~3.5.0",
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "^12.11.1",
-    "codelyzer": "^5.1.2",
-    "jasmine-core": "~3.5.0",
+    "codelyzer": "^6.0.0",
+    "jasmine-core": "~3.6.0",
     "jasmine-marbles": "~0.6.0",
-    "jasmine-spec-reporter": "~4.2.1",
+    "jasmine-spec-reporter": "~5.0.0",
     "karma": "~5.0.0",
     "karma-chrome-launcher": "~3.1.0",
-    "karma-coverage-istanbul-reporter": "~2.1.0",
-    "karma-jasmine": "~3.0.1",
-    "karma-jasmine-html-reporter": "^1.4.2",
-    "protractor": "~5.4.3",
+    "karma-coverage-istanbul-reporter": "~3.0.2",
+    "karma-jasmine": "~4.0.0",
+    "karma-jasmine-html-reporter": "^1.5.0",
+    "protractor": "~7.0.0",
     "ts-node": "~8.3.0",
     "tslint": "~6.1.0",
-    "typescript": "~3.8.3"
+    "typescript": "~4.0.3"
   }
 }
diff --git a/aio/tools/examples/shared/boilerplate/viewengine/cli/tsconfig.json b/aio/tools/examples/shared/boilerplate/viewengine/cli/tsconfig.json
index e4816a58e77b2..2394d7fc83811 100644
--- a/aio/tools/examples/shared/boilerplate/viewengine/cli/tsconfig.json
+++ b/aio/tools/examples/shared/boilerplate/viewengine/cli/tsconfig.json
@@ -1,19 +1,22 @@
+/* To learn more about this file see: https://angular.io/config/tsconfig. */
 {
   "compileOnSave": false,
   "compilerOptions": {
     "baseUrl": "./",
     "outDir": "./dist/out-tsc",
+    "forceConsistentCasingInFileNames": true,
+    // TODO(gkalpak): Fix the code and enable this.
+    // "strict": true,
+    "noImplicitReturns": true,
+    "noFallthroughCasesInSwitch": true,
     "sourceMap": true,
     "declaration": false,
     "downlevelIteration": true,
     "experimentalDecorators": true,
-    "module": "esnext",
     "moduleResolution": "node",
     "importHelpers": true,
     "target": "es2015",
-    "typeRoots": [
-      "node_modules/@types"
-    ],
+    "module": "es2020",
     "lib": [
       "es2018",
       "dom"
@@ -21,7 +24,9 @@
   },
   "angularCompilerOptions": {
     "enableIvy": false,
-    "fullTemplateTypeCheck": true,
-    "strictInjectionParameters": true
+    "strictInjectionParameters": true,
+    "strictInputAccessModifiers": true,
+    // TODO(gkalpak): Fix the code and enable this (i.e. switch from `fullTemplateTypeCheck` to `strictTemplates`).
+    "fullTemplateTypeCheck": true,// "strictTemplates": true
   }
 }
diff --git a/aio/tools/examples/shared/boilerplate/viewengine/systemjs/tsconfig-aot.json b/aio/tools/examples/shared/boilerplate/viewengine/systemjs/tsconfig-aot.json
index 068667697026a..b56690d6bb687 100644
--- a/aio/tools/examples/shared/boilerplate/viewengine/systemjs/tsconfig-aot.json
+++ b/aio/tools/examples/shared/boilerplate/viewengine/systemjs/tsconfig-aot.json
@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "target": "es5",
-    "module": "es2015",
+    "module": "es2020",
     "moduleResolution": "node",
     "sourceMap": true,
     "emitDecoratorMetadata": true,
diff --git a/aio/tools/examples/shared/example-scaffold/e2e/src/app.e2e-spec.ts b/aio/tools/examples/shared/example-scaffold/e2e/src/app.e2e-spec.ts
new file mode 100644
index 0000000000000..bd99243f89232
--- /dev/null
+++ b/aio/tools/examples/shared/example-scaffold/e2e/src/app.e2e-spec.ts
@@ -0,0 +1,20 @@
+import { AppPage } from './app.po';
+import { browser, logging } from 'protractor';
+
+describe('workspace-project App', () => {
+  let page: AppPage;
+
+  beforeEach(() => {
+    page = new AppPage();
+  });
+
+  // Add your e2e tests here
+
+  afterEach(async () => {
+    // Assert that there are no errors emitted from the browser
+    const logs = await browser.manage().logs().get(logging.Type.BROWSER);
+    expect(logs).not.toContain(jasmine.objectContaining({
+      level: logging.Level.SEVERE,
+    } as logging.Entry));
+  });
+});
diff --git a/aio/tools/examples/shared/example-scaffold/src/app/app.component.css b/aio/tools/examples/shared/example-scaffold/src/app/app.component.css
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/aio/tools/examples/shared/example-scaffold/src/app/app.component.html b/aio/tools/examples/shared/example-scaffold/src/app/app.component.html
new file mode 100644
index 0000000000000..60dbe3a500a19
--- /dev/null
+++ b/aio/tools/examples/shared/example-scaffold/src/app/app.component.html
@@ -0,0 +1 @@
+<h1>Replace the src folder in this {{title}} with yours.</h1>
\ No newline at end of file
diff --git a/aio/tools/examples/shared/example-scaffold/src/app/app.component.spec.ts b/aio/tools/examples/shared/example-scaffold/src/app/app.component.spec.ts
new file mode 100644
index 0000000000000..0509746ff0487
--- /dev/null
+++ b/aio/tools/examples/shared/example-scaffold/src/app/app.component.spec.ts
@@ -0,0 +1,20 @@
+import { TestBed } from '@angular/core/testing';
+import { AppComponent } from './app.component';
+
+describe('AppComponent', () => {
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [
+        AppComponent
+      ],
+    }).compileComponents();
+  });
+
+  it('should create the app', () => {
+    const fixture = TestBed.createComponent(AppComponent);
+    const app = fixture.componentInstance;
+    expect(app).toBeTruthy();
+  });
+
+  // Add your unit tests here
+});
diff --git a/aio/tools/examples/shared/example-scaffold/src/app/app.component.ts b/aio/tools/examples/shared/example-scaffold/src/app/app.component.ts
new file mode 100644
index 0000000000000..ea1aba85a9565
--- /dev/null
+++ b/aio/tools/examples/shared/example-scaffold/src/app/app.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-root',
+  templateUrl: './app.component.html',
+  styleUrls: ['./app.component.css'],
+})
+export class AppComponent {
+  title = 'example';
+}
diff --git a/aio/tools/examples/shared/example-scaffold/src/app/app.module.ts b/aio/tools/examples/shared/example-scaffold/src/app/app.module.ts
new file mode 100644
index 0000000000000..f65716351aa59
--- /dev/null
+++ b/aio/tools/examples/shared/example-scaffold/src/app/app.module.ts
@@ -0,0 +1,16 @@
+import { BrowserModule } from '@angular/platform-browser';
+import { NgModule } from '@angular/core';
+
+import { AppComponent } from './app.component';
+
+@NgModule({
+  declarations: [
+    AppComponent
+  ],
+  imports: [
+    BrowserModule
+  ],
+  providers: [],
+  bootstrap: [AppComponent]
+})
+export class AppModule { }
diff --git a/aio/tools/examples/shared/example-scaffold/src/index.html b/aio/tools/examples/shared/example-scaffold/src/index.html
new file mode 100644
index 0000000000000..3e64774523c01
--- /dev/null
+++ b/aio/tools/examples/shared/example-scaffold/src/index.html
@@ -0,0 +1,13 @@
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>Ponyracer</title>
+  <base href="/">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="icon" type="image/x-icon" href="favicon.ico">
+</head>
+<body>
+  <app-root></app-root>
+</body>
+</html>
diff --git a/aio/tools/examples/shared/example-scaffold/src/main.ts b/aio/tools/examples/shared/example-scaffold/src/main.ts
new file mode 100644
index 0000000000000..c7b673cf44b38
--- /dev/null
+++ b/aio/tools/examples/shared/example-scaffold/src/main.ts
@@ -0,0 +1,12 @@
+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)
+  .catch(err => console.error(err));
diff --git a/aio/tools/examples/shared/package.json b/aio/tools/examples/shared/package.json
index 4c64be04aa6b2..b998750eb9ae7 100644
--- a/aio/tools/examples/shared/package.json
+++ b/aio/tools/examples/shared/package.json
@@ -8,7 +8,8 @@
     "protractor": "protractor",
     "webdriver:update": "node ../../../../scripts/webdriver-manager-update.js",
     "preinstall": "node ../../../../tools/yarn/check-yarn.js",
-    "postinstall": "yarn webdriver:update"
+    "postinstall": "yarn webdriver:update",
+    "sync-deps": "node sync-boilerplate-dependencies"
   },
   "//engines-comment": "Keep this in sync with /package.json and /aio/package.json",
   "engines": {
@@ -20,63 +21,62 @@
   "license": "MIT",
   "repository": {},
   "dependencies": {
-    "@angular/animations": "~9.1.4",
-    "@angular/common": "~9.1.4",
-    "@angular/compiler": "~9.1.4",
-    "@angular/core": "~9.1.4",
-    "@angular/elements": "~9.1.4",
-    "@angular/forms": "~9.1.4",
-    "@angular/localize": "~9.1.4",
-    "@angular/platform-browser": "~9.1.4",
-    "@angular/platform-browser-dynamic": "~9.1.4",
-    "@angular/platform-server": "~9.1.4",
-    "@angular/router": "~9.1.4",
-    "@angular/service-worker": "~9.1.4",
-    "@angular/upgrade": "~9.1.4",
-    "@nguniversal/express-engine": "~9.0.1",
-    "@webcomponents/custom-elements": "^1.4.1",
-    "angular": "1.7.9",
+    "@angular/animations": "~10.1.3",
+    "@angular/common": "~10.1.3",
+    "@angular/compiler": "~10.1.3",
+    "@angular/core": "~10.1.3",
+    "@angular/elements": "~10.1.3",
+    "@angular/forms": "~10.1.3",
+    "@angular/localize": "~10.1.3",
+    "@angular/platform-browser": "~10.1.3",
+    "@angular/platform-browser-dynamic": "~10.1.3",
+    "@angular/platform-server": "~10.1.3",
+    "@angular/router": "~10.1.3",
+    "@angular/service-worker": "~10.1.3",
+    "@angular/upgrade": "~10.1.3",
+    "@nguniversal/express-engine": "~10.1.0",
+    "@webcomponents/custom-elements": "^1.4.2",
+    "angular": "1.8.0",
     "angular-in-memory-web-api": "~0.11.0",
-    "angular-route": "1.7.9",
+    "angular-route": "1.8.0",
     "core-js": "^2.5.4",
     "express": "^4.15.2",
-    "rxjs": "~6.5.4",
+    "rxjs": "~6.6.0",
     "systemjs": "0.19.39",
-    "tslib": "^1.10.0",
+    "tslib": "^2.0.0",
     "zone.js": "~0.10.3"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.901.4",
-    "@angular/cli": "~9.1.4",
-    "@angular/compiler-cli": "~9.1.4",
-    "@angular/language-service": "~9.1.4",
-    "@nguniversal/builders": "^9.0.2",
-    "@types/angular": "1.6.47",
+    "@angular-devkit/build-angular": "~0.1001.3",
+    "@angular/cli": "~10.1.3",
+    "@angular/compiler-cli": "~10.1.3",
+    "@nguniversal/builders": "~10.1.0",
+    "@types/angular": "1.7.3",
     "@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.17.0",
+    "@types/angular-mocks": "1.7.0",
+    "@types/angular-resource": "1.5.16",
+    "@types/angular-route": "1.7.1",
+    "@types/express": "^4.17.8",
     "@types/jasmine": "~3.5.0",
     "@types/jasminewd2": "~2.0.3",
-    "@types/jquery": "3.3.28",
+    "@types/jquery": "3.5.1",
     "@types/node": "^12.11.1",
     "canonical-path": "1.0.0",
-    "codelyzer": "^5.1.2",
+    "codelyzer": "^6.0.0",
     "concurrently": "^5.0.1",
     "http-server": "^0.12.0",
-    "jasmine-core": "~3.5.0",
+    "jasmine-core": "~3.6.0",
     "jasmine-marbles": "~0.6.0",
-    "jasmine-spec-reporter": "~4.2.1",
+    "jasmine-spec-reporter": "~5.0.0",
     "karma": "~5.0.0",
     "karma-chrome-launcher": "~3.1.0",
-    "karma-coverage-istanbul-reporter": "~2.1.0",
-    "karma-jasmine": "~3.0.1",
-    "karma-jasmine-html-reporter": "^1.4.2",
+    "karma-coverage-istanbul-reporter": "~3.0.2",
+    "karma-jasmine": "~4.0.0",
+    "karma-jasmine-html-reporter": "^1.5.0",
     "lite-server": "^2.2.2",
     "lodash": "^4.16.2",
-    "protractor": "~5.4.3",
-    "puppeteer": "3.3.0",
+    "protractor": "~7.0.0",
+    "puppeteer": "5.1.0",
     "rimraf": "^2.5.4",
     "rollup": "^1.1.0",
     "rollup-plugin-commonjs": "^9.2.1",
@@ -85,6 +85,6 @@
     "source-map-explorer": "^1.3.2",
     "ts-node": "~8.3.0",
     "tslint": "~6.1.0",
-    "typescript": "~3.8.3"
+    "typescript": "~4.0.3"
   }
 }
diff --git a/aio/tools/examples/shared/sync-boilerplate-dependencies.js b/aio/tools/examples/shared/sync-boilerplate-dependencies.js
new file mode 100644
index 0000000000000..439c627fe93c0
--- /dev/null
+++ b/aio/tools/examples/shared/sync-boilerplate-dependencies.js
@@ -0,0 +1,64 @@
+#!/usr/bin/env node
+
+/**
+ * Usage:
+ * ```sh
+ * node sync-boilerplate-dependencies
+ * ```
+ *
+ * Updates the dependency versions of the top-level `package.json` files in each sub-folder of
+ * `./boilerplate/` and `./boilerplate/viewengine/` to match the ones in `./package.json`.
+ */
+const fs = require('fs');
+const path = require('path');
+
+
+const BOILERPLATE_DIR = `${__dirname}/boilerplate`;
+const VIEWENGINE_DIR = `${BOILERPLATE_DIR}/viewengine`;
+const SHARED_PACKAGE_JSON_PATH = `${__dirname}/package.json`;
+
+const sharedPkgJson = loadJsonFile(SHARED_PACKAGE_JSON_PATH);
+const boilerplatePkgJsonPaths = [
+  ...collectPackageJsonFiles(BOILERPLATE_DIR),
+  ...collectPackageJsonFiles(VIEWENGINE_DIR),
+];
+
+boilerplatePkgJsonPaths.forEach(syncDependencies);
+
+// Helpers
+function collectPackageJsonFiles(dirPath) {
+  return fs.readdirSync(dirPath)
+      .map(childName => `${dirPath}/${childName}`)
+      .filter(childPath => fs.statSync(childPath).isDirectory())
+      .map(subDirPath => `${subDirPath}/package.json`)
+      .filter(pkgJsonPath => fs.existsSync(pkgJsonPath));
+}
+
+function loadJsonFile(filePath) {
+  return JSON.parse(fs.readFileSync(filePath, 'utf8'));
+}
+
+function syncDependencies(boilerplatePkgJsonPath) {
+  console.log(`Syncing '${path.relative(__dirname, boilerplatePkgJsonPath)}'...`);
+
+  const boilerplatePkgJson = loadJsonFile(boilerplatePkgJsonPath);
+
+  ['dependencies', 'devDependencies', 'peerDependencies']
+    .filter(depsProp => boilerplatePkgJson.hasOwnProperty(depsProp))
+    .forEach(depsProp => {
+      const srcDeps = sharedPkgJson[depsProp];
+      const dstDeps = boilerplatePkgJson[depsProp];
+
+      for (const dep of Object.keys(dstDeps)) {
+        if (!srcDeps.hasOwnProperty(dep)) {
+          throw new Error(
+              `Unable to update dependency '${dep}' in '${boilerplatePkgJsonPath} > ${depsProp}'. ` +
+              `The dependency is missing from '${SHARED_PACKAGE_JSON_PATH}'.`);
+        }
+
+        dstDeps[dep] = srcDeps[dep];
+      }
+    });
+
+  fs.writeFileSync(boilerplatePkgJsonPath, `${JSON.stringify(boilerplatePkgJson, null, 2)}\n`);
+}
diff --git a/aio/tools/examples/shared/yarn.lock b/aio/tools/examples/shared/yarn.lock
index 714f688230d05..3a6f6fbf6566f 100644
--- a/aio/tools/examples/shared/yarn.lock
+++ b/aio/tools/examples/shared/yarn.lock
@@ -2,180 +2,188 @@
 # yarn lockfile v1
 
 
-"@angular-devkit/architect@0.901.4":
-  version "0.901.4"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.901.4.tgz#10bef514b1101900f1e404d9bd991a6c0b221afe"
-  integrity sha512-w4RMj7eLhUSh70HUy5tW4EXjLQFXk0Lfr9WiSy5gvPGp+zzYxknI+Wn4Xid1wU/WS+4tuMv5nJIaNaH2sABESQ==
-  dependencies:
-    "@angular-devkit/core" "9.1.4"
-    rxjs "6.5.4"
-
-"@angular-devkit/architect@^0.900.6":
-  version "0.900.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.900.6.tgz#f82746975e1aa6593b66b3ceb742bcc0ff90b9a1"
-  integrity sha512-WK8e09DgNP1NHP1gqVQ9w+9rlRMVDJxAh4qZGJRjZBXd3LY7y84WWRmTpfuhOSu+82fR3/n76+urxraU3ZVphw==
-  dependencies:
-    "@angular-devkit/core" "9.0.6"
-    rxjs "6.5.3"
-
-"@angular-devkit/build-angular@~0.901.4":
-  version "0.901.4"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.901.4.tgz#0b9b9edb8a152ba37ed29a48ca046263a71ff6d0"
-  integrity sha512-Vod4bc6d38fuvqauIDQxKMe9hKW9m4QNzPKxEc+Dv5Xkv95WaGzkbUVu8M8t4E//sDDMpmcPdYOXSdR27WBi2Q==
-  dependencies:
-    "@angular-devkit/architect" "0.901.4"
-    "@angular-devkit/build-optimizer" "0.901.4"
-    "@angular-devkit/build-webpack" "0.901.4"
-    "@angular-devkit/core" "9.1.4"
-    "@babel/core" "7.9.0"
-    "@babel/generator" "7.9.3"
-    "@babel/preset-env" "7.9.0"
-    "@babel/template" "7.8.6"
-    "@jsdevtools/coverage-istanbul-loader" "3.0.3"
-    "@ngtools/webpack" "9.1.4"
-    ajv "6.12.0"
-    autoprefixer "9.7.4"
-    babel-loader "8.0.6"
+"@angular-devkit/architect@0.1001.3":
+  version "0.1001.3"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1001.3.tgz#168aa424be9d0dad90d1a03129c3999fbf76a1cc"
+  integrity sha512-WS5IAN6I73jKapiHKYz3U05Kka4eVRmwCk++GWM2uGChluiZsI87eK8vxMS3KWDIqTnAOuMpDt3XWxlASv1nlQ==
+  dependencies:
+    "@angular-devkit/core" "10.1.3"
+    rxjs "6.6.2"
+
+"@angular-devkit/architect@^0.1001.0":
+  version "0.1001.2"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1001.2.tgz#9f4d1f95e85a2b85d26bf8f5c06909552d703a02"
+  integrity sha512-05o12amjZ8NNIFehKm/lFYf12xvCclC7V5tGl/9+V7g/3pQqakwAjCysgb9T+ETffhmKhMnE8XdAJZqF7YrDcw==
+  dependencies:
+    "@angular-devkit/core" "10.1.2"
+    rxjs "6.6.2"
+
+"@angular-devkit/build-angular@~0.1001.3":
+  version "0.1001.3"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.1001.3.tgz#8085bcb26394c5dc47ecc4b9d9c7a47dfe9e1df4"
+  integrity sha512-TQhNNfBeWLLOcXitmBTl2l95/9/2OcVVGyI5bxbpcCn8f9ioRVa2DvIxQLR92aoGkTrp7Vgd12xu07DSuuQwvg==
+  dependencies:
+    "@angular-devkit/architect" "0.1001.3"
+    "@angular-devkit/build-optimizer" "0.1001.3"
+    "@angular-devkit/build-webpack" "0.1001.3"
+    "@angular-devkit/core" "10.1.3"
+    "@babel/core" "7.11.1"
+    "@babel/generator" "7.11.0"
+    "@babel/plugin-transform-runtime" "7.11.0"
+    "@babel/preset-env" "7.11.0"
+    "@babel/runtime" "7.11.2"
+    "@babel/template" "7.10.4"
+    "@jsdevtools/coverage-istanbul-loader" "3.0.5"
+    "@ngtools/webpack" "10.1.3"
+    autoprefixer "9.8.6"
+    babel-loader "8.1.0"
     browserslist "^4.9.1"
-    cacache "15.0.0"
+    cacache "15.0.5"
     caniuse-lite "^1.0.30001032"
     circular-dependency-plugin "5.2.0"
-    copy-webpack-plugin "5.1.1"
+    copy-webpack-plugin "6.0.3"
     core-js "3.6.4"
-    css-loader "3.5.1"
+    css-loader "4.2.2"
     cssnano "4.1.10"
     file-loader "6.0.0"
     find-cache-dir "3.3.1"
     glob "7.1.6"
-    jest-worker "25.1.0"
+    jest-worker "26.3.0"
     karma-source-map-support "1.4.0"
-    less "3.11.1"
-    less-loader "5.0.0"
-    license-webpack-plugin "2.1.4"
+    less-loader "6.2.0"
+    license-webpack-plugin "2.3.0"
     loader-utils "2.0.0"
-    mini-css-extract-plugin "0.9.0"
+    mini-css-extract-plugin "0.10.0"
     minimatch "3.0.4"
-    open "7.0.3"
-    parse5 "4.0.0"
-    postcss "7.0.27"
+    open "7.2.0"
+    parse5 "6.0.1"
+    parse5-htmlparser2-tree-adapter "6.0.1"
+    pnp-webpack-plugin "1.6.4"
+    postcss "7.0.32"
     postcss-import "12.0.1"
     postcss-loader "3.0.0"
-    raw-loader "4.0.0"
-    regenerator-runtime "0.13.5"
+    raw-loader "4.0.1"
+    regenerator-runtime "0.13.7"
+    resolve-url-loader "3.1.1"
     rimraf "3.0.2"
-    rollup "2.1.0"
-    rxjs "6.5.4"
-    sass "1.26.3"
-    sass-loader "8.0.2"
-    semver "7.1.3"
+    rollup "2.26.5"
+    rxjs "6.6.2"
+    sass "1.26.10"
+    sass-loader "10.0.1"
+    semver "7.3.2"
     source-map "0.7.3"
-    source-map-loader "0.2.4"
-    speed-measure-webpack-plugin "1.3.1"
-    style-loader "1.1.3"
-    stylus "0.54.7"
+    source-map-loader "1.0.2"
+    source-map-support "0.5.19"
+    speed-measure-webpack-plugin "1.3.3"
+    style-loader "1.2.1"
+    stylus "0.54.8"
     stylus-loader "3.0.2"
-    terser "4.6.10"
-    terser-webpack-plugin "2.3.5"
+    terser "5.3.0"
+    terser-webpack-plugin "4.1.0"
     tree-kill "1.2.2"
-    webpack "4.42.0"
+    webpack "4.44.1"
     webpack-dev-middleware "3.7.2"
-    webpack-dev-server "3.10.3"
+    webpack-dev-server "3.11.0"
     webpack-merge "4.2.2"
     webpack-sources "1.4.3"
-    webpack-subresource-integrity "1.4.0"
-    worker-plugin "4.0.2"
+    webpack-subresource-integrity "1.4.1"
+    worker-plugin "5.0.0"
 
-"@angular-devkit/build-optimizer@0.901.4":
-  version "0.901.4"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.901.4.tgz#a8e836d6aa687a78cf2e2b0f888e777f51ca5ad9"
-  integrity sha512-iDMlNRwd8ICMBKnycfw55hdnL5kCiqUjQn+aK/4uOMJMz49tiYMNJAaznXX2BFKmYSmbapKjEbzx9yMYRi9Y7w==
+"@angular-devkit/build-optimizer@0.1001.3":
+  version "0.1001.3"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.1001.3.tgz#11e6ea59ab0d6f6c0724c9453c82a2f15653534d"
+  integrity sha512-tQy4ADOVDL0hJcykpZzqfInQV6ft499E3g+D0jcZL/imSsxH4EaaBA2HCc0JTeAFjmkI32OhD9T8G/swqqBcVw==
   dependencies:
     loader-utils "2.0.0"
     source-map "0.7.3"
-    tslib "1.11.1"
-    typescript "3.6.5"
+    tslib "2.0.1"
+    typescript "4.0.2"
     webpack-sources "1.4.3"
 
-"@angular-devkit/build-webpack@0.901.4":
-  version "0.901.4"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.901.4.tgz#d6b7b3f05288c31c4ed9e5dfd5370c7d6c5a0a02"
-  integrity sha512-YBOufI4TGAtIDCS6erFygYJX/fkd8xwI58d+7iFIBmtIJC4/fpGjX6qkHMCBgh8HXAkEPSORBCYQn9O44J1ZXQ==
+"@angular-devkit/build-webpack@0.1001.3":
+  version "0.1001.3"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1001.3.tgz#889aaa2dde7daacb88969d9ede5ba2df94250df3"
+  integrity sha512-XpAEWRWIdh/bk2UHkP7iIjEiVwkQkAWoZPNYMJzg3iN/iAAdUDPiNBTXhFZEZjFEWT0RXl4iKW2hr5LFvpe6lw==
   dependencies:
-    "@angular-devkit/architect" "0.901.4"
-    "@angular-devkit/core" "9.1.4"
-    rxjs "6.5.4"
+    "@angular-devkit/architect" "0.1001.3"
+    "@angular-devkit/core" "10.1.3"
+    rxjs "6.6.2"
 
-"@angular-devkit/core@9.0.6", "@angular-devkit/core@^9.0.6":
-  version "9.0.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-9.0.6.tgz#cd4862e54f4dad9b47f515abf24e4d440cf8ba13"
-  integrity sha512-hCZJbnqLEm1F5Bx+ILcdd3LPgQTn4WFWpfUqMEGGj7UirRInWcz+6UpYotKGTJw85/mV01LrIbtWIkAUXbkkhg==
+"@angular-devkit/core@10.1.2", "@angular-devkit/core@^10.1.0":
+  version "10.1.2"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-10.1.2.tgz#3deb429596a6127c5b68bbc3bbd49cf00aeac966"
+  integrity sha512-LMxesiCuXRe3UzPdRouXsC1W73/q6rVtACVoD5GdzmmnZ7cRh7oiwonqT0lEXIKQikMsZUasUOXHD2HoKV6BoA==
   dependencies:
-    ajv "6.10.2"
-    fast-json-stable-stringify "2.0.0"
-    magic-string "0.25.4"
-    rxjs "6.5.3"
+    ajv "6.12.4"
+    fast-json-stable-stringify "2.1.0"
+    magic-string "0.25.7"
+    rxjs "6.6.2"
     source-map "0.7.3"
 
-"@angular-devkit/core@9.1.4":
-  version "9.1.4"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-9.1.4.tgz#97bb5681471ac40843167f2387b23e92a3e21ce4"
-  integrity sha512-OPFQDmT4XabLMSRDgmnzedlOrc83DzQIgLcfoh/UhZ7aJKf/2Vq4l09p/DkMNI36vN5BRL0zDZt7TjvKNgyYgA==
+"@angular-devkit/core@10.1.3":
+  version "10.1.3"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-10.1.3.tgz#48776a87253b40f6005b14413e089a1fee6b7227"
+  integrity sha512-Ub31/eqFtSuQy3V+B74Jt0jAUw8fs8sbd0ZL2UHYUJyrwm20iIRam+mOD3Sj8HFrDGLR8m56KsxJ12KvC1oxtQ==
   dependencies:
-    ajv "6.12.0"
+    ajv "6.12.4"
     fast-json-stable-stringify "2.1.0"
     magic-string "0.25.7"
-    rxjs "6.5.4"
+    rxjs "6.6.2"
     source-map "0.7.3"
 
-"@angular-devkit/schematics@9.1.4":
-  version "9.1.4"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-9.1.4.tgz#f493eebfae71f609b4ea81402013efe926acc76d"
-  integrity sha512-RAbdnUEZ3JTLmWSBiXT5trsVx8Fi72fxN9CiRaluM09Cytg6BUc1wC5XCO0YPvhI400+3Ro1nwjPXezjg7LXzQ==
-  dependencies:
-    "@angular-devkit/core" "9.1.4"
-    ora "4.0.3"
-    rxjs "6.5.4"
-
-"@angular/animations@~9.1.4":
-  version "9.1.4"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-9.1.4.tgz#22f64a062103d4903f2c7d862889a88fc6553bc7"
-  integrity sha512-gMo/DbCm5BDArladMAeC7/75T2DvhLr4CSUGJt/P/aimTEG2ywoAALs3pzwSSe4qxrHiR0OIksVW3l4km3iXEw==
-
-"@angular/cli@~9.1.4":
-  version "9.1.4"
-  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-9.1.4.tgz#0c1938e2342bb3bcd978b32458ab20f1bf007ba5"
-  integrity sha512-H9MqoT4zyIv+Yo3cvRVkzafWGHsqt7jUvtvGwMHIDMTfEX+Q8yiYlDLL6WM3Eb6/hDmLcRGC/GI495sKS1z5qA==
-  dependencies:
-    "@angular-devkit/architect" "0.901.4"
-    "@angular-devkit/core" "9.1.4"
-    "@angular-devkit/schematics" "9.1.4"
-    "@schematics/angular" "9.1.4"
-    "@schematics/update" "0.901.4"
+"@angular-devkit/schematics@10.1.3":
+  version "10.1.3"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-10.1.3.tgz#49ccf51a1a8e71625b5ec1a0d24adfc24c31c903"
+  integrity sha512-5+E2bBBsphuz1KfloC5yA+hXSEbxMokkp5UEp+X9VC7zUGTXV8sxuvcbBo+JVutaoNHezJGu2JUx/LqNrKd58w==
+  dependencies:
+    "@angular-devkit/core" "10.1.3"
+    ora "5.0.0"
+    rxjs "6.6.2"
+
+"@angular/animations@~10.1.3":
+  version "10.1.3"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-10.1.3.tgz#2047dae5fc1bf0f5173a410f0103fb003113d1b9"
+  integrity sha512-qIdxP28iF6qaoGBB3C6VvHt22nR3FMK5kh+no+jYmmy6z5cBVhwS/Vb6nkx+XRqivKBVHxWNZQ4ae6xmTg/k7A==
+  dependencies:
+    tslib "^2.0.0"
+
+"@angular/cli@~10.1.3":
+  version "10.1.3"
+  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-10.1.3.tgz#188f99583814e97727787869065d228c1b1f4407"
+  integrity sha512-wj+ZcTLRzM94asLUZRO5U96CLEsnWosa3Iqub+1AH1/C8Wv2w/2njUKDM7ifQeebYzjPb5EcN4EIAGcHAGyeWw==
+  dependencies:
+    "@angular-devkit/architect" "0.1001.3"
+    "@angular-devkit/core" "10.1.3"
+    "@angular-devkit/schematics" "10.1.3"
+    "@schematics/angular" "10.1.3"
+    "@schematics/update" "0.1001.3"
     "@yarnpkg/lockfile" "1.1.0"
     ansi-colors "4.1.1"
     debug "4.1.1"
     ini "1.3.5"
-    inquirer "7.1.0"
+    inquirer "7.3.3"
     npm-package-arg "8.0.1"
-    npm-pick-manifest "6.0.0"
-    open "7.0.3"
+    npm-pick-manifest "6.1.0"
+    open "7.2.0"
     pacote "9.5.12"
     read-package-tree "5.3.1"
     rimraf "3.0.2"
-    semver "7.1.3"
+    semver "7.3.2"
     symbol-observable "1.2.0"
-    universal-analytics "0.4.20"
-    uuid "7.0.2"
+    universal-analytics "0.4.23"
+    uuid "8.3.0"
 
-"@angular/common@~9.1.4":
-  version "9.1.4"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-9.1.4.tgz#23d7b42cd87aba634b78b8d73e12c6ebffe86043"
-  integrity sha512-JvCoCWVbx0tF7l/0WTi24ui/mc2SElyVSNchR4VK/FViARnkvnSBdI/Ef5QWXrsPyKU4PYBtnWWgyxRspH+FBA==
+"@angular/common@~10.1.3":
+  version "10.1.3"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-10.1.3.tgz#43b63609e3ef321d8b6835a5cd339587bf0aecbe"
+  integrity sha512-+9UsK+ZTCLO3MvTYlDTbjJGAZxtK9WftHWxbT3NTAJ8tisDfb+MwXB0xNw7qLOysMe3u04zShT0YXYZo5aJBrw==
+  dependencies:
+    tslib "^2.0.0"
 
-"@angular/compiler-cli@~9.1.4":
-  version "9.1.4"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-9.1.4.tgz#24c7c7060bb13f65337fb2998322d56021e185c1"
-  integrity sha512-n3PzqNnPD7s/AF9mv5CnarK0sgfoq4txFncHjJWBSltuTQoz6BDZyjuEdqsSLUvgAZPeLsmohemOzEE38HYHZA==
+"@angular/compiler-cli@~10.1.3":
+  version "10.1.3"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-10.1.3.tgz#e3b7dc11a362ec9fe70060e3730547a7e57cb69a"
+  integrity sha512-31XZ6jv4Vjsaa0kF+gzeHMyQiMILpaaZa+j1f5IqeS+HBl1ThxLTCpAhR1TVfZ/2EZV6uAM8o8FTYrhscy9qTA==
   dependencies:
     canonical-path "1.0.0"
     chokidar "^3.0.0"
@@ -188,74 +196,99 @@
     semver "^6.3.0"
     source-map "^0.6.1"
     sourcemap-codec "^1.4.8"
+    tslib "^2.0.0"
     yargs "15.3.0"
 
-"@angular/compiler@~9.1.4":
-  version "9.1.4"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-9.1.4.tgz#fe833fc3b74768bdd56b1bdd0010870f38ffaedc"
-  integrity sha512-B+f3lviFNEJtL9V9exSKYPSz2Ddb6dxgPzQR7GSjGikDo+fKMtC1PjNwgJooS9gavhQx30uwkEEMIPYQbM6nNA==
+"@angular/compiler@9.0.0":
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-9.0.0.tgz#87e0bef4c369b6cadae07e3a4295778fc93799d5"
+  integrity sha512-ctjwuntPfZZT2mNj2NDIVu51t9cvbhl/16epc5xEwyzyDt76pX9UgwvY+MbXrf/C/FWwdtmNtfP698BKI+9leQ==
+
+"@angular/compiler@~10.1.3":
+  version "10.1.3"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-10.1.3.tgz#84c2da8c37d02a7b7337ae34c173ce1d90d57d9a"
+  integrity sha512-rfiXkf6BPFWHLU0rg+c5BgTdrxVJcyOQipKw3iI2W00RsU3VCFTXKYpm10DamhRrNOf8rJcboqMbdi34awy6xA==
+  dependencies:
+    tslib "^2.0.0"
 
-"@angular/core@~9.1.4":
-  version "9.1.4"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-9.1.4.tgz#85f5322f42cf8add597fc6b02913e8fc3308c361"
-  integrity sha512-ND240vncmVD2KVe/KSQU3d/DxxoRipFg1+jFOFZGt0n0orCBHk/V1fu9iaG1sRyldL0+rCQ+fTI+1N4DTmMnxA==
+"@angular/core@9.0.0":
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-9.0.0.tgz#227dc53e1ac81824f998c6e76000b7efc522641e"
+  integrity sha512-6Pxgsrf0qF9iFFqmIcWmjJGkkCaCm6V5QNnxMy2KloO3SDq6QuMVRbN9RtC8Urmo25LP+eZ6ZgYqFYpdD8Hd9w==
 
-"@angular/elements@~9.1.4":
-  version "9.1.4"
-  resolved "https://registry.yarnpkg.com/@angular/elements/-/elements-9.1.4.tgz#b3bedbce72a2d61493f2cab4a09dadd1117cd91a"
-  integrity sha512-VXb+/eZv2x8CsDESnk8ICysDE3C2Htuj76WiG6NO4X1aX26XLTvnT5YLnOJ+8l8L88eh6s80Rphw6Gr6amUXHA==
+"@angular/core@~10.1.3":
+  version "10.1.3"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-10.1.3.tgz#7dbc38eb73a1d526d9c2aca3025c42e38c4acdc3"
+  integrity sha512-2rnNa8bSH1JoQRzUWXXvPGgxtNA6mSiIqDZs1tHdQZxJI15NbyAJhw6lglgBFahE/nOcUx+11ZhxaPJWSsbEOg==
+  dependencies:
+    tslib "^2.0.0"
 
-"@angular/forms@~9.1.4":
-  version "9.1.4"
-  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-9.1.4.tgz#7cb75b5731bd6cbcf4a45b7b2cc68b3581de8cc1"
-  integrity sha512-Njt+pMLfPBchL0/ayIjJqXL6ZfM4Ccvf7KO1wS1HMzh3QlmfNa0JSgc4pfrbRJAMN9g7V/FYLyKejs1bJZkenA==
+"@angular/elements@~10.1.3":
+  version "10.1.3"
+  resolved "https://registry.yarnpkg.com/@angular/elements/-/elements-10.1.3.tgz#a1b63a55f9f0f6bf150a7511a4fb20639869a767"
+  integrity sha512-eKgXIQlt1aRQc7QyoEZI0D0qsPn2banQuhJmLxKqjELNO8WJZt8VNEAvFMa3a2LO+OaVr6rv0YZhYYki5hkLiQ==
+  dependencies:
+    tslib "^2.0.0"
 
-"@angular/language-service@~9.1.4":
-  version "9.1.4"
-  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-9.1.4.tgz#2fa2c444e5a5a6036d5ca43d2887826df17d0553"
-  integrity sha512-eyVxxiegdb4ESdFGfkuDN+YfUbOVHRQLjIl6ACFJQDNHzVXzbmuqpyr5hIJANIVady103/7+dqRxxJo1DdIdTQ==
+"@angular/forms@~10.1.3":
+  version "10.1.3"
+  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-10.1.3.tgz#c48a9c79bc50b21017685037ad628ff0bc8d5e61"
+  integrity sha512-ntLnIZnEo+9ziajnjQPYvVR5m0gRfQBbXx5dug4EuUI5SzE2WzcTEZTnltgw4cLqOy/fOt8cXMiW0YeRBHsjKA==
+  dependencies:
+    tslib "^2.0.0"
 
-"@angular/localize@~9.1.4":
-  version "9.1.11"
-  resolved "https://registry.yarnpkg.com/@angular/localize/-/localize-9.1.11.tgz#25921d794836fb7a07d284c1ac0ed06c10e77d50"
-  integrity sha512-CrR7RniwJIK3+QKH8nHl35KDAHZn1mp1QAd5vujTWKw6YRLfio7SjM9qIfzw5y4WZuUitTsqKlQT/m/NK146Ag==
+"@angular/localize@~10.1.3":
+  version "10.1.3"
+  resolved "https://registry.yarnpkg.com/@angular/localize/-/localize-10.1.3.tgz#791bf79f8d14872c87f88be6bce4de718cded1e9"
+  integrity sha512-OJTCUTd7qF3JoqCM7+lNTNUErzHpm5TvGObFthXvP2V+u1ipsFeqTffzqEv7SrZ5+PkabRUditUrPOVAkFIlyw==
   dependencies:
     "@babel/core" "7.8.3"
     glob "7.1.2"
     yargs "15.3.0"
 
-"@angular/platform-browser-dynamic@~9.1.4":
-  version "9.1.4"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-9.1.4.tgz#bf1cde9156bd29eeeef932b683b0c993614f75d5"
-  integrity sha512-YtVbnxyS6FU7xNpA6A95tmSfrB8+WC7OH3mbP8M9NaGk0OYz8B/JOe1HByP4JRpEGCvBtXdJ2NSW/MpLIT8SiQ==
+"@angular/platform-browser-dynamic@~10.1.3":
+  version "10.1.3"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-10.1.3.tgz#e90f9329f2ccbfe817680f16a00686440653ee06"
+  integrity sha512-JGVz0XxiZuF1FGJ2zUk1/TogIlBFgFCUgNbSyULIfE/UXcuuvvLlzF+ls26tHK06lFHRAVHFjjDpyA270UzRTQ==
+  dependencies:
+    tslib "^2.0.0"
 
-"@angular/platform-browser@~9.1.4":
-  version "9.1.4"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-9.1.4.tgz#c4fe868f12a6593702967a957a6bc8aa50c34f3b"
-  integrity sha512-mBCHfTl+5tQfaUiGlDujP7mFBzovFc54Zi2kcCE8DSdSSVQ2TPBo6hXa6y2cL3hJPFZzQ7mC4ORFrsGADhHn/w==
+"@angular/platform-browser@~10.1.3":
+  version "10.1.3"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-10.1.3.tgz#f6a5c5098e878b964cfddc296fb63eb147710211"
+  integrity sha512-Y5/M9NEmQceda96a9ntmxidfgJTf23DmEvGw0SJ1TAn2X9EjlM4s7H8KNH9R/tDPK9QcuvzX9FTZsxQ9b6kCFQ==
+  dependencies:
+    tslib "^2.0.0"
 
-"@angular/platform-server@~9.1.4":
-  version "9.1.4"
-  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-9.1.4.tgz#61c704dffb250d244d6286813537b40edbf70f59"
-  integrity sha512-FynxZ1bmR2itvwKanUVzuUjugfZcIxZcT0Dx98BRol0Oc30RitRz8paJk9xAxySKSpZacwGJ/HkSxQdjIYWJOw==
+"@angular/platform-server@~10.1.3":
+  version "10.1.3"
+  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-10.1.3.tgz#4c4c5f071018406dd5150bee5ea6936030493b57"
+  integrity sha512-r7wcczPdvxAAZsblrfRbp/UsMBO1Uu0iK5YaAowpF6q8axgjYVxriV5k9IA2T2V+k+jTGUdI3XZwgrAkkbe7gg==
   dependencies:
     domino "^2.1.2"
+    tslib "^2.0.0"
     xhr2 "^0.2.0"
 
-"@angular/router@~9.1.4":
-  version "9.1.4"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-9.1.4.tgz#1bd09c84d1ec75bdc7cc75e80014eda5041ffeb7"
-  integrity sha512-yUyjCgG2P2Jh8MvoyC6yirmAtx1Qe7MKLuLvsa9WOB571QNEcNLTYMfAMHUKsQTcE/+o984QyLlneoibgI9wFA==
+"@angular/router@~10.1.3":
+  version "10.1.3"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-10.1.3.tgz#42b4c173bba8441a3e1eb6f1ca60e3b2a4eb3e86"
+  integrity sha512-CAd6u1y+NjB8edtuC2j2OpS6xFO+s90bg4kyu7zr9i0wIQX8xI+neFzkTeoYWJ0PNfi05cCGelyQnLZPZFsyvw==
+  dependencies:
+    tslib "^2.0.0"
 
-"@angular/service-worker@~9.1.4":
-  version "9.1.4"
-  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-9.1.4.tgz#acafd57fae1f745c42f6a3adf461c8bb032013c7"
-  integrity sha512-q3MIgWOeCg9DhQGDk81bDJYjauBtf3GxvtGnnZG6XEjw3r3k/ykTyRPGHgC5MTw/XFF4Y6dfpgLIXT42AXLhaw==
+"@angular/service-worker@~10.1.3":
+  version "10.1.3"
+  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-10.1.3.tgz#f5e8aa4663d6aae059c338cf796ae49ccd827c14"
+  integrity sha512-Zs8W+CCPxGGQFpF8BahF/ngwAnUOeFZIICfEdZaYnwwxFNWuJcwBRTc8DARyR58Ggc3wncZYd6KbHs+oa1n6Lg==
+  dependencies:
+    tslib "^2.0.0"
 
-"@angular/upgrade@~9.1.4":
-  version "9.1.4"
-  resolved "https://registry.yarnpkg.com/@angular/upgrade/-/upgrade-9.1.4.tgz#d65e9d9eafb6884768e8953011d481334d59be04"
-  integrity sha512-kqmsX27qukWDJpxvEBpGm+QRdosLzPqSx8pXD7aykcOp3//O/GVnKOJFh6w//WrYRtCe4+PFNckM5uN01BqnPw==
+"@angular/upgrade@~10.1.3":
+  version "10.1.3"
+  resolved "https://registry.yarnpkg.com/@angular/upgrade/-/upgrade-10.1.3.tgz#5ccd51f77aeac21439007a5af69c2546cb6b78e4"
+  integrity sha512-VREb98W4I/ldc0lTbq7sWrrb3hQLtgvXe6VpUWMSlAEtPbaXUnHWz/utVm1+hXZlCMRpoJUMxw5u9+M1odFm7w==
+  dependencies:
+    tslib "^2.0.0"
 
 "@babel/code-frame@^7.0.0":
   version "7.0.0"
@@ -270,6 +303,13 @@
   dependencies:
     "@babel/highlight" "^7.10.1"
 
+"@babel/code-frame@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a"
+  integrity sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==
+  dependencies:
+    "@babel/highlight" "^7.10.4"
+
 "@babel/code-frame@^7.5.5":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.5.5.tgz#bc0782f6d69f7b7d49531219699b988f669a8f9d"
@@ -284,15 +324,37 @@
   dependencies:
     "@babel/highlight" "^7.8.3"
 
-"@babel/compat-data@^7.9.0", "@babel/compat-data@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.9.6.tgz#3f604c40e420131affe6f2c8052e9a275ae2049b"
-  integrity sha512-5QPTrNen2bm7RBc7dsOmcA5hbrS4O2Vhmk5XOL4zWW/zD/hV0iinpefDlkm+tBBy8kDtFaaeEvmAqt+nURAV2g==
+"@babel/compat-data@^7.10.4", "@babel/compat-data@^7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.11.0.tgz#e9f73efe09af1355b723a7f39b11bad637d7c99c"
+  integrity sha512-TPSvJfv73ng0pfnEOh17bYMPQbI95+nGWc71Ss4vZdRBHTDqmM9Z8ZV4rYz8Ks7sfzc95n30k6ODIq5UGnXcYQ==
   dependencies:
-    browserslist "^4.11.1"
+    browserslist "^4.12.0"
     invariant "^2.2.4"
     semver "^5.5.0"
 
+"@babel/core@7.11.1":
+  version "7.11.1"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.11.1.tgz#2c55b604e73a40dc21b0e52650b11c65cf276643"
+  integrity sha512-XqF7F6FWQdKGGWAzGELL+aCO1p+lRY5Tj5/tbT3St1G8NaH70jhhDIKknIZaDans0OQBG5wRAldROLHSt44BgQ==
+  dependencies:
+    "@babel/code-frame" "^7.10.4"
+    "@babel/generator" "^7.11.0"
+    "@babel/helper-module-transforms" "^7.11.0"
+    "@babel/helpers" "^7.10.4"
+    "@babel/parser" "^7.11.1"
+    "@babel/template" "^7.10.4"
+    "@babel/traverse" "^7.11.0"
+    "@babel/types" "^7.11.0"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.1"
+    json5 "^2.1.2"
+    lodash "^4.17.19"
+    resolve "^1.3.2"
+    semver "^5.4.1"
+    source-map "^0.5.0"
+
 "@babel/core@7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.8.3.tgz#30b0ebb4dd1585de6923a0b4d179e0b9f5d82941"
@@ -314,28 +376,6 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/core@7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.9.0.tgz#ac977b538b77e132ff706f3b8a4dbad09c03c56e"
-  integrity sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==
-  dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/generator" "^7.9.0"
-    "@babel/helper-module-transforms" "^7.9.0"
-    "@babel/helpers" "^7.9.0"
-    "@babel/parser" "^7.9.0"
-    "@babel/template" "^7.8.6"
-    "@babel/traverse" "^7.9.0"
-    "@babel/types" "^7.9.0"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.1"
-    json5 "^2.1.2"
-    lodash "^4.17.13"
-    resolve "^1.3.2"
-    semver "^5.4.1"
-    source-map "^0.5.0"
-
 "@babel/core@^7.7.5":
   version "7.8.4"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.8.4.tgz#d496799e5c12195b3602d0fddd77294e3e38e80e"
@@ -357,14 +397,13 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/generator@7.9.3":
-  version "7.9.3"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.3.tgz#7c8b2956c6f68b3ab732bd16305916fbba521d94"
-  integrity sha512-RpxM252EYsz9qLUIq6F7YJyK1sv0wWDBFuztfDGWaQKzHjqDHysxSiRUpA/X9jmfqo+WzkAVKFaUily5h+gDCQ==
+"@babel/generator@7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.11.0.tgz#4b90c78d8c12825024568cbe83ee6c9af193585c"
+  integrity sha512-fEm3Uzw7Mc9Xi//qU20cBKatTfs2aOtKqmvy/Vm7RkJEGFQ4xc9myCfbXxqK//ZS8MR/ciOHw6meGASJuKmDfQ==
   dependencies:
-    "@babel/types" "^7.9.0"
+    "@babel/types" "^7.11.0"
     jsesc "^2.5.1"
-    lodash "^4.17.13"
     source-map "^0.5.0"
 
 "@babel/generator@^7.10.1", "@babel/generator@^7.8.3":
@@ -377,14 +416,13 @@
     lodash "^4.17.13"
     source-map "^0.5.0"
 
-"@babel/generator@^7.4.0", "@babel/generator@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.7.4.tgz#db651e2840ca9aa66f327dcec1dc5f5fa9611369"
-  integrity sha512-m5qo2WgdOJeyYngKImbkyQrnUN1mPceaG5BV+G0E3gWsa4l/jCSryWJdM2x8OuGAOyh+3d5pVYfZWCiNFtynxg==
+"@babel/generator@^7.11.0", "@babel/generator@^7.11.5":
+  version "7.11.6"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.11.6.tgz#b868900f81b163b4d464ea24545c61cbac4dc620"
+  integrity sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==
   dependencies:
-    "@babel/types" "^7.7.4"
+    "@babel/types" "^7.11.5"
     jsesc "^2.5.1"
-    lodash "^4.17.13"
     source-map "^0.5.0"
 
 "@babel/generator@^7.8.4":
@@ -397,15 +435,12 @@
     lodash "^4.17.13"
     source-map "^0.5.0"
 
-"@babel/generator@^7.9.0", "@babel/generator@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.6.tgz#5408c82ac5de98cda0d77d8124e99fa1f2170a43"
-  integrity sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==
+"@babel/helper-annotate-as-pure@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz#5bf0d495a3f757ac3bda48b5bf3b3ba309c72ba3"
+  integrity sha512-XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA==
   dependencies:
-    "@babel/types" "^7.9.6"
-    jsesc "^2.5.1"
-    lodash "^4.17.13"
-    source-map "^0.5.0"
+    "@babel/types" "^7.10.4"
 
 "@babel/helper-annotate-as-pure@^7.8.3":
   version "7.8.3"
@@ -414,25 +449,46 @@
   dependencies:
     "@babel/types" "^7.8.3"
 
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.8.3.tgz#c84097a427a061ac56a1c30ebf54b7b22d241503"
-  integrity sha512-5eFOm2SyFPK4Rh3XMMRDjN7lBH0orh3ss0g3rTYZnBQ+r6YPj7lgDyCvPphynHvUrobJmeMignBr6Acw9mAPlw==
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz#bb0b75f31bf98cbf9ff143c1ae578b87274ae1a3"
+  integrity sha512-L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg==
   dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/helper-explode-assignable-expression" "^7.10.4"
+    "@babel/types" "^7.10.4"
 
-"@babel/helper-compilation-targets@^7.8.7":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.9.6.tgz#1e05b7ccc9d38d2f8b40b458b380a04dcfadd38a"
-  integrity sha512-x2Nvu0igO0ejXzx09B/1fGBxY9NXQlBW2kZsSxCJft+KHN8t9XWzIvFxtPHnBOAXpVsdxZKZFbRUC8TsNKajMw==
+"@babel/helper-compilation-targets@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.4.tgz#804ae8e3f04376607cc791b9d47d540276332bd2"
+  integrity sha512-a3rYhlsGV0UHNDvrtOXBg8/OpfV0OKTkxKPzIplS1zpx7CygDcWWxckxZeDd3gzPzC4kUT0A4nVFDK0wGMh4MQ==
   dependencies:
-    "@babel/compat-data" "^7.9.6"
-    browserslist "^4.11.1"
+    "@babel/compat-data" "^7.10.4"
+    browserslist "^4.12.0"
     invariant "^2.2.4"
     levenary "^1.1.1"
     semver "^5.5.0"
 
+"@babel/helper-create-class-features-plugin@^7.10.4":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.5.tgz#9f61446ba80e8240b0a5c85c6fdac8459d6f259d"
+  integrity sha512-0nkdeijB7VlZoLT3r/mY3bUkw3T8WG/hNw+FATs/6+pG2039IJWjTYL0VTISqsNHMUTEnwbVnc89WIJX9Qed0A==
+  dependencies:
+    "@babel/helper-function-name" "^7.10.4"
+    "@babel/helper-member-expression-to-functions" "^7.10.5"
+    "@babel/helper-optimise-call-expression" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-replace-supers" "^7.10.4"
+    "@babel/helper-split-export-declaration" "^7.10.4"
+
+"@babel/helper-create-regexp-features-plugin@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.4.tgz#fdd60d88524659a0b6959c0579925e425714f3b8"
+  integrity sha512-2/hu58IEPKeoLF45DBwx3XFqsbCXmkdAay4spVr2x0jYgRxrSNp+ePwvSsy9g6YSaNDcKIQVPXk1Ov8S2edk2g==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.10.4"
+    "@babel/helper-regex" "^7.10.4"
+    regexpu-core "^4.7.0"
+
 "@babel/helper-create-regexp-features-plugin@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.3.tgz#c774268c95ec07ee92476a3862b75cc2839beb79"
@@ -450,22 +506,21 @@
     "@babel/helper-regex" "^7.8.3"
     regexpu-core "^4.7.0"
 
-"@babel/helper-define-map@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.8.3.tgz#a0655cad5451c3760b726eba875f1cd8faa02c15"
-  integrity sha512-PoeBYtxoZGtct3md6xZOCWPcKuMuk3IHhgxsRRNtnNShebf4C8YonTSblsK4tvDbm+eJAw2HAPOfCr+Q/YRG/g==
+"@babel/helper-define-map@^7.10.4":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz#b53c10db78a640800152692b13393147acb9bb30"
+  integrity sha512-fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ==
   dependencies:
-    "@babel/helper-function-name" "^7.8.3"
-    "@babel/types" "^7.8.3"
-    lodash "^4.17.13"
+    "@babel/helper-function-name" "^7.10.4"
+    "@babel/types" "^7.10.5"
+    lodash "^4.17.19"
 
-"@babel/helper-explode-assignable-expression@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.8.3.tgz#a728dc5b4e89e30fc2dfc7d04fa28a930653f982"
-  integrity sha512-N+8eW86/Kj147bO9G2uclsg5pwfs/fqqY5rwgIL7eTBklgXjcOJ3btzS5iM6AitJcftnY7pm2lGsrJVYLGjzIw==
+"@babel/helper-explode-assignable-expression@^7.10.4":
+  version "7.11.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.11.4.tgz#2d8e3470252cc17aba917ede7803d4a7a276a41b"
+  integrity sha512-ux9hm3zR4WV1Y3xXxXkdG/0gxF9nvI0YVmKVhvK9AfMoaQkemL3sJpXw+Xbz65azo8qJiEz2XVDUpK3KYhH3ZQ==
   dependencies:
-    "@babel/traverse" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.10.4"
 
 "@babel/helper-function-name@^7.10.1":
   version "7.10.1"
@@ -476,14 +531,14 @@
     "@babel/template" "^7.10.1"
     "@babel/types" "^7.10.1"
 
-"@babel/helper-function-name@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz#ab6e041e7135d436d8f0a3eca15de5b67a341a2e"
-  integrity sha512-AnkGIdiBhEuiwdoMnKm7jfPfqItZhgRaZfMg1XX3bS25INOnLPjPG1Ppnajh8eqgt5kPJnfqrRHqFqmjKDZLzQ==
+"@babel/helper-function-name@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz#d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a"
+  integrity sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==
   dependencies:
-    "@babel/helper-get-function-arity" "^7.7.4"
-    "@babel/template" "^7.7.4"
-    "@babel/types" "^7.7.4"
+    "@babel/helper-get-function-arity" "^7.10.4"
+    "@babel/template" "^7.10.4"
+    "@babel/types" "^7.10.4"
 
 "@babel/helper-function-name@^7.8.3":
   version "7.8.3"
@@ -494,15 +549,6 @@
     "@babel/template" "^7.8.3"
     "@babel/types" "^7.8.3"
 
-"@babel/helper-function-name@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz#2b53820d35275120e1874a82e5aabe1376920a5c"
-  integrity sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==
-  dependencies:
-    "@babel/helper-get-function-arity" "^7.8.3"
-    "@babel/template" "^7.8.3"
-    "@babel/types" "^7.9.5"
-
 "@babel/helper-get-function-arity@^7.10.1":
   version "7.10.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz#7303390a81ba7cb59613895a192b93850e373f7d"
@@ -510,12 +556,12 @@
   dependencies:
     "@babel/types" "^7.10.1"
 
-"@babel/helper-get-function-arity@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz#cb46348d2f8808e632f0ab048172130e636005f0"
-  integrity sha512-QTGKEdCkjgzgfJ3bAyRwF4yyT3pg+vDgan8DSivq1eS0gwi+KGKE5x8kRcbeFTb/673mkO5SN1IZfmCfA5o+EA==
+"@babel/helper-get-function-arity@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz#98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2"
+  integrity sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==
   dependencies:
-    "@babel/types" "^7.7.4"
+    "@babel/types" "^7.10.4"
 
 "@babel/helper-get-function-arity@^7.8.3":
   version "7.8.3"
@@ -524,57 +570,69 @@
   dependencies:
     "@babel/types" "^7.8.3"
 
-"@babel/helper-hoist-variables@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.8.3.tgz#1dbe9b6b55d78c9b4183fc8cdc6e30ceb83b7134"
-  integrity sha512-ky1JLOjcDUtSc+xkt0xhYff7Z6ILTAHKmZLHPxAhOP0Nd77O+3nCsd6uSVYur6nJnCI029CrNbYlc0LoPfAPQg==
+"@babel/helper-hoist-variables@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz#d49b001d1d5a68ca5e6604dda01a6297f7c9381e"
+  integrity sha512-wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA==
   dependencies:
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.10.4"
 
-"@babel/helper-member-expression-to-functions@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz#659b710498ea6c1d9907e0c73f206eee7dadc24c"
-  integrity sha512-fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA==
+"@babel/helper-member-expression-to-functions@^7.10.4", "@babel/helper-member-expression-to-functions@^7.10.5":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz#ae69c83d84ee82f4b42f96e2a09410935a8f26df"
+  integrity sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==
   dependencies:
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.11.0"
 
-"@babel/helper-module-imports@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz#7fe39589b39c016331b6b8c3f441e8f0b1419498"
-  integrity sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==
+"@babel/helper-module-imports@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz#4c5c54be04bd31670a7382797d75b9fa2e5b5620"
+  integrity sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==
   dependencies:
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.10.4"
 
-"@babel/helper-module-transforms@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz#43b34dfe15961918707d247327431388e9fe96e5"
-  integrity sha512-0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA==
+"@babel/helper-module-transforms@^7.10.4", "@babel/helper-module-transforms@^7.10.5", "@babel/helper-module-transforms@^7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz#b16f250229e47211abdd84b34b64737c2ab2d359"
+  integrity sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==
   dependencies:
-    "@babel/helper-module-imports" "^7.8.3"
-    "@babel/helper-replace-supers" "^7.8.6"
-    "@babel/helper-simple-access" "^7.8.3"
-    "@babel/helper-split-export-declaration" "^7.8.3"
-    "@babel/template" "^7.8.6"
-    "@babel/types" "^7.9.0"
-    lodash "^4.17.13"
+    "@babel/helper-module-imports" "^7.10.4"
+    "@babel/helper-replace-supers" "^7.10.4"
+    "@babel/helper-simple-access" "^7.10.4"
+    "@babel/helper-split-export-declaration" "^7.11.0"
+    "@babel/template" "^7.10.4"
+    "@babel/types" "^7.11.0"
+    lodash "^4.17.19"
 
-"@babel/helper-optimise-call-expression@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz#7ed071813d09c75298ef4f208956006b6111ecb9"
-  integrity sha512-Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ==
+"@babel/helper-optimise-call-expression@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz#50dc96413d594f995a77905905b05893cd779673"
+  integrity sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==
   dependencies:
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.10.4"
 
 "@babel/helper-plugin-utils@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz#bbb3fbee98661c569034237cc03967ba99b4f250"
   integrity sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA==
 
+"@babel/helper-plugin-utils@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375"
+  integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==
+
 "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz#9ea293be19babc0f52ff8ca88b34c3611b208670"
   integrity sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==
 
+"@babel/helper-regex@^7.10.4":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.10.5.tgz#32dfbb79899073c415557053a19bd055aae50ae0"
+  integrity sha512-68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg==
+  dependencies:
+    lodash "^4.17.19"
+
 "@babel/helper-regex@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.8.3.tgz#139772607d51b93f23effe72105b319d2a4c6965"
@@ -582,44 +640,40 @@
   dependencies:
     lodash "^4.17.13"
 
-"@babel/helper-remap-async-to-generator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.8.3.tgz#273c600d8b9bf5006142c1e35887d555c12edd86"
-  integrity sha512-kgwDmw4fCg7AVgS4DukQR/roGp+jP+XluJE5hsRZwxCYGg+Rv9wSGErDWhlI90FODdYfd4xG4AQRiMDjjN0GzA==
+"@babel/helper-remap-async-to-generator@^7.10.4":
+  version "7.11.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.11.4.tgz#4474ea9f7438f18575e30b0cac784045b402a12d"
+  integrity sha512-tR5vJ/vBa9wFy3m5LLv2faapJLnDFxNWff2SAYkSE4rLUdbp7CdObYFgI7wK4T/Mj4UzpjPwzR8Pzmr5m7MHGA==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.8.3"
-    "@babel/helper-wrap-function" "^7.8.3"
-    "@babel/template" "^7.8.3"
-    "@babel/traverse" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/helper-annotate-as-pure" "^7.10.4"
+    "@babel/helper-wrap-function" "^7.10.4"
+    "@babel/template" "^7.10.4"
+    "@babel/types" "^7.10.4"
 
-"@babel/helper-replace-supers@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.8.3.tgz#91192d25f6abbcd41da8a989d4492574fb1530bc"
-  integrity sha512-xOUssL6ho41U81etpLoT2RTdvdus4VfHamCuAm4AHxGr+0it5fnwoVdwUJ7GFEqCsQYzJUhcbsN9wB9apcYKFA==
+"@babel/helper-replace-supers@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz#d585cd9388ea06e6031e4cd44b6713cbead9e6cf"
+  integrity sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==
   dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.8.3"
-    "@babel/helper-optimise-call-expression" "^7.8.3"
-    "@babel/traverse" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/helper-member-expression-to-functions" "^7.10.4"
+    "@babel/helper-optimise-call-expression" "^7.10.4"
+    "@babel/traverse" "^7.10.4"
+    "@babel/types" "^7.10.4"
 
-"@babel/helper-replace-supers@^7.8.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.9.6.tgz#03149d7e6a5586ab6764996cd31d6981a17e1444"
-  integrity sha512-qX+chbxkbArLyCImk3bWV+jB5gTNU/rsze+JlcF6Nf8tVTigPJSI1o1oBow/9Resa1yehUO9lIipsmu9oG4RzA==
+"@babel/helper-simple-access@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz#0f5ccda2945277a2a7a2d3a821e15395edcf3461"
+  integrity sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==
   dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.8.3"
-    "@babel/helper-optimise-call-expression" "^7.8.3"
-    "@babel/traverse" "^7.9.6"
-    "@babel/types" "^7.9.6"
+    "@babel/template" "^7.10.4"
+    "@babel/types" "^7.10.4"
 
-"@babel/helper-simple-access@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz#7f8109928b4dab4654076986af575231deb639ae"
-  integrity sha512-VNGUDjx5cCWg4vvCTR8qQ7YJYZ+HBjxOgXEl7ounz+4Sn7+LMD3CFrCTEU6/qXKbA2nKg21CwhhBzO0RpRbdCw==
+"@babel/helper-skip-transparent-expression-wrappers@^7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.11.0.tgz#eec162f112c2f58d3af0af125e3bb57665146729"
+  integrity sha512-0XIdiQln4Elglgjbwo9wuJpL/K7AGCY26kmEt0+pRP0TAj4jjyNq1MjoRvikrTVqKcx4Gysxt4cXvVFXP/JO2Q==
   dependencies:
-    "@babel/template" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.11.0"
 
 "@babel/helper-split-export-declaration@^7.10.1":
   version "7.10.1"
@@ -628,12 +682,12 @@
   dependencies:
     "@babel/types" "^7.10.1"
 
-"@babel/helper-split-export-declaration@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.4.tgz#57292af60443c4a3622cf74040ddc28e68336fd8"
-  integrity sha512-guAg1SXFcVr04Guk9eq0S4/rWS++sbmyqosJzVs8+1fH5NI+ZcmkaSkc7dmtAFbHFva6yRJnjW3yAcGxjueDug==
+"@babel/helper-split-export-declaration@^7.10.4", "@babel/helper-split-export-declaration@^7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz#f8a491244acf6a676158ac42072911ba83ad099f"
+  integrity sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==
   dependencies:
-    "@babel/types" "^7.7.4"
+    "@babel/types" "^7.11.0"
 
 "@babel/helper-split-export-declaration@^7.8.3":
   version "7.8.3"
@@ -647,20 +701,34 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz#5770b0c1a826c4f53f5ede5e153163e0318e94b5"
   integrity sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==
 
+"@babel/helper-validator-identifier@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2"
+  integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==
+
 "@babel/helper-validator-identifier@^7.9.5":
   version "7.9.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz#90977a8e6fbf6b431a7dc31752eee233bf052d80"
   integrity sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==
 
-"@babel/helper-wrap-function@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz#9dbdb2bb55ef14aaa01fe8c99b629bd5352d8610"
-  integrity sha512-LACJrbUET9cQDzb6kG7EeD7+7doC3JNvUgTEQOx2qaO1fKlzE/Bf05qs9w1oXQMmXlPO65lC3Tq9S6gZpTErEQ==
+"@babel/helper-wrap-function@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz#8a6f701eab0ff39f765b5a1cfef409990e624b87"
+  integrity sha512-6py45WvEF0MhiLrdxtRjKjufwLL1/ob2qDJgg5JgNdojBAZSAKnAjkyOCNug6n+OBl4VW76XjvgSFTdaMcW0Ug==
   dependencies:
-    "@babel/helper-function-name" "^7.8.3"
-    "@babel/template" "^7.8.3"
-    "@babel/traverse" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/helper-function-name" "^7.10.4"
+    "@babel/template" "^7.10.4"
+    "@babel/traverse" "^7.10.4"
+    "@babel/types" "^7.10.4"
+
+"@babel/helpers@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.10.4.tgz#2abeb0d721aff7c0a97376b9e1f6f65d7a475044"
+  integrity sha512-L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA==
+  dependencies:
+    "@babel/template" "^7.10.4"
+    "@babel/traverse" "^7.10.4"
+    "@babel/types" "^7.10.4"
 
 "@babel/helpers@^7.8.3":
   version "7.10.1"
@@ -680,15 +748,6 @@
     "@babel/traverse" "^7.8.4"
     "@babel/types" "^7.8.3"
 
-"@babel/helpers@^7.9.0":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.9.6.tgz#092c774743471d0bb6c7de3ad465ab3d3486d580"
-  integrity sha512-tI4bUbldloLcHWoRUMAj4g1bF313M/o6fBKhIsb3QnGVPwRm9JsNf/gqMkQ7zjqReABiffPV6RWj7hEglID5Iw==
-  dependencies:
-    "@babel/template" "^7.8.3"
-    "@babel/traverse" "^7.9.6"
-    "@babel/types" "^7.9.6"
-
 "@babel/highlight@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0.tgz#f710c38c8d458e6dd9a201afb637fcb781ce99e4"
@@ -706,6 +765,15 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
+"@babel/highlight@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143"
+  integrity sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.10.4"
+    chalk "^2.0.0"
+    js-tokens "^4.0.0"
+
 "@babel/highlight@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.8.3.tgz#28f173d04223eaaa59bc1d439a3836e6d1265797"
@@ -720,88 +788,124 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.10.2.tgz#871807f10442b92ff97e4783b9b54f6a0ca812d0"
   integrity sha512-PApSXlNMJyB4JiGVhCOlzKIif+TKFTvu0aQAhnTvfP/z3vVSN6ZypH5bfUNwFXXjRQtUEBNFd2PtmCmG2Py3qQ==
 
-"@babel/parser@^7.4.3", "@babel/parser@^7.7.4":
-  version "7.7.5"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.5.tgz#cbf45321619ac12d83363fcf9c94bb67fa646d71"
-  integrity sha512-KNlOe9+/nk4i29g0VXgl8PEXIRms5xKLJeuZ6UptN0fHv+jDiriG+y94X6qAgWTR0h3KaoM1wK5G5h7MHFRSig==
+"@babel/parser@^7.10.4", "@babel/parser@^7.11.1", "@babel/parser@^7.11.5":
+  version "7.11.5"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.11.5.tgz#c7ff6303df71080ec7a4f5b8c003c58f1cf51037"
+  integrity sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==
 
-"@babel/parser@^7.7.5", "@babel/parser@^7.8.3", "@babel/parser@^7.8.4":
+"@babel/parser@^7.8.3", "@babel/parser@^7.8.4":
   version "7.8.4"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.4.tgz#d1dbe64691d60358a974295fa53da074dd2ce8e8"
   integrity sha512-0fKu/QqildpXmPVaRBoXOlyBb3MC+J0A66x97qEfLOMkn3u6nfY5esWogQwi/K0BjASYy4DbnsEWnpNL6qT5Mw==
 
-"@babel/parser@^7.8.6", "@babel/parser@^7.9.0", "@babel/parser@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.6.tgz#3b1bbb30dabe600cd72db58720998376ff653bc7"
-  integrity sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==
-
-"@babel/plugin-proposal-async-generator-functions@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.8.3.tgz#bad329c670b382589721b27540c7d288601c6e6f"
-  integrity sha512-NZ9zLv848JsV3hs8ryEh7Uaz/0KsmPLqv0+PdkDJL1cJy0K4kOCFa8zc1E3mp+RHPQcpdfb/6GovEsW4VDrOMw==
+"@babel/plugin-proposal-async-generator-functions@^7.10.4":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.5.tgz#3491cabf2f7c179ab820606cec27fed15e0e8558"
+  integrity sha512-cNMCVezQbrRGvXJwm9fu/1sJj9bHdGAgKodZdLqOQIpfoH3raqmRPBM17+lh7CzhiKRRBrGtZL9WcjxSoGYUSg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-remap-async-to-generator" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-remap-async-to-generator" "^7.10.4"
     "@babel/plugin-syntax-async-generators" "^7.8.0"
 
-"@babel/plugin-proposal-dynamic-import@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.8.3.tgz#38c4fe555744826e97e2ae930b0fb4cc07e66054"
-  integrity sha512-NyaBbyLFXFLT9FP+zk0kYlUlA8XtCUbehs67F0nnEg7KICgMc2mNkIeu9TYhKzyXMkrapZFwAhXLdnt4IYHy1w==
+"@babel/plugin-proposal-class-properties@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.4.tgz#a33bf632da390a59c7a8c570045d1115cd778807"
+  integrity sha512-vhwkEROxzcHGNu2mzUC0OFFNXdZ4M23ib8aRRcJSsW8BZK9pQMD7QB7csl97NBbgGZO7ZyHUyKDnxzOaP4IrCg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-create-class-features-plugin" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
+
+"@babel/plugin-proposal-dynamic-import@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.4.tgz#ba57a26cb98b37741e9d5bca1b8b0ddf8291f17e"
+  integrity sha512-up6oID1LeidOOASNXgv/CFbgBqTuKJ0cJjz6An5tWD+NVBNlp3VNSBxv2ZdU7SYl3NxJC7agAQDApZusV6uFwQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-dynamic-import" "^7.8.0"
 
-"@babel/plugin-proposal-json-strings@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.8.3.tgz#da5216b238a98b58a1e05d6852104b10f9a70d6b"
-  integrity sha512-KGhQNZ3TVCQG/MjRbAUwuH+14y9q0tpxs1nWWs3pbSleRdDro9SAMMDyye8HhY1gqZ7/NqIc8SKhya0wRDgP1Q==
+"@babel/plugin-proposal-export-namespace-from@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.10.4.tgz#570d883b91031637b3e2958eea3c438e62c05f54"
+  integrity sha512-aNdf0LY6/3WXkhh0Fdb6Zk9j1NMD8ovj3F6r0+3j837Pn1S1PdNtcwJ5EG9WkVPNHPxyJDaxMaAOVq4eki0qbg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+
+"@babel/plugin-proposal-json-strings@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz#593e59c63528160233bd321b1aebe0820c2341db"
+  integrity sha512-fCL7QF0Jo83uy1K0P2YXrfX11tj3lkpN7l4dMv9Y9VkowkhkQDwFHFd8IiwyK5MZjE8UpbgokkgtcReH88Abaw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-json-strings" "^7.8.0"
 
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.8.3.tgz#e4572253fdeed65cddeecfdab3f928afeb2fd5d2"
-  integrity sha512-TS9MlfzXpXKt6YYomudb/KU7nQI6/xnapG6in1uZxoxDghuSMZsPb6D2fyUwNYSAp4l1iR7QtFOjkqcRYcUsfw==
+"@babel/plugin-proposal-logical-assignment-operators@^7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.11.0.tgz#9f80e482c03083c87125dee10026b58527ea20c8"
+  integrity sha512-/f8p4z+Auz0Uaf+i8Ekf1iM7wUNLcViFUGiPxKeXvxTSl63B875YPiVdUDdem7hREcI0E0kSpEhS8tF5RphK7Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
+
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz#02a7e961fc32e6d5b2db0649e01bf80ddee7e04a"
+  integrity sha512-wq5n1M3ZUlHl9sqT2ok1T2/MTt6AXE0e1Lz4WzWBr95LsAZ5qDXe4KnFuauYyEyLiohvXFMdbsOTMyLZs91Zlw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
 
-"@babel/plugin-proposal-numeric-separator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.8.3.tgz#5d6769409699ec9b3b68684cd8116cedff93bad8"
-  integrity sha512-jWioO1s6R/R+wEHizfaScNsAx+xKgwTLNXSh7tTC4Usj3ItsPEhYkEpU4h+lpnBwq7NBVOJXfO6cRFYcX69JUQ==
+"@babel/plugin-proposal-numeric-separator@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.4.tgz#ce1590ff0a65ad12970a609d78855e9a4c1aef06"
+  integrity sha512-73/G7QoRoeNkLZFxsoCCvlg4ezE4eM+57PnOqgaPOozd5myfj7p0muD1mRVJvbUWbOzD+q3No2bWbaKy+DJ8DA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-numeric-separator" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@babel/plugin-proposal-object-rest-spread@^7.9.0":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.6.tgz#7a093586fcb18b08266eb1a7177da671ac575b63"
-  integrity sha512-Ga6/fhGqA9Hj+y6whNpPv8psyaK5xzrQwSPsGPloVkvmH+PqW1ixdnfJ9uIO06OjQNYol3PMnfmJ8vfZtkzF+A==
+"@babel/plugin-proposal-object-rest-spread@^7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.11.0.tgz#bd81f95a1f746760ea43b6c2d3d62b11790ad0af"
+  integrity sha512-wzch41N4yztwoRw0ak+37wxwJM2oiIiy6huGCoqkvSTA9acYWcPfn9Y4aJqmFFJ70KTJUu29f3DQ43uJ9HXzEA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
-    "@babel/plugin-transform-parameters" "^7.9.5"
+    "@babel/plugin-transform-parameters" "^7.10.4"
 
-"@babel/plugin-proposal-optional-catch-binding@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.8.3.tgz#9dee96ab1650eed88646ae9734ca167ac4a9c5c9"
-  integrity sha512-0gkX7J7E+AtAw9fcwlVQj8peP61qhdg/89D5swOkjYbkboA2CVckn3kiyum1DE0wskGb7KJJxBdyEBApDLLVdw==
+"@babel/plugin-proposal-optional-catch-binding@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.4.tgz#31c938309d24a78a49d68fdabffaa863758554dd"
+  integrity sha512-LflT6nPh+GK2MnFiKDyLiqSqVHkQnVf7hdoAvyTnnKj9xB3docGRsdPuxp6qqqW19ifK3xgc9U5/FwrSaCNX5g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
 
-"@babel/plugin-proposal-optional-chaining@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.9.0.tgz#31db16b154c39d6b8a645292472b98394c292a58"
-  integrity sha512-NDn5tu3tcv4W30jNhmc2hyD5c56G6cXx4TesJubhxrJeCvuuMpttxr0OnNCqbZGhFjLrg+NIhxxC+BK5F6yS3w==
+"@babel/plugin-proposal-optional-chaining@^7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.11.0.tgz#de5866d0646f6afdaab8a566382fe3a221755076"
+  integrity sha512-v9fZIu3Y8562RRwhm1BbMRxtqZNFmFA2EG+pT2diuU8PT3H6T/KXoZ54KgYisfOFZHV6PfvAiBIZ9Rcz+/JCxA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.11.0"
     "@babel/plugin-syntax-optional-chaining" "^7.8.0"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.4.4", "@babel/plugin-proposal-unicode-property-regex@^7.8.3":
+"@babel/plugin-proposal-private-methods@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.4.tgz#b160d972b8fdba5c7d111a145fc8c421fc2a6909"
+  integrity sha512-wh5GJleuI8k3emgTg5KkJK6kHNsGEr0uBTDBuQUBJwckk9xs1ez79ioheEVVxMLyPscB0LfkbVHslQqIzWV6Bw==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
+
+"@babel/plugin-proposal-unicode-property-regex@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz#4483cda53041ce3413b7fe2f00022665ddfaa75d"
+  integrity sha512-H+3fOgPnEXFL9zGYtKQe4IDOPKYlZdF1kqFDQRRb8PK4B8af1vAGK04tF5iQAAsui+mHNBQSAtd2/ndEDe9wuA==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
+
+"@babel/plugin-proposal-unicode-property-regex@^7.4.4":
   version "7.8.8"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.8.tgz#ee3a95e90cdc04fe8cd92ec3279fa017d68a0d1d"
   integrity sha512-EVhjVsMpbhLw9ZfHWSx2iy13Q8Z/eg8e8ccVWt23sWQK5l1UdkoLJPN5w69UA4uITGBnEZD2JOe4QOHycYKv8A==
@@ -816,6 +920,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
+"@babel/plugin-syntax-class-properties@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz#6644e6a0baa55a61f9e3231f6c9eeb6ee46c124c"
+  integrity sha512-GCSBF7iUle6rNugfURwNmCGG3Z/2+opxAMLs1nND4bhEG5PuxTIggDBoeYYSujAlLtsupzOHYJQgPS3pivwXIA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
 "@babel/plugin-syntax-dynamic-import@^7.8.0":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"
@@ -823,6 +934,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
+"@babel/plugin-syntax-export-namespace-from@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a"
+  integrity sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
 "@babel/plugin-syntax-json-strings@^7.8.0":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
@@ -830,6 +948,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
+"@babel/plugin-syntax-logical-assignment-operators@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
+  integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
 "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.0":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
@@ -837,12 +962,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-numeric-separator@^7.8.0", "@babel/plugin-syntax-numeric-separator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.8.3.tgz#0e3fb63e09bea1b11e96467271c8308007e7c41f"
-  integrity sha512-H7dCMAdN83PcCmqmkHB5dtp+Xa9a6LKSvA2hiFBC/5alSHxM5VgWZXFqDi0YFe8XNGT6iCa+z4V4zSt/PdZ7Dw==
+"@babel/plugin-syntax-numeric-separator@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"
+  integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-object-rest-spread@^7.8.0":
   version "7.8.3"
@@ -865,73 +990,80 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-top-level-await@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.8.3.tgz#3acdece695e6b13aaf57fc291d1a800950c71391"
-  integrity sha512-kwj1j9lL/6Wd0hROD3b/OZZ7MSrZLqqn9RAZ5+cYYsflQ9HZBIKCUkr3+uL1MEJ1NePiUbf98jjiMQSv0NMR9g==
+"@babel/plugin-syntax-top-level-await@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.4.tgz#4bbeb8917b54fcf768364e0a81f560e33a3ef57d"
+  integrity sha512-ni1brg4lXEmWyafKr0ccFWkJG0CeMt4WV1oyeBW6EFObF4oOHclbkj5cARxAPQyAQ2UTuplJyK4nfkXIMMFvsQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-arrow-functions@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.8.3.tgz#82776c2ed0cd9e1a49956daeb896024c9473b8b6"
-  integrity sha512-0MRF+KC8EqH4dbuITCWwPSzsyO3HIWWlm30v8BbbpOrS1B++isGxPnnuq/IZvOX5J2D/p7DQalQm+/2PnlKGxg==
+"@babel/plugin-transform-arrow-functions@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.4.tgz#e22960d77e697c74f41c501d44d73dbf8a6a64cd"
+  integrity sha512-9J/oD1jV0ZCBcgnoFWFq1vJd4msoKb/TCpGNFyyLt0zABdcvgK3aYikZ8HjzB14c26bc7E3Q1yugpwGy2aTPNA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-async-to-generator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.8.3.tgz#4308fad0d9409d71eafb9b1a6ee35f9d64b64086"
-  integrity sha512-imt9tFLD9ogt56Dd5CI/6XgpukMwd/fLGSrix2httihVe7LOGVPhyhMh1BU5kDM7iHD08i8uUtmV2sWaBFlHVQ==
+"@babel/plugin-transform-async-to-generator@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.4.tgz#41a5017e49eb6f3cda9392a51eef29405b245a37"
+  integrity sha512-F6nREOan7J5UXTLsDsZG3DXmZSVofr2tGNwfdrVwkDWHfQckbQXnXSPfD7iO+c/2HGqycwyLST3DnZ16n+cBJQ==
   dependencies:
-    "@babel/helper-module-imports" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-remap-async-to-generator" "^7.8.3"
+    "@babel/helper-module-imports" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-remap-async-to-generator" "^7.10.4"
 
-"@babel/plugin-transform-block-scoped-functions@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.8.3.tgz#437eec5b799b5852072084b3ae5ef66e8349e8a3"
-  integrity sha512-vo4F2OewqjbB1+yaJ7k2EJFHlTP3jR634Z9Cj9itpqNjuLXvhlVxgnjsHsdRgASR8xYDrx6onw4vW5H6We0Jmg==
+"@babel/plugin-transform-block-scoped-functions@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.4.tgz#1afa595744f75e43a91af73b0d998ecfe4ebc2e8"
+  integrity sha512-WzXDarQXYYfjaV1szJvN3AD7rZgZzC1JtjJZ8dMHUyiK8mxPRahynp14zzNjU3VkPqPsO38CzxiWO1c9ARZ8JA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-block-scoping@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.8.3.tgz#97d35dab66857a437c166358b91d09050c868f3a"
-  integrity sha512-pGnYfm7RNRgYRi7bids5bHluENHqJhrV4bCZRwc5GamaWIIs07N4rZECcmJL6ZClwjDz1GbdMZFtPs27hTB06w==
+"@babel/plugin-transform-block-scoping@^7.10.4":
+  version "7.11.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.11.1.tgz#5b7efe98852bef8d652c0b28144cd93a9e4b5215"
+  integrity sha512-00dYeDE0EVEHuuM+26+0w/SCL0BH2Qy7LwHuI4Hi4MH5gkC8/AqMN5uWFJIsoXZrAphiMm1iXzBw6L2T+eA0ew==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    lodash "^4.17.13"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-classes@^7.9.0":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.5.tgz#800597ddb8aefc2c293ed27459c1fcc935a26c2c"
-  integrity sha512-x2kZoIuLC//O5iA7PEvecB105o7TLzZo8ofBVhP79N+DO3jaX+KYfww9TQcfBEZD0nikNyYcGB1IKtRq36rdmg==
+"@babel/plugin-transform-classes@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.4.tgz#405136af2b3e218bc4a1926228bc917ab1a0adc7"
+  integrity sha512-2oZ9qLjt161dn1ZE0Ms66xBncQH4In8Sqw1YWgBUZuGVJJS5c0OFZXL6dP2MRHrkU/eKhWg8CzFJhRQl50rQxA==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.8.3"
-    "@babel/helper-define-map" "^7.8.3"
-    "@babel/helper-function-name" "^7.9.5"
-    "@babel/helper-optimise-call-expression" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-replace-supers" "^7.8.6"
-    "@babel/helper-split-export-declaration" "^7.8.3"
+    "@babel/helper-annotate-as-pure" "^7.10.4"
+    "@babel/helper-define-map" "^7.10.4"
+    "@babel/helper-function-name" "^7.10.4"
+    "@babel/helper-optimise-call-expression" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-replace-supers" "^7.10.4"
+    "@babel/helper-split-export-declaration" "^7.10.4"
     globals "^11.1.0"
 
-"@babel/plugin-transform-computed-properties@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.8.3.tgz#96d0d28b7f7ce4eb5b120bb2e0e943343c86f81b"
-  integrity sha512-O5hiIpSyOGdrQZRQ2ccwtTVkgUDBBiCuK//4RJ6UfePllUTCENOzKxfh6ulckXKc0DixTFLCfb2HVkNA7aDpzA==
+"@babel/plugin-transform-computed-properties@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.4.tgz#9ded83a816e82ded28d52d4b4ecbdd810cdfc0eb"
+  integrity sha512-JFwVDXcP/hM/TbyzGq3l/XWGut7p46Z3QvqFMXTfk6/09m7xZHJUN9xHfsv7vqqD4YnfI5ueYdSJtXqqBLyjBw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-destructuring@^7.8.3":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.9.5.tgz#72c97cf5f38604aea3abf3b935b0e17b1db76a50"
-  integrity sha512-j3OEsGel8nHL/iusv/mRd5fYZ3DrOxWC82x0ogmdN/vHfAP4MYw+AFKYanzWlktNwikKvlzUV//afBW5FTp17Q==
+"@babel/plugin-transform-destructuring@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.4.tgz#70ddd2b3d1bea83d01509e9bb25ddb3a74fc85e5"
+  integrity sha512-+WmfvyfsyF603iPa6825mq6Qrb7uLjTOsa3XOFzlYcYDHSS4QmpOWOL0NNBY5qMbvrcf3tq0Cw+v4lxswOBpgA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
+
+"@babel/plugin-transform-dotall-regex@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.4.tgz#469c2062105c1eb6a040eaf4fac4b488078395ee"
+  integrity sha512-ZEAVvUTCMlMFAbASYSVQoxIbHm2OkG2MseW6bV2JjIygOjdVv8tuxrCTzj1+Rynh7ODb8GivUy7dzEXzEhuPaA==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-dotall-regex@^7.4.4", "@babel/plugin-transform-dotall-regex@^7.8.3":
+"@babel/plugin-transform-dotall-regex@^7.4.4":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz#c3c6ec5ee6125c6993c5cbca20dc8621a9ea7a6e"
   integrity sha512-kLs1j9Nn4MQoBYdRXH6AeaXMbEJFaFu/v1nQkvib6QzTj8MZI5OQzqmD83/2jEM1z0DLilra5aWO5YpyC0ALIw==
@@ -939,244 +1071,270 @@
     "@babel/helper-create-regexp-features-plugin" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-duplicate-keys@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.8.3.tgz#8d12df309aa537f272899c565ea1768e286e21f1"
-  integrity sha512-s8dHiBUbcbSgipS4SMFuWGqCvyge5V2ZeAWzR6INTVC3Ltjig/Vw1G2Gztv0vU/hRG9X8IvKvYdoksnUfgXOEQ==
+"@babel/plugin-transform-duplicate-keys@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.4.tgz#697e50c9fee14380fe843d1f306b295617431e47"
+  integrity sha512-GL0/fJnmgMclHiBTTWXNlYjYsA7rDrtsazHG6mglaGSTh0KsrW04qml+Bbz9FL0LcJIRwBWL5ZqlNHKTkU3xAA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-exponentiation-operator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.8.3.tgz#581a6d7f56970e06bf51560cd64f5e947b70d7b7"
-  integrity sha512-zwIpuIymb3ACcInbksHaNcR12S++0MDLKkiqXHl3AzpgdKlFNhog+z/K0+TGW+b0w5pgTq4H6IwV/WhxbGYSjQ==
+"@babel/plugin-transform-exponentiation-operator@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.4.tgz#5ae338c57f8cf4001bdb35607ae66b92d665af2e"
+  integrity sha512-S5HgLVgkBcRdyQAHbKj+7KyuWx8C6t5oETmUuwz1pt3WTWJhsUV0WIIXuVvfXMxl/QQyHKlSCNNtaIamG8fysw==
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-for-of@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.9.0.tgz#0f260e27d3e29cd1bb3128da5e76c761aa6c108e"
-  integrity sha512-lTAnWOpMwOXpyDx06N+ywmF3jNbafZEqZ96CGYabxHrxNX8l5ny7dt4bK/rGwAh9utyP2b2Hv7PlZh1AAS54FQ==
+"@babel/plugin-transform-for-of@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.4.tgz#c08892e8819d3a5db29031b115af511dbbfebae9"
+  integrity sha512-ItdQfAzu9AlEqmusA/65TqJ79eRcgGmpPPFvBnGILXZH975G0LNjP1yjHvGgfuCxqrPPueXOPe+FsvxmxKiHHQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-function-name@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.8.3.tgz#279373cb27322aaad67c2683e776dfc47196ed8b"
-  integrity sha512-rO/OnDS78Eifbjn5Py9v8y0aR+aSYhDhqAwVfsTl0ERuMZyr05L1aFSCJnbv2mmsLkit/4ReeQ9N2BgLnOcPCQ==
+"@babel/plugin-transform-function-name@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.4.tgz#6a467880e0fc9638514ba369111811ddbe2644b7"
+  integrity sha512-OcDCq2y5+E0dVD5MagT5X+yTRbcvFjDI2ZVAottGH6tzqjx/LKpgkUepu3hp/u4tZBzxxpNGwLsAvGBvQ2mJzg==
   dependencies:
-    "@babel/helper-function-name" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-function-name" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-literals@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.8.3.tgz#aef239823d91994ec7b68e55193525d76dbd5dc1"
-  integrity sha512-3Tqf8JJ/qB7TeldGl+TT55+uQei9JfYaregDcEAyBZ7akutriFrt6C/wLYIer6OYhleVQvH/ntEhjE/xMmy10A==
+"@babel/plugin-transform-literals@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.4.tgz#9f42ba0841100a135f22712d0e391c462f571f3c"
+  integrity sha512-Xd/dFSTEVuUWnyZiMu76/InZxLTYilOSr1UlHV+p115Z/Le2Fi1KXkJUYz0b42DfndostYlPub3m8ZTQlMaiqQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-member-expression-literals@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.8.3.tgz#963fed4b620ac7cbf6029c755424029fa3a40410"
-  integrity sha512-3Wk2EXhnw+rP+IDkK6BdtPKsUE5IeZ6QOGrPYvw52NwBStw9V1ZVzxgK6fSKSxqUvH9eQPR3tm3cOq79HlsKYA==
+"@babel/plugin-transform-member-expression-literals@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.4.tgz#b1ec44fcf195afcb8db2c62cd8e551c881baf8b7"
+  integrity sha512-0bFOvPyAoTBhtcJLr9VcwZqKmSjFml1iVxvPL0ReomGU53CX53HsM4h2SzckNdkQcHox1bpAqzxBI1Y09LlBSw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-modules-amd@^7.9.0":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.6.tgz#8539ec42c153d12ea3836e0e3ac30d5aae7b258e"
-  integrity sha512-zoT0kgC3EixAyIAU+9vfaUVKTv9IxBDSabgHoUCBP6FqEJ+iNiN7ip7NBKcYqbfUDfuC2mFCbM7vbu4qJgOnDw==
+"@babel/plugin-transform-modules-amd@^7.10.4":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.5.tgz#1b9cddaf05d9e88b3aad339cb3e445c4f020a9b1"
+  integrity sha512-elm5uruNio7CTLFItVC/rIzKLfQ17+fX7EVz5W0TMgIHFo1zY0Ozzx+lgwhL4plzl8OzVn6Qasx5DeEFyoNiRw==
   dependencies:
-    "@babel/helper-module-transforms" "^7.9.0"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-module-transforms" "^7.10.5"
+    "@babel/helper-plugin-utils" "^7.10.4"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-commonjs@^7.9.0":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.6.tgz#64b7474a4279ee588cacd1906695ca721687c277"
-  integrity sha512-7H25fSlLcn+iYimmsNe3uK1at79IE6SKW9q0/QeEHTMC9MdOZ+4bA+T1VFB5fgOqBWoqlifXRzYD0JPdmIrgSQ==
+"@babel/plugin-transform-modules-commonjs@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz#66667c3eeda1ebf7896d41f1f16b17105a2fbca0"
+  integrity sha512-Xj7Uq5o80HDLlW64rVfDBhao6OX89HKUmb+9vWYaLXBZOma4gA6tw4Ni1O5qVDoZWUV0fxMYA0aYzOawz0l+1w==
   dependencies:
-    "@babel/helper-module-transforms" "^7.9.0"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-simple-access" "^7.8.3"
+    "@babel/helper-module-transforms" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-simple-access" "^7.10.4"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-systemjs@^7.9.0":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.6.tgz#207f1461c78a231d5337a92140e52422510d81a4"
-  integrity sha512-NW5XQuW3N2tTHim8e1b7qGy7s0kZ2OH3m5octc49K1SdAKGxYxeIx7hiIz05kS1R2R+hOWcsr1eYwcGhrdHsrg==
+"@babel/plugin-transform-modules-systemjs@^7.10.4":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.5.tgz#6270099c854066681bae9e05f87e1b9cadbe8c85"
+  integrity sha512-f4RLO/OL14/FP1AEbcsWMzpbUz6tssRaeQg11RH1BP/XnPpRoVwgeYViMFacnkaw4k4wjRSjn3ip1Uw9TaXuMw==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.8.3"
-    "@babel/helper-module-transforms" "^7.9.0"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-hoist-variables" "^7.10.4"
+    "@babel/helper-module-transforms" "^7.10.5"
+    "@babel/helper-plugin-utils" "^7.10.4"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-umd@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.9.0.tgz#e909acae276fec280f9b821a5f38e1f08b480697"
-  integrity sha512-uTWkXkIVtg/JGRSIABdBoMsoIeoHQHPTL0Y2E7xf5Oj7sLqwVsNXOkNk0VJc7vF0IMBsPeikHxFjGe+qmwPtTQ==
+"@babel/plugin-transform-modules-umd@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.4.tgz#9a8481fe81b824654b3a0b65da3df89f3d21839e"
+  integrity sha512-mohW5q3uAEt8T45YT7Qc5ws6mWgJAaL/8BfWD9Dodo1A3RKWli8wTS+WiQ/knF+tXlPirW/1/MqzzGfCExKECA==
   dependencies:
-    "@babel/helper-module-transforms" "^7.9.0"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-module-transforms" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz#a2a72bffa202ac0e2d0506afd0939c5ecbc48c6c"
-  integrity sha512-f+tF/8UVPU86TrCb06JoPWIdDpTNSGGcAtaD9mLP0aYGA0OS0j7j7DHJR0GTFrUZPUU6loZhbsVZgTh0N+Qdnw==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz#78b4d978810b6f3bcf03f9e318f2fc0ed41aecb6"
+  integrity sha512-V6LuOnD31kTkxQPhKiVYzYC/Jgdq53irJC/xBSmqcNcqFGV+PER4l6rU5SH2Vl7bH9mLDHcc0+l9HUOe4RNGKA==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.8.3"
+    "@babel/helper-create-regexp-features-plugin" "^7.10.4"
 
-"@babel/plugin-transform-new-target@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.8.3.tgz#60cc2ae66d85c95ab540eb34babb6434d4c70c43"
-  integrity sha512-QuSGysibQpyxexRyui2vca+Cmbljo8bcRckgzYV4kRIsHpVeyeC3JDO63pY+xFZ6bWOBn7pfKZTqV4o/ix9sFw==
+"@babel/plugin-transform-new-target@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.4.tgz#9097d753cb7b024cb7381a3b2e52e9513a9c6888"
+  integrity sha512-YXwWUDAH/J6dlfwqlWsztI2Puz1NtUAubXhOPLQ5gjR/qmQ5U96DY4FQO8At33JN4XPBhrjB8I4eMmLROjjLjw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-object-super@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.8.3.tgz#ebb6a1e7a86ffa96858bd6ac0102d65944261725"
-  integrity sha512-57FXk+gItG/GejofIyLIgBKTas4+pEU47IXKDBWFTxdPd7F80H8zybyAY7UoblVfBhBGs2EKM+bJUu2+iUYPDQ==
+"@babel/plugin-transform-object-super@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.4.tgz#d7146c4d139433e7a6526f888c667e314a093894"
+  integrity sha512-5iTw0JkdRdJvr7sY0vHqTpnruUpTea32JHmq/atIWqsnNussbRzjEDyWep8UNztt1B5IusBYg8Irb0bLbiEBCQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-replace-supers" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-replace-supers" "^7.10.4"
 
-"@babel/plugin-transform-parameters@^7.8.7", "@babel/plugin-transform-parameters@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.5.tgz#173b265746f5e15b2afe527eeda65b73623a0795"
-  integrity sha512-0+1FhHnMfj6lIIhVvS4KGQJeuhe1GI//h5uptK4PvLt+BGBxsoUJbd3/IW002yk//6sZPlFgsG1hY6OHLcy6kA==
+"@babel/plugin-transform-parameters@^7.10.4":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz#59d339d58d0b1950435f4043e74e2510005e2c4a"
+  integrity sha512-xPHwUj5RdFV8l1wuYiu5S9fqWGM2DrYc24TMvUiRrPVm+SM3XeqU9BcokQX/kEUe+p2RBwy+yoiR1w/Blq6ubw==
   dependencies:
-    "@babel/helper-get-function-arity" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-get-function-arity" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-property-literals@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.8.3.tgz#33194300d8539c1ed28c62ad5087ba3807b98263"
-  integrity sha512-uGiiXAZMqEoQhRWMK17VospMZh5sXWg+dlh2soffpkAl96KAm+WZuJfa6lcELotSRmooLqg0MWdH6UUq85nmmg==
+"@babel/plugin-transform-property-literals@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.4.tgz#f6fe54b6590352298785b83edd815d214c42e3c0"
+  integrity sha512-ofsAcKiUxQ8TY4sScgsGeR2vJIsfrzqvFb9GvJ5UdXDzl+MyYCaBj/FGzXuv7qE0aJcjWMILny1epqelnFlz8g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-regenerator@^7.8.7":
-  version "7.8.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz#5e46a0dca2bee1ad8285eb0527e6abc9c37672f8"
-  integrity sha512-TIg+gAl4Z0a3WmD3mbYSk+J9ZUH6n/Yc57rtKRnlA/7rcCvpekHXe0CMZHP1gYp7/KLe9GHTuIba0vXmls6drA==
+"@babel/plugin-transform-regenerator@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.4.tgz#2015e59d839074e76838de2159db421966fd8b63"
+  integrity sha512-3thAHwtor39A7C04XucbMg17RcZ3Qppfxr22wYzZNcVIkPHfpM9J0SO8zuCV6SZa265kxBJSrfKTvDCYqBFXGw==
   dependencies:
     regenerator-transform "^0.14.2"
 
-"@babel/plugin-transform-reserved-words@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.8.3.tgz#9a0635ac4e665d29b162837dd3cc50745dfdf1f5"
-  integrity sha512-mwMxcycN3omKFDjDQUl+8zyMsBfjRFr0Zn/64I41pmjv4NJuqcYlEtezwYtw9TFd9WR1vN5kiM+O0gMZzO6L0A==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-
-"@babel/plugin-transform-shorthand-properties@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.8.3.tgz#28545216e023a832d4d3a1185ed492bcfeac08c8"
-  integrity sha512-I9DI6Odg0JJwxCHzbzW08ggMdCezoWcuQRz3ptdudgwaHxTjxw5HgdFJmZIkIMlRymL6YiZcped4TTCB0JcC8w==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-
-"@babel/plugin-transform-spread@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.8.3.tgz#9c8ffe8170fdfb88b114ecb920b82fb6e95fe5e8"
-  integrity sha512-CkuTU9mbmAoFOI1tklFWYYbzX5qCIZVXPVy0jpXgGwkplCndQAa58s2jr66fTeQnA64bDox0HL4U56CFYoyC7g==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-
-"@babel/plugin-transform-sticky-regex@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.8.3.tgz#be7a1290f81dae767475452199e1f76d6175b100"
-  integrity sha512-9Spq0vGCD5Bb4Z/ZXXSK5wbbLFMG085qd2vhL1JYu1WcQ5bXqZBAYRzU1d+p79GcHs2szYv5pVQCX13QgldaWw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-regex" "^7.8.3"
-
-"@babel/plugin-transform-template-literals@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.8.3.tgz#7bfa4732b455ea6a43130adc0ba767ec0e402a80"
-  integrity sha512-820QBtykIQOLFT8NZOcTRJ1UNuztIELe4p9DCgvj4NK+PwluSJ49we7s9FB1HIGNIYT7wFUJ0ar2QpCDj0escQ==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-
-"@babel/plugin-transform-typeof-symbol@^7.8.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.8.4.tgz#ede4062315ce0aaf8a657a920858f1a2f35fc412"
-  integrity sha512-2QKyfjGdvuNfHsb7qnBBlKclbD4CfshH2KvDabiijLMGXPHJXGxtDzwIF7bQP+T0ysw8fYTtxPafgfs/c1Lrqg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-
-"@babel/plugin-transform-unicode-regex@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.8.3.tgz#0cef36e3ba73e5c57273effb182f46b91a1ecaad"
-  integrity sha512-+ufgJjYdmWfSQ+6NS9VGUR2ns8cjJjYbrbi11mZBTaWm+Fui/ncTLFF28Ei1okavY+xkojGr1eJxNsWYeA5aZw==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-
-"@babel/preset-env@7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.9.0.tgz#a5fc42480e950ae8f5d9f8f2bbc03f52722df3a8"
-  integrity sha512-712DeRXT6dyKAM/FMbQTV/FvRCms2hPCx+3weRjZ8iQVQWZejWWk1wwG6ViWMyqb/ouBbGOl5b6aCk0+j1NmsQ==
-  dependencies:
-    "@babel/compat-data" "^7.9.0"
-    "@babel/helper-compilation-targets" "^7.8.7"
-    "@babel/helper-module-imports" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-proposal-async-generator-functions" "^7.8.3"
-    "@babel/plugin-proposal-dynamic-import" "^7.8.3"
-    "@babel/plugin-proposal-json-strings" "^7.8.3"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.8.3"
-    "@babel/plugin-proposal-numeric-separator" "^7.8.3"
-    "@babel/plugin-proposal-object-rest-spread" "^7.9.0"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.8.3"
-    "@babel/plugin-proposal-optional-chaining" "^7.9.0"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.8.3"
+"@babel/plugin-transform-reserved-words@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.4.tgz#8f2682bcdcef9ed327e1b0861585d7013f8a54dd"
+  integrity sha512-hGsw1O6Rew1fkFbDImZIEqA8GoidwTAilwCyWqLBM9f+e/u/sQMQu7uX6dyokfOayRuuVfKOW4O7HvaBWM+JlQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
+"@babel/plugin-transform-runtime@7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.11.0.tgz#e27f78eb36f19448636e05c33c90fd9ad9b8bccf"
+  integrity sha512-LFEsP+t3wkYBlis8w6/kmnd6Kb1dxTd+wGJ8MlxTGzQo//ehtqlVL4S9DNUa53+dtPSQobN2CXx4d81FqC58cw==
+  dependencies:
+    "@babel/helper-module-imports" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    resolve "^1.8.1"
+    semver "^5.5.1"
+
+"@babel/plugin-transform-shorthand-properties@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.4.tgz#9fd25ec5cdd555bb7f473e5e6ee1c971eede4dd6"
+  integrity sha512-AC2K/t7o07KeTIxMoHneyX90v3zkm5cjHJEokrPEAGEy3UCp8sLKfnfOIGdZ194fyN4wfX/zZUWT9trJZ0qc+Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
+"@babel/plugin-transform-spread@^7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz#fa84d300f5e4f57752fe41a6d1b3c554f13f17cc"
+  integrity sha512-UwQYGOqIdQJe4aWNyS7noqAnN2VbaczPLiEtln+zPowRNlD+79w3oi2TWfYe0eZgd+gjZCbsydN7lzWysDt+gw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.11.0"
+
+"@babel/plugin-transform-sticky-regex@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz#8f3889ee8657581130a29d9cc91d7c73b7c4a28d"
+  integrity sha512-Ddy3QZfIbEV0VYcVtFDCjeE4xwVTJWTmUtorAJkn6u/92Z/nWJNV+mILyqHKrUxXYKA2EoCilgoPePymKL4DvQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-regex" "^7.10.4"
+
+"@babel/plugin-transform-template-literals@^7.10.4":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.5.tgz#78bc5d626a6642db3312d9d0f001f5e7639fde8c"
+  integrity sha512-V/lnPGIb+KT12OQikDvgSuesRX14ck5FfJXt6+tXhdkJ+Vsd0lDCVtF6jcB4rNClYFzaB2jusZ+lNISDk2mMMw==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
+
+"@babel/plugin-transform-typeof-symbol@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.4.tgz#9509f1a7eec31c4edbffe137c16cc33ff0bc5bfc"
+  integrity sha512-QqNgYwuuW0y0H+kUE/GWSR45t/ccRhe14Fs/4ZRouNNQsyd4o3PG4OtHiIrepbM2WKUBDAXKCAK/Lk4VhzTaGA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
+"@babel/plugin-transform-unicode-escapes@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.4.tgz#feae523391c7651ddac115dae0a9d06857892007"
+  integrity sha512-y5XJ9waMti2J+e7ij20e+aH+fho7Wb7W8rNuu72aKRwCHFqQdhkdU2lo3uZ9tQuboEJcUFayXdARhcxLQ3+6Fg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
+"@babel/plugin-transform-unicode-regex@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.4.tgz#e56d71f9282fac6db09c82742055576d5e6d80a8"
+  integrity sha512-wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
+
+"@babel/preset-env@7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.11.0.tgz#860ee38f2ce17ad60480c2021ba9689393efb796"
+  integrity sha512-2u1/k7rG/gTh02dylX2kL3S0IJNF+J6bfDSp4DI2Ma8QN6Y9x9pmAax59fsCk6QUQG0yqH47yJWA+u1I1LccAg==
+  dependencies:
+    "@babel/compat-data" "^7.11.0"
+    "@babel/helper-compilation-targets" "^7.10.4"
+    "@babel/helper-module-imports" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-proposal-async-generator-functions" "^7.10.4"
+    "@babel/plugin-proposal-class-properties" "^7.10.4"
+    "@babel/plugin-proposal-dynamic-import" "^7.10.4"
+    "@babel/plugin-proposal-export-namespace-from" "^7.10.4"
+    "@babel/plugin-proposal-json-strings" "^7.10.4"
+    "@babel/plugin-proposal-logical-assignment-operators" "^7.11.0"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.10.4"
+    "@babel/plugin-proposal-numeric-separator" "^7.10.4"
+    "@babel/plugin-proposal-object-rest-spread" "^7.11.0"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.10.4"
+    "@babel/plugin-proposal-optional-chaining" "^7.11.0"
+    "@babel/plugin-proposal-private-methods" "^7.10.4"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.10.4"
     "@babel/plugin-syntax-async-generators" "^7.8.0"
+    "@babel/plugin-syntax-class-properties" "^7.10.4"
     "@babel/plugin-syntax-dynamic-import" "^7.8.0"
+    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
     "@babel/plugin-syntax-json-strings" "^7.8.0"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
-    "@babel/plugin-syntax-numeric-separator" "^7.8.0"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
     "@babel/plugin-syntax-optional-chaining" "^7.8.0"
-    "@babel/plugin-syntax-top-level-await" "^7.8.3"
-    "@babel/plugin-transform-arrow-functions" "^7.8.3"
-    "@babel/plugin-transform-async-to-generator" "^7.8.3"
-    "@babel/plugin-transform-block-scoped-functions" "^7.8.3"
-    "@babel/plugin-transform-block-scoping" "^7.8.3"
-    "@babel/plugin-transform-classes" "^7.9.0"
-    "@babel/plugin-transform-computed-properties" "^7.8.3"
-    "@babel/plugin-transform-destructuring" "^7.8.3"
-    "@babel/plugin-transform-dotall-regex" "^7.8.3"
-    "@babel/plugin-transform-duplicate-keys" "^7.8.3"
-    "@babel/plugin-transform-exponentiation-operator" "^7.8.3"
-    "@babel/plugin-transform-for-of" "^7.9.0"
-    "@babel/plugin-transform-function-name" "^7.8.3"
-    "@babel/plugin-transform-literals" "^7.8.3"
-    "@babel/plugin-transform-member-expression-literals" "^7.8.3"
-    "@babel/plugin-transform-modules-amd" "^7.9.0"
-    "@babel/plugin-transform-modules-commonjs" "^7.9.0"
-    "@babel/plugin-transform-modules-systemjs" "^7.9.0"
-    "@babel/plugin-transform-modules-umd" "^7.9.0"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.8.3"
-    "@babel/plugin-transform-new-target" "^7.8.3"
-    "@babel/plugin-transform-object-super" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.8.7"
-    "@babel/plugin-transform-property-literals" "^7.8.3"
-    "@babel/plugin-transform-regenerator" "^7.8.7"
-    "@babel/plugin-transform-reserved-words" "^7.8.3"
-    "@babel/plugin-transform-shorthand-properties" "^7.8.3"
-    "@babel/plugin-transform-spread" "^7.8.3"
-    "@babel/plugin-transform-sticky-regex" "^7.8.3"
-    "@babel/plugin-transform-template-literals" "^7.8.3"
-    "@babel/plugin-transform-typeof-symbol" "^7.8.4"
-    "@babel/plugin-transform-unicode-regex" "^7.8.3"
+    "@babel/plugin-syntax-top-level-await" "^7.10.4"
+    "@babel/plugin-transform-arrow-functions" "^7.10.4"
+    "@babel/plugin-transform-async-to-generator" "^7.10.4"
+    "@babel/plugin-transform-block-scoped-functions" "^7.10.4"
+    "@babel/plugin-transform-block-scoping" "^7.10.4"
+    "@babel/plugin-transform-classes" "^7.10.4"
+    "@babel/plugin-transform-computed-properties" "^7.10.4"
+    "@babel/plugin-transform-destructuring" "^7.10.4"
+    "@babel/plugin-transform-dotall-regex" "^7.10.4"
+    "@babel/plugin-transform-duplicate-keys" "^7.10.4"
+    "@babel/plugin-transform-exponentiation-operator" "^7.10.4"
+    "@babel/plugin-transform-for-of" "^7.10.4"
+    "@babel/plugin-transform-function-name" "^7.10.4"
+    "@babel/plugin-transform-literals" "^7.10.4"
+    "@babel/plugin-transform-member-expression-literals" "^7.10.4"
+    "@babel/plugin-transform-modules-amd" "^7.10.4"
+    "@babel/plugin-transform-modules-commonjs" "^7.10.4"
+    "@babel/plugin-transform-modules-systemjs" "^7.10.4"
+    "@babel/plugin-transform-modules-umd" "^7.10.4"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.10.4"
+    "@babel/plugin-transform-new-target" "^7.10.4"
+    "@babel/plugin-transform-object-super" "^7.10.4"
+    "@babel/plugin-transform-parameters" "^7.10.4"
+    "@babel/plugin-transform-property-literals" "^7.10.4"
+    "@babel/plugin-transform-regenerator" "^7.10.4"
+    "@babel/plugin-transform-reserved-words" "^7.10.4"
+    "@babel/plugin-transform-shorthand-properties" "^7.10.4"
+    "@babel/plugin-transform-spread" "^7.11.0"
+    "@babel/plugin-transform-sticky-regex" "^7.10.4"
+    "@babel/plugin-transform-template-literals" "^7.10.4"
+    "@babel/plugin-transform-typeof-symbol" "^7.10.4"
+    "@babel/plugin-transform-unicode-escapes" "^7.10.4"
+    "@babel/plugin-transform-unicode-regex" "^7.10.4"
     "@babel/preset-modules" "^0.1.3"
-    "@babel/types" "^7.9.0"
-    browserslist "^4.9.1"
+    "@babel/types" "^7.11.0"
+    browserslist "^4.12.0"
     core-js-compat "^3.6.2"
     invariant "^2.2.2"
     levenary "^1.1.1"
@@ -1193,20 +1351,12 @@
     "@babel/types" "^7.4.4"
     esutils "^2.0.2"
 
-"@babel/runtime-corejs3@^7.7.4":
-  version "7.7.6"
-  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.7.6.tgz#5b1044ea11b659d288f77190e19c62da959ed9a3"
-  integrity sha512-NrRUehqG0sMSCaP+0XV/vOvvjNl4BQOWq3Qys1Q2KTEm5tGMo9h0dHnIzeKerj0a7SIB8LP5kYg/T1raE3FoKQ==
-  dependencies:
-    core-js-pure "^3.0.0"
-    regenerator-runtime "^0.13.2"
-
-"@babel/runtime@^7.7.4":
-  version "7.7.6"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.7.6.tgz#d18c511121aff1b4f2cd1d452f1bac9601dd830f"
-  integrity sha512-BWAJxpNVa0QlE5gZdWjSxXtemZyZ9RmrmVozxt3NUXeZhVIJ5ANyqmMc0JDrivBZyxUuQvFxlvH4OWWOogGfUw==
+"@babel/runtime@7.11.2":
+  version "7.11.2"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.11.2.tgz#f549c13c754cc40b87644b9fa9f09a6a95fe0736"
+  integrity sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==
   dependencies:
-    regenerator-runtime "^0.13.2"
+    regenerator-runtime "^0.13.4"
 
 "@babel/runtime@^7.8.4":
   version "7.9.6"
@@ -1215,14 +1365,14 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/template@7.8.6", "@babel/template@^7.8.6":
-  version "7.8.6"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz#86b22af15f828dfb086474f964dcc3e39c43ce2b"
-  integrity sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==
+"@babel/template@7.10.4", "@babel/template@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz#3251996c4200ebc71d1a8fc405fba940f36ba278"
+  integrity sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==
   dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/parser" "^7.8.6"
-    "@babel/types" "^7.8.6"
+    "@babel/code-frame" "^7.10.4"
+    "@babel/parser" "^7.10.4"
+    "@babel/types" "^7.10.4"
 
 "@babel/template@^7.10.1":
   version "7.10.1"
@@ -1233,15 +1383,6 @@
     "@babel/parser" "^7.10.1"
     "@babel/types" "^7.10.1"
 
-"@babel/template@^7.4.0", "@babel/template@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.7.4.tgz#428a7d9eecffe27deac0a98e23bf8e3675d2a77b"
-  integrity sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@babel/parser" "^7.7.4"
-    "@babel/types" "^7.7.4"
-
 "@babel/template@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.3.tgz#e02ad04fe262a657809327f578056ca15fd4d1b8"
@@ -1266,20 +1407,20 @@
     globals "^11.1.0"
     lodash "^4.17.13"
 
-"@babel/traverse@^7.4.3", "@babel/traverse@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.7.4.tgz#9c1e7c60fb679fe4fcfaa42500833333c2058558"
-  integrity sha512-P1L58hQyupn8+ezVA2z5KBm4/Zr4lCC8dwKCMYzsa5jFMDMQAzaBNy9W5VjB+KAmBjb40U7a/H6ao+Xo+9saIw==
-  dependencies:
-    "@babel/code-frame" "^7.5.5"
-    "@babel/generator" "^7.7.4"
-    "@babel/helper-function-name" "^7.7.4"
-    "@babel/helper-split-export-declaration" "^7.7.4"
-    "@babel/parser" "^7.7.4"
-    "@babel/types" "^7.7.4"
+"@babel/traverse@^7.10.4", "@babel/traverse@^7.11.0":
+  version "7.11.5"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.11.5.tgz#be777b93b518eb6d76ee2e1ea1d143daa11e61c3"
+  integrity sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==
+  dependencies:
+    "@babel/code-frame" "^7.10.4"
+    "@babel/generator" "^7.11.5"
+    "@babel/helper-function-name" "^7.10.4"
+    "@babel/helper-split-export-declaration" "^7.11.0"
+    "@babel/parser" "^7.11.5"
+    "@babel/types" "^7.11.5"
     debug "^4.1.0"
     globals "^11.1.0"
-    lodash "^4.17.13"
+    lodash "^4.17.19"
 
 "@babel/traverse@^7.8.3", "@babel/traverse@^7.8.4":
   version "7.8.4"
@@ -1296,21 +1437,6 @@
     globals "^11.1.0"
     lodash "^4.17.13"
 
-"@babel/traverse@^7.9.0", "@babel/traverse@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.6.tgz#5540d7577697bf619cc57b92aa0f1c231a94f442"
-  integrity sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg==
-  dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/generator" "^7.9.6"
-    "@babel/helper-function-name" "^7.9.5"
-    "@babel/helper-split-export-declaration" "^7.8.3"
-    "@babel/parser" "^7.9.6"
-    "@babel/types" "^7.9.6"
-    debug "^4.1.0"
-    globals "^11.1.0"
-    lodash "^4.17.13"
-
 "@babel/types@^7.10.1", "@babel/types@^7.10.2":
   version "7.10.2"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.10.2.tgz#30283be31cad0dbf6fb00bd40641ca0ea675172d"
@@ -1320,16 +1446,16 @@
     lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
-"@babel/types@^7.4.0", "@babel/types@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.7.4.tgz#516570d539e44ddf308c07569c258ff94fde9193"
-  integrity sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==
+"@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0", "@babel/types@^7.11.5":
+  version "7.11.5"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.11.5.tgz#d9de577d01252d77c6800cee039ee64faf75662d"
+  integrity sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==
   dependencies:
-    esutils "^2.0.2"
-    lodash "^4.17.13"
+    "@babel/helper-validator-identifier" "^7.10.4"
+    lodash "^4.17.19"
     to-fast-properties "^2.0.0"
 
-"@babel/types@^7.4.4", "@babel/types@^7.8.6", "@babel/types@^7.9.0", "@babel/types@^7.9.5", "@babel/types@^7.9.6":
+"@babel/types@^7.4.4":
   version "7.9.6"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.9.6.tgz#2c5502b427251e9de1bd2dff95add646d95cc9f7"
   integrity sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==
@@ -1352,73 +1478,103 @@
   resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd"
   integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==
 
-"@jsdevtools/coverage-istanbul-loader@3.0.3":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@jsdevtools/coverage-istanbul-loader/-/coverage-istanbul-loader-3.0.3.tgz#102e414b02ae2f0b3c7fd45a705601e1fd4867c5"
-  integrity sha512-TAdNkeGB5Fe4Og+ZkAr1Kvn9by2sfL44IAHFtxlh1BA1XJ5cLpO9iSNki5opWESv3l3vSHsZ9BNKuqFKbEbFaA==
+"@jsdevtools/coverage-istanbul-loader@3.0.5":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@jsdevtools/coverage-istanbul-loader/-/coverage-istanbul-loader-3.0.5.tgz#2a4bc65d0271df8d4435982db4af35d81754ee26"
+  integrity sha512-EUCPEkaRPvmHjWAAZkWMT7JDzpw7FKB00WTISaiXsbNOd5hCHg77XLA8sLYLFDo1zepYLo2w7GstN8YBqRXZfA==
   dependencies:
     convert-source-map "^1.7.0"
-    istanbul-lib-instrument "^4.0.1"
-    loader-utils "^1.4.0"
+    istanbul-lib-instrument "^4.0.3"
+    loader-utils "^2.0.0"
     merge-source-map "^1.1.0"
-    schema-utils "^2.6.4"
+    schema-utils "^2.7.0"
 
-"@ngtools/webpack@9.1.4":
-  version "9.1.4"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-9.1.4.tgz#8866d8461969662d0860d857aafa5a706877f85d"
-  integrity sha512-CDlQzMnWraxf/dT3G5L+0N0VniWHWdzjLRP8pWBoyV0xlzWS1yL/lj8Mas2jEIuaUxZ8bi29mE7xa8prqewtBQ==
+"@ngtools/webpack@10.1.3":
+  version "10.1.3"
+  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-10.1.3.tgz#f65c591daab7ed0c3372a115c6a90eba701a2ca1"
+  integrity sha512-wEg3hY0u+HMAIypClOVnpjYaNwBp+yY0pEb1yNc3Id8bBlw76Y+wk+kGplESelkNQKlfwKDaMFk+7EjGkOrmng==
   dependencies:
-    "@angular-devkit/core" "9.1.4"
-    enhanced-resolve "4.1.1"
-    rxjs "6.5.4"
+    "@angular-devkit/core" "10.1.3"
+    enhanced-resolve "4.3.0"
     webpack-sources "1.4.3"
 
-"@nguniversal/builders@^9.0.2":
-  version "9.0.2"
-  resolved "https://registry.yarnpkg.com/@nguniversal/builders/-/builders-9.0.2.tgz#10b2196f1587b41fa1369b5127ef2998ed1d11cf"
-  integrity sha512-k7TQktIdC/07KlUszgJjtpyuJArHE3fpiCg2wl4xXGdy3+xj9SpgzcgUhVCrcagjIBux7uTLcOqt12Zk4R43Ig==
+"@nguniversal/builders@~10.1.0":
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/@nguniversal/builders/-/builders-10.1.0.tgz#1097bec29254e399117f0d827e73ef8af888f221"
+  integrity sha512-4GeQ9S7fVMRbj5bwjCE9VVstrYW3MFrqyIwFcbI/l5Oq1kzWFQ3B6hDX1CVEKQYiofgIi1OWDWAhr/ryrQj1yg==
   dependencies:
-    "@angular-devkit/architect" "^0.900.6"
-    "@angular-devkit/core" "^9.0.6"
+    "@angular-devkit/architect" "^0.1001.0"
+    "@angular-devkit/core" "^10.1.0"
     browser-sync "^2.26.7"
     guess-parser "^0.4.12"
     http-proxy-middleware "^1.0.0"
-    rxjs "^6.5.3"
+    rxjs "^6.5.5"
     tree-kill "^1.2.1"
 
-"@nguniversal/common@9.0.1":
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/@nguniversal/common/-/common-9.0.1.tgz#f200003ef5e98d7bf8d54d43b2d64b163d5042da"
-  integrity sha512-AprW7oREmywDudrBI1auy4lB6AQFKHLeebdY7vAXjviIEzBDm9Zd1Z59SqFtp+H4Pce8R7tQ3zoXY1n7azCigg==
+"@nguniversal/common@10.1.0":
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/@nguniversal/common/-/common-10.1.0.tgz#7104f598b2a6eee078dfc1e0309cb9ea261e7da7"
+  integrity sha512-AIfLORs+LLHx9d+8kRNDq+GZj/2ToyXgg5Boi2RfgUhV5Rywey082XRlFmPwyVHxltYJzoMPeNWxzV6hrSMCzA==
+  dependencies:
+    tslib "^2.0.0"
 
-"@nguniversal/express-engine@~9.0.1":
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/@nguniversal/express-engine/-/express-engine-9.0.1.tgz#109078bda23093dbdfec7a722c360a4e394931fb"
-  integrity sha512-uICu/CVrKuRYKUhpn91tRoERRhorDH038zyUsQt3yqsKV5BXyclr+H0lHh94dXyi+W0RKmksvzGNshwc4IWnUA==
+"@nguniversal/express-engine@~10.1.0":
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/@nguniversal/express-engine/-/express-engine-10.1.0.tgz#b1595751eb6acfa02b65e25e9c9ffbe66baab2f5"
+  integrity sha512-UYQB8662Qnx9Y2TblZmC8QbfAZtiCE6OeLNdwWIz8rVY9jhWi4P5SFb0slvcPMyPL5JAb+FHHOKjsH1NJztsCQ==
   dependencies:
-    "@nguniversal/common" "9.0.1"
+    "@nguniversal/common" "10.1.0"
+    tslib "^2.0.0"
 
-"@schematics/angular@9.1.4":
-  version "9.1.4"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-9.1.4.tgz#01908a9b8c97db204fb1395e202aebd38b789bad"
-  integrity sha512-7nbiYBRgXc+f0sa5iXTcF6/VMy/Xq0wyKKnDFiLCb2aFYR7EXRHWF2GuwDIg2bvFugLuCBDoNnXeddLE1TXGWg==
+"@nodelib/fs.scandir@2.1.3":
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b"
+  integrity sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==
   dependencies:
-    "@angular-devkit/core" "9.1.4"
-    "@angular-devkit/schematics" "9.1.4"
+    "@nodelib/fs.stat" "2.0.3"
+    run-parallel "^1.1.9"
 
-"@schematics/update@0.901.4":
-  version "0.901.4"
-  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.901.4.tgz#665214fb6daec3162d428aead5fb4937a4508dd3"
-  integrity sha512-jCtZY2Fbj502gKN5gdu1brnRy/ssyzTrWm69Ty73V+t8uL7nLr+/hny/VBJ8CiQnKQvxcgVl1xgvI1cXzpysVA==
+"@nodelib/fs.stat@2.0.3", "@nodelib/fs.stat@^2.0.2":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz#34dc5f4cabbc720f4e60f75a747e7ecd6c175bd3"
+  integrity sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==
+
+"@nodelib/fs.walk@^1.2.3":
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz#011b9202a70a6366e436ca5c065844528ab04976"
+  integrity sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==
+  dependencies:
+    "@nodelib/fs.scandir" "2.1.3"
+    fastq "^1.6.0"
+
+"@npmcli/move-file@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.0.1.tgz#de103070dac0f48ce49cf6693c23af59c0f70464"
+  integrity sha512-Uv6h1sT+0DrblvIrolFtbvM1FgWm+/sy4B3pvLp67Zys+thcukzS5ekn7HsZFGpWP4Q3fYJCljbWQE/XivMRLw==
+  dependencies:
+    mkdirp "^1.0.4"
+
+"@schematics/angular@10.1.3":
+  version "10.1.3"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-10.1.3.tgz#8b39f2d934043c68b55495bc6e44705c6fa7ef8c"
+  integrity sha512-X3tNnpfF/jkl1KcyCC8PaOYogQlTZ9s7Yuz0va0DAVOptIqorpf8e6+lY0PPLKshaK9TSiFUcQ8SYYnjAVKcdA==
+  dependencies:
+    "@angular-devkit/core" "10.1.3"
+    "@angular-devkit/schematics" "10.1.3"
+    jsonc-parser "2.3.0"
+
+"@schematics/update@0.1001.3":
+  version "0.1001.3"
+  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.1001.3.tgz#7b8e2c166948c096cb46d9d7c712b3f9fac044e0"
+  integrity sha512-ah4YHjEXACmpX0i3cAn5OguH5S430HD+zbxlMu4AC93A8W52ll97vqvUVF8NLZ6RKcOV/8tXmzgzvJDe07i8yQ==
   dependencies:
-    "@angular-devkit/core" "9.1.4"
-    "@angular-devkit/schematics" "9.1.4"
+    "@angular-devkit/core" "10.1.3"
+    "@angular-devkit/schematics" "10.1.3"
     "@yarnpkg/lockfile" "1.1.0"
     ini "1.3.5"
     npm-package-arg "^8.0.0"
     pacote "9.5.12"
-    rxjs "6.5.4"
-    semver "7.1.3"
+    semver "7.3.2"
     semver-intersect "1.4.0"
 
 "@types/angular-animate@1.5.10":
@@ -1428,31 +1584,31 @@
   dependencies:
     "@types/angular" "*"
 
-"@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"
-  integrity sha512-rZRxzmeUJVvNS7uWFEFyK5f3/rXbDWhL7y3StHr5cZFgSN1BEfGEByEr/QKwrbPs5rY+kQiFLBUTcvMrzrpekg==
+"@types/angular-mocks@1.7.0":
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/@types/angular-mocks/-/angular-mocks-1.7.0.tgz#310d999a3c47c10ecd8eef466b5861df84799429"
+  integrity sha512-MeT5vxWBx4Ny5/sNZJjpZdv4K2KGwqQYiRQQZctan1TTaNyiVlFRYbcmheolhM4KKbTWmoxTVeuvGzniTDg1kw==
   dependencies:
     "@types/angular" "*"
 
-"@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"
-  integrity sha512-dpP5DHIape+lMlLPzfOrkpkgjiDrT2lYcPY2Wrk2FTUEBlOZkR1sM+I8oR1S/ZuKCDzTxOi0UmLg+0MG7zcFyA==
+"@types/angular-resource@1.5.16":
+  version "1.5.16"
+  resolved "https://registry.yarnpkg.com/@types/angular-resource/-/angular-resource-1.5.16.tgz#e32faef37c9e0557f5042b081746a666118af547"
+  integrity sha512-EJGp5Qxa+w2AHGW8Y+UUsYTTF+Kh68sFhI9YzXzM7n8pB91VGWynELQ/R3rTVE2xtxyiu+F2WU2mOQC4NUvWrA==
   dependencies:
     "@types/angular" "*"
 
-"@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"
-  integrity sha512-/jvK2s1rhUaOVimYpTEg9cj9IYL+Toq05FlBYDw/hMrZNb2SrkRd2DO3Lus9SZy9URs661gtM/NyQwbBUUWWKw==
+"@types/angular-route@1.7.1":
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/@types/angular-route/-/angular-route-1.7.1.tgz#0f545189ff51afc74afbcdde17b56a277963d51b"
+  integrity sha512-5N5nfUYTEf5InmrhGU5qtvBOHOq6uvv1olJR5fd6Eq5YFT+cdjrr0nklBaFfulAsF0Cd8y7IQipgaUSwWsATYQ==
   dependencies:
     "@types/angular" "*"
 
-"@types/angular@*", "@types/angular@1.6.47":
-  version "1.6.47"
-  resolved "https://registry.yarnpkg.com/@types/angular/-/angular-1.6.47.tgz#f7a31279a02c0892ed9aa76aae2da1b17791bacd"
-  integrity sha512-nHmD3F1eDX77z6n4KBuRIRCtl+AYUDPasS6gpF3+W4gNZsW4krCsDNLrONR4kJBqRf5I2on/FffKwFrBJyX6LA==
+"@types/angular@*", "@types/angular@1.7.3":
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/@types/angular/-/angular-1.7.3.tgz#138c2f2f688e9dcb413c6052d9483d773ce7f627"
+  integrity sha512-rr40P9yHTlLuY6y+PUfwHeoBWO8uEJTazcs89o83fheyH/b9OZW7p7EsvFMriCPam3p6VSD57zkgn+nAQCvfUw==
 
 "@types/body-parser@*":
   version "1.19.0"
@@ -1492,13 +1648,14 @@
     "@types/node" "*"
     "@types/range-parser" "*"
 
-"@types/express@^4.17.0":
-  version "4.17.3"
-  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.3.tgz#38e4458ce2067873b09a73908df488870c303bd9"
-  integrity sha512-I8cGRJj3pyOLs/HndoP+25vOqhqWkAZsWMEmq1qXy/b/M3ppufecUwaK2/TVDVxcV61/iSdhykUjQQ2DLSrTdg==
+"@types/express@^4.17.8":
+  version "4.17.8"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.8.tgz#3df4293293317e61c60137d273a2e96cd8d5f27a"
+  integrity sha512-wLhcKh3PMlyA2cNAB9sjM1BntnhPMiM0JOBwPBqttjHev2428MLEB4AYVN+d8s2iyCVZac+o41Pflm/ZH5vLXQ==
   dependencies:
     "@types/body-parser" "*"
     "@types/express-serve-static-core" "*"
+    "@types/qs" "*"
     "@types/serve-static" "*"
 
 "@types/glob@^7.1.1":
@@ -1533,10 +1690,10 @@
   dependencies:
     "@types/jasmine" "*"
 
-"@types/jquery@3.3.28":
-  version "3.3.28"
-  resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.3.28.tgz#e4e4e1a72a890b9d5fce34019d961265dd1394c4"
-  integrity sha512-6+0asQBU38H5kdoKvxVGE7fY8JREBgQsxONw0na0noV9D3JLN2+odBPKkTvRcLW20xSNiP8BH0nyl+8PcIHYNw==
+"@types/jquery@3.5.1":
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.5.1.tgz#cebb057acf5071c40e439f30e840c57a30d406c3"
+  integrity sha512-Tyctjh56U7eX2b9udu3wG853ASYP0uagChJcQJXLUXEU6C/JiW5qt5dl8ao01VRj1i5pgXPAf8f1mq4+FDLRQg==
   dependencies:
     "@types/sizzle" "*"
 
@@ -1549,6 +1706,11 @@
     "@types/parse5" "*"
     "@types/tough-cookie" "*"
 
+"@types/json-schema@^7.0.5":
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0"
+  integrity sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw==
+
 "@types/mime@*":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.0.tgz#5a7306e367c539b9f6543499de8dd519fac37a8b"
@@ -1596,6 +1758,11 @@
   resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.2.tgz#690a1475b84f2a884fd07cd797c00f5f31356ea8"
   integrity sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw==
 
+"@types/qs@*":
+  version "6.9.5"
+  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.5.tgz#434711bdd49eb5ee69d90c1d67c354a9a8ecb18b"
+  integrity sha512-/JHkVHtx/REVG0VVToGRGH2+23hsYLHdyG+GrvoUGlGAd0ErauXDyvHtRI/7H7mzLm+tBCKA7pfcpkQ1lf58iQ==
+
 "@types/range-parser@*":
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.3.tgz#7ee330ba7caafb98090bece86a5ee44115904c2c"
@@ -1643,156 +1810,155 @@
   dependencies:
     "@types/node" "*"
 
-"@webassemblyjs/ast@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359"
-  integrity sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==
+"@webassemblyjs/ast@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964"
+  integrity sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==
   dependencies:
-    "@webassemblyjs/helper-module-context" "1.8.5"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
-    "@webassemblyjs/wast-parser" "1.8.5"
+    "@webassemblyjs/helper-module-context" "1.9.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
+    "@webassemblyjs/wast-parser" "1.9.0"
 
-"@webassemblyjs/floating-point-hex-parser@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz#1ba926a2923613edce496fd5b02e8ce8a5f49721"
-  integrity sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==
+"@webassemblyjs/floating-point-hex-parser@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz#3c3d3b271bddfc84deb00f71344438311d52ffb4"
+  integrity sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==
 
-"@webassemblyjs/helper-api-error@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz#c49dad22f645227c5edb610bdb9697f1aab721f7"
-  integrity sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==
+"@webassemblyjs/helper-api-error@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz#203f676e333b96c9da2eeab3ccef33c45928b6a2"
+  integrity sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==
 
-"@webassemblyjs/helper-buffer@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz#fea93e429863dd5e4338555f42292385a653f204"
-  integrity sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==
+"@webassemblyjs/helper-buffer@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz#a1442d269c5feb23fcbc9ef759dac3547f29de00"
+  integrity sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==
 
-"@webassemblyjs/helper-code-frame@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz#9a740ff48e3faa3022b1dff54423df9aa293c25e"
-  integrity sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==
+"@webassemblyjs/helper-code-frame@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz#647f8892cd2043a82ac0c8c5e75c36f1d9159f27"
+  integrity sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==
   dependencies:
-    "@webassemblyjs/wast-printer" "1.8.5"
+    "@webassemblyjs/wast-printer" "1.9.0"
 
-"@webassemblyjs/helper-fsm@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz#ba0b7d3b3f7e4733da6059c9332275d860702452"
-  integrity sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==
+"@webassemblyjs/helper-fsm@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz#c05256b71244214671f4b08ec108ad63b70eddb8"
+  integrity sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw==
 
-"@webassemblyjs/helper-module-context@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz#def4b9927b0101dc8cbbd8d1edb5b7b9c82eb245"
-  integrity sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==
+"@webassemblyjs/helper-module-context@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz#25d8884b76839871a08a6c6f806c3979ef712f07"
+  integrity sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==
   dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    mamacro "^0.0.3"
+    "@webassemblyjs/ast" "1.9.0"
 
-"@webassemblyjs/helper-wasm-bytecode@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz#537a750eddf5c1e932f3744206551c91c1b93e61"
-  integrity sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==
+"@webassemblyjs/helper-wasm-bytecode@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz#4fed8beac9b8c14f8c58b70d124d549dd1fe5790"
+  integrity sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==
 
-"@webassemblyjs/helper-wasm-section@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz#74ca6a6bcbe19e50a3b6b462847e69503e6bfcbf"
-  integrity sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==
+"@webassemblyjs/helper-wasm-section@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz#5a4138d5a6292ba18b04c5ae49717e4167965346"
+  integrity sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==
   dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-buffer" "1.8.5"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
-    "@webassemblyjs/wasm-gen" "1.8.5"
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/helper-buffer" "1.9.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
+    "@webassemblyjs/wasm-gen" "1.9.0"
 
-"@webassemblyjs/ieee754@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz#712329dbef240f36bf57bd2f7b8fb9bf4154421e"
-  integrity sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==
+"@webassemblyjs/ieee754@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz#15c7a0fbaae83fb26143bbacf6d6df1702ad39e4"
+  integrity sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==
   dependencies:
     "@xtuc/ieee754" "^1.2.0"
 
-"@webassemblyjs/leb128@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.8.5.tgz#044edeb34ea679f3e04cd4fd9824d5e35767ae10"
-  integrity sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==
+"@webassemblyjs/leb128@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.9.0.tgz#f19ca0b76a6dc55623a09cffa769e838fa1e1c95"
+  integrity sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==
   dependencies:
     "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/utf8@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.8.5.tgz#a8bf3b5d8ffe986c7c1e373ccbdc2a0915f0cedc"
-  integrity sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==
+"@webassemblyjs/utf8@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.9.0.tgz#04d33b636f78e6a6813227e82402f7637b6229ab"
+  integrity sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==
 
-"@webassemblyjs/wasm-edit@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz#962da12aa5acc1c131c81c4232991c82ce56e01a"
-  integrity sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-buffer" "1.8.5"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
-    "@webassemblyjs/helper-wasm-section" "1.8.5"
-    "@webassemblyjs/wasm-gen" "1.8.5"
-    "@webassemblyjs/wasm-opt" "1.8.5"
-    "@webassemblyjs/wasm-parser" "1.8.5"
-    "@webassemblyjs/wast-printer" "1.8.5"
-
-"@webassemblyjs/wasm-gen@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz#54840766c2c1002eb64ed1abe720aded714f98bc"
-  integrity sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==
+"@webassemblyjs/wasm-edit@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz#3fe6d79d3f0f922183aa86002c42dd256cfee9cf"
+  integrity sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==
+  dependencies:
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/helper-buffer" "1.9.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
+    "@webassemblyjs/helper-wasm-section" "1.9.0"
+    "@webassemblyjs/wasm-gen" "1.9.0"
+    "@webassemblyjs/wasm-opt" "1.9.0"
+    "@webassemblyjs/wasm-parser" "1.9.0"
+    "@webassemblyjs/wast-printer" "1.9.0"
+
+"@webassemblyjs/wasm-gen@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz#50bc70ec68ded8e2763b01a1418bf43491a7a49c"
+  integrity sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==
   dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
-    "@webassemblyjs/ieee754" "1.8.5"
-    "@webassemblyjs/leb128" "1.8.5"
-    "@webassemblyjs/utf8" "1.8.5"
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
+    "@webassemblyjs/ieee754" "1.9.0"
+    "@webassemblyjs/leb128" "1.9.0"
+    "@webassemblyjs/utf8" "1.9.0"
 
-"@webassemblyjs/wasm-opt@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz#b24d9f6ba50394af1349f510afa8ffcb8a63d264"
-  integrity sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==
+"@webassemblyjs/wasm-opt@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz#2211181e5b31326443cc8112eb9f0b9028721a61"
+  integrity sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==
   dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-buffer" "1.8.5"
-    "@webassemblyjs/wasm-gen" "1.8.5"
-    "@webassemblyjs/wasm-parser" "1.8.5"
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/helper-buffer" "1.9.0"
+    "@webassemblyjs/wasm-gen" "1.9.0"
+    "@webassemblyjs/wasm-parser" "1.9.0"
 
-"@webassemblyjs/wasm-parser@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz#21576f0ec88b91427357b8536383668ef7c66b8d"
-  integrity sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==
+"@webassemblyjs/wasm-parser@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz#9d48e44826df4a6598294aa6c87469d642fff65e"
+  integrity sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==
   dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-api-error" "1.8.5"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
-    "@webassemblyjs/ieee754" "1.8.5"
-    "@webassemblyjs/leb128" "1.8.5"
-    "@webassemblyjs/utf8" "1.8.5"
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/helper-api-error" "1.9.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
+    "@webassemblyjs/ieee754" "1.9.0"
+    "@webassemblyjs/leb128" "1.9.0"
+    "@webassemblyjs/utf8" "1.9.0"
 
-"@webassemblyjs/wast-parser@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz#e10eecd542d0e7bd394f6827c49f3df6d4eefb8c"
-  integrity sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/floating-point-hex-parser" "1.8.5"
-    "@webassemblyjs/helper-api-error" "1.8.5"
-    "@webassemblyjs/helper-code-frame" "1.8.5"
-    "@webassemblyjs/helper-fsm" "1.8.5"
+"@webassemblyjs/wast-parser@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz#3031115d79ac5bd261556cecc3fa90a3ef451914"
+  integrity sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==
+  dependencies:
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/floating-point-hex-parser" "1.9.0"
+    "@webassemblyjs/helper-api-error" "1.9.0"
+    "@webassemblyjs/helper-code-frame" "1.9.0"
+    "@webassemblyjs/helper-fsm" "1.9.0"
     "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/wast-printer@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz#114bbc481fd10ca0e23b3560fa812748b0bae5bc"
-  integrity sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==
+"@webassemblyjs/wast-printer@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz#4935d54c85fef637b00ce9f52377451d00d47899"
+  integrity sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==
   dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/wast-parser" "1.8.5"
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/wast-parser" "1.9.0"
     "@xtuc/long" "4.2.2"
 
-"@webcomponents/custom-elements@^1.4.1":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/@webcomponents/custom-elements/-/custom-elements-1.4.1.tgz#9803aaa2286a13a4ba200a7a2ea767871598eb60"
-  integrity sha512-vNCS1+3sxJOpoIsBjUQiXjGLngakEAGOD5Ale+6ikg6OZG5qI5O39frm3raPhud/IwnF4vec5ags05YBsgzcuA==
+"@webcomponents/custom-elements@^1.4.2":
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/@webcomponents/custom-elements/-/custom-elements-1.4.2.tgz#a6fe80325c2b09e88e988c712144bc667c565499"
+  integrity sha512-bLw2XH9+2NBwmn7BI6WA2oIo2eOfBpl+GjAqkF/qnkZ8kq3HY5tKYTxtKowWALAferTp3wKD8W6FSn5OyK+rtQ==
 
 "@wessberg/ts-evaluator@0.0.25":
   version "0.0.25"
@@ -1886,16 +2052,27 @@ acorn@^6.1.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.1.tgz#7d25ae05bb8ad1f9b699108e1094ecd7884adc1f"
   integrity sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==
 
-acorn@^6.2.1:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.0.tgz#b659d2ffbafa24baf5db1cdbb2c94a983ecd2784"
-  integrity sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw==
+acorn@^6.4.1:
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474"
+  integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==
 
 acorn@^7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.1.tgz#e35668de0b402f359de515c5482a1ab9f89a69bf"
   integrity sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==
 
+adjust-sourcemap-loader@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/adjust-sourcemap-loader/-/adjust-sourcemap-loader-2.0.0.tgz#6471143af75ec02334b219f54bc7970c52fb29a4"
+  integrity sha512-4hFsTsn58+YjrU9qKzML2JSSDqKvN8mUGQ0nNIrfPi8hmIONT4L3uUaT6MKdMsZ9AjsU6D2xDkZxCkbQPxChrA==
+  dependencies:
+    assert "1.4.1"
+    camelcase "5.0.0"
+    loader-utils "1.2.3"
+    object-path "0.11.4"
+    regex-parser "2.2.10"
+
 adm-zip@^0.4.9:
   version "0.4.13"
   resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.13.tgz#597e2f8cc3672151e1307d3e95cddbc75672314a"
@@ -1955,20 +2132,15 @@ ajv-keywords@^3.4.1:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da"
   integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==
 
-ajv@6.10.2, ajv@^6.10.2:
-  version "6.10.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz#d3cea04d6b017b2894ad69040fec8b623eb4bd52"
-  integrity sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==
-  dependencies:
-    fast-deep-equal "^2.0.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
+ajv-keywords@^3.5.2:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
+  integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
 
-ajv@6.12.0, ajv@^6.5.5:
-  version "6.12.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.0.tgz#06d60b96d87b8454a5adaba86e7854da629db4b7"
-  integrity sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==
+ajv@6.12.4:
+  version "6.12.4"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.4.tgz#0614facc4522127fa713445c6bfd3ebd376e2234"
+  integrity sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ==
   dependencies:
     fast-deep-equal "^3.1.1"
     fast-json-stable-stringify "^2.0.0"
@@ -1982,15 +2154,6 @@ ajv@^4.9.1:
     co "^4.6.0"
     json-stable-stringify "^1.0.1"
 
-ajv@^5.1.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.3.0.tgz#4414ff74a50879c208ee5fdc826e32c303549eda"
-  dependencies:
-    co "^4.6.0"
-    fast-deep-equal "^1.0.0"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.3.0"
-
 ajv@^5.3.0:
   version "5.5.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
@@ -2009,6 +2172,16 @@ ajv@^6.1.0:
     json-schema-traverse "^0.3.0"
     uri-js "^3.0.2"
 
+ajv@^6.10.2:
+  version "6.10.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz#d3cea04d6b017b2894ad69040fec8b623eb4bd52"
+  integrity sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==
+  dependencies:
+    fast-deep-equal "^2.0.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
 ajv@^6.12.0:
   version "6.12.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.2.tgz#c629c5eced17baf314437918d2da88c99d5958cd"
@@ -2019,6 +2192,26 @@ ajv@^6.12.0:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
+ajv@^6.12.4:
+  version "6.12.5"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.5.tgz#19b0e8bae8f476e5ba666300387775fb1a00a4da"
+  integrity sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
+ajv@^6.5.5:
+  version "6.12.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.0.tgz#06d60b96d87b8454a5adaba86e7854da629db4b7"
+  integrity sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
 alphanum-sort@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
@@ -2029,15 +2222,15 @@ angular-in-memory-web-api@~0.11.0:
   resolved "https://registry.yarnpkg.com/angular-in-memory-web-api/-/angular-in-memory-web-api-0.11.0.tgz#46e4ad896b36d669f36801fc8cafa7db8278d078"
   integrity sha512-QV1qYHm+Zd+wrvlcPLnAcqqGpOmCN1EUj4rRuYHpek8+QqFFdxBNuPZOJCKvU7I97z5QSKHsdc6PNKlpUQr3UA==
 
-angular-route@1.7.9:
-  version "1.7.9"
-  resolved "https://registry.yarnpkg.com/angular-route/-/angular-route-1.7.9.tgz#f9910a2af0ba3ad7a969c5dd369b8360d0d5e4ef"
-  integrity sha512-vRoj5hzdQtWbODhWJqDzD1iNOEfCKshO6GFBuPVV7RHlPjzIc4R2dHCc7Qiv/8F3LDxJDohc6vSnTDMLHuaqeA==
+angular-route@1.8.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/angular-route/-/angular-route-1.8.0.tgz#cb8066c5d34284ffd6a15ac7be1b3d51c5ad7bb2"
+  integrity sha512-ORvXAdVfCCA6XFwyjSkVQFFGufj0mNGiCvBR93Qsii8+7t/6Ioy6wheUoCj1x4NWUv7hAq3nYYGCVO6QEKb1BQ==
 
-angular@1.7.9:
-  version "1.7.9"
-  resolved "https://registry.yarnpkg.com/angular/-/angular-1.7.9.tgz#e52616e8701c17724c3c238cfe4f9446fd570bc4"
-  integrity sha512-5se7ZpcOtu0MBFlzGv5dsM1quQDoDeUTwZrWjGtTNA7O88cD8TEk5IEKCTDa3uECV9XnvKREVUr7du1ACiWGFQ==
+angular@1.8.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/angular/-/angular-1.8.0.tgz#b1ec179887869215cab6dfd0df2e42caa65b1b51"
+  integrity sha512-VdaMx+Qk0Skla7B5gw77a8hzlcOakwF8mjlW13DpIWIDlfqwAbSSLfd8N/qZnzEmQF4jC4iofInd3gE7vL8ZZg==
 
 ansi-colors@4.1.1:
   version "4.1.1"
@@ -2063,10 +2256,6 @@ 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"
-
 ansi-regex@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
@@ -2123,16 +2312,10 @@ anymatch@~3.1.1:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
-app-root-path@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.2.1.tgz#d0df4a682ee408273583d43f6f79e9892624bc9a"
-  integrity sha512-91IFKeKk7FjfmezPKkwtaRvSpnUc4gDwPAjA1YZ9Gn0q0PPeW+vbeUsZuyDwjI7+QTHhcLen2v25fi/AmhvbJA==
-
-append-transform@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-1.0.0.tgz#046a52ae582a228bd72f58acfbe2967c678759ab"
-  dependencies:
-    default-require-extensions "^2.0.0"
+app-root-path@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-3.0.0.tgz#210b6f43873227e18a4b810a032283311555d5ad"
+  integrity sha512-qMcx+Gy2UZynHjOHOIXPNvpf+9cjvk3cWrBBK7zg4gH9+clobJRb9NGzcT7mQTcV/6Gm/1WelUtqxVXnNlrwcw==
 
 aproba@^1.0.3, aproba@^1.1.1:
   version "1.2.0"
@@ -2164,6 +2347,11 @@ aria-query@^3.0.0:
     ast-types-flow "0.0.7"
     commander "^2.11.0"
 
+arity-n@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/arity-n/-/arity-n-1.0.4.tgz#d9e76b11733e08569c0847ae7b39b2860b30b745"
+  integrity sha1-2edrEXM+CFacCEeuezmyhgswt0U=
+
 arr-diff@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
@@ -2196,6 +2384,11 @@ array-union@^1.0.1:
   dependencies:
     array-uniq "^1.0.1"
 
+array-union@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
+  integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
+
 array-uniq@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
@@ -2216,11 +2409,11 @@ 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.1:
+arrify@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
 
-asap@^2.0.0, asap@~2.0.3:
+asap@^2.0.0:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
 
@@ -2244,7 +2437,7 @@ assert-plus@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
 
-assert@^1.1.1:
+assert@1.4.1, assert@^1.1.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
   dependencies:
@@ -2280,7 +2473,7 @@ 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.5.0, async@^2.6.1:
+async@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
   dependencies:
@@ -2306,18 +2499,18 @@ atob@^2.1.1:
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
-autoprefixer@9.7.4:
-  version "9.7.4"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.4.tgz#f8bf3e06707d047f0641d87aee8cfb174b2a5378"
-  integrity sha512-g0Ya30YrMBAEZk60lp+qfX5YQllG+S5W3GYCFvyHTvhOki0AEQJLPEcIuGRsqVwLi8FvXPVtwTGhfr38hVpm0g==
+autoprefixer@9.8.6:
+  version "9.8.6"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.6.tgz#3b73594ca1bf9266320c5acf1588d74dea74210f"
+  integrity sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg==
   dependencies:
-    browserslist "^4.8.3"
-    caniuse-lite "^1.0.30001020"
-    chalk "^2.4.2"
+    browserslist "^4.12.0"
+    caniuse-lite "^1.0.30001109"
+    colorette "^1.2.1"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
-    postcss "^7.0.26"
-    postcss-value-parser "^4.0.2"
+    postcss "^7.0.32"
+    postcss-value-parser "^4.1.0"
 
 aws-sign2@~0.6.0:
   version "0.6.0"
@@ -2327,7 +2520,7 @@ 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.2.1, aws4@^1.6.0:
+aws4@^1.2.1:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
 
@@ -2343,23 +2536,23 @@ axios@0.19.0:
     follow-redirects "1.5.10"
     is-buffer "^2.0.2"
 
-axobject-query@^2.0.2:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.1.1.tgz#2a3b1271ec722d48a4cd4b3fcc20c853326a49a7"
-  integrity sha512-lF98xa/yvy6j3fBHAgQXIYl+J4eZadOSqsPojemUqClzNbBV38wWGpUbQbVEyf4eUF5yF7eHmGgGA2JiHyjeqw==
+axobject-query@2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.0.2.tgz#ea187abe5b9002b377f925d8bf7d1c561adf38f9"
+  integrity sha512-MCeek8ZH7hKyO1rWUbKNQBbl4l2eY0ntk7OGi+q0RlafrCnfPxC06WZA+uebCfmYp4mNU9jRBP1AhGyf8+W3ww==
   dependencies:
-    "@babel/runtime" "^7.7.4"
-    "@babel/runtime-corejs3" "^7.7.4"
+    ast-types-flow "0.0.7"
 
-babel-loader@8.0.6:
-  version "8.0.6"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.0.6.tgz#e33bdb6f362b03f4bb141a0c21ab87c501b70dfb"
-  integrity sha512-4BmWKtBOBm13uoUwd08UwjZlaw3O9GWf456R9j+5YykFZ6LUIjIKLc0zEZf+hauxPOJs96C8k6FvYD09vWzhYw==
+babel-loader@8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.1.0.tgz#c611d5112bd5209abe8b9fa84c3e4da25275f1c3"
+  integrity sha512-7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw==
   dependencies:
-    find-cache-dir "^2.0.0"
-    loader-utils "^1.0.2"
-    mkdirp "^0.5.1"
+    find-cache-dir "^2.1.0"
+    loader-utils "^1.4.0"
+    mkdirp "^0.5.3"
     pify "^4.0.1"
+    schema-utils "^2.6.5"
 
 babel-plugin-dynamic-import-node@^2.3.3:
   version "2.3.3"
@@ -2548,18 +2741,6 @@ boom@2.x.x:
   dependencies:
     hoek "2.x.x"
 
-boom@4.x.x:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31"
-  dependencies:
-    hoek "4.x.x"
-
-boom@5.x.x:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-5.2.0.tgz#5dd9da6ee3a5f302077436290cb717d3f4a54e02"
-  dependencies:
-    hoek "4.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"
@@ -2782,7 +2963,7 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@^4.0.0, browserslist@^4.8.3:
+browserslist@^4.0.0:
   version "4.8.7"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.7.tgz#ec8301ff415e6a42c949d0e66b405eb539c532d0"
   integrity sha512-gFOnZNYBHrEyUML0xr5NJ6edFaaKbTFX9S9kQHlYfCP0Rit/boRIz4G+Avq6/4haEKJXdGGUnoolx+5MWW2BoA==
@@ -2791,7 +2972,17 @@ browserslist@^4.0.0, browserslist@^4.8.3:
     electron-to-chromium "^1.3.349"
     node-releases "^1.1.49"
 
-browserslist@^4.11.1, browserslist@^4.8.5:
+browserslist@^4.12.0:
+  version "4.14.3"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.3.tgz#381f9e7f13794b2eb17e1761b4f118e8ae665a53"
+  integrity sha512-GcZPC5+YqyPO4SFnz48/B0YaCwS47Q9iPChRGi6t7HhflKBcINzFrJvRfC+jp30sRMKxF+d4EHGs27Z0XP1NaQ==
+  dependencies:
+    caniuse-lite "^1.0.30001131"
+    electron-to-chromium "^1.3.570"
+    escalade "^3.1.0"
+    node-releases "^1.1.61"
+
+browserslist@^4.8.5:
   version "4.12.0"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.12.0.tgz#06c6d5715a1ede6c51fc39ff67fd647f740b656d"
   integrity sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==
@@ -2888,30 +3079,30 @@ bytes@3.1.0:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
   integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
 
-cacache@15.0.0:
-  version "15.0.0"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.0.0.tgz#133b59edbd2a37ea8ef2d54964c6f247e47e5059"
-  integrity sha512-L0JpXHhplbJSiDGzyJJnJCTL7er7NzbBgxzVqLswEb4bO91Zbv17OUMuUeu/q0ZwKn3V+1HM4wb9tO4eVE/K8g==
+cacache@15.0.5, cacache@^15.0.4, cacache@^15.0.5:
+  version "15.0.5"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.0.5.tgz#69162833da29170d6732334643c60e005f5f17d0"
+  integrity sha512-lloiL22n7sOjEEXdL8NAjTgv9a1u43xICE9/203qonkZUCj5X1UEWIdf2/Y0d6QcCtMzbKQyhrcDbdvlZTs/+A==
   dependencies:
-    chownr "^1.1.2"
+    "@npmcli/move-file" "^1.0.1"
+    chownr "^2.0.0"
     fs-minipass "^2.0.0"
     glob "^7.1.4"
     infer-owner "^1.0.4"
-    lru-cache "^5.1.1"
+    lru-cache "^6.0.0"
     minipass "^3.1.1"
     minipass-collect "^1.0.2"
     minipass-flush "^1.0.5"
     minipass-pipeline "^1.2.2"
     mkdirp "^1.0.3"
-    move-concurrently "^1.0.1"
-    p-map "^3.0.0"
+    p-map "^4.0.0"
     promise-inflight "^1.0.1"
-    rimraf "^2.7.1"
+    rimraf "^3.0.2"
     ssri "^8.0.0"
-    tar "^6.0.1"
+    tar "^6.0.2"
     unique-filename "^1.1.1"
 
-cacache@^12.0.0, cacache@^12.0.2, cacache@^12.0.3:
+cacache@^12.0.0, cacache@^12.0.2:
   version "12.0.3"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.3.tgz#be99abba4e1bf5df461cd5a2c1071fc432573390"
   integrity sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==
@@ -2932,30 +3123,6 @@ cacache@^12.0.0, cacache@^12.0.2, cacache@^12.0.3:
     unique-filename "^1.1.1"
     y18n "^4.0.0"
 
-cacache@^13.0.1:
-  version "13.0.1"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-13.0.1.tgz#a8000c21697089082f85287a1aec6e382024a71c"
-  integrity sha512-5ZvAxd05HDDU+y9BVvcqYu2LLXmPnQ0hW62h32g4xBTgL/MppR4/04NHfj/ycM2y6lmTnbw6HVi+1eN0Psba6w==
-  dependencies:
-    chownr "^1.1.2"
-    figgy-pudding "^3.5.1"
-    fs-minipass "^2.0.0"
-    glob "^7.1.4"
-    graceful-fs "^4.2.2"
-    infer-owner "^1.0.4"
-    lru-cache "^5.1.1"
-    minipass "^3.0.0"
-    minipass-collect "^1.0.2"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.2"
-    mkdirp "^0.5.1"
-    move-concurrently "^1.0.1"
-    p-map "^3.0.0"
-    promise-inflight "^1.0.1"
-    rimraf "^2.7.1"
-    ssri "^7.0.0"
-    unique-filename "^1.1.1"
-
 cache-base@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
@@ -2993,6 +3160,16 @@ callsites@^2.0.0:
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
   integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=
 
+camelcase@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.0.0.tgz#03295527d58bd3cd4aa75363f35b2e8d97be2f42"
+  integrity sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA==
+
+camelcase@5.3.1, camelcase@^5.0.0:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
+  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
+
 camelcase@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
@@ -3001,10 +3178,10 @@ camelcase@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
 
-camelcase@^5.0.0, camelcase@^5.3.1:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
-  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
+camelcase@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.0.0.tgz#5259f7c30e35e278f1bdc2a4d91230b37cad981e"
+  integrity sha512-8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w==
 
 caniuse-api@^3.0.0:
   version "3.0.0"
@@ -3021,16 +3198,21 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001027:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001030.tgz#78076c4c6d67d3e41d6eb9399853fb27fe6e44ee"
   integrity sha512-QGK0W4Ft/Ac+zTjEiRJfwDNATvS3fodDczBXrH42784kcfqcDKpEPfN08N0HQjrAp8He/Jw8QiSS9QRn7XAbUw==
 
-caniuse-lite@^1.0.30001020, caniuse-lite@^1.0.30001043:
-  version "1.0.30001051"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001051.tgz#8e944abf9c796bc7ea0bec3c3688a250561fc9ac"
-  integrity sha512-sw8UUnTlRevawTMZKN7vpfwSjCBVoiMPlYd8oT2VwNylyPCBdMAUmLGUApnYYTtIm5JXsQegUAY7GPHqgfDzjw==
-
 caniuse-lite@^1.0.30001030, caniuse-lite@^1.0.30001032:
   version "1.0.30001035"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001035.tgz#2bb53b8aa4716b2ed08e088d4dc816a5fe089a1e"
   integrity sha512-C1ZxgkuA4/bUEdMbU5WrGY4+UhMFFiXrgNAfxiMIqWgFTWfv/xsZCS2xEHT2LMq7xAZfuAnu6mcqyDl0ZR6wLQ==
 
+caniuse-lite@^1.0.30001043:
+  version "1.0.30001051"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001051.tgz#8e944abf9c796bc7ea0bec3c3688a250561fc9ac"
+  integrity sha512-sw8UUnTlRevawTMZKN7vpfwSjCBVoiMPlYd8oT2VwNylyPCBdMAUmLGUApnYYTtIm5JXsQegUAY7GPHqgfDzjw==
+
+caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001131:
+  version "1.0.30001133"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001133.tgz#ec564c5495311299eb05245e252d589a84acd95e"
+  integrity sha512-s3XAUFaC/ntDb1O3lcw9K8MPeOW7KO3z9+GzAoBxfz1B0VdacXPMKgFUtG4KIsgmnbexmi013s9miVu4h+qMHw==
+
 canonical-path@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/canonical-path/-/canonical-path-1.0.0.tgz#fcb470c23958def85081856be7a86e904f180d1d"
@@ -3083,6 +3265,14 @@ chalk@^3.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
+chalk@^4.0.0, chalk@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
+  integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
 chardet@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
@@ -3117,24 +3307,6 @@ chokidar@1.7.0:
   optionalDependencies:
     fsevents "~2.1.1"
 
-chokidar@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.3.tgz#dcbd4f6cbb2a55b4799ba8a840ac527e5f4b1176"
-  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"
-    normalize-path "^2.1.1"
-    path-is-absolute "^1.0.0"
-    readdirp "^2.0.0"
-    upath "^1.0.0"
-  optionalDependencies:
-    fsevents "^1.1.2"
-
 chokidar@^2.0.4, chokidar@^2.1.8:
   version "2.1.8"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
@@ -3154,6 +3326,21 @@ chokidar@^2.0.4, chokidar@^2.1.8:
   optionalDependencies:
     fsevents "^1.2.7"
 
+chokidar@^3.4.1:
+  version "3.4.2"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.2.tgz#38dc8e658dec3809741eb3ef7bb0a47fe424232d"
+  integrity sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A==
+  dependencies:
+    anymatch "~3.1.1"
+    braces "~3.0.2"
+    glob-parent "~5.1.0"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.4.0"
+  optionalDependencies:
+    fsevents "~2.1.2"
+
 chownr@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
@@ -3213,14 +3400,15 @@ cli-cursor@^3.1.0:
   dependencies:
     restore-cursor "^3.1.0"
 
-cli-spinners@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.2.0.tgz#e8b988d9206c692302d8ee834e7a85c0144d8f77"
-  integrity sha512-tgU3fKwzYjiLEQgPMD9Jt+JjHVL9kW93FiIMX/l7rivvOD4/LL0Mf7gda3+4U2KJBloybwgj5KEoQgGRioMiKQ==
+cli-spinners@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.4.0.tgz#c6256db216b878cfba4720e719cec7cf72685d7f"
+  integrity sha512-sJAofoarcm76ZGpuooaO0eDy8saEy+YoZBLjC4h8srt4jeBnkYeOgqxgsJQTpyt2LjI5PTfLJHSL+41Yu4fEJA==
 
-cli-width@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
+cli-width@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
+  integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==
 
 cliui@^3.0.3, cliui@^3.2.0:
   version "3.2.0"
@@ -3230,14 +3418,6 @@ cliui@^3.0.3, cliui@^3.2.0:
     strip-ansi "^3.0.1"
     wrap-ansi "^2.0.0"
 
-cliui@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.0.0.tgz#743d4650e05f36d1ed2575b59638d87322bfbbcc"
-  dependencies:
-    string-width "^2.1.1"
-    strip-ansi "^4.0.0"
-    wrap-ansi "^2.0.0"
-
 cliui@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
@@ -3256,24 +3436,11 @@ cliui@^6.0.0:
     strip-ansi "^6.0.0"
     wrap-ansi "^6.2.0"
 
-clone-deep@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
-  integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==
-  dependencies:
-    is-plain-object "^2.0.4"
-    kind-of "^6.0.2"
-    shallow-clone "^3.0.0"
-
 clone@^1.0.2:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
   integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
 
-clone@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.1.tgz#d217d1e961118e3ac9a4b8bba3285553bf647cdb"
-
 clone@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
@@ -3295,20 +3462,25 @@ 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"
 
-codelyzer@^5.1.2:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-5.2.0.tgz#b0ee573a12779c996090e596c5c1755479d83758"
-  integrity sha512-izfUfhEOOgAizszPlEDxo71DK/C4wprZw0vkY6UWcOSTQvN1JyfXf9DXwaV7WX+/JC+hH0ShXfdtGLA9Rca7LA==
+codelyzer@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-6.0.0.tgz#50c98581cc2890e0e9a9f93878dc317115d836ed"
+  integrity sha512-edJIQCIcxD9DhVSyBEdJ38AbLikm515Wl91t5RDGNT88uA6uQdTm4phTWfn9JhzAI8kXNUcfYyAE90lJElpGtA==
   dependencies:
-    app-root-path "^2.2.1"
+    "@angular/compiler" "9.0.0"
+    "@angular/core" "9.0.0"
+    app-root-path "^3.0.0"
     aria-query "^3.0.0"
-    axobject-query "^2.0.2"
+    axobject-query "2.0.2"
     css-selector-tokenizer "^0.7.1"
     cssauron "^1.4.0"
     damerau-levenshtein "^1.0.4"
+    rxjs "^6.5.3"
     semver-dsl "^1.0.1"
     source-map "^0.5.7"
     sprintf-js "^1.1.2"
+    tslib "^1.10.0"
+    zone.js "~0.10.3"
 
 collection-visit@^1.0.0:
   version "1.0.0"
@@ -3362,15 +3534,20 @@ color@^3.0.0:
     color-convert "^1.9.1"
     color-string "^1.5.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"
+colorette@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b"
+  integrity sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==
 
-colors@^1.3.3:
+colors@1.4.0, colors@^1.3.3:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
   integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
 
+colors@^1.1.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
+
 combined-stream@1.0.6, combined-stream@~1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
@@ -3383,7 +3560,7 @@ combined-stream@^1.0.5, combined-stream@~1.0.5:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@^2.11.0, commander@^2.20.0, commander@~2.20.3:
+commander@^2.11.0, commander@^2.20.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
@@ -3400,11 +3577,6 @@ commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
 
-compare-versions@^3.4.0:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.5.1.tgz#26e1f5cf0d48a77eced5046b9f67b6b61075a393"
-  integrity sha512-9fGPIB7C6AyM18CJJBHt5EnCZDG3oiTJYy0NjfIAGjKpzv0tkxWko7TNQHF5ymqm7IH03tqmeuBxtvD+Izh6mg==
-
 component-bind@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"
@@ -3421,6 +3593,13 @@ component-inherit@0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143"
 
+compose-function@3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/compose-function/-/compose-function-3.0.3.tgz#9ed675f13cc54501d30950a486ff6a7ba3ab185f"
+  integrity sha1-ntZ18TzFRQHTCVCkhv9qe6OrGF8=
+  dependencies:
+    arity-n "^1.0.4"
+
 compressible@~2.0.16:
   version "2.0.17"
   resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.17.tgz#6e8c108a16ad58384a977f3a482ca20bff2f38c1"
@@ -3544,6 +3723,18 @@ content-type@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
 
+convert-source-map@1.7.0, convert-source-map@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
+  integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
+  dependencies:
+    safe-buffer "~5.1.1"
+
+convert-source-map@^0.3.3:
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-0.3.5.tgz#f1d802950af7dd2631a1febe0596550c86ab3190"
+  integrity sha1-8dgClQr33SYxof6+BZZVDIarMZA=
+
 convert-source-map@^1.1.1:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.0.tgz#9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"
@@ -3552,13 +3743,6 @@ convert-source-map@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5"
 
-convert-source-map@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
-  integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
-  dependencies:
-    safe-buffer "~5.1.1"
-
 cookie-signature@1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
@@ -3587,23 +3771,22 @@ 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@5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.1.1.tgz#5481a03dea1123d88a988c6ff8b78247214f0b88"
-  integrity sha512-P15M5ZC8dyCjQHWwd4Ia/dm0SgVvZJMYeykVIVYXbGyqO4dWB5oyPHp9i7wjwo5LhtlhKbiBCdS2NvM07Wlybg==
+copy-webpack-plugin@6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-6.0.3.tgz#2b3d2bfc6861b96432a65f0149720adbd902040b"
+  integrity sha512-q5m6Vz4elsuyVEIUXr7wJdIdePWTubsqVbEMvf1WQnHGv0Q+9yPRu7MtYFPt+GBOXRav9lvIINifTQ1vSCs+eA==
   dependencies:
-    cacache "^12.0.3"
-    find-cache-dir "^2.1.0"
-    glob-parent "^3.1.0"
-    globby "^7.1.1"
-    is-glob "^4.0.1"
-    loader-utils "^1.2.3"
-    minimatch "^3.0.4"
+    cacache "^15.0.4"
+    fast-glob "^3.2.4"
+    find-cache-dir "^3.3.1"
+    glob-parent "^5.1.1"
+    globby "^11.0.1"
+    loader-utils "^2.0.0"
     normalize-path "^3.0.0"
-    p-limit "^2.2.1"
-    schema-utils "^1.0.0"
-    serialize-javascript "^2.1.2"
-    webpack-log "^2.0.0"
+    p-limit "^3.0.1"
+    schema-utils "^2.7.0"
+    serialize-javascript "^4.0.0"
+    webpack-sources "^1.4.3"
 
 core-js-compat@^3.6.2:
   version "3.6.5"
@@ -3613,11 +3796,6 @@ core-js-compat@^3.6.2:
     browserslist "^4.8.5"
     semver "7.0.0"
 
-core-js-pure@^3.0.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.5.0.tgz#f63c7f2b245e7d678e73f87ad28505480554d70e"
-  integrity sha512-wB0QtKAofWigiISuT1Tej3hKgq932fB//Lf1VoPbiLpTYlHY0nIDhgF+q1na0DAKFHH5wGCirkAknOmDN8ijXA==
-
 core-js@3.6.4:
   version "3.6.4"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.4.tgz#440a83536b458114b9cb2ac1580ba377dc470647"
@@ -3703,12 +3881,6 @@ cryptiles@2.x.x:
   dependencies:
     boom "2.x.x"
 
-cryptiles@3.x.x:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.2.tgz#a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"
-  dependencies:
-    boom "5.x.x"
-
 crypto-browserify@^3.11.0:
   version "3.11.1"
   resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.11.1.tgz#948945efc6757a400d6e5e5af47194d10064279f"
@@ -3737,24 +3909,23 @@ css-declaration-sorter@^4.0.1:
     postcss "^7.0.1"
     timsort "^0.3.0"
 
-css-loader@3.5.1:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.5.1.tgz#db2b2336f4169edb68e6a829ad4fd36552647b77"
-  integrity sha512-0G4CbcZzQ9D1Q6ndOfjFuMDo8uLYMu5vc9Abs5ztyHcKvmil6GJrMiNjzzi3tQvUF+mVRuDg7bE6Oc0Prolgig==
+css-loader@4.2.2:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-4.2.2.tgz#b668b3488d566dc22ebcf9425c5f254a05808c89"
+  integrity sha512-omVGsTkZPVwVRpckeUnLshPp12KsmMSLqYxs12+RzM9jRR5Y+Idn/tBffjXRvOE+qW7if24cuceFJqYR5FmGBg==
   dependencies:
-    camelcase "^5.3.1"
+    camelcase "^6.0.0"
     cssesc "^3.0.0"
     icss-utils "^4.1.1"
-    loader-utils "^1.2.3"
-    normalize-path "^3.0.0"
-    postcss "^7.0.27"
+    loader-utils "^2.0.0"
+    postcss "^7.0.32"
     postcss-modules-extract-imports "^2.0.0"
-    postcss-modules-local-by-default "^3.0.2"
+    postcss-modules-local-by-default "^3.0.3"
     postcss-modules-scope "^2.2.0"
     postcss-modules-values "^3.0.0"
-    postcss-value-parser "^4.0.3"
-    schema-utils "^2.6.5"
-    semver "^6.3.0"
+    postcss-value-parser "^4.1.0"
+    schema-utils "^2.7.0"
+    semver "^7.3.2"
 
 css-parse@~2.0.0:
   version "2.0.0"
@@ -3927,6 +4098,14 @@ cyclist@~0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"
 
+d@1, d@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/d/-/d-1.0.1.tgz#8698095372d58dbee346ffd0c7093f99f8f9eb5a"
+  integrity sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==
+  dependencies:
+    es5-ext "^0.10.50"
+    type "^1.0.1"
+
 damerau-levenshtein@^1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.5.tgz#780cf7144eb2e8dbd1c3bb83ae31100ccc31a414"
@@ -4004,7 +4183,7 @@ debug@4, debug@4.1.1, debug@^4.1.0, debug@^4.1.1, debug@~4.1.0:
   dependencies:
     ms "^2.1.1"
 
-debug@^3.0.0, debug@^3.1.1, debug@^3.2.5, debug@^3.2.6:
+debug@^3.1.1, debug@^3.2.5, debug@^3.2.6:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
   integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
@@ -4055,12 +4234,6 @@ default-gateway@^4.2.0:
     execa "^1.0.0"
     ip-regex "^2.1.0"
 
-default-require-extensions@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-2.0.0.tgz#f5f8fbb18a7d6d50b21f641f649ebb522cfe24f7"
-  dependencies:
-    strip-bom "^3.0.0"
-
 defaults@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
@@ -4163,6 +4336,11 @@ dev-ip@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/dev-ip/-/dev-ip-1.0.1.tgz#a76a3ed1855be7a012bb8ac16cb80f3c00dc28f0"
 
+devtools-protocol@0.0.767361:
+  version "0.0.767361"
+  resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.767361.tgz#5977f2558b84f9df36f62501bdddb82f3ae7b66b"
+  integrity sha512-ziRTdhEVQ9jEwedaUaXZ7kl9w9TF/7A3SXQ0XuqrJB+hMS62POHZUWTbumDN2ehRTfvWqTPc2Jw4gUl/jggmHA==
+
 dezalgo@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456"
@@ -4188,12 +4366,12 @@ diffie-hellman@^5.0.0:
     miller-rabin "^4.0.0"
     randombytes "^2.0.0"
 
-dir-glob@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.0.0.tgz#0b205d2b6aef98238ca286598a8204d29d0a0034"
+dir-glob@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
+  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
   dependencies:
-    arrify "^1.0.1"
-    path-type "^3.0.0"
+    path-type "^4.0.0"
 
 dns-equal@^1.0.0:
   version "1.0.0"
@@ -4338,6 +4516,11 @@ electron-to-chromium@^1.3.413:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.428.tgz#9afec8766dbe3cab825817f77e3ed0e63467b71a"
   integrity sha512-u3+5jEfgLKq/hGO96YfAoOAM1tgFnRDTCD5mLuev44tttcXix+INtVegAkmGzUcfDsnzkPt51XXurXZLLwXt0w==
 
+electron-to-chromium@^1.3.570:
+  version "1.3.570"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.570.tgz#3f5141cc39b4e3892a276b4889980dabf1d29c7f"
+  integrity sha512-Y6OCoVQgFQBP5py6A/06+yWxUZHDlNr/gNDGatjH8AZqXl8X0tE4LfjLJsXGz/JmWJz8a6K7bR1k+QzZ+k//fg==
+
 elliptic@^6.0.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.0.tgz#cac9af8762c85836187003c8dfe193e5e2eae5df"
@@ -4505,23 +4688,15 @@ engine.io@~3.2.0:
     engine.io-parser "~2.1.0"
     ws "~3.3.1"
 
-enhanced-resolve@4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz#2937e2b8066cd0fe7ce0990a98f0d71a35189f66"
-  integrity sha512-98p2zE+rL7/g/DzMHMTF4zZlCgeVdJ7yr6xzEpJRYwFYrGi9ANdn5DnJURg6RpBkyk60XYDnWIv51VfIhfNGuA==
+enhanced-resolve@4.3.0, enhanced-resolve@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz#3b806f3bfafc1ec7de69551ef93cca46c1704126"
+  integrity sha512-3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ==
   dependencies:
     graceful-fs "^4.1.2"
     memory-fs "^0.5.0"
     tapable "^1.0.0"
 
-enhanced-resolve@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz#41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f"
-  dependencies:
-    graceful-fs "^4.1.2"
-    memory-fs "^0.4.0"
-    tapable "^1.0.0"
-
 ent@~2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d"
@@ -4597,6 +4772,24 @@ es-to-primitive@^1.2.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
+es5-ext@^0.10.35, es5-ext@^0.10.50:
+  version "0.10.53"
+  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.53.tgz#93c5a3acfdbef275220ad72644ad02ee18368de1"
+  integrity sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==
+  dependencies:
+    es6-iterator "~2.0.3"
+    es6-symbol "~3.1.3"
+    next-tick "~1.0.0"
+
+es6-iterator@2.0.3, es6-iterator@~2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
+  integrity sha1-p96IkUGgWpSwhUQDstCg+/qY87c=
+  dependencies:
+    d "1"
+    es5-ext "^0.10.35"
+    es6-symbol "^3.1.1"
+
 es6-promise@^4.0.3:
   version "4.2.4"
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.4.tgz#dc4221c2b16518760bd8c39a52d8f356fc00ed29"
@@ -4611,6 +4804,19 @@ es6-promisify@^5.0.0:
   dependencies:
     es6-promise "^4.0.3"
 
+es6-symbol@^3.1.1, es6-symbol@~3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz#bad5d3c1bcdac28269f4cb331e431c78ac705d18"
+  integrity sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==
+  dependencies:
+    d "^1.0.1"
+    ext "^1.1.2"
+
+escalade@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.0.tgz#e8e2d7c7a8b76f6ee64c2181d6b8151441602d4e"
+  integrity sha512-mAk+hPSO8fLDkhV7V0dXazH5pDc6MrjBTPyD3VeKzxnVFjH1MIxbCdqGZB9O8+EwWakZs3ZCbDS4IpRt79V1ig==
+
 escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
@@ -4720,18 +4926,6 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
     md5.js "^1.3.4"
     safe-buffer "^5.1.1"
 
-execa@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-0.10.0.tgz#ff456a8f53f90f8eccc71a96d11bdfc7f082cb50"
-  dependencies:
-    cross-spawn "^6.0.0"
-    get-stream "^3.0.0"
-    is-stream "^1.1.0"
-    npm-run-path "^2.0.0"
-    p-finally "^1.0.0"
-    signal-exit "^3.0.0"
-    strip-eof "^1.0.0"
-
 execa@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
@@ -4818,6 +5012,13 @@ express@^4.15.2, express@^4.17.1:
     utils-merge "1.0.1"
     vary "~1.1.2"
 
+ext@^1.1.2:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/ext/-/ext-1.4.0.tgz#89ae7a07158f79d35517882904324077e4379244"
+  integrity sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==
+  dependencies:
+    type "^2.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"
@@ -4831,7 +5032,7 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
-extend@^3.0.0, extend@~3.0.0, extend@~3.0.1:
+extend@^3.0.0, extend@~3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
 
@@ -4895,15 +5096,27 @@ fast-deep-equal@^3.1.1:
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4"
   integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==
 
-fast-json-stable-stringify@2.0.0, 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-glob@^3.1.1, fast-glob@^3.2.4:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.4.tgz#d20aefbf99579383e7f3cc66529158c9b98554d3"
+  integrity sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==
+  dependencies:
+    "@nodelib/fs.stat" "^2.0.2"
+    "@nodelib/fs.walk" "^1.2.3"
+    glob-parent "^5.1.0"
+    merge2 "^1.3.0"
+    micromatch "^4.0.2"
+    picomatch "^2.2.1"
 
 fast-json-stable-stringify@2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
   integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
 
+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.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
@@ -4914,6 +5127,13 @@ fastparse@^1.1.1:
   resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.2.tgz#91728c5a5942eced8531283c79441ee4122c35a9"
   integrity sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==
 
+fastq@^1.6.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.8.0.tgz#550e1f9f59bbc65fe185cb6a9b4d95357107f481"
+  integrity sha512-SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==
+  dependencies:
+    reusify "^1.0.4"
+
 faye-websocket@^0.10.0:
   version "0.10.0"
   resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"
@@ -4957,13 +5177,6 @@ filename-regex@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
 
-fileset@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/fileset/-/fileset-2.0.3.tgz#8e7548a96d3cc2327ee5e674168723a333bba2a0"
-  dependencies:
-    glob "^7.0.3"
-    minimatch "^3.0.3"
-
 fill-range@^2.1.0:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723"
@@ -5038,7 +5251,7 @@ finalhandler@~1.1.2:
     statuses "~1.5.0"
     unpipe "~1.0.0"
 
-find-cache-dir@3.3.1:
+find-cache-dir@3.3.1, find-cache-dir@^3.3.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz#89b33fad4a4670daa94f855f7fbe31d6d84fe880"
   integrity sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==
@@ -5047,14 +5260,6 @@ find-cache-dir@3.3.1:
     make-dir "^3.0.2"
     pkg-dir "^4.1.0"
 
-find-cache-dir@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.0.0.tgz#4c1faed59f45184530fb9d7fa123a4d04a98472d"
-  dependencies:
-    commondir "^1.0.1"
-    make-dir "^1.0.0"
-    pkg-dir "^3.0.0"
-
 find-cache-dir@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
@@ -5064,15 +5269,6 @@ find-cache-dir@^2.1.0:
     make-dir "^2.0.0"
     pkg-dir "^3.0.0"
 
-find-cache-dir@^3.2.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.0.tgz#4d74ed1fe9ef1731467ca24378e8f8f5c8b6ed11"
-  integrity sha512-PtXtQb7IrD8O+h6Cq1dbpJH5NzD8+9keN1zZ0YlpDzl1PwXEJEBj6u1Xa92t1Hwluoozd9TNKul5Hi2iqpsWwg==
-  dependencies:
-    commondir "^1.0.1"
-    make-dir "^3.0.2"
-    pkg-dir "^4.1.0"
-
 find-up@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
@@ -5149,14 +5345,6 @@ form-data@~2.1.1:
     combined-stream "^1.0.5"
     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"
-
 form-data@~2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
@@ -5262,13 +5450,6 @@ fsevents@^1.0.0:
     nan "^2.3.0"
     node-pre-gyp "^0.6.36"
 
-fsevents@^1.1.2:
-  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"
-
 fsevents@^1.2.7:
   version "1.2.9"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.9.tgz#3f5ed66583ccd6f400b5a00db6f7e861363e388f"
@@ -5341,10 +5522,6 @@ get-caller-file@^2.0.1:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-get-stream@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
-
 get-stream@^4.0.0, get-stream@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
@@ -5389,6 +5566,13 @@ glob-parent@^3.1.0:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
+glob-parent@^5.1.0, glob-parent@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229"
+  integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==
+  dependencies:
+    is-glob "^4.0.1"
+
 glob-parent@~5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.0.tgz#5f4c1d1e748d30cd73ad2944b3577a81b081e8c2"
@@ -5408,7 +5592,7 @@ glob@7.1.2, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@7.1.6, glob@^7.1.4:
+glob@7.1.6, glob@^7.1.4, glob@^7.1.6:
   version "7.1.6"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
   integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
@@ -5435,6 +5619,18 @@ globals@^11.1.0:
   version "11.7.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.7.0.tgz#a583faa43055b1aca771914bf68258e2fc125673"
 
+globby@^11.0.1:
+  version "11.0.1"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.1.tgz#9a2bf107a068f3ffeabc49ad702c79ede8cfd357"
+  integrity sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==
+  dependencies:
+    array-union "^2.1.0"
+    dir-glob "^3.0.1"
+    fast-glob "^3.1.1"
+    ignore "^5.1.4"
+    merge2 "^1.3.0"
+    slash "^3.0.0"
+
 globby@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
@@ -5456,17 +5652,6 @@ globby@^6.1.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
-globby@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-7.1.1.tgz#fb2ccff9401f8600945dfada97440cca972b8680"
-  dependencies:
-    array-union "^1.0.1"
-    dir-glob "^2.0.0"
-    glob "^7.1.2"
-    ignore "^3.3.5"
-    pify "^3.0.0"
-    slash "^1.0.0"
-
 graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
@@ -5476,11 +5661,6 @@ graceful-fs@^4.1.15:
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
   integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
 
-graceful-fs@^4.2.2:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
-  integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
-
 guess-parser@^0.4.12:
   version "0.4.16"
   resolved "https://registry.yarnpkg.com/guess-parser/-/guess-parser-0.4.16.tgz#92752dc91a9b1486655a45c7314356af38562173"
@@ -5493,17 +5673,6 @@ handle-thing@^2.0.0:
   resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.0.tgz#0e039695ff50c93fc288557d696f3c1dc6776754"
   integrity sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==
 
-handlebars@^4.1.2:
-  version "4.5.3"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.5.3.tgz#5cf75bd8714f7605713511a56be7c349becb0482"
-  integrity sha512-3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA==
-  dependencies:
-    neo-async "^2.6.0"
-    optimist "^0.6.1"
-    source-map "^0.6.1"
-  optionalDependencies:
-    uglify-js "^3.1.4"
-
 har-schema@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
@@ -5519,13 +5688,6 @@ har-validator@~4.2.1:
     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"
-  dependencies:
-    ajv "^5.1.0"
-    har-schema "^2.0.0"
-
 har-validator@~5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.0.tgz#44657f5688a22cfd4b72486e81b3a3fb11742c29"
@@ -5654,15 +5816,6 @@ hawk@3.1.3, hawk@~3.1.3:
     hoek "2.x.x"
     sntp "1.x.x"
 
-hawk@~6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/hawk/-/hawk-6.0.2.tgz#af4d914eb065f9b5ce4d9d11c1cb2126eecc3038"
-  dependencies:
-    boom "4.x.x"
-    cryptiles "3.x.x"
-    hoek "4.x.x"
-    sntp "2.x.x"
-
 he@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
@@ -5685,10 +5838,6 @@ hoek@2.x.x:
   version "2.16.3"
   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"
-
 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"
@@ -5735,10 +5884,15 @@ html-encoding-sniffer@^2.0.1:
   dependencies:
     whatwg-encoding "^1.0.5"
 
-html-entities@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
-  integrity sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=
+html-entities@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.3.1.tgz#fb9a1a4b5b14c5daba82d3e34c6ae4fe701a0e44"
+  integrity sha512-rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA==
+
+html-escaper@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
+  integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
 
 http-cache-semantics@^3.8.1:
   version "3.8.1"
@@ -5931,6 +6085,13 @@ iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
+iconv-lite@^0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.2.tgz#ce13d1875b0c3a674bd6a04b7f76b01b1b6ded01"
+  integrity sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3.0.0"
+
 icss-utils@^4.0.0, icss-utils@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-4.1.1.tgz#21170b53789ee27447c2f47dd683081403f9a467"
@@ -5952,9 +6113,10 @@ ignore-walk@^3.0.1:
   dependencies:
     minimatch "^3.0.4"
 
-ignore@^3.3.5:
-  version "3.3.7"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021"
+ignore@^5.1.4:
+  version "5.1.8"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
+  integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
 
 image-size@~0.5.0:
   version "0.5.5"
@@ -6052,21 +6214,21 @@ ini@^1.3.4, ini@~1.3.0:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
 
-inquirer@7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.1.0.tgz#1298a01859883e17c7264b82870ae1034f92dd29"
-  integrity sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg==
+inquirer@7.3.3:
+  version "7.3.3"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz#04d176b2af04afc157a83fd7c100e98ee0aad003"
+  integrity sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==
   dependencies:
     ansi-escapes "^4.2.1"
-    chalk "^3.0.0"
+    chalk "^4.1.0"
     cli-cursor "^3.1.0"
-    cli-width "^2.0.0"
+    cli-width "^3.0.0"
     external-editor "^3.0.3"
     figures "^3.0.0"
-    lodash "^4.17.15"
+    lodash "^4.17.19"
     mute-stream "0.0.8"
     run-async "^2.4.0"
-    rxjs "^6.5.3"
+    rxjs "^6.6.0"
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
     through "^2.3.6"
@@ -6096,10 +6258,6 @@ invert-kv@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
 
-invert-kv@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
-
 ip-regex@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
@@ -6512,25 +6670,6 @@ isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
 
-istanbul-api@^2.1.6:
-  version "2.1.6"
-  resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-2.1.6.tgz#d61702a9d1c66ad89d92e66d401e16b0bda4a35f"
-  integrity sha512-x0Eicp6KsShG1k1rMgBAi/1GgY7kFGEBwQpw3PXGEmu+rBcBNhqU8g2DgY9mlepAsLPzrzrbqSgCGANnki4POA==
-  dependencies:
-    async "^2.6.2"
-    compare-versions "^3.4.0"
-    fileset "^2.0.3"
-    istanbul-lib-coverage "^2.0.5"
-    istanbul-lib-hook "^2.0.7"
-    istanbul-lib-instrument "^3.3.0"
-    istanbul-lib-report "^2.0.8"
-    istanbul-lib-source-maps "^3.0.6"
-    istanbul-reports "^2.2.4"
-    js-yaml "^3.13.1"
-    make-dir "^2.1.0"
-    minimatch "^3.0.4"
-    once "^1.4.0"
-
 istanbul-lib-coverage@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz#675f0ab69503fad4b1d849f736baaca803344f49"
@@ -6541,47 +6680,24 @@ istanbul-lib-coverage@^3.0.0:
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec"
   integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==
 
-istanbul-lib-hook@^2.0.7:
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-2.0.7.tgz#c95695f383d4f8f60df1f04252a9550e15b5b133"
-  integrity sha512-vrRztU9VRRFDyC+aklfLoeXyNdTfga2EI3udDGn4cZ6fpSXpHLV9X6CHvfoMCPtggg8zvDDmC4b9xfu0z6/llA==
-  dependencies:
-    append-transform "^1.0.0"
-
-istanbul-lib-instrument@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz#a5f63d91f0bbc0c3e479ef4c5de027335ec6d630"
-  integrity sha512-5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA==
-  dependencies:
-    "@babel/generator" "^7.4.0"
-    "@babel/parser" "^7.4.3"
-    "@babel/template" "^7.4.0"
-    "@babel/traverse" "^7.4.3"
-    "@babel/types" "^7.4.0"
-    istanbul-lib-coverage "^2.0.5"
-    semver "^6.0.0"
-
-istanbul-lib-instrument@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.1.tgz#61f13ac2c96cfefb076fe7131156cc05907874e6"
-  integrity sha512-imIchxnodll7pvQBYOqUu88EufLCU56LMeFPZZM/fJZ1irYcYdqroaV+ACK1Ila8ls09iEYArp+nqyC6lW1Vfg==
+istanbul-lib-instrument@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz#873c6fff897450118222774696a3f28902d77c1d"
+  integrity sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==
   dependencies:
     "@babel/core" "^7.7.5"
-    "@babel/parser" "^7.7.5"
-    "@babel/template" "^7.7.4"
-    "@babel/traverse" "^7.7.4"
     "@istanbuljs/schema" "^0.1.2"
     istanbul-lib-coverage "^3.0.0"
     semver "^6.3.0"
 
-istanbul-lib-report@^2.0.8:
-  version "2.0.8"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz#5a8113cd746d43c4889eba36ab10e7d50c9b4f33"
-  integrity sha512-fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ==
+istanbul-lib-report@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#7518fe52ea44de372f460a76b5ecda9ffb73d8a6"
+  integrity sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==
   dependencies:
-    istanbul-lib-coverage "^2.0.5"
-    make-dir "^2.1.0"
-    supports-color "^6.1.0"
+    istanbul-lib-coverage "^3.0.0"
+    make-dir "^3.0.0"
+    supports-color "^7.1.0"
 
 istanbul-lib-source-maps@^3.0.6:
   version "3.0.6"
@@ -6594,17 +6710,18 @@ istanbul-lib-source-maps@^3.0.6:
     rimraf "^2.6.3"
     source-map "^0.6.1"
 
-istanbul-reports@^2.2.4:
-  version "2.2.6"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.2.6.tgz#7b4f2660d82b29303a8fe6091f8ca4bf058da1af"
-  integrity sha512-SKi4rnMyLBKe0Jy2uUdx28h8oG7ph2PPuQPvIAh31d+Ci+lSiEu4C+h3oBPuJ9+mPKhOyW0M8gY4U5NM1WLeXA==
+istanbul-reports@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.2.tgz#d593210e5000683750cb09fc0644e4b6e27fd53b"
+  integrity sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==
   dependencies:
-    handlebars "^4.1.2"
+    html-escaper "^2.0.0"
+    istanbul-lib-report "^3.0.0"
 
-jasmine-core@^3.5.0, jasmine-core@~3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.5.0.tgz#132c23e645af96d85c8bca13c8758b18429fc1e4"
-  integrity sha512-nCeAiw37MIMA9w9IXso7bRaLl+c/ef3wnxsoSAlYrzS+Ot0zTG6nU8G/cIfGkqpkjX2wNaIW9RFG0TwIFnG6bA==
+jasmine-core@^3.6.0, jasmine-core@~3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.6.0.tgz#491f3bb23941799c353ceb7a45b38a950ebc5a20"
+  integrity sha512-8uQYa7zJN8hq9z+g8z1bqCfdC8eoDAeVnM5sfqs7KHv9/ifoJ500m018fpFc7RDaO6SWCLCXwo/wPSNcdYTgcw==
 
 jasmine-core@~2.8.0:
   version "2.8.0"
@@ -6617,11 +6734,12 @@ jasmine-marbles@~0.6.0:
   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"
+jasmine-spec-reporter@~5.0.0:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/jasmine-spec-reporter/-/jasmine-spec-reporter-5.0.2.tgz#b61288ab074ad440dc2477c4d42840b0e74a6b95"
+  integrity sha512-6gP1LbVgJ+d7PKksQBc2H0oDGNRQI3gKUsWlswKaQ2fif9X5gzhQcgM5+kiJGCQVurOG09jqNhk7payggyp5+g==
   dependencies:
-    colors "1.1.2"
+    colors "1.4.0"
 
 jasmine@2.8.0:
   version "2.8.0"
@@ -6635,11 +6753,12 @@ jasminewd2@^2.1.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/jasminewd2/-/jasminewd2-2.2.0.tgz#e37cf0b17f199cce23bea71b2039395246b4ec4e"
 
-jest-worker@25.1.0, jest-worker@^25.1.0:
-  version "25.1.0"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-25.1.0.tgz#75d038bad6fdf58eba0d2ec1835856c497e3907a"
-  integrity sha512-ZHhHtlxOWSxCoNOKHGbiLzXnl42ga9CxDr27H36Qn+15pQZd3R/F24jrmjDelw9j/iHUIWMWs08/u2QN50HHOg==
+jest-worker@26.3.0, jest-worker@^26.3.0:
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.3.0.tgz#7c8a97e4f4364b4f05ed8bca8ca0c24de091871f"
+  integrity sha512-Vmpn2F6IASefL+DVBhPzI2J9/GJUsqzomdeN+P+dK8/jKxbh8R3BtFnx3FIta7wYlPU62cpJMJQo4kuOowcMnw==
   dependencies:
+    "@types/node" "*"
     merge-stream "^2.0.0"
     supports-color "^7.0.0"
 
@@ -6774,6 +6893,11 @@ json5@^2.1.2:
   dependencies:
     minimist "^1.2.5"
 
+jsonc-parser@2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.3.0.tgz#7c7fc988ee1486d35734faaaa866fadb00fa91ee"
+  integrity sha512-b0EBt8SWFNnixVdvoR2ZtEGa9ZqLhbJnOjezn+WP+8kspFm+PFYDN8Z4Bc7pRlDjvuVcADSUkroIuTWWn/YiIA==
+
 jsonfile@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-3.0.1.tgz#a5ecc6f65f53f662c4415c7675a0331d0992ec66"
@@ -6822,25 +6946,28 @@ karma-chrome-launcher@~3.1.0:
   dependencies:
     which "^1.2.1"
 
-karma-coverage-istanbul-reporter@~2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-2.1.1.tgz#37a775fbfbb3cbe98cebf19605c94c6277c3b88a"
-  integrity sha512-CH8lTi8+kKXGvrhy94+EkEMldLCiUA0xMOiL31vvli9qK0T+qcXJAwWBRVJWnVWxYkTmyWar8lPz63dxX6/z1A==
+karma-coverage-istanbul-reporter@~3.0.2:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-3.0.3.tgz#f3b5303553aadc8e681d40d360dfdc19bc7e9fe9"
+  integrity sha512-wE4VFhG/QZv2Y4CdAYWDbMmcAHeS926ZIji4z+FkB2aF/EposRb6DP6G5ncT/wXhqUfAb/d7kZrNKPonbvsATw==
   dependencies:
-    istanbul-api "^2.1.6"
+    istanbul-lib-coverage "^3.0.0"
+    istanbul-lib-report "^3.0.0"
+    istanbul-lib-source-maps "^3.0.6"
+    istanbul-reports "^3.0.2"
     minimatch "^3.0.4"
 
-karma-jasmine-html-reporter@^1.4.2:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.4.2.tgz#16d100fd701271192d27fd28ddc90b710ad36fff"
-  integrity sha512-7g0gPj8+9JepCNJR9WjDyQ2RkZ375jpdurYQyAYv8PorUCadepl8vrD6LmMqOGcM17cnrynBawQYZHaumgDjBw==
+karma-jasmine-html-reporter@^1.5.0:
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.5.4.tgz#669f33d694d88fce1b0ccfda57111de716cb0192"
+  integrity sha512-PtilRLno5O6wH3lDihRnz0Ba8oSn0YUJqKjjux1peoYGwo0AQqrWRbdWk/RLzcGlb+onTyXAnHl6M+Hu3UxG/Q==
 
-karma-jasmine@~3.0.1:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-3.0.3.tgz#751ae15d84d16e9148d0af42787fc12f5959f66d"
-  integrity sha512-80iBR8/hLFY2Uw3S2GG6EndWtMCGMJjrCYNwYROWsJFVTjWrRSsLqcA2ye+U3ygW5sjOQo8f+78L8cGUxjC/+A==
+karma-jasmine@~4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-4.0.1.tgz#b99e073b6d99a5196fc4bffc121b89313b0abd82"
+  integrity sha512-h8XDAhTiZjJKzfkoO1laMH+zfNlra+dEQHUAjpn5JV1zCPtOIVWGQjLBrqhnzQa/hrU2XrZwSyBa6XjEBzfXzw==
   dependencies:
-    jasmine-core "^3.5.0"
+    jasmine-core "^3.6.0"
 
 karma-source-map-support@1.4.0:
   version "1.4.0"
@@ -6904,6 +7031,11 @@ 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"
 
+klona@^2.0.3:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.4.tgz#7bb1e3affb0cb8624547ef7e8f6708ea2e39dfc0"
+  integrity sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA==
+
 lazy-cache@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-2.0.2.tgz#b9190a4f913354694840859f8a8f7084d8822264"
@@ -6916,36 +7048,29 @@ lcid@^1.0.0:
   dependencies:
     invert-kv "^1.0.0"
 
-lcid@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf"
-  dependencies:
-    invert-kv "^2.0.0"
-
-less-loader@5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-5.0.0.tgz#498dde3a6c6c4f887458ee9ed3f086a12ad1b466"
-  integrity sha512-bquCU89mO/yWLaUq0Clk7qCsKhsF/TZpJUzETRvJa9KSVEL9SO3ovCvdEHISBhrC81OwC8QSVX7E0bzElZj9cg==
+less-loader@6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-6.2.0.tgz#8b26f621c155b342eefc24f5bd6e9dc40c42a719"
+  integrity sha512-Cl5h95/Pz/PWub/tCBgT1oNMFeH1WTD33piG80jn5jr12T4XbxZcjThwNXDQ7AG649WEynuIzO4b0+2Tn9Qolg==
   dependencies:
-    clone "^2.1.1"
-    loader-utils "^1.1.0"
-    pify "^4.0.1"
+    clone "^2.1.2"
+    less "^3.11.3"
+    loader-utils "^2.0.0"
+    schema-utils "^2.7.0"
 
-less@3.11.1:
-  version "3.11.1"
-  resolved "https://registry.yarnpkg.com/less/-/less-3.11.1.tgz#c6bf08e39e02404fe6b307a3dfffafdc55bd36e2"
-  integrity sha512-tlWX341RECuTOvoDIvtFqXsKj072hm3+9ymRBe76/mD6O5ZZecnlAOVDlWAleF2+aohFrxNidXhv2773f6kY7g==
+less@^3.11.3:
+  version "3.12.2"
+  resolved "https://registry.yarnpkg.com/less/-/less-3.12.2.tgz#157e6dd32a68869df8859314ad38e70211af3ab4"
+  integrity sha512-+1V2PCMFkL+OIj2/HrtrvZw0BC0sYLMICJfbQjuj/K8CEnlrFX6R5cKKgzzttsZDHyxQNL1jqMREjKN3ja/E3Q==
   dependencies:
-    clone "^2.1.2"
     tslib "^1.10.0"
   optionalDependencies:
     errno "^0.1.1"
     graceful-fs "^4.1.2"
     image-size "~0.5.0"
+    make-dir "^2.1.0"
     mime "^1.4.1"
-    mkdirp "^0.5.0"
-    promise "^7.1.1"
-    request "^2.83.0"
+    native-request "^1.0.5"
     source-map "~0.6.0"
 
 leven@^3.1.0:
@@ -6968,10 +7093,10 @@ levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
-license-webpack-plugin@2.1.4:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.1.4.tgz#c5529a4bb87cc9b4489b486d054ba7cae43a554e"
-  integrity sha512-1Xq72fmPbTg5KofXs+yI5L4QqPFjQ6mZxoeI6D7gfiEDOtaEIk6PGrdLaej90bpDqKNHNxlQ/MW4tMAL6xMPJQ==
+license-webpack-plugin@2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.3.0.tgz#c00f70d5725ba0408de208acb9e66612cc2eceda"
+  integrity sha512-JK/DXrtN6UeYQSgkg5q1+pgJ8aiKPL9tnz9Wzw+Ikkf+8mJxG56x6t8O+OH/tAeF/5NREnelTEMyFtbJNkjH4w==
   dependencies:
     "@types/webpack-sources" "^0.1.5"
     webpack-sources "^1.2.0"
@@ -7011,6 +7136,15 @@ loader-runner@^2.4.0:
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357"
   integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==
 
+loader-utils@1.2.3, loader-utils@^1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"
+  integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==
+  dependencies:
+    big.js "^5.2.2"
+    emojis-list "^2.0.0"
+    json5 "^1.0.1"
+
 loader-utils@2.0.0, loader-utils@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0"
@@ -7028,15 +7162,6 @@ loader-utils@^1.0.2, loader-utils@^1.1.0:
     emojis-list "^2.0.0"
     json5 "^0.5.0"
 
-loader-utils@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"
-  integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==
-  dependencies:
-    big.js "^5.2.2"
-    emojis-list "^2.0.0"
-    json5 "^1.0.1"
-
 loader-utils@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
@@ -7132,12 +7257,17 @@ lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15:
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
 
-log-symbols@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-3.0.0.tgz#f3a08516a5dea893336a7dee14d18a1cfdab77c4"
-  integrity sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==
+lodash@^4.17.19:
+  version "4.17.20"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
+  integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
+
+log-symbols@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.0.0.tgz#69b3cc46d20f448eccdb75ea1fa733d9e821c920"
+  integrity sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==
   dependencies:
-    chalk "^2.4.2"
+    chalk "^4.0.0"
 
 log4js@^4.0.0:
   version "4.1.1"
@@ -7150,10 +7280,10 @@ log4js@^4.0.0:
     rfdc "^1.1.2"
     streamroller "^1.0.4"
 
-loglevel@^1.6.6:
-  version "1.6.8"
-  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.8.tgz#8a25fb75d092230ecd4457270d80b54e28011171"
-  integrity sha512-bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA==
+loglevel@^1.6.8:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.0.tgz#728166855a740d59d38db01cf46f042caa041bb0"
+  integrity sha512-i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ==
 
 loose-envify@^1.0.0:
   version "1.3.1"
@@ -7168,12 +7298,12 @@ lru-cache@^5.1.1:
   dependencies:
     yallist "^3.0.2"
 
-magic-string@0.25.4:
-  version "0.25.4"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.4.tgz#325b8a0a79fc423db109b77fd5a19183b7ba5143"
-  integrity sha512-oycWO9nEVAP2RVPbIoDoA4Y7LFIJ3xRYov93gAyJhZkET1tNuB0u7uWkZS2LpBWTJUWnmau/To8ECWRC+jKNfw==
+lru-cache@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
+  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
   dependencies:
-    sourcemap-codec "^1.4.4"
+    yallist "^4.0.0"
 
 magic-string@0.25.7:
   version "0.25.7"
@@ -7195,12 +7325,6 @@ magic-string@^0.25.1:
   dependencies:
     sourcemap-codec "^1.4.4"
 
-make-dir@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.1.0.tgz#19b4369fe48c116f53c2af95ad102c0e39e85d51"
-  dependencies:
-    pify "^3.0.0"
-
 make-dir@^2.0.0, make-dir@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
@@ -7209,6 +7333,13 @@ make-dir@^2.0.0, make-dir@^2.1.0:
     pify "^4.0.1"
     semver "^5.6.0"
 
+make-dir@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
+  integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
+  dependencies:
+    semver "^6.0.0"
+
 make-dir@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.0.2.tgz#04a1acbf22221e1d6ef43559f43e05a90dbb4392"
@@ -7237,17 +7368,6 @@ make-fetch-happen@^5.0.0:
     socks-proxy-agent "^4.0.0"
     ssri "^6.0.0"
 
-mamacro@^0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4"
-  integrity sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==
-
-map-age-cleaner@^0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.2.tgz#098fb15538fd3dbe461f12745b0ca8568d4e3f74"
-  dependencies:
-    p-defer "^1.0.0"
-
 map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
@@ -7274,15 +7394,7 @@ media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
 
-mem@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/mem/-/mem-4.0.0.tgz#6437690d9471678f6cc83659c00cbafcd6b0cdaf"
-  dependencies:
-    map-age-cleaner "^0.1.1"
-    mimic-fn "^1.0.0"
-    p-is-promise "^1.1.0"
-
-memory-fs@^0.4.0, memory-fs@^0.4.1:
+memory-fs@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
   dependencies:
@@ -7313,6 +7425,11 @@ merge-stream@^2.0.0:
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
   integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
 
+merge2@^1.3.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
+  integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
+
 methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
@@ -7453,19 +7570,15 @@ mime@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/mime/-/mime-2.3.1.tgz#b1621c54d63b97c47d3cfe7f7215f7d64517c369"
 
-mimic-fn@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"
-
 mimic-fn@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
-mini-css-extract-plugin@0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.0.tgz#47f2cf07aa165ab35733b1fc97d4c46c0564339e"
-  integrity sha512-lp3GeY7ygcgAmVIcRPBVhIkf8Us7FZjA+ILpal44qLdSu11wmjKQ3d9k15lfD7pO4esu9eUIAW7qiYIBppv40A==
+mini-css-extract-plugin@0.10.0:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.10.0.tgz#a0e6bfcad22a9c73f6c882a3c7557a98e2d3d27d"
+  integrity sha512-QgKgJBjaJhxVPwrLNqqwNS0AGkuQQ31Hp4xGXEK/P7wehEg6qmNtReHKai3zRXqY60wGVWLYcOMJK2b98aGc3A==
   dependencies:
     loader-utils "^1.1.0"
     normalize-url "1.9.1"
@@ -7480,7 +7593,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
 
-minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
+minimatch@3.0.4, 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:
@@ -7568,10 +7681,10 @@ minizlib@^1.2.1:
   dependencies:
     minipass "^2.9.0"
 
-minizlib@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.0.tgz#fd52c645301ef09a63a2c209697c294c6ce02cf3"
-  integrity sha512-EzTZN/fjSvifSX0SlqUERCN39o6T40AMarPbv0MrarSFtIITCBh7bi+dU8nxGFHuqs9jdIAeoYoKuQAAASsPPA==
+minizlib@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
+  integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
   dependencies:
     minipass "^3.0.0"
     yallist "^4.0.0"
@@ -7596,6 +7709,11 @@ mitt@^1.1.3:
   resolved "https://registry.yarnpkg.com/mitt/-/mitt-1.2.0.tgz#cb24e6569c806e31bd4e3995787fe38a04fdf90d"
   integrity sha512-r6lj77KlwqLhIUku9UWYes7KJtsczvolZkzp8hbaDPPaE24OmWl5s539Mytlj22siEQKosZ26qCBgda2PKwoJw==
 
+mitt@^2.0.1:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/mitt/-/mitt-2.1.0.tgz#f740577c23176c6205b121b2973514eade1b2230"
+  integrity sha512-ILj2TpLiysu2wkBbWjAmww7TkZb65aiQO+DkVdUTBpBXq+MHYiETENkKFMtsJZX1Lf4pe4QOrTSjIfUwN5lRdg==
+
 mixin-deep@^1.2.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.0.tgz#47a8732ba97799457c8c1eca28f95132d7e8150a"
@@ -7612,20 +7730,20 @@ mkdirp@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.3.0.tgz#1bbf5ab1ba827af23575143490426455f481fe1e"
 
-mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1, mkdirp@~0.5.x:
+mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, 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"
 
-mkdirp@^0.5.3:
+mkdirp@^0.5.3, mkdirp@^0.5.5:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
   integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
   dependencies:
     minimist "^1.2.5"
 
-mkdirp@^1.0.3:
+mkdirp@^1.0.3, mkdirp@^1.0.4, mkdirp@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
@@ -7728,6 +7846,11 @@ nanomatch@^1.2.9:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
+native-request@^1.0.5:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/native-request/-/native-request-1.0.7.tgz#ff742dc555b4c8f2f1c14b548639ba174e573856"
+  integrity sha512-9nRjinI9bmz+S7dgNtf4A70+/vPhnd+2krGpy4SUlADuOuSa24IDkNaZ+R/QT1wQ6S8jBdi6wE7fLekFZNfUpQ==
+
 needle@^2.2.1:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.4.tgz#51931bff82533b1928b7d1d69e01f1b00ffd2a4e"
@@ -7749,11 +7872,21 @@ neo-async@^2.5.0:
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.1.tgz#acb909e327b1e87ec9ef15f41b8a269512ad41ee"
 
-neo-async@^2.6.0, neo-async@^2.6.1:
+neo-async@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
   integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==
 
+neo-async@^2.6.2:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
+  integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
+
+next-tick@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
+  integrity sha1-yobR/ogoFpsBICCOPchCS524NCw=
+
 nice-try@^1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
@@ -7832,22 +7965,6 @@ node-pre-gyp@^0.6.36:
     tar "^2.2.1"
     tar-pack "^3.4.0"
 
-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"
-
 node-releases@^1.1.49:
   version "1.1.50"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.50.tgz#803c40d2c45db172d0410e4efec83aa8c6ad0592"
@@ -7867,6 +7984,11 @@ node-releases@^1.1.53:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.54.tgz#0a6b3916a7ddfd9656983fcde82cf38d1dbe1a6f"
   integrity sha512-tLzytKpgwKQr37yw9CEODjNM9lnmsNxzlv575GzOZ16AgMvPcJis/DgrJX4UEV1KIYoXk6XoVfY6YaMOPJESAQ==
 
+node-releases@^1.1.61:
+  version "1.1.61"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.61.tgz#707b0fca9ce4e11783612ba4a2fcba09047af16e"
+  integrity sha512-DD5vebQLg8jLCOzwupn954fbIiZht05DAZs0k2u8NStSe6h9XdsuIQL8hSRKYiU8WUQRznmSDrKGbv3ObOmC7g==
+
 nopt@3.0.x:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
@@ -7989,10 +8111,10 @@ npm-packlist@^1.1.6:
     ignore-walk "^3.0.1"
     npm-bundled "^1.0.1"
 
-npm-pick-manifest@6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-6.0.0.tgz#bfde7abe95f2670aed1629a3c18245ccb3cc2eb8"
-  integrity sha512-PdJpXMvjqt4nftNEDpCgjBUF8yI3Q3MyuAmVB9nemnnCg32F4BPL/JFBfdj8DubgHCYUFQhtLWmBPvdsFtjWMg==
+npm-pick-manifest@6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-6.1.0.tgz#2befed87b0fce956790f62d32afb56d7539c022a"
+  integrity sha512-ygs4k6f54ZxJXrzT0x34NybRlLeZ4+6nECAIbr2i0foTnijtS1TJiyzpqtuUAJOps/hO0tNDr8fRV5g+BtRlTw==
   dependencies:
     npm-install-checks "^4.0.0"
     npm-package-arg "^8.0.0"
@@ -8055,7 +8177,7 @@ nwsapi@^2.2.0:
   resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
   integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==
 
-oauth-sign@~0.8.1, oauth-sign@~0.8.2:
+oauth-sign@~0.8.1:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
 
@@ -8093,7 +8215,7 @@ object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1:
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
-object-path@^0.11.4:
+object-path@0.11.4, object-path@^0.11.4:
   version "0.11.4"
   resolved "https://registry.yarnpkg.com/object-path/-/object-path-0.11.4.tgz#370ae752fbf37de3ea70a861c23bba8915691949"
   integrity sha1-NwrnUvvzfePqcKhhwju6iRVpGUk=
@@ -8194,10 +8316,10 @@ open@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/open/-/open-0.0.5.tgz#42c3e18ec95466b6bf0dc42f3a2945c3f0cad8fc"
 
-open@7.0.3:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/open/-/open-7.0.3.tgz#db551a1af9c7ab4c7af664139930826138531c48"
-  integrity sha512-sP2ru2v0P290WFfv49Ap8MF6PkzGNnGlAwHweB4WR4mr5d2d0woiCluUeJ218w7/+PmoBy9JmYgD5A4mLcWOFA==
+open@7.2.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/open/-/open-7.2.0.tgz#212959bd7b0ce2e8e3676adc76e3cf2f0a2498b4"
+  integrity sha512-4HeyhxCvBTI5uBePsAdi55C5fmqnWZ2e2MlmvWi5KW5tdH5rxoiv/aMtbeVxKZc3eWkT1GymMnLG8XC4Rq4TDQ==
   dependencies:
     is-docker "^2.0.0"
     is-wsl "^2.1.1"
@@ -8232,7 +8354,7 @@ opn@^5.5.0:
   dependencies:
     is-wsl "^1.1.0"
 
-optimist@^0.6.1, optimist@~0.6.0, optimist@~0.6.1:
+optimist@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
   integrity sha1-2j6nRob6IaGaERwybpDrFaAZZoY=
@@ -8256,16 +8378,16 @@ options@>=0.0.5:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f"
 
-ora@4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/ora/-/ora-4.0.3.tgz#752a1b7b4be4825546a7a3d59256fa523b6b6d05"
-  integrity sha512-fnDebVFyz309A73cqCipVL1fBZewq4vwgSHfxh43vVy31mbyoQ8sCH3Oeaog/owYOs/lLlGVPCISQonTneg6Pg==
+ora@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/ora/-/ora-5.0.0.tgz#4f0b34f2994877b49b452a707245ab1e9f6afccb"
+  integrity sha512-s26qdWqke2kjN/wC4dy+IQPBIMWBJlSU/0JZhk30ZDBLelW25rv66yutUWARMigpGPzcXHb+Nac5pNhN/WsARw==
   dependencies:
-    chalk "^3.0.0"
+    chalk "^4.1.0"
     cli-cursor "^3.1.0"
-    cli-spinners "^2.2.0"
+    cli-spinners "^2.4.0"
     is-interactive "^1.0.0"
-    log-symbols "^3.0.0"
+    log-symbols "^4.0.0"
     mute-stream "0.0.8"
     strip-ansi "^6.0.0"
     wcwidth "^1.0.1"
@@ -8292,14 +8414,6 @@ os-locale@^1.4.0:
   dependencies:
     lcid "^1.0.0"
 
-os-locale@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.0.1.tgz#3b014fbf01d87f60a1e5348d80fe870dc82c4620"
-  dependencies:
-    execa "^0.10.0"
-    lcid "^2.0.0"
-    mem "^4.0.0"
-
 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"
@@ -8318,18 +8432,10 @@ osenv@^0.1.5:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
 
-p-defer@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
-
 p-finally@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
 
-p-is-promise@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e"
-
 p-limit@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
@@ -8343,17 +8449,17 @@ p-limit@^2.0.0:
   dependencies:
     p-try "^2.0.0"
 
-p-limit@^2.2.0, p-limit@^2.2.1:
+p-limit@^2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.1.tgz#aa07a788cc3151c939b5131f63570f0dd2009537"
   integrity sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==
   dependencies:
     p-try "^2.0.0"
 
-p-limit@^2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.2.tgz#61279b67721f5287aa1c13a9a7fbbc48c9291b1e"
-  integrity sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==
+p-limit@^3.0.1, p-limit@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.0.2.tgz#1664e010af3cadc681baafd3e2a437be7b0fb5fe"
+  integrity sha512-iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg==
   dependencies:
     p-try "^2.0.0"
 
@@ -8382,10 +8488,10 @@ p-map@^2.0.0:
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"
   integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==
 
-p-map@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-3.0.0.tgz#d704d9af8a2ba684e2600d9a215983d4141a979d"
-  integrity sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==
+p-map@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
+  integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==
   dependencies:
     aggregate-error "^3.0.0"
 
@@ -8490,15 +8596,23 @@ parse-json@^4.0.0:
     error-ex "^1.3.1"
     json-parse-better-errors "^1.0.1"
 
-parse5@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
+parse5-htmlparser2-tree-adapter@6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz#2cdf9ad823321140370d4dbf5d3e92c7c8ddc6e6"
+  integrity sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==
+  dependencies:
+    parse5 "^6.0.1"
 
 parse5@5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178"
   integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==
 
+parse5@6.0.1, parse5@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
+  integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
+
 parsejson@0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/parsejson/-/parsejson-0.0.3.tgz#ab7e3759f209ece99437973f7d0f1f64ae0e64ab"
@@ -8588,11 +8702,10 @@ path-type@^1.0.0:
     pify "^2.0.0"
     pinkie-promise "^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"
+path-type@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
+  integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
 pbkdf2@^3.0.3:
   version "3.0.14"
@@ -8622,6 +8735,11 @@ picomatch@^2.0.4, picomatch@^2.0.5:
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.1.1.tgz#ecdfbea7704adb5fe6fb47f9866c4c0e15e905c5"
   integrity sha512-OYMyqkKzK7blWO/+XZYP6w8hH0LDvkBvdvKukti+7kqYFCiEAk+gI3DWnryapc0Dau05ugGTy0foQ6mqn4AHYA==
 
+picomatch@^2.2.1:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
+  integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
+
 pify@^2.0.0, pify@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
@@ -8651,7 +8769,7 @@ pkg-dir@^3.0.0:
   dependencies:
     find-up "^3.0.0"
 
-pkg-dir@^4.1.0:
+pkg-dir@^4.1.0, pkg-dir@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
   integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
@@ -8665,6 +8783,13 @@ pkg-up@^2.0.0:
   dependencies:
     find-up "^2.1.0"
 
+pnp-webpack-plugin@1.6.4:
+  version "1.6.4"
+  resolved "https://registry.yarnpkg.com/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.4.tgz#c9711ac4dc48a685dabafc86f8b6dd9f8df84149"
+  integrity sha512-7Wjy+9E3WwLOEL30D+m8TSTF7qJJUJLONBnwQp0518siuMxUQUbgZwssaFX+QKlZkjHZcw/IpZCt/H0srrntSg==
+  dependencies:
+    ts-pnp "^1.1.6"
+
 portfinder@^1.0.20:
   version "1.0.20"
   resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.20.tgz#bea68632e54b2e13ab7b0c4775e9b41bf270e44a"
@@ -8674,14 +8799,14 @@ portfinder@^1.0.20:
     debug "^2.2.0"
     mkdirp "0.5.x"
 
-portfinder@^1.0.25:
-  version "1.0.25"
-  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.25.tgz#254fd337ffba869f4b9d37edc298059cb4d35eca"
-  integrity sha512-6ElJnHBbxVA1XSLgBp7G1FiCkQdlqGzuF7DswL5tcea+E8UpuvPU7beVAjjRwCioTS9ZluNbu+ZyRvgTsmqEBg==
+portfinder@^1.0.26:
+  version "1.0.28"
+  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778"
+  integrity sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==
   dependencies:
     async "^2.6.2"
     debug "^3.1.1"
-    mkdirp "^0.5.1"
+    mkdirp "^0.5.5"
 
 portscanner@2.1.1:
   version "2.1.1"
@@ -8845,15 +8970,15 @@ postcss-modules-extract-imports@^2.0.0:
   dependencies:
     postcss "^7.0.5"
 
-postcss-modules-local-by-default@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.2.tgz#e8a6561be914aaf3c052876377524ca90dbb7915"
-  integrity sha512-jM/V8eqM4oJ/22j0gx4jrp63GSvDH6v86OqyTHHUvk4/k1vceipZsaymiZ5PvocqZOl5SFHiFJqjs3la0wnfIQ==
+postcss-modules-local-by-default@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz#bb14e0cc78279d504dbdcbfd7e0ca28993ffbbb0"
+  integrity sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw==
   dependencies:
     icss-utils "^4.1.1"
-    postcss "^7.0.16"
+    postcss "^7.0.32"
     postcss-selector-parser "^6.0.2"
-    postcss-value-parser "^4.0.0"
+    postcss-value-parser "^4.1.0"
 
 postcss-modules-scope@^2.2.0:
   version "2.2.0"
@@ -9027,20 +9152,29 @@ 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-value-parser@^4.0.0, postcss-value-parser@^4.0.3:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb"
-  integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==
-
 postcss-value-parser@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz#482282c09a42706d1fc9a069b73f44ec08391dc9"
   integrity sha512-LmeoohTpp/K4UiyQCwuGWlONxXamGzCMtFxLq4W1nZVGIQLYvMCJx3yAF9qyyuFpflABI9yVdtJAqbihOsCsJQ==
 
-postcss@7.0.27, postcss@^7.0.27:
-  version "7.0.27"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.27.tgz#cc67cdc6b0daa375105b7c424a85567345fc54d9"
-  integrity sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==
+postcss-value-parser@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb"
+  integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==
+
+postcss@7.0.21:
+  version "7.0.21"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.21.tgz#06bb07824c19c2021c5d056d5b10c35b989f7e17"
+  integrity sha512-uIFtJElxJo29QC753JzhidoAhvp/e/Exezkdhfmt8AymWT6/5B7W1WmponYWkHk2eg6sONyTch0A3nkMPun3SQ==
+  dependencies:
+    chalk "^2.4.2"
+    source-map "^0.6.1"
+    supports-color "^6.1.0"
+
+postcss@7.0.32:
+  version "7.0.32"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.32.tgz#4310d6ee347053da3433db2be492883d62cec59d"
+  integrity sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==
   dependencies:
     chalk "^2.4.2"
     source-map "^0.6.1"
@@ -9054,7 +9188,7 @@ postcss@^7.0.0, postcss@^7.0.1:
     source-map "^0.6.1"
     supports-color "^5.5.0"
 
-postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.26, postcss@^7.0.5, postcss@^7.0.6:
+postcss@^7.0.14, postcss@^7.0.5, postcss@^7.0.6:
   version "7.0.29"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.29.tgz#d3a903872bd52280b83bce38cdc83ce55c06129e"
   integrity sha512-ba0ApvR3LxGvRMMiUa9n0WR4HjzcYm7tS+ht4/2Nd0NLtHpPIH77fuB9Xh1/yJVz9O/E/95Y/dn8ygWsyffXtw==
@@ -9063,6 +9197,24 @@ postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.26, postcss@^7.0.5, postcss@^7.0.
     source-map "^0.6.1"
     supports-color "^6.1.0"
 
+postcss@^7.0.27:
+  version "7.0.27"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.27.tgz#cc67cdc6b0daa375105b7c424a85567345fc54d9"
+  integrity sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==
+  dependencies:
+    chalk "^2.4.2"
+    source-map "^0.6.1"
+    supports-color "^6.1.0"
+
+postcss@^7.0.32:
+  version "7.0.34"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.34.tgz#f2baf57c36010df7de4009940f21532c16d65c20"
+  integrity sha512-H/7V2VeNScX9KE83GDrDZNiGT1m2H+UTnlinIzhjlLX9hfMUn1mHNnGeX81a1c8JSBdBvqk7c2ZOG6ZPn5itGw==
+  dependencies:
+    chalk "^2.4.2"
+    source-map "^0.6.1"
+    supports-color "^6.1.0"
+
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
@@ -9113,12 +9265,6 @@ promise-retry@^1.1.1:
     err-code "^1.0.0"
     retry "^0.10.0"
 
-promise@^7.1.1:
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
-  dependencies:
-    asap "~2.0.3"
-
 protoduck@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/protoduck/-/protoduck-5.0.1.tgz#03c3659ca18007b69a50fd82a7ebcc516261151f"
@@ -9126,10 +9272,10 @@ protoduck@^5.0.1:
   dependencies:
     genfun "^5.0.0"
 
-protractor@~5.4.3:
-  version "5.4.3"
-  resolved "https://registry.yarnpkg.com/protractor/-/protractor-5.4.3.tgz#35f050741e404a45868618ea648745d89af31683"
-  integrity sha512-7pMAolv8Ah1yJIqaorDTzACtn3gk7BamVKPTeO5lqIGOrfosjPgXFx/z1dqSI+m5EeZc2GMJHPr5DYlodujDNA==
+protractor@~7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/protractor/-/protractor-7.0.0.tgz#c3e263608bd72e2c2dc802b11a772711a4792d03"
+  integrity sha512-UqkFjivi4GcvUQYzqGYNe0mLzfn5jiLmO8w9nMhQoJRLhy2grJonpga2IWhI6yJO30LibWXJJtA4MOIZD2GgZw==
   dependencies:
     "@types/q" "^0.0.32"
     "@types/selenium-webdriver" "^3.0.0"
@@ -9139,13 +9285,13 @@ protractor@~5.4.3:
     glob "^7.0.3"
     jasmine "2.8.0"
     jasminewd2 "^2.1.0"
-    optimist "~0.6.0"
     q "1.4.1"
     saucelabs "^1.5.0"
     selenium-webdriver "3.6.0"
     source-map-support "~0.4.0"
     webdriver-js-extender "2.1.0"
-    webdriver-manager "^12.0.6"
+    webdriver-manager "^12.1.7"
+    yargs "^15.3.1"
 
 proxy-addr@~2.0.5:
   version "2.0.5"
@@ -9227,15 +9373,18 @@ punycode@^2.1.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
-puppeteer@3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-3.3.0.tgz#95839af9fdc0aa4de7e5ee073a4c0adeb9e2d3d7"
-  integrity sha512-23zNqRltZ1PPoK28uRefWJ/zKb5Jhnzbbwbpcna2o5+QMn17F0khq5s1bdH3vPlyj+J36pubccR8wiNA/VE0Vw==
+puppeteer@5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-5.1.0.tgz#e7bae2caa6e3a13a622755e4c27689d9812c38ca"
+  integrity sha512-IZBFG8XcA+oHxYo5rEpJI/HQignUis2XPijPoFpNxla2O+WufonGsUsSqrhRXgBKOME5zNfhRdUY2LvxAiKlhw==
   dependencies:
     debug "^4.1.0"
+    devtools-protocol "0.0.767361"
     extract-zip "^2.0.0"
     https-proxy-agent "^4.0.0"
     mime "^2.0.3"
+    mitt "^2.0.1"
+    pkg-dir "^4.2.0"
     progress "^2.0.1"
     proxy-from-env "^1.0.0"
     rimraf "^3.0.2"
@@ -9269,7 +9418,7 @@ qs@6.2.3:
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.3.tgz#1cfcb25c10a9b2b483053ff39f5dfc9233908cfe"
   integrity sha1-HPyyXBCpsrSDBT/zn138kjOQjP4=
 
-qs@6.5.1, "qs@>= 0.4.0", qs@~6.5.1:
+qs@6.5.1, "qs@>= 0.4.0":
   version "6.5.1"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
 
@@ -9326,6 +9475,13 @@ randombytes@^2.0.0, randombytes@^2.0.1:
   dependencies:
     safe-buffer "^5.1.0"
 
+randombytes@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
+  integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
+  dependencies:
+    safe-buffer "^5.1.0"
+
 range-parser@^1.2.0, range-parser@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
@@ -9364,13 +9520,13 @@ raw-body@^2.3.2:
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
-raw-loader@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-4.0.0.tgz#d639c40fb9d72b5c7f8abc1fb2ddb25b29d3d540"
-  integrity sha512-iINUOYvl1cGEmfoaLjnZXt4bKfT2LJnZZib5N/LLyAphC+Dd11vNP9CNVb38j+SAJpFI1uo8j9frmih53ASy7Q==
+raw-loader@4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-4.0.1.tgz#14e1f726a359b68437e183d5a5b7d33a3eba6933"
+  integrity sha512-baolhQBSi3iNh1cglJjA0mYzga+wePk7vdEX//1dTFd+v4TsQlQE0jitJSNF1OIP82rdYulH7otaVmdlDaJ64A==
   dependencies:
-    loader-utils "^1.2.3"
-    schema-utils "^2.5.0"
+    loader-utils "^2.0.0"
+    schema-utils "^2.6.5"
 
 rc@^1.1.7:
   version "1.2.2"
@@ -9530,6 +9686,13 @@ readdirp@~3.2.0:
   dependencies:
     picomatch "^2.0.4"
 
+readdirp@~3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.4.0.tgz#9fdccdf9e9155805449221ac645e8303ab5b9ada"
+  integrity sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==
+  dependencies:
+    picomatch "^2.2.1"
+
 reflect-metadata@^0.1.2:
   version "0.1.10"
   resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.10.tgz#b4f83704416acad89988c9b15635d47e03b9344a"
@@ -9553,16 +9716,16 @@ regenerate@^1.2.1, regenerate@^1.4.0:
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
   integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==
 
-regenerator-runtime@0.13.5, regenerator-runtime@^0.13.4:
+regenerator-runtime@0.13.7:
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55"
+  integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==
+
+regenerator-runtime@^0.13.4:
   version "0.13.5"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697"
   integrity sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==
 
-regenerator-runtime@^0.13.2:
-  version "0.13.3"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz#7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5"
-  integrity sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==
-
 regenerator-transform@^0.14.2:
   version "0.14.4"
   resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.4.tgz#5266857896518d1616a78a0479337a30ea974cc7"
@@ -9590,6 +9753,11 @@ regex-not@^1.0.2:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
 
+regex-parser@2.2.10:
+  version "2.2.10"
+  resolved "https://registry.yarnpkg.com/regex-parser/-/regex-parser-2.2.10.tgz#9e66a8f73d89a107616e63b39d4deddfee912b37"
+  integrity sha512-8t6074A68gHfU8Neftl0Le6KTDwfGAj7IyjPIMSfikI2wJUTHDMaIq42bUsfVnj8mhx0R+45rdUXHGpN164avA==
+
 regexpu-core@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-1.0.0.tgz#86a763f58ee4d7c2f6b102e4764050de7ed90c6b"
@@ -9709,34 +9877,7 @@ request@2.81.0:
     tunnel-agent "^0.6.0"
     uuid "^3.0.0"
 
-request@^2.83.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.87.0, request@^2.88.0:
+request@^2.87.0:
   version "2.88.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
   integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
@@ -9819,6 +9960,22 @@ resolve-from@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
 
+resolve-url-loader@3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/resolve-url-loader/-/resolve-url-loader-3.1.1.tgz#28931895fa1eab9be0647d3b2958c100ae3c0bf0"
+  integrity sha512-K1N5xUjj7v0l2j/3Sgs5b8CjrrgtC70SmdCuZiJ8tSyb5J+uk3FoeZ4b7yTnH6j7ngI+Bc5bldHJIa8hYdu2gQ==
+  dependencies:
+    adjust-sourcemap-loader "2.0.0"
+    camelcase "5.3.1"
+    compose-function "3.0.3"
+    convert-source-map "1.7.0"
+    es6-iterator "2.0.3"
+    loader-utils "1.2.3"
+    postcss "7.0.21"
+    rework "1.0.1"
+    rework-visit "1.0.0"
+    source-map "0.6.1"
+
 resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
@@ -9842,6 +9999,13 @@ resolve@^1.3.2:
   dependencies:
     path-parse "^1.0.5"
 
+resolve@^1.8.1:
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444"
+  integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==
+  dependencies:
+    path-parse "^1.0.6"
+
 resp-modifier@6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/resp-modifier/-/resp-modifier-6.0.2.tgz#b124de5c4fbafcba541f48ffa73970f4aa456b4f"
@@ -9870,6 +10034,24 @@ retry@^0.12.0:
   resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
   integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=
 
+reusify@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
+  integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
+
+rework-visit@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/rework-visit/-/rework-visit-1.0.0.tgz#9945b2803f219e2f7aca00adb8bc9f640f842c9a"
+  integrity sha1-mUWygD8hni96ygCtuLyfZA+ELJo=
+
+rework@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/rework/-/rework-1.0.1.tgz#30806a841342b54510aa4110850cd48534144aa7"
+  integrity sha1-MIBqhBNCtUUQqkEQhQzUhTQUSqc=
+  dependencies:
+    convert-source-map "^0.3.3"
+    css "^2.0.0"
+
 rfdc@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.1.2.tgz#e6e72d74f5dc39de8f538f65e00c36c18018e349"
@@ -9904,13 +10086,6 @@ rimraf@^2.6.3:
   dependencies:
     glob "^7.1.3"
 
-rimraf@^2.7.1:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
-  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
-  dependencies:
-    glob "^7.1.3"
-
 rimraf@~2.2.6:
   version "2.2.8"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582"
@@ -9967,10 +10142,10 @@ rollup-pluginutils@^2.8.2:
   dependencies:
     estree-walker "^0.6.1"
 
-rollup@2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.1.0.tgz#552e248e397a06b9c6db878c0564ca4ee06729c9"
-  integrity sha512-gfE1455AEazVVTJoeQtcOq/U6GSxwoj4XPSWVsuWmgIxj7sBQNLDOSA82PbdMe+cP8ql8fR1jogPFe8Wg8g4SQ==
+rollup@2.26.5:
+  version "2.26.5"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.26.5.tgz#5562ec36fcba3eed65cfd630bd78e037ad0e0307"
+  integrity sha512-rCyFG3ZtQdnn9YwfuAVH0l/Om34BdO5lwCA0W6Hq+bNB21dVEBbCRxhaHOmu1G7OBFDWytbzAC104u7rxHwGjA==
   optionalDependencies:
     fsevents "~2.1.2"
 
@@ -9988,6 +10163,11 @@ run-async@^2.4.0:
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
   integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
 
+run-parallel@^1.1.9:
+  version "1.1.9"
+  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.9.tgz#c9dd3a7cf9f4b2c4b6244e173a6ed866e61dd679"
+  integrity sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==
+
 run-queue@^1.0.0, run-queue@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
@@ -9998,17 +10178,10 @@ rx@4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
 
-rxjs@6.5.3, rxjs@^6.5.2:
-  version "6.5.3"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.3.tgz#510e26317f4db91a7eb1de77d9dd9ba0a4899a3a"
-  integrity sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==
-  dependencies:
-    tslib "^1.9.0"
-
-rxjs@6.5.4, rxjs@^6.5.3, rxjs@~6.5.4:
-  version "6.5.4"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.4.tgz#e0777fe0d184cec7872df147f303572d414e211c"
-  integrity sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==
+rxjs@6.6.2:
+  version "6.6.2"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.2.tgz#8096a7ac03f2cc4fe5860ef6e572810d9e01c0d2"
+  integrity sha512-BHdBMVoWC2sL26w//BCu3YzKT4s2jip/WhwsGEDmeKYBhKDZeYezVUnHatYB7L85v5xs0BAQmg6BEYJEKxBabg==
   dependencies:
     tslib "^1.9.0"
 
@@ -10019,6 +10192,20 @@ rxjs@^5.5.6:
   dependencies:
     symbol-observable "1.0.1"
 
+rxjs@^6.5.2:
+  version "6.5.3"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.3.tgz#510e26317f4db91a7eb1de77d9dd9ba0a4899a3a"
+  integrity sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==
+  dependencies:
+    tslib "^1.9.0"
+
+rxjs@^6.5.3, rxjs@^6.5.5, rxjs@^6.6.0, rxjs@~6.6.0:
+  version "6.6.3"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.3.tgz#8ca84635c4daa900c0d3967a6ee7ac60271ee552"
+  integrity sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==
+  dependencies:
+    tslib "^1.9.0"
+
 safe-buffer@5.1.2, safe-buffer@^5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
@@ -10039,25 +10226,25 @@ safe-regex@^1.1.0:
   dependencies:
     ret "~0.1.10"
 
-"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.1.2:
+"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
 
-sass-loader@8.0.2:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-8.0.2.tgz#debecd8c3ce243c76454f2e8290482150380090d"
-  integrity sha512-7o4dbSK8/Ol2KflEmSco4jTjQoV988bM82P9CZdmo9hR3RLnvNc0ufMNdMrB0caq38JQ/FgF4/7RcbcfKzxoFQ==
+sass-loader@10.0.1:
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.0.1.tgz#10c0364d8034f22fee25ddcc9eded20f99bbe3b4"
+  integrity sha512-b2PSldKVTS3JcFPHSrEXh3BeAfR7XknGiGCAO5aHruR3Pf3kqLP3Gb2ypXLglRrAzgZkloNxLZ7GXEGDX0hBUQ==
   dependencies:
-    clone-deep "^4.0.1"
-    loader-utils "^1.2.3"
-    neo-async "^2.6.1"
-    schema-utils "^2.6.1"
-    semver "^6.3.0"
+    klona "^2.0.3"
+    loader-utils "^2.0.0"
+    neo-async "^2.6.2"
+    schema-utils "^2.7.0"
+    semver "^7.3.2"
 
-sass@1.26.3:
-  version "1.26.3"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.26.3.tgz#412df54486143b76b5a65cdf7569e86f44659f46"
-  integrity sha512-5NMHI1+YFYw4sN3yfKjpLuV9B5l7MqQ6FlkTcC4FT+oHbBRUZoSjHrrt/mE0nFXJyY2kQtU9ou9HxvFVjLFuuw==
+sass@1.26.10:
+  version "1.26.10"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.26.10.tgz#851d126021cdc93decbf201d1eca2a20ee434760"
+  integrity sha512-bzN0uvmzfsTvjz0qwccN1sPm2HxxpNI/Xa+7PlUEMS+nQvbyuEK7Y0qFqxlPHhiNHb1Ze8WQJtU31olMObkAMw==
   dependencies:
     chokidar ">=2.0.0 <4.0.0"
 
@@ -10086,7 +10273,7 @@ schema-utils@^1.0.0:
     ajv-errors "^1.0.0"
     ajv-keywords "^3.1.0"
 
-schema-utils@^2.5.0, schema-utils@^2.6.5:
+schema-utils@^2.6.5:
   version "2.6.6"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.6.tgz#299fe6bd4a3365dc23d99fd446caff8f1d6c330c"
   integrity sha512-wHutF/WPSbIi9x6ctjGGk2Hvl0VOz5l3EKEuKbjPlB30mKZUzb9A5k9yEXRX3pwyqVLPvpfZZEllaFq/M718hA==
@@ -10094,13 +10281,14 @@ schema-utils@^2.5.0, schema-utils@^2.6.5:
     ajv "^6.12.0"
     ajv-keywords "^3.4.1"
 
-schema-utils@^2.6.1, schema-utils@^2.6.4:
-  version "2.6.4"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.4.tgz#a27efbf6e4e78689d91872ee3ccfa57d7bdd0f53"
-  integrity sha512-VNjcaUxVnEeun6B2fiiUDjXXBtD4ZSH7pdbfIu1pOFwgptDPLMo/z9jr4sUfsjFVPqDCEin/F7IYlq7/E6yDbQ==
+schema-utils@^2.6.6, schema-utils@^2.7.0:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"
+  integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==
   dependencies:
-    ajv "^6.10.2"
-    ajv-keywords "^3.4.1"
+    "@types/json-schema" "^7.0.5"
+    ajv "^6.12.4"
+    ajv-keywords "^3.5.2"
 
 secure-compare@3.0.1:
   version "3.0.1"
@@ -10149,10 +10337,10 @@ semver@7.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
-semver@7.1.3:
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.1.3.tgz#e4345ce73071c53f336445cfc19efb1c311df2a6"
-  integrity sha512-ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA==
+semver@7.3.2, semver@^7.0.0, semver@^7.1.1, semver@^7.3.2:
+  version "7.3.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
+  integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
 
 semver@^5.0.0, semver@^5.5.0:
   version "5.5.0"
@@ -10163,6 +10351,11 @@ semver@^5.4.1, semver@^5.6.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
   integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
 
+semver@^5.5.1:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
+  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+
 semver@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.0.0.tgz#05e359ee571e5ad7ed641a6eec1e547ba52dea65"
@@ -10173,11 +10366,6 @@ semver@^6.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@^7.0.0, semver@^7.1.1:
-  version "7.3.2"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
-  integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
-
 send@0.15.2:
   version "0.15.2"
   resolved "https://registry.yarnpkg.com/send/-/send-0.15.2.tgz#f91fab4403bcf87e716f70ceb5db2f578bdc17d6"
@@ -10239,6 +10427,13 @@ serialize-javascript@^2.1.2:
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61"
   integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==
 
+serialize-javascript@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa"
+  integrity sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==
+  dependencies:
+    randombytes "^2.1.0"
+
 serve-index@1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.8.0.tgz#7c5d96c13fb131101f93c1c5774f8516a1e78d3b"
@@ -10353,13 +10548,6 @@ sha.js@^2.4.0, sha.js@^2.4.8:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
-shallow-clone@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3"
-  integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==
-  dependencies:
-    kind-of "^6.0.2"
-
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
@@ -10385,6 +10573,11 @@ slash@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
 
+slash@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
+  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
+
 smart-buffer@4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.0.2.tgz#5207858c3815cc69110703c6b94e46c15634395d"
@@ -10423,12 +10616,6 @@ sntp@1.x.x:
   dependencies:
     hoek "2.x.x"
 
-sntp@2.x.x:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8"
-  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"
@@ -10556,12 +10743,14 @@ sockjs-client@1.4.0:
     json3 "^3.3.2"
     url-parse "^1.4.3"
 
-sockjs@0.3.19:
-  version "0.3.19"
-  resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.19.tgz#d976bbe800af7bd20ae08598d582393508993c0d"
+sockjs@0.3.20:
+  version "0.3.20"
+  resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.20.tgz#b26a283ec562ef8b2687b44033a4eeceac75d855"
+  integrity sha512-SpmVOVpdq0DJc0qArhF3E5xsxvaiqGNb73XfgBpK1y3UD5gs8DSo8aCTsuT5pX8rssdc2NDIzANwP9eCAiSdTA==
   dependencies:
     faye-websocket "^0.10.0"
-    uuid "^3.0.1"
+    uuid "^3.4.0"
+    websocket-driver "0.6.5"
 
 socks-proxy-agent@^4.0.0:
   version "4.0.1"
@@ -10603,12 +10792,16 @@ source-map-explorer@^1.3.2:
     temp "^0.8.3"
     underscore "^1.8.3"
 
-source-map-loader@0.2.4:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-0.2.4.tgz#c18b0dc6e23bf66f6792437557c569a11e072271"
+source-map-loader@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-1.0.2.tgz#b0a6582b2eaa387ede1ecf8061ae0b93c23f9eb0"
+  integrity sha512-oX8d6ndRjN+tVyjj6PlXSyFPhDdVAPsZA30nD3/II8g4uOv8fCz0DMn5sy8KtVbDfKQxOpGwGJnK3xIW3tauDw==
   dependencies:
-    async "^2.5.0"
-    loader-utils "^1.1.0"
+    data-urls "^2.0.0"
+    iconv-lite "^0.6.2"
+    loader-utils "^2.0.0"
+    schema-utils "^2.7.0"
+    source-map "^0.6.1"
 
 source-map-resolve@^0.5.0:
   version "0.5.1"
@@ -10631,6 +10824,14 @@ source-map-resolve@^0.5.2:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
+source-map-support@0.5.19:
+  version "0.5.19"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
+  integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
 source-map-support@^0.5.5, source-map-support@^0.5.6:
   version "0.5.9"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.9.tgz#41bc953b2534267ea2d605bccfa7bfa3111ced5f"
@@ -10656,6 +10857,10 @@ 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@0.6.1, source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+
 source-map@0.7.3, source-map@^0.7.3:
   version "0.7.3"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
@@ -10664,10 +10869,6 @@ source-map@^0.5.0, source-map@^0.5.1, source-map@^0.5.6, source-map@^0.5.7:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
 
-source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
-
 sourcemap-codec@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.1.tgz#c8fd92d91889e902a07aee392bdd2c5863958ba2"
@@ -10712,10 +10913,10 @@ spdy-transport@^3.0.0:
     readable-stream "^3.0.6"
     wbuf "^1.7.3"
 
-spdy@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.1.tgz#6f12ed1c5db7ea4f24ebb8b89ba58c87c08257f2"
-  integrity sha512-HeZS3PBdMA+sZSu0qwpCxl3DeALD5ASx8pAX0jZdKXSpPWbQ6SYGnlg3BBmYLx5LtiZrmkAZfErCm2oECBcioA==
+spdy@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.2.tgz#b74f466203a3eda452c02492b91fb9e84a27677b"
+  integrity sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==
   dependencies:
     debug "^4.1.0"
     handle-thing "^2.0.0"
@@ -10723,10 +10924,10 @@ spdy@^4.0.1:
     select-hose "^2.0.0"
     spdy-transport "^3.0.0"
 
-speed-measure-webpack-plugin@1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.1.tgz#69840a5cdc08b4638697dac7db037f595d7f36a0"
-  integrity sha512-qVIkJvbtS9j/UeZumbdfz0vg+QfG/zxonAjzefZrqzkr7xOncLVXkeGbTpzd1gjCBM4PmVNkWlkeTVhgskAGSQ==
+speed-measure-webpack-plugin@1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.3.tgz#6ff894fc83e8a6310dde3af863a0329cd79da4f5"
+  integrity sha512-2ljD4Ch/rz2zG3HsLsnPfp23osuPBS0qPuz9sGpkNXTN1Ic4M+W9xB8l8rS8ob2cO4b1L+WTJw/0AJwWYVgcxQ==
   dependencies:
     chalk "^2.0.1"
 
@@ -10765,14 +10966,6 @@ ssri@^6.0.0, ssri@^6.0.1:
   dependencies:
     figgy-pudding "^3.5.1"
 
-ssri@^7.0.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-7.1.0.tgz#92c241bf6de82365b5c7fb4bd76e975522e1294d"
-  integrity sha512-77/WrDZUWocK0mvA5NTRQyveUf+wsrIc6vyrxpS8tVvYBcX215QbafrJR3KtkpskIzoFLqqNuuYQvxaMjXJ/0g==
-  dependencies:
-    figgy-pudding "^3.5.1"
-    minipass "^3.1.1"
-
 ssri@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.0.tgz#79ca74e21f8ceaeddfcb4b90143c458b8d988808"
@@ -10870,13 +11063,6 @@ 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@^2.1.1:
-  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-width@^3.0.0, string-width@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
@@ -10958,7 +11144,7 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-stringstream@~0.0.4, stringstream@~0.0.5:
+stringstream@~0.0.4:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
 
@@ -10968,12 +11154,6 @@ strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   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-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
@@ -10994,10 +11174,6 @@ strip-bom@^2.0.0:
   dependencies:
     is-utf8 "^0.2.0"
 
-strip-bom@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
-
 strip-eof@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
@@ -11006,13 +11182,13 @@ 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@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-1.1.3.tgz#9e826e69c683c4d9bf9db924f85e9abb30d5e200"
-  integrity sha512-rlkH7X/22yuwFYK357fMN/BxYOorfnfq0eD7+vqlemSK4wEcejFF1dg4zxP0euBW8NrYx2WZzZ8PPFevr7D+Kw==
+style-loader@1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-1.2.1.tgz#c5cbbfbf1170d076cfdd86e0109c5bba114baa1a"
+  integrity sha512-ByHSTQvHLkWE9Ir5+lGbVOXhxX10fbprhLvdg96wedFZb4NDekDPxVKv5Fwmio+QcMlkkNfuK+5W1peQ5CUhZg==
   dependencies:
-    loader-utils "^1.2.3"
-    schema-utils "^2.6.4"
+    loader-utils "^2.0.0"
+    schema-utils "^2.6.6"
 
 stylehacks@^4.0.0:
   version "4.0.3"
@@ -11031,18 +11207,18 @@ stylus-loader@3.0.2:
     lodash.clonedeep "^4.5.0"
     when "~3.6.x"
 
-stylus@0.54.7:
-  version "0.54.7"
-  resolved "https://registry.yarnpkg.com/stylus/-/stylus-0.54.7.tgz#c6ce4793965ee538bcebe50f31537bfc04d88cd2"
-  integrity sha512-Yw3WMTzVwevT6ZTrLCYNHAFmanMxdylelL3hkWNgPMeTCpMwpV3nXjpOHuBXtFv7aiO2xRuQS6OoAdgkNcSNug==
+stylus@0.54.8:
+  version "0.54.8"
+  resolved "https://registry.yarnpkg.com/stylus/-/stylus-0.54.8.tgz#3da3e65966bc567a7b044bfe0eece653e099d147"
+  integrity sha512-vr54Or4BZ7pJafo2mpf0ZcwA74rpuYCZbxrHBsH8kbcXOwSfvBFwsRfpGO5OD5fhG5HDCFW737PKaawI7OqEAg==
   dependencies:
     css-parse "~2.0.0"
     debug "~3.1.0"
-    glob "^7.1.3"
-    mkdirp "~0.5.x"
+    glob "^7.1.6"
+    mkdirp "~1.0.4"
     safer-buffer "^2.1.2"
     sax "~1.2.4"
-    semver "^6.0.0"
+    semver "^6.3.0"
     source-map "^0.7.3"
 
 supports-color@^2.0.0:
@@ -11196,15 +11372,15 @@ tar@^4.4.10:
     safe-buffer "^5.1.2"
     yallist "^3.0.3"
 
-tar@^6.0.1:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-6.0.2.tgz#5df17813468a6264ff14f766886c622b84ae2f39"
-  integrity sha512-Glo3jkRtPcvpDlAs/0+hozav78yoXKFr+c4wgw62NNMO3oo4AaJdCo21Uu7lcwr55h39W2XD1LMERc64wtbItg==
+tar@^6.0.2:
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-6.0.5.tgz#bde815086e10b39f1dcd298e89d596e1535e200f"
+  integrity sha512-0b4HOimQHj9nXNEAA7zWwMM91Zhhba3pspja6sQbgTpynOJf+bkjBnfybNYzbpLbnwXnbyB4LOREvlyXLkCHSg==
   dependencies:
     chownr "^2.0.0"
     fs-minipass "^2.0.0"
     minipass "^3.0.0"
-    minizlib "^2.1.0"
+    minizlib "^2.1.1"
     mkdirp "^1.0.3"
     yallist "^4.0.0"
 
@@ -11215,19 +11391,19 @@ temp@^0.8.3:
     os-tmpdir "^1.0.0"
     rimraf "~2.2.6"
 
-terser-webpack-plugin@2.3.5:
-  version "2.3.5"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.3.5.tgz#5ad971acce5c517440ba873ea4f09687de2f4a81"
-  integrity sha512-WlWksUoq+E4+JlJ+h+U+QUzXpcsMSSNXkDy9lBVkSqDn1w23Gg29L/ary9GeJVYCGiNJJX7LnVc4bwL1N3/g1w==
-  dependencies:
-    cacache "^13.0.1"
-    find-cache-dir "^3.2.0"
-    jest-worker "^25.1.0"
-    p-limit "^2.2.2"
-    schema-utils "^2.6.4"
-    serialize-javascript "^2.1.2"
+terser-webpack-plugin@4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-4.1.0.tgz#6e9d6ae4e1a900d88ddce8da6a47507ea61f44bc"
+  integrity sha512-0ZWDPIP8BtEDZdChbufcXUigOYk6dOX/P/X0hWxqDDcVAQLb8Yy/0FAaemSfax3PAA67+DJR778oz8qVbmy4hA==
+  dependencies:
+    cacache "^15.0.5"
+    find-cache-dir "^3.3.1"
+    jest-worker "^26.3.0"
+    p-limit "^3.0.2"
+    schema-utils "^2.6.6"
+    serialize-javascript "^4.0.0"
     source-map "^0.6.1"
-    terser "^4.4.3"
+    terser "^5.0.0"
     webpack-sources "^1.4.3"
 
 terser-webpack-plugin@^1.4.3:
@@ -11245,10 +11421,10 @@ terser-webpack-plugin@^1.4.3:
     webpack-sources "^1.4.0"
     worker-farm "^1.7.0"
 
-terser@4.6.10:
-  version "4.6.10"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.10.tgz#90f5bd069ff456ddbc9503b18e52f9c493d3b7c2"
-  integrity sha512-qbF/3UOo11Hggsbsqm2hPa6+L4w7bkr+09FNseEe8xrcVD3APGLFqE+Oz1ZKAxjYnFsj80rLOfgAtJ0LNJjtTA==
+terser@5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.3.0.tgz#c481f4afecdcc182d5e2bdd2ff2dc61555161e81"
+  integrity sha512-XTT3D3AwxC54KywJijmY2mxZ8nJiEjBHVYzq8l9OaYuRFWeQNBwvipuzzYEP4e+/AVcd1hqG/CqgsdIRyT45Fg==
   dependencies:
     commander "^2.20.0"
     source-map "~0.6.1"
@@ -11263,19 +11439,19 @@ terser@^4.1.2:
     source-map "~0.6.1"
     source-map-support "~0.5.12"
 
-terser@^4.4.3:
-  version "4.6.4"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.4.tgz#40a0b37afbe5b57e494536815efa68326840fc00"
-  integrity sha512-5fqgBPLgVHZ/fVvqRhhUp9YUiGXhFJ9ZkrZWD9vQtFBR4QIGTnbsb+/kKqSqfgp3WnBwGWAFnedGTtmX1YTn0w==
+terser@^4.6.2:
+  version "4.6.13"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.13.tgz#e879a7364a5e0db52ba4891ecde007422c56a916"
+  integrity sha512-wMvqukYgVpQlymbnNbabVZbtM6PN63AzqexpwJL8tbh/mRT9LE5o+ruVduAGL7D6Fpjl+Q+06U5I9Ul82odAhw==
   dependencies:
     commander "^2.20.0"
     source-map "~0.6.1"
     source-map-support "~0.5.12"
 
-terser@^4.6.2:
-  version "4.6.13"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.13.tgz#e879a7364a5e0db52ba4891ecde007422c56a916"
-  integrity sha512-wMvqukYgVpQlymbnNbabVZbtM6PN63AzqexpwJL8tbh/mRT9LE5o+ruVduAGL7D6Fpjl+Q+06U5I9Ul82odAhw==
+terser@^5.0.0:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.3.2.tgz#f4bea90eb92945b2a028ceef79181b9bb586e7af"
+  integrity sha512-H67sydwBz5jCUA32ZRL319ULu+Su1cAoZnnc+lXnenGRYWyLE3Scgkt8mNoAsMx0h5kdo758zdoS0LG9rYZXDQ==
   dependencies:
     commander "^2.20.0"
     source-map "~0.6.1"
@@ -11398,7 +11574,7 @@ tough-cookie@^3.0.1:
     psl "^1.1.28"
     punycode "^2.1.1"
 
-tough-cookie@~2.3.0, tough-cookie@~2.3.3:
+tough-cookie@~2.3.0:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561"
   dependencies:
@@ -11434,16 +11610,26 @@ ts-node@~8.3.0:
     source-map-support "^0.5.6"
     yn "^3.0.0"
 
-tslib@1.11.1, tslib@^1.11.1:
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35"
-  integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==
+ts-pnp@^1.1.6:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz#a500ad084b0798f1c3071af391e65912c86bca92"
+  integrity sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==
+
+tslib@2.0.1, tslib@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.1.tgz#410eb0d113e5b6356490eec749603725b021b43e"
+  integrity sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ==
 
 tslib@^1.10.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
   integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==
 
+tslib@^1.11.1:
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35"
+  integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==
+
 tslib@^1.8.1:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8"
@@ -11519,19 +11705,29 @@ type-is@~1.6.17, type-is@~1.6.18:
     media-typer "0.3.0"
     mime-types "~2.1.24"
 
+type@^1.0.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz#848dd7698dafa3e54a6c479e759c4bc3f18847a0"
+  integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==
+
+type@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/type/-/type-2.1.0.tgz#9bdc22c648cf8cf86dd23d32336a41cfb6475e3f"
+  integrity sha512-G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA==
+
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
-typescript@3.6.5:
-  version "3.6.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.6.5.tgz#dae20114a7b4ff4bd642db9c8c699f2953e8bbdb"
-  integrity sha512-BEjlc0Z06ORZKbtcxGrIvvwYs5hAnuo6TKdNFL55frVDlB+na3z5bsLhFaIxmT+dPWgBIjMo6aNnTOgHHmHgiQ==
+typescript@4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.2.tgz#7ea7c88777c723c681e33bf7988be5d008d05ac2"
+  integrity sha512-e4ERvRV2wb+rRZ/IQeb3jm2VxBsirQLpQhdxplZ2MEzGvDkkMmPglecnNDfSUBivMjP93vRbngYYDQqQ/78bcQ==
 
-typescript@~3.8.3:
-  version "3.8.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz#409eb8544ea0335711205869ec458ab109ee1061"
-  integrity sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==
+typescript@~4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.3.tgz#153bbd468ef07725c1df9c77e8b453f8d36abba5"
+  integrity sha512-tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg==
 
 ua-parser-js@0.7.12:
   version "0.7.12"
@@ -11547,14 +11743,6 @@ ua-parser-js@0.7.21:
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.21.tgz#853cf9ce93f642f67174273cc34565ae6f308777"
   integrity sha512-+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ==
 
-uglify-js@^3.1.4:
-  version "3.7.3"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.7.3.tgz#f918fce9182f466d5140f24bb0ff35c2d32dcc6a"
-  integrity sha512-7tINm46/3puUA4hCkKYo4Xdts+JDaVC9ZPRcG8Xw9R4nhO/gZgUM3TENq8IF4Vatk8qCig4MzP/c8G4u2BkVQg==
-  dependencies:
-    commander "~2.20.3"
-    source-map "~0.6.1"
-
 uid-number@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
@@ -11650,13 +11838,13 @@ unique-slug@^2.0.0:
   dependencies:
     imurmurhash "^0.1.4"
 
-universal-analytics@0.4.20:
-  version "0.4.20"
-  resolved "https://registry.yarnpkg.com/universal-analytics/-/universal-analytics-0.4.20.tgz#d6b64e5312bf74f7c368e3024a922135dbf24b03"
-  integrity sha512-gE91dtMvNkjO+kWsPstHRtSwHXz0l2axqptGYp5ceg4MsuurloM0PU3pdOfpb5zBXUvyjT4PwhWK2m39uczZuw==
+universal-analytics@0.4.23:
+  version "0.4.23"
+  resolved "https://registry.yarnpkg.com/universal-analytics/-/universal-analytics-0.4.23.tgz#d915e676850c25c4156762471bdd7cf2eaaca8ac"
+  integrity sha512-lgMIH7XBI6OgYn1woDEmxhGdj8yDefMKg7GkWdeATAlQZFrMrNyxSkpDzY57iY0/6fdlzTbBV03OawvvzG+q7A==
   dependencies:
-    debug "^3.0.0"
-    request "^2.88.0"
+    debug "^4.1.1"
+    request "^2.88.2"
     uuid "^3.0.0"
 
 universalify@^0.1.0:
@@ -11679,10 +11867,6 @@ unset-value@^1.0.0:
     has-value "^0.3.1"
     isobject "^3.0.0"
 
-upath@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
-
 upath@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.2.tgz#3db658600edaeeccbe6db5e684d67ee8c2acd068"
@@ -11774,23 +11958,24 @@ utils-merge@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
 
-uuid@7.0.2:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.2.tgz#7ff5c203467e91f5e0d85cfcbaaf7d2ebbca9be6"
-  integrity sha512-vy9V/+pKG+5ZTYKf+VcphF5Oc6EFiu3W8Nv3P3zIh0EqVI80ZxOzuPfe9EHjkFNvf8+xuTHVeei4Drydlx4zjw==
+uuid@8.3.0:
+  version "8.3.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.0.tgz#ab738085ca22dc9a8c92725e459b1d507df5d6ea"
+  integrity sha512-fX6Z5o4m6XsXBdli9g7DtWgAx+osMsRRZFKma1mIUsLCz6vRvv+pz5VNbyu9UEDzpMWulZfvpgb/cmDXVulYFQ==
 
-uuid@^3.0.0, uuid@^3.1.0:
+uuid@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"
 
-uuid@^3.0.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14"
-
 uuid@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
 
+uuid@^3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
+  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
+
 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"
@@ -11844,14 +12029,23 @@ w3c-xmlserializer@^2.0.0:
   dependencies:
     xml-name-validator "^3.0.0"
 
-watchpack@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"
-  integrity sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==
+watchpack-chokidar2@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz#9948a1866cbbd6cb824dea13a7ed691f6c8ddff0"
+  integrity sha512-9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA==
+  dependencies:
+    chokidar "^2.1.8"
+
+watchpack@^1.7.4:
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.4.tgz#6e9da53b3c80bb2d6508188f5b200410866cd30b"
+  integrity sha512-aWAgTW4MoSJzZPAicljkO1hsi1oKj/RRq/OJQh2PKI2UKL04c2Bs+MBOB+BBABHTXJpf9mCwHN7ANCvYsvY2sg==
   dependencies:
-    chokidar "^2.0.2"
     graceful-fs "^4.1.2"
     neo-async "^2.5.0"
+  optionalDependencies:
+    chokidar "^3.4.1"
+    watchpack-chokidar2 "^2.0.0"
 
 wbuf@^1.1.0:
   version "1.7.2"
@@ -11880,7 +12074,7 @@ webdriver-js-extender@2.1.0:
     "@types/selenium-webdriver" "^3.0.0"
     selenium-webdriver "^3.0.1"
 
-webdriver-manager@^12.0.6:
+webdriver-manager@^12.1.7:
   version "12.1.7"
   resolved "https://registry.yarnpkg.com/webdriver-manager/-/webdriver-manager-12.1.7.tgz#ed4eaee8f906b33c146e869b55e850553a1b1162"
   integrity sha512-XINj6b8CYuUYC93SG3xPkxlyUc3IJbD6Vvo75CVGuG9uzsefDzWQrhz0Lq8vbPxtb4d63CZdYophF8k8Or/YiA==
@@ -11913,10 +12107,10 @@ webpack-dev-middleware@3.7.2, webpack-dev-middleware@^3.7.2:
     range-parser "^1.2.1"
     webpack-log "^2.0.0"
 
-webpack-dev-server@3.10.3:
-  version "3.10.3"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.10.3.tgz#f35945036813e57ef582c2420ef7b470e14d3af0"
-  integrity sha512-e4nWev8YzEVNdOMcNzNeCN947sWJNd43E5XvsJzbAL08kGc2frm1tQ32hTJslRS+H65LCb/AaUCYU7fjHCpDeQ==
+webpack-dev-server@3.11.0:
+  version "3.11.0"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz#8f154a3bce1bcfd1cc618ef4e703278855e7ff8c"
+  integrity sha512-PUxZ+oSTxogFQgkTtFndEtJIPNmml7ExwufBZ9L2/Xyyd5PnOL5UreWe5ZT7IU25DSdykL9p1MLQzmLh2ljSeg==
   dependencies:
     ansi-html "0.0.7"
     bonjour "^3.5.0"
@@ -11926,31 +12120,31 @@ webpack-dev-server@3.10.3:
     debug "^4.1.1"
     del "^4.1.1"
     express "^4.17.1"
-    html-entities "^1.2.1"
+    html-entities "^1.3.1"
     http-proxy-middleware "0.19.1"
     import-local "^2.0.0"
     internal-ip "^4.3.0"
     ip "^1.1.5"
     is-absolute-url "^3.0.3"
     killable "^1.0.1"
-    loglevel "^1.6.6"
+    loglevel "^1.6.8"
     opn "^5.5.0"
     p-retry "^3.0.1"
-    portfinder "^1.0.25"
+    portfinder "^1.0.26"
     schema-utils "^1.0.0"
     selfsigned "^1.10.7"
     semver "^6.3.0"
     serve-index "^1.9.1"
-    sockjs "0.3.19"
+    sockjs "0.3.20"
     sockjs-client "1.4.0"
-    spdy "^4.0.1"
+    spdy "^4.0.2"
     strip-ansi "^3.0.1"
     supports-color "^6.1.0"
     url "^0.11.0"
     webpack-dev-middleware "^3.7.2"
     webpack-log "^2.0.0"
     ws "^6.2.1"
-    yargs "12.0.5"
+    yargs "^13.3.2"
 
 webpack-log@^2.0.0:
   version "2.0.0"
@@ -11996,42 +12190,49 @@ webpack-sources@^1.3.0:
     source-list-map "^2.0.0"
     source-map "~0.6.1"
 
-webpack-subresource-integrity@1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/webpack-subresource-integrity/-/webpack-subresource-integrity-1.4.0.tgz#44963a64c9a214ad729158e7f46d52c2525cc88a"
-  integrity sha512-GB1kB/LwAWC3CxwcedGhMkxGpNZxSheCe1q+KJP1bakuieAdX/rGHEcf5zsEzhKXpqsGqokgsDoD9dIkr61VDQ==
+webpack-subresource-integrity@1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/webpack-subresource-integrity/-/webpack-subresource-integrity-1.4.1.tgz#e8bf918b444277df46a66cd84542cbcdc5a6272d"
+  integrity sha512-XMLFInbGbB1HV7K4vHWANzc1CN0t/c4bBvnlvGxGwV45yE/S/feAXIm8dJsCkzqWtSKnmaEgTp/meyeThxG4Iw==
   dependencies:
     webpack-sources "^1.3.0"
 
-webpack@4.42.0:
-  version "4.42.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.42.0.tgz#b901635dd6179391d90740a63c93f76f39883eb8"
-  integrity sha512-EzJRHvwQyBiYrYqhyjW9AqM90dE4+s1/XtCfn7uWg6cS72zH+2VPFAlsnW0+W0cDi0XRjNKUMoJtpSi50+Ph6w==
+webpack@4.44.1:
+  version "4.44.1"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.44.1.tgz#17e69fff9f321b8f117d1fda714edfc0b939cc21"
+  integrity sha512-4UOGAohv/VGUNQJstzEywwNxqX417FnjZgZJpJQegddzPmTvph37eBIRbRTfdySXzVtJXLJfbMN3mMYhM6GdmQ==
   dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-module-context" "1.8.5"
-    "@webassemblyjs/wasm-edit" "1.8.5"
-    "@webassemblyjs/wasm-parser" "1.8.5"
-    acorn "^6.2.1"
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/helper-module-context" "1.9.0"
+    "@webassemblyjs/wasm-edit" "1.9.0"
+    "@webassemblyjs/wasm-parser" "1.9.0"
+    acorn "^6.4.1"
     ajv "^6.10.2"
     ajv-keywords "^3.4.1"
     chrome-trace-event "^1.0.2"
-    enhanced-resolve "^4.1.0"
+    enhanced-resolve "^4.3.0"
     eslint-scope "^4.0.3"
     json-parse-better-errors "^1.0.2"
     loader-runner "^2.4.0"
     loader-utils "^1.2.3"
     memory-fs "^0.4.1"
     micromatch "^3.1.10"
-    mkdirp "^0.5.1"
+    mkdirp "^0.5.3"
     neo-async "^2.6.1"
     node-libs-browser "^2.2.1"
     schema-utils "^1.0.0"
     tapable "^1.1.3"
     terser-webpack-plugin "^1.4.3"
-    watchpack "^1.6.0"
+    watchpack "^1.7.4"
     webpack-sources "^1.4.1"
 
+websocket-driver@0.6.5:
+  version "0.6.5"
+  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.6.5.tgz#5cb2556ceb85f4373c6d8238aa691c8454e13a36"
+  integrity sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=
+  dependencies:
+    websocket-extensions ">=0.1.1"
+
 websocket-driver@>=0.5.1:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.0.tgz#0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb"
@@ -12132,10 +12333,10 @@ worker-farm@^1.7.0:
   dependencies:
     errno "~0.1.7"
 
-worker-plugin@4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/worker-plugin/-/worker-plugin-4.0.2.tgz#0456dd7af1c0de64591326fd8a08c5d9f2b5b27a"
-  integrity sha512-V+1zSZMOOKk+uBzKyNIODLQLsx59zSIOaI75J1EMS0iR1qy+KQR3y/pQ3T0vIhvPfDFapGRMsoMvQNEL3okqSA==
+worker-plugin@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/worker-plugin/-/worker-plugin-5.0.0.tgz#113b5fe1f4a5d6a957cecd29915bedafd70bb537"
+  integrity sha512-AXMUstURCxDD6yGam2r4E34aJg6kW85IiaeX72hi+I1cxyaMUtrvVY6sbfpGKAj5e7f68Acl62BjQF5aOOx2IQ==
   dependencies:
     loader-utils "^1.1.0"
 
@@ -12253,7 +12454,7 @@ y18n@^3.2.0, y18n@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
 
-"y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0:
+y18n@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
 
@@ -12271,14 +12472,6 @@ yallist@^4.0.0:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
-yargs-parser@^11.1.1:
-  version "11.1.1"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"
-  integrity sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==
-  dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
-
 yargs-parser@^13.1.1:
   version "13.1.1"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz#d26058532aa06d365fe091f6a1fc06b2f7e5eca0"
@@ -12287,6 +12480,14 @@ yargs-parser@^13.1.1:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
+yargs-parser@^13.1.2:
+  version "13.1.2"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
+  integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==
+  dependencies:
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
+
 yargs-parser@^18.1.0, yargs-parser@^18.1.1:
   version "18.1.3"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
@@ -12301,24 +12502,6 @@ yargs-parser@^4.1.0, yargs-parser@^4.2.0:
   dependencies:
     camelcase "^3.0.0"
 
-yargs@12.0.5:
-  version "12.0.5"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
-  integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==
-  dependencies:
-    cliui "^4.0.0"
-    decamelize "^1.2.0"
-    find-up "^3.0.0"
-    get-caller-file "^1.0.1"
-    os-locale "^3.0.0"
-    require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
-    set-blocking "^2.0.0"
-    string-width "^2.0.0"
-    which-module "^2.0.0"
-    y18n "^3.2.1 || ^4.0.0"
-    yargs-parser "^11.1.1"
-
 yargs@15.3.0:
   version "15.3.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.3.0.tgz#403af6edc75b3ae04bf66c94202228ba119f0976"
@@ -12401,6 +12584,22 @@ yargs@^13.3.0:
     y18n "^4.0.0"
     yargs-parser "^13.1.1"
 
+yargs@^13.3.2:
+  version "13.3.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
+  integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==
+  dependencies:
+    cliui "^5.0.0"
+    find-up "^3.0.0"
+    get-caller-file "^2.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^2.0.0"
+    set-blocking "^2.0.0"
+    string-width "^3.0.0"
+    which-module "^2.0.0"
+    y18n "^4.0.0"
+    yargs-parser "^13.1.2"
+
 yargs@^15.3.1:
   version "15.3.1"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.3.1.tgz#9505b472763963e54afe60148ad27a330818e98b"
diff --git a/aio/tools/stackblitz-builder/README.md b/aio/tools/stackblitz-builder/README.md
index d5f0b763238a5..bd2673e573a97 100644
--- a/aio/tools/stackblitz-builder/README.md
+++ b/aio/tools/stackblitz-builder/README.md
@@ -1,6 +1,6 @@
 # Overview
 
-[Stackblitz](https://stackblitz.com/) is an online tool for creating, collaborating and sharing ideas. 
+[Stackblitz](https://stackblitz.com/) is an online tool for creating, collaborating and sharing ideas.
 In AIO we use it to share one or more runnable versions of our examples.
 
 Stackblitz can be used both on a separate page and in an embedded form.
@@ -8,24 +8,25 @@ Stackblitz can be used both on a separate page and in an embedded form.
 
 ## Stackblitz generation
 
-Both forms are created within `builder.js`. How is a stackblitz created? What is the process from a
-directory with files to a link with a stackblitz.
+Both forms are created within `builder.js`.
+How is a stackblitz created?
+What is the process from a directory with files to a link with a stackblitz.
 
-An "executable" stackblitz is an HTML file with a `<form>` that makes a post to stackblitz on submit. It
-contains an `<input>` element for each file we need in the stackblitz.
+An "executable" stackblitz is an HTML file with a `<form>` that makes a post to stackblitz on submit.
+It contains an `<input>` element for each file we need in the stackblitz.
 
-The form will be submitted on load, so you can either double click the HTML file or open it with an
-anchor tag to open the stackblitz.
+The form will be submitted on load, so you can either double click the HTML file or open it with an anchor tag to open the stackblitz.
 
 So the `builder.js` job is to get all the needed files from an example and build this HTML file for you.
 
 ## Customizing the generation per example basis
 
-How does this tool know what is an example and what is not? It will look for all folders containing a
-`stackblitz.json` file. If found, all files within the folder and subfolders will be used in the stackblitz, with
-a few generic exceptions that you can find at `builder.js`.
+How does this tool know what is an example and what is not?
+It will look for all folders containing a `stackblitz.json` file.
+If found, all files within the folder and subfolders will be used in the stackblitz, with a few generic exceptions that you can find at `builder.js`.
 
-You can use the `stackblitz.json` to customize the stackblitz generation. For example:
+You can use the `stackblitz.json` to customize the stackblitz generation.
+For example:
 
 ```json
 {
@@ -39,21 +40,21 @@ You can use the `stackblitz.json` to customize the stackblitz generation. For ex
 }
 ```
 
-Here you can specify a description for the stackblitz, some tags and also a files array where you
-can specify extra files to add or to ignore.
+Here you can specify a description for the stackblitz, some tags and also a files array where you can specify extra files to add or to ignore.
 
 ## Executing the stackblitz generation
 
 `generateStackblitz.js` will create a stackblitz for each `stackblitz.json` it finds.
 
-Where? At `src/generated/live-examples/`.
+Where?
+At `src/generated/live-examples/`.
 
 Then the `<live-example>` embedded component will look at this folder to get the stackblitz it needs for the
 example.
 
 ## Appendix: Why not generating stackblitz at runtime?
 
-At AngularJS, all the plunker examples were generated at runtime. The downside was that all the example code had to be 
-deployed as well and would no longer be useful after the plunker was generated.
+At AngularJS, all the plunker examples were generated at runtime.
+The downside was that all the example code had to be  deployed as well and would no longer be useful after the plunker was generated.
 
 This `StackblitzBuilder` tool takes a few seconds to run, and the end result is only 3mb~.
diff --git a/aio/tools/transforms/README.md b/aio/tools/transforms/README.md
index cbda103a3d9ca..b3547bdf8373d 100644
--- a/aio/tools/transforms/README.md
+++ b/aio/tools/transforms/README.md
@@ -1,36 +1,27 @@
 # Overview
 
-All the content that is rendered by the AIO application, and some of its configuration files, are
-generated from source files by [Dgeni](https://github.com/angular/dgeni). Dgeni is a general purpose
-documentation generation tool.
+All the content that is rendered by the AIO application, and some of its configuration files, are generated from source files by [Dgeni](https://github.com/angular/dgeni).
+Dgeni is a general purpose documentation generation tool.
 
-Markdown files in `/aio/content`, code comments in the core Angular source files and example files
-are processed and transformed into files that are consumed by the AIO application.
+Markdown files in `/aio/content`, code comments in the core Angular source files and example files are processed and transformed into files that are consumed by the AIO application.
 
-Dgeni is configured by "packages", which contain services and processors. Some of these packages are
-installed as `node_modules` from the [dgeni-packages](https://github.com/angular/dgeni-packages) and
-some are specific to the AIO project.
+Dgeni is configured by "packages", which contain services and processors.
+Some of these packages are installed as `node_modules` from the [dgeni-packages](https://github.com/angular/dgeni-packages) and some are specific to the AIO project.
 
 The project specific packages are stored in this folder (`aio/tools/transforms`).
 
-If you are an author and want to know how to generate the documentation, the steps are outlined in
-the top level [README.md](../../README.md#guide-to-authoring).
+If you are an author and want to know how to generate the documentation, the steps are outlined in the top level [README.md](../../README.md#guide-to-authoring).
 
 ## Root packages
 
-To run Dgeni, you must specify a root package, which acts as the entry point to the documentation
-generation.
-This root package, in turn requires a number of other packages, some are defined locally in the
-`tools/transforms` folder, such as `tools/transforms/cheatsheet-package` and
-`tools/transforms/content-package`, etc. And some are brought in from the `dgeni-packages` node
-modules, such as `jsdoc` and `nunjucks`.
+To run Dgeni, you must specify a root package, which acts as the entry point to the documentation generation.
+This root package, in turn requires a number of other packages, some are defined locally in the `tools/transforms` folder, such as `tools/transforms/cheatsheet-package` and `tools/transforms/content-package`, etc.
+And some are brought in from the `dgeni-packages` node modules, such as `jsdoc` and `nunjucks`.
 
-* The primary root package is defined in `tools/transforms/angular.io-package/index.js`. This package
-is used to run a full generation of all the documentation.
-* There are also root packages defined in `tools/transforms/authors-package/*-package.js`. These
-packages are used by the documentation authors when writing docs, since it allows them to run partial
-doc generation, which is not complete but is faster for quickly seeing changes to the document that
-you are working on.
+* The primary root package is defined in `tools/transforms/angular.io-package/index.js`.
+  This package is used to run a full generation of all the documentation.
+* There are also root packages defined in `tools/transforms/authors-package/*-package.js`.
+  These packages are used by the documentation authors when writing docs, since it allows them to run partial doc generation, which is not complete but is faster for quickly seeing changes to the document that you are working on.
 
 ## Other packages
 
@@ -46,5 +37,5 @@ you are working on.
 
 ## Templates
 
-All the templates for the angular.io dgeni transformations are stoted in the `tools/transforms/templates`
-folder. See the [README](./templates/README.md).
\ No newline at end of file
+All the templates for the angular.io dgeni transformations are stoted in the `tools/transforms/templates` folder.
+See the [README](./templates/README.md).
diff --git a/aio/tools/transforms/angular-base-package/processors/createSitemap.js b/aio/tools/transforms/angular-base-package/processors/createSitemap.js
index e6d320b450dc8..b937ebb83e41e 100644
--- a/aio/tools/transforms/angular-base-package/processors/createSitemap.js
+++ b/aio/tools/transforms/angular-base-package/processors/createSitemap.js
@@ -5,6 +5,7 @@ module.exports = function createSitemap() {
       'contributors-json',
       'navigation-json',
       'resources-json',
+      'events-json'
     ],
     ignoredPaths: [
       'file-not-found',
diff --git a/aio/tools/transforms/angular-base-package/processors/createSitemap.spec.js b/aio/tools/transforms/angular-base-package/processors/createSitemap.spec.js
index 9802f3bcf54b6..f8935c831da5b 100644
--- a/aio/tools/transforms/angular-base-package/processors/createSitemap.spec.js
+++ b/aio/tools/transforms/angular-base-package/processors/createSitemap.spec.js
@@ -47,7 +47,7 @@ describe('createSitemap processor', () => {
         expect(docs.pop().urls).toEqual(['abc', 'fgh']);
       });
 
-      it('ignoring blacklisted doc types', () => {
+      it('ignoring excluded doc types', () => {
         const docs = [
           { path: 'abc', outputPath: 'abc', docType: 'good' },
           { path: 'cde', outputPath: 'cde', docType: 'bad' },
@@ -58,7 +58,7 @@ describe('createSitemap processor', () => {
         expect(docs.pop().urls).toEqual(['abc', 'fgh']);
       });
 
-      it('ignoring blacklisted paths', () => {
+      it('ignoring excluded paths', () => {
         const docs = [
           { path: 'abc', outputPath: 'abc' },
           { path: 'cde', outputPath: 'cde' },
diff --git a/aio/tools/transforms/angular-content-package/index.js b/aio/tools/transforms/angular-content-package/index.js
index 65f4de1c38475..47d7432ae6da4 100644
--- a/aio/tools/transforms/angular-content-package/index.js
+++ b/aio/tools/transforms/angular-content-package/index.js
@@ -82,6 +82,11 @@ module.exports = new Package('angular-content', [basePackage, contentPackage])
         include: CONTENTS_PATH + '/marketing/resources.json',
         fileReader: 'jsonFileReader'
       },
+      {
+        basePath: CONTENTS_PATH,
+        include: CONTENTS_PATH + '/marketing/events.json',
+        fileReader: 'jsonFileReader'
+      },
     ]);
 
     collectExamples.exampleFolders.push('examples');
@@ -110,7 +115,8 @@ module.exports = new Package('angular-content', [basePackage, contentPackage])
       {docTypes: ['navigation-json'], pathTemplate: '${id}', outputPathTemplate: '../${id}.json'},
       {docTypes: ['contributors-json'], pathTemplate: '${id}', outputPathTemplate: '../${id}.json'},
       {docTypes: ['announcements-json'], pathTemplate: '${id}', outputPathTemplate: '../${id}.json'},
-      {docTypes: ['resources-json'], pathTemplate: '${id}', outputPathTemplate: '../${id}.json'}
+      {docTypes: ['resources-json'], pathTemplate: '${id}', outputPathTemplate: '../${id}.json'},
+      {docTypes: ['events-json'], pathTemplate: '${id}', outputPathTemplate: '../${id}.json'}
     ]);
   })
 
diff --git a/aio/tools/transforms/authors-package/api-package.js b/aio/tools/transforms/authors-package/api-package.js
index 77698753c0415..d8d34a2412dd1 100644
--- a/aio/tools/transforms/authors-package/api-package.js
+++ b/aio/tools/transforms/authors-package/api-package.js
@@ -20,8 +20,6 @@ const packageMap = {
   'platform-browser': ['platform-browser/index.ts', 'platform-browser/animations/index.ts', 'platform-browser/testing/index.ts'],
   'platform-browser-dynamic': ['platform-browser-dynamic/index.ts', 'platform-browser-dynamic/testing/index.ts'],
   'platform-server': ['platform-server/index.ts', 'platform-server/testing/index.ts'],
-  'platform-webworker': ['platform-webworker/index.ts'],
-  'platform-webworker-dynamic': ['platform-webworker-dynamic/index.ts'],
   router: ['router/index.ts', 'router/testing/index.ts', 'router/upgrade/index.ts'],
   'service-worker': ['service-worker/index.ts'],
   upgrade: ['upgrade/index.ts', 'upgrade/static/index.ts', 'upgrade/static/testing/index.ts']
diff --git a/aio/tools/transforms/templates/api/decorator.template.html b/aio/tools/transforms/templates/api/decorator.template.html
index 4212a37166886..7c24766dd6dc7 100644
--- a/aio/tools/transforms/templates/api/decorator.template.html
+++ b/aio/tools/transforms/templates/api/decorator.template.html
@@ -12,12 +12,16 @@ <h2>Options</h2>
   {% for option in doc.members %}
   <a id="{$ option.anchor $}"></a>
   <table class="is-full-width option-table">
-    <thead><tr><th>
-      <div class="with-github-links">
-        <h3>{$ option.name $}</h3>
-        {$ github.githubLinks(option, versionInfo) $}
-      </div>
-    </th></tr></thead>
+    <thead>
+      <tr>
+        <th>
+          <div class="with-github-links">
+            <h3>{$ option.name $}</h3>
+            {$ github.githubLinks(option, versionInfo) $}
+          </div>
+        </th>
+      </tr>
+    </thead>
     <tbody>
       <tr>
         <td>
@@ -26,8 +30,9 @@ <h3>{$ option.name $}</h3>
       </tr>
       <tr>
         <td>
-          <code-example language="ts" hideCopy="true" class="no-box api-heading{% if option.deprecated %} deprecated-api-item{% endif %}">
-          {$ option.name $}: {$ option.type | escape $}
+          <code-example language="ts" hideCopy="true"
+            class="no-box api-heading{% if option.deprecated %} deprecated-api-item{% endif %}">
+            {$ option.name $}{%- if option.isOptional  %}?{% endif -%}: {$ option.type | escape $}
           </code-example>
         </td>
       </tr>
@@ -46,4 +51,4 @@ <h3>{$ option.name $}</h3>
   </table>
   {% endfor %}
 </section>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/aio/tools/transforms/templates/api/includes/decorator-overview.html b/aio/tools/transforms/templates/api/includes/decorator-overview.html
index 657a4933d1ec8..20d20db6c4524 100644
--- a/aio/tools/transforms/templates/api/includes/decorator-overview.html
+++ b/aio/tools/transforms/templates/api/includes/decorator-overview.html
@@ -10,7 +10,7 @@
     <tr class="option">
       <td>
         <a class="code-anchor" href="{$ doc.path $}#{$ option.anchor | urlencode $}">
-          <code>{$ option.name $}</code>
+          <code>{$ option.name $}{%- if option.isOptional  %}?{% endif -%}</code>
         </a>
       </td>
       <td>{$ option.shortDescription | marked $}</td>
diff --git a/aio/tools/transforms/templates/api/lib/memberHelpers.html b/aio/tools/transforms/templates/api/lib/memberHelpers.html
index 3b7c05515066c..49dc46c02a65e 100644
--- a/aio/tools/transforms/templates/api/lib/memberHelpers.html
+++ b/aio/tools/transforms/templates/api/lib/memberHelpers.html
@@ -3,7 +3,7 @@
 
 {%- macro renderHeritage(exportDoc) -%}
   {%- if exportDoc.extendsClauses.length %} extends {% for clause in exportDoc.extendsClauses -%}
-  <a class="code-anchor" href="{$ clause.doc.path $}">{$ clause.text $}</a>{% if not loop.last %}, {% endif -%}
+  {% if clause.doc.path %}<a class="code-anchor" href="{$ clause.doc.path $}">{$ clause.text $}</a>{% else %}{$ clause.text $}{% endif %}{% if not loop.last %}, {% endif -%}
   {% endfor %}{% endif %}
   {%- if exportDoc.implementsClauses.length %} implements {% for clause in exportDoc.implementsClauses -%}
   <a class="code-anchor" href="{$ clause.doc.path $}">{$ clause.text $}</a>{% if not loop.last %}, {% endif -%}
@@ -132,11 +132,11 @@ <h3>
           <summary>
             <div class="icon-action-header">
                 <h4 class="no-anchor">{$ method.overloads.length $} overloads...</h4>
-                <a>
+                <span class="actions">
                   <span class="show-all">Show All</span>
                   <span class="collapse-all">Hide All</span>
                   <i class="material-icons expand">expand_more</i>
-                </a>
+                </span>
               </div>
           </summary>
           <div class="detail-contents">
diff --git a/aio/tsconfig.json b/aio/tsconfig.json
index ce114541d0a69..c4edb3ba2e9d8 100644
--- a/aio/tsconfig.json
+++ b/aio/tsconfig.json
@@ -1,25 +1,28 @@
+/* To learn more about this file see: https://angular.io/config/tsconfig. */
 {
   "compileOnSave": false,
   "compilerOptions": {
     "baseUrl": "src",
     "outDir": "./out-tsc",
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "noImplicitReturns": true,
+    "noFallthroughCasesInSwitch": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
     "sourceMap": true,
     "declaration": false,
-    "module": "esnext",
-    "moduleResolution": "node",
+    "downlevelIteration": true,
     "experimentalDecorators": true,
+    "moduleResolution": "node",
     "importHelpers": true,
     "target": "es2015",
+    "module": "es2020",
     "lib": [
       "es2018",
       "dom"
     ],
     "skipLibCheck": true,
-    "strict": true,
-    "noFallthroughCasesInSwitch": true,
-    "noImplicitReturns": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
     // disabled because this is on by default in tsc 2.7 breaking our codebase - we need to refactor
     "strictPropertyInitialization": false
   },
@@ -35,6 +38,7 @@
   "angularCompilerOptions": {
     "disableTypeScriptVersionCheck": true,
     "strictInjectionParameters": true,
+    "strictInputAccessModifiers": true,
     "strictTemplates": true
   }
 }
diff --git a/aio/tslint.json b/aio/tslint.json
index 4f7ccaf9ed0e8..044f74da1be82 100644
--- a/aio/tslint.json
+++ b/aio/tslint.json
@@ -11,32 +11,16 @@
       ]
     },
     "array-type": false,
-    "arrow-parens": false,
     "arrow-return-shorthand": true,
     "ban": [
       true,
       {"name": "fdescribe", "message": "Don't keep jasmine focus methods."},
       {"name": "fit", "message": "Don't keep jasmine focus methods."}
     ],
-    "component-class-suffix": true,
-    "component-selector": [
-      true,
-      "element",
-      "aio",
-      "kebab-case"
-    ],
-    "contextual-lifecycle": true,
     "curly": true,
     "deprecation": {
-      "severity": "warn"
+      "severity": "warning"
     },
-    "directive-class-suffix": true,
-    "directive-selector": [
-      true,
-      "attribute",
-      "aio",
-      "camelCase"
-    ],
     "eofline": true,
     "import-blacklist": [
       true,
@@ -48,13 +32,11 @@
         "spaces"
       ]
     },
-    "interface-name": false,
     "max-classes-per-file": false,
     "max-line-length": [
       true,
       140
     ],
-    "member-access": false,
     "member-ordering": [
       true,
       {
@@ -66,8 +48,8 @@
         ]
       }
     ],
-    "no-conflicting-lifecycle": true,
-    "no-consecutive-blank-lines": false,
+    // TODO(gkalpak): Fix the code and enable this to align with CLI. (Failures: 114)
+    // "no-any": true,
     "no-console": [
       true,
       "debug",
@@ -77,24 +59,20 @@
       "trace"
     ],
     "no-empty": false,
-    "no-host-metadata-property": true,
     "no-inferrable-types": [
       true,
       "ignore-params"
     ],
-    "no-input-rename": true,
-    "no-inputs-metadata-property": true,
-    "no-output-native": true,
-    "no-output-on-prefix": true,
-    "no-output-rename": true,
-    "no-outputs-metadata-property": true,
-    "no-string-literal": false,
+    // TODO(gkalpak): Fix the code and enable this to align with CLI. (Failures: 59)
+    // "no-non-null-assertion": true,
+    "no-redundant-jsdoc": true,
+    // TODO(gkalpak): Fix the code and remove this to align with CLI.
     "no-switch-case-fall-through": true,
     "no-var-requires": false,
-    "object-literal-key-quotes": false,
-    "object-literal-sort-keys": false,
-    "only-arrow-functions": false,
-    "ordered-imports": false,
+    "object-literal-key-quotes": [
+      true,
+      "as-needed"
+    ],
     "quotemark": [
       true,
       "single"
@@ -113,9 +91,11 @@
         "named": "never"
       }
     },
-    "template-banana-in-box": true,
-    "template-no-negated-async": true,
-    "trailing-comma": false,
+    // TODO(gkalpak): Fix the code and enable this to align with CLI. (Failures: 243)
+    // "typedef": [
+    //   true,
+    //   "call-signature"
+    // ],
     "typedef-whitespace": {
       "options": [
         {
@@ -134,35 +114,61 @@
         }
       ]
     },
-    "use-lifecycle-interface": true,
-    "use-pipe-transform-interface": true,
-    "variable-name": [
-      true,
-      "allow-leading-underscore",
-      "allow-pascal-case",
-      "ban-keywords",
-      "check-format",
-      "require-const-for-all-caps"
-    ],
+    "variable-name": {
+      "options": [
+        "ban-keywords",
+        "check-format",
+        "allow-leading-underscore",
+        "allow-pascal-case",
+        "require-const-for-all-caps"
+      ]
+    },
+    "whitespace": {
+      "options": [
+        "check-branch",
+        "check-decl",
+        "check-operator",
+        "check-separator",
+        "check-type",
+        "check-typecast"
+      ]
+    },
+    "component-class-suffix": true,
+    "contextual-lifecycle": true,
+    "directive-class-suffix": true,
+    "no-conflicting-lifecycle": true,
+    "no-host-metadata-property": true,
+    "no-input-rename": true,
+    "no-inputs-metadata-property": true,
+    "no-output-native": true,
+    "no-output-on-prefix": true,
+    "no-output-rename": true,
+    "no-outputs-metadata-property": true,
     "template-accessibility-alt-text": true,
     "template-accessibility-elements-content": true,
     "template-accessibility-label-for": true,
     "template-accessibility-tabindex-no-positive": true,
     "template-accessibility-table-scope": true,
     "template-accessibility-valid-aria": true,
+    "template-banana-in-box": true,
     "template-click-events-have-key-events": true,
     "template-mouse-events-have-key-events": true,
     "template-no-autofocus": true,
     "template-no-distracting-elements": true,
-    "whitespace": {
-      "options": [
-        "check-branch",
-        "check-decl",
-        "check-operator",
-        "check-separator",
-        "check-type",
-        "check-typecast"
-      ]
-    }
+    "template-no-negated-async": true,
+    "use-lifecycle-interface": true,
+    "use-pipe-transform-interface": true,
+    "directive-selector": [
+      true,
+      "attribute",
+      "aio",
+      "camelCase"
+    ],
+    "component-selector": [
+      true,
+      "element",
+      "aio",
+      "kebab-case"
+    ]
   }
 }
diff --git a/aio/yarn.lock b/aio/yarn.lock
index 22211e6a0a4e4..8419c9e157cd9 100644
--- a/aio/yarn.lock
+++ b/aio/yarn.lock
@@ -2,177 +2,178 @@
 # yarn lockfile v1
 
 
-"@angular-devkit/architect@0.1000.1":
-  version "0.1000.1"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1000.1.tgz#6ca8529d888b3f5fc1f28863bb744855b67b811e"
-  integrity sha512-GpoJ+p38feerxwfpJgrjwv/2c47qIX+TMdfKVqbswxLnzK21hXjd0zn6UfovAFwLeL1hRu2O00NDsmQn01gdoA==
-  dependencies:
-    "@angular-devkit/core" "10.0.1"
-    rxjs "6.5.5"
-
-"@angular-devkit/build-angular@0.1000.1":
-  version "0.1000.1"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.1000.1.tgz#8073c8826763b6e0d2e5f2dcb21d55be11ce6937"
-  integrity sha512-rRYtHzy27BM3XjPVqlpQOs+RXAgtiT1Qr6EiLiMcb8Twg4aWHzKF+IITLQL9CSYkpOnY40vHjWZuEVu0qIhEPQ==
-  dependencies:
-    "@angular-devkit/architect" "0.1000.1"
-    "@angular-devkit/build-optimizer" "0.1000.1"
-    "@angular-devkit/build-webpack" "0.1000.1"
-    "@angular-devkit/core" "10.0.1"
-    "@babel/core" "7.9.6"
-    "@babel/generator" "7.9.6"
-    "@babel/plugin-transform-runtime" "7.9.6"
-    "@babel/preset-env" "7.9.6"
-    "@babel/runtime" "7.9.6"
-    "@babel/template" "7.8.6"
-    "@jsdevtools/coverage-istanbul-loader" "3.0.3"
-    "@ngtools/webpack" "10.0.1"
-    ajv "6.12.2"
-    autoprefixer "9.8.0"
+"@angular-devkit/architect@0.1001.3":
+  version "0.1001.3"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1001.3.tgz#168aa424be9d0dad90d1a03129c3999fbf76a1cc"
+  integrity sha512-WS5IAN6I73jKapiHKYz3U05Kka4eVRmwCk++GWM2uGChluiZsI87eK8vxMS3KWDIqTnAOuMpDt3XWxlASv1nlQ==
+  dependencies:
+    "@angular-devkit/core" "10.1.3"
+    rxjs "6.6.2"
+
+"@angular-devkit/build-angular@0.1001.3":
+  version "0.1001.3"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.1001.3.tgz#8085bcb26394c5dc47ecc4b9d9c7a47dfe9e1df4"
+  integrity sha512-TQhNNfBeWLLOcXitmBTl2l95/9/2OcVVGyI5bxbpcCn8f9ioRVa2DvIxQLR92aoGkTrp7Vgd12xu07DSuuQwvg==
+  dependencies:
+    "@angular-devkit/architect" "0.1001.3"
+    "@angular-devkit/build-optimizer" "0.1001.3"
+    "@angular-devkit/build-webpack" "0.1001.3"
+    "@angular-devkit/core" "10.1.3"
+    "@babel/core" "7.11.1"
+    "@babel/generator" "7.11.0"
+    "@babel/plugin-transform-runtime" "7.11.0"
+    "@babel/preset-env" "7.11.0"
+    "@babel/runtime" "7.11.2"
+    "@babel/template" "7.10.4"
+    "@jsdevtools/coverage-istanbul-loader" "3.0.5"
+    "@ngtools/webpack" "10.1.3"
+    autoprefixer "9.8.6"
     babel-loader "8.1.0"
     browserslist "^4.9.1"
-    cacache "15.0.3"
+    cacache "15.0.5"
     caniuse-lite "^1.0.30001032"
     circular-dependency-plugin "5.2.0"
     copy-webpack-plugin "6.0.3"
     core-js "3.6.4"
-    css-loader "3.5.3"
+    css-loader "4.2.2"
     cssnano "4.1.10"
     file-loader "6.0.0"
     find-cache-dir "3.3.1"
     glob "7.1.6"
-    jest-worker "26.0.0"
+    jest-worker "26.3.0"
     karma-source-map-support "1.4.0"
-    less-loader "6.1.0"
-    license-webpack-plugin "2.2.0"
+    less-loader "6.2.0"
+    license-webpack-plugin "2.3.0"
     loader-utils "2.0.0"
-    mini-css-extract-plugin "0.9.0"
+    mini-css-extract-plugin "0.10.0"
     minimatch "3.0.4"
-    open "7.0.4"
-    parse5 "4.0.0"
+    open "7.2.0"
+    parse5 "6.0.1"
+    parse5-htmlparser2-tree-adapter "6.0.1"
     pnp-webpack-plugin "1.6.4"
-    postcss "7.0.31"
+    postcss "7.0.32"
     postcss-import "12.0.1"
     postcss-loader "3.0.0"
     raw-loader "4.0.1"
-    regenerator-runtime "0.13.5"
+    regenerator-runtime "0.13.7"
     resolve-url-loader "3.1.1"
     rimraf "3.0.2"
-    rollup "2.10.9"
-    rxjs "6.5.5"
-    sass "1.26.5"
-    sass-loader "8.0.2"
+    rollup "2.26.5"
+    rxjs "6.6.2"
+    sass "1.26.10"
+    sass-loader "10.0.1"
     semver "7.3.2"
     source-map "0.7.3"
-    source-map-loader "1.0.0"
+    source-map-loader "1.0.2"
     source-map-support "0.5.19"
     speed-measure-webpack-plugin "1.3.3"
     style-loader "1.2.1"
-    stylus "0.54.7"
+    stylus "0.54.8"
     stylus-loader "3.0.2"
-    terser "4.7.0"
-    terser-webpack-plugin "3.0.1"
+    terser "5.3.0"
+    terser-webpack-plugin "4.1.0"
     tree-kill "1.2.2"
-    webpack "4.43.0"
+    webpack "4.44.1"
     webpack-dev-middleware "3.7.2"
     webpack-dev-server "3.11.0"
     webpack-merge "4.2.2"
     webpack-sources "1.4.3"
     webpack-subresource-integrity "1.4.1"
-    worker-plugin "4.0.3"
+    worker-plugin "5.0.0"
 
-"@angular-devkit/build-optimizer@0.1000.1":
-  version "0.1000.1"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.1000.1.tgz#2cb46c7b8fc4361d06244d50545b23e91e866c15"
-  integrity sha512-Q60lxyetBcMKUiNMc1vGUExuJMashHB9CF8HVenX80R9ihaA/GHAUrD2PbKBpLVoC4T291uUhfcA8MB1fJNRfw==
+"@angular-devkit/build-optimizer@0.1001.3":
+  version "0.1001.3"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.1001.3.tgz#11e6ea59ab0d6f6c0724c9453c82a2f15653534d"
+  integrity sha512-tQy4ADOVDL0hJcykpZzqfInQV6ft499E3g+D0jcZL/imSsxH4EaaBA2HCc0JTeAFjmkI32OhD9T8G/swqqBcVw==
   dependencies:
     loader-utils "2.0.0"
     source-map "0.7.3"
-    tslib "2.0.0"
+    tslib "2.0.1"
+    typescript "4.0.2"
     webpack-sources "1.4.3"
 
-"@angular-devkit/build-webpack@0.1000.1":
-  version "0.1000.1"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1000.1.tgz#c0e8208dfa52ca1743955c6ae96fb1d7685103e1"
-  integrity sha512-m+abxD38LYdHw+w53Rmc4MbuwDP7rfevAZ/1QR2WFYj0BI5QsTYGlpmieI2TXiwiwvTILn9UzYZAA16nKvmUwA==
+"@angular-devkit/build-webpack@0.1001.3":
+  version "0.1001.3"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1001.3.tgz#889aaa2dde7daacb88969d9ede5ba2df94250df3"
+  integrity sha512-XpAEWRWIdh/bk2UHkP7iIjEiVwkQkAWoZPNYMJzg3iN/iAAdUDPiNBTXhFZEZjFEWT0RXl4iKW2hr5LFvpe6lw==
   dependencies:
-    "@angular-devkit/architect" "0.1000.1"
-    "@angular-devkit/core" "10.0.1"
-    rxjs "6.5.5"
+    "@angular-devkit/architect" "0.1001.3"
+    "@angular-devkit/core" "10.1.3"
+    rxjs "6.6.2"
 
-"@angular-devkit/core@10.0.1":
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-10.0.1.tgz#acc1c6a088507e7340964c8cbf85e91781e86686"
-  integrity sha512-AXsxN00zbixi/9HyzzsDGm6rtMferxKfhG8WPJfp/0TLeJrmiLs5wdNjk8LhfTZABSTYx/QxRgOI6OnBoXePgg==
+"@angular-devkit/core@10.1.3":
+  version "10.1.3"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-10.1.3.tgz#48776a87253b40f6005b14413e089a1fee6b7227"
+  integrity sha512-Ub31/eqFtSuQy3V+B74Jt0jAUw8fs8sbd0ZL2UHYUJyrwm20iIRam+mOD3Sj8HFrDGLR8m56KsxJ12KvC1oxtQ==
   dependencies:
-    ajv "6.12.2"
+    ajv "6.12.4"
     fast-json-stable-stringify "2.1.0"
     magic-string "0.25.7"
-    rxjs "6.5.5"
+    rxjs "6.6.2"
     source-map "0.7.3"
 
-"@angular-devkit/schematics@10.0.1":
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-10.0.1.tgz#2631043e7459c5d1228ffeba18eb63aa1e45f40e"
-  integrity sha512-lG70f4KsZews/z1npzJC7ccJgz3RXyLetyg+wa5uGWV+Silpr7XX+3U65DjPwG/+921woifeqRMbOhK+zCCaVA==
+"@angular-devkit/schematics@10.1.3":
+  version "10.1.3"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-10.1.3.tgz#49ccf51a1a8e71625b5ec1a0d24adfc24c31c903"
+  integrity sha512-5+E2bBBsphuz1KfloC5yA+hXSEbxMokkp5UEp+X9VC7zUGTXV8sxuvcbBo+JVutaoNHezJGu2JUx/LqNrKd58w==
   dependencies:
-    "@angular-devkit/core" "10.0.1"
-    ora "4.0.4"
-    rxjs "6.5.5"
+    "@angular-devkit/core" "10.1.3"
+    ora "5.0.0"
+    rxjs "6.6.2"
 
-"@angular/animations@10.0.2":
-  version "10.0.2"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-10.0.2.tgz#4af6983800c7e6fbb402f7183fc547ae480cb534"
-  integrity sha512-3fMR574KnaeAon7ZlwYCB2qkUoZ255Y2KwU6Z/ki37U66QZc8XMqf/d4oUiTZgLsJG4a5Whse0IX8Jz5/HAvQQ==
+"@angular/animations@10.1.3":
+  version "10.1.3"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-10.1.3.tgz#2047dae5fc1bf0f5173a410f0103fb003113d1b9"
+  integrity sha512-qIdxP28iF6qaoGBB3C6VvHt22nR3FMK5kh+no+jYmmy6z5cBVhwS/Vb6nkx+XRqivKBVHxWNZQ4ae6xmTg/k7A==
   dependencies:
     tslib "^2.0.0"
 
-"@angular/cdk@10.0.1":
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-10.0.1.tgz#8e10317cd6fee4d9f8a3794998629496fb60e68b"
-  integrity sha512-tEgaTDQplptbOf4cHHdVScH0h5QNvkWDhabAWpWaT4/dVXEsp+p2E9Pzkemesi/gNmUIetVjGaicX5VqsijZSQ==
+"@angular/cdk@10.2.2":
+  version "10.2.2"
+  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-10.2.2.tgz#429816d2f8d15d1da99b85ee6810d54bf46e3d05"
+  integrity sha512-DVMnj7QY1prZblRjYfDeyEH79p1TDI0JGgg2D2BAWwzMoPKCgVCqy1uRuvi+WNhYoDR3QJJJ8tXLKucUoShuIw==
   dependencies:
     tslib "^2.0.0"
   optionalDependencies:
     parse5 "^5.0.0"
 
-"@angular/cli@10.0.1":
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-10.0.1.tgz#23fd9e6495a89d7fe1bc756fdfb5af9c71bcaf26"
-  integrity sha512-6Ht3022UcaWTBDnQKgcvTHbOP4ITjzn1DcZWKN0+zKk4PNqOwWtOEF2CBokOG79gTQVdrp2p5YQo5uX6UG7KMQ==
-  dependencies:
-    "@angular-devkit/architect" "0.1000.1"
-    "@angular-devkit/core" "10.0.1"
-    "@angular-devkit/schematics" "10.0.1"
-    "@schematics/angular" "10.0.1"
-    "@schematics/update" "0.1000.1"
+"@angular/cli@10.1.3":
+  version "10.1.3"
+  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-10.1.3.tgz#188f99583814e97727787869065d228c1b1f4407"
+  integrity sha512-wj+ZcTLRzM94asLUZRO5U96CLEsnWosa3Iqub+1AH1/C8Wv2w/2njUKDM7ifQeebYzjPb5EcN4EIAGcHAGyeWw==
+  dependencies:
+    "@angular-devkit/architect" "0.1001.3"
+    "@angular-devkit/core" "10.1.3"
+    "@angular-devkit/schematics" "10.1.3"
+    "@schematics/angular" "10.1.3"
+    "@schematics/update" "0.1001.3"
     "@yarnpkg/lockfile" "1.1.0"
     ansi-colors "4.1.1"
     debug "4.1.1"
     ini "1.3.5"
-    inquirer "7.1.0"
+    inquirer "7.3.3"
     npm-package-arg "8.0.1"
     npm-pick-manifest "6.1.0"
-    open "7.0.4"
+    open "7.2.0"
     pacote "9.5.12"
     read-package-tree "5.3.1"
     rimraf "3.0.2"
     semver "7.3.2"
     symbol-observable "1.2.0"
-    universal-analytics "0.4.20"
-    uuid "8.1.0"
+    universal-analytics "0.4.23"
+    uuid "8.3.0"
 
-"@angular/common@10.0.2":
-  version "10.0.2"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-10.0.2.tgz#8d5422b3a3e1bc405606476b90b0caffc9c9155a"
-  integrity sha512-zpNB2XD6jinXZjfihoO5Q1Yg7urfpZTt/fitdmwFHCcQ/1qZ9T2BVh8+VqVRkh6Pjxmtvu0uPnJ1a/aZ5f9r9A==
+"@angular/common@10.1.3":
+  version "10.1.3"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-10.1.3.tgz#43b63609e3ef321d8b6835a5cd339587bf0aecbe"
+  integrity sha512-+9UsK+ZTCLO3MvTYlDTbjJGAZxtK9WftHWxbT3NTAJ8tisDfb+MwXB0xNw7qLOysMe3u04zShT0YXYZo5aJBrw==
   dependencies:
     tslib "^2.0.0"
 
-"@angular/compiler-cli@10.0.2":
-  version "10.0.2"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-10.0.2.tgz#8f178a03989e0018890c52807df9e3e03faaf47a"
-  integrity sha512-LGX86k1hOyaw5aPCjFfoLuPhVLKMENOdCBeNBzZB+H2CUGHfv8OWFB1EzjZO1N07VGR7JoMx9ZWSP7ornhuS4Q==
+"@angular/compiler-cli@10.1.3":
+  version "10.1.3"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-10.1.3.tgz#e3b7dc11a362ec9fe70060e3730547a7e57cb69a"
+  integrity sha512-31XZ6jv4Vjsaa0kF+gzeHMyQiMILpaaZa+j1f5IqeS+HBl1ThxLTCpAhR1TVfZ/2EZV6uAM8o8FTYrhscy9qTA==
   dependencies:
     canonical-path "1.0.0"
     chokidar "^3.0.0"
@@ -188,38 +189,34 @@
     tslib "^2.0.0"
     yargs "15.3.0"
 
-"@angular/compiler@10.0.2":
-  version "10.0.2"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-10.0.2.tgz#1056af84ad76763f03228aa3a60b63a5cd775944"
-  integrity sha512-TNE5ESDlRCVneb/K62HOEgLpxuZZTlw8RcmOy5vt3SngEVc576OE/aYsEA6MCwTlqj16GLSS3jGm9HBJcBKUVw==
+"@angular/compiler@10.1.3":
+  version "10.1.3"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-10.1.3.tgz#84c2da8c37d02a7b7337ae34c173ce1d90d57d9a"
+  integrity sha512-rfiXkf6BPFWHLU0rg+c5BgTdrxVJcyOQipKw3iI2W00RsU3VCFTXKYpm10DamhRrNOf8rJcboqMbdi34awy6xA==
   dependencies:
     tslib "^2.0.0"
 
-"@angular/compiler@~8.2.14":
-  version "8.2.14"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-8.2.14.tgz#46db7a9d1c17f236126518ff26480c160d5a6183"
-  integrity sha512-ABZO4E7eeFA1QyJ2trDezxeQM5ZFa1dXw1Mpl/+1vuXDKNjJgNyWYwKp/NwRkLmrsuV0yv4UDCDe4kJOGbPKnw==
-  dependencies:
-    tslib "^1.9.0"
+"@angular/compiler@9.0.0":
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-9.0.0.tgz#87e0bef4c369b6cadae07e3a4295778fc93799d5"
+  integrity sha512-ctjwuntPfZZT2mNj2NDIVu51t9cvbhl/16epc5xEwyzyDt76pX9UgwvY+MbXrf/C/FWwdtmNtfP698BKI+9leQ==
 
-"@angular/core@10.0.2":
-  version "10.0.2"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-10.0.2.tgz#d2d2c2dd4a9e80dcccc63c274f13ab7397ee5a3b"
-  integrity sha512-r4M1D2NOdkmmFyvYLHRYSIBKTGNXQarZHDZcm5oEq2eTsRVe2u9MYIeOpHKeVQCQK7XKQVB13IZQP3XpUvljFg==
+"@angular/core@10.1.3":
+  version "10.1.3"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-10.1.3.tgz#7dbc38eb73a1d526d9c2aca3025c42e38c4acdc3"
+  integrity sha512-2rnNa8bSH1JoQRzUWXXvPGgxtNA6mSiIqDZs1tHdQZxJI15NbyAJhw6lglgBFahE/nOcUx+11ZhxaPJWSsbEOg==
   dependencies:
     tslib "^2.0.0"
 
-"@angular/core@~8.2.14":
-  version "8.2.14"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-8.2.14.tgz#35566f5b19480369229477e7e0e0fde740bd5204"
-  integrity sha512-zeePkigi+hPh3rN7yoNENG/YUBUsIvUXdxx+AZq+QPaFeKEA2FBSrKn36ojHFrdJUjKzl0lPMEiGC2b6a6bo6g==
-  dependencies:
-    tslib "^1.9.0"
+"@angular/core@9.0.0":
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-9.0.0.tgz#227dc53e1ac81824f998c6e76000b7efc522641e"
+  integrity sha512-6Pxgsrf0qF9iFFqmIcWmjJGkkCaCm6V5QNnxMy2KloO3SDq6QuMVRbN9RtC8Urmo25LP+eZ6ZgYqFYpdD8Hd9w==
 
-"@angular/elements@10.0.2":
-  version "10.0.2"
-  resolved "https://registry.yarnpkg.com/@angular/elements/-/elements-10.0.2.tgz#42464da37306ada1a5c9c8db00e0395b5a6939f0"
-  integrity sha512-ZYOuDojWJCCiRoZYXPtGhVVPT1y75V/wktzaMKLcNY/MxnJYW984i/Ynv7gdeqC8kvf0v1s0FkF7t1xndUwbCA==
+"@angular/elements@10.1.3":
+  version "10.1.3"
+  resolved "https://registry.yarnpkg.com/@angular/elements/-/elements-10.1.3.tgz#a1b63a55f9f0f6bf150a7511a4fb20639869a767"
+  integrity sha512-eKgXIQlt1aRQc7QyoEZI0D0qsPn2banQuhJmLxKqjELNO8WJZt8VNEAvFMa3a2LO+OaVr6rv0YZhYYki5hkLiQ==
   dependencies:
     tslib "^2.0.0"
 
@@ -230,50 +227,45 @@
   dependencies:
     tslib "^2.0.0"
 
-"@angular/forms@10.0.2":
-  version "10.0.2"
-  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-10.0.2.tgz#fa443f73156640664a9e018aaeb42f85d6d20fcb"
-  integrity sha512-qnfApb5Q58SFdl8za8i6ijvP0UfVGxxTtIVnf8czVU5Jz5/KYDbPeChVw/aPl3hfXq8jt0Q6Yl99aAm/BNyhpQ==
+"@angular/forms@10.1.3":
+  version "10.1.3"
+  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-10.1.3.tgz#c48a9c79bc50b21017685037ad628ff0bc8d5e61"
+  integrity sha512-ntLnIZnEo+9ziajnjQPYvVR5m0gRfQBbXx5dug4EuUI5SzE2WzcTEZTnltgw4cLqOy/fOt8cXMiW0YeRBHsjKA==
   dependencies:
     tslib "^2.0.0"
 
-"@angular/language-service@10.0.2":
-  version "10.0.2"
-  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-10.0.2.tgz#31f22020be96ab2cf77283e0627f8a6fffedfe36"
-  integrity sha512-kEMJ3DkprpoGJvEjvH/PZrBKtgCbLtFYtrXHRDy2+92vgCT0Xz6TwzZ2qlwlQSijffOgsV5LwdjI4oxpgVKReQ==
-
-"@angular/material@10.0.1":
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/@angular/material/-/material-10.0.1.tgz#f59988499d20ee4ab93292d7e9a9d16ce24839f0"
-  integrity sha512-4xGIupOiPbyYG/tTbVhgjATRZSRf+Xj2FGkX3csSlIOvhrFtN1B9gTlcbOjzWHPpWTFChZALzMXA/841KA9QqA==
+"@angular/material@10.2.2":
+  version "10.2.2"
+  resolved "https://registry.yarnpkg.com/@angular/material/-/material-10.2.2.tgz#224864e3c280ee2e8f0ccf28574c65d788799782"
+  integrity sha512-xRt8FsjY/MdC/dMBhitCXmOfXo4uhzLZ+kBqkKwY8gBsJ7FjhJIPbe/kRPBuzvVkVphrEfi/pMeDOge8v5ETbA==
   dependencies:
     tslib "^2.0.0"
 
-"@angular/platform-browser-dynamic@10.0.2":
-  version "10.0.2"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-10.0.2.tgz#b752e2110e5a4316087ce7922227b453e423c144"
-  integrity sha512-R1rt1/Ynm0DHgzMBcduCPoDg2y3MrYZVgT+N0DLobr2nCaVD74vGsJBVCRv7/m1sdCxyhPlOvq8Bm5sRauw2fw==
+"@angular/platform-browser-dynamic@10.1.3":
+  version "10.1.3"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-10.1.3.tgz#e90f9329f2ccbfe817680f16a00686440653ee06"
+  integrity sha512-JGVz0XxiZuF1FGJ2zUk1/TogIlBFgFCUgNbSyULIfE/UXcuuvvLlzF+ls26tHK06lFHRAVHFjjDpyA270UzRTQ==
   dependencies:
     tslib "^2.0.0"
 
-"@angular/platform-browser@10.0.2":
-  version "10.0.2"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-10.0.2.tgz#518db3bdff9692cc4ec0c871f3305218da66aebd"
-  integrity sha512-FLS3fYSuWvrDc7PiVCvs4joWZZxDe9+alJi90Sub1oBS/EnxmZpkS0Gr7zQv4MjAvVhNCVoTzL3CaV/SIoZqaw==
+"@angular/platform-browser@10.1.3":
+  version "10.1.3"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-10.1.3.tgz#f6a5c5098e878b964cfddc296fb63eb147710211"
+  integrity sha512-Y5/M9NEmQceda96a9ntmxidfgJTf23DmEvGw0SJ1TAn2X9EjlM4s7H8KNH9R/tDPK9QcuvzX9FTZsxQ9b6kCFQ==
   dependencies:
     tslib "^2.0.0"
 
-"@angular/router@10.0.2":
-  version "10.0.2"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-10.0.2.tgz#6514540f4f3179d8be3fd23b1f4a0dd02801a314"
-  integrity sha512-IcA3W+r5T0NC8TM4J9F0VOxG0wr7nJOSef6Qek6utZd6ByLlXxOhBrPIC5Ou+QNZeg9OuI2FBt6coea9jgmNOA==
+"@angular/router@10.1.3":
+  version "10.1.3"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-10.1.3.tgz#42b4c173bba8441a3e1eb6f1ca60e3b2a4eb3e86"
+  integrity sha512-CAd6u1y+NjB8edtuC2j2OpS6xFO+s90bg4kyu7zr9i0wIQX8xI+neFzkTeoYWJ0PNfi05cCGelyQnLZPZFsyvw==
   dependencies:
     tslib "^2.0.0"
 
-"@angular/service-worker@10.0.2":
-  version "10.0.2"
-  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-10.0.2.tgz#1414f4b7721a45c97c9a3efc6b7516453643d55d"
-  integrity sha512-PXbh5k7yba+X18o2nNqST92Mcsq+5CXDaYIwUcUkYhx1omAMHhYF9W+FFJSY/EhW2yx5x4aRoh9ZmOqldsQB9A==
+"@angular/service-worker@10.1.3":
+  version "10.1.3"
+  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-10.1.3.tgz#f5e8aa4663d6aae059c338cf796ae49ccd827c14"
+  integrity sha512-Zs8W+CCPxGGQFpF8BahF/ngwAnUOeFZIICfEdZaYnwwxFNWuJcwBRTc8DARyR58Ggc3wncZYd6KbHs+oa1n6Lg==
   dependencies:
     tslib "^2.0.0"
 
@@ -284,40 +276,40 @@
   dependencies:
     "@babel/highlight" "^7.8.3"
 
-"@babel/code-frame@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.1.tgz#d5481c5095daa1c57e16e54c6f9198443afb49ff"
-  integrity sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==
+"@babel/code-frame@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a"
+  integrity sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==
   dependencies:
-    "@babel/highlight" "^7.10.1"
+    "@babel/highlight" "^7.10.4"
 
-"@babel/compat-data@^7.10.1", "@babel/compat-data@^7.9.6":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.10.1.tgz#b1085ffe72cd17bf2c0ee790fc09f9626011b2db"
-  integrity sha512-CHvCj7So7iCkGKPRFUfryXIkU2gSBw7VSZFYLsqVhrS47269VK2Hfi9S/YcublPMW8k1u2bQBlbDruoQEm4fgw==
+"@babel/compat-data@^7.10.4", "@babel/compat-data@^7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.11.0.tgz#e9f73efe09af1355b723a7f39b11bad637d7c99c"
+  integrity sha512-TPSvJfv73ng0pfnEOh17bYMPQbI95+nGWc71Ss4vZdRBHTDqmM9Z8ZV4rYz8Ks7sfzc95n30k6ODIq5UGnXcYQ==
   dependencies:
     browserslist "^4.12.0"
     invariant "^2.2.4"
     semver "^5.5.0"
 
-"@babel/core@7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.9.6.tgz#d9aa1f580abf3b2286ef40b6904d390904c63376"
-  integrity sha512-nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg==
-  dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/generator" "^7.9.6"
-    "@babel/helper-module-transforms" "^7.9.0"
-    "@babel/helpers" "^7.9.6"
-    "@babel/parser" "^7.9.6"
-    "@babel/template" "^7.8.6"
-    "@babel/traverse" "^7.9.6"
-    "@babel/types" "^7.9.6"
+"@babel/core@7.11.1":
+  version "7.11.1"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.11.1.tgz#2c55b604e73a40dc21b0e52650b11c65cf276643"
+  integrity sha512-XqF7F6FWQdKGGWAzGELL+aCO1p+lRY5Tj5/tbT3St1G8NaH70jhhDIKknIZaDans0OQBG5wRAldROLHSt44BgQ==
+  dependencies:
+    "@babel/code-frame" "^7.10.4"
+    "@babel/generator" "^7.11.0"
+    "@babel/helper-module-transforms" "^7.11.0"
+    "@babel/helpers" "^7.10.4"
+    "@babel/parser" "^7.11.1"
+    "@babel/template" "^7.10.4"
+    "@babel/traverse" "^7.11.0"
+    "@babel/types" "^7.11.0"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.1"
     json5 "^2.1.2"
-    lodash "^4.17.13"
+    lodash "^4.17.19"
     resolve "^1.3.2"
     semver "^5.4.1"
     source-map "^0.5.0"
@@ -343,24 +335,22 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/generator@7.9.6", "@babel/generator@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.6.tgz#5408c82ac5de98cda0d77d8124e99fa1f2170a43"
-  integrity sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==
+"@babel/generator@7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.11.0.tgz#4b90c78d8c12825024568cbe83ee6c9af193585c"
+  integrity sha512-fEm3Uzw7Mc9Xi//qU20cBKatTfs2aOtKqmvy/Vm7RkJEGFQ4xc9myCfbXxqK//ZS8MR/ciOHw6meGASJuKmDfQ==
   dependencies:
-    "@babel/types" "^7.9.6"
+    "@babel/types" "^7.11.0"
     jsesc "^2.5.1"
-    lodash "^4.17.13"
     source-map "^0.5.0"
 
-"@babel/generator@^7.10.1":
-  version "7.10.2"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.10.2.tgz#0fa5b5b2389db8bfdfcc3492b551ee20f5dd69a9"
-  integrity sha512-AxfBNHNu99DTMvlUPlt1h2+Hn7knPpH5ayJ8OqDWSeLld+Fi2AYBTC/IejWDM9Edcii4UzZRCsbUt0WlSDsDsA==
+"@babel/generator@^7.11.0", "@babel/generator@^7.11.5":
+  version "7.11.6"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.11.6.tgz#b868900f81b163b4d464ea24545c61cbac4dc620"
+  integrity sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==
   dependencies:
-    "@babel/types" "^7.10.2"
+    "@babel/types" "^7.11.5"
     jsesc "^2.5.1"
-    lodash "^4.17.13"
     source-map "^0.5.0"
 
 "@babel/generator@^7.4.0", "@babel/generator@^7.8.4":
@@ -373,22 +363,12 @@
     lodash "^4.17.13"
     source-map "^0.5.0"
 
-"@babel/generator@^7.8.6":
-  version "7.8.8"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.8.8.tgz#cdcd58caab730834cee9eeadb729e833b625da3e"
-  integrity sha512-HKyUVu69cZoclptr8t8U5b6sx6zoWjh8jiUhnuj3MpZuKT2dJ8zPTuiy31luq32swhI0SpwItCIlU8XW7BZeJg==
+"@babel/helper-annotate-as-pure@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz#5bf0d495a3f757ac3bda48b5bf3b3ba309c72ba3"
+  integrity sha512-XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA==
   dependencies:
-    "@babel/types" "^7.8.7"
-    jsesc "^2.5.1"
-    lodash "^4.17.13"
-    source-map "^0.5.0"
-
-"@babel/helper-annotate-as-pure@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.1.tgz#f6d08acc6f70bbd59b436262553fb2e259a1a268"
-  integrity sha512-ewp3rvJEwLaHgyWGe4wQssC2vjks3E80WiUe2BpMb0KhreTjMROCbxXcEovTrbeGVdQct5VjQfrv9EgC+xMzCw==
-  dependencies:
-    "@babel/types" "^7.10.1"
+    "@babel/types" "^7.10.4"
 
 "@babel/helper-annotate-as-pure@^7.8.3":
   version "7.8.3"
@@ -397,25 +377,46 @@
   dependencies:
     "@babel/types" "^7.8.3"
 
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.8.3.tgz#c84097a427a061ac56a1c30ebf54b7b22d241503"
-  integrity sha512-5eFOm2SyFPK4Rh3XMMRDjN7lBH0orh3ss0g3rTYZnBQ+r6YPj7lgDyCvPphynHvUrobJmeMignBr6Acw9mAPlw==
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz#bb0b75f31bf98cbf9ff143c1ae578b87274ae1a3"
+  integrity sha512-L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg==
   dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/helper-explode-assignable-expression" "^7.10.4"
+    "@babel/types" "^7.10.4"
 
-"@babel/helper-compilation-targets@^7.9.6":
-  version "7.10.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.2.tgz#a17d9723b6e2c750299d2a14d4637c76936d8285"
-  integrity sha512-hYgOhF4To2UTB4LTaZepN/4Pl9LD4gfbJx8A34mqoluT8TLbof1mhUlYuNWTEebONa8+UlCC4X0TEXu7AOUyGA==
+"@babel/helper-compilation-targets@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.4.tgz#804ae8e3f04376607cc791b9d47d540276332bd2"
+  integrity sha512-a3rYhlsGV0UHNDvrtOXBg8/OpfV0OKTkxKPzIplS1zpx7CygDcWWxckxZeDd3gzPzC4kUT0A4nVFDK0wGMh4MQ==
   dependencies:
-    "@babel/compat-data" "^7.10.1"
+    "@babel/compat-data" "^7.10.4"
     browserslist "^4.12.0"
     invariant "^2.2.4"
     levenary "^1.1.1"
     semver "^5.5.0"
 
+"@babel/helper-create-class-features-plugin@^7.10.4":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.5.tgz#9f61446ba80e8240b0a5c85c6fdac8459d6f259d"
+  integrity sha512-0nkdeijB7VlZoLT3r/mY3bUkw3T8WG/hNw+FATs/6+pG2039IJWjTYL0VTISqsNHMUTEnwbVnc89WIJX9Qed0A==
+  dependencies:
+    "@babel/helper-function-name" "^7.10.4"
+    "@babel/helper-member-expression-to-functions" "^7.10.5"
+    "@babel/helper-optimise-call-expression" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-replace-supers" "^7.10.4"
+    "@babel/helper-split-export-declaration" "^7.10.4"
+
+"@babel/helper-create-regexp-features-plugin@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.4.tgz#fdd60d88524659a0b6959c0579925e425714f3b8"
+  integrity sha512-2/hu58IEPKeoLF45DBwx3XFqsbCXmkdAay4spVr2x0jYgRxrSNp+ePwvSsy9g6YSaNDcKIQVPXk1Ov8S2edk2g==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.10.4"
+    "@babel/helper-regex" "^7.10.4"
+    regexpu-core "^4.7.0"
+
 "@babel/helper-create-regexp-features-plugin@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.3.tgz#c774268c95ec07ee92476a3862b75cc2839beb79"
@@ -433,31 +434,30 @@
     "@babel/helper-regex" "^7.8.3"
     regexpu-core "^4.7.0"
 
-"@babel/helper-define-map@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.10.1.tgz#5e69ee8308648470dd7900d159c044c10285221d"
-  integrity sha512-+5odWpX+OnvkD0Zmq7panrMuAGQBu6aPUgvMzuMGo4R+jUOvealEj2hiqI6WhxgKrTpFoFj0+VdsuA8KDxHBDg==
+"@babel/helper-define-map@^7.10.4":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz#b53c10db78a640800152692b13393147acb9bb30"
+  integrity sha512-fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ==
   dependencies:
-    "@babel/helper-function-name" "^7.10.1"
-    "@babel/types" "^7.10.1"
-    lodash "^4.17.13"
+    "@babel/helper-function-name" "^7.10.4"
+    "@babel/types" "^7.10.5"
+    lodash "^4.17.19"
 
-"@babel/helper-explode-assignable-expression@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.8.3.tgz#a728dc5b4e89e30fc2dfc7d04fa28a930653f982"
-  integrity sha512-N+8eW86/Kj147bO9G2uclsg5pwfs/fqqY5rwgIL7eTBklgXjcOJ3btzS5iM6AitJcftnY7pm2lGsrJVYLGjzIw==
+"@babel/helper-explode-assignable-expression@^7.10.4":
+  version "7.11.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.11.4.tgz#2d8e3470252cc17aba917ede7803d4a7a276a41b"
+  integrity sha512-ux9hm3zR4WV1Y3xXxXkdG/0gxF9nvI0YVmKVhvK9AfMoaQkemL3sJpXw+Xbz65azo8qJiEz2XVDUpK3KYhH3ZQ==
   dependencies:
-    "@babel/traverse" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.10.4"
 
-"@babel/helper-function-name@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.1.tgz#92bd63829bfc9215aca9d9defa85f56b539454f4"
-  integrity sha512-fcpumwhs3YyZ/ttd5Rz0xn0TpIwVkN7X0V38B9TWNfVF42KEkhkAAuPCQ3oXmtTRtiPJrmZ0TrfS0GKF0eMaRQ==
+"@babel/helper-function-name@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz#d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a"
+  integrity sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==
   dependencies:
-    "@babel/helper-get-function-arity" "^7.10.1"
-    "@babel/template" "^7.10.1"
-    "@babel/types" "^7.10.1"
+    "@babel/helper-get-function-arity" "^7.10.4"
+    "@babel/template" "^7.10.4"
+    "@babel/types" "^7.10.4"
 
 "@babel/helper-function-name@^7.8.3":
   version "7.8.3"
@@ -468,21 +468,12 @@
     "@babel/template" "^7.8.3"
     "@babel/types" "^7.8.3"
 
-"@babel/helper-function-name@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz#2b53820d35275120e1874a82e5aabe1376920a5c"
-  integrity sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==
-  dependencies:
-    "@babel/helper-get-function-arity" "^7.8.3"
-    "@babel/template" "^7.8.3"
-    "@babel/types" "^7.9.5"
-
-"@babel/helper-get-function-arity@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz#7303390a81ba7cb59613895a192b93850e373f7d"
-  integrity sha512-F5qdXkYGOQUb0hpRaPoetF9AnsXknKjWMZ+wmsIRsp5ge5sFh4c3h1eH2pRTTuy9KKAA2+TTYomGXAtEL2fQEw==
+"@babel/helper-get-function-arity@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz#98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2"
+  integrity sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==
   dependencies:
-    "@babel/types" "^7.10.1"
+    "@babel/types" "^7.10.4"
 
 "@babel/helper-get-function-arity@^7.8.3":
   version "7.8.3"
@@ -491,90 +482,63 @@
   dependencies:
     "@babel/types" "^7.8.3"
 
-"@babel/helper-hoist-variables@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.1.tgz#7e77c82e5dcae1ebf123174c385aaadbf787d077"
-  integrity sha512-vLm5srkU8rI6X3+aQ1rQJyfjvCBLXP8cAGeuw04zeAM2ItKb1e7pmVmLyHb4sDaAYnLL13RHOZPLEtcGZ5xvjg==
+"@babel/helper-hoist-variables@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz#d49b001d1d5a68ca5e6604dda01a6297f7c9381e"
+  integrity sha512-wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA==
   dependencies:
-    "@babel/types" "^7.10.1"
+    "@babel/types" "^7.10.4"
 
-"@babel/helper-member-expression-to-functions@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.1.tgz#432967fd7e12a4afef66c4687d4ca22bc0456f15"
-  integrity sha512-u7XLXeM2n50gb6PWJ9hoO5oO7JFPaZtrh35t8RqKLT1jFKj9IWeD1zrcrYp1q1qiZTdEarfDWfTIP8nGsu0h5g==
+"@babel/helper-member-expression-to-functions@^7.10.4", "@babel/helper-member-expression-to-functions@^7.10.5":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz#ae69c83d84ee82f4b42f96e2a09410935a8f26df"
+  integrity sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==
   dependencies:
-    "@babel/types" "^7.10.1"
+    "@babel/types" "^7.11.0"
 
-"@babel/helper-member-expression-to-functions@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz#659b710498ea6c1d9907e0c73f206eee7dadc24c"
-  integrity sha512-fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA==
+"@babel/helper-module-imports@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz#4c5c54be04bd31670a7382797d75b9fa2e5b5620"
+  integrity sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==
   dependencies:
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.10.4"
 
-"@babel/helper-module-imports@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.10.1.tgz#dd331bd45bccc566ce77004e9d05fe17add13876"
-  integrity sha512-SFxgwYmZ3HZPyZwJRiVNLRHWuW2OgE5k2nrVs6D9Iv4PPnXVffuEHy83Sfx/l4SqF+5kyJXjAyUmrG7tNm+qVg==
+"@babel/helper-module-transforms@^7.10.4", "@babel/helper-module-transforms@^7.10.5", "@babel/helper-module-transforms@^7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz#b16f250229e47211abdd84b34b64737c2ab2d359"
+  integrity sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==
   dependencies:
-    "@babel/types" "^7.10.1"
+    "@babel/helper-module-imports" "^7.10.4"
+    "@babel/helper-replace-supers" "^7.10.4"
+    "@babel/helper-simple-access" "^7.10.4"
+    "@babel/helper-split-export-declaration" "^7.11.0"
+    "@babel/template" "^7.10.4"
+    "@babel/types" "^7.11.0"
+    lodash "^4.17.19"
 
-"@babel/helper-module-imports@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz#7fe39589b39c016331b6b8c3f441e8f0b1419498"
-  integrity sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==
+"@babel/helper-optimise-call-expression@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz#50dc96413d594f995a77905905b05893cd779673"
+  integrity sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==
   dependencies:
-    "@babel/types" "^7.8.3"
-
-"@babel/helper-module-transforms@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.10.1.tgz#24e2f08ee6832c60b157bb0936c86bef7210c622"
-  integrity sha512-RLHRCAzyJe7Q7sF4oy2cB+kRnU4wDZY/H2xJFGof+M+SJEGhZsb+GFj5j1AD8NiSaVBJ+Pf0/WObiXu/zxWpFg==
-  dependencies:
-    "@babel/helper-module-imports" "^7.10.1"
-    "@babel/helper-replace-supers" "^7.10.1"
-    "@babel/helper-simple-access" "^7.10.1"
-    "@babel/helper-split-export-declaration" "^7.10.1"
-    "@babel/template" "^7.10.1"
-    "@babel/types" "^7.10.1"
-    lodash "^4.17.13"
-
-"@babel/helper-module-transforms@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz#43b34dfe15961918707d247327431388e9fe96e5"
-  integrity sha512-0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA==
-  dependencies:
-    "@babel/helper-module-imports" "^7.8.3"
-    "@babel/helper-replace-supers" "^7.8.6"
-    "@babel/helper-simple-access" "^7.8.3"
-    "@babel/helper-split-export-declaration" "^7.8.3"
-    "@babel/template" "^7.8.6"
-    "@babel/types" "^7.9.0"
-    lodash "^4.17.13"
-
-"@babel/helper-optimise-call-expression@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.1.tgz#b4a1f2561870ce1247ceddb02a3860fa96d72543"
-  integrity sha512-a0DjNS1prnBsoKx83dP2falChcs7p3i8VMzdrSbfLhuQra/2ENC4sbri34dz/rWmDADsmF1q5GbfaXydh0Jbjg==
-  dependencies:
-    "@babel/types" "^7.10.1"
-
-"@babel/helper-optimise-call-expression@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz#7ed071813d09c75298ef4f208956006b6111ecb9"
-  integrity sha512-Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ==
-  dependencies:
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.10.4"
 
 "@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz#9ea293be19babc0f52ff8ca88b34c3611b208670"
   integrity sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==
 
-"@babel/helper-plugin-utils@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.1.tgz#ec5a5cf0eec925b66c60580328b122c01230a127"
-  integrity sha512-fvoGeXt0bJc7VMWZGCAEBEMo/HAjW2mP8apF5eXK0wSqwLAVHAISCWRoLMBMUs2kqeaG77jltVqu4Hn8Egl3nA==
+"@babel/helper-plugin-utils@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375"
+  integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==
+
+"@babel/helper-regex@^7.10.4":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.10.5.tgz#32dfbb79899073c415557053a19bd055aae50ae0"
+  integrity sha512-68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg==
+  dependencies:
+    lodash "^4.17.19"
 
 "@babel/helper-regex@^7.8.3":
   version "7.8.3"
@@ -583,69 +547,47 @@
   dependencies:
     lodash "^4.17.13"
 
-"@babel/helper-remap-async-to-generator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.8.3.tgz#273c600d8b9bf5006142c1e35887d555c12edd86"
-  integrity sha512-kgwDmw4fCg7AVgS4DukQR/roGp+jP+XluJE5hsRZwxCYGg+Rv9wSGErDWhlI90FODdYfd4xG4AQRiMDjjN0GzA==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.8.3"
-    "@babel/helper-wrap-function" "^7.8.3"
-    "@babel/template" "^7.8.3"
-    "@babel/traverse" "^7.8.3"
-    "@babel/types" "^7.8.3"
-
-"@babel/helper-replace-supers@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.10.1.tgz#ec6859d20c5d8087f6a2dc4e014db7228975f13d"
-  integrity sha512-SOwJzEfpuQwInzzQJGjGaiG578UYmyi2Xw668klPWV5n07B73S0a9btjLk/52Mlcxa+5AdIYqws1KyXRfMoB7A==
+"@babel/helper-remap-async-to-generator@^7.10.4":
+  version "7.11.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.11.4.tgz#4474ea9f7438f18575e30b0cac784045b402a12d"
+  integrity sha512-tR5vJ/vBa9wFy3m5LLv2faapJLnDFxNWff2SAYkSE4rLUdbp7CdObYFgI7wK4T/Mj4UzpjPwzR8Pzmr5m7MHGA==
   dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.10.1"
-    "@babel/helper-optimise-call-expression" "^7.10.1"
-    "@babel/traverse" "^7.10.1"
-    "@babel/types" "^7.10.1"
-
-"@babel/helper-replace-supers@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.8.3.tgz#91192d25f6abbcd41da8a989d4492574fb1530bc"
-  integrity sha512-xOUssL6ho41U81etpLoT2RTdvdus4VfHamCuAm4AHxGr+0it5fnwoVdwUJ7GFEqCsQYzJUhcbsN9wB9apcYKFA==
-  dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.8.3"
-    "@babel/helper-optimise-call-expression" "^7.8.3"
-    "@babel/traverse" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/helper-annotate-as-pure" "^7.10.4"
+    "@babel/helper-wrap-function" "^7.10.4"
+    "@babel/template" "^7.10.4"
+    "@babel/types" "^7.10.4"
 
-"@babel/helper-replace-supers@^7.8.6":
-  version "7.8.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz#5ada744fd5ad73203bf1d67459a27dcba67effc8"
-  integrity sha512-PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA==
+"@babel/helper-replace-supers@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz#d585cd9388ea06e6031e4cd44b6713cbead9e6cf"
+  integrity sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==
   dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.8.3"
-    "@babel/helper-optimise-call-expression" "^7.8.3"
-    "@babel/traverse" "^7.8.6"
-    "@babel/types" "^7.8.6"
+    "@babel/helper-member-expression-to-functions" "^7.10.4"
+    "@babel/helper-optimise-call-expression" "^7.10.4"
+    "@babel/traverse" "^7.10.4"
+    "@babel/types" "^7.10.4"
 
-"@babel/helper-simple-access@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.10.1.tgz#08fb7e22ace9eb8326f7e3920a1c2052f13d851e"
-  integrity sha512-VSWpWzRzn9VtgMJBIWTZ+GP107kZdQ4YplJlCmIrjoLVSi/0upixezHCDG8kpPVTBJpKfxTH01wDhh+jS2zKbw==
+"@babel/helper-simple-access@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz#0f5ccda2945277a2a7a2d3a821e15395edcf3461"
+  integrity sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==
   dependencies:
-    "@babel/template" "^7.10.1"
-    "@babel/types" "^7.10.1"
+    "@babel/template" "^7.10.4"
+    "@babel/types" "^7.10.4"
 
-"@babel/helper-simple-access@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz#7f8109928b4dab4654076986af575231deb639ae"
-  integrity sha512-VNGUDjx5cCWg4vvCTR8qQ7YJYZ+HBjxOgXEl7ounz+4Sn7+LMD3CFrCTEU6/qXKbA2nKg21CwhhBzO0RpRbdCw==
+"@babel/helper-skip-transparent-expression-wrappers@^7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.11.0.tgz#eec162f112c2f58d3af0af125e3bb57665146729"
+  integrity sha512-0XIdiQln4Elglgjbwo9wuJpL/K7AGCY26kmEt0+pRP0TAj4jjyNq1MjoRvikrTVqKcx4Gysxt4cXvVFXP/JO2Q==
   dependencies:
-    "@babel/template" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.11.0"
 
-"@babel/helper-split-export-declaration@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz#c6f4be1cbc15e3a868e4c64a17d5d31d754da35f"
-  integrity sha512-UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g==
+"@babel/helper-split-export-declaration@^7.10.4", "@babel/helper-split-export-declaration@^7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz#f8a491244acf6a676158ac42072911ba83ad099f"
+  integrity sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==
   dependencies:
-    "@babel/types" "^7.10.1"
+    "@babel/types" "^7.11.0"
 
 "@babel/helper-split-export-declaration@^7.8.3":
   version "7.8.3"
@@ -654,25 +596,34 @@
   dependencies:
     "@babel/types" "^7.8.3"
 
-"@babel/helper-validator-identifier@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz#5770b0c1a826c4f53f5ede5e153163e0318e94b5"
-  integrity sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==
+"@babel/helper-validator-identifier@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2"
+  integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==
 
 "@babel/helper-validator-identifier@^7.9.5":
   version "7.9.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz#90977a8e6fbf6b431a7dc31752eee233bf052d80"
   integrity sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==
 
-"@babel/helper-wrap-function@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz#9dbdb2bb55ef14aaa01fe8c99b629bd5352d8610"
-  integrity sha512-LACJrbUET9cQDzb6kG7EeD7+7doC3JNvUgTEQOx2qaO1fKlzE/Bf05qs9w1oXQMmXlPO65lC3Tq9S6gZpTErEQ==
+"@babel/helper-wrap-function@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz#8a6f701eab0ff39f765b5a1cfef409990e624b87"
+  integrity sha512-6py45WvEF0MhiLrdxtRjKjufwLL1/ob2qDJgg5JgNdojBAZSAKnAjkyOCNug6n+OBl4VW76XjvgSFTdaMcW0Ug==
   dependencies:
-    "@babel/helper-function-name" "^7.8.3"
-    "@babel/template" "^7.8.3"
-    "@babel/traverse" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/helper-function-name" "^7.10.4"
+    "@babel/template" "^7.10.4"
+    "@babel/traverse" "^7.10.4"
+    "@babel/types" "^7.10.4"
+
+"@babel/helpers@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.10.4.tgz#2abeb0d721aff7c0a97376b9e1f6f65d7a475044"
+  integrity sha512-L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA==
+  dependencies:
+    "@babel/template" "^7.10.4"
+    "@babel/traverse" "^7.10.4"
+    "@babel/types" "^7.10.4"
 
 "@babel/helpers@^7.8.4":
   version "7.8.4"
@@ -683,21 +634,12 @@
     "@babel/traverse" "^7.8.4"
     "@babel/types" "^7.8.3"
 
-"@babel/helpers@^7.9.6":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.10.1.tgz#a6827b7cb975c9d9cef5fd61d919f60d8844a973"
-  integrity sha512-muQNHF+IdU6wGgkaJyhhEmI54MOZBKsFfsXFhboz1ybwJ1Kl7IHlbm2a++4jwrmY5UYsgitt5lfqo1wMFcHmyw==
-  dependencies:
-    "@babel/template" "^7.10.1"
-    "@babel/traverse" "^7.10.1"
-    "@babel/types" "^7.10.1"
-
-"@babel/highlight@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.1.tgz#841d098ba613ba1a427a2b383d79e35552c38ae0"
-  integrity sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg==
+"@babel/highlight@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143"
+  integrity sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.10.1"
+    "@babel/helper-validator-identifier" "^7.10.4"
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
@@ -710,93 +652,124 @@
     esutils "^2.0.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.10.1":
-  version "7.10.2"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.10.2.tgz#871807f10442b92ff97e4783b9b54f6a0ca812d0"
-  integrity sha512-PApSXlNMJyB4JiGVhCOlzKIif+TKFTvu0aQAhnTvfP/z3vVSN6ZypH5bfUNwFXXjRQtUEBNFd2PtmCmG2Py3qQ==
+"@babel/parser@^7.10.4", "@babel/parser@^7.11.1", "@babel/parser@^7.11.5":
+  version "7.11.5"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.11.5.tgz#c7ff6303df71080ec7a4f5b8c003c58f1cf51037"
+  integrity sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==
 
-"@babel/parser@^7.4.3", "@babel/parser@^7.7.5", "@babel/parser@^7.8.3", "@babel/parser@^7.8.4":
+"@babel/parser@^7.4.3", "@babel/parser@^7.8.3", "@babel/parser@^7.8.4":
   version "7.8.4"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.4.tgz#d1dbe64691d60358a974295fa53da074dd2ce8e8"
   integrity sha512-0fKu/QqildpXmPVaRBoXOlyBb3MC+J0A66x97qEfLOMkn3u6nfY5esWogQwi/K0BjASYy4DbnsEWnpNL6qT5Mw==
 
-"@babel/parser@^7.8.6":
-  version "7.8.8"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.8.tgz#4c3b7ce36db37e0629be1f0d50a571d2f86f6cd4"
-  integrity sha512-mO5GWzBPsPf6865iIbzNE0AvkKF3NE+2S3eRUpE+FE07BOAkXh6G+GW/Pj01hhXjve1WScbaIO4UlY1JKeqCcA==
-
-"@babel/parser@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.6.tgz#3b1bbb30dabe600cd72db58720998376ff653bc7"
-  integrity sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==
-
-"@babel/plugin-proposal-async-generator-functions@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.8.3.tgz#bad329c670b382589721b27540c7d288601c6e6f"
-  integrity sha512-NZ9zLv848JsV3hs8ryEh7Uaz/0KsmPLqv0+PdkDJL1cJy0K4kOCFa8zc1E3mp+RHPQcpdfb/6GovEsW4VDrOMw==
+"@babel/plugin-proposal-async-generator-functions@^7.10.4":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.5.tgz#3491cabf2f7c179ab820606cec27fed15e0e8558"
+  integrity sha512-cNMCVezQbrRGvXJwm9fu/1sJj9bHdGAgKodZdLqOQIpfoH3raqmRPBM17+lh7CzhiKRRBrGtZL9WcjxSoGYUSg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-remap-async-to-generator" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-remap-async-to-generator" "^7.10.4"
     "@babel/plugin-syntax-async-generators" "^7.8.0"
 
-"@babel/plugin-proposal-dynamic-import@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.8.3.tgz#38c4fe555744826e97e2ae930b0fb4cc07e66054"
-  integrity sha512-NyaBbyLFXFLT9FP+zk0kYlUlA8XtCUbehs67F0nnEg7KICgMc2mNkIeu9TYhKzyXMkrapZFwAhXLdnt4IYHy1w==
+"@babel/plugin-proposal-class-properties@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.4.tgz#a33bf632da390a59c7a8c570045d1115cd778807"
+  integrity sha512-vhwkEROxzcHGNu2mzUC0OFFNXdZ4M23ib8aRRcJSsW8BZK9pQMD7QB7csl97NBbgGZO7ZyHUyKDnxzOaP4IrCg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-create-class-features-plugin" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
+
+"@babel/plugin-proposal-dynamic-import@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.4.tgz#ba57a26cb98b37741e9d5bca1b8b0ddf8291f17e"
+  integrity sha512-up6oID1LeidOOASNXgv/CFbgBqTuKJ0cJjz6An5tWD+NVBNlp3VNSBxv2ZdU7SYl3NxJC7agAQDApZusV6uFwQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-dynamic-import" "^7.8.0"
 
-"@babel/plugin-proposal-json-strings@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.8.3.tgz#da5216b238a98b58a1e05d6852104b10f9a70d6b"
-  integrity sha512-KGhQNZ3TVCQG/MjRbAUwuH+14y9q0tpxs1nWWs3pbSleRdDro9SAMMDyye8HhY1gqZ7/NqIc8SKhya0wRDgP1Q==
+"@babel/plugin-proposal-export-namespace-from@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.10.4.tgz#570d883b91031637b3e2958eea3c438e62c05f54"
+  integrity sha512-aNdf0LY6/3WXkhh0Fdb6Zk9j1NMD8ovj3F6r0+3j837Pn1S1PdNtcwJ5EG9WkVPNHPxyJDaxMaAOVq4eki0qbg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+
+"@babel/plugin-proposal-json-strings@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz#593e59c63528160233bd321b1aebe0820c2341db"
+  integrity sha512-fCL7QF0Jo83uy1K0P2YXrfX11tj3lkpN7l4dMv9Y9VkowkhkQDwFHFd8IiwyK5MZjE8UpbgokkgtcReH88Abaw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-json-strings" "^7.8.0"
 
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.8.3.tgz#e4572253fdeed65cddeecfdab3f928afeb2fd5d2"
-  integrity sha512-TS9MlfzXpXKt6YYomudb/KU7nQI6/xnapG6in1uZxoxDghuSMZsPb6D2fyUwNYSAp4l1iR7QtFOjkqcRYcUsfw==
+"@babel/plugin-proposal-logical-assignment-operators@^7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.11.0.tgz#9f80e482c03083c87125dee10026b58527ea20c8"
+  integrity sha512-/f8p4z+Auz0Uaf+i8Ekf1iM7wUNLcViFUGiPxKeXvxTSl63B875YPiVdUDdem7hREcI0E0kSpEhS8tF5RphK7Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
+
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz#02a7e961fc32e6d5b2db0649e01bf80ddee7e04a"
+  integrity sha512-wq5n1M3ZUlHl9sqT2ok1T2/MTt6AXE0e1Lz4WzWBr95LsAZ5qDXe4KnFuauYyEyLiohvXFMdbsOTMyLZs91Zlw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
 
-"@babel/plugin-proposal-numeric-separator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.8.3.tgz#5d6769409699ec9b3b68684cd8116cedff93bad8"
-  integrity sha512-jWioO1s6R/R+wEHizfaScNsAx+xKgwTLNXSh7tTC4Usj3ItsPEhYkEpU4h+lpnBwq7NBVOJXfO6cRFYcX69JUQ==
+"@babel/plugin-proposal-numeric-separator@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.4.tgz#ce1590ff0a65ad12970a609d78855e9a4c1aef06"
+  integrity sha512-73/G7QoRoeNkLZFxsoCCvlg4ezE4eM+57PnOqgaPOozd5myfj7p0muD1mRVJvbUWbOzD+q3No2bWbaKy+DJ8DA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-numeric-separator" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@babel/plugin-proposal-object-rest-spread@^7.9.6":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.1.tgz#cba44908ac9f142650b4a65b8aa06bf3478d5fb6"
-  integrity sha512-Z+Qri55KiQkHh7Fc4BW6o+QBuTagbOp9txE+4U1i79u9oWlf2npkiDx+Rf3iK3lbcHBuNy9UOkwuR5wOMH3LIQ==
+"@babel/plugin-proposal-object-rest-spread@^7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.11.0.tgz#bd81f95a1f746760ea43b6c2d3d62b11790ad0af"
+  integrity sha512-wzch41N4yztwoRw0ak+37wxwJM2oiIiy6huGCoqkvSTA9acYWcPfn9Y4aJqmFFJ70KTJUu29f3DQ43uJ9HXzEA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
-    "@babel/plugin-transform-parameters" "^7.10.1"
+    "@babel/plugin-transform-parameters" "^7.10.4"
 
-"@babel/plugin-proposal-optional-catch-binding@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.8.3.tgz#9dee96ab1650eed88646ae9734ca167ac4a9c5c9"
-  integrity sha512-0gkX7J7E+AtAw9fcwlVQj8peP61qhdg/89D5swOkjYbkboA2CVckn3kiyum1DE0wskGb7KJJxBdyEBApDLLVdw==
+"@babel/plugin-proposal-optional-catch-binding@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.4.tgz#31c938309d24a78a49d68fdabffaa863758554dd"
+  integrity sha512-LflT6nPh+GK2MnFiKDyLiqSqVHkQnVf7hdoAvyTnnKj9xB3docGRsdPuxp6qqqW19ifK3xgc9U5/FwrSaCNX5g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
 
-"@babel/plugin-proposal-optional-chaining@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.9.0.tgz#31db16b154c39d6b8a645292472b98394c292a58"
-  integrity sha512-NDn5tu3tcv4W30jNhmc2hyD5c56G6cXx4TesJubhxrJeCvuuMpttxr0OnNCqbZGhFjLrg+NIhxxC+BK5F6yS3w==
+"@babel/plugin-proposal-optional-chaining@^7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.11.0.tgz#de5866d0646f6afdaab8a566382fe3a221755076"
+  integrity sha512-v9fZIu3Y8562RRwhm1BbMRxtqZNFmFA2EG+pT2diuU8PT3H6T/KXoZ54KgYisfOFZHV6PfvAiBIZ9Rcz+/JCxA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.11.0"
     "@babel/plugin-syntax-optional-chaining" "^7.8.0"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.4.4", "@babel/plugin-proposal-unicode-property-regex@^7.8.3":
+"@babel/plugin-proposal-private-methods@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.4.tgz#b160d972b8fdba5c7d111a145fc8c421fc2a6909"
+  integrity sha512-wh5GJleuI8k3emgTg5KkJK6kHNsGEr0uBTDBuQUBJwckk9xs1ez79ioheEVVxMLyPscB0LfkbVHslQqIzWV6Bw==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
+
+"@babel/plugin-proposal-unicode-property-regex@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz#4483cda53041ce3413b7fe2f00022665ddfaa75d"
+  integrity sha512-H+3fOgPnEXFL9zGYtKQe4IDOPKYlZdF1kqFDQRRb8PK4B8af1vAGK04tF5iQAAsui+mHNBQSAtd2/ndEDe9wuA==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
+
+"@babel/plugin-proposal-unicode-property-regex@^7.4.4":
   version "7.8.8"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.8.tgz#ee3a95e90cdc04fe8cd92ec3279fa017d68a0d1d"
   integrity sha512-EVhjVsMpbhLw9ZfHWSx2iy13Q8Z/eg8e8ccVWt23sWQK5l1UdkoLJPN5w69UA4uITGBnEZD2JOe4QOHycYKv8A==
@@ -811,6 +784,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
+"@babel/plugin-syntax-class-properties@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz#6644e6a0baa55a61f9e3231f6c9eeb6ee46c124c"
+  integrity sha512-GCSBF7iUle6rNugfURwNmCGG3Z/2+opxAMLs1nND4bhEG5PuxTIggDBoeYYSujAlLtsupzOHYJQgPS3pivwXIA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
 "@babel/plugin-syntax-dynamic-import@^7.8.0":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"
@@ -818,6 +798,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
+"@babel/plugin-syntax-export-namespace-from@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a"
+  integrity sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
 "@babel/plugin-syntax-json-strings@^7.8.0":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
@@ -825,6 +812,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
+"@babel/plugin-syntax-logical-assignment-operators@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
+  integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
 "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.0":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
@@ -832,12 +826,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-numeric-separator@^7.8.0", "@babel/plugin-syntax-numeric-separator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.8.3.tgz#0e3fb63e09bea1b11e96467271c8308007e7c41f"
-  integrity sha512-H7dCMAdN83PcCmqmkHB5dtp+Xa9a6LKSvA2hiFBC/5alSHxM5VgWZXFqDi0YFe8XNGT6iCa+z4V4zSt/PdZ7Dw==
+"@babel/plugin-syntax-numeric-separator@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"
+  integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-object-rest-spread@^7.8.0":
   version "7.8.3"
@@ -860,73 +854,80 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-top-level-await@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.8.3.tgz#3acdece695e6b13aaf57fc291d1a800950c71391"
-  integrity sha512-kwj1j9lL/6Wd0hROD3b/OZZ7MSrZLqqn9RAZ5+cYYsflQ9HZBIKCUkr3+uL1MEJ1NePiUbf98jjiMQSv0NMR9g==
+"@babel/plugin-syntax-top-level-await@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.4.tgz#4bbeb8917b54fcf768364e0a81f560e33a3ef57d"
+  integrity sha512-ni1brg4lXEmWyafKr0ccFWkJG0CeMt4WV1oyeBW6EFObF4oOHclbkj5cARxAPQyAQ2UTuplJyK4nfkXIMMFvsQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-arrow-functions@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.8.3.tgz#82776c2ed0cd9e1a49956daeb896024c9473b8b6"
-  integrity sha512-0MRF+KC8EqH4dbuITCWwPSzsyO3HIWWlm30v8BbbpOrS1B++isGxPnnuq/IZvOX5J2D/p7DQalQm+/2PnlKGxg==
+"@babel/plugin-transform-arrow-functions@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.4.tgz#e22960d77e697c74f41c501d44d73dbf8a6a64cd"
+  integrity sha512-9J/oD1jV0ZCBcgnoFWFq1vJd4msoKb/TCpGNFyyLt0zABdcvgK3aYikZ8HjzB14c26bc7E3Q1yugpwGy2aTPNA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-async-to-generator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.8.3.tgz#4308fad0d9409d71eafb9b1a6ee35f9d64b64086"
-  integrity sha512-imt9tFLD9ogt56Dd5CI/6XgpukMwd/fLGSrix2httihVe7LOGVPhyhMh1BU5kDM7iHD08i8uUtmV2sWaBFlHVQ==
+"@babel/plugin-transform-async-to-generator@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.4.tgz#41a5017e49eb6f3cda9392a51eef29405b245a37"
+  integrity sha512-F6nREOan7J5UXTLsDsZG3DXmZSVofr2tGNwfdrVwkDWHfQckbQXnXSPfD7iO+c/2HGqycwyLST3DnZ16n+cBJQ==
   dependencies:
-    "@babel/helper-module-imports" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-remap-async-to-generator" "^7.8.3"
+    "@babel/helper-module-imports" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-remap-async-to-generator" "^7.10.4"
 
-"@babel/plugin-transform-block-scoped-functions@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.8.3.tgz#437eec5b799b5852072084b3ae5ef66e8349e8a3"
-  integrity sha512-vo4F2OewqjbB1+yaJ7k2EJFHlTP3jR634Z9Cj9itpqNjuLXvhlVxgnjsHsdRgASR8xYDrx6onw4vW5H6We0Jmg==
+"@babel/plugin-transform-block-scoped-functions@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.4.tgz#1afa595744f75e43a91af73b0d998ecfe4ebc2e8"
+  integrity sha512-WzXDarQXYYfjaV1szJvN3AD7rZgZzC1JtjJZ8dMHUyiK8mxPRahynp14zzNjU3VkPqPsO38CzxiWO1c9ARZ8JA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-block-scoping@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.8.3.tgz#97d35dab66857a437c166358b91d09050c868f3a"
-  integrity sha512-pGnYfm7RNRgYRi7bids5bHluENHqJhrV4bCZRwc5GamaWIIs07N4rZECcmJL6ZClwjDz1GbdMZFtPs27hTB06w==
+"@babel/plugin-transform-block-scoping@^7.10.4":
+  version "7.11.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.11.1.tgz#5b7efe98852bef8d652c0b28144cd93a9e4b5215"
+  integrity sha512-00dYeDE0EVEHuuM+26+0w/SCL0BH2Qy7LwHuI4Hi4MH5gkC8/AqMN5uWFJIsoXZrAphiMm1iXzBw6L2T+eA0ew==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    lodash "^4.17.13"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-classes@^7.9.5":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.1.tgz#6e11dd6c4dfae70f540480a4702477ed766d733f"
-  integrity sha512-P9V0YIh+ln/B3RStPoXpEQ/CoAxQIhRSUn7aXqQ+FZJ2u8+oCtjIXR3+X0vsSD8zv+mb56K7wZW1XiDTDGiDRQ==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.10.1"
-    "@babel/helper-define-map" "^7.10.1"
-    "@babel/helper-function-name" "^7.10.1"
-    "@babel/helper-optimise-call-expression" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/helper-replace-supers" "^7.10.1"
-    "@babel/helper-split-export-declaration" "^7.10.1"
+"@babel/plugin-transform-classes@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.4.tgz#405136af2b3e218bc4a1926228bc917ab1a0adc7"
+  integrity sha512-2oZ9qLjt161dn1ZE0Ms66xBncQH4In8Sqw1YWgBUZuGVJJS5c0OFZXL6dP2MRHrkU/eKhWg8CzFJhRQl50rQxA==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.10.4"
+    "@babel/helper-define-map" "^7.10.4"
+    "@babel/helper-function-name" "^7.10.4"
+    "@babel/helper-optimise-call-expression" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-replace-supers" "^7.10.4"
+    "@babel/helper-split-export-declaration" "^7.10.4"
     globals "^11.1.0"
 
-"@babel/plugin-transform-computed-properties@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.8.3.tgz#96d0d28b7f7ce4eb5b120bb2e0e943343c86f81b"
-  integrity sha512-O5hiIpSyOGdrQZRQ2ccwtTVkgUDBBiCuK//4RJ6UfePllUTCENOzKxfh6ulckXKc0DixTFLCfb2HVkNA7aDpzA==
+"@babel/plugin-transform-computed-properties@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.4.tgz#9ded83a816e82ded28d52d4b4ecbdd810cdfc0eb"
+  integrity sha512-JFwVDXcP/hM/TbyzGq3l/XWGut7p46Z3QvqFMXTfk6/09m7xZHJUN9xHfsv7vqqD4YnfI5ueYdSJtXqqBLyjBw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-destructuring@^7.9.5":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.1.tgz#abd58e51337815ca3a22a336b85f62b998e71907"
-  integrity sha512-V/nUc4yGWG71OhaTH705pU8ZSdM6c1KmmLP8ys59oOYbT7RpMYAR3MsVOt6OHL0WzG7BlTU076va9fjJyYzJMA==
+"@babel/plugin-transform-destructuring@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.4.tgz#70ddd2b3d1bea83d01509e9bb25ddb3a74fc85e5"
+  integrity sha512-+WmfvyfsyF603iPa6825mq6Qrb7uLjTOsa3XOFzlYcYDHSS4QmpOWOL0NNBY5qMbvrcf3tq0Cw+v4lxswOBpgA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-dotall-regex@^7.4.4", "@babel/plugin-transform-dotall-regex@^7.8.3":
+"@babel/plugin-transform-dotall-regex@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.4.tgz#469c2062105c1eb6a040eaf4fac4b488078395ee"
+  integrity sha512-ZEAVvUTCMlMFAbASYSVQoxIbHm2OkG2MseW6bV2JjIygOjdVv8tuxrCTzj1+Rynh7ODb8GivUy7dzEXzEhuPaA==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
+
+"@babel/plugin-transform-dotall-regex@^7.4.4":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz#c3c6ec5ee6125c6993c5cbca20dc8621a9ea7a6e"
   integrity sha512-kLs1j9Nn4MQoBYdRXH6AeaXMbEJFaFu/v1nQkvib6QzTj8MZI5OQzqmD83/2jEM1z0DLilra5aWO5YpyC0ALIw==
@@ -934,262 +935,270 @@
     "@babel/helper-create-regexp-features-plugin" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-duplicate-keys@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.8.3.tgz#8d12df309aa537f272899c565ea1768e286e21f1"
-  integrity sha512-s8dHiBUbcbSgipS4SMFuWGqCvyge5V2ZeAWzR6INTVC3Ltjig/Vw1G2Gztv0vU/hRG9X8IvKvYdoksnUfgXOEQ==
+"@babel/plugin-transform-duplicate-keys@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.4.tgz#697e50c9fee14380fe843d1f306b295617431e47"
+  integrity sha512-GL0/fJnmgMclHiBTTWXNlYjYsA7rDrtsazHG6mglaGSTh0KsrW04qml+Bbz9FL0LcJIRwBWL5ZqlNHKTkU3xAA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-exponentiation-operator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.8.3.tgz#581a6d7f56970e06bf51560cd64f5e947b70d7b7"
-  integrity sha512-zwIpuIymb3ACcInbksHaNcR12S++0MDLKkiqXHl3AzpgdKlFNhog+z/K0+TGW+b0w5pgTq4H6IwV/WhxbGYSjQ==
+"@babel/plugin-transform-exponentiation-operator@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.4.tgz#5ae338c57f8cf4001bdb35607ae66b92d665af2e"
+  integrity sha512-S5HgLVgkBcRdyQAHbKj+7KyuWx8C6t5oETmUuwz1pt3WTWJhsUV0WIIXuVvfXMxl/QQyHKlSCNNtaIamG8fysw==
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-for-of@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.9.0.tgz#0f260e27d3e29cd1bb3128da5e76c761aa6c108e"
-  integrity sha512-lTAnWOpMwOXpyDx06N+ywmF3jNbafZEqZ96CGYabxHrxNX8l5ny7dt4bK/rGwAh9utyP2b2Hv7PlZh1AAS54FQ==
+"@babel/plugin-transform-for-of@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.4.tgz#c08892e8819d3a5db29031b115af511dbbfebae9"
+  integrity sha512-ItdQfAzu9AlEqmusA/65TqJ79eRcgGmpPPFvBnGILXZH975G0LNjP1yjHvGgfuCxqrPPueXOPe+FsvxmxKiHHQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-function-name@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.8.3.tgz#279373cb27322aaad67c2683e776dfc47196ed8b"
-  integrity sha512-rO/OnDS78Eifbjn5Py9v8y0aR+aSYhDhqAwVfsTl0ERuMZyr05L1aFSCJnbv2mmsLkit/4ReeQ9N2BgLnOcPCQ==
+"@babel/plugin-transform-function-name@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.4.tgz#6a467880e0fc9638514ba369111811ddbe2644b7"
+  integrity sha512-OcDCq2y5+E0dVD5MagT5X+yTRbcvFjDI2ZVAottGH6tzqjx/LKpgkUepu3hp/u4tZBzxxpNGwLsAvGBvQ2mJzg==
   dependencies:
-    "@babel/helper-function-name" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-function-name" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-literals@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.8.3.tgz#aef239823d91994ec7b68e55193525d76dbd5dc1"
-  integrity sha512-3Tqf8JJ/qB7TeldGl+TT55+uQei9JfYaregDcEAyBZ7akutriFrt6C/wLYIer6OYhleVQvH/ntEhjE/xMmy10A==
+"@babel/plugin-transform-literals@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.4.tgz#9f42ba0841100a135f22712d0e391c462f571f3c"
+  integrity sha512-Xd/dFSTEVuUWnyZiMu76/InZxLTYilOSr1UlHV+p115Z/Le2Fi1KXkJUYz0b42DfndostYlPub3m8ZTQlMaiqQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-member-expression-literals@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.8.3.tgz#963fed4b620ac7cbf6029c755424029fa3a40410"
-  integrity sha512-3Wk2EXhnw+rP+IDkK6BdtPKsUE5IeZ6QOGrPYvw52NwBStw9V1ZVzxgK6fSKSxqUvH9eQPR3tm3cOq79HlsKYA==
+"@babel/plugin-transform-member-expression-literals@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.4.tgz#b1ec44fcf195afcb8db2c62cd8e551c881baf8b7"
+  integrity sha512-0bFOvPyAoTBhtcJLr9VcwZqKmSjFml1iVxvPL0ReomGU53CX53HsM4h2SzckNdkQcHox1bpAqzxBI1Y09LlBSw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-modules-amd@^7.9.6":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.1.tgz#65950e8e05797ebd2fe532b96e19fc5482a1d52a"
-  integrity sha512-31+hnWSFRI4/ACFr1qkboBbrTxoBIzj7qA69qlq8HY8p7+YCzkCT6/TvQ1a4B0z27VeWtAeJd6pr5G04dc1iHw==
+"@babel/plugin-transform-modules-amd@^7.10.4":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.5.tgz#1b9cddaf05d9e88b3aad339cb3e445c4f020a9b1"
+  integrity sha512-elm5uruNio7CTLFItVC/rIzKLfQ17+fX7EVz5W0TMgIHFo1zY0Ozzx+lgwhL4plzl8OzVn6Qasx5DeEFyoNiRw==
   dependencies:
-    "@babel/helper-module-transforms" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-module-transforms" "^7.10.5"
+    "@babel/helper-plugin-utils" "^7.10.4"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-commonjs@^7.9.6":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.1.tgz#d5ff4b4413ed97ffded99961056e1fb980fb9301"
-  integrity sha512-AQG4fc3KOah0vdITwt7Gi6hD9BtQP/8bhem7OjbaMoRNCH5Djx42O2vYMfau7QnAzQCa+RJnhJBmFFMGpQEzrg==
+"@babel/plugin-transform-modules-commonjs@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz#66667c3eeda1ebf7896d41f1f16b17105a2fbca0"
+  integrity sha512-Xj7Uq5o80HDLlW64rVfDBhao6OX89HKUmb+9vWYaLXBZOma4gA6tw4Ni1O5qVDoZWUV0fxMYA0aYzOawz0l+1w==
   dependencies:
-    "@babel/helper-module-transforms" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/helper-simple-access" "^7.10.1"
+    "@babel/helper-module-transforms" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-simple-access" "^7.10.4"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-systemjs@^7.9.6":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.1.tgz#9962e4b0ac6aaf2e20431ada3d8ec72082cbffb6"
-  integrity sha512-ewNKcj1TQZDL3YnO85qh9zo1YF1CHgmSTlRQgHqe63oTrMI85cthKtZjAiZSsSNjPQ5NCaYo5QkbYqEw1ZBgZA==
+"@babel/plugin-transform-modules-systemjs@^7.10.4":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.5.tgz#6270099c854066681bae9e05f87e1b9cadbe8c85"
+  integrity sha512-f4RLO/OL14/FP1AEbcsWMzpbUz6tssRaeQg11RH1BP/XnPpRoVwgeYViMFacnkaw4k4wjRSjn3ip1Uw9TaXuMw==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.10.1"
-    "@babel/helper-module-transforms" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-hoist-variables" "^7.10.4"
+    "@babel/helper-module-transforms" "^7.10.5"
+    "@babel/helper-plugin-utils" "^7.10.4"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-umd@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.9.0.tgz#e909acae276fec280f9b821a5f38e1f08b480697"
-  integrity sha512-uTWkXkIVtg/JGRSIABdBoMsoIeoHQHPTL0Y2E7xf5Oj7sLqwVsNXOkNk0VJc7vF0IMBsPeikHxFjGe+qmwPtTQ==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.9.0"
-    "@babel/helper-plugin-utils" "^7.8.3"
-
-"@babel/plugin-transform-named-capturing-groups-regex@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz#a2a72bffa202ac0e2d0506afd0939c5ecbc48c6c"
-  integrity sha512-f+tF/8UVPU86TrCb06JoPWIdDpTNSGGcAtaD9mLP0aYGA0OS0j7j7DHJR0GTFrUZPUU6loZhbsVZgTh0N+Qdnw==
+"@babel/plugin-transform-modules-umd@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.4.tgz#9a8481fe81b824654b3a0b65da3df89f3d21839e"
+  integrity sha512-mohW5q3uAEt8T45YT7Qc5ws6mWgJAaL/8BfWD9Dodo1A3RKWli8wTS+WiQ/knF+tXlPirW/1/MqzzGfCExKECA==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.8.3"
+    "@babel/helper-module-transforms" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-new-target@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.8.3.tgz#60cc2ae66d85c95ab540eb34babb6434d4c70c43"
-  integrity sha512-QuSGysibQpyxexRyui2vca+Cmbljo8bcRckgzYV4kRIsHpVeyeC3JDO63pY+xFZ6bWOBn7pfKZTqV4o/ix9sFw==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz#78b4d978810b6f3bcf03f9e318f2fc0ed41aecb6"
+  integrity sha512-V6LuOnD31kTkxQPhKiVYzYC/Jgdq53irJC/xBSmqcNcqFGV+PER4l6rU5SH2Vl7bH9mLDHcc0+l9HUOe4RNGKA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-create-regexp-features-plugin" "^7.10.4"
 
-"@babel/plugin-transform-object-super@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.8.3.tgz#ebb6a1e7a86ffa96858bd6ac0102d65944261725"
-  integrity sha512-57FXk+gItG/GejofIyLIgBKTas4+pEU47IXKDBWFTxdPd7F80H8zybyAY7UoblVfBhBGs2EKM+bJUu2+iUYPDQ==
+"@babel/plugin-transform-new-target@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.4.tgz#9097d753cb7b024cb7381a3b2e52e9513a9c6888"
+  integrity sha512-YXwWUDAH/J6dlfwqlWsztI2Puz1NtUAubXhOPLQ5gjR/qmQ5U96DY4FQO8At33JN4XPBhrjB8I4eMmLROjjLjw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-replace-supers" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-parameters@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.1.tgz#b25938a3c5fae0354144a720b07b32766f683ddd"
-  integrity sha512-tJ1T0n6g4dXMsL45YsSzzSDZCxiHXAQp/qHrucOq5gEHncTA3xDxnd5+sZcoQp+N1ZbieAaB8r/VUCG0gqseOg==
+"@babel/plugin-transform-object-super@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.4.tgz#d7146c4d139433e7a6526f888c667e314a093894"
+  integrity sha512-5iTw0JkdRdJvr7sY0vHqTpnruUpTea32JHmq/atIWqsnNussbRzjEDyWep8UNztt1B5IusBYg8Irb0bLbiEBCQ==
   dependencies:
-    "@babel/helper-get-function-arity" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-replace-supers" "^7.10.4"
 
-"@babel/plugin-transform-parameters@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.5.tgz#173b265746f5e15b2afe527eeda65b73623a0795"
-  integrity sha512-0+1FhHnMfj6lIIhVvS4KGQJeuhe1GI//h5uptK4PvLt+BGBxsoUJbd3/IW002yk//6sZPlFgsG1hY6OHLcy6kA==
+"@babel/plugin-transform-parameters@^7.10.4":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz#59d339d58d0b1950435f4043e74e2510005e2c4a"
+  integrity sha512-xPHwUj5RdFV8l1wuYiu5S9fqWGM2DrYc24TMvUiRrPVm+SM3XeqU9BcokQX/kEUe+p2RBwy+yoiR1w/Blq6ubw==
   dependencies:
-    "@babel/helper-get-function-arity" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-get-function-arity" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-property-literals@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.8.3.tgz#33194300d8539c1ed28c62ad5087ba3807b98263"
-  integrity sha512-uGiiXAZMqEoQhRWMK17VospMZh5sXWg+dlh2soffpkAl96KAm+WZuJfa6lcELotSRmooLqg0MWdH6UUq85nmmg==
+"@babel/plugin-transform-property-literals@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.4.tgz#f6fe54b6590352298785b83edd815d214c42e3c0"
+  integrity sha512-ofsAcKiUxQ8TY4sScgsGeR2vJIsfrzqvFb9GvJ5UdXDzl+MyYCaBj/FGzXuv7qE0aJcjWMILny1epqelnFlz8g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-regenerator@^7.8.7":
-  version "7.8.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz#5e46a0dca2bee1ad8285eb0527e6abc9c37672f8"
-  integrity sha512-TIg+gAl4Z0a3WmD3mbYSk+J9ZUH6n/Yc57rtKRnlA/7rcCvpekHXe0CMZHP1gYp7/KLe9GHTuIba0vXmls6drA==
+"@babel/plugin-transform-regenerator@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.4.tgz#2015e59d839074e76838de2159db421966fd8b63"
+  integrity sha512-3thAHwtor39A7C04XucbMg17RcZ3Qppfxr22wYzZNcVIkPHfpM9J0SO8zuCV6SZa265kxBJSrfKTvDCYqBFXGw==
   dependencies:
     regenerator-transform "^0.14.2"
 
-"@babel/plugin-transform-reserved-words@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.8.3.tgz#9a0635ac4e665d29b162837dd3cc50745dfdf1f5"
-  integrity sha512-mwMxcycN3omKFDjDQUl+8zyMsBfjRFr0Zn/64I41pmjv4NJuqcYlEtezwYtw9TFd9WR1vN5kiM+O0gMZzO6L0A==
+"@babel/plugin-transform-reserved-words@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.4.tgz#8f2682bcdcef9ed327e1b0861585d7013f8a54dd"
+  integrity sha512-hGsw1O6Rew1fkFbDImZIEqA8GoidwTAilwCyWqLBM9f+e/u/sQMQu7uX6dyokfOayRuuVfKOW4O7HvaBWM+JlQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-runtime@7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.6.tgz#3ba804438ad0d880a17bca5eaa0cdf1edeedb2fd"
-  integrity sha512-qcmiECD0mYOjOIt8YHNsAP1SxPooC/rDmfmiSK9BNY72EitdSc7l44WTEklaWuFtbOEBjNhWWyph/kOImbNJ4w==
+"@babel/plugin-transform-runtime@7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.11.0.tgz#e27f78eb36f19448636e05c33c90fd9ad9b8bccf"
+  integrity sha512-LFEsP+t3wkYBlis8w6/kmnd6Kb1dxTd+wGJ8MlxTGzQo//ehtqlVL4S9DNUa53+dtPSQobN2CXx4d81FqC58cw==
   dependencies:
-    "@babel/helper-module-imports" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-module-imports" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
     resolve "^1.8.1"
     semver "^5.5.1"
 
-"@babel/plugin-transform-shorthand-properties@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.8.3.tgz#28545216e023a832d4d3a1185ed492bcfeac08c8"
-  integrity sha512-I9DI6Odg0JJwxCHzbzW08ggMdCezoWcuQRz3ptdudgwaHxTjxw5HgdFJmZIkIMlRymL6YiZcped4TTCB0JcC8w==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-
-"@babel/plugin-transform-spread@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.8.3.tgz#9c8ffe8170fdfb88b114ecb920b82fb6e95fe5e8"
-  integrity sha512-CkuTU9mbmAoFOI1tklFWYYbzX5qCIZVXPVy0jpXgGwkplCndQAa58s2jr66fTeQnA64bDox0HL4U56CFYoyC7g==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-
-"@babel/plugin-transform-sticky-regex@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.8.3.tgz#be7a1290f81dae767475452199e1f76d6175b100"
-  integrity sha512-9Spq0vGCD5Bb4Z/ZXXSK5wbbLFMG085qd2vhL1JYu1WcQ5bXqZBAYRzU1d+p79GcHs2szYv5pVQCX13QgldaWw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-regex" "^7.8.3"
-
-"@babel/plugin-transform-template-literals@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.8.3.tgz#7bfa4732b455ea6a43130adc0ba767ec0e402a80"
-  integrity sha512-820QBtykIQOLFT8NZOcTRJ1UNuztIELe4p9DCgvj4NK+PwluSJ49we7s9FB1HIGNIYT7wFUJ0ar2QpCDj0escQ==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-
-"@babel/plugin-transform-typeof-symbol@^7.8.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.8.4.tgz#ede4062315ce0aaf8a657a920858f1a2f35fc412"
-  integrity sha512-2QKyfjGdvuNfHsb7qnBBlKclbD4CfshH2KvDabiijLMGXPHJXGxtDzwIF7bQP+T0ysw8fYTtxPafgfs/c1Lrqg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-
-"@babel/plugin-transform-unicode-regex@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.8.3.tgz#0cef36e3ba73e5c57273effb182f46b91a1ecaad"
-  integrity sha512-+ufgJjYdmWfSQ+6NS9VGUR2ns8cjJjYbrbi11mZBTaWm+Fui/ncTLFF28Ei1okavY+xkojGr1eJxNsWYeA5aZw==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-
-"@babel/preset-env@7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.9.6.tgz#df063b276c6455ec6fcfc6e53aacc38da9b0aea6"
-  integrity sha512-0gQJ9RTzO0heXOhzftog+a/WyOuqMrAIugVYxMYf83gh1CQaQDjMtsOpqOwXyDL/5JcWsrCm8l4ju8QC97O7EQ==
-  dependencies:
-    "@babel/compat-data" "^7.9.6"
-    "@babel/helper-compilation-targets" "^7.9.6"
-    "@babel/helper-module-imports" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-proposal-async-generator-functions" "^7.8.3"
-    "@babel/plugin-proposal-dynamic-import" "^7.8.3"
-    "@babel/plugin-proposal-json-strings" "^7.8.3"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.8.3"
-    "@babel/plugin-proposal-numeric-separator" "^7.8.3"
-    "@babel/plugin-proposal-object-rest-spread" "^7.9.6"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.8.3"
-    "@babel/plugin-proposal-optional-chaining" "^7.9.0"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.8.3"
+"@babel/plugin-transform-shorthand-properties@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.4.tgz#9fd25ec5cdd555bb7f473e5e6ee1c971eede4dd6"
+  integrity sha512-AC2K/t7o07KeTIxMoHneyX90v3zkm5cjHJEokrPEAGEy3UCp8sLKfnfOIGdZ194fyN4wfX/zZUWT9trJZ0qc+Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
+"@babel/plugin-transform-spread@^7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz#fa84d300f5e4f57752fe41a6d1b3c554f13f17cc"
+  integrity sha512-UwQYGOqIdQJe4aWNyS7noqAnN2VbaczPLiEtln+zPowRNlD+79w3oi2TWfYe0eZgd+gjZCbsydN7lzWysDt+gw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.11.0"
+
+"@babel/plugin-transform-sticky-regex@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz#8f3889ee8657581130a29d9cc91d7c73b7c4a28d"
+  integrity sha512-Ddy3QZfIbEV0VYcVtFDCjeE4xwVTJWTmUtorAJkn6u/92Z/nWJNV+mILyqHKrUxXYKA2EoCilgoPePymKL4DvQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-regex" "^7.10.4"
+
+"@babel/plugin-transform-template-literals@^7.10.4":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.5.tgz#78bc5d626a6642db3312d9d0f001f5e7639fde8c"
+  integrity sha512-V/lnPGIb+KT12OQikDvgSuesRX14ck5FfJXt6+tXhdkJ+Vsd0lDCVtF6jcB4rNClYFzaB2jusZ+lNISDk2mMMw==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
+
+"@babel/plugin-transform-typeof-symbol@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.4.tgz#9509f1a7eec31c4edbffe137c16cc33ff0bc5bfc"
+  integrity sha512-QqNgYwuuW0y0H+kUE/GWSR45t/ccRhe14Fs/4ZRouNNQsyd4o3PG4OtHiIrepbM2WKUBDAXKCAK/Lk4VhzTaGA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
+"@babel/plugin-transform-unicode-escapes@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.4.tgz#feae523391c7651ddac115dae0a9d06857892007"
+  integrity sha512-y5XJ9waMti2J+e7ij20e+aH+fho7Wb7W8rNuu72aKRwCHFqQdhkdU2lo3uZ9tQuboEJcUFayXdARhcxLQ3+6Fg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
+"@babel/plugin-transform-unicode-regex@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.4.tgz#e56d71f9282fac6db09c82742055576d5e6d80a8"
+  integrity sha512-wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
+
+"@babel/preset-env@7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.11.0.tgz#860ee38f2ce17ad60480c2021ba9689393efb796"
+  integrity sha512-2u1/k7rG/gTh02dylX2kL3S0IJNF+J6bfDSp4DI2Ma8QN6Y9x9pmAax59fsCk6QUQG0yqH47yJWA+u1I1LccAg==
+  dependencies:
+    "@babel/compat-data" "^7.11.0"
+    "@babel/helper-compilation-targets" "^7.10.4"
+    "@babel/helper-module-imports" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-proposal-async-generator-functions" "^7.10.4"
+    "@babel/plugin-proposal-class-properties" "^7.10.4"
+    "@babel/plugin-proposal-dynamic-import" "^7.10.4"
+    "@babel/plugin-proposal-export-namespace-from" "^7.10.4"
+    "@babel/plugin-proposal-json-strings" "^7.10.4"
+    "@babel/plugin-proposal-logical-assignment-operators" "^7.11.0"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.10.4"
+    "@babel/plugin-proposal-numeric-separator" "^7.10.4"
+    "@babel/plugin-proposal-object-rest-spread" "^7.11.0"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.10.4"
+    "@babel/plugin-proposal-optional-chaining" "^7.11.0"
+    "@babel/plugin-proposal-private-methods" "^7.10.4"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.10.4"
     "@babel/plugin-syntax-async-generators" "^7.8.0"
+    "@babel/plugin-syntax-class-properties" "^7.10.4"
     "@babel/plugin-syntax-dynamic-import" "^7.8.0"
+    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
     "@babel/plugin-syntax-json-strings" "^7.8.0"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
-    "@babel/plugin-syntax-numeric-separator" "^7.8.0"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
     "@babel/plugin-syntax-optional-chaining" "^7.8.0"
-    "@babel/plugin-syntax-top-level-await" "^7.8.3"
-    "@babel/plugin-transform-arrow-functions" "^7.8.3"
-    "@babel/plugin-transform-async-to-generator" "^7.8.3"
-    "@babel/plugin-transform-block-scoped-functions" "^7.8.3"
-    "@babel/plugin-transform-block-scoping" "^7.8.3"
-    "@babel/plugin-transform-classes" "^7.9.5"
-    "@babel/plugin-transform-computed-properties" "^7.8.3"
-    "@babel/plugin-transform-destructuring" "^7.9.5"
-    "@babel/plugin-transform-dotall-regex" "^7.8.3"
-    "@babel/plugin-transform-duplicate-keys" "^7.8.3"
-    "@babel/plugin-transform-exponentiation-operator" "^7.8.3"
-    "@babel/plugin-transform-for-of" "^7.9.0"
-    "@babel/plugin-transform-function-name" "^7.8.3"
-    "@babel/plugin-transform-literals" "^7.8.3"
-    "@babel/plugin-transform-member-expression-literals" "^7.8.3"
-    "@babel/plugin-transform-modules-amd" "^7.9.6"
-    "@babel/plugin-transform-modules-commonjs" "^7.9.6"
-    "@babel/plugin-transform-modules-systemjs" "^7.9.6"
-    "@babel/plugin-transform-modules-umd" "^7.9.0"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.8.3"
-    "@babel/plugin-transform-new-target" "^7.8.3"
-    "@babel/plugin-transform-object-super" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.9.5"
-    "@babel/plugin-transform-property-literals" "^7.8.3"
-    "@babel/plugin-transform-regenerator" "^7.8.7"
-    "@babel/plugin-transform-reserved-words" "^7.8.3"
-    "@babel/plugin-transform-shorthand-properties" "^7.8.3"
-    "@babel/plugin-transform-spread" "^7.8.3"
-    "@babel/plugin-transform-sticky-regex" "^7.8.3"
-    "@babel/plugin-transform-template-literals" "^7.8.3"
-    "@babel/plugin-transform-typeof-symbol" "^7.8.4"
-    "@babel/plugin-transform-unicode-regex" "^7.8.3"
+    "@babel/plugin-syntax-top-level-await" "^7.10.4"
+    "@babel/plugin-transform-arrow-functions" "^7.10.4"
+    "@babel/plugin-transform-async-to-generator" "^7.10.4"
+    "@babel/plugin-transform-block-scoped-functions" "^7.10.4"
+    "@babel/plugin-transform-block-scoping" "^7.10.4"
+    "@babel/plugin-transform-classes" "^7.10.4"
+    "@babel/plugin-transform-computed-properties" "^7.10.4"
+    "@babel/plugin-transform-destructuring" "^7.10.4"
+    "@babel/plugin-transform-dotall-regex" "^7.10.4"
+    "@babel/plugin-transform-duplicate-keys" "^7.10.4"
+    "@babel/plugin-transform-exponentiation-operator" "^7.10.4"
+    "@babel/plugin-transform-for-of" "^7.10.4"
+    "@babel/plugin-transform-function-name" "^7.10.4"
+    "@babel/plugin-transform-literals" "^7.10.4"
+    "@babel/plugin-transform-member-expression-literals" "^7.10.4"
+    "@babel/plugin-transform-modules-amd" "^7.10.4"
+    "@babel/plugin-transform-modules-commonjs" "^7.10.4"
+    "@babel/plugin-transform-modules-systemjs" "^7.10.4"
+    "@babel/plugin-transform-modules-umd" "^7.10.4"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.10.4"
+    "@babel/plugin-transform-new-target" "^7.10.4"
+    "@babel/plugin-transform-object-super" "^7.10.4"
+    "@babel/plugin-transform-parameters" "^7.10.4"
+    "@babel/plugin-transform-property-literals" "^7.10.4"
+    "@babel/plugin-transform-regenerator" "^7.10.4"
+    "@babel/plugin-transform-reserved-words" "^7.10.4"
+    "@babel/plugin-transform-shorthand-properties" "^7.10.4"
+    "@babel/plugin-transform-spread" "^7.11.0"
+    "@babel/plugin-transform-sticky-regex" "^7.10.4"
+    "@babel/plugin-transform-template-literals" "^7.10.4"
+    "@babel/plugin-transform-typeof-symbol" "^7.10.4"
+    "@babel/plugin-transform-unicode-escapes" "^7.10.4"
+    "@babel/plugin-transform-unicode-regex" "^7.10.4"
     "@babel/preset-modules" "^0.1.3"
-    "@babel/types" "^7.9.6"
-    browserslist "^4.11.1"
+    "@babel/types" "^7.11.0"
+    browserslist "^4.12.0"
     core-js-compat "^3.6.2"
     invariant "^2.2.2"
     levenary "^1.1.1"
@@ -1214,10 +1223,10 @@
     core-js-pure "^3.0.0"
     regenerator-runtime "^0.13.2"
 
-"@babel/runtime@7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.6.tgz#a9102eb5cadedf3f31d08a9ecf294af7827ea29f"
-  integrity sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==
+"@babel/runtime@7.11.2":
+  version "7.11.2"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.11.2.tgz#f549c13c754cc40b87644b9fa9f09a6a95fe0736"
+  integrity sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==
   dependencies:
     regenerator-runtime "^0.13.4"
 
@@ -1228,25 +1237,16 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/template@7.8.6", "@babel/template@^7.8.6":
-  version "7.8.6"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz#86b22af15f828dfb086474f964dcc3e39c43ce2b"
-  integrity sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==
+"@babel/template@7.10.4", "@babel/template@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz#3251996c4200ebc71d1a8fc405fba940f36ba278"
+  integrity sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==
   dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/parser" "^7.8.6"
-    "@babel/types" "^7.8.6"
+    "@babel/code-frame" "^7.10.4"
+    "@babel/parser" "^7.10.4"
+    "@babel/types" "^7.10.4"
 
-"@babel/template@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.1.tgz#e167154a94cb5f14b28dc58f5356d2162f539811"
-  integrity sha512-OQDg6SqvFSsc9A0ej6SKINWrpJiNonRIniYondK2ViKhB06i3c0s+76XUft71iqBEe9S1OKsHwPAjfHnuvnCig==
-  dependencies:
-    "@babel/code-frame" "^7.10.1"
-    "@babel/parser" "^7.10.1"
-    "@babel/types" "^7.10.1"
-
-"@babel/template@^7.4.0", "@babel/template@^7.7.4", "@babel/template@^7.8.3":
+"@babel/template@^7.4.0", "@babel/template@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.3.tgz#e02ad04fe262a657809327f578056ca15fd4d1b8"
   integrity sha512-04m87AcQgAFdvuoyiQ2kgELr2tV8B4fP/xJAVUL3Yb3bkNdMedD3d0rlSQr3PegP0cms3eHjl1F7PWlvWbU8FQ==
@@ -1255,22 +1255,22 @@
     "@babel/parser" "^7.8.3"
     "@babel/types" "^7.8.3"
 
-"@babel/traverse@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.10.1.tgz#bbcef3031e4152a6c0b50147f4958df54ca0dd27"
-  integrity sha512-C/cTuXeKt85K+p08jN6vMDz8vSV0vZcI0wmQ36o6mjbuo++kPMdpOYw23W2XH04dbRt9/nMEfA4W3eR21CD+TQ==
-  dependencies:
-    "@babel/code-frame" "^7.10.1"
-    "@babel/generator" "^7.10.1"
-    "@babel/helper-function-name" "^7.10.1"
-    "@babel/helper-split-export-declaration" "^7.10.1"
-    "@babel/parser" "^7.10.1"
-    "@babel/types" "^7.10.1"
+"@babel/traverse@^7.10.4", "@babel/traverse@^7.11.0":
+  version "7.11.5"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.11.5.tgz#be777b93b518eb6d76ee2e1ea1d143daa11e61c3"
+  integrity sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==
+  dependencies:
+    "@babel/code-frame" "^7.10.4"
+    "@babel/generator" "^7.11.5"
+    "@babel/helper-function-name" "^7.10.4"
+    "@babel/helper-split-export-declaration" "^7.11.0"
+    "@babel/parser" "^7.11.5"
+    "@babel/types" "^7.11.5"
     debug "^4.1.0"
     globals "^11.1.0"
-    lodash "^4.17.13"
+    lodash "^4.17.19"
 
-"@babel/traverse@^7.4.3", "@babel/traverse@^7.7.4", "@babel/traverse@^7.8.3", "@babel/traverse@^7.8.4":
+"@babel/traverse@^7.4.3", "@babel/traverse@^7.8.4":
   version "7.8.4"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.8.4.tgz#f0845822365f9d5b0e312ed3959d3f827f869e3c"
   integrity sha512-NGLJPZwnVEyBPLI+bl9y9aSnxMhsKz42so7ApAv9D+b4vAFPpY013FTS9LdKxcABoIYFU52HcYga1pPlx454mg==
@@ -1285,43 +1285,13 @@
     globals "^11.1.0"
     lodash "^4.17.13"
 
-"@babel/traverse@^7.8.6":
-  version "7.8.6"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.8.6.tgz#acfe0c64e1cd991b3e32eae813a6eb564954b5ff"
-  integrity sha512-2B8l0db/DPi8iinITKuo7cbPznLCEk0kCxDoB9/N6gGNg/gxOXiR/IcymAFPiBwk5w6TtQ27w4wpElgp9btR9A==
+"@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0", "@babel/types@^7.11.5":
+  version "7.11.5"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.11.5.tgz#d9de577d01252d77c6800cee039ee64faf75662d"
+  integrity sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==
   dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/generator" "^7.8.6"
-    "@babel/helper-function-name" "^7.8.3"
-    "@babel/helper-split-export-declaration" "^7.8.3"
-    "@babel/parser" "^7.8.6"
-    "@babel/types" "^7.8.6"
-    debug "^4.1.0"
-    globals "^11.1.0"
-    lodash "^4.17.13"
-
-"@babel/traverse@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.6.tgz#5540d7577697bf619cc57b92aa0f1c231a94f442"
-  integrity sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg==
-  dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/generator" "^7.9.6"
-    "@babel/helper-function-name" "^7.9.5"
-    "@babel/helper-split-export-declaration" "^7.8.3"
-    "@babel/parser" "^7.9.6"
-    "@babel/types" "^7.9.6"
-    debug "^4.1.0"
-    globals "^11.1.0"
-    lodash "^4.17.13"
-
-"@babel/types@^7.10.1", "@babel/types@^7.10.2":
-  version "7.10.2"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.10.2.tgz#30283be31cad0dbf6fb00bd40641ca0ea675172d"
-  integrity sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.10.1"
-    lodash "^4.17.13"
+    "@babel/helper-validator-identifier" "^7.10.4"
+    lodash "^4.17.19"
     to-fast-properties "^2.0.0"
 
 "@babel/types@^7.4.0", "@babel/types@^7.8.3":
@@ -1333,7 +1303,7 @@
     lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
-"@babel/types@^7.4.4", "@babel/types@^7.9.0", "@babel/types@^7.9.5", "@babel/types@^7.9.6":
+"@babel/types@^7.4.4":
   version "7.9.6"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.9.6.tgz#2c5502b427251e9de1bd2dff95add646d95cc9f7"
   integrity sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==
@@ -1342,15 +1312,6 @@
     lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
-"@babel/types@^7.8.6", "@babel/types@^7.8.7":
-  version "7.8.7"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.8.7.tgz#1fc9729e1acbb2337d5b6977a63979b4819f5d1d"
-  integrity sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw==
-  dependencies:
-    esutils "^2.0.2"
-    lodash "^4.17.13"
-    to-fast-properties "^2.0.0"
-
 "@firebase/analytics-types@0.3.1":
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/@firebase/analytics-types/-/analytics-types-0.3.1.tgz#3c5f5d71129c88295e17e914e34b391ffda1723c"
@@ -1627,10 +1588,13 @@
     semver "^6.2.0"
 
 "@grpc/grpc-js@^1.0.0":
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.1.3.tgz#0b91b166d744b6a43b00430dceff0f0ff88c98d5"
-  integrity sha512-HtOsk2YUofBcm1GkPqGzb6pwHhv+74eC2CUO229USIDKRtg30ycbZmqC+HdNtY3nHqoc9IgcRlntFgopyQoYCA==
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.1.7.tgz#d3d71c6da95397e2d63895ccc4a05e7572f7b7e6"
+  integrity sha512-EuxMstI0u778dp0nk6Fe3gHXYPeV6FYsWOe0/QFwxv1NQ6bc5Wl/0Yxa4xl9uBlKElL6AIxuASmSfu7KEJhqiw==
   dependencies:
+    "@grpc/proto-loader" "^0.6.0-pre14"
+    "@types/node" "^12.12.47"
+    google-auth-library "^6.0.0"
     semver "^6.2.0"
 
 "@grpc/proto-loader@^0.5.0":
@@ -1649,30 +1613,48 @@
     lodash.camelcase "^4.3.0"
     protobufjs "^6.8.6"
 
+"@grpc/proto-loader@^0.6.0-pre14":
+  version "0.6.0-pre9"
+  resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.6.0-pre9.tgz#0c6fe42f6c5ef9ce1b3cef7be64d5b09d6fe4d6d"
+  integrity sha512-oM+LjpEjNzW5pNJjt4/hq1HYayNeQT+eGrOPABJnYHv7TyNPDNzkQ76rDYZF86X5swJOa4EujEMzQ9iiTdPgww==
+  dependencies:
+    "@types/long" "^4.0.1"
+    lodash.camelcase "^4.3.0"
+    long "^4.0.0"
+    protobufjs "^6.9.0"
+    yargs "^15.3.1"
+
 "@istanbuljs/schema@^0.1.2":
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd"
   integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==
 
-"@jsdevtools/coverage-istanbul-loader@3.0.3":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@jsdevtools/coverage-istanbul-loader/-/coverage-istanbul-loader-3.0.3.tgz#102e414b02ae2f0b3c7fd45a705601e1fd4867c5"
-  integrity sha512-TAdNkeGB5Fe4Og+ZkAr1Kvn9by2sfL44IAHFtxlh1BA1XJ5cLpO9iSNki5opWESv3l3vSHsZ9BNKuqFKbEbFaA==
+"@jsdevtools/coverage-istanbul-loader@3.0.5":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@jsdevtools/coverage-istanbul-loader/-/coverage-istanbul-loader-3.0.5.tgz#2a4bc65d0271df8d4435982db4af35d81754ee26"
+  integrity sha512-EUCPEkaRPvmHjWAAZkWMT7JDzpw7FKB00WTISaiXsbNOd5hCHg77XLA8sLYLFDo1zepYLo2w7GstN8YBqRXZfA==
   dependencies:
     convert-source-map "^1.7.0"
-    istanbul-lib-instrument "^4.0.1"
-    loader-utils "^1.4.0"
+    istanbul-lib-instrument "^4.0.3"
+    loader-utils "^2.0.0"
     merge-source-map "^1.1.0"
-    schema-utils "^2.6.4"
+    schema-utils "^2.7.0"
 
-"@ngtools/webpack@10.0.1":
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-10.0.1.tgz#f3d5143f268cc1c3c8d94de0e048b970c95e6a27"
-  integrity sha512-/uUTczGcH2WJoVovCLHXdPdTzN0yQZontcf5MkoDjlA0selUdRFntV9cnUWoray9SVxzgoHqjRxBANCTsiiuuw==
+"@mrmlnc/readdir-enhanced@^2.2.1":
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
+  integrity sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==
   dependencies:
-    "@angular-devkit/core" "10.0.1"
-    enhanced-resolve "4.1.1"
-    rxjs "6.5.5"
+    call-me-maybe "^1.0.1"
+    glob-to-regexp "^0.3.0"
+
+"@ngtools/webpack@10.1.3":
+  version "10.1.3"
+  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-10.1.3.tgz#f65c591daab7ed0c3372a115c6a90eba701a2ca1"
+  integrity sha512-wEg3hY0u+HMAIypClOVnpjYaNwBp+yY0pEb1yNc3Id8bBlw76Y+wk+kGplESelkNQKlfwKDaMFk+7EjGkOrmng==
+  dependencies:
+    "@angular-devkit/core" "10.1.3"
+    enhanced-resolve "4.3.0"
     webpack-sources "1.4.3"
 
 "@nodelib/fs.scandir@2.1.3":
@@ -1688,6 +1670,11 @@
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz#34dc5f4cabbc720f4e60f75a747e7ecd6c175bd3"
   integrity sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==
 
+"@nodelib/fs.stat@^1.1.2":
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
+  integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
+
 "@nodelib/fs.walk@^1.2.3":
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz#011b9202a70a6366e436ca5c065844528ab04976"
@@ -1756,26 +1743,26 @@
   resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
   integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=
 
-"@schematics/angular@10.0.1":
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-10.0.1.tgz#0660d5eb99169a67ecfc7a4c2946de1ea32320c0"
-  integrity sha512-SrWr2FzenwuofRpcaLhzJYNFVJmJwKxlKu32dWAVnclpteMO0Hnp/jVI/e70HIc6zoWzgJ4yArmwBTA+Q26yaA==
+"@schematics/angular@10.1.3":
+  version "10.1.3"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-10.1.3.tgz#8b39f2d934043c68b55495bc6e44705c6fa7ef8c"
+  integrity sha512-X3tNnpfF/jkl1KcyCC8PaOYogQlTZ9s7Yuz0va0DAVOptIqorpf8e6+lY0PPLKshaK9TSiFUcQ8SYYnjAVKcdA==
   dependencies:
-    "@angular-devkit/core" "10.0.1"
-    "@angular-devkit/schematics" "10.0.1"
+    "@angular-devkit/core" "10.1.3"
+    "@angular-devkit/schematics" "10.1.3"
+    jsonc-parser "2.3.0"
 
-"@schematics/update@0.1000.1":
-  version "0.1000.1"
-  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.1000.1.tgz#bcccf6822eb2b145a0ac3d1b352ada2925a558bf"
-  integrity sha512-AiU3RiKMfzxquzxANgDMO88iTkk9pVKQ5fZV4UwiyZO5q/fUCW4FFx9h4Nc7e9adchM+VaCz/uEAWqrVdsPv9Q==
+"@schematics/update@0.1001.3":
+  version "0.1001.3"
+  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.1001.3.tgz#7b8e2c166948c096cb46d9d7c712b3f9fac044e0"
+  integrity sha512-ah4YHjEXACmpX0i3cAn5OguH5S430HD+zbxlMu4AC93A8W52ll97vqvUVF8NLZ6RKcOV/8tXmzgzvJDe07i8yQ==
   dependencies:
-    "@angular-devkit/core" "10.0.1"
-    "@angular-devkit/schematics" "10.0.1"
+    "@angular-devkit/core" "10.1.3"
+    "@angular-devkit/schematics" "10.1.3"
     "@yarnpkg/lockfile" "1.1.0"
     ini "1.3.5"
     npm-package-arg "^8.0.0"
     pacote "9.5.12"
-    rxjs "6.5.5"
     semver "7.3.2"
     semver-intersect "1.4.0"
 
@@ -1829,7 +1816,7 @@
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.5.tgz#dcce4430e64b443ba8945f0290fb564ad5bac6dd"
   integrity sha512-7+2BITlgjgDhH0vvwZU/HZJVyk+2XUlvxXe8dFMedNX/aMkaOq++rMAFXc0tM7ij15QaWlbdQASBR9dihi+bDQ==
 
-"@types/long@^4.0.0":
+"@types/long@^4.0.0", "@types/long@^4.0.1":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.1.tgz#459c65fa1867dafe6a8f322c4c51695663cc55e9"
   integrity sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w==
@@ -1854,11 +1841,21 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.15.tgz#bfff4e23e9e70be6eec450419d51e18de1daf8e7"
   integrity sha512-daFGV9GSs6USfPgxceDA8nlSe48XrVCJfDeYm7eokxq/ye7iuOH87hKXgMtEAVLFapkczbZsx868PMDT1Y0a6A==
 
+"@types/node@^12.12.47":
+  version "12.19.0"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.0.tgz#a0f841c195bdbe0b5070da9278b3e22189e8c8f6"
+  integrity sha512-4BVAE9yp5DU3ISqBInsaRp9J474HWNaNVs8eZ1Far3dI1MwS3Wk0EvBRMM4xBh3Oz+c05hUgJmcbtAVmG8bv7w==
+
 "@types/node@^12.7.9":
   version "12.12.27"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.27.tgz#d7506f73160ad30fcebbcf5b8b7d2d976e649e42"
   integrity sha512-odQFl/+B9idbdS0e8IxDl2ia/LP8KZLXhV3BUeI98TrZp0uoIzQPhGd+5EtzHmT0SMOIaPd7jfz6pOHLWTtl7A==
 
+"@types/node@^13.7.0":
+  version "13.13.28"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.28.tgz#b6d0628b0371d6c629d729c98322de314b640219"
+  integrity sha512-EM/qFeRH8ZCD+TlsaIPULyyFm9vOhFIvgskY2JmHbEsWsOPgN+rtjSXrcHGgJpob4Nu17VfO95FKewr0XY7iOQ==
+
 "@types/q@^0.0.32":
   version "0.0.32"
   resolved "https://registry.yarnpkg.com/@types/q/-/q-0.0.32.tgz#bd284e57c84f1325da702babfc82a5328190c0c5"
@@ -2196,6 +2193,13 @@ agent-base@5:
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-5.1.1.tgz#e8fb3f242959db44d63be665db7a8e739537a32c"
   integrity sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==
 
+agent-base@6:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.1.tgz#808007e4e5867decb0ab6ab2f928fbdb5a596db4"
+  integrity sha512-01q25QQDwLSsyfhrKbn8yuur+JNw0H+0Y4JiGIKd3z9aYk/w/2kxD/Upc+t2ZBBSUNff50VjPsSW2YxM8QYKVg==
+  dependencies:
+    debug "4"
+
 agent-base@~4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
@@ -2233,10 +2237,10 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.4.1:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da"
   integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==
 
-ajv@6.12.2, ajv@^6.12.2:
-  version "6.12.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.2.tgz#c629c5eced17baf314437918d2da88c99d5958cd"
-  integrity sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==
+ajv@6.12.4:
+  version "6.12.4"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.4.tgz#0614facc4522127fa713445c6bfd3ebd376e2234"
+  integrity sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ==
   dependencies:
     fast-deep-equal "^3.1.1"
     fast-json-stable-stringify "^2.0.0"
@@ -2271,6 +2275,16 @@ ajv@^6.12.0:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
+ajv@^6.12.2:
+  version "6.12.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.2.tgz#c629c5eced17baf314437918d2da88c99d5958cd"
+  integrity sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
 alphanum-sort@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
@@ -2392,10 +2406,10 @@ anymatch@~3.1.1:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
-app-root-path@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.2.1.tgz#d0df4a682ee408273583d43f6f79e9892624bc9a"
-  integrity sha512-91IFKeKk7FjfmezPKkwtaRvSpnUc4gDwPAjA1YZ9Gn0q0PPeW+vbeUsZuyDwjI7+QTHhcLen2v25fi/AmhvbJA==
+app-root-path@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-3.0.0.tgz#210b6f43873227e18a4b810a032283311555d5ad"
+  integrity sha512-qMcx+Gy2UZynHjOHOIXPNvpf+9cjvk3cWrBBK7zg4gH9+clobJRb9NGzcT7mQTcV/6Gm/1WelUtqxVXnNlrwcw==
 
 append-transform@^1.0.0:
   version "1.0.0"
@@ -2576,7 +2590,7 @@ as-array@^2.0.0:
   resolved "https://registry.yarnpkg.com/as-array/-/as-array-2.0.0.tgz#4f04805d87f8fce8e511bc2108f8e5e3a287d547"
   integrity sha1-TwSAXYf4/OjlEbwhCPjl46KH1Uc=
 
-asap@^2.0.0, asap@^2.0.3, asap@~2.0.3:
+asap@^2.0.0, asap@^2.0.3:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
   integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
@@ -2664,17 +2678,17 @@ atob@^2.1.2:
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
-autoprefixer@9.8.0:
-  version "9.8.0"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.0.tgz#68e2d2bef7ba4c3a65436f662d0a56a741e56511"
-  integrity sha512-D96ZiIHXbDmU02dBaemyAg53ez+6F5yZmapmgKcjm35yEe1uVDYI8hGW3VYoGRaG290ZFf91YxHrR518vC0u/A==
+autoprefixer@9.8.6:
+  version "9.8.6"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.6.tgz#3b73594ca1bf9266320c5acf1588d74dea74210f"
+  integrity sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg==
   dependencies:
     browserslist "^4.12.0"
-    caniuse-lite "^1.0.30001061"
-    chalk "^2.4.2"
+    caniuse-lite "^1.0.30001109"
+    colorette "^1.2.1"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
-    postcss "^7.0.30"
+    postcss "^7.0.32"
     postcss-value-parser "^4.1.0"
 
 aws-sign2@~0.7.0:
@@ -2815,6 +2829,11 @@ bignumber.js@^7.0.0:
   resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-7.2.1.tgz#80c048759d826800807c4bfd521e50edbba57a5f"
   integrity sha512-S4XzBk5sMB+Rcb/LNcpzXr57VRTxgAvaAEDAl1AwRx27j00hT84O6OkteE7u8UB3NuaaygCRrEpqox4uDOrbdQ==
 
+bignumber.js@^9.0.0:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.0.1.tgz#8d7ba124c882bfd8e43260c67475518d0689e4e5"
+  integrity sha512-IdZR9mh6ahOBv/hYGiXyVuyCetmGJhtYkqLBpTStdhEGjegpPlUawydyaF3pbIOFynJTpllEs+NP+CS9jKFLjA==
+
 binary-extensions@^1.0.0:
   version "1.13.1"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
@@ -3041,7 +3060,7 @@ browserslist@^4.0.0, browserslist@^4.8.3:
     electron-to-chromium "^1.3.341"
     node-releases "^1.1.47"
 
-browserslist@^4.11.1, browserslist@^4.12.0:
+browserslist@^4.12.0:
   version "4.12.0"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.12.0.tgz#06c6d5715a1ede6c51fc39ff67fd647f740b656d"
   integrity sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==
@@ -3171,22 +3190,22 @@ bytes@3.1.0:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
   integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
 
-cacache@15.0.3:
-  version "15.0.3"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.0.3.tgz#2225c2d1dd8e872339950d6a39c051e0e9334392"
-  integrity sha512-bc3jKYjqv7k4pWh7I/ixIjfcjPul4V4jme/WbjvwGS5LzoPL/GzXr4C5EgPNLO/QEZl9Oi61iGitYEdwcrwLCQ==
+cacache@15.0.5, cacache@^15.0.5:
+  version "15.0.5"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.0.5.tgz#69162833da29170d6732334643c60e005f5f17d0"
+  integrity sha512-lloiL22n7sOjEEXdL8NAjTgv9a1u43xICE9/203qonkZUCj5X1UEWIdf2/Y0d6QcCtMzbKQyhrcDbdvlZTs/+A==
   dependencies:
+    "@npmcli/move-file" "^1.0.1"
     chownr "^2.0.0"
     fs-minipass "^2.0.0"
     glob "^7.1.4"
     infer-owner "^1.0.4"
-    lru-cache "^5.1.1"
+    lru-cache "^6.0.0"
     minipass "^3.1.1"
     minipass-collect "^1.0.2"
     minipass-flush "^1.0.5"
     minipass-pipeline "^1.2.2"
     mkdirp "^1.0.3"
-    move-file "^2.0.0"
     p-map "^4.0.0"
     promise-inflight "^1.0.1"
     rimraf "^3.0.2"
@@ -3236,7 +3255,7 @@ cacache@^12.0.2:
     unique-filename "^1.1.1"
     y18n "^4.0.0"
 
-cacache@^15.0.3, cacache@^15.0.4:
+cacache@^15.0.4:
   version "15.0.4"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.0.4.tgz#b2c23cf4ac4f5ead004fb15a0efb0a20340741f1"
   integrity sha512-YlnKQqTbD/6iyoJvEY3KJftjrdBYroCbxxYXzhOzsFLWlp6KX4BOlEf4mTx0cMUfVaTS3ENL2QtDWeRYoGLkkw==
@@ -3274,6 +3293,11 @@ cache-base@^1.0.1:
     union-value "^1.0.0"
     unset-value "^1.0.0"
 
+call-me-maybe@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b"
+  integrity sha1-JtII6onje1y95gJQoV8DHBak1ms=
+
 caller-callsite@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134"
@@ -3323,7 +3347,7 @@ camelcase@5.0.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.0.0.tgz#03295527d58bd3cd4aa75363f35b2e8d97be2f42"
   integrity sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA==
 
-camelcase@5.3.1, camelcase@^5.0.0, camelcase@^5.3.1:
+camelcase@5.3.1, camelcase@^5.0.0:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
@@ -3333,16 +3357,16 @@ camelcase@^2.0.1:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
   integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=
 
-camelcase@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
-  integrity sha1-MvxLn82vhF/N9+c7uXysImHwqwo=
-
 camelcase@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
   integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
 
+camelcase@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.0.0.tgz#5259f7c30e35e278f1bdc2a4d91230b37cad981e"
+  integrity sha512-8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w==
+
 caniuse-api@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0"
@@ -3368,10 +3392,10 @@ caniuse-lite@^1.0.30001043:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001051.tgz#8e944abf9c796bc7ea0bec3c3688a250561fc9ac"
   integrity sha512-sw8UUnTlRevawTMZKN7vpfwSjCBVoiMPlYd8oT2VwNylyPCBdMAUmLGUApnYYTtIm5JXsQegUAY7GPHqgfDzjw==
 
-caniuse-lite@^1.0.30001061:
-  version "1.0.30001078"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001078.tgz#e1b6e2ae327b6a1ec11f65ec7a0dde1e7093074c"
-  integrity sha512-sF12qXe9VMm32IEf/+NDvmTpwJaaU7N1igpiH2FdI4DyABJSsOqG3ZAcFvszLkoLoo1y6VJLMYivukUAxaMASw==
+caniuse-lite@^1.0.30001109:
+  version "1.0.30001137"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001137.tgz#6f0127b1d3788742561a25af3607a17fc778b803"
+  integrity sha512-54xKQZTqZrKVHmVz0+UvdZR6kQc7pJDgfhsMYDG19ID1BWoNnDMFm5Q3uSBSU401pBvKYMsHAt9qhEDcxmk8aw==
 
 canonical-path@1.0.0, canonical-path@^1.0.0:
   version "1.0.0"
@@ -3445,10 +3469,10 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4"
-  integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==
+chalk@^4.0.0, chalk@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
+  integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
   dependencies:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
@@ -3551,6 +3575,21 @@ chokidar@^2.0.0, chokidar@^2.1.8:
   optionalDependencies:
     fsevents "^1.2.7"
 
+chokidar@^3.4.1:
+  version "3.4.2"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.2.tgz#38dc8e658dec3809741eb3ef7bb0a47fe424232d"
+  integrity sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A==
+  dependencies:
+    anymatch "~3.1.1"
+    braces "~3.0.2"
+    glob-parent "~5.1.0"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.4.0"
+  optionalDependencies:
+    fsevents "~2.1.2"
+
 chownr@^1.1.1, chownr@^1.1.2:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
@@ -3670,11 +3709,16 @@ cli-cursor@^3.1.0:
   dependencies:
     restore-cursor "^3.1.0"
 
-cli-spinners@^2.0.0, cli-spinners@^2.2.0:
+cli-spinners@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.2.0.tgz#e8b988d9206c692302d8ee834e7a85c0144d8f77"
   integrity sha512-tgU3fKwzYjiLEQgPMD9Jt+JjHVL9kW93FiIMX/l7rivvOD4/LL0Mf7gda3+4U2KJBloybwgj5KEoQgGRioMiKQ==
 
+cli-spinners@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.4.0.tgz#c6256db216b878cfba4720e719cec7cf72685d7f"
+  integrity sha512-sJAofoarcm76ZGpuooaO0eDy8saEy+YoZBLjC4h8srt4jeBnkYeOgqxgsJQTpyt2LjI5PTfLJHSL+41Yu4fEJA==
+
 cli-table@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/cli-table/-/cli-table-0.3.1.tgz#f53b05266a8b1a0b934b3d0821e6e2dc5914ae23"
@@ -3687,7 +3731,12 @@ cli-width@^2.0.0:
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
   integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=
 
-cliui@^3.0.3, cliui@^3.2.0:
+cli-width@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
+  integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==
+
+cliui@^3.0.3:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
   integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=
@@ -3723,14 +3772,14 @@ cliui@^6.0.0:
     strip-ansi "^6.0.0"
     wrap-ansi "^6.2.0"
 
-clone-deep@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
-  integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==
+cliui@^7.0.2:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.2.tgz#e3a412e1d5ec0ccbe50d1b4120fc8164e97881f4"
+  integrity sha512-lhpKkuUj67j5JgZIPZxLe7nSa4MQoojzRVWQyzMqBp2hBg6gwRjUDAwC1YDeBaC3APDBKNnjWbv2mlDF4XgOSA==
   dependencies:
-    is-plain-object "^2.0.4"
-    kind-of "^6.0.2"
-    shallow-clone "^3.0.0"
+    string-width "^4.2.0"
+    strip-ansi "^6.0.0"
+    wrap-ansi "^7.0.0"
 
 clone@^1.0.2:
   version "1.0.4"
@@ -3761,23 +3810,25 @@ code-point-at@^1.0.0:
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
   integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
 
-codelyzer@^6.0.0-next.1:
-  version "6.0.0-next.1"
-  resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-6.0.0-next.1.tgz#f68ca751d28f57e7a0c83fe8939929fb77e6c32b"
-  integrity sha512-TMzAaJ6P7GEZOIAOvLthZ50MUhnmac/8nA7EFBWuy+ZUsJSqm749az1gy/NdV7FtoM7/kb/NoAdwFjmJA5Zniw==
+codelyzer@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-6.0.0.tgz#50c98581cc2890e0e9a9f93878dc317115d836ed"
+  integrity sha512-edJIQCIcxD9DhVSyBEdJ38AbLikm515Wl91t5RDGNT88uA6uQdTm4phTWfn9JhzAI8kXNUcfYyAE90lJElpGtA==
   dependencies:
-    "@angular/compiler" "~8.2.14"
-    "@angular/core" "~8.2.14"
-    app-root-path "^2.2.1"
+    "@angular/compiler" "9.0.0"
+    "@angular/core" "9.0.0"
+    app-root-path "^3.0.0"
     aria-query "^3.0.0"
     axobject-query "2.0.2"
     css-selector-tokenizer "^0.7.1"
     cssauron "^1.4.0"
     damerau-levenshtein "^1.0.4"
+    rxjs "^6.5.3"
     semver-dsl "^1.0.1"
     source-map "^0.5.7"
     sprintf-js "^1.1.2"
-    zone.js "~0.9.1"
+    tslib "^1.10.0"
+    zone.js "~0.10.3"
 
 collapse-white-space@^1.0.0, collapse-white-space@^1.0.2:
   version "1.0.6"
@@ -3832,6 +3883,11 @@ color@^3.0.0:
     color-convert "^1.9.1"
     color-string "^1.5.2"
 
+colorette@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b"
+  integrity sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==
+
 colors@1.0.3, colors@1.0.x:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
@@ -4296,24 +4352,23 @@ css-declaration-sorter@^4.0.1:
     postcss "^7.0.1"
     timsort "^0.3.0"
 
-css-loader@3.5.3:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.5.3.tgz#95ac16468e1adcd95c844729e0bb167639eb0bcf"
-  integrity sha512-UEr9NH5Lmi7+dguAm+/JSPovNjYbm2k3TK58EiwQHzOHH5Jfq1Y+XoP2bQO6TMn7PptMd0opxxedAWcaSTRKHw==
+css-loader@4.2.2:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-4.2.2.tgz#b668b3488d566dc22ebcf9425c5f254a05808c89"
+  integrity sha512-omVGsTkZPVwVRpckeUnLshPp12KsmMSLqYxs12+RzM9jRR5Y+Idn/tBffjXRvOE+qW7if24cuceFJqYR5FmGBg==
   dependencies:
-    camelcase "^5.3.1"
+    camelcase "^6.0.0"
     cssesc "^3.0.0"
     icss-utils "^4.1.1"
-    loader-utils "^1.2.3"
-    normalize-path "^3.0.0"
-    postcss "^7.0.27"
+    loader-utils "^2.0.0"
+    postcss "^7.0.32"
     postcss-modules-extract-imports "^2.0.0"
-    postcss-modules-local-by-default "^3.0.2"
+    postcss-modules-local-by-default "^3.0.3"
     postcss-modules-scope "^2.2.0"
     postcss-modules-values "^3.0.0"
-    postcss-value-parser "^4.0.3"
-    schema-utils "^2.6.6"
-    semver "^6.3.0"
+    postcss-value-parser "^4.1.0"
+    schema-utils "^2.7.0"
+    semver "^7.3.2"
 
 css-parse@~2.0.0:
   version "2.0.0"
@@ -4745,6 +4800,11 @@ detect-node@^2.0.4:
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
   integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==
 
+devtools-protocol@0.0.767361:
+  version "0.0.767361"
+  resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.767361.tgz#5977f2558b84f9df36f62501bdddb82f3ae7b66b"
+  integrity sha512-ziRTdhEVQ9jEwedaUaXZ7kl9w9TF/7A3SXQ0XuqrJB+hMS62POHZUWTbumDN2ehRTfvWqTPc2Jw4gUl/jggmHA==
+
 dezalgo@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456"
@@ -4963,7 +5023,7 @@ ecc-jsbn@~0.1.1:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
 
-ecdsa-sig-formatter@1.0.11:
+ecdsa-sig-formatter@1.0.11, ecdsa-sig-formatter@^1.0.11:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz#ae0f0fa2d85045ef14a817daa3ce9acd0489e5bf"
   integrity sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==
@@ -5100,10 +5160,10 @@ engine.io@~3.2.0:
     engine.io-parser "~2.1.0"
     ws "~3.3.1"
 
-enhanced-resolve@4.1.1, enhanced-resolve@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz#2937e2b8066cd0fe7ce0990a98f0d71a35189f66"
-  integrity sha512-98p2zE+rL7/g/DzMHMTF4zZlCgeVdJ7yr6xzEpJRYwFYrGi9ANdn5DnJURg6RpBkyk60XYDnWIv51VfIhfNGuA==
+enhanced-resolve@4.3.0, enhanced-resolve@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz#3b806f3bfafc1ec7de69551ef93cca46c1704126"
+  integrity sha512-3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ==
   dependencies:
     graceful-fs "^4.1.2"
     memory-fs "^0.5.0"
@@ -5141,7 +5201,7 @@ errno@^0.1.1, errno@^0.1.3, errno@~0.1.7:
   dependencies:
     prr "~1.0.1"
 
-error-ex@^1.2.0, error-ex@^1.3.1:
+error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
   integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
@@ -5253,6 +5313,11 @@ es6-weak-map@^2.0.1, es6-weak-map@^2.0.2:
     es6-iterator "^2.0.3"
     es6-symbol "^3.1.1"
 
+escalade@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
+  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
+
 escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
@@ -5621,6 +5686,18 @@ fast-deep-equal@^3.1.1:
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4"
   integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==
 
+fast-glob@^2.2.6:
+  version "2.2.7"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.7.tgz#6953857c3afa475fff92ee6015d52da70a4cd39d"
+  integrity sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==
+  dependencies:
+    "@mrmlnc/readdir-enhanced" "^2.2.1"
+    "@nodelib/fs.stat" "^1.1.2"
+    glob-parent "^3.1.0"
+    is-glob "^4.0.0"
+    merge2 "^1.2.3"
+    micromatch "^3.1.10"
+
 fast-glob@^3.1.1, fast-glob@^3.2.4:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.4.tgz#d20aefbf99579383e7f3cc66529158c9b98554d3"
@@ -5803,17 +5880,9 @@ find-cache-dir@^2.1.0:
     pkg-dir "^3.0.0"
 
 find-free-port@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/find-free-port/-/find-free-port-2.0.0.tgz#4b22e5f6579eb1a38c41ac6bcb3efed1b6da9b1b"
-  integrity sha1-SyLl9leesaOMQaxryz7+0bbamxs=
-
-find-up@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
-  integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=
-  dependencies:
-    path-exists "^2.0.0"
-    pinkie-promise "^2.0.0"
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/find-free-port/-/find-free-port-2.0.0.tgz#4b22e5f6579eb1a38c41ac6bcb3efed1b6da9b1b"
+  integrity sha1-SyLl9leesaOMQaxryz7+0bbamxs=
 
 find-up@^2.1.0:
   version "2.1.0"
@@ -6122,6 +6191,17 @@ gaxios@^2.1.0:
     is-stream "^2.0.0"
     node-fetch "^2.3.0"
 
+gaxios@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-3.2.0.tgz#11b6f0e8fb08d94a10d4d58b044ad3bec6dd486a"
+  integrity sha512-+6WPeVzPvOshftpxJwRi2Ozez80tn/hdtOUag7+gajDHRJvAblKxTFSSMPtr2hmnLy7p0mvYz0rMXLBl8pSO7Q==
+  dependencies:
+    abort-controller "^3.0.0"
+    extend "^3.0.2"
+    https-proxy-agent "^5.0.0"
+    is-stream "^2.0.0"
+    node-fetch "^2.3.0"
+
 gaze@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a"
@@ -6145,6 +6225,14 @@ gcp-metadata@^3.3.0:
     gaxios "^2.1.0"
     json-bigint "^0.3.0"
 
+gcp-metadata@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/gcp-metadata/-/gcp-metadata-4.2.0.tgz#3b424355ccdc240ee07c5791e2fd6a60a283d89a"
+  integrity sha512-vQZD57cQkqIA6YPGXM/zc+PIZfNRFdukWGsGZ5+LcJzesi5xp6Gn7a02wRJi4eXPyArNMIYpPET4QMxGqtlk6Q==
+  dependencies:
+    gaxios "^3.0.0"
+    json-bigint "^1.0.0"
+
 generate-function@^2.0.0:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.3.1.tgz#f069617690c10c868e73b8465746764f97c3479f"
@@ -6174,7 +6262,7 @@ get-caller-file@^1.0.1:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
   integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
 
-get-caller-file@^2.0.1:
+get-caller-file@^2.0.1, get-caller-file@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
@@ -6253,7 +6341,12 @@ glob-slasher@^1.0.1:
     lodash.isobject "^2.4.1"
     toxic "^1.0.0"
 
-glob@7.1.6, 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.3, glob@^7.1.4, glob@~7.1.1:
+glob-to-regexp@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
+  integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=
+
+glob@7.1.6, 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.3, glob@^7.1.4, glob@^7.1.6, glob@~7.1.1:
   version "7.1.6"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
   integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
@@ -6350,6 +6443,21 @@ google-auth-library@^5.0.0, google-auth-library@^5.5.0:
     jws "^4.0.0"
     lru-cache "^5.0.0"
 
+google-auth-library@^6.0.0:
+  version "6.1.2"
+  resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-6.1.2.tgz#96a7b873068e2167d2d232a864c10f8f83aac216"
+  integrity sha512-X9EUX8R+kIpsf55KdSPhFWF0RNyBGuBc1zeYc/5Sjuk65eIYqq91rINJVBD22pp+w/PuM2fasHiA6H2xYjxTIQ==
+  dependencies:
+    arrify "^2.0.0"
+    base64-js "^1.3.0"
+    ecdsa-sig-formatter "^1.0.11"
+    fast-text-encoding "^1.0.0"
+    gaxios "^3.0.0"
+    gcp-metadata "^4.2.0"
+    gtoken "^5.0.4"
+    jws "^4.0.0"
+    lru-cache "^6.0.0"
+
 google-auto-auth@^0.7.2:
   version "0.7.2"
   resolved "https://registry.yarnpkg.com/google-auto-auth/-/google-auto-auth-0.7.2.tgz#bf9352d5c4a0897bf31fd9c491028b765fbea71e"
@@ -6415,6 +6523,13 @@ google-p12-pem@^2.0.0:
   dependencies:
     node-forge "^0.9.0"
 
+google-p12-pem@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/google-p12-pem/-/google-p12-pem-3.0.3.tgz#673ac3a75d3903a87f05878f3c75e06fc151669e"
+  integrity sha512-wS0ek4ZtFx/ACKYF3JhyGe5kzH7pgiQ7J5otlumqR9psmWMYc+U9cErKlCYVYHoUaidXHdZ2xbo34kB+S+24hA==
+  dependencies:
+    node-forge "^0.10.0"
+
 got@^6.7.1:
   version "6.7.1"
   resolved "https://registry.yarnpkg.com/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0"
@@ -6457,6 +6572,16 @@ gtoken@^4.1.0:
     jws "^4.0.0"
     mime "^2.2.0"
 
+gtoken@^5.0.4:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/gtoken/-/gtoken-5.0.4.tgz#e8d7456ad2ff774c70176e56b9d34b1c63fb6f0b"
+  integrity sha512-U9wnSp4GZ7ov6zRdPuRHG4TuqEWqRRgT1gfXGNArhzBUn9byrPeH8uTmBWU/ZiWJJvTEmkjhDIC3mqHWdVi3xQ==
+  dependencies:
+    gaxios "^3.0.0"
+    google-p12-pem "^3.0.3"
+    jws "^4.0.0"
+    mime "^2.2.0"
+
 handle-thing@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.0.tgz#0e039695ff50c93fc288557d696f3c1dc6776754"
@@ -6898,6 +7023,14 @@ https-proxy-agent@^4.0.0:
     agent-base "5"
     debug "4"
 
+https-proxy-agent@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2"
+  integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==
+  dependencies:
+    agent-base "6"
+    debug "4"
+
 humanize-ms@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
@@ -6912,12 +7045,12 @@ iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@~0.4.11, i
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
-iconv-lite@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.5.1.tgz#b2425d3c7b18f7219f2ca663d103bddb91718d64"
-  integrity sha512-ONHr16SQvKZNSqjQT9gy5z24Jw+uqfO02/ngBSBoqChZ+W8qXX7GPRa1RoUnzGADw8K63R1BXUMzarCVQBpY8Q==
+iconv-lite@^0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.2.tgz#ce13d1875b0c3a674bd6a04b7f76b01b1b6ded01"
+  integrity sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==
   dependencies:
-    safer-buffer ">= 2.1.2 < 3"
+    safer-buffer ">= 2.1.2 < 3.0.0"
 
 icss-utils@^4.0.0, icss-utils@^4.1.1:
   version "4.1.1"
@@ -7076,21 +7209,21 @@ ini@1.3.5, ini@^1.3.4, ini@~1.3.0:
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
   integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
 
-inquirer@7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.1.0.tgz#1298a01859883e17c7264b82870ae1034f92dd29"
-  integrity sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg==
+inquirer@7.3.3:
+  version "7.3.3"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz#04d176b2af04afc157a83fd7c100e98ee0aad003"
+  integrity sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==
   dependencies:
     ansi-escapes "^4.2.1"
-    chalk "^3.0.0"
+    chalk "^4.1.0"
     cli-cursor "^3.1.0"
-    cli-width "^2.0.0"
+    cli-width "^3.0.0"
     external-editor "^3.0.3"
     figures "^3.0.0"
-    lodash "^4.17.15"
+    lodash "^4.17.19"
     mute-stream "0.0.8"
     run-async "^2.4.0"
-    rxjs "^6.5.3"
+    rxjs "^6.6.0"
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
     through "^2.3.6"
@@ -7623,11 +7756,6 @@ is-url@^1.2.2:
   resolved "https://registry.yarnpkg.com/is-url/-/is-url-1.2.4.tgz#04a4df46d28c4cff3d73d01ff06abeb318a1aa52"
   integrity sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==
 
-is-utf8@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
-  integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
-
 is-whitespace-character@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz#0858edd94a95594c7c9dd0b5c174ec6e45ee4aa7"
@@ -7768,15 +7896,12 @@ istanbul-lib-instrument@^3.3.0:
     istanbul-lib-coverage "^2.0.5"
     semver "^6.0.0"
 
-istanbul-lib-instrument@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.1.tgz#61f13ac2c96cfefb076fe7131156cc05907874e6"
-  integrity sha512-imIchxnodll7pvQBYOqUu88EufLCU56LMeFPZZM/fJZ1irYcYdqroaV+ACK1Ila8ls09iEYArp+nqyC6lW1Vfg==
+istanbul-lib-instrument@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz#873c6fff897450118222774696a3f28902d77c1d"
+  integrity sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==
   dependencies:
     "@babel/core" "^7.7.5"
-    "@babel/parser" "^7.7.5"
-    "@babel/template" "^7.7.4"
-    "@babel/traverse" "^7.7.4"
     "@istanbuljs/schema" "^0.1.2"
     istanbul-lib-coverage "^3.0.0"
     semver "^6.3.0"
@@ -7808,10 +7933,10 @@ istanbul-reports@^2.2.4:
   dependencies:
     html-escaper "^2.0.0"
 
-jasmine-core@^3.4.0, jasmine-core@^3.5.0, jasmine-core@~3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.5.0.tgz#132c23e645af96d85c8bca13c8758b18429fc1e4"
-  integrity sha512-nCeAiw37MIMA9w9IXso7bRaLl+c/ef3wnxsoSAlYrzS+Ot0zTG6nU8G/cIfGkqpkjX2wNaIW9RFG0TwIFnG6bA==
+jasmine-core@^3.6.0, jasmine-core@~3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.6.0.tgz#491f3bb23941799c353ceb7a45b38a950ebc5a20"
+  integrity sha512-8uQYa7zJN8hq9z+g8z1bqCfdC8eoDAeVnM5sfqs7KHv9/ifoJ500m018fpFc7RDaO6SWCLCXwo/wPSNcdYTgcw==
 
 jasmine-core@~2.8.0:
   version "2.8.0"
@@ -7834,24 +7959,25 @@ jasmine@2.8.0:
     glob "^7.0.6"
     jasmine-core "~2.8.0"
 
-jasmine@^3.4.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-3.5.0.tgz#7101eabfd043a1fc82ac24e0ab6ec56081357f9e"
-  integrity sha512-DYypSryORqzsGoMazemIHUfMkXM7I7easFaxAvNM3Mr6Xz3Fy36TupTrAOxZWN8MVKEU5xECv22J4tUQf3uBzQ==
+jasmine@~3.6.0:
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-3.6.1.tgz#a20456b309a669b547a3c24bb2120f16f70cfc65"
+  integrity sha512-Jqp8P6ZWkTVFGmJwBK46p+kJNrZCdqkQ4GL+PGuBXZwK1fM4ST9BizkYgIwCFqYYqnTizAy6+XG2Ej5dFrej9Q==
   dependencies:
-    glob "^7.1.4"
-    jasmine-core "~3.5.0"
+    fast-glob "^2.2.6"
+    jasmine-core "~3.6.0"
 
 jasminewd2@^2.1.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/jasminewd2/-/jasminewd2-2.2.0.tgz#e37cf0b17f199cce23bea71b2039395246b4ec4e"
   integrity sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=
 
-jest-worker@26.0.0, jest-worker@^26.0.0:
-  version "26.0.0"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.0.0.tgz#4920c7714f0a96c6412464718d0c58a3df3fb066"
-  integrity sha512-pPaYa2+JnwmiZjK9x7p9BoZht+47ecFCDFA/CJxspHzeDvQcfVBLWzCiWyo+EGrSiQMWZtCFo9iSvMZnAAo8vw==
+jest-worker@26.3.0, jest-worker@^26.3.0:
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.3.0.tgz#7c8a97e4f4364b4f05ed8bca8ca0c24de091871f"
+  integrity sha512-Vmpn2F6IASefL+DVBhPzI2J9/GJUsqzomdeN+P+dK8/jKxbh8R3BtFnx3FIta7wYlPU62cpJMJQo4kuOowcMnw==
   dependencies:
+    "@types/node" "*"
     merge-stream "^2.0.0"
     supports-color "^7.0.0"
 
@@ -7944,6 +8070,13 @@ json-bigint@^0.3.0:
   dependencies:
     bignumber.js "^7.0.0"
 
+json-bigint@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/json-bigint/-/json-bigint-1.0.0.tgz#ae547823ac0cad8398667f8cd9ef4730f5b01ff1"
+  integrity sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==
+  dependencies:
+    bignumber.js "^9.0.0"
+
 json-parse-better-errors@^1.0.0, json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
@@ -8004,6 +8137,11 @@ json5@^2.1.2:
   dependencies:
     minimist "^1.2.5"
 
+jsonc-parser@2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.3.0.tgz#7c7fc988ee1486d35734faaaa866fadb00fa91ee"
+  integrity sha512-b0EBt8SWFNnixVdvoR2ZtEGa9ZqLhbJnOjezn+WP+8kspFm+PFYDN8Z4Bc7pRlDjvuVcADSUkroIuTWWn/YiIA==
+
 jsonfile@^2.1.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
@@ -8148,12 +8286,12 @@ karma-jasmine-html-reporter@^1.4.2:
   resolved "https://registry.yarnpkg.com/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.5.2.tgz#a846b703dbe5c8d803481e68636eb93346dc5966"
   integrity sha512-ILBPsXqQ3eomq+oaQsM311/jxsypw5/d0LnZXj26XkfThwq7jZ55A2CFSKJVA5VekbbOGvMyv7d3juZj0SeTxA==
 
-karma-jasmine@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-3.1.1.tgz#f592b253e7619a8d84559d7daf473a647498ade8"
-  integrity sha512-pxBmv5K7IkBRLsFSTOpgiK/HzicQT3mfFF+oHAC7nxMfYKhaYFgxOa5qjnHW4sL5rUnmdkSajoudOnnOdPyW4Q==
+karma-jasmine@~4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-4.0.1.tgz#b99e073b6d99a5196fc4bffc121b89313b0abd82"
+  integrity sha512-h8XDAhTiZjJKzfkoO1laMH+zfNlra+dEQHUAjpn5JV1zCPtOIVWGQjLBrqhnzQa/hrU2XrZwSyBa6XjEBzfXzw==
   dependencies:
-    jasmine-core "^3.5.0"
+    jasmine-core "^3.6.0"
 
 karma-source-map-support@1.4.0:
   version "1.4.0"
@@ -8228,6 +8366,11 @@ klaw@^1.0.0:
   optionalDependencies:
     graceful-fs "^4.1.9"
 
+klona@^2.0.3:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.4.tgz#7bb1e3affb0cb8624547ef7e8f6708ea2e39dfc0"
+  integrity sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA==
+
 latest-version@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-3.1.0.tgz#a205383fea322b33b5ae3b18abee0dc2f356ee15"
@@ -8256,22 +8399,21 @@ lcid@^2.0.0:
   dependencies:
     invert-kv "^2.0.0"
 
-less-loader@6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-6.1.0.tgz#59fd591df408ced89a40fce11a2aea449b005631"
-  integrity sha512-/jLzOwLyqJ7Kt3xg5sHHkXtOyShWwFj410K9Si9WO+/h8rmYxxkSR0A3/hFEntWudE20zZnWMtpMYnLzqTVdUA==
+less-loader@6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-6.2.0.tgz#8b26f621c155b342eefc24f5bd6e9dc40c42a719"
+  integrity sha512-Cl5h95/Pz/PWub/tCBgT1oNMFeH1WTD33piG80jn5jr12T4XbxZcjThwNXDQ7AG649WEynuIzO4b0+2Tn9Qolg==
   dependencies:
     clone "^2.1.2"
-    less "^3.11.1"
+    less "^3.11.3"
     loader-utils "^2.0.0"
-    schema-utils "^2.6.6"
+    schema-utils "^2.7.0"
 
-less@^3.11.1:
-  version "3.11.2"
-  resolved "https://registry.yarnpkg.com/less/-/less-3.11.2.tgz#51a484e9017287f5ac3db921cb86970eb7506e81"
-  integrity sha512-ed8Lir98Tu6a+LeU7+8ShpRLSUdk//lWf1sh+5w7tNju4wGItztqDHp03Z+a2o1nzU6pObVxw1n4Gu7VzQYusQ==
+less@^3.11.3:
+  version "3.12.2"
+  resolved "https://registry.yarnpkg.com/less/-/less-3.12.2.tgz#157e6dd32a68869df8859314ad38e70211af3ab4"
+  integrity sha512-+1V2PCMFkL+OIj2/HrtrvZw0BC0sYLMICJfbQjuj/K8CEnlrFX6R5cKKgzzttsZDHyxQNL1jqMREjKN3ja/E3Q==
   dependencies:
-    clone "^2.1.2"
     tslib "^1.10.0"
   optionalDependencies:
     errno "^0.1.1"
@@ -8279,8 +8421,7 @@ less@^3.11.1:
     image-size "~0.5.0"
     make-dir "^2.1.0"
     mime "^1.4.1"
-    promise "^7.1.1"
-    request "^2.83.0"
+    native-request "^1.0.5"
     source-map "~0.6.0"
 
 leven@^3.1.0:
@@ -8303,10 +8444,10 @@ levn@^0.3.0, levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
-license-webpack-plugin@2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.2.0.tgz#5c964380d7d0e0c27c349d86a6f856c82924590e"
-  integrity sha512-XPsdL/0brSHf+7dXIlRqotnCQ58RX2au6otkOg4U3dm8uH+Ka/fW4iukEs95uXm+qKe/SBs+s1Ll/aQddKG+tg==
+license-webpack-plugin@2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.3.0.tgz#c00f70d5725ba0408de208acb9e66612cc2eceda"
+  integrity sha512-JK/DXrtN6UeYQSgkg5q1+pgJ8aiKPL9tnz9Wzw+Ikkf+8mJxG56x6t8O+OH/tAeF/5NREnelTEMyFtbJNkjH4w==
   dependencies:
     "@types/webpack-sources" "^0.1.5"
     webpack-sources "^1.2.0"
@@ -8388,17 +8529,6 @@ listenercount@~1.0.1:
   resolved "https://registry.yarnpkg.com/listenercount/-/listenercount-1.0.1.tgz#84c8a72ab59c4725321480c975e6508342e70937"
   integrity sha1-hMinKrWcRyUyFIDJdeZQg0LnCTc=
 
-load-json-file@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
-  integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=
-  dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^2.2.0"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-    strip-bom "^2.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"
@@ -8639,6 +8769,11 @@ lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.1
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
 
+lodash@^4.17.19:
+  version "4.17.20"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
+  integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
+
 log-symbols@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
@@ -8646,12 +8781,12 @@ log-symbols@^2.2.0:
   dependencies:
     chalk "^2.0.1"
 
-log-symbols@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-3.0.0.tgz#f3a08516a5dea893336a7dee14d18a1cfdab77c4"
-  integrity sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==
+log-symbols@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.0.0.tgz#69b3cc46d20f448eccdb75ea1fa733d9e821c920"
+  integrity sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==
   dependencies:
-    chalk "^2.4.2"
+    chalk "^4.0.0"
 
 log4js@^4.0.0:
   version "4.5.1"
@@ -8723,6 +8858,13 @@ lru-cache@^5.0.0, lru-cache@^5.1.1:
   dependencies:
     yallist "^3.0.2"
 
+lru-cache@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
+  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
+  dependencies:
+    yallist "^4.0.0"
+
 lru-queue@0.1:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/lru-queue/-/lru-queue-0.1.0.tgz#2738bd9f0d3cf4f84490c5736c48699ac632cda3"
@@ -8974,7 +9116,7 @@ merge-stream@^2.0.0:
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
   integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
 
-merge2@^1.3.0:
+merge2@^1.2.3, merge2@^1.3.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
@@ -9056,10 +9198,10 @@ mimic-fn@^2.0.0, mimic-fn@^2.1.0:
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
-mini-css-extract-plugin@0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.0.tgz#47f2cf07aa165ab35733b1fc97d4c46c0564339e"
-  integrity sha512-lp3GeY7ygcgAmVIcRPBVhIkf8Us7FZjA+ILpal44qLdSu11wmjKQ3d9k15lfD7pO4esu9eUIAW7qiYIBppv40A==
+mini-css-extract-plugin@0.10.0:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.10.0.tgz#a0e6bfcad22a9c73f6c882a3c7557a98e2d3d27d"
+  integrity sha512-QgKgJBjaJhxVPwrLNqqwNS0AGkuQQ31Hp4xGXEK/P7wehEg6qmNtReHKai3zRXqY60wGVWLYcOMJK2b98aGc3A==
   dependencies:
     loader-utils "^1.1.0"
     normalize-url "1.9.1"
@@ -9170,6 +9312,11 @@ mississippi@^3.0.0:
     stream-each "^1.1.0"
     through2 "^2.0.0"
 
+mitt@^2.0.1:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/mitt/-/mitt-2.1.0.tgz#f740577c23176c6205b121b2973514eade1b2230"
+  integrity sha512-ILj2TpLiysu2wkBbWjAmww7TkZb65aiQO+DkVdUTBpBXq+MHYiETENkKFMtsJZX1Lf4pe4QOrTSjIfUwN5lRdg==
+
 mixin-deep@^1.2.0:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
@@ -9183,7 +9330,7 @@ mkdirp-classic@^0.5.2:
   resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113"
   integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==
 
-"mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1, mkdirp@~0.5.x:
+"mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
@@ -9202,7 +9349,7 @@ mkdirp@^1.0.3:
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.3.tgz#4cf2e30ad45959dddea53ad97d518b6c8205e1ea"
   integrity sha512-6uCP4Qc0sWsgMLy1EOqqS/3rjDHOEnsStVr/4vtAIK2Y5i2kA7lFFejYrpIyiN9w0pYf4ckeCYT9f1r1P9KX5g==
 
-mkdirp@^1.0.4:
+mkdirp@^1.0.4, mkdirp@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
@@ -9230,13 +9377,6 @@ move-concurrently@^1.0.1:
     rimraf "^2.5.4"
     run-queue "^1.0.3"
 
-move-file@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/move-file/-/move-file-2.0.0.tgz#83ffa309b5d7f69d518b28e1333e2ffadf331e3e"
-  integrity sha512-cdkdhNCgbP5dvS4tlGxZbD+nloio9GIimP57EjqFhwLcMjnU+XJKAZzlmg/TN/AK1LuNAdTSvm3CPPP4Xkv0iQ==
-  dependencies:
-    path-exists "^4.0.0"
-
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -9312,6 +9452,11 @@ nash@^3.0.0:
     lodash "^4.17.5"
     minimist "^1.1.0"
 
+native-request@^1.0.5:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/native-request/-/native-request-1.0.7.tgz#ff742dc555b4c8f2f1c14b548639ba174e573856"
+  integrity sha512-9nRjinI9bmz+S7dgNtf4A70+/vPhnd+2krGpy4SUlADuOuSa24IDkNaZ+R/QT1wQ6S8jBdi6wE7fLekFZNfUpQ==
+
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
@@ -9327,6 +9472,11 @@ neo-async@^2.5.0, neo-async@^2.6.1:
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
   integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==
 
+neo-async@^2.6.2:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
+  integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
+
 next-tick@1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.1.0.tgz#1836ee30ad56d67ef281b22bd199f709449b35eb"
@@ -9383,6 +9533,11 @@ node-forge@0.9.0:
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.9.0.tgz#d624050edbb44874adca12bb9a52ec63cb782579"
   integrity sha512-7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ==
 
+node-forge@^0.10.0:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3"
+  integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==
+
 node-forge@^0.7.1:
   version "0.7.6"
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.6.tgz#fdf3b418aee1f94f0ef642cd63486c77ca9724ac"
@@ -9750,10 +9905,10 @@ onetime@^5.1.0:
   dependencies:
     mimic-fn "^2.1.0"
 
-open@7.0.4:
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/open/-/open-7.0.4.tgz#c28a9d315e5c98340bf979fdcb2e58664aa10d83"
-  integrity sha512-brSA+/yq+b08Hsr4c8fsEW2CRzk1BmfN3SAK/5VCHQ9bdoZJ4qa/+AfR0xHjlbbZUyPkUHs1b8x1RqdyZdkVqQ==
+open@7.2.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/open/-/open-7.2.0.tgz#212959bd7b0ce2e8e3676adc76e3cf2f0a2498b4"
+  integrity sha512-4HeyhxCvBTI5uBePsAdi55C5fmqnWZ2e2MlmvWi5KW5tdH5rxoiv/aMtbeVxKZc3eWkT1GymMnLG8XC4Rq4TDQ==
   dependencies:
     is-docker "^2.0.0"
     is-wsl "^2.1.1"
@@ -9797,16 +9952,16 @@ optionator@^0.8.1, optionator@^0.8.2:
     type-check "~0.3.2"
     word-wrap "~1.2.3"
 
-ora@4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/ora/-/ora-4.0.4.tgz#e8da697cc5b6a47266655bf68e0fb588d29a545d"
-  integrity sha512-77iGeVU1cIdRhgFzCK8aw1fbtT1B/iZAvWjS+l/o1x0RShMgxHUZaD2yDpWsNCPwXg9z1ZA78Kbdvr8kBmG/Ww==
+ora@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/ora/-/ora-5.0.0.tgz#4f0b34f2994877b49b452a707245ab1e9f6afccb"
+  integrity sha512-s26qdWqke2kjN/wC4dy+IQPBIMWBJlSU/0JZhk30ZDBLelW25rv66yutUWARMigpGPzcXHb+Nac5pNhN/WsARw==
   dependencies:
-    chalk "^3.0.0"
+    chalk "^4.1.0"
     cli-cursor "^3.1.0"
-    cli-spinners "^2.2.0"
+    cli-spinners "^2.4.0"
     is-interactive "^1.0.0"
-    log-symbols "^3.0.0"
+    log-symbols "^4.0.0"
     mute-stream "0.0.8"
     strip-ansi "^6.0.0"
     wcwidth "^1.0.1"
@@ -9903,13 +10058,6 @@ p-limit@^2.0.0, p-limit@^2.2.0:
   dependencies:
     p-try "^2.0.0"
 
-p-limit@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
-  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
-  dependencies:
-    p-try "^2.0.0"
-
 p-limit@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.0.1.tgz#584784ac0722d1aed09f19f90ed2999af6ce2839"
@@ -9917,6 +10065,13 @@ p-limit@^3.0.1:
   dependencies:
     p-try "^2.0.0"
 
+p-limit@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.0.2.tgz#1664e010af3cadc681baafd3e2a437be7b0fb5fe"
+  integrity sha512-iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg==
+  dependencies:
+    p-try "^2.0.0"
+
 p-locate@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
@@ -10063,13 +10218,6 @@ parse-entities@^1.0.2, parse-entities@^1.1.0:
     is-decimal "^1.0.0"
     is-hexadecimal "^1.0.0"
 
-parse-json@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
-  integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=
-  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"
@@ -10078,10 +10226,17 @@ parse-json@^4.0.0:
     error-ex "^1.3.1"
     json-parse-better-errors "^1.0.1"
 
-parse5@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
-  integrity sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==
+parse5-htmlparser2-tree-adapter@6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz#2cdf9ad823321140370d4dbf5d3e92c7c8ddc6e6"
+  integrity sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==
+  dependencies:
+    parse5 "^6.0.1"
+
+parse5@6.0.1, parse5@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
+  integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
 
 parse5@^1.5.1:
   version "1.5.1"
@@ -10142,13 +10297,6 @@ path-dirname@^1.0.0:
   resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
   integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
 
-path-exists@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
-  integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=
-  dependencies:
-    pinkie-promise "^2.0.0"
-
 path-exists@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
@@ -10191,15 +10339,6 @@ path-to-regexp@^1.7.0:
   dependencies:
     isarray "0.0.1"
 
-path-type@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
-  integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=
-  dependencies:
-    graceful-fs "^4.1.2"
-    pify "^2.0.0"
-    pinkie-promise "^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"
@@ -10282,7 +10421,7 @@ pkg-dir@^3.0.0:
   dependencies:
     find-up "^3.0.0"
 
-pkg-dir@^4.1.0:
+pkg-dir@^4.1.0, pkg-dir@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
   integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
@@ -10506,15 +10645,15 @@ postcss-modules-extract-imports@^2.0.0:
   dependencies:
     postcss "^7.0.5"
 
-postcss-modules-local-by-default@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.2.tgz#e8a6561be914aaf3c052876377524ca90dbb7915"
-  integrity sha512-jM/V8eqM4oJ/22j0gx4jrp63GSvDH6v86OqyTHHUvk4/k1vceipZsaymiZ5PvocqZOl5SFHiFJqjs3la0wnfIQ==
+postcss-modules-local-by-default@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz#bb14e0cc78279d504dbdcbfd7e0ca28993ffbbb0"
+  integrity sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw==
   dependencies:
     icss-utils "^4.1.1"
-    postcss "^7.0.16"
+    postcss "^7.0.32"
     postcss-selector-parser "^6.0.2"
-    postcss-value-parser "^4.0.0"
+    postcss-value-parser "^4.1.0"
 
 postcss-modules-scope@^2.2.0:
   version "2.2.0"
@@ -10693,7 +10832,7 @@ postcss-value-parser@^3.0.0, postcss-value-parser@^3.2.3, postcss-value-parser@^
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
   integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
 
-postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.3, postcss-value-parser@^4.1.0:
+postcss-value-parser@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb"
   integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==
@@ -10707,10 +10846,10 @@ postcss@7.0.21:
     source-map "^0.6.1"
     supports-color "^6.1.0"
 
-postcss@7.0.31:
-  version "7.0.31"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.31.tgz#332af45cb73e26c0ee2614d7c7fb02dfcc2bd6dd"
-  integrity sha512-a937VDHE1ftkjk+8/7nj/mrjtmkn69xxzJgRETXdAUU+IgOYPQNJF17haGWbeDxSyk++HA14UA98FurvPyBJOA==
+postcss@7.0.32:
+  version "7.0.32"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.32.tgz#4310d6ee347053da3433db2be492883d62cec59d"
+  integrity sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==
   dependencies:
     chalk "^2.4.2"
     source-map "^0.6.1"
@@ -10725,7 +10864,7 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.5:
     source-map "^0.6.1"
     supports-color "^6.1.0"
 
-postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.27, postcss@^7.0.6:
+postcss@^7.0.14, postcss@^7.0.6:
   version "7.0.29"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.29.tgz#d3a903872bd52280b83bce38cdc83ce55c06129e"
   integrity sha512-ba0ApvR3LxGvRMMiUa9n0WR4HjzcYm7tS+ht4/2Nd0NLtHpPIH77fuB9Xh1/yJVz9O/E/95Y/dn8ygWsyffXtw==
@@ -10734,10 +10873,10 @@ postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.27, postcss@^7.0.6:
     source-map "^0.6.1"
     supports-color "^6.1.0"
 
-postcss@^7.0.30:
-  version "7.0.32"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.32.tgz#4310d6ee347053da3433db2be492883d62cec59d"
-  integrity sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==
+postcss@^7.0.32:
+  version "7.0.34"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.34.tgz#f2baf57c36010df7de4009940f21532c16d65c20"
+  integrity sha512-H/7V2VeNScX9KE83GDrDZNiGT1m2H+UTnlinIzhjlLX9hfMUn1mHNnGeX81a1c8JSBdBvqk7c2ZOG6ZPn5itGw==
   dependencies:
     chalk "^2.4.2"
     source-map "^0.6.1"
@@ -10801,13 +10940,6 @@ promise-retry@^1.1.1:
     err-code "^1.0.0"
     retry "^0.10.0"
 
-promise@^7.1.1:
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
-  integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==
-  dependencies:
-    asap "~2.0.3"
-
 property-information@^4.0.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/property-information/-/property-information-4.2.0.tgz#f0e66e07cbd6fed31d96844d958d153ad3eb486e"
@@ -10841,6 +10973,25 @@ protobufjs@^6.8.1, protobufjs@^6.8.6, protobufjs@^6.8.8:
     "@types/node" "^10.1.0"
     long "^4.0.0"
 
+protobufjs@^6.9.0:
+  version "6.10.1"
+  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.10.1.tgz#e6a484dd8f04b29629e9053344e3970cccf13cd2"
+  integrity sha512-pb8kTchL+1Ceg4lFd5XUpK8PdWacbvV5SK2ULH2ebrYtl4GjJmS24m6CKME67jzV53tbJxHlnNOSqQHbTsR9JQ==
+  dependencies:
+    "@protobufjs/aspromise" "^1.1.2"
+    "@protobufjs/base64" "^1.1.2"
+    "@protobufjs/codegen" "^2.0.4"
+    "@protobufjs/eventemitter" "^1.1.0"
+    "@protobufjs/fetch" "^1.1.0"
+    "@protobufjs/float" "^1.0.2"
+    "@protobufjs/inquire" "^1.1.0"
+    "@protobufjs/path" "^1.1.2"
+    "@protobufjs/pool" "^1.1.0"
+    "@protobufjs/utf8" "^1.1.0"
+    "@types/long" "^4.0.1"
+    "@types/node" "^13.7.0"
+    long "^4.0.0"
+
 protoduck@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/protoduck/-/protoduck-5.0.1.tgz#03c3659ca18007b69a50fd82a7ebcc516261151f"
@@ -10954,15 +11105,18 @@ punycode@^2.1.0, punycode@^2.1.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
-puppeteer@3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-3.3.0.tgz#95839af9fdc0aa4de7e5ee073a4c0adeb9e2d3d7"
-  integrity sha512-23zNqRltZ1PPoK28uRefWJ/zKb5Jhnzbbwbpcna2o5+QMn17F0khq5s1bdH3vPlyj+J36pubccR8wiNA/VE0Vw==
+puppeteer@5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-5.1.0.tgz#e7bae2caa6e3a13a622755e4c27689d9812c38ca"
+  integrity sha512-IZBFG8XcA+oHxYo5rEpJI/HQignUis2XPijPoFpNxla2O+WufonGsUsSqrhRXgBKOME5zNfhRdUY2LvxAiKlhw==
   dependencies:
     debug "^4.1.0"
+    devtools-protocol "0.0.767361"
     extract-zip "^2.0.0"
     https-proxy-agent "^4.0.0"
     mime "^2.0.3"
+    mitt "^2.0.1"
+    pkg-dir "^4.2.0"
     progress "^2.0.1"
     proxy-from-env "^1.0.0"
     rimraf "^3.0.2"
@@ -11118,23 +11272,6 @@ read-package-tree@5.3.1:
     readdir-scoped-modules "^1.0.0"
     util-promisify "^2.1.0"
 
-read-pkg-up@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
-  integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=
-  dependencies:
-    find-up "^1.0.0"
-    read-pkg "^1.0.0"
-
-read-pkg@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
-  integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=
-  dependencies:
-    load-json-file "^1.0.0"
-    normalize-package-data "^2.3.2"
-    path-type "^1.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"
@@ -11204,6 +11341,13 @@ readdirp@~3.3.0:
   dependencies:
     picomatch "^2.0.7"
 
+readdirp@~3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.4.0.tgz#9fdccdf9e9155805449221ac645e8303ab5b9ada"
+  integrity sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==
+  dependencies:
+    picomatch "^2.2.1"
+
 readline2@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/readline2/-/readline2-1.0.1.tgz#41059608ffc154757b715d9989d199ffbf372e35"
@@ -11251,16 +11395,21 @@ regenerate@^1.2.1, regenerate@^1.4.0:
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
   integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==
 
-regenerator-runtime@0.13.5, regenerator-runtime@^0.13.4:
-  version "0.13.5"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697"
-  integrity sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==
+regenerator-runtime@0.13.7:
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55"
+  integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==
 
 regenerator-runtime@^0.13.2:
   version "0.13.3"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz#7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5"
   integrity sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==
 
+regenerator-runtime@^0.13.4:
+  version "0.13.5"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697"
+  integrity sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==
+
 regenerator-transform@^0.14.2:
   version "0.14.4"
   resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.4.tgz#5266857896518d1616a78a0479337a30ea974cc7"
@@ -11512,7 +11661,7 @@ replace-ext@1.0.0:
   resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb"
   integrity sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=
 
-request@^2.72.0, request@^2.74.0, request@^2.79.0, request@^2.81.0, request@^2.83.0, request@^2.87.0, request@^2.88.0:
+request@^2.72.0, request@^2.74.0, request@^2.79.0, request@^2.81.0, request@^2.87.0, request@^2.88.0, request@^2.88.2:
   version "2.88.2"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
   integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
@@ -11740,10 +11889,10 @@ robots-parser@^2.0.1:
   resolved "https://registry.yarnpkg.com/robots-parser/-/robots-parser-2.1.1.tgz#41b289cf44a6aa136dc62be0085adca954573ab0"
   integrity sha512-6yWEYSdhK3bAEcYY0In3wgSBK70BiQoJArzdjZKCP/35b3gKIYu5Lc0qQqsoxjoLVebVoJiKK4VWGc5+oxvWBQ==
 
-rollup@2.10.9:
-  version "2.10.9"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.10.9.tgz#17dcc6753c619efcc1be2cf61d73a87827eebdf9"
-  integrity sha512-dY/EbjiWC17ZCUSyk14hkxATAMAShkMsD43XmZGWjLrgFj15M3Dw2kEkA9ns64BiLFm9PKN6vTQw8neHwK74eg==
+rollup@2.26.5:
+  version "2.26.5"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.26.5.tgz#5562ec36fcba3eed65cfd630bd78e037ad0e0307"
+  integrity sha512-rCyFG3ZtQdnn9YwfuAVH0l/Om34BdO5lwCA0W6Hq+bNB21dVEBbCRxhaHOmu1G7OBFDWytbzAC104u7rxHwGjA==
   optionalDependencies:
     fsevents "~2.1.2"
 
@@ -11815,10 +11964,10 @@ rx-lite@^3.1.2:
   resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102"
   integrity sha1-Gc5QLKVyZl87ZHsQk5+X/RYV8QI=
 
-rxjs@6.5.5:
-  version "6.5.5"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.5.tgz#c5c884e3094c8cfee31bf27eb87e54ccfc87f9ec"
-  integrity sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==
+rxjs@6.6.2:
+  version "6.6.2"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.2.tgz#8096a7ac03f2cc4fe5860ef6e572810d9e01c0d2"
+  integrity sha512-BHdBMVoWC2sL26w//BCu3YzKT4s2jip/WhwsGEDmeKYBhKDZeYezVUnHatYB7L85v5xs0BAQmg6BEYJEKxBabg==
   dependencies:
     tslib "^1.9.0"
 
@@ -11829,6 +11978,13 @@ rxjs@^6.4.0, rxjs@^6.5.3:
   dependencies:
     tslib "^1.9.0"
 
+rxjs@^6.6.0:
+  version "6.6.3"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.3.tgz#8ca84635c4daa900c0d3967a6ee7ac60271ee552"
+  integrity sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==
+  dependencies:
+    tslib "^1.9.0"
+
 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"
@@ -11872,26 +12028,26 @@ safeps@7.0.1:
     taskgroup "^5.0.0"
     typechecker "^4.3.0"
 
-"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@^2.1.2, safer-buffer@~2.1.0:
+"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@^2.1.2, safer-buffer@~2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-sass-loader@8.0.2:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-8.0.2.tgz#debecd8c3ce243c76454f2e8290482150380090d"
-  integrity sha512-7o4dbSK8/Ol2KflEmSco4jTjQoV988bM82P9CZdmo9hR3RLnvNc0ufMNdMrB0caq38JQ/FgF4/7RcbcfKzxoFQ==
+sass-loader@10.0.1:
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.0.1.tgz#10c0364d8034f22fee25ddcc9eded20f99bbe3b4"
+  integrity sha512-b2PSldKVTS3JcFPHSrEXh3BeAfR7XknGiGCAO5aHruR3Pf3kqLP3Gb2ypXLglRrAzgZkloNxLZ7GXEGDX0hBUQ==
   dependencies:
-    clone-deep "^4.0.1"
-    loader-utils "^1.2.3"
-    neo-async "^2.6.1"
-    schema-utils "^2.6.1"
-    semver "^6.3.0"
+    klona "^2.0.3"
+    loader-utils "^2.0.0"
+    neo-async "^2.6.2"
+    schema-utils "^2.7.0"
+    semver "^7.3.2"
 
-sass@1.26.5:
-  version "1.26.5"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.26.5.tgz#2d7aecfbbabfa298567c8f06615b6e24d2d68099"
-  integrity sha512-FG2swzaZUiX53YzZSjSakzvGtlds0lcbF+URuU9mxOv7WBh7NhXEVDa4kPKN4hN6fC2TkOTOKqiqp6d53N9X5Q==
+sass@1.26.10:
+  version "1.26.10"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.26.10.tgz#851d126021cdc93decbf201d1eca2a20ee434760"
+  integrity sha512-bzN0uvmzfsTvjz0qwccN1sPm2HxxpNI/Xa+7PlUEMS+nQvbyuEK7Y0qFqxlPHhiNHb1Ze8WQJtU31olMObkAMw==
   dependencies:
     chokidar ">=2.0.0 <4.0.0"
 
@@ -11925,14 +12081,6 @@ schema-utils@^1.0.0:
     ajv-errors "^1.0.0"
     ajv-keywords "^3.1.0"
 
-schema-utils@^2.6.1, schema-utils@^2.6.4:
-  version "2.6.4"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.4.tgz#a27efbf6e4e78689d91872ee3ccfa57d7bdd0f53"
-  integrity sha512-VNjcaUxVnEeun6B2fiiUDjXXBtD4ZSH7pdbfIu1pOFwgptDPLMo/z9jr4sUfsjFVPqDCEin/F7IYlq7/E6yDbQ==
-  dependencies:
-    ajv "^6.10.2"
-    ajv-keywords "^3.4.1"
-
 schema-utils@^2.6.5:
   version "2.6.5"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.5.tgz#c758f0a7e624263073d396e29cd40aa101152d8a"
@@ -12011,7 +12159,7 @@ semver@7.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
-semver@7.3.2:
+semver@7.3.2, semver@^7.3.2:
   version "7.3.2"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
   integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
@@ -12058,11 +12206,6 @@ serialize-javascript@^2.1.2:
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61"
   integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==
 
-serialize-javascript@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-3.0.0.tgz#492e489a2d77b7b804ad391a5f5d97870952548e"
-  integrity sha512-skZcHYw2vEX4bw90nAr2iTTsz6x2SrHEnfxgKYmZlvJYBEZrvbKtobJWlQ20zczKb3bsHHXXTYt48zBA7ni9cw==
-
 serialize-javascript@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa"
@@ -12141,13 +12284,6 @@ sha.js@^2.4.0, sha.js@^2.4.8:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
-shallow-clone@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3"
-  integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==
-  dependencies:
-    kind-of "^6.0.2"
-
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
@@ -12338,16 +12474,16 @@ source-list-map@^2.0.0:
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
   integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
 
-source-map-loader@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-1.0.0.tgz#240b88575a9b0d27214aeecbd4e7686af95cfa56"
-  integrity sha512-ZayyQCSCrQazN50aCvuS84lJT4xc1ZAcykH5blHaBdVveSwjiFK8UGMPvao0ho54DTb0Jf7m57uRRG/YYUZ2Fg==
+source-map-loader@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-1.0.2.tgz#b0a6582b2eaa387ede1ecf8061ae0b93c23f9eb0"
+  integrity sha512-oX8d6ndRjN+tVyjj6PlXSyFPhDdVAPsZA30nD3/II8g4uOv8fCz0DMn5sy8KtVbDfKQxOpGwGJnK3xIW3tauDw==
   dependencies:
     data-urls "^2.0.0"
-    iconv-lite "^0.5.1"
+    iconv-lite "^0.6.2"
     loader-utils "^2.0.0"
-    schema-utils "^2.6.6"
-    source-map "^0.6.0"
+    schema-utils "^2.7.0"
+    source-map "^0.6.1"
 
 source-map-resolve@^0.5.0, source-map-resolve@^0.5.2:
   version "0.5.3"
@@ -12628,7 +12764,7 @@ string-length@^1.0.0:
   dependencies:
     strip-ansi "^3.0.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"
   integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
@@ -12760,13 +12896,6 @@ strip-ansi@^6.0.0:
   dependencies:
     ansi-regex "^5.0.0"
 
-strip-bom@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
-  integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=
-  dependencies:
-    is-utf8 "^0.2.0"
-
 strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
@@ -12813,18 +12942,18 @@ stylus-loader@3.0.2:
     lodash.clonedeep "^4.5.0"
     when "~3.6.x"
 
-stylus@0.54.7:
-  version "0.54.7"
-  resolved "https://registry.yarnpkg.com/stylus/-/stylus-0.54.7.tgz#c6ce4793965ee538bcebe50f31537bfc04d88cd2"
-  integrity sha512-Yw3WMTzVwevT6ZTrLCYNHAFmanMxdylelL3hkWNgPMeTCpMwpV3nXjpOHuBXtFv7aiO2xRuQS6OoAdgkNcSNug==
+stylus@0.54.8:
+  version "0.54.8"
+  resolved "https://registry.yarnpkg.com/stylus/-/stylus-0.54.8.tgz#3da3e65966bc567a7b044bfe0eece653e099d147"
+  integrity sha512-vr54Or4BZ7pJafo2mpf0ZcwA74rpuYCZbxrHBsH8kbcXOwSfvBFwsRfpGO5OD5fhG5HDCFW737PKaawI7OqEAg==
   dependencies:
     css-parse "~2.0.0"
     debug "~3.1.0"
-    glob "^7.1.3"
-    mkdirp "~0.5.x"
+    glob "^7.1.6"
+    mkdirp "~1.0.4"
     safer-buffer "^2.1.2"
     sax "~1.2.4"
-    semver "^6.0.0"
+    semver "^6.3.0"
     source-map "^0.7.3"
 
 superstatic@^6.0.1:
@@ -13056,19 +13185,19 @@ term-size@^1.2.0:
   dependencies:
     execa "^0.7.0"
 
-terser-webpack-plugin@3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-3.0.1.tgz#31928c9330a582fb5ec6f90805337289b85cb8fe"
-  integrity sha512-eFDtq8qPUEa9hXcUzTwKXTnugIVtlqc1Z/ZVhG8LmRT3lgRY13+pQTnFLY2N7ATB6TKCHuW/IGjoAnZz9wOIqw==
+terser-webpack-plugin@4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-4.1.0.tgz#6e9d6ae4e1a900d88ddce8da6a47507ea61f44bc"
+  integrity sha512-0ZWDPIP8BtEDZdChbufcXUigOYk6dOX/P/X0hWxqDDcVAQLb8Yy/0FAaemSfax3PAA67+DJR778oz8qVbmy4hA==
   dependencies:
-    cacache "^15.0.3"
+    cacache "^15.0.5"
     find-cache-dir "^3.3.1"
-    jest-worker "^26.0.0"
-    p-limit "^2.3.0"
+    jest-worker "^26.3.0"
+    p-limit "^3.0.2"
     schema-utils "^2.6.6"
-    serialize-javascript "^3.0.0"
+    serialize-javascript "^4.0.0"
     source-map "^0.6.1"
-    terser "^4.6.13"
+    terser "^5.0.0"
     webpack-sources "^1.4.3"
 
 terser-webpack-plugin@^1.4.3:
@@ -13086,10 +13215,10 @@ terser-webpack-plugin@^1.4.3:
     webpack-sources "^1.4.0"
     worker-farm "^1.7.0"
 
-terser@4.7.0, terser@^4.6.13:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-4.7.0.tgz#15852cf1a08e3256a80428e865a2fa893ffba006"
-  integrity sha512-Lfb0RiZcjRDXCC3OSHJpEkxJ9Qeqs6mp2v4jf2MHfy8vGERmVDuvjXdd/EnP5Deme5F2yBRBymKmKHCBg2echw==
+terser@5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.3.0.tgz#c481f4afecdcc182d5e2bdd2ff2dc61555161e81"
+  integrity sha512-XTT3D3AwxC54KywJijmY2mxZ8nJiEjBHVYzq8l9OaYuRFWeQNBwvipuzzYEP4e+/AVcd1hqG/CqgsdIRyT45Fg==
   dependencies:
     commander "^2.20.0"
     source-map "~0.6.1"
@@ -13104,6 +13233,15 @@ terser@^4.1.2:
     source-map "~0.6.1"
     source-map-support "~0.5.12"
 
+terser@^5.0.0:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.3.2.tgz#f4bea90eb92945b2a028ceef79181b9bb586e7af"
+  integrity sha512-H67sydwBz5jCUA32ZRL319ULu+Su1cAoZnnc+lXnenGRYWyLE3Scgkt8mNoAsMx0h5kdo758zdoS0LG9rYZXDQ==
+  dependencies:
+    commander "^2.20.0"
+    source-map "~0.6.1"
+    source-map-support "~0.5.12"
+
 text-table@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
@@ -13329,10 +13467,10 @@ ts-pnp@^1.1.6:
   resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz#a500ad084b0798f1c3071af391e65912c86bca92"
   integrity sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==
 
-tslib@2.0.0, tslib@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.0.tgz#18d13fc2dce04051e20f074cc8387fd8089ce4f3"
-  integrity sha512-lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g==
+tslib@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.1.tgz#410eb0d113e5b6356490eec749603725b021b43e"
+  integrity sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ==
 
 tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0:
   version "1.10.0"
@@ -13340,9 +13478,14 @@ tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0:
   integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==
 
 tslib@^1.11.1:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043"
-  integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
+  integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
+
+tslib@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.0.tgz#18d13fc2dce04051e20f074cc8387fd8089ce4f3"
+  integrity sha512-lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g==
 
 tslint@~6.1.0:
   version "6.1.2"
@@ -13429,15 +13572,20 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
+typescript@4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.2.tgz#7ea7c88777c723c681e33bf7988be5d008d05ac2"
+  integrity sha512-e4ERvRV2wb+rRZ/IQeb3jm2VxBsirQLpQhdxplZ2MEzGvDkkMmPglecnNDfSUBivMjP93vRbngYYDQqQ/78bcQ==
+
 typescript@^3.2.2:
   version "3.7.5"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.5.tgz#0692e21f65fd4108b9330238aac11dd2e177a1ae"
   integrity sha512-/P5lkRXkWHNAbcJIiHPfRoKqyd7bsyCma1hZNUGfn20qm64T6ZBlrzprymeu918H+mB/0rIg2gGK/BXkhhYgBw==
 
-typescript@~3.9.5:
-  version "3.9.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.5.tgz#586f0dba300cde8be52dd1ac4f7e1009c1b13f36"
-  integrity sha512-hSAifV3k+i6lEoCJ2k6R2Z/rp/H3+8sdmcn5NrS3/3kE7+RyZXm9aqvxWqjEXHAd8b0pShatpcdMTvEdvAJltQ==
+typescript@~4.0.2:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.3.tgz#153bbd468ef07725c1df9c77e8b453f8d36abba5"
+  integrity sha512-tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg==
 
 ua-parser-js@0.7.21:
   version "0.7.21"
@@ -13670,7 +13818,16 @@ unist-util-visit@^1.0.0, unist-util-visit@^1.1.0, unist-util-visit@^1.1.1:
   dependencies:
     unist-util-visit-parents "^2.0.0"
 
-universal-analytics@0.4.20, universal-analytics@^0.4.16:
+universal-analytics@0.4.23:
+  version "0.4.23"
+  resolved "https://registry.yarnpkg.com/universal-analytics/-/universal-analytics-0.4.23.tgz#d915e676850c25c4156762471bdd7cf2eaaca8ac"
+  integrity sha512-lgMIH7XBI6OgYn1woDEmxhGdj8yDefMKg7GkWdeATAlQZFrMrNyxSkpDzY57iY0/6fdlzTbBV03OawvvzG+q7A==
+  dependencies:
+    debug "^4.1.1"
+    request "^2.88.2"
+    uuid "^3.0.0"
+
+universal-analytics@^0.4.16:
   version "0.4.20"
   resolved "https://registry.yarnpkg.com/universal-analytics/-/universal-analytics-0.4.20.tgz#d6b64e5312bf74f7c368e3024a922135dbf24b03"
   integrity sha512-gE91dtMvNkjO+kWsPstHRtSwHXz0l2axqptGYp5ceg4MsuurloM0PU3pdOfpb5zBXUvyjT4PwhWK2m39uczZuw==
@@ -13861,10 +14018,10 @@ uuid@3.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
   integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
 
-uuid@8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.1.0.tgz#6f1536eb43249f473abc6bd58ff983da1ca30d8d"
-  integrity sha512-CI18flHDznR0lq54xBycOVmphdCYnQLKn8abKn7PXUiKUGdEd+/l9LWNJmugXel4hXq7S+RMNl34ecyC9TntWg==
+uuid@8.3.0:
+  version "8.3.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.0.tgz#ab738085ca22dc9a8c92725e459b1d507df5d6ea"
+  integrity sha512-fX6Z5o4m6XsXBdli9g7DtWgAx+osMsRRZFKma1mIUsLCz6vRvv+pz5VNbyu9UEDzpMWulZfvpgb/cmDXVulYFQ==
 
 uuid@^2.0.1:
   version "2.0.3"
@@ -13980,14 +14137,23 @@ walkdir@^0.4.0:
   resolved "https://registry.yarnpkg.com/walkdir/-/walkdir-0.4.1.tgz#dc119f83f4421df52e3061e514228a2db20afa39"
   integrity sha512-3eBwRyEln6E1MSzcxcVpQIhRG8Q1jLvEqRmCZqS3dsfXEDR/AhOF4d+jHg1qvDCpYaVRZjENPQyrVxAkQqxPgQ==
 
-watchpack@^1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.1.tgz#280da0a8718592174010c078c7585a74cd8cd0e2"
-  integrity sha512-+IF9hfUFOrYOOaKyfaI7h7dquUIOgyEMoQMLA7OP5FxegKA2+XdXThAZ9TU2kucfhDH7rfMHs1oPYziVGWRnZA==
+watchpack-chokidar2@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz#9948a1866cbbd6cb824dea13a7ed691f6c8ddff0"
+  integrity sha512-9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA==
   dependencies:
     chokidar "^2.1.8"
+
+watchpack@^1.7.4:
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.4.tgz#6e9da53b3c80bb2d6508188f5b200410866cd30b"
+  integrity sha512-aWAgTW4MoSJzZPAicljkO1hsi1oKj/RRq/OJQh2PKI2UKL04c2Bs+MBOB+BBABHTXJpf9mCwHN7ANCvYsvY2sg==
+  dependencies:
     graceful-fs "^4.1.2"
     neo-async "^2.5.0"
+  optionalDependencies:
+    chokidar "^3.4.1"
+    watchpack-chokidar2 "^2.0.0"
 
 watchr@^3.0.1:
   version "3.0.1"
@@ -14141,10 +14307,10 @@ webpack-subresource-integrity@1.4.1:
   dependencies:
     webpack-sources "^1.3.0"
 
-webpack@4.43.0:
-  version "4.43.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.43.0.tgz#c48547b11d563224c561dad1172c8aa0b8a678e6"
-  integrity sha512-GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g==
+webpack@4.44.1:
+  version "4.44.1"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.44.1.tgz#17e69fff9f321b8f117d1fda714edfc0b939cc21"
+  integrity sha512-4UOGAohv/VGUNQJstzEywwNxqX417FnjZgZJpJQegddzPmTvph37eBIRbRTfdySXzVtJXLJfbMN3mMYhM6GdmQ==
   dependencies:
     "@webassemblyjs/ast" "1.9.0"
     "@webassemblyjs/helper-module-context" "1.9.0"
@@ -14154,7 +14320,7 @@ webpack@4.43.0:
     ajv "^6.10.2"
     ajv-keywords "^3.4.1"
     chrome-trace-event "^1.0.2"
-    enhanced-resolve "^4.1.0"
+    enhanced-resolve "^4.3.0"
     eslint-scope "^4.0.3"
     json-parse-better-errors "^1.0.2"
     loader-runner "^2.4.0"
@@ -14167,7 +14333,7 @@ webpack@4.43.0:
     schema-utils "^1.0.0"
     tapable "^1.1.3"
     terser-webpack-plugin "^1.4.3"
-    watchpack "^1.6.1"
+    watchpack "^1.7.4"
     webpack-sources "^1.4.1"
 
 websocket-driver@0.6.5:
@@ -14204,9 +14370,9 @@ whatwg-fetch@2.0.4:
   integrity sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng==
 
 whatwg-fetch@>=0.10.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.4.0.tgz#e11de14f4878f773fbebcde8871b2c0699af8b30"
-  integrity sha512-rsum2ulz2iuZH08mJkT0Yi6JnKhwdw4oeyMjokgxd+mmqYSd9cPpOQf01TIWgjxG/U4+QR+AwKq6lSbXVxkyoQ==
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.4.1.tgz#e5f871572d6879663fa5674c8f833f15a8425ab3"
+  integrity sha512-sofZVzE1wKwO+EYPbWfiwzaKovWiZXf4coEzjGP9b2GBVgQRLQUZ2QcuPpQExGDAW5GItpEm6Tl4OU5mywnAoQ==
 
 whatwg-mimetype@^2.3.0:
   version "2.3.0"
@@ -14235,11 +14401,6 @@ when@~3.6.x:
   resolved "https://registry.yarnpkg.com/when/-/when-3.6.4.tgz#473b517ec159e2b85005497a13983f095412e34e"
   integrity sha1-RztRfsFZ4rhQBUl6E5g/CVQS404=
 
-which-module@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
-  integrity sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=
-
 which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
@@ -14306,10 +14467,10 @@ worker-farm@^1.7.0:
   dependencies:
     errno "~0.1.7"
 
-worker-plugin@4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/worker-plugin/-/worker-plugin-4.0.3.tgz#7c42e600d5931ad154d3d5f187a32446df64db0f"
-  integrity sha512-7hFDYWiKcE3yHZvemsoM9lZis/PzurHAEX1ej8PLCu818Rt6QqUAiDdxHPCKZctzmhqzPpcFSgvMCiPbtooqAg==
+worker-plugin@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/worker-plugin/-/worker-plugin-5.0.0.tgz#113b5fe1f4a5d6a957cecd29915bedafd70bb537"
+  integrity sha512-AXMUstURCxDD6yGam2r4E34aJg6kW85IiaeX72hi+I1cxyaMUtrvVY6sbfpGKAj5e7f68Acl62BjQF5aOOx2IQ==
   dependencies:
     loader-utils "^1.1.0"
 
@@ -14339,6 +14500,15 @@ wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
@@ -14476,7 +14646,7 @@ xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.0, xtend@~4.0.1:
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
   integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
 
-y18n@^3.2.0, y18n@^3.2.1:
+y18n@^3.2.0:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
   integrity sha1-bRX7qITAhnnA136I53WegR4H+kE=
@@ -14486,6 +14656,11 @@ y18n@^3.2.0, y18n@^3.2.1:
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
   integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
 
+y18n@^5.0.2:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.3.tgz#978115b82befe2b5c762bf55980b7b01a4a2d5d9"
+  integrity sha512-JeFbcHQ/7hVmMBXW6UB6Tg7apStHd/ztGz1JN78y3pFi/q0Ht1eA6PVkvw56gm7UA8fcJR/ziRlYEDMGoju0yQ==
+
 yallist@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
@@ -14525,12 +14700,10 @@ yargs-parser@^18.1.0, yargs-parser@^18.1.1, yargs-parser@^18.1.3:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"
-  integrity sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=
-  dependencies:
-    camelcase "^3.0.0"
+yargs-parser@^20.2.2:
+  version "20.2.2"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.2.tgz#84562c6b1c41ccec2f13d346c7dd83f8d1a0dc70"
+  integrity sha512-XmrpXaTl6noDsf1dKpBuUNCOHqjs0g3jRMXf/ztRxdOmb+er8kE5z5b55Lz3p5u2T8KJ59ENBnASS8/iapVJ5g==
 
 yargs@15.3.0:
   version "15.3.0"
@@ -14613,24 +14786,18 @@ yargs@^15.3.1:
     y18n "^4.0.0"
     yargs-parser "^18.1.1"
 
-yargs@^7.0.2:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"
-  integrity sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=
+yargs@^16.1.0:
+  version "16.1.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.1.0.tgz#fc333fe4791660eace5a894b39d42f851cd48f2a"
+  integrity sha512-upWFJOmDdHN0syLuESuvXDmrRcWd1QafJolHskzaw79uZa7/x53gxQKiR07W59GWY1tFhhU/Th9DrtSfpS782g==
   dependencies:
-    camelcase "^3.0.0"
-    cliui "^3.2.0"
-    decamelize "^1.1.1"
-    get-caller-file "^1.0.1"
-    os-locale "^1.4.0"
-    read-pkg-up "^1.0.1"
+    cliui "^7.0.2"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
     require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
-    set-blocking "^2.0.0"
-    string-width "^1.0.2"
-    which-module "^1.0.0"
-    y18n "^3.2.1"
-    yargs-parser "^5.0.0"
+    string-width "^4.2.0"
+    y18n "^5.0.2"
+    yargs-parser "^20.2.2"
 
 yauzl@^2.10.0:
   version "2.10.0"
@@ -14673,8 +14840,3 @@ zone.js@~0.10.3:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.10.3.tgz#3e5e4da03c607c9dcd92e37dd35687a14a140c16"
   integrity sha512-LXVLVEq0NNOqK/fLJo3d0kfzd4sxwn2/h67/02pjCjfKDxgx1i9QqpvtHD8CrBnSSwMw5+dy11O7FRX5mkO7Cg==
-
-zone.js@~0.9.1:
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.9.1.tgz#e37c6e5c54c13fae4de26b5ffe8d8e9212da6d9b"
-  integrity sha512-GkPiJL8jifSrKReKaTZ5jkhrMEgXbXYC+IPo1iquBjayRa0q86w3Dipjn8b415jpitMExe9lV8iTsv8tk3DGag==
diff --git a/browser-providers.conf.js b/browser-providers.conf.js
index a377f4fac6543..b49dd9f26b52d 100644
--- a/browser-providers.conf.js
+++ b/browser-providers.conf.js
@@ -12,8 +12,10 @@
 // If a category becomes empty (e.g. BS and required), then the corresponding job must be commented
 // out in the CI configuration.
 var CIconfiguration = {
-  'Chrome': {unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}},
-  'Firefox': {unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}},
+  // Chrome and Firefox run as part of the Bazel browser tests, so we do not run them as
+  // part of the legacy Saucelabs tests.
+  'Chrome': {unitTest: {target: null, required: false}, e2e: {target: null, required: true}},
+  'Firefox': {unitTest: {target: null, required: false}, e2e: {target: null, required: true}},
   // Set ESR as a not required browser as it fails for Ivy acceptance tests.
   'FirefoxESR': {unitTest: {target: 'SL', required: false}, e2e: {target: null, required: true}},
   // Disabled because using the "beta" channel of Chrome can cause non-deterministic CI results.
@@ -25,8 +27,6 @@ var CIconfiguration = {
   // Currently deactivated due to https://github.com/angular/angular/issues/7560
   'FirefoxBeta': {unitTest: {target: null, required: true}, e2e: {target: null, required: false}},
   'FirefoxDev': {unitTest: {target: null, required: true}, e2e: {target: null, required: true}},
-  'IE9': {unitTest: {target: 'SL', required: false}, e2e: {target: null, required: true}},
-  'IE10': {unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}},
   'IE11': {unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}},
   'Edge': {unitTest: {target: 'SL', required: false}, e2e: {target: null, required: true}},
   'Android7': {unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}},
@@ -88,14 +88,6 @@ var customLaunchers = {
     version: '13.0',
     device: 'iPhone 11 Simulator'
   },
-  'SL_IE9':
-      {base: 'SauceLabs', browserName: 'internet explorer', platform: 'Windows 2008', version: '9'},
-  'SL_IE10': {
-    base: 'SauceLabs',
-    browserName: 'internet explorer',
-    platform: 'Windows 2012',
-    version: '10'
-  },
   'SL_IE11':
       {base: 'SauceLabs', browserName: 'internet explorer', platform: 'Windows 8.1', version: '11'},
   'SL_EDGE': {
@@ -135,15 +127,6 @@ var customLaunchers = {
   'BS_CHROME': {base: 'BrowserStack', browser: 'chrome', os: 'OS X', os_version: 'Yosemite'},
   'BS_FIREFOX': {base: 'BrowserStack', browser: 'firefox', os: 'Windows', os_version: '10'},
   'BS_SAFARI10': {base: 'BrowserStack', browser: 'safari', os: 'OS X', os_version: 'Sierra'},
-  'BS_IE9':
-      {base: 'BrowserStack', browser: 'ie', browser_version: '9.0', os: 'Windows', os_version: '7'},
-  'BS_IE10': {
-    base: 'BrowserStack',
-    browser: 'ie',
-    browser_version: '10.1',
-    os: 'Windows',
-    os_version: '8'
-  },
   'BS_IE11': {
     base: 'BrowserStack',
     browser: 'ie',
@@ -162,13 +145,12 @@ var sauceAliases = {
     return customLaunchers[item].base == 'SauceLabs';
   }),
   'DESKTOP': [
-    'SL_CHROME', 'SL_FIREFOX', 'SL_IE9', 'SL_IE10', 'SL_IE11', 'SL_EDGE', 'SL_SAFARI12',
-    'SL_SAFARI13', 'SL_FIREFOXESR'
+    'SL_CHROME', 'SL_FIREFOX', 'SL_IE11', 'SL_EDGE', 'SL_SAFARI12', 'SL_SAFARI13', 'SL_FIREFOXESR'
   ],
   'MOBILE': ['SL_ANDROID7', 'SL_ANDROID8', 'SL_ANDROID9', 'SL_ANDROID10', 'SL_IOS12', 'SL_IOS13'],
   'ANDROID': ['SL_ANDROID7', 'SL_ANDROID8', 'SL_ANDROID9', 'SL_ANDROID10'],
   'FIREFOX': ['SL_FIREFOXESR'],
-  'IE': ['SL_IE9', 'SL_IE10', 'SL_IE11'],
+  'IE': ['SL_IE11'],
   'IOS': ['SL_IOS12', 'SL_IOS13'],
   'SAFARI': ['SL_SAFARI12', 'SL_SAFARI13'],
   'BETA': ['SL_CHROMEBETA', 'SL_FIREFOXBETA'],
@@ -184,14 +166,12 @@ var browserstackAliases = {
   'DESKTOP': [
     'BS_CHROME',
     'BS_FIREFOX',
-    'BS_IE9',
-    'BS_IE10',
     'BS_IE11',
     'BS_EDGE',
   ],
   'MOBILE': ['BS_ANDROID7', 'BS_WINDOWSPHONE'],
   'ANDROID': ['BS_ANDROID7'],
-  'IE': ['BS_IE9', 'BS_IE10', 'BS_IE11'],
+  'IE': ['BS_IE11'],
   'IOS': [],
   'SAFARI': [],
   'CI_REQUIRED': buildConfiguration('unitTest', 'BS', true),
diff --git a/dev-infra/BUILD.bazel b/dev-infra/BUILD.bazel
index 1906e83c04aac..5492b72fddb44 100644
--- a/dev-infra/BUILD.bazel
+++ b/dev-infra/BUILD.bazel
@@ -1,5 +1,5 @@
 load("@build_bazel_rules_nodejs//:index.bzl", "pkg_npm")
-load("@npm_bazel_typescript//:index.bzl", "ts_library")
+load("@npm//@bazel/typescript:index.bzl", "ts_library")
 
 ts_library(
     name = "cli",
@@ -8,8 +8,10 @@ ts_library(
     ],
     module_name = "@angular/dev-infra-private",
     deps = [
+        "//dev-infra/caretaker",
         "//dev-infra/commit-message",
         "//dev-infra/format",
+        "//dev-infra/ngbot",
         "//dev-infra/pr",
         "//dev-infra/pullapprove",
         "//dev-infra/release",
@@ -47,7 +49,7 @@ pkg_npm(
         # substitutions to replace these in the published version of dev-infra.
         "//dev-infra/": "@npm_angular_dev_infra_private//",
         "//packages/benchpress": "@npm//@angular/benchpress",
-        "//packages/bazel/": "@npm_angular_bazel//",
+        "//packages/bazel": "@npm//@angular/bazel",
         "//packages/zone.js/bundles:zone.umd.js": "@npm//:node_modules/zone.js/dist/zone.js",
         "//packages/core": "@npm//@angular/core",
         "//packages/platform-browser": "@npm//@angular/platform-browser",
@@ -55,7 +57,7 @@ pkg_npm(
         # This substitution is particularly verbose because we need to make sure
         # that only things available via Angular Bazel are imported from
         # tools/defaults.bzl.
-        "load\(\"//tools:defaults.bzl\", \"ng_module\"\)": "load(\"@npm_angular_bazel//:index.bzl\", \"ng_module\")",
+        "load\(\"//tools:defaults.bzl\", \"ng_module\"\)": "load(\"@npm//@angular/bazel:index.bzl\", \"ng_module\")",
     },
     visibility = ["//visibility:public"],
     deps = [
diff --git a/dev-infra/benchmark/component_benchmark/benchmark_test.bzl b/dev-infra/benchmark/component_benchmark/benchmark_test.bzl
index 8cbfc98a712aa..450bf051ca65e 100644
--- a/dev-infra/benchmark/component_benchmark/benchmark_test.bzl
+++ b/dev-infra/benchmark/component_benchmark/benchmark_test.bzl
@@ -1,4 +1,4 @@
-load("@npm_bazel_protractor//:index.bzl", "protractor_web_test_suite")
+load("@npm//@bazel/protractor:index.bzl", "protractor_web_test_suite")
 
 """
   Macro that can be used to define a benchmark test. This differentiates from
diff --git a/dev-infra/benchmark/component_benchmark/component_benchmark.bzl b/dev-infra/benchmark/component_benchmark/component_benchmark.bzl
index 809e92d2592d1..62a82272c0660 100644
--- a/dev-infra/benchmark/component_benchmark/component_benchmark.bzl
+++ b/dev-infra/benchmark/component_benchmark/component_benchmark.bzl
@@ -1,6 +1,6 @@
 load("//dev-infra/benchmark/ng_rollup_bundle:ng_rollup_bundle.bzl", "ng_rollup_bundle")
 load("//tools:defaults.bzl", "ng_module")
-load("@npm_bazel_typescript//:index.bzl", "ts_devserver", "ts_library")
+load("@npm//@bazel/typescript:index.bzl", "ts_devserver", "ts_library")
 load(":benchmark_test.bzl", "benchmark_test")
 
 def copy_default_file(origin, destination):
diff --git a/dev-infra/benchmark/driver-utilities/BUILD.bazel b/dev-infra/benchmark/driver-utilities/BUILD.bazel
index d9086bef93d07..1117bd505709f 100644
--- a/dev-infra/benchmark/driver-utilities/BUILD.bazel
+++ b/dev-infra/benchmark/driver-utilities/BUILD.bazel
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("@npm_bazel_typescript//:index.bzl", "ts_library")
+load("@npm//@bazel/typescript:index.bzl", "ts_library")
 
 ts_library(
     name = "driver-utilities",
diff --git a/dev-infra/benchmark/driver-utilities/e2e_util.ts b/dev-infra/benchmark/driver-utilities/e2e_util.ts
index 55d21fa96cc2d..3b391f26e4844 100644
--- a/dev-infra/benchmark/driver-utilities/e2e_util.ts
+++ b/dev-infra/benchmark/driver-utilities/e2e_util.ts
@@ -13,7 +13,7 @@ import * as webdriver from 'selenium-webdriver';
 declare var expect: any;
 
 export function openBrowser(config: {
-  url: string,
+  url?: string,
   params?: {name: string, value: any}[],
   ignoreBrowserSynchronization?: boolean
 }) {
diff --git a/dev-infra/benchmark/driver-utilities/perf_util.ts b/dev-infra/benchmark/driver-utilities/perf_util.ts
index ab27079f0c456..b6d59a4a1d1ec 100644
--- a/dev-infra/benchmark/driver-utilities/perf_util.ts
+++ b/dev-infra/benchmark/driver-utilities/perf_util.ts
@@ -23,27 +23,34 @@ const globalOptions = {
 
 const runner = createBenchpressRunner();
 
-export async function runBenchmark(config: {
+export async function runBenchmark({
+  id,
+  url = '',
+  params = [],
+  ignoreBrowserSynchronization = true,
+  microMetrics,
+  work,
+  prepare,
+  setup,
+}: {
   id: string,
-  url: string,
-  params: {name: string, value: any}[],
+  url?: string,
+  params?: {name: string, value: any}[],
   ignoreBrowserSynchronization?: boolean,
   microMetrics?: {[key: string]: string},
-  work?: () => void,
-  prepare?: () => void,
-  setup?: () => void
+  work?: (() => void)|(() => Promise<unknown>),
+  prepare?: (() => void)|(() => Promise<unknown>),
+  setup?: (() => void)|(() => Promise<unknown>),
 }): Promise<any> {
-  openBrowser(config);
-  if (config.setup) {
-    await config.setup();
+  openBrowser({url, params, ignoreBrowserSynchronization});
+  if (setup) {
+    await setup();
   }
-  const description: {[key: string]: any} = {};
-  config.params.forEach((param) => description[param.name] = param.value);
   return runner.sample({
-    id: config.id,
-    execute: config.work,
-    prepare: config.prepare,
-    microMetrics: config.microMetrics,
+    id,
+    execute: work,
+    prepare,
+    microMetrics,
     providers: [{provide: Options.SAMPLE_DESCRIPTION, useValue: {}}]
   });
 }
diff --git a/dev-infra/benchmark/ng_rollup_bundle/ng_rollup_bundle.bzl b/dev-infra/benchmark/ng_rollup_bundle/ng_rollup_bundle.bzl
index a7eb00e66f8a5..2684c219aaefe 100644
--- a/dev-infra/benchmark/ng_rollup_bundle/ng_rollup_bundle.bzl
+++ b/dev-infra/benchmark/ng_rollup_bundle/ng_rollup_bundle.bzl
@@ -4,8 +4,8 @@
 # found in the LICENSE file at https://angular.io/license
 
 load("@build_bazel_rules_nodejs//:index.bzl", "npm_package_bin")
-load("@npm_bazel_terser//:index.bzl", "terser_minified")
-load("@npm_bazel_rollup//:index.bzl", "rollup_bundle")
+load("@npm//@bazel/terser:index.bzl", "terser_minified")
+load("@npm//@bazel/rollup:index.bzl", "rollup_bundle")
 load("//dev-infra/bazel:expand_template.bzl", "expand_template")
 
 def ng_rollup_bundle(
diff --git a/dev-infra/browsers/chromium/chromium.bzl b/dev-infra/browsers/chromium/chromium.bzl
index 1048b85d88da2..4b2b6d1d781a4 100644
--- a/dev-infra/browsers/chromium/chromium.bzl
+++ b/dev-infra/browsers/chromium/chromium.bzl
@@ -12,47 +12,47 @@ def define_chromium_repositories():
     platform_http_file(
         name = "org_chromium_chromium_amd64",
         licenses = ["notice"],  # BSD 3-clause (maybe more?)
-        sha256 = "2cfd74ee58c79d8b7aada05c899a930967e2fd8bb0186582cde02c7340863f64",
-        # 83.0.4103
-        urls = ["https://commondatastorage.googleapis.com/chromium-browser-snapshots/Linux_x64/756066/chrome-linux.zip"],
+        sha256 = "0e303931d9c3e065a160f5d31f1178c647f0748fb0b58b1945b84b04fe1c1165",
+        # 84.0.4147
+        urls = ["https://commondatastorage.googleapis.com/chromium-browser-snapshots/Linux_x64/768968/chrome-linux.zip"],
     )
 
     platform_http_file(
         name = "org_chromium_chromium_macos",
         licenses = ["notice"],  # BSD 3-clause (maybe more?)
-        sha256 = "b841ec5ad03b08422d97593fc719f1c5b038703388ad65e6cd8cc8272d58958c",
-        # 83.0.4103
-        urls = ["https://commondatastorage.googleapis.com/chromium-browser-snapshots/Mac/756053/chrome-mac.zip"],
+        sha256 = "39118c96db1b3fdb0129f434912a329c5ca07d3a1c6c6cda673d3383d83e2f9a",
+        # 84.0.4147
+        urls = ["https://commondatastorage.googleapis.com/chromium-browser-snapshots/Mac/768968/chrome-mac.zip"],
     )
 
     platform_http_file(
         name = "org_chromium_chromium_windows",
         licenses = ["notice"],  # BSD 3-clause (maybe more?)
-        sha256 = "4683d7ac88dfec4b98d1da3012ecc8e42cc8c1a560a7b95589ad4cc96bf90fcb",
-        # 83.0.4103
-        urls = ["https://commondatastorage.googleapis.com/chromium-browser-snapshots/Win/756065/chrome-win.zip"],
+        sha256 = "3429746fa80c917c6f4d5d96aba4e58894b905a2b8392e43ddb470c5ba612d60",
+        # 84.0.4147
+        urls = ["https://commondatastorage.googleapis.com/chromium-browser-snapshots/Win/768975/chrome-win.zip"],
     )
 
     platform_http_file(
         name = "org_chromium_chromedriver_amd64",
         licenses = ["reciprocal"],  # BSD 3-clause, ICU, MPL 1.1, libpng (BSD/MIT-like), Academic Free License v. 2.0, BSD 2-clause, MIT
-        sha256 = "95dded16000b82e31445361da7d251ed707e027a4b61e9a3ec5fbd1cc2f62bb1",
-        # 83.0.4103
-        urls = ["https://commondatastorage.googleapis.com/chromium-browser-snapshots/Linux_x64/756066/chromedriver_linux64.zip"],
+        sha256 = "f6b9852031d185739a2c1816508fe8158eb92782d13e831b8345957ef2506fe8",
+        # 84.0.4147
+        urls = ["https://commondatastorage.googleapis.com/chromium-browser-snapshots/Linux_x64/768968/chromedriver_linux64.zip"],
     )
 
     platform_http_file(
         name = "org_chromium_chromedriver_macos",
         licenses = ["reciprocal"],  # BSD 3-clause, ICU, MPL 1.1, libpng (BSD/MIT-like), Academic Free License v. 2.0, BSD 2-clause, MIT
-        sha256 = "17260e9b2222b0c905a1861285210192baef830f4281778903e7cebb8db683cc",
-        # 83.0.4103
-        urls = ["https://commondatastorage.googleapis.com/chromium-browser-snapshots/Mac/756053/chromedriver_mac64.zip"],
+        sha256 = "aa0124085146556d5d32ad172670e5dcef79b7429380112ad02898047ba7a8b7",
+        # 84.0.4147
+        urls = ["https://commondatastorage.googleapis.com/chromium-browser-snapshots/Mac/768968/chromedriver_mac64.zip"],
     )
 
     platform_http_file(
         name = "org_chromium_chromedriver_windows",
         licenses = ["reciprocal"],  # BSD 3-clause, ICU, MPL 1.1, libpng (BSD/MIT-like), Academic Free License v. 2.0, BSD 2-clause, MIT
-        sha256 = "de1423b2d69f96e451e902d686e8d471610d786c345a8de59dd1a5a436e45fc2",
-        # 83.0.4103
-        urls = ["https://commondatastorage.googleapis.com/chromium-browser-snapshots/Win/756065/chromedriver_win32.zip"],
+        sha256 = "c4b04fd263e757d3aa99c596832f2c414f9f00e80d2769590e2b9044072b140e",
+        # 84.0.4147
+        urls = ["https://commondatastorage.googleapis.com/chromium-browser-snapshots/Win/768975/chromedriver_win32.zip"],
     )
diff --git a/dev-infra/caretaker/BUILD.bazel b/dev-infra/caretaker/BUILD.bazel
new file mode 100644
index 0000000000000..eb834938659d3
--- /dev/null
+++ b/dev-infra/caretaker/BUILD.bazel
@@ -0,0 +1,22 @@
+load("@npm//@bazel/typescript:index.bzl", "ts_library")
+
+ts_library(
+    name = "caretaker",
+    srcs = glob([
+        "**/*.ts",
+    ]),
+    module_name = "@angular/dev-infra-private/caretaker",
+    visibility = ["//dev-infra:__subpackages__"],
+    deps = [
+        "//dev-infra/release/versioning",
+        "//dev-infra/utils",
+        "@npm//@types/node",
+        "@npm//@types/node-fetch",
+        "@npm//@types/yargs",
+        "@npm//multimatch",
+        "@npm//node-fetch",
+        "@npm//typed-graphqlify",
+        "@npm//yaml",
+        "@npm//yargs",
+    ],
+)
diff --git a/dev-infra/caretaker/check/check.ts b/dev-infra/caretaker/check/check.ts
new file mode 100644
index 0000000000000..ebd51125f8342
--- /dev/null
+++ b/dev-infra/caretaker/check/check.ts
@@ -0,0 +1,30 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {GitClient} from '../../utils/git';
+import {getCaretakerConfig} from '../config';
+
+import {printCiStatus} from './ci';
+import {printG3Comparison} from './g3';
+import {printGithubTasks} from './github';
+import {printServiceStatuses} from './services';
+
+
+/** Check the status of services which Angular caretakers need to monitor. */
+export async function checkServiceStatuses(githubToken: string) {
+  /** The configuration for the caretaker commands. */
+  const config = getCaretakerConfig();
+  /** The GitClient for interacting with git and Github. */
+  const git = new GitClient(githubToken, config);
+
+  // TODO(josephperrott): Allow these checks to be loaded in parallel.
+  await printServiceStatuses();
+  await printGithubTasks(git, config.caretaker);
+  await printG3Comparison(git);
+  await printCiStatus(git);
+}
diff --git a/dev-infra/caretaker/check/ci.ts b/dev-infra/caretaker/check/ci.ts
new file mode 100644
index 0000000000000..ff32fe052cb6f
--- /dev/null
+++ b/dev-infra/caretaker/check/ci.ts
@@ -0,0 +1,62 @@
+/**
+ * @license
+ * Copyright Google LLC 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 fetch from 'node-fetch';
+import {fetchActiveReleaseTrains} from '../../release/versioning/index';
+
+import {bold, debug, info} from '../../utils/console';
+import {GitClient} from '../../utils/git';
+
+
+/** The results of checking the status of CI.  */
+interface StatusCheckResult {
+  status: 'success'|'failed';
+}
+
+/** Retrieve and log status of CI for the project. */
+export async function printCiStatus(git: GitClient) {
+  const releaseTrains = await fetchActiveReleaseTrains({api: git.github, ...git.remoteConfig});
+
+  info.group(bold(`CI`));
+  for (const [trainName, train] of Object.entries(releaseTrains)) {
+    if (train === null) {
+      debug(`No active release train for ${trainName}`);
+      continue;
+    }
+    const status = await getStatusOfBranch(git, train.branchName);
+    await printStatus(`${trainName.padEnd(6)} (${train.branchName})`, status);
+  }
+  info.groupEnd();
+  info();
+}
+
+/** Log the status of CI for a given branch to the console. */
+async function printStatus(label: string, status: StatusCheckResult|null) {
+  const branchName = label.padEnd(16);
+  if (status === null) {
+    info(`${branchName} was not found on CircleCI`);
+  } else if (status.status === 'success') {
+    info(`${branchName} ✅`);
+  } else {
+    info(`${branchName} ❌`);
+  }
+}
+
+/** Get the CI status of a given branch from CircleCI. */
+async function getStatusOfBranch(git: GitClient, branch: string): Promise<StatusCheckResult|null> {
+  const {owner, name} = git.remoteConfig;
+  const url = `https://circleci.com/gh/${owner}/${name}/tree/${branch}.svg?style=shield`;
+  const result = await fetch(url).then(result => result.text());
+
+  if (result && !result.includes('no builds')) {
+    return {
+      status: result.includes('passing') ? 'success' : 'failed',
+    };
+  }
+  return null;
+}
diff --git a/dev-infra/caretaker/check/cli.ts b/dev-infra/caretaker/check/cli.ts
new file mode 100644
index 0000000000000..19883814238c4
--- /dev/null
+++ b/dev-infra/caretaker/check/cli.ts
@@ -0,0 +1,36 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Arguments, Argv, CommandModule} from 'yargs';
+
+import {addGithubTokenOption} from '../../utils/git/github-yargs';
+
+import {checkServiceStatuses} from './check';
+
+
+export interface CaretakerCheckOptions {
+  githubToken: string;
+}
+
+/** Builds the command. */
+function builder(yargs: Argv) {
+  return addGithubTokenOption(yargs);
+}
+
+/** Handles the command. */
+async function handler({githubToken}: Arguments<CaretakerCheckOptions>) {
+  await checkServiceStatuses(githubToken);
+}
+
+/** yargs command module for checking status information for the repository  */
+export const CheckModule: CommandModule<{}, CaretakerCheckOptions> = {
+  handler,
+  builder,
+  command: 'check',
+  describe: 'Check the status of information the caretaker manages for the repository',
+};
diff --git a/dev-infra/caretaker/check/g3.ts b/dev-infra/caretaker/check/g3.ts
new file mode 100644
index 0000000000000..1a5d8a48e63f4
--- /dev/null
+++ b/dev-infra/caretaker/check/g3.ts
@@ -0,0 +1,125 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {existsSync, readFileSync} from 'fs';
+import * as multimatch from 'multimatch';
+import {join} from 'path';
+import {parse as parseYaml} from 'yaml';
+
+import {getRepoBaseDir} from '../../utils/config';
+import {bold, debug, info} from '../../utils/console';
+import {GitClient} from '../../utils/git';
+
+/** Compare the upstream master to the upstream g3 branch, if it exists. */
+export async function printG3Comparison(git: GitClient) {
+  const angularRobotFilePath = join(getRepoBaseDir(), '.github/angular-robot.yml');
+  if (!existsSync(angularRobotFilePath)) {
+    return debug('No angular robot configuration file exists, skipping.');
+  }
+
+  /** The configuration defined for the angular robot. */
+  const robotConfig = parseYaml(readFileSync(angularRobotFilePath).toString());
+  /** The files to be included in the g3 sync. */
+  const includeFiles = robotConfig?.merge?.g3Status?.include || [];
+  /** The files to be expected in the g3 sync. */
+  const excludeFiles = robotConfig?.merge?.g3Status?.exclude || [];
+
+  if (includeFiles.length === 0 && excludeFiles.length === 0) {
+    debug('No g3Status include or exclude lists are defined in the angular robot configuration,');
+    debug('skipping.');
+    return;
+  }
+
+  /** The latest sha for the g3 branch. */
+  const g3Ref = getShaForBranchLatest('g3');
+  /** The latest sha for the master branch. */
+  const masterRef = getShaForBranchLatest('master');
+
+  if (!g3Ref && !masterRef) {
+    return debug('Exiting early as either the g3 or master was unable to be retrieved');
+  }
+
+  /** The statistical information about the git diff between master and g3. */
+  const stats = getDiffStats();
+
+  info.group(bold('g3 branch check'));
+  info(`${stats.commits} commits between g3 and master`);
+  if (stats.files === 0) {
+    info('✅ No sync is needed at this time');
+  } else {
+    info(`${stats.files} files changed, ${stats.insertions} insertions(+), ${
+        stats.deletions} deletions(-) will be included in the next sync`);
+  }
+  info.groupEnd();
+  info();
+
+
+  /** Fetch and retrieve the latest sha for a specific branch. */
+  function getShaForBranchLatest(branch: string) {
+    /** The result fo the fetch command. */
+    const fetchResult = git.runGraceful([
+      'fetch', '-q', `https://github.com/${git.remoteConfig.owner}/${git.remoteConfig.name}.git`,
+      branch
+    ]);
+
+    if (fetchResult.status !== 0 &&
+        fetchResult.stderr.includes(`couldn't find remote ref ${branch}`)) {
+      debug(`No '${branch}' branch exists on upstream, skipping.`);
+      return false;
+    }
+    return git.runGraceful(['rev-parse', 'FETCH_HEAD']).stdout.trim();
+  }
+
+  /**
+   * Get git diff stats between master and g3, for all files and filtered to only g3 affecting
+   * files.
+   */
+  function getDiffStats() {
+    /** The diff stats to be returned. */
+    const stats = {
+      insertions: 0,
+      deletions: 0,
+      files: 0,
+      commits: 0,
+    };
+
+    // Determine the number of commits between master and g3 refs. */
+    stats.commits = parseInt(git.run(['rev-list', '--count', `${g3Ref}..${masterRef}`]).stdout, 10);
+
+    // Get the numstat information between master and g3
+    git.run(['diff', `${g3Ref}...${masterRef}`, '--numstat'])
+        .stdout
+        // Remove the extra space after git's output.
+        .trim()
+        // Split each line of git output into array
+        .split('\n')
+        // Split each line from the git output into components parts: insertions,
+        // deletions and file name respectively
+        .map(line => line.split('\t'))
+        // Parse number value from the insertions and deletions values
+        // Example raw line input:
+        //   10\t5\tsrc/file/name.ts
+        .map(line => [Number(line[0]), Number(line[1]), line[2]] as [number, number, string])
+        // Add each line's value to the diff stats, and conditionally to the g3
+        // stats as well if the file name is included in the files synced to g3.
+        .forEach(([insertions, deletions, fileName]) => {
+          if (checkMatchAgainstIncludeAndExclude(fileName, includeFiles, excludeFiles)) {
+            stats.insertions += insertions;
+            stats.deletions += deletions;
+            stats.files += 1;
+          }
+        });
+    return stats;
+  }
+
+  /** Determine whether the file name passes both include and exclude checks. */
+  function checkMatchAgainstIncludeAndExclude(
+      file: string, includes: string[], excludes: string[]) {
+    return multimatch(file, includes).length >= 1 && multimatch(file, excludes).length === 0;
+  }
+}
diff --git a/dev-infra/caretaker/check/github.ts b/dev-infra/caretaker/check/github.ts
new file mode 100644
index 0000000000000..664e8b539fa62
--- /dev/null
+++ b/dev-infra/caretaker/check/github.ts
@@ -0,0 +1,83 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {alias, onUnion, params, types} from 'typed-graphqlify';
+
+import {bold, debug, info} from '../../utils/console';
+import {GitClient} from '../../utils/git';
+import {CaretakerConfig} from '../config';
+
+/**
+ * Cap the returned issues in the queries to an arbitrary 100. At that point, caretaker has a lot
+ * of work to do and showing more than that isn't really useful.
+ */
+const MAX_RETURNED_ISSUES = 20;
+
+/** Retrieve the number of matching issues for each github query. */
+export async function printGithubTasks(git: GitClient, config?: CaretakerConfig) {
+  if (!config?.githubQueries?.length) {
+    debug('No github queries defined in the configuration, skipping.');
+    return;
+  }
+  info.group(bold(`Github Tasks`));
+  await getGithubInfo(git, config);
+  info.groupEnd();
+  info();
+}
+
+/** Retrieve query match counts and log discovered counts to the console. */
+async function getGithubInfo(git: GitClient, {githubQueries: queries = []}: CaretakerConfig) {
+  /** The query object for graphql. */
+  const graphQlQuery: {
+    [key: string]: {
+      issueCount: number,
+      nodes: Array<{url: string}>,
+    }
+  } = {};
+  /** The Github search filter for the configured repository. */
+  const repoFilter = `repo:${git.remoteConfig.owner}/${git.remoteConfig.name}`;
+  queries.forEach(({name, query}) => {
+    /** The name of the query, with spaces removed to match GraphQL requirements. */
+    const queryKey = alias(name.replace(/ /g, ''), 'search');
+    graphQlQuery[queryKey] = params(
+        {
+          type: 'ISSUE',
+          first: MAX_RETURNED_ISSUES,
+          query: `"${repoFilter} ${query.replace(/"/g, '\\"')}"`,
+        },
+        {
+          issueCount: types.number,
+          nodes: [{...onUnion({
+            PullRequest: {
+              url: types.string,
+            },
+            Issue: {
+              url: types.string,
+            },
+          })}],
+        },
+    );
+  });
+  /** The results of the generated github query. */
+  const results = await git.github.graphql.query(graphQlQuery);
+  Object.values(results).forEach((result, i) => {
+    info(`${queries[i]?.name.padEnd(25)} ${result.issueCount}`);
+    if (result.issueCount > 0) {
+      const {owner, name: repo} = git.remoteConfig;
+      const url = encodeURI(`https://github.com/${owner}/${repo}/issues?q=${queries[i]?.query}`);
+      info.group(`${url}`);
+      if (result.nodes.length === MAX_RETURNED_ISSUES && result.nodes.length < result.issueCount) {
+        info(`(first ${MAX_RETURNED_ISSUES})`);
+      }
+      for (const node of result.nodes) {
+        info(`- ${node.url}`);
+      }
+      info.groupEnd();
+    }
+  });
+}
diff --git a/dev-infra/caretaker/check/services.ts b/dev-infra/caretaker/check/services.ts
new file mode 100644
index 0000000000000..8fd3a2dbc33ef
--- /dev/null
+++ b/dev-infra/caretaker/check/services.ts
@@ -0,0 +1,79 @@
+/**
+ * @license
+ * Copyright Google LLC 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 fetch from 'node-fetch';
+
+import {bold, green, info, red} from '../../utils/console';
+
+/** The status levels for services. */
+enum ServiceStatus {
+  GREEN,
+  RED
+}
+
+/** The results of checking the status of a service */
+interface StatusCheckResult {
+  status: ServiceStatus;
+  description: string;
+  lastUpdated: Date;
+}
+
+/** Retrieve and log stasuses for all of the services of concern. */
+export async function printServiceStatuses() {
+  info.group(bold(`Service Statuses (checked: ${new Date().toLocaleString()})`));
+  logStatus('CircleCI', await getCircleCiStatus());
+  logStatus('Github', await getGithubStatus());
+  logStatus('NPM', await getNpmStatus());
+  logStatus('Saucelabs', await getSaucelabsStatus());
+  info.groupEnd();
+  info();
+}
+
+
+/** Log the status of the service to the console. */
+function logStatus(serviceName: string, status: StatusCheckResult) {
+  serviceName = serviceName.padEnd(15);
+  if (status.status === ServiceStatus.GREEN) {
+    info(`${serviceName} ${green('✅')}`);
+  } else if (status.status === ServiceStatus.RED) {
+    info.group(`${serviceName} ${red('❌')} (Updated: ${status.lastUpdated.toLocaleString()})`);
+    info(`  Details: ${status.description}`);
+    info.groupEnd();
+  }
+}
+
+/** Gets the service status information for Saucelabs. */
+async function getSaucelabsStatus(): Promise<StatusCheckResult> {
+  return getStatusFromStandardApi('https://status.us-west-1.saucelabs.com/api/v2/status.json');
+}
+
+/** Gets the service status information for NPM. */
+async function getNpmStatus(): Promise<StatusCheckResult> {
+  return getStatusFromStandardApi('https://status.npmjs.org/api/v2/status.json');
+}
+
+/** Gets the service status information for CircleCI. */
+async function getCircleCiStatus(): Promise<StatusCheckResult> {
+  return getStatusFromStandardApi('https://status.circleci.com/api/v2/status.json');
+}
+
+/** Gets the service status information for Github. */
+async function getGithubStatus(): Promise<StatusCheckResult> {
+  return getStatusFromStandardApi('https://www.githubstatus.com/api/v2/status.json');
+}
+
+/** Retrieve the status information for a service which uses a standard API response. */
+async function getStatusFromStandardApi(url: string) {
+  const result = await fetch(url).then(result => result.json());
+  const status = result.status.indicator === 'none' ? ServiceStatus.GREEN : ServiceStatus.RED;
+  return {
+    status,
+    description: result.status.description,
+    lastUpdated: new Date(result.page.updated_at)
+  };
+}
diff --git a/dev-infra/caretaker/cli.ts b/dev-infra/caretaker/cli.ts
new file mode 100644
index 0000000000000..dd464699e83a0
--- /dev/null
+++ b/dev-infra/caretaker/cli.ts
@@ -0,0 +1,16 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Argv} from 'yargs';
+import {CheckModule} from './check/cli';
+
+
+/** Build the parser for the caretaker commands. */
+export function buildCaretakerParser(yargs: Argv) {
+  return yargs.command(CheckModule);
+}
diff --git a/dev-infra/caretaker/config.ts b/dev-infra/caretaker/config.ts
new file mode 100644
index 0000000000000..8ac7ea630335d
--- /dev/null
+++ b/dev-infra/caretaker/config.ts
@@ -0,0 +1,24 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {assertNoErrors, getConfig, NgDevConfig} from '../utils/config';
+
+export interface CaretakerConfig {
+  githubQueries?: {name: string; query: string;}[];
+}
+
+/** Retrieve and validate the config as `CaretakerConfig`. */
+export function getCaretakerConfig() {
+  // List of errors encountered validating the config.
+  const errors: string[] = [];
+  // The non-validated config object.
+  const config: Partial<NgDevConfig<{caretaker: CaretakerConfig}>> = getConfig();
+
+  assertNoErrors(errors);
+  return config as Required<typeof config>;
+}
diff --git a/dev-infra/cli.ts b/dev-infra/cli.ts
index a220486865826..c83db4117c546 100644
--- a/dev-infra/cli.ts
+++ b/dev-infra/cli.ts
@@ -13,8 +13,12 @@ import {buildCommitMessageParser} from './commit-message/cli';
 import {buildFormatParser} from './format/cli';
 import {buildReleaseParser} from './release/cli';
 import {buildPrParser} from './pr/cli';
+import {captureLogOutputForCommand} from './utils/console';
+import {buildCaretakerParser} from './caretaker/cli';
+import {buildNgbotParser} from './ngbot/cli';
 
 yargs.scriptName('ng-dev')
+    .middleware(captureLogOutputForCommand)
     .demandCommand()
     .recommendCommands()
     .command('commit-message <command>', '', buildCommitMessageParser)
@@ -23,6 +27,8 @@ yargs.scriptName('ng-dev')
     .command('pullapprove <command>', '', buildPullapproveParser)
     .command('release <command>', '', buildReleaseParser)
     .command('ts-circular-deps <command>', '', tsCircularDependenciesBuilder)
+    .command('caretaker <command>', '', buildCaretakerParser)
+    .command('ngbot <command>', false, buildNgbotParser)
     .wrap(120)
     .strict()
     .parse();
diff --git a/dev-infra/commit-message/BUILD.bazel b/dev-infra/commit-message/BUILD.bazel
index 2c6d3be371924..e6d77a54562bb 100644
--- a/dev-infra/commit-message/BUILD.bazel
+++ b/dev-infra/commit-message/BUILD.bazel
@@ -1,31 +1,30 @@
 load("//tools:defaults.bzl", "jasmine_node_test")
-load("@npm_bazel_typescript//:index.bzl", "ts_library")
+load("@npm//@bazel/typescript:index.bzl", "ts_library")
 
 ts_library(
     name = "commit-message",
-    srcs = [
-        "cli.ts",
-        "config.ts",
-        "validate.ts",
-        "validate-file.ts",
-        "validate-range.ts",
-    ],
+    srcs = glob(
+        ["**/*.ts"],
+        exclude = ["**/*.spec.ts"],
+    ),
     module_name = "@angular/dev-infra-private/commit-message",
     visibility = ["//dev-infra:__subpackages__"],
     deps = [
         "//dev-infra/utils",
+        "@npm//@types/inquirer",
         "@npm//@types/node",
         "@npm//@types/shelljs",
         "@npm//@types/yargs",
+        "@npm//inquirer",
         "@npm//shelljs",
         "@npm//yargs",
     ],
 )
 
 ts_library(
-    name = "validate-test",
+    name = "test_lib",
     testonly = True,
-    srcs = ["validate.spec.ts"],
+    srcs = glob(["**/*.spec.ts"]),
     deps = [
         ":commit-message",
         "//dev-infra/utils",
@@ -40,7 +39,6 @@ jasmine_node_test(
     name = "test",
     bootstrap = ["//tools/testing:node_no_angular_es5"],
     deps = [
-        ":commit-message",
-        ":validate-test",
+        "test_lib",
     ],
 )
diff --git a/dev-infra/commit-message/builder.spec.ts b/dev-infra/commit-message/builder.spec.ts
new file mode 100644
index 0000000000000..5b45ac4140c6f
--- /dev/null
+++ b/dev-infra/commit-message/builder.spec.ts
@@ -0,0 +1,46 @@
+/**
+ * @license
+ * Copyright Google LLC 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 config from '../utils/config';
+import * as console from '../utils/console';
+
+import {buildCommitMessage} from './builder';
+
+
+describe('commit message building:', () => {
+  beforeEach(() => {
+    // stub logging calls to prevent noise in test log
+    spyOn(console, 'info').and.stub();
+    // provide a configuration for DevInfra when loaded
+    spyOn(config, 'getConfig').and.returnValue({
+      commitMessage: {
+        scopes: ['core'],
+      }
+    } as any);
+  });
+
+  it('creates a commit message with a scope', async () => {
+    buildPromptResponseSpies('fix', 'core', 'This is a summary');
+
+    expect(await buildCommitMessage()).toMatch(/^fix\(core\): This is a summary/);
+  });
+
+  it('creates a commit message without a scope', async () => {
+    buildPromptResponseSpies('build', false, 'This is a summary');
+
+    expect(await buildCommitMessage()).toMatch(/^build: This is a summary/);
+  });
+});
+
+
+/** Create spies to return the mocked selections from prompts. */
+function buildPromptResponseSpies(type: string, scope: string|false, summary: string) {
+  spyOn(console, 'promptAutocomplete')
+      .and.returnValues(Promise.resolve(type), Promise.resolve(scope));
+  spyOn(console, 'promptInput').and.returnValue(Promise.resolve(summary));
+}
diff --git a/dev-infra/commit-message/builder.ts b/dev-infra/commit-message/builder.ts
new file mode 100644
index 0000000000000..f663f3619d471
--- /dev/null
+++ b/dev-infra/commit-message/builder.ts
@@ -0,0 +1,70 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {ListChoiceOptions} from 'inquirer';
+
+import {info, promptAutocomplete, promptInput} from '../utils/console';
+
+import {COMMIT_TYPES, CommitType, getCommitMessageConfig, ScopeRequirement} from './config';
+
+/** Validate commit message at the provided file path. */
+export async function buildCommitMessage() {
+  // TODO(josephperrott): Add support for skipping wizard with local untracked config file
+  // TODO(josephperrott): Add default commit message information/commenting into generated messages
+  info('Just a few questions to start building the commit message!');
+
+  /** The commit message type. */
+  const type = await promptForCommitMessageType();
+  /** The commit message scope. */
+  const scope = await promptForCommitMessageScopeForType(type);
+  /** The commit message summary. */
+  const summary = await promptForCommitMessageSummary();
+
+  return `${type.name}${scope ? '(' + scope + ')' : ''}: ${summary}\n\n`;
+}
+
+/** Prompts in the terminal for the commit message's type. */
+async function promptForCommitMessageType(): Promise<CommitType> {
+  info('The type of change in the commit. Allows a reader to know the effect of the change,');
+  info('whether it brings a new feature, adds additional testing, documents the `project, etc.');
+
+  /** List of commit type options for the autocomplete prompt. */
+  const typeOptions: ListChoiceOptions[] =
+      Object.values(COMMIT_TYPES).map(({description, name}) => {
+        return {
+          name: `${name} - ${description}`,
+          value: name,
+          short: name,
+        };
+      });
+  /** The key of a commit message type, selected by the user via prompt. */
+  const typeName = await promptAutocomplete('Select a type for the commit:', typeOptions);
+
+  return COMMIT_TYPES[typeName];
+}
+
+/** Prompts in the terminal for the commit message's scope. */
+async function promptForCommitMessageScopeForType(type: CommitType): Promise<string|false> {
+  // If the commit type's scope requirement is forbidden, return early.
+  if (type.scope === ScopeRequirement.Forbidden) {
+    info(`Skipping scope selection as the '${type.name}' type does not allow scopes`);
+    return false;
+  }
+  /** Commit message configuration */
+  const config = getCommitMessageConfig();
+
+  info('The area of the repository the changes in this commit most affects.');
+  return await promptAutocomplete(
+      'Select a scope for the commit:', config.commitMessage.scopes,
+      type.scope === ScopeRequirement.Optional ? '<no scope>' : '');
+}
+
+/** Prompts in the terminal for the commit message's summary. */
+async function promptForCommitMessageSummary(): Promise<string> {
+  info('Provide a short summary of what the changes in the commit do');
+  return await promptInput('Provide a short summary of the commit');
+}
diff --git a/dev-infra/commit-message/cli.ts b/dev-infra/commit-message/cli.ts
index f7b2cc8936cdc..9230b03d0ce23 100644
--- a/dev-infra/commit-message/cli.ts
+++ b/dev-infra/commit-message/cli.ts
@@ -7,61 +7,19 @@
  */
 import * as yargs from 'yargs';
 
-import {info} from '../utils/console';
-
-import {validateFile} from './validate-file';
-import {validateCommitRange} from './validate-range';
+import {RestoreCommitMessageModule} from './restore-commit-message/cli';
+import {ValidateFileModule} from './validate-file/cli';
+import {ValidateRangeModule} from './validate-range/cli';
+import {WizardModule} from './wizard/cli';
 
 /** Build the parser for the commit-message commands. */
 export function buildCommitMessageParser(localYargs: yargs.Argv) {
   return localYargs.help()
       .strict()
-      .command(
-          'pre-commit-validate', 'Validate the most recent commit message', {
-            'file': {
-              type: 'string',
-              conflicts: ['file-env-variable'],
-              description: 'The path of the commit message file.',
-            },
-            'file-env-variable': {
-              type: 'string',
-              conflicts: ['file'],
-              description:
-                  'The key of the environment variable for the path of the commit message file.',
-              coerce: arg => {
-                const file = process.env[arg];
-                if (!file) {
-                  throw new Error(`Provided environment variable "${arg}" was not found.`);
-                }
-                return file;
-              },
-            }
-          },
-          args => {
-            const file = args.file || args.fileEnvVariable || '.git/COMMIT_EDITMSG';
-            validateFile(file);
-          })
-      .command(
-          'validate-range', 'Validate a range of commit messages', {
-            'range': {
-              description: 'The range of commits to check, e.g. --range abc123..xyz456',
-              demandOption: '  A range must be provided, e.g. --range abc123..xyz456',
-              type: 'string',
-              requiresArg: true,
-            },
-          },
-          argv => {
-            // If on CI, and not pull request number is provided, assume the branch
-            // being run on is an upstream branch.
-            if (process.env['CI'] && process.env['CI_PULL_REQUEST'] === 'false') {
-              info(`Since valid commit messages are enforced by PR linting on CI, we do not`);
-              info(`need to validate commit messages on CI runs on upstream branches.`);
-              info();
-              info(`Skipping check of provided commit range`);
-              return;
-            }
-            validateCommitRange(argv.range);
-          });
+      .command(RestoreCommitMessageModule)
+      .command(WizardModule)
+      .command(ValidateFileModule)
+      .command(ValidateRangeModule);
 }
 
 if (require.main == module) {
diff --git a/dev-infra/commit-message/commit-message-draft.ts b/dev-infra/commit-message/commit-message-draft.ts
new file mode 100644
index 0000000000000..86a5655fd09b0
--- /dev/null
+++ b/dev-infra/commit-message/commit-message-draft.ts
@@ -0,0 +1,30 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {existsSync, readFileSync, unlinkSync, writeFileSync} from 'fs';
+
+/** Load the commit message draft from the file system if it exists. */
+export function loadCommitMessageDraft(basePath: string) {
+  const commitMessageDraftPath = `${basePath}.ngDevSave`;
+  if (existsSync(commitMessageDraftPath)) {
+    return readFileSync(commitMessageDraftPath).toString();
+  }
+  return '';
+}
+
+/** Remove the commit message draft from the file system. */
+export function deleteCommitMessageDraft(basePath: string) {
+  const commitMessageDraftPath = `${basePath}.ngDevSave`;
+  if (existsSync(commitMessageDraftPath)) {
+    unlinkSync(commitMessageDraftPath);
+  }
+}
+
+/** Save the commit message draft to the file system for later retrieval. */
+export function saveCommitMessageDraft(basePath: string, commitMessage: string) {
+  writeFileSync(`${basePath}.ngDevSave`, commitMessage);
+}
diff --git a/packages/platform-webworker-dynamic/public_api.ts b/dev-infra/commit-message/commit-message-source.ts
similarity index 50%
rename from packages/platform-webworker-dynamic/public_api.ts
rename to dev-infra/commit-message/commit-message-source.ts
index f6ddc07fc9139..c8a9640e839ed 100644
--- a/packages/platform-webworker-dynamic/public_api.ts
+++ b/dev-infra/commit-message/commit-message-source.ts
@@ -7,9 +7,7 @@
  */
 
 /**
- * @module
- * @description
- * Entry point for all public APIs of this package.
+ * The source triggering the git commit message creation.
+ * As described in: https://git-scm.com/docs/githooks#_prepare_commit_msg
  */
-export * from './src/platform-webworker-dynamic';
-// This file only reexports content of the `src` folder. Keep it that way.
+export type CommitMsgSource = 'message'|'template'|'merge'|'squash'|'commit';
diff --git a/dev-infra/commit-message/config.ts b/dev-infra/commit-message/config.ts
index 2d9739cecf368..613c59decbd85 100644
--- a/dev-infra/commit-message/config.ts
+++ b/dev-infra/commit-message/config.ts
@@ -8,11 +8,11 @@
 
 import {assertNoErrors, getConfig, NgDevConfig} from '../utils/config';
 
+/** Configuration for commit-message comands. */
 export interface CommitMessageConfig {
   maxLineLength: number;
   minBodyLength: number;
   minBodyLengthTypeExcludes?: string[];
-  types: string[];
   scopes: string[];
 }
 
@@ -30,3 +30,66 @@ export function getCommitMessageConfig() {
   assertNoErrors(errors);
   return config as Required<typeof config>;
 }
+
+/** Scope requirement level to be set for each commit type.  */
+export enum ScopeRequirement {
+  Required,
+  Optional,
+  Forbidden,
+}
+
+/** A commit type */
+export interface CommitType {
+  description: string;
+  name: string;
+  scope: ScopeRequirement;
+}
+
+/** The valid commit types for Angular commit messages. */
+export const COMMIT_TYPES: {[key: string]: CommitType} = {
+  build: {
+    name: 'build',
+    description: 'Changes to local repository build system and tooling',
+    scope: ScopeRequirement.Optional,
+  },
+  ci: {
+    name: 'ci',
+    description: 'Changes to CI configuration and CI specific tooling',
+    scope: ScopeRequirement.Forbidden,
+  },
+  docs: {
+    name: 'docs',
+    description: 'Changes which exclusively affects documentation.',
+    scope: ScopeRequirement.Optional,
+  },
+  feat: {
+    name: 'feat',
+    description: 'Creates a new feature',
+    scope: ScopeRequirement.Required,
+  },
+  fix: {
+    name: 'fix',
+    description: 'Fixes a previously discovered failure/bug',
+    scope: ScopeRequirement.Required,
+  },
+  perf: {
+    name: 'perf',
+    description: 'Improves performance without any change in functionality or API',
+    scope: ScopeRequirement.Required,
+  },
+  refactor: {
+    name: 'refactor',
+    description: 'Refactor without any change in functionality or API (includes style changes)',
+    scope: ScopeRequirement.Required,
+  },
+  release: {
+    name: 'release',
+    description: 'A release point in the repository',
+    scope: ScopeRequirement.Forbidden,
+  },
+  test: {
+    name: 'test',
+    description: 'Improvements or corrections made to the project\'s test suite',
+    scope: ScopeRequirement.Required,
+  },
+};
diff --git a/dev-infra/commit-message/parse.spec.ts b/dev-infra/commit-message/parse.spec.ts
new file mode 100644
index 0000000000000..22a79934a923e
--- /dev/null
+++ b/dev-infra/commit-message/parse.spec.ts
@@ -0,0 +1,105 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {parseCommitMessage, ParsedCommitMessage} from './parse';
+
+
+const commitValues = {
+  prefix: '',
+  type: 'fix',
+  scope: 'changed-area',
+  summary: 'This is a short summary of the change',
+  body: 'This is a longer description of the change Closes #1',
+};
+
+function buildCommitMessage(params = {}) {
+  const {prefix, type, scope, summary, body} = {...commitValues, ...params};
+  return `${prefix}${type}${scope ? '(' + scope + ')' : ''}: ${summary}\n\n${body}`;
+}
+
+
+describe('commit message parsing:', () => {
+  it('parses the scope', () => {
+    const message = buildCommitMessage();
+    expect(parseCommitMessage(message).scope).toBe(commitValues.scope);
+  });
+
+  it('parses the type', () => {
+    const message = buildCommitMessage();
+    expect(parseCommitMessage(message).type).toBe(commitValues.type);
+  });
+
+  it('parses the header', () => {
+    const message = buildCommitMessage();
+    expect(parseCommitMessage(message).header)
+        .toBe(`${commitValues.type}(${commitValues.scope}): ${commitValues.summary}`);
+  });
+
+  it('parses the body', () => {
+    const message = buildCommitMessage();
+    expect(parseCommitMessage(message).body).toBe(commitValues.body);
+  });
+
+  it('parses the body without Github linking', () => {
+    const body = 'This has linking\nCloses #1';
+    const message = buildCommitMessage({body});
+    expect(parseCommitMessage(message).bodyWithoutLinking).toBe('This has linking\n');
+  });
+
+  it('parses the subject', () => {
+    const message = buildCommitMessage();
+    expect(parseCommitMessage(message).subject).toBe(commitValues.summary);
+  });
+
+  it('identifies if a commit is a fixup', () => {
+    const message1 = buildCommitMessage();
+    expect(parseCommitMessage(message1).isFixup).toBe(false);
+
+    const message2 = buildCommitMessage({prefix: 'fixup! '});
+    expect(parseCommitMessage(message2).isFixup).toBe(true);
+  });
+
+  it('identifies if a commit is a revert', () => {
+    const message1 = buildCommitMessage();
+    expect(parseCommitMessage(message1).isRevert).toBe(false);
+
+    const message2 = buildCommitMessage({prefix: 'revert: '});
+    expect(parseCommitMessage(message2).isRevert).toBe(true);
+
+    const message3 = buildCommitMessage({prefix: 'revert '});
+    expect(parseCommitMessage(message3).isRevert).toBe(true);
+  });
+
+  it('identifies if a commit is a squash', () => {
+    const message1 = buildCommitMessage();
+    expect(parseCommitMessage(message1).isSquash).toBe(false);
+
+    const message2 = buildCommitMessage({prefix: 'squash! '});
+    expect(parseCommitMessage(message2).isSquash).toBe(true);
+  });
+
+  it('ignores comment lines', () => {
+    const message = buildCommitMessage({
+      prefix: '# This is a comment line before the header.\n' +
+          '## This is another comment line before the headers.\n',
+      body: '# This is a comment line befor the body.\n' +
+          'This is line 1 of the actual body.\n' +
+          '## This is another comment line inside the body.\n' +
+          'This is line 2 of the actual body (and it also contains a # but it not a comment).\n' +
+          '### This is yet another comment line after the body.\n',
+    });
+    const parsedMessage = parseCommitMessage(message);
+
+    expect(parsedMessage.header)
+        .toBe(`${commitValues.type}(${commitValues.scope}): ${commitValues.summary}`);
+    expect(parsedMessage.body)
+        .toBe(
+            'This is line 1 of the actual body.\n' +
+            'This is line 2 of the actual body (and it also contains a # but it not a comment).\n');
+  });
+});
diff --git a/dev-infra/commit-message/parse.ts b/dev-infra/commit-message/parse.ts
new file mode 100644
index 0000000000000..3ccd870620de7
--- /dev/null
+++ b/dev-infra/commit-message/parse.ts
@@ -0,0 +1,77 @@
+/**
+ * @license
+ * Copyright Google LLC 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
+ */
+
+/** A parsed commit message. */
+export interface ParsedCommitMessage {
+  header: string;
+  body: string;
+  bodyWithoutLinking: string;
+  type: string;
+  scope: string;
+  subject: string;
+  isFixup: boolean;
+  isSquash: boolean;
+  isRevert: boolean;
+}
+
+/** Regex determining if a commit is a fixup. */
+const FIXUP_PREFIX_RE = /^fixup! /i;
+/** Regex finding all github keyword links. */
+const GITHUB_LINKING_RE = /((closed?s?)|(fix(es)?(ed)?)|(resolved?s?))\s\#(\d+)/ig;
+/** Regex determining if a commit is a squash. */
+const SQUASH_PREFIX_RE = /^squash! /i;
+/** Regex determining if a commit is a revert. */
+const REVERT_PREFIX_RE = /^revert:? /i;
+/** Regex determining the scope of a commit if provided. */
+const TYPE_SCOPE_RE = /^(\w+)(?:\(([^)]+)\))?\:\s(.+)$/;
+/** Regex determining the entire header line of the commit. */
+const COMMIT_HEADER_RE = /^(.*)/i;
+/** Regex determining the body of the commit. */
+const COMMIT_BODY_RE = /^.*\n\n([\s\S]*)$/;
+
+/** Parse a full commit message into its composite parts. */
+export function parseCommitMessage(commitMsg: string): ParsedCommitMessage {
+  // Ignore comments (i.e. lines starting with `#`). Comments are automatically removed by git and
+  // should not be considered part of the final commit message.
+  commitMsg = commitMsg.split('\n').filter(line => !line.startsWith('#')).join('\n');
+
+  let header = '';
+  let body = '';
+  let bodyWithoutLinking = '';
+  let type = '';
+  let scope = '';
+  let subject = '';
+
+  if (COMMIT_HEADER_RE.test(commitMsg)) {
+    header = COMMIT_HEADER_RE.exec(commitMsg)![1]
+                 .replace(FIXUP_PREFIX_RE, '')
+                 .replace(SQUASH_PREFIX_RE, '');
+  }
+  if (COMMIT_BODY_RE.test(commitMsg)) {
+    body = COMMIT_BODY_RE.exec(commitMsg)![1];
+    bodyWithoutLinking = body.replace(GITHUB_LINKING_RE, '');
+  }
+
+  if (TYPE_SCOPE_RE.test(header)) {
+    const parsedCommitHeader = TYPE_SCOPE_RE.exec(header)!;
+    type = parsedCommitHeader[1];
+    scope = parsedCommitHeader[2];
+    subject = parsedCommitHeader[3];
+  }
+  return {
+    header,
+    body,
+    bodyWithoutLinking,
+    type,
+    scope,
+    subject,
+    isFixup: FIXUP_PREFIX_RE.test(commitMsg),
+    isSquash: SQUASH_PREFIX_RE.test(commitMsg),
+    isRevert: REVERT_PREFIX_RE.test(commitMsg),
+  };
+}
diff --git a/dev-infra/commit-message/restore-commit-message/cli.ts b/dev-infra/commit-message/restore-commit-message/cli.ts
new file mode 100644
index 0000000000000..828ca1adf90b5
--- /dev/null
+++ b/dev-infra/commit-message/restore-commit-message/cli.ts
@@ -0,0 +1,51 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Arguments, Argv, CommandModule} from 'yargs';
+
+import {CommitMsgSource} from '../commit-message-source';
+
+import {restoreCommitMessage} from './restore-commit-message';
+
+export interface RestoreCommitMessageOptions {
+  fileEnvVariable: string[];
+}
+
+/** Builds the command. */
+function builder(yargs: Argv) {
+  return yargs.option('file-env-variable' as 'fileEnvVariable', {
+    type: 'string',
+    array: true,
+    demandOption: true,
+    description: 'The key for the environment variable which holds the arguments for the\n' +
+        'prepare-commit-msg hook as described here:\n' +
+        'https://git-scm.com/docs/githooks#_prepare_commit_msg',
+    coerce: arg => {
+      const [file, source] = (process.env[arg] || '').split(' ');
+      if (!file) {
+        throw new Error(`Provided environment variable "${arg}" was not found.`);
+      }
+      return [file, source];
+    },
+  });
+}
+
+/** Handles the command. */
+async function handler({fileEnvVariable}: Arguments<RestoreCommitMessageOptions>) {
+  restoreCommitMessage(fileEnvVariable[0], fileEnvVariable[1] as CommitMsgSource);
+}
+
+/** yargs command module describing the command.  */
+export const RestoreCommitMessageModule: CommandModule<{}, RestoreCommitMessageOptions> = {
+  handler,
+  builder,
+  command: 'restore-commit-message-draft',
+  // Description: Restore a commit message draft if one has been saved from a failed commit attempt.
+  // No describe is defiend to hide the command from the --help.
+  describe: false,
+};
diff --git a/dev-infra/commit-message/restore-commit-message/restore-commit-message.ts b/dev-infra/commit-message/restore-commit-message/restore-commit-message.ts
new file mode 100644
index 0000000000000..8008728d0bca2
--- /dev/null
+++ b/dev-infra/commit-message/restore-commit-message/restore-commit-message.ts
@@ -0,0 +1,49 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {writeFileSync} from 'fs';
+
+import {debug, log} from '../../utils/console';
+
+import {loadCommitMessageDraft} from '../commit-message-draft';
+import {CommitMsgSource} from '../commit-message-source';
+
+/**
+ * Restore the commit message draft to the git to be used as the default commit message.
+ *
+ * The source provided may be one of the sources described in
+ *   https://git-scm.com/docs/githooks#_prepare_commit_msg
+ */
+export function restoreCommitMessage(filePath: string, source?: CommitMsgSource) {
+  if (!!source) {
+    log('Skipping commit message restoration attempt');
+    if (source === 'message') {
+      debug('A commit message was already provided via the command with a -m or -F flag');
+    }
+    if (source === 'template') {
+      debug('A commit message was already provided via the -t flag or config.template setting');
+    }
+    if (source === 'squash') {
+      debug('A commit message was already provided as a merge action or via .git/MERGE_MSG');
+    }
+    if (source === 'commit') {
+      debug('A commit message was already provided through a revision specified via --fixup, -c,');
+      debug('-C or --amend flag');
+    }
+    process.exit(0);
+  }
+  /** A draft of a commit message. */
+  const commitMessage = loadCommitMessageDraft(filePath);
+
+  // If the commit message draft has content, restore it into the provided filepath.
+  if (commitMessage) {
+    writeFileSync(filePath, commitMessage);
+  }
+  // Exit the process
+  process.exit(0);
+}
diff --git a/dev-infra/commit-message/validate-file.ts b/dev-infra/commit-message/validate-file.ts
deleted file mode 100644
index f4cd5ed8309be..0000000000000
--- a/dev-infra/commit-message/validate-file.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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 {readFileSync} from 'fs';
-import {resolve} from 'path';
-
-import {getRepoBaseDir} from '../utils/config';
-import {info} from '../utils/console';
-
-import {validateCommitMessage} from './validate';
-
-/** Validate commit message at the provided file path. */
-export function validateFile(filePath: string) {
-  const commitMessage = readFileSync(resolve(getRepoBaseDir(), filePath), 'utf8');
-  if (validateCommitMessage(commitMessage)) {
-    info('√  Valid commit message');
-    return;
-  }
-  // If the validation did not return true, exit as a failure.
-  process.exit(1);
-}
diff --git a/dev-infra/commit-message/validate-file/cli.ts b/dev-infra/commit-message/validate-file/cli.ts
new file mode 100644
index 0000000000000..602b3145cd5a5
--- /dev/null
+++ b/dev-infra/commit-message/validate-file/cli.ts
@@ -0,0 +1,62 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Arguments, Argv, CommandModule} from 'yargs';
+
+import {getUserConfig} from '../../utils/config';
+
+import {validateFile} from './validate-file';
+
+
+export interface ValidateFileOptions {
+  file?: string;
+  fileEnvVariable?: string;
+  error: boolean;
+}
+
+/** Builds the command. */
+function builder(yargs: Argv) {
+  return yargs
+      .option('file', {
+        type: 'string',
+        conflicts: ['file-env-variable'],
+        description: 'The path of the commit message file.',
+      })
+      .option('file-env-variable' as 'fileEnvVariable', {
+        type: 'string',
+        conflicts: ['file'],
+        description: 'The key of the environment variable for the path of the commit message file.',
+        coerce: (arg: string) => {
+          const file = process.env[arg];
+          if (!file) {
+            throw new Error(`Provided environment variable "${arg}" was not found.`);
+          }
+          return file;
+        },
+      })
+      .option('error', {
+        type: 'boolean',
+        description:
+            'Whether invalid commit messages should be treated as failures rather than a warning',
+        default: !!getUserConfig().commitMessage?.errorOnInvalidMessage || !!process.env['CI']
+      });
+}
+
+/** Handles the command. */
+async function handler({error, file, fileEnvVariable}: Arguments<ValidateFileOptions>) {
+  const filePath = file || fileEnvVariable || '.git/COMMIT_EDITMSG';
+  validateFile(filePath, error);
+}
+
+/** yargs command module describing the command.  */
+export const ValidateFileModule: CommandModule<{}, ValidateFileOptions> = {
+  handler,
+  builder,
+  command: 'pre-commit-validate',
+  describe: 'Validate the most recent commit message',
+};
diff --git a/dev-infra/commit-message/validate-file/validate-file.ts b/dev-infra/commit-message/validate-file/validate-file.ts
new file mode 100644
index 0000000000000..459fa52fa95f0
--- /dev/null
+++ b/dev-infra/commit-message/validate-file/validate-file.ts
@@ -0,0 +1,47 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {readFileSync} from 'fs';
+import {resolve} from 'path';
+
+import {getRepoBaseDir} from '../../utils/config';
+import {error, green, info, log, red, yellow} from '../../utils/console';
+
+import {deleteCommitMessageDraft, saveCommitMessageDraft} from '../commit-message-draft';
+import {printValidationErrors, validateCommitMessage} from '../validate';
+
+/** Validate commit message at the provided file path. */
+export function validateFile(filePath: string, isErrorMode: boolean) {
+  const commitMessage = readFileSync(resolve(getRepoBaseDir(), filePath), 'utf8');
+  const {valid, errors} = validateCommitMessage(commitMessage);
+  if (valid) {
+    info(`${green('√')}  Valid commit message`);
+    deleteCommitMessageDraft(filePath);
+    process.exitCode = 0;
+    return;
+  }
+
+  /** Function used to print to the console log. */
+  let printFn = isErrorMode ? error : log;
+
+  printFn(`${isErrorMode ? red('✘') : yellow('!')}  Invalid commit message`);
+  printValidationErrors(errors, printFn);
+  if (isErrorMode) {
+    printFn(red('Aborting commit attempt due to invalid commit message.'));
+    printFn(
+        red('Commit message aborted as failure rather than warning due to local configuration.'));
+  } else {
+    printFn(yellow('Before this commit can be merged into the upstream repository, it must be'));
+    printFn(yellow('amended to follow commit message guidelines.'));
+  }
+
+  // On all invalid commit messages, the commit message should be saved as a draft to be
+  // restored on the next commit attempt.
+  saveCommitMessageDraft(filePath, commitMessage);
+  // Set the correct exit code based on if invalid commit message is an error.
+  process.exitCode = isErrorMode ? 1 : 0;
+}
diff --git a/dev-infra/commit-message/validate-range/cli.ts b/dev-infra/commit-message/validate-range/cli.ts
new file mode 100644
index 0000000000000..6eea3ff95ea02
--- /dev/null
+++ b/dev-infra/commit-message/validate-range/cli.ts
@@ -0,0 +1,50 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Arguments, Argv, CommandModule} from 'yargs';
+
+import {info} from '../../utils/console';
+
+import {validateCommitRange} from './validate-range';
+
+
+export interface ValidateRangeOptions {
+  range: string;
+}
+
+/** Builds the command. */
+function builder(yargs: Argv) {
+  return yargs.option('range', {
+    description: 'The range of commits to check, e.g. --range abc123..xyz456',
+    demandOption: '  A range must be provided, e.g. --range abc123..xyz456',
+    type: 'string',
+    requiresArg: true,
+  });
+}
+
+/** Handles the command. */
+async function handler({range}: Arguments<ValidateRangeOptions>) {
+  // If on CI, and no pull request number is provided, assume the branch
+  // being run on is an upstream branch.
+  if (process.env['CI'] && process.env['CI_PULL_REQUEST'] === 'false') {
+    info(`Since valid commit messages are enforced by PR linting on CI, we do not`);
+    info(`need to validate commit messages on CI runs on upstream branches.`);
+    info();
+    info(`Skipping check of provided commit range`);
+    return;
+  }
+  validateCommitRange(range);
+}
+
+/** yargs command module describing the command.  */
+export const ValidateRangeModule: CommandModule<{}, ValidateRangeOptions> = {
+  handler,
+  builder,
+  command: 'validate-range',
+  describe: 'Validate a range of commit messages',
+};
diff --git a/dev-infra/commit-message/validate-range.ts b/dev-infra/commit-message/validate-range/validate-range.ts
similarity index 63%
rename from dev-infra/commit-message/validate-range.ts
rename to dev-infra/commit-message/validate-range/validate-range.ts
index 485fa06b2f57a..3c3825775f029 100644
--- a/dev-infra/commit-message/validate-range.ts
+++ b/dev-infra/commit-message/validate-range/validate-range.ts
@@ -5,10 +5,11 @@
  * 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 {info} from '../utils/console';
-import {exec} from '../utils/shelljs';
+import {error, info} from '../../utils/console';
+import {exec} from '../../utils/shelljs';
 
-import {parseCommitMessage, validateCommitMessage, ValidateCommitMessageOptions} from './validate';
+import {parseCommitMessage} from '../parse';
+import {printValidationErrors, validateCommitMessage, ValidateCommitMessageOptions} from '../validate';
 
 // Whether the provided commit is a fixup commit.
 const isNonFixup = (m: string) => !parseCommitMessage(m).isFixup;
@@ -18,11 +19,20 @@ const extractCommitHeader = (m: string) => parseCommitMessage(m).header;
 
 /** Validate all commits in a provided git commit range. */
 export function validateCommitRange(range: string) {
-  // A random value is used as a string to allow for a definite split point in the git log result.
+  /**
+   * A random value is used as a string to allow for a definite split point in the git log result.
+   */
   const randomValueSeparator = `${Math.random()}`;
-  // Custom git log format that provides the commit header and body, separated as expected with
-  // the custom separator as the trailing value.
+  /**
+   * Custom git log format that provides the commit header and body, separated as expected with the
+   * custom separator as the trailing value.
+   */
   const gitLogFormat = `%s%n%n%b${randomValueSeparator}`;
+  /**
+   * A list of tuples containing a commit header string and the list of error messages for the
+   * commit.
+   */
+  const errors: [commitHeader: string, errors: string[]][] = [];
 
   // Retrieve the commits in the provided range.
   const result = exec(`git log --reverse --format=${gitLogFormat} ${range}`);
@@ -44,12 +54,22 @@ export function validateCommitRange(range: string) {
           undefined :
           commits.slice(0, i).filter(isNonFixup).map(extractCommitHeader)
     };
-    return validateCommitMessage(m, options);
+    const {valid, errors: localErrors, commit} = validateCommitMessage(m, options);
+    if (localErrors.length) {
+      errors.push([commit.header, localErrors]);
+    }
+    return valid;
   });
 
   if (allCommitsInRangeValid) {
     info('√  All commit messages in range valid.');
   } else {
+    error('✘  Invalid commit message');
+    errors.forEach(([header, validationErrors]) => {
+      error.group(header);
+      printValidationErrors(validationErrors);
+      error.groupEnd();
+    });
     // Exit with a non-zero exit code if invalid commit messages have
     // been discovered.
     process.exit(1);
diff --git a/dev-infra/commit-message/validate.spec.ts b/dev-infra/commit-message/validate.spec.ts
index edc0bab802d57..24fb996698c26 100644
--- a/dev-infra/commit-message/validate.spec.ts
+++ b/dev-infra/commit-message/validate.spec.ts
@@ -8,7 +8,7 @@
 
 // Imports
 import * as validateConfig from './config';
-import {validateCommitMessage} from './validate';
+import {validateCommitMessage, ValidateCommitMessageResult} from './validate';
 
 type CommitMessageConfig = validateConfig.CommitMessageConfig;
 
@@ -18,13 +18,6 @@ const config: {commitMessage: CommitMessageConfig} = {
   commitMessage: {
     maxLineLength: 120,
     minBodyLength: 0,
-    types: [
-      'feat',
-      'fix',
-      'refactor',
-      'release',
-      'style',
-    ],
     scopes: [
       'common',
       'compiler',
@@ -33,48 +26,40 @@ const config: {commitMessage: CommitMessageConfig} = {
     ]
   }
 };
-const TYPES = config.commitMessage.types.join(', ');
+const TYPES = Object.keys(validateConfig.COMMIT_TYPES).join(', ');
 const SCOPES = config.commitMessage.scopes.join(', ');
 const INVALID = false;
 const VALID = true;
 
+function expectValidationResult(
+    validationResult: ValidateCommitMessageResult, valid: boolean, errors: string[] = []) {
+  expect(validationResult).toEqual(jasmine.objectContaining({valid, errors}));
+}
+
 // TODO(josephperrott): Clean up tests to test script rather than for
 // specific commit messages we want to use.
 describe('validate-commit-message.js', () => {
-  let lastError: string = '';
-
   beforeEach(() => {
-    lastError = '';
-
-    spyOn(console, 'error').and.callFake((msg: string) => lastError = msg);
-    spyOn(validateConfig, 'getCommitMessageConfig').and.returnValue(config);
+    spyOn(validateConfig, 'getCommitMessageConfig')
+        .and.returnValue(config as ReturnType<typeof validateConfig.getCommitMessageConfig>);
   });
 
   describe('validateMessage()', () => {
     it('should be valid', () => {
-      expect(validateCommitMessage('feat(packaging): something')).toBe(VALID);
-      expect(lastError).toBe('');
-
-      expect(validateCommitMessage('release(packaging): something')).toBe(VALID);
-      expect(lastError).toBe('');
-
-      expect(validateCommitMessage('fixup! release(packaging): something')).toBe(VALID);
-      expect(lastError).toBe('');
-
-      expect(validateCommitMessage('squash! release(packaging): something')).toBe(VALID);
-      expect(lastError).toBe('');
-
-      expect(validateCommitMessage('Revert: "release(packaging): something"')).toBe(VALID);
-      expect(lastError).toBe('');
+      expectValidationResult(validateCommitMessage('feat(packaging): something'), VALID);
+      expectValidationResult(validateCommitMessage('fix(packaging): something'), VALID);
+      expectValidationResult(validateCommitMessage('fixup! fix(packaging): something'), VALID);
+      expectValidationResult(validateCommitMessage('squash! fix(packaging): something'), VALID);
+      expectValidationResult(validateCommitMessage('Revert: "fix(packaging): something"'), VALID);
     });
 
     it('should validate max length', () => {
       const msg =
           'fix(compiler): something super mega extra giga tera long, maybe even longer and longer and longer and longer and longer and longer...';
 
-      expect(validateCommitMessage(msg)).toBe(INVALID);
-      expect(lastError).toContain(`The commit message header is longer than ${
-          config.commitMessage.maxLineLength} characters`);
+      expectValidationResult(validateCommitMessage(msg), INVALID, [
+        `The commit message header is longer than ${config.commitMessage.maxLineLength} characters`
+      ]);
     });
 
     it('should skip max length limit for URLs', () => {
@@ -83,49 +68,56 @@ describe('validate-commit-message.js', () => {
           'limit. For more details see the following super long URL:\n\n' +
           'https://github.com/angular/components/commit/e2ace018ddfad10608e0e32932c43dcfef4095d7#diff-9879d6db96fd29134fc802214163b95a';
 
-      expect(validateCommitMessage(msg)).toBe(VALID);
+      expectValidationResult(validateCommitMessage(msg), VALID);
     });
 
     it('should validate "<type>(<scope>): <subject>" format', () => {
       const msg = 'not correct format';
 
-      expect(validateCommitMessage(msg)).toBe(INVALID);
-      expect(lastError).toContain(`The commit message header does not match the expected format.`);
+      expectValidationResult(
+          validateCommitMessage(msg), INVALID,
+          [`The commit message header does not match the expected format.`]);
     });
 
     it('should fail when type is invalid', () => {
       const msg = 'weird(core): something';
 
-      expect(validateCommitMessage(msg)).toBe(INVALID);
-      expect(lastError).toContain(`'weird' is not an allowed type.\n => TYPES: ${TYPES}`);
+      expectValidationResult(
+          validateCommitMessage(msg), INVALID,
+          [`'weird' is not an allowed type.\n => TYPES: ${TYPES}`]);
     });
 
     it('should fail when scope is invalid', () => {
       const errorMessageFor = (scope: string, header: string) =>
           `'${scope}' is not an allowed scope.\n => SCOPES: ${SCOPES}`;
 
-      expect(validateCommitMessage('fix(Compiler): something')).toBe(INVALID);
-      expect(lastError).toContain(errorMessageFor('Compiler', 'fix(Compiler): something'));
+      expectValidationResult(
+          validateCommitMessage('fix(Compiler): something'), INVALID,
+          [errorMessageFor('Compiler', 'fix(Compiler): something')]);
 
-      expect(validateCommitMessage('feat(bah): something')).toBe(INVALID);
-      expect(lastError).toContain(errorMessageFor('bah', 'feat(bah): something'));
+      expectValidationResult(
+          validateCommitMessage('feat(bah): something'), INVALID,
+          [errorMessageFor('bah', 'feat(bah): something')]);
 
-      expect(validateCommitMessage('style(webworker): something')).toBe(INVALID);
-      expect(lastError).toContain(errorMessageFor('webworker', 'style(webworker): something'));
+      expectValidationResult(
+          validateCommitMessage('fix(webworker): something'), INVALID,
+          [errorMessageFor('webworker', 'fix(webworker): something')]);
 
-      expect(validateCommitMessage('refactor(security): something')).toBe(INVALID);
-      expect(lastError).toContain(errorMessageFor('security', 'refactor(security): something'));
+      expectValidationResult(
+          validateCommitMessage('refactor(security): something'), INVALID,
+          [errorMessageFor('security', 'refactor(security): something')]);
 
-      expect(validateCommitMessage('refactor(docs): something')).toBe(INVALID);
-      expect(lastError).toContain(errorMessageFor('docs', 'refactor(docs): something'));
+      expectValidationResult(
+          validateCommitMessage('refactor(docs): something'), INVALID,
+          [errorMessageFor('docs', 'refactor(docs): something')]);
 
-      expect(validateCommitMessage('release(angular): something')).toBe(INVALID);
-      expect(lastError).toContain(errorMessageFor('angular', 'release(angular): something'));
+      expectValidationResult(
+          validateCommitMessage('feat(angular): something'), INVALID,
+          [errorMessageFor('angular', 'feat(angular): something')]);
     });
 
     it('should allow empty scope', () => {
-      expect(validateCommitMessage('fix: blablabla')).toBe(VALID);
-      expect(lastError).toBe('');
+      expectValidationResult(validateCommitMessage('build: blablabla'), VALID);
     });
 
     // We do not want to allow WIP. It is OK to fail the PR build in this case to show that there is
@@ -133,30 +125,25 @@ describe('validate-commit-message.js', () => {
     it('should not allow "WIP: ..." syntax', () => {
       const msg = 'WIP: fix: something';
 
-      expect(validateCommitMessage(msg)).toBe(INVALID);
-      expect(lastError).toContain(`'WIP' is not an allowed type.\n => TYPES: ${TYPES}`);
+      expectValidationResult(
+          validateCommitMessage(msg), INVALID,
+          [`'WIP' is not an allowed type.\n => TYPES: ${TYPES}`]);
     });
 
     describe('(revert)', () => {
       it('should allow valid "revert: ..." syntaxes', () => {
-        expect(validateCommitMessage('revert: anything')).toBe(VALID);
-        expect(lastError).toBe('');
-
-        expect(validateCommitMessage('Revert: "anything"')).toBe(VALID);
-        expect(lastError).toBe('');
-
-        expect(validateCommitMessage('revert anything')).toBe(VALID);
-        expect(lastError).toBe('');
-
-        expect(validateCommitMessage('rEvErT anything')).toBe(VALID);
-        expect(lastError).toBe('');
+        expectValidationResult(validateCommitMessage('revert: anything'), VALID);
+        expectValidationResult(validateCommitMessage('Revert: "anything"'), VALID);
+        expectValidationResult(validateCommitMessage('revert anything'), VALID);
+        expectValidationResult(validateCommitMessage('rEvErT anything'), VALID);
       });
 
       it('should not allow "revert(scope): ..." syntax', () => {
         const msg = 'revert(compiler): reduce generated code payload size by 65%';
 
-        expect(validateCommitMessage(msg)).toBe(INVALID);
-        expect(lastError).toContain(`'revert' is not an allowed type.\n => TYPES: ${TYPES}`);
+        expectValidationResult(
+            validateCommitMessage(msg), INVALID,
+            [`'revert' is not an allowed type.\n => TYPES: ${TYPES}`]);
       });
 
       // https://github.com/angular/angular/issues/23479
@@ -164,28 +151,26 @@ describe('validate-commit-message.js', () => {
         const msg =
             'Revert "fix(compiler): Pretty print object instead of [Object object] (#22689)" (#23442)';
 
-        expect(validateCommitMessage(msg)).toBe(VALID);
-        expect(lastError).toBe('');
+        expectValidationResult(validateCommitMessage(msg), VALID);
       });
     });
 
     describe('(squash)', () => {
       describe('without `disallowSquash`', () => {
         it('should return commits as valid', () => {
-          expect(validateCommitMessage('squash! feat(core): add feature')).toBe(VALID);
-          expect(validateCommitMessage('squash! fix: a bug')).toBe(VALID);
-          expect(validateCommitMessage('squash! fix a typo')).toBe(VALID);
+          expectValidationResult(validateCommitMessage('squash! feat(core): add feature'), VALID);
+          expectValidationResult(validateCommitMessage('squash! fix: a bug'), VALID);
+          expectValidationResult(validateCommitMessage('squash! fix a typo'), VALID);
         });
       });
 
       describe('with `disallowSquash`', () => {
         it('should fail', () => {
-          expect(validateCommitMessage('fix(core): something', {disallowSquash: true})).toBe(VALID);
-          expect(validateCommitMessage('squash! fix(core): something', {
-            disallowSquash: true
-          })).toBe(INVALID);
-          expect(lastError).toContain(
-              'The commit must be manually squashed into the target commit');
+          expectValidationResult(
+              validateCommitMessage('fix(core): something', {disallowSquash: true}), VALID);
+          expectValidationResult(
+              validateCommitMessage('squash! fix(core): something', {disallowSquash: true}),
+              INVALID, ['The commit must be manually squashed into the target commit']);
         });
       });
     });
@@ -193,9 +178,9 @@ describe('validate-commit-message.js', () => {
     describe('(fixup)', () => {
       describe('without `nonFixupCommitHeaders`', () => {
         it('should return commits as valid', () => {
-          expect(validateCommitMessage('fixup! feat(core): add feature')).toBe(VALID);
-          expect(validateCommitMessage('fixup! fix: a bug')).toBe(VALID);
-          expect(validateCommitMessage('fixup! fixup! fix: a bug')).toBe(VALID);
+          expectValidationResult(validateCommitMessage('fixup! feat(core): add feature'), VALID);
+          expectValidationResult(validateCommitMessage('fixup! fix: a bug'), VALID);
+          expectValidationResult(validateCommitMessage('fixup! fixup! fix: a bug'), VALID);
         });
       });
 
@@ -203,36 +188,39 @@ describe('validate-commit-message.js', () => {
         it('should check that the fixup commit matches a non-fixup one', () => {
           const msg = 'fixup! foo';
 
-          expect(validateCommitMessage(
-                     msg, {disallowSquash: false, nonFixupCommitHeaders: ['foo', 'bar', 'baz']}))
-              .toBe(VALID);
-          expect(validateCommitMessage(
-                     msg, {disallowSquash: false, nonFixupCommitHeaders: ['bar', 'baz', 'foo']}))
-              .toBe(VALID);
-          expect(validateCommitMessage(
-                     msg, {disallowSquash: false, nonFixupCommitHeaders: ['baz', 'foo', 'bar']}))
-              .toBe(VALID);
-
-          expect(validateCommitMessage(
-                     msg, {disallowSquash: false, nonFixupCommitHeaders: ['qux', 'quux', 'quuux']}))
-              .toBe(INVALID);
-          expect(lastError).toContain(
-              'Unable to find match for fixup commit among prior commits: \n' +
-              '      qux\n' +
-              '      quux\n' +
-              '      quuux');
+          expectValidationResult(
+              validateCommitMessage(
+                  msg, {disallowSquash: false, nonFixupCommitHeaders: ['foo', 'bar', 'baz']}),
+              VALID);
+          expectValidationResult(
+              validateCommitMessage(
+                  msg, {disallowSquash: false, nonFixupCommitHeaders: ['bar', 'baz', 'foo']}),
+              VALID);
+          expectValidationResult(
+              validateCommitMessage(
+                  msg, {disallowSquash: false, nonFixupCommitHeaders: ['baz', 'foo', 'bar']}),
+              VALID);
+
+          expectValidationResult(
+              validateCommitMessage(
+                  msg, {disallowSquash: false, nonFixupCommitHeaders: ['qux', 'quux', 'quuux']}),
+              INVALID,
+              ['Unable to find match for fixup commit among prior commits: \n' +
+               '      qux\n' +
+               '      quux\n' +
+               '      quuux']);
         });
 
         it('should fail if `nonFixupCommitHeaders` is empty', () => {
-          expect(validateCommitMessage('refactor(core): make reactive', {
-            disallowSquash: false,
-            nonFixupCommitHeaders: []
-          })).toBe(VALID);
-          expect(validateCommitMessage(
-                     'fixup! foo', {disallowSquash: false, nonFixupCommitHeaders: []}))
-              .toBe(INVALID);
-          expect(lastError).toContain(
-              `Unable to find match for fixup commit among prior commits: -`);
+          expectValidationResult(
+              validateCommitMessage(
+                  'refactor(core): make reactive',
+                  {disallowSquash: false, nonFixupCommitHeaders: []}),
+              VALID);
+          expectValidationResult(
+              validateCommitMessage(
+                  'fixup! foo', {disallowSquash: false, nonFixupCommitHeaders: []}),
+              INVALID, [`Unable to find match for fixup commit among prior commits: -`]);
         });
       });
     });
@@ -243,7 +231,6 @@ describe('validate-commit-message.js', () => {
           maxLineLength: 120,
           minBodyLength: 30,
           minBodyLengthTypeExcludes: ['docs'],
-          types: ['fix', 'docs'],
           scopes: ['core']
         }
       };
@@ -253,24 +240,27 @@ describe('validate-commit-message.js', () => {
       });
 
       it('should fail validation if the body is shorter than `minBodyLength`', () => {
-        expect(validateCommitMessage(
-                   'fix(core): something\n\n Explanation of the motivation behind this change'))
-            .toBe(VALID);
-        expect(validateCommitMessage('fix(core): something\n\n too short')).toBe(INVALID);
-        expect(lastError).toContain(
-            'The commit message body does not meet the minimum length of 30 characters');
-        expect(validateCommitMessage('fix(core): something')).toBe(INVALID);
-        expect(lastError).toContain(
-            'The commit message body does not meet the minimum length of 30 characters');
+        expectValidationResult(
+            validateCommitMessage(
+                'fix(core): something\n\n Explanation of the motivation behind this change'),
+            VALID);
+        expectValidationResult(
+            validateCommitMessage('fix(core): something\n\n too short'), INVALID,
+            ['The commit message body does not meet the minimum length of 30 characters']);
+        expectValidationResult(validateCommitMessage('fix(core): something'), INVALID, [
+
+          'The commit message body does not meet the minimum length of 30 characters'
+        ]);
       });
 
       it('should pass validation if the body is shorter than `minBodyLength` but the commit type is in the `minBodyLengthTypeExclusions` list',
          () => {
-           expect(validateCommitMessage('docs: just fixing a typo')).toBe(VALID);
-           expect(validateCommitMessage('docs(core): just fixing a typo')).toBe(VALID);
-           expect(validateCommitMessage(
-                      'docs(core): just fixing a typo\n\nThis was just a silly typo.'))
-               .toBe(VALID);
+           expectValidationResult(validateCommitMessage('docs: just fixing a typo'), VALID);
+           expectValidationResult(validateCommitMessage('docs(core): just fixing a typo'), VALID);
+           expectValidationResult(
+               validateCommitMessage(
+                   'docs(core): just fixing a typo\n\nThis was just a silly typo.'),
+               VALID);
          });
     });
   });
diff --git a/dev-infra/commit-message/validate.ts b/dev-infra/commit-message/validate.ts
index 7108a63cac221..e66679b2b983e 100644
--- a/dev-infra/commit-message/validate.ts
+++ b/dev-infra/commit-message/validate.ts
@@ -7,7 +7,8 @@
  */
 import {error} from '../utils/console';
 
-import {getCommitMessageConfig} from './config';
+import {COMMIT_TYPES, getCommitMessageConfig, ScopeRequirement} from './config';
+import {parseCommitMessage, ParsedCommitMessage} from './parse';
 
 /** Options for commit message validation. */
 export interface ValidateCommitMessageOptions {
@@ -15,159 +16,147 @@ export interface ValidateCommitMessageOptions {
   nonFixupCommitHeaders?: string[];
 }
 
-const FIXUP_PREFIX_RE = /^fixup! /i;
-const GITHUB_LINKING_RE = /((closed?s?)|(fix(es)?(ed)?)|(resolved?s?))\s\#(\d+)/ig;
-const SQUASH_PREFIX_RE = /^squash! /i;
-const REVERT_PREFIX_RE = /^revert:? /i;
-const TYPE_SCOPE_RE = /^(\w+)(?:\(([^)]+)\))?\:\s(.+)$/;
-const COMMIT_HEADER_RE = /^(.*)/i;
-const COMMIT_BODY_RE = /^.*\n\n([\s\S]*)$/;
-const COMMIT_BODY_URL_LINE_RE = /^https?:\/\/.*$/;
-
-/** Parse a full commit message into its composite parts. */
-export function parseCommitMessage(commitMsg: string) {
-  let header = '';
-  let body = '';
-  let bodyWithoutLinking = '';
-  let type = '';
-  let scope = '';
-  let subject = '';
-
-  if (COMMIT_HEADER_RE.test(commitMsg)) {
-    header = COMMIT_HEADER_RE.exec(commitMsg)![1]
-                 .replace(FIXUP_PREFIX_RE, '')
-                 .replace(SQUASH_PREFIX_RE, '');
-  }
-  if (COMMIT_BODY_RE.test(commitMsg)) {
-    body = COMMIT_BODY_RE.exec(commitMsg)![1];
-    bodyWithoutLinking = body.replace(GITHUB_LINKING_RE, '');
-  }
-
-  if (TYPE_SCOPE_RE.test(header)) {
-    const parsedCommitHeader = TYPE_SCOPE_RE.exec(header)!;
-    type = parsedCommitHeader[1];
-    scope = parsedCommitHeader[2];
-    subject = parsedCommitHeader[3];
-  }
-  return {
-    header,
-    body,
-    bodyWithoutLinking,
-    type,
-    scope,
-    subject,
-    isFixup: FIXUP_PREFIX_RE.test(commitMsg),
-    isSquash: SQUASH_PREFIX_RE.test(commitMsg),
-    isRevert: REVERT_PREFIX_RE.test(commitMsg),
-  };
+/** The result of a commit message validation check. */
+export interface ValidateCommitMessageResult {
+  valid: boolean;
+  errors: string[];
+  commit: ParsedCommitMessage;
 }
 
+/** Regex matching a URL for an entire commit body line. */
+const COMMIT_BODY_URL_LINE_RE = /^https?:\/\/.*$/;
+
 /** Validate a commit message against using the local repo's config. */
 export function validateCommitMessage(
-    commitMsg: string, options: ValidateCommitMessageOptions = {}) {
-  function printError(errorMessage: string) {
-    error(
-        `INVALID COMMIT MSG: \n` +
-        `${'─'.repeat(40)}\n` +
-        `${commitMsg}\n` +
-        `${'─'.repeat(40)}\n` +
-        `ERROR: \n` +
-        `  ${errorMessage}` +
-        `\n\n` +
-        `The expected format for a commit is: \n` +
-        `<type>(<scope>): <subject>\n\n<body>`);
-  }
-
+    commitMsg: string, options: ValidateCommitMessageOptions = {}): ValidateCommitMessageResult {
   const config = getCommitMessageConfig().commitMessage;
   const commit = parseCommitMessage(commitMsg);
+  const errors: string[] = [];
 
-  ////////////////////////////////////
-  // Checking revert, squash, fixup //
-  ////////////////////////////////////
+  /** Perform the validation checks against the parsed commit. */
+  function validateCommitAndCollectErrors() {
+    // TODO(josephperrott): Remove early return calls when commit message errors are found
 
-  // All revert commits are considered valid.
-  if (commit.isRevert) {
-    return true;
-  }
+    ////////////////////////////////////
+    // Checking revert, squash, fixup //
+    ////////////////////////////////////
 
-  // All squashes are considered valid, as the commit will be squashed into another in
-  // the git history anyway, unless the options provided to not allow squash commits.
-  if (commit.isSquash) {
-    if (options.disallowSquash) {
-      printError('The commit must be manually squashed into the target commit');
+    // All revert commits are considered valid.
+    if (commit.isRevert) {
+      return true;
+    }
+
+    // All squashes are considered valid, as the commit will be squashed into another in
+    // the git history anyway, unless the options provided to not allow squash commits.
+    if (commit.isSquash) {
+      if (options.disallowSquash) {
+        errors.push('The commit must be manually squashed into the target commit');
+        return false;
+      }
+      return true;
+    }
+
+    // Fixups commits are considered valid, unless nonFixupCommitHeaders are provided to check
+    // against. If `nonFixupCommitHeaders` is not empty, we check whether there is a corresponding
+    // non-fixup commit (i.e. a commit whose header is identical to this commit's header after
+    // stripping the `fixup! ` prefix), otherwise we assume this verification will happen in another
+    // check.
+    if (commit.isFixup) {
+      if (options.nonFixupCommitHeaders && !options.nonFixupCommitHeaders.includes(commit.header)) {
+        errors.push(
+            'Unable to find match for fixup commit among prior commits: ' +
+            (options.nonFixupCommitHeaders.map(x => `\n      ${x}`).join('') || '-'));
+        return false;
+      }
+
+      return true;
+    }
+
+    ////////////////////////////
+    // Checking commit header //
+    ////////////////////////////
+    if (commit.header.length > config.maxLineLength) {
+      errors.push(`The commit message header is longer than ${config.maxLineLength} characters`);
       return false;
     }
-    return true;
-  }
 
-  // Fixups commits are considered valid, unless nonFixupCommitHeaders are provided to check
-  // against. If `nonFixupCommitHeaders` is not empty, we check whether there is a corresponding
-  // non-fixup commit (i.e. a commit whose header is identical to this commit's header after
-  // stripping the `fixup! ` prefix), otherwise we assume this verification will happen in another
-  // check.
-  if (commit.isFixup) {
-    if (options.nonFixupCommitHeaders && !options.nonFixupCommitHeaders.includes(commit.header)) {
-      printError(
-          'Unable to find match for fixup commit among prior commits: ' +
-          (options.nonFixupCommitHeaders.map(x => `\n      ${x}`).join('') || '-'));
+    if (!commit.type) {
+      errors.push(`The commit message header does not match the expected format.`);
       return false;
     }
 
-    return true;
-  }
+    if (COMMIT_TYPES[commit.type] === undefined) {
+      errors.push(`'${commit.type}' is not an allowed type.\n => TYPES: ${
+          Object.keys(COMMIT_TYPES).join(', ')}`);
+      return false;
+    }
 
-  ////////////////////////////
-  // Checking commit header //
-  ////////////////////////////
-  if (commit.header.length > config.maxLineLength) {
-    printError(`The commit message header is longer than ${config.maxLineLength} characters`);
-    return false;
-  }
+    /** The scope requirement level for the provided type of the commit message. */
+    const scopeRequirementForType = COMMIT_TYPES[commit.type].scope;
 
-  if (!commit.type) {
-    printError(`The commit message header does not match the expected format.`);
-    return false;
-  }
+    if (scopeRequirementForType === ScopeRequirement.Forbidden && commit.scope) {
+      errors.push(`Scopes are forbidden for commits with type '${commit.type}', but a scope of '${
+          commit.scope}' was provided.`);
+      return false;
+    }
 
-  if (!config.types.includes(commit.type)) {
-    printError(`'${commit.type}' is not an allowed type.\n => TYPES: ${config.types.join(', ')}`);
-    return false;
-  }
+    if (scopeRequirementForType === ScopeRequirement.Required && !commit.scope) {
+      errors.push(
+          `Scopes are required for commits with type '${commit.type}', but no scope was provided.`);
+      return false;
+    }
 
-  if (commit.scope && !config.scopes.includes(commit.scope)) {
-    printError(
-        `'${commit.scope}' is not an allowed scope.\n => SCOPES: ${config.scopes.join(', ')}`);
-    return false;
-  }
+    if (commit.scope && !config.scopes.includes(commit.scope)) {
+      errors.push(
+          `'${commit.scope}' is not an allowed scope.\n => SCOPES: ${config.scopes.join(', ')}`);
+      return false;
+    }
 
-  // Commits with the type of `release` do not require a commit body.
-  if (commit.type === 'release') {
-    return true;
-  }
+    // Commits with the type of `release` do not require a commit body.
+    if (commit.type === 'release') {
+      return true;
+    }
 
-  //////////////////////////
-  // Checking commit body //
-  //////////////////////////
+    //////////////////////////
+    // Checking commit body //
+    //////////////////////////
 
-  if (!config.minBodyLengthTypeExcludes?.includes(commit.type) &&
-      commit.bodyWithoutLinking.trim().length < config.minBodyLength) {
-    printError(`The commit message body does not meet the minimum length of ${
-        config.minBodyLength} characters`);
-    return false;
-  }
+    if (!config.minBodyLengthTypeExcludes?.includes(commit.type) &&
+        commit.bodyWithoutLinking.trim().length < config.minBodyLength) {
+      errors.push(`The commit message body does not meet the minimum length of ${
+          config.minBodyLength} characters`);
+      return false;
+    }
+
+    const bodyByLine = commit.body.split('\n');
+    const lineExceedsMaxLength = bodyByLine.some(line => {
+      // Check if any line exceeds the max line length limit. The limit is ignored for
+      // lines that just contain an URL (as these usually cannot be wrapped or shortened).
+      return line.length > config.maxLineLength && !COMMIT_BODY_URL_LINE_RE.test(line);
+    });
+
+    if (lineExceedsMaxLength) {
+      errors.push(
+          `The commit message body contains lines greater than ${config.maxLineLength} characters`);
+      return false;
+    }
 
-  const bodyByLine = commit.body.split('\n');
-  const lineExceedsMaxLength = bodyByLine.some(line => {
-    // Check if any line exceeds the max line length limit. The limit is ignored for
-    // lines that just contain an URL (as these usually cannot be wrapped or shortened).
-    return line.length > config.maxLineLength && !COMMIT_BODY_URL_LINE_RE.test(line);
-  });
-
-  if (lineExceedsMaxLength) {
-    printError(
-        `The commit message body contains lines greater than ${config.maxLineLength} characters`);
-    return false;
+    return true;
   }
 
-  return true;
+  return {valid: validateCommitAndCollectErrors(), errors, commit};
+}
+
+
+/** Print the error messages from the commit message validation to the console. */
+export function printValidationErrors(errors: string[], print = error) {
+  print.group(`Error${errors.length === 1 ? '' : 's'}:`);
+  errors.forEach(line => print(line));
+  print.groupEnd();
+  print();
+  print('The expected format for a commit is: ');
+  print('<type>(<scope>): <summary>');
+  print();
+  print('<body>');
+  print();
 }
diff --git a/dev-infra/commit-message/wizard/cli.ts b/dev-infra/commit-message/wizard/cli.ts
new file mode 100644
index 0000000000000..b4cc94cfa69f4
--- /dev/null
+++ b/dev-infra/commit-message/wizard/cli.ts
@@ -0,0 +1,54 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Arguments, Argv, CommandModule} from 'yargs';
+
+import {CommitMsgSource} from '../commit-message-source';
+
+import {runWizard} from './wizard';
+
+
+export interface WizardOptions {
+  filePath: string;
+  commitSha: string|undefined;
+  source: CommitMsgSource|undefined;
+}
+
+/** Builds the command. */
+function builder(yargs: Argv) {
+  return yargs
+      .positional('filePath', {
+        description: 'The file path to write the generated commit message into',
+        type: 'string',
+        demandOption: true,
+      })
+      .positional('source', {
+        choices: ['message', 'template', 'merge', 'squash', 'commit'] as const,
+        description: 'The source of the commit message as described here: ' +
+            'https://git-scm.com/docs/githooks#_prepare_commit_msg'
+      })
+      .positional('commitSha', {
+        description: 'The commit sha if source is set to `commit`',
+        type: 'string',
+      });
+}
+
+/** Handles the command. */
+async function handler(args: Arguments<WizardOptions>) {
+  await runWizard(args);
+}
+
+/** yargs command module describing the command.  */
+export const WizardModule: CommandModule<{}, WizardOptions> = {
+  handler,
+  builder,
+  command: 'wizard <filePath> [source] [commitSha]',
+  // Description: Run the wizard to build a base commit message before opening to complete.
+  // No describe is defiend to hide the command from the --help.
+  describe: false,
+};
diff --git a/dev-infra/commit-message/wizard/wizard.ts b/dev-infra/commit-message/wizard/wizard.ts
new file mode 100644
index 0000000000000..40623fed10250
--- /dev/null
+++ b/dev-infra/commit-message/wizard/wizard.ts
@@ -0,0 +1,45 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {writeFileSync} from 'fs';
+
+import {getUserConfig} from '../../utils/config';
+import {debug, info} from '../../utils/console';
+
+import {buildCommitMessage} from '../builder';
+import {CommitMsgSource} from '../commit-message-source';
+
+
+/** The default commit message used if the wizard does not procude a commit message. */
+const defaultCommitMessage = `<type>(<scope>): <summary>
+
+# <Describe the motivation behind this change - explain WHY you are making this change. Wrap all
+#  lines at 100 characters.>\n\n`;
+
+export async function runWizard(
+    args: {filePath: string, source?: CommitMsgSource, commitSha?: string}) {
+  if (getUserConfig().commitMessage?.disableWizard) {
+    debug('Skipping commit message wizard due to enabled `commitMessage.disableWizard` option in');
+    debug('user config.');
+    process.exitCode = 0;
+    return;
+  }
+
+  if (args.source !== undefined) {
+    info(`Skipping commit message wizard because the commit was created via '${
+        args.source}' source`);
+    process.exitCode = 0;
+    return;
+  }
+
+  // Set the default commit message to be updated if the user cancels out of the wizard in progress
+  writeFileSync(args.filePath, defaultCommitMessage);
+
+  /** The generated commit message. */
+  const commitMessage = await buildCommitMessage();
+  writeFileSync(args.filePath, commitMessage);
+}
diff --git a/dev-infra/format/BUILD.bazel b/dev-infra/format/BUILD.bazel
index 2b340e6aebcad..255e8d7535e7c 100644
--- a/dev-infra/format/BUILD.bazel
+++ b/dev-infra/format/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@npm_bazel_typescript//:index.bzl", "ts_library")
+load("@npm//@bazel/typescript:index.bzl", "ts_library")
 
 ts_library(
     name = "format",
@@ -10,12 +10,10 @@ ts_library(
     deps = [
         "//dev-infra/utils",
         "@npm//@types/cli-progress",
-        "@npm//@types/inquirer",
         "@npm//@types/node",
         "@npm//@types/shelljs",
         "@npm//@types/yargs",
         "@npm//cli-progress",
-        "@npm//inquirer",
         "@npm//multimatch",
         "@npm//shelljs",
         "@npm//yargs",
diff --git a/dev-infra/format/cli.ts b/dev-infra/format/cli.ts
index 68ddff86e9ac2..77dc6503699bc 100644
--- a/dev-infra/format/cli.ts
+++ b/dev-infra/format/cli.ts
@@ -7,7 +7,7 @@
  */
 import * as yargs from 'yargs';
 
-import {allChangedFilesSince, allFiles} from '../utils/repo-files';
+import {allChangedFilesSince, allFiles, allStagedFiles} from '../utils/repo-files';
 
 import {checkFiles, formatFiles} from './format';
 
@@ -22,22 +22,31 @@ export function buildFormatParser(localYargs: yargs.Argv) {
         description: 'Run the formatter to check formatting rather than updating code format'
       })
       .command(
-          'all', 'Run the formatter on all files in the repository', {},
+          'all', 'Run the formatter on all files in the repository', args => args,
           ({check}) => {
             const executionCmd = check ? checkFiles : formatFiles;
             executionCmd(allFiles());
           })
       .command(
-          'changed [shaOrRef]', 'Run the formatter on files changed since the provided sha/ref', {},
+          'changed [shaOrRef]', 'Run the formatter on files changed since the provided sha/ref',
+          args => args.positional('shaOrRef', {type: 'string'}),
           ({shaOrRef, check}) => {
             const sha = shaOrRef || 'master';
             const executionCmd = check ? checkFiles : formatFiles;
             executionCmd(allChangedFilesSince(sha));
           })
-      .command('files <files..>', 'Run the formatter on provided files', {}, ({check, files}) => {
-        const executionCmd = check ? checkFiles : formatFiles;
-        executionCmd(files);
-      });
+      .command(
+          'staged', 'Run the formatter on all staged files', args => args,
+          ({check}) => {
+            const executionCmd = check ? checkFiles : formatFiles;
+            executionCmd(allStagedFiles());
+          })
+      .command(
+          'files <files..>', 'Run the formatter on provided files',
+          args => args.positional('files', {array: true, type: 'string'}), ({check, files}) => {
+            const executionCmd = check ? checkFiles : formatFiles;
+            executionCmd(files!);
+          });
 }
 
 if (require.main === module) {
diff --git a/dev-infra/format/format.ts b/dev-infra/format/format.ts
index b7c55fbf9c8d9..e3e79f6a4076d 100644
--- a/dev-infra/format/format.ts
+++ b/dev-infra/format/format.ts
@@ -6,9 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {prompt} from 'inquirer';
-
-import {error, info} from '../utils/console';
+import {error, info, promptConfirm} from '../utils/console';
 
 import {runFormatterInParallel} from './run-commands-parallel';
 
@@ -57,11 +55,7 @@ export async function checkFiles(files: string[]) {
     // If the command is run in a non-CI environment, prompt to format the files immediately.
     let runFormatter = false;
     if (!process.env['CI']) {
-      runFormatter = (await prompt({
-                       type: 'confirm',
-                       name: 'runFormatter',
-                       message: 'Format the files now?',
-                     })).runFormatter;
+      runFormatter = await promptConfirm('Format the files now?', true);
     }
 
     if (runFormatter) {
diff --git a/dev-infra/ngbot/BUILD.bazel b/dev-infra/ngbot/BUILD.bazel
new file mode 100644
index 0000000000000..08e72e9962d71
--- /dev/null
+++ b/dev-infra/ngbot/BUILD.bazel
@@ -0,0 +1,19 @@
+load("@npm//@bazel/typescript:index.bzl", "ts_library")
+
+ts_library(
+    name = "ngbot",
+    srcs = [
+        "cli.ts",
+        "verify.ts",
+    ],
+    module_name = "@angular/dev-infra-private/ngbot",
+    visibility = ["//dev-infra:__subpackages__"],
+    deps = [
+        "//dev-infra/utils",
+        "@npm//@types/node",
+        "@npm//@types/yaml",
+        "@npm//@types/yargs",
+        "@npm//yaml",
+        "@npm//yargs",
+    ],
+)
diff --git a/dev-infra/ngbot/cli.ts b/dev-infra/ngbot/cli.ts
new file mode 100644
index 0000000000000..9a881ee92eb73
--- /dev/null
+++ b/dev-infra/ngbot/cli.ts
@@ -0,0 +1,19 @@
+/**
+ * @license
+ * Copyright Google LLC 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 yargs from 'yargs';
+import {verify} from './verify';
+
+/** Build the parser for the NgBot commands. */
+export function buildNgbotParser(localYargs: yargs.Argv) {
+  return localYargs.help().strict().demandCommand().command(
+      'verify', 'Verify the NgBot config', {}, () => verify());
+}
+
+if (require.main === module) {
+  buildNgbotParser(yargs).parse();
+}
diff --git a/dev-infra/ngbot/verify.ts b/dev-infra/ngbot/verify.ts
new file mode 100644
index 0000000000000..a5c244937611e
--- /dev/null
+++ b/dev-infra/ngbot/verify.ts
@@ -0,0 +1,31 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {readFileSync} from 'fs';
+import {resolve} from 'path';
+import {parse as parseYaml} from 'yaml';
+
+import {getRepoBaseDir} from '../utils/config';
+import {error, green, info, red} from '../utils/console';
+
+export function verify() {
+  /** Full path to NgBot config file */
+  const NGBOT_CONFIG_YAML_PATH = resolve(getRepoBaseDir(), '.github/angular-robot.yml');
+
+  /** The NgBot config file */
+  const ngBotYaml = readFileSync(NGBOT_CONFIG_YAML_PATH, 'utf8');
+
+  try {
+    // Try parsing the config file to verify that the syntax is correct.
+    parseYaml(ngBotYaml);
+    info(`${green('√')}  Valid NgBot YAML config`);
+  } catch (e) {
+    error(`${red('!')} Invalid NgBot YAML config`);
+    error(e);
+    process.exitCode = 1;
+  }
+}
diff --git a/dev-infra/pr/BUILD.bazel b/dev-infra/pr/BUILD.bazel
index 023bbd69ac062..cf51a59dc973f 100644
--- a/dev-infra/pr/BUILD.bazel
+++ b/dev-infra/pr/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@npm_bazel_typescript//:index.bzl", "ts_library")
+load("@npm//@bazel/typescript:index.bzl", "ts_library")
 
 ts_library(
     name = "pr",
@@ -6,6 +6,7 @@ ts_library(
     module_name = "@angular/dev-infra-private/pr",
     visibility = ["//dev-infra:__subpackages__"],
     deps = [
+        "//dev-infra/pr/checkout",
         "//dev-infra/pr/discover-new-conflicts",
         "//dev-infra/pr/merge",
         "//dev-infra/pr/rebase",
diff --git a/dev-infra/pr/checkout/BUILD.bazel b/dev-infra/pr/checkout/BUILD.bazel
new file mode 100644
index 0000000000000..e7a729c10f091
--- /dev/null
+++ b/dev-infra/pr/checkout/BUILD.bazel
@@ -0,0 +1,13 @@
+load("@npm//@bazel/typescript:index.bzl", "ts_library")
+
+ts_library(
+    name = "checkout",
+    srcs = glob(["*.ts"]),
+    module_name = "@angular/dev-infra-private/pr/checkout",
+    visibility = ["//dev-infra:__subpackages__"],
+    deps = [
+        "//dev-infra/pr/common",
+        "//dev-infra/utils",
+        "@npm//@types/yargs",
+    ],
+)
diff --git a/dev-infra/pr/checkout/cli.ts b/dev-infra/pr/checkout/cli.ts
new file mode 100644
index 0000000000000..1ea44bd937fef
--- /dev/null
+++ b/dev-infra/pr/checkout/cli.ts
@@ -0,0 +1,36 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Arguments, Argv, CommandModule} from 'yargs';
+
+import {addGithubTokenOption} from '../../utils/git/github-yargs';
+import {checkOutPullRequestLocally} from '../common/checkout-pr';
+
+export interface CheckoutOptions {
+  prNumber: number;
+  githubToken: string;
+}
+
+/** Builds the checkout pull request command. */
+function builder(yargs: Argv) {
+  return addGithubTokenOption(yargs).positional('prNumber', {type: 'number', demandOption: true});
+}
+
+/** Handles the checkout pull request command. */
+async function handler({prNumber, githubToken}: Arguments<CheckoutOptions>) {
+  const prCheckoutOptions = {allowIfMaintainerCannotModify: true, branchName: `pr-${prNumber}`};
+  await checkOutPullRequestLocally(prNumber, githubToken, prCheckoutOptions);
+}
+
+/** yargs command module for checking out a PR  */
+export const CheckoutCommandModule: CommandModule<{}, CheckoutOptions> = {
+  handler,
+  builder,
+  command: 'checkout <pr-number>',
+  describe: 'Checkout a PR from the upstream repo',
+};
diff --git a/dev-infra/pr/cli.ts b/dev-infra/pr/cli.ts
index 0f4d312d444b4..fb080ed5c299b 100644
--- a/dev-infra/pr/cli.ts
+++ b/dev-infra/pr/cli.ts
@@ -8,6 +8,7 @@
 
 import * as yargs from 'yargs';
 
+import {CheckoutCommandModule} from './checkout/cli';
 import {buildDiscoverNewConflictsCommand, handleDiscoverNewConflictsCommand} from './discover-new-conflicts/cli';
 import {buildMergeCommand, handleMergeCommand} from './merge/cli';
 import {buildRebaseCommand, handleRebaseCommand} from './rebase/cli';
@@ -24,7 +25,8 @@ export function buildPrParser(localYargs: yargs.Argv) {
           buildDiscoverNewConflictsCommand, handleDiscoverNewConflictsCommand)
       .command(
           'rebase <pr-number>', 'Rebase a pending PR and push the rebased commits back to Github',
-          buildRebaseCommand, handleRebaseCommand);
+          buildRebaseCommand, handleRebaseCommand)
+      .command(CheckoutCommandModule);
 }
 
 if (require.main === module) {
diff --git a/dev-infra/pr/common/BUILD.bazel b/dev-infra/pr/common/BUILD.bazel
new file mode 100644
index 0000000000000..496961b80507a
--- /dev/null
+++ b/dev-infra/pr/common/BUILD.bazel
@@ -0,0 +1,13 @@
+load("@npm//@bazel/typescript:index.bzl", "ts_library")
+
+ts_library(
+    name = "common",
+    srcs = glob(["*.ts"]),
+    module_name = "@angular/dev-infra-private/pr/common",
+    visibility = ["//dev-infra:__subpackages__"],
+    deps = [
+        "//dev-infra/utils",
+        "@npm//@types/node",
+        "@npm//typed-graphqlify",
+    ],
+)
diff --git a/dev-infra/pr/common/checkout-pr.ts b/dev-infra/pr/common/checkout-pr.ts
new file mode 100644
index 0000000000000..dcb7be2e68734
--- /dev/null
+++ b/dev-infra/pr/common/checkout-pr.ts
@@ -0,0 +1,128 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {types as graphQLTypes} from 'typed-graphqlify';
+
+import {info} from '../../utils/console';
+import {GitClient} from '../../utils/git';
+import {addTokenToGitHttpsUrl} from '../../utils/git/github-urls';
+import {getPr} from '../../utils/github';
+
+/* GraphQL schema for the response body for a pending PR. */
+const PR_SCHEMA = {
+  state: graphQLTypes.string,
+  maintainerCanModify: graphQLTypes.boolean,
+  viewerDidAuthor: graphQLTypes.boolean,
+  headRefOid: graphQLTypes.string,
+  headRef: {
+    name: graphQLTypes.string,
+    repository: {
+      url: graphQLTypes.string,
+      nameWithOwner: graphQLTypes.string,
+    },
+  },
+  baseRef: {
+    name: graphQLTypes.string,
+    repository: {
+      url: graphQLTypes.string,
+      nameWithOwner: graphQLTypes.string,
+    },
+  },
+};
+
+
+export class UnexpectedLocalChangesError extends Error {
+  constructor(m: string) {
+    super(m);
+    Object.setPrototypeOf(this, UnexpectedLocalChangesError.prototype);
+  }
+}
+
+export class MaintainerModifyAccessError extends Error {
+  constructor(m: string) {
+    super(m);
+    Object.setPrototypeOf(this, MaintainerModifyAccessError.prototype);
+  }
+}
+
+/** Options for checking out a PR */
+export interface PullRequestCheckoutOptions {
+  /** Whether the PR should be checked out if the maintainer cannot modify. */
+  allowIfMaintainerCannotModify?: boolean;
+}
+
+/**
+ * Rebase the provided PR onto its merge target branch, and push up the resulting
+ * commit to the PRs repository.
+ */
+export async function checkOutPullRequestLocally(
+    prNumber: number, githubToken: string, opts: PullRequestCheckoutOptions = {}) {
+  /** Authenticated Git client for git and Github interactions. */
+  const git = new GitClient(githubToken);
+
+  // In order to preserve local changes, checkouts cannot occur if local changes are present in the
+  // git environment. Checked before retrieving the PR to fail fast.
+  if (git.hasLocalChanges()) {
+    throw new UnexpectedLocalChangesError('Unable to checkout PR due to uncommitted changes.');
+  }
+
+  /**
+   * The branch or revision originally checked out before this method performed
+   * any Git operations that may change the working branch.
+   */
+  const previousBranchOrRevision = git.getCurrentBranchOrRevision();
+  /* The PR information from Github. */
+  const pr = await getPr(PR_SCHEMA, prNumber, git);
+  /** The branch name of the PR from the repository the PR came from. */
+  const headRefName = pr.headRef.name;
+  /** The full ref for the repository and branch the PR came from. */
+  const fullHeadRef = `${pr.headRef.repository.nameWithOwner}:${headRefName}`;
+  /** The full URL path of the repository the PR came from with github token as authentication. */
+  const headRefUrl = addTokenToGitHttpsUrl(pr.headRef.repository.url, githubToken);
+  // Note: Since we use a detached head for rebasing the PR and therefore do not have
+  // remote-tracking branches configured, we need to set our expected ref and SHA. This
+  // allows us to use `--force-with-lease` for the detached head while ensuring that we
+  // never accidentally override upstream changes that have been pushed in the meanwhile.
+  // See:
+  // https://git-scm.com/docs/git-push#Documentation/git-push.txt---force-with-leaseltrefnamegtltexpectgt
+  /** Flag for a force push with leage back to upstream. */
+  const forceWithLeaseFlag = `--force-with-lease=${headRefName}:${pr.headRefOid}`;
+
+  // If the PR does not allow maintainers to modify it, exit as the rebased PR cannot
+  // be pushed up.
+  if (!pr.maintainerCanModify && !pr.viewerDidAuthor && !opts.allowIfMaintainerCannotModify) {
+    throw new MaintainerModifyAccessError('PR is not set to allow maintainers to modify the PR');
+  }
+
+  try {
+    // Fetch the branch at the commit of the PR, and check it out in a detached state.
+    info(`Checking out PR #${prNumber} from ${fullHeadRef}`);
+    git.run(['fetch', headRefUrl, headRefName]);
+    git.run(['checkout', '--detach', 'FETCH_HEAD']);
+  } catch (e) {
+    git.checkout(previousBranchOrRevision, true);
+    throw e;
+  }
+
+  return {
+    /**
+     * Pushes the current local branch to the PR on the upstream repository.
+     *
+     * @returns true If the command did not fail causing a GitCommandError to be thrown.
+     * @throws GitCommandError Thrown when the push back to upstream fails.
+     */
+    pushToUpstream: (): true => {
+      git.run(['push', headRefUrl, `HEAD:${headRefName}`, forceWithLeaseFlag]);
+      return true;
+    },
+    /** Restores the state of the local repository to before the PR checkout occured. */
+    resetGitState: (): boolean => {
+      return git.checkout(previousBranchOrRevision, true);
+    }
+  };
+}
diff --git a/dev-infra/pr/discover-new-conflicts/BUILD.bazel b/dev-infra/pr/discover-new-conflicts/BUILD.bazel
index a0dbdca87a1ca..c625ad7aede59 100644
--- a/dev-infra/pr/discover-new-conflicts/BUILD.bazel
+++ b/dev-infra/pr/discover-new-conflicts/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@npm_bazel_typescript//:index.bzl", "ts_library")
+load("@npm//@bazel/typescript:index.bzl", "ts_library")
 
 ts_library(
     name = "discover-new-conflicts",
diff --git a/dev-infra/pr/discover-new-conflicts/cli.ts b/dev-infra/pr/discover-new-conflicts/cli.ts
index 672afb3c1432c..27f83b69e9289 100644
--- a/dev-infra/pr/discover-new-conflicts/cli.ts
+++ b/dev-infra/pr/discover-new-conflicts/cli.ts
@@ -12,18 +12,28 @@ import {error} from '../../utils/console';
 
 import {discoverNewConflictsForPr} from './index';
 
+/** The options available to the discover-new-conflicts command via CLI. */
+export interface DiscoverNewConflictsCommandOptions {
+  date: number;
+  'pr-number': number;
+}
+
 /** Builds the discover-new-conflicts pull request command. */
-export function buildDiscoverNewConflictsCommand(yargs: Argv) {
-  return yargs.option('date', {
-    description: 'Only consider PRs updated since provided date',
-    defaultDescription: '30 days ago',
-    coerce: Date.parse,
-    default: getThirtyDaysAgoDate,
-  });
+export function buildDiscoverNewConflictsCommand(yargs: Argv):
+    Argv<DiscoverNewConflictsCommandOptions> {
+  return yargs
+      .option('date', {
+        description: 'Only consider PRs updated since provided date',
+        defaultDescription: '30 days ago',
+        coerce: (date) => typeof date === 'number' ? date : Date.parse(date),
+        default: getThirtyDaysAgoDate(),
+      })
+      .positional('pr-number', {demandOption: true, type: 'number'});
 }
 
 /** Handles the discover-new-conflicts pull request command. */
-export async function handleDiscoverNewConflictsCommand({prNumber, date}: Arguments) {
+export async function handleDiscoverNewConflictsCommand(
+    {'pr-number': prNumber, date}: Arguments<DiscoverNewConflictsCommandOptions>) {
   // If a provided date is not able to be parsed, yargs provides it as NaN.
   if (isNaN(date)) {
     error('Unable to parse the value provided via --date flag');
@@ -33,11 +43,11 @@ export async function handleDiscoverNewConflictsCommand({prNumber, date}: Argume
 }
 
 /** Gets a date object 30 days ago from today. */
-function getThirtyDaysAgoDate(): Date {
+function getThirtyDaysAgoDate() {
   const date = new Date();
   // Set the hours, minutes and seconds to 0 to only consider date.
   date.setHours(0, 0, 0, 0);
   // Set the date to 30 days in the past.
   date.setDate(date.getDate() - 30);
-  return date;
+  return date.getTime();
 }
diff --git a/dev-infra/pr/discover-new-conflicts/index.ts b/dev-infra/pr/discover-new-conflicts/index.ts
index 790d809438437..c59f1a0698231 100644
--- a/dev-infra/pr/discover-new-conflicts/index.ts
+++ b/dev-infra/pr/discover-new-conflicts/index.ts
@@ -72,7 +72,7 @@ export async function discoverNewConflictsForPr(
 
   info(`Requesting pending PRs from Github`);
   /** List of PRs from github currently known as mergable. */
-  const allPendingPRs = (await getPendingPrs(PR_SCHEMA, config.github)).map(processPr);
+  const allPendingPRs = (await getPendingPrs(PR_SCHEMA, git)).map(processPr);
   /** The PR which is being checked against. */
   const requestedPr = allPendingPRs.find(pr => pr.number === newPrNumber);
   if (requestedPr === undefined) {
diff --git a/dev-infra/pr/merge/BUILD.bazel b/dev-infra/pr/merge/BUILD.bazel
index ccfb9cb507e68..52865f0a238ff 100644
--- a/dev-infra/pr/merge/BUILD.bazel
+++ b/dev-infra/pr/merge/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@npm_bazel_typescript//:index.bzl", "ts_library")
+load("@npm//@bazel/typescript:index.bzl", "ts_library")
 load("//tools:defaults.bzl", "jasmine_node_test")
 
 ts_library(
@@ -11,6 +11,8 @@ ts_library(
     visibility = ["//dev-infra:__subpackages__"],
     deps = [
         "//dev-infra/commit-message",
+        "//dev-infra/release/config",
+        "//dev-infra/release/versioning",
         "//dev-infra/utils",
         "@npm//@octokit/rest",
         "@npm//@types/inquirer",
@@ -28,6 +30,8 @@ ts_library(
     srcs = glob(["**/*.spec.ts"]),
     deps = [
         ":merge",
+        "//dev-infra/release/config",
+        "//dev-infra/release/versioning",
         "//dev-infra/utils",
         "@npm//@types/jasmine",
         "@npm//@types/node",
diff --git a/dev-infra/pr/merge/cli.ts b/dev-infra/pr/merge/cli.ts
index b1d30223d62df..0c2600351ae69 100644
--- a/dev-infra/pr/merge/cli.ts
+++ b/dev-infra/pr/merge/cli.ts
@@ -8,27 +8,24 @@
 
 import {Arguments, Argv} from 'yargs';
 
-import {error, red, yellow} from '../../utils/console';
+import {addGithubTokenOption} from '../../utils/git/github-yargs';
 
-import {GITHUB_TOKEN_GENERATE_URL, mergePullRequest} from './index';
+import {mergePullRequest} from './index';
+
+/** The options available to the merge command via CLI. */
+export interface MergeCommandOptions {
+  githubToken: string;
+  'pr-number': number;
+}
 
 /** Builds the options for the merge command. */
-export function buildMergeCommand(yargs: Argv) {
-  return yargs.help().strict().option('github-token', {
-    type: 'string',
-    description: 'Github token. If not set, token is retrieved from the environment variables.'
-  });
+export function buildMergeCommand(yargs: Argv): Argv<MergeCommandOptions> {
+  return addGithubTokenOption(yargs).help().strict().positional(
+      'pr-number', {demandOption: true, type: 'number'});
 }
 
 /** Handles the merge command. i.e. performs the merge of a specified pull request. */
-export async function handleMergeCommand(args: Arguments) {
-  const githubToken = args.githubToken || process.env.GITHUB_TOKEN || process.env.TOKEN;
-  if (!githubToken) {
-    error(red('No Github token set. Please set the `GITHUB_TOKEN` environment variable.'));
-    error(red('Alternatively, pass the `--github-token` command line flag.'));
-    error(yellow(`You can generate a token here: ${GITHUB_TOKEN_GENERATE_URL}`));
-    process.exit(1);
-  }
-
-  await mergePullRequest(args.prNumber, githubToken);
+export async function handleMergeCommand(
+    {'pr-number': pr, githubToken}: Arguments<MergeCommandOptions>) {
+  await mergePullRequest(pr, githubToken);
 }
diff --git a/dev-infra/pr/merge/defaults/branches.ts b/dev-infra/pr/merge/defaults/branches.ts
deleted file mode 100644
index 0f40a2d0a2b8c..0000000000000
--- a/dev-infra/pr/merge/defaults/branches.ts
+++ /dev/null
@@ -1,212 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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 semver from 'semver';
-import {GithubClient} from '../../../utils/git/github';
-
-/** Type describing a Github repository with corresponding API client. */
-export interface GithubRepo {
-  /** API client that can access the repository. */
-  api: GithubClient;
-  /** Owner login of the repository. */
-  owner: string;
-  /** Name of the repository. */
-  repo: string;
-  /**
-   * NPM package representing this repository. Angular repositories usually contain
-   * multiple packages in a monorepo scheme, but packages commonly are released with
-   * the same versions. This means that a single package can be used for querying
-   * NPM about previously published versions (e.g. to determine active LTS versions).
-   * */
-  npmPackageName: string;
-}
-
-/** Type describing a version-branch. */
-export interface VersionBranch {
-  /** Name of the branch in Git. e.g. `10.0.x`. */
-  name: string;
-  /**
-   * Parsed SemVer version for the version-branch. Version branches technically do
-   * not follow the SemVer format, but we can have representative SemVer versions
-   * that can be used for comparisons, sorting and other checks.
-   */
-  parsed: semver.SemVer;
-}
-
-/** Branch name for the `next` branch. */
-export const nextBranchName = 'master';
-
-/** Regular expression that matches version-branches for a release-train. */
-const releaseTrainBranchNameRegex = /(\d+)\.(\d+)\.x/;
-
-/**
- * Fetches the active release train and its branches for the specified major version. i.e.
- * the latest active release-train branch name is resolved and an optional version-branch for
- * a currently active feature-freeze/release-candidate release-train.
- */
-export async function fetchActiveReleaseTrainBranches(
-    repo: GithubRepo, nextVersion: semver.SemVer): Promise<{
-  /**
-   * Name of the currently active release-candidate branch. Null if no
-   * feature-freeze/release-candidate is currently active.
-   */
-  releaseCandidateBranch: string | null,
-  /** Name of the latest non-prerelease version branch (i.e. the patch branch). */
-  latestVersionBranch: string
-}> {
-  const majorVersionsToConsider: number[] = [];
-  let expectedReleaseCandidateMajor: number;
-
-  // If the `next` branch (i.e. `master` branch) is for an upcoming major version, we know
-  // that there is no patch branch or feature-freeze/release-candidate branch for this major
-  // digit. If the current `next` version is the first minor of a major version, we know that
-  // the feature-freeze/release-candidate branch can only be the actual major branch. The
-  // patch branch is based on that, either the actual major branch or the last minor from the
-  // preceding major version. In all other cases, the patch branch and feature-freeze or
-  // release-candidate branch are part of the same major version. Consider the following:
-  //
-  //  CASE 1. next: 11.0.0-next.0: patch and feature-freeze/release-candidate can only be
-  //          most recent `10.<>.x` branches. The FF/RC branch can only be the last-minor of v10.
-  //  CASE 2. next: 11.1.0-next.0: patch can be either `11.0.x` or last-minor in v10 based
-  //          on whether there is a feature-freeze/release-candidate branch (=> `11.0.x`).
-  //  CASE 3. next: 10.6.0-next.0: patch can be either `10.5.x` or `10.4.x` based on whether
-  //          there is a feature-freeze/release-candidate branch (=> `10.5.x`)
-  if (nextVersion.minor === 0) {
-    expectedReleaseCandidateMajor = nextVersion.major - 1;
-    majorVersionsToConsider.push(nextVersion.major - 1);
-  } else if (nextVersion.minor === 1) {
-    expectedReleaseCandidateMajor = nextVersion.major;
-    majorVersionsToConsider.push(nextVersion.major, nextVersion.major - 1);
-  } else {
-    expectedReleaseCandidateMajor = nextVersion.major;
-    majorVersionsToConsider.push(nextVersion.major);
-  }
-
-  // Collect all version-branches that should be considered for the latest version-branch,
-  // or the feature-freeze/release-candidate.
-  const branches = (await getBranchesForMajorVersions(repo, majorVersionsToConsider));
-  const {latestVersionBranch, releaseCandidateBranch} =
-      await findActiveVersionBranches(repo, nextVersion, branches, expectedReleaseCandidateMajor);
-
-  if (latestVersionBranch === null) {
-    throw Error(
-        `Unable to determine the latest release-train. The following branches ` +
-        `have been considered: [${branches.join(', ')}]`);
-  }
-
-  return {releaseCandidateBranch, latestVersionBranch};
-}
-
-/** Gets the version of a given branch by reading the `package.json` upstream. */
-export async function getVersionOfBranch(
-    repo: GithubRepo, branchName: string): Promise<semver.SemVer> {
-  const {data} =
-      await repo.api.repos.getContents({...repo, path: '/package.json', ref: branchName});
-  const {version} = JSON.parse(Buffer.from(data.content, 'base64').toString());
-  const parsedVersion = semver.parse(version);
-  if (parsedVersion === null) {
-    throw Error(`Invalid version detected in following branch: ${branchName}.`);
-  }
-  return parsedVersion;
-}
-
-/** Whether the given branch corresponds to a release-train branch. */
-export function isReleaseTrainBranch(branchName: string): boolean {
-  return releaseTrainBranchNameRegex.test(branchName);
-}
-
-/**
- * Converts a given version-branch into a SemVer version that can be used with SemVer
- * utilities. e.g. to determine semantic order, extract major digit, compare.
- *
- * For example `10.0.x` will become `10.0.0` in SemVer. The patch digit is not
- * relevant but needed for parsing. SemVer does not allow `x` as patch digit.
- */
-export function getVersionForReleaseTrainBranch(branchName: string): semver.SemVer|null {
-  // Convert a given version-branch into a SemVer version that can be used
-  // with the SemVer utilities. i.e. to determine semantic order.
-  return semver.parse(branchName.replace(releaseTrainBranchNameRegex, '$1.$2.0'));
-}
-
-/**
- * Gets the version branches for the specified major versions in descending
- * order. i.e. latest version branches first.
- */
-export async function getBranchesForMajorVersions(
-    repo: GithubRepo, majorVersions: number[]): Promise<VersionBranch[]> {
-  const {data: branchData} = await repo.api.repos.listBranches({...repo, protected: true});
-  const branches: VersionBranch[] = [];
-
-  for (const {name} of branchData) {
-    if (!isReleaseTrainBranch(name)) {
-      continue;
-    }
-    // Convert the version-branch into a SemVer version that can be used with the
-    // SemVer utilities. e.g. to determine semantic order, compare versions.
-    const parsed = getVersionForReleaseTrainBranch(name);
-    // Collect all version-branches that match the specified major versions.
-    if (parsed !== null && majorVersions.includes(parsed.major)) {
-      branches.push({name, parsed});
-    }
-  }
-
-  // Sort captured version-branches in descending order.
-  return branches.sort((a, b) => semver.rcompare(a.parsed, b.parsed));
-}
-
-export async function findActiveVersionBranches(
-    repo: GithubRepo, nextVersion: semver.SemVer, branches: VersionBranch[],
-    expectedReleaseCandidateMajor: number): Promise<{
-  latestVersionBranch: string | null,
-  releaseCandidateBranch: string | null,
-}> {
-  let latestVersionBranch: string|null = null;
-  let releaseCandidateBranch: string|null = null;
-
-  // Iterate through the captured branches and find the latest non-prerelease branch and a
-  // potential release candidate branch. From the collected branches we iterate descending
-  // order (most recent semantic version-branch first). The first branch is either the latest
-  // active version branch (i.e. patch) or a feature-freeze/release-candidate branch. A FF/RC
-  // branch cannot be older than the latest active version-branch, so we stop iterating once
-  // we found such a branch. Otherwise, if we found a FF/RC branch, we continue looking for the
-  // next version-branch as that one is supposed to be the latest active version-branch. If it
-  // is not, then an error will be thrown due to two FF/RC branches existing at the same time.
-  for (const {name, parsed} of branches) {
-    // It can happen that version branches that are more recent than the version in the next
-    // branch (i.e. `master`) have been created. We could ignore such branches silently, but
-    // it might actually be symptomatic for an outdated version in the `next` branch, or an
-    // accidentally created branch by the caretaker. In either way we want to raise awareness.
-    if (semver.gte(parsed, nextVersion)) {
-      throw Error(
-          `Discovered unexpected version-branch that is representing a minor ` +
-          `version more recent than the one in the "${nextBranchName}" branch. Consider ` +
-          `deleting the branch, or check if the version in "${nextBranchName}" is outdated.`);
-    }
-
-    const version = await getVersionOfBranch(repo, name);
-    const isPrerelease = version.prerelease[0] === 'rc' || version.prerelease[0] === 'next';
-    if (isPrerelease) {
-      if (releaseCandidateBranch !== null) {
-        throw Error(
-            `Unable to determine latest release-train. Found two consecutive ` +
-            `branches in feature-freeze/release-candidate phase. Did not expect both "${name}" ` +
-            `and "${releaseCandidateBranch}" to be in feature-freeze/release-candidate mode.`);
-      } else if (version.major !== expectedReleaseCandidateMajor) {
-        throw Error(
-            `Discovered unexpected old feature-freeze/release-candidate branch. Expected no ` +
-            `version-branch in feature-freeze/release-candidate mode for v${version.major}.`);
-      }
-      releaseCandidateBranch = name;
-    } else {
-      latestVersionBranch = name;
-      break;
-    }
-  }
-
-  return {releaseCandidateBranch, latestVersionBranch};
-}
diff --git a/dev-infra/pr/merge/defaults/index.ts b/dev-infra/pr/merge/defaults/index.ts
index b633d828256a0..292bf3fb3ebd7 100644
--- a/dev-infra/pr/merge/defaults/index.ts
+++ b/dev-infra/pr/merge/defaults/index.ts
@@ -7,5 +7,4 @@
  */
 
 export * from './labels';
-export * from './branches';
 export * from './lts-branch';
diff --git a/dev-infra/pr/merge/defaults/integration.spec.ts b/dev-infra/pr/merge/defaults/integration.spec.ts
index d085422e9012f..6db2cfc12fd3c 100644
--- a/dev-infra/pr/merge/defaults/integration.spec.ts
+++ b/dev-infra/pr/merge/defaults/integration.spec.ts
@@ -7,8 +7,9 @@
  */
 
 import * as nock from 'nock';
-import * as nodeFetch from 'node-fetch';
 
+import {ReleaseConfig} from '../../../release/config/index';
+import {_npmPackageInfoCache, NpmPackageInfo} from '../../../release/versioning/npm-registry';
 import {GithubConfig} from '../../../utils/config';
 import * as console from '../../../utils/console';
 import {GithubClient} from '../../../utils/git/github';
@@ -21,13 +22,17 @@ const API_ENDPOINT = `https://api.github.com`;
 
 describe('default target labels', () => {
   let api: GithubClient;
-  let config: GithubConfig;
-  let npmPackageName: string;
+  let githubConfig: GithubConfig;
+  let releaseConfig: ReleaseConfig;
 
   beforeEach(() => {
     api = new GithubClient();
-    config = {owner: 'angular', name: 'dev-infra-test'};
-    npmPackageName = '@angular/dev-infra-test-pkg';
+    githubConfig = {owner: 'angular', name: 'dev-infra-test'};
+    releaseConfig = {
+      npmPackages: ['@angular/dev-infra-test-pkg'],
+      buildPackages: async () => [],
+      generateReleaseNotesForHead: async () => {},
+    };
 
     // The label determination will print warn messages. These should not be
     // printed to the console, so we turn `console.warn` into a spy.
@@ -37,11 +42,11 @@ describe('default target labels', () => {
   afterEach(() => nock.cleanAll());
 
   async function computeTargetLabels(): Promise<TargetLabel[]> {
-    return getDefaultTargetLabelConfiguration(api, config, npmPackageName);
+    return getDefaultTargetLabelConfiguration(api, githubConfig, releaseConfig);
   }
 
   function getRepoApiRequestUrl(): string {
-    return `${API_ENDPOINT}/repos/${config.owner}/${config.name}`;
+    return `${API_ENDPOINT}/repos/${githubConfig.owner}/${githubConfig.name}`;
   }
 
   /**
@@ -61,10 +66,9 @@ describe('default target labels', () => {
   }
 
   /** Fakes a NPM package query API request. */
-  function fakeNpmPackageQueryRequest(data: unknown) {
-    // Note: We only need to mock the `json` function for a `Response`. Types
-    // would expect us to mock more functions, so we need to cast to `any`.
-    spyOn(nodeFetch, 'default').and.resolveTo({json: async () => data} as any);
+  function fakeNpmPackageQueryRequest(data: Partial<NpmPackageInfo>) {
+    _npmPackageInfoCache[releaseConfig.npmPackages[0]] =
+        Promise.resolve({'dist-tags': {}, versions: {}, time: {}, ...data});
   }
 
   /**
@@ -167,7 +171,7 @@ describe('default target labels', () => {
       'time': {
         // v10 has been released at the given specified date. We pick a date that
         // guarantees that the version is no longer considered as active LTS version.
-        '10.0.0': new Date(1912, 5, 23),
+        '10.0.0': new Date(1912, 5, 23).toISOString(),
       }
     });
 
@@ -234,7 +238,7 @@ describe('default target labels', () => {
          'time': {
            // v10 has been released at the given specified date. We pick a date that
            // guarantees that the version is no longer considered as active LTS version.
-           '10.0.0': new Date(1912, 5, 23),
+           '10.0.0': new Date(1912, 5, 23).toISOString(),
          }
        });
 
@@ -247,16 +251,14 @@ describe('default target labels', () => {
     interceptBranchVersionRequest('10.5.x', '10.5.1');
     interceptBranchesListRequest(['10.5.x', '11.0.x']);
 
-    spyOn(require('node-fetch'), 'default').and.callFake(() => ({
-                                                           json: () => ({
-                                                             'dist-tags': {
-                                                               'v10-lts': '10.5.1',
-                                                             },
-                                                             'time': {
-                                                               '10.0.0': new Date().toISOString(),
-                                                             }
-                                                           }),
-                                                         }));
+    fakeNpmPackageQueryRequest({
+      'dist-tags': {
+        'v10-lts': '10.5.1',
+      },
+      'time': {
+        '10.0.0': new Date().toISOString(),
+      }
+    });
 
     expect(await getBranchesForLabel('target: lts', '10.5.x')).toEqual(['10.5.x']);
   });
@@ -280,7 +282,21 @@ describe('default target labels', () => {
         .toBeRejectedWithError('Invalid version detected in following branch: 11.1.x.');
   });
 
-  it('should error if branch more recent than version in "next" branch is found', async () => {
+  it('should error if version-branch more recent than "next" is discovered', async () => {
+    interceptBranchVersionRequest('master', '11.2.0-next.0');
+    interceptBranchVersionRequest('11.3.x', '11.3.0-next.0');
+    interceptBranchVersionRequest('11.1.x', '11.1.5');
+    interceptBranchesListRequest(['11.1.x', '11.3.x']);
+
+    await expectAsync(getBranchesForLabel('target: lts', '10.2.x'))
+        .toBeRejectedWithError(
+            'Discovered unexpected version-branch "11.3.x" for a release-train that is ' +
+            'more recent than the release-train currently in the "master" branch. Please ' +
+            'either delete the branch if created by accident, or update the outdated version ' +
+            'in the next branch (master).');
+  });
+
+  it('should error if branch is matching with release-train in the "next" branch', async () => {
     interceptBranchVersionRequest('master', '11.2.0-next.0');
     interceptBranchVersionRequest('11.2.x', '11.2.0-next.0');
     interceptBranchVersionRequest('11.1.x', '11.1.5');
@@ -288,9 +304,9 @@ describe('default target labels', () => {
 
     await expectAsync(getBranchesForLabel('target: lts', '10.2.x'))
         .toBeRejectedWithError(
-            'Discovered unexpected version-branch that is representing a minor version more ' +
-            'recent than the one in the "master" branch. Consider deleting the branch, or check ' +
-            'if the version in "master" is outdated.');
+            'Discovered unexpected version-branch "11.2.x" for a release-train that is already ' +
+            'active in the "master" branch. Please either delete the branch if created by ' +
+            'accident, or update the version in the next branch (master).');
   });
 
   it('should allow merging PR only into patch branch with "target: patch"', async () => {
diff --git a/dev-infra/pr/merge/defaults/labels.ts b/dev-infra/pr/merge/defaults/labels.ts
index 1ef039bdb9ee7..57f01c166879b 100644
--- a/dev-infra/pr/merge/defaults/labels.ts
+++ b/dev-infra/pr/merge/defaults/labels.ts
@@ -6,12 +6,13 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {ReleaseConfig} from '../../../release/config/index';
+import {fetchActiveReleaseTrains, isVersionBranch, nextBranchName} from '../../../release/versioning';
 import {GithubConfig} from '../../../utils/config';
 import {GithubClient} from '../../../utils/git/github';
 import {TargetLabel} from '../config';
 import {InvalidTargetBranchError, InvalidTargetLabelError} from '../target-label';
 
-import {fetchActiveReleaseTrainBranches, getVersionOfBranch, GithubRepo, isReleaseTrainBranch, nextBranchName} from './branches';
 import {assertActiveLtsBranch} from './lts-branch';
 
 /**
@@ -19,14 +20,18 @@ import {assertActiveLtsBranch} from './lts-branch';
  * organization-wide labeling and branching semantics as outlined in the specification.
  *
  * https://docs.google.com/document/d/197kVillDwx-RZtSVOBtPb4BBIAw0E9RT3q3v6DZkykU
+ *
+ * @param api Instance of an authenticated Github client.
+ * @param githubConfig Configuration for the Github remote. Used as Git remote
+ *   for the release train branches.
+ * @param releaseConfig Configuration for the release packages. Used to fetch
+ *   NPM version data when LTS version branches are validated.
  */
 export async function getDefaultTargetLabelConfiguration(
-    api: GithubClient, github: GithubConfig, npmPackageName: string): Promise<TargetLabel[]> {
-  const repo: GithubRepo = {owner: github.owner, repo: github.name, api, npmPackageName};
-  const nextVersion = await getVersionOfBranch(repo, nextBranchName);
-  const hasNextMajorTrain = nextVersion.minor === 0;
-  const {latestVersionBranch, releaseCandidateBranch} =
-      await fetchActiveReleaseTrainBranches(repo, nextVersion);
+    api: GithubClient, githubConfig: GithubConfig,
+    releaseConfig: ReleaseConfig): Promise<TargetLabel[]> {
+  const repo = {owner: githubConfig.owner, name: githubConfig.name, api};
+  const {latest, releaseCandidate, next} = await fetchActiveReleaseTrains(repo);
 
   return [
     {
@@ -34,10 +39,10 @@ export async function getDefaultTargetLabelConfiguration(
       branches: () => {
         // If `next` is currently not designated to be a major version, we do not
         // allow merging of PRs with `target: major`.
-        if (!hasNextMajorTrain) {
+        if (!next.isMajor) {
           throw new InvalidTargetLabelError(
-              `Unable to merge pull request. The "${nextBranchName}" branch will be ` +
-              `released as a minor version.`);
+              `Unable to merge pull request. The "${nextBranchName}" branch will be released as ` +
+              'a minor version.');
         }
         return [nextBranchName];
       },
@@ -59,15 +64,15 @@ export async function getDefaultTargetLabelConfiguration(
         // and is also labeled with `target: patch`, then we merge it directly into the
         // branch without doing any cherry-picking. This is useful if a PR could not be
         // applied cleanly, and a separate PR for the patch branch has been created.
-        if (githubTargetBranch === latestVersionBranch) {
-          return [latestVersionBranch];
+        if (githubTargetBranch === latest.branchName) {
+          return [latest.branchName];
         }
         // Otherwise, patch changes are always merged into the next and patch branch.
-        const branches = [nextBranchName, latestVersionBranch];
+        const branches = [nextBranchName, latest.branchName];
         // Additionally, if there is a release-candidate/feature-freeze release-train
         // currently active, also merge the PR into that version-branch.
-        if (releaseCandidateBranch !== null) {
-          branches.push(releaseCandidateBranch);
+        if (releaseCandidate !== null) {
+          branches.push(releaseCandidate.branchName);
         }
         return branches;
       }
@@ -77,7 +82,7 @@ export async function getDefaultTargetLabelConfiguration(
       branches: githubTargetBranch => {
         // The `target: rc` label cannot be applied if there is no active feature-freeze
         // or release-candidate release train.
-        if (releaseCandidateBranch === null) {
+        if (releaseCandidate === null) {
           throw new InvalidTargetLabelError(
               `No active feature-freeze/release-candidate branch. ` +
               `Unable to merge pull request using "target: rc" label.`);
@@ -86,11 +91,11 @@ export async function getDefaultTargetLabelConfiguration(
         // directly through the Github UI and has the `target: rc` label applied, merge it
         // only into the release candidate branch. This is useful if a PR did not apply cleanly
         // into the release-candidate/feature-freeze branch, and a separate PR has been created.
-        if (githubTargetBranch === releaseCandidateBranch) {
-          return [releaseCandidateBranch];
+        if (githubTargetBranch === releaseCandidate.branchName) {
+          return [releaseCandidate.branchName];
         }
         // Otherwise, merge into the next and active release-candidate/feature-freeze branch.
-        return [nextBranchName, releaseCandidateBranch];
+        return [nextBranchName, releaseCandidate.branchName];
       },
     },
     {
@@ -100,23 +105,23 @@ export async function getDefaultTargetLabelConfiguration(
       // commonly diverge quickly. This makes cherry-picking not an option for LTS changes.
       pattern: 'target: lts',
       branches: async githubTargetBranch => {
-        if (!isReleaseTrainBranch(githubTargetBranch)) {
+        if (!isVersionBranch(githubTargetBranch)) {
           throw new InvalidTargetBranchError(
               `PR cannot be merged as it does not target a long-term support ` +
               `branch: "${githubTargetBranch}"`);
         }
-        if (githubTargetBranch === latestVersionBranch) {
+        if (githubTargetBranch === latest.branchName) {
           throw new InvalidTargetBranchError(
               `PR cannot be merged with "target: lts" into patch branch. ` +
               `Consider changing the label to "target: patch" if this is intentional.`);
         }
-        if (githubTargetBranch === releaseCandidateBranch && releaseCandidateBranch !== null) {
+        if (releaseCandidate !== null && githubTargetBranch === releaseCandidate.branchName) {
           throw new InvalidTargetBranchError(
               `PR cannot be merged with "target: lts" into feature-freeze/release-candidate ` +
               `branch. Consider changing the label to "target: rc" if this is intentional.`);
         }
         // Assert that the selected branch is an active LTS branch.
-        await assertActiveLtsBranch(repo, githubTargetBranch);
+        await assertActiveLtsBranch(repo, releaseConfig, githubTargetBranch);
         return [githubTargetBranch];
       },
     },
diff --git a/dev-infra/pr/merge/defaults/lts-branch.ts b/dev-infra/pr/merge/defaults/lts-branch.ts
index 5db07f8ad406e..f29fab26ea27a 100644
--- a/dev-infra/pr/merge/defaults/lts-branch.ts
+++ b/dev-infra/pr/merge/defaults/lts-branch.ts
@@ -6,40 +6,32 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import fetch from 'node-fetch';
 import * as semver from 'semver';
 
+import {ReleaseConfig} from '../../../release/config/index';
+import {computeLtsEndDateOfMajor, fetchProjectNpmPackageInfo, getLtsNpmDistTagOfMajor, getVersionOfBranch, GithubRepoWithApi} from '../../../release/versioning';
 import {promptConfirm, red, warn, yellow} from '../../../utils/console';
 import {InvalidTargetBranchError} from '../target-label';
 
-import {getVersionOfBranch, GithubRepo} from './branches';
-
-/**
- * Number of months a major version in Angular is actively supported. See:
- * https://angular.io/guide/releases#support-policy-and-schedule.
- */
-const majorActiveSupportDuration = 6;
-
-/**
- * Number of months a major version has active long-term support. See:
- * https://angular.io/guide/releases#support-policy-and-schedule.
- */
-const majorActiveTermSupportDuration = 12;
-
 /**
  * Asserts that the given branch corresponds to an active LTS version-branch that can receive
- * backported fixes. Throws an error if LTS expired or an invalid branch is selected.
- */
-export async function assertActiveLtsBranch(repo: GithubRepo, branchName: string) {
+ * backport fixes. Throws an error if LTS expired or an invalid branch is selected.
+ *
+ * @param repo Repository containing the given branch. Used for Github API queries.
+ * @param releaseConfig Configuration for releases. Used to query NPM about past publishes.
+ * @param branchName Branch that is checked to be an active LTS version-branch.
+ * */
+export async function assertActiveLtsBranch(
+    repo: GithubRepoWithApi, releaseConfig: ReleaseConfig, branchName: string) {
   const version = await getVersionOfBranch(repo, branchName);
-  const {'dist-tags': distTags, time} =
-      await (await fetch(`https://registry.npmjs.org/${repo.npmPackageName}`)).json();
+  const {'dist-tags': distTags, time} = await fetchProjectNpmPackageInfo(releaseConfig);
 
   // LTS versions should be tagged in NPM in the following format: `v{major}-lts`.
-  const ltsVersion = semver.parse(distTags[`v${version.major}-lts`]);
+  const ltsNpmTag = getLtsNpmDistTagOfMajor(version.major);
+  const ltsVersion = semver.parse(distTags[ltsNpmTag]);
 
-  // Ensure that there is a LTS version tagged for the given version-branch major. e.g.
-  // if the version branch is `9.2.x` then we want to make sure that there is a LTS
+  // Ensure that there is an LTS version tagged for the given version-branch major. e.g.
+  // if the version branch is `9.2.x` then we want to make sure that there is an LTS
   // version tagged in NPM for `v9`, following the `v{major}-lts` tag convention.
   if (ltsVersion === null) {
     throw new InvalidTargetBranchError(`No LTS version tagged for v${version.major} in NPM.`);
@@ -54,12 +46,8 @@ export async function assertActiveLtsBranch(repo: GithubRepo, branchName: string
   }
 
   const today = new Date();
-  const releaseDate = new Date(time[`${version.major}.0.0`]);
-  const ltsEndDate = new Date(
-      releaseDate.getFullYear(),
-      releaseDate.getMonth() + majorActiveSupportDuration + majorActiveTermSupportDuration,
-      releaseDate.getDate(), releaseDate.getHours(), releaseDate.getMinutes(),
-      releaseDate.getSeconds(), releaseDate.getMilliseconds());
+  const majorReleaseDate = new Date(time[`${version.major}.0.0`]);
+  const ltsEndDate = computeLtsEndDateOfMajor(majorReleaseDate);
 
   // Check if LTS has already expired for the targeted major version. If so, we do not
   // allow the merge as per our LTS guarantees. Can be forcibly overridden if desired.
diff --git a/dev-infra/pr/merge/index.ts b/dev-infra/pr/merge/index.ts
index 816aa679d2715..d6d28a6619757 100644
--- a/dev-infra/pr/merge/index.ts
+++ b/dev-infra/pr/merge/index.ts
@@ -11,14 +11,11 @@ import {getConfig, getRepoBaseDir} from '../../utils/config';
 import {error, green, info, promptConfirm, red, yellow} from '../../utils/console';
 import {GitClient} from '../../utils/git';
 import {GithubApiRequestError} from '../../utils/git/github';
+import {GITHUB_TOKEN_GENERATE_URL} from '../../utils/git/github-urls';
 
-import {loadAndValidateConfig, MergeConfig, MergeConfigWithRemote} from './config';
+import {loadAndValidateConfig, MergeConfigWithRemote} from './config';
 import {MergeResult, MergeStatus, PullRequestMergeTask} from './task';
 
-/** URL to the Github page where personal access tokens can be generated. */
-export const GITHUB_TOKEN_GENERATE_URL = `https://github.com/settings/tokens`;
-
-
 /**
  * Merges a given pull request based on labels configured in the given merge configuration.
  * Pull requests can be merged with different strategies such as the Github API merge
@@ -35,6 +32,10 @@ export const GITHUB_TOKEN_GENERATE_URL = `https://github.com/settings/tokens`;
 export async function mergePullRequest(
     prNumber: number, githubToken: string, projectRoot: string = getRepoBaseDir(),
     config?: MergeConfigWithRemote) {
+  // Set the environment variable to skip all git commit hooks triggered by husky. We are unable to
+  // rely on `--no-verify` as some hooks still run, notably the `prepare-commit-msg` hook.
+  process.env['HUSKY_SKIP_HOOKS'] = '1';
+
   const api = await createPullRequestMergeTask(githubToken, projectRoot, config);
 
   // Perform the merge. Force mode can be activated through a command line flag.
diff --git a/dev-infra/pr/merge/messages.ts b/dev-infra/pr/merge/messages.ts
index dbcb0aac667f1..34a34ce3db5b2 100644
--- a/dev-infra/pr/merge/messages.ts
+++ b/dev-infra/pr/merge/messages.ts
@@ -11,5 +11,11 @@ import {PullRequest} from './pull-request';
 
 export function getCaretakerNotePromptMessage(pullRequest: PullRequest): string {
   return red('Pull request has a caretaker note applied. Please make sure you read it.') +
-      `\nQuick link to PR: ${pullRequest.url}`;
+      `\nQuick link to PR: ${pullRequest.url}\nDo you want to proceed merging?`;
+}
+
+export function getTargettedBranchesConfirmationPromptMessage(pullRequest: PullRequest): string {
+  const targetBranchListAsString = pullRequest.targetBranches.map(b => ` - ${b}\n`).join('');
+  return `Pull request #${pullRequest.prNumber} will merge into:\n${
+      targetBranchListAsString}\nDo you want to proceed merging?`;
 }
diff --git a/dev-infra/pr/merge/strategies/api-merge.ts b/dev-infra/pr/merge/strategies/api-merge.ts
index f52b768e00b4e..42afdd1c6fa24 100644
--- a/dev-infra/pr/merge/strategies/api-merge.ts
+++ b/dev-infra/pr/merge/strategies/api-merge.ts
@@ -9,7 +9,7 @@
 import {PullsListCommitsResponse, PullsMergeParams} from '@octokit/rest';
 import {prompt} from 'inquirer';
 
-import {parseCommitMessage} from '../../../commit-message/validate';
+import {parseCommitMessage} from '../../../commit-message/parse';
 import {GitClient} from '../../../utils/git';
 import {GithubApiMergeMethod} from '../config';
 import {PullRequestFailure} from '../failures';
diff --git a/dev-infra/pr/merge/task.ts b/dev-infra/pr/merge/task.ts
index 4d20d2a338e29..42ca89898fbb4 100644
--- a/dev-infra/pr/merge/task.ts
+++ b/dev-infra/pr/merge/task.ts
@@ -9,9 +9,9 @@
 import {promptConfirm} from '../../utils/console';
 import {GitClient, GitCommandError} from '../../utils/git';
 
-import {MergeConfig, MergeConfigWithRemote} from './config';
+import {MergeConfigWithRemote} from './config';
 import {PullRequestFailure} from './failures';
-import {getCaretakerNotePromptMessage} from './messages';
+import {getCaretakerNotePromptMessage, getTargettedBranchesConfirmationPromptMessage} from './messages';
 import {isPullRequest, loadAndValidatePullRequest,} from './pull-request';
 import {GithubApiMergeStrategy} from './strategies/api-merge';
 import {AutosquashMergeStrategy} from './strategies/autosquash-merge';
@@ -78,11 +78,16 @@ export class PullRequestMergeTask {
       return {status: MergeStatus.FAILED, failure: pullRequest};
     }
 
+
+    if (!await promptConfirm(getTargettedBranchesConfirmationPromptMessage(pullRequest))) {
+      return {status: MergeStatus.USER_ABORTED};
+    }
+
+
     // If the pull request has a caretaker note applied, raise awareness by prompting
     // the caretaker. The caretaker can then decide to proceed or abort the merge.
     if (pullRequest.hasCaretakerNote &&
-        !await promptConfirm(
-            getCaretakerNotePromptMessage(pullRequest) + `\nDo you want to proceed merging?`)) {
+        !await promptConfirm(getCaretakerNotePromptMessage(pullRequest))) {
       return {status: MergeStatus.USER_ABORTED};
     }
 
diff --git a/dev-infra/pr/rebase/BUILD.bazel b/dev-infra/pr/rebase/BUILD.bazel
index 5ee5219d5de59..0e49fd70a4238 100644
--- a/dev-infra/pr/rebase/BUILD.bazel
+++ b/dev-infra/pr/rebase/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@npm_bazel_typescript//:index.bzl", "ts_library")
+load("@npm//@bazel/typescript:index.bzl", "ts_library")
 
 ts_library(
     name = "rebase",
diff --git a/dev-infra/pr/rebase/cli.ts b/dev-infra/pr/rebase/cli.ts
index 03a369d89125c..6b1c0c05f128e 100644
--- a/dev-infra/pr/rebase/cli.ts
+++ b/dev-infra/pr/rebase/cli.ts
@@ -8,30 +8,23 @@
 
 import {Arguments, Argv} from 'yargs';
 
-import {error} from '../../utils/console';
+import {addGithubTokenOption} from '../../utils/git/github-yargs';
 
 import {rebasePr} from './index';
 
-/** URL to the Github page where personal access tokens can be generated. */
-export const GITHUB_TOKEN_GENERATE_URL = `https://github.com/settings/tokens`;
+/** The options available to the rebase command via CLI. */
+export interface RebaseCommandOptions {
+  githubToken: string;
+  prNumber: number;
+}
 
 /** Builds the rebase pull request command. */
-export function buildRebaseCommand(yargs: Argv) {
-  return yargs.option('github-token', {
-    type: 'string',
-    description: 'Github token. If not set, token is retrieved from the environment variables.'
-  });
+export function buildRebaseCommand(yargs: Argv): Argv<RebaseCommandOptions> {
+  return addGithubTokenOption(yargs).positional('prNumber', {type: 'number', demandOption: true});
 }
 
 /** Handles the rebase pull request command. */
-export async function handleRebaseCommand(args: Arguments) {
-  const githubToken = args.githubToken || process.env.GITHUB_TOKEN || process.env.TOKEN;
-  if (!githubToken) {
-    error('No Github token set. Please set the `GITHUB_TOKEN` environment variable.');
-    error('Alternatively, pass the `--github-token` command line flag.');
-    error(`You can generate a token here: ${GITHUB_TOKEN_GENERATE_URL}`);
-    process.exit(1);
-  }
-
-  await rebasePr(args.prNumber, githubToken);
+export async function handleRebaseCommand(
+    {prNumber, githubToken}: Arguments<RebaseCommandOptions>) {
+  await rebasePr(prNumber, githubToken);
 }
diff --git a/dev-infra/pr/rebase/index.ts b/dev-infra/pr/rebase/index.ts
index 8c0af93324c7b..7aa63e6290c5d 100644
--- a/dev-infra/pr/rebase/index.ts
+++ b/dev-infra/pr/rebase/index.ts
@@ -7,11 +7,11 @@
  */
 
 import {types as graphQLTypes} from 'typed-graphqlify';
-import {URL} from 'url';
 
 import {getConfig, NgDevConfig} from '../../utils/config';
 import {error, info, promptConfirm} from '../../utils/console';
 import {GitClient} from '../../utils/git';
+import {addTokenToGitHttpsUrl} from '../../utils/git/github-urls';
 import {getPr} from '../../utils/github';
 
 /* GraphQL schema for the response body for each pending PR. */
@@ -55,14 +55,14 @@ export async function rebasePr(
    */
   const previousBranchOrRevision = git.getCurrentBranchOrRevision();
   /* Get the PR information from Github. */
-  const pr = await getPr(PR_SCHEMA, prNumber, config.github);
+  const pr = await getPr(PR_SCHEMA, prNumber, git);
 
   const headRefName = pr.headRef.name;
   const baseRefName = pr.baseRef.name;
   const fullHeadRef = `${pr.headRef.repository.nameWithOwner}:${headRefName}`;
   const fullBaseRef = `${pr.baseRef.repository.nameWithOwner}:${baseRefName}`;
-  const headRefUrl = addAuthenticationToUrl(pr.headRef.repository.url, githubToken);
-  const baseRefUrl = addAuthenticationToUrl(pr.baseRef.repository.url, githubToken);
+  const headRefUrl = addTokenToGitHttpsUrl(pr.headRef.repository.url, githubToken);
+  const baseRefUrl = addTokenToGitHttpsUrl(pr.baseRef.repository.url, githubToken);
 
   // Note: Since we use a detached head for rebasing the PR and therefore do not have
   // remote-tracking branches configured, we need to set our expected ref and SHA. This
@@ -99,12 +99,12 @@ export async function rebasePr(
       info(`Pushing rebased PR #${prNumber} to ${fullHeadRef}`);
       git.run(['push', headRefUrl, `HEAD:${headRefName}`, forceWithLeaseFlag]);
       info(`Rebased and updated PR #${prNumber}`);
-      cleanUpGitState();
+      git.checkout(previousBranchOrRevision, true);
       process.exit(0);
     }
   } catch (err) {
     error(err.message);
-    cleanUpGitState();
+    git.checkout(previousBranchOrRevision, true);
     process.exit(1);
   }
 
@@ -127,23 +127,6 @@ export async function rebasePr(
     info(`Cleaning up git state, and restoring previous state.`);
   }
 
-  cleanUpGitState();
+  git.checkout(previousBranchOrRevision, true);
   process.exit(1);
-
-  /** Reset git back to the original branch. */
-  function cleanUpGitState() {
-    // Ensure that any outstanding rebases are aborted.
-    git.runGraceful(['rebase', '--abort'], {stdio: 'ignore'});
-    // Ensure that any changes in the current repo state are cleared.
-    git.runGraceful(['reset', '--hard'], {stdio: 'ignore'});
-    // Checkout the original branch from before the run began.
-    git.runGraceful(['checkout', previousBranchOrRevision], {stdio: 'ignore'});
-  }
-}
-
-/** Adds the provided token as username to the provided url. */
-function addAuthenticationToUrl(urlString: string, token: string) {
-  const url = new URL(urlString);
-  url.username = token;
-  return url.toString();
 }
diff --git a/dev-infra/pullapprove/BUILD.bazel b/dev-infra/pullapprove/BUILD.bazel
index 4cd28756f03be..8d452677495d9 100644
--- a/dev-infra/pullapprove/BUILD.bazel
+++ b/dev-infra/pullapprove/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@npm_bazel_typescript//:index.bzl", "ts_library")
+load("@npm//@bazel/typescript:index.bzl", "ts_library")
 load("//tools:defaults.bzl", "jasmine_node_test")
 
 ts_library(
diff --git a/dev-infra/release/BUILD.bazel b/dev-infra/release/BUILD.bazel
index 065521461eeee..16e0a5146a1be 100644
--- a/dev-infra/release/BUILD.bazel
+++ b/dev-infra/release/BUILD.bazel
@@ -1,18 +1,18 @@
-load("@npm_bazel_typescript//:index.bzl", "ts_library")
+load("@npm//@bazel/typescript:index.bzl", "ts_library")
 
 ts_library(
     name = "release",
     srcs = glob([
-        "*.ts",
+        "**/*.ts",
     ]),
     module_name = "@angular/dev-infra-private/release",
     visibility = ["//dev-infra:__subpackages__"],
     deps = [
+        "//dev-infra/release/build",
+        "//dev-infra/release/publish",
+        "//dev-infra/release/set-dist-tag",
         "//dev-infra/utils",
-        "@npm//@types/node",
-        "@npm//@types/shelljs",
         "@npm//@types/yargs",
-        "@npm//shelljs",
         "@npm//yargs",
     ],
 )
diff --git a/dev-infra/release/build/BUILD.bazel b/dev-infra/release/build/BUILD.bazel
new file mode 100644
index 0000000000000..679c0f2c1e108
--- /dev/null
+++ b/dev-infra/release/build/BUILD.bazel
@@ -0,0 +1,38 @@
+load("@npm//@bazel/typescript:index.bzl", "ts_library")
+load("//tools:defaults.bzl", "jasmine_node_test")
+
+ts_library(
+    name = "build",
+    srcs = glob(
+        [
+            "**/*.ts",
+        ],
+        exclude = ["*.spec.ts"],
+    ),
+    module_name = "@angular/dev-infra-private/release/build",
+    visibility = ["//dev-infra:__subpackages__"],
+    deps = [
+        "//dev-infra/release/config",
+        "//dev-infra/utils",
+        "@npm//@types/node",
+        "@npm//@types/yargs",
+    ],
+)
+
+ts_library(
+    name = "test_lib",
+    srcs = glob([
+        "*.spec.ts",
+    ]),
+    deps = [
+        ":build",
+        "//dev-infra/release/config",
+        "@npm//@types/jasmine",
+        "@npm//@types/node",
+    ],
+)
+
+jasmine_node_test(
+    name = "test",
+    deps = [":test_lib"],
+)
diff --git a/dev-infra/release/build/build-worker.ts b/dev-infra/release/build/build-worker.ts
new file mode 100644
index 0000000000000..5cc090495e3e6
--- /dev/null
+++ b/dev-infra/release/build/build-worker.ts
@@ -0,0 +1,32 @@
+/**
+ * @license
+ * Copyright Google LLC 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 will be spawned as a separate process when the `ng-dev release build` command is
+ * invoked. A separate process allows us to hide any superfluous stdout output from arbitrary
+ * build commands that we cannot control. This is necessary as the `ng-dev release build` command
+ * supports stdout JSON output that should be parsable and not polluted from other stdout messages.
+ */
+
+import {getReleaseConfig} from '../config/index';
+
+// Start the release package building.
+main();
+
+/** Main function for building the release packages. */
+async function main() {
+  if (process.send === undefined) {
+    throw Error('This script needs to be invoked as a NodeJS worker.');
+  }
+
+  const config = getReleaseConfig();
+  const builtPackages = await config.buildPackages();
+
+  // Transfer the built packages back to the parent process.
+  process.send(builtPackages);
+}
diff --git a/dev-infra/release/build/build.spec.ts b/dev-infra/release/build/build.spec.ts
new file mode 100644
index 0000000000000..9f6ca0fb809a2
--- /dev/null
+++ b/dev-infra/release/build/build.spec.ts
@@ -0,0 +1,77 @@
+/**
+ * @license
+ * Copyright Google LLC 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 releaseConfig from '../config/index';
+import {ReleaseBuildCommandModule} from './cli';
+import * as index from './index';
+
+describe('ng-dev release build', () => {
+  let npmPackages: string[];
+  let buildPackages: jasmine.Spy;
+
+  beforeEach(() => {
+    npmPackages = ['@angular/pkg1', '@angular/pkg2'];
+    buildPackages = jasmine.createSpy('buildPackages').and.resolveTo([
+      {name: '@angular/pkg1', outputPath: 'dist/pkg1'},
+      {name: '@angular/pkg2', outputPath: 'dist/pkg2'},
+    ]);
+
+    // We cannot test the worker process, so we fake the worker function and
+    // directly call the package build function.
+    spyOn(index, 'buildReleaseOutput').and.callFake(() => buildPackages());
+    // We need to stub out the `process.exit` function during tests as the CLI
+    // handler calls those in case of failures.
+    spyOn(process, 'exit');
+  });
+
+  /** Invokes the build command handler. */
+  async function invokeBuild({json}: {json?: boolean} = {}) {
+    spyOn(releaseConfig, 'getReleaseConfig')
+        .and.returnValue({npmPackages, buildPackages, generateReleaseNotesForHead: async () => {}});
+    await ReleaseBuildCommandModule.handler({json: !!json, $0: '', _: []});
+  }
+
+  it('should invoke configured build packages function', async () => {
+    await invokeBuild();
+    expect(buildPackages).toHaveBeenCalledTimes(1);
+    expect(process.exit).toHaveBeenCalledTimes(0);
+  });
+
+  it('should print built packages as JSON if `--json` is specified', async () => {
+    const writeSpy = spyOn(process.stdout, 'write');
+    await invokeBuild({json: true});
+
+    expect(buildPackages).toHaveBeenCalledTimes(1);
+    expect(writeSpy).toHaveBeenCalledTimes(1);
+
+    const jsonText = writeSpy.calls.mostRecent().args[0] as string;
+    const parsed = JSON.parse(jsonText);
+
+    expect(parsed).toEqual([
+      {name: '@angular/pkg1', outputPath: 'dist/pkg1'},
+      {name: '@angular/pkg2', outputPath: 'dist/pkg2'}
+    ]);
+    expect(process.exit).toHaveBeenCalledTimes(0);
+  });
+
+  it('should error if package has not been built', async () => {
+    // Set up an NPM package that is not built.
+    npmPackages.push('@angular/non-existent');
+
+    spyOn(console, 'error');
+    await invokeBuild();
+
+    expect(console.error).toHaveBeenCalledTimes(2);
+    expect(console.error)
+        .toHaveBeenCalledWith(
+            jasmine.stringMatching(`Release output missing for the following packages`));
+    expect(console.error).toHaveBeenCalledWith(jasmine.stringMatching(`- @angular/non-existent`));
+    expect(process.exit).toHaveBeenCalledTimes(1);
+    expect(process.exit).toHaveBeenCalledWith(1);
+  });
+});
diff --git a/dev-infra/release/build/cli.ts b/dev-infra/release/build/cli.ts
new file mode 100644
index 0000000000000..9898e5f74bf3b
--- /dev/null
+++ b/dev-infra/release/build/cli.ts
@@ -0,0 +1,75 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Arguments, Argv, CommandModule} from 'yargs';
+
+import {getConfig} from '../../utils/config';
+import {error, green, info, red, warn, yellow} from '../../utils/console';
+import {BuiltPackage, getReleaseConfig} from '../config/index';
+
+import {buildReleaseOutput} from './index';
+
+/** Command line options for building a release. */
+export interface ReleaseBuildOptions {
+  json: boolean;
+}
+
+/** Yargs command builder for configuring the `ng-dev release build` command. */
+function builder(argv: Argv): Argv<ReleaseBuildOptions> {
+  return argv.option('json', {
+    type: 'boolean',
+    description: 'Whether the built packages should be printed to stdout as JSON.',
+    default: false,
+  });
+}
+
+/** Yargs command handler for building a release. */
+async function handler(args: Arguments<ReleaseBuildOptions>) {
+  const {npmPackages} = getReleaseConfig();
+  let builtPackages = await buildReleaseOutput();
+
+  // If package building failed, print an error and exit with an error code.
+  if (builtPackages === null) {
+    error(red(`  ✘   Could not build release output. Please check output above.`));
+    process.exit(1);
+  }
+
+  // If no packages have been built, we assume that this is never correct
+  // and exit with an error code.
+  if (builtPackages.length === 0) {
+    error(red(`  ✘   No release packages have been built. Please ensure that the`));
+    error(red(`      build script is configured correctly in ".ng-dev".`));
+    process.exit(1);
+  }
+
+  const missingPackages =
+      npmPackages.filter(pkgName => !builtPackages!.find(b => b.name === pkgName));
+
+  // Check for configured release packages which have not been built. We want to
+  // error and exit if any configured package has not been built.
+  if (missingPackages.length > 0) {
+    error(red(`  ✘   Release output missing for the following packages:`));
+    missingPackages.forEach(pkgName => error(red(`      - ${pkgName}`)));
+    process.exit(1);
+  }
+
+  if (args.json) {
+    process.stdout.write(JSON.stringify(builtPackages, null, 2));
+  } else {
+    info(green('  ✓   Built release packages.'));
+    builtPackages.forEach(({name}) => info(green(`      - ${name}`)));
+  }
+}
+
+/** CLI command module for building release output. */
+export const ReleaseBuildCommandModule: CommandModule<{}, ReleaseBuildOptions> = {
+  builder,
+  handler,
+  command: 'build',
+  describe: 'Builds the release output for the current branch.',
+};
diff --git a/dev-infra/release/build/index.ts b/dev-infra/release/build/index.ts
new file mode 100644
index 0000000000000..7a024490a482a
--- /dev/null
+++ b/dev-infra/release/build/index.ts
@@ -0,0 +1,36 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {fork} from 'child_process';
+import {BuiltPackage} from '../config/index';
+
+/**
+ * Builds the release output without polluting the process stdout. Build scripts commonly
+ * print messages to stderr or stdout. This is fine in most cases, but sometimes other tooling
+ * reserves stdout for data transfer (e.g. when `ng release build --json` is invoked). To not
+ * pollute the stdout in such cases, we launch a child process for building the release packages
+ * and redirect all stdout output to the stderr channel (which can be read in the terminal).
+ */
+export async function buildReleaseOutput(): Promise<BuiltPackage[]|null> {
+  return new Promise(resolve => {
+    const buildProcess = fork(require.resolve('./build-worker'), [], {
+      // The stdio option is set to redirect any "stdout" output directly to the "stderr" file
+      // descriptor. An additional "ipc" file descriptor is created to support communication with
+      // the build process. https://nodejs.org/api/child_process.html#child_process_options_stdio.
+      stdio: ['inherit', 2, 2, 'ipc'],
+    });
+    let builtPackages: BuiltPackage[]|null = null;
+
+    // The child process will pass the `buildPackages()` output through the
+    // IPC channel. We keep track of it so that we can use it as resolve value.
+    buildProcess.on('message', buildResponse => builtPackages = buildResponse);
+
+    // On child process exit, resolve the promise with the received output.
+    buildProcess.on('exit', () => resolve(builtPackages));
+  });
+}
diff --git a/dev-infra/release/cli.ts b/dev-infra/release/cli.ts
index bd2646260e074..988b34643792c 100644
--- a/dev-infra/release/cli.ts
+++ b/dev-infra/release/cli.ts
@@ -6,12 +6,23 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import * as yargs from 'yargs';
-import {buildEnvStamp} from './env-stamp';
+
+import {ReleaseBuildCommandModule} from './build/cli';
+import {ReleasePublishCommandModule} from './publish/cli';
+import {ReleaseSetDistTagCommand} from './set-dist-tag/cli';
+import {buildEnvStamp} from './stamping/env-stamp';
 
 /** Build the parser for the release commands. */
 export function buildReleaseParser(localYargs: yargs.Argv) {
-  return localYargs.help().strict().demandCommand().command(
-      'build-env-stamp', 'Build the environment stamping information', {}, () => buildEnvStamp());
+  return localYargs.help()
+      .strict()
+      .demandCommand()
+      .command(ReleasePublishCommandModule)
+      .command(ReleaseBuildCommandModule)
+      .command(ReleaseSetDistTagCommand)
+      .command(
+          'build-env-stamp', 'Build the environment stamping information', {},
+          () => buildEnvStamp());
 }
 
 if (require.main === module) {
diff --git a/dev-infra/release/config/BUILD.bazel b/dev-infra/release/config/BUILD.bazel
new file mode 100644
index 0000000000000..186db7f542f57
--- /dev/null
+++ b/dev-infra/release/config/BUILD.bazel
@@ -0,0 +1,14 @@
+load("@npm//@bazel/typescript:index.bzl", "ts_library")
+
+ts_library(
+    name = "config",
+    srcs = glob([
+        "**/*.ts",
+    ]),
+    module_name = "@angular/dev-infra-private/release/config",
+    visibility = ["//dev-infra:__subpackages__"],
+    deps = [
+        "//dev-infra/utils",
+        "@npm//@types/semver",
+    ],
+)
diff --git a/dev-infra/release/config/index.ts b/dev-infra/release/config/index.ts
new file mode 100644
index 0000000000000..da1f75911600b
--- /dev/null
+++ b/dev-infra/release/config/index.ts
@@ -0,0 +1,63 @@
+/**
+ * @license
+ * Copyright Google LLC 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 semver from 'semver';
+
+import {assertNoErrors, getConfig, NgDevConfig} from '../../utils/config';
+
+/** Interface describing a built package. */
+export interface BuiltPackage {
+  /** Name of the package. */
+  name: string;
+  /** Path to the package output directory. */
+  outputPath: string;
+}
+
+/** Configuration for staging and publishing a release. */
+export interface ReleaseConfig {
+  /** Registry URL used for publishing release packages. Defaults to the NPM registry. */
+  publishRegistry?: string;
+  /** List of NPM packages that are published as part of this project. */
+  npmPackages: string[];
+  /** Builds release packages and returns a list of paths pointing to the output. */
+  buildPackages: () => Promise<BuiltPackage[]|null>;
+  /** Generates the release notes from the most recent tag to `HEAD`. */
+  generateReleaseNotesForHead: (outputPath: string) => Promise<void>;
+  /**
+   * Gets a pattern for extracting the release notes of the a given version.
+   * @returns A pattern matching the notes for a given version (including the header).
+   */
+  // TODO: Remove this in favor of a canonical changelog format across the Angular organization.
+  extractReleaseNotesPattern?: (version: semver.SemVer) => RegExp;
+}
+
+/** Configuration for releases in the dev-infra configuration. */
+export type DevInfraReleaseConfig = NgDevConfig<{release: ReleaseConfig}>;
+
+/** Retrieve and validate the config as `ReleaseConfig`. */
+export function getReleaseConfig(config: Partial<DevInfraReleaseConfig> = getConfig()):
+    ReleaseConfig {
+  // List of errors encountered validating the config.
+  const errors: string[] = [];
+
+  if (config.release === undefined) {
+    errors.push(`No configuration defined for "release"`);
+  }
+  if (config.release?.npmPackages === undefined) {
+    errors.push(`No "npmPackages" configured for releasing.`);
+  }
+  if (config.release?.buildPackages === undefined) {
+    errors.push(`No "buildPackages" function configured for releasing.`);
+  }
+  if (config.release?.generateReleaseNotesForHead === undefined) {
+    errors.push(`No "generateReleaseNotesForHead" function configured for releasing.`);
+  }
+
+  assertNoErrors(errors);
+  return config.release!;
+}
diff --git a/dev-infra/release/publish/BUILD.bazel b/dev-infra/release/publish/BUILD.bazel
new file mode 100644
index 0000000000000..a2f62b7dc58bf
--- /dev/null
+++ b/dev-infra/release/publish/BUILD.bazel
@@ -0,0 +1,25 @@
+load("@npm//@bazel/typescript:index.bzl", "ts_library")
+
+ts_library(
+    name = "publish",
+    srcs = glob([
+        "**/*.ts",
+    ]),
+    module_name = "@angular/dev-infra-private/release/publish",
+    visibility = ["//dev-infra:__subpackages__"],
+    deps = [
+        "//dev-infra/pr/merge",
+        "//dev-infra/release/config",
+        "//dev-infra/release/versioning",
+        "//dev-infra/utils",
+        "@npm//@octokit/rest",
+        "@npm//@types/inquirer",
+        "@npm//@types/node",
+        "@npm//@types/semver",
+        "@npm//@types/yargs",
+        "@npm//inquirer",
+        "@npm//ora",
+        "@npm//semver",
+        "@npm//typed-graphqlify",
+    ],
+)
diff --git a/dev-infra/release/publish/actions-error.ts b/dev-infra/release/publish/actions-error.ts
new file mode 100644
index 0000000000000..517b7bcf47d6a
--- /dev/null
+++ b/dev-infra/release/publish/actions-error.ts
@@ -0,0 +1,29 @@
+/**
+ * @license
+ * Copyright Google LLC 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
+ */
+
+/** Error that will be thrown if the user manually aborted a release action. */
+export class UserAbortedReleaseActionError extends Error {
+  constructor() {
+    super();
+    // Set the prototype explicitly because in ES5, the prototype is accidentally lost due to
+    // a limitation in down-leveling.
+    // https://github.com/Microsoft/TypeScript/wiki/FAQ#why-doesnt-extending-built-ins-like-error-array-and-map-work.
+    Object.setPrototypeOf(this, UserAbortedReleaseActionError.prototype);
+  }
+}
+
+/** Error that will be thrown if the action has been aborted due to a fatal error. */
+export class FatalReleaseActionError extends Error {
+  constructor() {
+    super();
+    // Set the prototype explicitly because in ES5, the prototype is accidentally lost due to
+    // a limitation in down-leveling.
+    // https://github.com/Microsoft/TypeScript/wiki/FAQ#why-doesnt-extending-built-ins-like-error-array-and-map-work.
+    Object.setPrototypeOf(this, FatalReleaseActionError.prototype);
+  }
+}
diff --git a/dev-infra/release/publish/actions.ts b/dev-infra/release/publish/actions.ts
new file mode 100644
index 0000000000000..2bfbbb44b9619
--- /dev/null
+++ b/dev-infra/release/publish/actions.ts
@@ -0,0 +1,540 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {promises as fs} from 'fs';
+import * as ora from 'ora';
+import {join} from 'path';
+import * as semver from 'semver';
+
+import {debug, error, green, info, promptConfirm, red, warn, yellow} from '../../utils/console';
+import {getListCommitsInBranchUrl, getRepositoryGitUrl} from '../../utils/git/github-urls';
+import {GitClient} from '../../utils/git/index';
+import {BuiltPackage, ReleaseConfig} from '../config';
+import {ActiveReleaseTrains} from '../versioning/active-release-trains';
+import {runNpmPublish} from '../versioning/npm-publish';
+
+import {FatalReleaseActionError, UserAbortedReleaseActionError} from './actions-error';
+import {getCommitMessageForRelease, getReleaseNoteCherryPickCommitMessage} from './commit-message';
+import {changelogPath, packageJsonPath, waitForPullRequestInterval} from './constants';
+import {invokeReleaseBuildCommand, invokeYarnInstallCommand} from './external-commands';
+import {findOwnedForksOfRepoQuery} from './graphql-queries';
+import {getPullRequestState} from './pull-request-state';
+import {getDefaultExtractReleaseNotesPattern, getLocalChangelogFilePath} from './release-notes';
+
+/** Interface describing a Github repository. */
+export interface GithubRepo {
+  owner: string;
+  name: string;
+}
+
+/** Interface describing a Github pull request. */
+export interface PullRequest {
+  /** Unique id for the pull request (i.e. the PR number). */
+  id: number;
+  /** URL that resolves to the pull request in Github. */
+  url: string;
+  /** Fork containing the head branch of this pull request. */
+  fork: GithubRepo;
+  /** Branch name in the fork that defines this pull request. */
+  forkBranch: string;
+}
+
+/** Constructor type for instantiating a release action */
+export interface ReleaseActionConstructor<T extends ReleaseAction = ReleaseAction> {
+  /** Whether the release action is currently active. */
+  isActive(active: ActiveReleaseTrains): Promise<boolean>;
+  /** Constructs a release action. */
+  new(...args: [ActiveReleaseTrains, GitClient, ReleaseConfig, string]): T;
+}
+
+/**
+ * Abstract base class for a release action. A release action is selectable by the caretaker
+ * if active, and can perform changes for releasing, such as staging a release, bumping the
+ * version, cherry-picking the changelog, branching off from master. etc.
+ */
+export abstract class ReleaseAction {
+  /** Whether the release action is currently active. */
+  static isActive(_trains: ActiveReleaseTrains): Promise<boolean> {
+    throw Error('Not implemented.');
+  }
+
+  /** Gets the description for a release action. */
+  abstract getDescription(): Promise<string>;
+  /**
+   * Performs the given release action.
+   * @throws {UserAbortedReleaseActionError} When the user manually aborted the action.
+   * @throws {FatalReleaseActionError} When the action has been aborted due to a fatal error.
+   */
+  abstract perform(): Promise<void>;
+
+  /** Cached found fork of the configured project. */
+  private _cachedForkRepo: GithubRepo|null = null;
+
+  constructor(
+      protected active: ActiveReleaseTrains, protected git: GitClient,
+      protected config: ReleaseConfig, protected projectDir: string) {}
+
+  /** Updates the version in the project top-level `package.json` file. */
+  protected async updateProjectVersion(newVersion: semver.SemVer) {
+    const pkgJsonPath = join(this.projectDir, packageJsonPath);
+    const pkgJson = JSON.parse(await fs.readFile(pkgJsonPath, 'utf8'));
+    pkgJson.version = newVersion.format();
+    // Write the `package.json` file. Note that we add a trailing new line
+    // to avoid unnecessary diff. IDEs usually add a trailing new line.
+    await fs.writeFile(pkgJsonPath, `${JSON.stringify(pkgJson, null, 2)}\n`);
+    info(green(`  ✓   Updated project version to ${pkgJson.version}`));
+  }
+
+  /** Gets the most recent commit of a specified branch. */
+  private async _getCommitOfBranch(branchName: string): Promise<string> {
+    const {data: {commit}} =
+        await this.git.github.repos.getBranch({...this.git.remoteParams, branch: branchName});
+    return commit.sha;
+  }
+
+  /** Verifies that the latest commit for the given branch is passing all statuses. */
+  protected async verifyPassingGithubStatus(branchName: string) {
+    const commitSha = await this._getCommitOfBranch(branchName);
+    const {data: {state}} = await this.git.github.repos.getCombinedStatusForRef(
+        {...this.git.remoteParams, ref: commitSha});
+    const branchCommitsUrl = getListCommitsInBranchUrl(this.git, branchName);
+
+    if (state === 'failure') {
+      error(
+          red(`  ✘   Cannot stage release. Commit "${commitSha}" does not pass all github ` +
+              'status checks. Please make sure this commit passes all checks before re-running.'));
+      error(`      Please have a look at: ${branchCommitsUrl}`);
+
+      if (await promptConfirm('Do you want to ignore the Github status and proceed?')) {
+        info(yellow(
+            '  ⚠   Upstream commit is failing CI checks, but status has been forcibly ignored.'));
+        return;
+      }
+      throw new UserAbortedReleaseActionError();
+    } else if (state === 'pending') {
+      error(
+          red(`  ✘   Commit "${commitSha}" still has pending github statuses that ` +
+              'need to succeed before staging a release.'));
+      error(red(`      Please have a look at: ${branchCommitsUrl}`));
+      if (await promptConfirm('Do you want to ignore the Github status and proceed?')) {
+        info(yellow('  ⚠   Upstream commit is pending CI, but status has been forcibly ignored.'));
+        return;
+      }
+      throw new UserAbortedReleaseActionError();
+    }
+
+    info(green('  ✓   Upstream commit is passing all github status checks.'));
+  }
+
+  /** Generates the changelog for the specified for the current `HEAD`. */
+  private async _generateReleaseNotesForHead(version: semver.SemVer) {
+    const changelogPath = getLocalChangelogFilePath(this.projectDir);
+    await this.config.generateReleaseNotesForHead(changelogPath);
+    info(green(`  ✓   Updated the changelog to capture changes for "${version}".`));
+  }
+
+  /** Extract the release notes for the given version from the changelog file. */
+  private _extractReleaseNotesForVersion(changelogContent: string, version: semver.SemVer): string
+      |null {
+    const pattern = this.config.extractReleaseNotesPattern !== undefined ?
+        this.config.extractReleaseNotesPattern(version) :
+        getDefaultExtractReleaseNotesPattern(version);
+    const matchedNotes = pattern.exec(changelogContent);
+    return matchedNotes === null ? null : matchedNotes[1];
+  }
+
+  /**
+   * Prompts the user for potential release notes edits that need to be made. Once
+   * confirmed, a new commit for the release point is created.
+   */
+  protected async waitForEditsAndCreateReleaseCommit(newVersion: semver.SemVer) {
+    info(yellow(
+        '  ⚠   Please review the changelog and ensure that the log contains only changes ' +
+        'that apply to the public API surface. Manual changes can be made. When done, please ' +
+        'proceed with the prompt below.'));
+
+    if (!await promptConfirm('Do you want to proceed and commit the changes?')) {
+      throw new UserAbortedReleaseActionError();
+    }
+
+    // Commit message for the release point.
+    const commitMessage = getCommitMessageForRelease(newVersion);
+    // Create a release staging commit including changelog and version bump.
+    await this.createCommit(commitMessage, [packageJsonPath, changelogPath]);
+
+    info(green(`  ✓   Created release commit for: "${newVersion}".`));
+  }
+
+  /**
+   * Gets an owned fork for the configured project of the authenticated user. Aborts the
+   * process with an error if no fork could be found. Also caches the determined fork
+   * repository as the authenticated user cannot change during action execution.
+   */
+  private async _getForkOfAuthenticatedUser(): Promise<GithubRepo> {
+    if (this._cachedForkRepo !== null) {
+      return this._cachedForkRepo;
+    }
+
+    const {owner, name} = this.git.remoteConfig;
+    const result = await this.git.github.graphql.query(findOwnedForksOfRepoQuery, {owner, name});
+    const forks = result.repository.forks.nodes;
+
+    if (forks.length === 0) {
+      error(red('  ✘   Unable to find fork for currently authenticated user.'));
+      error(red(`      Please ensure you created a fork of: ${owner}/${name}.`));
+      throw new FatalReleaseActionError();
+    }
+
+    const fork = forks[0];
+    return this._cachedForkRepo = {owner: fork.owner.login, name: fork.name};
+  }
+
+  /** Checks whether a given branch name is reserved in the specified repository. */
+  private async _isBranchNameReservedInRepo(repo: GithubRepo, name: string): Promise<boolean> {
+    try {
+      await this.git.github.repos.getBranch({owner: repo.owner, repo: repo.name, branch: name});
+      return true;
+    } catch (e) {
+      // If the error has a `status` property set to `404`, then we know that the branch
+      // does not exist. Otherwise, it might be an API error that we want to report/re-throw.
+      if (e.status === 404) {
+        return false;
+      }
+      throw e;
+    }
+  }
+
+  /** Finds a non-reserved branch name in the repository with respect to a base name. */
+  private async _findAvailableBranchName(repo: GithubRepo, baseName: string): Promise<string> {
+    let currentName = baseName;
+    let suffixNum = 0;
+    while (await this._isBranchNameReservedInRepo(repo, currentName)) {
+      suffixNum++;
+      currentName = `${baseName}_${suffixNum}`;
+    }
+    return currentName;
+  }
+
+  /**
+   * Creates a local branch from the current Git `HEAD`. Will override
+   * existing branches in case of a collision.
+   */
+  protected async createLocalBranchFromHead(branchName: string) {
+    this.git.run(['checkout', '-B', branchName]);
+  }
+
+  /** Pushes the current Git `HEAD` to the given remote branch in the configured project. */
+  protected async pushHeadToRemoteBranch(branchName: string) {
+    // Push the local `HEAD` to the remote branch in the configured project.
+    this.git.run(['push', this.git.repoGitUrl, `HEAD:refs/heads/${branchName}`]);
+  }
+
+  /**
+   * Pushes the current Git `HEAD` to a fork for the configured project that is owned by
+   * the authenticated user. If the specified branch name exists in the fork already, a
+   * unique one will be generated based on the proposed name to avoid collisions.
+   * @param proposedBranchName Proposed branch name for the fork.
+   * @param trackLocalBranch Whether the fork branch should be tracked locally. i.e. whether
+   *   a local branch with remote tracking should be set up.
+   * @returns The fork and branch name containing the pushed changes.
+   */
+  private async _pushHeadToFork(proposedBranchName: string, trackLocalBranch: boolean):
+      Promise<{fork: GithubRepo, branchName: string}> {
+    const fork = await this._getForkOfAuthenticatedUser();
+    // Compute a repository URL for pushing to the fork. Note that we want to respect
+    // the SSH option from the dev-infra github configuration.
+    const repoGitUrl =
+        getRepositoryGitUrl({...fork, useSsh: this.git.remoteConfig.useSsh}, this.git.githubToken);
+    const branchName = await this._findAvailableBranchName(fork, proposedBranchName);
+    const pushArgs: string[] = [];
+    // If a local branch should track the remote fork branch, create a branch matching
+    // the remote branch. Later with the `git push`, the remote is set for the branch.
+    if (trackLocalBranch) {
+      await this.createLocalBranchFromHead(branchName);
+      pushArgs.push('--set-upstream');
+    }
+    // Push the local `HEAD` to the remote branch in the fork.
+    this.git.run(['push', repoGitUrl, `HEAD:refs/heads/${branchName}`, ...pushArgs]);
+    return {fork, branchName};
+  }
+
+  /**
+   * Pushes changes to a fork for the configured project that is owned by the currently
+   * authenticated user. A pull request is then created for the pushed changes on the
+   * configured project that targets the specified target branch.
+   * @returns An object describing the created pull request.
+   */
+  protected async pushChangesToForkAndCreatePullRequest(
+      targetBranch: string, proposedForkBranchName: string, title: string,
+      body?: string): Promise<PullRequest> {
+    const repoSlug = `${this.git.remoteParams.owner}/${this.git.remoteParams.repo}`;
+    const {fork, branchName} = await this._pushHeadToFork(proposedForkBranchName, true);
+    const {data} = await this.git.github.pulls.create({
+      ...this.git.remoteParams,
+      head: `${fork.owner}:${branchName}`,
+      base: targetBranch,
+      body,
+      title,
+    });
+
+    info(green(`  ✓   Created pull request #${data.number} in ${repoSlug}.`));
+    return {
+      id: data.number,
+      url: data.html_url,
+      fork,
+      forkBranch: branchName,
+    };
+  }
+
+  /**
+   * Waits for the given pull request to be merged. Default interval for checking the Github
+   * API is 10 seconds (to not exceed any rate limits). If the pull request is closed without
+   * merge, the script will abort gracefully (considering a manual user abort).
+   */
+  protected async waitForPullRequestToBeMerged(id: number, interval = waitForPullRequestInterval):
+      Promise<void> {
+    return new Promise((resolve, reject) => {
+      debug(`Waiting for pull request #${id} to be merged.`);
+
+      const spinner = ora().start(`Waiting for pull request #${id} to be merged.`);
+      const intervalId = setInterval(async () => {
+        const prState = await getPullRequestState(this.git, id);
+        if (prState === 'merged') {
+          spinner.stop();
+          info(green(`  ✓   Pull request #${id} has been merged.`));
+          clearInterval(intervalId);
+          resolve();
+        } else if (prState === 'closed') {
+          spinner.stop();
+          warn(yellow(`  ✘   Pull request #${id} has been closed.`));
+          clearInterval(intervalId);
+          reject(new UserAbortedReleaseActionError());
+        }
+      }, interval);
+    });
+  }
+
+  /**
+   * Prepend releases notes for a version published in a given branch to the changelog in
+   * the current Git `HEAD`. This is useful for cherry-picking the changelog.
+   * @returns A boolean indicating whether the release notes have been prepended.
+   */
+  protected async prependReleaseNotesFromVersionBranch(
+      version: semver.SemVer, containingBranch: string): Promise<boolean> {
+    const {data} = await this.git.github.repos.getContents(
+        {...this.git.remoteParams, path: '/' + changelogPath, ref: containingBranch});
+    const branchChangelog = Buffer.from(data.content, 'base64').toString();
+    let releaseNotes = this._extractReleaseNotesForVersion(branchChangelog, version);
+    // If no release notes could be extracted, return "false" so that the caller
+    // can tell that changelog prepending failed.
+    if (releaseNotes === null) {
+      return false;
+    }
+    const localChangelogPath = getLocalChangelogFilePath(this.projectDir);
+    const localChangelog = await fs.readFile(localChangelogPath, 'utf8');
+    // If the extracted release notes do not have any new lines at the end and the
+    // local changelog is not empty, we add lines manually so that there is space
+    // between the previous and cherry-picked release notes.
+    if (!/[\r\n]+$/.test(releaseNotes) && localChangelog !== '') {
+      releaseNotes = `${releaseNotes}\n\n`;
+    }
+    // Prepend the extracted release notes to the local changelog and write it back.
+    await fs.writeFile(localChangelogPath, releaseNotes + localChangelog);
+    return true;
+  }
+
+  /** Checks out an upstream branch with a detached head. */
+  protected async checkoutUpstreamBranch(branchName: string) {
+    this.git.run(['fetch', this.git.repoGitUrl, branchName]);
+    this.git.run(['checkout', 'FETCH_HEAD', '--detach']);
+  }
+
+  /**
+   * Creates a commit for the specified files with the given message.
+   * @param message Message for the created commit
+   * @param files List of project-relative file paths to be commited.
+   */
+  protected async createCommit(message: string, files: string[]) {
+    this.git.run(['commit', '--no-verify', '-m', message, ...files]);
+  }
+
+  /**
+   * Creates a cherry-pick commit for the release notes of the specified version that
+   * has been pushed to the given branch.
+   * @returns a boolean indicating whether the commit has been created successfully.
+   */
+  protected async createCherryPickReleaseNotesCommitFrom(
+      version: semver.SemVer, branchName: string): Promise<boolean> {
+    const commitMessage = getReleaseNoteCherryPickCommitMessage(version);
+
+    // Fetch, extract and prepend the release notes to the local changelog. If that is not
+    // possible, abort so that we can ask the user to manually cherry-pick the changelog.
+    if (!await this.prependReleaseNotesFromVersionBranch(version, branchName)) {
+      return false;
+    }
+
+    // Create a changelog cherry-pick commit.
+    await this.createCommit(commitMessage, [changelogPath]);
+
+    info(green(`  ✓   Created changelog cherry-pick commit for: "${version}".`));
+    return true;
+  }
+
+  /**
+   * Stages the specified new version for the current branch and creates a
+   * pull request that targets the given base branch.
+   * @returns an object describing the created pull request.
+   */
+  protected async stageVersionForBranchAndCreatePullRequest(
+      newVersion: semver.SemVer, pullRequestBaseBranch: string): Promise<PullRequest> {
+    await this.updateProjectVersion(newVersion);
+    await this._generateReleaseNotesForHead(newVersion);
+    await this.waitForEditsAndCreateReleaseCommit(newVersion);
+
+    const pullRequest = await this.pushChangesToForkAndCreatePullRequest(
+        pullRequestBaseBranch, `release-stage-${newVersion}`,
+        `Bump version to "v${newVersion}" with changelog.`);
+
+    info(green('  ✓   Release staging pull request has been created.'));
+    info(yellow(`      Please ask team members to review: ${pullRequest.url}.`));
+
+    return pullRequest;
+  }
+
+  /**
+   * Checks out the specified target branch, verifies its CI status and stages
+   * the specified new version in order to create a pull request.
+   * @returns an object describing the created pull request.
+   */
+  protected async checkoutBranchAndStageVersion(newVersion: semver.SemVer, stagingBranch: string):
+      Promise<PullRequest> {
+    await this.verifyPassingGithubStatus(stagingBranch);
+    await this.checkoutUpstreamBranch(stagingBranch);
+    return await this.stageVersionForBranchAndCreatePullRequest(newVersion, stagingBranch);
+  }
+
+  /**
+   * Cherry-picks the release notes of a version that have been pushed to a given branch
+   * into the `next` primary development branch. A pull request is created for this.
+   * @returns a boolean indicating successful creation of the cherry-pick pull request.
+   */
+  protected async cherryPickChangelogIntoNextBranch(
+      newVersion: semver.SemVer, stagingBranch: string): Promise<boolean> {
+    const nextBranch = this.active.next.branchName;
+    const commitMessage = getReleaseNoteCherryPickCommitMessage(newVersion);
+
+    // Checkout the next branch.
+    await this.checkoutUpstreamBranch(nextBranch);
+
+    // Cherry-pick the release notes into the current branch. If it fails,
+    // ask the user to manually copy the release notes into the next branch.
+    if (!await this.createCherryPickReleaseNotesCommitFrom(newVersion, stagingBranch)) {
+      error(yellow(`  ✘   Could not cherry-pick release notes for v${newVersion}.`));
+      error(
+          yellow(`      Please copy the release notes manually into the "${nextBranch}" branch.`));
+      return false;
+    }
+
+    // Create a cherry-pick pull request that should be merged by the caretaker.
+    const {url} = await this.pushChangesToForkAndCreatePullRequest(
+        nextBranch, `changelog-cherry-pick-${newVersion}`, commitMessage,
+        `Cherry-picks the changelog from the "${stagingBranch}" branch to the next ` +
+            `branch (${nextBranch}).`);
+
+    info(green(
+        `  ✓   Pull request for cherry-picking the changelog into "${nextBranch}" ` +
+        'has been created.'));
+    info(yellow(`      Please ask team members to review: ${url}.`));
+    return true;
+  }
+
+  /**
+   * Creates a Github release for the specified version in the configured project.
+   * The release is created by tagging the specified commit SHA.
+   */
+  private async _createGithubReleaseForVersion(
+      newVersion: semver.SemVer, versionBumpCommitSha: string) {
+    const tagName = newVersion.format();
+    await this.git.github.git.createRef({
+      ...this.git.remoteParams,
+      ref: `refs/tags/${tagName}`,
+      sha: versionBumpCommitSha,
+    });
+    info(green(`  ✓   Tagged v${newVersion} release upstream.`));
+
+    await this.git.github.repos.createRelease({
+      ...this.git.remoteParams,
+      name: `v${newVersion}`,
+      tag_name: tagName,
+    });
+    info(green(`  ✓   Created v${newVersion} release in Github.`));
+  }
+
+  /**
+   * Builds and publishes the given version in the specified branch.
+   * @param newVersion The new version to be published.
+   * @param publishBranch Name of the branch that contains the new version.
+   * @param npmDistTag NPM dist tag where the version should be published to.
+   */
+  protected async buildAndPublish(
+      newVersion: semver.SemVer, publishBranch: string, npmDistTag: string) {
+    const versionBumpCommitSha = await this._getCommitOfBranch(publishBranch);
+
+    if (!await this._isCommitForVersionStaging(newVersion, versionBumpCommitSha)) {
+      error(red(`  ✘   Latest commit in "${publishBranch}" branch is not a staging commit.`));
+      error(red('      Please make sure the staging pull request has been merged.'));
+      throw new FatalReleaseActionError();
+    }
+
+    // Checkout the publish branch and build the release packages.
+    await this.checkoutUpstreamBranch(publishBranch);
+
+    // Install the project dependencies for the publish branch, and then build the release
+    // packages. Note that we do not directly call the build packages function from the release
+    // config. We only want to build and publish packages that have been configured in the given
+    // publish branch. e.g. consider we publish patch version and a new package has been
+    // created in the `next` branch. The new package would not be part of the patch branch,
+    // so we cannot build and publish it.
+    await invokeYarnInstallCommand(this.projectDir);
+    const builtPackages = await invokeReleaseBuildCommand();
+
+    // Create a Github release for the new version.
+    await this._createGithubReleaseForVersion(newVersion, versionBumpCommitSha);
+
+    // Walk through all built packages and publish them to NPM.
+    for (const builtPackage of builtPackages) {
+      await this._publishBuiltPackageToNpm(builtPackage, npmDistTag);
+    }
+
+    info(green('  ✓   Published all packages successfully'));
+  }
+
+  /** Publishes the given built package to NPM with the specified NPM dist tag. */
+  private async _publishBuiltPackageToNpm(pkg: BuiltPackage, npmDistTag: string) {
+    debug(`Starting publish of "${pkg.name}".`);
+    const spinner = ora().start(`Publishing "${pkg.name}"`);
+
+    try {
+      await runNpmPublish(pkg.outputPath, npmDistTag, this.config.publishRegistry);
+      spinner.stop();
+      info(green(`  ✓   Successfully published "${pkg.name}.`));
+    } catch (e) {
+      spinner.stop();
+      error(e);
+      error(red(`  ✘   An error occurred while publishing "${pkg.name}".`));
+      throw new FatalReleaseActionError();
+    }
+  }
+
+  /** Checks whether the given commit represents a staging commit for the specified version. */
+  private async _isCommitForVersionStaging(version: semver.SemVer, commitSha: string) {
+    const {data} =
+        await this.git.github.repos.getCommit({...this.git.remoteParams, ref: commitSha});
+    return data.commit.message.startsWith(getCommitMessageForRelease(version));
+  }
+}
diff --git a/dev-infra/release/publish/actions/configure-next-as-major.ts b/dev-infra/release/publish/actions/configure-next-as-major.ts
new file mode 100644
index 0000000000000..b4ced15a52009
--- /dev/null
+++ b/dev-infra/release/publish/actions/configure-next-as-major.ts
@@ -0,0 +1,53 @@
+/**
+ * @license
+ * Copyright Google LLC 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 semver from 'semver';
+
+import {green, info, yellow} from '../../../utils/console';
+import {ActiveReleaseTrains} from '../../versioning/active-release-trains';
+import {ReleaseAction} from '../actions';
+import {getCommitMessageForNextBranchMajorSwitch} from '../commit-message';
+import {packageJsonPath} from '../constants';
+
+/**
+ * Release action that configures the active next release-train to be for a major
+ * version. This means that major changes can land in the next branch.
+ */
+export class ConfigureNextAsMajorAction extends ReleaseAction {
+  private _newVersion = semver.parse(`${this.active.next.version.major + 1}.0.0-next.0`)!;
+
+  async getDescription() {
+    const {branchName} = this.active.next;
+    const newVersion = this._newVersion;
+    return `Configure the "${branchName}" branch to be released as major (v${newVersion}).`;
+  }
+
+  async perform() {
+    const {branchName} = this.active.next;
+    const newVersion = this._newVersion;
+
+    await this.verifyPassingGithubStatus(branchName);
+    await this.checkoutUpstreamBranch(branchName);
+    await this.updateProjectVersion(newVersion);
+    await this.createCommit(
+        getCommitMessageForNextBranchMajorSwitch(newVersion), [packageJsonPath]);
+    const pullRequest = await this.pushChangesToForkAndCreatePullRequest(
+        branchName, `switch-next-to-major-${newVersion}`,
+        `Configure next branch to receive major changes for v${newVersion}`);
+
+    info(green('  ✓   Next branch update pull request has been created.'));
+    info(yellow(`      Please ask team members to review: ${pullRequest.url}.`));
+  }
+
+  static async isActive(active: ActiveReleaseTrains) {
+    // The `next` branch can always be switched to a major version, unless it already
+    // is targeting a new major. A major can contain minor changes, so we can always
+    // change the target from a minor to a major.
+    return !active.next.isMajor;
+  }
+}
diff --git a/dev-infra/release/publish/actions/cut-lts-patch.ts b/dev-infra/release/publish/actions/cut-lts-patch.ts
new file mode 100644
index 0000000000000..a3593f4929df8
--- /dev/null
+++ b/dev-infra/release/publish/actions/cut-lts-patch.ts
@@ -0,0 +1,93 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {ListChoiceOptions, prompt} from 'inquirer';
+import * as semver from 'semver';
+
+import {ActiveReleaseTrains} from '../../versioning/active-release-trains';
+import {semverInc} from '../../versioning/inc-semver';
+import {fetchLongTermSupportBranchesFromNpm} from '../../versioning/long-term-support';
+import {ReleaseAction} from '../actions';
+
+/** Interface describing an LTS version branch. */
+interface LtsBranch {
+  /** Name of the branch. */
+  name: string;
+  /** Most recent version for the given LTS branch. */
+  version: semver.SemVer;
+  /** NPM dist tag for the LTS version. */
+  npmDistTag: string;
+}
+
+/**
+ * Release action that cuts a new patch release for an active release-train in the long-term
+ * support phase. The patch segment is incremented. The changelog is generated for the new
+ * patch version, but also needs to be cherry-picked into the next development branch.
+ */
+export class CutLongTermSupportPatchAction extends ReleaseAction {
+  /** Promise resolving an object describing long-term support branches. */
+  ltsBranches = fetchLongTermSupportBranchesFromNpm(this.config);
+
+  async getDescription() {
+    const {active} = await this.ltsBranches;
+    return `Cut a new release for an active LTS branch (${active.length} active).`;
+  }
+
+  async perform() {
+    const ltsBranch = await this._promptForTargetLtsBranch();
+    const newVersion = semverInc(ltsBranch.version, 'patch');
+    const {id} = await this.checkoutBranchAndStageVersion(newVersion, ltsBranch.name);
+
+    await this.waitForPullRequestToBeMerged(id);
+    await this.buildAndPublish(newVersion, ltsBranch.name, ltsBranch.npmDistTag);
+    await this.cherryPickChangelogIntoNextBranch(newVersion, ltsBranch.name);
+  }
+
+  /** Prompts the user to select an LTS branch for which a patch should but cut. */
+  private async _promptForTargetLtsBranch(): Promise<LtsBranch> {
+    const {active, inactive} = await this.ltsBranches;
+    const activeBranchChoices = active.map(branch => this._getChoiceForLtsBranch(branch));
+
+    // If there are inactive LTS branches, we allow them to be selected. In some situations,
+    // patch releases are still cut for inactive LTS branches. e.g. when the LTS duration
+    // has been increased due to exceptional events ()
+    if (inactive.length !== 0) {
+      activeBranchChoices.push({name: 'Inactive LTS versions (not recommended)', value: null});
+    }
+
+    const {activeLtsBranch, inactiveLtsBranch} =
+        await prompt<{activeLtsBranch: LtsBranch | null, inactiveLtsBranch: LtsBranch}>([
+          {
+            name: 'activeLtsBranch',
+            type: 'list',
+            message: 'Please select a version for which you want to cut an LTS patch',
+            choices: activeBranchChoices,
+          },
+          {
+            name: 'inactiveLtsBranch',
+            type: 'list',
+            when: o => o.activeLtsBranch === null,
+            message: 'Please select an inactive LTS version for which you want to cut an LTS patch',
+            choices: inactive.map(branch => this._getChoiceForLtsBranch(branch)),
+          }
+        ]);
+    return activeLtsBranch ?? inactiveLtsBranch;
+  }
+
+  /** Gets an inquirer choice for the given LTS branch. */
+  private _getChoiceForLtsBranch(branch: LtsBranch): ListChoiceOptions {
+    return {name: `v${branch.version.major} (from ${branch.name})`, value: branch};
+  }
+
+  static async isActive(active: ActiveReleaseTrains) {
+    // LTS patch versions can be only cut if there are release trains in LTS phase.
+    // This action is always selectable as we support publishing of old LTS branches,
+    // and have prompt for selecting an LTS branch when the action performs.
+    return true;
+  }
+}
diff --git a/dev-infra/release/publish/actions/cut-new-patch.ts b/dev-infra/release/publish/actions/cut-new-patch.ts
new file mode 100644
index 0000000000000..fe8d79203f078
--- /dev/null
+++ b/dev-infra/release/publish/actions/cut-new-patch.ts
@@ -0,0 +1,43 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {ActiveReleaseTrains} from '../../versioning/active-release-trains';
+import {semverInc} from '../../versioning/inc-semver';
+import {ReleaseAction} from '../actions';
+
+/**
+ * Release action that cuts a new patch release for the current latest release-train version
+ * branch (i.e. the patch branch). The patch segment is incremented. The changelog is generated
+ * for the new patch version, but also needs to be cherry-picked into the next development branch.
+ */
+export class CutNewPatchAction extends ReleaseAction {
+  private _newVersion = semverInc(this.active.latest.version, 'patch');
+
+  async getDescription() {
+    const {branchName} = this.active.latest;
+    const newVersion = this._newVersion;
+    return `Cut a new patch release for the "${branchName}" branch (v${newVersion}).`;
+  }
+
+  async perform() {
+    const {branchName} = this.active.latest;
+    const newVersion = this._newVersion;
+
+    const {id} = await this.checkoutBranchAndStageVersion(newVersion, branchName);
+
+    await this.waitForPullRequestToBeMerged(id);
+    await this.buildAndPublish(newVersion, branchName, 'latest');
+    await this.cherryPickChangelogIntoNextBranch(newVersion, branchName);
+  }
+
+  static async isActive(active: ActiveReleaseTrains) {
+    // Patch versions can be cut at any time. See:
+    // https://hackmd.io/2Le8leq0S6G_R5VEVTNK9A#Release-prompt-options.
+    return true;
+  }
+}
diff --git a/dev-infra/release/publish/actions/cut-next-prerelease.ts b/dev-infra/release/publish/actions/cut-next-prerelease.ts
new file mode 100644
index 0000000000000..40ecb20fd1c41
--- /dev/null
+++ b/dev-infra/release/publish/actions/cut-next-prerelease.ts
@@ -0,0 +1,72 @@
+/**
+ * @license
+ * Copyright Google LLC 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 semver from 'semver';
+
+import {semverInc} from '../../versioning/inc-semver';
+import {computeNewPrereleaseVersionForNext} from '../../versioning/next-prerelease-version';
+import {ReleaseTrain} from '../../versioning/release-trains';
+import {ReleaseAction} from '../actions';
+
+/**
+ * Release action that cuts a prerelease for the next branch. A version in the next
+ * branch can have an arbitrary amount of next pre-releases.
+ */
+export class CutNextPrereleaseAction extends ReleaseAction {
+  /** Promise resolving with the new version if a NPM next pre-release is cut. */
+  private _newVersion: Promise<semver.SemVer> = this._computeNewVersion();
+
+  async getDescription() {
+    const {branchName} = this._getActivePrereleaseTrain();
+    const newVersion = await this._newVersion;
+    return `Cut a new next pre-release for the "${branchName}" branch (v${newVersion}).`;
+  }
+
+  async perform() {
+    const releaseTrain = this._getActivePrereleaseTrain();
+    const {branchName} = releaseTrain;
+    const newVersion = await this._newVersion;
+
+    const {id} = await this.checkoutBranchAndStageVersion(newVersion, branchName);
+
+    await this.waitForPullRequestToBeMerged(id);
+    await this.buildAndPublish(newVersion, branchName, 'next');
+
+    // If the pre-release has been cut from a branch that is not corresponding
+    // to the next release-train, cherry-pick the changelog into the primary
+    // development branch. i.e. the `next` branch that is usually `master`.
+    if (releaseTrain !== this.active.next) {
+      await this.cherryPickChangelogIntoNextBranch(newVersion, branchName);
+    }
+  }
+
+  /** Gets the release train for which NPM next pre-releases should be cut. */
+  private _getActivePrereleaseTrain(): ReleaseTrain {
+    return this.active.releaseCandidate ?? this.active.next;
+  }
+
+  /** Gets the new pre-release version for this release action. */
+  private async _computeNewVersion(): Promise<semver.SemVer> {
+    const releaseTrain = this._getActivePrereleaseTrain();
+    // If a pre-release is cut for the next release-train, the new version is computed
+    // with respect to special cases surfacing with FF/RC branches. Otherwise, the basic
+    // pre-release increment of the version is used as new version.
+    if (releaseTrain === this.active.next) {
+      return await computeNewPrereleaseVersionForNext(this.active, this.config);
+    } else {
+      return semverInc(releaseTrain.version, 'prerelease');
+    }
+  }
+
+  static async isActive() {
+    // Pre-releases for the `next` NPM dist tag can always be cut. Depending on whether
+    // there is a feature-freeze/release-candidate branch, the next pre-releases are either
+    // cut from such a branch, or from the actual `next` release-train branch (i.e. master).
+    return true;
+  }
+}
diff --git a/dev-infra/release/publish/actions/cut-release-candidate.ts b/dev-infra/release/publish/actions/cut-release-candidate.ts
new file mode 100644
index 0000000000000..716446a1eef65
--- /dev/null
+++ b/dev-infra/release/publish/actions/cut-release-candidate.ts
@@ -0,0 +1,42 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {ActiveReleaseTrains} from '../../versioning/active-release-trains';
+import {semverInc} from '../../versioning/inc-semver';
+import {ReleaseAction} from '../actions';
+
+/**
+ * Cuts the first release candidate for a release-train currently in the
+ * feature-freeze phase. The version is bumped from `next` to `rc.0`.
+ */
+export class CutReleaseCandidateAction extends ReleaseAction {
+  private _newVersion = semverInc(this.active.releaseCandidate!.version, 'prerelease', 'rc');
+
+  async getDescription() {
+    const newVersion = this._newVersion;
+    return `Cut a first release-candidate for the feature-freeze branch (v${newVersion}).`;
+  }
+
+  async perform() {
+    const {branchName} = this.active.releaseCandidate!;
+    const newVersion = this._newVersion;
+
+    const {id} = await this.checkoutBranchAndStageVersion(newVersion, branchName);
+
+    await this.waitForPullRequestToBeMerged(id);
+    await this.buildAndPublish(newVersion, branchName, 'next');
+    await this.cherryPickChangelogIntoNextBranch(newVersion, branchName);
+  }
+
+  static async isActive(active: ActiveReleaseTrains) {
+    // A release-candidate can be cut for an active release-train currently
+    // in the feature-freeze phase.
+    return active.releaseCandidate !== null &&
+        active.releaseCandidate.version.prerelease[0] === 'next';
+  }
+}
diff --git a/dev-infra/release/publish/actions/cut-stable.ts b/dev-infra/release/publish/actions/cut-stable.ts
new file mode 100644
index 0000000000000..dee7e88ee875e
--- /dev/null
+++ b/dev-infra/release/publish/actions/cut-stable.ts
@@ -0,0 +1,71 @@
+/**
+ * @license
+ * Copyright Google LLC 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 semver from 'semver';
+
+import {ActiveReleaseTrains} from '../../versioning/active-release-trains';
+import {getLtsNpmDistTagOfMajor} from '../../versioning/long-term-support';
+import {ReleaseAction} from '../actions';
+import {invokeSetNpmDistCommand, invokeYarnInstallCommand} from '../external-commands';
+
+/**
+ * Release action that cuts a stable version for the current release-train in the release
+ * candidate phase. The pre-release release-candidate version label is removed.
+ */
+export class CutStableAction extends ReleaseAction {
+  private _newVersion = this._computeNewVersion();
+
+  async getDescription() {
+    const newVersion = this._newVersion;
+    return `Cut a stable release for the release-candidate branch (v${newVersion}).`;
+  }
+
+  async perform() {
+    const {branchName} = this.active.releaseCandidate!;
+    const newVersion = this._newVersion;
+    const isNewMajor = this.active.releaseCandidate?.isMajor;
+
+
+    const {id} = await this.checkoutBranchAndStageVersion(newVersion, branchName);
+
+    await this.waitForPullRequestToBeMerged(id);
+    await this.buildAndPublish(newVersion, branchName, 'latest');
+
+    // If a new major version is published and becomes the "latest" release-train, we need
+    // to set the LTS npm dist tag for the previous latest release-train (the current patch).
+    if (isNewMajor) {
+      const previousPatchVersion = this.active.latest.version;
+      const ltsTagForPatch = getLtsNpmDistTagOfMajor(previousPatchVersion.major);
+
+      // Instead of directly setting the NPM dist tags, we invoke the ng-dev command for
+      // setting the NPM dist tag to the specified version. We do this because release NPM
+      // packages could be different in the previous patch branch, and we want to set the
+      // LTS tag for all packages part of the last major. It would not be possible to set the
+      // NPM dist tag for new packages part of the released major, nor would it be acceptable
+      // to skip the LTS tag for packages which are no longer part of the new major.
+      await invokeYarnInstallCommand(this.projectDir);
+      await invokeSetNpmDistCommand(ltsTagForPatch, previousPatchVersion);
+    }
+
+    await this.cherryPickChangelogIntoNextBranch(newVersion, branchName);
+  }
+
+  /** Gets the new stable version of the release candidate release-train. */
+  private _computeNewVersion(): semver.SemVer {
+    const {version} = this.active.releaseCandidate!;
+    return semver.parse(`${version.major}.${version.minor}.${version.patch}`)!;
+  }
+
+  static async isActive(active: ActiveReleaseTrains) {
+    // A stable version can be cut for an active release-train currently in the
+    // release-candidate phase. Note: It is not possible to directly release from
+    // feature-freeze phase into a stable version.
+    return active.releaseCandidate !== null &&
+        active.releaseCandidate.version.prerelease[0] === 'rc';
+  }
+}
diff --git a/dev-infra/release/publish/actions/index.ts b/dev-infra/release/publish/actions/index.ts
new file mode 100644
index 0000000000000..85ad7ba1566cd
--- /dev/null
+++ b/dev-infra/release/publish/actions/index.ts
@@ -0,0 +1,29 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {ReleaseActionConstructor} from '../actions';
+
+import {CutLongTermSupportPatchAction} from './cut-lts-patch';
+import {CutNewPatchAction} from './cut-new-patch';
+import {CutNextPrereleaseAction} from './cut-next-prerelease';
+import {CutReleaseCandidateAction} from './cut-release-candidate';
+import {CutStableAction} from './cut-stable';
+import {MoveNextIntoFeatureFreezeAction} from './move-next-into-feature-freeze';
+
+/**
+ * List of release actions supported by the release staging tool. These are sorted
+ * by priority. Actions which are selectable are sorted based on this declaration order.
+ */
+export const actions: ReleaseActionConstructor[] = [
+  CutStableAction,
+  CutReleaseCandidateAction,
+  CutNewPatchAction,
+  CutNextPrereleaseAction,
+  MoveNextIntoFeatureFreezeAction,
+  CutLongTermSupportPatchAction,
+];
diff --git a/dev-infra/release/publish/actions/move-next-into-feature-freeze.ts b/dev-infra/release/publish/actions/move-next-into-feature-freeze.ts
new file mode 100644
index 0000000000000..0ecf6322270f2
--- /dev/null
+++ b/dev-infra/release/publish/actions/move-next-into-feature-freeze.ts
@@ -0,0 +1,109 @@
+/**
+ * @license
+ * Copyright Google LLC 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 semver from 'semver';
+
+import {error, green, info, yellow} from '../../../utils/console';
+import {ActiveReleaseTrains} from '../../versioning/active-release-trains';
+import {computeNewPrereleaseVersionForNext} from '../../versioning/next-prerelease-version';
+import {ReleaseAction} from '../actions';
+import {getCommitMessageForExceptionalNextVersionBump} from '../commit-message';
+import {packageJsonPath} from '../constants';
+
+/**
+ * Release action that moves the next release-train into the feature-freeze phase. This means
+ * that a new version branch is created from the next branch, and a new next pre-release is
+ * cut indicating the started feature-freeze.
+ */
+export class MoveNextIntoFeatureFreezeAction extends ReleaseAction {
+  private _newVersion = computeNewPrereleaseVersionForNext(this.active, this.config);
+
+  async getDescription() {
+    const {branchName} = this.active.next;
+    const newVersion = await this._newVersion;
+    return `Move the "${branchName}" branch into feature-freeze phase (v${newVersion}).`;
+  }
+
+  async perform() {
+    const newVersion = await this._newVersion;
+    const newBranch = `${newVersion.major}.${newVersion.minor}.x`;
+
+    // Branch-off the next branch into a feature-freeze branch.
+    await this._createNewVersionBranchFromNext(newBranch);
+
+    // Stage the new version for the newly created branch, and push changes to a
+    // fork in order to create a staging pull request. Note that we re-use the newly
+    // created branch instead of re-fetching from the upstream.
+    const stagingPullRequest =
+        await this.stageVersionForBranchAndCreatePullRequest(newVersion, newBranch);
+
+    // Wait for the staging PR to be merged. Then build and publish the feature-freeze next
+    // pre-release. Finally, cherry-pick the release notes into the next branch in combination
+    // with bumping the version to the next minor too.
+    await this.waitForPullRequestToBeMerged(stagingPullRequest.id);
+    await this.buildAndPublish(newVersion, newBranch, 'next');
+    await this._createNextBranchUpdatePullRequest(newVersion, newBranch);
+  }
+
+  /** Creates a new version branch from the next branch. */
+  private async _createNewVersionBranchFromNext(newBranch: string) {
+    const {branchName: nextBranch} = this.active.next;
+    await this.verifyPassingGithubStatus(nextBranch);
+    await this.checkoutUpstreamBranch(nextBranch);
+    await this.createLocalBranchFromHead(newBranch);
+    await this.pushHeadToRemoteBranch(newBranch);
+    info(green(`  ✓   Version branch "${newBranch}" created.`));
+  }
+
+  /**
+   * Creates a pull request for the next branch that bumps the version to the next
+   * minor, and cherry-picks the changelog for the newly branched-off feature-freeze version.
+   */
+  private async _createNextBranchUpdatePullRequest(newVersion: semver.SemVer, newBranch: string) {
+    const {branchName: nextBranch, version} = this.active.next;
+    // We increase the version for the next branch to the next minor. The team can decide
+    // later if they want next to be a major through the `Configure Next as Major` release action.
+    const newNextVersion = semver.parse(`${version.major}.${version.minor + 1}.0-next.0`)!;
+    const bumpCommitMessage = getCommitMessageForExceptionalNextVersionBump(newNextVersion);
+
+    await this.checkoutUpstreamBranch(nextBranch);
+    await this.updateProjectVersion(newNextVersion);
+
+    // Create an individual commit for the next version bump. The changelog should go into
+    // a separate commit that makes it clear where the changelog is cherry-picked from.
+    await this.createCommit(bumpCommitMessage, [packageJsonPath]);
+
+    let nextPullRequestMessage = `The previous "next" release-train has moved into the ` +
+        `release-candidate phase. This PR updates the next branch to the subsequent ` +
+        `release-train.`;
+    const hasChangelogCherryPicked =
+        await this.createCherryPickReleaseNotesCommitFrom(newVersion, newBranch);
+
+    if (hasChangelogCherryPicked) {
+      nextPullRequestMessage += `\n\nAlso this PR cherry-picks the changelog for ` +
+          `v${newVersion} into the ${nextBranch} branch so that the changelog is up to date.`;
+    } else {
+      error(yellow(`  ✘   Could not cherry-pick release notes for v${newVersion}.`));
+      error(yellow(`      Please copy the release note manually into "${nextBranch}".`));
+    }
+
+    const nextUpdatePullRequest = await this.pushChangesToForkAndCreatePullRequest(
+        nextBranch, `next-release-train-${newNextVersion}`,
+        `Update next branch to reflect new release-train "v${newNextVersion}".`,
+        nextPullRequestMessage);
+
+    info(green(`  ✓   Pull request for updating the "${nextBranch}" branch has been created.`));
+    info(yellow(`      Please ask team members to review: ${nextUpdatePullRequest.url}.`));
+  }
+
+  static async isActive(active: ActiveReleaseTrains) {
+    // A new feature-freeze/release-candidate branch can only be created if there
+    // is no active release-train in feature-freeze/release-candidate phase.
+    return active.releaseCandidate === null;
+  }
+}
diff --git a/dev-infra/release/publish/cli.ts b/dev-infra/release/publish/cli.ts
new file mode 100644
index 0000000000000..5a61dd8072559
--- /dev/null
+++ b/dev-infra/release/publish/cli.ts
@@ -0,0 +1,56 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Arguments, Argv, CommandModule} from 'yargs';
+
+import {getConfig, getRepoBaseDir} from '../../utils/config';
+import {error, green, info, red, yellow} from '../../utils/console';
+import {addGithubTokenOption} from '../../utils/git/github-yargs';
+import {getReleaseConfig} from '../config';
+
+import {CompletionState, ReleaseTool} from './index';
+
+/** Command line options for publishing a release. */
+export interface ReleasePublishOptions {
+  githubToken: string;
+}
+
+/** Yargs command builder for configuring the `ng-dev release publish` command. */
+function builder(argv: Argv): Argv<ReleasePublishOptions> {
+  return addGithubTokenOption(argv);
+}
+
+/** Yargs command handler for staging a release. */
+async function handler(args: Arguments<ReleasePublishOptions>) {
+  const config = getConfig();
+  const releaseConfig = getReleaseConfig(config);
+  const projectDir = getRepoBaseDir();
+  const task = new ReleaseTool(releaseConfig, config.github, args.githubToken, projectDir);
+  const result = await task.run();
+
+  switch (result) {
+    case CompletionState.FATAL_ERROR:
+      error(red(`Release action has been aborted due to fatal errors. See above.`));
+      process.exitCode = 1;
+      break;
+    case CompletionState.MANUALLY_ABORTED:
+      info(yellow(`Release action has been manually aborted.`));
+      break;
+    case CompletionState.SUCCESS:
+      info(green(`Release action has completed successfully.`));
+      break;
+  }
+}
+
+/** CLI command module for publishing a release. */
+export const ReleasePublishCommandModule: CommandModule<{}, ReleasePublishOptions> = {
+  builder,
+  handler,
+  command: 'publish',
+  describe: 'Publish new releases and configure version branches.',
+};
diff --git a/dev-infra/release/publish/commit-message.ts b/dev-infra/release/publish/commit-message.ts
new file mode 100644
index 0000000000000..a4bc73aa2c3cb
--- /dev/null
+++ b/dev-infra/release/publish/commit-message.ts
@@ -0,0 +1,39 @@
+/**
+ * @license
+ * Copyright Google LLC 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 semver from 'semver';
+
+/** Gets the commit message for a new release point in the project. */
+export function getCommitMessageForRelease(newVersion: semver.SemVer): string {
+  return `release: cut the v${newVersion} release`;
+}
+
+/**
+ * Gets the commit message for an exceptional version bump in the next branch. The next
+ * branch version will be bumped without the release being published in some situations.
+ * More details can be found in the `MoveNextIntoFeatureFreeze` release action and in:
+ * https://hackmd.io/2Le8leq0S6G_R5VEVTNK9A.
+ */
+export function getCommitMessageForExceptionalNextVersionBump(newVersion: semver.SemVer) {
+  return `release: bump the next branch to v${newVersion}`;
+}
+
+/**
+ * Gets the commit message for a version update in the next branch to a major version. The next
+ * branch version will be updated without the release being published if the branch is configured
+ * as a major. More details can be found in the `ConfigureNextAsMajor` release action and in:
+ * https://hackmd.io/2Le8leq0S6G_R5VEVTNK9A.
+ */
+export function getCommitMessageForNextBranchMajorSwitch(newVersion: semver.SemVer) {
+  return `release: switch the next branch to v${newVersion}`;
+}
+
+/** Gets the commit message for a release notes cherry-pick commit */
+export function getReleaseNoteCherryPickCommitMessage(newVersion: semver.SemVer): string {
+  return `docs: release notes for the v${newVersion} release`;
+}
diff --git a/dev-infra/release/publish/constants.ts b/dev-infra/release/publish/constants.ts
new file mode 100644
index 0000000000000..f108f0abf1743
--- /dev/null
+++ b/dev-infra/release/publish/constants.ts
@@ -0,0 +1,16 @@
+/**
+ * @license
+ * Copyright Google LLC 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
+ */
+
+/** Project-relative path for the changelog file. */
+export const changelogPath = 'CHANGELOG.md';
+
+/** Project-relative path for the "package.json" file. */
+export const packageJsonPath = 'package.json';
+
+/** Default interval in milliseconds to check whether a pull request has been merged. */
+export const waitForPullRequestInterval = 10000;
diff --git a/dev-infra/release/publish/external-commands.ts b/dev-infra/release/publish/external-commands.ts
new file mode 100644
index 0000000000000..8b27c14f311fc
--- /dev/null
+++ b/dev-infra/release/publish/external-commands.ts
@@ -0,0 +1,92 @@
+/**
+ * @license
+ * Copyright Google LLC 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 ora from 'ora';
+import * as semver from 'semver';
+
+import {spawnWithDebugOutput} from '../../utils/child-process';
+import {error, green, info, red} from '../../utils/console';
+import {BuiltPackage} from '../config/index';
+
+import {FatalReleaseActionError} from './actions-error';
+
+/*
+ * ###############################################################
+ *
+ * This file contains helpers for invoking external `ng-dev` commands. A subset of actions,
+ * like building release output or setting aν NPM dist tag for release packages, cannot be
+ * performed directly as part of the release tool and need to be delegated to external `ng-dev`
+ * commands that exist across arbitrary version branches.
+ *
+ * In a concrete example: Consider a new patch version is released and that a new release
+ * package has been added to the `next` branch. The patch branch will not contain the new
+ * release package, so we could not build the release output for it. To work around this, we
+ * call the ng-dev build command for the patch version branch and expect it to return a list
+ * of built packages that need to be released as part of this release train.
+ *
+ * ###############################################################
+ */
+
+/**
+ * Invokes the `ng-dev release set-dist-tag` command in order to set the specified
+ * NPM dist tag for all packages in the checked out branch to the given version.
+ */
+export async function invokeSetNpmDistCommand(npmDistTag: string, version: semver.SemVer) {
+  try {
+    // Note: No progress indicator needed as that is the responsibility of the command.
+    await spawnWithDebugOutput(
+        'yarn', ['--silent', 'ng-dev', 'release', 'set-dist-tag', npmDistTag, version.format()]);
+    info(green(`  ✓   Set "${npmDistTag}" NPM dist tag for all packages to v${version}.`));
+  } catch (e) {
+    error(e);
+    error(red(`  ✘   An error occurred while setting the NPM dist tag for "${npmDistTag}".`));
+    throw new FatalReleaseActionError();
+  }
+}
+
+/**
+ * Invokes the `ng-dev release build` command in order to build the release
+ * packages for the currently checked out branch.
+ */
+export async function invokeReleaseBuildCommand(): Promise<BuiltPackage[]> {
+  const spinner = ora().start('Building release output.');
+  try {
+    // Since we expect JSON to be printed from the `ng-dev release build` command,
+    // we spawn the process in silent mode. We have set up an Ora progress spinner.
+    const {stdout} = await spawnWithDebugOutput(
+        'yarn', ['--silent', 'ng-dev', 'release', 'build', '--json'], {mode: 'silent'});
+    spinner.stop();
+    info(green('  ✓   Built release output for all packages.'));
+    // The `ng-dev release build` command prints a JSON array to stdout
+    // that represents the built release packages and their output paths.
+    return JSON.parse(stdout.trim());
+  } catch (e) {
+    spinner.stop();
+    error(e);
+    error(red('  ✘   An error occurred while building the release packages.'));
+    throw new FatalReleaseActionError();
+  }
+}
+
+/**
+ * Invokes the `yarn install` command in order to install dependencies for
+ * the configured project with the currently checked out revision.
+ */
+export async function invokeYarnInstallCommand(projectDir: string): Promise<void> {
+  try {
+    // Note: No progress indicator needed as that is the responsibility of the command.
+    // TODO: Consider using an Ora spinner instead to ensure minimal console output.
+    await spawnWithDebugOutput(
+        'yarn', ['install', '--frozen-lockfile', '--non-interactive'], {cwd: projectDir});
+    info(green('  ✓   Installed project dependencies.'));
+  } catch (e) {
+    error(e);
+    error(red('  ✘   An error occurred while installing dependencies.'));
+    throw new FatalReleaseActionError();
+  }
+}
diff --git a/dev-infra/release/publish/graphql-queries.ts b/dev-infra/release/publish/graphql-queries.ts
new file mode 100644
index 0000000000000..63679d7a77bd5
--- /dev/null
+++ b/dev-infra/release/publish/graphql-queries.ts
@@ -0,0 +1,31 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {params, types} from 'typed-graphqlify';
+
+/**
+ * Graphql Github API query that can be used to find forks of a given repository
+ * that are owned by the current viewer authenticated with the Github API.
+ */
+export const findOwnedForksOfRepoQuery = params(
+    {
+      $owner: 'String!',
+      $name: 'String!',
+    },
+    {
+      repository: params({owner: '$owner', name: '$name'}, {
+        forks: params({affiliations: 'OWNER', first: 1}, {
+          nodes: [{
+            owner: {
+              login: types.string,
+            },
+            name: types.string,
+          }],
+        }),
+      }),
+    });
diff --git a/dev-infra/release/publish/index.ts b/dev-infra/release/publish/index.ts
new file mode 100644
index 0000000000000..99c999c1679df
--- /dev/null
+++ b/dev-infra/release/publish/index.ts
@@ -0,0 +1,132 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {ListChoiceOptions, prompt} from 'inquirer';
+
+import {GithubConfig} from '../../utils/config';
+import {error, info, log, red, yellow} from '../../utils/console';
+import {GitClient} from '../../utils/git/index';
+import {ReleaseConfig} from '../config';
+import {ActiveReleaseTrains, fetchActiveReleaseTrains, nextBranchName} from '../versioning/active-release-trains';
+import {printActiveReleaseTrains} from '../versioning/print-active-trains';
+import {GithubRepoWithApi} from '../versioning/version-branches';
+
+import {ReleaseAction} from './actions';
+import {FatalReleaseActionError, UserAbortedReleaseActionError} from './actions-error';
+import {actions} from './actions/index';
+
+export enum CompletionState {
+  SUCCESS,
+  FATAL_ERROR,
+  MANUALLY_ABORTED,
+}
+
+export class ReleaseTool {
+  /** Client for interacting with the Github API and the local Git command. */
+  private _git = new GitClient(this._githubToken, {github: this._github}, this._projectRoot);
+
+  constructor(
+      protected _config: ReleaseConfig, protected _github: GithubConfig,
+      protected _githubToken: string, protected _projectRoot: string) {}
+
+  /** Runs the interactive release tool. */
+  async run(): Promise<CompletionState> {
+    log();
+    log(yellow('--------------------------------------------'));
+    log(yellow('  Angular Dev-Infra release staging script'));
+    log(yellow('--------------------------------------------'));
+    log();
+
+    if (!await this._verifyNoUncommittedChanges() || !await this._verifyRunningFromNextBranch()) {
+      return CompletionState.FATAL_ERROR;
+    }
+
+    const {owner, name} = this._github;
+    const repo: GithubRepoWithApi = {owner, name, api: this._git.github};
+    const releaseTrains = await fetchActiveReleaseTrains(repo);
+
+    // Print the active release trains so that the caretaker can access
+    // the current project branching state without switching context.
+    await printActiveReleaseTrains(releaseTrains, this._config);
+
+    const action = await this._promptForReleaseAction(releaseTrains);
+    const previousGitBranchOrRevision = this._git.getCurrentBranchOrRevision();
+
+    try {
+      await action.perform();
+    } catch (e) {
+      if (e instanceof UserAbortedReleaseActionError) {
+        return CompletionState.MANUALLY_ABORTED;
+      }
+      // Only print the error message and stack if the error is not a known fatal release
+      // action error (for which we print the error gracefully to the console with colors).
+      if (!(e instanceof FatalReleaseActionError) && e instanceof Error) {
+        console.error(e);
+      }
+      return CompletionState.FATAL_ERROR;
+    } finally {
+      this._git.checkout(previousGitBranchOrRevision, true);
+    }
+
+    return CompletionState.SUCCESS;
+  }
+
+  /** Prompts the caretaker for a release action that should be performed. */
+  private async _promptForReleaseAction(activeTrains: ActiveReleaseTrains) {
+    const choices: ListChoiceOptions[] = [];
+
+    // Find and instantiate all release actions which are currently valid.
+    for (let actionType of actions) {
+      if (await actionType.isActive(activeTrains)) {
+        const action: ReleaseAction =
+            new actionType(activeTrains, this._git, this._config, this._projectRoot);
+        choices.push({name: await action.getDescription(), value: action});
+      }
+    }
+
+    info('Please select the type of release you want to perform.');
+
+    const {releaseAction} = await prompt<{releaseAction: ReleaseAction}>({
+      name: 'releaseAction',
+      message: 'Please select an action:',
+      type: 'list',
+      choices,
+    });
+
+    return releaseAction;
+  }
+
+  /**
+   * Verifies that there are no uncommitted changes in the project.
+   * @returns a boolean indicating success or failure.
+   */
+  private async _verifyNoUncommittedChanges(): Promise<boolean> {
+    if (this._git.hasUncommittedChanges()) {
+      error(red('  ✘   There are changes which are not committed and should be discarded.'));
+      return false;
+    }
+    return true;
+  }
+
+  /**
+   * Verifies that the next branch from the configured repository is checked out.
+   * @returns a boolean indicating success or failure.
+   */
+  private async _verifyRunningFromNextBranch(): Promise<boolean> {
+    const headSha = this._git.run(['rev-parse', 'HEAD']).stdout.trim();
+    const {data} =
+        await this._git.github.repos.getBranch({...this._git.remoteParams, branch: nextBranchName});
+
+    if (headSha !== data.commit.sha) {
+      error(red('  ✘   Running release tool from an outdated local branch.'));
+      error(red(`      Please make sure you are running from the "${nextBranchName}" branch.`));
+      return false;
+    }
+    return true;
+  }
+}
diff --git a/dev-infra/release/publish/pull-request-state.ts b/dev-infra/release/publish/pull-request-state.ts
new file mode 100644
index 0000000000000..9f318ee406b72
--- /dev/null
+++ b/dev-infra/release/publish/pull-request-state.ts
@@ -0,0 +1,73 @@
+/**
+ * @license
+ * Copyright Google LLC 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 Octokit from '@octokit/rest';
+import {GitClient} from '../../utils/git/index';
+
+/** State of a pull request in Github. */
+export type PullRequestState = 'merged'|'closed'|'open';
+
+/** Gets whether a given pull request has been merged. */
+export async function getPullRequestState(api: GitClient, id: number): Promise<PullRequestState> {
+  const {data} = await api.github.pulls.get({...api.remoteParams, pull_number: id});
+  if (data.merged) {
+    return 'merged';
+  } else if (data.closed_at !== null) {
+    return await isPullRequestClosedWithAssociatedCommit(api, id) ? 'merged' : 'closed';
+  } else {
+    return 'open';
+  }
+}
+
+/**
+ * Whether the pull request has been closed with an associated commit. This is usually
+ * the case if a PR has been merged using the autosquash merge script strategy. Since
+ * the merge is not fast-forward, Github does not consider the PR as merged and instead
+ * shows the PR as closed. See for example: https://github.com/angular/angular/pull/37918.
+ */
+async function isPullRequestClosedWithAssociatedCommit(api: GitClient, id: number) {
+  const request =
+      api.github.issues.listEvents.endpoint.merge({...api.remoteParams, issue_number: id});
+  const events: Octokit.IssuesListEventsResponse = await api.github.paginate(request);
+  // Iterate through the events of the pull request in reverse. We want to find the most
+  // recent events and check if the PR has been closed with a commit associated with it.
+  // If the PR has been closed through a commit, we assume that the PR has been merged
+  // using the autosquash merge strategy. For more details. See the `AutosquashMergeStrategy`.
+  for (let i = events.length - 1; i >= 0; i--) {
+    const {event, commit_id} = events[i];
+    // If we come across a "reopened" event, we abort looking for referenced commits. Any
+    // commits that closed the PR before, are no longer relevant and did not close the PR.
+    if (event === 'reopened') {
+      return false;
+    }
+    // If a `closed` event is captured with a commit assigned, then we assume that
+    // this PR has been merged properly.
+    if (event === 'closed' && commit_id) {
+      return true;
+    }
+    // If the PR has been referenced by a commit, check if the commit closes this pull
+    // request. Note that this is needed besides checking `closed` as PRs could be merged
+    // into any non-default branch where the `Closes <..>` keyword does not work and the PR
+    // is simply closed without an associated `commit_id`. For more details see:
+    // https://docs.github.com/en/enterprise/2.16/user/github/managing-your-work-on-github/closing-issues-using-keywords#:~:text=non-default.
+    if (event === 'referenced' && commit_id &&
+        await isCommitClosingPullRequest(api, commit_id, id)) {
+      return true;
+    }
+  }
+  return false;
+}
+
+/** Checks whether the specified commit is closing the given pull request. */
+async function isCommitClosingPullRequest(api: GitClient, sha: string, id: number) {
+  const {data} = await api.github.repos.getCommit({...api.remoteParams, ref: sha});
+  // Matches the closing keyword supported in commit messages. See:
+  // https://docs.github.com/en/enterprise/2.16/user/github/managing-your-work-on-github/closing-issues-using-keywords.
+  return data.commit.message.match(
+      new RegExp(`(?:close[sd]?|fix(?:e[sd]?)|resolve[sd]?):? #${id}(?!\\d)`, 'i'));
+}
diff --git a/dev-infra/release/publish/release-notes.ts b/dev-infra/release/publish/release-notes.ts
new file mode 100644
index 0000000000000..c48d17a554f41
--- /dev/null
+++ b/dev-infra/release/publish/release-notes.ts
@@ -0,0 +1,27 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {join} from 'path';
+import * as semver from 'semver';
+import {changelogPath} from './constants';
+
+/**
+ * Gets the default pattern for extracting release notes for the given version.
+ * This pattern matches for the conventional-changelog Angular preset.
+ */
+export function getDefaultExtractReleaseNotesPattern(version: semver.SemVer): RegExp {
+  const escapedVersion = version.format().replace('.', '\\.');
+  // TODO: Change this once we have a canonical changelog generation tool. Also update this
+  // based on the conventional-changelog version. They removed anchors in more recent versions.
+  return new RegExp(`(<a name="${escapedVersion}"></a>.*?)(?:<a name="|$)`, 's');
+}
+
+/** Gets the path for the changelog file in a given project. */
+export function getLocalChangelogFilePath(projectDir: string): string {
+  return join(projectDir, changelogPath);
+}
diff --git a/dev-infra/release/publish/test/BUILD.bazel b/dev-infra/release/publish/test/BUILD.bazel
new file mode 100644
index 0000000000000..eea28bad980d2
--- /dev/null
+++ b/dev-infra/release/publish/test/BUILD.bazel
@@ -0,0 +1,36 @@
+load("@npm//@bazel/typescript:index.bzl", "ts_library")
+load("//tools:defaults.bzl", "jasmine_node_test")
+
+ts_library(
+    name = "test_lib",
+    srcs = glob([
+        "**/*.ts",
+    ]),
+    module_name = "@angular/dev-infra-private/release/test",
+    deps = [
+        "//dev-infra/release/config",
+        "//dev-infra/release/publish",
+        "//dev-infra/release/versioning",
+        "//dev-infra/utils",
+        "//dev-infra/utils/testing",
+        "@npm//@types/jasmine",
+        "@npm//@types/minimist",
+        "@npm//@types/node",
+        "@npm//@types/node-fetch",
+        "@npm//@types/semver",
+        "@npm//minimist",
+        "@npm//nock",
+        "@npm//node-fetch",
+        "@npm//semver",
+    ],
+)
+
+jasmine_node_test(
+    name = "test",
+    # Disable the Bazel patched module resolution. It always loads ".mjs" files first. This
+    # breaks NodeJS execution for "node-fetch" as it uses experimental modules which are not
+    # enabled in NodeJS. TODO: Remove this with rules_nodejs 3.x where patching is optional.
+    # https://github.com/bazelbuild/rules_nodejs/commit/7d070ffadf9c3b41711382a4737b995f987c14fa.
+    args = ["--nobazel_patch_module_resolver"],
+    deps = [":test_lib"],
+)
diff --git a/dev-infra/release/publish/test/common.spec.ts b/dev-infra/release/publish/test/common.spec.ts
new file mode 100644
index 0000000000000..ac2aeebccff87
--- /dev/null
+++ b/dev-infra/release/publish/test/common.spec.ts
@@ -0,0 +1,211 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {readFileSync} from 'fs';
+import {join} from 'path';
+import * as semver from 'semver';
+
+import {getBranchPushMatcher} from '../../../utils/testing';
+import {ActiveReleaseTrains} from '../../versioning/active-release-trains';
+import * as npm from '../../versioning/npm-publish';
+import {ReleaseTrain} from '../../versioning/release-trains';
+import {ReleaseAction} from '../actions';
+import {actions} from '../actions/index';
+import {changelogPath} from '../constants';
+
+import {getChangelogForVersion, getTestingMocksForReleaseAction, parse, setupReleaseActionForTesting, testTmpDir} from './test-utils';
+
+describe('common release action logic', () => {
+  const baseReleaseTrains: ActiveReleaseTrains = {
+    releaseCandidate: null,
+    next: new ReleaseTrain('master', parse('10.1.0-next.0')),
+    latest: new ReleaseTrain('10.0.x', parse('10.0.1')),
+  };
+
+  describe('version computation', async () => {
+    const testReleaseTrain: ActiveReleaseTrains = {
+      releaseCandidate: new ReleaseTrain('10.1.x', parse('10.1.0-next.3')),
+      next: new ReleaseTrain('master', parse('10.2.0-next.0')),
+      latest: new ReleaseTrain('10.0.x', parse('10.0.1')),
+    };
+
+    it('should not modify release train versions and cause invalid other actions', async () => {
+      const {releaseConfig, gitClient} = getTestingMocksForReleaseAction();
+      const descriptions: string[] = [];
+
+      for (const actionCtor of actions) {
+        if (await actionCtor.isActive(testReleaseTrain)) {
+          const action = new actionCtor(testReleaseTrain, gitClient, releaseConfig, testTmpDir);
+          descriptions.push(await action.getDescription());
+        }
+      }
+
+      expect(descriptions).toEqual([
+        `Cut a first release-candidate for the feature-freeze branch (v10.1.0-rc.0).`,
+        `Cut a new patch release for the "10.0.x" branch (v10.0.2).`,
+        `Cut a new next pre-release for the "10.1.x" branch (v10.1.0-next.4).`,
+        `Cut a new release for an active LTS branch (0 active).`
+      ]);
+    });
+  });
+
+  describe('build and publishing', () => {
+    it('should support a custom NPM registry', async () => {
+      const {repo, instance, releaseConfig} =
+          setupReleaseActionForTesting(TestAction, baseReleaseTrains);
+      const {version, branchName} = baseReleaseTrains.next;
+      const tagName = version.format();
+      const customRegistryUrl = 'https://custom-npm-registry.google.com';
+
+      repo.expectBranchRequest(branchName, 'STAGING_SHA')
+          .expectCommitRequest('STAGING_SHA', `release: cut the v${version} release`)
+          .expectTagToBeCreated(tagName, 'STAGING_SHA')
+          .expectReleaseToBeCreated(`v${version}`, tagName);
+
+      // Set up a custom NPM registry.
+      releaseConfig.publishRegistry = customRegistryUrl;
+
+      await instance.testBuildAndPublish(version, branchName, 'latest');
+
+      expect(npm.runNpmPublish).toHaveBeenCalledTimes(2);
+      expect(npm.runNpmPublish)
+          .toHaveBeenCalledWith(`${testTmpDir}/dist/pkg1`, 'latest', customRegistryUrl);
+      expect(npm.runNpmPublish)
+          .toHaveBeenCalledWith(`${testTmpDir}/dist/pkg2`, 'latest', customRegistryUrl);
+    });
+  });
+
+  describe('changelog cherry-picking', () => {
+    const {version, branchName} = baseReleaseTrains.latest;
+    const fakeReleaseNotes = getChangelogForVersion(version.format());
+    const forkBranchName = `changelog-cherry-pick-${version}`;
+
+    it('should prepend fetched changelog', async () => {
+      const {repo, fork, instance, testTmpDir} =
+          setupReleaseActionForTesting(TestAction, baseReleaseTrains);
+
+      // Expect the changelog to be fetched and return a fake changelog to test that
+      // it is properly appended. Also expect a pull request to be created in the fork.
+      repo.expectChangelogFetch(branchName, fakeReleaseNotes)
+          .expectFindForkRequest(fork)
+          .expectPullRequestToBeCreated('master', fork, forkBranchName, 200);
+
+      // Simulate that the fork branch name is available.
+      fork.expectBranchRequest(forkBranchName, null);
+
+      await instance.testCherryPickWithPullRequest(version, branchName);
+
+      const changelogContent = readFileSync(join(testTmpDir, changelogPath), 'utf8');
+      expect(changelogContent).toEqual(`${fakeReleaseNotes}Existing changelog`);
+    });
+
+    it('should respect a custom release note extraction pattern', async () => {
+      const {repo, fork, instance, testTmpDir, releaseConfig} =
+          setupReleaseActionForTesting(TestAction, baseReleaseTrains);
+
+      // Custom pattern matching changelog output sections grouped through
+      // basic level-1 markdown headers (compared to the default anchor pattern).
+      releaseConfig.extractReleaseNotesPattern = version =>
+          new RegExp(`(# v${version} \\("[^"]+"\\).*?)(?:# v|$)`, 's');
+
+      const customReleaseNotes = `# v${version} ("newton-kepler")\n\nNew Content!`;
+
+      // Expect the changelog to be fetched and return a fake changelog to test that
+      // it is properly appended. Also expect a pull request to be created in the fork.
+      repo.expectChangelogFetch(branchName, customReleaseNotes)
+          .expectFindForkRequest(fork)
+          .expectPullRequestToBeCreated('master', fork, forkBranchName, 200);
+
+      // Simulate that the fork branch name is available.
+      fork.expectBranchRequest(forkBranchName, null);
+
+      await instance.testCherryPickWithPullRequest(version, branchName);
+
+      const changelogContent = readFileSync(join(testTmpDir, changelogPath), 'utf8');
+      expect(changelogContent).toEqual(`${customReleaseNotes}\n\nExisting changelog`);
+    });
+
+    it('should print an error if release notes cannot be extracted', async () => {
+      const {repo, fork, instance, testTmpDir, releaseConfig} =
+          setupReleaseActionForTesting(TestAction, baseReleaseTrains);
+
+      // Expect the changelog to be fetched and return a fake changelog to test that
+      // it is properly appended. Also expect a pull request to be created in the fork.
+      repo.expectChangelogFetch(branchName, `non analyzable changelog`)
+          .expectFindForkRequest(fork)
+          .expectPullRequestToBeCreated('master', fork, forkBranchName, 200);
+
+      // Simulate that the fork branch name is available.
+      fork.expectBranchRequest(forkBranchName, null);
+
+      spyOn(console, 'error');
+
+      await instance.testCherryPickWithPullRequest(version, branchName);
+
+      expect(console.error)
+          .toHaveBeenCalledWith(
+              jasmine.stringMatching(`Could not cherry-pick release notes for v${version}`));
+      expect(console.error)
+          .toHaveBeenCalledWith(jasmine.stringMatching(
+              `Please copy the release notes manually into the "master" branch.`));
+
+      const changelogContent = readFileSync(join(testTmpDir, changelogPath), 'utf8');
+      expect(changelogContent).toEqual(`Existing changelog`);
+    });
+
+    it('should push changes to a fork for creating a pull request', async () => {
+      const {repo, fork, instance, gitClient} =
+          setupReleaseActionForTesting(TestAction, baseReleaseTrains);
+
+      // Expect the changelog to be fetched and return a fake changelog to test that
+      // it is properly appended. Also expect a pull request to be created in the fork.
+      repo.expectChangelogFetch(branchName, fakeReleaseNotes)
+          .expectFindForkRequest(fork)
+          .expectPullRequestToBeCreated('master', fork, forkBranchName, 200);
+
+      // Simulate that the fork branch name is available.
+      fork.expectBranchRequest(forkBranchName, null);
+
+      await instance.testCherryPickWithPullRequest(version, branchName);
+
+      expect(gitClient.pushed.length).toBe(1);
+      expect(gitClient.pushed[0]).toEqual(getBranchPushMatcher({
+        targetBranch: forkBranchName,
+        targetRepo: fork,
+        baseBranch: 'master',
+        baseRepo: repo,
+        expectedCommits: [{
+          message: `docs: release notes for the v${version} release`,
+          files: ['CHANGELOG.md'],
+        }],
+      }));
+    });
+  });
+});
+
+/**
+ * Test release action that exposes protected units of the base
+ * release action class. This allows us to add unit tests.
+ */
+class TestAction extends ReleaseAction {
+  async getDescription() {
+    return 'Test action';
+  }
+
+  async perform() {
+    throw Error('Not implemented.');
+  }
+
+  async testBuildAndPublish(newVersion: semver.SemVer, publishBranch: string, distTag: string) {
+    await this.buildAndPublish(newVersion, publishBranch, distTag);
+  }
+
+  async testCherryPickWithPullRequest(version: semver.SemVer, branch: string) {
+    await this.cherryPickChangelogIntoNextBranch(version, branch);
+  }
+}
diff --git a/dev-infra/release/publish/test/configure-next-as-major.spec.ts b/dev-infra/release/publish/test/configure-next-as-major.spec.ts
new file mode 100644
index 0000000000000..10fb3b5639b73
--- /dev/null
+++ b/dev-infra/release/publish/test/configure-next-as-major.spec.ts
@@ -0,0 +1,79 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {getBranchPushMatcher} from '../../../utils/testing';
+import {ReleaseTrain} from '../../versioning/release-trains';
+import {ConfigureNextAsMajorAction} from '../actions/configure-next-as-major';
+
+import {parse, setupReleaseActionForTesting} from './test-utils';
+
+describe('configure next as major action', () => {
+  it('should be active if the next branch is for a minor', async () => {
+    expect(await ConfigureNextAsMajorAction.isActive({
+      releaseCandidate: null,
+      next: new ReleaseTrain('master', parse('10.1.0-next.3')),
+      latest: new ReleaseTrain('10.0.x', parse('10.0.3')),
+    })).toBe(true);
+  });
+
+  it('should be active regardless of a feature-freeze/release-candidate train', async () => {
+    expect(await ConfigureNextAsMajorAction.isActive({
+      releaseCandidate: new ReleaseTrain('10.1.x', parse('10.1.0-rc.1')),
+      next: new ReleaseTrain('master', parse('10.2.0-next.3')),
+      latest: new ReleaseTrain('10.0.x', parse('10.0.3')),
+    })).toBe(true);
+  });
+
+  it('should not be active if the next branch is for a major', async () => {
+    expect(await ConfigureNextAsMajorAction.isActive({
+      releaseCandidate: null,
+      next: new ReleaseTrain('master', parse('11.0.0-next.0')),
+      latest: new ReleaseTrain('10.0.x', parse('10.0.3')),
+    })).toBe(false);
+  });
+
+  it('should compute proper version and create staging pull request', async () => {
+    const action = setupReleaseActionForTesting(ConfigureNextAsMajorAction, {
+      releaseCandidate: null,
+      next: new ReleaseTrain('master', parse('10.1.0-next.3')),
+      latest: new ReleaseTrain('10.0.x', parse('10.0.2')),
+    });
+
+    const {repo, fork, gitClient} = action;
+    const expectedVersion = `11.0.0-next.0`;
+    const expectedForkBranch = `switch-next-to-major-${expectedVersion}`;
+
+    // We first mock the commit status check for the next branch, then expect two pull
+    // requests from a fork that are targeting next and the new feature-freeze branch.
+    repo.expectBranchRequest('master', 'MASTER_COMMIT_SHA')
+        .expectCommitStatusCheck('MASTER_COMMIT_SHA', 'success')
+        .expectFindForkRequest(fork)
+        .expectPullRequestToBeCreated('master', fork, expectedForkBranch, 200);
+
+    // In the fork, we make the staging branch appear as non-existent,
+    // so that the PR can be created properly without collisions.
+    fork.expectBranchRequest(expectedForkBranch, null);
+
+    await action.instance.perform();
+
+    expect(gitClient.pushed.length).toBe(1);
+    expect(gitClient.pushed[0])
+        .toEqual(
+            getBranchPushMatcher({
+              baseBranch: 'master',
+              baseRepo: repo,
+              targetBranch: expectedForkBranch,
+              targetRepo: fork,
+              expectedCommits: [{
+                message: `release: switch the next branch to v${expectedVersion}`,
+                files: ['package.json'],
+              }],
+            }),
+            'Expected the update branch to be created in fork for a pull request.');
+  });
+});
diff --git a/dev-infra/release/publish/test/cut-lts-patch.spec.ts b/dev-infra/release/publish/test/cut-lts-patch.spec.ts
new file mode 100644
index 0000000000000..d27bbd60883d6
--- /dev/null
+++ b/dev-infra/release/publish/test/cut-lts-patch.spec.ts
@@ -0,0 +1,110 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {matchesVersion} from '../../../utils/testing/semver-matchers';
+import {fetchLongTermSupportBranchesFromNpm} from '../../versioning/long-term-support';
+import {ReleaseTrain} from '../../versioning/release-trains';
+import {CutLongTermSupportPatchAction} from '../actions/cut-lts-patch';
+
+import {expectStagingAndPublishWithCherryPick, fakeNpmPackageQueryRequest, getTestingMocksForReleaseAction, parse, setupReleaseActionForTesting, testTmpDir} from './test-utils';
+
+describe('cut an LTS patch action', () => {
+  it('should be active', async () => {
+    expect(await CutLongTermSupportPatchAction.isActive({
+      releaseCandidate: null,
+      next: new ReleaseTrain('master', parse('10.1.0-next.3')),
+      latest: new ReleaseTrain('10.0.x', parse('10.0.3')),
+    })).toBe(true);
+  });
+
+  it('should be active if there is a feature-freeze train', async () => {
+    expect(await CutLongTermSupportPatchAction.isActive({
+      releaseCandidate: new ReleaseTrain('10.1.x', parse('10.1.0-next.3')),
+      next: new ReleaseTrain('master', parse('10.2.0-next.3')),
+      latest: new ReleaseTrain('10.0.x', parse('10.0.3')),
+    })).toBe(true);
+  });
+
+  it('should be active if there is a release-candidate train', async () => {
+    expect(await CutLongTermSupportPatchAction.isActive({
+      releaseCandidate: new ReleaseTrain('10.1.x', parse('10.1.0-rc.0')),
+      next: new ReleaseTrain('master', parse('10.2.0-next.3')),
+      latest: new ReleaseTrain('10.0.x', parse('10.0.3')),
+    })).toBe(true);
+  });
+
+  it('should compute proper new version and select correct branch', async () => {
+    const action = setupReleaseActionForTesting(CutLongTermSupportPatchAction, {
+      releaseCandidate: null,
+      next: new ReleaseTrain('master', parse('10.1.0-next.3')),
+      latest: new ReleaseTrain('10.0.x', parse('10.0.2')),
+    });
+
+    spyOn<any>(action.instance, '_promptForTargetLtsBranch')
+        .and.resolveTo({name: '9.2.x', version: parse('9.2.4'), npmDistTag: 'v9-lts'});
+
+    await expectStagingAndPublishWithCherryPick(action, '9.2.x', '9.2.5', 'v9-lts');
+  });
+
+  it('should include number of active LTS branches in action description', async () => {
+    const {releaseConfig, gitClient} = getTestingMocksForReleaseAction();
+    const activeReleaseTrains = {
+      releaseCandidate: null,
+      next: new ReleaseTrain('master', parse('10.1.0-next.3')),
+      latest: new ReleaseTrain('10.0.x', parse('10.0.2')),
+    };
+
+    fakeNpmPackageQueryRequest(releaseConfig.npmPackages[0], {
+      'dist-tags': {'v9-lts': '9.1.2', 'v8-lts': '8.2.2'},
+      'time': {
+        '9.0.0': new Date().toISOString(),
+        '8.0.0': new Date().toISOString(),
+      },
+    });
+
+    const action = new CutLongTermSupportPatchAction(
+        activeReleaseTrains, gitClient, releaseConfig, testTmpDir);
+
+    expect(await action.getDescription())
+        .toEqual(`Cut a new release for an active LTS branch (2 active).`);
+  });
+
+  it('should properly determine active and inactive LTS branches', async () => {
+    const {releaseConfig} = getTestingMocksForReleaseAction();
+    fakeNpmPackageQueryRequest(releaseConfig.npmPackages[0], {
+      'dist-tags': {
+        'v9-lts': '9.2.3',
+        'v8-lts': '8.4.4',
+        'v7-lts': '7.0.1',
+        'v6-lts': '6.0.0',
+      },
+      time: {
+        '9.0.0': new Date().toISOString(),
+        '8.0.0': new Date().toISOString(),
+        // We pick dates for the v6 and v7 major versions that guarantee that the version
+        // is no longer considered as active LTS version.
+        '7.0.0': new Date(1912, 5, 23).toISOString(),
+        '6.0.0': new Date(1912, 5, 23).toISOString(),
+      },
+    });
+
+    // Note: This accesses a private method, so we need to use an element access to satisfy
+    // TypeScript. It is acceptable to access the member for fine-grained unit testing due to
+    // complexity with inquirer we want to avoid. It is not easy to test prompts.
+    const {active, inactive} = await fetchLongTermSupportBranchesFromNpm(releaseConfig);
+
+    expect(active).toEqual([
+      {name: '9.2.x', version: matchesVersion('9.2.3'), npmDistTag: 'v9-lts'},
+      {name: '8.4.x', version: matchesVersion('8.4.4'), npmDistTag: 'v8-lts'},
+    ]);
+    expect(inactive).toEqual([
+      {name: '7.0.x', version: matchesVersion('7.0.1'), npmDistTag: 'v7-lts'},
+      {name: '6.0.x', version: matchesVersion('6.0.0'), npmDistTag: 'v6-lts'},
+    ]);
+  });
+});
diff --git a/dev-infra/release/publish/test/cut-new-patch.spec.ts b/dev-infra/release/publish/test/cut-new-patch.spec.ts
new file mode 100644
index 0000000000000..9df19191f01cc
--- /dev/null
+++ b/dev-infra/release/publish/test/cut-new-patch.spec.ts
@@ -0,0 +1,52 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {ReleaseTrain} from '../../versioning/release-trains';
+import {CutNewPatchAction} from '../actions/cut-new-patch';
+
+import {expectStagingAndPublishWithCherryPick, parse, setupReleaseActionForTesting} from './test-utils';
+
+describe('cut new patch action', () => {
+  it('should be active', async () => {
+    expect(await CutNewPatchAction.isActive({
+      releaseCandidate: null,
+      next: new ReleaseTrain('master', parse('10.1.0-next.3')),
+      latest: new ReleaseTrain('10.0.x', parse('10.0.3')),
+    })).toBe(true);
+  });
+
+  it('should compute proper new version and select correct branch', async () => {
+    const action = setupReleaseActionForTesting(CutNewPatchAction, {
+      releaseCandidate: null,
+      next: new ReleaseTrain('master', parse('10.1.0-next.3')),
+      latest: new ReleaseTrain('10.0.x', parse('10.0.2')),
+    });
+
+    await expectStagingAndPublishWithCherryPick(action, '10.0.x', '10.0.3', 'latest');
+  });
+
+  it('should create a proper new version if there is a feature-freeze release-train', async () => {
+    const action = setupReleaseActionForTesting(CutNewPatchAction, {
+      releaseCandidate: new ReleaseTrain('10.1.x', parse('10.1.0-next.3')),
+      next: new ReleaseTrain('master', parse('10.2.0-next.0')),
+      latest: new ReleaseTrain('10.0.x', parse('10.0.9')),
+    });
+
+    await expectStagingAndPublishWithCherryPick(action, '10.0.x', '10.0.10', 'latest');
+  });
+
+  it('should create a proper new version if there is a release-candidate train', async () => {
+    const action = setupReleaseActionForTesting(CutNewPatchAction, {
+      releaseCandidate: new ReleaseTrain('10.1.x', parse('10.1.0-rc.0')),
+      next: new ReleaseTrain('master', parse('10.2.0-next.0')),
+      latest: new ReleaseTrain('10.0.x', parse('10.0.9')),
+    });
+
+    await expectStagingAndPublishWithCherryPick(action, '10.0.x', '10.0.10', 'latest');
+  });
+});
diff --git a/dev-infra/release/publish/test/cut-next-prerelease.spec.ts b/dev-infra/release/publish/test/cut-next-prerelease.spec.ts
new file mode 100644
index 0000000000000..ab37350788b82
--- /dev/null
+++ b/dev-infra/release/publish/test/cut-next-prerelease.spec.ts
@@ -0,0 +1,79 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {readFileSync} from 'fs';
+import {join} from 'path';
+
+import {ReleaseTrain} from '../../versioning/release-trains';
+import {CutNextPrereleaseAction} from '../actions/cut-next-prerelease';
+import {packageJsonPath} from '../constants';
+
+import {expectStagingAndPublishWithCherryPick, expectStagingAndPublishWithoutCherryPick, parse, setupReleaseActionForTesting} from './test-utils';
+
+describe('cut next pre-release action', () => {
+  it('should always be active regardless of release-trains', async () => {
+    expect(await CutNextPrereleaseAction.isActive()).toBe(true);
+  });
+
+  it('should cut a pre-release for the next branch if there is no FF/RC branch', async () => {
+    const action = setupReleaseActionForTesting(CutNextPrereleaseAction, {
+      releaseCandidate: null,
+      next: new ReleaseTrain('master', parse('10.2.0-next.0')),
+      latest: new ReleaseTrain('10.1.x', parse('10.1.2')),
+    });
+
+    await expectStagingAndPublishWithoutCherryPick(action, 'master', '10.2.0-next.1', 'next');
+  });
+
+  // This is test for a special case in the release tooling. Whenever we branch off for
+  // feature-freeze, we immediately bump the version in the `next` branch but do not publish
+  // it. This is because there are no new changes in the next branch that wouldn't be part of
+  // the branched-off feature-freeze release-train. Also while a FF/RC is active, we cannot
+  // publish versions to the NPM dist tag. This means that the version is later published, but
+  // still needs all the staging work (e.g. changelog). We special-case this by not incrementing
+  // the version if the version in the next branch has not been published yet.
+  it('should not bump version if current next version has not been published', async () => {
+    const action = setupReleaseActionForTesting(
+        CutNextPrereleaseAction, {
+          releaseCandidate: null,
+          next: new ReleaseTrain('master', parse('10.2.0-next.0')),
+          latest: new ReleaseTrain('10.1.x', parse('10.1.0')),
+        },
+        /* isNextPublishedToNpm */ false);
+
+    await expectStagingAndPublishWithoutCherryPick(action, 'master', '10.2.0-next.0', 'next');
+
+    const pkgJsonContents = readFileSync(join(action.testTmpDir, packageJsonPath), 'utf8');
+    const pkgJson = JSON.parse(pkgJsonContents);
+    expect(pkgJson.version).toBe('10.2.0-next.0', 'Expected version to not have changed.');
+  });
+
+  describe('with active feature-freeze', () => {
+    it('should create a proper new version and select correct branch', async () => {
+      const action = setupReleaseActionForTesting(CutNextPrereleaseAction, {
+        releaseCandidate: new ReleaseTrain('10.1.x', parse('10.1.0-next.4')),
+        next: new ReleaseTrain('master', parse('10.2.0-next.0')),
+        latest: new ReleaseTrain('10.0.x', parse('10.0.2')),
+      });
+
+      await expectStagingAndPublishWithCherryPick(action, '10.1.x', '10.1.0-next.5', 'next');
+    });
+  });
+
+  describe('with active release-candidate', () => {
+    it('should create a proper new version and select correct branch', async () => {
+      const action = setupReleaseActionForTesting(CutNextPrereleaseAction, {
+        releaseCandidate: new ReleaseTrain('10.1.x', parse('10.1.0-rc.0')),
+        next: new ReleaseTrain('master', parse('10.2.0-next.0')),
+        latest: new ReleaseTrain('10.0.x', parse('10.0.2')),
+      });
+
+      await expectStagingAndPublishWithCherryPick(action, '10.1.x', '10.1.0-rc.1', 'next');
+    });
+  });
+});
diff --git a/dev-infra/release/publish/test/cut-release-candidate.spec.ts b/dev-infra/release/publish/test/cut-release-candidate.spec.ts
new file mode 100644
index 0000000000000..589efa1df0f97
--- /dev/null
+++ b/dev-infra/release/publish/test/cut-release-candidate.spec.ts
@@ -0,0 +1,49 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {ReleaseTrain} from '../../versioning/release-trains';
+import {CutReleaseCandidateAction} from '../actions/cut-release-candidate';
+
+import {expectStagingAndPublishWithCherryPick, parse, setupReleaseActionForTesting} from './test-utils';
+
+describe('cut release candidate action', () => {
+  it('should activate if a feature-freeze release-train is active', async () => {
+    expect(await CutReleaseCandidateAction.isActive({
+      releaseCandidate: new ReleaseTrain('10.1.x', parse('10.1.0-next.1')),
+      next: new ReleaseTrain('master', parse('10.2.0-next.0')),
+      latest: new ReleaseTrain('10.0.x', parse('10.0.3')),
+    })).toBe(true);
+  });
+
+  it('should not activate if release-candidate release-train is active', async () => {
+    expect(await CutReleaseCandidateAction.isActive({
+      // No longer in feature-freeze but in release-candidate phase.
+      releaseCandidate: new ReleaseTrain('10.1.x', parse('10.1.0-rc.0')),
+      next: new ReleaseTrain('master', parse('10.2.0-next.0')),
+      latest: new ReleaseTrain('10.0.x', parse('10.0.3')),
+    })).toBe(false);
+  });
+
+  it('should not activate if no FF/RC release-train is active', async () => {
+    expect(await CutReleaseCandidateAction.isActive({
+      releaseCandidate: null,
+      next: new ReleaseTrain('master', parse('10.1.0-next.0')),
+      latest: new ReleaseTrain('10.0.x', parse('10.0.3')),
+    })).toBe(false);
+  });
+
+  it('should create a proper new version and select correct branch', async () => {
+    const action = setupReleaseActionForTesting(CutReleaseCandidateAction, {
+      releaseCandidate: new ReleaseTrain('10.1.x', parse('10.1.0-next.1')),
+      next: new ReleaseTrain('master', parse('10.2.0-next.0')),
+      latest: new ReleaseTrain('10.0.x', parse('10.0.3')),
+    });
+
+    await expectStagingAndPublishWithCherryPick(action, '10.1.x', '10.1.0-rc.0', 'next');
+  });
+});
diff --git a/dev-infra/release/publish/test/cut-stable.spec.ts b/dev-infra/release/publish/test/cut-stable.spec.ts
new file mode 100644
index 0000000000000..5383b8f30093b
--- /dev/null
+++ b/dev-infra/release/publish/test/cut-stable.spec.ts
@@ -0,0 +1,78 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {matchesVersion} from '../../../utils/testing/semver-matchers';
+import {ReleaseTrain} from '../../versioning/release-trains';
+import {CutStableAction} from '../actions/cut-stable';
+import * as externalCommands from '../external-commands';
+
+import {expectStagingAndPublishWithCherryPick, parse, setupReleaseActionForTesting} from './test-utils';
+
+describe('cut stable action', () => {
+  it('should not activate if a feature-freeze release-train is active', async () => {
+    expect(await CutStableAction.isActive({
+      releaseCandidate: new ReleaseTrain('10.1.x', parse('10.1.0-next.1')),
+      next: new ReleaseTrain('master', parse('10.2.0-next.0')),
+      latest: new ReleaseTrain('10.0.x', parse('10.0.3')),
+    })).toBe(false);
+  });
+
+  it('should activate if release-candidate release-train is active', async () => {
+    expect(await CutStableAction.isActive({
+      // No longer in feature-freeze but in release-candidate phase.
+      releaseCandidate: new ReleaseTrain('10.1.x', parse('10.1.0-rc.0')),
+      next: new ReleaseTrain('master', parse('10.2.0-next.0')),
+      latest: new ReleaseTrain('10.0.x', parse('10.0.3')),
+    })).toBe(true);
+  });
+
+  it('should not activate if no FF/RC release-train is active', async () => {
+    expect(await CutStableAction.isActive({
+      releaseCandidate: null,
+      next: new ReleaseTrain('master', parse('10.1.0-next.0')),
+      latest: new ReleaseTrain('10.0.x', parse('10.0.3')),
+    })).toBe(false);
+  });
+
+  it('should create a proper new version and select correct branch', async () => {
+    const action = setupReleaseActionForTesting(CutStableAction, {
+      // No longer in feature-freeze but in release-candidate phase.
+      releaseCandidate: new ReleaseTrain('10.1.x', parse('10.1.0-rc.0')),
+      next: new ReleaseTrain('master', parse('10.2.0-next.0')),
+      latest: new ReleaseTrain('10.0.x', parse('10.0.3')),
+    });
+
+    await expectStagingAndPublishWithCherryPick(action, '10.1.x', '10.1.0', 'latest');
+  });
+
+  it('should not tag the previous latest release-train if a minor has been cut', async () => {
+    const action = setupReleaseActionForTesting(CutStableAction, {
+      // No longer in feature-freeze but in release-candidate phase.
+      releaseCandidate: new ReleaseTrain('10.1.x', parse('10.1.0-rc.0')),
+      next: new ReleaseTrain('master', parse('10.2.0-next.0')),
+      latest: new ReleaseTrain('10.0.x', parse('10.0.3')),
+    });
+
+    await expectStagingAndPublishWithCherryPick(action, '10.1.x', '10.1.0', 'latest');
+    expect(externalCommands.invokeSetNpmDistCommand).toHaveBeenCalledTimes(0);
+  });
+
+  it('should tag the previous latest release-train if a major has been cut', async () => {
+    const action = setupReleaseActionForTesting(CutStableAction, {
+      // No longer in feature-freeze but in release-candidate phase.
+      releaseCandidate: new ReleaseTrain('11.0.x', parse('11.0.0-rc.0')),
+      next: new ReleaseTrain('master', parse('10.2.0-next.0')),
+      latest: new ReleaseTrain('10.0.x', parse('10.0.3')),
+    });
+
+    await expectStagingAndPublishWithCherryPick(action, '11.0.x', '11.0.0', 'latest');
+    expect(externalCommands.invokeSetNpmDistCommand).toHaveBeenCalledTimes(1);
+    expect(externalCommands.invokeSetNpmDistCommand)
+        .toHaveBeenCalledWith('v10-lts', matchesVersion('10.0.3'));
+  });
+});
diff --git a/dev-infra/release/publish/test/github-api-testing.ts b/dev-infra/release/publish/test/github-api-testing.ts
new file mode 100644
index 0000000000000..e12ef6da37c86
--- /dev/null
+++ b/dev-infra/release/publish/test/github-api-testing.ts
@@ -0,0 +1,88 @@
+/**
+ * @license
+ * Copyright Google LLC 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 nock from 'nock';
+
+/**
+ * Class that represents a Github repository in testing. The class can be
+ * used to intercept and except Github API requests for release actions.
+ */
+export class GithubTestingRepo {
+  /** Github API endpoint. */
+  private apiEndpoint = `https://api.github.com`;
+
+  /** Github API url for the given repository. */
+  private repoApiUrl = `${this.apiEndpoint}/repos/${this.owner}/${this.name}`;
+
+  constructor(public owner: string, public name: string) {}
+
+  expectPullRequestToBeCreated(
+      baseBranch: string, fork: GithubTestingRepo, forkBranch: string, prNumber: number): this {
+    const expectedHead = `${fork.owner}:${forkBranch}`;
+    nock(this.repoApiUrl)
+        .post('/pulls', ({base, head}) => base === baseBranch && head === expectedHead)
+        .reply(200, {number: prNumber});
+    return this;
+  }
+
+  expectBranchRequest(branchName: string, sha: string|null): this {
+    nock(this.repoApiUrl)
+        .get(`/branches/${branchName}`)
+        .reply(sha ? 200 : 404, sha ? {commit: {sha}} : undefined);
+    return this;
+  }
+
+  expectFindForkRequest(fork: GithubTestingRepo): this {
+    nock(this.apiEndpoint)
+        .post(
+            '/graphql',
+            ({variables}) => variables.owner === this.owner && variables.name === this.name)
+        .reply(200, {
+          data: {repository: {forks: {nodes: [{owner: {login: fork.owner}, name: fork.name}]}}}
+        });
+    return this;
+  }
+
+  expectCommitStatusCheck(sha: string, state: 'success'|'pending'|'failure'): this {
+    nock(this.repoApiUrl).get(`/commits/${sha}/status`).reply(200, {state}).activeMocks();
+    return this;
+  }
+
+  expectPullRequestWait(prNumber: number): this {
+    // The pull request state could be queried multiple times, so we persist
+    // this mock request. By default, nock only mocks requests once.
+    nock(this.repoApiUrl).get(`/pulls/${prNumber}`).reply(200, {merged: true}).persist();
+    return this;
+  }
+
+  expectChangelogFetch(branch: string, content: string): this {
+    nock(this.repoApiUrl).get(`/contents//CHANGELOG.md`).query(p => p.ref === branch).reply(200, {
+      content: new Buffer(content).toString('base64')
+    });
+    return this;
+  }
+
+  expectCommitRequest(sha: string, message: string): this {
+    nock(this.repoApiUrl).get(`/commits/${sha}`).reply(200, {commit: {message}});
+    return this;
+  }
+
+  expectTagToBeCreated(tagName: string, sha: string): this {
+    nock(this.repoApiUrl)
+        .post(`/git/refs`, b => b.ref === `refs/tags/${tagName}` && b.sha === sha)
+        .reply(200, {});
+    return this;
+  }
+
+  expectReleaseToBeCreated(name: string, tagName: string): this {
+    nock(this.repoApiUrl)
+        .post('/releases', b => b.name === name && b['tag_name'] === tagName)
+        .reply(200, {});
+    return this;
+  }
+}
diff --git a/dev-infra/release/publish/test/move-next-into-feature-freeze.spec.ts b/dev-infra/release/publish/test/move-next-into-feature-freeze.spec.ts
new file mode 100644
index 0000000000000..11a64ca4867de
--- /dev/null
+++ b/dev-infra/release/publish/test/move-next-into-feature-freeze.spec.ts
@@ -0,0 +1,148 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {getBranchPushMatcher} from '../../../utils/testing';
+import {ActiveReleaseTrains} from '../../versioning/active-release-trains';
+import * as npm from '../../versioning/npm-publish';
+import {ReleaseTrain} from '../../versioning/release-trains';
+import {MoveNextIntoFeatureFreezeAction} from '../actions/move-next-into-feature-freeze';
+import * as externalCommands from '../external-commands';
+
+import {getChangelogForVersion, parse, setupReleaseActionForTesting, testTmpDir} from './test-utils';
+
+describe('move next into feature-freeze action', () => {
+  it('should not activate if a feature-freeze release-train is active', async () => {
+    expect(await MoveNextIntoFeatureFreezeAction.isActive({
+      releaseCandidate: new ReleaseTrain('10.1.x', parse('10.1.0-next.1')),
+      next: new ReleaseTrain('master', parse('10.2.0-next.0')),
+      latest: new ReleaseTrain('10.0.x', parse('10.0.3')),
+    })).toBe(false);
+  });
+
+  it('should not activate if release-candidate release-train is active', async () => {
+    expect(await MoveNextIntoFeatureFreezeAction.isActive({
+      // No longer in feature-freeze but in release-candidate phase.
+      releaseCandidate: new ReleaseTrain('10.1.x', parse('10.1.0-rc.0')),
+      next: new ReleaseTrain('master', parse('10.2.0-next.0')),
+      latest: new ReleaseTrain('10.0.x', parse('10.0.3')),
+    })).toBe(false);
+  });
+
+  it('should activate if no FF/RC release-train is active', async () => {
+    expect(await MoveNextIntoFeatureFreezeAction.isActive({
+      releaseCandidate: null,
+      next: new ReleaseTrain('master', parse('10.1.0-next.0')),
+      latest: new ReleaseTrain('10.0.x', parse('10.0.3')),
+    })).toBe(true);
+  });
+
+  it('should create pull requests and feature-freeze branch', async () => {
+    await expectVersionAndBranchToBeCreated(
+        {
+          releaseCandidate: null,
+          next: new ReleaseTrain('master', parse('10.2.0-next.0')),
+          latest: new ReleaseTrain('10.0.x', parse('10.0.3')),
+        },
+        /* isNextPublishedToNpm */ true, '10.3.0-next.0', '10.2.0-next.1', '10.2.x');
+  });
+
+  it('should not increment the version if "next" version is not yet published', async () => {
+    await expectVersionAndBranchToBeCreated(
+        {
+          releaseCandidate: null,
+          next: new ReleaseTrain('master', parse('10.2.0-next.0')),
+          latest: new ReleaseTrain('10.0.x', parse('10.0.3')),
+        },
+        /* isNextPublishedToNpm */ false, '10.3.0-next.0', '10.2.0-next.0', '10.2.x');
+  });
+
+  /** Performs the action and expects versions and branches to be determined properly. */
+  async function expectVersionAndBranchToBeCreated(
+      active: ActiveReleaseTrains, isNextPublishedToNpm: boolean, expectedNextVersion: string,
+      expectedVersion: string, expectedNewBranch: string) {
+    const {repo, fork, instance, gitClient, releaseConfig} =
+        setupReleaseActionForTesting(MoveNextIntoFeatureFreezeAction, active, isNextPublishedToNpm);
+
+    const expectedNextUpdateBranch = `next-release-train-${expectedNextVersion}`;
+    const expectedStagingForkBranch = `release-stage-${expectedVersion}`;
+    const expectedTagName = expectedVersion;
+
+    // We first mock the commit status check for the next branch, then expect two pull
+    // requests from a fork that are targeting next and the new feature-freeze branch.
+    repo.expectBranchRequest('master', 'MASTER_COMMIT_SHA')
+        .expectCommitStatusCheck('MASTER_COMMIT_SHA', 'success')
+        .expectFindForkRequest(fork)
+        .expectPullRequestToBeCreated(expectedNewBranch, fork, expectedStagingForkBranch, 200)
+        .expectPullRequestWait(200)
+        .expectBranchRequest(expectedNewBranch, 'STAGING_COMMIT_SHA')
+        .expectCommitRequest(
+            'STAGING_COMMIT_SHA', `release: cut the v${expectedVersion} release\n\nPR Close #200.`)
+        .expectTagToBeCreated(expectedTagName, 'STAGING_COMMIT_SHA')
+        .expectReleaseToBeCreated(`v${expectedVersion}`, expectedTagName)
+        .expectChangelogFetch(expectedNewBranch, getChangelogForVersion(expectedVersion))
+        .expectPullRequestToBeCreated('master', fork, expectedNextUpdateBranch, 100);
+
+    // In the fork, we make the following branches appear as non-existent,
+    // so that the PRs can be created properly without collisions.
+    fork.expectBranchRequest(expectedStagingForkBranch, null)
+        .expectBranchRequest(expectedNextUpdateBranch, null);
+
+    await instance.perform();
+
+    expect(gitClient.pushed.length).toBe(3);
+    expect(gitClient.pushed[0])
+        .toEqual(
+            getBranchPushMatcher({
+              baseRepo: repo,
+              baseBranch: 'master',
+              targetRepo: repo,
+              targetBranch: expectedNewBranch,
+              expectedCommits: [],
+            }),
+            'Expected feature-freeze branch to be created upstream and based on "master".');
+    expect(gitClient.pushed[1])
+        .toEqual(
+            getBranchPushMatcher({
+              baseBranch: 'master',
+              baseRepo: repo,
+              targetBranch: expectedStagingForkBranch,
+              targetRepo: fork,
+              expectedCommits: [{
+                message: `release: cut the v${expectedVersion} release`,
+                files: ['package.json', 'CHANGELOG.md'],
+              }],
+            }),
+            'Expected release staging branch to be created in fork.');
+
+    expect(gitClient.pushed[2])
+        .toEqual(
+            getBranchPushMatcher({
+              baseBranch: 'master',
+              baseRepo: repo,
+              targetBranch: expectedNextUpdateBranch,
+              targetRepo: fork,
+              expectedCommits: [
+                {
+                  message: `release: bump the next branch to v${expectedNextVersion}`,
+                  files: ['package.json']
+                },
+                {
+                  message: `docs: release notes for the v${expectedVersion} release`,
+                  files: ['CHANGELOG.md']
+                },
+              ],
+            }),
+            'Expected next release-train update branch be created in fork.');
+
+    expect(externalCommands.invokeReleaseBuildCommand).toHaveBeenCalledTimes(1);
+    expect(releaseConfig.generateReleaseNotesForHead).toHaveBeenCalledTimes(1);
+    expect(npm.runNpmPublish).toHaveBeenCalledTimes(2);
+    expect(npm.runNpmPublish).toHaveBeenCalledWith(`${testTmpDir}/dist/pkg1`, 'next', undefined);
+    expect(npm.runNpmPublish).toHaveBeenCalledWith(`${testTmpDir}/dist/pkg2`, 'next', undefined);
+  }
+});
diff --git a/dev-infra/release/publish/test/test-utils.ts b/dev-infra/release/publish/test/test-utils.ts
new file mode 100644
index 0000000000000..0f4ac54445423
--- /dev/null
+++ b/dev-infra/release/publish/test/test-utils.ts
@@ -0,0 +1,244 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {writeFileSync} from 'fs';
+import * as nock from 'nock';
+import {join} from 'path';
+import * as semver from 'semver';
+
+import {GithubConfig} from '../../../utils/config';
+import * as console from '../../../utils/console';
+import {getBranchPushMatcher, VirtualGitClient} from '../../../utils/testing';
+import {ReleaseConfig} from '../../config/index';
+import {ActiveReleaseTrains} from '../../versioning/active-release-trains';
+import * as npm from '../../versioning/npm-publish';
+import {_npmPackageInfoCache, NpmPackageInfo} from '../../versioning/npm-registry';
+import {ReleaseAction, ReleaseActionConstructor} from '../actions';
+import * as constants from '../constants';
+import * as externalCommands from '../external-commands';
+
+import {GithubTestingRepo} from './github-api-testing';
+
+/**
+ * Temporary directory which will be used as project directory in tests. Note that
+ * this environment variable is automatically set by Bazel for tests.
+ */
+export const testTmpDir: string = process.env['TEST_TMPDIR']!;
+
+/** Interface describing a test release action. */
+export interface TestReleaseAction<T extends ReleaseAction = ReleaseAction> {
+  instance: T;
+  gitClient: VirtualGitClient;
+  repo: GithubTestingRepo;
+  fork: GithubTestingRepo;
+  testTmpDir: string;
+  githubConfig: GithubConfig;
+  releaseConfig: ReleaseConfig;
+}
+
+/** Gets necessary test mocks for running a release action. */
+export function getTestingMocksForReleaseAction() {
+  const githubConfig = {owner: 'angular', name: 'dev-infra-test'};
+  const gitClient = new VirtualGitClient(undefined, {github: githubConfig}, testTmpDir);
+  const releaseConfig: ReleaseConfig = {
+    npmPackages: [
+      '@angular/pkg1',
+      '@angular/pkg2',
+    ],
+    generateReleaseNotesForHead: jasmine.createSpy('generateReleaseNotesForHead').and.resolveTo(),
+    buildPackages: () => {
+      throw Error('Not implemented');
+    },
+  };
+  return {githubConfig, gitClient, releaseConfig};
+}
+
+/**
+ * Sets up the given release action for testing.
+ * @param actionCtor Type of release action to be tested.
+ * @param active Fake active release trains for the action,
+ * @param isNextPublishedToNpm Whether the next version is published to NPM. True by default.
+ */
+export function setupReleaseActionForTesting<T extends ReleaseAction>(
+    actionCtor: ReleaseActionConstructor<T>, active: ActiveReleaseTrains,
+    isNextPublishedToNpm = true): TestReleaseAction<T> {
+  // Reset existing HTTP interceptors.
+  nock.cleanAll();
+
+  const {gitClient, githubConfig, releaseConfig} = getTestingMocksForReleaseAction();
+  const repo = new GithubTestingRepo(githubConfig.owner, githubConfig.name);
+  const fork = new GithubTestingRepo('some-user', 'fork');
+
+  // The version for the release-train in the next phase does not necessarily need to be
+  // published to NPM. We mock the NPM package request and fake the state of the next
+  // version based on the `isNextPublishedToNpm` testing parameter. More details on the
+  // special case for the next release train can be found in the next pre-release action.
+  fakeNpmPackageQueryRequest(
+      releaseConfig.npmPackages[0],
+      {versions: {[active.next.version.format()]: isNextPublishedToNpm ? {} : undefined}});
+
+  const action = new actionCtor(active, gitClient, releaseConfig, testTmpDir);
+
+  // Fake confirm any prompts. We do not want to make any changelog edits and
+  // just proceed with the release action.
+  spyOn(console, 'promptConfirm').and.resolveTo(true);
+
+  // Fake all external commands for the release tool.
+  spyOn(npm, 'runNpmPublish').and.resolveTo(true);
+  spyOn(externalCommands, 'invokeSetNpmDistCommand').and.resolveTo();
+  spyOn(externalCommands, 'invokeYarnInstallCommand').and.resolveTo();
+  spyOn(externalCommands, 'invokeReleaseBuildCommand').and.resolveTo([
+    {name: '@angular/pkg1', outputPath: `${testTmpDir}/dist/pkg1`},
+    {name: '@angular/pkg2', outputPath: `${testTmpDir}/dist/pkg2`}
+  ]);
+
+  // Create an empty changelog and a `package.json` file so that file system
+  // interactions with the project directory do not cause exceptions.
+  writeFileSync(join(testTmpDir, 'CHANGELOG.md'), 'Existing changelog');
+  writeFileSync(join(testTmpDir, 'package.json'), JSON.stringify({version: 'unknown'}));
+
+  // Override the default pull request wait interval to a number of milliseconds that can be
+  // awaited in Jasmine tests. The default interval of 10sec is too large and causes a timeout.
+  Object.defineProperty(constants, 'waitForPullRequestInterval', {value: 50});
+
+  return {instance: action, repo, fork, testTmpDir, githubConfig, releaseConfig, gitClient};
+}
+
+/** Parses the specified version into Semver. */
+export function parse(version: string): semver.SemVer {
+  return semver.parse(version)!;
+}
+
+/** Gets a changelog for the specified version. */
+export function getChangelogForVersion(version: string): string {
+  return `<a name="${version}"></a>Changelog\n\n`;
+}
+
+export async function expectStagingAndPublishWithoutCherryPick(
+    action: TestReleaseAction, expectedBranch: string, expectedVersion: string,
+    expectedNpmDistTag: string) {
+  const {repo, fork, gitClient, releaseConfig} = action;
+  const expectedStagingForkBranch = `release-stage-${expectedVersion}`;
+  const expectedTagName = expectedVersion;
+
+  // We first mock the commit status check for the next branch, then expect two pull
+  // requests from a fork that are targeting next and the new feature-freeze branch.
+  repo.expectBranchRequest(expectedBranch, 'MASTER_COMMIT_SHA')
+      .expectCommitStatusCheck('MASTER_COMMIT_SHA', 'success')
+      .expectFindForkRequest(fork)
+      .expectPullRequestToBeCreated(expectedBranch, fork, expectedStagingForkBranch, 200)
+      .expectPullRequestWait(200)
+      .expectBranchRequest(expectedBranch, 'STAGING_COMMIT_SHA')
+      .expectCommitRequest(
+          'STAGING_COMMIT_SHA', `release: cut the v${expectedVersion} release\n\nPR Close #200.`)
+      .expectTagToBeCreated(expectedTagName, 'STAGING_COMMIT_SHA')
+      .expectReleaseToBeCreated(`v${expectedVersion}`, expectedTagName);
+
+  // In the fork, we make the staging branch appear as non-existent,
+  // so that the PR can be created properly without collisions.
+  fork.expectBranchRequest(expectedStagingForkBranch, null);
+
+  await action.instance.perform();
+
+  expect(gitClient.pushed.length).toBe(1);
+  expect(gitClient.pushed[0])
+      .toEqual(
+          getBranchPushMatcher({
+            baseBranch: expectedBranch,
+            baseRepo: repo,
+            targetBranch: expectedStagingForkBranch,
+            targetRepo: fork,
+            expectedCommits: [{
+              message: `release: cut the v${expectedVersion} release`,
+              files: ['package.json', 'CHANGELOG.md'],
+            }],
+          }),
+          'Expected release staging branch to be created in fork.');
+
+  expect(externalCommands.invokeReleaseBuildCommand).toHaveBeenCalledTimes(1);
+  expect(releaseConfig.generateReleaseNotesForHead).toHaveBeenCalledTimes(1);
+  expect(npm.runNpmPublish).toHaveBeenCalledTimes(2);
+  expect(npm.runNpmPublish)
+      .toHaveBeenCalledWith(`${testTmpDir}/dist/pkg1`, expectedNpmDistTag, undefined);
+  expect(npm.runNpmPublish)
+      .toHaveBeenCalledWith(`${testTmpDir}/dist/pkg2`, expectedNpmDistTag, undefined);
+}
+
+export async function expectStagingAndPublishWithCherryPick(
+    action: TestReleaseAction, expectedBranch: string, expectedVersion: string,
+    expectedNpmDistTag: string) {
+  const {repo, fork, gitClient, releaseConfig} = action;
+  const expectedStagingForkBranch = `release-stage-${expectedVersion}`;
+  const expectedCherryPickForkBranch = `changelog-cherry-pick-${expectedVersion}`;
+  const expectedTagName = expectedVersion;
+
+  // We first mock the commit status check for the next branch, then expect two pull
+  // requests from a fork that are targeting next and the new feature-freeze branch.
+  repo.expectBranchRequest(expectedBranch, 'MASTER_COMMIT_SHA')
+      .expectCommitStatusCheck('MASTER_COMMIT_SHA', 'success')
+      .expectFindForkRequest(fork)
+      .expectPullRequestToBeCreated(expectedBranch, fork, expectedStagingForkBranch, 200)
+      .expectPullRequestWait(200)
+      .expectBranchRequest(expectedBranch, 'STAGING_COMMIT_SHA')
+      .expectCommitRequest(
+          'STAGING_COMMIT_SHA', `release: cut the v${expectedVersion} release\n\nPR Close #200.`)
+      .expectTagToBeCreated(expectedTagName, 'STAGING_COMMIT_SHA')
+      .expectReleaseToBeCreated(`v${expectedVersion}`, expectedTagName)
+      .expectChangelogFetch(expectedBranch, getChangelogForVersion(expectedVersion))
+      .expectPullRequestToBeCreated('master', fork, expectedCherryPickForkBranch, 300);
+
+  // In the fork, we make the staging and cherry-pick branches appear as
+  // non-existent, so that the PRs can be created properly without collisions.
+  fork.expectBranchRequest(expectedStagingForkBranch, null)
+      .expectBranchRequest(expectedCherryPickForkBranch, null);
+
+  await action.instance.perform();
+
+  expect(gitClient.pushed.length).toBe(2);
+  expect(gitClient.pushed[0])
+      .toEqual(
+          getBranchPushMatcher({
+            baseBranch: expectedBranch,
+            baseRepo: repo,
+            targetBranch: expectedStagingForkBranch,
+            targetRepo: fork,
+            expectedCommits: [{
+              message: `release: cut the v${expectedVersion} release`,
+              files: ['package.json', 'CHANGELOG.md'],
+            }],
+          }),
+          'Expected release staging branch to be created in fork.');
+
+  expect(gitClient.pushed[1])
+      .toEqual(
+          getBranchPushMatcher({
+            baseBranch: 'master',
+            baseRepo: repo,
+            targetBranch: expectedCherryPickForkBranch,
+            targetRepo: fork,
+            expectedCommits: [{
+              message: `docs: release notes for the v${expectedVersion} release`,
+              files: ['CHANGELOG.md'],
+            }],
+          }),
+          'Expected cherry-pick branch to be created in fork.');
+
+  expect(externalCommands.invokeReleaseBuildCommand).toHaveBeenCalledTimes(1);
+  expect(releaseConfig.generateReleaseNotesForHead).toHaveBeenCalledTimes(1);
+  expect(npm.runNpmPublish).toHaveBeenCalledTimes(2);
+  expect(npm.runNpmPublish)
+      .toHaveBeenCalledWith(`${testTmpDir}/dist/pkg1`, expectedNpmDistTag, undefined);
+  expect(npm.runNpmPublish)
+      .toHaveBeenCalledWith(`${testTmpDir}/dist/pkg2`, expectedNpmDistTag, undefined);
+}
+
+/** Fakes a NPM package query API request for the given package. */
+export function fakeNpmPackageQueryRequest(pkgName: string, data: Partial<NpmPackageInfo>) {
+  _npmPackageInfoCache[pkgName] =
+      Promise.resolve({'dist-tags': {}, versions: {}, time: {}, ...data});
+}
diff --git a/dev-infra/release/set-dist-tag/BUILD.bazel b/dev-infra/release/set-dist-tag/BUILD.bazel
new file mode 100644
index 0000000000000..24ffebb76d1e7
--- /dev/null
+++ b/dev-infra/release/set-dist-tag/BUILD.bazel
@@ -0,0 +1,44 @@
+load("@npm//@bazel/typescript:index.bzl", "ts_library")
+load("//tools:defaults.bzl", "jasmine_node_test")
+
+ts_library(
+    name = "set-dist-tag",
+    srcs = glob(
+        [
+            "**/*.ts",
+        ],
+        exclude = ["*.spec.ts"],
+    ),
+    module_name = "@angular/dev-infra-private/release/set-dist-tag",
+    visibility = ["//dev-infra:__subpackages__"],
+    deps = [
+        "//dev-infra/release/config",
+        "//dev-infra/release/versioning",
+        "//dev-infra/utils",
+        "@npm//@types/node",
+        "@npm//@types/semver",
+        "@npm//@types/yargs",
+        "@npm//ora",
+        "@npm//semver",
+    ],
+)
+
+ts_library(
+    name = "test_lib",
+    srcs = glob([
+        "*.spec.ts",
+    ]),
+    deps = [
+        ":set-dist-tag",
+        "//dev-infra/release/config",
+        "//dev-infra/release/versioning",
+        "//dev-infra/utils/testing",
+        "@npm//@types/jasmine",
+        "@npm//@types/node",
+    ],
+)
+
+jasmine_node_test(
+    name = "test",
+    deps = [":test_lib"],
+)
diff --git a/dev-infra/release/set-dist-tag/cli.ts b/dev-infra/release/set-dist-tag/cli.ts
new file mode 100644
index 0000000000000..29cc0f2dd263a
--- /dev/null
+++ b/dev-infra/release/set-dist-tag/cli.ts
@@ -0,0 +1,78 @@
+/**
+ * @license
+ * Copyright Google LLC 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 ora from 'ora';
+import * as semver from 'semver';
+import {Arguments, Argv, CommandModule} from 'yargs';
+
+import {bold, debug, error, green, info, red} from '../../utils/console';
+import {getReleaseConfig} from '../config/index';
+import {setNpmTagForPackage} from '../versioning/npm-publish';
+
+
+/** Command line options for setting an NPM dist tag. */
+export interface ReleaseSetDistTagOptions {
+  tagName: string;
+  targetVersion: string;
+}
+
+function builder(args: Argv): Argv<ReleaseSetDistTagOptions> {
+  return args
+      .positional('tagName', {
+        type: 'string',
+        demandOption: true,
+        description: 'Name of the NPM dist tag.',
+      })
+      .positional('targetVersion', {
+        type: 'string',
+        demandOption: true,
+        description: 'Version to which the dist tag should be set.'
+      });
+}
+
+/** Yargs command handler for building a release. */
+async function handler(args: Arguments<ReleaseSetDistTagOptions>) {
+  const {targetVersion: rawVersion, tagName} = args;
+  const {npmPackages, publishRegistry} = getReleaseConfig();
+  const version = semver.parse(rawVersion);
+
+  if (version === null) {
+    error(red(`Invalid version specified (${rawVersion}). Unable to set NPM dist tag.`));
+    process.exit(1);
+  }
+
+  const spinner = ora().start();
+  debug(`Setting "${tagName}" NPM dist tag for release packages to v${version}.`);
+
+  for (const pkgName of npmPackages) {
+    spinner.text = `Setting NPM dist tag for "${pkgName}"`;
+    spinner.render();
+
+    try {
+      await setNpmTagForPackage(pkgName, tagName, version!, publishRegistry);
+      debug(`Successfully set "${tagName}" NPM dist tag for "${pkgName}".`);
+    } catch (e) {
+      spinner.stop();
+      error(e);
+      error(red(`  ✘   An error occurred while setting the NPM dist tag for "${pkgName}".`));
+      process.exit(1);
+    }
+  }
+
+  spinner.stop();
+  info(green(`  ✓   Set NPM dist tag for all release packages.`));
+  info(green(`      ${bold(tagName)} will now point to ${bold(`v${version}`)}.`));
+}
+
+/** CLI command module for setting an NPM dist tag. */
+export const ReleaseSetDistTagCommand: CommandModule<{}, ReleaseSetDistTagOptions> = {
+  builder,
+  handler,
+  command: 'set-dist-tag <tag-name> <target-version>',
+  describe: 'Sets a given NPM dist tag for all release packages.',
+};
diff --git a/dev-infra/release/set-dist-tag/set-dist-tag.spec.ts b/dev-infra/release/set-dist-tag/set-dist-tag.spec.ts
new file mode 100644
index 0000000000000..f7c02b98536b3
--- /dev/null
+++ b/dev-infra/release/set-dist-tag/set-dist-tag.spec.ts
@@ -0,0 +1,73 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {matchesVersion} from '../../utils/testing/semver-matchers';
+import * as releaseConfig from '../config/index';
+import * as npm from '../versioning/npm-publish';
+
+import {ReleaseSetDistTagCommand} from './cli';
+
+describe('ng-dev release set-dist-tag', () => {
+  let npmPackages: string[];
+  let publishRegistry: string|undefined;
+
+  beforeEach(() => {
+    npmPackages = ['@angular/pkg1', '@angular/pkg2'];
+    publishRegistry = undefined;
+
+    spyOn(npm, 'setNpmTagForPackage');
+    // We need to stub out the `process.exit` function during tests as the
+    // CLI handler calls those in case of failures.
+    spyOn(process, 'exit');
+  });
+
+  /** Invokes the `set-dist-tag` command handler. */
+  async function invokeCommand(tagName: string, targetVersion: string) {
+    spyOn(releaseConfig, 'getReleaseConfig').and.returnValue({
+      npmPackages,
+      publishRegistry,
+      buildPackages: async () => [],
+      generateReleaseNotesForHead: async () => {}
+    });
+    await ReleaseSetDistTagCommand.handler({tagName, targetVersion, $0: '', _: []});
+  }
+
+  it('should invoke "npm dist-tag" command for all configured packages', async () => {
+    await invokeCommand('latest', '10.0.0');
+    expect(npm.setNpmTagForPackage).toHaveBeenCalledTimes(2);
+    expect(npm.setNpmTagForPackage)
+        .toHaveBeenCalledWith('@angular/pkg1', 'latest', matchesVersion('10.0.0'), undefined);
+    expect(npm.setNpmTagForPackage)
+        .toHaveBeenCalledWith('@angular/pkg2', 'latest', matchesVersion('10.0.0'), undefined);
+  });
+
+  it('should support a configured custom NPM registry', async () => {
+    publishRegistry = 'https://my-custom-registry.angular.io';
+    await invokeCommand('latest', '10.0.0');
+
+    expect(npm.setNpmTagForPackage).toHaveBeenCalledTimes(2);
+    expect(npm.setNpmTagForPackage)
+        .toHaveBeenCalledWith(
+            '@angular/pkg1', 'latest', matchesVersion('10.0.0'),
+            'https://my-custom-registry.angular.io');
+    expect(npm.setNpmTagForPackage)
+        .toHaveBeenCalledWith(
+            '@angular/pkg2', 'latest', matchesVersion('10.0.0'),
+            'https://my-custom-registry.angular.io');
+  });
+
+  it('should error if an invalid version has been specified', async () => {
+    spyOn(console, 'error');
+    await invokeCommand('latest', '10.0');
+
+    expect(console.error)
+        .toHaveBeenCalledWith('Invalid version specified (10.0). Unable to set NPM dist tag.');
+    expect(process.exit).toHaveBeenCalledWith(1);
+    expect(process.exit).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/dev-infra/release/env-stamp.ts b/dev-infra/release/stamping/env-stamp.ts
similarity index 97%
rename from dev-infra/release/env-stamp.ts
rename to dev-infra/release/stamping/env-stamp.ts
index b425e5ece0313..184b63d7d6c0a 100644
--- a/dev-infra/release/env-stamp.ts
+++ b/dev-infra/release/stamping/env-stamp.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {exec as _exec} from '../utils/shelljs';
+import {exec as _exec} from '../../utils/shelljs';
 
 /**
  * Log the environment variables expected by bazel for stamping.
diff --git a/dev-infra/release/versioning/BUILD.bazel b/dev-infra/release/versioning/BUILD.bazel
new file mode 100644
index 0000000000000..94e6011ade990
--- /dev/null
+++ b/dev-infra/release/versioning/BUILD.bazel
@@ -0,0 +1,18 @@
+load("@npm//@bazel/typescript:index.bzl", "ts_library")
+
+ts_library(
+    name = "versioning",
+    srcs = glob([
+        "**/*.ts",
+    ]),
+    module_name = "@angular/dev-infra-private/release/versioning",
+    visibility = ["//dev-infra:__subpackages__"],
+    deps = [
+        "//dev-infra/release/config",
+        "//dev-infra/utils",
+        "@npm//@types/node-fetch",
+        "@npm//@types/semver",
+        "@npm//node-fetch",
+        "@npm//semver",
+    ],
+)
diff --git a/dev-infra/release/versioning/README.md b/dev-infra/release/versioning/README.md
new file mode 100644
index 0000000000000..b428492b7f02e
--- /dev/null
+++ b/dev-infra/release/versioning/README.md
@@ -0,0 +1,5 @@
+## Versioning for the Angular organization
+
+The folder contains common tooling needed for implementing the versioning as proposed
+by [this design document](https://docs.google.com/document/d/197kVillDwx-RZtSVOBtPb4BBIAw0E9RT3q3v6DZkykU).
+Primary tooling is the determination of _active_ release trains.
diff --git a/dev-infra/release/versioning/active-release-trains.ts b/dev-infra/release/versioning/active-release-trains.ts
new file mode 100644
index 0000000000000..4ec1341bf3d1c
--- /dev/null
+++ b/dev-infra/release/versioning/active-release-trains.ts
@@ -0,0 +1,139 @@
+/**
+ * @license
+ * Copyright Google LLC 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 semver from 'semver';
+
+import {ReleaseTrain} from './release-trains';
+import {getBranchesForMajorVersions, getVersionOfBranch, GithubRepoWithApi, VersionBranch} from './version-branches';
+
+/** Interface describing determined active release trains for a project. */
+export interface ActiveReleaseTrains {
+  /** Release-train currently in the "release-candidate" or "feature-freeze" phase. */
+  releaseCandidate: ReleaseTrain|null;
+  /** Release-train currently in the "latest" phase. */
+  latest: ReleaseTrain;
+  /** Release-train in the `next` phase. */
+  next: ReleaseTrain;
+}
+
+/** Branch name for the `next` branch. */
+export const nextBranchName = 'master';
+
+/** Fetches the active release trains for the configured project. */
+export async function fetchActiveReleaseTrains(repo: GithubRepoWithApi):
+    Promise<ActiveReleaseTrains> {
+  const nextVersion = await getVersionOfBranch(repo, nextBranchName);
+  const next = new ReleaseTrain(nextBranchName, nextVersion);
+  const majorVersionsToConsider: number[] = [];
+  let expectedReleaseCandidateMajor: number;
+
+  // If the `next` branch (i.e. `master` branch) is for an upcoming major version, we know
+  // that there is no patch branch or feature-freeze/release-candidate branch for this major
+  // digit. If the current `next` version is the first minor of a major version, we know that
+  // the feature-freeze/release-candidate branch can only be the actual major branch. The
+  // patch branch is based on that, either the actual major branch or the last minor from the
+  // preceding major version. In all other cases, the patch branch and feature-freeze or
+  // release-candidate branch are part of the same major version. Consider the following:
+  //
+  //  CASE 1. next: 11.0.0-next.0: patch and feature-freeze/release-candidate can only be
+  //          most recent `10.<>.x` branches. The FF/RC branch can only be the last-minor of v10.
+  //  CASE 2. next: 11.1.0-next.0: patch can be either `11.0.x` or last-minor in v10 based
+  //          on whether there is a feature-freeze/release-candidate branch (=> `11.0.x`).
+  //  CASE 3. next: 10.6.0-next.0: patch can be either `10.5.x` or `10.4.x` based on whether
+  //          there is a feature-freeze/release-candidate branch (=> `10.5.x`)
+  if (nextVersion.minor === 0) {
+    expectedReleaseCandidateMajor = nextVersion.major - 1;
+    majorVersionsToConsider.push(nextVersion.major - 1);
+  } else if (nextVersion.minor === 1) {
+    expectedReleaseCandidateMajor = nextVersion.major;
+    majorVersionsToConsider.push(nextVersion.major, nextVersion.major - 1);
+  } else {
+    expectedReleaseCandidateMajor = nextVersion.major;
+    majorVersionsToConsider.push(nextVersion.major);
+  }
+
+  // Collect all version-branches that should be considered for the latest version-branch,
+  // or the feature-freeze/release-candidate.
+  const branches = (await getBranchesForMajorVersions(repo, majorVersionsToConsider));
+  const {latest, releaseCandidate} = await findActiveReleaseTrainsFromVersionBranches(
+      repo, nextVersion, branches, expectedReleaseCandidateMajor);
+
+  if (latest === null) {
+    throw Error(
+        `Unable to determine the latest release-train. The following branches ` +
+        `have been considered: [${branches.map(b => b.name).join(', ')}]`);
+  }
+
+  return {releaseCandidate, latest, next};
+}
+
+/** Finds the currently active release trains from the specified version branches. */
+export async function findActiveReleaseTrainsFromVersionBranches(
+    repo: GithubRepoWithApi, nextVersion: semver.SemVer, branches: VersionBranch[],
+    expectedReleaseCandidateMajor: number): Promise<{
+  latest: ReleaseTrain | null,
+  releaseCandidate: ReleaseTrain | null,
+}> {
+  // Version representing the release-train currently in the next phase. Note that we ignore
+  // patch and pre-release segments in order to be able to compare the next release train to
+  // other release trains from version branches (which follow the `N.N.x` pattern).
+  const nextReleaseTrainVersion = semver.parse(`${nextVersion.major}.${nextVersion.minor}.0`)!;
+
+  let latest: ReleaseTrain|null = null;
+  let releaseCandidate: ReleaseTrain|null = null;
+
+  // Iterate through the captured branches and find the latest non-prerelease branch and a
+  // potential release candidate branch. From the collected branches we iterate descending
+  // order (most recent semantic version-branch first). The first branch is either the latest
+  // active version branch (i.e. patch) or a feature-freeze/release-candidate branch. A FF/RC
+  // branch cannot be older than the latest active version-branch, so we stop iterating once
+  // we found such a branch. Otherwise, if we found a FF/RC branch, we continue looking for the
+  // next version-branch as that one is supposed to be the latest active version-branch. If it
+  // is not, then an error will be thrown due to two FF/RC branches existing at the same time.
+  for (const {name, parsed} of branches) {
+    // It can happen that version branches have been accidentally created which are more recent
+    // than the release-train in the next branch (i.e. `master`). We could ignore such branches
+    // silently, but it might be symptomatic for an outdated version in the `next` branch, or an
+    // accidentally created branch by the caretaker. In either way we want to raise awareness.
+    if (semver.gt(parsed, nextReleaseTrainVersion)) {
+      throw Error(
+          `Discovered unexpected version-branch "${name}" for a release-train that is ` +
+          `more recent than the release-train currently in the "${nextBranchName}" branch. ` +
+          `Please either delete the branch if created by accident, or update the outdated ` +
+          `version in the next branch (${nextBranchName}).`);
+    } else if (semver.eq(parsed, nextReleaseTrainVersion)) {
+      throw Error(
+          `Discovered unexpected version-branch "${name}" for a release-train that is already ` +
+          `active in the "${nextBranchName}" branch. Please either delete the branch if ` +
+          `created by accident, or update the version in the next branch (${nextBranchName}).`);
+    }
+
+    const version = await getVersionOfBranch(repo, name);
+    const releaseTrain = new ReleaseTrain(name, version);
+    const isPrerelease = version.prerelease[0] === 'rc' || version.prerelease[0] === 'next';
+
+    if (isPrerelease) {
+      if (releaseCandidate !== null) {
+        throw Error(
+            `Unable to determine latest release-train. Found two consecutive ` +
+            `branches in feature-freeze/release-candidate phase. Did not expect both "${name}" ` +
+            `and "${releaseCandidate.branchName}" to be in feature-freeze/release-candidate mode.`);
+      } else if (version.major !== expectedReleaseCandidateMajor) {
+        throw Error(
+            `Discovered unexpected old feature-freeze/release-candidate branch. Expected no ` +
+            `version-branch in feature-freeze/release-candidate mode for v${version.major}.`);
+      }
+      releaseCandidate = releaseTrain;
+    } else {
+      latest = releaseTrain;
+      break;
+    }
+  }
+
+  return {releaseCandidate, latest};
+}
diff --git a/dev-infra/release/versioning/inc-semver.ts b/dev-infra/release/versioning/inc-semver.ts
new file mode 100644
index 0000000000000..3ea0e917c6995
--- /dev/null
+++ b/dev-infra/release/versioning/inc-semver.ts
@@ -0,0 +1,19 @@
+/**
+ * @license
+ * Copyright Google LLC 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 semver from 'semver';
+
+/**
+ * Increments a specified SemVer version. Compared to the original increment in SemVer,
+ * the version is cloned to not modify the original version instance.
+ */
+export function semverInc(
+    version: semver.SemVer, release: semver.ReleaseType, identifier?: string) {
+  const clone = new semver.SemVer(version.version);
+  return clone.inc(release, identifier);
+}
diff --git a/modules/playground/src/web_workers/input/index.ts b/dev-infra/release/versioning/index.ts
similarity index 53%
rename from modules/playground/src/web_workers/input/index.ts
rename to dev-infra/release/versioning/index.ts
index f3791aca9123d..fa834458cd150 100644
--- a/modules/playground/src/web_workers/input/index.ts
+++ b/dev-infra/release/versioning/index.ts
@@ -6,6 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {bootstrapWorkerUi} from '@angular/platform-webworker';
-
-bootstrapWorkerUi('loader.js');
+export * from './active-release-trains';
+export * from './release-trains';
+export * from './long-term-support';
+export * from './version-branches';
+export * from './npm-registry';
diff --git a/dev-infra/release/versioning/long-term-support.ts b/dev-infra/release/versioning/long-term-support.ts
new file mode 100644
index 0000000000000..308bd952abb63
--- /dev/null
+++ b/dev-infra/release/versioning/long-term-support.ts
@@ -0,0 +1,99 @@
+/**
+ * @license
+ * Copyright Google LLC 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 semver from 'semver';
+
+import {ReleaseConfig} from '../config/index';
+
+import {fetchProjectNpmPackageInfo} from './npm-registry';
+
+/** Interface describing determined LTS branches. */
+export interface LtsBranches {
+  /** List of active LTS version branches. */
+  active: LtsBranch[];
+  /** List of inactive LTS version branches. */
+  inactive: LtsBranch[];
+}
+
+/** Interface describing an LTS version branch. */
+export interface LtsBranch {
+  /** Name of the branch. */
+  name: string;
+  /** Most recent version for the given LTS branch. */
+  version: semver.SemVer;
+  /** NPM dist tag for the LTS version. */
+  npmDistTag: string;
+}
+
+/**
+ * Number of months a major version in Angular is actively supported. See:
+ * https://angular.io/guide/releases#support-policy-and-schedule.
+ */
+const majorActiveSupportDuration = 6;
+
+/**
+ * Number of months a major version has active long-term support. See:
+ * https://angular.io/guide/releases#support-policy-and-schedule.
+ */
+const majorLongTermSupportDuration = 12;
+
+/** Regular expression that matches LTS NPM dist tags. */
+const ltsNpmDistTagRegex = /^v(\d+)-lts$/;
+
+/** Finds all long-term support release trains from the specified NPM package. */
+export async function fetchLongTermSupportBranchesFromNpm(config: ReleaseConfig):
+    Promise<LtsBranches> {
+  const {'dist-tags': distTags, time} = await fetchProjectNpmPackageInfo(config);
+  const today = new Date();
+  const active: LtsBranch[] = [];
+  const inactive: LtsBranch[] = [];
+
+  // Iterate through the NPM package information and determine active/inactive LTS versions with
+  // their corresponding branches. We assume that an LTS tagged version in NPM belongs to the
+  // last-minor branch of a given major (i.e. we assume there are no outdated LTS NPM dist tags).
+  for (const npmDistTag in distTags) {
+    if (ltsNpmDistTagRegex.test(npmDistTag)) {
+      const version = semver.parse(distTags[npmDistTag])!;
+      const branchName = `${version.major}.${version.minor}.x`;
+      const majorReleaseDate = new Date(time[`${version.major}.0.0`]);
+      const ltsEndDate = computeLtsEndDateOfMajor(majorReleaseDate);
+      const ltsBranch: LtsBranch = {name: branchName, version, npmDistTag};
+      // Depending on whether the LTS phase is still active, add the branch
+      // to the list of active or inactive LTS branches.
+      if (today <= ltsEndDate) {
+        active.push(ltsBranch);
+      } else {
+        inactive.push(ltsBranch);
+      }
+    }
+  }
+
+  // Sort LTS branches in descending order. i.e. most recent ones first.
+  active.sort((a, b) => semver.rcompare(a.version, b.version));
+  inactive.sort((a, b) => semver.rcompare(a.version, b.version));
+
+  return {active, inactive};
+}
+
+/**
+ * Computes the date when long-term support ends for a major released at the
+ * specified date.
+ */
+export function computeLtsEndDateOfMajor(majorReleaseDate: Date): Date {
+  return new Date(
+      majorReleaseDate.getFullYear(),
+      majorReleaseDate.getMonth() + majorActiveSupportDuration + majorLongTermSupportDuration,
+      majorReleaseDate.getDate(), majorReleaseDate.getHours(), majorReleaseDate.getMinutes(),
+      majorReleaseDate.getSeconds(), majorReleaseDate.getMilliseconds());
+}
+
+/** Gets the long-term support NPM dist tag for a given major version. */
+export function getLtsNpmDistTagOfMajor(major: number): string {
+  // LTS versions should be tagged in NPM in the following format: `v{major}-lts`.
+  return `v${major}-lts`;
+}
diff --git a/dev-infra/release/versioning/next-prerelease-version.ts b/dev-infra/release/versioning/next-prerelease-version.ts
new file mode 100644
index 0000000000000..bc6ed5b08655d
--- /dev/null
+++ b/dev-infra/release/versioning/next-prerelease-version.ts
@@ -0,0 +1,32 @@
+/**
+ * @license
+ * Copyright Google LLC 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 semver from 'semver';
+
+import {ReleaseConfig} from '../config/index';
+
+import {ActiveReleaseTrains} from './active-release-trains';
+import {semverInc} from './inc-semver';
+import {isVersionPublishedToNpm} from './npm-registry';
+
+/** Computes the new pre-release version for the next release-train. */
+export async function computeNewPrereleaseVersionForNext(
+    active: ActiveReleaseTrains, config: ReleaseConfig): Promise<semver.SemVer> {
+  const {version: nextVersion} = active.next;
+  const isNextPublishedToNpm = await isVersionPublishedToNpm(nextVersion, config);
+  // Special-case where the version in the `next` release-train is not published yet. This
+  // happens when we recently branched off for feature-freeze. We already bump the version to
+  // the next minor or major, but do not publish immediately. Cutting a release immediately would
+  // be not helpful as there are no other changes than in the feature-freeze branch. If we happen
+  // to detect this case, we stage the release as usual but do not increment the version.
+  if (isNextPublishedToNpm) {
+    return semverInc(nextVersion, 'prerelease');
+  } else {
+    return nextVersion;
+  }
+}
diff --git a/dev-infra/release/versioning/npm-publish.ts b/dev-infra/release/versioning/npm-publish.ts
new file mode 100644
index 0000000000000..7415c5e84b5d6
--- /dev/null
+++ b/dev-infra/release/versioning/npm-publish.ts
@@ -0,0 +1,38 @@
+/**
+ * @license
+ * Copyright Google LLC 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 semver from 'semver';
+import {spawnWithDebugOutput} from '../../utils/child-process';
+
+/**
+ * Runs NPM publish within a specified package directory.
+ * @throws With the process log output if the publish failed.
+ */
+export async function runNpmPublish(
+    packagePath: string, distTag: string, registryUrl: string|undefined) {
+  const args = ['publish', '--access', 'public', '--tag', distTag];
+  // If a custom registry URL has been specified, add the `--registry` flag.
+  if (registryUrl !== undefined) {
+    args.push('--registry', registryUrl);
+  }
+  await spawnWithDebugOutput('npm', args, {cwd: packagePath, mode: 'silent'});
+}
+
+/**
+ * Sets the NPM tag to the specified version for the given package.
+ * @throws With the process log output if the tagging failed.
+ */
+export async function setNpmTagForPackage(
+    packageName: string, distTag: string, version: semver.SemVer, registryUrl: string|undefined) {
+  const args = ['dist-tag', 'add', `${packageName}@${version}`, distTag];
+  // If a custom registry URL has been specified, add the `--registry` flag.
+  if (registryUrl !== undefined) {
+    args.push('--registry', registryUrl);
+  }
+  await spawnWithDebugOutput('npm', args, {mode: 'silent'});
+}
diff --git a/dev-infra/release/versioning/npm-registry.ts b/dev-infra/release/versioning/npm-registry.ts
new file mode 100644
index 0000000000000..2e0419ee695a8
--- /dev/null
+++ b/dev-infra/release/versioning/npm-registry.ts
@@ -0,0 +1,65 @@
+/**
+ * @license
+ * Copyright Google LLC 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 fetch from 'node-fetch';
+import * as semver from 'semver';
+
+import {ReleaseConfig} from '../config/index';
+
+/** Type describing an NPM package fetched from the registry. */
+export interface NpmPackageInfo {
+  /** Maps of versions and their package JSON objects. */
+  'versions': {[name: string]: undefined|object};
+  /** Map of NPM dist-tags and their chosen version. */
+  'dist-tags': {[tagName: string]: string|undefined};
+  /** Map of versions and their ISO release time. */
+  'time': {[name: string]: string};
+}
+
+/**
+ * Cache for requested NPM package information. A cache is desirable as the NPM
+ * registry requests are usually very large and slow.
+ */
+export const _npmPackageInfoCache: {[pkgName: string]: Promise<NpmPackageInfo>} = {};
+
+/**
+ * Fetches the NPM package representing the project. Angular repositories usually contain
+ * multiple packages in a monorepo scheme, but packages dealt with as part of the release
+ * tooling are released together with the same versioning and branching. This means that
+ * a single package can be used as source of truth for NPM package queries.
+ */
+export async function fetchProjectNpmPackageInfo(config: ReleaseConfig): Promise<NpmPackageInfo> {
+  const pkgName = getRepresentativeNpmPackage(config);
+  return await fetchPackageInfoFromNpmRegistry(pkgName);
+}
+
+/** Gets whether the given version is published to NPM or not */
+export async function isVersionPublishedToNpm(
+    version: semver.SemVer, config: ReleaseConfig): Promise<boolean> {
+  const {versions} = await fetchProjectNpmPackageInfo(config);
+  return versions[version.format()] !== undefined;
+}
+
+/**
+ * Gets the representative NPM package for the specified release configuration. Angular
+ * repositories usually contain multiple packages in a monorepo scheme, but packages dealt with
+ * as part of the release tooling are released together with the same versioning and branching.
+ * This means that a single package can be used as source of truth for NPM package queries.
+ */
+function getRepresentativeNpmPackage(config: ReleaseConfig) {
+  return config.npmPackages[0];
+}
+
+/** Fetches the specified NPM package from the NPM registry. */
+async function fetchPackageInfoFromNpmRegistry(pkgName: string): Promise<NpmPackageInfo> {
+  if (_npmPackageInfoCache[pkgName] === undefined) {
+    _npmPackageInfoCache[pkgName] =
+        fetch(`https://registry.npmjs.org/${pkgName}`).then(r => r.json());
+  }
+  return await _npmPackageInfoCache[pkgName];
+}
diff --git a/dev-infra/release/versioning/print-active-trains.ts b/dev-infra/release/versioning/print-active-trains.ts
new file mode 100644
index 0000000000000..b4314cea2e5db
--- /dev/null
+++ b/dev-infra/release/versioning/print-active-trains.ts
@@ -0,0 +1,80 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {blue, bold, info} from '../../utils/console';
+import {ReleaseConfig} from '../config/index';
+
+import {ActiveReleaseTrains} from './active-release-trains';
+import {fetchLongTermSupportBranchesFromNpm} from './long-term-support';
+import {isVersionPublishedToNpm} from './npm-registry';
+
+/**
+ * Prints the active release trains to the console.
+ * @params active Active release trains that should be printed.
+ * @params config Release configuration used for querying NPM on published versions.
+ */
+export async function printActiveReleaseTrains(
+    active: ActiveReleaseTrains, config: ReleaseConfig): Promise<void> {
+  const {releaseCandidate, next, latest} = active;
+  const isNextPublishedToNpm = await isVersionPublishedToNpm(next.version, config);
+  const nextTrainType = next.isMajor ? 'major' : 'minor';
+  const ltsBranches = await fetchLongTermSupportBranchesFromNpm(config);
+
+  info();
+  info(blue('Current version branches in the project:'));
+
+  // Print information for release trains in the feature-freeze/release-candidate phase.
+  if (releaseCandidate !== null) {
+    const rcVersion = releaseCandidate.version;
+    const rcTrainType = releaseCandidate.isMajor ? 'major' : 'minor';
+    const rcTrainPhase =
+        rcVersion.prerelease[0] === 'next' ? 'feature-freeze' : 'release-candidate';
+    info(
+        ` • ${bold(releaseCandidate.branchName)} contains changes for an upcoming ` +
+        `${rcTrainType} that is currently in ${bold(rcTrainPhase)} phase.`);
+    info(`   Most recent pre-release for this branch is "${bold(`v${rcVersion}`)}".`);
+  }
+
+  // Print information about the release-train in the latest phase. i.e. the patch branch.
+  info(` • ${bold(latest.branchName)} contains changes for the most recent patch.`);
+  info(`   Most recent patch version for this branch is "${bold(`v${latest.version}`)}".`);
+
+  // Print information about the release-train in the next phase.
+  info(
+      ` • ${bold(next.branchName)} contains changes for a ${nextTrainType} ` +
+      `currently in active development.`);
+  // Note that there is a special case for versions in the next release-train. The version in
+  // the next branch is not always published to NPM. This can happen when we recently branched
+  // off for a feature-freeze release-train. More details are in the next pre-release action.
+  if (isNextPublishedToNpm) {
+    info(`   Most recent pre-release version for this branch is "${bold(`v${next.version}`)}".`);
+  } else {
+    info(
+        `   Version is currently set to "${bold(`v${next.version}`)}", but has not been ` +
+        `published yet.`);
+  }
+
+  // If no release-train in release-candidate or feature-freeze phase is active,
+  // we print a message as last bullet point to make this clear.
+  if (releaseCandidate === null) {
+    info(' • No release-candidate or feature-freeze branch currently active.');
+  }
+
+  info();
+  info(blue('Current active LTS version branches:'));
+
+  // Print all active LTS branches (each branch as own bullet point).
+  if (ltsBranches.active.length !== 0) {
+    for (const ltsBranch of ltsBranches.active) {
+      info(` • ${bold(ltsBranch.name)} is currently in active long-term support phase.`);
+      info(`   Most recent patch version for this branch is "${bold(`v${ltsBranch.version}`)}".`);
+    }
+  }
+
+  info();
+}
diff --git a/dev-infra/release/versioning/release-trains.ts b/dev-infra/release/versioning/release-trains.ts
new file mode 100644
index 0000000000000..ee72c603f67c5
--- /dev/null
+++ b/dev-infra/release/versioning/release-trains.ts
@@ -0,0 +1,21 @@
+/**
+ * @license
+ * Copyright Google LLC 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 semver from 'semver';
+
+/** Class describing a release-train. */
+export class ReleaseTrain {
+  /** Whether the release train is currently targeting a major. */
+  isMajor = this.version.minor === 0 && this.version.patch === 0;
+
+  constructor(
+      /** Name of the branch for this release-train. */
+      public branchName: string,
+      /** Most recent version for this release train. */
+      public version: semver.SemVer) {}
+}
diff --git a/dev-infra/release/versioning/version-branches.ts b/dev-infra/release/versioning/version-branches.ts
new file mode 100644
index 0000000000000..7a934d3a761d3
--- /dev/null
+++ b/dev-infra/release/versioning/version-branches.ts
@@ -0,0 +1,87 @@
+/**
+ * @license
+ * Copyright Google LLC 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 semver from 'semver';
+import {GithubClient, GithubRepo} from '../../utils/git/github';
+
+/** Type describing a Github repository with corresponding API client. */
+export interface GithubRepoWithApi extends GithubRepo {
+  /** API client that can access the repository. */
+  api: GithubClient;
+}
+
+/** Type describing a version-branch. */
+export interface VersionBranch {
+  /** Name of the branch in Git. e.g. `10.0.x`. */
+  name: string;
+  /**
+   * Parsed SemVer version for the version-branch. Version branches technically do
+   * not follow the SemVer format, but we can have representative SemVer versions
+   * that can be used for comparisons, sorting and other checks.
+   */
+  parsed: semver.SemVer;
+}
+
+/** Regular expression that matches version-branches. */
+const versionBranchNameRegex = /^(\d+)\.(\d+)\.x$/;
+
+/** Gets the version of a given branch by reading the `package.json` upstream. */
+export async function getVersionOfBranch(
+    repo: GithubRepoWithApi, branchName: string): Promise<semver.SemVer> {
+  const {data} = await repo.api.repos.getContents(
+      {owner: repo.owner, repo: repo.name, path: '/package.json', ref: branchName});
+  const {version} = JSON.parse(Buffer.from(data.content, 'base64').toString());
+  const parsedVersion = semver.parse(version);
+  if (parsedVersion === null) {
+    throw Error(`Invalid version detected in following branch: ${branchName}.`);
+  }
+  return parsedVersion;
+}
+
+/** Whether the given branch corresponds to a version branch. */
+export function isVersionBranch(branchName: string): boolean {
+  return versionBranchNameRegex.test(branchName);
+}
+
+/**
+ * Converts a given version-branch into a SemVer version that can be used with SemVer
+ * utilities. e.g. to determine semantic order, extract major digit, compare.
+ *
+ * For example `10.0.x` will become `10.0.0` in SemVer. The patch digit is not
+ * relevant but needed for parsing. SemVer does not allow `x` as patch digit.
+ */
+export function getVersionForVersionBranch(branchName: string): semver.SemVer|null {
+  return semver.parse(branchName.replace(versionBranchNameRegex, '$1.$2.0'));
+}
+
+/**
+ * Gets the version branches for the specified major versions in descending
+ * order. i.e. latest version branches first.
+ */
+export async function getBranchesForMajorVersions(
+    repo: GithubRepoWithApi, majorVersions: number[]): Promise<VersionBranch[]> {
+  const {data: branchData} =
+      await repo.api.repos.listBranches({owner: repo.owner, repo: repo.name, protected: true});
+  const branches: VersionBranch[] = [];
+
+  for (const {name} of branchData) {
+    if (!isVersionBranch(name)) {
+      continue;
+    }
+    // Convert the version-branch into a SemVer version that can be used with the
+    // SemVer utilities. e.g. to determine semantic order, compare versions.
+    const parsed = getVersionForVersionBranch(name);
+    // Collect all version-branches that match the specified major versions.
+    if (parsed !== null && majorVersions.includes(parsed.major)) {
+      branches.push({name, parsed});
+    }
+  }
+
+  // Sort captured version-branches in descending order.
+  return branches.sort((a, b) => semver.rcompare(a.parsed, b.parsed));
+}
diff --git a/dev-infra/tmpl-package.json b/dev-infra/tmpl-package.json
index 0b3048a6651ad..350f316044027 100644
--- a/dev-infra/tmpl-package.json
+++ b/dev-infra/tmpl-package.json
@@ -9,26 +9,27 @@
     "ts-circular-deps": "./ts-circular-dependencies/index.js"
   },
   "dependencies": {
-    "@angular/benchpress": "0.2.0",
+    "@angular/benchpress": "0.2.1",
     "@octokit/graphql": "<from-root>",
     "@octokit/types": "<from-root>",
+    "@octokit/rest": "<from-root>",
     "brotli": "<from-root>",
     "chalk": "<from-root>",
     "cli-progress": "<from-root>",
     "glob": "<from-root>",
     "inquirer": "<from-root>",
+    "inquirer-autocomplete-prompt": "<from-root>",
     "minimatch": "<from-root>",
     "multimatch": "<from-root>",
     "node-fetch": "<from-root>",
     "node-uuid": "<from-root>",
+    "ora": "<from-root>",
     "semver": "<from-root>",
     "shelljs": "<from-root>",
     "tslib": "<from-root>",
     "typed-graphqlify": "<from-root>",
     "yaml": "<from-root>",
-    "yargs": "<from-root>"
-  },
-  "peerDependencies": {
+    "yargs": "<from-root>",
     "@bazel/buildifier": "<from-root>",
     "clang-format": "<from-root>",
     "protractor": "<from-root>",
diff --git a/dev-infra/ts-circular-dependencies/BUILD.bazel b/dev-infra/ts-circular-dependencies/BUILD.bazel
index e084b268ba88f..ff8b0ae5506ea 100644
--- a/dev-infra/ts-circular-dependencies/BUILD.bazel
+++ b/dev-infra/ts-circular-dependencies/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@npm_bazel_typescript//:index.bzl", "ts_library")
+load("@npm//@bazel/typescript:index.bzl", "ts_library")
 
 ts_library(
     name = "ts-circular-dependencies",
diff --git a/dev-infra/ts-circular-dependencies/index.ts b/dev-infra/ts-circular-dependencies/index.ts
index df597bf6e2bb9..e76ad4d7e133b 100644
--- a/dev-infra/ts-circular-dependencies/index.ts
+++ b/dev-infra/ts-circular-dependencies/index.ts
@@ -30,20 +30,19 @@ export function tsCircularDependenciesBuilder(localYargs: yargs.Argv) {
           {type: 'string', demandOption: true, description: 'Path to the configuration file.'})
       .option('warnings', {type: 'boolean', description: 'Prints all warnings.'})
       .command(
-          'check', 'Checks if the circular dependencies have changed.', {},
-          (argv: yargs.Arguments) => {
+          'check', 'Checks if the circular dependencies have changed.', args => args,
+          argv => {
             const {config: configArg, warnings} = argv;
             const configPath = isAbsolute(configArg) ? configArg : resolve(configArg);
             const config = loadTestConfig(configPath);
-            process.exit(main(false, config, warnings));
+            process.exit(main(false, config, !!warnings));
           })
-      .command(
-          'approve', 'Approves the current circular dependencies.', {}, (argv: yargs.Arguments) => {
-            const {config: configArg, warnings} = argv;
-            const configPath = isAbsolute(configArg) ? configArg : resolve(configArg);
-            const config = loadTestConfig(configPath);
-            process.exit(main(true, config, warnings));
-          });
+      .command('approve', 'Approves the current circular dependencies.', args => args, argv => {
+        const {config: configArg, warnings} = argv;
+        const configPath = isAbsolute(configArg) ? configArg : resolve(configArg);
+        const config = loadTestConfig(configPath);
+        process.exit(main(true, config, !!warnings));
+      });
 }
 
 /**
@@ -113,7 +112,8 @@ export function main(
   if (fixedCircularDeps.length !== 0) {
     error(yellow(`   Fixed circular dependencies that need to be removed from the golden:`));
     fixedCircularDeps.forEach(c => error(`     • ${convertReferenceChainToString(c)}`));
-    error();
+    info(yellow(`\n   Total: ${newCircularDeps.length} new cycle(s), ${
+        fixedCircularDeps.length} fixed cycle(s). \n`));
     if (approveCommand) {
       info(yellow(`   Please approve the new golden with: ${approveCommand}`));
     } else {
diff --git a/dev-infra/tsconfig.json b/dev-infra/tsconfig.json
new file mode 100644
index 0000000000000..aee0ec940fcde
--- /dev/null
+++ b/dev-infra/tsconfig.json
@@ -0,0 +1,5 @@
+{
+  "compilerOptions": {
+    "strict": true
+  }
+}
diff --git a/dev-infra/utils/BUILD.bazel b/dev-infra/utils/BUILD.bazel
index 248aaddacfcaa..24dc637c6d64e 100644
--- a/dev-infra/utils/BUILD.bazel
+++ b/dev-infra/utils/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@npm_bazel_typescript//:index.bzl", "ts_library")
+load("@npm//@bazel/typescript:index.bzl", "ts_library")
 
 ts_library(
     name = "utils",
@@ -15,10 +15,13 @@ ts_library(
         "@npm//@types/inquirer",
         "@npm//@types/node",
         "@npm//@types/shelljs",
+        "@npm//@types/yargs",
         "@npm//chalk",
         "@npm//inquirer",
+        "@npm//inquirer-autocomplete-prompt",
         "@npm//shelljs",
         "@npm//tslib",
         "@npm//typed-graphqlify",
+        "@npm//yargs",
     ],
 )
diff --git a/dev-infra/utils/child-process.ts b/dev-infra/utils/child-process.ts
new file mode 100644
index 0000000000000..b2a4c21df7358
--- /dev/null
+++ b/dev-infra/utils/child-process.ts
@@ -0,0 +1,82 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {spawn, SpawnOptions} from 'child_process';
+import {debug, error} from './console';
+
+/** Interface describing the options for spawning a process. */
+export interface SpawnedProcessOptions extends Omit<SpawnOptions, 'stdio'> {
+  /** Console output mode. Defaults to "enabled". */
+  mode?: 'enabled'|'silent'|'on-error';
+}
+
+/** Interface describing the result of a spawned process. */
+export interface SpawnedProcessResult {
+  /** Captured stdout in string format. */
+  stdout: string;
+}
+
+/**
+ * Spawns a given command with the specified arguments inside a shell. All process stdout
+ * output is captured and returned as resolution on completion. Depending on the chosen
+ * output mode, stdout/stderr output is also printed to the console, or only on error.
+ *
+ * @returns a Promise resolving with captured stdout on success. The promise
+ *   rejects on command failure.
+ */
+export function spawnWithDebugOutput(
+    command: string, args: string[],
+    options: SpawnedProcessOptions = {}): Promise<SpawnedProcessResult> {
+  return new Promise((resolve, reject) => {
+    const commandText = `${command} ${args.join(' ')}`;
+    const outputMode = options.mode;
+
+    debug(`Executing command: ${commandText}`);
+
+    const childProcess =
+        spawn(command, args, {...options, shell: true, stdio: ['inherit', 'pipe', 'pipe']});
+    let logOutput = '';
+    let stdout = '';
+
+    // Capture the stdout separately so that it can be passed as resolve value.
+    // This is useful if commands return parsable stdout.
+    childProcess.stderr.on('data', message => {
+      logOutput += message;
+      // If console output is enabled, print the message directly to the stderr. Note that
+      // we intentionally print all output to stderr as stdout should not be polluted.
+      if (outputMode === undefined || outputMode === 'enabled') {
+        process.stderr.write(message);
+      }
+    });
+    childProcess.stdout.on('data', message => {
+      stdout += message;
+      logOutput += message;
+      // If console output is enabled, print the message directly to the stderr. Note that
+      // we intentionally print all output to stderr as stdout should not be polluted.
+      if (outputMode === undefined || outputMode === 'enabled') {
+        process.stderr.write(message);
+      }
+    });
+
+    childProcess.on('exit', (status, signal) => {
+      const exitDescription = status !== null ? `exit code "${status}"` : `signal "${signal}"`;
+      const printFn = outputMode === 'on-error' ? error : debug;
+
+      printFn(`Command "${commandText}" completed with ${exitDescription}.`);
+      printFn(`Process output: \n${logOutput}`);
+
+      // On success, resolve the promise. Otherwise reject with the captured stderr
+      // and stdout log output if the output mode was set to `silent`.
+      if (status === 0) {
+        resolve({stdout});
+      } else {
+        reject(outputMode === 'silent' ? logOutput : undefined);
+      }
+    });
+  });
+}
diff --git a/dev-infra/utils/config.ts b/dev-infra/utils/config.ts
index bd08ee68e44e1..358c02d7665aa 100644
--- a/dev-infra/utils/config.ts
+++ b/dev-infra/utils/config.ts
@@ -9,7 +9,7 @@
 import {existsSync} from 'fs';
 import {dirname, join} from 'path';
 
-import {error} from './console';
+import {debug, error} from './console';
 import {exec} from './shelljs';
 import {isTsNodeAvailable} from './ts-node';
 
@@ -49,7 +49,16 @@ export type NgDevConfig<T = {}> = CommonConfig&T;
 const CONFIG_FILE_PATH = '.ng-dev/config';
 
 /** The configuration for ng-dev. */
-let CONFIG: {}|null = null;
+let cachedConfig: NgDevConfig|null = null;
+
+/**
+ * The filename expected for local user config, without the file extension to allow a typescript,
+ * javascript or json file to be used.
+ */
+const USER_CONFIG_FILE_PATH = '.ng-dev.user';
+
+/** The local user configuration for ng-dev. */
+let userConfig: {[key: string]: any}|null = null;
 
 /**
  * Get the configuration from the file system, returning the already loaded
@@ -57,15 +66,15 @@ let CONFIG: {}|null = null;
  */
 export function getConfig(): NgDevConfig {
   // If the global config is not defined, load it from the file system.
-  if (CONFIG === null) {
+  if (cachedConfig === null) {
     // The full path to the configuration file.
     const configPath = join(getRepoBaseDir(), CONFIG_FILE_PATH);
-    // Set the global config object.
-    CONFIG = readConfigFile(configPath);
+    // Read the configuration and validate it before caching it for the future.
+    cachedConfig = validateCommonConfig(readConfigFile(configPath));
   }
-  // Return a clone of the global config to ensure that a new instance of the config is returned
-  // each time, preventing unexpected effects of modifications to the config object.
-  return validateCommonConfig({...CONFIG});
+  // Return a clone of the cached global config to ensure that a new instance of the config
+  // is returned each time, preventing unexpected effects of modifications to the config object.
+  return {...cachedConfig};
 }
 
 /** Validate the common configuration has been met for the ng-dev command. */
@@ -86,8 +95,11 @@ function validateCommonConfig(config: Partial<NgDevConfig>) {
   return config as NgDevConfig;
 }
 
-/** Resolves and reads the specified configuration file. */
-function readConfigFile(configPath: string): object {
+/**
+ * Resolves and reads the specified configuration file, optionally returning an empty object if the
+ * configuration file cannot be read.
+ */
+function readConfigFile(configPath: string, returnEmptyObjectOnError = false): object {
   // If the the `.ts` extension has not been set up already, and a TypeScript based
   // version of the given configuration seems to exist, set up `ts-node` if available.
   if (require.extensions['.ts'] === undefined && existsSync(`${configPath}.ts`) &&
@@ -103,7 +115,12 @@ function readConfigFile(configPath: string): object {
   try {
     return require(configPath);
   } catch (e) {
-    error('Could not read configuration file.');
+    if (returnEmptyObjectOnError) {
+      debug(`Could not read configuration file at ${configPath}, returning empty object instead.`);
+      debug(e);
+      return {};
+    }
+    error(`Could not read configuration file at ${configPath}.`);
     error(e);
     process.exit(1);
   }
@@ -135,3 +152,23 @@ export function getRepoBaseDir() {
   }
   return baseRepoDir.trim();
 }
+
+/**
+ * Get the local user configuration from the file system, returning the already loaded copy if it is
+ * defined.
+ *
+ * @returns The user configuration object, or an empty object if no user configuration file is
+ * present. The object is an untyped object as there are no required user configurations.
+ */
+export function getUserConfig() {
+  // If the global config is not defined, load it from the file system.
+  if (userConfig === null) {
+    // The full path to the configuration file.
+    const configPath = join(getRepoBaseDir(), USER_CONFIG_FILE_PATH);
+    // Set the global config object.
+    userConfig = readConfigFile(configPath, true);
+  }
+  // Return a clone of the user config to ensure that a new instance of the config is returned
+  // each time, preventing unexpected effects of modifications to the config object.
+  return {...userConfig};
+}
diff --git a/dev-infra/utils/console.ts b/dev-infra/utils/console.ts
index 63830a5e76a82..41d2c8a3a5139 100644
--- a/dev-infra/utils/console.ts
+++ b/dev-infra/utils/console.ts
@@ -7,13 +7,20 @@
  */
 
 import chalk from 'chalk';
-import {prompt} from 'inquirer';
+import {writeFileSync} from 'fs';
+import {createPromptModule, ListChoiceOptions, prompt} from 'inquirer';
+import * as inquirerAutocomplete from 'inquirer-autocomplete-prompt';
+import {join} from 'path';
+import {Arguments} from 'yargs';
 
+import {getRepoBaseDir} from './config';
 
 /** Reexport of chalk colors for convenient access. */
 export const red: typeof chalk = chalk.red;
 export const green: typeof chalk = chalk.green;
 export const yellow: typeof chalk = chalk.yellow;
+export const bold: typeof chalk = chalk.bold;
+export const blue: typeof chalk = chalk.blue;
 
 /** Prompts the user with a confirmation question and a specified message. */
 export async function promptConfirm(message: string, defaultValue = false): Promise<boolean> {
@@ -26,6 +33,52 @@ export async function promptConfirm(message: string, defaultValue = false): Prom
       .result;
 }
 
+/** Prompts the user to select an option from a filterable autocomplete list. */
+export async function promptAutocomplete(
+    message: string, choices: (string|ListChoiceOptions)[]): Promise<string>;
+/**
+ * Prompts the user to select an option from a filterable autocomplete list, with an option to
+ * choose no value.
+ */
+export async function promptAutocomplete(
+    message: string, choices: (string|ListChoiceOptions)[],
+    noChoiceText?: string): Promise<string|false>;
+export async function promptAutocomplete(
+    message: string, choices: (string|ListChoiceOptions)[],
+    noChoiceText?: string): Promise<string|false> {
+  // Creates a local prompt module with an autocomplete prompt type.
+  const prompt = createPromptModule({}).registerPrompt('autocomplete', inquirerAutocomplete);
+  if (noChoiceText) {
+    choices = [noChoiceText, ...choices];
+  }
+  // `prompt` must be cast as `any` as the autocomplete typings are not available.
+  const result = (await (prompt as any)({
+                   type: 'autocomplete',
+                   name: 'result',
+                   message,
+                   source: (_: any, input: string) => {
+                     if (!input) {
+                       return Promise.resolve(choices);
+                     }
+                     return Promise.resolve(choices.filter(choice => {
+                       if (typeof choice === 'string') {
+                         return choice.includes(input);
+                       }
+                       return choice.name!.includes(input);
+                     }));
+                   }
+                 })).result;
+  if (result === noChoiceText) {
+    return false;
+  }
+  return result;
+}
+
+/** Prompts the user for one line of input. */
+export async function promptInput(message: string): Promise<string> {
+  return (await prompt<{result: string}>({type: 'input', name: 'result', message})).result;
+}
+
 /**
  * Supported levels for logging functions.
  *
@@ -93,6 +146,7 @@ function runConsoleCommand(loadCommand: () => Function, logLevel: LOG_LEVELS, ..
   if (getLogLevel() >= logLevel) {
     loadCommand()(...text);
   }
+  printToLogFile(logLevel, ...text);
 }
 
 /**
@@ -108,3 +162,59 @@ function getLogLevel() {
   }
   return logLevel;
 }
+
+/** All text to write to the log file. */
+let LOGGED_TEXT = '';
+/** Whether file logging as been enabled. */
+let FILE_LOGGING_ENABLED = false;
+/**
+ * The number of columns used in the prepended log level information on each line of the logging
+ * output file.
+ */
+const LOG_LEVEL_COLUMNS = 7;
+
+/**
+ * Enable writing the logged outputs to the log file on process exit, sets initial lines from the
+ * command execution, containing information about the timing and command parameters.
+ *
+ * This is expected to be called only once during a command run, and should be called by the
+ * middleware of yargs to enable the file logging before the rest of the command parsing and
+ * response is executed.
+ */
+export function captureLogOutputForCommand(argv: Arguments) {
+  if (FILE_LOGGING_ENABLED) {
+    throw Error('`captureLogOutputForCommand` cannot be called multiple times');
+  }
+  /** The date time used for timestamping when the command was invoked. */
+  const now = new Date();
+  /** Header line to separate command runs in log files. */
+  const headerLine = Array(100).fill('#').join('');
+  LOGGED_TEXT += `${headerLine}\nCommand: ${argv.$0} ${argv._.join(' ')}\nRan at: ${now}\n`;
+
+  // On process exit, write the logged output to the appropriate log files
+  process.on('exit', (code: number) => {
+    LOGGED_TEXT += `Command ran in ${new Date().getTime() - now.getTime()}ms`;
+    /** Path to the log file location. */
+    const logFilePath = join(getRepoBaseDir(), '.ng-dev.log');
+
+    // Strip ANSI escape codes from log outputs.
+    LOGGED_TEXT = LOGGED_TEXT.replace(/\x1B\[([0-9]{1,3}(;[0-9]{1,2})?)?[mGK]/g, '');
+
+    writeFileSync(logFilePath, LOGGED_TEXT);
+
+    // For failure codes greater than 1, the new logged lines should be written to a specific log
+    // file for the command run failure.
+    if (code > 1) {
+      writeFileSync(join(getRepoBaseDir(), `.ng-dev.err-${now.getTime()}.log`), LOGGED_TEXT);
+    }
+  });
+
+  // Mark file logging as enabled to prevent the function from executing multiple times.
+  FILE_LOGGING_ENABLED = true;
+}
+
+/** Write the provided text to the log file, prepending each line with the log level.  */
+function printToLogFile(logLevel: LOG_LEVELS, ...text: string[]) {
+  const logLevelText = `${LOG_LEVELS[logLevel]}:`.padEnd(LOG_LEVEL_COLUMNS);
+  LOGGED_TEXT += text.join(' ').split('\n').map(l => `${logLevelText} ${l}\n`).join('');
+}
diff --git a/dev-infra/utils/git/github-urls.ts b/dev-infra/utils/git/github-urls.ts
new file mode 100644
index 0000000000000..ff4e04810f671
--- /dev/null
+++ b/dev-infra/utils/git/github-urls.ts
@@ -0,0 +1,42 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {URL} from 'url';
+import {GithubConfig} from '../config';
+import {GitClient} from './index';
+
+/** URL to the Github page where personal access tokens can be managed. */
+export const GITHUB_TOKEN_SETTINGS_URL = 'https://github.com/settings/tokens';
+
+/** URL to the Github page where personal access tokens can be generated. */
+export const GITHUB_TOKEN_GENERATE_URL = 'https://github.com/settings/tokens/new';
+
+/** Adds the provided token to the given Github HTTPs remote url. */
+export function addTokenToGitHttpsUrl(githubHttpsUrl: string, token: string) {
+  const url = new URL(githubHttpsUrl);
+  url.username = token;
+  return url.href;
+}
+
+/** Gets the repository Git URL for the given github config. */
+export function getRepositoryGitUrl(config: GithubConfig, githubToken?: string): string {
+  if (config.useSsh) {
+    return `git@github.com:${config.owner}/${config.name}.git`;
+  }
+  const baseHttpUrl = `https://github.com/${config.owner}/${config.name}.git`;
+  if (githubToken !== undefined) {
+    return addTokenToGitHttpsUrl(baseHttpUrl, githubToken);
+  }
+  return baseHttpUrl;
+}
+
+/** Gets a Github URL that refers to a list of recent commits within a specified branch. */
+export function getListCommitsInBranchUrl({remoteParams}: GitClient, branchName: string) {
+  return `https://github.com/${remoteParams.owner}/${remoteParams.repo}/commits/${branchName}`;
+}
diff --git a/dev-infra/utils/git/github-yargs.ts b/dev-infra/utils/git/github-yargs.ts
new file mode 100644
index 0000000000000..ecd615d57e400
--- /dev/null
+++ b/dev-infra/utils/git/github-yargs.ts
@@ -0,0 +1,36 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Argv} from 'yargs';
+import {error, red, yellow} from '../console';
+import {GITHUB_TOKEN_GENERATE_URL} from './github-urls';
+
+export type ArgvWithGithubToken = Argv<{githubToken: string}>;
+
+/** Sets up the `github-token` command option for the given Yargs instance. */
+export function addGithubTokenOption(yargs: Argv): ArgvWithGithubToken {
+  return yargs
+      // 'github-token' is casted to 'githubToken' to properly set up typings to reflect the key in
+      // the Argv object being camelCase rather than kebob case due to the `camel-case-expansion`
+      // config: https://github.com/yargs/yargs-parser#camel-case-expansion
+      .option('github-token' as 'githubToken', {
+        type: 'string',
+        description: 'Github token. If not set, token is retrieved from the environment variables.',
+        coerce: (token: string) => {
+          const githubToken = token || process.env.GITHUB_TOKEN || process.env.TOKEN;
+          if (!githubToken) {
+            error(red('No Github token set. Please set the `GITHUB_TOKEN` environment variable.'));
+            error(red('Alternatively, pass the `--github-token` command line flag.'));
+            error(yellow(`You can generate a token here: ${GITHUB_TOKEN_GENERATE_URL}`));
+            process.exit(1);
+          }
+          return githubToken;
+        },
+      })
+      .default('github-token' as 'githubToken', '', '<LOCAL TOKEN>');
+}
diff --git a/dev-infra/utils/git/github.ts b/dev-infra/utils/git/github.ts
index 85d061435868f..1d368bb9f03d3 100644
--- a/dev-infra/utils/git/github.ts
+++ b/dev-infra/utils/git/github.ts
@@ -11,6 +11,14 @@ import * as Octokit from '@octokit/rest';
 import {RequestParameters} from '@octokit/types';
 import {query, types} from 'typed-graphqlify';
 
+/** Interface describing a Github repository. */
+export interface GithubRepo {
+  /** Owner login of the repository. */
+  owner: string;
+  /** Name of the repository. */
+  name: string;
+}
+
 /** Error for failed Github API requests. */
 export class GithubApiRequestError extends Error {
   constructor(public status: number, message: string) {
@@ -26,7 +34,7 @@ export class GithubApiRequestError extends Error {
  **/
 export class GithubClient extends Octokit {
   /** The Github GraphQL (v4) API. */
-  graqhql: GithubGraphqlClient;
+  graphql: GithubGraphqlClient;
 
   /** The current user based on checking against the Github API. */
   private _currentUser: string|null = null;
@@ -42,7 +50,7 @@ export class GithubClient extends Octokit {
     });
 
     // Create authenticated graphql client.
-    this.graqhql = new GithubGraphqlClient(token);
+    this.graphql = new GithubGraphqlClient(token);
   }
 
   /** Retrieve the login of the current user from Github. */
@@ -51,7 +59,7 @@ export class GithubClient extends Octokit {
     if (this._currentUser !== null) {
       return this._currentUser;
     }
-    const result = await this.graqhql.query({
+    const result = await this.graphql.query({
       viewer: {
         login: types.string,
       }
@@ -61,18 +69,13 @@ export class GithubClient extends Octokit {
 }
 
 /**
- * An object representation of a GraphQL Query to be used as a response type and to generate
- * a GraphQL query string.
+ * An object representation of a GraphQL Query to be used as a response type and
+ * to generate a GraphQL query string.
  */
-type GraphQLQueryObject = Parameters<typeof query>[1];
+export type GraphQLQueryObject = Parameters<typeof query>[1];
 
-/**
- * A client for interacting with Github's GraphQL API.
- *
- * This class is intentionally not exported as it should always be access/used via a
- * _GithubClient instance.
- */
-class GithubGraphqlClient {
+/** A client for interacting with Github's GraphQL API. */
+export class GithubGraphqlClient {
   /** The Github GraphQL (v4) API. */
   private graqhql = graphql;
 
@@ -80,11 +83,10 @@ class GithubGraphqlClient {
     // Set the default headers to include authorization with the provided token for all
     // graphQL calls.
     if (token) {
-      this.graqhql.defaults({headers: {authorization: `token ${token}`}});
+      this.graqhql = this.graqhql.defaults({headers: {authorization: `token ${token}`}});
     }
   }
 
-
   /** Perform a query using Github's GraphQL API. */
   async query<T extends GraphQLQueryObject>(queryObject: T, params: RequestParameters = {}) {
     const queryString = query(queryObject);
diff --git a/dev-infra/utils/git/index.ts b/dev-infra/utils/git/index.ts
index 030a25c4cada6..8a51ffc63f7dc 100644
--- a/dev-infra/utils/git/index.ts
+++ b/dev-infra/utils/git/index.ts
@@ -10,8 +10,9 @@ import * as Octokit from '@octokit/rest';
 import {spawnSync, SpawnSyncOptions, SpawnSyncReturns} from 'child_process';
 
 import {getConfig, getRepoBaseDir, NgDevConfig} from '../config';
-import {info, yellow} from '../console';
+import {debug, info, yellow} from '../console';
 import {GithubClient} from './github';
+import {getRepositoryGitUrl, GITHUB_TOKEN_GENERATE_URL, GITHUB_TOKEN_SETTINGS_URL} from './github-urls';
 
 /** Github response type extended to include the `x-oauth-scopes` headers presence. */
 type RateLimitResponseWithOAuthScopeHeader = Octokit.Response<Octokit.RateLimitGetResponse>&{
@@ -32,29 +33,26 @@ export class GitCommandError extends Error {
 }
 
 /**
- * Common client for performing Git interactions.
+ * Common client for performing Git interactions with a given remote.
  *
- * Takes in two optional arguements:
- *   _githubToken: the token used for authentifation in github interactions, by default empty
+ * Takes in two optional arguments:
+ *   `githubToken`: the token used for authentication in Github interactions, by default empty
  *     allowing readonly actions.
- *   _config: The dev-infra configuration containing GitClientConfig information, by default
- *     loads the config from the default location.
+ *   `config`: The dev-infra configuration containing information about the remote. By default
+ *     the dev-infra configuration is loaded with its Github configuration.
  **/
 export class GitClient {
-  /** Short-hand for accessing the remote configuration. */
+  /** Short-hand for accessing the default remote configuration. */
   remoteConfig = this._config.github;
   /** Octokit request parameters object for targeting the configured remote. */
   remoteParams = {owner: this.remoteConfig.owner, repo: this.remoteConfig.name};
-  /** URL that resolves to the configured repository. */
-  repoGitUrl = this.remoteConfig.useSsh ?
-      `git@github.com:${this.remoteConfig.owner}/${this.remoteConfig.name}.git` :
-      `https://${this._githubToken}@github.com/${this.remoteConfig.owner}/${
-          this.remoteConfig.name}.git`;
+  /** Git URL that resolves to the configured repository. */
+  repoGitUrl = getRepositoryGitUrl(this.remoteConfig, this.githubToken);
   /** Instance of the authenticated Github octokit API. */
-  github = new GithubClient(this._githubToken);
+  github = new GithubClient(this.githubToken);
 
   /** The OAuth scopes available for the provided Github token. */
-  private _oauthScopes: Promise<string[]>|null = null;
+  private _cachedOauthScopes: Promise<string[]>|null = null;
   /**
    * Regular expression that matches the provided Github token. Used for
    * sanitizing the token from Git child process output.
@@ -62,13 +60,13 @@ export class GitClient {
   private _githubTokenRegex: RegExp|null = null;
 
   constructor(
-      private _githubToken?: string, private _config: Pick<NgDevConfig, 'github'> = getConfig(),
+      public githubToken?: string, private _config: Pick<NgDevConfig, 'github'> = getConfig(),
       private _projectRoot = getRepoBaseDir()) {
     // If a token has been specified (and is not empty), pass it to the Octokit API and
     // also create a regular expression that can be used for sanitizing Git command output
     // so that it does not print the token accidentally.
-    if (_githubToken != null) {
-      this._githubTokenRegex = new RegExp(_githubToken, 'g');
+    if (githubToken != null) {
+      this._githubTokenRegex = new RegExp(githubToken, 'g');
     }
   }
 
@@ -86,13 +84,17 @@ export class GitClient {
   /**
    * Spawns a given Git command process. Does not throw if the command fails. Additionally,
    * if there is any stderr output, the output will be printed. This makes it easier to
-   * debug failed commands.
+   * info failed commands.
    */
   runGraceful(args: string[], options: SpawnSyncOptions = {}): SpawnSyncReturns<string> {
-    // To improve the debugging experience in case something fails, we print all executed
-    // Git commands. Note that we do not want to print the token if is contained in the
-    // command. It's common to share errors with others if the tool failed.
-    info('Executing: git', this.omitGithubTokenFromMessage(args.join(' ')));
+    // To improve the debugging experience in case something fails, we print all executed Git
+    // commands unless the `stdio` is explicitly set to `ignore` (which is equivalent to silent).
+    // Note that we do not want to print the token if it is contained in the command. It's common
+    // to share errors with others if the tool failed, and we do not want to leak tokens.
+    // TODO: Add support for configuring this on a per-client basis. Some tools do not want
+    // to print the Git command messages to the console at all (e.g. to maintain clean output).
+    const printFn = options.stdio !== 'ignore' ? info : debug;
+    printFn('Executing: git', this.omitGithubTokenFromMessage(args.join(' ')));
 
     const result = spawnSync('git', args, {
       cwd: this._projectRoot,
@@ -150,6 +152,25 @@ export class GitClient {
     return value.replace(this._githubTokenRegex, '<TOKEN>');
   }
 
+  /**
+   * Checks out a requested branch or revision, optionally cleaning the state of the repository
+   * before attempting the checking. Returns a boolean indicating whether the branch or revision
+   * was cleanly checked out.
+   */
+  checkout(branchOrRevision: string, cleanState: boolean): boolean {
+    if (cleanState) {
+      // Abort any outstanding ams.
+      this.runGraceful(['am', '--abort'], {stdio: 'ignore'});
+      // Abort any outstanding cherry-picks.
+      this.runGraceful(['cherry-pick', '--abort'], {stdio: 'ignore'});
+      // Abort any outstanding rebases.
+      this.runGraceful(['rebase', '--abort'], {stdio: 'ignore'});
+      // Clear any changes in the current repo.
+      this.runGraceful(['reset', '--hard'], {stdio: 'ignore'});
+    }
+    return this.runGraceful(['checkout', branchOrRevision], {stdio: 'ignore'}).status === 0;
+  }
+
   /**
    * Assert the GitClient instance is using a token with permissions for the all of the
    * provided OAuth scopes.
@@ -172,8 +193,8 @@ export class GitClient {
         `The provided <TOKEN> does not have required permissions due to missing scope(s): ` +
         `${yellow(missingScopes.join(', '))}\n\n` +
         `Update the token in use at:\n` +
-        `  https://github.com/settings/tokens\n\n` +
-        `Alternatively, a new token can be created at: https://github.com/settings/tokens/new\n`;
+        `  ${GITHUB_TOKEN_SETTINGS_URL}\n\n` +
+        `Alternatively, a new token can be created at: ${GITHUB_TOKEN_GENERATE_URL}\n`;
 
     return {error};
   }
@@ -181,14 +202,14 @@ export class GitClient {
   /**
    * Retrieve the OAuth scopes for the loaded Github token.
    **/
-  private async getAuthScopesForToken() {
+  private getAuthScopesForToken() {
     // If the OAuth scopes have already been loaded, return the Promise containing them.
-    if (this._oauthScopes !== null) {
-      return this._oauthScopes;
+    if (this._cachedOauthScopes !== null) {
+      return this._cachedOauthScopes;
     }
     // OAuth scopes are loaded via the /rate_limit endpoint to prevent
     // usage of a request against that rate_limit for this lookup.
-    return this._oauthScopes = this.github.rateLimit.get().then(_response => {
+    return this._cachedOauthScopes = this.github.rateLimit.get().then(_response => {
       const response = _response as RateLimitResponseWithOAuthScopeHeader;
       const scopes: string = response.headers['x-oauth-scopes'] || '';
       return scopes.split(',').map(scope => scope.trim());
diff --git a/dev-infra/utils/github.ts b/dev-infra/utils/github.ts
index 04cd93ed97e2e..7e187a24a4d93 100644
--- a/dev-infra/utils/github.ts
+++ b/dev-infra/utils/github.ts
@@ -6,29 +6,15 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {graphql as unauthenticatedGraphql} from '@octokit/graphql';
+import {params, types} from 'typed-graphqlify';
 
-import {params, query as graphqlQuery, types} from 'typed-graphqlify';
-import {NgDevConfig} from './config';
-
-/** The configuration required for github interactions. */
-type GithubConfig = NgDevConfig['github'];
-
-/**
- * Authenticated instance of Github GraphQl API service, relies on a
- * personal access token being available in the TOKEN environment variable.
- */
-const graphql = unauthenticatedGraphql.defaults({
-  headers: {
-    // TODO(josephperrott): Remove reference to TOKEN environment variable as part of larger
-    // effort to migrate to expecting tokens via GITHUB_ACCESS_TOKEN environment variables.
-    authorization: `token ${process.env.TOKEN || process.env.GITHUB_ACCESS_TOKEN}`,
-  }
-});
+import {GitClient} from './git';
 
 /** Get a PR from github  */
-export async function getPr<PrSchema>(
-    prSchema: PrSchema, prNumber: number, {owner, name}: GithubConfig) {
+export async function getPr<PrSchema>(prSchema: PrSchema, prNumber: number, git: GitClient) {
+  /** The owner and name of the repository */
+  const {owner, name} = git.remoteConfig;
+  /** The GraphQL query object to get a the PR */
   const PR_QUERY = params(
       {
         $number: 'Int!',    // The PR number
@@ -41,14 +27,15 @@ export async function getPr<PrSchema>(
         })
       });
 
-  const result =
-      await graphql(graphqlQuery(PR_QUERY), {number: prNumber, owner, name}) as typeof PR_QUERY;
+  const result = (await git.github.graphql.query(PR_QUERY, {number: prNumber, owner, name}));
   return result.repository.pullRequest;
 }
 
 /** Get all pending PRs from github  */
-export async function getPendingPrs<PrSchema>(prSchema: PrSchema, {owner, name}: GithubConfig) {
-  // The GraphQL query object to get a page of pending PRs
+export async function getPendingPrs<PrSchema>(prSchema: PrSchema, git: GitClient) {
+  /** The owner and name of the repository */
+  const {owner, name} = git.remoteConfig;
+  /** The GraphQL query object to get a page of pending PRs */
   const PRS_QUERY = params(
       {
         $first: 'Int',      // How many entries to get with each request
@@ -73,36 +60,22 @@ export async function getPendingPrs<PrSchema>(prSchema: PrSchema, {owner, name}:
               }),
         })
       });
-  const query = graphqlQuery('members', PRS_QUERY);
-
-  /**
-   * Gets the query and queryParams for a specific page of entries.
-   */
-  const queryBuilder = (count: number, cursor?: string) => {
-    return {
-      query,
-      params: {
-        after: cursor || null,
-        first: count,
-        owner,
-        name,
-      },
-    };
-  };
-
-  // The current cursor
+  /** The current cursor */
   let cursor: string|undefined;
-  // If an additional page of members is expected
+  /** If an additional page of members is expected */
   let hasNextPage = true;
-  // Array of pending PRs
+  /** Array of pending PRs */
   const prs: Array<PrSchema> = [];
 
-  // For each page of the response, get the page and add it to the
-  // list of PRs
+  // For each page of the response, get the page and add it to the list of PRs
   while (hasNextPage) {
-    const {query, params} = queryBuilder(100, cursor);
-    const results = await graphql(query, params) as typeof PRS_QUERY;
-
+    const params = {
+      after: cursor || null,
+      first: 100,
+      owner,
+      name,
+    };
+    const results = await git.github.graphql.query(PRS_QUERY, params) as typeof PRS_QUERY;
     prs.push(...results.repository.pullRequests.nodes);
     hasNextPage = results.repository.pullRequests.pageInfo.hasNextPage;
     cursor = results.repository.pullRequests.pageInfo.endCursor;
diff --git a/dev-infra/utils/inquirer-autocomplete-typings.d.ts b/dev-infra/utils/inquirer-autocomplete-typings.d.ts
new file mode 100644
index 0000000000000..bddf9e2e1a20c
--- /dev/null
+++ b/dev-infra/utils/inquirer-autocomplete-typings.d.ts
@@ -0,0 +1,17 @@
+/**
+ * @license
+ * Copyright Google LLC 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
+ */
+
+// inquirer-autocomplete-prompt doesn't provide types and no types are made available via
+// DefinitelyTyped.
+declare module "inquirer-autocomplete-prompt" {
+
+  import {registerPrompt} from 'inquirer';
+
+  let AutocompletePrompt: Parameters<typeof registerPrompt>[1];
+  export = AutocompletePrompt;
+}
diff --git a/dev-infra/utils/repo-files.ts b/dev-infra/utils/repo-files.ts
index 7cfbc09ec4f52..b509e90fc0b57 100644
--- a/dev-infra/utils/repo-files.ts
+++ b/dev-infra/utils/repo-files.ts
@@ -27,6 +27,18 @@ export function allChangedFilesSince(sha = 'HEAD') {
   return Array.from(new Set([...diffFiles, ...untrackedFiles]));
 }
 
+/**
+ * A list of all staged files which have been modified.
+ *
+ * Only added, created and modified files are listed as others (deleted, renamed, etc) aren't
+ * changed or available as content to act upon.
+ */
+export function allStagedFiles() {
+  return gitOutputAsArray(`git diff --staged --name-only --diff-filter=ACM`);
+}
+
+
+
 export function allFiles() {
   return gitOutputAsArray(`git ls-files`);
 }
diff --git a/dev-infra/utils/testing/BUILD.bazel b/dev-infra/utils/testing/BUILD.bazel
new file mode 100644
index 0000000000000..734fbc215356e
--- /dev/null
+++ b/dev-infra/utils/testing/BUILD.bazel
@@ -0,0 +1,15 @@
+load("@npm//@bazel/typescript:index.bzl", "ts_library")
+
+ts_library(
+    name = "testing",
+    srcs = glob(["*.ts"]),
+    module_name = "@angular/dev-infra-private/utils/testing",
+    visibility = ["//dev-infra:__subpackages__"],
+    deps = [
+        "//dev-infra/utils",
+        "@npm//@types/jasmine",
+        "@npm//@types/minimist",
+        "@npm//@types/node",
+        "@npm//minimist",
+    ],
+)
diff --git a/modules/playground/src/web_workers/images/index.ts b/dev-infra/utils/testing/index.ts
similarity index 64%
rename from modules/playground/src/web_workers/images/index.ts
rename to dev-infra/utils/testing/index.ts
index f3791aca9123d..30052d6e230d4 100644
--- a/modules/playground/src/web_workers/images/index.ts
+++ b/dev-infra/utils/testing/index.ts
@@ -6,6 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {bootstrapWorkerUi} from '@angular/platform-webworker';
-
-bootstrapWorkerUi('loader.js');
+export * from './semver-matchers';
+export * from './virtual-git-client';
+export * from './virtual-git-matchers';
diff --git a/dev-infra/utils/testing/semver-matchers.ts b/dev-infra/utils/testing/semver-matchers.ts
new file mode 100644
index 0000000000000..fa38e6af12bc4
--- /dev/null
+++ b/dev-infra/utils/testing/semver-matchers.ts
@@ -0,0 +1,12 @@
+/**
+ * @license
+ * Copyright Google LLC 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
+ */
+
+/** Gets a jasmine asymmetric matcher for matching a given SemVer version. */
+export function matchesVersion(versionName: string) {
+  return jasmine.objectContaining({raw: versionName, version: versionName});
+}
diff --git a/dev-infra/utils/testing/virtual-git-client.ts b/dev-infra/utils/testing/virtual-git-client.ts
new file mode 100644
index 0000000000000..05d7f7d708db1
--- /dev/null
+++ b/dev-infra/utils/testing/virtual-git-client.ts
@@ -0,0 +1,173 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {SpawnSyncOptions, SpawnSyncReturns} from 'child_process';
+import * as parseArgs from 'minimist';
+
+import {GitClient} from '../git/index';
+
+/** Type describing a Git head. */
+interface GitHead {
+  /** Name of the head. Not defined in a detached state. */
+  branch?: string;
+  /** Ref associated with this head. i.e. the remote base of this head. */
+  ref?: RemoteRef;
+  /** List of commits added to this head (on top of the ref's base). */
+  newCommits: Commit[];
+}
+
+/** Type describing a remote Git ref. */
+export interface RemoteRef {
+  /** Name of the reference. */
+  name: string;
+  /** Repository containing this ref. */
+  repoUrl: string;
+}
+
+/** Type describing a Git commit. */
+export interface Commit {
+  /** Commit message. */
+  message: string;
+  /** List of files included in this commit. */
+  files: string[];
+}
+
+/**
+ * Virtual git client that mocks Git commands and keeps track of the repository state
+ * in memory. This allows for convenient test assertions with Git interactions.
+ */
+export class VirtualGitClient extends GitClient {
+  /** Current Git HEAD that has been previously fetched. */
+  fetchHeadRef: RemoteRef|null = null;
+  /** List of known branches in the repository. */
+  branches: {[branchName: string]: GitHead} = {master: {branch: 'master', newCommits: []}};
+  /** Current checked out HEAD in the repository. */
+  head: GitHead = this.branches['master'];
+  /** List of pushed heads to a given remote ref. */
+  pushed: {remote: RemoteRef, head: GitHead}[] = [];
+
+  /** Override for the actual Git client command execution. */
+  runGraceful(args: string[], options: SpawnSyncOptions = {}): SpawnSyncReturns<string> {
+    const [command, ...rawArgs] = args;
+    switch (command) {
+      case 'push':
+        this._push(rawArgs);
+        break;
+      case 'fetch':
+        this._fetch(rawArgs);
+        break;
+      case 'checkout':
+        this._checkout(rawArgs);
+        break;
+      case 'commit':
+        this._commit(rawArgs);
+        break;
+    }
+
+    // Return a fake spawn sync return value. We error non-gracefully if any command fails
+    // in the tests, so we always return success and stub out the `SpawnSyncReturns` type.
+    return {status: 0, stderr: '', output: [], pid: -1, signal: null, stdout: ''};
+  }
+
+  /** Handler for the `git push` command. */
+  private _push(args: string[]) {
+    const [repoUrl, refspec] = parseArgs(args)._;
+    const ref = this._unwrapRefspec(refspec);
+    const name = ref.destination || ref.source;
+    const existingPush =
+        this.pushed.find(({remote}) => remote.repoUrl === repoUrl && remote.name === name);
+    const pushedHead = this._cloneHead(this.head);
+
+    // Either, update a previously pushed branch, or keep track of a newly
+    // performed branch push. We don't respect the `--force` flag.
+    if (existingPush !== undefined) {
+      existingPush.head = pushedHead;
+    } else {
+      this.pushed.push({remote: {repoUrl, name}, head: pushedHead});
+    }
+  }
+
+  /** Handler for the `git commit` command. */
+  private _commit(rawArgs: string[]) {
+    const args = parseArgs(rawArgs, {string: ['m', 'message']});
+    const message = args['m'] || args['message'];
+    const files = args._;
+    if (!message) {
+      throw Error('No commit message has been specified.');
+    }
+    this.head.newCommits.push({message, files});
+  }
+
+  /** Handler for the `git fetch` command. */
+  private _fetch(rawArgs: string[]) {
+    const args = parseArgs(rawArgs, {boolean: ['f', 'force']});
+    const [repoUrl, refspec] = args._;
+    const force = args['f'] || args['force'];
+    const ref = this._unwrapRefspec(refspec);
+
+    // Keep track of the fetch head, so that it can be checked out
+    // later in a detached state.
+    this.fetchHeadRef = {name: ref.source, repoUrl};
+
+    // If a destination has been specified in the ref spec, add it to the
+    // list of available local branches.
+    if (ref.destination) {
+      if (this.branches[ref.destination] && !force) {
+        throw Error('Cannot override existing local branch when fetching.');
+      }
+      this.branches[ref.destination] = {
+        branch: ref.destination,
+        ref: this.fetchHeadRef,
+        newCommits: [],
+      };
+    }
+  }
+
+  /** Handler for the `git checkout` command. */
+  private _checkout(rawArgs: string[]) {
+    const args = parseArgs(rawArgs, {boolean: ['detach', 'B']});
+    const createBranch = args['B'];
+    const detached = args['detach'];
+    const [target] = args._;
+
+    if (target === 'FETCH_HEAD') {
+      if (this.fetchHeadRef === null) {
+        throw Error('Unexpectedly trying to check out "FETCH_HEAD". Not fetch head set.');
+      }
+      this.head = {ref: this.fetchHeadRef, newCommits: []};
+    } else if (this.branches[target]) {
+      this.head = this._cloneHead(this.branches[target], detached);
+    } else if (createBranch) {
+      this.head = this.branches[target] = {branch: target, ...this._cloneHead(this.head, detached)};
+    } else {
+      throw Error(`Unexpected branch checked out: ${target}`);
+    }
+  }
+
+  /**
+   * Unwraps a refspec into the base and target ref names.
+   * https://git-scm.com/docs/git-fetch#Documentation/git-fetch.txt-ltrefspecgt.
+   */
+  private _unwrapRefspec(refspec: string): {source: string, destination?: string} {
+    const [source, destination] = refspec.split(':');
+    if (!destination) {
+      return {source};
+    } else {
+      return {source, destination};
+    }
+  }
+
+  /** Clones the specified Git head with respect to the detached flag. */
+  private _cloneHead(head: GitHead, detached = false): GitHead {
+    return {
+      branch: detached ? undefined : head.branch,
+      ref: head.ref,
+      newCommits: [...head.newCommits],
+    };
+  }
+}
diff --git a/dev-infra/utils/testing/virtual-git-matchers.ts b/dev-infra/utils/testing/virtual-git-matchers.ts
new file mode 100644
index 0000000000000..41c021aa6fbae
--- /dev/null
+++ b/dev-infra/utils/testing/virtual-git-matchers.ts
@@ -0,0 +1,41 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {GithubRepo} from '../git/github';
+
+import {Commit} from './virtual-git-client';
+
+/** Interface describing the match parameters for a virtual Git client push. */
+interface BranchPushMatchParameters {
+  targetRepo: GithubRepo;
+  targetBranch: string;
+  baseRepo: GithubRepo;
+  baseBranch: string;
+  expectedCommits: Commit[]|jasmine.ArrayContaining<Commit>;
+}
+
+/**
+ * Gets a jasmine object matcher for asserting that a virtual Git client push
+ * matches the specified branch push (through the match parameters).
+ */
+export function getBranchPushMatcher(options: BranchPushMatchParameters) {
+  const {targetRepo, targetBranch, baseBranch, baseRepo, expectedCommits} = options;
+  return jasmine.objectContaining({
+    remote: {
+      repoUrl: `https://github.com/${targetRepo.owner}/${targetRepo.name}.git`,
+      name: `refs/heads/${targetBranch}`
+    },
+    head: jasmine.objectContaining({
+      newCommits: expectedCommits,
+      ref: {
+        repoUrl: `https://github.com/${baseRepo.owner}/${baseRepo.name}.git`,
+        name: baseBranch,
+      },
+    })
+  });
+}
diff --git a/docs/CARETAKER.md b/docs/CARETAKER.md
index 3ea4091b11a94..ac7a005b84dbd 100644
--- a/docs/CARETAKER.md
+++ b/docs/CARETAKER.md
@@ -4,71 +4,23 @@ Caretaker is responsible for merging PRs into the individual branches and intern
 
 ## Responsibilities
 
-- Draining the queue of PRs ready to be merged. (PRs with [`PR action: merge`](https://github.com/angular/angular/pulls?q=is%3Aopen+is%3Apr+label%3A%22PR+action%3A+merge%22) label)
+- Draining the queue of PRs ready to be merged. (PRs with [`action: merge`](https://github.com/angular/angular/pulls?q=is%3Aopen+is%3Apr+label%3A%22action%3A+merge%22) label)
 - Assigning [new issues](https://github.com/angular/angular/issues?q=is%3Aopen+is%3Aissue+no%3Alabel) to individual component authors.
 
 ## Merging the PR
 
-A PR needs to have `PR action: merge` and `PR target: *` labels to be considered
-ready to merge. Merging is performed by running `merge-pr` with a PR number to merge.
+A PR needs to have `action: merge` and `target: *` labels to be considered
+ready to merge. Merging is performed by running `ng-dev pr merge` with a PR number to merge.
+
+The tooling automatically verifies the given PR is ready for merge. If the PR passes the tests, the
+tool will automatically merge it based on the applied target label.
 
 To merge a PR run:
 
 ```
-$ ./scripts/github/merge-pr 1234
+$ yarn ng-dev pr merge <pr number>
 ```
 
-The `merge-pr` script will:
-- Ensure that all appropriate labels are on the PR.
-- Fetches the latest PR code from the `angular/angular` repo.
-- It will `cherry-pick` all of the SHAs from the PR into the current corresponding branches `master` and or `?.?.x` (patch).
-- It will rewrite commit history by automatically adding `Close #1234` and `(#1234)` into the commit message.
-
-NOTE: The `merge-pr` will land the PR on `master` and or `?.?.x` (patch) as described by `PR target: *` label.
-
 ### Recovering from failed `merge-pr` due to conflicts
 
-When running `merge-pr` the script will output the commands which it is about to run.
-
-```
-$ ./scripts/github/merge-pr 1234
-======================
-GitHub Merge PR Steps
-======================
-   git cherry-pick angular/pr/1234~1..angular/pr/1234
-   git filter-branch -f --msg-filter "/home/misko/angular/scripts/github/utils/github.closes 1234" HEAD~1..HEAD
-```
-
-If the `cherry-pick` command fails than resolve conflicts and use `git cherry-pick --continue` once ready. After the `cherry-pick` is done cut&paste and run the `filter-branch` command to properly rewrite the messages
-
-## Cherry-picking PRs into patch branch
-
-In addition to merging PRs into the master branch, many PRs need to be also merged into a patch branch.
-Follow these steps to get patch branch up to date.
-
-1. Check out the most recent patch branch: `git checkout 4.3.x`
-2. Get a list of PRs merged into master: `git log master --oneline -n10`
-3. For each PR number in the commit message run: `./scripts/github/merge-pr 1234`
-   - The PR will only merge if the `PR target:` matches the branch.
-
-Once all of the PRs are in patch branch, push the all branches and tags to github using `push-upstream` script.
-
-
-## Pushing merged PRs into github
-
-Use `push-upstream` script to push all of the branch and tags to github.
-
-```
-$ ./scripts/github/push-upstream
-git push git@github.com:angular/angular.git master:master 4.3.x:4.3.x
-Counting objects: 25, done.
-Delta compression using up to 6 threads.
-Compressing objects: 100% (17/17), done.
-Writing objects: 100% (25/25), 2.22 KiB | 284.00 KiB/s, done.
-Total 25 (delta 22), reused 8 (delta 7)
-remote: Resolving deltas: 100% (22/22), completed with 18 local objects.
-To github.com:angular/angular.git
-   079d884b6..d1c4a94bb  master -> master
-git push --tags -f git@github.com:angular/angular.git patch_sync:patch_sync
-Everything up-to-date
-```
+The `ng-dev pr merge` tool will automatically restore to the previous git state when a merge fails.
diff --git a/docs/COMMITTER.md b/docs/COMMITTER.md
index 77b1dc8e3886f..91abbb4c6608e 100644
--- a/docs/COMMITTER.md
+++ b/docs/COMMITTER.md
@@ -12,7 +12,7 @@ Change approvals in our monorepo are managed via [PullApprove](https://docs.pull
 # Merging
 
 Once a change has all of the required approvals, either the last approver or the PR author (if PR author has the project collaborator status)
-should mark the PR with the `PR action: merge` label and the correct [target label](https://github.com/angular/angular/blob/master/docs/TRIAGE_AND_LABELS.md#pr-target).
+should mark the PR with the `action: merge` label and the correct [target label](https://github.com/angular/angular/blob/master/docs/TRIAGE_AND_LABELS.md#pr-target).
 This signals to the caretaker that the PR should be merged. See [merge instructions](CARETAKER.md).
 
 # Who is the Caretaker?
diff --git a/docs/DEBUG_COMPONENTS_REPO_IVY.md b/docs/DEBUG_COMPONENTS_REPO_IVY.md
index 59feffafb8d86..16bed8268f0bc 100644
--- a/docs/DEBUG_COMPONENTS_REPO_IVY.md
+++ b/docs/DEBUG_COMPONENTS_REPO_IVY.md
@@ -4,7 +4,7 @@ Currently all changes to Ivy are validated against the test suite of the
 `angular/components` repository. In order to debug the `components-repo-unit-tests` CI
 job, the following steps can be used:
 
-1\) Build the Ivy package output by running `node ./scripts/build/build-ivy-npm-packages.js` in
+1\) Build the Ivy package output by running `node ./scripts/build/build-packages-dist.js` in
 the `angular/angular` repo.
 
 2\) Clone the `angular/components` repository if not done yet ([quick link to repo](https://github.com/angular/components)).
@@ -13,7 +13,7 @@ the `angular/angular` repo.
 command in the `angular/angular` repo:
 
 ```bash
-node ./scripts/ci/update-deps-to-dist-packages.js {COMPONENTS_REPO}/package.json ./dist/packages-dist-ivy-aot
+node ./scripts/ci/update-deps-to-dist-packages.js {COMPONENTS_REPO}/package.json ./dist/packages-dist
 ```
 
 4\) Switch into the `angular/components` repository and run the tests by using the
diff --git a/docs/DEVELOPER.md b/docs/DEVELOPER.md
index 0cb401ab7aac7..346fa3f200d48 100644
--- a/docs/DEVELOPER.md
+++ b/docs/DEVELOPER.md
@@ -154,9 +154,7 @@ available as a long-term distribution mechanism, but they are guaranteed to be a
 time of the build.
 
 You can access the artifacts for a specific CI run by going to the workflow page, clicking on the
-`publish_packages_as_artifacts` job and then switching to the "Artifacts" tab.
-(If you happen to know the build number of the job, the URL will be something like:
-`https://circleci.com/gh/angular/angular/<build-number>#artifacts`)
+`publish_packages_as_artifacts` job and then switching to the "ARTIFACTS" tab.
 
 #### Archives for each Package
 On the "Artifacts" tab, there is a list of links to compressed archives for Angular packages. The
diff --git a/docs/FIXUP_COMMITS.md b/docs/FIXUP_COMMITS.md
new file mode 100644
index 0000000000000..c32a91ef3d708
--- /dev/null
+++ b/docs/FIXUP_COMMITS.md
@@ -0,0 +1,95 @@
+# Working with fixup commits
+
+This document provides information and guidelines for working with fixup commits:
+- [What are fixup commits](#about-fixup-commits)
+- [Why use fixup commits](#why-fixup-commits)
+- [Creating fixup commits](#create-fixup-commits)
+- [Squashing fixup commits](#squash-fixup-commits)
+
+[This blog post](https://thoughtbot.com/blog/autosquashing-git-commits) is also a good resource on the subject.
+
+
+## <a name="about-fixup-commits"></a> What are fixup commits
+
+At their core, fixup commits are just regular commits with a special commit message:
+The first line of their commit message starts with "fixup! " (notice the space after "!") followed by the first line of the commit message of an earlier commit (it doesn't have to be the immediately preceding one).
+
+The purpose of a fixup commit is to modify an earlier commit.
+I.e. it allows adding more changes in a new commit, but "marking" them as belonging to an earlier commit.
+`Git` provides tools to make it easy to squash fixup commits into the original commit at a later time (see [below](#squash-fixup-commits) for details).
+
+For example, let's assume you have added the following commits to your branch:
+
+```
+feat: first commit
+fix: second commit
+```
+
+If you want to add more changes to the first commit, you can create a new commit with the commit message:
+`fixup! feat: first commit`:
+
+```
+feat: first commit
+fix: second commit
+fixup! feat: first commit
+```
+
+
+## <a name="why-fixup-commits"></a> Why use fixup commits
+
+So, when are fixup commits useful?
+
+During the life of a Pull Request, a reviewer might request changes.
+The Pull Request author can make the requested changes and submit them for another review.
+Normally, these changes should be part of one of the original commits of the Pull Request.
+However, amending an existing commit with the changes makes it difficult for the reviewer to know exactly what has changed since the last time they reviewed the Pull Request.
+
+Here is where fixup commits come in handy.
+By addressing review feedback in fixup commits, you make it very straight forward for the reviewer to see what are the new changes that need to be reviewed and verify that their earlier feedback has been addressed.
+This can save a lot of effort, especially on larger Pull Requests (where having to re-review _all_ the changes is pretty wasteful).
+
+When the time comes to merge the Pull Request into the repository, the merge script [knows how to automatically squash](../dev-infra/pr/merge/strategies/autosquash-merge.ts) fixup commits with the corresponding regular commits.
+
+
+## <a name="create-fixup-commits"></a> Creating fixup commits
+
+As mentioned [above](#about-fixup-commits), the only thing that differentiates a fixup commit from a regular commit is the commit message.
+You can create a fixup commit by specifying an appropriate commit message (i.e. `fixup! <original-commit-message-subject>`).
+
+In addition, the `git` command-line tool provides an easy way to create a fixup commit via [git commit --fixup](https://git-scm.com/docs/git-commit#Documentation/git-commit.txt---fixupltcommitgt):
+
+```sh
+# Create a fixup commit to fix up the last commit on the branch:
+git commit --fixup HEAD ...
+
+# Create a fixup commit to fix up commit with SHA <COMMIT_SHA>:
+git commit --fixup <COMMIT_SHA> ...
+```
+
+
+## <a name="squash-fixup-commits"></a> Squashing fixup commits
+
+As mentioned above, the merge script will [automatically squash](../dev-infra/pr/merge/strategies/autosquash-merge.ts) fixup commits.
+However, sometimes you might want to manually squash a fixup commit.
+
+
+### Rebasing to squash fixup commits
+
+The easiest way to re-order and squash any commit is via [rebasing interactively](https://git-scm.com/docs/git-rebase#_interactive_mode). You move a commit right after the one you want to squash it into in the rebase TODO list and change the corresponding action from `pick` to `fixup`.
+
+`Git` can do all these automatically for you if you pass the `--autosquash` option to `git rebase`.
+See the [`git` docs](https://git-scm.com/docs/git-rebase#Documentation/git-rebase.txt---autosquash) for more details.
+
+
+### Additional options
+
+You may like to consider some optional configurations:
+
+
+#### Configuring `git` to auto-squash by default
+
+By default, `git` will not automatically squash fixup commits when interactively rebasing.
+If you prefer to not have to pass the `--autosquash` option every time, you can change the default behavior by setting the `rebase.autoSquash` `git` config option to true.
+See the [`git` docs](https://git-scm.com/docs/git-rebase#Documentation/git-rebase.txt-rebaseautoSquash) for more details.
+
+If you have `rebase.autoSquash` set to true, you can pass the `--no-autosquash` option to `git rebase` to override and disable this setting.
diff --git a/docs/PUBLIC_API.md b/docs/PUBLIC_API.md
index dc592c378817e..d4f96a44d0ed9 100644
--- a/docs/PUBLIC_API.md
+++ b/docs/PUBLIC_API.md
@@ -10,8 +10,6 @@ Our semver, timed-release cycle and deprecation policy currently applies to thes
 - `@angular/platform-browser`
 - `@angular/platform-browser-dynamic`
 - `@angular/platform-server`
-- `@angular/platform-webworker`
-- `@angular/platform-webworker-dynamic`
 - `@angular/upgrade`
 - `@angular/router`
 - `@angular/service-worker`
@@ -79,10 +77,10 @@ INFO: From Testing //packages/core:core_api:
      ngModule: Type<T>;
      providers?: Provider[];
  }
- 
+
 -export declare type NgIterable<T> = Array<T> | Iterable<T>;
 +export declare type NgIterable<T> = Iterable<T>;
- 
+
  export declare interface NgModule {
      bootstrap?: Array<Type<any> | any[]>;
      declarations?: Array<Type<any> | any[]>;
diff --git a/docs/TRIAGE_AND_LABELS.md b/docs/TRIAGE_AND_LABELS.md
index aa23e674c45fe..c41f469bd2eca 100644
--- a/docs/TRIAGE_AND_LABELS.md
+++ b/docs/TRIAGE_AND_LABELS.md
@@ -1,8 +1,8 @@
 # Triage Process and GitHub Labels for Angular
 
-This document describes how the Angular team uses labels and milestones to triage issues on github.
+This document describes how the Angular team uses labels and milestones to triage issues on GitHub.
 The basic idea of the process is that caretaker only assigns a component (`comp: *`) label.
-The owner of the component is then responsible for the secondary / component-level triage.
+The owner of the component is then responsible for the detailed / component-level triage.
 
 
 ## Label Types
@@ -10,7 +10,8 @@ The owner of the component is then responsible for the secondary / component-lev
 ### Components
 
 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.
+The components have a clear piece of source code associated with it within the `/packages/` folder
+of this repo.
 
 * `comp: animations`
 * `comp: bazel` - @angular/bazel rules
@@ -48,109 +49,105 @@ We will treat them as a component even thought no specific source tree is associ
 * `comp: performance`
 * `comp: security`
 
-Sometimes, especially in the case of cross-cutting issues or PRs, these PRs or issues belong to multiple components.
-In these cases, all applicable component labels should be used to triage the issue or PR.
+Sometimes, especially in the case of cross-cutting issues or PRs, these PRs or issues belong to
+multiple components. In these cases, all applicable component labels should be used to triage the
+issue or PR.
 
+## Caretaker Triage Process (Initial Triage)
 
-### Type
+The caretaker assigns `comp:  *` labels to new issues as they come in.
+Untriaged issues can be found by selecting the issues with no milestone.
 
-What kind of problem is this?
+If an issue or PR obviously relates to a release regression, the caretaker must assign an
+appropriate priority (`P0` or `P1`) and ensure that someone from the team is actively working to
+resolve it.
 
-* `type: RFC / discussion / question`
-* `type: bug`
-* `type: docs`
-* `type: feature`
-* `type: performance`
-* `type: refactor`
-* `type: use-case`
-* `type: confusing`
+Initial triage should occur daily so that issues can move into detailed triage.
 
+Once the initial triage is done, the ng-bot automatically adds the milestone `needs triage`.
 
-## Caretaker Triage Process (Primary Triage)
+## Detailed Triage
 
-It is the caretaker's responsibility to assign `comp:  *` to each new issue as they come in.
-Issues that haven't been triaged can be found by selecting the issues with no milestone.
+Detailed triage can be done by anyone familiar with the issue subject matter.
 
-If it's obvious that the issue or PR is related to a release regression, the caretaker is also responsible for assigning the `severity(5): regression` label to make the issue or PR highly visible.
+### Step 1: Does the issue have enough information?
 
-The primary triage should be done on a daily basis so that the issues become available for secondary triage without much of delay.
+Gauge whether the issue has enough information to act upon. This typically includes a test case
+via StackBlitz or GitHub and steps to reproduce. If the issue may be legitimate but needs more
+information, add the "needs clarification" label. These labels can be revisted if the author can
+provide further clarification. If the issue does have enough information, move on to step 2.
 
-The reason why we limit the responsibility of the caretaker to this one label is that it is likely that without domain knowledge the caretaker could mislabel issues or lack knowledge of duplicate issues.
+### Step 2: Bug, feature, or discussion?
 
-Once the primary triage is done, the ng-bot automatically adds the milestone `needsTriage`.
+By default, all issues are considered bugs. Bug reports require only a priority label.
 
+If the issue is a feature request, apply the "feature" label. Use your judgement to determine
+whether the feature request is reasonable. If it's clear that the issue requests something
+infeasible, close the issue with a comment explaining why.
 
-## Component's owner Triage Process
+If the issue is an RFC or discussion, apply the "discussion" label. Use your judgement to determine
+whether this discussion belongs on GitHub. Discussions here should pertain to the technical
+implementation details of Angular. Redirect requests for debugging help or advice to a more
+appropriate channel unless they're capturing a legitimate bug. 
 
-The component owner is responsible for assigning one of the labels from each of these categories to the issues that have the milestone `needsTriage`:
+### Step 3: Set a Priority
 
-- `type: *`
-- `frequency: *` (only required for `type: bug/fix`)
-- `severity: *` (only required for `type: bug/fix`)
+For bug reports, set a priority label.
 
-We've adopted the issue categorization based on [user pain](http://www.lostgarden.com/2008/05/improving-bug-triage-with-user-pain.html) used by AngularJS. In this system every issue is assigned frequency and severity based on which the total user pain score is calculated.
+| Label | Description |
+|----|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| P0 | An issue that causes a full outage, breakage, or major function unavailability for everyone, without any known workaround. The issue must be fixed immediately, taking precedence over all other work. Should receive updates at least once per day. |
+| P1 | An issue that significantly impacts a large percentage of users; if there is a workaround it is partial or overly painful. The issue should be resolved before the next release.                                                                     |
+| P2 | The issue is important to a large percentage of users, with a workaround. Issues that are significantly ugly or painful (especially first-use or install-time issues). Issues with workarounds that would otherwise be P0 or P1.                     |
+| P3 | An issue that is relevant to core functions, but does not impede progress. Important, but not urgent.                                                                                                                                                |
+| P4 | A relatively minor issue that is not relevant to core functions, or relates only to the attractiveness or pleasantness of use of the system. Good to have but not necessary changes/fixes.                                                           |
+| P5 | The team acknowledges the request but (due to any number of reasons) does not plan to work on or accept contributions for this request. The issue remains open for discussion.                                                                       |
 
-The issues with type `type: feature`, `type: refactor` and `type: RFC / Discussion / question` do not require a frequency and severity.
 
-Following is the definition of various frequency and severity levels:
+Issues marked with "feature" or "discussion" don't require a priority. 
 
-1. `freq(score): *` – How often does this issue come up? How many developers does this affect?
-    * low (1) - obscure issue affecting a handful of developers
-    * moderate (2) - impacts auxiliary usage patterns, only small number of applications are affected
-    * high (3) - impacts primary usage patterns, affecting most Angular apps
-    * critical (4) - impacts all Angular apps
-1. `severity(score): *` - How bad is the issue?
-    * inconvenience (1) - causes ugly/boilerplate code in apps
-    * confusing (2) - unexpected or inconsistent behavior; hard-to-debug
-    * broken expected use (3) - it's hard or impossible for a developer using Angular to accomplish something that Angular should be able to do
-    * memory leak (4)
-    * regression (5) - functionality that used to work no longer works in a new release due to an unintentional change
-    * security issue (6)
+### Step 4: Apply additional information labels
 
+Many optional labels provide additional context for issues. Consider adding any of the following if
+they apply to the issue:
 
-These criteria are then used to calculate a "user pain" score as follows:
+* Browser or operating system labels (`windows`, `ie11`, etc.)
+* Labels that inform the severity (`regression`, `has workaround`, `no workaround`)
+* Labels that categorize the bug (`performance`, `refactoring`, `memory leak`)
+* Community engagement labels (`good first issue`)
 
-`pain = severity × frequency`
-
-This score can then be used to estimate the impact of the issue which helps with prioritization.
-
-Once the component's owner triage is done, the ng-bot automatically changes the milestone from `needsTriage` to `Backlog`.
+Once this triage is done, the ng-bot automatically changes the milestone from `needs triage` to
+`Backlog`.
 
 
 ## Triaging PRs
 
-Triaging PRs is the same as triaging issues, except that the labels `frequency: *` and `severity: *` are replaced by:
-- `effort*`
-- `risk: *`
-
-PRs also have additional label categories that should be used to signal their state.
+PRs labels signal their state. Every triaged PR must have a `action: *` label assigned to it:
 
-Every triaged PR must have a `PR action` label assigned to it:
-
-* `PR action: discuss`: Discussion is needed, to be led by the author.
+* `action: discuss`: Discussion is needed, to be led by the author.
   * _**Who adds it:** Typically the PR author._
   * _**Who removes it:** Whoever added it._
-* `PR action: review` (optional): One or more reviews are pending. The label is optional, since the review status can be derived from GitHub's Reviewers interface.
+* `action: review` (optional): One or more reviews are pending. The label is optional, since the review status can be derived from GitHub's Reviewers interface.
   * _**Who adds it:** Any team member. The caretaker can use it to differentiate PRs pending review from merge-ready PRs._
   * _**Who removes it:** Whoever added it or the reviewer adding the last missing review._
-* `PR action: cleanup`: More work is needed from the author.
+* `action: cleanup`: More work is needed from the author.
   * _**Who adds it:** The reviewer requesting changes to the PR._
   * _**Who removes it:** Either the author (after implementing the requested changes) or the reviewer (after confirming the requested changes have been implemented)._
-* `PR action: merge`: The PR author is ready for the changes to be merged by the caretaker as soon as the PR is green (or merge-assistance label is applied and caretaker has deemed it acceptable manually). In other words, this label indicates to "auto submit when ready".
+* `action: merge`: The PR author is ready for the changes to be merged by the caretaker as soon as the PR is green (or merge-assistance label is applied and caretaker has deemed it acceptable manually). In other words, this label indicates to "auto submit when ready".
   * _**Who adds it:** Typically the PR author._
   * _**Who removes it:** Whoever added it._
 
 
 In addition, PRs can have the following states:
 
-* `PR state: WIP`: PR is experimental or rapidly changing. Not ready for review or triage.
+* `state: WIP`: PR is experimental or rapidly changing. Not ready for review or triage.
   * _**Who adds it:** The PR author._
   * _**Who removes it:** Whoever added it._
-* `PR state: blocked`: PR is blocked on an issue or other PR. Not ready for merge.
+* `state: blocked`: PR is blocked on an issue or other PR. Not ready for merge.
   * _**Who adds it:** Any team member._
   * _**Who removes it:** Any team member._
 
-When a PR is ready for review, a review should be requested using the Reviewers interface in Github.
+When a PR is ready for review, a review should be requested using the Reviewers interface in GitHub.
 
 
 ## PR Target
@@ -160,15 +157,29 @@ In our git workflow, we merge changes either to the `master` branch, the active
 The decision about the target must be done by the PR author and/or reviewer.
 This decision is then honored when the PR is being merged by the caretaker.
 
-To communicate the target we use the following labels:
+To communicate the target we use GitHub labels and only one target label may be applied to a PR.
+
+Targeting an active release train:
+
+* `target: major`: Any breaking change
+* `target: minor`: Any new feature
+* `target: patch`: Bug fixes, refactorings, documentation changes, etc. that pose no or very low risk of adversely
+  affecting existing applications.
+
+Special Cases:
+* `target: rc`: A critical fix for an active release-train while it is in a feature freeze or RC phase
+* `target: lts`: A criticial fix for a specific release-train that is still within the long term support phase
+
+
+Notes:
+  - To land a change only in a patch/RC branch, without landing it in any other active release-train branch (such
+  as `master`), the patch/RC branch can be targeted in the GitHub UI with the appropriate
+  `target: patch`/`target: rc` label.
+  - `target: lts` PRs must target the specific LTS branch they would need to merge into in the GitHub UI, in
+  cases which a change is desired in multiple LTS branches, individual PRs for each LTS branch must be created
 
-* `PR target: master & patch`: the PR should me merged into the master branch and cherry-picked into the most recent patch branch. All PRs with fixes, docs and refactorings should use this target.
-* `PR target: master-only`: the PR should be merged only into the `master` branch. All PRs with new features, API changes or high-risk changes should use this target.
-* `PR target: patch-only`: the PR should be merged only into the most recent patch branch (e.g. 5.0.x). This target is useful if a `master & patch` PR can't be cleanly cherry-picked into the stable branch and a new PR is needed.
-* `PR target: LTS-only`: the PR should be merged only into the active LTS branch(es). Only security and critical fixes are allowed in these branches. Always send a new PR targeting just the LTS branch and request review approval from @IgorMinar.
-* `PR target: TBD`: the target is yet to be determined.
 
-If a PR is missing the `PR target: *` label, or if the label is set to "TBD" when the PR is sent to the caretaker, the caretaker should reject the PR and request the appropriate target label to be applied before the PR is merged.
+If a PR is missing the `target:*` label, it will be marked as pending by the angular robot status checks.
 
 
 ## PR Approvals
@@ -182,7 +193,7 @@ In any case, the reviewer should actually look through the code and provide feed
 
 Note that approved state does not mean a PR is ready to be merged.
 For example, a reviewer might approve the PR but request a minor tweak that doesn't need further review, e.g., a rebase or small uncontroversial change.
-Only the `PR action: merge` label means that the PR is ready for merging.
+Only the `action: merge` label means that the PR is ready for merging.
 
 
 ## Special Labels
@@ -201,7 +212,7 @@ Only issues with `cla:yes` should be merged into master.
 
 Applying this label to a PR makes the angular.io preview available regardless of the author. [More info](../aio/aio-builds-setup/docs/overview--security-model.md)
 
-### `PR action: merge-assistance`
+### `action: merge-assistance`
 * _**Who adds it:** Any team member._
 * _**Who removes it:** Any team member._
 
@@ -211,7 +222,7 @@ The comment should be formatted like this: `merge-assistance: <explain what kind
 
 For example, the PR owner might not be a Googler and needs help to run g3sync; or one of the checks is failing due to external causes and the PR should still be merged.
 
-### `PR action: rerun CI at HEAD`
+### `action: rerun CI at HEAD`
 * _**Who adds it:** Any team member._
 * _**Who removes it:** The Angular Bot, once it triggers the CI rerun._
 
diff --git a/docs/images/angular-ecosystem-logos.png b/docs/images/angular-ecosystem-logos.png
new file mode 100644
index 0000000000000..f1f311b3d9d33
Binary files /dev/null and b/docs/images/angular-ecosystem-logos.png differ
diff --git a/goldens/circular-deps/packages.json b/goldens/circular-deps/packages.json
index 924b196222dcc..8c26c0a4898b6 100644
--- a/goldens/circular-deps/packages.json
+++ b/goldens/circular-deps/packages.json
@@ -284,10 +284,8 @@
     "packages/core/src/change_detection/change_detection.ts",
     "packages/core/src/change_detection/change_detector_ref.ts",
     "packages/core/src/render3/view_engine_compatibility.ts",
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component_ref.ts",
+    "packages/core/src/render3/di.ts",
+    "packages/core/src/di/injector_compatibility.ts",
     "packages/core/src/di/injector.ts",
     "packages/core/src/di/r3_injector.ts",
     "packages/core/src/render3/definition.ts",
@@ -300,10 +298,9 @@
     "packages/core/src/change_detection/change_detection.ts",
     "packages/core/src/change_detection/change_detector_ref.ts",
     "packages/core/src/render3/view_engine_compatibility.ts",
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component_ref.ts",
+    "packages/core/src/render3/di.ts",
+    "packages/core/src/di/injector.ts",
+    "packages/core/src/di/r3_injector.ts",
     "packages/core/src/render3/definition.ts",
     "packages/core/src/metadata/ng_module.ts"
   ],
@@ -314,11 +311,9 @@
     "packages/core/src/change_detection/change_detection.ts",
     "packages/core/src/change_detection/change_detector_ref.ts",
     "packages/core/src/render3/view_engine_compatibility.ts",
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component_ref.ts",
-    "packages/core/src/render3/view_ref.ts"
+    "packages/core/src/render3/di.ts",
+    "packages/core/src/render3/definition.ts",
+    "packages/core/src/metadata/ng_module.ts"
   ],
   [
     "packages/core/src/application_ref.ts",
@@ -327,12 +322,7 @@
     "packages/core/src/change_detection/change_detection.ts",
     "packages/core/src/change_detection/change_detector_ref.ts",
     "packages/core/src/render3/view_engine_compatibility.ts",
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component.ts",
-    "packages/core/src/core.ts",
-    "packages/core/src/metadata.ts",
+    "packages/core/src/render3/instructions/shared.ts",
     "packages/core/src/di.ts",
     "packages/core/src/di/index.ts",
     "packages/core/src/di/injectable.ts",
@@ -351,10 +341,16 @@
     "packages/core/src/change_detection/change_detection.ts",
     "packages/core/src/change_detection/change_detector_ref.ts",
     "packages/core/src/render3/view_engine_compatibility.ts",
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component.ts",
+    "packages/core/src/render3/instructions/shared.ts",
+    "packages/core/src/error_handler.ts",
+    "packages/core/src/errors.ts",
+    "packages/core/src/view/types.ts",
+    "packages/core/src/di.ts",
+    "packages/core/src/di/index.ts",
+    "packages/core/src/di/injectable.ts",
+    "packages/core/src/di/jit/injectable.ts",
+    "packages/core/src/di/jit/environment.ts",
+    "packages/core/src/di/injector_compatibility.ts",
     "packages/core/src/di/injector.ts",
     "packages/core/src/di/r3_injector.ts",
     "packages/core/src/render3/definition.ts",
@@ -367,10 +363,7 @@
     "packages/core/src/change_detection/change_detection.ts",
     "packages/core/src/change_detection/change_detector_ref.ts",
     "packages/core/src/render3/view_engine_compatibility.ts",
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component.ts",
+    "packages/core/src/render3/instructions/shared.ts",
     "packages/core/src/render3/definition.ts",
     "packages/core/src/metadata/ng_module.ts"
   ],
@@ -381,11 +374,15 @@
     "packages/core/src/change_detection/change_detection.ts",
     "packages/core/src/change_detection/change_detector_ref.ts",
     "packages/core/src/render3/view_engine_compatibility.ts",
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component.ts",
-    "packages/core/src/render3/di.ts",
+    "packages/core/src/render3/instructions/shared.ts",
+    "packages/core/src/render3/instructions/lview_debug.ts",
+    "packages/core/src/core.ts",
+    "packages/core/src/metadata.ts",
+    "packages/core/src/di.ts",
+    "packages/core/src/di/index.ts",
+    "packages/core/src/di/injectable.ts",
+    "packages/core/src/di/jit/injectable.ts",
+    "packages/core/src/di/jit/environment.ts",
     "packages/core/src/di/injector_compatibility.ts",
     "packages/core/src/di/injector.ts",
     "packages/core/src/di/r3_injector.ts",
@@ -399,11 +396,21 @@
     "packages/core/src/change_detection/change_detection.ts",
     "packages/core/src/change_detection/change_detector_ref.ts",
     "packages/core/src/render3/view_engine_compatibility.ts",
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component.ts",
-    "packages/core/src/render3/di.ts",
+    "packages/core/src/render3/view_ref.ts"
+  ],
+  [
+    "packages/core/src/application_ref.ts",
+    "packages/core/src/application_tokens.ts",
+    "packages/core/src/linker/component_factory.ts",
+    "packages/core/src/change_detection/change_detection.ts",
+    "packages/core/src/change_detection/differs/default_keyvalue_differ.ts",
+    "packages/core/src/change_detection/differs/keyvalue_differs.ts",
+    "packages/core/src/di.ts",
+    "packages/core/src/di/index.ts",
+    "packages/core/src/di/injectable.ts",
+    "packages/core/src/di/jit/injectable.ts",
+    "packages/core/src/di/jit/environment.ts",
+    "packages/core/src/di/injector_compatibility.ts",
     "packages/core/src/di/injector.ts",
     "packages/core/src/di/r3_injector.ts",
     "packages/core/src/render3/definition.ts",
@@ -413,29 +420,14 @@
     "packages/core/src/application_ref.ts",
     "packages/core/src/application_tokens.ts",
     "packages/core/src/linker/component_factory.ts",
-    "packages/core/src/change_detection/change_detection.ts",
-    "packages/core/src/change_detection/change_detector_ref.ts",
-    "packages/core/src/render3/view_engine_compatibility.ts",
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component.ts",
-    "packages/core/src/render3/di.ts",
+    "packages/core/src/di/injector.ts",
+    "packages/core/src/di/r3_injector.ts",
     "packages/core/src/render3/definition.ts",
     "packages/core/src/metadata/ng_module.ts"
   ],
   [
     "packages/core/src/application_ref.ts",
-    "packages/core/src/application_tokens.ts",
-    "packages/core/src/linker/component_factory.ts",
-    "packages/core/src/change_detection/change_detection.ts",
-    "packages/core/src/change_detection/change_detector_ref.ts",
-    "packages/core/src/render3/view_engine_compatibility.ts",
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component.ts",
-    "packages/core/src/render3/instructions/shared.ts",
+    "packages/core/src/console.ts",
     "packages/core/src/di.ts",
     "packages/core/src/di/index.ts",
     "packages/core/src/di/injectable.ts",
@@ -449,23 +441,6 @@
   ],
   [
     "packages/core/src/application_ref.ts",
-    "packages/core/src/application_tokens.ts",
-    "packages/core/src/linker/component_factory.ts",
-    "packages/core/src/change_detection/change_detection.ts",
-    "packages/core/src/change_detection/change_detector_ref.ts",
-    "packages/core/src/render3/view_engine_compatibility.ts",
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component.ts",
-    "packages/core/src/render3/instructions/shared.ts",
-    "packages/core/src/error_handler.ts",
-    "packages/core/src/errors.ts",
-    "packages/core/src/view/index.ts",
-    "packages/core/src/view/element.ts",
-    "packages/core/src/view/types.ts",
-    "packages/core/src/di.ts",
-    "packages/core/src/di/index.ts",
     "packages/core/src/di/injectable.ts",
     "packages/core/src/di/jit/injectable.ts",
     "packages/core/src/di/jit/environment.ts",
@@ -477,22 +452,6 @@
   ],
   [
     "packages/core/src/application_ref.ts",
-    "packages/core/src/application_tokens.ts",
-    "packages/core/src/linker/component_factory.ts",
-    "packages/core/src/change_detection/change_detection.ts",
-    "packages/core/src/change_detection/change_detector_ref.ts",
-    "packages/core/src/render3/view_engine_compatibility.ts",
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component.ts",
-    "packages/core/src/render3/instructions/shared.ts",
-    "packages/core/src/error_handler.ts",
-    "packages/core/src/errors.ts",
-    "packages/core/src/view/index.ts",
-    "packages/core/src/view/element.ts",
-    "packages/core/src/view/util.ts",
-    "packages/core/src/di/injector_compatibility.ts",
     "packages/core/src/di/injector.ts",
     "packages/core/src/di/r3_injector.ts",
     "packages/core/src/render3/definition.ts",
@@ -500,20 +459,11 @@
   ],
   [
     "packages/core/src/application_ref.ts",
-    "packages/core/src/application_tokens.ts",
-    "packages/core/src/linker/component_factory.ts",
-    "packages/core/src/change_detection/change_detection.ts",
-    "packages/core/src/change_detection/change_detector_ref.ts",
-    "packages/core/src/render3/view_engine_compatibility.ts",
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component.ts",
-    "packages/core/src/render3/instructions/shared.ts",
-    "packages/core/src/error_handler.ts",
-    "packages/core/src/errors.ts",
-    "packages/core/src/view/index.ts",
-    "packages/core/src/view/entrypoint.ts",
+    "packages/core/src/linker/compiler.ts",
+    "packages/core/src/di/injectable.ts",
+    "packages/core/src/di/jit/injectable.ts",
+    "packages/core/src/di/jit/environment.ts",
+    "packages/core/src/di/injector_compatibility.ts",
     "packages/core/src/di/injector.ts",
     "packages/core/src/di/r3_injector.ts",
     "packages/core/src/render3/definition.ts",
@@ -521,22 +471,8 @@
   ],
   [
     "packages/core/src/application_ref.ts",
-    "packages/core/src/application_tokens.ts",
-    "packages/core/src/linker/component_factory.ts",
-    "packages/core/src/change_detection/change_detection.ts",
-    "packages/core/src/change_detection/change_detector_ref.ts",
-    "packages/core/src/render3/view_engine_compatibility.ts",
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component.ts",
-    "packages/core/src/render3/instructions/shared.ts",
-    "packages/core/src/error_handler.ts",
-    "packages/core/src/errors.ts",
-    "packages/core/src/view/index.ts",
-    "packages/core/src/view/entrypoint.ts",
-    "packages/core/src/view/services.ts",
-    "packages/core/src/debug/debug_node.ts",
+    "packages/core/src/linker/compiler.ts",
+    "packages/core/src/metadata.ts",
     "packages/core/src/di.ts",
     "packages/core/src/di/index.ts",
     "packages/core/src/di/injectable.ts",
@@ -550,23 +486,8 @@
   ],
   [
     "packages/core/src/application_ref.ts",
-    "packages/core/src/application_tokens.ts",
-    "packages/core/src/linker/component_factory.ts",
-    "packages/core/src/change_detection/change_detection.ts",
-    "packages/core/src/change_detection/change_detector_ref.ts",
-    "packages/core/src/render3/view_engine_compatibility.ts",
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component.ts",
-    "packages/core/src/render3/instructions/shared.ts",
-    "packages/core/src/error_handler.ts",
-    "packages/core/src/errors.ts",
-    "packages/core/src/view/index.ts",
-    "packages/core/src/view/entrypoint.ts",
-    "packages/core/src/view/services.ts",
-    "packages/core/src/debug/debug_node.ts",
-    "packages/core/src/render3/util/discovery_utils.ts",
+    "packages/core/src/linker/compiler.ts",
+    "packages/core/src/render3/component_ref.ts",
     "packages/core/src/di/injector.ts",
     "packages/core/src/di/r3_injector.ts",
     "packages/core/src/render3/definition.ts",
@@ -574,24 +495,9 @@
   ],
   [
     "packages/core/src/application_ref.ts",
-    "packages/core/src/application_tokens.ts",
-    "packages/core/src/linker/component_factory.ts",
-    "packages/core/src/change_detection/change_detection.ts",
-    "packages/core/src/change_detection/change_detector_ref.ts",
-    "packages/core/src/render3/view_engine_compatibility.ts",
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
+    "packages/core/src/linker/compiler.ts",
+    "packages/core/src/render3/component_ref.ts",
     "packages/core/src/render3/component.ts",
-    "packages/core/src/render3/instructions/shared.ts",
-    "packages/core/src/error_handler.ts",
-    "packages/core/src/errors.ts",
-    "packages/core/src/view/index.ts",
-    "packages/core/src/view/entrypoint.ts",
-    "packages/core/src/view/services.ts",
-    "packages/core/src/debug/debug_node.ts",
-    "packages/core/src/render3/util/discovery_utils.ts",
-    "packages/core/src/render3/instructions/lview_debug.ts",
     "packages/core/src/core.ts",
     "packages/core/src/metadata.ts",
     "packages/core/src/di.ts",
@@ -607,27 +513,9 @@
   ],
   [
     "packages/core/src/application_ref.ts",
-    "packages/core/src/application_tokens.ts",
-    "packages/core/src/linker/component_factory.ts",
-    "packages/core/src/change_detection/change_detection.ts",
-    "packages/core/src/change_detection/change_detector_ref.ts",
-    "packages/core/src/render3/view_engine_compatibility.ts",
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
+    "packages/core/src/linker/compiler.ts",
+    "packages/core/src/render3/component_ref.ts",
     "packages/core/src/render3/component.ts",
-    "packages/core/src/render3/instructions/shared.ts",
-    "packages/core/src/error_handler.ts",
-    "packages/core/src/errors.ts",
-    "packages/core/src/view/index.ts",
-    "packages/core/src/view/entrypoint.ts",
-    "packages/core/src/view/services.ts",
-    "packages/core/src/di.ts",
-    "packages/core/src/di/index.ts",
-    "packages/core/src/di/injectable.ts",
-    "packages/core/src/di/jit/injectable.ts",
-    "packages/core/src/di/jit/environment.ts",
-    "packages/core/src/di/injector_compatibility.ts",
     "packages/core/src/di/injector.ts",
     "packages/core/src/di/r3_injector.ts",
     "packages/core/src/render3/definition.ts",
@@ -635,21 +523,36 @@
   ],
   [
     "packages/core/src/application_ref.ts",
-    "packages/core/src/application_tokens.ts",
-    "packages/core/src/linker/component_factory.ts",
-    "packages/core/src/change_detection/change_detection.ts",
-    "packages/core/src/change_detection/change_detector_ref.ts",
-    "packages/core/src/render3/view_engine_compatibility.ts",
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
+    "packages/core/src/linker/compiler.ts",
+    "packages/core/src/render3/component_ref.ts",
     "packages/core/src/render3/component.ts",
-    "packages/core/src/render3/instructions/shared.ts",
-    "packages/core/src/error_handler.ts",
-    "packages/core/src/errors.ts",
-    "packages/core/src/view/index.ts",
-    "packages/core/src/view/entrypoint.ts",
-    "packages/core/src/view/services.ts",
+    "packages/core/src/render3/definition.ts",
+    "packages/core/src/metadata/ng_module.ts"
+  ],
+  [
+    "packages/core/src/application_ref.ts",
+    "packages/core/src/linker/compiler.ts",
+    "packages/core/src/render3/component_ref.ts",
+    "packages/core/src/render3/component.ts",
+    "packages/core/src/render3/util/global_utils.ts",
+    "packages/core/src/render3/util/change_detection_utils.ts",
+    "packages/core/src/render3/util/discovery_utils.ts",
+    "packages/core/src/di/injector.ts",
+    "packages/core/src/di/r3_injector.ts",
+    "packages/core/src/render3/definition.ts",
+    "packages/core/src/metadata/ng_module.ts"
+  ],
+  [
+    "packages/core/src/application_ref.ts",
+    "packages/core/src/linker/compiler.ts",
+    "packages/core/src/render3/component_ref.ts",
+    "packages/core/src/render3/definition.ts",
+    "packages/core/src/metadata/ng_module.ts"
+  ],
+  [
+    "packages/core/src/application_ref.ts",
+    "packages/core/src/linker/compiler.ts",
+    "packages/core/src/render3/component_ref.ts",
     "packages/core/src/view/provider.ts",
     "packages/core/src/di.ts",
     "packages/core/src/di/index.ts",
@@ -664,41 +567,15 @@
   ],
   [
     "packages/core/src/application_ref.ts",
-    "packages/core/src/application_tokens.ts",
-    "packages/core/src/linker/component_factory.ts",
-    "packages/core/src/change_detection/change_detection.ts",
-    "packages/core/src/change_detection/change_detector_ref.ts",
-    "packages/core/src/render3/view_engine_compatibility.ts",
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component.ts",
-    "packages/core/src/render3/instructions/shared.ts",
-    "packages/core/src/error_handler.ts",
-    "packages/core/src/errors.ts",
-    "packages/core/src/view/index.ts",
-    "packages/core/src/view/entrypoint.ts",
-    "packages/core/src/view/services.ts",
+    "packages/core/src/linker/compiler.ts",
+    "packages/core/src/render3/component_ref.ts",
     "packages/core/src/view/provider.ts",
     "packages/core/src/view/refs.ts"
   ],
   [
     "packages/core/src/application_ref.ts",
-    "packages/core/src/application_tokens.ts",
-    "packages/core/src/linker/component_factory.ts",
-    "packages/core/src/change_detection/change_detection.ts",
-    "packages/core/src/change_detection/change_detector_ref.ts",
-    "packages/core/src/render3/view_engine_compatibility.ts",
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component.ts",
-    "packages/core/src/render3/instructions/shared.ts",
-    "packages/core/src/error_handler.ts",
-    "packages/core/src/errors.ts",
-    "packages/core/src/view/index.ts",
-    "packages/core/src/view/entrypoint.ts",
-    "packages/core/src/view/services.ts",
+    "packages/core/src/linker/compiler.ts",
+    "packages/core/src/render3/component_ref.ts",
     "packages/core/src/view/provider.ts",
     "packages/core/src/view/refs.ts",
     "packages/core/src/di/injector.ts",
@@ -708,21 +585,8 @@
   ],
   [
     "packages/core/src/application_ref.ts",
-    "packages/core/src/application_tokens.ts",
-    "packages/core/src/linker/component_factory.ts",
-    "packages/core/src/change_detection/change_detection.ts",
-    "packages/core/src/change_detection/change_detector_ref.ts",
-    "packages/core/src/render3/view_engine_compatibility.ts",
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component.ts",
-    "packages/core/src/render3/instructions/shared.ts",
-    "packages/core/src/error_handler.ts",
-    "packages/core/src/errors.ts",
-    "packages/core/src/view/index.ts",
-    "packages/core/src/view/entrypoint.ts",
-    "packages/core/src/view/services.ts",
+    "packages/core/src/linker/compiler.ts",
+    "packages/core/src/render3/component_ref.ts",
     "packages/core/src/view/provider.ts",
     "packages/core/src/view/refs.ts",
     "packages/core/src/view/ng_module.ts",
@@ -734,21 +598,8 @@
   ],
   [
     "packages/core/src/application_ref.ts",
-    "packages/core/src/application_tokens.ts",
-    "packages/core/src/linker/component_factory.ts",
-    "packages/core/src/change_detection/change_detection.ts",
-    "packages/core/src/change_detection/change_detector_ref.ts",
-    "packages/core/src/render3/view_engine_compatibility.ts",
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component.ts",
-    "packages/core/src/render3/instructions/shared.ts",
-    "packages/core/src/error_handler.ts",
-    "packages/core/src/errors.ts",
-    "packages/core/src/view/index.ts",
-    "packages/core/src/view/entrypoint.ts",
-    "packages/core/src/view/services.ts",
+    "packages/core/src/linker/compiler.ts",
+    "packages/core/src/render3/component_ref.ts",
     "packages/core/src/view/provider.ts",
     "packages/core/src/view/refs.ts",
     "packages/core/src/view/ng_module.ts",
@@ -759,85 +610,12 @@
   ],
   [
     "packages/core/src/application_ref.ts",
-    "packages/core/src/application_tokens.ts",
-    "packages/core/src/linker/component_factory.ts",
-    "packages/core/src/change_detection/change_detection.ts",
-    "packages/core/src/change_detection/change_detector_ref.ts",
-    "packages/core/src/render3/view_engine_compatibility.ts",
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component.ts",
-    "packages/core/src/render3/instructions/shared.ts",
-    "packages/core/src/render3/definition.ts",
-    "packages/core/src/metadata/ng_module.ts"
-  ],
-  [
-    "packages/core/src/application_ref.ts",
-    "packages/core/src/application_tokens.ts",
-    "packages/core/src/linker/component_factory.ts",
-    "packages/core/src/change_detection/change_detection.ts",
-    "packages/core/src/change_detection/change_detector_ref.ts",
-    "packages/core/src/render3/view_engine_compatibility.ts",
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component.ts",
-    "packages/core/src/render3/node_manipulation.ts",
-    "packages/core/src/core.ts",
-    "packages/core/src/metadata.ts",
-    "packages/core/src/di.ts",
-    "packages/core/src/di/index.ts",
-    "packages/core/src/di/injectable.ts",
-    "packages/core/src/di/jit/injectable.ts",
-    "packages/core/src/di/jit/environment.ts",
-    "packages/core/src/di/injector_compatibility.ts",
-    "packages/core/src/di/injector.ts",
-    "packages/core/src/di/r3_injector.ts",
-    "packages/core/src/render3/definition.ts",
-    "packages/core/src/metadata/ng_module.ts"
-  ],
-  [
-    "packages/core/src/application_ref.ts",
-    "packages/core/src/application_tokens.ts",
-    "packages/core/src/linker/component_factory.ts",
-    "packages/core/src/change_detection/change_detection.ts",
-    "packages/core/src/change_detection/change_detector_ref.ts",
-    "packages/core/src/render3/view_engine_compatibility.ts",
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component.ts",
-    "packages/core/src/render3/util/global_utils.ts",
-    "packages/core/src/render3/util/change_detection_utils.ts",
-    "packages/core/src/render3/instructions/all.ts",
-    "packages/core/src/render3/instructions/di.ts",
-    "packages/core/src/di.ts",
-    "packages/core/src/di/index.ts",
-    "packages/core/src/di/injectable.ts",
-    "packages/core/src/di/jit/injectable.ts",
-    "packages/core/src/di/jit/environment.ts",
-    "packages/core/src/di/injector_compatibility.ts",
-    "packages/core/src/di/injector.ts",
-    "packages/core/src/di/r3_injector.ts",
-    "packages/core/src/render3/definition.ts",
-    "packages/core/src/metadata/ng_module.ts"
-  ],
-  [
-    "packages/core/src/application_ref.ts",
-    "packages/core/src/application_tokens.ts",
-    "packages/core/src/linker/component_factory.ts",
-    "packages/core/src/change_detection/change_detection.ts",
-    "packages/core/src/change_detection/change_detector_ref.ts",
-    "packages/core/src/render3/view_engine_compatibility.ts",
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component.ts",
-    "packages/core/src/render3/util/global_utils.ts",
-    "packages/core/src/render3/util/change_detection_utils.ts",
-    "packages/core/src/render3/instructions/all.ts",
-    "packages/core/src/render3/instructions/di.ts",
+    "packages/core/src/linker/compiler.ts",
+    "packages/core/src/render3/component_ref.ts",
+    "packages/core/src/view/provider.ts",
+    "packages/core/src/view/refs.ts",
+    "packages/core/src/view/ng_module.ts",
+    "packages/core/src/view/util.ts",
     "packages/core/src/di/injector_compatibility.ts",
     "packages/core/src/di/injector.ts",
     "packages/core/src/di/r3_injector.ts",
@@ -846,43 +624,13 @@
   ],
   [
     "packages/core/src/application_ref.ts",
-    "packages/core/src/application_tokens.ts",
-    "packages/core/src/linker/component_factory.ts",
-    "packages/core/src/change_detection/change_detection.ts",
-    "packages/core/src/change_detection/change_detector_ref.ts",
-    "packages/core/src/render3/view_engine_compatibility.ts",
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/definition.ts",
-    "packages/core/src/metadata/ng_module.ts"
-  ],
-  [
-    "packages/core/src/application_ref.ts",
-    "packages/core/src/application_tokens.ts",
-    "packages/core/src/linker/component_factory.ts",
-    "packages/core/src/change_detection/change_detection.ts",
-    "packages/core/src/change_detection/change_detector_ref.ts",
-    "packages/core/src/render3/view_engine_compatibility.ts",
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/features/providers_feature.ts",
-    "packages/core/src/render3/di_setup.ts",
-    "packages/core/src/di/r3_injector.ts",
+    "packages/core/src/linker/compiler.ts",
     "packages/core/src/render3/definition.ts",
     "packages/core/src/metadata/ng_module.ts"
   ],
   [
     "packages/core/src/application_ref.ts",
-    "packages/core/src/application_tokens.ts",
-    "packages/core/src/linker/component_factory.ts",
-    "packages/core/src/change_detection/change_detection.ts",
-    "packages/core/src/change_detection/change_detector_ref.ts",
-    "packages/core/src/render3/view_engine_compatibility.ts",
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
+    "packages/core/src/linker/compiler.ts",
     "packages/core/src/render3/ng_module_ref.ts",
     "packages/core/src/di/injector_compatibility.ts",
     "packages/core/src/di/injector.ts",
@@ -892,14 +640,7 @@
   ],
   [
     "packages/core/src/application_ref.ts",
-    "packages/core/src/application_tokens.ts",
-    "packages/core/src/linker/component_factory.ts",
-    "packages/core/src/change_detection/change_detection.ts",
-    "packages/core/src/change_detection/change_detector_ref.ts",
-    "packages/core/src/render3/view_engine_compatibility.ts",
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
+    "packages/core/src/linker/compiler.ts",
     "packages/core/src/render3/ng_module_ref.ts",
     "packages/core/src/di/injector.ts",
     "packages/core/src/di/r3_injector.ts",
@@ -908,14 +649,7 @@
   ],
   [
     "packages/core/src/application_ref.ts",
-    "packages/core/src/application_tokens.ts",
-    "packages/core/src/linker/component_factory.ts",
-    "packages/core/src/change_detection/change_detection.ts",
-    "packages/core/src/change_detection/change_detector_ref.ts",
-    "packages/core/src/render3/view_engine_compatibility.ts",
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
+    "packages/core/src/linker/compiler.ts",
     "packages/core/src/render3/ng_module_ref.ts",
     "packages/core/src/di/r3_injector.ts",
     "packages/core/src/render3/definition.ts",
@@ -923,14 +657,7 @@
   ],
   [
     "packages/core/src/application_ref.ts",
-    "packages/core/src/application_tokens.ts",
-    "packages/core/src/linker/component_factory.ts",
-    "packages/core/src/change_detection/change_detection.ts",
-    "packages/core/src/change_detection/change_detector_ref.ts",
-    "packages/core/src/render3/view_engine_compatibility.ts",
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
+    "packages/core/src/linker/compiler.ts",
     "packages/core/src/render3/ng_module_ref.ts",
     "packages/core/src/linker/ng_module_factory_registration.ts",
     "packages/core/src/render3/definition.ts",
@@ -938,42 +665,26 @@
   ],
   [
     "packages/core/src/application_ref.ts",
-    "packages/core/src/application_tokens.ts",
-    "packages/core/src/linker/component_factory.ts",
-    "packages/core/src/change_detection/change_detection.ts",
-    "packages/core/src/change_detection/change_detector_ref.ts",
-    "packages/core/src/render3/view_engine_compatibility.ts",
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
+    "packages/core/src/linker/compiler.ts",
     "packages/core/src/render3/ng_module_ref.ts",
     "packages/core/src/metadata/ng_module.ts"
   ],
   [
     "packages/core/src/application_ref.ts",
-    "packages/core/src/application_tokens.ts",
-    "packages/core/src/linker/component_factory.ts",
-    "packages/core/src/change_detection/change_detection.ts",
-    "packages/core/src/change_detection/change_detector_ref.ts",
-    "packages/core/src/render3/view_engine_compatibility.ts",
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
+    "packages/core/src/linker/compiler.ts",
     "packages/core/src/render3/ng_module_ref.ts",
     "packages/core/src/render3/definition.ts",
     "packages/core/src/metadata/ng_module.ts"
   ],
   [
     "packages/core/src/application_ref.ts",
-    "packages/core/src/application_tokens.ts",
-    "packages/core/src/linker/component_factory.ts",
-    "packages/core/src/change_detection/change_detection.ts",
-    "packages/core/src/change_detection/change_detector_ref.ts",
-    "packages/core/src/render3/view_engine_compatibility.ts",
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/pipe.ts",
+    "packages/core/src/metadata/resource_loading.ts",
+    "packages/core/src/metadata/directives.ts",
+    "packages/core/src/di.ts",
+    "packages/core/src/di/index.ts",
+    "packages/core/src/di/injectable.ts",
+    "packages/core/src/di/jit/injectable.ts",
+    "packages/core/src/di/jit/environment.ts",
     "packages/core/src/di/injector_compatibility.ts",
     "packages/core/src/di/injector.ts",
     "packages/core/src/di/r3_injector.ts",
@@ -982,30 +693,18 @@
   ],
   [
     "packages/core/src/application_ref.ts",
-    "packages/core/src/application_tokens.ts",
-    "packages/core/src/linker/component_factory.ts",
-    "packages/core/src/change_detection/change_detection.ts",
-    "packages/core/src/change_detection/change_detector_ref.ts",
-    "packages/core/src/render3/view_engine_compatibility.ts",
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/pipe.ts",
+    "packages/core/src/metadata/resource_loading.ts",
+    "packages/core/src/metadata/directives.ts",
+    "packages/core/src/render3/jit/directive.ts",
     "packages/core/src/render3/definition.ts",
     "packages/core/src/metadata/ng_module.ts"
   ],
   [
     "packages/core/src/application_ref.ts",
-    "packages/core/src/application_tokens.ts",
-    "packages/core/src/linker/component_factory.ts",
-    "packages/core/src/change_detection/change_detection.ts",
-    "packages/core/src/change_detection/differs/default_keyvalue_differ.ts",
-    "packages/core/src/change_detection/differs/keyvalue_differs.ts",
-    "packages/core/src/di.ts",
-    "packages/core/src/di/index.ts",
-    "packages/core/src/di/injectable.ts",
-    "packages/core/src/di/jit/injectable.ts",
-    "packages/core/src/di/jit/environment.ts",
+    "packages/core/src/metadata/resource_loading.ts",
+    "packages/core/src/metadata/directives.ts",
+    "packages/core/src/render3/jit/directive.ts",
+    "packages/core/src/render3/jit/environment.ts",
     "packages/core/src/di/injector_compatibility.ts",
     "packages/core/src/di/injector.ts",
     "packages/core/src/di/r3_injector.ts",
@@ -1014,77 +713,38 @@
   ],
   [
     "packages/core/src/application_ref.ts",
-    "packages/core/src/application_tokens.ts",
-    "packages/core/src/linker/component_factory.ts",
-    "packages/core/src/di/injector.ts",
-    "packages/core/src/di/r3_injector.ts",
+    "packages/core/src/metadata/resource_loading.ts",
+    "packages/core/src/metadata/directives.ts",
+    "packages/core/src/render3/jit/directive.ts",
+    "packages/core/src/render3/jit/environment.ts",
+    "packages/core/src/render3/index.ts",
     "packages/core/src/render3/definition.ts",
     "packages/core/src/metadata/ng_module.ts"
   ],
   [
     "packages/core/src/application_ref.ts",
-    "packages/core/src/console.ts",
-    "packages/core/src/di.ts",
-    "packages/core/src/di/index.ts",
-    "packages/core/src/di/injectable.ts",
-    "packages/core/src/di/jit/injectable.ts",
-    "packages/core/src/di/jit/environment.ts",
-    "packages/core/src/di/injector_compatibility.ts",
-    "packages/core/src/di/injector.ts",
-    "packages/core/src/di/r3_injector.ts",
-    "packages/core/src/render3/definition.ts",
-    "packages/core/src/metadata/ng_module.ts"
-  ],
-  [
-    "packages/core/src/application_ref.ts",
-    "packages/core/src/di.ts",
-    "packages/core/src/di/index.ts",
-    "packages/core/src/di/injectable.ts",
-    "packages/core/src/di/jit/injectable.ts",
-    "packages/core/src/di/jit/environment.ts",
-    "packages/core/src/di/injector_compatibility.ts",
-    "packages/core/src/di/injector.ts",
-    "packages/core/src/di/r3_injector.ts",
-    "packages/core/src/render3/definition.ts",
-    "packages/core/src/metadata/ng_module.ts"
-  ],
-  [
-    "packages/core/src/application_ref.ts",
-    "packages/core/src/linker/compiler.ts",
-    "packages/core/src/di/injectable.ts",
-    "packages/core/src/di/jit/injectable.ts",
-    "packages/core/src/di/jit/environment.ts",
-    "packages/core/src/di/injector_compatibility.ts",
-    "packages/core/src/di/injector.ts",
-    "packages/core/src/di/r3_injector.ts",
-    "packages/core/src/render3/definition.ts",
-    "packages/core/src/metadata/ng_module.ts"
-  ],
-  [
-    "packages/core/src/application_ref.ts",
-    "packages/core/src/linker/compiler.ts",
-    "packages/core/src/metadata.ts",
-    "packages/core/src/di.ts",
-    "packages/core/src/di/index.ts",
-    "packages/core/src/di/injectable.ts",
-    "packages/core/src/di/jit/injectable.ts",
-    "packages/core/src/di/jit/environment.ts",
-    "packages/core/src/di/injector_compatibility.ts",
-    "packages/core/src/di/injector.ts",
+    "packages/core/src/metadata/resource_loading.ts",
+    "packages/core/src/metadata/directives.ts",
+    "packages/core/src/render3/jit/directive.ts",
+    "packages/core/src/render3/jit/environment.ts",
+    "packages/core/src/render3/index.ts",
+    "packages/core/src/render3/features/providers_feature.ts",
+    "packages/core/src/render3/di_setup.ts",
     "packages/core/src/di/r3_injector.ts",
     "packages/core/src/render3/definition.ts",
     "packages/core/src/metadata/ng_module.ts"
   ],
-  [
-    "packages/core/src/application_ref.ts",
-    "packages/core/src/linker/compiler.ts",
-    "packages/core/src/render3/definition.ts",
-    "packages/core/src/metadata/ng_module.ts"
-  ],
   [
     "packages/core/src/application_ref.ts",
     "packages/core/src/metadata/resource_loading.ts",
     "packages/core/src/metadata/directives.ts",
+    "packages/core/src/render3/jit/directive.ts",
+    "packages/core/src/render3/jit/environment.ts",
+    "packages/core/src/render3/index.ts",
+    "packages/core/src/render3/features/providers_feature.ts",
+    "packages/core/src/render3/di_setup.ts",
+    "packages/core/src/render3/instructions/all.ts",
+    "packages/core/src/render3/instructions/di.ts",
     "packages/core/src/di.ts",
     "packages/core/src/di/index.ts",
     "packages/core/src/di/injectable.ts",
@@ -1101,6 +761,15 @@
     "packages/core/src/metadata/resource_loading.ts",
     "packages/core/src/metadata/directives.ts",
     "packages/core/src/render3/jit/directive.ts",
+    "packages/core/src/render3/jit/environment.ts",
+    "packages/core/src/render3/index.ts",
+    "packages/core/src/render3/features/providers_feature.ts",
+    "packages/core/src/render3/di_setup.ts",
+    "packages/core/src/render3/instructions/all.ts",
+    "packages/core/src/render3/instructions/di.ts",
+    "packages/core/src/di/injector_compatibility.ts",
+    "packages/core/src/di/injector.ts",
+    "packages/core/src/di/r3_injector.ts",
     "packages/core/src/render3/definition.ts",
     "packages/core/src/metadata/ng_module.ts"
   ],
@@ -1110,6 +779,8 @@
     "packages/core/src/metadata/directives.ts",
     "packages/core/src/render3/jit/directive.ts",
     "packages/core/src/render3/jit/environment.ts",
+    "packages/core/src/render3/index.ts",
+    "packages/core/src/render3/pipe.ts",
     "packages/core/src/di/injector_compatibility.ts",
     "packages/core/src/di/injector.ts",
     "packages/core/src/di/r3_injector.ts",
@@ -1121,16 +792,9 @@
     "packages/core/src/metadata/resource_loading.ts",
     "packages/core/src/metadata/directives.ts",
     "packages/core/src/render3/jit/directive.ts",
-    "packages/core/src/render3/jit/module.ts",
-    "packages/core/src/metadata.ts",
-    "packages/core/src/di.ts",
-    "packages/core/src/di/index.ts",
-    "packages/core/src/di/injectable.ts",
-    "packages/core/src/di/jit/injectable.ts",
-    "packages/core/src/di/jit/environment.ts",
-    "packages/core/src/di/injector_compatibility.ts",
-    "packages/core/src/di/injector.ts",
-    "packages/core/src/di/r3_injector.ts",
+    "packages/core/src/render3/jit/environment.ts",
+    "packages/core/src/render3/index.ts",
+    "packages/core/src/render3/pipe.ts",
     "packages/core/src/render3/definition.ts",
     "packages/core/src/metadata/ng_module.ts"
   ],
@@ -1190,125 +854,12 @@
     "packages/core/src/change_detection/change_detection.ts",
     "packages/core/src/change_detection/change_detector_ref.ts",
     "packages/core/src/render3/view_engine_compatibility.ts",
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component_ref.ts",
-    "packages/core/src/linker/component_factory.ts"
-  ],
-  [
-    "packages/core/src/change_detection/change_detection.ts",
-    "packages/core/src/change_detection/change_detector_ref.ts",
-    "packages/core/src/render3/view_engine_compatibility.ts",
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component.ts",
     "packages/core/src/render3/instructions/shared.ts",
     "packages/core/src/error_handler.ts",
     "packages/core/src/errors.ts",
-    "packages/core/src/view/index.ts",
-    "packages/core/src/view/element.ts",
     "packages/core/src/view/types.ts",
     "packages/core/src/linker/component_factory.ts"
   ],
-  [
-    "packages/core/src/change_detection/change_detection.ts",
-    "packages/core/src/change_detection/change_detector_ref.ts",
-    "packages/core/src/render3/view_engine_compatibility.ts",
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component.ts",
-    "packages/core/src/render3/instructions/shared.ts",
-    "packages/core/src/error_handler.ts",
-    "packages/core/src/errors.ts",
-    "packages/core/src/view/index.ts",
-    "packages/core/src/view/element.ts",
-    "packages/core/src/view/util.ts"
-  ],
-  [
-    "packages/core/src/change_detection/change_detection.ts",
-    "packages/core/src/change_detection/change_detector_ref.ts",
-    "packages/core/src/render3/view_engine_compatibility.ts",
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component.ts",
-    "packages/core/src/render3/instructions/shared.ts",
-    "packages/core/src/error_handler.ts",
-    "packages/core/src/errors.ts",
-    "packages/core/src/view/index.ts",
-    "packages/core/src/view/entrypoint.ts",
-    "packages/core/src/linker/component_factory.ts"
-  ],
-  [
-    "packages/core/src/change_detection/change_detection.ts",
-    "packages/core/src/change_detection/change_detector_ref.ts",
-    "packages/core/src/render3/view_engine_compatibility.ts",
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component.ts",
-    "packages/core/src/render3/instructions/shared.ts",
-    "packages/core/src/error_handler.ts",
-    "packages/core/src/errors.ts",
-    "packages/core/src/view/index.ts",
-    "packages/core/src/view/entrypoint.ts",
-    "packages/core/src/view/services.ts",
-    "packages/core/src/linker/component_factory.ts"
-  ],
-  [
-    "packages/core/src/change_detection/change_detection.ts",
-    "packages/core/src/change_detection/change_detector_ref.ts",
-    "packages/core/src/render3/view_engine_compatibility.ts",
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component.ts",
-    "packages/core/src/render3/instructions/shared.ts",
-    "packages/core/src/error_handler.ts",
-    "packages/core/src/errors.ts",
-    "packages/core/src/view/index.ts",
-    "packages/core/src/view/entrypoint.ts",
-    "packages/core/src/view/services.ts",
-    "packages/core/src/view/provider.ts"
-  ],
-  [
-    "packages/core/src/change_detection/change_detection.ts",
-    "packages/core/src/change_detection/change_detector_ref.ts",
-    "packages/core/src/render3/view_engine_compatibility.ts",
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component.ts",
-    "packages/core/src/render3/instructions/shared.ts",
-    "packages/core/src/error_handler.ts",
-    "packages/core/src/errors.ts",
-    "packages/core/src/view/index.ts",
-    "packages/core/src/view/entrypoint.ts",
-    "packages/core/src/view/services.ts",
-    "packages/core/src/view/provider.ts",
-    "packages/core/src/view/refs.ts"
-  ],
-  [
-    "packages/core/src/change_detection/change_detection.ts",
-    "packages/core/src/change_detection/change_detector_ref.ts",
-    "packages/core/src/render3/view_engine_compatibility.ts",
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component.ts",
-    "packages/core/src/render3/instructions/shared.ts",
-    "packages/core/src/error_handler.ts",
-    "packages/core/src/errors.ts",
-    "packages/core/src/view/index.ts",
-    "packages/core/src/view/entrypoint.ts",
-    "packages/core/src/view/services.ts",
-    "packages/core/src/view/provider.ts",
-    "packages/core/src/view/refs.ts",
-    "packages/core/src/linker/component_factory.ts"
-  ],
   [
     "packages/core/src/change_detection/change_detector_ref.ts",
     "packages/core/src/render3/view_engine_compatibility.ts"
@@ -1322,28 +873,8 @@
   [
     "packages/core/src/change_detection/change_detector_ref.ts",
     "packages/core/src/render3/view_engine_compatibility.ts",
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component_ref.ts"
-  ],
-  [
-    "packages/core/src/change_detection/change_detector_ref.ts",
-    "packages/core/src/render3/view_engine_compatibility.ts",
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component_ref.ts",
     "packages/core/src/render3/view_ref.ts"
   ],
-  [
-    "packages/core/src/change_detection/change_detector_ref.ts",
-    "packages/core/src/render3/view_engine_compatibility.ts",
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/view_engine_compatibility_prebound.ts"
-  ],
   [
     "packages/core/src/change_detection/differs/default_iterable_differ.ts",
     "packages/core/src/change_detection/differs/iterable_differs.ts"
@@ -1352,87 +883,6 @@
     "packages/core/src/change_detection/differs/default_keyvalue_differ.ts",
     "packages/core/src/change_detection/differs/keyvalue_differs.ts"
   ],
-  [
-    "packages/core/src/debug/debug_node.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component.ts",
-    "packages/core/src/render3/instructions/shared.ts",
-    "packages/core/src/error_handler.ts",
-    "packages/core/src/errors.ts",
-    "packages/core/src/view/index.ts",
-    "packages/core/src/view/entrypoint.ts",
-    "packages/core/src/view/services.ts"
-  ],
-  [
-    "packages/core/src/debug/debug_node.ts",
-    "packages/core/src/render3/util/discovery_utils.ts",
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component.ts",
-    "packages/core/src/render3/instructions/shared.ts",
-    "packages/core/src/error_handler.ts",
-    "packages/core/src/errors.ts",
-    "packages/core/src/view/index.ts",
-    "packages/core/src/view/entrypoint.ts",
-    "packages/core/src/view/services.ts"
-  ],
-  [
-    "packages/core/src/debug/debug_node.ts",
-    "packages/core/src/render3/util/discovery_utils.ts",
-    "packages/core/src/render3/instructions/lview_debug.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component.ts",
-    "packages/core/src/render3/instructions/shared.ts",
-    "packages/core/src/error_handler.ts",
-    "packages/core/src/errors.ts",
-    "packages/core/src/view/index.ts",
-    "packages/core/src/view/entrypoint.ts",
-    "packages/core/src/view/services.ts"
-  ],
-  [
-    "packages/core/src/debug/debug_node.ts",
-    "packages/core/src/render3/util/discovery_utils.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component.ts",
-    "packages/core/src/render3/instructions/shared.ts",
-    "packages/core/src/error_handler.ts",
-    "packages/core/src/errors.ts",
-    "packages/core/src/view/index.ts",
-    "packages/core/src/view/entrypoint.ts",
-    "packages/core/src/view/services.ts"
-  ],
-  [
-    "packages/core/src/debug/debug_node.ts",
-    "packages/core/src/render3/util/discovery_utils.ts",
-    "packages/core/src/render3/util/view_traversal_utils.ts",
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component.ts",
-    "packages/core/src/render3/instructions/shared.ts",
-    "packages/core/src/error_handler.ts",
-    "packages/core/src/errors.ts",
-    "packages/core/src/view/index.ts",
-    "packages/core/src/view/entrypoint.ts",
-    "packages/core/src/view/services.ts"
-  ],
-  [
-    "packages/core/src/debug/debug_node.ts",
-    "packages/core/src/render3/util/discovery_utils.ts",
-    "packages/core/src/render3/util/view_traversal_utils.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component.ts",
-    "packages/core/src/render3/instructions/shared.ts",
-    "packages/core/src/error_handler.ts",
-    "packages/core/src/errors.ts",
-    "packages/core/src/view/index.ts",
-    "packages/core/src/view/entrypoint.ts",
-    "packages/core/src/view/services.ts"
-  ],
   [
     "packages/core/src/debug/debug_node.ts",
     "packages/core/src/view/index.ts",
@@ -1471,24 +921,8 @@
   [
     "packages/core/src/error_handler.ts",
     "packages/core/src/errors.ts",
-    "packages/core/src/view/index.ts",
-    "packages/core/src/view/element.ts",
     "packages/core/src/view/types.ts"
   ],
-  [
-    "packages/core/src/error_handler.ts",
-    "packages/core/src/errors.ts",
-    "packages/core/src/view/index.ts",
-    "packages/core/src/view/entrypoint.ts",
-    "packages/core/src/view/services.ts"
-  ],
-  [
-    "packages/core/src/errors.ts",
-    "packages/core/src/view/index.ts",
-    "packages/core/src/view/element.ts",
-    "packages/core/src/view/util.ts",
-    "packages/core/src/view/errors.ts"
-  ],
   [
     "packages/core/src/linker/component_factory_resolver.ts",
     "packages/core/src/linker/ng_module_factory.ts"
@@ -1520,248 +954,17 @@
   ],
   [
     "packages/core/src/metadata/directives.ts",
-    "packages/core/src/render3/jit/pipe.ts"
-  ],
-  [
-    "packages/core/src/render/api.ts",
-    "packages/core/src/render3/view_engine_compatibility.ts"
-  ],
-  [
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component_ref.ts"
-  ],
-  [
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component_ref.ts",
-    "packages/core/src/render3/view_engine_compatibility.ts"
-  ],
-  [
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component.ts"
-  ],
-  [
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component.ts",
-    "packages/core/src/render3/di.ts"
-  ],
-  [
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component.ts",
-    "packages/core/src/render3/di.ts",
-    "packages/core/src/render3/hooks.ts"
-  ],
-  [
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component.ts",
-    "packages/core/src/render3/di.ts",
-    "packages/core/src/render3/hooks.ts",
-    "packages/core/src/render3/state.ts"
-  ],
-  [
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component.ts",
-    "packages/core/src/render3/di.ts",
-    "packages/core/src/render3/hooks.ts",
-    "packages/core/src/render3/state.ts",
-    "packages/core/src/render3/util/view_utils.ts"
-  ],
-  [
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component.ts",
-    "packages/core/src/render3/instructions/shared.ts"
-  ],
-  [
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component.ts",
-    "packages/core/src/render3/node_manipulation.ts"
-  ],
-  [
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component.ts",
-    "packages/core/src/render3/styling/static_styling.ts"
-  ],
-  [
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component.ts",
-    "packages/core/src/render3/util/global_utils.ts",
-    "packages/core/src/render3/util/change_detection_utils.ts",
-    "packages/core/src/render3/instructions/all.ts",
-    "packages/core/src/render3/instructions/element_container.ts"
-  ],
-  [
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component.ts",
-    "packages/core/src/render3/util/global_utils.ts",
-    "packages/core/src/render3/util/change_detection_utils.ts",
-    "packages/core/src/render3/instructions/all.ts",
-    "packages/core/src/render3/instructions/element.ts"
-  ],
-  [
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component.ts",
-    "packages/core/src/render3/util/global_utils.ts",
-    "packages/core/src/render3/util/change_detection_utils.ts",
-    "packages/core/src/render3/instructions/all.ts",
-    "packages/core/src/render3/instructions/styling.ts"
-  ],
-  [
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component.ts",
-    "packages/core/src/render3/util/global_utils.ts",
-    "packages/core/src/render3/util/change_detection_utils.ts",
-    "packages/core/src/render3/instructions/all.ts",
-    "packages/core/src/render3/instructions/styling.ts",
-    "packages/core/src/render3/styling/style_binding_list.ts"
-  ],
-  [
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/component.ts",
-    "packages/core/src/render3/util/global_utils.ts",
-    "packages/core/src/render3/util/change_detection_utils.ts",
-    "packages/core/src/render3/instructions/all.ts",
-    "packages/core/src/render3/instructions/template.ts"
-  ],
-  [
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/query.ts"
+    "packages/core/src/render3/jit/directive.ts",
+    "packages/core/src/render3/jit/module.ts"
   ],
   [
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/query.ts",
-    "packages/core/src/render3/view_engine_compatibility.ts"
+    "packages/core/src/metadata/directives.ts",
+    "packages/core/src/render3/jit/pipe.ts"
   ],
   [
-    "packages/core/src/render3/assert.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/view_engine_compatibility_prebound.ts",
+    "packages/core/src/render/api.ts",
     "packages/core/src/render3/view_engine_compatibility.ts"
   ],
-  [
-    "packages/core/src/render3/component_ref.ts",
-    "packages/core/src/render3/view_ref.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts"
-  ],
-  [
-    "packages/core/src/render3/component.ts",
-    "packages/core/src/render3/di.ts",
-    "packages/core/src/render3/hooks.ts",
-    "packages/core/src/render3/state.ts",
-    "packages/core/src/render3/util/view_utils.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts"
-  ],
-  [
-    "packages/core/src/render3/component.ts",
-    "packages/core/src/render3/di.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts"
-  ],
-  [
-    "packages/core/src/render3/component.ts",
-    "packages/core/src/render3/instructions/shared.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts"
-  ],
-  [
-    "packages/core/src/render3/component.ts",
-    "packages/core/src/render3/node_manipulation.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts"
-  ],
-  [
-    "packages/core/src/render3/component.ts",
-    "packages/core/src/render3/util/global_utils.ts",
-    "packages/core/src/render3/util/change_detection_utils.ts",
-    "packages/core/src/render3/instructions/all.ts",
-    "packages/core/src/render3/instructions/element_container.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts"
-  ],
-  [
-    "packages/core/src/render3/component.ts",
-    "packages/core/src/render3/util/global_utils.ts",
-    "packages/core/src/render3/util/change_detection_utils.ts",
-    "packages/core/src/render3/instructions/all.ts",
-    "packages/core/src/render3/instructions/element.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts"
-  ],
-  [
-    "packages/core/src/render3/component.ts",
-    "packages/core/src/render3/util/global_utils.ts",
-    "packages/core/src/render3/util/change_detection_utils.ts",
-    "packages/core/src/render3/instructions/all.ts",
-    "packages/core/src/render3/instructions/listener.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts"
-  ],
-  [
-    "packages/core/src/render3/component.ts",
-    "packages/core/src/render3/util/global_utils.ts",
-    "packages/core/src/render3/util/change_detection_utils.ts",
-    "packages/core/src/render3/instructions/all.ts",
-    "packages/core/src/render3/instructions/template.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts"
-  ],
-  [
-    "packages/core/src/render3/di_setup.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts",
-    "packages/core/src/render3/features/providers_feature.ts"
-  ],
-  [
-    "packages/core/src/render3/features/copy_definition_feature.ts",
-    "packages/core/src/render3/features/inherit_definition_feature.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts"
-  ],
-  [
-    "packages/core/src/render3/features/copy_definition_feature.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts"
-  ],
-  [
-    "packages/core/src/render3/i18n.ts",
-    "packages/core/src/render3/interfaces/type_checks.ts",
-    "packages/core/src/render3/index.ts"
-  ],
   [
     "packages/core/src/render3/interfaces/container.ts",
     "packages/core/src/render3/interfaces/node.ts",
diff --git a/goldens/public-api/common/common.d.ts b/goldens/public-api/common/common.d.ts
index 339f0b753d87d..647fd3f2f9b39 100644
--- a/goldens/public-api/common/common.d.ts
+++ b/goldens/public-api/common/common.d.ts
@@ -3,10 +3,9 @@ export declare const APP_BASE_HREF: InjectionToken<string>;
 export declare class AsyncPipe implements OnDestroy, PipeTransform {
     constructor(_ref: ChangeDetectorRef);
     ngOnDestroy(): void;
-    transform<T>(obj: null): null;
-    transform<T>(obj: undefined): undefined;
-    transform<T>(obj: Observable<T> | null | undefined): T | null;
-    transform<T>(obj: Promise<T> | null | undefined): T | null;
+    transform<T>(obj: Observable<T> | Promise<T>): T | null;
+    transform<T>(obj: null | undefined): null;
+    transform<T>(obj: Observable<T> | Promise<T> | null | undefined): T | null;
 }
 
 export declare class CommonModule {
@@ -14,17 +13,23 @@ export declare class CommonModule {
 
 export declare class CurrencyPipe implements PipeTransform {
     constructor(_locale: string, _defaultCurrencyCode?: string);
-    transform(value: any, currencyCode?: string, display?: 'code' | 'symbol' | 'symbol-narrow' | string | boolean, digitsInfo?: string, locale?: string): string | null;
+    transform(value: number | string, currencyCode?: string, display?: 'code' | 'symbol' | 'symbol-narrow' | string | boolean, digitsInfo?: string, locale?: string): string | null;
+    transform(value: null | undefined, currencyCode?: string, display?: 'code' | 'symbol' | 'symbol-narrow' | string | boolean, digitsInfo?: string, locale?: string): null;
+    transform(value: number | string | null | undefined, currencyCode?: string, display?: 'code' | 'symbol' | 'symbol-narrow' | string | boolean, digitsInfo?: string, locale?: string): string | null;
 }
 
 export declare class DatePipe implements PipeTransform {
     constructor(locale: string);
-    transform(value: any, format?: string, timezone?: string, locale?: string): string | null;
+    transform(value: Date | string | number, format?: string, timezone?: string, locale?: string): string | null;
+    transform(value: null | undefined, format?: string, timezone?: string, locale?: string): null;
+    transform(value: Date | string | number | null | undefined, format?: string, timezone?: string, locale?: string): string | null;
 }
 
 export declare class DecimalPipe implements PipeTransform {
     constructor(_locale: string);
-    transform(value: any, digitsInfo?: string, locale?: string): string | null;
+    transform(value: number | string, digitsInfo?: string, locale?: string): string | null;
+    transform(value: null | undefined, digitsInfo?: string, locale?: string): null;
+    transform(value: number | string | null | undefined, digitsInfo?: string, locale?: string): string | null;
 }
 
 export declare const DOCUMENT: InjectionToken<Document>;
@@ -61,13 +66,13 @@ export declare function getLocaleDateFormat(locale: string, width: FormatWidth):
 
 export declare function getLocaleDateTimeFormat(locale: string, width: FormatWidth): string;
 
-export declare function getLocaleDayNames(locale: string, formStyle: FormStyle, width: TranslationWidth): string[];
+export declare function getLocaleDayNames(locale: string, formStyle: FormStyle, width: TranslationWidth): ReadonlyArray<string>;
 
-export declare function getLocaleDayPeriods(locale: string, formStyle: FormStyle, width: TranslationWidth): [string, string];
+export declare function getLocaleDayPeriods(locale: string, formStyle: FormStyle, width: TranslationWidth): Readonly<[string, string]>;
 
 export declare function getLocaleDirection(locale: string): 'ltr' | 'rtl';
 
-export declare function getLocaleEraNames(locale: string, width: TranslationWidth): [string, string];
+export declare function getLocaleEraNames(locale: string, width: TranslationWidth): Readonly<[string, string]>;
 
 export declare function getLocaleExtraDayPeriodRules(locale: string): (Time | [Time, Time])[];
 
@@ -77,7 +82,7 @@ export declare function getLocaleFirstDayOfWeek(locale: string): WeekDay;
 
 export declare function getLocaleId(locale: string): string;
 
-export declare function getLocaleMonthNames(locale: string, formStyle: FormStyle, width: TranslationWidth): string[];
+export declare function getLocaleMonthNames(locale: string, formStyle: FormStyle, width: TranslationWidth): ReadonlyArray<string>;
 
 export declare function getLocaleNumberFormat(locale: string, type: NumberFormatStyle): string;
 
@@ -105,7 +110,7 @@ export declare class HashLocationStrategy extends LocationStrategy {
 
 export declare class I18nPluralPipe implements PipeTransform {
     constructor(_localization: NgLocalization);
-    transform(value: number, pluralMap: {
+    transform(value: number | null | undefined, pluralMap: {
         [count: string]: string;
     }, locale?: string): string;
 }
@@ -135,21 +140,13 @@ export declare interface KeyValue<K, 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;
-    } | ReadonlyMap<string, V>, compareFn?: (a: KeyValue<string, V>, b: KeyValue<string, V>) => number): Array<KeyValue<string, V>>;
-    transform<V>(input: {
-        [key: string]: V;
-    } | ReadonlyMap<string, V> | null, compareFn?: (a: KeyValue<string, V>, b: KeyValue<string, V>) => number): Array<KeyValue<string, V>> | null;
-    transform<V>(input: {
-        [key: number]: V;
-    } | ReadonlyMap<number, V>, compareFn?: (a: KeyValue<number, V>, b: KeyValue<number, V>) => number): Array<KeyValue<number, V>>;
-    transform<V>(input: {
-        [key: number]: V;
-    } | ReadonlyMap<number, V> | null, compareFn?: (a: KeyValue<number, V>, b: KeyValue<number, V>) => number): Array<KeyValue<number, V>> | null;
     transform<K, V>(input: ReadonlyMap<K, V>, compareFn?: (a: KeyValue<K, V>, b: KeyValue<K, V>) => number): Array<KeyValue<K, V>>;
-    transform<K, V>(input: ReadonlyMap<K, V> | null, compareFn?: (a: KeyValue<K, V>, b: KeyValue<K, V>) => number): Array<KeyValue<K, V>> | null;
+    transform<K extends number, V>(input: Record<K, V>, compareFn?: (a: KeyValue<string, V>, b: KeyValue<string, V>) => number): Array<KeyValue<string, V>>;
+    transform<K extends string, V>(input: Record<K, V> | ReadonlyMap<K, V>, compareFn?: (a: KeyValue<K, V>, b: KeyValue<K, V>) => number): Array<KeyValue<K, V>>;
+    transform(input: null | undefined, compareFn?: (a: KeyValue<unknown, unknown>, b: KeyValue<unknown, unknown>) => number): null;
+    transform<K, V>(input: ReadonlyMap<K, V> | null | undefined, compareFn?: (a: KeyValue<K, V>, b: KeyValue<K, V>) => number): Array<KeyValue<K, V>> | null;
+    transform<K extends number, V>(input: Record<K, V> | null | undefined, compareFn?: (a: KeyValue<string, V>, b: KeyValue<string, V>) => number): Array<KeyValue<string, V>> | null;
+    transform<K extends string, V>(input: Record<K, V> | ReadonlyMap<K, V> | null | undefined, compareFn?: (a: KeyValue<K, V>, b: KeyValue<K, V>) => number): Array<KeyValue<K, V>> | null;
 }
 
 export declare class Location {
@@ -194,6 +191,8 @@ export declare abstract class LocationStrategy {
 
 export declare class LowerCasePipe implements PipeTransform {
     transform(value: string): string;
+    transform(value: null | undefined): null;
+    transform(value: string | null | undefined): string | null;
 }
 
 export declare class NgClass implements DoCheck {
@@ -216,7 +215,7 @@ export declare class NgComponentOutlet implements OnChanges, OnDestroy {
 }
 
 export declare class NgForOf<T, U extends NgIterable<T> = NgIterable<T>> implements DoCheck {
-    set ngForOf(ngForOf: (U & NgIterable<T>) | undefined | null);
+    set ngForOf(ngForOf: U & NgIterable<T> | undefined | null);
     set ngForTemplate(value: TemplateRef<NgForOfContext<T, U>>);
     set ngForTrackBy(fn: TrackByFunction<T>);
     get ngForTrackBy(): TrackByFunction<T>;
@@ -339,7 +338,9 @@ export declare class PathLocationStrategy extends LocationStrategy {
 
 export declare class PercentPipe implements PipeTransform {
     constructor(_locale: string);
-    transform(value: any, digitsInfo?: string, locale?: string): string | null;
+    transform(value: number | string, digitsInfo?: string, locale?: string): string | null;
+    transform(value: null | undefined, digitsInfo?: string, locale?: string): null;
+    transform(value: number | string | null | undefined, digitsInfo?: string, locale?: string): string | null;
 }
 
 export declare abstract class PlatformLocation {
@@ -380,9 +381,10 @@ export declare function registerLocaleData(data: any, localeId?: string | any, e
 
 export declare class SlicePipe implements PipeTransform {
     transform<T>(value: ReadonlyArray<T>, start: number, end?: number): Array<T>;
+    transform(value: null | undefined, start: number, end?: number): null;
+    transform<T>(value: ReadonlyArray<T> | null | undefined, start: number, end?: number): Array<T> | null;
     transform(value: string, start: number, end?: number): string;
-    transform(value: null, start: number, end?: number): null;
-    transform(value: undefined, start: number, end?: number): undefined;
+    transform(value: string | null | undefined, start: number, end?: number): string | null;
 }
 
 export declare type Time = {
@@ -392,6 +394,8 @@ export declare type Time = {
 
 export declare class TitleCasePipe implements PipeTransform {
     transform(value: string): string;
+    transform(value: null | undefined): null;
+    transform(value: string | null | undefined): string | null;
 }
 
 export declare enum TranslationWidth {
@@ -403,6 +407,8 @@ export declare enum TranslationWidth {
 
 export declare class UpperCasePipe implements PipeTransform {
     transform(value: string): string;
+    transform(value: null | undefined): null;
+    transform(value: string | null | undefined): string | null;
 }
 
 export declare const VERSION: Version;
diff --git a/goldens/public-api/common/http/http.d.ts b/goldens/public-api/common/http/http.d.ts
index dc83116d82988..668d6c76a7b96 100644
--- a/goldens/public-api/common/http/http.d.ts
+++ b/goldens/public-api/common/http/http.d.ts
@@ -1177,6 +1177,10 @@ export declare class HttpClient {
             [header: string]: string | string[];
         };
         observe: 'events';
+        params?: HttpParams | {
+            [param: string]: string | string[];
+        };
+        reportProgress?: boolean;
         responseType?: 'json';
         withCredentials?: boolean;
     }): Observable<HttpEvent<T>>;
diff --git a/goldens/public-api/common/http/testing/testing.d.ts b/goldens/public-api/common/http/testing/testing.d.ts
index 6e896345e2e49..8143ffd6a0347 100644
--- a/goldens/public-api/common/http/testing/testing.d.ts
+++ b/goldens/public-api/common/http/testing/testing.d.ts
@@ -33,7 +33,7 @@ export declare class TestRequest {
         statusText?: string;
     }): void;
     event(event: HttpEvent<any>): void;
-    flush(body: ArrayBuffer | Blob | string | number | Object | (string | number | Object | null)[] | null, opts?: {
+    flush(body: ArrayBuffer | Blob | boolean | string | number | Object | (boolean | string | number | Object | null)[] | null, opts?: {
         headers?: HttpHeaders | {
             [name: string]: string | string[];
         };
diff --git a/goldens/public-api/compiler-cli/compiler_options.d.ts b/goldens/public-api/compiler-cli/compiler_options.d.ts
index 92723d30509d5..2c462d513a4ce 100644
--- a/goldens/public-api/compiler-cli/compiler_options.d.ts
+++ b/goldens/public-api/compiler-cli/compiler_options.d.ts
@@ -35,6 +35,7 @@ export interface StrictTemplateOptions {
     strictContextGenerics?: boolean;
     strictDomEventTypes?: boolean;
     strictDomLocalRefTypes?: boolean;
+    strictInputAccessModifiers?: boolean;
     strictInputTypes?: boolean;
     strictLiteralTypes?: boolean;
     strictNullInputTypes?: boolean;
diff --git a/goldens/public-api/compiler-cli/error_code.d.ts b/goldens/public-api/compiler-cli/error_code.d.ts
index 41ad7164771fe..b9ed59e4694ca 100644
--- a/goldens/public-api/compiler-cli/error_code.d.ts
+++ b/goldens/public-api/compiler-cli/error_code.d.ts
@@ -19,6 +19,7 @@ export declare enum ErrorCode {
     CONFIG_FLAT_MODULE_NO_INDEX = 4001,
     CONFIG_STRICT_TEMPLATES_IMPLIES_FULL_TEMPLATE_TYPECHECK = 4002,
     HOST_BINDING_PARSE_ERROR = 5001,
+    TEMPLATE_PARSE_ERROR = 5002,
     NGMODULE_INVALID_DECLARATION = 6001,
     NGMODULE_INVALID_IMPORT = 6002,
     NGMODULE_INVALID_EXPORT = 6003,
diff --git a/goldens/public-api/core/core.d.ts b/goldens/public-api/core/core.d.ts
index 6334c6632a950..0bbed1ad0209c 100644
--- a/goldens/public-api/core/core.d.ts
+++ b/goldens/public-api/core/core.d.ts
@@ -85,10 +85,6 @@ export declare interface ClassSansProvider {
     useClass: Type<any>;
 }
 
-/** @deprecated */
-export declare interface CollectionChangeRecord<V> extends IterableChangeRecord<V> {
-}
-
 export declare class Compiler {
     compileModuleAndAllComponentsAsync: <T>(moduleType: Type<T>) => Promise<ModuleWithComponentFactories<T>>;
     compileModuleAndAllComponentsSync: <T>(moduleType: Type<T>) => ModuleWithComponentFactories<T>;
@@ -803,7 +799,7 @@ export declare abstract class Renderer2 {
     abstract createElement(name: string, namespace?: string | null): any;
     abstract createText(value: string): any;
     abstract destroy(): void;
-    abstract insertBefore(parent: any, newChild: any, refChild: any): void;
+    abstract insertBefore(parent: any, newChild: any, refChild: any, isMove?: boolean): void;
     abstract listen(target: 'window' | 'document' | 'body' | any, eventName: string, callback: (event: any) => boolean | void): () => void;
     abstract nextSibling(node: any): any;
     abstract parentNode(node: any): any;
@@ -1036,7 +1032,6 @@ export declare abstract class ViewContainerRef {
 
 export declare enum ViewEncapsulation {
     Emulated = 0,
-    Native = 1,
     None = 2,
     ShadowDom = 3
 }
diff --git a/goldens/public-api/elements/elements.d.ts b/goldens/public-api/elements/elements.d.ts
index 04f108ca60e4f..baafc1693d888 100644
--- a/goldens/public-api/elements/elements.d.ts
+++ b/goldens/public-api/elements/elements.d.ts
@@ -2,7 +2,7 @@ export declare function createCustomElement<P>(component: Type<any>, config: NgE
 
 export declare abstract class NgElement extends HTMLElement {
     protected ngElementEventsSubscription: Subscription | null;
-    protected ngElementStrategy: NgElementStrategy;
+    protected abstract ngElementStrategy: NgElementStrategy;
     abstract attributeChangedCallback(attrName: string, oldValue: string | null, newValue: string, namespace?: string): void;
     abstract connectedCallback(): void;
     abstract disconnectedCallback(): void;
diff --git a/goldens/public-api/forms/forms.d.ts b/goldens/public-api/forms/forms.d.ts
index 5733623c01fa1..87df5fcc7452d 100644
--- a/goldens/public-api/forms/forms.d.ts
+++ b/goldens/public-api/forms/forms.d.ts
@@ -6,7 +6,7 @@ export declare abstract class AbstractControl {
     get enabled(): boolean;
     readonly errors: ValidationErrors | null;
     get invalid(): boolean;
-    get parent(): FormGroup | FormArray;
+    get parent(): FormGroup | FormArray | null;
     get pending(): boolean;
     readonly pristine: boolean;
     get root(): AbstractControl;
@@ -199,7 +199,7 @@ export declare class FormArrayName extends ControlContainer implements OnInit, O
     name: string | number | null;
     get path(): string[];
     get validator(): ValidatorFn | null;
-    constructor(parent: ControlContainer, validators: any[], asyncValidators: any[]);
+    constructor(parent: ControlContainer, validators: (Validator | ValidatorFn)[], asyncValidators: (AsyncValidator | AsyncValidatorFn)[]);
     ngOnDestroy(): void;
     ngOnInit(): void;
 }
@@ -246,7 +246,7 @@ export declare class FormControlDirective extends NgControl implements OnChanges
     /** @deprecated */ update: EventEmitter<any>;
     get validator(): ValidatorFn | null;
     viewModel: any;
-    constructor(validators: Array<Validator | ValidatorFn>, asyncValidators: Array<AsyncValidator | AsyncValidatorFn>, valueAccessors: ControlValueAccessor[], _ngModelWarningConfig: string | null);
+    constructor(validators: (Validator | ValidatorFn)[], asyncValidators: (AsyncValidator | AsyncValidatorFn)[], valueAccessors: ControlValueAccessor[], _ngModelWarningConfig: string | null);
     ngOnChanges(changes: SimpleChanges): void;
     viewToModelUpdate(newValue: any): void;
 }
@@ -261,7 +261,7 @@ export declare class FormControlName extends NgControl implements OnChanges, OnD
     get path(): string[];
     /** @deprecated */ update: EventEmitter<any>;
     get validator(): ValidatorFn | null;
-    constructor(parent: ControlContainer, validators: Array<Validator | ValidatorFn>, asyncValidators: Array<AsyncValidator | AsyncValidatorFn>, valueAccessors: ControlValueAccessor[], _ngModelWarningConfig: string | null);
+    constructor(parent: ControlContainer, validators: (Validator | ValidatorFn)[], asyncValidators: (AsyncValidator | AsyncValidatorFn)[], valueAccessors: ControlValueAccessor[], _ngModelWarningConfig: string | null);
     ngOnChanges(changes: SimpleChanges): void;
     ngOnDestroy(): void;
     viewToModelUpdate(newValue: any): void;
@@ -306,7 +306,7 @@ export declare class FormGroupDirective extends ControlContainer implements Form
     ngSubmit: EventEmitter<any>;
     get path(): string[];
     readonly submitted: boolean;
-    constructor(_validators: any[], _asyncValidators: any[]);
+    constructor(_validators: (Validator | ValidatorFn)[], _asyncValidators: (AsyncValidator | AsyncValidatorFn)[]);
     addControl(dir: FormControlName): FormControl;
     addFormArray(dir: FormArrayName): void;
     addFormGroup(dir: FormGroupName): void;
@@ -325,7 +325,7 @@ export declare class FormGroupDirective extends ControlContainer implements Form
 
 export declare class FormGroupName extends AbstractFormGroupDirective implements OnInit, OnDestroy {
     name: string | number | null;
-    constructor(parent: ControlContainer, validators: any[], asyncValidators: any[]);
+    constructor(parent: ControlContainer, validators: (Validator | ValidatorFn)[], asyncValidators: (AsyncValidator | AsyncValidatorFn)[]);
 }
 
 export declare class FormsModule {
@@ -349,7 +349,7 @@ export declare const NG_ASYNC_VALIDATORS: InjectionToken<(Function | Validator)[
 
 export declare const NG_VALIDATORS: InjectionToken<(Function | Validator)[]>;
 
-export declare const NG_VALUE_ACCESSOR: InjectionToken<ControlValueAccessor>;
+export declare const NG_VALUE_ACCESSOR: InjectionToken<readonly ControlValueAccessor[]>;
 
 export declare abstract class NgControl extends AbstractControlDirective {
     get asyncValidator(): AsyncValidatorFn | null;
@@ -380,7 +380,7 @@ export declare class NgForm extends ControlContainer implements Form, AfterViewI
     };
     get path(): string[];
     readonly submitted: boolean;
-    constructor(validators: any[], asyncValidators: any[]);
+    constructor(validators: (Validator | ValidatorFn)[], asyncValidators: (AsyncValidator | AsyncValidatorFn)[]);
     addControl(dir: NgModel): void;
     addFormGroup(dir: NgModelGroup): void;
     getControl(dir: NgModel): FormControl;
@@ -413,7 +413,7 @@ export declare class NgModel extends NgControl implements OnChanges, OnDestroy {
     update: EventEmitter<any>;
     get validator(): ValidatorFn | null;
     viewModel: any;
-    constructor(parent: ControlContainer, validators: Array<Validator | ValidatorFn>, asyncValidators: Array<AsyncValidator | AsyncValidatorFn>, valueAccessors: ControlValueAccessor[]);
+    constructor(parent: ControlContainer, validators: (Validator | ValidatorFn)[], asyncValidators: (AsyncValidator | AsyncValidatorFn)[], valueAccessors: ControlValueAccessor[]);
     ngOnChanges(changes: SimpleChanges): void;
     ngOnDestroy(): void;
     viewToModelUpdate(newValue: any): void;
@@ -422,7 +422,7 @@ export declare class NgModel extends NgControl implements OnChanges, OnDestroy {
 
 export declare class NgModelGroup extends AbstractFormGroupDirective implements OnInit, OnDestroy {
     name: string;
-    constructor(parent: ControlContainer, validators: any[], asyncValidators: any[]);
+    constructor(parent: ControlContainer, validators: (Validator | ValidatorFn)[], asyncValidators: (AsyncValidator | AsyncValidatorFn)[]);
 }
 
 export declare class NgSelectOption implements OnDestroy {
diff --git a/goldens/public-api/platform-server/platform-server.d.ts b/goldens/public-api/platform-server/platform-server.d.ts
index 7db0b77e9777f..490599c709a5a 100644
--- a/goldens/public-api/platform-server/platform-server.d.ts
+++ b/goldens/public-api/platform-server/platform-server.d.ts
@@ -3,6 +3,7 @@ export declare const BEFORE_APP_SERIALIZED: InjectionToken<(() => void | Promise
 export declare const INITIAL_CONFIG: InjectionToken<PlatformConfig>;
 
 export declare interface PlatformConfig {
+    baseUrl?: string;
     document?: string;
     url?: string;
     useAbsoluteUrl?: boolean;
diff --git a/goldens/public-api/router/router.d.ts b/goldens/public-api/router/router.d.ts
index 41395ae9bb1de..73cb56deb0ee3 100644
--- a/goldens/public-api/router/router.d.ts
+++ b/goldens/public-api/router/router.d.ts
@@ -51,6 +51,14 @@ export declare class ActivationStart {
     toString(): string;
 }
 
+export declare abstract class BaseRouteReuseStrategy implements RouteReuseStrategy {
+    retrieve(route: ActivatedRouteSnapshot): DetachedRouteHandle | null;
+    shouldAttach(route: ActivatedRouteSnapshot): boolean;
+    shouldDetach(route: ActivatedRouteSnapshot): boolean;
+    shouldReuseRoute(future: ActivatedRouteSnapshot, curr: ActivatedRouteSnapshot): boolean;
+    store(route: ActivatedRouteSnapshot, detachedTree: DetachedRouteHandle): void;
+}
+
 export declare interface CanActivate {
     canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree;
 }
@@ -148,7 +156,7 @@ export declare class GuardsCheckStart extends RouterEvent {
     toString(): string;
 }
 
-export declare type InitialNavigation = true | false | 'enabled' | 'disabled' | 'legacy_enabled' | 'legacy_disabled';
+export declare type InitialNavigation = 'disabled' | 'enabled' | 'enabledBlocking' | 'enabledNonBlocking';
 
 export declare type LoadChildren = LoadChildrenCallback | DeprecatedLoadChildren;
 
@@ -164,6 +172,14 @@ export declare type Navigation = {
     previousNavigation: Navigation | null;
 };
 
+export declare interface NavigationBehaviorOptions {
+    replaceUrl?: boolean;
+    skipLocationChange?: boolean;
+    state?: {
+        [k: string]: any;
+    };
+}
+
 export declare class NavigationCancel extends RouterEvent {
     reason: string;
     constructor(
@@ -191,18 +207,7 @@ export declare class NavigationError extends RouterEvent {
     toString(): string;
 }
 
-export declare interface NavigationExtras {
-    fragment?: string;
-    preserveFragment?: boolean;
-    /** @deprecated */ preserveQueryParams?: boolean;
-    queryParams?: Params | null;
-    queryParamsHandling?: QueryParamsHandling | null;
-    relativeTo?: ActivatedRoute | null;
-    replaceUrl?: boolean;
-    skipLocationChange?: boolean;
-    state?: {
-        [k: string]: any;
-    };
+export declare interface NavigationExtras extends UrlCreationOptions, NavigationBehaviorOptions {
 }
 
 export declare class NavigationStart extends RouterEvent {
@@ -336,13 +341,13 @@ export declare class Router {
     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;
+    createUrlTree(commands: any[], navigationExtras?: UrlCreationOptions): UrlTree;
     dispose(): void;
     getCurrentNavigation(): Navigation | null;
     initialNavigation(): void;
     isActive(url: string | UrlTree, exact: boolean): boolean;
     navigate(commands: any[], extras?: NavigationExtras): Promise<boolean>;
-    navigateByUrl(url: string | UrlTree, extras?: NavigationExtras): Promise<boolean>;
+    navigateByUrl(url: string | UrlTree, extras?: NavigationBehaviorOptions): Promise<boolean>;
     ngOnDestroy(): void;
     parseUrl(url: string): UrlTree;
     resetConfig(config: Routes): void;
@@ -370,14 +375,11 @@ export declare class RouterEvent {
     url: string);
 }
 
-export declare class RouterLink {
-    fragment: string;
+export declare class RouterLink implements OnChanges {
+    fragment?: string;
     preserveFragment: boolean;
-    /** @deprecated */ set preserveQueryParams(value: boolean);
-    queryParams: {
-        [k: string]: any;
-    };
-    queryParamsHandling: QueryParamsHandling;
+    queryParams?: Params | null;
+    queryParamsHandling?: QueryParamsHandling | null;
     replaceUrl: boolean;
     set routerLink(commands: any[] | string | null | undefined);
     skipLocationChange: boolean;
@@ -386,6 +388,7 @@ export declare class RouterLink {
     };
     get urlTree(): UrlTree;
     constructor(router: Router, route: ActivatedRoute, tabIndex: string, renderer: Renderer2, el: ElementRef);
+    ngOnChanges(changes: SimpleChanges): void;
     onClick(): boolean;
 }
 
@@ -404,14 +407,11 @@ export declare class RouterLinkActive implements OnChanges, OnDestroy, AfterCont
 }
 
 export declare class RouterLinkWithHref implements OnChanges, OnDestroy {
-    fragment: string;
+    fragment?: string;
     href: string;
     preserveFragment: boolean;
-    /** @deprecated */ set preserveQueryParams(value: boolean);
-    queryParams: {
-        [k: string]: any;
-    };
-    queryParamsHandling: QueryParamsHandling;
+    queryParams?: Params | null;
+    queryParamsHandling?: QueryParamsHandling | null;
     replaceUrl: boolean;
     set routerLink(commands: any[] | string | null | undefined);
     skipLocationChange: boolean;
@@ -421,9 +421,9 @@ export declare class RouterLinkWithHref implements OnChanges, OnDestroy {
     target: string;
     get urlTree(): UrlTree;
     constructor(router: Router, route: ActivatedRoute, locationStrategy: LocationStrategy);
-    ngOnChanges(changes: {}): any;
+    ngOnChanges(changes: SimpleChanges): any;
     ngOnDestroy(): any;
-    onClick(button: number, ctrlKey: boolean, metaKey: boolean, shiftKey: boolean): boolean;
+    onClick(button: number, ctrlKey: boolean, shiftKey: boolean, altKey: boolean, metaKey: boolean): boolean;
 }
 
 export declare class RouterModule {
@@ -493,6 +493,14 @@ export declare class Scroll {
     toString(): string;
 }
 
+export declare interface UrlCreationOptions {
+    fragment?: string;
+    preserveFragment?: boolean;
+    queryParams?: Params | null;
+    queryParamsHandling?: QueryParamsHandling | null;
+    relativeTo?: ActivatedRoute | null;
+}
+
 export declare abstract class UrlHandlingStrategy {
     abstract extract(url: UrlTree): UrlTree;
     abstract merge(newUrlPart: UrlTree, rawUrl: UrlTree): UrlTree;
diff --git a/goldens/public-api/service-worker/config/config.d.ts b/goldens/public-api/service-worker/config/config.d.ts
index 575115c56e46a..75a007d98b505 100644
--- a/goldens/public-api/service-worker/config/config.d.ts
+++ b/goldens/public-api/service-worker/config/config.d.ts
@@ -14,6 +14,7 @@ export declare interface Config {
     assetGroups?: AssetGroup[];
     dataGroups?: DataGroup[];
     index: string;
+    navigationRequestStrategy?: 'freshness' | 'performance';
     navigationUrls?: string[];
 }
 
diff --git a/goldens/public-api/service-worker/service-worker.d.ts b/goldens/public-api/service-worker/service-worker.d.ts
index 097cbe2339efb..946a370fdd4ed 100644
--- a/goldens/public-api/service-worker/service-worker.d.ts
+++ b/goldens/public-api/service-worker/service-worker.d.ts
@@ -29,11 +29,17 @@ export declare class SwUpdate {
     readonly activated: Observable<UpdateActivatedEvent>;
     readonly available: Observable<UpdateAvailableEvent>;
     get isEnabled(): boolean;
+    readonly unrecoverable: Observable<UnrecoverableStateEvent>;
     constructor(sw: ɵangular_packages_service_worker_service_worker_a);
     activateUpdate(): Promise<void>;
     checkForUpdate(): Promise<void>;
 }
 
+export declare interface UnrecoverableStateEvent {
+    reason: string;
+    type: 'UNRECOVERABLE_STATE';
+}
+
 export declare interface UpdateActivatedEvent {
     current: {
         hash: string;
diff --git a/goldens/size-tracking/aio-payloads.json b/goldens/size-tracking/aio-payloads.json
index 8ebdb7da2442a..48c80297490c4 100755
--- a/goldens/size-tracking/aio-payloads.json
+++ b/goldens/size-tracking/aio-payloads.json
@@ -2,8 +2,8 @@
   "aio": {
     "master": {
       "uncompressed": {
-        "runtime-es2015": 2987,
-        "main-es2015": 450880,
+        "runtime-es2015": 3037,
+        "main-es2015": 448243,
         "polyfills-es2015": 52685
       }
     }
@@ -11,18 +11,18 @@
   "aio-local": {
     "master": {
       "uncompressed": {
-        "runtime-es2015": 2987,
-        "main-es2015": 448419,
-        "polyfills-es2015": 52630
+        "runtime-es2015": 3037,
+        "main-es2015": 448676,
+        "polyfills-es2015": 52415
       }
     }
   },
   "aio-local-viewengine": {
     "master": {
       "uncompressed": {
-        "runtime-es2015": 3097,
-        "main-es2015": 430239,
-        "polyfills-es2015": 52195
+        "runtime-es2015": 3157,
+        "main-es2015": 431750,
+        "polyfills-es2015": 52415
       }
     }
   }
diff --git a/goldens/size-tracking/integration-payloads.json b/goldens/size-tracking/integration-payloads.json
index 9a036944cf2a8..e9db1e512f051 100644
--- a/goldens/size-tracking/integration-payloads.json
+++ b/goldens/size-tracking/integration-payloads.json
@@ -3,7 +3,7 @@
     "master": {
       "uncompressed": {
         "runtime-es2015": 1485,
-        "main-es2015": 141151,
+        "main-es2015": 140899,
         "polyfills-es2015": 36571
       }
     }
@@ -12,7 +12,7 @@
     "master": {
       "uncompressed": {
         "runtime-es2015": 1485,
-        "main-es2015": 17362,
+        "main-es2015": 17092,
         "polyfills-es2015": 36657
       }
     }
@@ -21,7 +21,7 @@
     "master": {
       "uncompressed": {
         "runtime-es2015": 1485,
-        "main-es2015": 147573,
+        "main-es2015": 146698,
         "polyfills-es2015": 36571
       }
     }
@@ -30,7 +30,7 @@
     "master": {
       "uncompressed": {
         "runtime-es2015": 1485,
-        "main-es2015": 136168,
+        "main-es2015": 136096,
         "polyfills-es2015": 37248
       }
     }
@@ -39,7 +39,7 @@
     "master": {
       "uncompressed": {
         "runtime-es2015": 2289,
-        "main-es2015": 245351,
+        "main-es2015": 242460,
         "polyfills-es2015": 36938,
         "5-es2015": 751
       }
@@ -49,7 +49,7 @@
     "master": {
       "uncompressed": {
         "runtime-es2015": 2289,
-        "main-es2015": 221939,
+        "main-es2015": 218527,
         "polyfills-es2015": 36723,
         "5-es2015": 781
       }
@@ -62,7 +62,7 @@
         "bundle": "TODO(i): we should define ngDevMode to false in Closure, but --define only works in the global scope.",
         "bundle": "TODO(i): (FW-2164) TS 3.9 new class shape seems to have broken Closure in big ways. The size went from 169991 to 252338",
         "bundle": "TODO(i): after removal of tsickle from ngc-wrapped / ng_package, we had to switch to SIMPLE optimizations which increased the size from 252338 to 1198917, see PR#37221 and PR#37317 for more info",
-        "bundle": 1213130
+        "bundle": 1214857
       }
     }
   }
diff --git a/gulpfile.js b/gulpfile.js
index 0b281c445baf1..5853cf68b989f 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -32,4 +32,5 @@ gulp.task('changelog', loadTask('changelog'));
 gulp.task('changelog:zonejs', loadTask('changelog-zonejs'));
 gulp.task('check-env', () => {/* this is a noop because the env test ran already above */});
 gulp.task('cldr:extract', loadTask('cldr', 'extract'));
+gulp.task('cldr:download', loadTask('cldr', 'download'));
 gulp.task('cldr:gen-closure-locale', loadTask('cldr', 'closure'));
diff --git a/integration/BUILD.bazel b/integration/BUILD.bazel
index b352583c40817..a58be0c1d56fb 100644
--- a/integration/BUILD.bazel
+++ b/integration/BUILD.bazel
@@ -53,7 +53,10 @@ INTEGRATION_TESTS = {
     },
     "dynamic-compiler": {"tags": ["no-ivy-aot"]},
     "hello_world__closure": {
-        "commands": "payload_size_tracking",
+        # TODO: Re-enable the payload_size_tracking command:
+        #   We should define ngDevMode to false in Closure, but --define only works in the global scope.
+        #   With ngDevMode not being set to false, this size tracking test provides little value but a lot of
+        #   headache to continue updating the size.
         "tags": ["no-ivy-aot"],
     },
     "hello_world__systemjs_umd": {
@@ -82,6 +85,12 @@ INTEGRATION_TESTS = {
         # root @npm//typescript package.
         "pinned_npm_packages": ["typescript"],
     },
+    "typings_test_ts40": {
+        # Special case for `typings_test_ts40` test as we want to pin
+        # `typescript` at version 4.0.x for that test and not link to the
+        # root @npm//typescript package.
+        "pinned_npm_packages": ["typescript"],
+    },
 }
 
 [
diff --git a/integration/angular_integration_test.bzl b/integration/angular_integration_test.bzl
index b331062191907..1335d42c47b9d 100644
--- a/integration/angular_integration_test.bzl
+++ b/integration/angular_integration_test.bzl
@@ -50,8 +50,6 @@ GENERATED_NPM_PACKAGES = [
     "@angular/platform-browser",
     "@angular/platform-browser-dynamic",
     "@angular/platform-server",
-    "@angular/platform-webworker",
-    "@angular/platform-webworker-dynamic",
     "@angular/router",
     "@angular/service-worker",
     "@angular/upgrade",
diff --git a/integration/bazel/.bazelignore b/integration/bazel/.bazelignore
index 3c3629e647f5d..1afd721e88d33 100644
--- a/integration/bazel/.bazelignore
+++ b/integration/bazel/.bazelignore
@@ -1 +1,2 @@
 node_modules
+.yarn_local_cache
diff --git a/integration/bazel/WORKSPACE b/integration/bazel/WORKSPACE
index ff35bd1440419..92f347350a241 100644
--- a/integration/bazel/WORKSPACE
+++ b/integration/bazel/WORKSPACE
@@ -5,8 +5,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 # Fetch rules_nodejs so we can install our npm dependencies
 http_archive(
     name = "build_bazel_rules_nodejs",
-    sha256 = "84abf7ac4234a70924628baa9a73a5a5cbad944c4358cf9abdb4aab29c9a5b77",
-    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/1.7.0/rules_nodejs-1.7.0.tar.gz"],
+    sha256 = "4952ef879704ab4ad6729a29007e7094aef213ea79e9f2e94cbe1c9a753e63ef",
+    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/2.2.0/rules_nodejs-2.2.0.tar.gz"],
 )
 
 # Fetch sass rules for compiling sass files
@@ -48,18 +48,13 @@ yarn_install(
     yarn_lock = "//:yarn.lock",
 )
 
-# Install all bazel dependencies of our npm packages
-load("@npm//:install_bazel_dependencies.bzl", "install_bazel_dependencies")
-
-install_bazel_dependencies()
-
 # Load protractor dependencies
-load("@npm_bazel_protractor//:package.bzl", "npm_bazel_protractor_dependencies")
+load("@npm//@bazel/protractor:package.bzl", "npm_bazel_protractor_dependencies")
 
 npm_bazel_protractor_dependencies()
 
 # Load karma dependencies
-load("@npm_bazel_karma//:package.bzl", "npm_bazel_karma_dependencies")
+load("@npm//@bazel/karma:package.bzl", "npm_bazel_karma_dependencies")
 
 npm_bazel_karma_dependencies()
 
@@ -75,11 +70,6 @@ browser_repositories(
     firefox = True,
 )
 
-# Setup the rules_typescript tooolchain
-load("@npm_bazel_typescript//:index.bzl", "ts_setup_workspace")
-
-ts_setup_workspace()
-
 # Setup the rules_sass toolchain
 load("@io_bazel_rules_sass//sass:sass_repositories.bzl", "sass_repositories")
 
diff --git a/integration/bazel/package.json b/integration/bazel/package.json
index b87ab109d0ee2..c7347b3814fba 100644
--- a/integration/bazel/package.json
+++ b/integration/bazel/package.json
@@ -16,18 +16,18 @@
     "reflect-metadata": "0.1.12",
     "rxjs": "file:../../node_modules/rxjs",
     "tslib": "file:../../node_modules/tslib",
-    "zone.js": "file:../../dist/zone.js-dist"
+    "zone.js": "file:../../dist/zone.js-dist/archive/zone.js.tgz"
   },
   "devDependencies": {
     "@angular/bazel": "file:../../dist/packages-dist/bazel",
     "@angular/compiler": "file:../../dist/packages-dist/compiler",
     "@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
     "@bazel/bazelisk": "file:../../node_modules/@bazel/bazelisk",
-    "@bazel/karma": "1.7.0",
-    "@bazel/protractor": "1.7.0",
-    "@bazel/rollup": "1.7.0",
-    "@bazel/terser": "1.7.0",
-    "@bazel/typescript": "1.7.0",
+    "@bazel/karma": "2.2.0",
+    "@bazel/protractor": "2.2.0",
+    "@bazel/rollup": "2.2.0",
+    "@bazel/terser": "2.2.0",
+    "@bazel/typescript": "2.2.0",
     "@types/jasmine": "2.8.8",
     "http-server": "0.12.0",
     "karma": "4.4.1",
@@ -43,7 +43,7 @@
     "rollup-plugin-node-resolve": "5.2.0",
     "rollup-plugin-sourcemaps": "0.4.2",
     "terser": "4.4.0",
-    "typescript": "3.8.3"
+    "typescript": "file:../../node_modules/typescript"
   },
   "scripts": {
     "test": "bazelisk build ... --noshow_progress && bazelisk test ...",
diff --git a/integration/bazel/src/BUILD.bazel b/integration/bazel/src/BUILD.bazel
index 2968f24a0dd31..a61abdb73f48a 100644
--- a/integration/bazel/src/BUILD.bazel
+++ b/integration/bazel/src/BUILD.bazel
@@ -2,10 +2,10 @@ package(default_visibility = ["//visibility:public"])
 
 load("@build_bazel_rules_nodejs//:index.bzl", "pkg_web")
 load("@npm//http-server:index.bzl", "http_server")
-load("@npm_angular_bazel//:index.bzl", "ng_module")
-load("@npm_bazel_rollup//:index.bzl", "rollup_bundle")
-load("@npm_bazel_terser//:index.bzl", "terser_minified")
-load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
+load("@npm//@angular/bazel:index.bzl", "ng_module")
+load("@npm//@bazel/rollup:index.bzl", "rollup_bundle")
+load("@npm//@bazel/terser:index.bzl", "terser_minified")
+load("@npm//@bazel/typescript:index.bzl", "ts_devserver")
 
 # Allow targets under sub-packages to reference the tsconfig.json file
 exports_files(["tsconfig.json"])
diff --git a/integration/bazel/src/app.component.ts b/integration/bazel/src/app.component.ts
index 0801972313358..6b0e7cc515204 100644
--- a/integration/bazel/src/app.component.ts
+++ b/integration/bazel/src/app.component.ts
@@ -15,6 +15,6 @@ export class AppComponent {
   constructor(private http: HttpClient) {}
 
   time$: Observable<string> =
-      this.http.get('http://worldclockapi.com/api/json/pst/now')
-          .pipe(map((result: any) => result.currentDateTime), startWith(['...']));
+      this.http.get('http://worldtimeapi.org/api/timezone/America/Los_Angeles.json')
+          .pipe(map((result: any) => result.datetime), startWith(['...']));
 }
diff --git a/integration/bazel/src/hello-world/BUILD.bazel b/integration/bazel/src/hello-world/BUILD.bazel
index 5f72e67774e96..615aab8117e57 100644
--- a/integration/bazel/src/hello-world/BUILD.bazel
+++ b/integration/bazel/src/hello-world/BUILD.bazel
@@ -1,23 +1,23 @@
 package(default_visibility = ["//visibility:public"])
 
-load("@npm_bazel_karma//:index.bzl", "karma_web_test_suite")
-load("@npm_bazel_typescript//:index.bzl", "ts_library")
+load("@npm//@bazel/karma:index.bzl", "karma_web_test_suite")
+load("@npm//@bazel/typescript:index.bzl", "ts_library")
 load("@io_bazel_rules_sass//sass:sass.bzl", "sass_binary")
-load("@npm_angular_bazel//:index.bzl", "ng_module", "ng_package")
+load("@npm//@angular/bazel:index.bzl", "ng_package")
+load("//tools:ng_ts_library.bzl", "ng_ts_library")
 
 sass_binary(
     name = "hello-world-styles",
     src = "hello-world.component.scss",
 )
 
-ng_module(
+ng_ts_library(
     name = "hello-world",
     srcs = glob(
         ["*.ts"],
         exclude = ["*.spec.ts"],
     ),
     assets = [":hello-world-styles"],
-    generate_ve_shims = True,
     deps = [
         "@npm//@angular/core",
         "@npm//@types",
diff --git a/integration/bazel/test/e2e/BUILD.bazel b/integration/bazel/test/e2e/BUILD.bazel
index 933e7fc1b976f..19440263601bb 100644
--- a/integration/bazel/test/e2e/BUILD.bazel
+++ b/integration/bazel/test/e2e/BUILD.bazel
@@ -1,5 +1,5 @@
-load("@npm_bazel_protractor//:index.bzl", "protractor_web_test_suite")
-load("@npm_bazel_typescript//:index.bzl", "ts_library")
+load("@npm//@bazel/protractor:index.bzl", "protractor_web_test_suite")
+load("@npm//@bazel/typescript:index.bzl", "ts_library")
 
 ts_library(
     name = "e2e",
diff --git a/integration/bazel/tools/BUILD.bazel b/integration/bazel/tools/BUILD.bazel
new file mode 100644
index 0000000000000..d2f335e89bf90
--- /dev/null
+++ b/integration/bazel/tools/BUILD.bazel
@@ -0,0 +1,15 @@
+load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary")
+
+# Custom ts_library compiler that runs tsc_wrapped with angular/compiler-cli statically linked
+# This can be used with worker mode because we don't need the linker at runtime to make
+# the angular plugin loadable
+# Just a clone of @npm//@bazel/typescript/bin:tsc_wrapped with added deps
+nodejs_binary(
+    name = "tsc_wrapped_with_angular",
+    data = [
+        "@npm//@angular/compiler-cli",
+        "@npm//@bazel/typescript",
+    ],
+    entry_point = "@npm//:node_modules/@bazel/typescript/internal/tsc_wrapped/tsc_wrapped.js",
+    visibility = ["//:__subpackages__"],
+)
diff --git a/integration/bazel/tools/ng_ts_library.bzl b/integration/bazel/tools/ng_ts_library.bzl
new file mode 100644
index 0000000000000..fc36c5bc5fd60
--- /dev/null
+++ b/integration/bazel/tools/ng_ts_library.bzl
@@ -0,0 +1,13 @@
+"Shows how to enable both worker mode and use_angular_plugin to make a drop-in replacement for ng_module"
+
+load("@npm//@bazel/typescript:index.bzl", "ts_library")
+
+def ng_ts_library(**kwargs):
+    angular_assets = kwargs.pop("assets", []) + kwargs.pop("angular_assets", [])
+    ts_library(
+        compiler = "//tools:tsc_wrapped_with_angular",
+        supports_workers = True,
+        use_angular_plugin = True,
+        angular_assets = angular_assets,
+        **kwargs
+    )
diff --git a/integration/bazel/yarn.lock b/integration/bazel/yarn.lock
index 07d373b800f82..9cf0c6683f2e1 100644
--- a/integration/bazel/yarn.lock
+++ b/integration/bazel/yarn.lock
@@ -3,12 +3,14 @@
 
 
 "@angular/animations@file:../../dist/packages-dist/animations":
-  version "10.0.0-next.5"
+  version "11.0.0-next.4"
+  dependencies:
+    tslib "^2.0.0"
 
 "@angular/bazel@file:../../dist/packages-dist/bazel":
-  version "10.0.0-next.5"
+  version "11.0.0-next.4"
   dependencies:
-    "@microsoft/api-extractor" "^7.3.9"
+    "@microsoft/api-extractor" "^7.7.13"
     shelljs "0.8.2"
     tsickle "^0.38.0"
 
@@ -22,11 +24,15 @@
     parse5 "^5.0.0"
 
 "@angular/common@file:../../dist/packages-dist/common":
-  version "10.0.0-next.5"
+  version "11.0.0-next.4"
+  dependencies:
+    tslib "^2.0.0"
 
 "@angular/compiler-cli@file:../../dist/packages-dist/compiler-cli":
-  version "10.0.0-next.5"
+  version "11.0.0-next.4"
   dependencies:
+    "@babel/core" "^7.8.6"
+    "@babel/types" "^7.8.6"
     canonical-path "1.0.0"
     chokidar "^3.0.0"
     convert-source-map "^1.5.1"
@@ -38,16 +44,23 @@
     semver "^6.3.0"
     source-map "^0.6.1"
     sourcemap-codec "^1.4.8"
+    tslib "^2.0.0"
     yargs "15.3.0"
 
 "@angular/compiler@file:../../dist/packages-dist/compiler":
-  version "10.0.0-next.5"
+  version "11.0.0-next.4"
+  dependencies:
+    tslib "^2.0.0"
 
 "@angular/core@file:../../dist/packages-dist/core":
-  version "10.0.0-next.5"
+  version "11.0.0-next.4"
+  dependencies:
+    tslib "^2.0.0"
 
 "@angular/forms@file:../../dist/packages-dist/forms":
-  version "10.0.0-next.5"
+  version "11.0.0-next.4"
+  dependencies:
+    tslib "^2.0.0"
 
 "@angular/material@8.0.1":
   version "8.0.1"
@@ -57,98 +70,257 @@
     tslib "^1.7.1"
 
 "@angular/platform-browser-dynamic@file:../../dist/packages-dist/platform-browser-dynamic":
-  version "10.0.0-next.5"
+  version "11.0.0-next.4"
+  dependencies:
+    tslib "^2.0.0"
 
 "@angular/platform-browser@file:../../dist/packages-dist/platform-browser":
-  version "10.0.0-next.5"
+  version "11.0.0-next.4"
+  dependencies:
+    tslib "^2.0.0"
 
 "@angular/router@file:../../dist/packages-dist/router":
-  version "10.0.0-next.5"
+  version "11.0.0-next.4"
+  dependencies:
+    tslib "^2.0.0"
+
+"@babel/code-frame@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a"
+  integrity sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==
+  dependencies:
+    "@babel/highlight" "^7.10.4"
+
+"@babel/core@^7.8.6":
+  version "7.11.6"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.11.6.tgz#3a9455dc7387ff1bac45770650bc13ba04a15651"
+  integrity sha512-Wpcv03AGnmkgm6uS6k8iwhIwTrcP0m17TL1n1sy7qD0qelDu4XNeW0dN0mHfa+Gei211yDaLoEe/VlbXQzM4Bg==
+  dependencies:
+    "@babel/code-frame" "^7.10.4"
+    "@babel/generator" "^7.11.6"
+    "@babel/helper-module-transforms" "^7.11.0"
+    "@babel/helpers" "^7.10.4"
+    "@babel/parser" "^7.11.5"
+    "@babel/template" "^7.10.4"
+    "@babel/traverse" "^7.11.5"
+    "@babel/types" "^7.11.5"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.1"
+    json5 "^2.1.2"
+    lodash "^4.17.19"
+    resolve "^1.3.2"
+    semver "^5.4.1"
+    source-map "^0.5.0"
+
+"@babel/generator@^7.11.5", "@babel/generator@^7.11.6":
+  version "7.11.6"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.11.6.tgz#b868900f81b163b4d464ea24545c61cbac4dc620"
+  integrity sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==
+  dependencies:
+    "@babel/types" "^7.11.5"
+    jsesc "^2.5.1"
+    source-map "^0.5.0"
+
+"@babel/helper-function-name@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz#d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a"
+  integrity sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==
+  dependencies:
+    "@babel/helper-get-function-arity" "^7.10.4"
+    "@babel/template" "^7.10.4"
+    "@babel/types" "^7.10.4"
+
+"@babel/helper-get-function-arity@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz#98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2"
+  integrity sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==
+  dependencies:
+    "@babel/types" "^7.10.4"
+
+"@babel/helper-member-expression-to-functions@^7.10.4":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz#ae69c83d84ee82f4b42f96e2a09410935a8f26df"
+  integrity sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==
+  dependencies:
+    "@babel/types" "^7.11.0"
+
+"@babel/helper-module-imports@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz#4c5c54be04bd31670a7382797d75b9fa2e5b5620"
+  integrity sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==
+  dependencies:
+    "@babel/types" "^7.10.4"
+
+"@babel/helper-module-transforms@^7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz#b16f250229e47211abdd84b34b64737c2ab2d359"
+  integrity sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==
+  dependencies:
+    "@babel/helper-module-imports" "^7.10.4"
+    "@babel/helper-replace-supers" "^7.10.4"
+    "@babel/helper-simple-access" "^7.10.4"
+    "@babel/helper-split-export-declaration" "^7.11.0"
+    "@babel/template" "^7.10.4"
+    "@babel/types" "^7.11.0"
+    lodash "^4.17.19"
+
+"@babel/helper-optimise-call-expression@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz#50dc96413d594f995a77905905b05893cd779673"
+  integrity sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==
+  dependencies:
+    "@babel/types" "^7.10.4"
+
+"@babel/helper-replace-supers@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz#d585cd9388ea06e6031e4cd44b6713cbead9e6cf"
+  integrity sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==
+  dependencies:
+    "@babel/helper-member-expression-to-functions" "^7.10.4"
+    "@babel/helper-optimise-call-expression" "^7.10.4"
+    "@babel/traverse" "^7.10.4"
+    "@babel/types" "^7.10.4"
+
+"@babel/helper-simple-access@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz#0f5ccda2945277a2a7a2d3a821e15395edcf3461"
+  integrity sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==
+  dependencies:
+    "@babel/template" "^7.10.4"
+    "@babel/types" "^7.10.4"
+
+"@babel/helper-split-export-declaration@^7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz#f8a491244acf6a676158ac42072911ba83ad099f"
+  integrity sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==
+  dependencies:
+    "@babel/types" "^7.11.0"
+
+"@babel/helper-validator-identifier@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2"
+  integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==
+
+"@babel/helpers@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.10.4.tgz#2abeb0d721aff7c0a97376b9e1f6f65d7a475044"
+  integrity sha512-L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA==
+  dependencies:
+    "@babel/template" "^7.10.4"
+    "@babel/traverse" "^7.10.4"
+    "@babel/types" "^7.10.4"
+
+"@babel/highlight@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143"
+  integrity sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.10.4"
+    chalk "^2.0.0"
+    js-tokens "^4.0.0"
+
+"@babel/parser@^7.10.4", "@babel/parser@^7.11.5":
+  version "7.11.5"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.11.5.tgz#c7ff6303df71080ec7a4f5b8c003c58f1cf51037"
+  integrity sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==
+
+"@babel/template@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz#3251996c4200ebc71d1a8fc405fba940f36ba278"
+  integrity sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==
+  dependencies:
+    "@babel/code-frame" "^7.10.4"
+    "@babel/parser" "^7.10.4"
+    "@babel/types" "^7.10.4"
+
+"@babel/traverse@^7.10.4", "@babel/traverse@^7.11.5":
+  version "7.11.5"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.11.5.tgz#be777b93b518eb6d76ee2e1ea1d143daa11e61c3"
+  integrity sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==
+  dependencies:
+    "@babel/code-frame" "^7.10.4"
+    "@babel/generator" "^7.11.5"
+    "@babel/helper-function-name" "^7.10.4"
+    "@babel/helper-split-export-declaration" "^7.11.0"
+    "@babel/parser" "^7.11.5"
+    "@babel/types" "^7.11.5"
+    debug "^4.1.0"
+    globals "^11.1.0"
+    lodash "^4.17.19"
+
+"@babel/types@^7.10.4", "@babel/types@^7.11.0", "@babel/types@^7.11.5", "@babel/types@^7.8.6":
+  version "7.11.5"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.11.5.tgz#d9de577d01252d77c6800cee039ee64faf75662d"
+  integrity sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.10.4"
+    lodash "^4.17.19"
+    to-fast-properties "^2.0.0"
 
 "@bazel/bazelisk@file:../../node_modules/@bazel/bazelisk":
   version "1.4.0"
 
-"@bazel/karma@1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-1.6.0.tgz#98950b71114dd9ec169e6778a35d31ae1f578655"
-  integrity sha512-9cX0E1SiMWwA70ZMFnMzeqSRn3biduGx03bGV77FSUYKocZpyfU2cOEygYGfxAqHnyM7x4cS8nflRv3+ZE0Aqg==
+"@bazel/karma@2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-2.2.0.tgz#9bf6f6f1aa5f12b25468b1cad5e4404138436600"
+  integrity sha512-qyVE7vZ/qaibmpmcRdjS0rlorLGR0zZtlUSImVVTcPTSXqt364fp8TWBWe7oOneJ1SOVyUmTOAzyE86ArxZ/AA==
   dependencies:
     tmp "0.1.0"
 
-"@bazel/protractor@1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@bazel/protractor/-/protractor-1.6.0.tgz#cf095a1dbc038def7031c513a3b87f4e79bedb00"
-  integrity sha512-gPiRv0oUJbVPpQ9nrwe5vjkffAc8VsYJhpTGgG+8aPdOaTLWgmBP/sy4BdfijU9O1Z/mNYojQCZgMzQz6kAvdg==
+"@bazel/protractor@2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@bazel/protractor/-/protractor-2.2.0.tgz#721b06507b84bf6d61d0e843e0af9939c6ad35a4"
+  integrity sha512-7dvAXxf/rGoi+S4+DWg8HNx3Co9s0kMg1xnBJ4T4nPF5wqSEoItkR6wsjkjQyocA2kIXan+HQcQvw4iIDMhGmg==
 
-"@bazel/rollup@1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@bazel/rollup/-/rollup-1.6.0.tgz#c0bdad0ad0ba5c5b2e21d1634dc2ce48840ca044"
-  integrity sha512-MLF7laHX3CSAJH+RbIEVWgnQdz3U8dPkdJWJqiX/z9mUSEgC47LNsMBPKlRy1TpOJOpw1j0vLaJv0qN/bgq9NQ==
+"@bazel/rollup@2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@bazel/rollup/-/rollup-2.2.0.tgz#15651d545114e08db056f10a1eeaa4e76fc4df56"
+  integrity sha512-N4SyrvFkdAVc24CqFNhDtrR6P3XJTdPGziCuF7QM/BGihnsGlxF6+Dt2n5BTLJnObiB1St8vtRwCtAY8faxYWQ==
 
-"@bazel/terser@1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@bazel/terser/-/terser-1.6.0.tgz#63ccd20dd6c9793e7b3b23fb5ea82b55b3ef6eb2"
-  integrity sha512-csBrN4XfX/hYTtDVcH/ulVO9K4Ca/IlrCWk5o/l7JBJq/cHoTj5AWIA7PKJ4QgnxXeEjso4CmLFgUMEVKVYV3Q==
+"@bazel/terser@2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@bazel/terser/-/terser-2.2.0.tgz#e0452f3d20e41d5e63048b3eea3280256172fd30"
+  integrity sha512-vukKS9ayJsW/eFFX6tG2Blem+NmEWbcYuCXxwgjL/uYiMCL/uowaTpcvVp9B+DsNSXhGyohOYwud0nBreSUFzg==
 
-"@bazel/typescript@1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-1.6.0.tgz#8dfd29e71bcf917d5f9cb67f19ac4dcfc9082439"
-  integrity sha512-vAKuwy1Hgl+t3M3sH/G0oqHRYN35TdENj+0lsCI3x7EbSzyI6cbA3YQrLrlyvdScksqOpZa3PZ3UBGqfJJq2DA==
+"@bazel/typescript@2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-2.2.0.tgz#f2d3dce8715d574fe3146f19fdb8479abcc4d608"
+  integrity sha512-Thf8pXntBzE3EvJtyiTBNsfIf1QnYmGPQmUSGLcKUuuFoplUVYShMRHaxBoPZmYsnD/x+BFLgUKIzlXiEQpGqQ==
   dependencies:
     protobufjs "6.8.8"
     semver "5.6.0"
     source-map-support "0.5.9"
     tsutils "2.27.2"
 
-"@microsoft/api-extractor-model@7.7.7":
-  version "7.7.7"
-  resolved "https://registry.yarnpkg.com/@microsoft/api-extractor-model/-/api-extractor-model-7.7.7.tgz#1d15eae7a19b72abbfca9053f200fe79b6f9d755"
-  integrity sha512-822kyHMEx2sl+KnBioEiFoTIXuz/4pYBo94nQ4AMqb9BFvY9I1AZUPtC4HFh2zcXQqpFLpKKC55s/o8UOze2wQ==
+"@microsoft/api-extractor-model@7.8.12":
+  version "7.8.12"
+  resolved "https://registry.yarnpkg.com/@microsoft/api-extractor-model/-/api-extractor-model-7.8.12.tgz#d089193ef29275b8b20802498c6bdfab80dcef59"
+  integrity sha512-lE9xcNStS2hf5K+ZQy4L9DQ9Xd62bNsMqW+SyPQWXuQ5HJqUBSXJ2yxCWXP/+rcAkFCvZrikbql9M8Z88nKvwQ==
   dependencies:
-    "@microsoft/node-core-library" "3.19.3"
-    "@microsoft/tsdoc" "0.12.14"
+    "@microsoft/tsdoc" "0.12.19"
+    "@rushstack/node-core-library" "3.25.0"
 
-"@microsoft/api-extractor@^7.3.9":
-  version "7.7.8"
-  resolved "https://registry.yarnpkg.com/@microsoft/api-extractor/-/api-extractor-7.7.8.tgz#19b0bca8a2113d4ded55a270266bc2b802de1a43"
-  integrity sha512-XNO6Dk6ByfJq24Cn1/j0B0F16ZtwYnEC/sxgB/M0wTphBdBlHjRXZmxofmjirBBj9f7vG4UJ18IOIZRLbhGFPw==
+"@microsoft/api-extractor@^7.7.13":
+  version "7.9.2"
+  resolved "https://registry.yarnpkg.com/@microsoft/api-extractor/-/api-extractor-7.9.2.tgz#3bb8c93f4280fcb94171e4214d714e1639f4fbd4"
+  integrity sha512-R4b3zXlYdicoS8bRLXEChTKLPyhUHrG1cb0GDtOX0zdoxlovU1p0JaPt97A/vC7N3Gm2E8gd2qsDWElKU3/wKQ==
   dependencies:
-    "@microsoft/api-extractor-model" "7.7.7"
-    "@microsoft/node-core-library" "3.19.3"
-    "@microsoft/ts-command-line" "4.3.10"
-    "@microsoft/tsdoc" "0.12.14"
+    "@microsoft/api-extractor-model" "7.8.12"
+    "@microsoft/tsdoc" "0.12.19"
+    "@rushstack/node-core-library" "3.25.0"
+    "@rushstack/ts-command-line" "4.4.6"
     colors "~1.2.1"
     lodash "~4.17.15"
-    resolve "1.8.1"
+    resolve "~1.17.0"
+    semver "~7.3.0"
     source-map "~0.6.1"
-    typescript "~3.7.2"
-
-"@microsoft/node-core-library@3.19.3":
-  version "3.19.3"
-  resolved "https://registry.yarnpkg.com/@microsoft/node-core-library/-/node-core-library-3.19.3.tgz#cf09ddb2905a29b32956d4a88f9d035a00637be9"
-  integrity sha512-rJ+hT6+XK5AESbhn31YBnHKpZSFKCmqHCRZyK9+jyWwav1HXv0qzuXnFvnyrO0MZyJ6rH0seWOZVWbU5KGv1tg==
-  dependencies:
-    "@types/node" "10.17.13"
-    colors "~1.2.1"
-    fs-extra "~7.0.1"
-    jju "~1.4.0"
-    semver "~5.3.0"
-    timsort "~0.3.0"
-    z-schema "~3.18.3"
+    typescript "~3.9.5"
 
-"@microsoft/ts-command-line@4.3.10":
-  version "4.3.10"
-  resolved "https://registry.yarnpkg.com/@microsoft/ts-command-line/-/ts-command-line-4.3.10.tgz#fcb4f5ea43c93d17db6cc810bbee39ea32b2a86d"
-  integrity sha512-AgxArGqPt0H5WTo3fxNFP3Blm3obkCCopVG9kwIo+/mMdXaj6qMDn6+8Bv8+5Nke3CvvXpKAZtu3IaGY5cV1Hg==
-  dependencies:
-    "@types/argparse" "1.0.33"
-    argparse "~1.0.9"
-    colors "~1.2.1"
-
-"@microsoft/tsdoc@0.12.14":
-  version "0.12.14"
-  resolved "https://registry.yarnpkg.com/@microsoft/tsdoc/-/tsdoc-0.12.14.tgz#0e0810a0a174e50e22dfe8edb30599840712f22d"
-  integrity sha512-518yewjSga1jLdiLrcmpMFlaba5P+50b0TWNFUpC+SL9Yzf0kMi57qw+bMl+rQ08cGqH1vLx4eg9YFUbZXgZ0Q==
+"@microsoft/tsdoc@0.12.19":
+  version "0.12.19"
+  resolved "https://registry.yarnpkg.com/@microsoft/tsdoc/-/tsdoc-0.12.19.tgz#2173ccb92469aaf62031fa9499d21b16d07f9b57"
+  integrity sha512-IpgPxHrNxZiMNUSXqR1l/gePKPkfAmIKoDRP9hp7OwjU29ZR8WCJsOJ8iBKgw0Qk+pFwR+8Y1cy8ImLY6e9m4A==
 
 "@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2":
   version "1.1.2"
@@ -203,10 +375,32 @@
   resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
   integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=
 
-"@types/argparse@1.0.33":
-  version "1.0.33"
-  resolved "https://registry.yarnpkg.com/@types/argparse/-/argparse-1.0.33.tgz#2728669427cdd74a99e53c9f457ca2866a37c52d"
-  integrity sha512-VQgHxyPMTj3hIlq9SY1mctqx+Jj8kpQfoLvDlVSDNOyuYs8JYfkuY3OW/4+dO657yPmNhHpePRx0/Tje5ImNVQ==
+"@rushstack/node-core-library@3.25.0":
+  version "3.25.0"
+  resolved "https://registry.yarnpkg.com/@rushstack/node-core-library/-/node-core-library-3.25.0.tgz#ba40bc1b188ab5d31f5705999cd2b3b56b8a32cf"
+  integrity sha512-e2NCFtAu/eu14b8nlzRX6ZrE9Sb3J2wVt+pninQmTn/IgfnRLAtM0D4PzUO4+ktZwF9fCnpqrOGokLzw6RSVNw==
+  dependencies:
+    "@types/node" "10.17.13"
+    colors "~1.2.1"
+    fs-extra "~7.0.1"
+    jju "~1.4.0"
+    semver "~7.3.0"
+    timsort "~0.3.0"
+    z-schema "~3.18.3"
+
+"@rushstack/ts-command-line@4.4.6":
+  version "4.4.6"
+  resolved "https://registry.yarnpkg.com/@rushstack/ts-command-line/-/ts-command-line-4.4.6.tgz#7818f19e444274e68564a756ef62a2b4e0ced0f8"
+  integrity sha512-ue3p2m773Yea/s4Ef2Q3gEyLd9T0NDjXCl+PlodGTrJHgxoiRwbROSWHAdYJL/LceGWa6Biqizu9qxUDEWFweQ==
+  dependencies:
+    "@types/argparse" "1.0.38"
+    argparse "~1.0.9"
+    colors "~1.2.1"
+
+"@types/argparse@1.0.38":
+  version "1.0.38"
+  resolved "https://registry.yarnpkg.com/@types/argparse/-/argparse-1.0.38.tgz#a81fd8606d481f873a3800c6ebae4f1d768a56a9"
+  integrity sha512-ebDJ9b0e702Yr7pWgB0jzm+CX4Srzz8RcXtLJDJB+BSccqMa36uyH/zUsSYao5+BD1ytv3k3rPYCq4mAE1hsXA==
 
 "@types/color-name@^1.1.1":
   version "1.1.1"
@@ -315,6 +509,13 @@ ansi-styles@^2.2.1:
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
   integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
 
+ansi-styles@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
+  dependencies:
+    color-convert "^1.9.0"
+
 ansi-styles@^4.0.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359"
@@ -567,6 +768,15 @@ chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
+chalk@^2.0.0:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
+  dependencies:
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
+
 chokidar@^3.0.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.3.0.tgz#12c0714668c55800f659e262d4962a97faf554a6"
@@ -591,6 +801,13 @@ cliui@^6.0.0:
     strip-ansi "^6.0.0"
     wrap-ansi "^6.2.0"
 
+color-convert@^1.9.0:
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
+  dependencies:
+    color-name "1.1.3"
+
 color-convert@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
@@ -598,6 +815,11 @@ color-convert@^2.0.1:
   dependencies:
     color-name "~1.1.4"
 
+color-name@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
+
 color-name@~1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
@@ -667,6 +889,13 @@ convert-source-map@^1.5.1:
   dependencies:
     safe-buffer "~5.1.1"
 
+convert-source-map@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
+  integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
+  dependencies:
+    safe-buffer "~5.1.1"
+
 cookie@0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
@@ -713,6 +942,13 @@ debug@^3.0.0, debug@^3.1.0, debug@^3.1.1, debug@^3.2.6:
   dependencies:
     ms "^2.1.1"
 
+debug@^4.1.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz#7f150f93920e94c58f5574c2fd01a3110effe7f1"
+  integrity sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==
+  dependencies:
+    ms "2.1.2"
+
 debug@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
@@ -907,7 +1143,7 @@ escape-html@~1.0.3:
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
   integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
 
-escape-string-regexp@^1.0.2:
+escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
@@ -1039,6 +1275,11 @@ function-bind@^1.1.1:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
+gensync@^1.0.0-beta.1:
+  version "1.0.0-beta.1"
+  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269"
+  integrity sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==
+
 get-caller-file@^2.0.1:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
@@ -1082,6 +1323,11 @@ glob@^7.0.3, glob@^7.0.6, glob@^7.1.1:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+globals@^11.1.0:
+  version "11.12.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
+  integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
+
 globby@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
@@ -1131,6 +1377,11 @@ has-cors@1.1.0:
   resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
   integrity sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=
 
+has-flag@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
+
 has-symbols@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
@@ -1396,11 +1647,21 @@ jju@~1.4.0:
   resolved "https://registry.yarnpkg.com/jju/-/jju-1.4.0.tgz#a3abe2718af241a2b2904f84a625970f389ae32a"
   integrity sha1-o6vicYryQaKykE+EpiWXDzia4yo=
 
+js-tokens@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
+
 jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
   integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
 
+jsesc@^2.5.1:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
+  integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
+
 json-schema-traverse@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
@@ -1416,6 +1677,13 @@ json-stringify-safe@~5.0.1:
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
+json5@^2.1.2:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"
+  integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==
+  dependencies:
+    minimist "^1.2.5"
+
 jsonfile@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
@@ -1537,6 +1805,11 @@ lodash@^4.17.14, lodash@~4.17.15:
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
 
+lodash@^4.17.19:
+  version "4.17.20"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
+  integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
+
 log4js@^4.0.0:
   version "4.5.1"
   resolved "https://registry.yarnpkg.com/log4js/-/log4js-4.5.1.tgz#e543625e97d9e6f3e6e7c9fc196dd6ab2cae30b5"
@@ -1612,6 +1885,11 @@ minimist@^1.1.0, minimist@^1.2.0:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
   integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
 
+minimist@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
+  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+
 minimist@~0.0.1:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
@@ -1629,7 +1907,7 @@ ms@2.0.0:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
   integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
-ms@^2.1.1:
+ms@2.1.2, ms@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
@@ -1772,7 +2050,7 @@ path-is-inside@^1.0.1:
   resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
   integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
 
-path-parse@^1.0.5, path-parse@^1.0.6:
+path-parse@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
   integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
@@ -2011,13 +2289,6 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve@1.8.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26"
-  integrity sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==
-  dependencies:
-    path-parse "^1.0.5"
-
 resolve@^1.1.6, resolve@^1.11.0, resolve@^1.11.1:
   version "1.12.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.12.0.tgz#3fc644a35c84a48554609ff26ec52b66fa577df6"
@@ -2025,6 +2296,13 @@ resolve@^1.1.6, resolve@^1.11.0, resolve@^1.11.1:
   dependencies:
     path-parse "^1.0.6"
 
+resolve@^1.3.2, resolve@~1.17.0:
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444"
+  integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==
+  dependencies:
+    path-parse "^1.0.6"
+
 rfdc@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.1.4.tgz#ba72cc1367a0ccd9cf81a870b3b58bd3ad07f8c2"
@@ -2135,7 +2413,7 @@ semver@5.6.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
   integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
 
-semver@^5.3.0:
+semver@^5.3.0, semver@^5.4.1:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
@@ -2145,10 +2423,10 @@ semver@^6.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@~5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
-  integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8=
+semver@~7.3.0:
+  version "7.3.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
+  integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
 
 set-blocking@^2.0.0:
   version "2.0.0"
@@ -2259,7 +2537,7 @@ source-map-url@^0.4.0:
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
   integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
 
-source-map@^0.5.6:
+source-map@^0.5.0, source-map@^0.5.6:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
@@ -2366,6 +2644,13 @@ supports-color@^2.0.0:
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
   integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
 
+supports-color@^5.3.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
+  dependencies:
+    has-flag "^3.0.0"
+
 terser@4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/terser/-/terser-4.4.0.tgz#22c46b4817cf4c9565434bfe6ad47336af259ac3"
@@ -2406,6 +2691,11 @@ to-array@0.1.4:
   resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"
   integrity sha1-F+bBH3PdTz10zaek/zI46a2b+JA=
 
+to-fast-properties@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
+  integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
+
 to-regex-range@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
@@ -2436,8 +2726,13 @@ tslib@^1.7.1, tslib@^1.8.1, tslib@^1.9.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
   integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==
 
+tslib@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.0.tgz#18d13fc2dce04051e20f074cc8387fd8089ce4f3"
+  integrity sha512-lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g==
+
 "tslib@file:../../node_modules/tslib":
-  version "1.11.1"
+  version "2.0.0"
 
 tsutils@2.27.2:
   version "2.27.2"
@@ -2466,15 +2761,13 @@ type-is@~1.6.17:
     media-typer "0.3.0"
     mime-types "~2.1.24"
 
-typescript@3.8.3:
-  version "3.8.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz#409eb8544ea0335711205869ec458ab109ee1061"
-  integrity sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==
+"typescript@file:../../node_modules/typescript":
+  version "4.0.2"
 
-typescript@~3.7.2:
-  version "3.7.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.5.tgz#0692e21f65fd4108b9330238aac11dd2e177a1ae"
-  integrity sha512-/P5lkRXkWHNAbcJIiHPfRoKqyd7bsyCma1hZNUGfn20qm64T6ZBlrzprymeu918H+mB/0rIg2gGK/BXkhhYgBw==
+typescript@~3.9.5:
+  version "3.9.6"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.6.tgz#8f3e0198a34c3ae17091b35571d3afd31999365a"
+  integrity sha512-Pspx3oKAPJtjNwE92YS05HQoY7z2SFyOpHo9MqJor3BXAGNaPUs83CuVp9VISFkSjyRfiTpmKuAYGJB7S7hOxw==
 
 ultron@~1.1.0:
   version "1.1.1"
@@ -2700,5 +2993,7 @@ z-schema@~3.18.3:
   optionalDependencies:
     commander "^2.7.1"
 
-"zone.js@file:../../dist/zone.js-dist":
-  version "0.0.0"
+"zone.js@file:../../dist/zone.js-dist/zone.js":
+  version "0.11.2"
+  dependencies:
+    tslib "^2.0.0"
diff --git a/integration/cli-hello-world-ivy-compat/browserslist b/integration/cli-hello-world-ivy-compat/browserslist
index 80848532e47d5..92197689d65b0 100644
--- a/integration/cli-hello-world-ivy-compat/browserslist
+++ b/integration/cli-hello-world-ivy-compat/browserslist
@@ -9,4 +9,4 @@
 last 2 versions
 Firefox ESR
 not dead
-not IE 9-11 # For IE 9-11 support, remove 'not'.
\ No newline at end of file
+not IE 11 # For IE 11 support, remove 'not'.
\ No newline at end of file
diff --git a/integration/cli-hello-world-ivy-compat/package.json b/integration/cli-hello-world-ivy-compat/package.json
index 52b46ebceb072..d44c1b73d5dde 100644
--- a/integration/cli-hello-world-ivy-compat/package.json
+++ b/integration/cli-hello-world-ivy-compat/package.json
@@ -24,7 +24,7 @@
     "@angular/router": "file:../../dist/packages-dist/router",
     "rxjs": "file:../../node_modules/rxjs",
     "tslib": "file:../../node_modules/tslib",
-    "zone.js": "file:../../dist/zone.js-dist/zone.js"
+    "zone.js": "file:../../dist/zone.js-dist/archive/zone.js.tgz"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "file:../../node_modules/@angular-devkit/build-angular",
@@ -37,7 +37,7 @@
     "codelyzer": "5.2.0",
     "jasmine-core": "3.5.0",
     "jasmine-spec-reporter": "4.2.1",
-    "karma": "4.3.0",
+    "karma": "4.4.0",
     "karma-chrome-launcher": "3.1.0",
     "karma-coverage-istanbul-reporter": "2.1.0",
     "karma-jasmine": "2.0.1",
diff --git a/integration/cli-hello-world-ivy-compat/src/polyfills.ts b/integration/cli-hello-world-ivy-compat/src/polyfills.ts
index aa665d6b87408..f39dafba9caeb 100644
--- a/integration/cli-hello-world-ivy-compat/src/polyfills.ts
+++ b/integration/cli-hello-world-ivy-compat/src/polyfills.ts
@@ -18,7 +18,7 @@
  * BROWSER POLYFILLS
  */
 
-/** IE10 and IE11 requires the following for NgClass support on SVG elements */
+/** IE11 requires the following for NgClass support on SVG elements */
 // import 'classlist.js';  // Run `npm install --save classlist.js`.
 
 /**
diff --git a/integration/cli-hello-world-ivy-compat/yarn.lock b/integration/cli-hello-world-ivy-compat/yarn.lock
index a9b3ba8f71af9..dc75f51f66501 100644
--- a/integration/cli-hello-world-ivy-compat/yarn.lock
+++ b/integration/cli-hello-world-ivy-compat/yarn.lock
@@ -5253,10 +5253,10 @@ karma-source-map-support@1.4.0:
   dependencies:
     source-map-support "^0.5.5"
 
-karma@4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-4.3.0.tgz#e14471ea090a952265a42ebb442b1a3c09832559"
-  integrity sha512-NSPViHOt+RW38oJklvYxQC4BSQsv737oQlr/r06pCM+slDOr4myuI1ivkRmp+3dVpJDfZt2DmaPJ2wkx+ZZuMQ==
+karma@4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/karma/-/karma-4.4.0.tgz#10f16117a37b388aa86618a8815b5c9acf1d7d6d"
+  integrity sha512-+mvzi+gBWHPrlqt1KE0WrrjcKuePX7WWJjTYNaewp6U00inno/DTSk+QHMbc+aV09scErWjhJukxswFyS7u2qw==
   dependencies:
     bluebird "^3.3.0"
     body-parser "^1.16.1"
@@ -5264,7 +5264,6 @@ karma@4.3.0:
     chokidar "^3.0.0"
     colors "^1.1.0"
     connect "^3.6.0"
-    core-js "^3.1.3"
     di "^0.0.1"
     dom-serialize "^2.2.0"
     flatted "^2.0.0"
diff --git a/integration/cli-hello-world-ivy-i18n/browserslist b/integration/cli-hello-world-ivy-i18n/browserslist
index 80848532e47d5..92197689d65b0 100644
--- a/integration/cli-hello-world-ivy-i18n/browserslist
+++ b/integration/cli-hello-world-ivy-i18n/browserslist
@@ -9,4 +9,4 @@
 last 2 versions
 Firefox ESR
 not dead
-not IE 9-11 # For IE 9-11 support, remove 'not'.
\ No newline at end of file
+not IE 11 # For IE 11 support, remove 'not'.
\ No newline at end of file
diff --git a/integration/cli-hello-world-ivy-i18n/package.json b/integration/cli-hello-world-ivy-i18n/package.json
index ed8e39797cb96..450ddec284a98 100644
--- a/integration/cli-hello-world-ivy-i18n/package.json
+++ b/integration/cli-hello-world-ivy-i18n/package.json
@@ -28,7 +28,7 @@
     "core-js": "file:../../node_modules/core-js",
     "rxjs": "file:../../node_modules/rxjs",
     "tslib": "file:../../node_modules/tslib",
-    "zone.js": "file:../../dist/zone.js-dist/zone.js"
+    "zone.js": "file:../../dist/zone.js-dist/archive/zone.js.tgz"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "file:../../node_modules/@angular-devkit/build-angular",
@@ -41,7 +41,7 @@
     "codelyzer": "5.2.0",
     "jasmine-core": "3.5.0",
     "jasmine-spec-reporter": "4.2.1",
-    "karma": "4.3.0",
+    "karma": "4.4.0",
     "karma-chrome-launcher": "3.1.0",
     "karma-coverage-istanbul-reporter": "2.1.0",
     "karma-jasmine": "2.0.1",
diff --git a/integration/cli-hello-world-ivy-i18n/src/polyfills.ts b/integration/cli-hello-world-ivy-i18n/src/polyfills.ts
index dcfb64083540e..ac4cd2caedf15 100644
--- a/integration/cli-hello-world-ivy-i18n/src/polyfills.ts
+++ b/integration/cli-hello-world-ivy-i18n/src/polyfills.ts
@@ -18,7 +18,7 @@
  * BROWSER POLYFILLS
  */
 
-/** IE10 and IE11 requires the following for NgClass support on SVG elements */
+/** IE11 requires the following for NgClass support on SVG elements */
 // import 'classlist.js';  // Run `npm install --save classlist.js`.
 
 /**
diff --git a/integration/cli-hello-world-ivy-i18n/yarn.lock b/integration/cli-hello-world-ivy-i18n/yarn.lock
index db8afee3a5800..19b5f627799ac 100644
--- a/integration/cli-hello-world-ivy-i18n/yarn.lock
+++ b/integration/cli-hello-world-ivy-i18n/yarn.lock
@@ -5278,10 +5278,10 @@ karma-source-map-support@1.4.0:
   dependencies:
     source-map-support "^0.5.5"
 
-karma@4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-4.3.0.tgz#e14471ea090a952265a42ebb442b1a3c09832559"
-  integrity sha512-NSPViHOt+RW38oJklvYxQC4BSQsv737oQlr/r06pCM+slDOr4myuI1ivkRmp+3dVpJDfZt2DmaPJ2wkx+ZZuMQ==
+karma@4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/karma/-/karma-4.4.0.tgz#10f16117a37b388aa86618a8815b5c9acf1d7d6d"
+  integrity sha512-+mvzi+gBWHPrlqt1KE0WrrjcKuePX7WWJjTYNaewp6U00inno/DTSk+QHMbc+aV09scErWjhJukxswFyS7u2qw==
   dependencies:
     bluebird "^3.3.0"
     body-parser "^1.16.1"
@@ -5289,7 +5289,6 @@ karma@4.3.0:
     chokidar "^3.0.0"
     colors "^1.1.0"
     connect "^3.6.0"
-    core-js "^3.1.3"
     di "^0.0.1"
     dom-serialize "^2.2.0"
     flatted "^2.0.0"
diff --git a/integration/cli-hello-world-ivy-minimal/browserslist b/integration/cli-hello-world-ivy-minimal/browserslist
index 80848532e47d5..92197689d65b0 100644
--- a/integration/cli-hello-world-ivy-minimal/browserslist
+++ b/integration/cli-hello-world-ivy-minimal/browserslist
@@ -9,4 +9,4 @@
 last 2 versions
 Firefox ESR
 not dead
-not IE 9-11 # For IE 9-11 support, remove 'not'.
\ No newline at end of file
+not IE 11 # For IE 11 support, remove 'not'.
\ No newline at end of file
diff --git a/integration/cli-hello-world-ivy-minimal/package.json b/integration/cli-hello-world-ivy-minimal/package.json
index 04e1ca0116093..ea176faaa9c80 100644
--- a/integration/cli-hello-world-ivy-minimal/package.json
+++ b/integration/cli-hello-world-ivy-minimal/package.json
@@ -24,7 +24,7 @@
     "@angular/router": "file:../../dist/packages-dist/router",
     "rxjs": "file:../../node_modules/rxjs",
     "tslib": "file:../../node_modules/tslib",
-    "zone.js": "file:../../dist/zone.js-dist/zone.js"
+    "zone.js": "file:../../dist/zone.js-dist/archive/zone.js.tgz"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "file:../../node_modules/@angular-devkit/build-angular",
@@ -37,7 +37,7 @@
     "codelyzer": "5.2.0",
     "jasmine-core": "3.5.0",
     "jasmine-spec-reporter": "4.2.1",
-    "karma": "4.3.0",
+    "karma": "4.4.0",
     "karma-chrome-launcher": "3.1.0",
     "karma-coverage-istanbul-reporter": "2.1.0",
     "karma-jasmine": "2.0.1",
diff --git a/integration/cli-hello-world-ivy-minimal/src/polyfills.ts b/integration/cli-hello-world-ivy-minimal/src/polyfills.ts
index aa665d6b87408..f39dafba9caeb 100644
--- a/integration/cli-hello-world-ivy-minimal/src/polyfills.ts
+++ b/integration/cli-hello-world-ivy-minimal/src/polyfills.ts
@@ -18,7 +18,7 @@
  * BROWSER POLYFILLS
  */
 
-/** IE10 and IE11 requires the following for NgClass support on SVG elements */
+/** IE11 requires the following for NgClass support on SVG elements */
 // import 'classlist.js';  // Run `npm install --save classlist.js`.
 
 /**
diff --git a/integration/cli-hello-world-ivy-minimal/yarn.lock b/integration/cli-hello-world-ivy-minimal/yarn.lock
index a9b3ba8f71af9..dc75f51f66501 100644
--- a/integration/cli-hello-world-ivy-minimal/yarn.lock
+++ b/integration/cli-hello-world-ivy-minimal/yarn.lock
@@ -5253,10 +5253,10 @@ karma-source-map-support@1.4.0:
   dependencies:
     source-map-support "^0.5.5"
 
-karma@4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-4.3.0.tgz#e14471ea090a952265a42ebb442b1a3c09832559"
-  integrity sha512-NSPViHOt+RW38oJklvYxQC4BSQsv737oQlr/r06pCM+slDOr4myuI1ivkRmp+3dVpJDfZt2DmaPJ2wkx+ZZuMQ==
+karma@4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/karma/-/karma-4.4.0.tgz#10f16117a37b388aa86618a8815b5c9acf1d7d6d"
+  integrity sha512-+mvzi+gBWHPrlqt1KE0WrrjcKuePX7WWJjTYNaewp6U00inno/DTSk+QHMbc+aV09scErWjhJukxswFyS7u2qw==
   dependencies:
     bluebird "^3.3.0"
     body-parser "^1.16.1"
@@ -5264,7 +5264,6 @@ karma@4.3.0:
     chokidar "^3.0.0"
     colors "^1.1.0"
     connect "^3.6.0"
-    core-js "^3.1.3"
     di "^0.0.1"
     dom-serialize "^2.2.0"
     flatted "^2.0.0"
diff --git a/integration/cli-hello-world-lazy-rollup/browserslist b/integration/cli-hello-world-lazy-rollup/browserslist
index 80848532e47d5..92197689d65b0 100644
--- a/integration/cli-hello-world-lazy-rollup/browserslist
+++ b/integration/cli-hello-world-lazy-rollup/browserslist
@@ -9,4 +9,4 @@
 last 2 versions
 Firefox ESR
 not dead
-not IE 9-11 # For IE 9-11 support, remove 'not'.
\ No newline at end of file
+not IE 11 # For IE 11 support, remove 'not'.
\ No newline at end of file
diff --git a/integration/cli-hello-world-lazy-rollup/package.json b/integration/cli-hello-world-lazy-rollup/package.json
index bae5154b9cd35..12681d1b94ba2 100644
--- a/integration/cli-hello-world-lazy-rollup/package.json
+++ b/integration/cli-hello-world-lazy-rollup/package.json
@@ -19,7 +19,7 @@
     "@angular/router": "file:../../dist/packages-dist/router",
     "rxjs": "file:../../node_modules/rxjs",
     "tslib": "file:../../node_modules/tslib",
-    "zone.js": "file:../../dist/zone.js-dist/zone.js"
+    "zone.js": "file:../../dist/zone.js-dist/archive/zone.js.tgz"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "file:../../node_modules/@angular-devkit/build-angular",
@@ -32,7 +32,7 @@
     "codelyzer": "5.1.2",
     "jasmine-core": "3.5.0",
     "jasmine-spec-reporter": "4.2.1",
-    "karma": "4.3.0",
+    "karma": "4.4.0",
     "karma-chrome-launcher": "3.1.0",
     "karma-coverage-istanbul-reporter": "2.1.0",
     "karma-jasmine": "2.0.1",
diff --git a/integration/cli-hello-world-lazy-rollup/src/polyfills.ts b/integration/cli-hello-world-lazy-rollup/src/polyfills.ts
index aa665d6b87408..f39dafba9caeb 100644
--- a/integration/cli-hello-world-lazy-rollup/src/polyfills.ts
+++ b/integration/cli-hello-world-lazy-rollup/src/polyfills.ts
@@ -18,7 +18,7 @@
  * BROWSER POLYFILLS
  */
 
-/** IE10 and IE11 requires the following for NgClass support on SVG elements */
+/** IE11 requires the following for NgClass support on SVG elements */
 // import 'classlist.js';  // Run `npm install --save classlist.js`.
 
 /**
diff --git a/integration/cli-hello-world-lazy-rollup/yarn.lock b/integration/cli-hello-world-lazy-rollup/yarn.lock
index f622c33cac979..7c6b3b721d373 100644
--- a/integration/cli-hello-world-lazy-rollup/yarn.lock
+++ b/integration/cli-hello-world-lazy-rollup/yarn.lock
@@ -5086,10 +5086,10 @@ karma-source-map-support@1.4.0:
   dependencies:
     source-map-support "^0.5.5"
 
-karma@4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-4.3.0.tgz#e14471ea090a952265a42ebb442b1a3c09832559"
-  integrity sha512-NSPViHOt+RW38oJklvYxQC4BSQsv737oQlr/r06pCM+slDOr4myuI1ivkRmp+3dVpJDfZt2DmaPJ2wkx+ZZuMQ==
+karma@4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/karma/-/karma-4.4.0.tgz#10f16117a37b388aa86618a8815b5c9acf1d7d6d"
+  integrity sha512-+mvzi+gBWHPrlqt1KE0WrrjcKuePX7WWJjTYNaewp6U00inno/DTSk+QHMbc+aV09scErWjhJukxswFyS7u2qw==
   dependencies:
     bluebird "^3.3.0"
     body-parser "^1.16.1"
@@ -5097,7 +5097,6 @@ karma@4.3.0:
     chokidar "^3.0.0"
     colors "^1.1.0"
     connect "^3.6.0"
-    core-js "^3.1.3"
     di "^0.0.1"
     dom-serialize "^2.2.0"
     flatted "^2.0.0"
diff --git a/integration/cli-hello-world-lazy/browserslist b/integration/cli-hello-world-lazy/browserslist
index 80848532e47d5..92197689d65b0 100644
--- a/integration/cli-hello-world-lazy/browserslist
+++ b/integration/cli-hello-world-lazy/browserslist
@@ -9,4 +9,4 @@
 last 2 versions
 Firefox ESR
 not dead
-not IE 9-11 # For IE 9-11 support, remove 'not'.
\ No newline at end of file
+not IE 11 # For IE 11 support, remove 'not'.
\ No newline at end of file
diff --git a/integration/cli-hello-world-lazy/package.json b/integration/cli-hello-world-lazy/package.json
index f6a9d15506e03..8c2584a5f68d5 100644
--- a/integration/cli-hello-world-lazy/package.json
+++ b/integration/cli-hello-world-lazy/package.json
@@ -19,7 +19,7 @@
     "@angular/router": "file:../../dist/packages-dist/router",
     "rxjs": "file:../../node_modules/rxjs",
     "tslib": "file:../../node_modules/tslib",
-    "zone.js": "file:../../dist/zone.js-dist/zone.js"
+    "zone.js": "file:../../dist/zone.js-dist/archive/zone.js.tgz"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "file:../../node_modules/@angular-devkit/build-angular",
@@ -32,7 +32,7 @@
     "codelyzer": "5.1.2",
     "jasmine-core": "3.5.0",
     "jasmine-spec-reporter": "4.2.1",
-    "karma": "4.3.0",
+    "karma": "4.4.0",
     "karma-chrome-launcher": "3.1.0",
     "karma-coverage-istanbul-reporter": "2.1.0",
     "karma-jasmine": "2.0.1",
diff --git a/integration/cli-hello-world-lazy/src/polyfills.ts b/integration/cli-hello-world-lazy/src/polyfills.ts
index aa665d6b87408..f39dafba9caeb 100644
--- a/integration/cli-hello-world-lazy/src/polyfills.ts
+++ b/integration/cli-hello-world-lazy/src/polyfills.ts
@@ -18,7 +18,7 @@
  * BROWSER POLYFILLS
  */
 
-/** IE10 and IE11 requires the following for NgClass support on SVG elements */
+/** IE11 requires the following for NgClass support on SVG elements */
 // import 'classlist.js';  // Run `npm install --save classlist.js`.
 
 /**
diff --git a/integration/cli-hello-world-lazy/yarn.lock b/integration/cli-hello-world-lazy/yarn.lock
index f622c33cac979..7c6b3b721d373 100644
--- a/integration/cli-hello-world-lazy/yarn.lock
+++ b/integration/cli-hello-world-lazy/yarn.lock
@@ -5086,10 +5086,10 @@ karma-source-map-support@1.4.0:
   dependencies:
     source-map-support "^0.5.5"
 
-karma@4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-4.3.0.tgz#e14471ea090a952265a42ebb442b1a3c09832559"
-  integrity sha512-NSPViHOt+RW38oJklvYxQC4BSQsv737oQlr/r06pCM+slDOr4myuI1ivkRmp+3dVpJDfZt2DmaPJ2wkx+ZZuMQ==
+karma@4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/karma/-/karma-4.4.0.tgz#10f16117a37b388aa86618a8815b5c9acf1d7d6d"
+  integrity sha512-+mvzi+gBWHPrlqt1KE0WrrjcKuePX7WWJjTYNaewp6U00inno/DTSk+QHMbc+aV09scErWjhJukxswFyS7u2qw==
   dependencies:
     bluebird "^3.3.0"
     body-parser "^1.16.1"
@@ -5097,7 +5097,6 @@ karma@4.3.0:
     chokidar "^3.0.0"
     colors "^1.1.0"
     connect "^3.6.0"
-    core-js "^3.1.3"
     di "^0.0.1"
     dom-serialize "^2.2.0"
     flatted "^2.0.0"
diff --git a/integration/cli-hello-world/browserslist b/integration/cli-hello-world/browserslist
index 80848532e47d5..92197689d65b0 100644
--- a/integration/cli-hello-world/browserslist
+++ b/integration/cli-hello-world/browserslist
@@ -9,4 +9,4 @@
 last 2 versions
 Firefox ESR
 not dead
-not IE 9-11 # For IE 9-11 support, remove 'not'.
\ No newline at end of file
+not IE 11 # For IE 11 support, remove 'not'.
\ No newline at end of file
diff --git a/integration/cli-hello-world/package.json b/integration/cli-hello-world/package.json
index 98ec7d4986ce7..44821b4b1dca4 100644
--- a/integration/cli-hello-world/package.json
+++ b/integration/cli-hello-world/package.json
@@ -23,7 +23,7 @@
     "@angular/router": "file:../../dist/packages-dist/router",
     "rxjs": "file:../../node_modules/rxjs",
     "tslib": "file:../../node_modules/tslib",
-    "zone.js": "file:../../dist/zone.js-dist/zone.js"
+    "zone.js": "file:../../dist/zone.js-dist/archive/zone.js.tgz"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "file:../../node_modules/@angular-devkit/build-angular",
@@ -36,7 +36,7 @@
     "codelyzer": "5.2.0",
     "jasmine-core": "3.5.0",
     "jasmine-spec-reporter": "4.2.1",
-    "karma": "4.3.0",
+    "karma": "4.4.0",
     "karma-chrome-launcher": "3.1.0",
     "karma-coverage-istanbul-reporter": "2.1.0",
     "karma-jasmine": "2.0.1",
diff --git a/integration/cli-hello-world/src/polyfills.ts b/integration/cli-hello-world/src/polyfills.ts
index aa665d6b87408..f39dafba9caeb 100644
--- a/integration/cli-hello-world/src/polyfills.ts
+++ b/integration/cli-hello-world/src/polyfills.ts
@@ -18,7 +18,7 @@
  * BROWSER POLYFILLS
  */
 
-/** IE10 and IE11 requires the following for NgClass support on SVG elements */
+/** IE11 requires the following for NgClass support on SVG elements */
 // import 'classlist.js';  // Run `npm install --save classlist.js`.
 
 /**
diff --git a/integration/cli-hello-world/yarn.lock b/integration/cli-hello-world/yarn.lock
index 5d07c26fe88d8..90bab6cdf6ace 100644
--- a/integration/cli-hello-world/yarn.lock
+++ b/integration/cli-hello-world/yarn.lock
@@ -5535,10 +5535,10 @@ karma-source-map-support@1.4.0:
   dependencies:
     source-map-support "^0.5.5"
 
-karma@4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-4.3.0.tgz#e14471ea090a952265a42ebb442b1a3c09832559"
-  integrity sha512-NSPViHOt+RW38oJklvYxQC4BSQsv737oQlr/r06pCM+slDOr4myuI1ivkRmp+3dVpJDfZt2DmaPJ2wkx+ZZuMQ==
+karma@4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/karma/-/karma-4.4.0.tgz#10f16117a37b388aa86618a8815b5c9acf1d7d6d"
+  integrity sha512-+mvzi+gBWHPrlqt1KE0WrrjcKuePX7WWJjTYNaewp6U00inno/DTSk+QHMbc+aV09scErWjhJukxswFyS7u2qw==
   dependencies:
     bluebird "^3.3.0"
     body-parser "^1.16.1"
@@ -5546,7 +5546,6 @@ karma@4.3.0:
     chokidar "^3.0.0"
     colors "^1.1.0"
     connect "^3.6.0"
-    core-js "^3.1.3"
     di "^0.0.1"
     dom-serialize "^2.2.0"
     flatted "^2.0.0"
diff --git a/integration/dynamic-compiler/package.json b/integration/dynamic-compiler/package.json
index 82fbe67f78002..59cb8d36260bd 100644
--- a/integration/dynamic-compiler/package.json
+++ b/integration/dynamic-compiler/package.json
@@ -41,7 +41,7 @@
     "core-js": "file:../../node_modules/core-js",
     "rxjs": "file:../../node_modules/rxjs",
     "systemjs": "file:../../node_modules/systemjs",
-    "zone.js": "file:../../dist/zone.js-dist/zone.js"
+    "zone.js": "file:../../dist/zone.js-dist/archive/zone.js.tgz"
   },
   "//resolutions-comment": "Ensure a single version of webdriver-manager which comes from root node_modules that has already run webdriver-manager update",
   "resolutions": {
diff --git a/integration/hello_world__closure/package.json b/integration/hello_world__closure/package.json
index 83cf5530dd201..398b4eb08d95e 100644
--- a/integration/hello_world__closure/package.json
+++ b/integration/hello_world__closure/package.json
@@ -12,7 +12,7 @@
     "rxjs": "file:../../node_modules/rxjs",
     "typescript": "file:../../node_modules/typescript",
     "tslib": "file:../../node_modules/tslib",
-    "zone.js": "file:../../dist/zone.js-dist/zone.js"
+    "zone.js": "file:../../dist/zone.js-dist/archive/zone.js.tgz"
   },
   "devDependencies": {
     "@types/jasmine": "file:../../node_modules/@types/jasmine",
diff --git a/integration/hello_world__systemjs_umd/package.json b/integration/hello_world__systemjs_umd/package.json
index 6a8c567b775a8..54d380fcc926e 100644
--- a/integration/hello_world__systemjs_umd/package.json
+++ b/integration/hello_world__systemjs_umd/package.json
@@ -20,7 +20,7 @@
     "rxjs": "file:../../node_modules/rxjs",
     "systemjs": "0.20.2",
     "typescript": "file:../../node_modules/typescript",
-    "zone.js": "file:../../dist/zone.js-dist/zone.js"
+    "zone.js": "file:../../dist/zone.js-dist/archive/zone.js.tgz"
   },
   "devDependencies": {
     "@types/jasmine": "file:../../node_modules/@types/jasmine",
diff --git a/integration/i18n/package.json b/integration/i18n/package.json
index d681893bd5082..ad0c9955d0292 100644
--- a/integration/i18n/package.json
+++ b/integration/i18n/package.json
@@ -11,7 +11,7 @@
     "rxjs": "file:../../node_modules/rxjs",
     "typescript": "file:../../node_modules/typescript",
     "tslib": "file:../../node_modules/tslib",
-    "zone.js": "file:../../dist/zone.js-dist/zone.js"
+    "zone.js": "file:../../dist/zone.js-dist/archive/zone.js.tgz"
   },
   "devDependencies": {
     "@types/jasmine": "file:../../node_modules/@types/jasmine",
diff --git a/integration/injectable-def/package.json b/integration/injectable-def/package.json
index b2fe57ba6dd35..054b482fab565 100644
--- a/integration/injectable-def/package.json
+++ b/integration/injectable-def/package.json
@@ -14,7 +14,7 @@
     "@types/node": "file:../../node_modules/@types/node",
     "rxjs": "file:../../node_modules/rxjs",
     "typescript": "file:../../node_modules/typescript",
-    "zone.js": "file:../../dist/zone.js-dist/zone.js"
+    "zone.js": "file:../../dist/zone.js-dist/archive/zone.js.tgz"
   },
   "devDependencies": {
     "@types/jasmine": "file:../../node_modules/@types/jasmine",
diff --git a/integration/ivy-i18n/browserslist b/integration/ivy-i18n/browserslist
index 80848532e47d5..92197689d65b0 100644
--- a/integration/ivy-i18n/browserslist
+++ b/integration/ivy-i18n/browserslist
@@ -9,4 +9,4 @@
 last 2 versions
 Firefox ESR
 not dead
-not IE 9-11 # For IE 9-11 support, remove 'not'.
\ No newline at end of file
+not IE 11 # For IE 11 support, remove 'not'.
\ No newline at end of file
diff --git a/integration/ivy-i18n/package.json b/integration/ivy-i18n/package.json
index 71c2f9e6bf660..e07a6202d5afa 100644
--- a/integration/ivy-i18n/package.json
+++ b/integration/ivy-i18n/package.json
@@ -56,7 +56,7 @@
     "codelyzer": "5.2.0",
     "jasmine-core": "3.5.0",
     "jasmine-spec-reporter": "4.2.1",
-    "karma": "4.3.0",
+    "karma": "4.4.0",
     "karma-chrome-launcher": "3.1.0",
     "karma-coverage-istanbul-reporter": "2.1.0",
     "karma-jasmine": "2.0.1",
diff --git a/integration/ivy-i18n/src/polyfills-runtime.ts b/integration/ivy-i18n/src/polyfills-runtime.ts
index 30b721ff77c6c..63ba0f8456500 100644
--- a/integration/ivy-i18n/src/polyfills-runtime.ts
+++ b/integration/ivy-i18n/src/polyfills-runtime.ts
@@ -18,7 +18,7 @@
  * BROWSER POLYFILLS
  */
 
-/** IE10 and IE11 requires the following for NgClass support on SVG elements */
+/** IE11 requires the following for NgClass support on SVG elements */
 // import 'classlist.js';  // Run `npm install --save classlist.js`.
 
 /**
diff --git a/integration/ivy-i18n/src/polyfills.ts b/integration/ivy-i18n/src/polyfills.ts
index dcfb64083540e..ac4cd2caedf15 100644
--- a/integration/ivy-i18n/src/polyfills.ts
+++ b/integration/ivy-i18n/src/polyfills.ts
@@ -18,7 +18,7 @@
  * BROWSER POLYFILLS
  */
 
-/** IE10 and IE11 requires the following for NgClass support on SVG elements */
+/** IE11 requires the following for NgClass support on SVG elements */
 // import 'classlist.js';  // Run `npm install --save classlist.js`.
 
 /**
diff --git a/integration/ivy-i18n/yarn.lock b/integration/ivy-i18n/yarn.lock
index f15743a5e4e9d..ba2f3923ae84a 100644
--- a/integration/ivy-i18n/yarn.lock
+++ b/integration/ivy-i18n/yarn.lock
@@ -5810,10 +5810,10 @@ karma-source-map-support@1.4.0:
   dependencies:
     source-map-support "^0.5.5"
 
-karma@4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-4.3.0.tgz#e14471ea090a952265a42ebb442b1a3c09832559"
-  integrity sha512-NSPViHOt+RW38oJklvYxQC4BSQsv737oQlr/r06pCM+slDOr4myuI1ivkRmp+3dVpJDfZt2DmaPJ2wkx+ZZuMQ==
+karma@4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/karma/-/karma-4.4.0.tgz#10f16117a37b388aa86618a8815b5c9acf1d7d6d"
+  integrity sha512-+mvzi+gBWHPrlqt1KE0WrrjcKuePX7WWJjTYNaewp6U00inno/DTSk+QHMbc+aV09scErWjhJukxswFyS7u2qw==
   dependencies:
     bluebird "^3.3.0"
     body-parser "^1.16.1"
@@ -5821,7 +5821,6 @@ karma@4.3.0:
     chokidar "^3.0.0"
     colors "^1.1.0"
     connect "^3.6.0"
-    core-js "^3.1.3"
     di "^0.0.1"
     dom-serialize "^2.2.0"
     flatted "^2.0.0"
diff --git a/integration/ng_elements/package.json b/integration/ng_elements/package.json
index 783f0580f406b..2d99a595e3e65 100644
--- a/integration/ng_elements/package.json
+++ b/integration/ng_elements/package.json
@@ -12,7 +12,7 @@
     "rxjs": "file:../../node_modules/rxjs",
     "typescript": "file:../../node_modules/typescript",
     "tslib": "file:../../node_modules/tslib",
-    "zone.js": "file:../../dist/zone.js-dist/zone.js"
+    "zone.js": "file:../../dist/zone.js-dist/archive/zone.js.tgz"
   },
   "devDependencies": {
     "@types/jasmine": "file:../../node_modules/@types/jasmine",
diff --git a/integration/ng_update/package.json b/integration/ng_update/package.json
index a1f977c81bd2a..2deba2e6059eb 100644
--- a/integration/ng_update/package.json
+++ b/integration/ng_update/package.json
@@ -17,13 +17,11 @@
     "@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",
     "rxjs": "file:../../node_modules/rxjs",
     "typescript": "file:../../node_modules/typescript",
-    "zone.js": "file:../../dist/zone.js-dist/zone.js"
+    "zone.js": "file:../../dist/zone.js-dist/archive/zone.js.tgz"
   }
 }
diff --git a/integration/ng_update_migrations/browserslist b/integration/ng_update_migrations/browserslist
index d6ac0551f9ef8..d96c53f232517 100644
--- a/integration/ng_update_migrations/browserslist
+++ b/integration/ng_update_migrations/browserslist
@@ -9,5 +9,5 @@
 last 2 versions
 Firefox ESR
 not dead
-not IE 9-11 # For IE 9-11 support, remove 'not'.
+not IE 11 # For IE 11 support, remove 'not'.
 not Chrome 41 # For Googlebot support, remove 'not'.
\ No newline at end of file
diff --git a/integration/ng_update_migrations/package.json b/integration/ng_update_migrations/package.json
index 705d624ce9d08..b9190e3993477 100644
--- a/integration/ng_update_migrations/package.json
+++ b/integration/ng_update_migrations/package.json
@@ -21,7 +21,7 @@
     "@angular/router": "file:../../dist/packages-dist/router",
     "rxjs": "file:../../node_modules/rxjs",
     "tslib": "file:../../node_modules/tslib",
-    "zone.js": "file:../../dist/zone.js-dist/zone.js"
+    "zone.js": "file:../../dist/zone.js-dist/archive/zone.js.tgz"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "file:../../node_modules/@angular-devkit/build-angular",
@@ -36,7 +36,7 @@
     "glob": "7.1.4",
     "jasmine-core": "3.4.0",
     "jasmine-spec-reporter": "4.2.1",
-    "karma": "4.0.1",
+    "karma": "4.4.0",
     "karma-chrome-launcher": "2.2.0",
     "karma-jasmine": "2.0.1",
     "karma-jasmine-html-reporter": "1.4.2",
diff --git a/integration/ng_update_migrations/src/polyfills.ts b/integration/ng_update_migrations/src/polyfills.ts
index aa665d6b87408..f39dafba9caeb 100644
--- a/integration/ng_update_migrations/src/polyfills.ts
+++ b/integration/ng_update_migrations/src/polyfills.ts
@@ -18,7 +18,7 @@
  * BROWSER POLYFILLS
  */
 
-/** IE10 and IE11 requires the following for NgClass support on SVG elements */
+/** IE11 requires the following for NgClass support on SVG elements */
 // import 'classlist.js';  // Run `npm install --save classlist.js`.
 
 /**
diff --git a/integration/ng_update_migrations/yarn.lock b/integration/ng_update_migrations/yarn.lock
index 74b2fe5c60e63..64eb2b38f9fdd 100644
--- a/integration/ng_update_migrations/yarn.lock
+++ b/integration/ng_update_migrations/yarn.lock
@@ -4816,18 +4816,17 @@ karma-source-map-support@1.4.0:
   dependencies:
     source-map-support "^0.5.5"
 
-karma@4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-4.0.1.tgz#2581d6caa0d4cd28b65131561b47bad6d5478773"
-  integrity sha512-ind+4s03BqIXas7ZmraV3/kc5+mnqwCd+VDX1FndS6jxbt03kQKX2vXrWxNLuCjVYmhMwOZosAEKMM0a2q7w7A==
+karma@4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/karma/-/karma-4.4.0.tgz#10f16117a37b388aa86618a8815b5c9acf1d7d6d"
+  integrity sha512-+mvzi+gBWHPrlqt1KE0WrrjcKuePX7WWJjTYNaewp6U00inno/DTSk+QHMbc+aV09scErWjhJukxswFyS7u2qw==
   dependencies:
     bluebird "^3.3.0"
     body-parser "^1.16.1"
-    braces "^2.3.2"
-    chokidar "^2.0.3"
+    braces "^3.0.2"
+    chokidar "^3.0.0"
     colors "^1.1.0"
     connect "^3.6.0"
-    core-js "^2.2.0"
     di "^0.0.1"
     dom-serialize "^2.2.0"
     flatted "^2.0.0"
@@ -4835,7 +4834,7 @@ karma@4.0.1:
     graceful-fs "^4.1.2"
     http-proxy "^1.13.0"
     isbinaryfile "^3.0.0"
-    lodash "^4.17.11"
+    lodash "^4.17.14"
     log4js "^4.0.0"
     mime "^2.3.1"
     minimatch "^3.0.2"
diff --git a/integration/ngcc/package.json b/integration/ngcc/package.json
index 4c19e1cbbf7db..75a47d83ccbf4 100644
--- a/integration/ngcc/package.json
+++ b/integration/ngcc/package.json
@@ -18,7 +18,7 @@
     "@types/node": "file:../../node_modules/@types/node",
     "rxjs": "file:../../node_modules/rxjs",
     "typescript": "file:../../node_modules/typescript",
-    "zone.js": "file:../../dist/zone.js-dist/zone.js"
+    "zone.js": "file:../../dist/zone.js-dist/archive/zone.js.tgz"
   },
   "devDependencies": {
     "@types/jasmine": "file:../../node_modules/@types/jasmine",
diff --git a/integration/platform-server/package.json b/integration/platform-server/package.json
index 002eb5065d65f..a62d727983c4a 100644
--- a/integration/platform-server/package.json
+++ b/integration/platform-server/package.json
@@ -19,7 +19,7 @@
     "express": "4.16.4",
     "rxjs": "file:../../node_modules/rxjs",
     "typescript": "file:../../node_modules/typescript",
-    "zone.js": "file:../../dist/zone.js-dist/zone.js"
+    "zone.js": "file:../../dist/zone.js-dist/archive/zone.js.tgz"
   },
   "devDependencies": {
     "@types/jasmine": "file:../../node_modules/@types/jasmine",
diff --git a/integration/service-worker-schema/package.json b/integration/service-worker-schema/package.json
index 26a08141ffb57..af3986155e2a6 100644
--- a/integration/service-worker-schema/package.json
+++ b/integration/service-worker-schema/package.json
@@ -11,6 +11,6 @@
     "@angular/core": "file:../../dist/packages-dist/core",
     "@angular/service-worker": "file:../../dist/packages-dist/service-worker",
     "rxjs": "file:../../node_modules/rxjs",
-    "zone.js": "file:../../dist/zone.js-dist/zone.js"
+    "zone.js": "file:../../dist/zone.js-dist/archive/zone.js.tgz"
   }
 }
diff --git a/integration/terser/package.json b/integration/terser/package.json
index e585c2c531f35..7a8769bc7efd1 100644
--- a/integration/terser/package.json
+++ b/integration/terser/package.json
@@ -12,6 +12,6 @@
     "rxjs": "file:../../node_modules/rxjs",
     "terser": "3.17.0",
     "typescript": "file:../../node_modules/typescript",
-    "zone.js": "file:../../dist/zone.js-dist/zone.js"
+    "zone.js": "file:../../dist/zone.js-dist/archive/zone.js.tgz"
   }
 }
diff --git a/integration/typings_test_ts39/include-all.ts b/integration/typings_test_ts39/include-all.ts
index 81d94b0a01934..7bf19f646cd58 100644
--- a/integration/typings_test_ts39/include-all.ts
+++ b/integration/typings_test_ts39/include-all.ts
@@ -28,8 +28,6 @@ import * as platformBrowserAnimations from '@angular/platform-browser/animations
 import * as platformBrowserTesting from '@angular/platform-browser/testing';
 import * as platformServer from '@angular/platform-server';
 import * as platformServerTesting from '@angular/platform-server/testing';
-import * as 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 routerUpgrade from '@angular/router/upgrade';
@@ -59,8 +57,6 @@ export default {
   platformBrowserAnimations,
   platformServer,
   platformServerTesting,
-  platformWebworker,
-  platformWebworkerDynamic,
   router,
   routerTesting,
   routerUpgrade,
diff --git a/integration/typings_test_ts39/package.json b/integration/typings_test_ts39/package.json
index c3d79ae0435d1..6f375da378866 100644
--- a/integration/typings_test_ts39/package.json
+++ b/integration/typings_test_ts39/package.json
@@ -14,15 +14,13 @@
     "@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": "file:../../node_modules/@types/jasmine",
     "rxjs": "file:../../node_modules/rxjs",
     "typescript": "~3.9.5",
-    "zone.js": "file:../../dist/zone.js-dist/zone.js"
+    "zone.js": "file:../../dist/zone.js-dist/archive/zone.js.tgz"
   },
   "scripts": {
     "test": "tsc"
diff --git a/integration/typings_test_ts40/include-all.ts b/integration/typings_test_ts40/include-all.ts
new file mode 100644
index 0000000000000..7bf19f646cd58
--- /dev/null
+++ b/integration/typings_test_ts40/include-all.ts
@@ -0,0 +1,67 @@
+/**
+ * @license
+ * Copyright Google LLC 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 animations from '@angular/animations';
+import * as animationsBrowser from '@angular/animations/browser';
+import * as animationsBrowserTesting from '@angular/animations/browser/testing';
+import * as common from '@angular/common';
+import * as commonHttp from '@angular/common/http';
+import * as commonTesting from '@angular/common/testing';
+import * as commonHttpTesting from '@angular/common/testing';
+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 platformBrowser from '@angular/platform-browser';
+import * as platformBrowserDynamic from '@angular/platform-browser-dynamic';
+import * as platformBrowserDynamicTesting from '@angular/platform-browser-dynamic/testing';
+import * as platformBrowserAnimations from '@angular/platform-browser/animations';
+import * as platformBrowserTesting from '@angular/platform-browser/testing';
+import * as platformServer from '@angular/platform-server';
+import * as platformServerTesting from '@angular/platform-server/testing';
+import * as router from '@angular/router';
+import * as routerTesting from '@angular/router/testing';
+import * as routerUpgrade from '@angular/router/upgrade';
+import * as serviceWorker from '@angular/service-worker';
+import * as upgrade from '@angular/upgrade';
+import * as upgradeStatic from '@angular/upgrade/static';
+import * as upgradeTesting from '@angular/upgrade/static/testing';
+
+export default {
+  animations,
+  animationsBrowser,
+  animationsBrowserTesting,
+  common,
+  commonTesting,
+  commonHttp,
+  commonHttpTesting,
+  compiler,
+  compilerTesting,
+  core,
+  coreTesting,
+  elements,
+  forms,
+  platformBrowser,
+  platformBrowserTesting,
+  platformBrowserDynamic,
+  platformBrowserDynamicTesting,
+  platformBrowserAnimations,
+  platformServer,
+  platformServerTesting,
+  router,
+  routerTesting,
+  routerUpgrade,
+  serviceWorker,
+  upgrade,
+  upgradeStatic,
+  upgradeTesting,
+};
diff --git a/integration/typings_test_ts40/package.json b/integration/typings_test_ts40/package.json
new file mode 100644
index 0000000000000..c4a666ee33a54
--- /dev/null
+++ b/integration/typings_test_ts40/package.json
@@ -0,0 +1,28 @@
+{
+  "name": "angular-integration",
+  "description": "Assert that users with TypeScript 4.0 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/platform-browser": "file:../../dist/packages-dist/platform-browser",
+    "@angular/platform-browser-dynamic": "file:../../dist/packages-dist/platform-browser-dynamic",
+    "@angular/platform-server": "file:../../dist/packages-dist/platform-server",
+    "@angular/router": "file:../../dist/packages-dist/router",
+    "@angular/service-worker": "file:../../dist/packages-dist/service-worker",
+    "@angular/upgrade": "file:../../dist/packages-dist/upgrade",
+    "@types/jasmine": "file:../../node_modules/@types/jasmine",
+    "rxjs": "file:../../node_modules/rxjs",
+    "typescript": "4.0.2",
+    "zone.js": "file:../../dist/zone.js-dist/archive/zone.js.tgz"
+  },
+  "scripts": {
+    "test": "tsc"
+  }
+}
diff --git a/integration/typings_test_ts40/tsconfig.json b/integration/typings_test_ts40/tsconfig.json
new file mode 100644
index 0000000000000..30e25c2209734
--- /dev/null
+++ b/integration/typings_test_ts40/tsconfig.json
@@ -0,0 +1,26 @@
+{
+  "compilerOptions": {
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "noImplicitReturns": true,
+    "noFallthroughCasesInSwitch": true,
+    "experimentalDecorators": true,
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "outDir": "./dist/out-tsc",
+    "rootDir": ".",
+    "target": "es5",
+    "lib": [
+      "es5",
+      "dom",
+      "es2015.collection",
+      "es2015.iterable",
+      "es2015.promise"
+    ],
+    "types": [],
+  },
+  "files": [
+    "include-all.ts",
+    "node_modules/@types/jasmine/index.d.ts"
+  ]
+}
diff --git a/karma-js.conf.js b/karma-js.conf.js
index bdab6ea46359a..6f97a611f84ce 100644
--- a/karma-js.conf.js
+++ b/karma-js.conf.js
@@ -37,6 +37,9 @@ module.exports = function(config) {
 
       'node_modules/core-js/client/core.js',
       'node_modules/jasmine-ajax/lib/mock-ajax.js',
+
+      // Dependencies built by Bazel. See `config.yml` for steps running before
+      // the legacy Saucelabs tests run.
       'dist/bin/packages/zone.js/npm_package/bundles/zone.umd.js',
       'dist/bin/packages/zone.js/npm_package/bundles/zone-testing.umd.js',
       'dist/bin/packages/zone.js/npm_package/bundles/task-tracking.umd.js',
diff --git a/modules/benchmarks/src/expanding_rows/expanding_row.ts b/modules/benchmarks/src/expanding_rows/expanding_row.ts
index 9885b1298cca9..4f6a0180f68b4 100644
--- a/modules/benchmarks/src/expanding_rows/expanding_row.ts
+++ b/modules/benchmarks/src/expanding_rows/expanding_row.ts
@@ -45,10 +45,10 @@ export interface ExpandingRowHostBase {
   handleRowSummaryClick(row: ExpandingRow): void;
 
   /**
-   * Check if element is blacklisted.  Blacklisted elements will not collapse an
+   * Check if element is collapsible.  Elements marked as uncollapsible will not collapse an
    * open row when clicked.
    */
-  isBlacklisted(element: HTMLElement|null): boolean;
+  isCollapsible(element: HTMLElement|null): boolean;
 
   /**
    * Handles caption element click on a cfc-expanding-row component. Note
@@ -247,16 +247,15 @@ export class ExpandingRow {
    * notify click on its host element. Note that caption is only shown when
    * the row is expanded. Hence this will collapse this row and put the focus
    * on it.
-   * If a blacklisted element exists in the caption, clicking that element will
+   * If an uncollapsible element exists in the caption, clicking that element will
    * not trigger the row collapse.
    */
   handleCaptionClick(event: MouseEvent): void {
-    if (this.expandingRowHost.isBlacklisted(event.target as {} as HTMLElement)) {
-      return;
+    if (this.expandingRowHost.isCollapsible(event.target as {} as HTMLElement)) {
+      this.expandingRowHost.handleRowCaptionClick(this);
+      this.collapse();
+      this.focus();
     }
-    this.expandingRowHost.handleRowCaptionClick(this);
-    this.collapse();
-    this.focus();
   }
 
   /**
diff --git a/modules/benchmarks/src/expanding_rows/expanding_row_host.ts b/modules/benchmarks/src/expanding_rows/expanding_row_host.ts
index 21f86b956efad..dd2b109f77a09 100644
--- a/modules/benchmarks/src/expanding_rows/expanding_row_host.ts
+++ b/modules/benchmarks/src/expanding_rows/expanding_row_host.ts
@@ -315,18 +315,18 @@ export class ExpandingRowHost implements AfterViewInit, OnDestroy, ExpandingRowH
   }
 
   /**
-   * Check if element is blacklisted.  Blacklisted elements will not collapse an
+   * Check if element is collapsible.  Elements marked as uncollapsible will not collapse an
    * open row when clicked.
    */
-  isBlacklisted(element: HTMLElement|null): boolean {
+  isCollapsible(element: HTMLElement|null): boolean {
     const clickRoot = this.getClickRootElement();
     while (element && element !== clickRoot) {
-      if (element.hasAttribute('cfcexpandingrowblacklist')) {
-        return true;
+      if (element.hasAttribute('cfcUncollapsible')) {
+        return false;
       }
       element = element.parentElement;
     }
-    return false;
+    return true;
   }
 
   /**
diff --git a/modules/benchmarks/src/expanding_rows/expanding_row_module.ts b/modules/benchmarks/src/expanding_rows/expanding_row_module.ts
index f48d76d47d0fe..fa65ae4303358 100644
--- a/modules/benchmarks/src/expanding_rows/expanding_row_module.ts
+++ b/modules/benchmarks/src/expanding_rows/expanding_row_module.ts
@@ -10,11 +10,11 @@ import {CommonModule} from '@angular/common';
 import {NgModule} from '@angular/core';
 
 import {ExpandingRow} from './expanding_row';
-import {ExpandingRowBlacklist} from './expanding_row_blacklist';
 import {ExpandingRowDetailsCaption} from './expanding_row_details_caption';
 import {ExpandingRowDetailsContent} from './expanding_row_details_content';
 import {ExpandingRowHost} from './expanding_row_host';
 import {ExpandingRowSummary} from './expanding_row_summary';
+import {ExpandingRowUncollapsible} from './expanding_row_uncollapsible';
 
 /** The main module for the cfc-expanding-row component. */
 @NgModule({
@@ -24,7 +24,7 @@ import {ExpandingRowSummary} from './expanding_row_summary';
     ExpandingRowDetailsContent,
     ExpandingRowHost,
     ExpandingRowSummary,
-    ExpandingRowBlacklist,
+    ExpandingRowUncollapsible,
   ],
   exports: [
     ExpandingRow,
@@ -32,7 +32,7 @@ import {ExpandingRowSummary} from './expanding_row_summary';
     ExpandingRowDetailsContent,
     ExpandingRowHost,
     ExpandingRowSummary,
-    ExpandingRowBlacklist,
+    ExpandingRowUncollapsible,
   ],
   imports: [
     CommonModule,
diff --git a/modules/benchmarks/src/expanding_rows/expanding_row_blacklist.ts b/modules/benchmarks/src/expanding_rows/expanding_row_uncollapsible.ts
similarity index 82%
rename from modules/benchmarks/src/expanding_rows/expanding_row_blacklist.ts
rename to modules/benchmarks/src/expanding_rows/expanding_row_uncollapsible.ts
index e19bb14e6fbbe..073f391113d75 100644
--- a/modules/benchmarks/src/expanding_rows/expanding_row_blacklist.ts
+++ b/modules/benchmarks/src/expanding_rows/expanding_row_uncollapsible.ts
@@ -14,7 +14,7 @@ import {Directive} from '@angular/core';
  * expanded row
  */
 @Directive({
-  selector: '[cfcExpandingRowBlacklist]',
+  selector: '[cfcUncollapsible]',
 })
-export class ExpandingRowBlacklist {
+export class ExpandingRowUncollapsible {
 }
diff --git a/modules/playground/e2e_test/web_workers/animations/BUILD.bazel b/modules/playground/e2e_test/web_workers/animations/BUILD.bazel
deleted file mode 100644
index 2bd6e176d7639..0000000000000
--- a/modules/playground/e2e_test/web_workers/animations/BUILD.bazel
+++ /dev/null
@@ -1,7 +0,0 @@
-load("//modules/playground/e2e_test:example_test.bzl", "example_test")
-
-example_test(
-    name = "animations",
-    srcs = glob(["**/*.ts"]),
-    server = "//modules/playground/src/web_workers/animations:devserver",
-)
diff --git a/modules/playground/e2e_test/web_workers/animations/animations_spec.ts b/modules/playground/e2e_test/web_workers/animations/animations_spec.ts
deleted file mode 100644
index e000861711227..0000000000000
--- a/modules/playground/e2e_test/web_workers/animations/animations_spec.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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 {browser, by, element, protractor} from 'protractor';
-
-import {verifyNoBrowserErrors} from '../../../../../dev-infra/benchmark/driver-utilities';
-
-
-// Disabled because with ViewEngine animations within webworkers is not supported.
-// See: https://github.com/angular/angular/issues/18610
-xdescribe('WebWorkers Animations', function() {
-  afterEach(() => {
-    verifyNoBrowserErrors();
-    browser.ignoreSynchronization = false;
-  });
-
-  const selector = 'animation-app';
-  const URL = 'all/playground/src/web_workers/animations/index.html';
-
-  it('should bootstrap', () => {
-    // This test can't wait for Angular as Testability is not available when using WebWorker
-    browser.ignoreSynchronization = true;
-    browser.get(URL);
-
-    waitForBootstrap();
-    const elem = element(by.css(selector + ' .box'));
-    expect(elem.getText()).toEqual('...');
-  });
-
-  it('should animate to open', () => {
-    // This test can't wait for Angular as Testability is not available when using WebWorker
-    browser.ignoreSynchronization = true;
-    browser.get(URL);
-
-    waitForBootstrap();
-    element(by.css(selector + ' button')).click();
-
-    const boxElm = element(by.css(selector + ' .box'));
-    browser.wait(() => boxElm.getSize().then(sizes => sizes['width'] > 750), 1000);
-  });
-
-  it('should cancel the animation midway and continue from where it left off', () => {
-    browser.ignoreSynchronization = true;
-    browser.get(URL);
-
-    waitForBootstrap();
-
-    const elem = element(by.css(selector + ' .box'));
-    const btn = element(by.css(selector + ' button'));
-    const getWidth = () => elem.getSize().then((sizes: any) => sizes['width']);
-
-    btn.click();
-
-    browser.sleep(250);
-
-    btn.click();
-
-    expect(getWidth()).toBeLessThan(600);
-
-    browser.sleep(500);
-
-    expect(getWidth()).toBeLessThan(50);
-  });
-
-  function waitForBootstrap() {
-    browser.wait(protractor.until.elementLocated(by.css(selector + ' .box')), 5000)
-        .then(() => {}, () => {
-          // jasmine will timeout if this gets called too many times
-          console.error('>> unexpected timeout -> browser.refresh()');
-          browser.refresh();
-          waitForBootstrap();
-        });
-  }
-});
diff --git a/modules/playground/e2e_test/web_workers/input/BUILD.bazel b/modules/playground/e2e_test/web_workers/input/BUILD.bazel
deleted file mode 100644
index ae90a5daa45da..0000000000000
--- a/modules/playground/e2e_test/web_workers/input/BUILD.bazel
+++ /dev/null
@@ -1,7 +0,0 @@
-load("//modules/playground/e2e_test:example_test.bzl", "example_test")
-
-example_test(
-    name = "input",
-    srcs = glob(["**/*.ts"]),
-    server = "//modules/playground/src/web_workers/input:devserver",
-)
diff --git a/modules/playground/e2e_test/web_workers/input/input_spec.ts b/modules/playground/e2e_test/web_workers/input/input_spec.ts
deleted file mode 100644
index 541baf99ad137..0000000000000
--- a/modules/playground/e2e_test/web_workers/input/input_spec.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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 {browser, by, element, ExpectedConditions, protractor} from 'protractor';
-
-import {verifyNoBrowserErrors} from '../../../../../dev-infra/benchmark/driver-utilities';
-
-describe('WebWorkers Input', function() {
-  afterEach(() => {
-    verifyNoBrowserErrors();
-    browser.ignoreSynchronization = false;
-  });
-  const selector = 'input-app';
-  const URL = '/';
-  const VALUE = 'test val';
-
-  it('should bootstrap', () => {
-    // This test can't wait for Angular as Testability is not available when using WebWorker
-    browser.ignoreSynchronization = true;
-    browser.get(URL);
-
-    waitForBootstrap();
-    const elem = element(by.css(selector + ' h2'));
-    expect(elem.getText()).toEqual('Input App');
-  });
-
-  it('should bind to input value', () => {
-    // This test can't wait for Angular as Testability is not available when using WebWorker
-    browser.ignoreSynchronization = true;
-    browser.get(URL);
-
-    waitForBootstrap();
-    const input = element(by.css(selector + ' input'));
-    input.sendKeys(VALUE);
-    const displayElem = element(by.css(selector + ' .input-val'));
-    const expectedVal = `Input val is ${VALUE}.`;
-    browser.wait(ExpectedConditions.textToBePresentInElement(displayElem, expectedVal), 5000);
-    expect(displayElem.getText()).toEqual(expectedVal);
-  });
-
-  it('should bind to textarea value', () => {
-    // This test can't wait for Angular as Testability is not available when using WebWorker
-    browser.ignoreSynchronization = true;
-    browser.get(URL);
-
-    waitForBootstrap();
-    const input = element(by.css(selector + ' textarea'));
-    input.sendKeys(VALUE);
-    const displayElem = element(by.css(selector + ' .textarea-val'));
-    const expectedVal = `Textarea val is ${VALUE}.`;
-    browser.wait(ExpectedConditions.textToBePresentInElement(displayElem, expectedVal), 5000);
-    expect(displayElem.getText()).toEqual(expectedVal);
-  });
-
-  function waitForBootstrap() {
-    browser.wait(protractor.until.elementLocated(by.css(selector + ' h2')), 5000)
-        .then(
-            () => {
-              const elem = element(by.css(selector + ' h2'));
-              browser.wait(
-                  protractor.ExpectedConditions.textToBePresentInElement(elem, 'Input App'), 5000);
-            },
-            () => {
-              // jasmine will timeout if this gets called too many times
-              console.error('>> unexpected timeout -> browser.refresh()');
-              browser.refresh();
-              waitForBootstrap();
-            });
-  }
-});
diff --git a/modules/playground/e2e_test/web_workers/kitchen_sink/BUILD.bazel b/modules/playground/e2e_test/web_workers/kitchen_sink/BUILD.bazel
deleted file mode 100644
index a764d7b479c74..0000000000000
--- a/modules/playground/e2e_test/web_workers/kitchen_sink/BUILD.bazel
+++ /dev/null
@@ -1,7 +0,0 @@
-load("//modules/playground/e2e_test:example_test.bzl", "example_test")
-
-example_test(
-    name = "kitchen_sink",
-    srcs = glob(["**/*.ts"]),
-    server = "//modules/playground/src/web_workers/kitchen_sink:devserver",
-)
diff --git a/modules/playground/e2e_test/web_workers/kitchen_sink/kitchen_sink_spec.ts b/modules/playground/e2e_test/web_workers/kitchen_sink/kitchen_sink_spec.ts
deleted file mode 100644
index cb019f66974f1..0000000000000
--- a/modules/playground/e2e_test/web_workers/kitchen_sink/kitchen_sink_spec.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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 {browser, by, element, ExpectedConditions, protractor} from 'protractor';
-
-import {verifyNoBrowserErrors} from '../../../../../dev-infra/benchmark/driver-utilities';
-
-describe('WebWorkers Kitchen Sink', function() {
-  afterEach(() => {
-    verifyNoBrowserErrors();
-    browser.ignoreSynchronization = false;
-  });
-  const selector = 'hello-app .greeting';
-  const URL = '/';
-
-  it('should greet', () => {
-    // This test can't wait for Angular as Testability is not available when using WebWorker
-    browser.ignoreSynchronization = true;
-    browser.get(URL);
-
-    browser.wait(protractor.until.elementLocated(by.css(selector)), 15000);
-    const elem = element(by.css(selector));
-    browser.wait(ExpectedConditions.textToBePresentInElement(elem, 'hello world!'), 5000);
-    expect(elem.getText()).toEqual('hello world!');
-  });
-
-  it('should change greeting', () => {
-    // This test can't wait for Angular as Testability is not available when using WebWorker
-    browser.ignoreSynchronization = true;
-    browser.get(URL);
-    const changeButtonSelector = 'hello-app .changeButton';
-
-    browser.wait(protractor.until.elementLocated(by.css(changeButtonSelector)), 15000);
-    element(by.css(changeButtonSelector)).click();
-    const elem = element(by.css(selector));
-    browser.wait(ExpectedConditions.textToBePresentInElement(elem, 'howdy world!'), 5000);
-    expect(elem.getText()).toEqual('howdy world!');
-  });
-
-  it('should display correct key names', () => {
-    // This test can't wait for Angular as Testability is not available when using WebWorker
-    browser.ignoreSynchronization = true;
-    browser.get(URL);
-    browser.wait(protractor.until.elementLocated(by.css('.sample-area')), 15000);
-
-    const area = element.all(by.css('.sample-area')).first();
-    expect(area.getText()).toEqual('(none)');
-
-    area.sendKeys('u');
-    browser.wait(ExpectedConditions.textToBePresentInElement(area, 'U'), 5000);
-    expect(area.getText()).toEqual('U');
-  });
-});
diff --git a/modules/playground/e2e_test/web_workers/message_broker/BUILD.bazel b/modules/playground/e2e_test/web_workers/message_broker/BUILD.bazel
deleted file mode 100644
index 74b19d9060523..0000000000000
--- a/modules/playground/e2e_test/web_workers/message_broker/BUILD.bazel
+++ /dev/null
@@ -1,7 +0,0 @@
-load("//modules/playground/e2e_test:example_test.bzl", "example_test")
-
-example_test(
-    name = "message_broker",
-    srcs = glob(["**/*.ts"]),
-    server = "//modules/playground/src/web_workers/message_broker:devserver",
-)
diff --git a/modules/playground/e2e_test/web_workers/message_broker/message_broker_spec.ts b/modules/playground/e2e_test/web_workers/message_broker/message_broker_spec.ts
deleted file mode 100644
index 9ab657220848a..0000000000000
--- a/modules/playground/e2e_test/web_workers/message_broker/message_broker_spec.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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 {browser, by, element, ExpectedConditions, protractor} from 'protractor';
-
-import {verifyNoBrowserErrors} from '../../../../../dev-infra/benchmark/driver-utilities';
-
-const URL = '/';
-
-describe('MessageBroker', function() {
-  afterEach(() => {
-    verifyNoBrowserErrors();
-    browser.ignoreSynchronization = false;
-  });
-
-  it('should bootstrap', () => {
-    // This test can't wait for Angular as Testability is not available when using WebWorker
-    browser.ignoreSynchronization = true;
-    browser.get(URL);
-    waitForBootstrap();
-    expect(element(by.css('app h1')).getText()).toEqual('WebWorker MessageBroker Test');
-  });
-
-  it('should echo messages', () => {
-    const VALUE = 'Hi There';
-    // This test can't wait for Angular as Testability is not available when using WebWorker
-    browser.ignoreSynchronization = true;
-    browser.get(URL);
-    waitForBootstrap();
-
-    const input = element.all(by.css('#echo_input')).first();
-    input.sendKeys(VALUE);
-    element(by.css('#send_echo')).click();
-    const area = element(by.css('#echo_result'));
-    browser.wait(ExpectedConditions.textToBePresentInElement(area, VALUE), 5000);
-    expect(area.getText()).toEqual(VALUE);
-  });
-});
-
-function waitForBootstrap(): void {
-  browser.wait(protractor.until.elementLocated(by.css('app h1')), 15000);
-}
diff --git a/modules/playground/e2e_test/web_workers/router/BUILD.bazel b/modules/playground/e2e_test/web_workers/router/BUILD.bazel
deleted file mode 100644
index e6c55fae25a93..0000000000000
--- a/modules/playground/e2e_test/web_workers/router/BUILD.bazel
+++ /dev/null
@@ -1,7 +0,0 @@
-load("//modules/playground/e2e_test:example_test.bzl", "example_test")
-
-example_test(
-    name = "router",
-    srcs = glob(["**/*.ts"]),
-    server = "//modules/playground/src/web_workers/router:devserver",
-)
diff --git a/modules/playground/e2e_test/web_workers/router/router_spec.ts b/modules/playground/e2e_test/web_workers/router/router_spec.ts
deleted file mode 100644
index 01773e947f1c5..0000000000000
--- a/modules/playground/e2e_test/web_workers/router/router_spec.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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 {browser, by, element, protractor} from 'protractor';
-
-import {verifyNoBrowserErrors} from '../../../../../dev-infra/benchmark/driver-utilities';
-
-describe('WebWorker Router', () => {
-  beforeEach(() => {
-    // This test can't wait for Angular as Testability is not available when using WebWorker
-    browser.ignoreSynchronization = true;
-    browser.get('/');
-  });
-
-  afterEach(() => {
-    verifyNoBrowserErrors();
-    browser.ignoreSynchronization = false;
-  });
-
-  const contentSelector = 'app main h1';
-  const navSelector = 'app nav ul';
-  const baseUrl = '/';
-
-  it('should route on click', () => {
-    browser.get(baseUrl);
-
-    waitForElement(contentSelector);
-    let content = element(by.css(contentSelector));
-    expect(content.getText()).toEqual('Start');
-
-    const aboutBtn = element(by.css(navSelector + ' .about'));
-    aboutBtn.click();
-    waitForUrl(/\/about/);
-    waitForElement(contentSelector);
-    waitForElementText(contentSelector, 'About');
-    content = element(by.css(contentSelector));
-    expect(content.getText()).toEqual('About');
-    expect(browser.getCurrentUrl()).toMatch(/\/about/);
-
-    const contactBtn = element(by.css(navSelector + ' .contact'));
-    contactBtn.click();
-    waitForUrl(/\/contact/);
-    waitForElement(contentSelector);
-    waitForElementText(contentSelector, 'Contact');
-    content = element(by.css(contentSelector));
-    expect(content.getText()).toEqual('Contact');
-    expect(browser.getCurrentUrl()).toMatch(/\/contact/);
-  });
-
-  it('should load the correct route from the URL', () => {
-    browser.get(baseUrl + '#/about');
-
-    waitForElement(contentSelector);
-    waitForElementText(contentSelector, 'About');
-    const content = element(by.css(contentSelector));
-    expect(content.getText()).toEqual('About');
-  });
-
-  function waitForElement(selector: string): void {
-    browser.wait(protractor.until.elementLocated(by.css(selector)), 15000);
-  }
-
-  function waitForElementText(contentSelector: string, expected: string): void {
-    browser.wait(() => {
-      const deferred = protractor.promise.defer();
-      const elem = element(by.css(contentSelector));
-      elem.getText().then((text: string) => {
-        return deferred.fulfill(text === expected);
-      });
-      return deferred.promise;
-    }, 5000);
-  }
-
-  function waitForUrl(regex: RegExp): void {
-    browser.wait(() => {
-      const deferred = protractor.promise.defer();
-      browser.getCurrentUrl().then((url: string) => {
-        return deferred.fulfill(url.match(regex) !== null);
-      });
-      return deferred.promise;
-    }, 5000);
-  }
-});
diff --git a/modules/playground/e2e_test/web_workers/todo/BUILD.bazel b/modules/playground/e2e_test/web_workers/todo/BUILD.bazel
deleted file mode 100644
index 907933a69974c..0000000000000
--- a/modules/playground/e2e_test/web_workers/todo/BUILD.bazel
+++ /dev/null
@@ -1,7 +0,0 @@
-load("//modules/playground/e2e_test:example_test.bzl", "example_test")
-
-example_test(
-    name = "todo",
-    srcs = glob(["**/*.ts"]),
-    server = "//modules/playground/src/web_workers/todo:devserver",
-)
diff --git a/modules/playground/e2e_test/web_workers/todo/todo_spec.ts b/modules/playground/e2e_test/web_workers/todo/todo_spec.ts
deleted file mode 100644
index d8caffdd360af..0000000000000
--- a/modules/playground/e2e_test/web_workers/todo/todo_spec.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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 {browser, by, element, protractor} from 'protractor';
-
-import {verifyNoBrowserErrors} from '../../../../../dev-infra/benchmark/driver-utilities';
-
-describe('WebWorkers Todo', function() {
-  afterEach(() => {
-    verifyNoBrowserErrors();
-    browser.ignoreSynchronization = false;
-  });
-
-  const URL = '/';
-
-  it('should bootstrap', () => {
-    // This test can't wait for Angular as Testability is not available when using WebWorker
-    browser.ignoreSynchronization = true;
-    browser.get(URL);
-
-    waitForBootstrap();
-    expect(element(by.css('#todoapp header')).getText()).toEqual('todos');
-  });
-});
-
-function waitForBootstrap(): void {
-  browser.wait(protractor.until.elementLocated(by.css('todo-app #todoapp')), 15000);
-}
diff --git a/modules/playground/src/web_workers/BUILD.bazel b/modules/playground/src/web_workers/BUILD.bazel
deleted file mode 100644
index 101d5649d746f..0000000000000
--- a/modules/playground/src/web_workers/BUILD.bazel
+++ /dev/null
@@ -1,13 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-filegroup(
-    name = "worker-config",
-    srcs = ["worker-configure.js"],
-    data = [
-        "//modules/playground:systemjs-config.js",
-        "//modules/playground:systemjs-rxjs-operators.js",
-        "//packages/zone.js/bundles:zone.umd.js",
-        "@npm//reflect-metadata",
-        "@npm//systemjs",
-    ],
-)
diff --git a/modules/playground/src/web_workers/animations/BUILD.bazel b/modules/playground/src/web_workers/animations/BUILD.bazel
deleted file mode 100644
index 9b6cf7012e4bd..0000000000000
--- a/modules/playground/src/web_workers/animations/BUILD.bazel
+++ /dev/null
@@ -1,31 +0,0 @@
-load("//tools:defaults.bzl", "ng_module", "ts_devserver")
-
-package(default_visibility = ["//modules/playground:__subpackages__"])
-
-ng_module(
-    name = "animations",
-    srcs = glob(["**/*.ts"]),
-    tsconfig = "//modules/playground:tsconfig-build.json",
-    deps = [
-        "//packages/animations",
-        "//packages/core",
-        "//packages/platform-webworker",
-        "//packages/platform-webworker-dynamic",
-    ],
-)
-
-ts_devserver(
-    name = "devserver",
-    entry_module = "angular/modules/playground/src/web_workers/animations/index",
-    port = 4200,
-    scripts = ["@npm//:node_modules/tslib/tslib.js"],
-    static_files = [
-        "loader.js",
-        "//modules/playground/src/web_workers:worker-config",
-        "@npm//:node_modules/rxjs/bundles/rxjs.umd.js",
-        "@npm//:node_modules/tslib/tslib.js",
-        "index.html",
-        "//packages/zone.js/bundles:zone.umd.js",
-    ],
-    deps = [":animations"],
-)
diff --git a/modules/playground/src/web_workers/animations/background_index.ts b/modules/playground/src/web_workers/animations/background_index.ts
deleted file mode 100644
index b73cc3ac27d93..0000000000000
--- a/modules/playground/src/web_workers/animations/background_index.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @license
- * Copyright Google LLC All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import {NgModule} from '@angular/core';
-import {WorkerAppModule} from '@angular/platform-webworker';
-import {platformWorkerAppDynamic} from '@angular/platform-webworker-dynamic';
-
-import {AnimationCmp} from './index_common';
-
-@NgModule({imports: [WorkerAppModule], bootstrap: [AnimationCmp], declarations: [AnimationCmp]})
-export class ExampleModule {
-}
-
-platformWorkerAppDynamic().bootstrapModule(ExampleModule);
diff --git a/modules/playground/src/web_workers/animations/index.html b/modules/playground/src/web_workers/animations/index.html
deleted file mode 100644
index c4c0c25eb1dac..0000000000000
--- a/modules/playground/src/web_workers/animations/index.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!doctype html>
-<html>
-  <title>WebWorker Animation Tests</title>
-  <style>
-  </style>
-<body>
-  <animation-app>
-    Loading...
-  </animation-app>
-</body>
-</html>
diff --git a/modules/playground/src/web_workers/animations/index_common.ts b/modules/playground/src/web_workers/animations/index_common.ts
deleted file mode 100644
index d38fd32498118..0000000000000
--- a/modules/playground/src/web_workers/animations/index_common.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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 {animate, state, style, transition, trigger} from '@angular/animations';
-import {Component} from '@angular/core';
-
-@Component({
-  selector: 'animation-app',
-  styles: [`
-    .box {
-      border:10px solid black;
-      text-align:center;
-      overflow:hidden;
-      background:red;
-      color:white;
-      font-size:100px;
-      line-height:200px;
-    }
-  `],
-  animations: [trigger(
-      'animate',
-      [
-        state('off', style({width: '0px'})), state('on', style({width: '750px'})),
-        transition('off <=> on', animate(500))
-      ])],
-  template: `
-    <button (click)="animate=!animate">
-      Start Animation
-    </button>
-
-    <div class="box" [@animate]="animate ? 'on' : 'off'">
-      ...
-    </div>
-  `
-})
-export class AnimationCmp {
-  animate = false;
-}
diff --git a/modules/playground/src/web_workers/animations/loader.js b/modules/playground/src/web_workers/animations/loader.js
deleted file mode 100644
index 9dd1900c0b1c5..0000000000000
--- a/modules/playground/src/web_workers/animations/loader.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * @license
- * Copyright Google LLC All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-importScripts('angular/modules/playground/src/web_workers/worker-configure.js');
-
-System.config({packages: {'angular/modules/playground/src/web_workers': {defaultExtension: 'js'}}});
-
-System.import('./background_index.js')
-    .catch(error => console.error('error loading background', error));
diff --git a/modules/playground/src/web_workers/images/BUILD.bazel b/modules/playground/src/web_workers/images/BUILD.bazel
deleted file mode 100644
index e55c51a651a12..0000000000000
--- a/modules/playground/src/web_workers/images/BUILD.bazel
+++ /dev/null
@@ -1,41 +0,0 @@
-load("//tools:defaults.bzl", "ng_module", "ts_devserver")
-
-package(default_visibility = ["//modules/playground:__subpackages__"])
-
-ng_module(
-    name = "images",
-    srcs = glob(["**/*.ts"]),
-    assets = ["image_demo.html"],
-    tsconfig = "//modules/playground:tsconfig-build.json",
-    deps = [
-        "//packages/core",
-        "//packages/platform-webworker",
-        "//packages/platform-webworker-dynamic",
-        "@npm//@types/base64-js",
-    ],
-)
-
-ts_devserver(
-    name = "devserver",
-    # Workaround for: https://github.com/bazelbuild/rules_typescript/issues/409
-    additional_root_paths = ["angular"],
-    bootstrap = [
-        "//packages/zone.js/bundles:zone.umd.js",
-        "@npm//:node_modules/jquery/dist/jquery.min.js",
-        "@npm//:node_modules/materialize-css/dist/js/materialize.min.js",
-    ],
-    entry_module = "angular/modules/playground/src/web_workers/images/index",
-    port = 4200,
-    scripts = ["@npm//:node_modules/tslib/tslib.js"],
-    static_files = [
-        "@npm//:node_modules/base64-js/base64js.min.js",
-        "@npm//:node_modules/rxjs/bundles/rxjs.umd.js",
-        "@npm//:node_modules/tslib/tslib.js",
-        "@npm//:node_modules/materialize-css/dist/css/materialize.min.css",
-        "loader.js",
-        "index.html",
-        "//modules/playground/src/web_workers:worker-config",
-        "//third_party/github.com/google/material-design-icons",
-    ] + glob(["**/*.css"]),
-    deps = [":images"],
-)
diff --git a/modules/playground/src/web_workers/images/background_index.ts b/modules/playground/src/web_workers/images/background_index.ts
deleted file mode 100644
index 5dc345cfb44bf..0000000000000
--- a/modules/playground/src/web_workers/images/background_index.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @license
- * Copyright Google LLC All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import {NgModule} from '@angular/core';
-import {WorkerAppModule} from '@angular/platform-webworker';
-import {platformWorkerAppDynamic} from '@angular/platform-webworker-dynamic';
-
-import {ImageDemo} from './index_common';
-
-@NgModule({imports: [WorkerAppModule], bootstrap: [ImageDemo], declarations: [ImageDemo]})
-export class ExampleModule {
-}
-
-platformWorkerAppDynamic().bootstrapModule(ExampleModule);
diff --git a/modules/playground/src/web_workers/images/image_demo.css b/modules/playground/src/web_workers/images/image_demo.css
deleted file mode 100644
index bf19e97801a69..0000000000000
--- a/modules/playground/src/web_workers/images/image_demo.css
+++ /dev/null
@@ -1,30 +0,0 @@
-.hidden{
-  display: none !important;
-}
-#images {
-  width: 600px;
-  margin: 0 auto;
-}
-ul li {
-  list-style-type: none;
-  float: left;
-  margin-left: 20px;
-  width: 200px;
-}
-#main ul {
-  width: 700px;
-}
-.card-image .image-loader{
-  position: absolute;
-  bottom: 0;
-  margin: auto;
-}
-
-.card-image img.grey {
-  opacity: 0.4;
-}
-
-.fixed-action-btn.bottom {
-  bottom: 45px;
-  right: 24px;
-}
diff --git a/modules/playground/src/web_workers/images/image_demo.html b/modules/playground/src/web_workers/images/image_demo.html
deleted file mode 100644
index e1ae692b98edd..0000000000000
--- a/modules/playground/src/web_workers/images/image_demo.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<nav class="blue">
-  <div class="container">
-    <div class="nav-wrapper">
-      <a class="brand-logo">Angular Image Demo</a>
-    </div>
-  </div>
-</nav>
-<section id="main" class="container">
-  <div class="row">
-    <div *ngFor="let image of images" class="col s12 m2">
-      <div class="card">
-        <div class="card-image">
-          <img [src]="image.src" [class.grey]="image.filtering"/>
-          <div class="image-loader progress" [class.hidden]="!image.filtering">
-            <div class="indeterminate"></div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-  <div class="fixed-action-btn bottom" (click)="applyFilters()">
-    <a class="btn-floating btn-large blue darken-4" (click)="applyFilters()">
-      <i class="large material-icons" (click)="applyFilters()">invert_colors</i>
-    </a>
-  </div>
-
-  <div class="input-field file-field">
-    <div class="btn blue darken-2">
-      <span>Select Images</span>
-      <input type="file" accept="image/bmp" multiple (change)="uploadFiles($event.target.files)" />
-    </div>
-    <div class="file-path-wrapper">
-      <input class="file-path validate" type="text" placeholder="Upload one or more files">
-    </div>
-  </div>
-</section>
diff --git a/modules/playground/src/web_workers/images/index.html b/modules/playground/src/web_workers/images/index.html
deleted file mode 100644
index fde85836fa105..0000000000000
--- a/modules/playground/src/web_workers/images/index.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<html>
-  <head>
-    <link rel="stylesheet" href="image_demo.css" />
-    <link rel="stylesheet" href="/npm/node_modules/materialize-css/dist/css/materialize.min.css">
-    <link rel="stylesheet" href="/third_party/github.com/google/material-design-icons/material-icons.css"></head>
-  </head>
-  <body>
-    <image-demo></image-demo>
-
-    <!--load location for ts_devserver-->
-    <script src="/app_bundle.js"></script>
-  </body>
-</html>
diff --git a/modules/playground/src/web_workers/images/index_common.ts b/modules/playground/src/web_workers/images/index_common.ts
deleted file mode 100644
index b17efba38b3f8..0000000000000
--- a/modules/playground/src/web_workers/images/index_common.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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';
-
-import {BitmapService} from './services/bitmap';
-
-
-@Component({selector: 'image-demo', viewProviders: [BitmapService], templateUrl: 'image_demo.html'})
-export class ImageDemo {
-  images: {src: string, buffer: ArrayBuffer, filtering: boolean}[] = [];
-  fileInput: String;
-
-  constructor(private _bitmapService: BitmapService) {}
-
-  uploadFiles(files: FileList) {
-    for (let i = 0; i < files.length; i++) {
-      const reader = new FileReader();
-      reader.addEventListener('load', this.handleReaderLoad(reader));
-      reader.readAsArrayBuffer(files[i]);
-    }
-  }
-
-  handleReaderLoad(reader: FileReader): EventListener {
-    return (e) => {
-      const buffer = reader.result as ArrayBuffer;
-      this.images.push({
-        src: this._bitmapService.arrayBufferToDataUri(new Uint8Array(buffer)),
-        buffer: buffer,
-        filtering: false
-      });
-    };
-  }
-
-  applyFilters() {
-    for (let i = 0; i < this.images.length; i++) {
-      this.images[i].filtering = true;
-
-      setTimeout(this._filter(i), 0);
-    }
-  }
-
-  private _filter(i: number): () => void {
-    return () => {
-      let imageData = this._bitmapService.convertToImageData(this.images[i].buffer);
-      imageData = this._bitmapService.applySepia(imageData);
-      this.images[i].src = this._bitmapService.toDataUri(imageData);
-      this.images[i].filtering = false;
-    };
-  }
-}
diff --git a/modules/playground/src/web_workers/images/loader.css b/modules/playground/src/web_workers/images/loader.css
deleted file mode 100644
index 30e38fef8b90a..0000000000000
--- a/modules/playground/src/web_workers/images/loader.css
+++ /dev/null
@@ -1,71 +0,0 @@
-body {
-  background: #eaecfa;
-}
-
-.loader {
-  width: 250px;
-  height: 50px;
-  line-height: 50px;
-  text-align: center;
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  -webkit-transform: translate(-50%, -50%);
-      -ms-transform: translate(-50%, -50%);
-          transform: translate(-50%, -50%);
-  font-family: helvetica, arial, sans-serif;
-  text-transform: uppercase;
-  font-weight: 900;
-  color: #ce4233;
-  letter-spacing: 0.2em;
-}
-.loader::before, .loader::after {
-  content: "";
-  display: block;
-  width: 15px;
-  height: 15px;
-  background: #ce4233;
-  position: absolute;
-  -webkit-animation: load .7s infinite alternate ease-in-out;
-          animation: load .7s infinite alternate ease-in-out;
-}
-.loader::before {
-  top: 0;
-}
-.loader::after {
-  bottom: 0;
-}
-
-@-webkit-keyframes load {
-  0% {
-    left: 0;
-    height: 30px;
-    width: 15px;
-  }
-  50% {
-    height: 8px;
-    width: 40px;
-  }
-  100% {
-    left: 235px;
-    height: 30px;
-    width: 15px;
-  }
-}
-
-@keyframes load {
-  0% {
-    left: 0;
-    height: 30px;
-    width: 15px;
-  }
-  50% {
-    height: 8px;
-    width: 40px;
-  }
-  100% {
-    left: 235px;
-    height: 30px;
-    width: 15px;
-  }
-}
diff --git a/modules/playground/src/web_workers/images/loader.js b/modules/playground/src/web_workers/images/loader.js
deleted file mode 100644
index dc68d1ea03cd3..0000000000000
--- a/modules/playground/src/web_workers/images/loader.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @license
- * Copyright Google LLC All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-importScripts('angular/modules/playground/src/web_workers/worker-configure.js');
-
-System.config({
-  map: {
-    'base64-js': 'npm/node_modules/base64-js/base64js.min.js',
-  },
-  packages: {'angular/modules/playground/src/web_workers': {defaultExtension: 'js'}}
-});
-
-System.import('./background_index.js')
-    .catch(error => console.error('error loading background', error));
diff --git a/modules/playground/src/web_workers/images/services/bitmap.ts b/modules/playground/src/web_workers/images/services/bitmap.ts
deleted file mode 100644
index 31c08973930cf..0000000000000
--- a/modules/playground/src/web_workers/images/services/bitmap.ts
+++ /dev/null
@@ -1,179 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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';
-import {fromByteArray} from 'base64-js';
-
-// This class is based on the Bitmap examples at:
-// http://www.i-programmer.info/projects/36-web/6234-reading-a-bmp-file-in-javascript.html
-// and http://www.worldwidewhat.net/2012/07/how-to-draw-bitmaps-using-javascript/
-@Injectable()
-export class BitmapService {
-  convertToImageData(buffer: ArrayBuffer): ImageData {
-    const bmp = this._getBMP(buffer);
-    return this._BMPToImageData(bmp);
-  }
-
-  applySepia(imageData: ImageData): ImageData {
-    const buffer = imageData.data;
-    for (let i = 0; i < buffer.length; i += 4) {
-      const r = buffer[i];
-      const g = buffer[i + 1];
-      const b = buffer[i + 2];
-      buffer[i] = (r * .393) + (g * .769) + (b * .189);
-      buffer[i + 1] = (r * .349) + (g * .686) + (b * .168);
-      buffer[i + 2] = (r * .272) + (g * .534) + (b * .131);
-    }
-    return imageData;
-  }
-
-  toDataUri(imageData: ImageData): string {
-    const header = this._createBMPHeader(imageData);
-    imageData = this._imageDataToBMP(imageData);
-    return 'data:image/bmp;base64,' + btoa(header) + fromByteArray(Uint8Array.from(imageData.data));
-  }
-
-  // converts a .bmp file ArrayBuffer to a dataURI
-  arrayBufferToDataUri(data: Uint8Array): string {
-    return 'data:image/bmp;base64,' + fromByteArray(data);
-  }
-
-  // returns a UInt8Array in BMP order (starting from the bottom)
-  private _imageDataToBMP(imageData: ImageData): ImageData {
-    const width = imageData.width;
-    const height = imageData.height;
-
-    const data = imageData.data;
-    for (let y = 0; y < height / 2; ++y) {
-      let topIndex = y * width * 4;
-      let bottomIndex = (height - y) * width * 4;
-      for (let i = 0; i < width * 4; i++) {
-        this._swap(data, topIndex, bottomIndex);
-        topIndex++;
-        bottomIndex++;
-      }
-    }
-
-    return imageData;
-  }
-
-  private _swap(data: Uint8Array|Uint8ClampedArray|number[], index1: number, index2: number) {
-    const temp = data[index1];
-    data[index1] = data[index2];
-    data[index2] = temp;
-  }
-
-  // Based on example from
-  // http://www.worldwidewhat.net/2012/07/how-to-draw-bitmaps-using-javascript/
-  private _createBMPHeader(imageData: ImageData): string {
-    const numFileBytes = this._getLittleEndianHex(imageData.width * imageData.height);
-    const w = this._getLittleEndianHex(imageData.width);
-    const h = this._getLittleEndianHex(imageData.height);
-    return 'BM' +             // Signature
-        numFileBytes +        // size of the file (bytes)*
-        '\x00\x00' +          // reserved
-        '\x00\x00' +          // reserved
-        '\x36\x00\x00\x00' +  // offset of where BMP data lives (54 bytes)
-        '\x28\x00\x00\x00' +  // number of remaining bytes in header from here (40 bytes)
-        w +                   // the width of the bitmap in pixels*
-        h +                   // the height of the bitmap in pixels*
-        '\x01\x00' +          // the number of color planes (1)
-        '\x20\x00' +          // 32 bits / pixel
-        '\x00\x00\x00\x00' +  // No compression (0)
-        '\x00\x00\x00\x00' +  // size of the BMP data (bytes)*
-        '\x13\x0B\x00\x00' +  // 2835 pixels/meter - horizontal resolution
-        '\x13\x0B\x00\x00' +  // 2835 pixels/meter - the vertical resolution
-        '\x00\x00\x00\x00' +  // Number of colors in the palette (keep 0 for 32-bit)
-        '\x00\x00\x00\x00';   // 0 important colors (means all colors are important)
-  }
-
-  private _BMPToImageData(bmp: BitmapFile): ImageData {
-    const width = bmp.infoHeader.biWidth;
-    const height = bmp.infoHeader.biHeight;
-    const imageData = new ImageData(width, height);
-
-    const data = imageData.data;
-    const bmpData = bmp.pixels;
-    const stride = bmp.stride;
-
-    for (let y = 0; y < height; ++y) {
-      for (let x = 0; x < width; ++x) {
-        const index1 = (x + width * (height - y)) * 4;
-        const index2 = x * 3 + stride * y;
-        data[index1] = bmpData[index2 + 2];
-        data[index1 + 1] = bmpData[index2 + 1];
-        data[index1 + 2] = bmpData[index2];
-        data[index1 + 3] = 255;
-      }
-    }
-    return imageData;
-  }
-
-  private _getBMP(buffer: ArrayBuffer): BitmapFile {
-    const datav = new DataView(buffer);
-    const bitmap: BitmapFile = {
-      fileHeader: {
-        bfType: datav.getUint16(0, true),
-        bfSize: datav.getUint32(2, true),
-        bfReserved1: datav.getUint16(6, true),
-        bfReserved2: datav.getUint16(8, true),
-        bfOffBits: datav.getUint32(10, true),
-      },
-      infoHeader: {
-        biSize: datav.getUint32(14, true),
-        biWidth: datav.getUint32(18, true),
-        biHeight: datav.getUint32(22, true),
-        biPlanes: datav.getUint16(26, true),
-        biBitCount: datav.getUint16(28, true),
-        biCompression: datav.getUint32(30, true),
-        biSizeImage: datav.getUint32(34, true),
-        biXPelsPerMeter: datav.getUint32(38, true),
-        biYPelsPerMeter: datav.getUint32(42, true),
-        biClrUsed: datav.getUint32(46, true),
-        biClrImportant: datav.getUint32(50, true)
-      },
-      stride: null,
-      pixels: null
-    };
-    const start = bitmap.fileHeader.bfOffBits;
-    bitmap.stride =
-        Math.floor((bitmap.infoHeader.biBitCount * bitmap.infoHeader.biWidth + 31) / 32) * 4;
-    bitmap.pixels = new Uint8Array(datav.buffer, start);
-    return bitmap;
-  }
-
-  // Based on example from
-  // http://www.worldwidewhat.net/2012/07/how-to-draw-bitmaps-using-javascript/
-  private _getLittleEndianHex(value: number): string {
-    const result: string[] = [];
-
-    for (let bytes = 4; bytes > 0; bytes--) {
-      result.push(String.fromCharCode(value & 255));
-      value >>= 8;
-    }
-
-    return result.join('');
-  }
-}
-
-interface BitmapFile {
-  fileHeader: {
-    bfType: number; bfSize: number; bfReserved1: number; bfReserved2: number; bfOffBits: number;
-  };
-  infoHeader: {
-    biSize: number; biWidth: number; biHeight: number; biPlanes: number; biBitCount: number;
-    biCompression: number;
-    biSizeImage: number;
-    biXPelsPerMeter: number;
-    biYPelsPerMeter: number;
-    biClrUsed: number;
-    biClrImportant: number
-  };
-  stride: number;
-  pixels: Uint8Array;
-}
diff --git a/modules/playground/src/web_workers/images/single_thread.html b/modules/playground/src/web_workers/images/single_thread.html
deleted file mode 100644
index ec3da632a54cd..0000000000000
--- a/modules/playground/src/web_workers/images/single_thread.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html>
-  <head>
-    <link href="angular/third_party/github.com/google/material-design-icons/material-icons.css"
-          rel="stylesheet">
-    <link rel="stylesheet" href="image_demo.css" />
-  </head>
-  <body>
-    <image-demo>
-    </image-demo>
-    <!-- Compiled and minified CSS -->
-    <link rel="stylesheet" href="angular/third_party/cdnjs.cloudflare.com/materialize/materialize.min.css">
-
-    <!-- Compiled and minified JavaScript -->
-    <script type="text/javascript" src="angular/third_party/code.jquery.com/jquery-2.1.1.min.js"></script>
-    <script src="angular/third_party/cdnjs.cloudflare.com/materialize/materialize.min.js"></script>
-  </body>
-</html>
diff --git a/modules/playground/src/web_workers/images/single_thread.ts b/modules/playground/src/web_workers/images/single_thread.ts
deleted file mode 100644
index 6891b04c1df06..0000000000000
--- a/modules/playground/src/web_workers/images/single_thread.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * @license
- * Copyright Google LLC All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import {NgModule} from '@angular/core';
-import {BrowserModule} from '@angular/platform-browser';
-import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
-
-import {ImageDemo} from './index_common';
-
-@NgModule({bootstrap: [ImageDemo], imports: [BrowserModule]})
-class ExampleModule {
-}
-
-export function main() {
-  platformBrowserDynamic().bootstrapModule(ExampleModule);
-}
diff --git a/modules/playground/src/web_workers/input/BUILD.bazel b/modules/playground/src/web_workers/input/BUILD.bazel
deleted file mode 100644
index ab49918324e0f..0000000000000
--- a/modules/playground/src/web_workers/input/BUILD.bazel
+++ /dev/null
@@ -1,38 +0,0 @@
-load("//tools:defaults.bzl", "ng_module", "ts_devserver")
-
-package(default_visibility = ["//modules/playground:__subpackages__"])
-
-ng_module(
-    name = "input",
-    srcs = glob(["**/*.ts"]),
-    tsconfig = "//modules/playground:tsconfig-build.json",
-    deps = [
-        "//packages/core",
-        "//packages/platform-webworker",
-        "//packages/platform-webworker-dynamic",
-    ],
-)
-
-ts_devserver(
-    name = "devserver",
-    bootstrap = [
-        "@npm//:node_modules/systemjs/dist/system.js",
-        "//packages/zone.js/bundles:zone.umd.js",
-        "//packages/zone.js/bundles:long-stack-trace-zone.umd.js",
-        "@npm//:node_modules/reflect-metadata/Reflect.js",
-    ],
-    entry_module = "angular/modules/playground/src/web_workers/input/index",
-    port = 4200,
-    scripts = [
-        "@npm//:node_modules/tslib/tslib.js",
-        "//tools/rxjs:rxjs_umd_modules",
-    ],
-    static_files = [
-        "index.html",
-        "loader.js",
-        "//modules/playground/src/web_workers:worker-config",
-        "//modules/playground:systemjs-config.js",
-        "//modules/playground:systemjs-rxjs-operators.js",
-    ],
-    deps = [":input"],
-)
diff --git a/modules/playground/src/web_workers/input/background_index.ts b/modules/playground/src/web_workers/input/background_index.ts
deleted file mode 100644
index 3e889dbd957c2..0000000000000
--- a/modules/playground/src/web_workers/input/background_index.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @license
- * Copyright Google LLC All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import {NgModule} from '@angular/core';
-import {WorkerAppModule} from '@angular/platform-webworker';
-import {platformWorkerAppDynamic} from '@angular/platform-webworker-dynamic';
-
-import {InputCmp} from './index_common';
-
-@NgModule({imports: [WorkerAppModule], bootstrap: [InputCmp], declarations: [InputCmp]})
-export class ExampleModule {
-}
-
-platformWorkerAppDynamic().bootstrapModule(ExampleModule);
diff --git a/modules/playground/src/web_workers/input/index.html b/modules/playground/src/web_workers/input/index.html
deleted file mode 100644
index 7f026e4e32b2a..0000000000000
--- a/modules/playground/src/web_workers/input/index.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!doctype html>
-<html>
-  <title>WebWorker Input Tests</title>
-  <style>
-  </style>
-<body>
-  <input-app>
-    Loading...
-  </input-app>
-
-  <!--load location for ts_devserver-->
-  <script src="/app_bundle.js"></script>
-</body>
-</html>
diff --git a/modules/playground/src/web_workers/input/index_common.ts b/modules/playground/src/web_workers/input/index_common.ts
deleted file mode 100644
index 8be97e9c18f94..0000000000000
--- a/modules/playground/src/web_workers/input/index_common.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * @license
- * Copyright Google LLC All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import {Component} from '@angular/core';
-
-@Component({
-  selector: 'input-app',
-  template: `
-    <h2>Input App</h2>
-    <div id="input-container">
-      <input type="text" (input)="inputChanged($event)">
-      <textarea (input)="textAreaChanged($event)"></textarea>
-      <div class="input-val">Input val is {{inputVal}}.</div>
-      <div class="textarea-val">Textarea val is {{textareaVal}}.</div>
-    </div>
-    <div id="ng-model-container">
-    </div>
-  `
-})
-export class InputCmp {
-  inputVal = '';
-  textareaVal = '';
-
-  inputChanged(e: Event) {
-    this.inputVal = (e.target as HTMLInputElement).value;
-  }
-
-  textAreaChanged(e: Event) {
-    this.textareaVal = (e.target as HTMLTextAreaElement).value;
-  }
-}
diff --git a/modules/playground/src/web_workers/input/loader.js b/modules/playground/src/web_workers/input/loader.js
deleted file mode 100644
index 9dd1900c0b1c5..0000000000000
--- a/modules/playground/src/web_workers/input/loader.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * @license
- * Copyright Google LLC All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-importScripts('angular/modules/playground/src/web_workers/worker-configure.js');
-
-System.config({packages: {'angular/modules/playground/src/web_workers': {defaultExtension: 'js'}}});
-
-System.import('./background_index.js')
-    .catch(error => console.error('error loading background', error));
diff --git a/modules/playground/src/web_workers/kitchen_sink/BUILD.bazel b/modules/playground/src/web_workers/kitchen_sink/BUILD.bazel
deleted file mode 100644
index 686ef0468b12b..0000000000000
--- a/modules/playground/src/web_workers/kitchen_sink/BUILD.bazel
+++ /dev/null
@@ -1,38 +0,0 @@
-load("//tools:defaults.bzl", "ng_module", "ts_devserver")
-
-package(default_visibility = ["//modules/playground:__subpackages__"])
-
-ng_module(
-    name = "kitchen_sink",
-    srcs = glob(["**/*.ts"]),
-    tsconfig = "//modules/playground:tsconfig-build.json",
-    deps = [
-        "//packages/core",
-        "//packages/platform-webworker",
-        "//packages/platform-webworker-dynamic",
-    ],
-)
-
-ts_devserver(
-    name = "devserver",
-    bootstrap = [
-        "@npm//:node_modules/systemjs/dist/system.js",
-        "//packages/zone.js/bundles:zone.umd.js",
-        "//packages/zone.js/bundles:long-stack-trace-zone.umd.js",
-        "@npm//:node_modules/reflect-metadata/Reflect.js",
-    ],
-    entry_module = "angular/modules/playground/src/web_workers/kitchen_sink/index",
-    port = 4200,
-    scripts = [
-        "@npm//:node_modules/tslib/tslib.js",
-        "//tools/rxjs:rxjs_umd_modules",
-    ],
-    static_files = [
-        "index.html",
-        "loader.js",
-        "//modules/playground/src/web_workers:worker-config",
-        "//modules/playground:systemjs-config.js",
-        "//modules/playground:systemjs-rxjs-operators.js",
-    ],
-    deps = [":kitchen_sink"],
-)
diff --git a/modules/playground/src/web_workers/kitchen_sink/background_index.ts b/modules/playground/src/web_workers/kitchen_sink/background_index.ts
deleted file mode 100644
index dfea4058345a9..0000000000000
--- a/modules/playground/src/web_workers/kitchen_sink/background_index.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @license
- * Copyright Google LLC All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import {NgModule} from '@angular/core';
-import {WorkerAppModule} from '@angular/platform-webworker';
-import {platformWorkerAppDynamic} from '@angular/platform-webworker-dynamic';
-
-import {HelloCmp, RedDec} from './index_common';
-
-@NgModule({
-  imports: [WorkerAppModule],
-  bootstrap: [HelloCmp],
-  declarations: [HelloCmp, RedDec],
-})
-export class ExampleModule {
-}
-
-platformWorkerAppDynamic().bootstrapModule(ExampleModule);
diff --git a/modules/playground/src/web_workers/kitchen_sink/index.html b/modules/playground/src/web_workers/kitchen_sink/index.html
deleted file mode 100644
index 72a835e48abf6..0000000000000
--- a/modules/playground/src/web_workers/kitchen_sink/index.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!doctype html>
-<html>
-  <title>Hello Angular</title>
-  <style>
-    .sample-area {
-      text-align: center;
-      margin: 5px;
-      height: 50px;
-      line-height: 50px;
-      border-radius: 5px;
-      border: 1px solid #d0d0d0;
-   }
-    .sample-area:focus {
-      border: 1px solid blue;
-      color: blue;
-      font-weight: bold;
-    }
-  </style>
-<body>
-  <hello-app>
-    Loading...
-  </hello-app>
-
-  <!--load location for ts_devserver-->
-  <script src="/app_bundle.js"></script>
-</body>
-</html>
diff --git a/modules/playground/src/web_workers/kitchen_sink/index_common.ts b/modules/playground/src/web_workers/kitchen_sink/index_common.ts
deleted file mode 100644
index 90939de9ba096..0000000000000
--- a/modules/playground/src/web_workers/kitchen_sink/index_common.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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, Directive, ElementRef, Injectable, Renderer2} from '@angular/core';
-
-// A service available to the Injector, used by the HelloCmp component.
-@Injectable()
-export class GreetingService {
-  greeting: string = 'hello';
-}
-
-// Directives are light-weight. They don't allow new
-// expression contexts (use @Component for those needs).
-@Directive({selector: '[red]'})
-export class RedDec {
-  // ElementRef is always injectable and it wraps the element on which the
-  // directive was found by the compiler.
-  constructor(el: ElementRef, renderer: Renderer2) {
-    renderer.setStyle(el.nativeElement, 'color', 'red');
-  }
-}
-
-// Angular supports 2 basic types of directives:
-// - Component - the basic building blocks of Angular apps. Backed by
-//   ShadowDom.(http://www.html5rocks.com/en/tutorials/webcomponents/shadowdom/)
-// - Directive - add behavior to existing elements.
-
-@Component({
-  // The Selector prop tells Angular on which elements to instantiate this
-  // class. The syntax supported is a basic subset of CSS selectors, for example
-  // 'element', '[attr]', [attr=foo]', etc.
-  selector: 'hello-app',
-  // These are services that would be created if a class in the component's
-  // template tries to inject them.
-  viewProviders: [GreetingService],
-  // The template for the component.
-  // Expressions in the template (like {{greeting}}) are evaluated in the
-  // context of the HelloCmp class below.
-  template: `<div class="greeting">{{greeting}} <span red>world</span>!</div>
-           <button class="changeButton" (click)="changeGreeting()">change greeting</button>
-           <div (keydown)="onKeyDown($event)" class="sample-area" tabindex="0">{{lastKey}}</div><br>`
-})
-export class HelloCmp {
-  greeting: string;
-  lastKey: string = '(none)';
-
-  constructor(service: GreetingService) {
-    this.greeting = service.greeting;
-  }
-
-  changeGreeting(): void {
-    this.greeting = 'howdy';
-  }
-
-  onKeyDown(event: KeyboardEvent): void {
-    this.lastKey = String.fromCharCode(event.keyCode);
-  }
-}
diff --git a/modules/playground/src/web_workers/kitchen_sink/loader.js b/modules/playground/src/web_workers/kitchen_sink/loader.js
deleted file mode 100644
index 9dd1900c0b1c5..0000000000000
--- a/modules/playground/src/web_workers/kitchen_sink/loader.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * @license
- * Copyright Google LLC All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-importScripts('angular/modules/playground/src/web_workers/worker-configure.js');
-
-System.config({packages: {'angular/modules/playground/src/web_workers': {defaultExtension: 'js'}}});
-
-System.import('./background_index.js')
-    .catch(error => console.error('error loading background', error));
diff --git a/modules/playground/src/web_workers/message_broker/BUILD.bazel b/modules/playground/src/web_workers/message_broker/BUILD.bazel
deleted file mode 100644
index 9dd6417a301e8..0000000000000
--- a/modules/playground/src/web_workers/message_broker/BUILD.bazel
+++ /dev/null
@@ -1,38 +0,0 @@
-load("//tools:defaults.bzl", "ng_module", "ts_devserver")
-
-package(default_visibility = ["//modules/playground:__subpackages__"])
-
-ng_module(
-    name = "message_broker",
-    srcs = glob(["**/*.ts"]),
-    tsconfig = "//modules/playground:tsconfig-build.json",
-    deps = [
-        "//packages/core",
-        "//packages/platform-webworker",
-        "//packages/platform-webworker-dynamic",
-    ],
-)
-
-ts_devserver(
-    name = "devserver",
-    bootstrap = [
-        "@npm//:node_modules/systemjs/dist/system.js",
-        "//packages/zone.js/bundles:zone.umd.js",
-        "//packages/zone.js/bundles:long-stack-trace-zone.umd.js",
-        "@npm//:node_modules/reflect-metadata/Reflect.js",
-    ],
-    entry_module = "angular/modules/playground/src/web_workers/message_broker/index",
-    port = 4200,
-    scripts = [
-        "@npm//:node_modules/tslib/tslib.js",
-        "//tools/rxjs:rxjs_umd_modules",
-    ],
-    static_files = [
-        "index.html",
-        "loader.js",
-        "//modules/playground/src/web_workers:worker-config",
-        "//modules/playground:systemjs-config.js",
-        "//modules/playground:systemjs-rxjs-operators.js",
-    ],
-    deps = [":message_broker"],
-)
diff --git a/modules/playground/src/web_workers/message_broker/background_index.ts b/modules/playground/src/web_workers/message_broker/background_index.ts
deleted file mode 100644
index f9f8e033c72f5..0000000000000
--- a/modules/playground/src/web_workers/message_broker/background_index.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @license
- * Copyright Google LLC All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import {NgModule} from '@angular/core';
-import {WorkerAppModule} from '@angular/platform-webworker';
-import {platformWorkerAppDynamic} from '@angular/platform-webworker-dynamic';
-
-import {App} from './index_common';
-
-@NgModule({imports: [WorkerAppModule], bootstrap: [App], declarations: [App]})
-export class ExampleModule {
-}
-
-platformWorkerAppDynamic().bootstrapModule(ExampleModule);
diff --git a/modules/playground/src/web_workers/message_broker/index.html b/modules/playground/src/web_workers/message_broker/index.html
deleted file mode 100644
index f1aab56501b3b..0000000000000
--- a/modules/playground/src/web_workers/message_broker/index.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!doctype html>
-<html>
-  <title>Message Broker Example</title>
-<body>
-  <app></app>
-  <input type="text" id="echo_input" />
-  <button type="button" id="send_echo">Send Echo</button>
-  <p id="echo_result"></p>
-  <p id="ui_result"></p>
-
-  <!--load location for ts_devserver-->
-  <script src="/app_bundle.js"></script>
-</body>
-</html>
diff --git a/modules/playground/src/web_workers/message_broker/index.ts b/modules/playground/src/web_workers/message_broker/index.ts
deleted file mode 100644
index 592ff5bd7718f..0000000000000
--- a/modules/playground/src/web_workers/message_broker/index.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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 {PlatformRef} from '@angular/core';
-import {bootstrapWorkerUi, ClientMessageBrokerFactory, FnArg, SerializerTypes, UiArguments} from '@angular/platform-webworker';
-
-const ECHO_CHANNEL = 'ECHO';
-
-function afterBootstrap(ref: PlatformRef) {
-  const brokerFactory: ClientMessageBrokerFactory = ref.injector.get(ClientMessageBrokerFactory);
-  const broker = brokerFactory.createMessageBroker(ECHO_CHANNEL, false);
-
-  document.getElementById('send_echo').addEventListener('click', (e) => {
-    const val = (<HTMLInputElement>document.getElementById('echo_input')).value;
-    // TODO(jteplitz602): Replace default constructors with real constructors
-    // once they're in the .d.ts file (#3926)
-    const fnArg = new FnArg(val);
-    const args = new UiArguments('echo', [fnArg]);
-
-    broker.runOnService(args, SerializerTypes.PRIMITIVE).then((echo_result: string) => {
-      document.getElementById('echo_result').innerHTML =
-          `<span class='response'>${echo_result}</span>`;
-    });
-  });
-}
-
-bootstrapWorkerUi('loader.js').then(afterBootstrap);
diff --git a/modules/playground/src/web_workers/message_broker/index_common.ts b/modules/playground/src/web_workers/message_broker/index_common.ts
deleted file mode 100644
index 193964bdba069..0000000000000
--- a/modules/playground/src/web_workers/message_broker/index_common.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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';
-import {SerializerTypes, ServiceMessageBrokerFactory} from '@angular/platform-webworker';
-
-const ECHO_CHANNEL = 'ECHO';
-
-@Component({selector: 'app', template: '<h1>WebWorker MessageBroker Test</h1>'})
-export class App {
-  constructor(private _serviceBrokerFactory: ServiceMessageBrokerFactory) {
-    const broker = _serviceBrokerFactory.createMessageBroker(ECHO_CHANNEL, false);
-    broker.registerMethod(
-        'echo', [SerializerTypes.PRIMITIVE], this._echo, SerializerTypes.PRIMITIVE);
-  }
-
-  private _echo(val: string) {
-    return new Promise((res) => res(val));
-  }
-}
diff --git a/modules/playground/src/web_workers/message_broker/loader.js b/modules/playground/src/web_workers/message_broker/loader.js
deleted file mode 100644
index 9dd1900c0b1c5..0000000000000
--- a/modules/playground/src/web_workers/message_broker/loader.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * @license
- * Copyright Google LLC All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-importScripts('angular/modules/playground/src/web_workers/worker-configure.js');
-
-System.config({packages: {'angular/modules/playground/src/web_workers': {defaultExtension: 'js'}}});
-
-System.import('./background_index.js')
-    .catch(error => console.error('error loading background', error));
diff --git a/modules/playground/src/web_workers/router/BUILD.bazel b/modules/playground/src/web_workers/router/BUILD.bazel
deleted file mode 100644
index e771007426752..0000000000000
--- a/modules/playground/src/web_workers/router/BUILD.bazel
+++ /dev/null
@@ -1,41 +0,0 @@
-load("//tools:defaults.bzl", "ng_module", "ts_devserver")
-
-package(default_visibility = ["//modules/playground:__subpackages__"])
-
-ng_module(
-    name = "router",
-    srcs = glob(["**/*.ts"]),
-    assets = ["app.html"],
-    tsconfig = "//modules/playground:tsconfig-build.json",
-    deps = [
-        "//packages/core",
-        "//packages/platform-webworker",
-        "//packages/platform-webworker-dynamic",
-        "//packages/router",
-        "@npm//rxjs",
-    ],
-)
-
-ts_devserver(
-    name = "devserver",
-    bootstrap = [
-        "@npm//:node_modules/systemjs/dist/system.js",
-        "//packages/zone.js/bundles:zone.umd.js",
-        "//packages/zone.js/bundles:long-stack-trace-zone.umd.js",
-        "@npm//:node_modules/reflect-metadata/Reflect.js",
-    ],
-    entry_module = "angular/modules/playground/src/web_workers/router/index",
-    port = 4200,
-    scripts = [
-        "@npm//:node_modules/tslib/tslib.js",
-        "//tools/rxjs:rxjs_umd_modules",
-    ],
-    static_files = [
-        "index.html",
-        "loader.js",
-        "//modules/playground/src/web_workers:worker-config",
-        "//modules/playground:systemjs-config.js",
-        "//modules/playground:systemjs-rxjs-operators.js",
-    ],
-    deps = [":router"],
-)
diff --git a/modules/playground/src/web_workers/router/app.html b/modules/playground/src/web_workers/router/app.html
deleted file mode 100644
index d79243c194f6a..0000000000000
--- a/modules/playground/src/web_workers/router/app.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<nav>
-	<ul>
-		<li class="start" routerLink="/">Start</li>
-		<li class="about" routerLink="/about">About</li>
-		<li class="contact" routerLink="/contact">Contact</li>
-	</ul>
-</nav>
-<main>
-	<router-outlet></router-outlet>
-</main>
-
diff --git a/modules/playground/src/web_workers/router/background_index.ts b/modules/playground/src/web_workers/router/background_index.ts
deleted file mode 100644
index d8240a05a162b..0000000000000
--- a/modules/playground/src/web_workers/router/background_index.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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 {platformWorkerAppDynamic} from '@angular/platform-webworker-dynamic';
-import {AppModule} from './index_common';
-
-platformWorkerAppDynamic().bootstrapModule(AppModule);
diff --git a/modules/playground/src/web_workers/router/components/about.ts b/modules/playground/src/web_workers/router/components/about.ts
deleted file mode 100644
index 272a2404b24c9..0000000000000
--- a/modules/playground/src/web_workers/router/components/about.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * @license
- * Copyright Google LLC All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import {Component} from '@angular/core';
-@Component({selector: 'about', template: '<h1>About</h1>'})
-export class About {
-}
diff --git a/modules/playground/src/web_workers/router/components/contact.ts b/modules/playground/src/web_workers/router/components/contact.ts
deleted file mode 100644
index 46ba8e7cdcbd4..0000000000000
--- a/modules/playground/src/web_workers/router/components/contact.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * @license
- * Copyright Google LLC All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import {Component} from '@angular/core';
-@Component({selector: 'contact', template: '<h1>Contact</h1>'})
-export class Contact {
-}
diff --git a/modules/playground/src/web_workers/router/components/start.ts b/modules/playground/src/web_workers/router/components/start.ts
deleted file mode 100644
index d80dab161896c..0000000000000
--- a/modules/playground/src/web_workers/router/components/start.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * @license
- * Copyright Google LLC All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import {Component} from '@angular/core';
-@Component({selector: 'start', template: '<h1>Start</h1>'})
-export class Start {
-}
diff --git a/modules/playground/src/web_workers/router/index.html b/modules/playground/src/web_workers/router/index.html
deleted file mode 100644
index 90ce028dae9bb..0000000000000
--- a/modules/playground/src/web_workers/router/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!doctype html>
-<html>
-  <title>Web Worker Router Example</title>
-<body>
-  <app></app>
-
-  <!--load location for ts_devserver-->
-  <script src="/app_bundle.js"></script>
-</body>
-</html>
diff --git a/modules/playground/src/web_workers/router/index.ts b/modules/playground/src/web_workers/router/index.ts
deleted file mode 100644
index 72034f8c65c86..0000000000000
--- a/modules/playground/src/web_workers/router/index.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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 {bootstrapWorkerUi, WORKER_UI_LOCATION_PROVIDERS} from '@angular/platform-webworker';
-
-bootstrapWorkerUi('loader.js', WORKER_UI_LOCATION_PROVIDERS);
diff --git a/modules/playground/src/web_workers/router/index_common.ts b/modules/playground/src/web_workers/router/index_common.ts
deleted file mode 100644
index 9aa0ce01c0c52..0000000000000
--- a/modules/playground/src/web_workers/router/index_common.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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, NgModule} from '@angular/core';
-import {WORKER_APP_LOCATION_PROVIDERS, WorkerAppModule} from '@angular/platform-webworker';
-import {RouterModule} from '@angular/router';
-
-import {About} from './components/about';
-import {Contact} from './components/contact';
-import {Start} from './components/start';
-
-@Component({selector: 'app', templateUrl: 'app.html'})
-export class App {
-}
-
-export const ROUTES = [
-  {path: '', component: Start}, {path: 'contact', component: Contact},
-  {path: 'about', component: About}
-];
-
-@NgModule({
-  imports: [WorkerAppModule, RouterModule.forRoot(ROUTES, {useHash: true})],
-  providers: [
-    WORKER_APP_LOCATION_PROVIDERS,
-  ],
-  bootstrap: [App],
-  declarations: [App, Start, Contact, About]
-})
-export class AppModule {
-}
diff --git a/modules/playground/src/web_workers/router/loader.js b/modules/playground/src/web_workers/router/loader.js
deleted file mode 100644
index 9dd1900c0b1c5..0000000000000
--- a/modules/playground/src/web_workers/router/loader.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * @license
- * Copyright Google LLC All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-importScripts('angular/modules/playground/src/web_workers/worker-configure.js');
-
-System.config({packages: {'angular/modules/playground/src/web_workers': {defaultExtension: 'js'}}});
-
-System.import('./background_index.js')
-    .catch(error => console.error('error loading background', error));
diff --git a/modules/playground/src/web_workers/todo/BUILD.bazel b/modules/playground/src/web_workers/todo/BUILD.bazel
deleted file mode 100644
index ab7d0168863dd..0000000000000
--- a/modules/playground/src/web_workers/todo/BUILD.bazel
+++ /dev/null
@@ -1,41 +0,0 @@
-load("//tools:defaults.bzl", "ng_module", "ts_devserver")
-
-package(default_visibility = ["//modules/playground:__subpackages__"])
-
-ng_module(
-    name = "todo",
-    srcs = glob(["**/*.ts"]),
-    assets = ["todo.html"],
-    tsconfig = "//modules/playground:tsconfig-build.json",
-    deps = [
-        "//packages/core",
-        "//packages/forms",
-        "//packages/platform-webworker",
-        "//packages/platform-webworker-dynamic",
-    ],
-)
-
-ts_devserver(
-    name = "devserver",
-    bootstrap = [
-        "@npm//:node_modules/systemjs/dist/system.js",
-        "//packages/zone.js/bundles:zone.umd.js",
-        "//packages/zone.js/bundles:long-stack-trace-zone.umd.js",
-        "@npm//:node_modules/reflect-metadata/Reflect.js",
-    ],
-    entry_module = "angular/modules/playground/src/web_workers/todo/index",
-    port = 4200,
-    scripts = [
-        "@npm//:node_modules/tslib/tslib.js",
-        "//tools/rxjs:rxjs_umd_modules",
-    ],
-    static_files = [
-        "index.html",
-        "css/main.css",
-        "loader.js",
-        "//modules/playground/src/web_workers:worker-config",
-        "//modules/playground:systemjs-config.js",
-        "//modules/playground:systemjs-rxjs-operators.js",
-    ],
-    deps = [":todo"],
-)
diff --git a/modules/playground/src/web_workers/todo/background_index.ts b/modules/playground/src/web_workers/todo/background_index.ts
deleted file mode 100644
index f54e747f426e8..0000000000000
--- a/modules/playground/src/web_workers/todo/background_index.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * @license
- * Copyright Google LLC All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import {NgModule} from '@angular/core';
-import {FormsModule} from '@angular/forms';
-import {WorkerAppModule} from '@angular/platform-webworker';
-import {platformWorkerAppDynamic} from '@angular/platform-webworker-dynamic';
-
-import {TodoApp} from './index_common';
-
-@NgModule({imports: [WorkerAppModule, FormsModule], bootstrap: [TodoApp], declarations: [TodoApp]})
-export class ExampleModule {
-}
-
-platformWorkerAppDynamic().bootstrapModule(ExampleModule);
diff --git a/modules/playground/src/web_workers/todo/css/bg.png b/modules/playground/src/web_workers/todo/css/bg.png
deleted file mode 100644
index b2a7600825ee1..0000000000000
Binary files a/modules/playground/src/web_workers/todo/css/bg.png and /dev/null differ
diff --git a/modules/playground/src/web_workers/todo/css/main.css b/modules/playground/src/web_workers/todo/css/main.css
deleted file mode 100644
index 2b3220292b06d..0000000000000
--- a/modules/playground/src/web_workers/todo/css/main.css
+++ /dev/null
@@ -1,386 +0,0 @@
-@charset "utf-8";
-
-html,
-body {
-  margin: 0;
-  padding: 0;
-}
-
-body {
-  font: 14px 'Helvetica Neue', Helvetica, Arial, sans-serif;
-  line-height: 1.4em;
-  background: #eaeaea;
-  color: #4d4d4d;
-  width: 550px;
-  margin: 0 auto;
-}
-
-button {
-  margin: 0;
-  padding: 0;
-  border: 0;
-  background: none;
-  font-size: 100%;
-  vertical-align: baseline;
-  font-family: inherit;
-  font-weight: inherit;
-  color: inherit;
-  -webkit-appearance: none;
-  -ms-appearance: none;
-  appearance: none;
-}
-
-button,
-input[type="checkbox"] {
-  outline: none;
-}
-
-.hidden {
-  display: none;
-}
-
-.visible {
-  display: block !important;
-}
-
-#todoapp {
-  background: #fff;
-  margin: 130px 0 40px 0;
-  position: relative;
-  box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.2),
-  0 25px 50px 0 rgba(0, 0, 0, 0.1);
-}
-
-#todoapp input::-webkit-input-placeholder {
-  font-style: italic;
-  font-weight: 300;
-  color: #e6e6e6;
-}
-
-#todoapp input::-moz-placeholder {
-  font-style: italic;
-  font-weight: 300;
-  color: #e6e6e6;
-}
-
-#todoapp input::input-placeholder {
-  font-style: italic;
-  font-weight: 300;
-  color: #e6e6e6;
-}
-
-#todoapp h1 {
-  position: absolute;
-  top: -155px;
-  width: 100%;
-  font-size: 100px;
-  font-weight: 100;
-  text-align: center;
-  color: rgba(175, 47, 47, 0.15);
-  -webkit-text-rendering: optimizeLegibility;
-  -moz-text-rendering: optimizeLegibility;
-  -ms-text-rendering: optimizeLegibility;
-  text-rendering: optimizeLegibility;
-}
-
-#new-todo,
-.edit {
-  position: relative;
-  margin: 0;
-  width: 100%;
-  font-size: 24px;
-  font-family: inherit;
-  font-weight: inherit;
-  line-height: 1.4em;
-  border: 0;
-  outline: none;
-  color: inherit;
-  padding: 6px;
-  border: 1px solid #999;
-  box-shadow: inset 0 -1px 5px 0 rgba(0, 0, 0, 0.2);
-  -ms-box-sizing: border-box;
-  box-sizing: border-box;
-}
-
-#new-todo {
-  padding: 16px 16px 16px 60px;
-  border: none;
-  background: rgba(0, 0, 0, 0.003);
-  box-shadow: inset 0 -2px 1px rgba(0,0,0,0.03);
-}
-
-#main {
-  position: relative;
-  z-index: 2;
-  border-top: 1px solid #e6e6e6;
-}
-
-label[for='toggle-all'] {
-  display: none;
-}
-
-#toggle-all {
-  position: absolute;
-  top: -55px;
-  left: -12px;
-  width: 60px;
-  height: 34px;
-  text-align: center;
-  border: none; /* Mobile Safari */
-}
-
-#toggle-all:before {
-  content: '❯';
-  font-size: 22px;
-  color: #e6e6e6;
-  padding: 10px 27px 10px 27px;
-}
-
-#toggle-all:checked:before {
-  color: #737373;
-}
-
-#todo-list {
-  margin: 0;
-  padding: 0;
-  list-style: none;
-}
-
-#todo-list li {
-  position: relative;
-  font-size: 24px;
-  border-bottom: 1px solid #ededed;
-}
-
-#todo-list li:last-child {
-  border-bottom: none;
-}
-
-#todo-list li.editing {
-  border-bottom: none;
-  padding: 0;
-}
-
-#todo-list li.editing .edit {
-  display: block;
-  width: 506px;
-  padding: 13px 17px 12px 17px;
-  margin: 0 0 0 43px;
-}
-
-#todo-list li.editing .view {
-  display: none;
-}
-
-#todo-list li .toggle {
-  text-align: center;
-  width: 40px;
-  /* auto, since non-WebKit browsers doesn't support input styling */
-  height: auto;
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  margin: auto 0;
-  border: none; /* Mobile Safari */
-  -webkit-appearance: none;
-  -ms-appearance: none;
-  appearance: none;
-}
-
-#todo-list li .toggle:after {
-  content: url('data:image/svg+xml;charset=utf8,<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="-10 -18 100 135"><circle cx="50" cy="50" r="50" fill="none" stroke="#ededed" stroke-width="3"/></svg>');
-}
-
-#todo-list li .toggle:checked:after {
-  content: url('data:image/svg+xml;charset=utf8,<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="-10 -18 100 135"><circle cx="50" cy="50" r="50" fill="none" stroke="#bddad5" stroke-width="3"/><path fill="#5dc2af" d="M72 25L42 71 27 56l-4 4 20 20 34-52z"/></svg>');
-}
-
-#todo-list li label {
-  white-space: pre;
-  word-break: break-word;
-  padding: 15px 60px 15px 15px;
-  margin-left: 45px;
-  display: block;
-  line-height: 1.2;
-  transition: color 0.4s;
-}
-
-#todo-list li.completed label {
-  color: #d9d9d9;
-  text-decoration: line-through;
-}
-
-#todo-list li .destroy {
-  display: none;
-  position: absolute;
-  top: 0;
-  right: 10px;
-  bottom: 0;
-  width: 40px;
-  height: 40px;
-  margin: auto 0;
-  font-size: 30px;
-  color: #cc9a9a;
-  margin-bottom: 11px;
-  transition: color 0.2s ease-out;
-}
-
-#todo-list li .destroy:hover {
-  color: #af5b5e;
-}
-
-#todo-list li .destroy:after {
-  content: '×';
-}
-
-#todo-list li:hover .destroy {
-  display: block;
-}
-
-#todo-list li .edit {
-  display: none;
-}
-
-#todo-list li.editing:last-child {
-  margin-bottom: -1px;
-}
-
-#footer {
-  color: #777;
-  padding: 10px 15px;
-  height: 20px;
-  text-align: center;
-  border-top: 1px solid #e6e6e6;
-}
-
-#footer:before {
-  content: '';
-  position: absolute;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  height: 50px;
-  overflow: hidden;
-  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2),
-  0 8px 0 -3px #f6f6f6,
-  0 9px 1px -3px rgba(0, 0, 0, 0.2),
-  0 16px 0 -6px #f6f6f6,
-  0 17px 2px -6px rgba(0, 0, 0, 0.2);
-}
-
-#todo-count {
-  float: left;
-  text-align: left;
-}
-
-#todo-count strong {
-  font-weight: 300;
-}
-
-#filters {
-  margin: 0;
-  padding: 0;
-  list-style: none;
-  position: absolute;
-  right: 0;
-  left: 0;
-}
-
-#filters li {
-  display: inline;
-}
-
-#filters li a {
-  color: inherit;
-  margin: 3px;
-  padding: 3px 7px;
-  text-decoration: none;
-  border: 1px solid transparent;
-  border-radius: 3px;
-}
-
-#filters li a.selected,
-#filters li a:hover {
-  border-color: rgba(175, 47, 47, 0.1);
-}
-
-#filters li a.selected {
-  border-color: rgba(175, 47, 47, 0.2);
-}
-
-#clear-completed,
-html #clear-completed:active {
-  float: right;
-  position: relative;
-  line-height: 20px;
-  text-decoration: none;
-  cursor: pointer;
-  visibility: hidden;
-  position: relative;
-}
-
-#clear-completed::after {
-  visibility: visible;
-  content: 'Clear completed';
-  position: absolute;
-  right: 0;
-  white-space: nowrap;
-}
-
-#clear-completed:hover::after {
-  text-decoration: underline;
-}
-
-#info {
-  margin: 65px auto 0;
-  color: #bfbfbf;
-  font-size: 10px;
-  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
-  text-align: center;
-}
-
-#info p {
-  line-height: 1;
-}
-
-#info a {
-  color: inherit;
-  text-decoration: none;
-  font-weight: 400;
-}
-
-#info a:hover {
-  text-decoration: underline;
-}
-
-/*
-Hack to remove background from Mobile Safari.
-Can't use it globally since it destroys checkboxes in Firefox
-*/
-@media screen and (-webkit-min-device-pixel-ratio:0) {
-  #toggle-all,
-  #todo-list li .toggle {
-    background: none;
-  }
-
-  #todo-list li .toggle {
-    height: 40px;
-  }
-
-  #toggle-all {
-    -webkit-transform: rotate(90deg);
-    transform: rotate(90deg);
-    -webkit-appearance: none;
-    appearance: none;
-  }
-}
-
-@media (max-width: 430px) {
-  #footer {
-    height: 50px;
-  }
-
-  #filters {
-    bottom: 10px;
-  }
-}
diff --git a/modules/playground/src/web_workers/todo/index.html b/modules/playground/src/web_workers/todo/index.html
deleted file mode 100644
index 329bf4c6a03ef..0000000000000
--- a/modules/playground/src/web_workers/todo/index.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!doctype html>
-<html>
-  <title>Todo Angular - WebWorker</title>
-  <link rel="stylesheet" href="css/main.css" media="screen" title="no title" charset="utf-8">
-<body>
-  <todo-app>
-    Loading...
-  </todo-app>
-
-  <!--load location for ts_devserver-->
-  <script src="/app_bundle.js"></script>
-</body>
-</html>
diff --git a/modules/playground/src/web_workers/todo/index.ts b/modules/playground/src/web_workers/todo/index.ts
deleted file mode 100644
index f3791aca9123d..0000000000000
--- a/modules/playground/src/web_workers/todo/index.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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 {bootstrapWorkerUi} from '@angular/platform-webworker';
-
-bootstrapWorkerUi('loader.js');
diff --git a/modules/playground/src/web_workers/todo/index_common.ts b/modules/playground/src/web_workers/todo/index_common.ts
deleted file mode 100644
index 9630d459276e0..0000000000000
--- a/modules/playground/src/web_workers/todo/index_common.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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';
-
-import {Store, Todo, TodoFactory} from './services/TodoStore';
-
-@Component({selector: 'todo-app', viewProviders: [Store, TodoFactory], templateUrl: 'todo.html'})
-export class TodoApp {
-  todoEdit: Todo = null;
-  inputValue: string;
-  hideActive: boolean = false;
-  hideCompleted: boolean = false;
-  isComplete: boolean = false;
-
-  constructor(public todoStore: Store<Todo>, public factory: TodoFactory) {}
-
-  enterTodo(): void {
-    this.addTodo(this.inputValue);
-    this.inputValue = '';
-  }
-
-  doneEditing($event: KeyboardEvent, todo: Todo): void {
-    const which = $event.keyCode;
-    if (which === 13) {
-      todo.title = todo.editTitle;
-      this.todoEdit = null;
-    } else if (which === 27) {
-      this.todoEdit = null;
-      todo.editTitle = todo.title;
-    }
-  }
-
-  editTodo(todo: Todo): void {
-    this.todoEdit = todo;
-  }
-
-  addTodo(newTitle: string): void {
-    this.todoStore.add(this.factory.create(newTitle, false));
-  }
-
-  completeMe(todo: Todo): void {
-    todo.completed = !todo.completed;
-  }
-
-  toggleCompleted(): void {
-    this.hideActive = !this.hideActive;
-    this.hideCompleted = false;
-  }
-
-  toggleActive(): void {
-    this.hideCompleted = !this.hideCompleted;
-    this.hideActive = false;
-  }
-
-  showAll(): void {
-    this.hideCompleted = false;
-    this.hideActive = false;
-  }
-
-  deleteMe(todo: Todo): void {
-    this.todoStore.remove(todo);
-  }
-
-  toggleAll($event: MouseEvent): void {
-    this.isComplete = !this.isComplete;
-    this.todoStore.list.forEach((todo: Todo) => {
-      todo.completed = this.isComplete;
-    });
-  }
-
-  clearCompleted(): void {
-    this.todoStore.removeBy((todo: Todo) => todo.completed);
-  }
-}
diff --git a/modules/playground/src/web_workers/todo/index_web_socket.html b/modules/playground/src/web_workers/todo/index_web_socket.html
deleted file mode 100644
index e4fac7623f219..0000000000000
--- a/modules/playground/src/web_workers/todo/index_web_socket.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!doctype html>
-<html>
-  <title>Todo Angular - WebWorker</title>
-  <link rel="stylesheet" href="css/main.css" media="screen" title="no title" charset="utf-8">
-<body>
-  <todo-app>
-    Loading...
-  </todo-app>
-</body>
-</html>
diff --git a/modules/playground/src/web_workers/todo/loader.js b/modules/playground/src/web_workers/todo/loader.js
deleted file mode 100644
index 9dd1900c0b1c5..0000000000000
--- a/modules/playground/src/web_workers/todo/loader.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * @license
- * Copyright Google LLC All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-importScripts('angular/modules/playground/src/web_workers/worker-configure.js');
-
-System.config({packages: {'angular/modules/playground/src/web_workers': {defaultExtension: 'js'}}});
-
-System.import('./background_index.js')
-    .catch(error => console.error('error loading background', error));
diff --git a/modules/playground/src/web_workers/todo/services/TodoStore.ts b/modules/playground/src/web_workers/todo/services/TodoStore.ts
deleted file mode 100644
index 34896ca7c84bf..0000000000000
--- a/modules/playground/src/web_workers/todo/services/TodoStore.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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';
-
-// base model for RecordStore
-export class KeyModel {
-  constructor(public key: number) {}
-}
-
-export class Todo extends KeyModel {
-  editTitle: string;
-  constructor(key: number, public title: string, public completed: boolean) {
-    super(key);
-    this.editTitle = title;
-  }
-}
-
-@Injectable()
-export class TodoFactory {
-  private _uid: number = 0;
-
-  nextUid(): number {
-    return ++this._uid;
-  }
-
-  create(title: string, isCompleted: boolean): Todo {
-    return new Todo(this.nextUid(), title, isCompleted);
-  }
-}
-
-// Store manages any generic item that inherits from KeyModel
-@Injectable()
-export class Store<T extends KeyModel> {
-  list: T[] = [];
-
-  add(record: T): void {
-    this.list.push(record);
-  }
-
-  remove(record: T): void {
-    this.removeBy((item) => item === record);
-  }
-
-  removeBy(callback: (record: T) => boolean): void {
-    this.list = this.list.filter((record) => !callback(record));
-  }
-}
diff --git a/modules/playground/src/web_workers/todo/todo.html b/modules/playground/src/web_workers/todo/todo.html
deleted file mode 100644
index d65042c440c7b..0000000000000
--- a/modules/playground/src/web_workers/todo/todo.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<section id="todoapp">
-
-  <header id="header">
-    <h1>todos</h1>
-    <input
-      id="new-todo"
-      placeholder="What needs to be done?"
-      [(ngModel)]="inputValue"
-      autofocus
-      #newtodo
-      (keyup.enter)="enterTodo()">
-  </header>
-
-  <section id="main">
-    <input id="toggle-all" type="checkbox" [checked]="isComplete" (click)="toggleAll($event)">
-    <label for="toggle-all">Mark all as complete</label>
-
-    <ul id="todo-list">
-
-      <li *ngFor="let todo of todoStore.list" [class.hidden]="hideActive && !todo.completed || hideCompleted && todo.completed">
-        <div class="view"
-            [class.hidden]="todoEdit == todo">
-
-          <input class="toggle" type="checkbox"
-                 (click)="completeMe(todo)"
-                 [checked]="todo.completed">
-
-          <label (dblclick)="editTodo(todo)">{{todo.title}}</label>
-          <button class="destroy" (click)="deleteMe(todo)"></button>
-
-        </div>
-
-        <div>
-
-          <input class="edit"
-            [class.visible]="todoEdit == todo"
-            [(ngModel)]="todo.editTitle"
-            (keyup)="doneEditing($event, todo)">
-
-        </div>
-      </li>
-    </ul>
-
-  </section>
-
-  <footer id="footer">
-    <span id="todo-count"></span>
-    <div [class.hidden]="true"></div>
-    <ul id="filters">
-      <li>
-        <a href="#/" [class.selected]="!hideActive && !hideCompleted" (click)="showAll()">All</a>
-      </li>
-      <li>
-        <a href="#/active" [class.selected]="hideCompleted" (click)="toggleActive()">Active</a>
-      </li>
-      <li>
-        <a href="#/completed" [class.selected]="hideActive" (click)="toggleCompleted()">Completed</a>
-      </li>
-    </ul>
-    <button id="clear-completed" (click)="clearCompleted()">Clear completed</button>
-  </footer>
-
-</section>
-
-<footer id="info">
-  <p>Double-click to edit a todo</p>
-  <p>Created by <a href="http://twitter.com/angularjs">The Angular Team</a></p>
-</footer>
diff --git a/modules/playground/src/web_workers/worker-configure.js b/modules/playground/src/web_workers/worker-configure.js
deleted file mode 100644
index 8aba8ffcfabde..0000000000000
--- a/modules/playground/src/web_workers/worker-configure.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * @license
- * Copyright Google LLC All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-importScripts('npm/node_modules/reflect-metadata/Reflect.js');
-importScripts('angular/packages/zone.js/bundles/zone.umd.js');
-importScripts('angular/packages/zone.js/bundles/long-stack-trace-zone.umd.js');
-importScripts('npm/node_modules/systemjs/dist/system.js');
-
-importScripts('angular/modules/playground/systemjs-config.js');
diff --git a/modules/playground/systemjs-config.js b/modules/playground/systemjs-config.js
index e30ed5878ba7c..cc0f8b95b9e9c 100644
--- a/modules/playground/systemjs-config.js
+++ b/modules/playground/systemjs-config.js
@@ -21,8 +21,6 @@ const angularPackages = [
   'http',
   'platform-browser',
   'platform-browser-dynamic',
-  'platform-webworker',
-  'platform-webworker-dynamic',
   'router',
   'upgrade',
   'upgrade/static',
diff --git a/package.json b/package.json
index 350be9de2de69..c425e2a2ad961 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-srcs",
-  "version": "10.1.0-next.4",
+  "version": "11.1.0-next.0",
   "private": true,
   "description": "Angular - a web framework for modern web apps",
   "homepage": "https://github.com/angular/angular",
@@ -28,13 +28,12 @@
     "test-non-ivy": "bazelisk test --build_tag_filters=-ivy-only --test_tag_filters=-ivy-only",
     "test-fixme-ivy-aot": "bazelisk test --config=ivy --build_tag_filters=-no-ivy-aot --test_tag_filters=-no-ivy-aot",
     "list-fixme-ivy-targets": "bazelisk query --output=label 'attr(\"tags\", \"\\[.*fixme-ivy.*\\]\", //...) except kind(\"sh_binary\", //...) except kind(\"devmode_js_sources\", //...)' | sort",
-    "//circleci-win-comment": "See the test-win circleci job for why these are needed. If they are not needed anymore, remove them.",
-    "circleci-win-ve": "bazelisk test --build_tag_filters=-ivy-only --test_tag_filters=-ivy-only,-browser:chromium-local //packages/compiler-cli/... //tools/ts-api-guardian/...",
-    "circleci-win-ivy": "bazelisk test --config=ivy --build_tag_filters=-no-ivy-aot,-fixme-ivy-aot --test_tag_filters=-no-ivy-aot,-fixme-ivy-aot,-browser:chromium-local //packages/compiler-cli/... //tools/ts-api-guardian/...",
     "lint": "yarn -s tslint && yarn -s ng-dev format changed --check",
     "tslint": "tsc -p tools/tsconfig.json && tslint -c tslint.json \"+(dev-infra|packages|modules|scripts|tools)/**/*.+(js|ts)\"",
     "public-api:check": "node goldens/public-api/manage.js test",
     "public-api:update": "node goldens/public-api/manage.js accept",
+    "symbol-extractor:check": "node tools/symbol-extractor/run_all_symbols_extractor_tests.js test",
+    "symbol-extractor:update": "node tools/symbol-extractor/run_all_symbols_extractor_tests.js accept",
     "ts-circular-deps": "ts-node --transpile-only -- dev-infra/ts-circular-dependencies/index.ts --config ./packages/circular-deps-test.conf.js",
     "ts-circular-deps:check": "yarn -s ts-circular-deps check",
     "ts-circular-deps:approve": "yarn -s ts-circular-deps approve",
@@ -54,12 +53,12 @@
     "@babel/template": "^7.8.6",
     "@babel/traverse": "^7.8.6",
     "@babel/types": "^7.8.6",
-    "@bazel/jasmine": "1.7.0",
-    "@bazel/karma": "1.7.0",
-    "@bazel/protractor": "1.7.0",
-    "@bazel/rollup": "1.7.0",
-    "@bazel/terser": "1.7.0",
-    "@bazel/typescript": "1.7.0",
+    "@bazel/jasmine": "2.2.0",
+    "@bazel/karma": "2.2.0",
+    "@bazel/protractor": "2.2.0",
+    "@bazel/rollup": "2.2.0",
+    "@bazel/terser": "2.2.0",
+    "@bazel/typescript": "2.2.0",
     "@microsoft/api-extractor": "7.7.11",
     "@octokit/rest": "16.28.7",
     "@octokit/types": "^5.0.1",
@@ -76,19 +75,20 @@
     "@types/diff": "^3.5.1",
     "@types/fs-extra": "4.0.2",
     "@types/hammerjs": "2.0.35",
-    "@types/inquirer": "^6.5.0",
+    "@types/inquirer": "^7.3.0",
     "@types/jasmine": "3.5.10",
     "@types/jasmine-ajax": "^3.3.1",
     "@types/jasminewd2": "^2.0.8",
     "@types/minimist": "^1.2.0",
+    "@types/multimatch": "^4.0.0",
     "@types/node": "^12.11.1",
     "@types/node-fetch": "^2.5.7",
     "@types/selenium-webdriver": "3.0.7",
     "@types/semver": "^6.0.2",
     "@types/shelljs": "^0.8.6",
     "@types/systemjs": "0.19.32",
-    "@types/yaml": "^1.2.0",
-    "@types/yargs": "^11.1.1",
+    "@types/yaml": "^1.9.7",
+    "@types/yargs": "^15.0.5",
     "@webcomponents/custom-elements": "^1.1.0",
     "angular": "npm:angular@1.7",
     "angular-1.5": "npm:angular@1.5",
@@ -118,7 +118,7 @@
     "jasmine-core": "^3.5.0",
     "jquery": "3.0.0",
     "js-levenshtein": "^1.1.6",
-    "karma": "~4.1.0",
+    "karma": "~4.4.0",
     "karma-chrome-launcher": "^2.2.0",
     "karma-firefox-launcher": "^1.2.0",
     "karma-jasmine": "^2.0.1",
@@ -132,7 +132,7 @@
     "node-uuid": "1.4.8",
     "nodejs-websocket": "^1.7.2",
     "protractor": "^5.4.2",
-    "puppeteer": "3.3.0",
+    "puppeteer": "5.1.0",
     "reflect-metadata": "^0.1.3",
     "requirejs": "^2.3.6",
     "rollup": "^2.16.1",
@@ -149,11 +149,11 @@
     "terser": "^4.4.0",
     "tsickle": "0.38.1",
     "tslib": "^2.0.0",
-    "tslint": "6.0.0",
-    "typescript": "~3.9.5",
+    "tslint": "6.1.3",
+    "typescript": "~4.0.2",
     "xhr2": "0.2.0",
-    "yaml": "^1.7.2",
-    "yargs": "15.3.0"
+    "yaml": "^1.10.0",
+    "yargs": "^15.4.1"
   },
   "// 2": "devDependencies are not used under Bazel. Many can be removed after test.sh is deleted.",
   "devDependencies": {
@@ -169,7 +169,7 @@
     "check-side-effects": "0.0.21",
     "clang-format": "^1.4.0",
     "cldr": "4.10.0",
-    "cldr-data": "36.0.0",
+    "cldr-data-downloader": "0.3.2",
     "cldrjs": "0.5.0",
     "cli-progress": "^3.7.0",
     "conventional-changelog": "^2.0.3",
@@ -179,8 +179,9 @@
     "glob": "7.1.2",
     "gulp": "3.9.1",
     "gulp-conventional-changelog": "^2.0.3",
-    "husky": "^4.2.3",
-    "inquirer": "^7.1.0",
+    "husky": "^4.2.5",
+    "inquirer": "^7.3.3",
+    "inquirer-autocomplete-prompt": "^1.0.2",
     "jpm": "1.3.1",
     "karma-browserstack-launcher": "^1.3.0",
     "karma-sauce-launcher": "^2.0.2",
@@ -188,8 +189,9 @@
     "multimatch": "^4.0.0",
     "mutation-observer": "^1.0.3",
     "nock": "^13.0.3",
+    "ora": "^5.0.0",
     "rewire": "2.5.2",
-    "sauce-connect": "https://saucelabs.com/downloads/sc-4.5.1-linux.tar.gz",
+    "sauce-connect": "https://saucelabs.com/downloads/sc-4.6.2-linux.tar.gz",
     "semver": "^6.3.0",
     "ts-node": "^8.6.2",
     "tslint-eslint-rules": "5.4.0",
@@ -209,7 +211,9 @@
   "cldr-data-coverage": "full",
   "husky": {
     "hooks": {
-      "commit-msg": "yarn -s ng-dev commit-message pre-commit-validate --file-env-variable HUSKY_GIT_PARAMS"
+      "pre-commit": "yarn -s ng-dev format staged",
+      "commit-msg": "yarn -s ng-dev commit-message pre-commit-validate --file-env-variable HUSKY_GIT_PARAMS",
+      "prepare-commit-msg": "yarn -s ng-dev commit-message restore-commit-message-draft --file-env-variable HUSKY_GIT_PARAMS"
     }
   }
 }
diff --git a/packages/BUILD.bazel b/packages/BUILD.bazel
index ff8c68c4fa6b2..da0cac42282b7 100644
--- a/packages/BUILD.bazel
+++ b/packages/BUILD.bazel
@@ -5,8 +5,7 @@ exports_files([
     "tsconfig.json",
 ])
 
-load("@npm_bazel_typescript//:index.bzl", "ts_config")
-load("//tools:defaults.bzl", "ts_library")
+load("//tools:defaults.bzl", "ts_config", "ts_library")
 
 ts_library(
     name = "types",
diff --git a/packages/animations/browser/src/render/css_keyframes/css_keyframes_driver.ts b/packages/animations/browser/src/render/css_keyframes/css_keyframes_driver.ts
index 9f5b771b44fdc..68805f196e2b7 100644
--- a/packages/animations/browser/src/render/css_keyframes/css_keyframes_driver.ts
+++ b/packages/animations/browser/src/render/css_keyframes/css_keyframes_driver.ts
@@ -72,7 +72,7 @@ export class CssKeyframesDriver implements AnimationDriver {
     keyframeStr += `}\n`;
 
     const kfElm = document.createElement('style');
-    kfElm.innerHTML = keyframeStr;
+    kfElm.textContent = keyframeStr;
     return kfElm;
   }
 
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 95c2a61a4048e..c062712e8da23 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
@@ -106,7 +106,7 @@ describe('CssKeyframesDriver tests', () => {
 
     it('should animate until the `animationend` method is emitted, but stil retain the <style> method and the element animation details',
        fakeAsync(() => {
-         // IE10 and IE11 cannot create an instanceof AnimationEvent
+         // IE11 cannot create an instanceof AnimationEvent
          if (!supportsAnimationEventCreation()) return;
 
          const elm = createElement();
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 f0a8caed09208..0d2420e9fd02d 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
@@ -195,7 +195,7 @@ const EMPTY_FN = () => {};
     });
 
     it('should fire the onDone method when the matching animationend event is emitted', () => {
-      // IE10 and IE11 cannot create an instanceof AnimationEvent
+      // IE11 cannot create an instanceof AnimationEvent
       if (!supportsAnimationEventCreation()) return;
 
       const element = createElement();
diff --git a/packages/bazel/BUILD.bazel b/packages/bazel/BUILD.bazel
index 3c2fe6eeb0def..8ac0f195f6e8a 100644
--- a/packages/bazel/BUILD.bazel
+++ b/packages/bazel/BUILD.bazel
@@ -1,3 +1,4 @@
+# BEGIN-DEV-ONLY
 load("//tools:defaults.bzl", "pkg_npm")
 
 pkg_npm(
@@ -17,9 +18,8 @@ pkg_npm(
     ],
     substitutions = {
         "(#|\/\/)\\s+BEGIN-DEV-ONLY[\\w\W]+?(#|\/\/)\\s+END-DEV-ONLY": "",
-        "//packages/bazel/src/ngc-wrapped": "@npm//@angular/bazel/bin:ngc-wrapped",
-        "//packages/bazel/": "//",
-        "angular/packages/bazel/": "npm_angular_bazel/",
+        "//packages/bazel/": "//@angular/bazel/",
+        "@npm//@bazel/typescript/internal:": "//@bazel/typescript/internal:",
     },
     tags = ["release-with-framework"],
     # Do not add more to this list.
@@ -31,3 +31,4 @@ pkg_npm(
         "//packages/bazel/src/ngc-wrapped:ngc_lib",
     ],
 )
+# END-DEV-ONLY
diff --git a/packages/bazel/package.bzl b/packages/bazel/package.bzl
index d1e13c1bdefa8..4ebf61a888386 100644
--- a/packages/bazel/package.bzl
+++ b/packages/bazel/package.bzl
@@ -29,11 +29,11 @@ def rules_angular_dev_dependencies():
     _maybe(
         http_archive,
         name = "bazel_toolchains",
-        sha256 = "db48eed61552e25d36fe051a65d2a329cc0fb08442627e8f13960c5ab087a44e",
-        strip_prefix = "bazel-toolchains-3.2.0",
+        sha256 = "4fb3ceea08101ec41208e3df9e56ec72b69f3d11c56629d6477c0ff88d711cf7",
+        strip_prefix = "bazel-toolchains-3.6.0",
         urls = [
-            "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/releases/download/3.2.0/bazel-toolchains-3.2.0.tar.gz",
-            "https://github.com/bazelbuild/bazel-toolchains/releases/download/3.2.0/bazel-toolchains-3.2.0.tar.gz",
+            "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/releases/download/3.6.0/bazel-toolchains-3.6.0.tar.gz",
+            "https://github.com/bazelbuild/bazel-toolchains/releases/download/3.6.0/bazel-toolchains-3.6.0.tar.gz",
         ],
     )
 
diff --git a/packages/bazel/package.json b/packages/bazel/package.json
index bcc704af052a0..798b8b2c7cbb8 100644
--- a/packages/bazel/package.json
+++ b/packages/bazel/package.json
@@ -19,12 +19,6 @@
       }
     }
   },
-  "bazelWorkspaces": {
-    "npm_angular_bazel": {
-      "version": "0.0.0-PLACEHOLDER",
-      "rootPath": "."
-    }
-  },
   "dependencies": {
     "@microsoft/api-extractor": "^7.7.13",
     "shelljs": "0.8.2",
@@ -34,7 +28,7 @@
     "@angular/compiler-cli": "0.0.0-PLACEHOLDER",
     "@bazel/typescript": ">=1.0.0",
     "terser": "^4.3.1",
-    "typescript": ">=3.9 <4.0",
+    "typescript": ">=4.0 <4.1",
     "rollup": ">=1.20.0",
     "rollup-plugin-commonjs": ">=9.0.0",
     "rollup-plugin-node-resolve": ">=4.2.0",
diff --git a/packages/bazel/src/BUILD.bazel b/packages/bazel/src/BUILD.bazel
index b26742aae48d1..d83cc00e8e41f 100644
--- a/packages/bazel/src/BUILD.bazel
+++ b/packages/bazel/src/BUILD.bazel
@@ -1,3 +1,4 @@
+# BEGIN-DEV-ONLY
 package(default_visibility = ["//packages/bazel:__subpackages__"])
 
 filegroup(
@@ -22,3 +23,4 @@ nodejs_binary(
     node_modules = ":empty_node_modules",
     visibility = ["//visibility:public"],
 )
+# END-DEV-ONLY
diff --git a/packages/bazel/src/api-extractor/BUILD.bazel b/packages/bazel/src/api-extractor/BUILD.bazel
index 29a694b794d77..6490cab609fd6 100644
--- a/packages/bazel/src/api-extractor/BUILD.bazel
+++ b/packages/bazel/src/api-extractor/BUILD.bazel
@@ -1,9 +1,8 @@
+# BEGIN-DEV-ONLY
 package(default_visibility = ["//packages:__subpackages__"])
 
-load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary")
-
-# BEGIN-DEV-ONLY
 load("//tools:defaults.bzl", "ts_library")
+load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary")
 
 ts_library(
     name = "lib",
@@ -17,7 +16,6 @@ ts_library(
     ],
 )
 
-# END-DEV-ONLY
 nodejs_binary(
     name = "api_extractor",
     data = [
@@ -33,3 +31,4 @@ filegroup(
     name = "package_assets",
     srcs = ["BUILD.bazel"],
 )
+# END-DEV-ONLY
diff --git a/packages/bazel/src/external.bzl b/packages/bazel/src/external.bzl
index 982d654eea1b3..18fc917978c54 100644
--- a/packages/bazel/src/external.bzl
+++ b/packages/bazel/src/external.bzl
@@ -2,11 +2,13 @@
 """
 
 load(
-    "@npm_bazel_typescript//internal:build_defs.bzl",
+    # Replaced with "//@bazel/typescript/internal:..." in published package
+    "@npm//@bazel/typescript/internal:build_defs.bzl",
     _tsc_wrapped_tsconfig = "tsc_wrapped_tsconfig",
 )
 load(
-    "@npm_bazel_typescript//internal:common/compilation.bzl",
+    # Replaced with "//@bazel/typescript/internal:..." in published package
+    "@npm//@bazel/typescript/internal:common/compilation.bzl",
     _COMMON_ATTRIBUTES = "COMMON_ATTRIBUTES",
     _COMMON_OUTPUTS = "COMMON_OUTPUTS",
     _DEPS_ASPECTS = "DEPS_ASPECTS",
@@ -14,7 +16,8 @@ load(
     _ts_providers_dict_to_struct = "ts_providers_dict_to_struct",
 )
 load(
-    "@npm_bazel_typescript//internal:ts_config.bzl",
+    # Replaced with "//@bazel/typescript/internal:..." in published package
+    "@npm//@bazel/typescript/internal:ts_config.bzl",
     _TsConfigInfo = "TsConfigInfo",
 )
 load(
@@ -22,6 +25,7 @@ load(
     _LinkablePackageInfo = "LinkablePackageInfo",
     _NpmPackageInfo = "NpmPackageInfo",
     _js_ecma_script_module_info = "js_ecma_script_module_info",
+    _js_module_info = "js_module_info",
     _js_named_module_info = "js_named_module_info",
     _node_modules_aspect = "node_modules_aspect",
 )
@@ -42,10 +46,26 @@ ts_providers_dict_to_struct = _ts_providers_dict_to_struct
 # is loaded differently anyways where this file is overridden.
 BuildSettingInfo = provider(doc = "Not used outside google3.")
 
-DEFAULT_API_EXTRACTOR = "@npm//@angular/bazel/bin:api-extractor"
-DEFAULT_NG_COMPILER = "@npm//@angular/bazel/bin:ngc-wrapped"
-DEFAULT_NG_XI18N = "@npm//@angular/bazel/bin:xi18n"
+DEFAULT_API_EXTRACTOR = (
+    # BEGIN-DEV-ONLY
+    "@npm" +
+    # END-DEV-ONLY
+    "//@angular/bazel/bin:api-extractor"
+)
+DEFAULT_NG_COMPILER = (
+    # BEGIN-DEV-ONLY
+    "@npm" +
+    # END-DEV-ONLY
+    "//@angular/bazel/bin:ngc-wrapped"
+)
+DEFAULT_NG_XI18N = (
+    # BEGIN-DEV-ONLY
+    "@npm" +
+    # END-DEV-ONLY
+    "//@angular/bazel/bin:xi18n"
+)
 FLAT_DTS_FILE_SUFFIX = ".bundle.d.ts"
 TsConfigInfo = _TsConfigInfo
 js_ecma_script_module_info = _js_ecma_script_module_info
+js_module_info = _js_module_info
 js_named_module_info = _js_named_module_info
diff --git a/packages/bazel/src/ng_module.bzl b/packages/bazel/src/ng_module.bzl
index fc67d737669bb..9e7064895a714 100644
--- a/packages/bazel/src/ng_module.bzl
+++ b/packages/bazel/src/ng_module.bzl
@@ -19,6 +19,7 @@ load(
     "TsConfigInfo",
     "compile_ts",
     "js_ecma_script_module_info",
+    "js_module_info",
     "js_named_module_info",
     "node_modules_aspect",
     "ts_providers_dict_to_struct",
@@ -47,14 +48,6 @@ def is_ivy_enabled(ctx):
          ctx.attr._renderer[BuildSettingInfo].value == "ivy")):
         return True
 
-    # TODO(josephperott): Remove after ~Feb 2020, to allow local script migrations
-    if "compile" in ctx.var and ctx.workspace_name == "angular":
-        fail(
-            msg = "Setting ViewEngine/Ivy using --define=compile is deprecated, please use " +
-                  "--config=ivy or --config=view-engine instead.",
-            attr = "ng_module",
-        )
-
     # This attribute is only defined in google's private ng_module rule and not
     # available externally. For external users, this is effectively a no-op.
     if hasattr(ctx.attr, "ivy") and ctx.attr.ivy == True:
@@ -644,6 +637,10 @@ def _ng_module_impl(ctx):
     # See design doc https://docs.google.com/document/d/1ggkY5RqUkVL4aQLYm7esRW978LgX3GUCnQirrk5E1C0/edit#
     # and issue https://github.com/bazelbuild/rules_nodejs/issues/57 for more details.
     ts_providers["providers"].extend([
+        js_module_info(
+            sources = ts_providers["typescript"]["es5_sources"],
+            deps = ctx.attr.deps,
+        ),
         js_named_module_info(
             sources = ts_providers["typescript"]["es5_sources"],
             deps = ctx.attr.deps,
@@ -701,12 +698,9 @@ NG_MODULE_ATTRIBUTES = {
     "compiler": attr.label(
         doc = """Sets a different ngc compiler binary to use for this library.
 
-        The default ngc compiler depends on the `@npm//@angular/bazel`
+        The default ngc compiler depends on the `//@angular/bazel`
         target which is setup for projects that use bazel managed npm deps that
-        fetch the @angular/bazel npm package. It is recommended that you use
-        the workspace name `@npm` for bazel managed deps so the default
-        compiler works out of the box. Otherwise, you'll have to override
-        the compiler attribute manually.
+        fetch the @angular/bazel npm package.
         """,
         default = Label(DEFAULT_NG_COMPILER),
         executable = True,
@@ -725,14 +719,11 @@ NG_MODULE_RULE_ATTRS = dict(dict(COMMON_ATTRIBUTES, **NG_MODULE_ATTRIBUTES), **{
     "node_modules": attr.label(
         doc = """The npm packages which should be available during the compile.
 
-        The default value of `@npm//typescript:typescript__typings` is
-        for projects that use bazel managed npm deps. It is recommended
-        that you use the workspace name `@npm` for bazel managed deps so the
-        default value works out of the box. Otherwise, you'll have to
-        override the node_modules attribute manually. This default is in place
+        The default value of `//typescript:typescript__typings` is
+        for projects that use bazel managed npm deps. This default is in place
         since code compiled by ng_module will always depend on at least the
         typescript default libs which are provided by
-        `@npm//typescript:typescript__typings`.
+        `//typescript:typescript__typings`.
 
         This attribute is DEPRECATED. As of version 0.18.0 the recommended
         approach to npm dependencies is to use fine grained npm dependencies
@@ -784,7 +775,12 @@ NG_MODULE_RULE_ATTRS = dict(dict(COMMON_ATTRIBUTES, **NG_MODULE_ATTRIBUTES), **{
           yarn_lock = "//:yarn.lock",
         )
         """,
-        default = Label("@npm//typescript:typescript__typings"),
+        default = Label(
+            # BEGIN-DEV-ONLY
+            "@npm" +
+            # END-DEV-ONLY
+            "//typescript:typescript__typings",
+        ),
     ),
     "entry_point": attr.label(allow_single_file = True),
 
diff --git a/packages/bazel/src/ng_package/BUILD.bazel b/packages/bazel/src/ng_package/BUILD.bazel
index fabd7b22edb08..fe8b8f170371a 100644
--- a/packages/bazel/src/ng_package/BUILD.bazel
+++ b/packages/bazel/src/ng_package/BUILD.bazel
@@ -2,8 +2,46 @@ package(default_visibility = ["//visibility:public"])
 
 load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary")
 
+nodejs_binary(
+    name = "rollup_for_ng_package",
+    data = [
+        # BEGIN-DEV-ONLY
+        "@npm" +
+        # END-DEV-ONLY
+        "//rollup",
+        # BEGIN-DEV-ONLY
+        "@npm" +
+        # END-DEV-ONLY
+        "//rollup-plugin-commonjs",
+        # BEGIN-DEV-ONLY
+        "@npm" +
+        # END-DEV-ONLY
+        "//rollup-plugin-node-resolve",
+        # BEGIN-DEV-ONLY
+        "@npm" +
+        # END-DEV-ONLY
+        "//rollup-plugin-sourcemaps",
+        # BEGIN-DEV-ONLY
+        "@npm" +
+        # END-DEV-ONLY
+        "//typescript",
+    ],
+    entry_point = (
+        # BEGIN-DEV-ONLY
+        "@npm" +
+        # END-DEV-ONLY
+        "//:node_modules/rollup/dist/bin/rollup"
+    ),
+)
+
+exports_files([
+    "ng_package.bzl",
+    "rollup.config.js",
+    "terser_config.default.json",
+])
+
 # BEGIN-DEV-ONLY
-load("@npm_bazel_typescript//:index.bzl", "ts_library")
+load("@npm//@bazel/typescript:index.bzl", "ts_library")
 
 ts_library(
     name = "lib",
@@ -16,34 +54,6 @@ ts_library(
     ],
 )
 
-# END-DEV-ONLY
-nodejs_binary(
-    name = "packager",
-    data = [
-        "lib",
-        "@npm//shelljs",
-    ],
-    entry_point = ":packager.ts",
-)
-
-nodejs_binary(
-    name = "rollup_for_ng_package",
-    data = [
-        "@npm//rollup",
-        "@npm//rollup-plugin-commonjs",
-        "@npm//rollup-plugin-node-resolve",
-        "@npm//rollup-plugin-sourcemaps",
-        "@npm//typescript",
-    ],
-    entry_point = "@npm//:node_modules/rollup/dist/bin/rollup",
-)
-
-exports_files([
-    "ng_package.bzl",
-    "rollup.config.js",
-    "terser_config.default.json",
-])
-
 filegroup(
     name = "package_assets",
     srcs = glob(["*.bzl"]) + [
@@ -52,3 +62,13 @@ filegroup(
         "terser_config.default.json",
     ],
 )
+
+nodejs_binary(
+    name = "packager",
+    data = [
+        "lib",
+        "@npm//shelljs",
+    ],
+    entry_point = ":packager.ts",
+)
+# END-DEV-ONLY
diff --git a/packages/bazel/src/ng_package/ng_package.bzl b/packages/bazel/src/ng_package/ng_package.bzl
index 6619799dc56b0..2f94a7e4df841 100644
--- a/packages/bazel/src/ng_package/ng_package.bzl
+++ b/packages/bazel/src/ng_package/ng_package.bzl
@@ -28,11 +28,16 @@ def _debug(vars, *args):
     if "VERBOSE_LOGS" in vars.keys():
         print("[ng_package.bzl]", args)
 
-_DEFAULT_NG_PACKAGER = "@npm//@angular/bazel/bin:packager"
-_DEFAULT_ROLLUP_CONFIG_TMPL = "@npm_angular_bazel//src/ng_package:rollup.config.js"
-_DEFALUT_TERSER_CONFIG_FILE = "@npm_angular_bazel//src/ng_package:terser_config.default.json"
-_DEFAULT_ROLLUP = "@npm_angular_bazel//src/ng_package:rollup_for_ng_package"
-_DEFAULT_TERSER = "@npm//terser/bin:terser"
+_DEFAULT_NG_PACKAGER = "//@angular/bazel/bin:packager"
+_DEFAULT_ROLLUP_CONFIG_TMPL = "//:node_modules/@angular/bazel/src/ng_package/rollup.config.js"
+_DEFALUT_TERSER_CONFIG_FILE = "//:node_modules/@angular/bazel/src/ng_package/terser_config.default.json"
+_DEFAULT_ROLLUP = "//@angular/bazel/src/ng_package:rollup_for_ng_package"
+_DEFAULT_TERSER = (
+    # BEGIN-DEV-ONLY
+    "@npm" +
+    # END-DEV-ONLY
+    "//terser/bin:terser"
+)
 
 _NG_PACKAGE_MODULE_MAPPINGS_ATTR = "ng_package_module_mappings"
 
@@ -102,8 +107,6 @@ WELL_KNOWN_GLOBALS = {p: _global_name(p) for p in [
     "@angular/core",
     "@angular/platform-server/testing",
     "@angular/platform-server",
-    "@angular/platform-webworker-dynamic",
-    "@angular/platform-webworker",
     "@angular/common/testing",
     "@angular/common",
     "@angular/common/http/testing",
diff --git a/packages/bazel/src/ngc-wrapped/BUILD.bazel b/packages/bazel/src/ngc-wrapped/BUILD.bazel
index 5c1195239cda4..45421ab417b09 100644
--- a/packages/bazel/src/ngc-wrapped/BUILD.bazel
+++ b/packages/bazel/src/ngc-wrapped/BUILD.bazel
@@ -1,5 +1,6 @@
+# BEGIN-DEV-ONLY
 load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary")
-load("@npm_bazel_typescript//:index.bzl", "ts_library")
+load("@npm//@bazel/typescript:index.bzl", "ts_library")
 
 ts_library(
     name = "ngc_lib",
@@ -15,11 +16,7 @@ ts_library(
         "//packages/bazel/test/ngc-wrapped:__subpackages__",
     ],
     deps = [
-        # BEGIN-INTERNAL
-        # Only needed when compiling within the Angular repo.
-        # Users will get this dependency from node_modules.
         "//packages/compiler-cli",
-        # END-INTERNAL
         "@npm//@bazel/typescript",
         "@npm//@types/node",
         "@npm//tsickle",
@@ -55,3 +52,4 @@ filegroup(
     srcs = ["BUILD.bazel"],
     visibility = ["//packages/bazel:__subpackages__"],
 )
+# END-DEV-ONLY
diff --git a/packages/bazel/src/schematics/ng-new/schema.d.ts b/packages/bazel/src/schematics/ng-new/schema.d.ts
index 69aedc72d884c..a734a45e27abd 100644
--- a/packages/bazel/src/schematics/ng-new/schema.d.ts
+++ b/packages/bazel/src/schematics/ng-new/schema.d.ts
@@ -107,7 +107,6 @@ export declare enum Style {
  */
 export declare enum ViewEncapsulation {
   Emulated = 'Emulated',
-  Native = 'Native',
   None = 'None',
   ShadowDom = 'ShadowDom'
 }
diff --git a/packages/bazel/test/ngc-wrapped/BUILD.bazel b/packages/bazel/test/ngc-wrapped/BUILD.bazel
index f8f79077012f7..a2dc5ad314c44 100644
--- a/packages/bazel/test/ngc-wrapped/BUILD.bazel
+++ b/packages/bazel/test/ngc-wrapped/BUILD.bazel
@@ -32,7 +32,7 @@ jasmine_node_test(
         "//packages/bazel/test/ngc-wrapped/empty:empty_tsconfig.json",
         "//packages/bazel/test/ngc-wrapped/empty:tsconfig.json",
         "//packages/private/testing",
-        "@npm_bazel_typescript//third_party/github.com/bazelbuild/bazel/src/main/protobuf:worker_protocol.proto",
+        "@npm//@bazel/typescript/third_party/github.com/bazelbuild/bazel/src/main/protobuf:worker_protocol.proto",
     ],
 )
 
diff --git a/packages/bazel/third_party/github.com/bazelbuild/bazel/src/main/protobuf/BUILD.bazel b/packages/bazel/third_party/github.com/bazelbuild/bazel/src/main/protobuf/BUILD.bazel
index b4bb240b0a3ee..cf81820a506d9 100644
--- a/packages/bazel/third_party/github.com/bazelbuild/bazel/src/main/protobuf/BUILD.bazel
+++ b/packages/bazel/third_party/github.com/bazelbuild/bazel/src/main/protobuf/BUILD.bazel
@@ -3,9 +3,11 @@ licenses(["notice"])
 
 package(default_visibility = ["//visibility:public"])
 
+# BEGIN-DEV-ONLY
 filegroup(
     name = "package_assets",
     srcs = glob(["*"]),
 )
+# END-DEV-ONLY
 
 exports_files(["worker_protocol.proto"])
diff --git a/packages/circular-deps-test.conf.js b/packages/circular-deps-test.conf.js
index 0820b1907eb51..33fe4c7d4ebd2 100644
--- a/packages/circular-deps-test.conf.js
+++ b/packages/circular-deps-test.conf.js
@@ -11,8 +11,7 @@ const path = require('path');
 module.exports = {
   baseDir: '../',
   goldenFile: '../goldens/circular-deps/packages.json',
-  // The test should not capture deprecated packages such as `http`, or the `webworker` platform.
-  glob: `./!(http|platform-webworker|platform-webworker-dynamic)/**/*.ts`,
+  glob: `./**/*.ts`,
   // Command that will be displayed if the golden needs to be updated.
   approveCommand: 'yarn ts-circular-deps:approve',
   resolveModule: resolveModule
diff --git a/packages/common/http/src/client.ts b/packages/common/http/src/client.ts
index 785a22980241a..29bf07935e67d 100644
--- a/packages/common/http/src/client.ts
+++ b/packages/common/http/src/client.ts
@@ -2448,6 +2448,8 @@ export class HttpClient {
    */
   put<T>(url: string, body: any|null, options: {
     headers?: HttpHeaders|{[header: string]: string | string[]}, observe: 'events',
+    params?: HttpParams|{[param: string]: string | string[]},
+    reportProgress?: boolean,
     responseType?: 'json',
     withCredentials?: boolean,
   }): Observable<HttpEvent<T>>;
@@ -2526,8 +2528,8 @@ export class HttpClient {
   }): Observable<HttpResponse<Object>>;
 
   /**
-   * Constructs a `PUT` request that interprets the body as a JSON object and returns the full HTTP
-   * response.
+   * Constructs a `PUT` request that interprets the body as an instance of the requested type and
+   * returns the full HTTP response.
    *
    * @param url The endpoint URL.
    * @param body The resources to add/update.
@@ -2545,14 +2547,14 @@ export class HttpClient {
   }): Observable<HttpResponse<T>>;
 
   /**
-   * Constructs a `PUT` request that interprets the body as a JSON object and returns the response
-   * body as a JSON object.
+   * Constructs a `PUT` request that interprets the body as a JSON object
+   * and returns an observable of JSON object.
    *
    * @param url The endpoint URL.
    * @param body The resources to add/update.
    * @param options HTTP options
    *
-   * @return An `Observable` of the response, with the response body as a JSON object.
+   * @return An `Observable` of the response as a JSON object.
    */
   put(url: string, body: any|null, options?: {
     headers?: HttpHeaders|{[header: string]: string | string[]},
@@ -2564,15 +2566,14 @@ export class HttpClient {
   }): Observable<Object>;
 
   /**
-   * Constructs a `PUT` request that interprets the body as a JSON object
-   * and returns an observable of the response.
+   * Constructs a `PUT` request that interprets the body as an instance of the requested type
+   * and returns an observable of the requested type.
    *
    * @param url The endpoint URL.
    * @param body The resources to add/update.
    * @param options HTTP options
    *
-   * @return An `Observable` of the `HTTPResponse` for the request, with a response body in the
-   *     requested type.
+   * @return An `Observable` of the requested type.
    */
   put<T>(url: string, body: any|null, options?: {
     headers?: HttpHeaders|{[header: string]: string | string[]},
diff --git a/packages/common/http/src/xhr.ts b/packages/common/http/src/xhr.ts
index 11e0fd544e12f..1dc006a463f71 100644
--- a/packages/common/http/src/xhr.ts
+++ b/packages/common/http/src/xhr.ts
@@ -79,9 +79,10 @@ export class HttpXhrBackend implements HttpBackend {
    */
   handle(req: HttpRequest<any>): Observable<HttpEvent<any>> {
     // Quick check to give a better error message when a user attempts to use
-    // HttpClient.jsonp() without installing the JsonpClientModule
+    // HttpClient.jsonp() without installing the HttpClientJsonpModule
     if (req.method === 'JSONP') {
-      throw new Error(`Attempted to construct Jsonp request without JsonpClientModule installed.`);
+      throw new Error(
+          `Attempted to construct Jsonp request without HttpClientJsonpModule installed.`);
     }
 
     // Everything happens on Observable subscription.
diff --git a/packages/common/http/test/client_spec.ts b/packages/common/http/test/client_spec.ts
index 7ecbdef8b42d7..f76c1a238929a 100644
--- a/packages/common/http/test/client_spec.ts
+++ b/packages/common/http/test/client_spec.ts
@@ -31,6 +31,13 @@ import {toArray} from 'rxjs/operators';
         });
         backend.expectOne('/test').flush({'data': 'hello world'});
       });
+      it('should allow flushing requests with a boolean value', (done: DoneFn) => {
+        client.get('/test').subscribe(res => {
+          expect((res as any)).toEqual(true);
+          done();
+        });
+        backend.expectOne('/test').flush(true);
+      });
       it('for text data', done => {
         client.get('/test', {responseType: 'text'}).subscribe(res => {
           expect(res).toEqual('hello world');
diff --git a/packages/common/http/testing/src/request.ts b/packages/common/http/testing/src/request.ts
index 66f760b06bec1..bdd9121784687 100644
--- a/packages/common/http/testing/src/request.ts
+++ b/packages/common/http/testing/src/request.ts
@@ -40,11 +40,14 @@ export class TestRequest {
    *
    * Both successful and unsuccessful responses can be delivered via `flush()`.
    */
-  flush(body: ArrayBuffer|Blob|string|number|Object|(string|number|Object|null)[]|null, opts: {
-    headers?: HttpHeaders|{[name: string]: string | string[]},
-    status?: number,
-    statusText?: string,
-  } = {}): void {
+  flush(
+      body: ArrayBuffer|Blob|boolean|string|number|Object|(boolean|string|number|Object|null)[]|
+      null,
+      opts: {
+        headers?: HttpHeaders|{[name: string]: string | string[]},
+        status?: number,
+        statusText?: string,
+      } = {}): void {
     if (this.cancelled) {
       throw new Error(`Cannot flush a cancelled request.`);
     }
@@ -146,7 +149,8 @@ function _toBlob(body: ArrayBuffer|Blob|string|number|Object|
  * Helper function to convert a response body to JSON data.
  */
 function _toJsonBody(
-    body: ArrayBuffer|Blob|string|number|Object|(string | number | Object | null)[],
+    body: ArrayBuffer|Blob|boolean|string|number|Object|
+    (boolean | string | number | Object | null)[],
     format: string = 'JSON'): Object|string|number|(Object | string | number)[] {
   if (typeof ArrayBuffer !== 'undefined' && body instanceof ArrayBuffer) {
     throw new Error(`Automatic conversion to ${format} is not supported for ArrayBuffers.`);
@@ -155,7 +159,7 @@ function _toJsonBody(
     throw new Error(`Automatic conversion to ${format} is not supported for Blobs.`);
   }
   if (typeof body === 'string' || typeof body === 'number' || typeof body === 'object' ||
-      Array.isArray(body)) {
+      typeof body === 'boolean' || Array.isArray(body)) {
     return body;
   }
   throw new Error(`Automatic conversion to ${format} is not supported for response type.`);
diff --git a/packages/common/locales/ceb.ts b/packages/common/locales/ceb.ts
index beda3a236e397..34dca81650638 100644
--- a/packages/common/locales/ceb.ts
+++ b/packages/common/locales/ceb.ts
@@ -20,7 +20,7 @@ export default [
   [['a', 'p'], ['AM', 'PM'], u],
   [['AM', 'PM'], u, u],
   [
-    ['D', 'L', 'M', 'M', 'H', 'B', 'S'], ['Dom', 'Lun', 'Mar', 'Mks', 'Hu', 'Bi', 'Sa'],
+    ['D', 'L', 'M', 'M', 'H', 'B', 'S'], ['Dom', 'Lun', 'Mar', 'Miy', 'Huw', 'Biy', 'Sab'],
     ['Domingo', 'Lunes', 'Martes', 'Miyerkules', 'Huwebes', 'Biyernes', 'Sabado'],
     ['Dom', 'Lun', 'Mar', 'Miy', 'Huw', 'Biy', 'Sab']
   ],
@@ -33,8 +33,15 @@ export default [
       'Oktubre', 'Nobyembre', 'Disyembre'
     ]
   ],
-  u,
-  [['WK', 'KP'], u, u],
+  [
+    ['E', 'P', 'M', 'A', 'M', 'H', 'H', 'A', 'S', 'O', 'N', 'D'],
+    ['Ene', 'Peb', 'Mar', 'Abr', 'May', 'Hun', 'Hul', 'Ago', 'Set', 'Okt', 'Nob', 'Dis'],
+    [
+      'Enero', 'Pebrero', 'Marso', 'Abril', 'Mayo', 'Hunyo', 'Hulyo', 'Agosto', 'Setyembre',
+      'Oktubre', 'Nobyembre', 'Disyembre'
+    ]
+  ],
+  [['BC', 'KP'], u, ['Sa Wala Pa Si Kristo', 'Anno Domini']],
   0,
   [6, 0],
   ['M/d/yy', 'MMM d, y', 'MMMM d, y', 'EEEE, MMMM d, y'],
diff --git a/packages/common/locales/closure-locale.ts b/packages/common/locales/closure-locale.ts
index 7ead917590903..cb764264d225b 100644
--- a/packages/common/locales/closure-locale.ts
+++ b/packages/common/locales/closure-locale.ts
@@ -1917,6 +1917,16 @@ export const locale_eu = [
     ['ig.', 'al.', 'ar.', 'az.', 'og.', 'or.', 'lr.']
   ],
   u,
+  [
+    ['U', 'O', 'M', 'A', 'M', 'E', 'U', 'A', 'I', 'U', 'A', 'A'],
+    [
+      'urt.', 'ots.', 'mar.', 'api.', 'mai.', 'eka.', 'uzt.', 'abu.', 'ira.', 'urr.', 'aza.', 'abe.'
+    ],
+    [
+      'urtarrilak', 'otsailak', 'martxoak', 'apirilak', 'maiatzak', 'ekainak', 'uztailak',
+      'abuztuak', 'irailak', 'urriak', 'azaroak', 'abenduak'
+    ]
+  ],
   [
     ['U', 'O', 'M', 'A', 'M', 'E', 'U', 'A', 'I', 'U', 'A', 'A'],
     [
@@ -1927,7 +1937,6 @@ export const locale_eu = [
       'iraila', 'urria', 'azaroa', 'abendua'
     ]
   ],
-  u,
   [['K.a.', 'K.o.'], u, ['K.a.', 'Kristo ondoren']],
   1,
   [6, 0],
@@ -4031,7 +4040,7 @@ export const locale_ne = [
   ['HH:mm', 'HH:mm:ss', 'HH:mm:ss z', 'HH:mm:ss zzzz'],
   ['{1}, {0}', u, '{1} {0}', u],
   ['.', ',', ';', '%', '+', '-', 'E', '×', '‰', '∞', 'NaN', ':'],
-  ['#,##0.###', '#,##0%', '¤ #,##0.00', '#E0'],
+  ['#,##,##0.###', '#,##,##0%', '¤ #,##,##0.00', '#E0'],
   'NPR',
   'नेरू',
   'नेपाली रूपैयाँ',
diff --git a/packages/common/locales/eu.ts b/packages/common/locales/eu.ts
index 50aba551b0148..da1352a28afbd 100644
--- a/packages/common/locales/eu.ts
+++ b/packages/common/locales/eu.ts
@@ -26,6 +26,16 @@ export default [
     ['ig.', 'al.', 'ar.', 'az.', 'og.', 'or.', 'lr.']
   ],
   u,
+  [
+    ['U', 'O', 'M', 'A', 'M', 'E', 'U', 'A', 'I', 'U', 'A', 'A'],
+    [
+      'urt.', 'ots.', 'mar.', 'api.', 'mai.', 'eka.', 'uzt.', 'abu.', 'ira.', 'urr.', 'aza.', 'abe.'
+    ],
+    [
+      'urtarrilak', 'otsailak', 'martxoak', 'apirilak', 'maiatzak', 'ekainak', 'uztailak',
+      'abuztuak', 'irailak', 'urriak', 'azaroak', 'abenduak'
+    ]
+  ],
   [
     ['U', 'O', 'M', 'A', 'M', 'E', 'U', 'A', 'I', 'U', 'A', 'A'],
     [
@@ -36,7 +46,6 @@ export default [
       'iraila', 'urria', 'azaroa', 'abendua'
     ]
   ],
-  u,
   [['K.a.', 'K.o.'], u, ['K.a.', 'Kristo ondoren']],
   1,
   [6, 0],
diff --git a/packages/common/locales/global/ceb.js b/packages/common/locales/global/ceb.js
index f99a3afd4afa1..af23158f371e0 100644
--- a/packages/common/locales/global/ceb.js
+++ b/packages/common/locales/global/ceb.js
@@ -22,7 +22,7 @@ global.ng.common.locales['ceb'] = [
   [['a', 'p'], ['AM', 'PM'], u],
   [['AM', 'PM'], u, u],
   [
-    ['D', 'L', 'M', 'M', 'H', 'B', 'S'], ['Dom', 'Lun', 'Mar', 'Mks', 'Hu', 'Bi', 'Sa'],
+    ['D', 'L', 'M', 'M', 'H', 'B', 'S'], ['Dom', 'Lun', 'Mar', 'Miy', 'Huw', 'Biy', 'Sab'],
     ['Domingo', 'Lunes', 'Martes', 'Miyerkules', 'Huwebes', 'Biyernes', 'Sabado'],
     ['Dom', 'Lun', 'Mar', 'Miy', 'Huw', 'Biy', 'Sab']
   ],
@@ -35,8 +35,15 @@ global.ng.common.locales['ceb'] = [
       'Oktubre', 'Nobyembre', 'Disyembre'
     ]
   ],
-  u,
-  [['WK', 'KP'], u, u],
+  [
+    ['E', 'P', 'M', 'A', 'M', 'H', 'H', 'A', 'S', 'O', 'N', 'D'],
+    ['Ene', 'Peb', 'Mar', 'Abr', 'May', 'Hun', 'Hul', 'Ago', 'Set', 'Okt', 'Nob', 'Dis'],
+    [
+      'Enero', 'Pebrero', 'Marso', 'Abril', 'Mayo', 'Hunyo', 'Hulyo', 'Agosto', 'Setyembre',
+      'Oktubre', 'Nobyembre', 'Disyembre'
+    ]
+  ],
+  [['BC', 'KP'], u, ['Sa Wala Pa Si Kristo', 'Anno Domini']],
   0,
   [6, 0],
   ['M/d/yy', 'MMM d, y', 'MMMM d, y', 'EEEE, MMMM d, y'],
diff --git a/packages/common/locales/global/eu.js b/packages/common/locales/global/eu.js
index b4063a4032d28..379e13a4e268b 100644
--- a/packages/common/locales/global/eu.js
+++ b/packages/common/locales/global/eu.js
@@ -28,6 +28,16 @@ global.ng.common.locales['eu'] = [
     ['ig.', 'al.', 'ar.', 'az.', 'og.', 'or.', 'lr.']
   ],
   u,
+  [
+    ['U', 'O', 'M', 'A', 'M', 'E', 'U', 'A', 'I', 'U', 'A', 'A'],
+    [
+      'urt.', 'ots.', 'mar.', 'api.', 'mai.', 'eka.', 'uzt.', 'abu.', 'ira.', 'urr.', 'aza.', 'abe.'
+    ],
+    [
+      'urtarrilak', 'otsailak', 'martxoak', 'apirilak', 'maiatzak', 'ekainak', 'uztailak',
+      'abuztuak', 'irailak', 'urriak', 'azaroak', 'abenduak'
+    ]
+  ],
   [
     ['U', 'O', 'M', 'A', 'M', 'E', 'U', 'A', 'I', 'U', 'A', 'A'],
     [
@@ -38,7 +48,6 @@ global.ng.common.locales['eu'] = [
       'iraila', 'urria', 'azaroa', 'abendua'
     ]
   ],
-  u,
   [['K.a.', 'K.o.'], u, ['K.a.', 'Kristo ondoren']],
   1,
   [6, 0],
diff --git a/packages/common/locales/global/ha-GH.js b/packages/common/locales/global/ha-GH.js
index ae5b77dd2b421..4045db5e8cfb1 100644
--- a/packages/common/locales/global/ha-GH.js
+++ b/packages/common/locales/global/ha-GH.js
@@ -47,7 +47,7 @@ global.ng.common.locales['ha-gh'] = [
   ['#,##0.###', '#,##0%', '¤ #,##0.00', '#E0'],
   'GHS',
   'GH₵',
-  'GHS',
+  'Kudin Ghana',
   {'GHS': ['GH₵'], 'NGN': ['₦']},
   'ltr',
   plural,
diff --git a/packages/common/locales/global/kkj.js b/packages/common/locales/global/kkj.js
index cc878b8896b29..078eb3bd80195 100644
--- a/packages/common/locales/global/kkj.js
+++ b/packages/common/locales/global/kkj.js
@@ -35,7 +35,7 @@ global.ng.common.locales['kkj'] = [
     ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'],
     [
       'pamba', 'wanja', 'mbiyɔ mɛndoŋgɔ', 'Nyɔlɔmbɔŋgɔ', 'Mɔnɔ ŋgbanja', 'Nyaŋgwɛ ŋgbanja',
-      'kuŋgwɛ', 'fɛ', 'njapi', 'nyukul', '11', 'ɓulɓusɛ'
+      'kuŋgwɛ', 'fɛ', 'njapi', 'nyukul', 'M11', 'ɓulɓusɛ'
     ],
     u
   ],
diff --git a/packages/common/locales/global/kok.js b/packages/common/locales/global/kok.js
index 00340a163028e..ae2a8fe4dbd1d 100644
--- a/packages/common/locales/global/kok.js
+++ b/packages/common/locales/global/kok.js
@@ -22,20 +22,31 @@ global.ng.common.locales['kok'] = [
   [['a', 'p'], ['AM', 'PM'], u],
   [['AM', 'PM'], u, u],
   [
-    ['आ', 'सो', 'मं', 'बु', 'गु', 'शु', 'शे'],
-    ['आयतार', 'सोमार', 'मंगळार', 'बुधवार', 'गुरुवार', 'शुक्रार', 'शेनवार'], u,
-    ['आय', 'सोम', 'मंगळ', 'बुध', 'गुरु', 'शुक्र', 'शेन']
+    ['आ', 'सो', 'मं', 'बु', 'बि', 'शु', 'शे'],
+    ['आयतार', 'सोमार', 'मंगळार', 'बुधवार', 'बिरेस्तार', 'शुक्रार', 'शेनवार'], u,
+    ['आय', 'सोम', 'मंगळ', 'बुध', 'बिरे', 'शुक्र', 'शेन']
+  ],
+  [
+    ['आ', 'सो', 'मं', 'बु', 'ब', 'शु', 'शे'],
+    ['आयतार', 'सोमार', 'मंगळार', 'बुधवार', 'बिरेस्तार', 'शुक्रार', 'शेनवार'], u,
+    ['आय', 'सोम', 'मंगळ', 'बुध', 'बिरे', 'शुक्र', 'शेन']
   ],
-  u,
   [
     ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'],
     [
-      'जानेवारी', 'फेब्रुवारी', 'मार्च', 'एप्रिल', 'मे', 'जून', 'जुलाय', 'आगोस्त', 'सप्टेंबर', 'ऑक्टोबर',
-      'नोव्हेंबर', 'डिसेंबर'
+      'जानेवारी', 'फेब्रुवारी', 'मार्च', 'एप्रिल', 'मे', 'जून', 'जुलय', 'ऑगस्ट', 'सप्टेंबर', 'ऑक्टोबर', 'नोव्हेंबर',
+      'डिसेंबर'
     ],
     u
   ],
-  u,
+  [
+    ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'],
+    ['जाने', 'फेब्रु', 'मार्च', 'एप्री', 'मे', 'जून', 'जुल', 'ऑग', 'सप्टें', 'ऑक्टो', 'नो', 'डिसे'],
+    [
+      'जानेवारी', 'फेब्रुवारी', 'मार्च', 'एप्रिल', 'मे', 'जून', 'जुलय', 'ऑगस्ट', 'सप्टेंबर', 'ऑक्टोबर', 'नोव्हेंबर',
+      'डिसेंबर'
+    ]
+  ],
   [['क्रिस्तपूर्व', 'क्रिस्तशखा'], u, u],
   0,
   [0, 0],
diff --git a/packages/common/locales/global/ne-IN.js b/packages/common/locales/global/ne-IN.js
index 1b8941ddda9c5..72dc42797f8a3 100644
--- a/packages/common/locales/global/ne-IN.js
+++ b/packages/common/locales/global/ne-IN.js
@@ -51,7 +51,7 @@ global.ng.common.locales['ne-in'] = [
   ['h:mm a', 'h:mm:ss a', 'h:mm:ss a z', 'h:mm:ss a zzzz'],
   ['{1}, {0}', u, '{1} {0}', u],
   ['.', ',', ';', '%', '+', '-', 'E', '×', '‰', '∞', 'NaN', ':'],
-  ['#,##0.###', '#,##0%', '¤ #,##0.00', '#E0'],
+  ['#,##,##0.###', '#,##,##0%', '¤ #,##,##0.00', '#E0'],
   'INR',
   '₹',
   'भारतीय रूपिँया',
diff --git a/packages/common/locales/global/ne.js b/packages/common/locales/global/ne.js
index 13ad07d65b62e..8589ee9895175 100644
--- a/packages/common/locales/global/ne.js
+++ b/packages/common/locales/global/ne.js
@@ -51,7 +51,7 @@ global.ng.common.locales['ne'] = [
   ['HH:mm', 'HH:mm:ss', 'HH:mm:ss z', 'HH:mm:ss zzzz'],
   ['{1}, {0}', u, '{1} {0}', u],
   ['.', ',', ';', '%', '+', '-', 'E', '×', '‰', '∞', 'NaN', ':'],
-  ['#,##0.###', '#,##0%', '¤ #,##0.00', '#E0'],
+  ['#,##,##0.###', '#,##,##0%', '¤ #,##,##0.00', '#E0'],
   'NPR',
   'नेरू',
   'नेपाली रूपैयाँ',
diff --git a/packages/common/locales/global/so-DJ.js b/packages/common/locales/global/so-DJ.js
index d3d22e98d660e..455a01b6428e1 100644
--- a/packages/common/locales/global/so-DJ.js
+++ b/packages/common/locales/global/so-DJ.js
@@ -45,7 +45,7 @@ global.ng.common.locales['so-dj'] = [
       'Oktoobar', 'Nofembar', 'Desembar'
     ]
   ],
-  [['CH', 'CD'], u, ['Ciise Hortii', 'Ciise Dabadii']],
+  [['B', 'A'], ['CH', 'CD'], ['Ciise Hortii', 'Ciise Dabadii']],
   6,
   [6, 0],
   ['dd/MM/yy', 'dd-MMM-y', 'dd MMMM y', 'EEEE, MMMM dd, y'],
diff --git a/packages/common/locales/global/so-ET.js b/packages/common/locales/global/so-ET.js
index a39c607d62b8c..cfc0148e6efba 100644
--- a/packages/common/locales/global/so-ET.js
+++ b/packages/common/locales/global/so-ET.js
@@ -45,7 +45,7 @@ global.ng.common.locales['so-et'] = [
       'Oktoobar', 'Nofembar', 'Desembar'
     ]
   ],
-  [['CH', 'CD'], u, ['Ciise Hortii', 'Ciise Dabadii']],
+  [['B', 'A'], ['CH', 'CD'], ['Ciise Hortii', 'Ciise Dabadii']],
   0,
   [6, 0],
   ['dd/MM/yy', 'dd-MMM-y', 'dd MMMM y', 'EEEE, MMMM dd, y'],
diff --git a/packages/common/locales/global/so-KE.js b/packages/common/locales/global/so-KE.js
index 5cef95e9d54d7..3147fa940ae67 100644
--- a/packages/common/locales/global/so-KE.js
+++ b/packages/common/locales/global/so-KE.js
@@ -45,7 +45,7 @@ global.ng.common.locales['so-ke'] = [
       'Oktoobar', 'Nofembar', 'Desembar'
     ]
   ],
-  [['CH', 'CD'], u, ['Ciise Hortii', 'Ciise Dabadii']],
+  [['B', 'A'], ['CH', 'CD'], ['Ciise Hortii', 'Ciise Dabadii']],
   0,
   [6, 0],
   ['dd/MM/yy', 'dd-MMM-y', 'dd MMMM y', 'EEEE, MMMM dd, y'],
diff --git a/packages/common/locales/global/so.js b/packages/common/locales/global/so.js
index 865f68406495f..21f9e41fd8d75 100644
--- a/packages/common/locales/global/so.js
+++ b/packages/common/locales/global/so.js
@@ -45,7 +45,7 @@ global.ng.common.locales['so'] = [
       'Oktoobar', 'Nofembar', 'Desembar'
     ]
   ],
-  [['CH', 'CD'], u, ['Ciise Hortii', 'Ciise Dabadii']],
+  [['B', 'A'], ['CH', 'CD'], ['Ciise Hortii', 'Ciise Dabadii']],
   1,
   [6, 0],
   ['dd/MM/yy', 'dd-MMM-y', 'dd MMMM y', 'EEEE, MMMM dd, y'],
diff --git a/packages/common/locales/global/vai-Latn.js b/packages/common/locales/global/vai-Latn.js
index e030b48248969..2b6c58d31de68 100644
--- a/packages/common/locales/global/vai-Latn.js
+++ b/packages/common/locales/global/vai-Latn.js
@@ -28,11 +28,7 @@ global.ng.common.locales['vai-latn'] = [
   u,
   [
     ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'],
-    [
-      'luukao kemã', 'ɓandaɓu', 'vɔɔ', 'fulu', 'goo', '6', '7', 'kɔnde', 'saah', 'galo',
-      'kenpkato ɓololɔ', 'luukao lɔma'
-    ],
-    u
+    ['M01', 'M02', 'M03', 'M04', 'M05', 'M06', 'M07', 'M08', 'M09', 'M10', 'M11', 'M12'], u
   ],
   u,
   [['BCE', 'CE'], u, u],
diff --git a/packages/common/locales/ha-GH.ts b/packages/common/locales/ha-GH.ts
index e072f6b6cdbd2..f6d0698727ca0 100644
--- a/packages/common/locales/ha-GH.ts
+++ b/packages/common/locales/ha-GH.ts
@@ -45,7 +45,7 @@ export default [
   ['#,##0.###', '#,##0%', '¤ #,##0.00', '#E0'],
   'GHS',
   'GH₵',
-  'GHS',
+  'Kudin Ghana',
   {'GHS': ['GH₵'], 'NGN': ['₦']},
   'ltr',
   plural
diff --git a/packages/common/locales/kkj.ts b/packages/common/locales/kkj.ts
index 5c6021df92166..fb93a1e3bf48a 100644
--- a/packages/common/locales/kkj.ts
+++ b/packages/common/locales/kkj.ts
@@ -33,7 +33,7 @@ export default [
     ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'],
     [
       'pamba', 'wanja', 'mbiyɔ mɛndoŋgɔ', 'Nyɔlɔmbɔŋgɔ', 'Mɔnɔ ŋgbanja', 'Nyaŋgwɛ ŋgbanja',
-      'kuŋgwɛ', 'fɛ', 'njapi', 'nyukul', '11', 'ɓulɓusɛ'
+      'kuŋgwɛ', 'fɛ', 'njapi', 'nyukul', 'M11', 'ɓulɓusɛ'
     ],
     u
   ],
diff --git a/packages/common/locales/kok.ts b/packages/common/locales/kok.ts
index b42a876e9b7c8..0478643e56d3c 100644
--- a/packages/common/locales/kok.ts
+++ b/packages/common/locales/kok.ts
@@ -20,20 +20,31 @@ export default [
   [['a', 'p'], ['AM', 'PM'], u],
   [['AM', 'PM'], u, u],
   [
-    ['आ', 'सो', 'मं', 'बु', 'गु', 'शु', 'शे'],
-    ['आयतार', 'सोमार', 'मंगळार', 'बुधवार', 'गुरुवार', 'शुक्रार', 'शेनवार'], u,
-    ['आय', 'सोम', 'मंगळ', 'बुध', 'गुरु', 'शुक्र', 'शेन']
+    ['आ', 'सो', 'मं', 'बु', 'बि', 'शु', 'शे'],
+    ['आयतार', 'सोमार', 'मंगळार', 'बुधवार', 'बिरेस्तार', 'शुक्रार', 'शेनवार'], u,
+    ['आय', 'सोम', 'मंगळ', 'बुध', 'बिरे', 'शुक्र', 'शेन']
+  ],
+  [
+    ['आ', 'सो', 'मं', 'बु', 'ब', 'शु', 'शे'],
+    ['आयतार', 'सोमार', 'मंगळार', 'बुधवार', 'बिरेस्तार', 'शुक्रार', 'शेनवार'], u,
+    ['आय', 'सोम', 'मंगळ', 'बुध', 'बिरे', 'शुक्र', 'शेन']
   ],
-  u,
   [
     ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'],
     [
-      'जानेवारी', 'फेब्रुवारी', 'मार्च', 'एप्रिल', 'मे', 'जून', 'जुलाय', 'आगोस्त', 'सप्टेंबर', 'ऑक्टोबर',
-      'नोव्हेंबर', 'डिसेंबर'
+      'जानेवारी', 'फेब्रुवारी', 'मार्च', 'एप्रिल', 'मे', 'जून', 'जुलय', 'ऑगस्ट', 'सप्टेंबर', 'ऑक्टोबर', 'नोव्हेंबर',
+      'डिसेंबर'
     ],
     u
   ],
-  u,
+  [
+    ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'],
+    ['जाने', 'फेब्रु', 'मार्च', 'एप्री', 'मे', 'जून', 'जुल', 'ऑग', 'सप्टें', 'ऑक्टो', 'नो', 'डिसे'],
+    [
+      'जानेवारी', 'फेब्रुवारी', 'मार्च', 'एप्रिल', 'मे', 'जून', 'जुलय', 'ऑगस्ट', 'सप्टेंबर', 'ऑक्टोबर', 'नोव्हेंबर',
+      'डिसेंबर'
+    ]
+  ],
   [['क्रिस्तपूर्व', 'क्रिस्तशखा'], u, u],
   0,
   [0, 0],
diff --git a/packages/common/locales/ne-IN.ts b/packages/common/locales/ne-IN.ts
index ae97f28fa82f8..e2c84beb2f012 100644
--- a/packages/common/locales/ne-IN.ts
+++ b/packages/common/locales/ne-IN.ts
@@ -49,7 +49,7 @@ export default [
   ['h:mm a', 'h:mm:ss a', 'h:mm:ss a z', 'h:mm:ss a zzzz'],
   ['{1}, {0}', u, '{1} {0}', u],
   ['.', ',', ';', '%', '+', '-', 'E', '×', '‰', '∞', 'NaN', ':'],
-  ['#,##0.###', '#,##0%', '¤ #,##0.00', '#E0'],
+  ['#,##,##0.###', '#,##,##0%', '¤ #,##,##0.00', '#E0'],
   'INR',
   '₹',
   'भारतीय रूपिँया',
diff --git a/packages/common/locales/ne.ts b/packages/common/locales/ne.ts
index 509d7454e808e..4da8cb70120cf 100644
--- a/packages/common/locales/ne.ts
+++ b/packages/common/locales/ne.ts
@@ -49,7 +49,7 @@ export default [
   ['HH:mm', 'HH:mm:ss', 'HH:mm:ss z', 'HH:mm:ss zzzz'],
   ['{1}, {0}', u, '{1} {0}', u],
   ['.', ',', ';', '%', '+', '-', 'E', '×', '‰', '∞', 'NaN', ':'],
-  ['#,##0.###', '#,##0%', '¤ #,##0.00', '#E0'],
+  ['#,##,##0.###', '#,##,##0%', '¤ #,##,##0.00', '#E0'],
   'NPR',
   'नेरू',
   'नेपाली रूपैयाँ',
diff --git a/packages/common/locales/so-DJ.ts b/packages/common/locales/so-DJ.ts
index c5aaf6bd5edec..1eab97680471f 100644
--- a/packages/common/locales/so-DJ.ts
+++ b/packages/common/locales/so-DJ.ts
@@ -43,7 +43,7 @@ export default [
       'Oktoobar', 'Nofembar', 'Desembar'
     ]
   ],
-  [['CH', 'CD'], u, ['Ciise Hortii', 'Ciise Dabadii']],
+  [['B', 'A'], ['CH', 'CD'], ['Ciise Hortii', 'Ciise Dabadii']],
   6,
   [6, 0],
   ['dd/MM/yy', 'dd-MMM-y', 'dd MMMM y', 'EEEE, MMMM dd, y'],
diff --git a/packages/common/locales/so-ET.ts b/packages/common/locales/so-ET.ts
index 8596e60999cb2..161609df76b24 100644
--- a/packages/common/locales/so-ET.ts
+++ b/packages/common/locales/so-ET.ts
@@ -43,7 +43,7 @@ export default [
       'Oktoobar', 'Nofembar', 'Desembar'
     ]
   ],
-  [['CH', 'CD'], u, ['Ciise Hortii', 'Ciise Dabadii']],
+  [['B', 'A'], ['CH', 'CD'], ['Ciise Hortii', 'Ciise Dabadii']],
   0,
   [6, 0],
   ['dd/MM/yy', 'dd-MMM-y', 'dd MMMM y', 'EEEE, MMMM dd, y'],
diff --git a/packages/common/locales/so-KE.ts b/packages/common/locales/so-KE.ts
index e008a609e9c84..c8a64a2e9022c 100644
--- a/packages/common/locales/so-KE.ts
+++ b/packages/common/locales/so-KE.ts
@@ -43,7 +43,7 @@ export default [
       'Oktoobar', 'Nofembar', 'Desembar'
     ]
   ],
-  [['CH', 'CD'], u, ['Ciise Hortii', 'Ciise Dabadii']],
+  [['B', 'A'], ['CH', 'CD'], ['Ciise Hortii', 'Ciise Dabadii']],
   0,
   [6, 0],
   ['dd/MM/yy', 'dd-MMM-y', 'dd MMMM y', 'EEEE, MMMM dd, y'],
diff --git a/packages/common/locales/so.ts b/packages/common/locales/so.ts
index 1975c67aac5c2..58ecb51b9df59 100644
--- a/packages/common/locales/so.ts
+++ b/packages/common/locales/so.ts
@@ -43,7 +43,7 @@ export default [
       'Oktoobar', 'Nofembar', 'Desembar'
     ]
   ],
-  [['CH', 'CD'], u, ['Ciise Hortii', 'Ciise Dabadii']],
+  [['B', 'A'], ['CH', 'CD'], ['Ciise Hortii', 'Ciise Dabadii']],
   1,
   [6, 0],
   ['dd/MM/yy', 'dd-MMM-y', 'dd MMMM y', 'EEEE, MMMM dd, y'],
diff --git a/packages/common/locales/vai-Latn.ts b/packages/common/locales/vai-Latn.ts
index ff9783ac31a7f..1feb039f35bc9 100644
--- a/packages/common/locales/vai-Latn.ts
+++ b/packages/common/locales/vai-Latn.ts
@@ -26,11 +26,7 @@ export default [
   u,
   [
     ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'],
-    [
-      'luukao kemã', 'ɓandaɓu', 'vɔɔ', 'fulu', 'goo', '6', '7', 'kɔnde', 'saah', 'galo',
-      'kenpkato ɓololɔ', 'luukao lɔma'
-    ],
-    u
+    ['M01', 'M02', 'M03', 'M04', 'M05', 'M06', 'M07', 'M08', 'M09', 'M10', 'M11', 'M12'], u
   ],
   u,
   [['BCE', 'CE'], u, u],
diff --git a/packages/common/src/directives/ng_for_of.ts b/packages/common/src/directives/ng_for_of.ts
index 700b6710267d6..bae7bd543d2fe 100644
--- a/packages/common/src/directives/ng_for_of.ts
+++ b/packages/common/src/directives/ng_for_of.ts
@@ -155,7 +155,7 @@ export class NgForOf<T, U extends NgIterable<T> = NgIterable<T>> implements DoCh
    * rather than the identity of the object itself.
    *
    * The function receives two inputs,
-   * the iteration index and the node object ID.
+   * the iteration index and the associated node data.
    */
   @Input()
   set ngForTrackBy(fn: TrackByFunction<T>) {
diff --git a/packages/common/src/i18n/format_date.ts b/packages/common/src/i18n/format_date.ts
index 355298a60f5be..4c5d653d516da 100644
--- a/packages/common/src/i18n/format_date.ts
+++ b/packages/common/src/i18n/format_date.ts
@@ -13,7 +13,7 @@ export const ISO8601_DATE_REGEX =
 //    1        2       3         4          5          6          7          8  9     10      11
 const NAMED_FORMATS: {[localeId: string]: {[format: string]: string}} = {};
 const DATE_FORMATS_SPLIT =
-    /((?:[^GyMLwWdEabBhHmsSzZO']+)|(?:'(?:[^']|'')*')|(?:G{1,5}|y{1,4}|M{1,5}|L{1,5}|w{1,2}|W{1}|d{1,2}|E{1,6}|a{1,5}|b{1,5}|B{1,5}|h{1,2}|H{1,2}|m{1,2}|s{1,2}|S{1,3}|z{1,4}|Z{1,5}|O{1,4}))([\s\S]*)/;
+    /((?:[^GyrMLwWdEabBhHmsSzZO']+)|(?:'(?:[^']|'')*')|(?:G{1,5}|y{1,4}|r{1,4}|M{1,5}|L{1,5}|w{1,2}|W{1}|d{1,2}|E{1,6}|a{1,5}|b{1,5}|B{1,5}|h{1,2}|H{1,2}|m{1,2}|s{1,2}|S{1,3}|z{1,4}|Z{1,5}|O{1,4}))([\s\S]*)/;
 
 enum ZoneWidth {
   Short,
@@ -394,6 +394,18 @@ function weekGetter(size: number, monthBased = false): DateFormatter {
   };
 }
 
+/**
+ * Returns a date formatter that provides the week-numbering year for the input date.
+ */
+function weekNumberingYearGetter(size: number, trim = false): DateFormatter {
+  return function(date: Date, locale: string) {
+    const thisThurs = getThursdayThisWeek(date);
+    const weekNumberingYear = thisThurs.getFullYear();
+    return padNumber(
+        weekNumberingYear, size, getLocaleNumberSymbol(locale, NumberSymbol.MinusSign), trim);
+  };
+}
+
 type DateFormatter = (date: Date, locale: string, offset: number) => string;
 
 const DATE_FORMATS: {[format: string]: DateFormatter} = {};
@@ -438,6 +450,25 @@ function getDateFormatter(format: string): DateFormatter|null {
       formatter = dateGetter(DateType.FullYear, 4, 0, false, true);
       break;
 
+    // 1 digit representation of the week-numbering year, e.g. (AD 1 => 1, AD 199 => 199)
+    case 'r':
+      formatter = weekNumberingYearGetter(1);
+      break;
+    // 2 digit representation of the week-numbering year, padded (00-99). (e.g. AD 2001 => 01, AD
+    // 2010 => 10)
+    case 'rr':
+      formatter = weekNumberingYearGetter(2, true);
+      break;
+    // 3 digit representation of the week-numbering year, padded (000-999). (e.g. AD 1 => 001, AD
+    // 2010 => 2010)
+    case 'rrr':
+      formatter = weekNumberingYearGetter(3);
+      break;
+    // 4 digit representation of the week-numbering year (e.g. AD 1 => 0001, AD 2010 => 2010)
+    case 'rrrr':
+      formatter = weekNumberingYearGetter(4);
+      break;
+
     // Month of the year (1-12), numeric
     case 'M':
     case 'L':
@@ -636,7 +667,7 @@ function getDateFormatter(format: string): DateFormatter|null {
 }
 
 function timezoneToOffset(timezone: string, fallback: number): number {
-  // Support: IE 9-11 only, Edge 13-15+
+  // Support: IE 11 only, Edge 13-15+
   // IE/Edge do not "understand" colon (`:`) in timezone
   timezone = timezone.replace(/:/g, '');
   const requestedTimezoneOffset = Date.parse('Jan 01, 1970 00:00:00 ' + timezone) / 60000;
@@ -734,7 +765,10 @@ export function isoStringToDate(match: RegExpMatchArray): Date {
   const h = Number(match[4] || 0) - tzHour;
   const m = Number(match[5] || 0) - tzMin;
   const s = Number(match[6] || 0);
-  const ms = Math.round(parseFloat('0.' + (match[7] || 0)) * 1000);
+  // The ECMAScript specification (https://www.ecma-international.org/ecma-262/5.1/#sec-15.9.1.11)
+  // defines that `DateTime` milliseconds should always be rounded down, so that `999.9ms`
+  // becomes `999ms`.
+  const ms = Math.floor(parseFloat('0.' + (match[7] || 0)) * 1000);
   timeSetter.call(date, h, m, s, ms);
   return date;
 }
diff --git a/packages/common/src/i18n/locale_data_api.ts b/packages/common/src/i18n/locale_data_api.ts
index a4661fde9349c..20221f759bab2 100644
--- a/packages/common/src/i18n/locale_data_api.ts
+++ b/packages/common/src/i18n/locale_data_api.ts
@@ -233,7 +233,7 @@ export function getLocaleId(locale: string): string {
  * @publicApi
  */
 export function getLocaleDayPeriods(
-    locale: string, formStyle: FormStyle, width: TranslationWidth): [string, string] {
+    locale: string, formStyle: FormStyle, width: TranslationWidth): Readonly<[string, string]> {
   const data = ɵfindLocaleData(locale);
   const amPmData = <[string, string][][]>[
     data[ɵLocaleDataIndex.DayPeriodsFormat], data[ɵLocaleDataIndex.DayPeriodsStandalone]
@@ -255,7 +255,7 @@ export function getLocaleDayPeriods(
  * @publicApi
  */
 export function getLocaleDayNames(
-    locale: string, formStyle: FormStyle, width: TranslationWidth): string[] {
+    locale: string, formStyle: FormStyle, width: TranslationWidth): ReadonlyArray<string> {
   const data = ɵfindLocaleData(locale);
   const daysData =
       <string[][][]>[data[ɵLocaleDataIndex.DaysFormat], data[ɵLocaleDataIndex.DaysStandalone]];
@@ -276,7 +276,7 @@ export function getLocaleDayNames(
  * @publicApi
  */
 export function getLocaleMonthNames(
-    locale: string, formStyle: FormStyle, width: TranslationWidth): string[] {
+    locale: string, formStyle: FormStyle, width: TranslationWidth): ReadonlyArray<string> {
   const data = ɵfindLocaleData(locale);
   const monthsData =
       <string[][][]>[data[ɵLocaleDataIndex.MonthsFormat], data[ɵLocaleDataIndex.MonthsStandalone]];
@@ -287,7 +287,6 @@ export function getLocaleMonthNames(
 /**
  * Retrieves Gregorian-calendar eras for the given locale.
  * @param locale A locale code for the locale format rules to use.
- * @param formStyle The required grammatical form.
  * @param width The required character width.
 
  * @returns An array of localized era strings.
@@ -296,7 +295,8 @@ export function getLocaleMonthNames(
  *
  * @publicApi
  */
-export function getLocaleEraNames(locale: string, width: TranslationWidth): [string, string] {
+export function getLocaleEraNames(
+    locale: string, width: TranslationWidth): Readonly<[string, string]> {
   const data = ɵfindLocaleData(locale);
   const erasData = <[string, string][]>data[ɵLocaleDataIndex.Eras];
   return getLastDefinedValue(erasData, width);
diff --git a/packages/common/src/pipes/async_pipe.ts b/packages/common/src/pipes/async_pipe.ts
index 3716d7db42a8c..3921e1c018067 100644
--- a/packages/common/src/pipes/async_pipe.ts
+++ b/packages/common/src/pipes/async_pipe.ts
@@ -94,11 +94,10 @@ export class AsyncPipe implements OnDestroy, PipeTransform {
     }
   }
 
-  transform<T>(obj: null): null;
-  transform<T>(obj: undefined): undefined;
-  transform<T>(obj: Observable<T>|null|undefined): T|null;
-  transform<T>(obj: Promise<T>|null|undefined): T|null;
-  transform(obj: Observable<any>|Promise<any>|null|undefined): any {
+  transform<T>(obj: Observable<T>|Promise<T>): T|null;
+  transform<T>(obj: null|undefined): null;
+  transform<T>(obj: Observable<T>|Promise<T>|null|undefined): T|null;
+  transform<T>(obj: Observable<T>|Promise<T>|null|undefined): T|null {
     if (!this._obj) {
       if (obj) {
         this._subscribe(obj);
@@ -108,7 +107,7 @@ export class AsyncPipe implements OnDestroy, PipeTransform {
 
     if (obj !== this._obj) {
       this._dispose();
-      return this.transform(obj as any);
+      return this.transform(obj);
     }
 
     return this._latestValue;
diff --git a/packages/common/src/pipes/case_conversion_pipes.ts b/packages/common/src/pipes/case_conversion_pipes.ts
index 556c7cc1c16d0..fea96ec2d24d4 100644
--- a/packages/common/src/pipes/case_conversion_pipes.ts
+++ b/packages/common/src/pipes/case_conversion_pipes.ts
@@ -29,8 +29,11 @@ export class LowerCasePipe implements PipeTransform {
   /**
    * @param value The string to transform to lower case.
    */
-  transform(value: string): string {
-    if (!value) return value;
+  transform(value: string): string;
+  transform(value: null|undefined): null;
+  transform(value: string|null|undefined): string|null;
+  transform(value: string|null|undefined): string|null {
+    if (value == null) return null;
     if (typeof value !== 'string') {
       throw invalidPipeArgumentError(LowerCasePipe, value);
     }
@@ -72,8 +75,11 @@ export class TitleCasePipe implements PipeTransform {
   /**
    * @param value The string to transform to title case.
    */
-  transform(value: string): string {
-    if (!value) return value;
+  transform(value: string): string;
+  transform(value: null|undefined): null;
+  transform(value: string|null|undefined): string|null;
+  transform(value: string|null|undefined): string|null {
+    if (value == null) return null;
     if (typeof value !== 'string') {
       throw invalidPipeArgumentError(TitleCasePipe, value);
     }
@@ -96,8 +102,11 @@ export class UpperCasePipe implements PipeTransform {
   /**
    * @param value The string to transform to upper case.
    */
-  transform(value: string): string {
-    if (!value) return value;
+  transform(value: string): string;
+  transform(value: null|undefined): null;
+  transform(value: string|null|undefined): string|null;
+  transform(value: string|null|undefined): string|null {
+    if (value == null) return null;
     if (typeof value !== 'string') {
       throw invalidPipeArgumentError(UpperCasePipe, value);
     }
diff --git a/packages/common/src/pipes/date_pipe.ts b/packages/common/src/pipes/date_pipe.ts
index a6781804a3722..e4b8d4d1046c9 100644
--- a/packages/common/src/pipes/date_pipe.ts
+++ b/packages/common/src/pipes/date_pipe.ts
@@ -65,6 +65,10 @@ import {invalidPipeArgumentError} from './invalid_pipe_argument_error';
  *  |                    | yy          | Numeric: 2 digits + zero padded                               | 02, 20, 01, 17, 73                                         |
  *  |                    | yyy         | Numeric: 3 digits + zero padded                               | 002, 020, 201, 2017, 20173                                 |
  *  |                    | yyyy        | Numeric: 4 digits or more + zero padded                       | 0002, 0020, 0201, 2017, 20173                              |
+ *  | Week-numbering year| r           | Numeric: minimum digits                                       | 2, 20, 201, 2017, 20173                                    |
+ *  |                    | rr          | Numeric: 2 digits + zero padded                               | 02, 20, 01, 17, 73                                         |
+ *  |                    | rrr         | Numeric: 3 digits + zero padded                               | 002, 020, 201, 2017, 20173                                 |
+ *  |                    | rrrr        | Numeric: 4 digits or more + zero padded                       | 0002, 0020, 0201, 2017, 20173                              |
  *  | Month              | M           | Numeric: 1 digit                                              | 9, 12                                                      |
  *  |                    | MM          | Numeric: 2 digits + zero padded                               | 09, 12                                                     |
  *  |                    | MMM         | Abbreviated                                                   | Sep                                                        |
@@ -167,7 +171,15 @@ export class DatePipe implements PipeTransform {
    * 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 {
+  transform(value: Date|string|number, format?: string, timezone?: string, locale?: string): string
+      |null;
+  transform(value: null|undefined, format?: string, timezone?: string, locale?: string): null;
+  transform(
+      value: Date|string|number|null|undefined, format?: string, timezone?: string,
+      locale?: string): string|null;
+  transform(
+      value: Date|string|number|null|undefined, format = 'mediumDate', timezone?: string,
+      locale?: string): string|null {
     if (value == null || value === '' || value !== value) return null;
 
     try {
diff --git a/packages/common/src/pipes/i18n_plural_pipe.ts b/packages/common/src/pipes/i18n_plural_pipe.ts
index a0956167b065b..252da96c3e82d 100644
--- a/packages/common/src/pipes/i18n_plural_pipe.ts
+++ b/packages/common/src/pipes/i18n_plural_pipe.ts
@@ -39,7 +39,8 @@ export class I18nPluralPipe implements PipeTransform {
    * @param locale a `string` defining the locale to use (uses the current {@link LOCALE_ID} by
    * default).
    */
-  transform(value: number, pluralMap: {[count: string]: string}, locale?: string): string {
+  transform(value: number|null|undefined, pluralMap: {[count: string]: string}, locale?: string):
+      string {
     if (value == null) return '';
 
     if (typeof pluralMap !== 'object' || pluralMap === null) {
diff --git a/packages/common/src/pipes/keyvalue_pipe.ts b/packages/common/src/pipes/keyvalue_pipe.ts
index e81fff13269a8..163b83f3e6acd 100644
--- a/packages/common/src/pipes/keyvalue_pipe.ts
+++ b/packages/common/src/pipes/keyvalue_pipe.ts
@@ -50,31 +50,35 @@ export class KeyValuePipe implements PipeTransform {
   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}|ReadonlyMap<string, V>,
-      compareFn?: (a: KeyValue<string, V>, b: KeyValue<string, V>) => number):
-      Array<KeyValue<string, V>>;
-  transform<V>(
-      input: {[key: string]: V}|ReadonlyMap<string, V>|null,
-      compareFn?: (a: KeyValue<string, V>, b: KeyValue<string, V>) => number):
-      Array<KeyValue<string, V>>|null;
-  transform<V>(
-      input: {[key: number]: V}|ReadonlyMap<number, V>,
-      compareFn?: (a: KeyValue<number, V>, b: KeyValue<number, V>) => number):
-      Array<KeyValue<number, V>>;
-  transform<V>(
-      input: {[key: number]: V}|ReadonlyMap<number, V>|null,
-      compareFn?: (a: KeyValue<number, V>, b: KeyValue<number, V>) => number):
-      Array<KeyValue<number, V>>|null;
+  /*
+   * NOTE: when the `input` value is a simple Record<K, V> object, the keys are extracted with
+   * Object.keys(). This means that even if the `input` type is Record<number, V> the keys are
+   * compared/returned as `string`s.
+   */
   transform<K, V>(
       input: ReadonlyMap<K, V>,
       compareFn?: (a: KeyValue<K, V>, b: KeyValue<K, V>) => number): Array<KeyValue<K, V>>;
+  transform<K extends number, V>(
+      input: Record<K, V>, compareFn?: (a: KeyValue<string, V>, b: KeyValue<string, V>) => number):
+      Array<KeyValue<string, V>>;
+  transform<K extends string, V>(
+      input: Record<K, V>|ReadonlyMap<K, V>,
+      compareFn?: (a: KeyValue<K, V>, b: KeyValue<K, V>) => number): Array<KeyValue<K, V>>;
+  transform(
+      input: null|undefined,
+      compareFn?: (a: KeyValue<unknown, unknown>, b: KeyValue<unknown, unknown>) => number): null;
   transform<K, V>(
-      input: ReadonlyMap<K, V>|null,
+      input: ReadonlyMap<K, V>|null|undefined,
+      compareFn?: (a: KeyValue<K, V>, b: KeyValue<K, V>) => number): Array<KeyValue<K, V>>|null;
+  transform<K extends number, V>(
+      input: Record<K, V>|null|undefined,
+      compareFn?: (a: KeyValue<string, V>, b: KeyValue<string, V>) => number):
+      Array<KeyValue<string, V>>|null;
+  transform<K extends string, V>(
+      input: Record<K, V>|ReadonlyMap<K, V>|null|undefined,
       compareFn?: (a: KeyValue<K, V>, b: KeyValue<K, V>) => number): Array<KeyValue<K, V>>|null;
   transform<K, V>(
-      input: null|{[key: string]: V, [key: number]: V}|ReadonlyMap<K, V>,
+      input: undefined|null|{[key: string]: V, [key: number]: V}|ReadonlyMap<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')) {
diff --git a/packages/common/src/pipes/number_pipe.ts b/packages/common/src/pipes/number_pipe.ts
index 4931e7aa0ceac..edc6d080949e4 100644
--- a/packages/common/src/pipes/number_pipe.ts
+++ b/packages/common/src/pipes/number_pipe.ts
@@ -67,8 +67,12 @@ export class DecimalPipe implements PipeTransform {
    * 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;
+  transform(value: number|string, digitsInfo?: string, locale?: string): string|null;
+  transform(value: null|undefined, digitsInfo?: string, locale?: string): null;
+  transform(value: number|string|null|undefined, digitsInfo?: string, locale?: string): string|null;
+  transform(value: number|string|null|undefined, digitsInfo?: string, locale?: string): string
+      |null {
+    if (!isValue(value)) return null;
 
     locale = locale || this._locale;
 
@@ -121,8 +125,12 @@ export class PercentPipe implements PipeTransform {
    * 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;
+  transform(value: number|string, digitsInfo?: string, locale?: string): string|null;
+  transform(value: null|undefined, digitsInfo?: string, locale?: string): null;
+  transform(value: number|string|null|undefined, digitsInfo?: string, locale?: string): string|null;
+  transform(value: number|string|null|undefined, digitsInfo?: string, locale?: string): string
+      |null {
+    if (!isValue(value)) return null;
     locale = locale || this._locale;
     try {
       const num = strToNumber(value);
@@ -213,10 +221,22 @@ export class CurrencyPipe implements PipeTransform {
    * See [Setting your app locale](guide/i18n#setting-up-the-locale-of-your-app).
    */
   transform(
-      value: any, currencyCode?: string,
+      value: number|string, currencyCode?: string,
+      display?: 'code'|'symbol'|'symbol-narrow'|string|boolean, digitsInfo?: string,
+      locale?: string): string|null;
+  transform(
+      value: null|undefined, currencyCode?: string,
+      display?: 'code'|'symbol'|'symbol-narrow'|string|boolean, digitsInfo?: string,
+      locale?: string): null;
+  transform(
+      value: number|string|null|undefined, currencyCode?: string,
+      display?: 'code'|'symbol'|'symbol-narrow'|string|boolean, digitsInfo?: string,
+      locale?: string): string|null;
+  transform(
+      value: number|string|null|undefined, currencyCode?: string,
       display: 'code'|'symbol'|'symbol-narrow'|string|boolean = 'symbol', digitsInfo?: string,
       locale?: string): string|null {
-    if (isEmpty(value)) return null;
+    if (!isValue(value)) return null;
 
     locale = locale || this._locale;
 
@@ -246,8 +266,8 @@ export class CurrencyPipe implements PipeTransform {
   }
 }
 
-function isEmpty(value: any): boolean {
-  return value == null || value === '' || value !== value;
+function isValue(value: number|string|null|undefined): value is number|string {
+  return !(value == null || value === '' || value !== value);
 }
 
 /**
diff --git a/packages/common/src/pipes/slice_pipe.ts b/packages/common/src/pipes/slice_pipe.ts
index 07e6ba4014e08..90bf602f923eb 100644
--- a/packages/common/src/pipes/slice_pipe.ts
+++ b/packages/common/src/pipes/slice_pipe.ts
@@ -62,11 +62,13 @@ export class SlicePipe implements PipeTransform {
    *   - **if negative**: return all items before `end` index from the end of the list or string.
    */
   transform<T>(value: ReadonlyArray<T>, start: number, end?: number): Array<T>;
+  transform(value: null|undefined, start: number, end?: number): null;
+  transform<T>(value: ReadonlyArray<T>|null|undefined, start: number, end?: number): Array<T>|null;
   transform(value: string, start: number, end?: number): string;
-  transform(value: null, start: number, end?: number): null;
-  transform(value: undefined, start: number, end?: number): undefined;
-  transform(value: any, start: number, end?: number): any {
-    if (value == null) return value;
+  transform(value: string|null|undefined, start: number, end?: number): string|null;
+  transform<T>(value: ReadonlyArray<T>|string|null|undefined, start: number, end?: number):
+      Array<T>|string|null {
+    if (value == null) return null;
 
     if (!this.supports(value)) {
       throw invalidPipeArgumentError(SlicePipe, value);
diff --git a/packages/common/src/viewport_scroller.ts b/packages/common/src/viewport_scroller.ts
index 355b90ecc79d6..bbcf53ebbc898 100644
--- a/packages/common/src/viewport_scroller.ts
+++ b/packages/common/src/viewport_scroller.ts
@@ -88,7 +88,7 @@ export class BrowserViewportScroller implements ViewportScroller {
    * @returns The position in screen coordinates.
    */
   getScrollPosition(): [number, number] {
-    if (this.supportScrollRestoration()) {
+    if (this.supportsScrolling()) {
       return [this.window.scrollX, this.window.scrollY];
     } else {
       return [0, 0];
@@ -100,7 +100,7 @@ export class BrowserViewportScroller implements ViewportScroller {
    * @param position The new position in screen coordinates.
    */
   scrollToPosition(position: [number, number]): void {
-    if (this.supportScrollRestoration()) {
+    if (this.supportsScrolling()) {
       this.window.scrollTo(position[0], position[1]);
     }
   }
@@ -110,7 +110,7 @@ export class BrowserViewportScroller implements ViewportScroller {
    * @param anchor The ID of the anchor element.
    */
   scrollToAnchor(anchor: string): void {
-    if (this.supportScrollRestoration()) {
+    if (this.supportsScrolling()) {
       const elSelected =
           this.document.getElementById(anchor) || this.document.getElementsByName(anchor)[0];
       if (elSelected) {
@@ -163,6 +163,14 @@ export class BrowserViewportScroller implements ViewportScroller {
       return false;
     }
   }
+
+  private supportsScrolling(): boolean {
+    try {
+      return !!this.window.scrollTo;
+    } catch {
+      return false;
+    }
+  }
 }
 
 function getScrollRestorationProperty(obj: any): PropertyDescriptor|undefined {
@@ -170,8 +178,7 @@ function getScrollRestorationProperty(obj: any): PropertyDescriptor|undefined {
 }
 
 /**
- * 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.
+ * Provides an empty implementation of the viewport scroller.
  */
 export class NullViewportScroller implements ViewportScroller {
   /**
diff --git a/packages/common/test/i18n/format_date_spec.ts b/packages/common/test/i18n/format_date_spec.ts
index 25a1f2b71fe5e..2a9cabf6ad78f 100644
--- a/packages/common/test/i18n/format_date_spec.ts
+++ b/packages/common/test/i18n/format_date_spec.ts
@@ -95,6 +95,10 @@ describe('Format date', () => {
         yy: '15',
         yyy: '2015',
         yyyy: '2015',
+        r: '2015',
+        rr: '15',
+        rrr: '2015',
+        rrrr: '2015',
         M: '6',
         MM: '06',
         MMM: 'Jun',
@@ -153,6 +157,10 @@ describe('Format date', () => {
         yy: '15',
         yyy: '2015',
         yyyy: '2015',
+        r: '2015',
+        rr: '15',
+        rrr: '2015',
+        rrrr: '2015',
         M: '1',
         MM: '01',
         MMM: 'Jan',
@@ -361,5 +369,14 @@ describe('Format date', () => {
       expect(formatDate(3001, 'm:ss.SS', 'en')).toEqual('0:03.00');
       expect(formatDate(3001, 'm:ss.SSS', 'en')).toEqual('0:03.001');
     });
+
+    // https://github.com/angular/angular/issues/38739
+    it('should return correct ISO 8601 week-numbering year for dates close to year end/beginning',
+       () => {
+         expect(formatDate('2013-12-27', 'rrrr', 'en')).toEqual('2013');
+         expect(formatDate('2013-12-29', 'rrrr', 'en')).toEqual('2014');
+         expect(formatDate('2010-01-02', 'rrrr', 'en')).toEqual('2009');
+         expect(formatDate('2010-01-04', 'rrrr', 'en')).toEqual('2010');
+       });
   });
 });
diff --git a/packages/common/test/i18n/locale_data_api_spec.ts b/packages/common/test/i18n/locale_data_api_spec.ts
index be6be2501971d..406e1327dbcb5 100644
--- a/packages/common/test/i18n/locale_data_api_spec.ts
+++ b/packages/common/test/i18n/locale_data_api_spec.ts
@@ -13,7 +13,7 @@ import localeHe from '@angular/common/locales/he';
 import localeZh from '@angular/common/locales/zh';
 import {ɵregisterLocaleData, ɵunregisterLocaleData} from '@angular/core';
 
-import {FormatWidth, getCurrencySymbol, getLocaleDateFormat, getLocaleDirection, getNumberOfCurrencyDigits} from '../../src/i18n/locale_data_api';
+import {FormatWidth, FormStyle, getCurrencySymbol, getLocaleDateFormat, getLocaleDayNames, getLocaleDirection, getLocaleMonthNames, getNumberOfCurrencyDigits, TranslationWidth} from '../../src/i18n/locale_data_api';
 
 {
   describe('locale data api', () => {
@@ -71,5 +71,96 @@ import {FormatWidth, getCurrencySymbol, getLocaleDateFormat, getLocaleDirection,
         expect(getLocaleDirection('en')).toEqual('ltr');
       });
     });
+
+    describe('getLocaleDayNames', () => {
+      it('should return english short list of days', () => {
+        expect(
+            getLocaleDayNames('en-US', FormStyle.Format, TranslationWidth.Short),
+            )
+            .toEqual(['Su', 'Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa']);
+      });
+
+      it('should return french short list of days', () => {
+        expect(
+            getLocaleDayNames('fr-CA', FormStyle.Format, TranslationWidth.Short),
+            )
+            .toEqual(['di', 'lu', 'ma', 'me', 'je', 've', 'sa']);
+      });
+
+      it('should return english wide list of days', () => {
+        expect(
+            getLocaleDayNames('en-US', FormStyle.Format, TranslationWidth.Wide),
+            )
+            .toEqual(
+                ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday']);
+      });
+
+      it('should return french wide list of days', () => {
+        expect(
+            getLocaleDayNames('fr-CA', FormStyle.Format, TranslationWidth.Wide),
+            )
+            .toEqual(['dimanche', 'lundi', 'mardi', 'mercredi', 'jeudi', 'vendredi', 'samedi']);
+      });
+
+      it('should return the full short list of days after manipulations', () => {
+        const days =
+            Array.from(getLocaleDayNames('en-US', FormStyle.Format, TranslationWidth.Short));
+
+        days.splice(2);
+        days.push('unexisting_day');
+
+        const newDays = getLocaleDayNames('en-US', FormStyle.Format, TranslationWidth.Short);
+
+        expect(newDays.length).toBe(7);
+
+        expect(newDays).toEqual(['Su', 'Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa']);
+      });
+    });
+
+    describe('getLocaleMonthNames', () => {
+      it('should return english abbreviated list of month', () => {
+        expect(getLocaleMonthNames('en-US', FormStyle.Format, TranslationWidth.Abbreviated))
+            .toEqual([
+              'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'
+            ]);
+      });
+
+      it('should return french abbreviated list of month', () => {
+        expect(getLocaleMonthNames('fr-CA', FormStyle.Format, TranslationWidth.Abbreviated))
+            .toEqual([
+              'janv.', 'févr.', 'mars', 'avr.', 'mai', 'juin', 'juil.', 'août', 'sept.', 'oct.',
+              'nov.', 'déc.'
+            ]);
+      });
+
+      it('should return english wide list of month', () => {
+        expect(getLocaleMonthNames('en-US', FormStyle.Format, TranslationWidth.Wide)).toEqual([
+          'January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September',
+          'October', 'November', 'December'
+        ]);
+      });
+
+      it('should return french wide list of month', () => {
+        expect(getLocaleMonthNames('fr-CA', FormStyle.Format, TranslationWidth.Wide)).toEqual([
+          'janvier', 'février', 'mars', 'avril', 'mai', 'juin', 'juillet', 'août', 'septembre',
+          'octobre', 'novembre', 'décembre'
+        ]);
+      });
+
+      it('should return the full abbreviated list of month after manipulations', () => {
+        const month = Array.from(
+            getLocaleMonthNames('en-US', FormStyle.Format, TranslationWidth.Abbreviated));
+        month.splice(2);
+        month.push('unexisting_month');
+
+        const newMonth =
+            getLocaleMonthNames('en-US', FormStyle.Format, TranslationWidth.Abbreviated);
+
+        expect(newMonth.length).toBe(12);
+
+        expect(newMonth).toEqual(
+            ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']);
+      });
+    });
   });
 }
diff --git a/packages/common/test/pipes/async_pipe_spec.ts b/packages/common/test/pipes/async_pipe_spec.ts
index 42414897eade5..00a2de5064eb6 100644
--- a/packages/common/test/pipes/async_pipe_spec.ts
+++ b/packages/common/test/pipes/async_pipe_spec.ts
@@ -129,7 +129,7 @@ import {SpyChangeDetectorRef} from '../spies';
           reject = rej;
         });
         ref = new SpyChangeDetectorRef();
-        pipe = new AsyncPipe(<any>ref);
+        pipe = new AsyncPipe(ref as any);
       });
 
       describe('transform', () => {
@@ -218,10 +218,17 @@ import {SpyChangeDetectorRef} from '../spies';
       });
     });
 
+    describe('undefined', () => {
+      it('should return null when given undefined', () => {
+        const pipe = new AsyncPipe(null as any);
+        expect(pipe.transform(undefined)).toEqual(null);
+      });
+    });
+
     describe('other types', () => {
       it('should throw when given an invalid object', () => {
         const pipe = new AsyncPipe(null as any);
-        expect(() => pipe.transform(<any>'some bogus object')).toThrowError();
+        expect(() => pipe.transform('some bogus object' as any)).toThrowError();
       });
     });
   });
diff --git a/packages/common/test/pipes/case_conversion_pipes_spec.ts b/packages/common/test/pipes/case_conversion_pipes_spec.ts
index 0fde495f33c1a..ca1bc289ce2cc 100644
--- a/packages/common/test/pipes/case_conversion_pipes_spec.ts
+++ b/packages/common/test/pipes/case_conversion_pipes_spec.ts
@@ -25,8 +25,18 @@ import {LowerCasePipe, TitleCasePipe, UpperCasePipe} from '@angular/common';
       expect(pipe.transform('BAr')).toEqual('bar');
     });
 
+    it('should map null to null', () => {
+      expect(pipe.transform(null)).toEqual(null);
+    });
+    it('should map undefined to null', () => {
+      expect(pipe.transform(undefined)).toEqual(null);
+    });
+
+    it('should not support numbers', () => {
+      expect(() => pipe.transform(0 as any)).toThrowError();
+    });
     it('should not support other objects', () => {
-      expect(() => pipe.transform(<any>{})).toThrowError();
+      expect(() => pipe.transform({} as any)).toThrowError();
     });
   });
 
@@ -80,8 +90,18 @@ import {LowerCasePipe, TitleCasePipe, UpperCasePipe} from '@angular/common';
       expect(pipe.transform('éric')).toEqual('Éric');
     });
 
+    it('should map null to null', () => {
+      expect(pipe.transform(null)).toEqual(null);
+    });
+    it('should map undefined to null', () => {
+      expect(pipe.transform(undefined)).toEqual(null);
+    });
+
+    it('should not support numbers', () => {
+      expect(() => pipe.transform(0 as any)).toThrowError();
+    });
     it('should not support other objects', () => {
-      expect(() => pipe.transform(<any>{})).toThrowError();
+      expect(() => pipe.transform({} as any)).toThrowError();
     });
   });
 
@@ -101,8 +121,18 @@ import {LowerCasePipe, TitleCasePipe, UpperCasePipe} from '@angular/common';
       expect(pipe.transform('bar')).toEqual('BAR');
     });
 
+    it('should map null to null', () => {
+      expect(pipe.transform(null)).toEqual(null);
+    });
+    it('should map undefined to null', () => {
+      expect(pipe.transform(undefined)).toEqual(null);
+    });
+
+    it('should not support numbers', () => {
+      expect(() => pipe.transform(0 as any)).toThrowError();
+    });
     it('should not support other objects', () => {
-      expect(() => pipe.transform(<any>{})).toThrowError();
+      expect(() => pipe.transform({} as any)).toThrowError();
     });
   });
 }
diff --git a/packages/common/test/pipes/date_pipe_spec.ts b/packages/common/test/pipes/date_pipe_spec.ts
index ba532d5e25084..c054061188141 100644
--- a/packages/common/test/pipes/date_pipe_spec.ts
+++ b/packages/common/test/pipes/date_pipe_spec.ts
@@ -59,12 +59,20 @@ import {JitReflector} from '@angular/platform-browser-dynamic/src/compiler_refle
         expect(pipe.transform(Number.NaN)).toEqual(null);
       });
 
+      it('should return null for null', () => {
+        expect(pipe.transform(null)).toEqual(null);
+      });
+
+      it('should return null for undefined', () => {
+        expect(pipe.transform(undefined)).toEqual(null);
+      });
+
       it('should support ISO string without time', () => {
         expect(() => pipe.transform(isoStringWithoutTime)).not.toThrow();
       });
 
       it('should not support other objects', () => {
-        expect(() => pipe.transform({})).toThrowError(/InvalidPipeArgument/);
+        expect(() => pipe.transform({} as any)).toThrowError(/InvalidPipeArgument/);
       });
     });
 
@@ -85,6 +93,13 @@ import {JitReflector} from '@angular/platform-browser-dynamic/src/compiler_refle
            expect(pipe.transform('2012-12-30T00:00:00', 'w')).toEqual('1');
            expect(pipe.transform('2012-12-31T00:00:00', 'w')).toEqual('1');
          });
+
+
+      it('should round milliseconds down to the nearest millisecond', () => {
+        expect(pipe.transform('2020-08-01T23:59:59.999', 'yyyy-MM-dd')).toEqual('2020-08-01');
+        expect(pipe.transform('2020-08-01T23:59:59.9999', 'yyyy-MM-dd, h:mm:ss SSS'))
+            .toEqual('2020-08-01, 11:59:59 999');
+      });
     });
   });
 }
diff --git a/packages/common/test/pipes/i18n_plural_pipe_spec.ts b/packages/common/test/pipes/i18n_plural_pipe_spec.ts
index 0140768624127..19757f367d14c 100644
--- a/packages/common/test/pipes/i18n_plural_pipe_spec.ts
+++ b/packages/common/test/pipes/i18n_plural_pipe_spec.ts
@@ -54,12 +54,17 @@ import {JitReflector} from '@angular/platform-browser-dynamic/src/compiler_refle
       });
 
       it('should use "" if value is undefined', () => {
-        const val = pipe.transform(void (0) as any, mapping);
+        const val = pipe.transform(undefined, mapping);
+        expect(val).toEqual('');
+      });
+
+      it('should use "" if value is null', () => {
+        const val = pipe.transform(null, mapping);
         expect(val).toEqual('');
       });
 
       it('should not support bad arguments', () => {
-        expect(() => pipe.transform(0, <any>'hey')).toThrowError();
+        expect(() => pipe.transform(0, 'hey' as any)).toThrowError();
       });
     });
   });
diff --git a/packages/common/test/pipes/i18n_select_pipe_spec.ts b/packages/common/test/pipes/i18n_select_pipe_spec.ts
index e8f8c43c1f504..776c62131e4c0 100644
--- a/packages/common/test/pipes/i18n_select_pipe_spec.ts
+++ b/packages/common/test/pipes/i18n_select_pipe_spec.ts
@@ -40,7 +40,7 @@ import {JitReflector} from '@angular/platform-browser-dynamic/src/compiler_refle
       });
 
       it('should throw on bad arguments', () => {
-        expect(() => pipe.transform('male', <any>'hey')).toThrowError();
+        expect(() => pipe.transform('male', 'hey' as any)).toThrowError();
       });
     });
   });
diff --git a/packages/common/test/pipes/keyvalue_pipe_spec.ts b/packages/common/test/pipes/keyvalue_pipe_spec.ts
index b6741b284a085..2b9fb49533190 100644
--- a/packages/common/test/pipes/keyvalue_pipe_spec.ts
+++ b/packages/common/test/pipes/keyvalue_pipe_spec.ts
@@ -17,12 +17,12 @@ describe('KeyValuePipe', () => {
   });
   it('should return null when given undefined', () => {
     const pipe = new KeyValuePipe(defaultKeyValueDiffers);
-    expect(pipe.transform(undefined as any)).toEqual(null);
+    expect(pipe.transform(undefined)).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);
+    expect(pipe.transform(fn as any as null)).toEqual(null);
   });
   describe('object dictionary', () => {
     it('should return empty array of an empty dictionary', () => {
@@ -98,8 +98,9 @@ describe('KeyValuePipe', () => {
     });
     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([
+      const input =
+          [[2, 1], [1, 1], ['b', 1], [0, 1], [3, 1], ['a', 1]] as Array<[number | string, number]>;
+      expect(pipe.transform(new Map(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}
       ]);
diff --git a/packages/common/test/pipes/number_pipe_spec.ts b/packages/common/test/pipes/number_pipe_spec.ts
index f0210677a0beb..249cc57eeedb5 100644
--- a/packages/common/test/pipes/number_pipe_spec.ts
+++ b/packages/common/test/pipes/number_pipe_spec.ts
@@ -50,8 +50,20 @@ import {beforeEach, describe, expect, it} from '@angular/core/testing/src/testin
           expect(pipe.transform('1.1234')).toEqual('1.123');
         });
 
+        it('should return null for NaN', () => {
+          expect(pipe.transform(Number.NaN)).toEqual(null);
+        });
+
+        it('should return null for null', () => {
+          expect(pipe.transform(null)).toEqual(null);
+        });
+
+        it('should return null for undefined', () => {
+          expect(pipe.transform(undefined)).toEqual(null);
+        });
+
         it('should not support other objects', () => {
-          expect(() => pipe.transform({}))
+          expect(() => pipe.transform({} as any))
               .toThrowError(
                   `InvalidPipeArgument: '[object Object] is not a number' for pipe 'DecimalPipe'`);
           expect(() => pipe.transform('123abc'))
@@ -82,8 +94,20 @@ import {beforeEach, describe, expect, it} from '@angular/core/testing/src/testin
           expect(pipe.transform(12.3456, '0.0-10')).toEqual('1,234.56%');
         });
 
+        it('should return null for NaN', () => {
+          expect(pipe.transform(Number.NaN)).toEqual(null);
+        });
+
+        it('should return null for null', () => {
+          expect(pipe.transform(null)).toEqual(null);
+        });
+
+        it('should return null for undefined', () => {
+          expect(pipe.transform(undefined)).toEqual(null);
+        });
+
         it('should not support other objects', () => {
-          expect(() => pipe.transform({}))
+          expect(() => pipe.transform({} as any))
               .toThrowError(
                   `InvalidPipeArgument: '[object Object] is not a number' for pipe 'PercentPipe'`);
         });
@@ -125,8 +149,20 @@ import {beforeEach, describe, expect, it} from '@angular/core/testing/src/testin
           expect(pipe.transform(5.1234, 'USD', 'Custom name')).toEqual('Custom name5.12');
         });
 
+        it('should return null for NaN', () => {
+          expect(pipe.transform(Number.NaN)).toEqual(null);
+        });
+
+        it('should return null for null', () => {
+          expect(pipe.transform(null)).toEqual(null);
+        });
+
+        it('should return null for undefined', () => {
+          expect(pipe.transform(undefined)).toEqual(null);
+        });
+
         it('should not support other objects', () => {
-          expect(() => pipe.transform({}))
+          expect(() => pipe.transform({} as any))
               .toThrowError(
                   `InvalidPipeArgument: '[object Object] is not a number' for pipe 'CurrencyPipe'`);
         });
diff --git a/packages/common/test/pipes/slice_pipe_spec.ts b/packages/common/test/pipes/slice_pipe_spec.ts
index 1ab7398c4db9f..c0172e6278033 100644
--- a/packages/common/test/pipes/slice_pipe_spec.ts
+++ b/packages/common/test/pipes/slice_pipe_spec.ts
@@ -47,8 +47,8 @@ import {expect} from '@angular/platform-browser/testing/src/matchers';
         expect(pipe.transform(null, 1)).toBe(null);
       });
 
-      it('should return undefined if the value is undefined', () => {
-        expect(pipe.transform(undefined, 1)).toBe(undefined);
+      it('should return null if the value is undefined', () => {
+        expect(pipe.transform(undefined, 1)).toBe(null);
       });
 
       it('should return all items after START index when START is positive and END is omitted',
diff --git a/packages/common/test/viewport_scroller_spec.ts b/packages/common/test/viewport_scroller_spec.ts
index 510a24bad5b7f..006702e985038 100644
--- a/packages/common/test/viewport_scroller_spec.ts
+++ b/packages/common/test/viewport_scroller_spec.ts
@@ -15,21 +15,30 @@ describe('BrowserViewportScroller', () => {
   let windowSpy: any;
 
   beforeEach(() => {
-    windowSpy = jasmine.createSpyObj('window', ['history']);
-    windowSpy.scrollTo = 1;
+    windowSpy = jasmine.createSpyObj('window', ['history', 'scrollTo']);
     windowSpy.history.scrollRestoration = 'auto';
     documentSpy = jasmine.createSpyObj('document', ['getElementById', 'getElementsByName']);
     scroller = new BrowserViewportScroller(documentSpy, windowSpy, null!);
   });
 
   describe('setHistoryScrollRestoration', () => {
-    it('should not crash when scrollRestoration is not writable', () => {
+    function createNonWritableScrollRestoration() {
       Object.defineProperty(windowSpy.history, 'scrollRestoration', {
         value: 'auto',
         configurable: true,
       });
+    }
+
+    it('should not crash when scrollRestoration is not writable', () => {
+      createNonWritableScrollRestoration();
       expect(() => scroller.setHistoryScrollRestoration('manual')).not.toThrow();
     });
+
+    it('should still allow scrolling if scrollRestoration is not writable', () => {
+      createNonWritableScrollRestoration();
+      scroller.scrollToPosition([10, 10]);
+      expect(windowSpy.scrollTo as jasmine.Spy).toHaveBeenCalledWith(10, 10);
+    });
   });
 
   describe('scrollToAnchor', () => {
diff --git a/packages/common/upgrade/src/location_shim.ts b/packages/common/upgrade/src/location_shim.ts
index 781b1205d27ed..7c3c010365d97 100644
--- a/packages/common/upgrade/src/location_shim.ts
+++ b/packages/common/upgrade/src/location_shim.ts
@@ -689,7 +689,7 @@ export class $locationShim {
    *
    * This method is supported only in HTML5 mode and only in browsers supporting
    * the HTML5 History API methods such as `pushState` and `replaceState`. If you need to support
-   * older browsers (like IE9 or Android < 4.0), don't use this method.
+   * older browsers (like Android < 4.0), don't use this method.
    *
    */
   state(): unknown;
diff --git a/packages/common/upgrade/src/params.ts b/packages/common/upgrade/src/params.ts
index 51518ce8a2ed3..67b53b2c68353 100644
--- a/packages/common/upgrade/src/params.ts
+++ b/packages/common/upgrade/src/params.ts
@@ -309,10 +309,7 @@ function toKeyValue(obj: {[k: string]: unknown}) {
  * Logic from https://github.com/angular/angular.js/blob/864c7f0/src/Angular.js#L1437
  */
 function encodeUriSegment(val: string) {
-  return encodeUriQuery(val, true)
-      .replace(/%26/gi, '&')
-      .replace(/%3D/gi, '=')
-      .replace(/%2B/gi, '+');
+  return encodeUriQuery(val, true).replace(/%26/g, '&').replace(/%3D/gi, '=').replace(/%2B/gi, '+');
 }
 
 
@@ -331,7 +328,7 @@ function encodeUriSegment(val: string) {
  */
 function encodeUriQuery(val: string, pctEncodeSpaces: boolean = false) {
   return encodeURIComponent(val)
-      .replace(/%40/gi, '@')
+      .replace(/%40/g, '@')
       .replace(/%3A/gi, ':')
       .replace(/%24/g, '$')
       .replace(/%2C/gi, ',')
diff --git a/packages/compiler-cli/BUILD.bazel b/packages/compiler-cli/BUILD.bazel
index 27885e70af263..9942ad35b4bf6 100644
--- a/packages/compiler-cli/BUILD.bazel
+++ b/packages/compiler-cli/BUILD.bazel
@@ -1,7 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("//tools:defaults.bzl", "pkg_npm", "ts_api_guardian_test", "ts_library")
-load("@npm_bazel_typescript//:index.bzl", "ts_config")
+load("//tools:defaults.bzl", "pkg_npm", "ts_api_guardian_test", "ts_config", "ts_library")
 
 ts_config(
     name = "tsconfig",
@@ -32,6 +31,7 @@ ts_library(
         "//packages/compiler-cli/src/ngtsc/perf",
         "//packages/compiler-cli/src/ngtsc/reflection",
         "//packages/compiler-cli/src/ngtsc/shims",
+        "//packages/compiler-cli/src/ngtsc/translator",
         "//packages/compiler-cli/src/ngtsc/typecheck",
         "@npm//@bazel/typescript",
         "@npm//@types/node",
diff --git a/packages/compiler-cli/integrationtest/BUILD.bazel b/packages/compiler-cli/integrationtest/BUILD.bazel
index 187cc2958bb4a..90f5766c14103 100644
--- a/packages/compiler-cli/integrationtest/BUILD.bazel
+++ b/packages/compiler-cli/integrationtest/BUILD.bazel
@@ -62,5 +62,10 @@ nodejs_test(
         "//packages/router:npm_package",
     ] + glob(["**/*"]),
     entry_point = "test.js",
-    tags = ["no-ivy-aot"],
+    tags = [
+        # TODO(josephperrott): reenable or remove test after investigating the cause of failures
+        # on windows CI runs.
+        "manual",
+        "no-ivy-aot",
+    ],
 )
diff --git a/packages/compiler-cli/linker/BUILD.bazel b/packages/compiler-cli/linker/BUILD.bazel
new file mode 100644
index 0000000000000..0c9fb1309d469
--- /dev/null
+++ b/packages/compiler-cli/linker/BUILD.bazel
@@ -0,0 +1,15 @@
+load("//tools:defaults.bzl", "ts_library")
+
+package(default_visibility = ["//visibility:public"])
+
+ts_library(
+    name = "linker",
+    srcs = ["index.ts"] + glob([
+        "src/**/*.ts",
+    ]),
+    deps = [
+        "//packages/compiler",
+        "//packages/compiler-cli/src/ngtsc/translator",
+        "@npm//typescript",
+    ],
+)
diff --git a/packages/compiler-cli/linker/README.md b/packages/compiler-cli/linker/README.md
new file mode 100644
index 0000000000000..d063084c3b3f3
--- /dev/null
+++ b/packages/compiler-cli/linker/README.md
@@ -0,0 +1,18 @@
+# Angular Linker
+
+This package contains a `FileLinker` and supporting code to be able to "link" partial declarations of components, directives, etc in libraries to produce the full definitions.
+
+The partial declaration format allows library packages to be published to npm without exposing the underlying Ivy instructions.
+
+The tooling here allows application build tools (e.g. CLI) to produce fully compiled components, directives, etc at the point when the application is bundled.
+These linked files can be cached outside `node_modules` so it does not suffer from problems of mutating packages in `node_modules`.
+
+Generally this tooling will be wrapped in a transpiler specific plugin, such as the provided [Babel plugin](./babel).
+
+## Unit Testing
+
+The unit tests are built and run using Bazel:
+
+```bash
+yarn bazel test //packages/compiler-cli/linker/test
+```
diff --git a/packages/compiler-cli/linker/babel/BUILD.bazel b/packages/compiler-cli/linker/babel/BUILD.bazel
new file mode 100644
index 0000000000000..b5a15beef37b3
--- /dev/null
+++ b/packages/compiler-cli/linker/babel/BUILD.bazel
@@ -0,0 +1,19 @@
+load("//tools:defaults.bzl", "ts_library")
+
+package(default_visibility = ["//visibility:public"])
+
+ts_library(
+    name = "babel",
+    srcs = ["index.ts"] + glob([
+        "src/**/*.ts",
+    ]),
+    deps = [
+        "//packages/compiler",
+        "//packages/compiler-cli/linker",
+        "//packages/compiler-cli/src/ngtsc/translator",
+        "@npm//@babel/core",
+        "@npm//@babel/types",
+        "@npm//@types/babel__core",
+        "@npm//@types/babel__traverse",
+    ],
+)
diff --git a/packages/compiler-cli/linker/babel/README.md b/packages/compiler-cli/linker/babel/README.md
new file mode 100644
index 0000000000000..374cc55d078cf
--- /dev/null
+++ b/packages/compiler-cli/linker/babel/README.md
@@ -0,0 +1,12 @@
+# Angular linker - Babel plugin
+
+This package contains a Babel plugin that can be used to find and link partially compiled declarations in library source code.
+See the [linker package README](../README.md) for more information.
+
+## Unit Testing
+
+The unit tests are built and run using Bazel:
+
+```bash
+yarn bazel test //packages/compiler-cli/linker/babel/test
+```
diff --git a/modules/playground/src/web_workers/animations/index.ts b/packages/compiler-cli/linker/babel/index.ts
similarity index 67%
rename from modules/playground/src/web_workers/animations/index.ts
rename to packages/compiler-cli/linker/babel/index.ts
index f3791aca9123d..cf9450bf4bfaa 100644
--- a/modules/playground/src/web_workers/animations/index.ts
+++ b/packages/compiler-cli/linker/babel/index.ts
@@ -5,7 +5,4 @@
  * 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 {bootstrapWorkerUi} from '@angular/platform-webworker';
-
-bootstrapWorkerUi('loader.js');
+export {createEs2015LinkerPlugin} from './src/es2015_linker_plugin';
\ No newline at end of file
diff --git a/packages/compiler-cli/linker/babel/src/ast/babel_ast_factory.ts b/packages/compiler-cli/linker/babel/src/ast/babel_ast_factory.ts
new file mode 100644
index 0000000000000..811f8a9bac091
--- /dev/null
+++ b/packages/compiler-cli/linker/babel/src/ast/babel_ast_factory.ts
@@ -0,0 +1,164 @@
+/**
+ * @license
+ * Copyright Google LLC 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 t from '@babel/types';
+
+import {assert} from '../../../../linker';
+import {AstFactory, BinaryOperator, LeadingComment, ObjectLiteralProperty, SourceMapRange, TemplateLiteral, VariableDeclarationType} from '../../../../src/ngtsc/translator';
+
+/**
+ * A Babel flavored implementation of the AstFactory.
+ */
+export class BabelAstFactory implements AstFactory<t.Statement, t.Expression> {
+  attachComments(statement: t.Statement, leadingComments: LeadingComment[]): void {
+    // We must process the comments in reverse because `t.addComment()` will add new ones in front.
+    for (let i = leadingComments.length - 1; i >= 0; i--) {
+      const comment = leadingComments[i];
+      t.addComment(statement, 'leading', comment.toString(), !comment.multiline);
+    }
+  }
+
+  createArrayLiteral = t.arrayExpression;
+
+  createAssignment(target: t.Expression, value: t.Expression): t.Expression {
+    assert(target, isLExpression, 'must be a left hand side expression');
+    return t.assignmentExpression('=', target, value);
+  }
+
+  createBinaryExpression(
+      leftOperand: t.Expression, operator: BinaryOperator,
+      rightOperand: t.Expression): t.Expression {
+    switch (operator) {
+      case '&&':
+      case '||':
+        return t.logicalExpression(operator, leftOperand, rightOperand);
+      default:
+        return t.binaryExpression(operator, leftOperand, rightOperand);
+    }
+  }
+
+  createBlock = t.blockStatement;
+
+  createCallExpression(callee: t.Expression, args: t.Expression[], pure: boolean): t.Expression {
+    const call = t.callExpression(callee, args);
+    if (pure) {
+      t.addComment(call, 'leading', ' @__PURE__ ', /* line */ false);
+    }
+    return call;
+  }
+
+  createConditional = t.conditionalExpression;
+
+  createElementAccess(expression: t.Expression, element: t.Expression): t.Expression {
+    return t.memberExpression(expression, element, /* computed */ true);
+  }
+
+  createExpressionStatement = t.expressionStatement;
+
+  createFunctionDeclaration(functionName: string, parameters: string[], body: t.Statement):
+      t.Statement {
+    assert(body, t.isBlockStatement, 'a block');
+    return t.functionDeclaration(
+        t.identifier(functionName), parameters.map(param => t.identifier(param)), body);
+  }
+
+  createFunctionExpression(functionName: string|null, parameters: string[], body: t.Statement):
+      t.Expression {
+    assert(body, t.isBlockStatement, 'a block');
+    const name = functionName !== null ? t.identifier(functionName) : null;
+    return t.functionExpression(name, parameters.map(param => t.identifier(param)), body);
+  }
+
+  createIdentifier = t.identifier;
+
+  createIfStatement = t.ifStatement;
+
+  createLiteral(value: string|number|boolean|null|undefined): t.Expression {
+    if (typeof value === 'string') {
+      return t.stringLiteral(value);
+    } else if (typeof value === 'number') {
+      return t.numericLiteral(value);
+    } else if (typeof value === 'boolean') {
+      return t.booleanLiteral(value);
+    } else if (value === undefined) {
+      return t.identifier('undefined');
+    } else if (value === null) {
+      return t.nullLiteral();
+    } else {
+      throw new Error(`Invalid literal: ${value} (${typeof value})`);
+    }
+  }
+
+  createNewExpression = t.newExpression;
+
+  createObjectLiteral(properties: ObjectLiteralProperty<t.Expression>[]): t.Expression {
+    return t.objectExpression(properties.map(prop => {
+      const key =
+          prop.quoted ? t.stringLiteral(prop.propertyName) : t.identifier(prop.propertyName);
+      return t.objectProperty(key, prop.value);
+    }));
+  }
+
+  createParenthesizedExpression = t.parenthesizedExpression;
+
+  createPropertyAccess(expression: t.Expression, propertyName: string): t.Expression {
+    return t.memberExpression(expression, t.identifier(propertyName), /* computed */ false);
+  }
+
+  createReturnStatement = t.returnStatement;
+
+  createTaggedTemplate(tag: t.Expression, template: TemplateLiteral<t.Expression>): t.Expression {
+    const elements = template.elements.map(
+        (element, i) => this.setSourceMapRange(
+            t.templateElement(element, i === template.elements.length - 1), element.range));
+    return t.taggedTemplateExpression(tag, t.templateLiteral(elements, template.expressions));
+  }
+
+  createThrowStatement = t.throwStatement;
+
+  createTypeOfExpression(expression: t.Expression): t.Expression {
+    return t.unaryExpression('typeof', expression);
+  }
+
+  createUnaryExpression = t.unaryExpression;
+
+  createVariableDeclaration(
+      variableName: string, initializer: t.Expression|null,
+      type: VariableDeclarationType): t.Statement {
+    return t.variableDeclaration(
+        type, [t.variableDeclarator(t.identifier(variableName), initializer)]);
+  }
+
+  setSourceMapRange<T extends t.Statement|t.Expression|t.TemplateElement>(
+      node: T, sourceMapRange: SourceMapRange|null): T {
+    if (sourceMapRange === null) {
+      return node;
+    }
+    // Note that the linker only works on a single file at a time, so there is no need to track the
+    // filename. Babel will just use the current filename in the source-map.
+    node.loc = {
+      start: {
+        line: sourceMapRange.start.line + 1,  // lines are 1-based in Babel.
+        column: sourceMapRange.start.column,
+      },
+      end: {
+        line: sourceMapRange.end.line + 1,  // lines are 1-based in Babel.
+        column: sourceMapRange.end.column,
+      },
+    };
+    node.start = sourceMapRange.start.offset;
+    node.end = sourceMapRange.end.offset;
+
+    return node;
+  }
+}
+
+function isLExpression(expr: t.Expression): expr is Extract<t.LVal, t.Expression> {
+  // Some LVal types are not expressions, which prevents us from using `t.isLVal()`
+  // directly with `assert()`.
+  return t.isLVal(expr);
+}
diff --git a/packages/compiler-cli/linker/babel/src/ast/babel_ast_host.ts b/packages/compiler-cli/linker/babel/src/ast/babel_ast_host.ts
new file mode 100644
index 0000000000000..4e826d80281b8
--- /dev/null
+++ b/packages/compiler-cli/linker/babel/src/ast/babel_ast_host.ts
@@ -0,0 +1,140 @@
+/**
+ * @license
+ * Copyright Google LLC 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 t from '@babel/types';
+
+import {assert, AstHost, FatalLinkerError, Range} from '../../../../linker';
+
+/**
+ * This implementation of `AstHost` is able to get information from Babel AST nodes.
+ */
+export class BabelAstHost implements AstHost<t.Expression> {
+  getSymbolName(node: t.Expression): string|null {
+    if (t.isIdentifier(node)) {
+      return node.name;
+    } else if (t.isMemberExpression(node) && t.isIdentifier(node.property)) {
+      return node.property.name;
+    } else {
+      return null;
+    }
+  }
+
+  isStringLiteral = t.isStringLiteral;
+
+  parseStringLiteral(str: t.Expression): string {
+    assert(str, t.isStringLiteral, 'a string literal');
+    return str.value;
+  }
+
+  isNumericLiteral = t.isNumericLiteral;
+
+  parseNumericLiteral(num: t.Expression): number {
+    assert(num, t.isNumericLiteral, 'a numeric literal');
+    return num.value;
+  }
+
+  isBooleanLiteral = t.isBooleanLiteral;
+
+  parseBooleanLiteral(bool: t.Expression): boolean {
+    assert(bool, t.isBooleanLiteral, 'a boolean literal');
+    return bool.value;
+  }
+
+  isArrayLiteral = t.isArrayExpression;
+
+  parseArrayLiteral(array: t.Expression): t.Expression[] {
+    assert(array, t.isArrayExpression, 'an array literal');
+    return array.elements.map(element => {
+      assert(element, isNotEmptyElement, 'element in array not to be empty');
+      assert(element, isNotSpreadElement, 'element in array not to use spread syntax');
+      return element;
+    });
+  }
+
+  isObjectLiteral = t.isObjectExpression;
+
+  parseObjectLiteral(obj: t.Expression): Map<string, t.Expression> {
+    assert(obj, t.isObjectExpression, 'an object literal');
+
+    const result = new Map<string, t.Expression>();
+    for (const property of obj.properties) {
+      assert(property, t.isObjectProperty, 'a property assignment');
+      assert(property.value, t.isExpression, 'an expression');
+      assert(property.key, isPropertyName, 'a property name');
+      const key = t.isIdentifier(property.key) ? property.key.name : property.key.value;
+      result.set(key, property.value);
+    }
+    return result;
+  }
+
+  isFunctionExpression(node: t.Expression): node is Extract<t.Function, t.Expression> {
+    return t.isFunction(node);
+  }
+
+  parseReturnValue(fn: t.Expression): t.Expression {
+    assert(fn, this.isFunctionExpression, 'a function');
+    if (!t.isBlockStatement(fn.body)) {
+      // it is a simple array function expression: `(...) => expr`
+      return fn.body;
+    }
+
+    // it is a function (arrow or normal) with a body. E.g.:
+    // * `(...) => { stmt; ... }`
+    // * `function(...) { stmt; ... }`
+
+    if (fn.body.body.length !== 1) {
+      throw new FatalLinkerError(
+          fn.body, 'Unsupported syntax, expected a function body with a single return statement.');
+    }
+    const stmt = fn.body.body[0];
+    assert(stmt, t.isReturnStatement, 'a function body with a single return statement');
+    if (stmt.argument === null) {
+      throw new FatalLinkerError(stmt, 'Unsupported syntax, expected function to return a value.');
+    }
+
+    return stmt.argument;
+  }
+
+  getRange(node: t.Expression): Range {
+    if (node.loc == null || node.start === null || node.end === null) {
+      throw new FatalLinkerError(
+          node, 'Unable to read range for node - it is missing location information.');
+    }
+    return {
+      startLine: node.loc.start.line - 1,  // Babel lines are 1-based
+      startCol: node.loc.start.column,
+      startPos: node.start,
+      endPos: node.end,
+    };
+  }
+}
+
+/**
+ * Return true if the expression does not represent an empty element in an array literal.
+ * For example in `[,foo]` the first element is "empty".
+ */
+function isNotEmptyElement(e: t.Expression|t.SpreadElement|null): e is t.Expression|
+    t.SpreadElement {
+  return e !== null;
+}
+
+/**
+ * Return true if the expression is not a spread element of an array literal.
+ * For example in `[x, ...rest]` the `...rest` expression is a spread element.
+ */
+function isNotSpreadElement(e: t.Expression|t.SpreadElement): e is t.Expression {
+  return !t.isSpreadElement(e);
+}
+
+
+/**
+ * Return true if the expression can be considered a text based property name.
+ */
+function isPropertyName(e: t.Expression): e is t.Identifier|t.StringLiteral|t.NumericLiteral {
+  return t.isIdentifier(e) || t.isStringLiteral(e) || t.isNumericLiteral(e);
+}
diff --git a/packages/compiler-cli/linker/babel/src/babel_declaration_scope.ts b/packages/compiler-cli/linker/babel/src/babel_declaration_scope.ts
new file mode 100644
index 0000000000000..5eb9d0cee31e4
--- /dev/null
+++ b/packages/compiler-cli/linker/babel/src/babel_declaration_scope.ts
@@ -0,0 +1,67 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {NodePath, Scope} from '@babel/traverse';
+import * as t from '@babel/types';
+
+import {DeclarationScope} from '../../../linker';
+
+export type ConstantScopePath = NodePath<t.Function|t.Program>;
+
+/**
+ * This class represents the lexical scope of a partial declaration in Babel source code.
+ *
+ * Its only responsibility is to compute a reference object for the scope of shared constant
+ * statements that will be generated during partial linking.
+ */
+export class BabelDeclarationScope implements DeclarationScope<ConstantScopePath, t.Expression> {
+  /**
+   * Construct a new `BabelDeclarationScope`.
+   *
+   * @param declarationScope the Babel scope containing the declaration call expression.
+   */
+  constructor(private declarationScope: Scope) {}
+
+  /**
+   * Compute the Babel `NodePath` that can be used to reference the lexical scope where any
+   * shared constant statements would be inserted.
+   *
+   * There will only be a shared constant scope if the expression is in an ECMAScript module, or a
+   * UMD module. Otherwise `null` is returned to indicate that constant statements must be emitted
+   * locally to the generated linked definition, to avoid polluting the global scope.
+   *
+   * @param expression the expression that points to the Angular core framework import.
+   */
+  getConstantScopeRef(expression: t.Expression): ConstantScopePath|null {
+    // If the expression is of the form `a.b.c` then we want to get the far LHS (e.g. `a`).
+    let bindingExpression = expression;
+    while (t.isMemberExpression(bindingExpression)) {
+      bindingExpression = bindingExpression.object;
+    }
+
+    if (!t.isIdentifier(bindingExpression)) {
+      return null;
+    }
+
+    // The binding of the expression is where this identifier was declared.
+    // This could be a variable declaration, an import namespace or a function parameter.
+    const binding = this.declarationScope.getBinding(bindingExpression.name);
+    if (binding === undefined) {
+      return null;
+    }
+
+    // We only support shared constant statements if the binding was in a UMD module (i.e. declared
+    // within a `t.Function`) or an ECMASCript module (i.e. declared at the top level of a
+    // `t.Program` that is marked as a module).
+    const path = binding.scope.path;
+    if (!path.isFunctionParent() && !(path.isProgram() && path.node.sourceType === 'module')) {
+      return null;
+    }
+
+    return path;
+  }
+}
diff --git a/packages/compiler-cli/linker/babel/src/es2015_linker_plugin.ts b/packages/compiler-cli/linker/babel/src/es2015_linker_plugin.ts
new file mode 100644
index 0000000000000..b13be8e4073fc
--- /dev/null
+++ b/packages/compiler-cli/linker/babel/src/es2015_linker_plugin.ts
@@ -0,0 +1,167 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {PluginObj} from '@babel/core';
+import {NodePath} from '@babel/traverse';
+import * as t from '@babel/types';
+
+import {FileLinker, isFatalLinkerError, LinkerEnvironment, LinkerOptions} from '../../../linker';
+
+import {BabelAstFactory} from './ast/babel_ast_factory';
+import {BabelAstHost} from './ast/babel_ast_host';
+import {BabelDeclarationScope, ConstantScopePath} from './babel_declaration_scope';
+
+/**
+ * Create a Babel plugin that visits the program, identifying and linking partial declarations.
+ *
+ * The plugin delegates most of its work to a generic `FileLinker` for each file (`t.Program` in
+ * Babel) that is visited.
+ */
+export function createEs2015LinkerPlugin(options: Partial<LinkerOptions> = {}): PluginObj {
+  let fileLinker: FileLinker<ConstantScopePath, t.Statement, t.Expression>|null = null;
+
+  const linkerEnvironment = LinkerEnvironment.create<t.Statement, t.Expression>(
+      new BabelAstHost(), new BabelAstFactory(), options);
+
+  return {
+    visitor: {
+      Program: {
+
+        /**
+         * Create a new `FileLinker` as we enter each file (`t.Program` in Babel).
+         */
+        enter(path: NodePath<t.Program>): void {
+          assertNull(fileLinker);
+          const file: BabelFile = path.hub.file;
+          fileLinker = new FileLinker(linkerEnvironment, file.opts.filename ?? '', file.code);
+        },
+
+        /**
+         * On exiting the file, insert any shared constant statements that were generated during
+         * linking of the partial declarations.
+         */
+        exit(): void {
+          assertNotNull(fileLinker);
+          for (const {constantScope, statements} of fileLinker.getConstantStatements()) {
+            insertStatements(constantScope, statements);
+          }
+          fileLinker = null;
+        }
+      },
+
+      /**
+       * Test each call expression to see if it is a partial declaration; it if is then replace it
+       * with the results of linking the declaration.
+       */
+      CallExpression(call: NodePath<t.CallExpression>): void {
+        try {
+          assertNotNull(fileLinker);
+
+          const callee = call.node.callee;
+          if (!t.isExpression(callee)) {
+            return;
+          }
+          const calleeName = linkerEnvironment.host.getSymbolName(callee);
+          if (calleeName === null) {
+            return;
+          }
+          const args = call.node.arguments;
+          if (!fileLinker.isPartialDeclaration(calleeName) || !isExpressionArray(args)) {
+            return;
+          }
+
+          const declarationScope = new BabelDeclarationScope(call.scope);
+          const replacement = fileLinker.linkPartialDeclaration(calleeName, args, declarationScope);
+
+          call.replaceWith(replacement);
+        } catch (e) {
+          const node = isFatalLinkerError(e) ? e.node as t.Node : call.node;
+          throw buildCodeFrameError(call.hub.file, e.message, node);
+        }
+      }
+    }
+  };
+}
+
+/**
+ * Insert the `statements` at the location defined by `path`.
+ *
+ * The actual insertion strategy depends upon the type of the `path`.
+ */
+function insertStatements(path: ConstantScopePath, statements: t.Statement[]): void {
+  if (path.isFunction()) {
+    insertIntoFunction(path, statements);
+  } else if (path.isProgram()) {
+    insertIntoProgram(path, statements);
+  }
+}
+
+/**
+ * Insert the `statements` at the top of the body of the `fn` function.
+ */
+function insertIntoFunction(fn: NodePath<t.Function>, statements: t.Statement[]): void {
+  const body = fn.get('body');
+  body.unshiftContainer('body', statements);
+}
+
+/**
+ * Insert the `statements` at the top of the `program`, below any import statements.
+ */
+function insertIntoProgram(program: NodePath<t.Program>, statements: t.Statement[]): void {
+  const body = program.get('body');
+  const importStatements = body.filter(statement => statement.isImportDeclaration());
+  if (importStatements.length === 0) {
+    program.unshiftContainer('body', statements);
+  } else {
+    importStatements[importStatements.length - 1].insertAfter(statements);
+  }
+}
+
+/**
+ * Return true if all the `nodes` are Babel expressions.
+ */
+function isExpressionArray(nodes: t.Node[]): nodes is t.Expression[] {
+  return nodes.every(node => t.isExpression(node));
+}
+
+/**
+ * Assert that the given `obj` is `null`.
+ */
+function assertNull<T>(obj: T|null): asserts obj is null {
+  if (obj !== null) {
+    throw new Error('BUG - expected `obj` to be null');
+  }
+}
+
+/**
+ * Assert that the given `obj` is not `null`.
+ */
+function assertNotNull<T>(obj: T|null): asserts obj is T {
+  if (obj === null) {
+    throw new Error('BUG - expected `obj` not to be null');
+  }
+}
+
+/**
+ * Create a string representation of an error that includes the code frame of the `node`.
+ */
+function buildCodeFrameError(file: BabelFile, message: string, node: t.Node): string {
+  const filename = file.opts.filename || '(unknown file)';
+  const error = file.buildCodeFrameError(node, message);
+  return `${filename}: ${error.message}`;
+}
+
+/**
+ * This interface is making up for the fact that the Babel typings for `NodePath.hub.file` are
+ * lacking.
+ */
+interface BabelFile {
+  code: string;
+  opts: {filename?: string;};
+
+  buildCodeFrameError(node: t.Node, message: string): Error;
+}
diff --git a/packages/compiler-cli/linker/babel/test/BUILD.bazel b/packages/compiler-cli/linker/babel/test/BUILD.bazel
new file mode 100644
index 0000000000000..f2a426de889f1
--- /dev/null
+++ b/packages/compiler-cli/linker/babel/test/BUILD.bazel
@@ -0,0 +1,36 @@
+load("//tools:defaults.bzl", "jasmine_node_test", "ts_library")
+
+package(default_visibility = ["//visibility:public"])
+
+ts_library(
+    name = "test_lib",
+    testonly = True,
+    srcs = glob([
+        "**/*.ts",
+    ]),
+    deps = [
+        "//packages:types",
+        "//packages/compiler",
+        "//packages/compiler-cli/linker",
+        "//packages/compiler-cli/linker/babel",
+        "//packages/compiler-cli/src/ngtsc/translator",
+        "@npm//@babel/core",
+        "@npm//@babel/generator",
+        "@npm//@babel/parser",
+        "@npm//@babel/template",
+        "@npm//@babel/traverse",
+        "@npm//@babel/types",
+        "@npm//@types/babel__core",
+        "@npm//@types/babel__generator",
+        "@npm//@types/babel__template",
+        "@npm//@types/babel__traverse",
+    ],
+)
+
+jasmine_node_test(
+    name = "test",
+    bootstrap = ["//tools/testing:node_no_angular_es5"],
+    deps = [
+        ":test_lib",
+    ],
+)
diff --git a/packages/compiler-cli/linker/babel/test/ast/babel_ast_factory_spec.ts b/packages/compiler-cli/linker/babel/test/ast/babel_ast_factory_spec.ts
new file mode 100644
index 0000000000000..c1f874d7f6fec
--- /dev/null
+++ b/packages/compiler-cli/linker/babel/test/ast/babel_ast_factory_spec.ts
@@ -0,0 +1,382 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {leadingComment} from '@angular/compiler';
+import generate from '@babel/generator';
+import {expression, statement} from '@babel/template';
+import * as t from '@babel/types';
+
+import {BabelAstFactory} from '../../src/ast/babel_ast_factory';
+
+describe('BabelAstFactory', () => {
+  let factory: BabelAstFactory;
+  beforeEach(() => factory = new BabelAstFactory());
+
+  describe('attachComments()', () => {
+    it('should add the comments to the given statement', () => {
+      const stmt = statement.ast`x = 10;`;
+      factory.attachComments(
+          stmt, [leadingComment('comment 1', true), leadingComment('comment 2', false)]);
+
+      expect(generate(stmt).code).toEqual([
+        '/* comment 1 */',
+        '//comment 2',
+        'x = 10;',
+      ].join('\n'));
+    });
+  });
+
+  describe('createArrayLiteral()', () => {
+    it('should create an array node containing the provided expressions', () => {
+      const expr1 = expression.ast`42`;
+      const expr2 = expression.ast`"moo"`;
+
+      const array = factory.createArrayLiteral([expr1, expr2]);
+      expect(generate(array).code).toEqual('[42, "moo"]');
+    });
+  });
+
+  describe('createAssignment()', () => {
+    it('should create an assignment node using the target and value expressions', () => {
+      const target = expression.ast`x`;
+      const value = expression.ast`42`;
+      const assignment = factory.createAssignment(target, value);
+      expect(generate(assignment).code).toEqual('x = 42');
+    });
+  });
+
+  describe('createBinaryExpression()', () => {
+    it('should create a binary operation node using the left and right expressions', () => {
+      const left = expression.ast`17`;
+      const right = expression.ast`42`;
+      const expr = factory.createBinaryExpression(left, '+', right);
+      expect(generate(expr).code).toEqual('17 + 42');
+    });
+
+    it('should create a binary operation node for logical operators', () => {
+      const left = expression.ast`17`;
+      const right = expression.ast`42`;
+      const expr = factory.createBinaryExpression(left, '&&', right);
+      expect(t.isLogicalExpression(expr)).toBe(true);
+      expect(generate(expr).code).toEqual('17 && 42');
+    });
+  });
+
+  describe('createBlock()', () => {
+    it('should create a block statement containing the given statements', () => {
+      const stmt1 = statement.ast`x = 10`;
+      const stmt2 = statement.ast`y = 20`;
+      const block = factory.createBlock([stmt1, stmt2]);
+      expect(generate(block).code).toEqual([
+        '{',
+        '  x = 10;',
+        '  y = 20;',
+        '}',
+      ].join('\n'));
+    });
+  });
+
+  describe('createCallExpression()', () => {
+    it('should create a call on the `callee` with the given `args`', () => {
+      const callee = expression.ast`foo`;
+      const arg1 = expression.ast`42`;
+      const arg2 = expression.ast`"moo"`;
+      const call = factory.createCallExpression(callee, [arg1, arg2], false);
+      expect(generate(call).code).toEqual('foo(42, "moo")');
+    });
+
+    it('should create a call marked with a PURE comment if `pure` is true', () => {
+      const callee = expression.ast`foo`;
+      const arg1 = expression.ast`42`;
+      const arg2 = expression.ast`"moo"`;
+      const call = factory.createCallExpression(callee, [arg1, arg2], true);
+      expect(generate(call).code).toEqual(['/* @__PURE__ */', 'foo(42, "moo")'].join('\n'));
+    });
+  });
+
+  describe('createConditional()', () => {
+    it('should create a condition expression', () => {
+      const test = expression.ast`!test`;
+      const thenExpr = expression.ast`42`;
+      const elseExpr = expression.ast`"moo"`;
+      const conditional = factory.createConditional(test, thenExpr, elseExpr);
+      expect(generate(conditional).code).toEqual('!test ? 42 : "moo"');
+    });
+  });
+
+  describe('createElementAccess()', () => {
+    it('should create an expression accessing the element of an array/object', () => {
+      const expr = expression.ast`obj`;
+      const element = expression.ast`"moo"`;
+      const access = factory.createElementAccess(expr, element);
+      expect(generate(access).code).toEqual('obj["moo"]');
+    });
+  });
+
+  describe('createExpressionStatement()', () => {
+    it('should create a statement node from the given expression', () => {
+      const expr = expression.ast`x = 10`;
+      const stmt = factory.createExpressionStatement(expr);
+      expect(t.isStatement(stmt)).toBe(true);
+      expect(generate(stmt).code).toEqual('x = 10;');
+    });
+  });
+
+  describe('createFunctionDeclaration()', () => {
+    it('should create a function declaration node with the given name, parameters and body statements',
+       () => {
+         const stmts = statement.ast`{x = 10; y = 20;}`;
+         const fn = factory.createFunctionDeclaration('foo', ['arg1', 'arg2'], stmts);
+         expect(generate(fn).code).toEqual([
+           'function foo(arg1, arg2) {',
+           '  x = 10;',
+           '  y = 20;',
+           '}',
+         ].join('\n'));
+       });
+  });
+
+  describe('createFunctionExpression()', () => {
+    it('should create a function expression node with the given name, parameters and body statements',
+       () => {
+         const stmts = statement.ast`{x = 10; y = 20;}`;
+         const fn = factory.createFunctionExpression('foo', ['arg1', 'arg2'], stmts);
+         expect(t.isStatement(fn)).toBe(false);
+         expect(generate(fn).code).toEqual([
+           'function foo(arg1, arg2) {',
+           '  x = 10;',
+           '  y = 20;',
+           '}',
+         ].join('\n'));
+       });
+
+    it('should create an anonymous function expression node if the name is null', () => {
+      const stmts = statement.ast`{x = 10; y = 20;}`;
+      const fn = factory.createFunctionExpression(null, ['arg1', 'arg2'], stmts);
+      expect(generate(fn).code).toEqual([
+        'function (arg1, arg2) {',
+        '  x = 10;',
+        '  y = 20;',
+        '}',
+      ].join('\n'));
+    });
+  });
+
+  describe('createIdentifier()', () => {
+    it('should create an identifier with the given name', () => {
+      const id = factory.createIdentifier('someId') as t.Identifier;
+      expect(t.isIdentifier(id)).toBe(true);
+      expect(id.name).toEqual('someId');
+    });
+  });
+
+  describe('createIfStatement()', () => {
+    it('should create an if-else statement', () => {
+      const test = expression.ast`!test`;
+      const thenStmt = statement.ast`x = 10;`;
+      const elseStmt = statement.ast`x = 42;`;
+      const ifStmt = factory.createIfStatement(test, thenStmt, elseStmt);
+      expect(generate(ifStmt).code).toEqual('if (!test) x = 10;else x = 42;');
+    });
+
+    it('should create an if statement if the else expression is null', () => {
+      const test = expression.ast`!test`;
+      const thenStmt = statement.ast`x = 10;`;
+      const ifStmt = factory.createIfStatement(test, thenStmt, null);
+      expect(generate(ifStmt).code).toEqual('if (!test) x = 10;');
+    });
+  });
+
+  describe('createLiteral()', () => {
+    it('should create a string literal', () => {
+      const literal = factory.createLiteral('moo');
+      expect(t.isStringLiteral(literal)).toBe(true);
+      expect(generate(literal).code).toEqual('"moo"');
+    });
+
+    it('should create a number literal', () => {
+      const literal = factory.createLiteral(42);
+      expect(t.isNumericLiteral(literal)).toBe(true);
+      expect(generate(literal).code).toEqual('42');
+    });
+
+    it('should create a number literal for `NaN`', () => {
+      const literal = factory.createLiteral(NaN);
+      expect(t.isNumericLiteral(literal)).toBe(true);
+      expect(generate(literal).code).toEqual('NaN');
+    });
+
+    it('should create a boolean literal', () => {
+      const literal = factory.createLiteral(true);
+      expect(t.isBooleanLiteral(literal)).toBe(true);
+      expect(generate(literal).code).toEqual('true');
+    });
+
+    it('should create an `undefined` literal', () => {
+      const literal = factory.createLiteral(undefined);
+      expect(t.isIdentifier(literal)).toBe(true);
+      expect(generate(literal).code).toEqual('undefined');
+    });
+
+    it('should create a null literal', () => {
+      const literal = factory.createLiteral(null);
+      expect(t.isNullLiteral(literal)).toBe(true);
+      expect(generate(literal).code).toEqual('null');
+    });
+  });
+
+  describe('createNewExpression()', () => {
+    it('should create a `new` operation on the constructor `expression` with the given `args`',
+       () => {
+         const expr = expression.ast`Foo`;
+         const arg1 = expression.ast`42`;
+         const arg2 = expression.ast`"moo"`;
+         const call = factory.createNewExpression(expr, [arg1, arg2]);
+         expect(generate(call).code).toEqual('new Foo(42, "moo")');
+       });
+  });
+
+  describe('createObjectLiteral()', () => {
+    it('should create an object literal node, with the given properties', () => {
+      const prop1 = expression.ast`42`;
+      const prop2 = expression.ast`"moo"`;
+      const obj = factory.createObjectLiteral([
+        {propertyName: 'prop1', value: prop1, quoted: false},
+        {propertyName: 'prop2', value: prop2, quoted: true},
+      ]);
+      expect(generate(obj).code).toEqual([
+        '{',
+        '  prop1: 42,',
+        '  "prop2": "moo"',
+        '}',
+      ].join('\n'));
+    });
+  });
+
+  describe('createParenthesizedExpression()', () => {
+    it('should add parentheses around the given expression', () => {
+      const expr = expression.ast`a + b`;
+      const paren = factory.createParenthesizedExpression(expr);
+      expect(generate(paren).code).toEqual('(a + b)');
+    });
+  });
+
+  describe('createPropertyAccess()', () => {
+    it('should create a property access expression node', () => {
+      const expr = expression.ast`obj`;
+      const access = factory.createPropertyAccess(expr, 'moo');
+      expect(generate(access).code).toEqual('obj.moo');
+    });
+  });
+
+  describe('createReturnStatement()', () => {
+    it('should create a return statement returning the given expression', () => {
+      const expr = expression.ast`42`;
+      const returnStmt = factory.createReturnStatement(expr);
+      expect(generate(returnStmt).code).toEqual('return 42;');
+    });
+
+    it('should create a void return statement if the expression is null', () => {
+      const returnStmt = factory.createReturnStatement(null);
+      expect(generate(returnStmt).code).toEqual('return;');
+    });
+  });
+
+  describe('createTaggedTemplate()', () => {
+    it('should create a tagged template node from the tag, elements and expressions', () => {
+      const elements = [
+        {raw: 'raw1', cooked: 'cooked1', range: null},
+        {raw: 'raw2', cooked: 'cooked2', range: null},
+        {raw: 'raw3', cooked: 'cooked3', range: null},
+      ];
+      const expressions = [
+        expression.ast`42`,
+        expression.ast`"moo"`,
+      ];
+      const tag = expression.ast`tagFn`;
+      const template = factory.createTaggedTemplate(tag, {elements, expressions});
+      expect(generate(template).code).toEqual('tagFn`raw1${42}raw2${"moo"}raw3`');
+    });
+  });
+
+  describe('createThrowStatement()', () => {
+    it('should create a throw statement, throwing the given expression', () => {
+      const expr = expression.ast`new Error("bad")`;
+      const throwStmt = factory.createThrowStatement(expr);
+      expect(generate(throwStmt).code).toEqual('throw new Error("bad");');
+    });
+  });
+
+  describe('createTypeOfExpression()', () => {
+    it('should create a typeof expression node', () => {
+      const expr = expression.ast`42`;
+      const typeofExpr = factory.createTypeOfExpression(expr);
+      expect(generate(typeofExpr).code).toEqual('typeof 42');
+    });
+  });
+
+  describe('createUnaryExpression()', () => {
+    it('should create a unary expression with the operator and operand', () => {
+      const expr = expression.ast`value`;
+      const unaryExpr = factory.createUnaryExpression('!', expr);
+      expect(generate(unaryExpr).code).toEqual('!value');
+    });
+  });
+
+  describe('createVariableDeclaration()', () => {
+    it('should create a variable declaration statement node for the given variable name and initializer',
+       () => {
+         const initializer = expression.ast`42`;
+         const varDecl = factory.createVariableDeclaration('foo', initializer, 'let');
+         expect(generate(varDecl).code).toEqual('let foo = 42;');
+       });
+
+    it('should create a constant declaration statement node for the given variable name and initializer',
+       () => {
+         const initializer = expression.ast`42`;
+         const varDecl = factory.createVariableDeclaration('foo', initializer, 'const');
+         expect(generate(varDecl).code).toEqual('const foo = 42;');
+       });
+
+    it('should create a downleveled variable declaration statement node for the given variable name and initializer',
+       () => {
+         const initializer = expression.ast`42`;
+         const varDecl = factory.createVariableDeclaration('foo', initializer, 'var');
+         expect(generate(varDecl).code).toEqual('var foo = 42;');
+       });
+
+    it('should create an uninitialized variable declaration statement node for the given variable name and a null initializer',
+       () => {
+         const varDecl = factory.createVariableDeclaration('foo', null, 'let');
+         expect(generate(varDecl).code).toEqual('let foo;');
+       });
+  });
+
+  describe('setSourceMapRange()', () => {
+    it('should attach the `sourceMapRange` to the given `node`', () => {
+      const expr = expression.ast`42`;
+      expect(expr.loc).toBeUndefined();
+      expect(expr.start).toBeUndefined();
+      expect(expr.end).toBeUndefined();
+
+      factory.setSourceMapRange(expr, {
+        start: {line: 0, column: 1, offset: 1},
+        end: {line: 2, column: 3, offset: 15},
+        content: '-****\n*****\n****',
+        url: 'original.ts'
+      });
+
+      // Lines are 1-based in Babel.
+      expect(expr.loc).toEqual({
+        start: {line: 1, column: 1},
+        end: {line: 3, column: 3},
+      });
+      expect(expr.start).toEqual(1);
+      expect(expr.end).toEqual(15);
+    });
+  });
+});
diff --git a/packages/compiler-cli/linker/babel/test/ast/babel_ast_host_spec.ts b/packages/compiler-cli/linker/babel/test/ast/babel_ast_host_spec.ts
new file mode 100644
index 0000000000000..746f6cd3aed1d
--- /dev/null
+++ b/packages/compiler-cli/linker/babel/test/ast/babel_ast_host_spec.ts
@@ -0,0 +1,305 @@
+/**
+ * @license
+ * Copyright Google LLC 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 t from '@babel/types';
+import template from '@babel/template';
+import {parse} from '@babel/parser';
+import {BabelAstHost} from '../../src/ast/babel_ast_host';
+
+describe('BabelAstHost', () => {
+  let host: BabelAstHost;
+  beforeEach(() => host = new BabelAstHost());
+
+  describe('getSymbolName()', () => {
+    it('should return the name of an identifier', () => {
+      expect(host.getSymbolName(expr('someIdentifier'))).toEqual('someIdentifier');
+    });
+
+    it('should return the name of an identifier at the end of a property access chain', () => {
+      expect(host.getSymbolName(expr('a.b.c.someIdentifier'))).toEqual('someIdentifier');
+    });
+
+    it('should return null if the expression has no identifier', () => {
+      expect(host.getSymbolName(expr('42'))).toBe(null);
+    });
+  });
+
+  describe('isStringLiteral()', () => {
+    it('should return true if the expression is a string literal', () => {
+      expect(host.isStringLiteral(expr('"moo"'))).toBe(true);
+      expect(host.isStringLiteral(expr('\'moo\''))).toBe(true);
+    });
+
+    it('should return false if the expression is not a string literal', () => {
+      expect(host.isStringLiteral(expr('true'))).toBe(false);
+      expect(host.isStringLiteral(expr('someIdentifier'))).toBe(false);
+      expect(host.isStringLiteral(expr('42'))).toBe(false);
+      expect(host.isStringLiteral(expr('{}'))).toBe(false);
+      expect(host.isStringLiteral(expr('[]'))).toBe(false);
+      expect(host.isStringLiteral(expr('null'))).toBe(false);
+      expect(host.isStringLiteral(expr('\'a\' + \'b\''))).toBe(false);
+    });
+
+    it('should return false if the expression is a template string', () => {
+      expect(host.isStringLiteral(expr('\`moo\`'))).toBe(false);
+    });
+  });
+
+  describe('parseStringLiteral()', () => {
+    it('should extract the string value', () => {
+      expect(host.parseStringLiteral(expr('"moo"'))).toEqual('moo');
+      expect(host.parseStringLiteral(expr('\'moo\''))).toEqual('moo');
+    });
+
+    it('should error if the value is not a string literal', () => {
+      expect(() => host.parseStringLiteral(expr('42')))
+          .toThrowError('Unsupported syntax, expected a string literal.');
+    });
+  });
+
+  describe('isNumericLiteral()', () => {
+    it('should return true if the expression is a number literal', () => {
+      expect(host.isNumericLiteral(expr('42'))).toBe(true);
+    });
+
+    it('should return false if the expression is not a number literal', () => {
+      expect(host.isStringLiteral(expr('true'))).toBe(false);
+      expect(host.isNumericLiteral(expr('"moo"'))).toBe(false);
+      expect(host.isNumericLiteral(expr('\'moo\''))).toBe(false);
+      expect(host.isNumericLiteral(expr('someIdentifier'))).toBe(false);
+      expect(host.isNumericLiteral(expr('{}'))).toBe(false);
+      expect(host.isNumericLiteral(expr('[]'))).toBe(false);
+      expect(host.isNumericLiteral(expr('null'))).toBe(false);
+      expect(host.isNumericLiteral(expr('\'a\' + \'b\''))).toBe(false);
+      expect(host.isNumericLiteral(expr('\`moo\`'))).toBe(false);
+    });
+  });
+
+  describe('parseNumericLiteral()', () => {
+    it('should extract the number value', () => {
+      expect(host.parseNumericLiteral(expr('42'))).toEqual(42);
+    });
+
+    it('should error if the value is not a numeric literal', () => {
+      expect(() => host.parseNumericLiteral(expr('"moo"')))
+          .toThrowError('Unsupported syntax, expected a numeric literal.');
+    });
+  });
+
+  describe('isBooleanLiteral()', () => {
+    it('should return true if the expression is a boolean literal', () => {
+      expect(host.isBooleanLiteral(expr('true'))).toBe(true);
+      expect(host.isBooleanLiteral(expr('false'))).toBe(true);
+    });
+
+    it('should return false if the expression is not a boolean literal', () => {
+      expect(host.isBooleanLiteral(expr('"moo"'))).toBe(false);
+      expect(host.isBooleanLiteral(expr('\'moo\''))).toBe(false);
+      expect(host.isBooleanLiteral(expr('someIdentifier'))).toBe(false);
+      expect(host.isBooleanLiteral(expr('42'))).toBe(false);
+      expect(host.isBooleanLiteral(expr('{}'))).toBe(false);
+      expect(host.isBooleanLiteral(expr('[]'))).toBe(false);
+      expect(host.isBooleanLiteral(expr('null'))).toBe(false);
+      expect(host.isBooleanLiteral(expr('\'a\' + \'b\''))).toBe(false);
+      expect(host.isBooleanLiteral(expr('\`moo\`'))).toBe(false);
+    });
+  });
+
+  describe('parseBooleanLiteral()', () => {
+    it('should extract the boolean value', () => {
+      expect(host.parseBooleanLiteral(expr('true'))).toEqual(true);
+      expect(host.parseBooleanLiteral(expr('false'))).toEqual(false);
+    });
+
+    it('should error if the value is not a boolean literal', () => {
+      expect(() => host.parseBooleanLiteral(expr('"moo"')))
+          .toThrowError('Unsupported syntax, expected a boolean literal.');
+    });
+  });
+
+  describe('isArrayLiteral()', () => {
+    it('should return true if the expression is an array literal', () => {
+      expect(host.isArrayLiteral(expr('[]'))).toBe(true);
+      expect(host.isArrayLiteral(expr('[1, 2, 3]'))).toBe(true);
+      expect(host.isArrayLiteral(expr('[[], []]'))).toBe(true);
+    });
+
+    it('should return false if the expression is not an array literal', () => {
+      expect(host.isArrayLiteral(expr('"moo"'))).toBe(false);
+      expect(host.isArrayLiteral(expr('\'moo\''))).toBe(false);
+      expect(host.isArrayLiteral(expr('someIdentifier'))).toBe(false);
+      expect(host.isArrayLiteral(expr('42'))).toBe(false);
+      expect(host.isArrayLiteral(expr('{}'))).toBe(false);
+      expect(host.isArrayLiteral(expr('null'))).toBe(false);
+      expect(host.isArrayLiteral(expr('\'a\' + \'b\''))).toBe(false);
+      expect(host.isArrayLiteral(expr('\`moo\`'))).toBe(false);
+    });
+  });
+
+  describe('parseArrayLiteral()', () => {
+    it('should extract the expressions in the array', () => {
+      const moo = expr('\'moo\'');
+      expect(host.parseArrayLiteral(expr('[]'))).toEqual([]);
+      expect(host.parseArrayLiteral(expr('[\'moo\']'))).toEqual([moo]);
+    });
+
+    it('should error if there is an empty item', () => {
+      expect(() => host.parseArrayLiteral(expr('[,]')))
+          .toThrowError('Unsupported syntax, expected element in array not to be empty.');
+    });
+
+    it('should error if there is a spread element', () => {
+      expect(() => host.parseArrayLiteral(expr('[...[0,1]]')))
+          .toThrowError('Unsupported syntax, expected element in array not to use spread syntax.');
+    });
+  });
+
+  describe('isObjectLiteral()', () => {
+    it('should return true if the expression is an object literal', () => {
+      expect(host.isObjectLiteral(rhs('x = {}'))).toBe(true);
+      expect(host.isObjectLiteral(rhs('x = { foo: \'bar\' }'))).toBe(true);
+    });
+
+    it('should return false if the expression is not an object literal', () => {
+      expect(host.isObjectLiteral(rhs('x = "moo"'))).toBe(false);
+      expect(host.isObjectLiteral(rhs('x = \'moo\''))).toBe(false);
+      expect(host.isObjectLiteral(rhs('x = someIdentifier'))).toBe(false);
+      expect(host.isObjectLiteral(rhs('x = 42'))).toBe(false);
+      expect(host.isObjectLiteral(rhs('x = []'))).toBe(false);
+      expect(host.isObjectLiteral(rhs('x = null'))).toBe(false);
+      expect(host.isObjectLiteral(rhs('x = \'a\' + \'b\''))).toBe(false);
+      expect(host.isObjectLiteral(rhs('x = \`moo\`'))).toBe(false);
+    });
+  });
+
+  describe('parseObjectLiteral()', () => {
+    it('should extract the properties from the object', () => {
+      const moo = expr('\'moo\'');
+      expect(host.parseObjectLiteral(rhs('x = {}'))).toEqual(new Map());
+      expect(host.parseObjectLiteral(rhs('x = {a: \'moo\'}'))).toEqual(new Map([['a', moo]]));
+    });
+
+    it('should error if there is a method', () => {
+      expect(() => host.parseObjectLiteral(rhs('x = { foo() {} }')))
+          .toThrowError('Unsupported syntax, expected a property assignment.');
+    });
+
+    it('should error if there is a spread element', () => {
+      expect(() => host.parseObjectLiteral(rhs('x = {...{a:\'moo\'}}')))
+          .toThrowError('Unsupported syntax, expected a property assignment.');
+    });
+  });
+
+  describe('isFunctionExpression()', () => {
+    it('should return true if the expression is a function', () => {
+      expect(host.isFunctionExpression(rhs('x = function() {}'))).toBe(true);
+      expect(host.isFunctionExpression(rhs('x = function foo() {}'))).toBe(true);
+      expect(host.isFunctionExpression(rhs('x = () => {}'))).toBe(true);
+      expect(host.isFunctionExpression(rhs('x = () => true'))).toBe(true);
+    });
+
+    it('should return false if the expression is a function declaration', () => {
+      expect(host.isFunctionExpression(expr('function foo() {}'))).toBe(false);
+    });
+
+    it('should return false if the expression is not a function expression', () => {
+      expect(host.isFunctionExpression(expr('[]'))).toBe(false);
+      expect(host.isFunctionExpression(expr('"moo"'))).toBe(false);
+      expect(host.isFunctionExpression(expr('\'moo\''))).toBe(false);
+      expect(host.isFunctionExpression(expr('someIdentifier'))).toBe(false);
+      expect(host.isFunctionExpression(expr('42'))).toBe(false);
+      expect(host.isFunctionExpression(expr('{}'))).toBe(false);
+      expect(host.isFunctionExpression(expr('null'))).toBe(false);
+      expect(host.isFunctionExpression(expr('\'a\' + \'b\''))).toBe(false);
+      expect(host.isFunctionExpression(expr('\`moo\`'))).toBe(false);
+    });
+  });
+
+  describe('parseReturnValue()', () => {
+    it('should extract the return value of a function', () => {
+      const moo = expr('\'moo\'');
+      expect(host.parseReturnValue(rhs('x = function() { return \'moo\'; }'))).toEqual(moo);
+    });
+
+    it('should extract the value of a simple arrow function', () => {
+      const moo = expr('\'moo\'');
+      expect(host.parseReturnValue(rhs('x = () => \'moo\''))).toEqual(moo);
+    });
+
+    it('should extract the return value of an arrow function', () => {
+      const moo = expr('\'moo\'');
+      expect(host.parseReturnValue(rhs('x = () => { return \'moo\' }'))).toEqual(moo);
+    });
+
+    it('should error if the body has 0 statements', () => {
+      expect(() => host.parseReturnValue(rhs('x = function () { }')))
+          .toThrowError(
+              'Unsupported syntax, expected a function body with a single return statement.');
+      expect(() => host.parseReturnValue(rhs('x = () => { }')))
+          .toThrowError(
+              'Unsupported syntax, expected a function body with a single return statement.');
+    });
+
+    it('should error if the body has more than 1 statement', () => {
+      expect(() => host.parseReturnValue(rhs('x = function () { const x = 10; return x; }')))
+          .toThrowError(
+              'Unsupported syntax, expected a function body with a single return statement.');
+      expect(() => host.parseReturnValue(rhs('x = () => { const x = 10; return x; }')))
+          .toThrowError(
+              'Unsupported syntax, expected a function body with a single return statement.');
+    });
+
+    it('should error if the single statement is not a return statement', () => {
+      expect(() => host.parseReturnValue(rhs('x = function () { const x = 10; }')))
+          .toThrowError(
+              'Unsupported syntax, expected a function body with a single return statement.');
+      expect(() => host.parseReturnValue(rhs('x = () => { const x = 10; }')))
+          .toThrowError(
+              'Unsupported syntax, expected a function body with a single return statement.');
+    });
+  });
+
+  describe('getRange()', () => {
+    it('should extract the range from the expression', () => {
+      const file = parse('// preamble\nx = \'moo\';');
+      const stmt = file.program.body[0];
+      assertExpressionStatement(stmt);
+      assertAssignmentExpression(stmt.expression);
+      expect(host.getRange(stmt.expression.right))
+          .toEqual({startLine: 1, startCol: 4, startPos: 16, endPos: 21});
+    });
+
+    it('should error if there is no range information', () => {
+      const moo = rhs('// preamble\nx = \'moo\';');
+      expect(() => host.getRange(moo))
+          .toThrowError('Unable to read range for node - it is missing location information.');
+    });
+  });
+});
+
+function expr(code: string): t.Expression {
+  const stmt = template.ast(code);
+  return (stmt as t.ExpressionStatement).expression;
+}
+
+function rhs(code: string): t.Expression {
+  const e = expr(code);
+  assertAssignmentExpression(e);
+  return e.right;
+}
+
+function assertExpressionStatement(e: t.Node): asserts e is t.ExpressionStatement {
+  if (!t.isExpressionStatement(e)) {
+    throw new Error('Bad test - expected an expression statement');
+  }
+}
+
+function assertAssignmentExpression(e: t.Expression): asserts e is t.AssignmentExpression {
+  if (!t.isAssignmentExpression(e)) {
+    throw new Error('Bad test - expected an assignment expression');
+  }
+}
diff --git a/packages/compiler-cli/linker/babel/test/babel_declaration_scope_spec.ts b/packages/compiler-cli/linker/babel/test/babel_declaration_scope_spec.ts
new file mode 100644
index 0000000000000..b4c5545f610ea
--- /dev/null
+++ b/packages/compiler-cli/linker/babel/test/babel_declaration_scope_spec.ts
@@ -0,0 +1,116 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {parse} from '@babel/parser';
+import traverse, {NodePath} from '@babel/traverse';
+import * as t from '@babel/types';
+import {BabelDeclarationScope} from '../src/babel_declaration_scope';
+
+
+describe('BabelDeclarationScope', () => {
+  describe('getConstantScopeRef()', () => {
+    it('should return a path to the ES module where the expression was imported', () => {
+      const ast = parse(
+          [
+            'import * as core from \'@angular/core\';',
+            'function foo() {',
+            '  var TEST = core;',
+            '}',
+          ].join('\n'),
+          {sourceType: 'module'});
+      const nodePath = findVarDeclaration(ast, 'TEST');
+      const scope = new BabelDeclarationScope(nodePath.scope);
+      const constantScope = scope.getConstantScopeRef(nodePath.get('init').node);
+      expect(constantScope).not.toBe(null);
+      expect(constantScope!.node).toBe(ast.program);
+    });
+
+    it('should return a path to the ES Module where the expression is declared', () => {
+      const ast = parse(
+          [
+            'var core;',
+            'export function foo() {',
+            '  var TEST = core;',
+            '}',
+          ].join('\n'),
+          {sourceType: 'module'});
+      const nodePath = findVarDeclaration(ast, 'TEST');
+      const scope = new BabelDeclarationScope(nodePath.scope);
+      const constantScope = scope.getConstantScopeRef(nodePath.get('init').node);
+      expect(constantScope).not.toBe(null);
+      expect(constantScope!.node).toBe(ast.program);
+    });
+
+    it('should return null if the file is not an ES module', () => {
+      const ast = parse(
+          [
+            'var core;',
+            'function foo() {',
+            '  var TEST = core;',
+            '}',
+          ].join('\n'),
+          {sourceType: 'script'});
+      const nodePath = findVarDeclaration(ast, 'TEST');
+      const scope = new BabelDeclarationScope(nodePath.scope);
+      const constantScope = scope.getConstantScopeRef(nodePath.get('init').node);
+      expect(constantScope).toBe(null);
+    });
+
+    it('should return the IIFE factory function where the expression is a parameter', () => {
+      const ast = parse(
+          [
+            'var core;',
+            '(function(core) {',
+            '  var BLOCK = \'block\';',
+            '  function foo() {',
+            '    var TEST = core;',
+            '  }',
+            '})(core);',
+          ].join('\n'),
+          {sourceType: 'script'});
+      const nodePath = findVarDeclaration(ast, 'TEST');
+      const fnPath = findFirstFunction(ast);
+      const scope = new BabelDeclarationScope(nodePath.scope);
+      const constantScope = scope.getConstantScopeRef(nodePath.get('init').node);
+      expect(constantScope).not.toBe(null);
+      expect(constantScope!.isFunction()).toBe(true);
+      expect(constantScope!.node).toEqual(fnPath.node);
+    });
+  });
+});
+
+function findVarDeclaration(
+    file: t.File, varName: string): NodePath<t.VariableDeclarator&{init: t.Expression}> {
+  let varDecl: NodePath<t.VariableDeclarator>|undefined = undefined;
+  traverse(file, {
+    VariableDeclarator: (path) => {
+      const id = path.get('id');
+      if (id.isIdentifier() && id.node.name === varName && path.get('init') !== null) {
+        varDecl = path;
+        path.stop();
+      }
+    }
+  });
+  if (varDecl === undefined) {
+    throw new Error(`TEST BUG: expected to find variable declaration for ${varName}.`);
+  }
+  return varDecl;
+}
+
+function findFirstFunction(file: t.File): NodePath<t.Function> {
+  let fn: NodePath<t.Function>|undefined = undefined;
+  traverse(file, {
+    Function: (path) => {
+      fn = path;
+      path.stop();
+    }
+  });
+  if (fn === undefined) {
+    throw new Error(`TEST BUG: expected to find a function.`);
+  }
+  return fn;
+}
diff --git a/packages/compiler-cli/linker/babel/test/es2015_linker_plugin_spec.ts b/packages/compiler-cli/linker/babel/test/es2015_linker_plugin_spec.ts
new file mode 100644
index 0000000000000..1f492df846c7b
--- /dev/null
+++ b/packages/compiler-cli/linker/babel/test/es2015_linker_plugin_spec.ts
@@ -0,0 +1,256 @@
+/**
+ * @license
+ * Copyright Google LLC 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 '@angular/compiler/src/output/output_ast';
+import {NodePath, PluginObj, transformSync} from '@babel/core';
+import generate from '@babel/generator';
+import * as t from '@babel/types';
+
+import {FileLinker} from '../../../linker';
+import {PartialDirectiveLinkerVersion1} from '../../src/file_linker/partial_linkers/partial_directive_linker_1';
+import {createEs2015LinkerPlugin} from '../src/es2015_linker_plugin';
+
+describe('createEs2015LinkerPlugin()', () => {
+  it('should return a Babel plugin visitor that handles Program (enter/exit) and CallExpression nodes',
+     () => {
+       const plugin = createEs2015LinkerPlugin();
+       expect(plugin.visitor).toEqual({
+         Program: {
+           enter: jasmine.any(Function),
+           exit: jasmine.any(Function),
+         },
+         CallExpression: jasmine.any(Function),
+       });
+     });
+
+  it('should return a Babel plugin that calls FileLinker.isPartialDeclaration() on each call expression',
+     () => {
+       const isPartialDeclarationSpy = spyOn(FileLinker.prototype, 'isPartialDeclaration');
+
+       transformSync(
+           [
+             'var core;', `fn1()`, 'fn2({prop: () => fn3({})});', `x.method(() => fn4());`,
+             'spread(...x);'
+           ].join('\n'),
+           {
+             plugins: [createEs2015LinkerPlugin()],
+             filename: '/test.js',
+             parserOpts: {sourceType: 'unambiguous'},
+           });
+       expect(isPartialDeclarationSpy.calls.allArgs()).toEqual([
+         ['fn1'],
+         ['fn2'],
+         ['fn3'],
+         ['method'],
+         ['fn4'],
+         ['spread'],
+       ]);
+     });
+
+  it('should return a Babel plugin that calls FileLinker.linkPartialDeclaration() on each matching declaration',
+     () => {
+       const linkSpy = spyOn(FileLinker.prototype, 'linkPartialDeclaration')
+                           .and.returnValue(t.identifier('REPLACEMENT'));
+
+       transformSync(
+           [
+             'var core;',
+             `$ngDeclareDirective({version: 1, ngImport: core, x: 1});`,
+             `$ngDeclareComponent({version: 1, ngImport: core, foo: () => $ngDeclareDirective({version: 1, ngImport: core, x: 2})});`,
+             `x.qux(() => $ngDeclareDirective({version: 1, ngImport: core, x: 3}));`,
+             'spread(...x);',
+           ].join('\n'),
+           {
+             plugins: [createEs2015LinkerPlugin()],
+             filename: '/test.js',
+             parserOpts: {sourceType: 'unambiguous'},
+           });
+
+       expect(humanizeLinkerCalls(linkSpy.calls)).toEqual([
+         ['$ngDeclareDirective', '{version:1,ngImport:core,x:1}'],
+         [
+           '$ngDeclareComponent',
+           '{version:1,ngImport:core,foo:()=>$ngDeclareDirective({version:1,ngImport:core,x:2})}'
+         ],
+         // Note we do not process `x:2` declaration since it is nested within another declaration
+         ['$ngDeclareDirective', '{version:1,ngImport:core,x:3}']
+       ]);
+     });
+
+  it('should return a Babel plugin that replaces call expressions with the return value from FileLinker.linkPartialDeclaration()',
+     () => {
+       let replaceCount = 0;
+       spyOn(FileLinker.prototype, 'linkPartialDeclaration')
+           .and.callFake(() => t.identifier('REPLACEMENT_' + ++replaceCount));
+       const result = transformSync(
+           [
+             'var core;',
+             '$ngDeclareDirective({version: 1, ngImport: core});',
+             '$ngDeclareDirective({version: 1, ngImport: core, foo: () => bar({})});',
+             'x.qux();',
+             'spread(...x);',
+           ].join('\n'),
+           {
+             plugins: [createEs2015LinkerPlugin()],
+             filename: '/test.js',
+             parserOpts: {sourceType: 'unambiguous'},
+             generatorOpts: {compact: true},
+           });
+       expect(result!.code).toEqual('var core;REPLACEMENT_1;REPLACEMENT_2;x.qux();spread(...x);');
+     });
+
+  it('should return a Babel plugin that adds shared statements after any imports', () => {
+    spyOnLinkPartialDeclarationWithConstants(o.literal('REPLACEMENT'));
+    const result = transformSync(
+        [
+          'import * as core from \'some-module\';',
+          'import {id} from \'other-module\';',
+          `$ngDeclareDirective({version: 1, ngImport: core})`,
+          `$ngDeclareDirective({version: 1, ngImport: core})`,
+          `$ngDeclareDirective({version: 1, ngImport: core})`,
+        ].join('\n'),
+        {
+          plugins: [createEs2015LinkerPlugin()],
+          filename: '/test.js',
+          parserOpts: {sourceType: 'unambiguous'},
+          generatorOpts: {compact: true},
+        });
+    expect(result!.code)
+        .toEqual(
+            'import*as core from\'some-module\';import{id}from\'other-module\';const _c0=[1];const _c1=[2];const _c2=[3];"REPLACEMENT";"REPLACEMENT";"REPLACEMENT";');
+  });
+
+  it('should return a Babel plugin that adds shared statements at the start of the program if it is an ECMAScript Module and there are no imports',
+     () => {
+       spyOnLinkPartialDeclarationWithConstants(o.literal('REPLACEMENT'));
+       const result = transformSync(
+           [
+             'var core;',
+             `$ngDeclareDirective({version: 1, ngImport: core})`,
+             `$ngDeclareDirective({version: 1, ngImport: core})`,
+             `$ngDeclareDirective({version: 1, ngImport: core})`,
+           ].join('\n'),
+           {
+             plugins: [createEs2015LinkerPlugin()],
+             filename: '/test.js',
+             // We declare the file as a module because this cannot be inferred from the source
+             parserOpts: {sourceType: 'module'},
+             generatorOpts: {compact: true},
+           });
+       expect(result!.code)
+           .toEqual(
+               'const _c0=[1];const _c1=[2];const _c2=[3];var core;"REPLACEMENT";"REPLACEMENT";"REPLACEMENT";');
+     });
+
+  it('should return a Babel plugin that adds shared statements at the start of the function body if the ngImport is from a function parameter',
+     () => {
+       spyOnLinkPartialDeclarationWithConstants(o.literal('REPLACEMENT'));
+       const result = transformSync(
+           [
+             'function run(core) {', `  $ngDeclareDirective({version: 1, ngImport: core})`,
+             `  $ngDeclareDirective({version: 1, ngImport: core})`,
+             `  $ngDeclareDirective({version: 1, ngImport: core})`, '}'
+           ].join('\n'),
+           {
+             plugins: [createEs2015LinkerPlugin()],
+             filename: '/test.js',
+             parserOpts: {sourceType: 'unambiguous'},
+             generatorOpts: {compact: true},
+           });
+       expect(result!.code)
+           .toEqual(
+               'function run(core){const _c0=[1];const _c1=[2];const _c2=[3];"REPLACEMENT";"REPLACEMENT";"REPLACEMENT";}');
+     });
+
+  it('should return a Babel plugin that adds shared statements into an IIFE if no scope could not be derived for the ngImport',
+     () => {
+       spyOnLinkPartialDeclarationWithConstants(o.literal('REPLACEMENT'));
+       const result = transformSync(
+           [
+             'function run() {',
+             `  $ngDeclareDirective({version: 1, ngImport: core})`,
+             `  $ngDeclareDirective({version: 1, ngImport: core})`,
+             `  $ngDeclareDirective({version: 1, ngImport: core})`,
+             '}',
+           ].join('\n'),
+           {
+             plugins: [createEs2015LinkerPlugin()],
+             filename: '/test.js',
+             parserOpts: {sourceType: 'unambiguous'},
+             generatorOpts: {compact: true},
+           });
+       expect(result!.code).toEqual([
+         `function run(){`,
+         `(function(){const _c0=[1];return"REPLACEMENT";})();`,
+         `(function(){const _c0=[2];return"REPLACEMENT";})();`,
+         `(function(){const _c0=[3];return"REPLACEMENT";})();`,
+         `}`,
+       ].join(''));
+     });
+
+  it('should still execute other plugins that match AST nodes inside the result of the replacement',
+     () => {
+       spyOnLinkPartialDeclarationWithConstants(o.fn([], [], null, null, 'FOO'));
+       const result = transformSync(
+           [
+             `$ngDeclareDirective({version: 1, ngImport: core}); FOO;`,
+           ].join('\n'),
+           {
+             plugins: [
+               createEs2015LinkerPlugin(),
+               createIdentifierMapperPlugin('FOO', 'BAR'),
+               createIdentifierMapperPlugin('_c0', 'x1'),
+             ],
+             filename: '/test.js',
+             parserOpts: {sourceType: 'module'},
+             generatorOpts: {compact: true},
+           });
+       expect(result!.code).toEqual([
+         `(function(){const x1=[1];return function BAR(){};})();BAR;`,
+       ].join(''));
+     });
+});
+
+/**
+ * Convert the arguments of the spied-on `calls` into a human readable array.
+ */
+function humanizeLinkerCalls(
+    calls: jasmine.Calls<typeof FileLinker.prototype.linkPartialDeclaration>) {
+  return calls.all().map(({args: [fn, args]}) => [fn, generate(args[0], {compact: true}).code]);
+}
+
+/**
+ * Spy on the `PartialDirectiveLinkerVersion1.linkPartialDeclaration()` method, triggering
+ * shared constants to be created.
+ */
+function spyOnLinkPartialDeclarationWithConstants(replacement: o.Expression) {
+  let callCount = 0;
+  spyOn(PartialDirectiveLinkerVersion1.prototype, 'linkPartialDeclaration')
+      .and.callFake(((sourceUrl, code, constantPool) => {
+                      const constArray = o.literalArr([o.literal(++callCount)]);
+                      // We have to add the constant twice or it will not create a shared statement
+                      constantPool.getConstLiteral(constArray);
+                      constantPool.getConstLiteral(constArray);
+                      return replacement;
+                    }) as typeof PartialDirectiveLinkerVersion1.prototype.linkPartialDeclaration);
+}
+
+/**
+ * A simple Babel plugin that will replace all identifiers that match `<src>` with identifiers
+ * called `<dest>`.
+ */
+function createIdentifierMapperPlugin(src: string, dest: string): PluginObj {
+  return {
+    visitor: {
+      Identifier(path: NodePath<t.Identifier>) {
+        if (path.node.name === src) {
+          path.replaceWith(t.identifier(dest));
+        }
+      }
+    },
+  };
+}
diff --git a/packages/compiler-cli/linker/index.ts b/packages/compiler-cli/linker/index.ts
new file mode 100644
index 0000000000000..96256b7b43851
--- /dev/null
+++ b/packages/compiler-cli/linker/index.ts
@@ -0,0 +1,14 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {AstHost, Range} from './src/ast/ast_host';
+export {assert} from './src/ast/utils';
+export {FatalLinkerError, isFatalLinkerError} from './src/fatal_linker_error';
+export {DeclarationScope} from './src/file_linker/declaration_scope';
+export {FileLinker} from './src/file_linker/file_linker';
+export {LinkerEnvironment} from './src/file_linker/linker_environment';
+export {LinkerOptions} from './src/file_linker/linker_options';
diff --git a/packages/compiler-cli/linker/src/ast/ast_host.ts b/packages/compiler-cli/linker/src/ast/ast_host.ts
new file mode 100644
index 0000000000000..70f55bb5d73df
--- /dev/null
+++ b/packages/compiler-cli/linker/src/ast/ast_host.ts
@@ -0,0 +1,95 @@
+/**
+ * @license
+ * Copyright Google LLC 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
+ */
+
+/**
+ * An abstraction for getting information from an AST while being agnostic to the underlying AST
+ * implementation.
+ */
+export interface AstHost<TExpression> {
+  /**
+   * Get the name of the symbol represented by the given expression node, or `null` if it is not a
+   * symbol.
+   */
+  getSymbolName(node: TExpression): string|null;
+
+  /**
+   * Return `true` if the given expression is a string literal, or false otherwise.
+   */
+  isStringLiteral(node: TExpression): boolean;
+  /**
+   * Parse the string value from the given expression, or throw if it is not a string literal.
+   */
+  parseStringLiteral(str: TExpression): string;
+
+  /**
+   * Return `true` if the given expression is a numeric literal, or false otherwise.
+   */
+  isNumericLiteral(node: TExpression): boolean;
+  /**
+   * Parse the numeric value from the given expression, or throw if it is not a numeric literal.
+   */
+  parseNumericLiteral(num: TExpression): number;
+
+  /**
+   * Return `true` if the given expression is a boolean literal, or false otherwise.
+   */
+  isBooleanLiteral(node: TExpression): boolean;
+  /**
+   * Parse the boolean value from the given expression, or throw if it is not a boolean literal.
+   */
+  parseBooleanLiteral(bool: TExpression): boolean;
+
+  /**
+   * Return `true` if the given expression is an array literal, or false otherwise.
+   */
+  isArrayLiteral(node: TExpression): boolean;
+  /**
+   * Parse an array of expressions from the given expression, or throw if it is not an array
+   * literal.
+   */
+  parseArrayLiteral(array: TExpression): TExpression[];
+
+  /**
+   * Return `true` if the given expression is an object literal, or false otherwise.
+   */
+  isObjectLiteral(node: TExpression): boolean;
+  /**
+   * Parse the given expression into a map of object property names to property expressions, or
+   * throw if it is not an object literal.
+   */
+  parseObjectLiteral(obj: TExpression): Map<string, TExpression>;
+
+  /**
+   * Return `true` if the given expression is a function, or false otherwise.
+   */
+  isFunctionExpression(node: TExpression): boolean;
+  /**
+   * Compute the "value" of a function expression by parsing its body for a single `return`
+   * statement, extracting the returned expression, or throw if it is not possible.
+   */
+  parseReturnValue(fn: TExpression): TExpression;
+
+  /**
+   * Compute the location range of the expression in the source file, to be used for source-mapping.
+   */
+  getRange(node: TExpression): Range;
+}
+
+/**
+ * The location of the start and end of an expression in the original source file.
+ */
+export interface Range {
+  /** 0-based character position of the range start in the source file text. */
+  startPos: number;
+  /** 0-based line index of the range start in the source file text. */
+  startLine: number;
+  /** 0-based column position of the range start in the source file text. */
+  startCol: number;
+  /** 0-based character position of the range end in the source file text. */
+  endPos: number;
+}
diff --git a/packages/compiler-cli/linker/src/ast/ast_value.ts b/packages/compiler-cli/linker/src/ast/ast_value.ts
new file mode 100644
index 0000000000000..2275c61aef814
--- /dev/null
+++ b/packages/compiler-cli/linker/src/ast/ast_value.ts
@@ -0,0 +1,240 @@
+/**
+ * @license
+ * Copyright Google LLC 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 '@angular/compiler';
+import {FatalLinkerError} from '../fatal_linker_error';
+import {AstHost, Range} from './ast_host';
+
+/**
+ * This helper class wraps an object expression along with an `AstHost` object, exposing helper
+ * methods that make it easier to extract the properties of the object.
+ */
+export class AstObject<TExpression> {
+  /**
+   * Create a new `AstObject` from the given `expression` and `host`.
+   */
+  static parse<TExpression>(expression: TExpression, host: AstHost<TExpression>):
+      AstObject<TExpression> {
+    const obj = host.parseObjectLiteral(expression);
+    return new AstObject<TExpression>(expression, obj, host);
+  }
+
+  private constructor(
+      readonly expression: TExpression, private obj: Map<string, TExpression>,
+      private host: AstHost<TExpression>) {}
+
+  /**
+   * Returns true if the object has a property called `propertyName`.
+   */
+  has(propertyName: string): boolean {
+    return this.obj.has(propertyName);
+  }
+
+  /**
+   * Returns the number value of the property called `propertyName`.
+   *
+   * Throws an error if there is no such property or the property is not a number.
+   */
+  getNumber(propertyName: string): number {
+    return this.host.parseNumericLiteral(this.getRequiredProperty(propertyName));
+  }
+
+  /**
+   * Returns the string value of the property called `propertyName`.
+   *
+   * Throws an error if there is no such property or the property is not a string.
+   */
+  getString(propertyName: string): string {
+    return this.host.parseStringLiteral(this.getRequiredProperty(propertyName));
+  }
+
+  /**
+   * Returns the boolean value of the property called `propertyName`.
+   *
+   * Throws an error if there is no such property or the property is not a boolean.
+   */
+  getBoolean(propertyName: string): boolean {
+    return this.host.parseBooleanLiteral(this.getRequiredProperty(propertyName));
+  }
+
+  /**
+   * Returns the nested `AstObject` parsed from the property called `propertyName`.
+   *
+   * Throws an error if there is no such property or the property is not an object.
+   */
+  getObject(propertyName: string): AstObject<TExpression> {
+    const expr = this.getRequiredProperty(propertyName);
+    const obj = this.host.parseObjectLiteral(expr);
+    return new AstObject(expr, obj, this.host);
+  }
+
+  /**
+   * Returns an array of `AstValue` objects parsed from the property called `propertyName`.
+   *
+   * Throws an error if there is no such property or the property is not an array.
+   */
+  getArray(propertyName: string): AstValue<TExpression>[] {
+    const arr = this.host.parseArrayLiteral(this.getRequiredProperty(propertyName));
+    return arr.map(entry => new AstValue(entry, this.host));
+  }
+
+  /**
+   * Returns a `WrappedNodeExpr` object that wraps the expression at the property called
+   * `propertyName`.
+   *
+   * Throws an error if there is no such property.
+   */
+  getOpaque(propertyName: string): o.WrappedNodeExpr<TExpression> {
+    return new o.WrappedNodeExpr(this.getRequiredProperty(propertyName));
+  }
+
+  /**
+   * Returns the raw `TExpression` value of the property called `propertyName`.
+   *
+   * Throws an error if there is no such property.
+   */
+  getNode(propertyName: string): TExpression {
+    return this.getRequiredProperty(propertyName);
+  }
+
+  /**
+   * Returns an `AstValue` that wraps the value of the property called `propertyName`.
+   *
+   * Throws an error if there is no such property.
+   */
+  getValue(propertyName: string): AstValue<TExpression> {
+    return new AstValue(this.getRequiredProperty(propertyName), this.host);
+  }
+
+  /**
+   * Converts the AstObject to a raw JavaScript object, mapping each property value (as an
+   * `AstValue`) to the generic type (`T`) via the `mapper` function.
+   */
+  toLiteral<T>(mapper: (value: AstValue<TExpression>) => T): {[key: string]: T} {
+    const result: {[key: string]: T} = {};
+    for (const [key, expression] of this.obj) {
+      result[key] = mapper(new AstValue(expression, this.host));
+    }
+    return result;
+  }
+
+  private getRequiredProperty(propertyName: string): TExpression {
+    if (!this.obj.has(propertyName)) {
+      throw new FatalLinkerError(
+          this.expression, `Expected property '${propertyName}' to be present.`);
+    }
+    return this.obj.get(propertyName)!;
+  }
+}
+
+/**
+ * This helper class wraps an `expression`, exposing methods that use the `host` to give
+ * access to the underlying value of the wrapped expression.
+ */
+export class AstValue<TExpression> {
+  constructor(private expression: TExpression, private host: AstHost<TExpression>) {}
+
+  /**
+   * Is this value a number?
+   */
+  isNumber(): boolean {
+    return this.host.isNumericLiteral(this.expression);
+  }
+
+  /**
+   * Parse the number from this value, or error if it is not a number.
+   */
+  getNumber(): number {
+    return this.host.parseNumericLiteral(this.expression);
+  }
+
+  /**
+   * Is this value a string?
+   */
+  isString(): boolean {
+    return this.host.isStringLiteral(this.expression);
+  }
+
+  /**
+   * Parse the string from this value, or error if it is not a string.
+   */
+  getString(): string {
+    return this.host.parseStringLiteral(this.expression);
+  }
+
+  /**
+   * Is this value a boolean?
+   */
+  isBoolean(): boolean {
+    return this.host.isBooleanLiteral(this.expression);
+  }
+
+  /**
+   * Parse the boolean from this value, or error if it is not a boolean.
+   */
+  getBoolean(): boolean {
+    return this.host.parseBooleanLiteral(this.expression);
+  }
+
+  /**
+   * Is this value an object literal?
+   */
+  isObject(): boolean {
+    return this.host.isObjectLiteral(this.expression);
+  }
+
+  /**
+   * Parse this value into an `AstObject`, or error if it is not an object literal.
+   */
+  getObject(): AstObject<TExpression> {
+    return AstObject.parse(this.expression, this.host);
+  }
+
+  /**
+   * Is this value an array literal?
+   */
+  isArray(): boolean {
+    return this.host.isArrayLiteral(this.expression);
+  }
+
+  /**
+   * Parse this value into an array of `AstValue` objects, or error if it is not an array literal.
+   */
+  getArray(): AstValue<TExpression>[] {
+    const arr = this.host.parseArrayLiteral(this.expression);
+    return arr.map(entry => new AstValue(entry, this.host));
+  }
+
+  /**
+   * Is this value a function expression?
+   */
+  isFunction(): boolean {
+    return this.host.isFunctionExpression(this.expression);
+  }
+
+  /**
+   * Extract the return value as an `AstValue` from this value as a function expression, or error if
+   * it is not a function expression.
+   */
+  getFunctionReturnValue(): AstValue<TExpression> {
+    return new AstValue(this.host.parseReturnValue(this.expression), this.host);
+  }
+
+  /**
+   * Return the `TExpression` of this value wrapped in a `WrappedNodeExpr`.
+   */
+  getOpaque(): o.WrappedNodeExpr<TExpression> {
+    return new o.WrappedNodeExpr(this.expression);
+  }
+
+  /**
+   * Get the range of the location of this value in the original source.
+   */
+  getRange(): Range {
+    return this.host.getRange(this.expression);
+  }
+}
diff --git a/packages/compiler-cli/linker/src/ast/typescript/typescript_ast_host.ts b/packages/compiler-cli/linker/src/ast/typescript/typescript_ast_host.ts
new file mode 100644
index 0000000000000..582f5823a0189
--- /dev/null
+++ b/packages/compiler-cli/linker/src/ast/typescript/typescript_ast_host.ts
@@ -0,0 +1,147 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {FatalLinkerError} from '../../fatal_linker_error';
+import {AstHost, Range} from '../ast_host';
+import {assert} from '../utils';
+
+
+/**
+ * This implementation of `AstHost` is able to get information from TypeScript AST nodes.
+ *
+ * This host is not actually used at runtime in the current code.
+ *
+ * It is implemented here to ensure that the `AstHost` abstraction is not unfairly skewed towards
+ * the Babel implementation. It could also provide a basis for a 3rd TypeScript compiler plugin to
+ * do linking in the future.
+ */
+export class TypeScriptAstHost implements AstHost<ts.Expression> {
+  getSymbolName(node: ts.Expression): string|null {
+    if (ts.isIdentifier(node)) {
+      return node.text;
+    } else if (ts.isPropertyAccessExpression(node) && ts.isIdentifier(node.name)) {
+      return node.name.text;
+    } else {
+      return null;
+    }
+  }
+
+  isStringLiteral = ts.isStringLiteral;
+
+  parseStringLiteral(str: ts.Expression): string {
+    assert(str, this.isStringLiteral, 'a string literal');
+    return str.text;
+  }
+
+  isNumericLiteral = ts.isNumericLiteral;
+
+  parseNumericLiteral(num: ts.Expression): number {
+    assert(num, this.isNumericLiteral, 'a numeric literal');
+    return parseInt(num.text);
+  }
+
+  isBooleanLiteral(node: ts.Expression): node is ts.FalseLiteral|ts.TrueLiteral {
+    return node.kind === ts.SyntaxKind.TrueKeyword || node.kind === ts.SyntaxKind.FalseKeyword;
+  }
+
+  parseBooleanLiteral(bool: ts.Expression): boolean {
+    assert(bool, this.isBooleanLiteral, 'a boolean literal');
+    return bool.kind === ts.SyntaxKind.TrueKeyword;
+  }
+
+  isArrayLiteral = ts.isArrayLiteralExpression;
+
+  parseArrayLiteral(array: ts.Expression): ts.Expression[] {
+    assert(array, this.isArrayLiteral, 'an array literal');
+    return array.elements.map(element => {
+      assert(element, isNotEmptyElement, 'element in array not to be empty');
+      assert(element, isNotSpreadElement, 'element in array not to use spread syntax');
+      return element;
+    });
+  }
+
+  isObjectLiteral = ts.isObjectLiteralExpression;
+
+  parseObjectLiteral(obj: ts.Expression): Map<string, ts.Expression> {
+    assert(obj, this.isObjectLiteral, 'an object literal');
+
+    const result = new Map<string, ts.Expression>();
+    for (const property of obj.properties) {
+      assert(property, ts.isPropertyAssignment, 'a property assignment');
+      assert(property.name, isPropertyName, 'a property name');
+      result.set(property.name.text, property.initializer);
+    }
+    return result;
+  }
+
+  isFunctionExpression(node: ts.Expression): node is ts.FunctionExpression|ts.ArrowFunction {
+    return ts.isFunctionExpression(node) || ts.isArrowFunction(node);
+  }
+
+  parseReturnValue(fn: ts.Expression): ts.Expression {
+    assert(fn, this.isFunctionExpression, 'a function');
+    if (!ts.isBlock(fn.body)) {
+      // it is a simple array function expression: `(...) => expr`
+      return fn.body;
+    }
+
+    // it is a function (arrow or normal) with a body. E.g.:
+    // * `(...) => { stmt; ... }`
+    // * `function(...) { stmt; ... }`
+
+    if (fn.body.statements.length !== 1) {
+      throw new FatalLinkerError(
+          fn.body, 'Unsupported syntax, expected a function body with a single return statement.');
+    }
+    const stmt = fn.body.statements[0];
+    assert(stmt, ts.isReturnStatement, 'a function body with a single return statement');
+    if (stmt.expression === undefined) {
+      throw new FatalLinkerError(stmt, 'Unsupported syntax, expected function to return a value.');
+    }
+
+    return stmt.expression;
+  }
+
+  getRange(node: ts.Expression): Range {
+    const file = node.getSourceFile();
+    if (file === undefined) {
+      throw new FatalLinkerError(
+          node, 'Unable to read range for node - it is missing parent information.');
+    }
+    const startPos = node.getStart();
+    const endPos = node.getEnd();
+    const {line: startLine, character: startCol} = ts.getLineAndCharacterOfPosition(file, startPos);
+    return {startLine, startCol, startPos, endPos};
+  }
+}
+
+/**
+ * Return true if the expression does not represent an empty element in an array literal.
+ * For example in `[,foo]` the first element is "empty".
+ */
+function isNotEmptyElement(e: ts.Expression|ts.SpreadElement|
+                           ts.OmittedExpression): e is ts.Expression|ts.SpreadElement {
+  return !ts.isOmittedExpression(e);
+}
+
+/**
+ * Return true if the expression is not a spread element of an array literal.
+ * For example in `[x, ...rest]` the `...rest` expression is a spread element.
+ */
+function isNotSpreadElement(e: ts.Expression|ts.SpreadElement): e is ts.Expression {
+  return !ts.isSpreadElement(e);
+}
+
+/**
+ * Return true if the expression can be considered a text based property name.
+ */
+function isPropertyName(e: ts.PropertyName): e is ts.Identifier|ts.StringLiteral|ts.NumericLiteral {
+  return ts.isIdentifier(e) || ts.isStringLiteral(e) || ts.isNumericLiteral(e);
+}
diff --git a/packages/compiler-cli/linker/src/ast/utils.ts b/packages/compiler-cli/linker/src/ast/utils.ts
new file mode 100644
index 0000000000000..2aa9437361f5c
--- /dev/null
+++ b/packages/compiler-cli/linker/src/ast/utils.ts
@@ -0,0 +1,18 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {FatalLinkerError} from '../fatal_linker_error';
+
+/**
+ * Assert that the given `node` is of the type guarded by the `predicate` function.
+ */
+export function assert<T, K extends T>(
+    node: T, predicate: (node: T) => node is K, expected: string): asserts node is K {
+  if (!predicate(node)) {
+    throw new FatalLinkerError(node, `Unsupported syntax, expected ${expected}.`);
+  }
+}
diff --git a/packages/compiler-cli/linker/src/fatal_linker_error.ts b/packages/compiler-cli/linker/src/fatal_linker_error.ts
new file mode 100644
index 0000000000000..49bf52f3f3576
--- /dev/null
+++ b/packages/compiler-cli/linker/src/fatal_linker_error.ts
@@ -0,0 +1,31 @@
+/**
+ * @license
+ * Copyright Google LLC 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
+ */
+
+/**
+ * An unrecoverable error during linking.
+ */
+export class FatalLinkerError extends Error {
+  readonly type = 'FatalLinkerError';
+
+  /**
+   * Create a new FatalLinkerError.
+   *
+   * @param node The AST node where the error occurred.
+   * @param message A description of the error.
+   */
+  constructor(public node: unknown, message: string) {
+    super(message);
+  }
+}
+
+/**
+ * Whether the given object `e` is a FatalLinkerError.
+ */
+export function isFatalLinkerError(e: any): e is FatalLinkerError {
+  return e && e.type === 'FatalLinkerError';
+}
diff --git a/packages/compiler-cli/linker/src/file_linker/declaration_scope.ts b/packages/compiler-cli/linker/src/file_linker/declaration_scope.ts
new file mode 100644
index 0000000000000..a543bc3b874d3
--- /dev/null
+++ b/packages/compiler-cli/linker/src/file_linker/declaration_scope.ts
@@ -0,0 +1,45 @@
+/**
+ * @license
+ * Copyright Google LLC 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 interface represents the lexical scope of a partial declaration in the source code.
+ *
+ * For example, if you had the following code:
+ *
+ * ```
+ * function foo() {
+ *   function bar () {
+ *     $ngDeclareDirective({...});
+ *   }
+ * }
+ * ```
+ *
+ * The `DeclarationScope` of the `$ngDeclareDirective()` call is the body of the `bar()` function.
+ *
+ * The `FileLinker` uses this object to identify the lexical scope of any constant statements that
+ * might be generated by the linking process (i.e. where the `ConstantPool` lives for a set of
+ * partial linkers).
+ */
+export interface DeclarationScope<TSharedConstantScope, TExpression> {
+  /**
+   * Get a `TSharedConstantScope` object that can be used to reference the lexical scope where any
+   * shared constant statements would be inserted.
+   *
+   * This object is generic because different AST implementations will need different
+   * `TConstantScope` types to be able to insert shared constant statements. For example in Babel
+   * this would be a `NodePath` object; in TS it would just be a `Node` object.
+   *
+   * If it is not possible to find such a shared scope, then constant statements will be wrapped up
+   * with their generated linked definition expression, in the form of an IIFE.
+   *
+   * @param expression the expression that points to the Angular core framework import.
+   * @returns a reference to a reference object for where the shared constant statements will be
+   *     inserted, or `null` if it is not possible to have a shared scope.
+   */
+  getConstantScopeRef(expression: TExpression): TSharedConstantScope|null;
+}
diff --git a/packages/compiler-cli/linker/src/file_linker/emit_scopes/emit_scope.ts b/packages/compiler-cli/linker/src/file_linker/emit_scopes/emit_scope.ts
new file mode 100644
index 0000000000000..75f47067cef48
--- /dev/null
+++ b/packages/compiler-cli/linker/src/file_linker/emit_scopes/emit_scope.ts
@@ -0,0 +1,48 @@
+/**
+ * @license
+ * Copyright Google LLC 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 '@angular/compiler';
+import * as o from '@angular/compiler/src/output/output_ast';
+import {LinkerImportGenerator} from '../../linker_import_generator';
+import {LinkerEnvironment} from '../linker_environment';
+
+/**
+ * This class represents (from the point of view of the `FileLinker`) the scope in which
+ * statements and expressions related to a linked partial declaration will be emitted.
+ *
+ * It holds a copy of a `ConstantPool` that is used to capture any constant statements that need to
+ * be emitted in this context.
+ *
+ * This implementation will emit the definition and the constant statements separately.
+ */
+export class EmitScope<TStatement, TExpression> {
+  readonly constantPool = new ConstantPool();
+
+  constructor(
+      protected readonly ngImport: TExpression,
+      protected readonly linkerEnvironment: LinkerEnvironment<TStatement, TExpression>) {}
+
+  /**
+   * Translate the given Output AST definition expression into a generic `TExpression`.
+   *
+   * Use a `LinkerImportGenerator` to handle any imports in the definition.
+   */
+  translateDefinition(definition: o.Expression): TExpression {
+    return this.linkerEnvironment.translator.translateExpression(
+        definition, new LinkerImportGenerator(this.ngImport));
+  }
+
+  /**
+   * Return any constant statements that are shared between all uses of this `EmitScope`.
+   */
+  getConstantStatements(): TStatement[] {
+    const {translator} = this.linkerEnvironment;
+    const importGenerator = new LinkerImportGenerator(this.ngImport);
+    return this.constantPool.statements.map(
+        statement => translator.translateStatement(statement, importGenerator));
+  }
+}
diff --git a/packages/compiler-cli/linker/src/file_linker/emit_scopes/iife_emit_scope.ts b/packages/compiler-cli/linker/src/file_linker/emit_scopes/iife_emit_scope.ts
new file mode 100644
index 0000000000000..18d0982d2ddab
--- /dev/null
+++ b/packages/compiler-cli/linker/src/file_linker/emit_scopes/iife_emit_scope.ts
@@ -0,0 +1,40 @@
+/**
+ * @license
+ * Copyright Google LLC 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 '@angular/compiler/src/output/output_ast';
+import {EmitScope} from './emit_scope';
+
+/**
+ * This class is a specialization of the `EmitScope` class that is designed for the situation where
+ * there is no clear shared scope for constant statements. In this case they are bundled with the
+ * translated definition inside an IIFE.
+ */
+export class IifeEmitScope<TStatement, TExpression> extends EmitScope<TStatement, TExpression> {
+  /**
+   * Translate the given Output AST definition expression into a generic `TExpression`.
+   *
+   * Wraps the output from `EmitScope.translateDefinition()` and `EmitScope.getConstantStatements()`
+   * in an IIFE.
+   */
+  translateDefinition(definition: o.Expression): TExpression {
+    const {factory} = this.linkerEnvironment;
+    const constantStatements = super.getConstantStatements();
+
+    const returnStatement = factory.createReturnStatement(super.translateDefinition(definition));
+    const body = factory.createBlock([...constantStatements, returnStatement]);
+    const fn = factory.createFunctionExpression(/* name */ null, /* args */[], body);
+    return factory.createCallExpression(fn, /* args */[], /* pure */ false);
+  }
+
+  /**
+   * It is not valid to call this method, since there will be no shared constant statements - they
+   * are already emitted in the IIFE alongside the translated definition.
+   */
+  getConstantStatements(): TStatement[] {
+    throw new Error('BUG - IifeEmitScope should not expose any constant statements');
+  }
+}
diff --git a/packages/compiler-cli/linker/src/file_linker/file_linker.ts b/packages/compiler-cli/linker/src/file_linker/file_linker.ts
new file mode 100644
index 0000000000000..2b541fa372168
--- /dev/null
+++ b/packages/compiler-cli/linker/src/file_linker/file_linker.ts
@@ -0,0 +1,94 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {AstObject} from '../ast/ast_value';
+import {DeclarationScope} from './declaration_scope';
+import {EmitScope} from './emit_scopes/emit_scope';
+import {IifeEmitScope} from './emit_scopes/iife_emit_scope';
+import {LinkerEnvironment} from './linker_environment';
+import {PartialLinkerSelector} from './partial_linkers/partial_linker_selector';
+
+export const NO_STATEMENTS: Readonly<any[]> = [] as const;
+
+/**
+ * This class is responsible for linking all the partial declarations found in a single file.
+ */
+export class FileLinker<TConstantScope, TStatement, TExpression> {
+  private linkerSelector = new PartialLinkerSelector<TStatement, TExpression>();
+  private emitScopes = new Map<TConstantScope, EmitScope<TStatement, TExpression>>();
+
+  constructor(
+      private linkerEnvironment: LinkerEnvironment<TStatement, TExpression>,
+      private sourceUrl: string, readonly code: string) {}
+
+  /**
+   * Return true if the given callee name matches a partial declaration that can be linked.
+   */
+  isPartialDeclaration(calleeName: string): boolean {
+    return this.linkerSelector.supportsDeclaration(calleeName);
+  }
+
+  /**
+   * Link the metadata extracted from the args of a call to a partial declaration function.
+   *
+   * The `declarationScope` is used to determine the scope and strategy of emission of the linked
+   * definition and any shared constant statements.
+   *
+   * @param declarationFn the name of the function used to declare the partial declaration - e.g.
+   *     `$ngDeclareDirective`.
+   * @param args the arguments passed to the declaration function.
+   * @param declarationScope the scope that contains this call to the declaration function.
+   */
+  linkPartialDeclaration(
+      declarationFn: string, args: TExpression[],
+      declarationScope: DeclarationScope<TConstantScope, TExpression>): TExpression {
+    if (args.length !== 1) {
+      throw new Error(
+          `Invalid function call: It should have only a single object literal argument, but contained ${
+              args.length}.`);
+    }
+
+    const metaObj = AstObject.parse(args[0], this.linkerEnvironment.host);
+    const ngImport = metaObj.getNode('ngImport');
+    const emitScope = this.getEmitScope(ngImport, declarationScope);
+
+    const version = metaObj.getNumber('version');
+    const linker = this.linkerSelector.getLinker(declarationFn, version);
+    const definition =
+        linker.linkPartialDeclaration(this.sourceUrl, this.code, emitScope.constantPool, metaObj);
+
+    return emitScope.translateDefinition(definition);
+  }
+
+  /**
+   * Return all the shared constant statements and their associated constant scope references, so
+   * that they can be inserted into the source code.
+   */
+  getConstantStatements(): {constantScope: TConstantScope, statements: TStatement[]}[] {
+    const results: {constantScope: TConstantScope, statements: TStatement[]}[] = [];
+    for (const [constantScope, emitScope] of this.emitScopes.entries()) {
+      const statements = emitScope.getConstantStatements();
+      results.push({constantScope, statements});
+    }
+    return results;
+  }
+
+  private getEmitScope(
+      ngImport: TExpression, declarationScope: DeclarationScope<TConstantScope, TExpression>):
+      EmitScope<TStatement, TExpression> {
+    const constantScope = declarationScope.getConstantScopeRef(ngImport);
+    if (constantScope === null) {
+      // There is no constant scope so we will emit extra statements into the definition IIFE.
+      return new IifeEmitScope(ngImport, this.linkerEnvironment);
+    }
+
+    if (!this.emitScopes.has(constantScope)) {
+      this.emitScopes.set(constantScope, new EmitScope(ngImport, this.linkerEnvironment));
+    }
+    return this.emitScopes.get(constantScope)!;
+  }
+}
diff --git a/packages/compiler-cli/linker/src/file_linker/linker_environment.ts b/packages/compiler-cli/linker/src/file_linker/linker_environment.ts
new file mode 100644
index 0000000000000..c8024dc8a1325
--- /dev/null
+++ b/packages/compiler-cli/linker/src/file_linker/linker_environment.ts
@@ -0,0 +1,25 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {AstFactory} from '@angular/compiler-cli/src/ngtsc/translator';
+
+import {AstHost} from '../ast/ast_host';
+import {DEFAULT_LINKER_OPTIONS, LinkerOptions} from './linker_options';
+import {Translator} from './translator';
+
+export class LinkerEnvironment<TStatement, TExpression> {
+  readonly translator = new Translator<TStatement, TExpression>(this.factory);
+  private constructor(
+      readonly host: AstHost<TExpression>, readonly factory: AstFactory<TStatement, TExpression>,
+      readonly options: LinkerOptions) {}
+
+  static create<TStatement, TExpression>(
+      host: AstHost<TExpression>, factory: AstFactory<TStatement, TExpression>,
+      options: Partial<LinkerOptions>): LinkerEnvironment<TStatement, TExpression> {
+    return new LinkerEnvironment(host, factory, {...DEFAULT_LINKER_OPTIONS, ...options});
+  }
+}
diff --git a/packages/compiler-cli/linker/src/file_linker/linker_options.ts b/packages/compiler-cli/linker/src/file_linker/linker_options.ts
new file mode 100644
index 0000000000000..d76de5b57760e
--- /dev/null
+++ b/packages/compiler-cli/linker/src/file_linker/linker_options.ts
@@ -0,0 +1,31 @@
+/**
+ * @license
+ * Copyright Google LLC 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
+ */
+
+/**
+ * Options to configure the linking behavior.
+ */
+export interface LinkerOptions {
+  /**
+   * Whether to generate legacy i18n message ids.
+   * The default is `true`.
+   */
+  enableI18nLegacyMessageIdFormat: boolean;
+  /**
+   * Whether to convert all line-endings in ICU expressions to `\n` characters.
+   * The default is `false`.
+   */
+  i18nNormalizeLineEndingsInICUs: boolean;
+}
+
+/**
+ * The default linker options to use if properties are not provided.
+ */
+export const DEFAULT_LINKER_OPTIONS: LinkerOptions = {
+  enableI18nLegacyMessageIdFormat: true,
+  i18nNormalizeLineEndingsInICUs: false,
+};
diff --git a/packages/compiler-cli/linker/src/file_linker/partial_linkers/partial_component_linker_1.ts b/packages/compiler-cli/linker/src/file_linker/partial_linkers/partial_component_linker_1.ts
new file mode 100644
index 0000000000000..1c7bcde2428f9
--- /dev/null
+++ b/packages/compiler-cli/linker/src/file_linker/partial_linkers/partial_component_linker_1.ts
@@ -0,0 +1,25 @@
+/**
+ * @license
+ * Copyright Google LLC 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 '@angular/compiler';
+import * as o from '@angular/compiler/src/output/output_ast';
+
+import {AstObject} from '../../ast/ast_value';
+
+import {PartialLinker} from './partial_linker';
+
+/**
+ * A `PartialLinker` that is designed to process `$ngDeclareComponent()` call expressions.
+ */
+export class PartialComponentLinkerVersion1<TStatement, TExpression> implements
+    PartialLinker<TStatement, TExpression> {
+  linkPartialDeclaration(
+      sourceUrl: string, code: string, constantPool: ConstantPool,
+      metaObj: AstObject<TExpression>): o.Expression {
+    throw new Error('Not implemented.');
+  }
+}
diff --git a/packages/compiler-cli/linker/src/file_linker/partial_linkers/partial_directive_linker_1.ts b/packages/compiler-cli/linker/src/file_linker/partial_linkers/partial_directive_linker_1.ts
new file mode 100644
index 0000000000000..bd3e8b80a9d00
--- /dev/null
+++ b/packages/compiler-cli/linker/src/file_linker/partial_linkers/partial_directive_linker_1.ts
@@ -0,0 +1,25 @@
+/**
+ * @license
+ * Copyright Google LLC 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 '@angular/compiler';
+import * as o from '@angular/compiler/src/output/output_ast';
+
+import {AstObject} from '../../ast/ast_value';
+
+import {PartialLinker} from './partial_linker';
+
+/**
+ * A `PartialLinker` that is designed to process `$ngDeclareDirective()` call expressions.
+ */
+export class PartialDirectiveLinkerVersion1<TStatement, TExpression> implements
+    PartialLinker<TStatement, TExpression> {
+  linkPartialDeclaration(
+      sourceUrl: string, code: string, constantPool: ConstantPool,
+      metaObj: AstObject<TExpression>): o.Expression {
+    throw new Error('Not implemented.');
+  }
+}
diff --git a/packages/compiler-cli/linker/src/file_linker/partial_linkers/partial_linker.ts b/packages/compiler-cli/linker/src/file_linker/partial_linkers/partial_linker.ts
new file mode 100644
index 0000000000000..cc5031f165f5c
--- /dev/null
+++ b/packages/compiler-cli/linker/src/file_linker/partial_linkers/partial_linker.ts
@@ -0,0 +1,22 @@
+/**
+ * @license
+ * Copyright Google LLC 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 '@angular/compiler';
+import * as o from '@angular/compiler/src/output/output_ast';
+import {AstObject} from '../../ast/ast_value';
+
+/**
+ * An interface for classes that can link partial declarations into full definitions.
+ */
+export interface PartialLinker<TStatement, TExpression> {
+  /**
+   * Link the partial declaration `metaObj` information to generate a full definition expression.
+   */
+  linkPartialDeclaration(
+      sourceUrl: string, code: string, constantPool: ConstantPool,
+      metaObj: AstObject<TExpression>): o.Expression;
+}
diff --git a/packages/compiler-cli/linker/src/file_linker/partial_linkers/partial_linker_selector.ts b/packages/compiler-cli/linker/src/file_linker/partial_linkers/partial_linker_selector.ts
new file mode 100644
index 0000000000000..ba6ffe6aa2f3a
--- /dev/null
+++ b/packages/compiler-cli/linker/src/file_linker/partial_linkers/partial_linker_selector.ts
@@ -0,0 +1,44 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {PartialComponentLinkerVersion1} from './partial_component_linker_1';
+import {PartialDirectiveLinkerVersion1} from './partial_directive_linker_1';
+import {PartialLinker} from './partial_linker';
+
+export class PartialLinkerSelector<TStatement, TExpression> {
+  private linkers: Record<string, Record<number, PartialLinker<TStatement, TExpression>>> = {
+    '$ngDeclareDirective': {
+      1: new PartialDirectiveLinkerVersion1(),
+    },
+    '$ngDeclareComponent': {
+      1: new PartialComponentLinkerVersion1(),
+    },
+  };
+
+  /**
+   * Returns true if there are `PartialLinker` classes that can handle functions with this name.
+   */
+  supportsDeclaration(functionName: string): boolean {
+    return this.linkers[functionName] !== undefined;
+  }
+
+  /**
+   * Returns the `PartialLinker` that can handle functions with the given name and version.
+   * Throws an error if there is none.
+   */
+  getLinker(functionName: string, version: number): PartialLinker<TStatement, TExpression> {
+    const versions = this.linkers[functionName];
+    if (versions === undefined) {
+      throw new Error(`Unknown partial declaration function ${functionName}.`);
+    }
+    const linker = versions[version];
+    if (linker === undefined) {
+      throw new Error(`Unsupported partial declaration version ${version} for ${functionName}.`);
+    }
+    return linker;
+  }
+}
diff --git a/packages/compiler-cli/linker/src/file_linker/translator.ts b/packages/compiler-cli/linker/src/file_linker/translator.ts
new file mode 100644
index 0000000000000..7e55f297dcbb1
--- /dev/null
+++ b/packages/compiler-cli/linker/src/file_linker/translator.ts
@@ -0,0 +1,39 @@
+/**
+ * @license
+ * Copyright Google LLC 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 '@angular/compiler';
+import {AstFactory, Context, ExpressionTranslatorVisitor, ImportGenerator, TranslatorOptions} from '@angular/compiler-cli/src/ngtsc/translator';
+
+/**
+ * Generic translator helper class, which exposes methods for translating expressions and
+ * statements.
+ */
+export class Translator<TStatement, TExpression> {
+  constructor(private factory: AstFactory<TStatement, TExpression>) {}
+
+  /**
+   * Translate the given output AST in the context of an expression.
+   */
+  translateExpression(
+      expression: o.Expression, imports: ImportGenerator<TExpression>,
+      options: TranslatorOptions<TExpression> = {}): TExpression {
+    return expression.visitExpression(
+        new ExpressionTranslatorVisitor<TStatement, TExpression>(this.factory, imports, options),
+        new Context(false));
+  }
+
+  /**
+   * Translate the given output AST in the context of a statement.
+   */
+  translateStatement(
+      statement: o.Statement, imports: ImportGenerator<TExpression>,
+      options: TranslatorOptions<TExpression> = {}): TStatement {
+    return statement.visitStatement(
+        new ExpressionTranslatorVisitor<TStatement, TExpression>(this.factory, imports, options),
+        new Context(true));
+  }
+}
diff --git a/packages/compiler-cli/linker/src/linker_import_generator.ts b/packages/compiler-cli/linker/src/linker_import_generator.ts
new file mode 100644
index 0000000000000..d3c4b923250b5
--- /dev/null
+++ b/packages/compiler-cli/linker/src/linker_import_generator.ts
@@ -0,0 +1,38 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {ImportGenerator, NamedImport} from '../../src/ngtsc/translator';
+import {FatalLinkerError} from './fatal_linker_error';
+
+/**
+ * A class that is used to generate imports when translating from Angular Output AST to an AST to
+ * render, such as Babel.
+ *
+ * Note that, in the linker, there can only be imports from `@angular/core` and that these imports
+ * must be achieved by property access on an `ng` namespace identifer, which is passed in via the
+ * constructor.
+ */
+export class LinkerImportGenerator<TExpression> implements ImportGenerator<TExpression> {
+  constructor(private ngImport: TExpression) {}
+
+  generateNamespaceImport(moduleName: string): TExpression {
+    this.assertModuleName(moduleName);
+    return this.ngImport;
+  }
+
+  generateNamedImport(moduleName: string, originalSymbol: string): NamedImport<TExpression> {
+    this.assertModuleName(moduleName);
+    return {moduleImport: this.ngImport, symbol: originalSymbol};
+  }
+
+  private assertModuleName(moduleName: string): void {
+    if (moduleName !== '@angular/core') {
+      throw new FatalLinkerError(
+          this.ngImport, `Unable to import from anything other than '@angular/core'`);
+    }
+  }
+}
diff --git a/packages/compiler-cli/linker/test/BUILD.bazel b/packages/compiler-cli/linker/test/BUILD.bazel
new file mode 100644
index 0000000000000..5a3008dcc076a
--- /dev/null
+++ b/packages/compiler-cli/linker/test/BUILD.bazel
@@ -0,0 +1,26 @@
+load("//tools:defaults.bzl", "jasmine_node_test", "ts_library")
+
+package(default_visibility = ["//visibility:public"])
+
+ts_library(
+    name = "test_lib",
+    testonly = True,
+    srcs = glob([
+        "**/*.ts",
+    ]),
+    deps = [
+        "//packages:types",
+        "//packages/compiler",
+        "//packages/compiler-cli/linker",
+        "//packages/compiler-cli/src/ngtsc/translator",
+        "@npm//typescript",
+    ],
+)
+
+jasmine_node_test(
+    name = "test",
+    bootstrap = ["//tools/testing:node_no_angular_es5"],
+    deps = [
+        ":test_lib",
+    ],
+)
diff --git a/packages/compiler-cli/linker/test/ast/ast_value_spec.ts b/packages/compiler-cli/linker/test/ast/ast_value_spec.ts
new file mode 100644
index 0000000000000..711b996cfc17f
--- /dev/null
+++ b/packages/compiler-cli/linker/test/ast/ast_value_spec.ts
@@ -0,0 +1,318 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {WrappedNodeExpr} from '@angular/compiler';
+import {TypeScriptAstFactory} from '@angular/compiler-cli/src/ngtsc/translator';
+import * as ts from 'typescript';
+
+import {AstObject, AstValue} from '../../src/ast/ast_value';
+import {TypeScriptAstHost} from '../../src/ast/typescript/typescript_ast_host';
+
+const host = new TypeScriptAstHost();
+const factory = new TypeScriptAstFactory();
+const nestedObj = factory.createObjectLiteral([
+  {propertyName: 'x', quoted: false, value: factory.createLiteral(42)},
+  {propertyName: 'y', quoted: false, value: factory.createLiteral('X')},
+]);
+const nestedArray =
+    factory.createArrayLiteral([factory.createLiteral(1), factory.createLiteral(2)]);
+const obj = AstObject.parse(
+    factory.createObjectLiteral([
+      {propertyName: 'a', quoted: false, value: factory.createLiteral(42)},
+      {propertyName: 'b', quoted: false, value: factory.createLiteral('X')},
+      {propertyName: 'c', quoted: false, value: factory.createLiteral(true)},
+      {propertyName: 'd', quoted: false, value: nestedObj},
+      {propertyName: 'e', quoted: false, value: nestedArray},
+    ]),
+    host);
+
+describe('AstObject', () => {
+  describe('has()', () => {
+    it('should return true if the property exists on the object', () => {
+      expect(obj.has('a')).toBe(true);
+      expect(obj.has('b')).toBe(true);
+      expect(obj.has('z')).toBe(false);
+    });
+  });
+
+  describe('getNumber()', () => {
+    it('should return the number value of the property', () => {
+      expect(obj.getNumber('a')).toEqual(42);
+    });
+
+    it('should throw an error if the property is not a number', () => {
+      expect(() => obj.getNumber('b'))
+          .toThrowError('Unsupported syntax, expected a numeric literal.');
+    });
+  });
+
+  describe('getString()', () => {
+    it('should return the string value of the property', () => {
+      expect(obj.getString('b')).toEqual('X');
+    });
+
+    it('should throw an error if the property is not a string', () => {
+      expect(() => obj.getString('a'))
+          .toThrowError('Unsupported syntax, expected a string literal.');
+    });
+  });
+
+  describe('getBoolean()', () => {
+    it('should return the boolean value of the property', () => {
+      expect(obj.getBoolean('c')).toEqual(true);
+    });
+
+    it('should throw an error if the property is not a boolean', () => {
+      expect(() => obj.getBoolean('b'))
+          .toThrowError('Unsupported syntax, expected a boolean literal.');
+    });
+  });
+
+  describe('getObject()', () => {
+    it('should return an AstObject instance parsed from the value of the property', () => {
+      expect(obj.getObject('d')).toEqual(AstObject.parse(nestedObj, host));
+    });
+
+    it('should throw an error if the property is not an object expression', () => {
+      expect(() => obj.getObject('b'))
+          .toThrowError('Unsupported syntax, expected an object literal.');
+    });
+  });
+
+  describe('getArray()', () => {
+    it('should return an array of AstValue instances of parsed from the value of the property',
+       () => {
+         expect(obj.getArray('e')).toEqual([
+           new AstValue(factory.createLiteral(1), host),
+           new AstValue(factory.createLiteral(2), host)
+         ]);
+       });
+
+    it('should throw an error if the property is not an array of expressions', () => {
+      expect(() => obj.getArray('b'))
+          .toThrowError('Unsupported syntax, expected an array literal.');
+    });
+  });
+
+  describe('getOpaque()', () => {
+    it('should return the expression value of the property wrapped in a `WrappedNodeExpr`', () => {
+      expect(obj.getOpaque('d')).toEqual(jasmine.any(WrappedNodeExpr));
+      expect(obj.getOpaque('d').node).toEqual(obj.getNode('d'));
+    });
+
+    it('should throw an error if the property does not exist', () => {
+      expect(() => obj.getOpaque('x')).toThrowError('Expected property \'x\' to be present.');
+    });
+  });
+
+  describe('getNode()', () => {
+    it('should return the original expression value of the property', () => {
+      expect(obj.getNode('a')).toEqual(factory.createLiteral(42));
+    });
+
+    it('should throw an error if the property does not exist', () => {
+      expect(() => obj.getNode('x')).toThrowError('Expected property \'x\' to be present.');
+    });
+  });
+
+  describe('getValue()', () => {
+    it('should return the expression value of the property wrapped in an `AstValue`', () => {
+      expect(obj.getValue('a')).toEqual(jasmine.any(AstValue));
+      expect(obj.getValue('a').getNumber()).toEqual(42);
+    });
+
+    it('should throw an error if the property does not exist', () => {
+      expect(() => obj.getValue('x')).toThrowError('Expected property \'x\' to be present.');
+    });
+  });
+
+  describe('toLiteral()', () => {
+    it('should convert the AstObject to a raw object with each property mapped', () => {
+      expect(obj.toLiteral(value => value.getOpaque())).toEqual({
+        a: obj.getOpaque('a'),
+        b: obj.getOpaque('b'),
+        c: obj.getOpaque('c'),
+        d: obj.getOpaque('d'),
+        e: obj.getOpaque('e'),
+      });
+    });
+  });
+});
+
+describe('AstValue', () => {
+  describe('isNumber', () => {
+    it('should return true if the value is a number', () => {
+      expect(new AstValue(factory.createLiteral(42), host).isNumber()).toEqual(true);
+    });
+
+    it('should return false if the value is not a number', () => {
+      expect(new AstValue(factory.createLiteral('a'), host).isNumber()).toEqual(false);
+    });
+  });
+
+  describe('getNumber', () => {
+    it('should return the number value of the AstValue', () => {
+      expect(new AstValue(factory.createLiteral(42), host).getNumber()).toEqual(42);
+    });
+
+    it('should throw an error if the property is not a number', () => {
+      expect(() => new AstValue(factory.createLiteral('a'), host).getNumber())
+          .toThrowError('Unsupported syntax, expected a numeric literal.');
+    });
+  });
+
+  describe('isString', () => {
+    it('should return true if the value is a string', () => {
+      expect(new AstValue(factory.createLiteral('a'), host).isString()).toEqual(true);
+    });
+
+    it('should return false if the value is not a string', () => {
+      expect(new AstValue(factory.createLiteral(42), host).isString()).toEqual(false);
+    });
+  });
+
+  describe('getString', () => {
+    it('should return the string value of the AstValue', () => {
+      expect(new AstValue(factory.createLiteral('X'), host).getString()).toEqual('X');
+    });
+
+    it('should throw an error if the property is not a string', () => {
+      expect(() => new AstValue(factory.createLiteral(42), host).getString())
+          .toThrowError('Unsupported syntax, expected a string literal.');
+    });
+  });
+
+  describe('isBoolean', () => {
+    it('should return true if the value is a boolean', () => {
+      expect(new AstValue(factory.createLiteral(true), host).isBoolean()).toEqual(true);
+    });
+
+    it('should return false if the value is not a boolean', () => {
+      expect(new AstValue(factory.createLiteral(42), host).isBoolean()).toEqual(false);
+    });
+  });
+
+  describe('getBoolean', () => {
+    it('should return the boolean value of the AstValue', () => {
+      expect(new AstValue(factory.createLiteral(true), host).getBoolean()).toEqual(true);
+    });
+
+    it('should throw an error if the property is not a boolean', () => {
+      expect(() => new AstValue(factory.createLiteral(42), host).getBoolean())
+          .toThrowError('Unsupported syntax, expected a boolean literal.');
+    });
+  });
+
+  describe('isObject', () => {
+    it('should return true if the value is an object literal', () => {
+      expect(new AstValue(nestedObj, host).isObject()).toEqual(true);
+    });
+
+    it('should return false if the value is not an object literal', () => {
+      expect(new AstValue(factory.createLiteral(42), host).isObject()).toEqual(false);
+    });
+  });
+
+  describe('getObject', () => {
+    it('should return the AstObject value of the AstValue', () => {
+      expect(new AstValue(nestedObj, host).getObject()).toEqual(AstObject.parse(nestedObj, host));
+    });
+
+    it('should throw an error if the property is not an object literal', () => {
+      expect(() => new AstValue(factory.createLiteral(42), host).getObject())
+          .toThrowError('Unsupported syntax, expected an object literal.');
+    });
+  });
+
+  describe('isArray', () => {
+    it('should return true if the value is an array literal', () => {
+      expect(new AstValue(nestedArray, host).isArray()).toEqual(true);
+    });
+
+    it('should return false if the value is not an object literal', () => {
+      expect(new AstValue(factory.createLiteral(42), host).isArray()).toEqual(false);
+    });
+  });
+
+  describe('getArray', () => {
+    it('should return an array of AstValue objects from the AstValue', () => {
+      expect(new AstValue(nestedArray, host).getArray()).toEqual([
+        new AstValue(factory.createLiteral(1), host),
+        new AstValue(factory.createLiteral(2), host),
+      ]);
+    });
+
+    it('should throw an error if the property is not an array', () => {
+      expect(() => new AstValue(factory.createLiteral(42), host).getArray())
+          .toThrowError('Unsupported syntax, expected an array literal.');
+    });
+  });
+
+  describe('isFunction', () => {
+    it('should return true if the value is a function expression', () => {
+      const funcExpr = factory.createFunctionExpression(
+          'foo', [],
+          factory.createBlock([factory.createReturnStatement(factory.createLiteral(42))]));
+      expect(new AstValue(funcExpr, host).isFunction()).toEqual(true);
+    });
+
+    it('should return false if the value is not a function expression', () => {
+      expect(new AstValue(factory.createLiteral(42), host).isFunction()).toEqual(false);
+    });
+  });
+
+  describe('getFunctionReturnValue', () => {
+    it('should return the "return value" of the function expression', () => {
+      const funcExpr = factory.createFunctionExpression(
+          'foo', [],
+          factory.createBlock([factory.createReturnStatement(factory.createLiteral(42))]));
+      expect(new AstValue(funcExpr, host).getFunctionReturnValue())
+          .toEqual(new AstValue(factory.createLiteral(42), host));
+    });
+
+    it('should throw an error if the property is not a function expression', () => {
+      expect(() => new AstValue(factory.createLiteral(42), host).getFunctionReturnValue())
+          .toThrowError('Unsupported syntax, expected a function.');
+    });
+
+    it('should throw an error if the property is a function expression with no return value',
+       () => {
+         const funcExpr = factory.createFunctionExpression(
+             'foo', [], factory.createBlock([factory.createExpressionStatement(
+                            factory.createLiteral('do nothing'))]));
+         expect(() => new AstValue(funcExpr, host).getFunctionReturnValue())
+             .toThrowError(
+                 'Unsupported syntax, expected a function body with a single return statement.');
+       });
+  });
+
+  describe('getOpaque()', () => {
+    it('should return the value wrapped in a `WrappedNodeExpr`', () => {
+      expect(new AstValue(factory.createLiteral(42), host).getOpaque())
+          .toEqual(jasmine.any(WrappedNodeExpr));
+      expect(new AstValue(factory.createLiteral(42), host).getOpaque().node)
+          .toEqual(factory.createLiteral(42));
+    });
+  });
+
+  describe('getRange()', () => {
+    it('should return the source range of the AST node', () => {
+      const file = ts.createSourceFile(
+          'test.ts', '// preamble\nx = \'moo\';', ts.ScriptTarget.ES2015,
+          /* setParentNodes */ true);
+
+      // Grab the `'moo'` string literal from the generated AST
+      const stmt = file.statements[0] as ts.ExpressionStatement;
+      const mooString =
+          (stmt.expression as ts.AssignmentExpression<ts.Token<ts.SyntaxKind.EqualsToken>>).right;
+
+      // Check that this string literal has the expected range.
+      expect(new AstValue(mooString, host).getRange())
+          .toEqual({startLine: 1, startCol: 4, startPos: 16, endPos: 21});
+    });
+  });
+});
diff --git a/packages/compiler-cli/linker/test/ast/typescript/typescript_ast_host_spec.ts b/packages/compiler-cli/linker/test/ast/typescript/typescript_ast_host_spec.ts
new file mode 100644
index 0000000000000..68dd6ad9b4827
--- /dev/null
+++ b/packages/compiler-cli/linker/test/ast/typescript/typescript_ast_host_spec.ts
@@ -0,0 +1,289 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {TypeScriptAstHost} from '../../../src/ast/typescript/typescript_ast_host';
+
+describe('TypeScriptAstHost', () => {
+  let host: TypeScriptAstHost;
+  beforeEach(() => host = new TypeScriptAstHost());
+
+  describe('getSymbolName()', () => {
+    it('should return the name of an identifier', () => {
+      expect(host.getSymbolName(expr('someIdentifier'))).toEqual('someIdentifier');
+    });
+
+    it('should return the name of an identifier at the end of a property access chain', () => {
+      expect(host.getSymbolName(expr('a.b.c.someIdentifier'))).toEqual('someIdentifier');
+    });
+
+    it('should return null if the expression has no identifier', () => {
+      expect(host.getSymbolName(expr('42'))).toBe(null);
+    });
+  });
+
+  describe('isStringLiteral()', () => {
+    it('should return true if the expression is a string literal', () => {
+      expect(host.isStringLiteral(expr('"moo"'))).toBe(true);
+      expect(host.isStringLiteral(expr('\'moo\''))).toBe(true);
+    });
+
+    it('should return false if the expression is not a string literal', () => {
+      expect(host.isStringLiteral(expr('true'))).toBe(false);
+      expect(host.isStringLiteral(expr('someIdentifier'))).toBe(false);
+      expect(host.isStringLiteral(expr('42'))).toBe(false);
+      expect(host.isStringLiteral(rhs('x = {}'))).toBe(false);
+      expect(host.isStringLiteral(expr('[]'))).toBe(false);
+      expect(host.isStringLiteral(expr('null'))).toBe(false);
+      expect(host.isStringLiteral(expr('\'a\' + \'b\''))).toBe(false);
+    });
+
+    it('should return false if the expression is a template string', () => {
+      expect(host.isStringLiteral(expr('\`moo\`'))).toBe(false);
+    });
+  });
+
+  describe('parseStringLiteral()', () => {
+    it('should extract the string value', () => {
+      expect(host.parseStringLiteral(expr('"moo"'))).toEqual('moo');
+      expect(host.parseStringLiteral(expr('\'moo\''))).toEqual('moo');
+    });
+
+    it('should error if the value is not a string literal', () => {
+      expect(() => host.parseStringLiteral(expr('42')))
+          .toThrowError('Unsupported syntax, expected a string literal.');
+    });
+  });
+
+  describe('isNumericLiteral()', () => {
+    it('should return true if the expression is a number literal', () => {
+      expect(host.isNumericLiteral(expr('42'))).toBe(true);
+    });
+
+    it('should return false if the expression is not a number literal', () => {
+      expect(host.isStringLiteral(expr('true'))).toBe(false);
+      expect(host.isNumericLiteral(expr('"moo"'))).toBe(false);
+      expect(host.isNumericLiteral(expr('\'moo\''))).toBe(false);
+      expect(host.isNumericLiteral(expr('someIdentifier'))).toBe(false);
+      expect(host.isNumericLiteral(rhs('x = {}'))).toBe(false);
+      expect(host.isNumericLiteral(expr('[]'))).toBe(false);
+      expect(host.isNumericLiteral(expr('null'))).toBe(false);
+      expect(host.isNumericLiteral(expr('\'a\' + \'b\''))).toBe(false);
+      expect(host.isNumericLiteral(expr('\`moo\`'))).toBe(false);
+    });
+  });
+
+  describe('parseNumericLiteral()', () => {
+    it('should extract the number value', () => {
+      expect(host.parseNumericLiteral(expr('42'))).toEqual(42);
+    });
+
+    it('should error if the value is not a numeric literal', () => {
+      expect(() => host.parseNumericLiteral(expr('"moo"')))
+          .toThrowError('Unsupported syntax, expected a numeric literal.');
+    });
+  });
+
+  describe('isBooleanLiteral()', () => {
+    it('should return true if the expression is a boolean literal', () => {
+      expect(host.isBooleanLiteral(expr('true'))).toBe(true);
+      expect(host.isBooleanLiteral(expr('false'))).toBe(true);
+    });
+
+    it('should return false if the expression is not a boolean literal', () => {
+      expect(host.isBooleanLiteral(expr('"moo"'))).toBe(false);
+      expect(host.isBooleanLiteral(expr('\'moo\''))).toBe(false);
+      expect(host.isBooleanLiteral(expr('someIdentifier'))).toBe(false);
+      expect(host.isBooleanLiteral(expr('42'))).toBe(false);
+      expect(host.isBooleanLiteral(rhs('x = {}'))).toBe(false);
+      expect(host.isBooleanLiteral(expr('[]'))).toBe(false);
+      expect(host.isBooleanLiteral(expr('null'))).toBe(false);
+      expect(host.isBooleanLiteral(expr('\'a\' + \'b\''))).toBe(false);
+      expect(host.isBooleanLiteral(expr('\`moo\`'))).toBe(false);
+    });
+  });
+
+  describe('parseBooleanLiteral()', () => {
+    it('should extract the boolean value', () => {
+      expect(host.parseBooleanLiteral(expr('true'))).toEqual(true);
+      expect(host.parseBooleanLiteral(expr('false'))).toEqual(false);
+    });
+
+    it('should error if the value is not a boolean literal', () => {
+      expect(() => host.parseBooleanLiteral(expr('"moo"')))
+          .toThrowError('Unsupported syntax, expected a boolean literal.');
+    });
+  });
+
+  describe('isArrayLiteral()', () => {
+    it('should return true if the expression is an array literal', () => {
+      expect(host.isArrayLiteral(expr('[]'))).toBe(true);
+      expect(host.isArrayLiteral(expr('[1, 2, 3]'))).toBe(true);
+      expect(host.isArrayLiteral(expr('[[], []]'))).toBe(true);
+    });
+
+    it('should return false if the expression is not an array literal', () => {
+      expect(host.isArrayLiteral(expr('"moo"'))).toBe(false);
+      expect(host.isArrayLiteral(expr('\'moo\''))).toBe(false);
+      expect(host.isArrayLiteral(expr('someIdentifier'))).toBe(false);
+      expect(host.isArrayLiteral(expr('42'))).toBe(false);
+      expect(host.isArrayLiteral(rhs('x = {}'))).toBe(false);
+      expect(host.isArrayLiteral(expr('null'))).toBe(false);
+      expect(host.isArrayLiteral(expr('\'a\' + \'b\''))).toBe(false);
+      expect(host.isArrayLiteral(expr('\`moo\`'))).toBe(false);
+    });
+  });
+
+  describe('parseArrayLiteral()', () => {
+    it('should extract the expressions in the array', () => {
+      const moo = jasmine.objectContaining({text: 'moo', kind: ts.SyntaxKind.StringLiteral});
+      expect(host.parseArrayLiteral(expr('[]'))).toEqual([]);
+      expect(host.parseArrayLiteral(expr('[\'moo\']'))).toEqual([moo]);
+    });
+
+    it('should error if there is an empty item', () => {
+      expect(() => host.parseArrayLiteral(expr('[,]')))
+          .toThrowError('Unsupported syntax, expected element in array not to be empty.');
+    });
+
+    it('should error if there is a spread element', () => {
+      expect(() => host.parseArrayLiteral(expr('[...[0,1]]')))
+          .toThrowError('Unsupported syntax, expected element in array not to use spread syntax.');
+    });
+  });
+
+  describe('isObjectLiteral()', () => {
+    it('should return true if the expression is an object literal', () => {
+      expect(host.isObjectLiteral(rhs('x = {}'))).toBe(true);
+      expect(host.isObjectLiteral(rhs('x = { foo: \'bar\' }'))).toBe(true);
+    });
+
+    it('should return false if the expression is not an object literal', () => {
+      expect(host.isObjectLiteral(rhs('x = "moo"'))).toBe(false);
+      expect(host.isObjectLiteral(rhs('x = \'moo\''))).toBe(false);
+      expect(host.isObjectLiteral(rhs('x = someIdentifier'))).toBe(false);
+      expect(host.isObjectLiteral(rhs('x = 42'))).toBe(false);
+      expect(host.isObjectLiteral(rhs('x = []'))).toBe(false);
+      expect(host.isObjectLiteral(rhs('x = null'))).toBe(false);
+      expect(host.isObjectLiteral(rhs('x = \'a\' + \'b\''))).toBe(false);
+      expect(host.isObjectLiteral(rhs('x = \`moo\`'))).toBe(false);
+    });
+  });
+
+  describe('parseObjectLiteral()', () => {
+    it('should extract the properties from the object', () => {
+      const moo = jasmine.objectContaining({text: 'moo', kind: ts.SyntaxKind.StringLiteral});
+      expect(host.parseObjectLiteral(rhs('x = {}'))).toEqual(new Map());
+      expect(host.parseObjectLiteral(rhs('x = {a: \'moo\'}'))).toEqual(new Map([['a', moo]]));
+    });
+
+    it('should error if there is a method', () => {
+      expect(() => host.parseObjectLiteral(rhs('x = { foo() {} }')))
+          .toThrowError('Unsupported syntax, expected a property assignment.');
+    });
+
+    it('should error if there is a spread element', () => {
+      expect(() => host.parseObjectLiteral(rhs('x = {...{ a: \'moo\' }}')))
+          .toThrowError('Unsupported syntax, expected a property assignment.');
+    });
+  });
+
+  describe('isFunctionExpression()', () => {
+    it('should return true if the expression is a function', () => {
+      expect(host.isFunctionExpression(rhs('x = function() {}'))).toBe(true);
+      expect(host.isFunctionExpression(rhs('x = function foo() {}'))).toBe(true);
+      expect(host.isFunctionExpression(rhs('x = () => {}'))).toBe(true);
+      expect(host.isFunctionExpression(rhs('x = () => true'))).toBe(true);
+    });
+
+    it('should return false if the expression is not a function', () => {
+      expect(host.isFunctionExpression(expr('[]'))).toBe(false);
+      expect(host.isFunctionExpression(expr('"moo"'))).toBe(false);
+      expect(host.isFunctionExpression(expr('\'moo\''))).toBe(false);
+      expect(host.isFunctionExpression(expr('someIdentifier'))).toBe(false);
+      expect(host.isFunctionExpression(expr('42'))).toBe(false);
+      expect(host.isFunctionExpression(rhs('x = {}'))).toBe(false);
+      expect(host.isFunctionExpression(expr('null'))).toBe(false);
+      expect(host.isFunctionExpression(expr('\'a\' + \'b\''))).toBe(false);
+      expect(host.isFunctionExpression(expr('\`moo\`'))).toBe(false);
+    });
+  });
+
+  describe('parseReturnValue()', () => {
+    it('should extract the return value of a function', () => {
+      const moo = jasmine.objectContaining({text: 'moo', kind: ts.SyntaxKind.StringLiteral});
+      expect(host.parseReturnValue(rhs('x = function() { return \'moo\'; }'))).toEqual(moo);
+    });
+
+    it('should extract the value of a simple arrow function', () => {
+      const moo = jasmine.objectContaining({text: 'moo', kind: ts.SyntaxKind.StringLiteral});
+      expect(host.parseReturnValue(rhs('x = () => \'moo\''))).toEqual(moo);
+    });
+
+    it('should extract the return value of an arrow function', () => {
+      const moo = jasmine.objectContaining({text: 'moo', kind: ts.SyntaxKind.StringLiteral});
+      expect(host.parseReturnValue(rhs('x = () => { return \'moo\' }'))).toEqual(moo);
+    });
+
+    it('should error if the body has 0 statements', () => {
+      expect(() => host.parseReturnValue(rhs('x = function () { }')))
+          .toThrowError(
+              'Unsupported syntax, expected a function body with a single return statement.');
+      expect(() => host.parseReturnValue(rhs('x = () => { }')))
+          .toThrowError(
+              'Unsupported syntax, expected a function body with a single return statement.');
+    });
+
+    it('should error if the body has more than 1 statement', () => {
+      expect(() => host.parseReturnValue(rhs('x = function () { const x = 10; return x; }')))
+          .toThrowError(
+              'Unsupported syntax, expected a function body with a single return statement.');
+      expect(() => host.parseReturnValue(rhs('x = () => { const x = 10; return x; }')))
+          .toThrowError(
+              'Unsupported syntax, expected a function body with a single return statement.');
+    });
+
+    it('should error if the single statement is not a return statement', () => {
+      expect(() => host.parseReturnValue(rhs('x = function () { const x = 10; }')))
+          .toThrowError(
+              'Unsupported syntax, expected a function body with a single return statement.');
+      expect(() => host.parseReturnValue(rhs('x = () => { const x = 10; }')))
+          .toThrowError(
+              'Unsupported syntax, expected a function body with a single return statement.');
+    });
+  });
+
+  describe('getRange()', () => {
+    it('should extract the range from the expression', () => {
+      const moo = rhs('// preamble\nx = \'moo\';');
+      expect(host.getRange(moo)).toEqual({startLine: 1, startCol: 4, startPos: 16, endPos: 21});
+    });
+
+    it('should error if the nodes do not have attached parents', () => {
+      const moo = rhs('// preamble\nx = \'moo\';', false);
+      expect(() => host.getRange(moo))
+          .toThrowError('Unable to read range for node - it is missing parent information.');
+    });
+  });
+});
+
+function stmt(code: string, attachParents = true): ts.Statement {
+  const sf = ts.createSourceFile('test.ts', code, ts.ScriptTarget.ES2015, attachParents);
+  return sf.statements[0];
+}
+
+function expr(code: string, attachParents = true): ts.Expression {
+  return (stmt(code, attachParents) as ts.ExpressionStatement).expression;
+}
+
+function rhs(code: string, attachParents = true): ts.Expression {
+  const e = expr(code, attachParents);
+  if (!ts.isBinaryExpression(e)) {
+    throw new Error('Bad test - expected a binary expression');
+  }
+  return e.right;
+}
diff --git a/packages/compiler-cli/linker/test/fatal_linker_error_spec.ts b/packages/compiler-cli/linker/test/fatal_linker_error_spec.ts
new file mode 100644
index 0000000000000..1b4572fff86fd
--- /dev/null
+++ b/packages/compiler-cli/linker/test/fatal_linker_error_spec.ts
@@ -0,0 +1,29 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {FatalLinkerError, isFatalLinkerError} from '../src/fatal_linker_error';
+
+describe('FatalLinkerError', () => {
+  it('should expose the `node` and `message`', () => {
+    const node = {};
+    expect(new FatalLinkerError(node, 'Some message'))
+        .toEqual(jasmine.objectContaining({node, message: 'Some message'}));
+  });
+});
+
+describe('isFatalLinkerError()', () => {
+  it('should return true if the error is of type `FatalLinkerError`', () => {
+    const error = new FatalLinkerError({}, 'Some message');
+    expect(isFatalLinkerError(error)).toBe(true);
+  });
+
+  it('should return false if the error is not of type `FatalLinkerError`', () => {
+    const error = new Error('Some message');
+    expect(isFatalLinkerError(error)).toBe(false);
+  });
+});
diff --git a/packages/compiler-cli/linker/test/file_linker/emit_scopes/emit_scope_spec.ts b/packages/compiler-cli/linker/test/file_linker/emit_scopes/emit_scope_spec.ts
new file mode 100644
index 0000000000000..3484f3978d32a
--- /dev/null
+++ b/packages/compiler-cli/linker/test/file_linker/emit_scopes/emit_scope_spec.ts
@@ -0,0 +1,77 @@
+/**
+ * @license
+ * Copyright Google LLC 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 '@angular/compiler/src/output/output_ast';
+import * as ts from 'typescript';
+
+import {TypeScriptAstFactory} from '../../../../src/ngtsc/translator';
+import {TypeScriptAstHost} from '../../../src/ast/typescript/typescript_ast_host';
+import {EmitScope} from '../../../src/file_linker/emit_scopes/emit_scope';
+import {LinkerEnvironment} from '../../../src/file_linker/linker_environment';
+import {DEFAULT_LINKER_OPTIONS} from '../../../src/file_linker/linker_options';
+import {generate} from '../helpers';
+
+describe('EmitScope', () => {
+  describe('translateDefinition()', () => {
+    it('should translate the given output AST into a TExpression', () => {
+      const factory = new TypeScriptAstFactory();
+      const linkerEnvironment = LinkerEnvironment.create<ts.Statement, ts.Expression>(
+          new TypeScriptAstHost(), factory, DEFAULT_LINKER_OPTIONS);
+      const ngImport = factory.createIdentifier('core');
+      const emitScope = new EmitScope<ts.Statement, ts.Expression>(ngImport, linkerEnvironment);
+
+      const def = emitScope.translateDefinition(o.fn([], [], null, null, 'foo'));
+      expect(generate(def)).toEqual('function foo() { }');
+    });
+
+    it('should use the `ngImport` idenfifier for imports when translating', () => {
+      const factory = new TypeScriptAstFactory();
+      const linkerEnvironment = LinkerEnvironment.create<ts.Statement, ts.Expression>(
+          new TypeScriptAstHost(), factory, DEFAULT_LINKER_OPTIONS);
+      const ngImport = factory.createIdentifier('core');
+      const emitScope = new EmitScope<ts.Statement, ts.Expression>(ngImport, linkerEnvironment);
+
+      const coreImportRef = new o.ExternalReference('@angular/core', 'foo');
+      const def = emitScope.translateDefinition(o.importExpr(coreImportRef).callMethod('bar', []));
+      expect(generate(def)).toEqual('core.foo.bar()');
+    });
+
+    it('should not emit any shared constants in the replacement expression', () => {
+      const factory = new TypeScriptAstFactory();
+      const linkerEnvironment = LinkerEnvironment.create<ts.Statement, ts.Expression>(
+          new TypeScriptAstHost(), factory, DEFAULT_LINKER_OPTIONS);
+      const ngImport = factory.createIdentifier('core');
+      const emitScope = new EmitScope<ts.Statement, ts.Expression>(ngImport, linkerEnvironment);
+
+      const constArray = o.literalArr([o.literal('CONST')]);
+      // We have to add the constant twice or it will not create a shared statement
+      emitScope.constantPool.getConstLiteral(constArray);
+      emitScope.constantPool.getConstLiteral(constArray);
+
+      const def = emitScope.translateDefinition(o.fn([], [], null, null, 'foo'));
+      expect(generate(def)).toEqual('function foo() { }');
+    });
+  });
+
+  describe('getConstantStatements()', () => {
+    it('should return any constant statements that were added to the `constantPool`', () => {
+      const factory = new TypeScriptAstFactory();
+      const linkerEnvironment = LinkerEnvironment.create<ts.Statement, ts.Expression>(
+          new TypeScriptAstHost(), factory, DEFAULT_LINKER_OPTIONS);
+      const ngImport = factory.createIdentifier('core');
+      const emitScope = new EmitScope<ts.Statement, ts.Expression>(ngImport, linkerEnvironment);
+
+      const constArray = o.literalArr([o.literal('CONST')]);
+      // We have to add the constant twice or it will not create a shared statement
+      emitScope.constantPool.getConstLiteral(constArray);
+      emitScope.constantPool.getConstLiteral(constArray);
+
+      const statements = emitScope.getConstantStatements();
+      expect(statements.map(generate)).toEqual(['const _c0 = ["CONST"];']);
+    });
+  });
+});
diff --git a/packages/compiler-cli/linker/test/file_linker/emit_scopes/iief_emit_scope_spec.ts b/packages/compiler-cli/linker/test/file_linker/emit_scopes/iief_emit_scope_spec.ts
new file mode 100644
index 0000000000000..b4d12f8269a4e
--- /dev/null
+++ b/packages/compiler-cli/linker/test/file_linker/emit_scopes/iief_emit_scope_spec.ts
@@ -0,0 +1,71 @@
+/**
+ * @license
+ * Copyright Google LLC 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 '@angular/compiler/src/output/output_ast';
+import * as ts from 'typescript';
+
+import {TypeScriptAstFactory} from '../../../../src/ngtsc/translator';
+import {TypeScriptAstHost} from '../../../src/ast/typescript/typescript_ast_host';
+import {IifeEmitScope} from '../../../src/file_linker/emit_scopes/iife_emit_scope';
+import {LinkerEnvironment} from '../../../src/file_linker/linker_environment';
+import {DEFAULT_LINKER_OPTIONS} from '../../../src/file_linker/linker_options';
+import {generate} from '../helpers';
+
+describe('IifeEmitScope', () => {
+  describe('translateDefinition()', () => {
+    it('should translate the given output AST into a TExpression, wrapped in an IIFE', () => {
+      const factory = new TypeScriptAstFactory();
+      const linkerEnvironment = LinkerEnvironment.create<ts.Statement, ts.Expression>(
+          new TypeScriptAstHost(), factory, DEFAULT_LINKER_OPTIONS);
+      const ngImport = factory.createIdentifier('core');
+      const emitScope = new IifeEmitScope<ts.Statement, ts.Expression>(ngImport, linkerEnvironment);
+
+      const def = emitScope.translateDefinition(o.fn([], [], null, null, 'foo'));
+      expect(generate(def)).toEqual('function () { return function foo() { }; }()');
+    });
+
+    it('should use the `ngImport` idenfifier for imports when translating', () => {
+      const factory = new TypeScriptAstFactory();
+      const linkerEnvironment = LinkerEnvironment.create<ts.Statement, ts.Expression>(
+          new TypeScriptAstHost(), factory, DEFAULT_LINKER_OPTIONS);
+      const ngImport = factory.createIdentifier('core');
+      const emitScope = new IifeEmitScope<ts.Statement, ts.Expression>(ngImport, linkerEnvironment);
+
+      const coreImportRef = new o.ExternalReference('@angular/core', 'foo');
+      const def = emitScope.translateDefinition(o.importExpr(coreImportRef).callMethod('bar', []));
+      expect(generate(def)).toEqual('function () { return core.foo.bar(); }()');
+    });
+
+    it('should emit any shared constants in the replacement expression IIFE', () => {
+      const factory = new TypeScriptAstFactory();
+      const linkerEnvironment = LinkerEnvironment.create<ts.Statement, ts.Expression>(
+          new TypeScriptAstHost(), factory, DEFAULT_LINKER_OPTIONS);
+      const ngImport = factory.createIdentifier('core');
+      const emitScope = new IifeEmitScope<ts.Statement, ts.Expression>(ngImport, linkerEnvironment);
+
+      const constArray = o.literalArr([o.literal('CONST')]);
+      // We have to add the constant twice or it will not create a shared statement
+      emitScope.constantPool.getConstLiteral(constArray);
+      emitScope.constantPool.getConstLiteral(constArray);
+
+      const def = emitScope.translateDefinition(o.fn([], [], null, null, 'foo'));
+      expect(generate(def))
+          .toEqual('function () { const _c0 = ["CONST"]; return function foo() { }; }()');
+    });
+  });
+
+  describe('getConstantStatements()', () => {
+    it('should throw an error', () => {
+      const factory = new TypeScriptAstFactory();
+      const linkerEnvironment = LinkerEnvironment.create<ts.Statement, ts.Expression>(
+          new TypeScriptAstHost(), factory, DEFAULT_LINKER_OPTIONS);
+      const ngImport = factory.createIdentifier('core');
+      const emitScope = new IifeEmitScope<ts.Statement, ts.Expression>(ngImport, linkerEnvironment);
+      expect(() => emitScope.getConstantStatements()).toThrowError();
+    });
+  });
+});
diff --git a/packages/compiler-cli/linker/test/file_linker/file_linker_spec.ts b/packages/compiler-cli/linker/test/file_linker/file_linker_spec.ts
new file mode 100644
index 0000000000000..68eeee4ddf865
--- /dev/null
+++ b/packages/compiler-cli/linker/test/file_linker/file_linker_spec.ts
@@ -0,0 +1,191 @@
+/**
+ * @license
+ * Copyright Google LLC 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 '@angular/compiler/src/output/output_ast';
+import * as ts from 'typescript';
+
+import {TypeScriptAstFactory} from '../../../src/ngtsc/translator';
+import {AstHost} from '../../src/ast/ast_host';
+import {TypeScriptAstHost} from '../../src/ast/typescript/typescript_ast_host';
+import {DeclarationScope} from '../../src/file_linker/declaration_scope';
+import {FileLinker} from '../../src/file_linker/file_linker';
+import {LinkerEnvironment} from '../../src/file_linker/linker_environment';
+import {DEFAULT_LINKER_OPTIONS} from '../../src/file_linker/linker_options';
+import {PartialDirectiveLinkerVersion1} from '../../src/file_linker/partial_linkers/partial_directive_linker_1';
+import {generate} from './helpers';
+
+describe('FileLinker', () => {
+  let factory: TypeScriptAstFactory;
+  beforeEach(() => factory = new TypeScriptAstFactory());
+
+  describe('isPartialDeclaration()', () => {
+    it('should return true if the callee is recognized', () => {
+      const {fileLinker} = createFileLinker();
+      expect(fileLinker.isPartialDeclaration('$ngDeclareDirective')).toBe(true);
+      expect(fileLinker.isPartialDeclaration('$ngDeclareComponent')).toBe(true);
+    });
+
+    it('should return false if the callee is not recognized', () => {
+      const {fileLinker} = createFileLinker();
+      expect(fileLinker.isPartialDeclaration('$foo')).toBe(false);
+    });
+  });
+
+  describe('linkPartialDeclaration()', () => {
+    it('should throw an error if the function name is not recognised', () => {
+      const {fileLinker} = createFileLinker();
+      const version = factory.createLiteral(1);
+      const ngImport = factory.createIdentifier('core');
+      const declarationArg = factory.createObjectLiteral([
+        {propertyName: 'version', quoted: false, value: version},
+        {propertyName: 'ngImport', quoted: false, value: ngImport},
+      ]);
+      expect(
+          () => fileLinker.linkPartialDeclaration(
+              'foo', [declarationArg], new MockDeclarationScope()))
+          .toThrowError('Unknown partial declaration function foo.');
+    });
+
+    it('should throw an error if the metadata object does not have a `version` property', () => {
+      const {fileLinker} = createFileLinker();
+      const ngImport = factory.createIdentifier('core');
+      const declarationArg = factory.createObjectLiteral([
+        {propertyName: 'ngImport', quoted: false, value: ngImport},
+      ]);
+      expect(
+          () => fileLinker.linkPartialDeclaration(
+              '$ngDeclareDirective', [declarationArg], new MockDeclarationScope()))
+          .toThrowError(`Expected property 'version' to be present.`);
+    });
+
+    it('should throw an error if the metadata object does not have a `ngImport` property', () => {
+      const {fileLinker} = createFileLinker();
+      const ngImport = factory.createIdentifier('core');
+      const declarationArg = factory.createObjectLiteral([
+        {propertyName: 'version', quoted: false, value: ngImport},
+      ]);
+      expect(
+          () => fileLinker.linkPartialDeclaration(
+              '$ngDeclareDirective', [declarationArg], new MockDeclarationScope()))
+          .toThrowError(`Expected property 'ngImport' to be present.`);
+    });
+
+    it('should call `linkPartialDeclaration()` on the appropriate partial compiler', () => {
+      const {fileLinker} = createFileLinker();
+      const compileSpy = spyOn(PartialDirectiveLinkerVersion1.prototype, 'linkPartialDeclaration')
+                             .and.returnValue(o.literal('compilation result'));
+
+      const ngImport = factory.createIdentifier('core');
+      const version = factory.createLiteral(1);
+      const declarationArg = factory.createObjectLiteral([
+        {propertyName: 'ngImport', quoted: false, value: ngImport},
+        {propertyName: 'version', quoted: false, value: version},
+      ]);
+
+      const compilationResult = fileLinker.linkPartialDeclaration(
+          '$ngDeclareDirective', [declarationArg], new MockDeclarationScope());
+
+      expect(compilationResult).toEqual(factory.createLiteral('compilation result'));
+      expect(compileSpy).toHaveBeenCalled();
+      expect(compileSpy.calls.mostRecent().args[3].getNode('ngImport')).toBe(ngImport);
+    });
+  });
+
+  describe('getConstantStatements()', () => {
+    it('should capture shared constant values', () => {
+      const {fileLinker} = createFileLinker();
+      spyOnLinkPartialDeclarationWithConstants(o.literal('REPLACEMENT'));
+
+      // Here we use the `core` idenfifier for `ngImport` to trigger the use of a shared scope for
+      // constant statements.
+      const declarationArg = factory.createObjectLiteral([
+        {propertyName: 'ngImport', quoted: false, value: factory.createIdentifier('core')},
+        {propertyName: 'version', quoted: false, value: factory.createLiteral(1)},
+      ]);
+
+      const replacement = fileLinker.linkPartialDeclaration(
+          '$ngDeclareDirective', [declarationArg], new MockDeclarationScope());
+      expect(generate(replacement)).toEqual('"REPLACEMENT"');
+
+      const results = fileLinker.getConstantStatements();
+      expect(results.length).toEqual(1);
+      const {constantScope, statements} = results[0];
+      expect(constantScope).toBe(MockConstantScopeRef.singleton);
+      expect(statements.map(generate)).toEqual(['const _c0 = [1];']);
+    });
+
+    it('should be no shared constant statements to capture when they are emitted into the replacement IIFE',
+       () => {
+         const {fileLinker} = createFileLinker();
+         spyOnLinkPartialDeclarationWithConstants(o.literal('REPLACEMENT'));
+
+         // Here we use a string literal `"not-a-module"` for `ngImport` to cause constant
+         // statements to be emitted in an IIFE rather than added to the shared constant scope.
+         const declarationArg = factory.createObjectLiteral([
+           {propertyName: 'ngImport', quoted: false, value: factory.createLiteral('not-a-module')},
+           {propertyName: 'version', quoted: false, value: factory.createLiteral(1)},
+         ]);
+
+         const replacement = fileLinker.linkPartialDeclaration(
+             '$ngDeclareDirective', [declarationArg], new MockDeclarationScope());
+         expect(generate(replacement))
+             .toEqual('function () { const _c0 = [1]; return "REPLACEMENT"; }()');
+
+         const results = fileLinker.getConstantStatements();
+         expect(results.length).toEqual(0);
+       });
+  });
+
+  function createFileLinker(): {
+    host: AstHost<ts.Expression>,
+    fileLinker: FileLinker<MockConstantScopeRef, ts.Statement, ts.Expression>
+  } {
+    const linkerEnvironment = LinkerEnvironment.create<ts.Statement, ts.Expression>(
+        new TypeScriptAstHost(), new TypeScriptAstFactory(), DEFAULT_LINKER_OPTIONS);
+    const fileLinker = new FileLinker<MockConstantScopeRef, ts.Statement, ts.Expression>(
+        linkerEnvironment, 'test.js', '// test code');
+    return {host: linkerEnvironment.host, fileLinker};
+  }
+});
+
+
+/**
+ * This mock implementation of `DeclarationScope` will return a singleton instance of
+ * `MockConstantScopeRef` if the expression is an identifier, or `null` otherwise.
+ *
+ * This way we can simulate whether the constants will be shared or inlined into an IIFE.
+ */
+class MockDeclarationScope implements DeclarationScope<MockConstantScopeRef, ts.Expression> {
+  getConstantScopeRef(expression: ts.Expression): MockConstantScopeRef|null {
+    if (ts.isIdentifier(expression)) {
+      return MockConstantScopeRef.singleton;
+    } else {
+      return null;
+    }
+  }
+}
+
+class MockConstantScopeRef {
+  private constructor() {}
+  static singleton = new MockDeclarationScope();
+}
+
+/**
+ * Spy on the `PartialDirectiveLinkerVersion1.linkPartialDeclaration()` method, triggering
+ * shared constants to be created.
+ */
+function spyOnLinkPartialDeclarationWithConstants(replacement: o.Expression) {
+  let callCount = 0;
+  spyOn(PartialDirectiveLinkerVersion1.prototype, 'linkPartialDeclaration')
+      .and.callFake(((sourceUrl, code, constantPool) => {
+                      const constArray = o.literalArr([o.literal(++callCount)]);
+                      // We have to add the constant twice or it will not create a shared statement
+                      constantPool.getConstLiteral(constArray);
+                      constantPool.getConstLiteral(constArray);
+                      return replacement;
+                    }) as typeof PartialDirectiveLinkerVersion1.prototype.linkPartialDeclaration);
+}
diff --git a/packages/compiler-cli/linker/test/file_linker/helpers.ts b/packages/compiler-cli/linker/test/file_linker/helpers.ts
new file mode 100644
index 0000000000000..5faa908ce788a
--- /dev/null
+++ b/packages/compiler-cli/linker/test/file_linker/helpers.ts
@@ -0,0 +1,17 @@
+/**
+ * @license
+ * Copyright Google LLC 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';
+
+/**
+ * A simple helper to render a TS Node as a string.
+ */
+export function generate(node: ts.Node): string {
+  const printer = ts.createPrinter({newLine: ts.NewLineKind.LineFeed});
+  const sf = ts.createSourceFile('test.ts', '', ts.ScriptTarget.ES2015, true);
+  return printer.printNode(ts.EmitHint.Unspecified, node, sf);
+}
diff --git a/packages/compiler-cli/linker/test/file_linker/partial_linkers/partial_linker_selector_spec.ts b/packages/compiler-cli/linker/test/file_linker/partial_linkers/partial_linker_selector_spec.ts
new file mode 100644
index 0000000000000..c04b92e2d9628
--- /dev/null
+++ b/packages/compiler-cli/linker/test/file_linker/partial_linkers/partial_linker_selector_spec.ts
@@ -0,0 +1,41 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {PartialComponentLinkerVersion1} from '../../../src/file_linker/partial_linkers/partial_component_linker_1';
+import {PartialDirectiveLinkerVersion1} from '../../../src/file_linker/partial_linkers/partial_directive_linker_1';
+import {PartialLinkerSelector} from '../../../src/file_linker/partial_linkers/partial_linker_selector';
+
+describe('PartialLinkerSelector', () => {
+  describe('supportsDeclaration()', () => {
+    it('should return true if there is at least one linker that matches the given function name',
+       () => {
+         const selector = new PartialLinkerSelector();
+         expect(selector.supportsDeclaration('$ngDeclareDirective')).toBe(true);
+         expect(selector.supportsDeclaration('$ngDeclareComponent')).toBe(true);
+         expect(selector.supportsDeclaration('$foo')).toBe(false);
+       });
+  });
+
+  describe('getLinker()', () => {
+    it('should return the linker that matches the name and version number', () => {
+      const selector = new PartialLinkerSelector();
+      expect(selector.getLinker('$ngDeclareDirective', 1))
+          .toBeInstanceOf(PartialDirectiveLinkerVersion1);
+      expect(selector.getLinker('$ngDeclareComponent', 1))
+          .toBeInstanceOf(PartialComponentLinkerVersion1);
+    });
+
+    it('should throw an error if there is no linker that matches the given name or version', () => {
+      const selector = new PartialLinkerSelector();
+      expect(() => selector.getLinker('$foo', 1))
+          .toThrowError('Unknown partial declaration function $foo.');
+      expect(() => selector.getLinker('$ngDeclareDirective', 2))
+          .toThrowError('Unsupported partial declaration version 2 for $ngDeclareDirective.');
+    });
+  });
+});
diff --git a/packages/compiler-cli/linker/test/file_linker/translator_spec.ts b/packages/compiler-cli/linker/test/file_linker/translator_spec.ts
new file mode 100644
index 0000000000000..31d0401f0b2e4
--- /dev/null
+++ b/packages/compiler-cli/linker/test/file_linker/translator_spec.ts
@@ -0,0 +1,47 @@
+/**
+ * @license
+ * Copyright Google LLC 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 '@angular/compiler';
+import {ImportGenerator, NamedImport, TypeScriptAstFactory} from '@angular/compiler-cli/src/ngtsc/translator';
+import * as ts from 'typescript';
+
+import {Translator} from '../../src/file_linker/translator';
+import {generate} from './helpers';
+
+describe('Translator', () => {
+  let factory: TypeScriptAstFactory;
+  beforeEach(() => factory = new TypeScriptAstFactory());
+
+  describe('translateExpression()', () => {
+    it('should generate expression specific output', () => {
+      const translator = new Translator<ts.Statement, ts.Expression>(factory);
+      const outputAst = new o.WriteVarExpr('foo', new o.LiteralExpr(42));
+      const translated = translator.translateExpression(outputAst, new MockImportGenerator());
+      expect(generate(translated)).toEqual('(foo = 42)');
+    });
+  });
+
+  describe('translateStatement()', () => {
+    it('should generate statement specific output', () => {
+      const translator = new Translator<ts.Statement, ts.Expression>(factory);
+      const outputAst = new o.ExpressionStatement(new o.WriteVarExpr('foo', new o.LiteralExpr(42)));
+      const translated = translator.translateStatement(outputAst, new MockImportGenerator());
+      expect(generate(translated)).toEqual('foo = 42;');
+    });
+  });
+  class MockImportGenerator implements ImportGenerator<ts.Expression> {
+    generateNamespaceImport(moduleName: string): ts.Expression {
+      return factory.createLiteral(moduleName);
+    }
+    generateNamedImport(moduleName: string, originalSymbol: string): NamedImport<ts.Expression> {
+      return {
+        moduleImport: factory.createLiteral(moduleName),
+        symbol: originalSymbol,
+      };
+    }
+  }
+});
diff --git a/packages/compiler-cli/linker/test/linker_import_generator_spec.ts b/packages/compiler-cli/linker/test/linker_import_generator_spec.ts
new file mode 100644
index 0000000000000..3202ada682d09
--- /dev/null
+++ b/packages/compiler-cli/linker/test/linker_import_generator_spec.ts
@@ -0,0 +1,41 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {LinkerImportGenerator} from '../src/linker_import_generator';
+
+const ngImport = {
+  ngImport: true
+};
+
+describe('LinkerImportGenerator<TExpression>', () => {
+  describe('generateNamespaceImport()', () => {
+    it('should error if the import is not `@angular/core`', () => {
+      const generator = new LinkerImportGenerator(ngImport);
+      expect(() => generator.generateNamespaceImport('other/import'))
+          .toThrowError(`Unable to import from anything other than '@angular/core'`);
+    });
+
+    it('should return the ngImport expression for `@angular/core`', () => {
+      const generator = new LinkerImportGenerator(ngImport);
+      expect(generator.generateNamespaceImport('@angular/core')).toBe(ngImport);
+    });
+  });
+
+  describe('generateNamedImport()', () => {
+    it('should error if the import is not `@angular/core`', () => {
+      const generator = new LinkerImportGenerator(ngImport);
+      expect(() => generator.generateNamedImport('other/import', 'someSymbol'))
+          .toThrowError(`Unable to import from anything other than '@angular/core'`);
+    });
+
+    it('should return a `NamedImport` object containing the ngImport expression', () => {
+      const generator = new LinkerImportGenerator(ngImport);
+      expect(generator.generateNamedImport('@angular/core', 'someSymbol'))
+          .toEqual({moduleImport: ngImport, symbol: 'someSymbol'});
+    });
+  });
+});
diff --git a/packages/compiler-cli/ngcc/src/analysis/decoration_analyzer.ts b/packages/compiler-cli/ngcc/src/analysis/decoration_analyzer.ts
index 399c3abeb229e..e557fa4fe5b73 100644
--- a/packages/compiler-cli/ngcc/src/analysis/decoration_analyzer.ts
+++ b/packages/compiler-cli/ngcc/src/analysis/decoration_analyzer.ts
@@ -14,7 +14,7 @@ import {CycleAnalyzer, ImportGraph} from '../../../src/ngtsc/cycles';
 import {isFatalDiagnosticError} from '../../../src/ngtsc/diagnostics';
 import {absoluteFrom, absoluteFromSourceFile, dirname, FileSystem, LogicalFileSystem, resolve} from '../../../src/ngtsc/file_system';
 import {AbsoluteModuleStrategy, LocalIdentifierStrategy, LogicalProjectStrategy, ModuleResolver, NOOP_DEFAULT_IMPORT_RECORDER, PrivateExportAliasingHost, Reexport, ReferenceEmitter} from '../../../src/ngtsc/imports';
-import {CompoundMetadataReader, CompoundMetadataRegistry, DtsMetadataReader, InjectableClassRegistry, LocalMetadataRegistry} from '../../../src/ngtsc/metadata';
+import {CompoundMetadataReader, CompoundMetadataRegistry, DtsMetadataReader, InjectableClassRegistry, LocalMetadataRegistry, TemplateMapping} from '../../../src/ngtsc/metadata';
 import {PartialEvaluator} from '../../../src/ngtsc/partial_evaluator';
 import {LocalModuleScopeRegistry, MetadataDtsModuleScopeResolver} from '../../../src/ngtsc/scope';
 import {DecoratorHandler} from '../../../src/ngtsc/transform';
@@ -94,8 +94,8 @@ export class DecorationAnalyzer {
   handlers: DecoratorHandler<unknown, unknown, unknown>[] = [
     new ComponentDecoratorHandler(
         this.reflectionHost, this.evaluator, this.fullRegistry, this.fullMetaReader,
-        this.scopeRegistry, this.scopeRegistry, this.isCore, this.resourceManager, this.rootDirs,
-        !!this.compilerOptions.preserveWhitespaces,
+        this.scopeRegistry, this.scopeRegistry, new TemplateMapping(), this.isCore,
+        this.resourceManager, this.rootDirs, !!this.compilerOptions.preserveWhitespaces,
         /* i18nUseExternalIds */ true, this.bundle.enableI18nLegacyMessageIdFormat,
         /* i18nNormalizeLineEndingsInICUs */ false, this.moduleResolver, this.cycleAnalyzer,
         this.refEmitter, NOOP_DEFAULT_IMPORT_RECORDER, NOOP_DEPENDENCY_TRACKER,
diff --git a/packages/compiler-cli/ngcc/src/analysis/module_with_providers_analyzer.ts b/packages/compiler-cli/ngcc/src/analysis/module_with_providers_analyzer.ts
index 955bafe116a64..598823faea7a5 100644
--- a/packages/compiler-cli/ngcc/src/analysis/module_with_providers_analyzer.ts
+++ b/packages/compiler-cli/ngcc/src/analysis/module_with_providers_analyzer.ts
@@ -10,7 +10,7 @@ import * as ts from 'typescript';
 import {ReferencesRegistry} from '../../../src/ngtsc/annotations';
 import {Reference} from '../../../src/ngtsc/imports';
 import {PartialEvaluator} from '../../../src/ngtsc/partial_evaluator';
-import {ClassDeclaration, isNamedClassDeclaration, isNamedVariableDeclaration} from '../../../src/ngtsc/reflection';
+import {ClassDeclaration, DeclarationNode, isNamedClassDeclaration, isNamedVariableDeclaration} from '../../../src/ngtsc/reflection';
 import {NgccReflectionHost} from '../host/ngcc_host';
 import {hasNameIdentifier, isDefined} from '../utils';
 
@@ -30,7 +30,7 @@ export interface ModuleWithProvidersInfo {
   /**
    * Declaration of the containing class (if this is a method)
    */
-  container: ts.Declaration|null;
+  container: DeclarationNode|null;
   /**
    * The declaration of the class that the `ngModule` property on the `ModuleWithProviders` object
    * refers to.
@@ -125,7 +125,7 @@ export class ModuleWithProvidersAnalyzer {
    */
   private parseForModuleWithProviders(
       name: string, node: ts.Node|null, implementation: ts.Node|null = node,
-      container: ts.Declaration|null = null): ModuleWithProvidersInfo|null {
+      container: DeclarationNode|null = null): ModuleWithProvidersInfo|null {
     if (implementation === null ||
         (!ts.isFunctionDeclaration(implementation) && !ts.isMethodDeclaration(implementation) &&
          !ts.isFunctionExpression(implementation))) {
diff --git a/packages/compiler-cli/ngcc/src/analysis/ngcc_references_registry.ts b/packages/compiler-cli/ngcc/src/analysis/ngcc_references_registry.ts
index 6d8beb4fb59e8..198e5659b82d0 100644
--- a/packages/compiler-cli/ngcc/src/analysis/ngcc_references_registry.ts
+++ b/packages/compiler-cli/ngcc/src/analysis/ngcc_references_registry.ts
@@ -9,7 +9,7 @@
 import * as ts from 'typescript';
 import {ReferencesRegistry} from '../../../src/ngtsc/annotations';
 import {Reference} from '../../../src/ngtsc/imports';
-import {ConcreteDeclaration, ReflectionHost} from '../../../src/ngtsc/reflection';
+import {Declaration, DeclarationNode, ReflectionHost} from '../../../src/ngtsc/reflection';
 import {hasNameIdentifier} from '../utils';
 
 /**
@@ -20,7 +20,7 @@ import {hasNameIdentifier} from '../utils';
  * from libraries that are compiled by ngcc.
  */
 export class NgccReferencesRegistry implements ReferencesRegistry {
-  private map = new Map<ts.Identifier, ConcreteDeclaration>();
+  private map = new Map<ts.Identifier, Declaration>();
 
   constructor(private host: ReflectionHost) {}
 
@@ -29,12 +29,12 @@ export class NgccReferencesRegistry implements ReferencesRegistry {
    * Only `ResolveReference` references are stored. Other types are ignored.
    * @param references A collection of references to register.
    */
-  add(source: ts.Declaration, ...references: Reference<ts.Declaration>[]): void {
+  add(source: DeclarationNode, ...references: Reference<DeclarationNode>[]): void {
     references.forEach(ref => {
       // Only store relative references. We are not interested in literals.
       if (ref.bestGuessOwningModule === null && hasNameIdentifier(ref.node)) {
         const declaration = this.host.getDeclarationOfIdentifier(ref.node.name);
-        if (declaration && declaration.node !== null && hasNameIdentifier(declaration.node)) {
+        if (declaration && hasNameIdentifier(declaration.node)) {
           this.map.set(declaration.node.name, declaration);
         }
       }
@@ -45,7 +45,7 @@ export class NgccReferencesRegistry implements ReferencesRegistry {
    * Create and return a mapping for the registered resolved references.
    * @returns A map of reference identifiers to reference declarations.
    */
-  getDeclarationMap(): Map<ts.Identifier, ConcreteDeclaration> {
+  getDeclarationMap(): Map<ts.Identifier, Declaration> {
     return this.map;
   }
 }
diff --git a/packages/compiler-cli/ngcc/src/analysis/ngcc_trait_compiler.ts b/packages/compiler-cli/ngcc/src/analysis/ngcc_trait_compiler.ts
index 7d951acba3dbd..bfda1dbeffd16 100644
--- a/packages/compiler-cli/ngcc/src/analysis/ngcc_trait_compiler.ts
+++ b/packages/compiler-cli/ngcc/src/analysis/ngcc_trait_compiler.ts
@@ -10,7 +10,7 @@ import * as ts from 'typescript';
 import {IncrementalBuild} from '../../../src/ngtsc/incremental/api';
 import {NOOP_PERF_RECORDER} from '../../../src/ngtsc/perf';
 import {ClassDeclaration, Decorator} from '../../../src/ngtsc/reflection';
-import {DecoratorHandler, DtsTransformRegistry, HandlerFlags, Trait, TraitCompiler} from '../../../src/ngtsc/transform';
+import {CompilationMode, DecoratorHandler, DtsTransformRegistry, HandlerFlags, Trait, TraitCompiler} from '../../../src/ngtsc/transform';
 import {NgccReflectionHost} from '../host/ngcc_host';
 import {isDefined} from '../utils';
 
@@ -26,7 +26,7 @@ export class NgccTraitCompiler extends TraitCompiler {
       private ngccReflector: NgccReflectionHost) {
     super(
         handlers, ngccReflector, NOOP_PERF_RECORDER, new NoIncrementalBuild(),
-        /* compileNonExportedClasses */ true, new DtsTransformRegistry());
+        /* compileNonExportedClasses */ true, CompilationMode.FULL, new DtsTransformRegistry());
   }
 
   get analyzedFiles(): ts.SourceFile[] {
diff --git a/packages/compiler-cli/ngcc/src/analysis/private_declarations_analyzer.ts b/packages/compiler-cli/ngcc/src/analysis/private_declarations_analyzer.ts
index c03e7f9402b5e..4dcbf9461cf48 100644
--- a/packages/compiler-cli/ngcc/src/analysis/private_declarations_analyzer.ts
+++ b/packages/compiler-cli/ngcc/src/analysis/private_declarations_analyzer.ts
@@ -8,7 +8,7 @@
 import * as ts from 'typescript';
 
 import {absoluteFromSourceFile, AbsoluteFsPath} from '../../../src/ngtsc/file_system';
-import {ConcreteDeclaration} from '../../../src/ngtsc/reflection';
+import {Declaration} from '../../../src/ngtsc/reflection';
 import {NgccReflectionHost} from '../host/ngcc_host';
 import {hasNameIdentifier, isDefined} from '../utils';
 
@@ -40,8 +40,8 @@ export class PrivateDeclarationsAnalyzer {
 
   private getPrivateDeclarations(
       rootFiles: ts.SourceFile[],
-      declarations: Map<ts.Identifier, ConcreteDeclaration>): PrivateDeclarationsAnalyses {
-    const privateDeclarations: Map<ts.Identifier, ConcreteDeclaration> = new Map(declarations);
+      declarations: Map<ts.Identifier, Declaration>): PrivateDeclarationsAnalyses {
+    const privateDeclarations: Map<ts.Identifier, Declaration> = new Map(declarations);
 
     rootFiles.forEach(f => {
       const exports = this.host.getExportsOfModule(f);
diff --git a/packages/compiler-cli/ngcc/src/command_line_options.ts b/packages/compiler-cli/ngcc/src/command_line_options.ts
index 1487a68ec8d72..12f06df3b7447 100644
--- a/packages/compiler-cli/ngcc/src/command_line_options.ts
+++ b/packages/compiler-cli/ngcc/src/command_line_options.ts
@@ -19,9 +19,10 @@ export function parseCommandLineOptions(args: string[]): NgccOptions {
             alias: 'source',
             describe:
                 'A path (relative to the working directory) of the `node_modules` folder to process.',
-            default: './node_modules'
+            default: './node_modules',
+            type: 'string',
           })
-          .option('f', {alias: 'formats', hidden: true, array: true})
+          .option('f', {alias: 'formats', hidden: true, array: true, type: 'string'})
           .option('p', {
             alias: 'properties',
             array: true,
@@ -29,7 +30,8 @@ export function parseCommandLineOptions(args: string[]): NgccOptions {
                 'An array of names of properties in package.json to compile (e.g. `module` or `main`)\n' +
                 'Each of these properties should hold the path to a bundle-format.\n' +
                 'If provided, only the specified properties are considered for processing.\n' +
-                'If not provided, all the supported format properties (e.g. fesm2015, fesm5, es2015, esm2015, esm5, main, module) in the package.json are considered.'
+                'If not provided, all the supported format properties (e.g. fesm2015, fesm5, es2015, esm2015, esm5, main, module) in the package.json are considered.',
+            type: 'string',
           })
           .option('t', {
             alias: 'target',
@@ -37,6 +39,7 @@ export function parseCommandLineOptions(args: string[]): NgccOptions {
                 'A relative path (from the `source` path) to a single entry-point to process (plus its dependencies).\n' +
                 'If this property is provided then `error-on-failed-entry-point` is forced to true.\n' +
                 'This option overrides the `--use-program-dependencies` option.',
+            type: 'string',
           })
           .option('use-program-dependencies', {
             type: 'boolean',
@@ -47,7 +50,7 @@ export function parseCommandLineOptions(args: string[]): NgccOptions {
           .option('first-only', {
             describe:
                 'If specified then only the first matching package.json property will be compiled.',
-            type: 'boolean'
+            type: 'boolean',
           })
           .option('create-ivy-entry-points', {
             describe:
@@ -78,6 +81,7 @@ export function parseCommandLineOptions(args: string[]): NgccOptions {
             alias: 'loglevel',
             describe: 'The lowest severity logging message that should be output.',
             choices: ['debug', 'info', 'warn', 'error'],
+            type: 'string',
           })
           .option('invalidate-entry-point-manifest', {
             describe:
@@ -105,7 +109,7 @@ export function parseCommandLineOptions(args: string[]): NgccOptions {
           .help()
           .parse(args);
 
-  if (options['f'] && options['f'].length) {
+  if (options.f?.length) {
     console.error(
         'The formats option (-f/--formats) has been removed. Consider the properties option (-p/--properties) instead.');
     process.exit(1);
@@ -113,12 +117,12 @@ export function parseCommandLineOptions(args: string[]): NgccOptions {
 
   setFileSystem(new NodeJSFileSystem());
 
-  const baseSourcePath = resolve(options['s'] || './node_modules');
-  const propertiesToConsider: string[] = options['p'];
-  const targetEntryPointPath = options['t'] ? options['t'] : undefined;
+  const baseSourcePath = resolve(options.s || './node_modules');
+  const propertiesToConsider = options.p;
+  const targetEntryPointPath = options.t;
   const compileAllFormats = !options['first-only'];
   const createNewEntryPointFormats = options['create-ivy-entry-points'];
-  const logLevel = options['l'] as keyof typeof LogLevel | undefined;
+  const logLevel = options.l as keyof typeof LogLevel | undefined;
   const enableI18nLegacyMessageIdFormat = options['legacy-message-ids'];
   const invalidateEntryPointManifest = options['invalidate-entry-point-manifest'];
   const errorOnFailedEntryPoint = options['error-on-failed-entry-point'];
@@ -126,7 +130,7 @@ export function parseCommandLineOptions(args: string[]): NgccOptions {
   // yargs is not so great at mixed string+boolean types, so we have to test tsconfig against a
   // string "false" to capture the `tsconfig=false` option.
   // And we have to convert the option to a string to handle `no-tsconfig`, which will be `false`.
-  const tsConfigPath = `${options['tsconfig']}` === 'false' ? null : options['tsconfig'];
+  const tsConfigPath = `${options.tsconfig}` === 'false' ? null : options.tsconfig;
 
   const logger = logLevel && new ConsoleLogger(LogLevel[logLevel]);
 
@@ -138,7 +142,7 @@ export function parseCommandLineOptions(args: string[]): NgccOptions {
     createNewEntryPointFormats,
     logger,
     enableI18nLegacyMessageIdFormat,
-    async: options['async'],
+    async: options.async,
     invalidateEntryPointManifest,
     errorOnFailedEntryPoint,
     tsConfigPath,
diff --git a/packages/compiler-cli/ngcc/src/dependencies/commonjs_dependency_host.ts b/packages/compiler-cli/ngcc/src/dependencies/commonjs_dependency_host.ts
index 022fe4a284716..1f31b9059b5db 100644
--- a/packages/compiler-cli/ngcc/src/dependencies/commonjs_dependency_host.ts
+++ b/packages/compiler-cli/ngcc/src/dependencies/commonjs_dependency_host.ts
@@ -9,7 +9,6 @@ import * as ts from 'typescript';
 
 import {AbsoluteFsPath} from '../../../src/ngtsc/file_system';
 import {isRequireCall, isWildcardReexportStatement, RequireCall} from '../host/commonjs_umd_utils';
-import {isAssignment, isAssignmentStatement} from '../host/esm2015_host';
 
 import {DependencyHostBase} from './dependency_host';
 
diff --git a/packages/compiler-cli/ngcc/src/dependencies/dependency_host.ts b/packages/compiler-cli/ngcc/src/dependencies/dependency_host.ts
index e251973e0edeb..1913bf871f164 100644
--- a/packages/compiler-cli/ngcc/src/dependencies/dependency_host.ts
+++ b/packages/compiler-cli/ngcc/src/dependencies/dependency_host.ts
@@ -53,6 +53,22 @@ export abstract class DependencyHostBase implements DependencyHost {
     }
   }
 
+  /**
+   * Find all the dependencies for the provided paths.
+   *
+   * @param files The list of absolute paths of JavaScript files to scan for dependencies.
+   * @param dependencyInfo An object containing information about the dependencies of the
+   * entry-point, including those that were missing or deep imports into other entry-points. The
+   * sets in this object will be updated with new information about the entry-point's dependencies.
+   */
+  collectDependenciesInFiles(
+      files: AbsoluteFsPath[], {dependencies, missing, deepImports}: DependencyInfo): void {
+    const alreadySeen = new Set<AbsoluteFsPath>();
+    for (const file of files) {
+      this.processFile(file, dependencies, missing, deepImports, alreadySeen);
+    }
+  }
+
   /**
    * Compute the dependencies of the given file.
    *
@@ -102,12 +118,7 @@ export abstract class DependencyHostBase implements DependencyHost {
       return false;
     }
     if (resolvedModule instanceof ResolvedRelativeModule) {
-      const internalDependency = resolvedModule.modulePath;
-      if (!alreadySeen.has(internalDependency)) {
-        alreadySeen.add(internalDependency);
-        this.recursivelyCollectDependencies(
-            internalDependency, dependencies, missing, deepImports, alreadySeen);
-      }
+      this.processFile(resolvedModule.modulePath, dependencies, missing, deepImports, alreadySeen);
     } else if (resolvedModule instanceof ResolvedDeepImport) {
       deepImports.add(resolvedModule.importPath);
     } else {
@@ -115,4 +126,18 @@ export abstract class DependencyHostBase implements DependencyHost {
     }
     return true;
   }
+
+  /**
+   * Processes the file if it has not already been seen. This will also recursively process
+   * all files that are imported from the file, while taking the set of already seen files
+   * into account.
+   */
+  protected processFile(
+      file: AbsoluteFsPath, dependencies: Set<AbsoluteFsPath>, missing: Set<string>,
+      deepImports: Set<string>, alreadySeen: Set<AbsoluteFsPath>): void {
+    if (!alreadySeen.has(file)) {
+      alreadySeen.add(file);
+      this.recursivelyCollectDependencies(file, dependencies, missing, deepImports, alreadySeen);
+    }
+  }
 }
diff --git a/packages/compiler-cli/ngcc/src/entry_point_finder/program_based_entry_point_finder.ts b/packages/compiler-cli/ngcc/src/entry_point_finder/program_based_entry_point_finder.ts
index 35bf766afa30c..7c9f1b67c207e 100644
--- a/packages/compiler-cli/ngcc/src/entry_point_finder/program_based_entry_point_finder.ts
+++ b/packages/compiler-cli/ngcc/src/entry_point_finder/program_based_entry_point_finder.ts
@@ -48,14 +48,12 @@ export class ProgramBasedEntryPointFinder extends TracingEntryPointFinder {
     const moduleResolver = new ModuleResolver(this.fs, this.pathMappings, ['', '.ts', '/index.ts']);
     const host = new EsmDependencyHost(this.fs, moduleResolver);
     const dependencies = createDependencyInfo();
+    const rootFiles = this.tsConfig.rootNames.map(rootName => this.fs.resolve(rootName));
     this.logger.debug(
         `Using the program from ${this.tsConfig.project} to seed the entry-point finding.`);
     this.logger.debug(
-        `Collecting dependencies from the following files:` +
-        this.tsConfig.rootNames.map(file => `\n- ${file}`));
-    this.tsConfig.rootNames.forEach(rootName => {
-      host.collectDependencies(this.fs.resolve(rootName), dependencies);
-    });
+        `Collecting dependencies from the following files:` + rootFiles.map(file => `\n- ${file}`));
+    host.collectDependenciesInFiles(rootFiles, dependencies);
     return Array.from(dependencies.dependencies);
   }
 
diff --git a/packages/compiler-cli/ngcc/src/execution/create_compile_function.ts b/packages/compiler-cli/ngcc/src/execution/create_compile_function.ts
index c3671e6946a56..6f8d754ed2670 100644
--- a/packages/compiler-cli/ngcc/src/execution/create_compile_function.ts
+++ b/packages/compiler-cli/ngcc/src/execution/create_compile_function.ts
@@ -14,6 +14,7 @@ import {Logger} from '../../../src/ngtsc/logging';
 import {ParsedConfiguration} from '../../../src/perform_compile';
 import {getEntryPointFormat} from '../packages/entry_point';
 import {makeEntryPointBundle} from '../packages/entry_point_bundle';
+import {createModuleResolutionCache, SharedFileCache} from '../packages/source_file_cache';
 import {PathMappings} from '../path_mappings';
 import {FileWriter} from '../writing/file_writer';
 
@@ -30,6 +31,8 @@ export function getCreateCompileFn(
   return (beforeWritingFiles, onTaskCompleted) => {
     const {Transformer} = require('../packages/transformer');
     const transformer = new Transformer(fileSystem, logger, tsConfig);
+    const sharedFileCache = new SharedFileCache(fileSystem);
+    const moduleResolutionCache = createModuleResolutionCache(fileSystem);
 
     return (task: Task) => {
       const {entryPoint, formatProperty, formatPropertiesToMarkAsProcessed, processDts} = task;
@@ -54,8 +57,8 @@ export function getCreateCompileFn(
       logger.info(`Compiling ${entryPoint.name} : ${formatProperty} as ${format}`);
 
       const bundle = makeEntryPointBundle(
-          fileSystem, entryPoint, formatPath, isCore, format, processDts, pathMappings, true,
-          enableI18nLegacyMessageIdFormat);
+          fileSystem, entryPoint, sharedFileCache, moduleResolutionCache, formatPath, isCore,
+          format, processDts, pathMappings, true, enableI18nLegacyMessageIdFormat);
 
       const result = transformer.transform(bundle);
       if (result.success) {
diff --git a/packages/compiler-cli/ngcc/src/host/commonjs_host.ts b/packages/compiler-cli/ngcc/src/host/commonjs_host.ts
index ca3d6532c6396..4a501a953a869 100644
--- a/packages/compiler-cli/ngcc/src/host/commonjs_host.ts
+++ b/packages/compiler-cli/ngcc/src/host/commonjs_host.ts
@@ -10,11 +10,11 @@ import * as ts from 'typescript';
 
 import {absoluteFrom} from '../../../src/ngtsc/file_system';
 import {Logger} from '../../../src/ngtsc/logging';
-import {Declaration, Import} from '../../../src/ngtsc/reflection';
+import {Declaration, DeclarationKind, Import} from '../../../src/ngtsc/reflection';
 import {BundleProgram} from '../packages/bundle_program';
 import {FactoryMap, isDefined} from '../utils';
 
-import {DefinePropertyReexportStatement, ExportDeclaration, ExportStatement, extractGetterFnExpression, findNamespaceOfIdentifier, findRequireCallReference, isDefinePropertyReexportStatement, isExportStatement, isExternalImport, isRequireCall, isWildcardReexportStatement, RequireCall, WildcardReexportStatement} from './commonjs_umd_utils';
+import {DefinePropertyReexportStatement, ExportDeclaration, ExportsStatement, extractGetterFnExpression, findNamespaceOfIdentifier, findRequireCallReference, isDefinePropertyReexportStatement, isExportsStatement, isExternalImport, isRequireCall, isWildcardReexportStatement, RequireCall, skipAliases, WildcardReexportStatement} from './commonjs_umd_utils';
 import {Esm5ReflectionHost} from './esm5_host';
 import {NgccClassSymbol} from './ngcc_host';
 
@@ -98,7 +98,7 @@ export class CommonJsReflectionHost extends Esm5ReflectionHost {
   private computeExportsOfCommonJsModule(sourceFile: ts.SourceFile): Map<string, Declaration> {
     const moduleMap = new Map<string, Declaration>();
     for (const statement of this.getModuleStatements(sourceFile)) {
-      if (isExportStatement(statement)) {
+      if (isExportsStatement(statement)) {
         const exportDeclaration = this.extractBasicCommonJsExportDeclaration(statement);
         moduleMap.set(exportDeclaration.name, exportDeclaration.declaration);
       } else if (isWildcardReexportStatement(statement)) {
@@ -116,10 +116,17 @@ export class CommonJsReflectionHost extends Esm5ReflectionHost {
     return moduleMap;
   }
 
-  private extractBasicCommonJsExportDeclaration(statement: ExportStatement): ExportDeclaration {
-    const exportExpression = statement.expression.right;
-    const name = statement.expression.left.name.text;
-    return this.extractCommonJsExportDeclaration(name, exportExpression);
+  private extractBasicCommonJsExportDeclaration(statement: ExportsStatement): ExportDeclaration {
+    const exportExpression = skipAliases(statement.expression.right);
+    const node = statement.expression.left;
+    const declaration = this.getDeclarationOfExpression(exportExpression) ?? {
+      kind: DeclarationKind.Inline,
+      node,
+      implementation: exportExpression,
+      known: null,
+      viaModule: null,
+    };
+    return {name: node.name.text, declaration};
   }
 
   private extractCommonJsWildcardReexports(
@@ -163,7 +170,22 @@ export class CommonJsReflectionHost extends Esm5ReflectionHost {
     if (getterFnExpression === null) {
       return null;
     }
-    return this.extractCommonJsExportDeclaration(name, getterFnExpression);
+
+    const declaration = this.getDeclarationOfExpression(getterFnExpression);
+    if (declaration !== null) {
+      return {name, declaration};
+    }
+
+    return {
+      name,
+      declaration: {
+        kind: DeclarationKind.Inline,
+        node: args[1],
+        implementation: getterFnExpression,
+        known: null,
+        viaModule: null,
+      },
+    };
   }
 
   private findCommonJsImport(id: ts.Identifier): RequireCall|null {
@@ -173,19 +195,6 @@ export class CommonJsReflectionHost extends Esm5ReflectionHost {
     return nsIdentifier && findRequireCallReference(nsIdentifier, this.checker);
   }
 
-  private extractCommonJsExportDeclaration(name: string, expression: ts.Expression):
-      ExportDeclaration {
-    const declaration = this.getDeclarationOfExpression(expression);
-    if (declaration !== null) {
-      return {name, declaration};
-    } else {
-      return {
-        name,
-        declaration: {node: null, known: null, expression, viaModule: null},
-      };
-    }
-  }
-
   /**
    * Handle the case where the identifier represents a reference to a whole CommonJS
    * module, i.e. the result of a call to `require(...)`.
@@ -204,7 +213,7 @@ export class CommonJsReflectionHost extends Esm5ReflectionHost {
       return null;
     }
     const viaModule = isExternalImport(importPath) ? importPath : null;
-    return {node: module, known: null, viaModule, identity: null};
+    return {node: module, known: null, viaModule, identity: null, kind: DeclarationKind.Concrete};
   }
 
   private resolveModuleName(moduleName: string, containingFile: ts.SourceFile): ts.SourceFile
diff --git a/packages/compiler-cli/ngcc/src/host/commonjs_umd_utils.ts b/packages/compiler-cli/ngcc/src/host/commonjs_umd_utils.ts
index 7374871584709..b762eafdec51f 100644
--- a/packages/compiler-cli/ngcc/src/host/commonjs_umd_utils.ts
+++ b/packages/compiler-cli/ngcc/src/host/commonjs_umd_utils.ts
@@ -8,22 +8,13 @@
 
 import * as ts from 'typescript';
 import {Declaration} from '../../../src/ngtsc/reflection';
-
+import {isAssignment} from '../../../src/ngtsc/util/src/typescript';
 
 export interface ExportDeclaration {
   name: string;
   declaration: Declaration;
 }
 
-export interface ExportStatement extends ts.ExpressionStatement {
-  expression: ts.BinaryExpression&{
-    left: ts.PropertyAccessExpression &
-        {
-          expression: ts.Identifier
-        }
-  };
-}
-
 /**
  * A CommonJS or UMD wildcard re-export statement.
  *
@@ -59,6 +50,9 @@ export interface DefinePropertyReexportStatement extends ts.ExpressionStatement
       {arguments: [ts.Identifier, ts.StringLiteral, ts.ObjectLiteralExpression]};
 }
 
+/**
+ * A call expression that has a string literal for its first argument.
+ */
 export interface RequireCall extends ts.CallExpression {
   arguments: ts.CallExpression['arguments']&[ts.StringLiteral];
 }
@@ -90,18 +84,6 @@ export function findRequireCallReference(id: ts.Identifier, checker: ts.TypeChec
   return initializer && isRequireCall(initializer) ? initializer : null;
 }
 
-/**
- * Check whether the specified `ts.Statement` is an export statement, i.e. an expression statement
- * of the form: `exports.<foo> = <bar>`
- */
-export function isExportStatement(stmt: ts.Statement): stmt is ExportStatement {
-  return ts.isExpressionStatement(stmt) && ts.isBinaryExpression(stmt.expression) &&
-      (stmt.expression.operatorToken.kind === ts.SyntaxKind.EqualsToken) &&
-      ts.isPropertyAccessExpression(stmt.expression.left) &&
-      ts.isIdentifier(stmt.expression.left.expression) &&
-      stmt.expression.left.expression.text === 'exports';
-}
-
 /**
  * Check whether the specified `ts.Statement` is a wildcard re-export statement.
  * I.E. an expression statement of one of the following forms:
@@ -194,6 +176,12 @@ export function isDefinePropertyReexportStatement(stmt: ts.Statement):
       prop => prop.name !== undefined && ts.isIdentifier(prop.name) && prop.name.text === 'get'));
 }
 
+/**
+ * Extract the "value" of the getter in a `defineProperty` statement.
+ *
+ * This will return the `ts.Expression` value of a single `return` statement in the `get` method
+ * of the property definition object, or `null` if that is not possible.
+ */
 export function extractGetterFnExpression(statement: DefinePropertyReexportStatement):
     ts.Expression|null {
   const args = statement.expression.arguments;
@@ -220,6 +208,76 @@ export function isRequireCall(node: ts.Node): node is RequireCall {
       ts.isStringLiteral(node.arguments[0]);
 }
 
+/**
+ * Check whether the specified `path` is an "external" import.
+ * In other words, that it comes from a entry-point outside the current one.
+ */
 export function isExternalImport(path: string): boolean {
   return !/^\.\.?(\/|$)/.test(path);
 }
+
+/**
+ * A UMD/CommonJS style export declaration of the form `exports.<name>`.
+ */
+export interface ExportsDeclaration extends ts.PropertyAccessExpression {
+  name: ts.Identifier;
+  expression: ts.Identifier;
+  parent: ExportsAssignment;
+}
+
+/**
+ * Check whether the specified `node` is a property access expression of the form
+ * `exports.<foo>`.
+ */
+export function isExportsDeclaration(expr: ts.Node): expr is ExportsDeclaration {
+  return expr.parent && isExportsAssignment(expr.parent);
+}
+
+/**
+ * A UMD/CommonJS style export assignment of the form `exports.<foo> = <bar>`.
+ */
+export interface ExportsAssignment extends ts.BinaryExpression {
+  left: ExportsDeclaration;
+}
+
+/**
+ * Check whether the specified `node` is an assignment expression of the form
+ * `exports.<foo> = <bar>`.
+ */
+export function isExportsAssignment(expr: ts.Node): expr is ExportsAssignment {
+  return isAssignment(expr) && ts.isPropertyAccessExpression(expr.left) &&
+      ts.isIdentifier(expr.left.expression) && expr.left.expression.text === 'exports' &&
+      ts.isIdentifier(expr.left.name);
+}
+
+/**
+ * An expression statement of the form `exports.<foo> = <bar>;`.
+ */
+export interface ExportsStatement extends ts.ExpressionStatement {
+  expression: ExportsAssignment;
+}
+
+/**
+ * Check whether the specified `stmt` is an expression statement of the form
+ * `exports.<foo> = <bar>;`.
+ */
+export function isExportsStatement(stmt: ts.Node): stmt is ExportsStatement {
+  return ts.isExpressionStatement(stmt) && isExportsAssignment(stmt.expression);
+}
+
+/**
+ * Find the far right hand side of a sequence of aliased assignements of the form
+ *
+ * ```
+ * exports.MyClass = alias1 = alias2 = <<declaration>>
+ * ```
+ *
+ * @param node the expression to parse
+ * @returns the original `node` or the far right expression of a series of assignments.
+ */
+export function skipAliases(node: ts.Expression): ts.Expression {
+  while (isAssignment(node)) {
+    node = node.right;
+  }
+  return node;
+}
diff --git a/packages/compiler-cli/ngcc/src/host/delegating_host.ts b/packages/compiler-cli/ngcc/src/host/delegating_host.ts
index 907433fabde4b..e72a40a94d01a 100644
--- a/packages/compiler-cli/ngcc/src/host/delegating_host.ts
+++ b/packages/compiler-cli/ngcc/src/host/delegating_host.ts
@@ -8,7 +8,7 @@
 
 import * as ts from 'typescript';
 
-import {ClassDeclaration, ClassMember, CtorParameter, Declaration, Decorator, FunctionDefinition, Import, ReflectionHost} from '../../../src/ngtsc/reflection';
+import {ClassDeclaration, ClassMember, CtorParameter, Declaration, DeclarationNode, Decorator, FunctionDefinition, Import, ReflectionHost} from '../../../src/ngtsc/reflection';
 import {isFromDtsFile} from '../../../src/ngtsc/util/src/typescript';
 
 import {NgccClassSymbol, NgccReflectionHost, SwitchableVariableDeclaration} from './ngcc_host';
@@ -38,7 +38,7 @@ export class DelegatingReflectionHost implements NgccReflectionHost {
     return this.ngccHost.getDeclarationOfIdentifier(id);
   }
 
-  getDecoratorsOfDeclaration(declaration: ts.Declaration): Decorator[]|null {
+  getDecoratorsOfDeclaration(declaration: DeclarationNode): Decorator[]|null {
     if (isFromDtsFile(declaration)) {
       return this.tsHost.getDecoratorsOfDeclaration(declaration);
     }
@@ -52,7 +52,7 @@ export class DelegatingReflectionHost implements NgccReflectionHost {
     return this.ngccHost.getDefinitionOfFunction(fn);
   }
 
-  getDtsDeclaration(declaration: ts.Declaration): ts.Declaration|null {
+  getDtsDeclaration(declaration: DeclarationNode): ts.Declaration|null {
     if (isFromDtsFile(declaration)) {
       return this.tsHost.getDtsDeclaration(declaration);
     }
diff --git a/packages/compiler-cli/ngcc/src/host/esm2015_host.ts b/packages/compiler-cli/ngcc/src/host/esm2015_host.ts
index 9589818870074..c4d7c89cbe1f9 100644
--- a/packages/compiler-cli/ngcc/src/host/esm2015_host.ts
+++ b/packages/compiler-cli/ngcc/src/host/esm2015_host.ts
@@ -7,10 +7,10 @@
  */
 
 import * as ts from 'typescript';
-import {absoluteFromSourceFile} from '../../../src/ngtsc/file_system';
 
+import {absoluteFromSourceFile} from '../../../src/ngtsc/file_system';
 import {Logger} from '../../../src/ngtsc/logging';
-import {ClassDeclaration, ClassMember, ClassMemberKind, CtorParameter, Declaration, Decorator, EnumMember, isDecoratorIdentifier, isNamedClassDeclaration, isNamedFunctionDeclaration, isNamedVariableDeclaration, KnownDeclaration, reflectObjectLiteral, SpecialDeclarationKind, TypeScriptReflectionHost, TypeValueReference} from '../../../src/ngtsc/reflection';
+import {ClassDeclaration, ClassMember, ClassMemberKind, CtorParameter, Declaration, DeclarationNode, Decorator, EnumMember, Import, isConcreteDeclaration, isDecoratorIdentifier, isNamedClassDeclaration, isNamedFunctionDeclaration, isNamedVariableDeclaration, KnownDeclaration, reflectObjectLiteral, SpecialDeclarationKind, TypeScriptReflectionHost, TypeValueReference, TypeValueReferenceKind, ValueUnavailableKind} from '../../../src/ngtsc/reflection';
 import {isWithinPackage} from '../analysis/util';
 import {BundleProgram} from '../packages/bundle_program';
 import {findAll, getNameText, hasNameIdentifier, isDefined, stripDollarSuffix} from '../utils';
@@ -58,7 +58,7 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
    * tree. Note that by definition the key and value declarations will not be in the same TS
    * program.
    */
-  protected publicDtsDeclarationMap: Map<ts.Declaration, ts.Declaration>|null = null;
+  protected publicDtsDeclarationMap: Map<DeclarationNode, ts.Declaration>|null = null;
   /**
    * A mapping from source declarations to typings declarations, which are not publicly exported.
    *
@@ -66,7 +66,7 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
    * the same name in both the source and the dts file. Note that by definition the key and value
    * declarations will not be in the same TS program.
    */
-  protected privateDtsDeclarationMap: Map<ts.Declaration, ts.Declaration>|null = null;
+  protected privateDtsDeclarationMap: Map<DeclarationNode, ts.Declaration>|null = null;
 
   /**
    * The set of source files that have already been preprocessed.
@@ -88,7 +88,7 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
    *
    * This map is populated during the preprocessing of each source file.
    */
-  protected aliasedClassDeclarations = new Map<ts.Declaration, ts.Identifier>();
+  protected aliasedClassDeclarations = new Map<DeclarationNode, ts.Identifier>();
 
   /**
    * Caches the information of the decorators on a class, as the work involved with extracting
@@ -132,31 +132,25 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
     if (symbol !== undefined) {
       return symbol;
     }
-
-    if (declaration.parent !== undefined && isNamedVariableDeclaration(declaration.parent)) {
-      const variableValue = this.getVariableValue(declaration.parent);
-      if (variableValue !== null) {
-        declaration = variableValue;
-      }
-    }
-
-    return this.getClassSymbolFromInnerDeclaration(declaration);
+    const innerDeclaration = this.getInnerDeclarationFromAliasOrInner(declaration);
+    return this.getClassSymbolFromInnerDeclaration(innerDeclaration);
   }
 
   /**
    * 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.
+   * @param declaration a TypeScript 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 decoratable type.
+   *     `null` if either no decorators were present or if the declaration is not of a decoratable
+   *     type.
    */
-  getDecoratorsOfDeclaration(declaration: ts.Declaration): Decorator[]|null {
+  getDecoratorsOfDeclaration(declaration: DeclarationNode): Decorator[]|null {
     const symbol = this.getClassSymbol(declaration);
     if (!symbol) {
       return null;
@@ -243,13 +237,7 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
           clazz.name.text} to be a class declaration.`);
     }
 
-    if (classSymbol.adjacent !== undefined) {
-      return this.getNameFromClassSymbolDeclaration(
-          classSymbol, classSymbol.adjacent.valueDeclaration);
-    } else {
-      return this.getNameFromClassSymbolDeclaration(
-          classSymbol, classSymbol.implementation.valueDeclaration);
-    }
+    return this.getAdjacentNameOfClassSymbol(classSymbol);
   }
 
   private getNameFromClassSymbolDeclaration(
@@ -293,15 +281,17 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
   getDeclarationOfIdentifier(id: ts.Identifier): Declaration|null {
     const superDeclaration = super.getDeclarationOfIdentifier(id);
 
-    // If no declaration was found or it's an inline declaration, return as is.
-    if (superDeclaration === null || superDeclaration.node === null) {
+    // If no declaration was found, return.
+    if (superDeclaration === null) {
       return superDeclaration;
     }
 
     // If the declaration already has traits assigned to it, return as is.
-    if (superDeclaration.known !== null || superDeclaration.identity !== null) {
+    if (superDeclaration.known !== null ||
+        isConcreteDeclaration(superDeclaration) && superDeclaration.identity !== null) {
       return superDeclaration;
     }
+
     let declarationNode: ts.Node = superDeclaration.node;
     if (isNamedVariableDeclaration(superDeclaration.node) && !isTopLevel(superDeclaration.node)) {
       const variableValue = this.getVariableValue(superDeclaration.node);
@@ -310,11 +300,12 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
       }
     }
 
-    const outerClassNode = getClassDeclarationFromInnerDeclaration(declarationNode);
-    const declaration = outerClassNode !== null ?
-        this.getDeclarationOfIdentifier(outerClassNode.name) :
+    const outerNode = getOuterNodeFromInnerDeclaration(declarationNode);
+    const declaration = outerNode !== null && isNamedVariableDeclaration(outerNode) ?
+        this.getDeclarationOfIdentifier(outerNode.name) :
         superDeclaration;
-    if (declaration === null || declaration.node === null || declaration.known !== null) {
+    if (declaration === null || declaration.known !== null ||
+        isConcreteDeclaration(declaration) && declaration.identity !== null) {
       return declaration;
     }
 
@@ -326,7 +317,7 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
     }
 
     // Variable declarations may represent an enum declaration, so attempt to resolve its members.
-    if (ts.isVariableDeclaration(declaration.node)) {
+    if (isConcreteDeclaration(declaration) && ts.isVariableDeclaration(declaration.node)) {
       const enumMembers = this.resolveEnumMembers(declaration.node);
       if (enumMembers !== null) {
         declaration.identity = {kind: SpecialDeclarationKind.DownleveledEnum, enumMembers};
@@ -428,23 +419,10 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
    * @returns An array of class symbols.
    */
   findClassSymbols(sourceFile: ts.SourceFile): NgccClassSymbol[] {
-    const classes: NgccClassSymbol[] = [];
-    this.getModuleStatements(sourceFile).forEach(statement => {
-      if (ts.isVariableStatement(statement)) {
-        statement.declarationList.declarations.forEach(declaration => {
-          const classSymbol = this.getClassSymbol(declaration);
-          if (classSymbol) {
-            classes.push(classSymbol);
-          }
-        });
-      } else if (ts.isClassDeclaration(statement)) {
-        const classSymbol = this.getClassSymbol(statement);
-        if (classSymbol) {
-          classes.push(classSymbol);
-        }
-      }
-    });
-    return classes;
+    const classes = new Map<ts.Symbol, NgccClassSymbol>();
+    this.getModuleStatements(sourceFile)
+        .forEach(statement => this.addClassSymbolsFromStatement(classes, statement));
+    return Array.from(classes.values());
   }
 
   /**
@@ -475,7 +453,7 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
    * Note that the `ts.ClassDeclaration` returned from this function may not be from the same
    * `ts.Program` as the input declaration.
    */
-  getDtsDeclaration(declaration: ts.Declaration): ts.Declaration|null {
+  getDtsDeclaration(declaration: DeclarationNode): ts.Declaration|null {
     if (this.dts === null) {
       return null;
     }
@@ -484,20 +462,27 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
           declaration.getText()} in ${declaration.getSourceFile().fileName}`);
     }
 
+    const decl = this.getDeclarationOfIdentifier(declaration.name);
+    if (decl === null) {
+      throw new Error(
+          `Cannot get the dts file for a node that cannot be associated with a declaration ${
+              declaration.getText()} in ${declaration.getSourceFile().fileName}`);
+    }
+
     // Try to retrieve the dts declaration from the public map
     if (this.publicDtsDeclarationMap === null) {
       this.publicDtsDeclarationMap = this.computePublicDtsDeclarationMap(this.src, this.dts);
     }
-    if (this.publicDtsDeclarationMap.has(declaration)) {
-      return this.publicDtsDeclarationMap.get(declaration)!;
+    if (this.publicDtsDeclarationMap.has(decl.node)) {
+      return this.publicDtsDeclarationMap.get(decl.node)!;
     }
 
     // No public export, try the private map
     if (this.privateDtsDeclarationMap === null) {
       this.privateDtsDeclarationMap = this.computePrivateDtsDeclarationMap(this.src, this.dts);
     }
-    if (this.privateDtsDeclarationMap.has(declaration)) {
-      return this.privateDtsDeclarationMap.get(declaration)!;
+    if (this.privateDtsDeclarationMap.has(decl.node)) {
+      return this.privateDtsDeclarationMap.get(decl.node)!;
     }
 
     // No declaration found at all
@@ -568,6 +553,41 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
 
   ///////////// Protected Helpers /////////////
 
+  /**
+   * Extract all the "classes" from the `statement` and add them to the `classes` map.
+   */
+  protected addClassSymbolsFromStatement(
+      classes: Map<ts.Symbol, NgccClassSymbol>, statement: ts.Statement): void {
+    if (ts.isVariableStatement(statement)) {
+      statement.declarationList.declarations.forEach(declaration => {
+        const classSymbol = this.getClassSymbol(declaration);
+        if (classSymbol) {
+          classes.set(classSymbol.implementation, classSymbol);
+        }
+      });
+    } else if (ts.isClassDeclaration(statement)) {
+      const classSymbol = this.getClassSymbol(statement);
+      if (classSymbol) {
+        classes.set(classSymbol.implementation, classSymbol);
+      }
+    }
+  }
+
+  /**
+   * Compute the inner declaration node of a "class" from the given `declaration` node.
+   *
+   * @param declaration a node that is either an inner declaration or an alias of a class.
+   */
+  protected getInnerDeclarationFromAliasOrInner(declaration: ts.Node): ts.Node {
+    if (declaration.parent !== undefined && isNamedVariableDeclaration(declaration.parent)) {
+      const variableValue = this.getVariableValue(declaration.parent);
+      if (variableValue !== null) {
+        declaration = variableValue;
+      }
+    }
+    return declaration;
+  }
+
   /**
    * A class may be declared as a top level class declaration:
    *
@@ -610,7 +630,7 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
   protected getClassSymbolFromOuterDeclaration(declaration: ts.Node): NgccClassSymbol|undefined {
     // Return a class symbol without an inner declaration if it is a regular "top level" class
     if (isNamedClassDeclaration(declaration) && isTopLevel(declaration)) {
-      return this.createClassSymbol(declaration, null);
+      return this.createClassSymbol(declaration.name, null);
     }
 
     // Otherwise, an outer class declaration must be an initialized variable declaration:
@@ -619,12 +639,11 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
     }
 
     const innerDeclaration = getInnerClassDeclaration(skipClassAliases(declaration));
-    if (innerDeclaration !== null) {
-      return this.createClassSymbol(declaration, innerDeclaration);
+    if (innerDeclaration === null) {
+      return undefined;
     }
 
-
-    return undefined;
+    return this.createClassSymbol(declaration.name, innerDeclaration);
   }
 
   /**
@@ -680,7 +699,7 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
       return undefined;
     }
 
-    return this.createClassSymbol(outerDeclaration, declaration);
+    return this.createClassSymbol(outerDeclaration.name, declaration);
   }
 
   /**
@@ -694,10 +713,10 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
    * @returns the `NgccClassSymbol` representing the class, or undefined if a `ts.Symbol` for any of
    * the declarations could not be resolved.
    */
-  protected createClassSymbol(outerDeclaration: ClassDeclaration, innerDeclaration: ts.Node|null):
+  protected createClassSymbol(outerDeclaration: ts.Identifier, innerDeclaration: ts.Node|null):
       NgccClassSymbol|undefined {
     const declarationSymbol =
-        this.checker.getSymbolAtLocation(outerDeclaration.name) as ClassSymbol | undefined;
+        this.checker.getSymbolAtLocation(outerDeclaration) as ClassSymbol | undefined;
     if (declarationSymbol === undefined) {
       return undefined;
     }
@@ -715,13 +734,9 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
       name: declarationSymbol.name,
       declaration: declarationSymbol,
       implementation: implementationSymbol,
+      adjacent: this.getAdjacentSymbol(declarationSymbol, implementationSymbol),
     };
 
-    let adjacent = this.getAdjacentSymbol(declarationSymbol, implementationSymbol);
-    if (adjacent !== null) {
-      classSymbol.adjacent = adjacent;
-    }
-
     return classSymbol;
   }
 
@@ -772,7 +787,7 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
    * @returns The original identifier that the given class declaration resolves to, or `undefined`
    * if the declaration does not represent an aliased class.
    */
-  protected resolveAliasedClassIdentifier(declaration: ts.Declaration): ts.Identifier|null {
+  protected resolveAliasedClassIdentifier(declaration: DeclarationNode): ts.Identifier|null {
     this.ensurePreprocessed(declaration.getSourceFile());
     return this.aliasedClassDeclarations.has(declaration) ?
         this.aliasedClassDeclarations.get(declaration)! :
@@ -824,7 +839,7 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
     const aliasedIdentifier = initializer.left;
 
     const aliasedDeclaration = this.getDeclarationOfIdentifier(aliasedIdentifier);
-    if (aliasedDeclaration === null || aliasedDeclaration.node === null) {
+    if (aliasedDeclaration === null) {
       throw new Error(
           `Unable to locate declaration of ${aliasedIdentifier.text} in "${statement.getText()}"`);
     }
@@ -1165,8 +1180,7 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
 
     const outerDeclaration = classSymbol.declaration.valueDeclaration;
     const innerDeclaration = classSymbol.implementation.valueDeclaration;
-    const adjacentDeclaration =
-        this.getAdjacentNameOfClass((classSymbol.declaration.valueDeclaration)).parent;
+    const adjacentDeclaration = this.getAdjacentNameOfClassSymbol(classSymbol).parent;
     const matchesClass = (identifier: ts.Identifier) => {
       const decl = this.getDeclarationOfIdentifier(identifier);
       return decl !== null &&
@@ -1593,30 +1607,7 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
           constructorParamInfo[index] :
           {decorators: null, typeExpression: null};
       const nameNode = node.name;
-
-      let typeValueReference: TypeValueReference|null = null;
-      if (typeExpression !== null) {
-        // `typeExpression` is an expression in a "type" context. Resolve it to a declared value.
-        // Either it's a reference to an imported type, or a type declared locally. Distinguish the
-        // two cases with `getDeclarationOfExpression`.
-        const decl = this.getDeclarationOfExpression(typeExpression);
-        if (decl !== null && decl.node !== null && decl.viaModule !== null &&
-            isNamedDeclaration(decl.node)) {
-          typeValueReference = {
-            local: false,
-            valueDeclaration: decl.node,
-            moduleName: decl.viaModule,
-            importedName: decl.node.name.text,
-            nestedPath: null,
-          };
-        } else {
-          typeValueReference = {
-            local: true,
-            expression: typeExpression,
-            defaultImportStatement: null,
-          };
-        }
-      }
+      const typeValueReference = this.typeToValue(typeExpression);
 
       return {
         name: getNameText(nameNode),
@@ -1628,6 +1619,59 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
     });
   }
 
+  /**
+   * Compute the `TypeValueReference` for the given `typeExpression`.
+   *
+   * Although `typeExpression` is a valid `ts.Expression` that could be emitted directly into the
+   * generated code, ngcc still needs to resolve the declaration and create an `IMPORTED` type
+   * value reference as the compiler has specialized handling for some symbols, for example
+   * `ChangeDetectorRef` from `@angular/core`. Such an `IMPORTED` type value reference will result
+   * in a newly generated namespace import, instead of emitting the original `typeExpression` as is.
+   */
+  private typeToValue(typeExpression: ts.Expression|null): TypeValueReference {
+    if (typeExpression === null) {
+      return {
+        kind: TypeValueReferenceKind.UNAVAILABLE,
+        reason: {kind: ValueUnavailableKind.MISSING_TYPE},
+      };
+    }
+
+    const imp = this.getImportOfExpression(typeExpression);
+    const decl = this.getDeclarationOfExpression(typeExpression);
+    if (imp === null || decl === null) {
+      return {
+        kind: TypeValueReferenceKind.LOCAL,
+        expression: typeExpression,
+        defaultImportStatement: null,
+      };
+    }
+
+    return {
+      kind: TypeValueReferenceKind.IMPORTED,
+      valueDeclaration: decl.node,
+      moduleName: imp.from,
+      importedName: imp.name,
+      nestedPath: null,
+    };
+  }
+
+  /**
+   * Determines where the `expression` is imported from.
+   *
+   * @param expression the expression to determine the import details for.
+   * @returns the `Import` for the expression, or `null` if the expression is not imported or the
+   * expression syntax is not supported.
+   */
+  private getImportOfExpression(expression: ts.Expression): Import|null {
+    if (ts.isIdentifier(expression)) {
+      return this.getImportOfIdentifier(expression);
+    } else if (ts.isPropertyAccessExpression(expression) && ts.isIdentifier(expression.name)) {
+      return this.getImportOfIdentifier(expression.name);
+    } else {
+      return null;
+    }
+  }
+
   /**
    * Get the parameter type and decorators for the constructor of a class,
    * where the information is stored on a static property of the class.
@@ -1754,8 +1798,8 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
    * @returns a map of source declarations to typings declarations.
    */
   protected computePublicDtsDeclarationMap(src: BundleProgram, dts: BundleProgram):
-      Map<ts.Declaration, ts.Declaration> {
-    const declarationMap = new Map<ts.Declaration, ts.Declaration>();
+      Map<DeclarationNode, ts.Declaration> {
+    const declarationMap = new Map<DeclarationNode, ts.Declaration>();
     const dtsDeclarationMap = new Map<string, ts.Declaration>();
     const rootDts = getRootFileOrFail(dts);
     this.collectDtsExportedDeclarations(dtsDeclarationMap, rootDts, dts.program.getTypeChecker());
@@ -1778,8 +1822,8 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
    * @returns a map of source declarations to typings declarations.
    */
   protected computePrivateDtsDeclarationMap(src: BundleProgram, dts: BundleProgram):
-      Map<ts.Declaration, ts.Declaration> {
-    const declarationMap = new Map<ts.Declaration, ts.Declaration>();
+      Map<DeclarationNode, ts.Declaration> {
+    const declarationMap = new Map<DeclarationNode, ts.Declaration>();
     const dtsDeclarationMap = new Map<string, ts.Declaration>();
     const typeChecker = dts.program.getTypeChecker();
 
@@ -1821,13 +1865,13 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
 
 
   protected collectSrcExportedDeclarations(
-      declarationMap: Map<ts.Declaration, ts.Declaration>,
+      declarationMap: Map<DeclarationNode, ts.Declaration>,
       dtsDeclarationMap: Map<string, ts.Declaration>, srcFile: ts.SourceFile): void {
     const fileExports = this.getExportsOfModule(srcFile);
     if (fileExports !== null) {
-      for (const [exportName, {node: declaration}] of fileExports) {
-        if (declaration !== null && dtsDeclarationMap.has(exportName)) {
-          declarationMap.set(declaration, dtsDeclarationMap.get(exportName)!);
+      for (const [exportName, {node: declarationNode}] of fileExports) {
+        if (dtsDeclarationMap.has(exportName)) {
+          declarationMap.set(declarationNode, dtsDeclarationMap.get(exportName)!);
         }
       }
     }
@@ -1843,7 +1887,7 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
     }
 
     const namespaceDecl = this.getDeclarationOfIdentifier(expression.expression);
-    if (!namespaceDecl || namespaceDecl.node === null || !ts.isSourceFile(namespaceDecl.node)) {
+    if (!namespaceDecl || !ts.isSourceFile(namespaceDecl.node)) {
       return null;
     }
 
@@ -1862,9 +1906,6 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
 
   /** Checks if the specified declaration resolves to the known JavaScript global `Object`. */
   protected isJavaScriptObjectDeclaration(decl: Declaration): boolean {
-    if (decl.node === null) {
-      return false;
-    }
     const node = decl.node;
     // The default TypeScript library types the global `Object` variable through
     // a variable declaration with a type reference resolving to `ObjectConstructor`.
@@ -1986,6 +2027,16 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
     }
     return reflectEnumAssignment(innerExpression);
   }
+
+  private getAdjacentNameOfClassSymbol(classSymbol: NgccClassSymbol): ts.Identifier {
+    if (classSymbol.adjacent !== undefined) {
+      return this.getNameFromClassSymbolDeclaration(
+          classSymbol, classSymbol.adjacent.valueDeclaration);
+    } else {
+      return this.getNameFromClassSymbolDeclaration(
+          classSymbol, classSymbol.implementation.valueDeclaration);
+    }
+  }
 }
 
 ///////////// Exported Helpers /////////////
@@ -2274,6 +2325,7 @@ function isInitializedVariableClassDeclaration(node: ts.Node):
     node is InitializedVariableClassDeclaration {
   return isNamedVariableDeclaration(node) && node.initializer !== undefined;
 }
+
 /**
  * Handle a variable declaration of the form
  *
@@ -2281,7 +2333,7 @@ function isInitializedVariableClassDeclaration(node: ts.Node):
  * var MyClass = alias1 = alias2 = <<declaration>>
  * ```
  *
- * @node the LHS of a variable declaration.
+ * @param node the LHS of a variable declaration.
  * @returns the original AST node or the RHS of a series of assignments in a variable
  *     declaration.
  */
@@ -2333,7 +2385,7 @@ export function skipClassAliases(node: InitializedVariableClassDeclaration): ts.
  * @param expression the node that represents the class whose declaration we are finding.
  * @returns the declaration of the class or `null` if it is not a "class".
  */
-function getInnerClassDeclaration(expression: ts.Expression):
+export function getInnerClassDeclaration(expression: ts.Expression):
     ClassDeclaration<ts.ClassExpression|ts.ClassDeclaration|ts.FunctionDeclaration>|null {
   if (ts.isClassExpression(expression) && hasNameIdentifier(expression)) {
     return expression;
@@ -2539,51 +2591,53 @@ function isTopLevel(node: ts.Node): boolean {
 }
 
 /**
- * Get the actual (outer) declaration of a class.
+ * Get a node that represents the actual (outer) declaration of a class from its implementation.
  *
  * Sometimes, the implementation of a class is an expression that is hidden inside an IIFE and
- * returned to be assigned to a variable outside the IIFE, which is what the rest of the program
- * interacts with.
+ * assigned to a variable outside the IIFE, which is what the rest of the program interacts with.
+ * For example,
  *
- * Given the inner declaration, we want to get to the declaration of the outer variable that
- * represents the class.
+ * ```
+ * OuterNode = Alias = (function() { function InnerNode() {} return InnerNode; })();
+ * ```
  *
- * @param node a node that could be the inner declaration inside an IIFE.
- * @returns the outer variable declaration or `null` if it is not a "class".
+ * @param node a node that could be the implementation inside an IIFE.
+ * @returns a node that represents the outer declaration, or `null` if it is does not match the IIFE
+ *     format shown above.
  */
-export function getClassDeclarationFromInnerDeclaration(node: ts.Node):
-    ClassDeclaration<ts.VariableDeclaration>|null {
-  if (ts.isFunctionDeclaration(node) || ts.isClassDeclaration(node) ||
-      ts.isVariableStatement(node)) {
-    // It might be the function expression inside the IIFE. We need to go 5 levels up...
+export function getOuterNodeFromInnerDeclaration(node: ts.Node): ts.Node|null {
+  if (!ts.isFunctionDeclaration(node) && !ts.isClassDeclaration(node) &&
+      !ts.isVariableStatement(node)) {
+    return null;
+  }
 
-    // - IIFE body.
-    let outerNode = node.parent;
-    if (!outerNode || !ts.isBlock(outerNode)) return null;
+  // It might be the function expression inside the IIFE. We need to go 5 levels up...
 
-    // - IIFE function expression.
-    outerNode = outerNode.parent;
-    if (!outerNode || (!ts.isFunctionExpression(outerNode) && !ts.isArrowFunction(outerNode))) {
-      return null;
-    }
-    outerNode = outerNode.parent;
+  // - IIFE body.
+  let outerNode = node.parent;
+  if (!outerNode || !ts.isBlock(outerNode)) return null;
 
-    // - Parenthesis inside IIFE.
-    if (outerNode && ts.isParenthesizedExpression(outerNode)) outerNode = outerNode.parent;
+  // - IIFE function expression.
+  outerNode = outerNode.parent;
+  if (!outerNode || (!ts.isFunctionExpression(outerNode) && !ts.isArrowFunction(outerNode))) {
+    return null;
+  }
+  outerNode = outerNode.parent;
 
-    // - IIFE call expression.
-    if (!outerNode || !ts.isCallExpression(outerNode)) return null;
-    outerNode = outerNode.parent;
+  // - Parenthesis inside IIFE.
+  if (outerNode && ts.isParenthesizedExpression(outerNode)) outerNode = outerNode.parent;
 
-    // - Parenthesis around IIFE.
-    if (outerNode && ts.isParenthesizedExpression(outerNode)) outerNode = outerNode.parent;
+  // - IIFE call expression.
+  if (!outerNode || !ts.isCallExpression(outerNode)) return null;
+  outerNode = outerNode.parent;
 
-    // - Outer variable declaration.
-    if (!outerNode || !ts.isVariableDeclaration(outerNode)) return null;
+  // - Parenthesis around IIFE.
+  if (outerNode && ts.isParenthesizedExpression(outerNode)) outerNode = outerNode.parent;
 
-    // Finally, ensure that the variable declaration has a `name` identifier.
-    return hasNameIdentifier(outerNode) ? outerNode : null;
+  // - Skip any aliases between the IIFE and the far left hand side of any assignments.
+  while (isAssignment(outerNode.parent)) {
+    outerNode = outerNode.parent;
   }
 
-  return null;
+  return outerNode;
 }
diff --git a/packages/compiler-cli/ngcc/src/host/esm5_host.ts b/packages/compiler-cli/ngcc/src/host/esm5_host.ts
index fbaf423b7cd3a..5af9c9f12391b 100644
--- a/packages/compiler-cli/ngcc/src/host/esm5_host.ts
+++ b/packages/compiler-cli/ngcc/src/host/esm5_host.ts
@@ -8,10 +8,10 @@
 
 import * as ts from 'typescript';
 
-import {ClassDeclaration, ClassMember, ClassMemberKind, Declaration, Decorator, FunctionDefinition, Parameter, reflectObjectLiteral} from '../../../src/ngtsc/reflection';
+import {ClassDeclaration, ClassMember, ClassMemberKind, Declaration, DeclarationKind, Decorator, FunctionDefinition, isNamedFunctionDeclaration, KnownDeclaration, Parameter, reflectObjectLiteral} from '../../../src/ngtsc/reflection';
 import {getTsHelperFnFromDeclaration, getTsHelperFnFromIdentifier, hasNameIdentifier} from '../utils';
 
-import {Esm2015ReflectionHost, getClassDeclarationFromInnerDeclaration, getPropertyValueFromSymbol, isAssignmentStatement, ParamInfo} from './esm2015_host';
+import {Esm2015ReflectionHost, getOuterNodeFromInnerDeclaration, getPropertyValueFromSymbol, isAssignmentStatement, ParamInfo} from './esm2015_host';
 import {NgccClassSymbol} from './ngcc_host';
 
 
@@ -82,9 +82,9 @@ export class Esm5ReflectionHost extends Esm2015ReflectionHost {
         // `importHelpers: false` (the default). This is, for example, the case with
         // `@nativescript/angular@9.0.0-next-2019-11-12-155500-01`.
         return {
-          expression: id,
+          kind: DeclarationKind.Inline,
+          node: id,
           known: nonEmittedNorImportedTsHelperDeclaration,
-          node: null,
           viaModule: null,
         };
       }
@@ -186,16 +186,16 @@ export class Esm5ReflectionHost extends Esm2015ReflectionHost {
       return classSymbol;
     }
 
-    if (!ts.isFunctionDeclaration(declaration) || !hasNameIdentifier(declaration)) {
+    if (!isNamedFunctionDeclaration(declaration)) {
       return undefined;
     }
 
-    const outerDeclaration = getClassDeclarationFromInnerDeclaration(declaration);
-    if (outerDeclaration === null || !hasNameIdentifier(outerDeclaration)) {
+    const outerNode = getOuterNodeFromInnerDeclaration(declaration);
+    if (outerNode === null || !hasNameIdentifier(outerNode)) {
       return undefined;
     }
 
-    return this.createClassSymbol(outerDeclaration, declaration);
+    return this.createClassSymbol(outerNode.name, declaration);
   }
 
   /**
@@ -219,7 +219,7 @@ export class Esm5ReflectionHost extends Esm2015ReflectionHost {
       return Array.from(constructor.parameters);
     }
 
-    if (isSynthesizedConstructor(constructor)) {
+    if (this.isSynthesizedConstructor(constructor)) {
       return null;
     }
 
@@ -352,6 +352,219 @@ export class Esm5ReflectionHost extends Esm2015ReflectionHost {
     const classDeclarationParent = classSymbol.implementation.valueDeclaration.parent;
     return ts.isBlock(classDeclarationParent) ? Array.from(classDeclarationParent.statements) : [];
   }
+
+  ///////////// Host Private Helpers /////////////
+
+  /**
+   * A constructor function may have been "synthesized" by TypeScript during JavaScript emit,
+   * in the case no user-defined constructor exists and e.g. property initializers are used.
+   * Those initializers need to be emitted into a constructor in JavaScript, so the TypeScript
+   * compiler generates a synthetic constructor.
+   *
+   * We need to identify such constructors as ngcc needs to be able to tell if a class did
+   * originally have a constructor in the TypeScript source. For ES5, we can not tell an
+   * empty constructor apart from a synthesized constructor, but fortunately that does not
+   * matter for the code generated by ngtsc.
+   *
+   * When a class has a superclass however, a synthesized constructor must not be considered
+   * as a user-defined constructor as that prevents a base factory call from being created by
+   * ngtsc, resulting in a factory function that does not inject the dependencies of the
+   * superclass. Hence, we identify a default synthesized super call in the constructor body,
+   * according to the structure that TypeScript's ES2015 to ES5 transformer generates in
+   * https://github.com/Microsoft/TypeScript/blob/v3.2.2/src/compiler/transformers/es2015.ts#L1082-L1098
+   *
+   * Additionally, we handle synthetic delegate constructors that are emitted when TypeScript
+   * downlevel's ES2015 synthetically generated to ES5. These vary slightly from the default
+   * structure mentioned above because the ES2015 output uses a spread operator, for delegating
+   * to the parent constructor, that is preserved through a TypeScript helper in ES5. e.g.
+   *
+   * ```
+   * return _super.apply(this, tslib.__spread(arguments)) || this;
+   * ```
+   *
+   * Such constructs can be still considered as synthetic delegate constructors as they are
+   * the product of a common TypeScript to ES5 synthetic constructor, just being downleveled
+   * to ES5 using `tsc`. See: https://github.com/angular/angular/issues/38453.
+   *
+   *
+   * @param constructor a constructor function to test
+   * @returns true if the constructor appears to have been synthesized
+   */
+  private isSynthesizedConstructor(constructor: ts.FunctionDeclaration): boolean {
+    if (!constructor.body) return false;
+
+    const firstStatement = constructor.body.statements[0];
+    if (!firstStatement) return false;
+
+    return this.isSynthesizedSuperThisAssignment(firstStatement) ||
+        this.isSynthesizedSuperReturnStatement(firstStatement);
+  }
+
+  /**
+   * Identifies synthesized super calls which pass-through function arguments directly and are
+   * being assigned to a common `_this` variable. The following patterns we intend to match:
+   *
+   * 1. Delegate call emitted by TypeScript when it emits ES5 directly.
+   *   ```
+   *   var _this = _super !== null && _super.apply(this, arguments) || this;
+   *   ```
+   *
+   * 2. Delegate call emitted by TypeScript when it downlevel's ES2015 to ES5.
+   *   ```
+   *   var _this = _super.apply(this, tslib.__spread(arguments)) || this;
+   *   ```
+   *
+   *
+   * @param statement a statement that may be a synthesized super call
+   * @returns true if the statement looks like a synthesized super call
+   */
+  private isSynthesizedSuperThisAssignment(statement: ts.Statement): boolean {
+    if (!ts.isVariableStatement(statement)) return false;
+
+    const variableDeclarations = statement.declarationList.declarations;
+    if (variableDeclarations.length !== 1) return false;
+
+    const variableDeclaration = variableDeclarations[0];
+    if (!ts.isIdentifier(variableDeclaration.name) ||
+        !variableDeclaration.name.text.startsWith('_this'))
+      return false;
+
+    const initializer = variableDeclaration.initializer;
+    if (!initializer) return false;
+
+    return this.isSynthesizedDefaultSuperCall(initializer);
+  }
+  /**
+   * Identifies synthesized super calls which pass-through function arguments directly and
+   * are being returned. The following patterns correspond to synthetic super return calls:
+   *
+   * 1. Delegate call emitted by TypeScript when it emits ES5 directly.
+   *   ```
+   *   return _super !== null && _super.apply(this, arguments) || this;
+   *   ```
+   *
+   * 2. Delegate call emitted by TypeScript when it downlevel's ES2015 to ES5.
+   *   ```
+   *   return _super.apply(this, tslib.__spread(arguments)) || this;
+   *   ```
+   *
+   * @param statement a statement that may be a synthesized super call
+   * @returns true if the statement looks like a synthesized super call
+   */
+  private isSynthesizedSuperReturnStatement(statement: ts.Statement): boolean {
+    if (!ts.isReturnStatement(statement)) return false;
+
+    const expression = statement.expression;
+    if (!expression) return false;
+
+    return this.isSynthesizedDefaultSuperCall(expression);
+  }
+
+  /**
+   * Identifies synthesized super calls which pass-through function arguments directly. The
+   * synthetic delegate super call match the following patterns we intend to match:
+   *
+   * 1. Delegate call emitted by TypeScript when it emits ES5 directly.
+   *   ```
+   *   _super !== null && _super.apply(this, arguments) || this;
+   *   ```
+   *
+   * 2. Delegate call emitted by TypeScript when it downlevel's ES2015 to ES5.
+   *   ```
+   *   _super.apply(this, tslib.__spread(arguments)) || this;
+   *   ```
+   *
+   * @param expression an expression that may represent a default super call
+   * @returns true if the expression corresponds with the above form
+   */
+  private isSynthesizedDefaultSuperCall(expression: ts.Expression): boolean {
+    if (!isBinaryExpr(expression, ts.SyntaxKind.BarBarToken)) return false;
+    if (expression.right.kind !== ts.SyntaxKind.ThisKeyword) return false;
+
+    const left = expression.left;
+    if (isBinaryExpr(left, ts.SyntaxKind.AmpersandAmpersandToken)) {
+      return isSuperNotNull(left.left) && this.isSuperApplyCall(left.right);
+    } else {
+      return this.isSuperApplyCall(left);
+    }
+  }
+
+  /**
+   * Tests whether the expression corresponds to a `super` call passing through
+   * function arguments without any modification. e.g.
+   *
+   * ```
+   * _super !== null && _super.apply(this, arguments) || this;
+   * ```
+   *
+   * This structure is generated by TypeScript when transforming ES2015 to ES5, see
+   * https://github.com/Microsoft/TypeScript/blob/v3.2.2/src/compiler/transformers/es2015.ts#L1148-L1163
+   *
+   * Additionally, we also handle cases where `arguments` are wrapped by a TypeScript spread helper.
+   * This can happen if ES2015 class output contain auto-generated constructors due to class
+   * members. The ES2015 output will be using `super(...arguments)` to delegate to the superclass,
+   * but once downleveled to ES5, the spread operator will be persisted through a TypeScript spread
+   * helper. For example:
+   *
+   * ```
+   * _super.apply(this, __spread(arguments)) || this;
+   * ```
+   *
+   * More details can be found in: https://github.com/angular/angular/issues/38453.
+   *
+   * @param expression an expression that may represent a default super call
+   * @returns true if the expression corresponds with the above form
+   */
+  private isSuperApplyCall(expression: ts.Expression): boolean {
+    if (!ts.isCallExpression(expression) || expression.arguments.length !== 2) return false;
+
+    const targetFn = expression.expression;
+    if (!ts.isPropertyAccessExpression(targetFn)) return false;
+    if (!isSuperIdentifier(targetFn.expression)) return false;
+    if (targetFn.name.text !== 'apply') return false;
+
+    const thisArgument = expression.arguments[0];
+    if (thisArgument.kind !== ts.SyntaxKind.ThisKeyword) return false;
+
+    const argumentsExpr = expression.arguments[1];
+
+    // If the super is directly invoked with `arguments`, return `true`. This represents the
+    // common TypeScript output where the delegate constructor super call matches the following
+    // pattern: `super.apply(this, arguments)`.
+    if (isArgumentsIdentifier(argumentsExpr)) {
+      return true;
+    }
+
+    // The other scenario we intend to detect: The `arguments` variable might be wrapped with the
+    // TypeScript spread helper (either through tslib or inlined). This can happen if an explicit
+    // delegate constructor uses `super(...arguments)` in ES2015 and is downleveled to ES5 using
+    // `--downlevelIteration`. The output in such cases would not directly pass the function
+    // `arguments` to the `super` call, but wrap it in a TS spread helper. The output would match
+    // the following pattern: `super.apply(this, tslib.__spread(arguments))`. We check for such
+    // constructs below, but perform the detection of the call expression definition as last as
+    // that is the most expensive operation here.
+    if (!ts.isCallExpression(argumentsExpr) || argumentsExpr.arguments.length !== 1 ||
+        !isArgumentsIdentifier(argumentsExpr.arguments[0])) {
+      return false;
+    }
+
+    const argumentsCallExpr = argumentsExpr.expression;
+    let argumentsCallDeclaration: Declaration|null = null;
+
+    // The `__spread` helper could be globally available, or accessed through a namespaced
+    // import. Hence we support a property access here as long as it resolves to the actual
+    // known TypeScript spread helper.
+    if (ts.isIdentifier(argumentsCallExpr)) {
+      argumentsCallDeclaration = this.getDeclarationOfIdentifier(argumentsCallExpr);
+    } else if (
+        ts.isPropertyAccessExpression(argumentsCallExpr) &&
+        ts.isIdentifier(argumentsCallExpr.name)) {
+      argumentsCallDeclaration = this.getDeclarationOfIdentifier(argumentsCallExpr.name);
+    }
+
+    return argumentsCallDeclaration !== null &&
+        argumentsCallDeclaration.known === KnownDeclaration.TsHelperSpread;
+  }
 }
 
 ///////////// Internal Helpers /////////////
@@ -422,103 +635,8 @@ function reflectArrayElement(element: ts.Expression) {
   return ts.isObjectLiteralExpression(element) ? reflectObjectLiteral(element) : null;
 }
 
-/**
- * A constructor function may have been "synthesized" by TypeScript during JavaScript emit,
- * in the case no user-defined constructor exists and e.g. property initializers are used.
- * Those initializers need to be emitted into a constructor in JavaScript, so the TypeScript
- * compiler generates a synthetic constructor.
- *
- * We need to identify such constructors as ngcc needs to be able to tell if a class did
- * originally have a constructor in the TypeScript source. For ES5, we can not tell an
- * empty constructor apart from a synthesized constructor, but fortunately that does not
- * matter for the code generated by ngtsc.
- *
- * When a class has a superclass however, a synthesized constructor must not be considered
- * as a user-defined constructor as that prevents a base factory call from being created by
- * ngtsc, resulting in a factory function that does not inject the dependencies of the
- * superclass. Hence, we identify a default synthesized super call in the constructor body,
- * according to the structure that TypeScript's ES2015 to ES5 transformer generates in
- * https://github.com/Microsoft/TypeScript/blob/v3.2.2/src/compiler/transformers/es2015.ts#L1082-L1098
- *
- * @param constructor a constructor function to test
- * @returns true if the constructor appears to have been synthesized
- */
-function isSynthesizedConstructor(constructor: ts.FunctionDeclaration): boolean {
-  if (!constructor.body) return false;
-
-  const firstStatement = constructor.body.statements[0];
-  if (!firstStatement) return false;
-
-  return isSynthesizedSuperThisAssignment(firstStatement) ||
-      isSynthesizedSuperReturnStatement(firstStatement);
-}
-
-/**
- * Identifies a synthesized super call of the form:
- *
- * ```
- * var _this = _super !== null && _super.apply(this, arguments) || this;
- * ```
- *
- * @param statement a statement that may be a synthesized super call
- * @returns true if the statement looks like a synthesized super call
- */
-function isSynthesizedSuperThisAssignment(statement: ts.Statement): boolean {
-  if (!ts.isVariableStatement(statement)) return false;
-
-  const variableDeclarations = statement.declarationList.declarations;
-  if (variableDeclarations.length !== 1) return false;
-
-  const variableDeclaration = variableDeclarations[0];
-  if (!ts.isIdentifier(variableDeclaration.name) ||
-      !variableDeclaration.name.text.startsWith('_this'))
-    return false;
-
-  const initializer = variableDeclaration.initializer;
-  if (!initializer) return false;
-
-  return isSynthesizedDefaultSuperCall(initializer);
-}
-/**
- * Identifies a synthesized super call of the form:
- *
- * ```
- * return _super !== null && _super.apply(this, arguments) || this;
- * ```
- *
- * @param statement a statement that may be a synthesized super call
- * @returns true if the statement looks like a synthesized super call
- */
-function isSynthesizedSuperReturnStatement(statement: ts.Statement): boolean {
-  if (!ts.isReturnStatement(statement)) return false;
-
-  const expression = statement.expression;
-  if (!expression) return false;
-
-  return isSynthesizedDefaultSuperCall(expression);
-}
-
-/**
- * Tests whether the expression is of the form:
- *
- * ```
- * _super !== null && _super.apply(this, arguments) || this;
- * ```
- *
- * This structure is generated by TypeScript when transforming ES2015 to ES5, see
- * https://github.com/Microsoft/TypeScript/blob/v3.2.2/src/compiler/transformers/es2015.ts#L1148-L1163
- *
- * @param expression an expression that may represent a default super call
- * @returns true if the expression corresponds with the above form
- */
-function isSynthesizedDefaultSuperCall(expression: ts.Expression): boolean {
-  if (!isBinaryExpr(expression, ts.SyntaxKind.BarBarToken)) return false;
-  if (expression.right.kind !== ts.SyntaxKind.ThisKeyword) return false;
-
-  const left = expression.left;
-  if (!isBinaryExpr(left, ts.SyntaxKind.AmpersandAmpersandToken)) return false;
-
-  return isSuperNotNull(left.left) && isSuperApplyCall(left.right);
+function isArgumentsIdentifier(expression: ts.Expression): boolean {
+  return ts.isIdentifier(expression) && expression.text === 'arguments';
 }
 
 function isSuperNotNull(expression: ts.Expression): boolean {
@@ -526,31 +644,6 @@ function isSuperNotNull(expression: ts.Expression): boolean {
       isSuperIdentifier(expression.left);
 }
 
-/**
- * Tests whether the expression is of the form
- *
- * ```
- * _super.apply(this, arguments)
- * ```
- *
- * @param expression an expression that may represent a default super call
- * @returns true if the expression corresponds with the above form
- */
-function isSuperApplyCall(expression: ts.Expression): boolean {
-  if (!ts.isCallExpression(expression) || expression.arguments.length !== 2) return false;
-
-  const targetFn = expression.expression;
-  if (!ts.isPropertyAccessExpression(targetFn)) return false;
-  if (!isSuperIdentifier(targetFn.expression)) return false;
-  if (targetFn.name.text !== 'apply') return false;
-
-  const thisArgument = expression.arguments[0];
-  if (thisArgument.kind !== ts.SyntaxKind.ThisKeyword) return false;
-
-  const argumentsArgument = expression.arguments[1];
-  return ts.isIdentifier(argumentsArgument) && argumentsArgument.text === 'arguments';
-}
-
 function isBinaryExpr(
     expression: ts.Expression, operator: ts.BinaryOperator): expression is ts.BinaryExpression {
   return ts.isBinaryExpression(expression) && expression.operatorToken.kind === operator;
diff --git a/packages/compiler-cli/ngcc/src/host/umd_host.ts b/packages/compiler-cli/ngcc/src/host/umd_host.ts
index 5a4b73ed70b35..c56b95b2d6fa9 100644
--- a/packages/compiler-cli/ngcc/src/host/umd_host.ts
+++ b/packages/compiler-cli/ngcc/src/host/umd_host.ts
@@ -10,12 +10,14 @@ import * as ts from 'typescript';
 
 import {absoluteFrom} from '../../../src/ngtsc/file_system';
 import {Logger} from '../../../src/ngtsc/logging';
-import {Declaration, Import} from '../../../src/ngtsc/reflection';
+import {Declaration, DeclarationKind, Import, isNamedFunctionDeclaration} from '../../../src/ngtsc/reflection';
 import {BundleProgram} from '../packages/bundle_program';
 import {FactoryMap, getTsHelperFnFromIdentifier, stripExtension} from '../utils';
 
-import {DefinePropertyReexportStatement, ExportDeclaration, ExportStatement, extractGetterFnExpression, findNamespaceOfIdentifier, findRequireCallReference, isDefinePropertyReexportStatement, isExportStatement, isExternalImport, isRequireCall, isWildcardReexportStatement, WildcardReexportStatement} from './commonjs_umd_utils';
+import {DefinePropertyReexportStatement, ExportDeclaration, ExportsStatement, extractGetterFnExpression, findNamespaceOfIdentifier, findRequireCallReference, isDefinePropertyReexportStatement, isExportsAssignment, isExportsDeclaration, isExportsStatement, isExternalImport, isRequireCall, isWildcardReexportStatement, skipAliases, WildcardReexportStatement} from './commonjs_umd_utils';
+import {getInnerClassDeclaration, getOuterNodeFromInnerDeclaration, isAssignment} from './esm2015_host';
 import {Esm5ReflectionHost} from './esm5_host';
+import {NgccClassSymbol} from './ngcc_host';
 import {stripParentheses} from './utils';
 
 export class UmdReflectionHost extends Esm5ReflectionHost {
@@ -44,8 +46,41 @@ export class UmdReflectionHost extends Esm5ReflectionHost {
   }
 
   getDeclarationOfIdentifier(id: ts.Identifier): Declaration|null {
-    return this.getUmdModuleDeclaration(id) || this.getUmdDeclaration(id) ||
-        super.getDeclarationOfIdentifier(id);
+    // First we try one of the the following:
+    // 1. The `exports` identifier - referring to the current file/module.
+    // 2. An identifier (e.g. `foo`) that refers to an imported UMD module.
+    // 3. A UMD style export identifier (e.g. the `foo` of `exports.foo`).
+    const declaration = this.getExportsDeclaration(id) || this.getUmdModuleDeclaration(id) ||
+        this.getUmdDeclaration(id);
+    if (declaration !== null) {
+      return declaration;
+    }
+
+    // Try to get the declaration using the super class.
+    const superDeclaration = super.getDeclarationOfIdentifier(id);
+    if (superDeclaration === null) {
+      return null;
+    }
+
+    // Check to see if the declaration is the inner node of a declaration IIFE.
+    const outerNode = getOuterNodeFromInnerDeclaration(superDeclaration.node);
+    if (outerNode === null) {
+      return superDeclaration;
+    }
+
+    // We are only interested if the outer declaration is of the form
+    // `exports.<name> = <initializer>`.
+    if (!isExportsAssignment(outerNode)) {
+      return superDeclaration;
+    }
+
+    return {
+      kind: DeclarationKind.Inline,
+      node: outerNode.left,
+      implementation: outerNode.right,
+      known: null,
+      viaModule: null,
+    };
   }
 
   getExportsOfModule(module: ts.Node): Map<string, Declaration>|null {
@@ -77,6 +112,102 @@ export class UmdReflectionHost extends Esm5ReflectionHost {
     return umdModule !== null ? Array.from(umdModule.factoryFn.body.statements) : [];
   }
 
+  protected getClassSymbolFromOuterDeclaration(declaration: ts.Node): NgccClassSymbol|undefined {
+    const superSymbol = super.getClassSymbolFromOuterDeclaration(declaration);
+    if (superSymbol) {
+      return superSymbol;
+    }
+
+    if (!isExportsDeclaration(declaration)) {
+      return undefined;
+    }
+
+    let initializer = skipAliases(declaration.parent.right);
+
+    if (ts.isIdentifier(initializer)) {
+      const implementation = this.getDeclarationOfIdentifier(initializer);
+      if (implementation !== null) {
+        const implementationSymbol = this.getClassSymbol(implementation.node);
+        if (implementationSymbol !== null) {
+          return implementationSymbol;
+        }
+      }
+    }
+
+    const innerDeclaration = getInnerClassDeclaration(initializer);
+    if (innerDeclaration !== null) {
+      return this.createClassSymbol(declaration.name, innerDeclaration);
+    }
+
+    return undefined;
+  }
+
+
+  protected getClassSymbolFromInnerDeclaration(declaration: ts.Node): NgccClassSymbol|undefined {
+    const superClassSymbol = super.getClassSymbolFromInnerDeclaration(declaration);
+    if (superClassSymbol !== undefined) {
+      return superClassSymbol;
+    }
+
+    if (!isNamedFunctionDeclaration(declaration)) {
+      return undefined;
+    }
+
+    const outerNode = getOuterNodeFromInnerDeclaration(declaration);
+    if (outerNode === null || !isExportsAssignment(outerNode)) {
+      return undefined;
+    }
+
+    return this.createClassSymbol(outerNode.left.name, declaration);
+  }
+
+  /**
+   * Extract all "classes" from the `statement` and add them to the `classes` map.
+   */
+  protected addClassSymbolsFromStatement(
+      classes: Map<ts.Symbol, NgccClassSymbol>, statement: ts.Statement): void {
+    super.addClassSymbolsFromStatement(classes, statement);
+
+    // Also check for exports of the form: `exports.<name> = <class def>;`
+    if (isExportsStatement(statement)) {
+      const classSymbol = this.getClassSymbol(statement.expression.left);
+      if (classSymbol) {
+        classes.set(classSymbol.implementation, classSymbol);
+      }
+    }
+  }
+
+  /**
+   * Analyze the given statement to see if it corresponds with an exports declaration like
+   * `exports.MyClass = MyClass_1 = <class def>;`. If so, the declaration of `MyClass_1`
+   * is associated with the `MyClass` identifier.
+   *
+   * @param statement The statement that needs to be preprocessed.
+   */
+  protected preprocessStatement(statement: ts.Statement): void {
+    super.preprocessStatement(statement);
+
+    if (!isExportsStatement(statement)) {
+      return;
+    }
+
+    const declaration = statement.expression.left;
+    const initializer = statement.expression.right;
+    if (!isAssignment(initializer) || !ts.isIdentifier(initializer.left) ||
+        !this.isClass(declaration)) {
+      return;
+    }
+
+    const aliasedIdentifier = initializer.left;
+
+    const aliasedDeclaration = this.getDeclarationOfIdentifier(aliasedIdentifier);
+    if (aliasedDeclaration === null || aliasedDeclaration.node === null) {
+      throw new Error(
+          `Unable to locate declaration of ${aliasedIdentifier.text} in "${statement.getText()}"`);
+    }
+    this.aliasedClassDeclarations.set(aliasedDeclaration.node, declaration.name);
+  }
+
   private computeUmdModule(sourceFile: ts.SourceFile): UmdModule|null {
     if (sourceFile.statements.length !== 1) {
       throw new Error(
@@ -90,9 +221,19 @@ export class UmdReflectionHost extends Esm5ReflectionHost {
   private computeExportsOfUmdModule(sourceFile: ts.SourceFile): Map<string, Declaration>|null {
     const moduleMap = new Map<string, Declaration>();
     for (const statement of this.getModuleStatements(sourceFile)) {
-      if (isExportStatement(statement)) {
+      if (isExportsStatement(statement)) {
         const exportDeclaration = this.extractBasicUmdExportDeclaration(statement);
-        moduleMap.set(exportDeclaration.name, exportDeclaration.declaration);
+        if (!moduleMap.has(exportDeclaration.name)) {
+          // We assume that the first `exports.<name>` is the actual declaration, and that any
+          // subsequent statements that match are decorating the original declaration.
+          // For example:
+          // ```
+          // exports.foo = <declaration>;
+          // exports.foo = __decorate(<decorator>, exports.foo);
+          // ```
+          // The declaration is the first line not the second.
+          moduleMap.set(exportDeclaration.name, exportDeclaration.declaration);
+        }
       } else if (isWildcardReexportStatement(statement)) {
         const reexports = this.extractUmdWildcardReexports(statement, sourceFile);
         for (const reexport of reexports) {
@@ -132,10 +273,17 @@ export class UmdReflectionHost extends Esm5ReflectionHost {
     return importPath;
   }
 
-  private extractBasicUmdExportDeclaration(statement: ExportStatement): ExportDeclaration {
+  private extractBasicUmdExportDeclaration(statement: ExportsStatement): ExportDeclaration {
     const name = statement.expression.left.name.text;
-    const exportExpression = statement.expression.right;
-    return this.extractUmdExportDeclaration(name, exportExpression);
+    const exportExpression = skipAliases(statement.expression.right);
+    const declaration = this.getDeclarationOfExpression(exportExpression) ?? {
+      kind: DeclarationKind.Inline,
+      node: statement.expression.left,
+      implementation: statement.expression.right,
+      known: null,
+      viaModule: null,
+    };
+    return {name, declaration};
   }
 
   private extractUmdWildcardReexports(
@@ -171,17 +319,8 @@ export class UmdReflectionHost extends Esm5ReflectionHost {
 
     const viaModule = stripExtension(importedFile.fileName);
     const reexports: ExportDeclaration[] = [];
-    importedExports.forEach((decl, name) => {
-      if (decl.node !== null) {
-        reexports.push({
-          name,
-          declaration: {node: decl.node, known: null, viaModule, identity: decl.identity}
-        });
-      } else {
-        reexports.push(
-            {name, declaration: {node: null, known: null, expression: decl.expression, viaModule}});
-      }
-    });
+    importedExports.forEach(
+        (decl, name) => reexports.push({name, declaration: {...decl, viaModule}}));
     return reexports;
   }
 
@@ -193,17 +332,21 @@ export class UmdReflectionHost extends Esm5ReflectionHost {
     if (getterFnExpression === null) {
       return null;
     }
-    return this.extractUmdExportDeclaration(name, getterFnExpression);
-  }
 
-  private extractUmdExportDeclaration(name: string, expression: ts.Expression): ExportDeclaration {
-    const declaration = this.getDeclarationOfExpression(expression);
+    const declaration = this.getDeclarationOfExpression(getterFnExpression);
     if (declaration !== null) {
       return {name, declaration};
     }
+
     return {
       name,
-      declaration: {node: null, known: null, expression, viaModule: null},
+      declaration: {
+        kind: DeclarationKind.Inline,
+        node: args[1],
+        implementation: getterFnExpression,
+        known: null,
+        viaModule: null,
+      },
     };
   }
 
@@ -222,6 +365,21 @@ export class UmdReflectionHost extends Esm5ReflectionHost {
     if (nsIdentifier === null) {
       return null;
     }
+
+    if (nsIdentifier.parent.parent && isExportsAssignment(nsIdentifier.parent.parent)) {
+      const initializer = nsIdentifier.parent.parent.right;
+      if (ts.isIdentifier(initializer)) {
+        return this.getDeclarationOfIdentifier(initializer);
+      }
+      return this.detectKnownDeclaration({
+        kind: DeclarationKind.Inline,
+        node: nsIdentifier.parent.parent.left,
+        implementation: skipAliases(nsIdentifier.parent.parent.right),
+        viaModule: null,
+        known: null,
+      });
+    }
+
     const moduleDeclaration = this.getUmdModuleDeclaration(nsIdentifier);
     if (moduleDeclaration === null || moduleDeclaration.node === null ||
         !ts.isSourceFile(moduleDeclaration.node)) {
@@ -249,6 +407,38 @@ export class UmdReflectionHost extends Esm5ReflectionHost {
     return {...declaration, viaModule, known: getTsHelperFnFromIdentifier(id)};
   }
 
+  private getExportsDeclaration(id: ts.Identifier): Declaration|null {
+    if (!isExportsIdentifier(id)) {
+      return null;
+    }
+
+    // Sadly, in the case of `exports.foo = bar`, we can't use `this.findUmdImportParameter(id)`
+    // to check whether this `exports` is from the IIFE body arguments, because
+    // `this.checker.getSymbolAtLocation(id)` will return the symbol for the `foo` identifier
+    // rather than the `exports` identifier.
+    //
+    // Instead we search the symbols in the current local scope.
+    const exportsSymbol = this.checker.getSymbolsInScope(id, ts.SymbolFlags.Variable)
+                              .find(symbol => symbol.name === 'exports');
+
+    const node = exportsSymbol !== undefined &&
+            !ts.isFunctionExpression(exportsSymbol.valueDeclaration.parent) ?
+        // There is a locally defined `exports` variable that is not a function parameter.
+        // So this `exports` identifier must be a local variable and does not represent the module.
+        exportsSymbol.valueDeclaration :
+        // There is no local symbol or it is a parameter of an IIFE.
+        // So this `exports` represents the current "module".
+        id.getSourceFile();
+
+    return {
+      kind: DeclarationKind.Concrete,
+      node,
+      viaModule: null,
+      known: null,
+      identity: null,
+    };
+  }
+
   private getUmdModuleDeclaration(id: ts.Identifier): Declaration|null {
     const importPath = this.getImportPathFromParameter(id) || this.getImportPathFromRequireCall(id);
     if (importPath === null) {
@@ -261,7 +451,7 @@ export class UmdReflectionHost extends Esm5ReflectionHost {
     }
 
     const viaModule = isExternalImport(importPath) ? importPath : null;
-    return {node: module, viaModule, known: null, identity: null};
+    return {kind: DeclarationKind.Concrete, node: module, viaModule, known: null, identity: null};
   }
 
   private getImportPathFromParameter(id: ts.Identifier): string|null {
@@ -370,3 +560,10 @@ function getRequiredModulePath(wrapperFn: ts.FunctionExpression, paramIndex: num
     }
   }
 }
+
+/**
+ * Is the `node` an identifier with the name "exports"?
+ */
+function isExportsIdentifier(node: ts.Node): node is ts.Identifier {
+  return ts.isIdentifier(node) && node.text === 'exports';
+}
diff --git a/packages/compiler-cli/ngcc/src/main.ts b/packages/compiler-cli/ngcc/src/main.ts
index d87bd556cd096..b6d74e19df4d2 100644
--- a/packages/compiler-cli/ngcc/src/main.ts
+++ b/packages/compiler-cli/ngcc/src/main.ts
@@ -8,8 +8,6 @@
 
 /// <reference types="node" />
 
-import * as os from 'os';
-
 import {AbsoluteFsPath, FileSystem, resolve} from '../../src/ngtsc/file_system';
 import {Logger} from '../../src/ngtsc/logging';
 import {ParsedConfiguration} from '../../src/perform_compile';
@@ -35,7 +33,7 @@ import {composeTaskCompletedCallbacks, createLogErrorHandler, createMarkAsProces
 import {AsyncLocker} from './locking/async_locker';
 import {LockFileWithChildProcess} from './locking/lock_file_with_child_process';
 import {SyncLocker} from './locking/sync_locker';
-import {AsyncNgccOptions, getSharedSetup, SyncNgccOptions} from './ngcc_options';
+import {AsyncNgccOptions, getMaxNumberOfWorkers, getSharedSetup, SyncNgccOptions} from './ngcc_options';
 import {NgccConfiguration} from './packages/configuration';
 import {EntryPointJsonProperty, SUPPORTED_FORMAT_PROPERTIES} from './packages/entry_point';
 import {EntryPointManifest, InvalidatingEntryPointManifest} from './packages/entry_point_manifest';
@@ -92,10 +90,9 @@ export function mainNgcc(options: AsyncNgccOptions|SyncNgccOptions): void|Promis
     return;
   }
 
-  // Execute in parallel, if async execution is acceptable and there are more than 2 CPU cores.
-  // (One CPU core is always reserved for the master process and we need at least 2 worker processes
-  // in order to run tasks in parallel.)
-  const inParallel = async && (os.cpus().length > 2);
+  // Determine the number of workers to use and whether ngcc should run in parallel.
+  const workerCount = async ? getMaxNumberOfWorkers() : 1;
+  const inParallel = workerCount > 1;
 
   const analyzeEntryPoints = getAnalyzeEntryPointsFn(
       logger, finder, fileSystem, supportedPropertiesToConsider, compileAllFormats,
@@ -113,7 +110,7 @@ export function mainNgcc(options: AsyncNgccOptions|SyncNgccOptions): void|Promis
   const createTaskCompletedCallback =
       getCreateTaskCompletedCallback(pkgJsonUpdater, errorOnFailedEntryPoint, logger, fileSystem);
   const executor = getExecutor(
-      async, inParallel, logger, fileWriter, pkgJsonUpdater, fileSystem, config,
+      async, workerCount, logger, fileWriter, pkgJsonUpdater, fileSystem, config,
       createTaskCompletedCallback);
 
   return executor.execute(analyzeEntryPoints, createCompileFn);
@@ -153,7 +150,7 @@ function getCreateTaskCompletedCallback(
 }
 
 function getExecutor(
-    async: boolean, inParallel: boolean, logger: Logger, fileWriter: FileWriter,
+    async: boolean, workerCount: number, logger: Logger, fileWriter: FileWriter,
     pkgJsonUpdater: PackageJsonUpdater, fileSystem: FileSystem, config: NgccConfiguration,
     createTaskCompletedCallback: CreateTaskCompletedCallback): Executor {
   const lockFile = new LockFileWithChildProcess(fileSystem, logger);
@@ -161,9 +158,8 @@ function getExecutor(
     // Execute asynchronously (either serially or in parallel)
     const {retryAttempts, retryDelay} = config.getLockingConfig();
     const locker = new AsyncLocker(lockFile, logger, retryDelay, retryAttempts);
-    if (inParallel) {
-      // Execute in parallel. Use up to 8 CPU cores for workers, always reserving one for master.
-      const workerCount = Math.min(8, os.cpus().length - 1);
+    if (workerCount > 1) {
+      // Execute in parallel.
       return new ClusterExecutor(
           workerCount, fileSystem, logger, fileWriter, pkgJsonUpdater, locker,
           createTaskCompletedCallback);
diff --git a/packages/compiler-cli/ngcc/src/migrations/missing_injectable_migration.ts b/packages/compiler-cli/ngcc/src/migrations/missing_injectable_migration.ts
index f1fd7ec3d7431..2ee3a33252ff7 100644
--- a/packages/compiler-cli/ngcc/src/migrations/missing_injectable_migration.ts
+++ b/packages/compiler-cli/ngcc/src/migrations/missing_injectable_migration.ts
@@ -151,7 +151,7 @@ function migrateProviderClass(provider: ResolvedValue, host: MigrationHost): voi
     return;
   }
 
-  const clazz = provider.node as ts.Declaration;
+  const clazz = provider.node;
   if (isClassDeclaration(clazz) && host.isInScope(clazz) && needsInjectableDecorator(clazz, host)) {
     host.injectSyntheticDecorator(clazz, createInjectableDecorator(clazz));
   }
diff --git a/packages/compiler-cli/ngcc/src/migrations/undecorated_parent_migration.ts b/packages/compiler-cli/ngcc/src/migrations/undecorated_parent_migration.ts
index 6bd6b06c5fdfc..d1e9edfb969a3 100644
--- a/packages/compiler-cli/ngcc/src/migrations/undecorated_parent_migration.ts
+++ b/packages/compiler-cli/ngcc/src/migrations/undecorated_parent_migration.ts
@@ -101,7 +101,7 @@ function determineBaseClass(
   }
 
   const baseClass = host.evaluator.evaluate(baseClassExpr);
-  if (!(baseClass instanceof Reference) || !isClassDeclaration(baseClass.node as ts.Declaration)) {
+  if (!(baseClass instanceof Reference) || !isClassDeclaration(baseClass.node)) {
     return null;
   }
 
diff --git a/packages/compiler-cli/ngcc/src/migrations/utils.ts b/packages/compiler-cli/ngcc/src/migrations/utils.ts
index ccf16f9f2e801..16a6ccddf73e5 100644
--- a/packages/compiler-cli/ngcc/src/migrations/utils.ts
+++ b/packages/compiler-cli/ngcc/src/migrations/utils.ts
@@ -10,7 +10,7 @@ import {Reference} from '../../../src/ngtsc/imports';
 import {ClassDeclaration, Decorator, isNamedClassDeclaration, isNamedFunctionDeclaration, isNamedVariableDeclaration} from '../../../src/ngtsc/reflection';
 import {MigrationHost} from './migration';
 
-export function isClassDeclaration(clazz: ts.Declaration): clazz is ClassDeclaration {
+export function isClassDeclaration(clazz: ts.Node): clazz is ClassDeclaration<ts.Declaration> {
   return isNamedClassDeclaration(clazz) || isNamedFunctionDeclaration(clazz) ||
       isNamedVariableDeclaration(clazz);
 }
diff --git a/packages/compiler-cli/ngcc/src/ngcc_options.ts b/packages/compiler-cli/ngcc/src/ngcc_options.ts
index 7ef38ec650f80..52fb3ab4d8cfc 100644
--- a/packages/compiler-cli/ngcc/src/ngcc_options.ts
+++ b/packages/compiler-cli/ngcc/src/ngcc_options.ts
@@ -5,6 +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 * as os from 'os';
+
 import {absoluteFrom, AbsoluteFsPath, FileSystem, getFileSystem} from '../../src/ngtsc/file_system';
 import {ConsoleLogger, Logger, LogLevel} from '../../src/ngtsc/logging';
 import {ParsedConfiguration, readConfiguration} from '../../src/perform_compile';
@@ -254,3 +256,26 @@ function checkForSolutionStyleTsConfig(
         `  ngcc ... --tsconfig "${fileSystem.relative(projectPath, tsConfig.project)}"`);
   }
 }
+
+/**
+ * Determines the maximum number of workers to use for parallel execution. This can be set using the
+ * NGCC_MAX_WORKERS environment variable, or is computed based on the number of available CPUs. One
+ * CPU core is always reserved for the master process, so we take the number of CPUs minus one, with
+ * a maximum of 4 workers. We don't scale the number of workers beyond 4 by default, as it takes
+ * considerably more memory and CPU cycles while not offering a substantial improvement in time.
+ */
+export function getMaxNumberOfWorkers(): number {
+  const maxWorkers = process.env.NGCC_MAX_WORKERS;
+  if (maxWorkers === undefined) {
+    // Use up to 4 CPU cores for workers, always reserving one for master.
+    return Math.max(1, Math.min(4, os.cpus().length - 1));
+  }
+
+  const numericMaxWorkers = +maxWorkers.trim();
+  if (!Number.isInteger(numericMaxWorkers)) {
+    throw new Error('NGCC_MAX_WORKERS should be an integer.');
+  } else if (numericMaxWorkers < 1) {
+    throw new Error('NGCC_MAX_WORKERS should be at least 1.');
+  }
+  return numericMaxWorkers;
+}
diff --git a/packages/compiler-cli/ngcc/src/packages/entry_point_bundle.ts b/packages/compiler-cli/ngcc/src/packages/entry_point_bundle.ts
index 68eea9495df18..4acd7f0031de9 100644
--- a/packages/compiler-cli/ngcc/src/packages/entry_point_bundle.ts
+++ b/packages/compiler-cli/ngcc/src/packages/entry_point_bundle.ts
@@ -6,11 +6,12 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import * as ts from 'typescript';
-import {AbsoluteFsPath, FileSystem, NgtscCompilerHost} from '../../../src/ngtsc/file_system';
+import {AbsoluteFsPath, FileSystem} from '../../../src/ngtsc/file_system';
 import {PathMappings} from '../path_mappings';
 import {BundleProgram, makeBundleProgram} from './bundle_program';
 import {EntryPoint, EntryPointFormat} from './entry_point';
-import {NgccSourcesCompilerHost} from './ngcc_compiler_host';
+import {NgccDtsCompilerHost, NgccSourcesCompilerHost} from './ngcc_compiler_host';
+import {EntryPointFileCache, SharedFileCache} from './source_file_cache';
 
 /**
  * A bundle of files and paths (and TS programs) that correspond to a particular
@@ -31,6 +32,8 @@ export interface EntryPointBundle {
  * Get an object that describes a formatted bundle for an entry-point.
  * @param fs The current file-system being used.
  * @param entryPoint The entry-point that contains the bundle.
+ * @param sharedFileCache The cache to use for source files that are shared across all entry-points.
+ * @param moduleResolutionCache The module resolution cache to use.
  * @param formatPath The path to the source files for this bundle.
  * @param isCore This entry point is the Angular core package.
  * @param format The underlying format of the bundle.
@@ -42,7 +45,8 @@ export interface EntryPointBundle {
  * component templates.
  */
 export function makeEntryPointBundle(
-    fs: FileSystem, entryPoint: EntryPoint, formatPath: string, isCore: boolean,
+    fs: FileSystem, entryPoint: EntryPoint, sharedFileCache: SharedFileCache,
+    moduleResolutionCache: ts.ModuleResolutionCache, formatPath: string, isCore: boolean,
     format: EntryPointFormat, transformDts: boolean, pathMappings?: PathMappings,
     mirrorDtsFromSrc: boolean = false,
     enableI18nLegacyMessageIdFormat: boolean = true): EntryPointBundle {
@@ -50,8 +54,10 @@ export function makeEntryPointBundle(
   const rootDir = entryPoint.packagePath;
   const options: ts
       .CompilerOptions = {allowJs: true, maxNodeModuleJsDepth: Infinity, rootDir, ...pathMappings};
-  const srcHost = new NgccSourcesCompilerHost(fs, options, entryPoint.packagePath);
-  const dtsHost = new NgtscCompilerHost(fs, options);
+  const entryPointCache = new EntryPointFileCache(fs, sharedFileCache);
+  const dtsHost = new NgccDtsCompilerHost(fs, options, entryPointCache, moduleResolutionCache);
+  const srcHost = new NgccSourcesCompilerHost(
+      fs, options, entryPointCache, moduleResolutionCache, entryPoint.packagePath);
 
   // Create the bundle programs, as necessary.
   const absFormatPath = fs.resolve(entryPoint.path, formatPath);
diff --git a/packages/compiler-cli/ngcc/src/packages/ngcc_compiler_host.ts b/packages/compiler-cli/ngcc/src/packages/ngcc_compiler_host.ts
index 4c5d62f767e3d..c679a12503e94 100644
--- a/packages/compiler-cli/ngcc/src/packages/ngcc_compiler_host.ts
+++ b/packages/compiler-cli/ngcc/src/packages/ngcc_compiler_host.ts
@@ -10,6 +10,7 @@ import * as ts from 'typescript';
 import {AbsoluteFsPath, FileSystem, NgtscCompilerHost} from '../../../src/ngtsc/file_system';
 import {isWithinPackage} from '../analysis/util';
 import {isRelativePath} from '../utils';
+import {EntryPointFileCache} from './source_file_cache';
 
 /**
  * Represents a compiler host that resolves a module import as a JavaScript source file if
@@ -18,19 +19,24 @@ import {isRelativePath} from '../utils';
  * would otherwise let TypeScript prefer the .d.ts file instead of the JavaScript source file.
  */
 export class NgccSourcesCompilerHost extends NgtscCompilerHost {
-  private cache = ts.createModuleResolutionCache(
-      this.getCurrentDirectory(), file => this.getCanonicalFileName(file));
-
-  constructor(fs: FileSystem, options: ts.CompilerOptions, protected packagePath: AbsoluteFsPath) {
+  constructor(
+      fs: FileSystem, options: ts.CompilerOptions, private cache: EntryPointFileCache,
+      private moduleResolutionCache: ts.ModuleResolutionCache,
+      protected packagePath: AbsoluteFsPath) {
     super(fs, options);
   }
 
+  getSourceFile(fileName: string, languageVersion: ts.ScriptTarget): ts.SourceFile|undefined {
+    return this.cache.getCachedSourceFile(fileName, languageVersion);
+  }
+
   resolveModuleNames(
       moduleNames: string[], containingFile: string, reusedNames?: string[],
       redirectedReference?: ts.ResolvedProjectReference): Array<ts.ResolvedModule|undefined> {
     return moduleNames.map(moduleName => {
       const {resolvedModule} = ts.resolveModuleName(
-          moduleName, containingFile, this.options, this, this.cache, redirectedReference);
+          moduleName, containingFile, this.options, this, this.moduleResolutionCache,
+          redirectedReference);
 
       // If the module request originated from a relative import in a JavaScript source file,
       // TypeScript may have resolved the module to its .d.ts declaration file if the .js source
@@ -59,3 +65,31 @@ export class NgccSourcesCompilerHost extends NgtscCompilerHost {
     });
   }
 }
+
+/**
+ * A compiler host implementation that is used for the typings program. It leverages the entry-point
+ * cache for source files and module resolution, as these results can be reused across the sources
+ * program.
+ */
+export class NgccDtsCompilerHost extends NgtscCompilerHost {
+  constructor(
+      fs: FileSystem, options: ts.CompilerOptions, private cache: EntryPointFileCache,
+      private moduleResolutionCache: ts.ModuleResolutionCache) {
+    super(fs, options);
+  }
+
+  getSourceFile(fileName: string, languageVersion: ts.ScriptTarget): ts.SourceFile|undefined {
+    return this.cache.getCachedSourceFile(fileName, languageVersion);
+  }
+
+  resolveModuleNames(
+      moduleNames: string[], containingFile: string, reusedNames?: string[],
+      redirectedReference?: ts.ResolvedProjectReference): Array<ts.ResolvedModule|undefined> {
+    return moduleNames.map(moduleName => {
+      const {resolvedModule} = ts.resolveModuleName(
+          moduleName, containingFile, this.options, this, this.moduleResolutionCache,
+          redirectedReference);
+      return resolvedModule;
+    });
+  }
+}
diff --git a/packages/compiler-cli/ngcc/src/packages/source_file_cache.ts b/packages/compiler-cli/ngcc/src/packages/source_file_cache.ts
new file mode 100644
index 0000000000000..d9b0c33637c25
--- /dev/null
+++ b/packages/compiler-cli/ngcc/src/packages/source_file_cache.ts
@@ -0,0 +1,197 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {AbsoluteFsPath, FileSystem} from '../../../src/ngtsc/file_system';
+
+/**
+ * A cache that holds on to source files that can be shared for processing all entry-points in a
+ * single invocation of ngcc. In particular, the following files are shared across all entry-points
+ * through this cache:
+ *
+ * 1. Default library files such as `lib.dom.d.ts` and `lib.es5.d.ts`. These files don't change
+ *    and some are very large, so parsing is expensive. Therefore, the parsed `ts.SourceFile`s for
+ *    the default library files are cached.
+ * 2. The typings of @angular scoped packages. The typing files for @angular packages are typically
+ *    used in the entry-points that ngcc processes, so benefit from a single source file cache.
+ *    Especially `@angular/core/core.d.ts` is large and expensive to parse repeatedly. In contrast
+ *    to default library files, we have to account for these files to be invalidated during a single
+ *    invocation of ngcc, as ngcc will overwrite the .d.ts files during its processing.
+ *
+ * The lifecycle of this cache corresponds with a single invocation of ngcc. Separate invocations,
+ * e.g. the CLI's synchronous module resolution fallback will therefore all have their own cache.
+ * This allows for the source file cache to be garbage collected once ngcc processing has completed.
+ */
+export class SharedFileCache {
+  private sfCache = new Map<AbsoluteFsPath, ts.SourceFile>();
+
+  constructor(private fs: FileSystem) {}
+
+  /**
+   * Loads a `ts.SourceFile` if the provided `fileName` is deemed appropriate to be cached. To
+   * optimize for memory usage, only files that are generally used in all entry-points are cached.
+   * If `fileName` is not considered to benefit from caching or the requested file does not exist,
+   * then `undefined` is returned.
+   */
+  getCachedSourceFile(fileName: string): ts.SourceFile|undefined {
+    const absPath = this.fs.resolve(fileName);
+    if (isDefaultLibrary(absPath, this.fs)) {
+      return this.getStableCachedFile(absPath);
+    } else if (isAngularDts(absPath, this.fs)) {
+      return this.getVolatileCachedFile(absPath);
+    } else {
+      return undefined;
+    }
+  }
+
+  /**
+   * Attempts to load the source file from the cache, or parses the file into a `ts.SourceFile` if
+   * it's not yet cached. This method assumes that the file will not be modified for the duration
+   * that this cache is valid for. If that assumption does not hold, the `getVolatileCachedFile`
+   * method is to be used instead.
+   */
+  private getStableCachedFile(absPath: AbsoluteFsPath): ts.SourceFile|undefined {
+    if (!this.sfCache.has(absPath)) {
+      const content = readFile(absPath, this.fs);
+      if (content === undefined) {
+        return undefined;
+      }
+      const sf = ts.createSourceFile(absPath, content, ts.ScriptTarget.ES2015);
+      this.sfCache.set(absPath, sf);
+    }
+    return this.sfCache.get(absPath)!;
+  }
+
+  /**
+   * In contrast to `getStableCachedFile`, this method always verifies that the cached source file
+   * is the same as what's stored on disk. This is done for files that are expected to change during
+   * ngcc's processing, such as @angular scoped packages for which the .d.ts files are overwritten
+   * by ngcc. If the contents on disk have changed compared to a previously cached source file, the
+   * content from disk is re-parsed and the cache entry is replaced.
+   */
+  private getVolatileCachedFile(absPath: AbsoluteFsPath): ts.SourceFile|undefined {
+    const content = readFile(absPath, this.fs);
+    if (content === undefined) {
+      return undefined;
+    }
+    if (!this.sfCache.has(absPath) || this.sfCache.get(absPath)!.text !== content) {
+      const sf = ts.createSourceFile(absPath, content, ts.ScriptTarget.ES2015);
+      this.sfCache.set(absPath, sf);
+    }
+    return this.sfCache.get(absPath)!;
+  }
+}
+
+const DEFAULT_LIB_PATTERN = ['node_modules', 'typescript', 'lib', /^lib\..+\.d\.ts$/];
+
+/**
+ * Determines whether the provided path corresponds with a default library file inside of the
+ * typescript package.
+ *
+ * @param absPath The path for which to determine if it corresponds with a default library file.
+ * @param fs The filesystem to use for inspecting the path.
+ */
+export function isDefaultLibrary(absPath: AbsoluteFsPath, fs: FileSystem): boolean {
+  return isFile(absPath, DEFAULT_LIB_PATTERN, fs);
+}
+
+const ANGULAR_DTS_PATTERN = ['node_modules', '@angular', /./, /\.d\.ts$/];
+
+/**
+ * Determines whether the provided path corresponds with a .d.ts file inside of an @angular
+ * scoped package. This logic only accounts for the .d.ts files in the root, which is sufficient
+ * to find the large, flattened entry-point files that benefit from caching.
+ *
+ * @param absPath The path for which to determine if it corresponds with an @angular .d.ts file.
+ * @param fs The filesystem to use for inspecting the path.
+ */
+export function isAngularDts(absPath: AbsoluteFsPath, fs: FileSystem): boolean {
+  return isFile(absPath, ANGULAR_DTS_PATTERN, fs);
+}
+
+/**
+ * Helper function to determine whether a file corresponds with a given pattern of segments.
+ *
+ * @param path The path for which to determine if it corresponds with the provided segments.
+ * @param segments Array of segments; the `path` must have ending segments that match the
+ * patterns in this array.
+ * @param fs The filesystem to use for inspecting the path.
+ */
+function isFile(
+    path: AbsoluteFsPath, segments: ReadonlyArray<string|RegExp>, fs: FileSystem): boolean {
+  for (let i = segments.length - 1; i >= 0; i--) {
+    const pattern = segments[i];
+    const segment = fs.basename(path);
+    if (typeof pattern === 'string') {
+      if (pattern !== segment) {
+        return false;
+      }
+    } else {
+      if (!pattern.test(segment)) {
+        return false;
+      }
+    }
+    path = fs.dirname(path);
+  }
+  return true;
+}
+
+/**
+ * A cache for processing a single entry-point. This exists to share `ts.SourceFile`s between the
+ * source and typing programs that are created for a single program.
+ */
+export class EntryPointFileCache {
+  private readonly sfCache = new Map<AbsoluteFsPath, ts.SourceFile>();
+
+  constructor(private fs: FileSystem, private sharedFileCache: SharedFileCache) {}
+
+  /**
+   * Returns and caches a parsed `ts.SourceFile` for the provided `fileName`. If the `fileName` is
+   * cached in the shared file cache, that result is used. Otherwise, the source file is cached
+   * internally. This method returns `undefined` if the requested file does not exist.
+   *
+   * @param fileName The path of the file to retrieve a source file for.
+   * @param languageVersion The language version to use for parsing the file.
+   */
+  getCachedSourceFile(fileName: string, languageVersion: ts.ScriptTarget): ts.SourceFile|undefined {
+    const staticSf = this.sharedFileCache.getCachedSourceFile(fileName);
+    if (staticSf !== undefined) {
+      return staticSf;
+    }
+
+    const absPath = this.fs.resolve(fileName);
+    if (this.sfCache.has(absPath)) {
+      return this.sfCache.get(absPath);
+    }
+
+    const content = readFile(absPath, this.fs);
+    if (content === undefined) {
+      return undefined;
+    }
+    const sf = ts.createSourceFile(fileName, content, languageVersion);
+    this.sfCache.set(absPath, sf);
+    return sf;
+  }
+}
+
+function readFile(absPath: AbsoluteFsPath, fs: FileSystem): string|undefined {
+  if (!fs.exists(absPath) || !fs.stat(absPath).isFile()) {
+    return undefined;
+  }
+  return fs.readFile(absPath);
+}
+
+/**
+ * Creates a `ts.ModuleResolutionCache` that uses the provided filesystem for path operations.
+ *
+ * @param fs The filesystem to use for path operations.
+ */
+export function createModuleResolutionCache(fs: FileSystem): ts.ModuleResolutionCache {
+  return ts.createModuleResolutionCache(fs.pwd(), fileName => {
+    return fs.isCaseSensitive() ? fileName : fileName.toLowerCase();
+  });
+}
diff --git a/packages/compiler-cli/ngcc/src/rendering/commonjs_rendering_formatter.ts b/packages/compiler-cli/ngcc/src/rendering/commonjs_rendering_formatter.ts
index 4213d605a4923..962f94ad29dfb 100644
--- a/packages/compiler-cli/ngcc/src/rendering/commonjs_rendering_formatter.ts
+++ b/packages/compiler-cli/ngcc/src/rendering/commonjs_rendering_formatter.ts
@@ -55,7 +55,7 @@ export class CommonJsRenderingFormatter extends Esm5RenderingFormatter {
       const namedImport = entryPointBasePath !== basePath ?
           importManager.generateNamedImport(relativePath, e.identifier) :
           {symbol: e.identifier, moduleImport: null};
-      const importNamespace = namedImport.moduleImport ? `${namedImport.moduleImport}.` : '';
+      const importNamespace = namedImport.moduleImport ? `${namedImport.moduleImport.text}.` : '';
       const exportStr = `\nexports.${e.identifier} = ${importNamespace}${namedImport.symbol};`;
       output.append(exportStr);
     });
@@ -66,7 +66,7 @@ export class CommonJsRenderingFormatter extends Esm5RenderingFormatter {
       file: ts.SourceFile): void {
     for (const e of exports) {
       const namedImport = importManager.generateNamedImport(e.fromModule, e.symbolName);
-      const importNamespace = namedImport.moduleImport ? `${namedImport.moduleImport}.` : '';
+      const importNamespace = namedImport.moduleImport ? `${namedImport.moduleImport.text}.` : '';
       const exportStr = `\nexports.${e.asAlias} = ${importNamespace}${namedImport.symbol};`;
       output.append(exportStr);
     }
diff --git a/packages/compiler-cli/ngcc/src/rendering/esm5_rendering_formatter.ts b/packages/compiler-cli/ngcc/src/rendering/esm5_rendering_formatter.ts
index a2cefd7d42005..8cb3e68310e14 100644
--- a/packages/compiler-cli/ngcc/src/rendering/esm5_rendering_formatter.ts
+++ b/packages/compiler-cli/ngcc/src/rendering/esm5_rendering_formatter.ts
@@ -9,7 +9,6 @@ import {Statement} from '@angular/compiler';
 import MagicString from 'magic-string';
 import * as ts from 'typescript';
 
-import {NOOP_DEFAULT_IMPORT_RECORDER} from '../../../src/ngtsc/imports';
 import {ImportManager, translateStatement} from '../../../src/ngtsc/translator';
 import {CompiledClass} from '../analysis/types';
 import {getContainingStatement} from '../host/esm2015_host';
@@ -65,8 +64,9 @@ export class Esm5RenderingFormatter extends EsmRenderingFormatter {
    * @return The JavaScript code corresponding to `stmt` (in the appropriate format).
    */
   printStatement(stmt: Statement, sourceFile: ts.SourceFile, importManager: ImportManager): string {
-    const node =
-        translateStatement(stmt, importManager, NOOP_DEFAULT_IMPORT_RECORDER, ts.ScriptTarget.ES5);
+    const node = translateStatement(
+        stmt, importManager,
+        {downlevelLocalizedStrings: true, downlevelVariableDeclarations: true});
     const code = this.printer.printNode(ts.EmitHint.Unspecified, node, sourceFile);
 
     return code;
diff --git a/packages/compiler-cli/ngcc/src/rendering/esm_rendering_formatter.ts b/packages/compiler-cli/ngcc/src/rendering/esm_rendering_formatter.ts
index 5f113661fba2f..28aeaec3b1560 100644
--- a/packages/compiler-cli/ngcc/src/rendering/esm_rendering_formatter.ts
+++ b/packages/compiler-cli/ngcc/src/rendering/esm_rendering_formatter.ts
@@ -10,7 +10,7 @@ import MagicString from 'magic-string';
 import * as ts from 'typescript';
 
 import {absoluteFromSourceFile, AbsoluteFsPath, dirname, relative, toRelativeImport} from '../../../src/ngtsc/file_system';
-import {NOOP_DEFAULT_IMPORT_RECORDER, Reexport} from '../../../src/ngtsc/imports';
+import {Reexport} from '../../../src/ngtsc/imports';
 import {Import, ImportManager, translateStatement} from '../../../src/ngtsc/translator';
 import {isDtsPath} from '../../../src/ngtsc/util/src/typescript';
 import {ModuleWithProvidersInfo} from '../analysis/module_with_providers_analyzer';
@@ -247,8 +247,7 @@ export class EsmRenderingFormatter implements RenderingFormatter {
    * @return The JavaScript code corresponding to `stmt` (in the appropriate format).
    */
   printStatement(stmt: Statement, sourceFile: ts.SourceFile, importManager: ImportManager): string {
-    const node = translateStatement(
-        stmt, importManager, NOOP_DEFAULT_IMPORT_RECORDER, ts.ScriptTarget.ES2015);
+    const node = translateStatement(stmt, importManager);
     const code = this.printer.printNode(ts.EmitHint.Unspecified, node, sourceFile);
 
     return code;
@@ -264,8 +263,6 @@ export class EsmRenderingFormatter implements RenderingFormatter {
     return 0;
   }
 
-
-
   /**
    * Check whether the given type is the core Angular `ModuleWithProviders` interface.
    * @param typeName The type to check.
@@ -292,7 +289,8 @@ function findStatement(node: ts.Node): ts.Statement|undefined {
 function generateImportString(
     importManager: ImportManager, importPath: string|null, importName: string) {
   const importAs = importPath ? importManager.generateNamedImport(importPath, importName) : null;
-  return importAs ? `${importAs.moduleImport}.${importAs.symbol}` : `${importName}`;
+  return importAs && importAs.moduleImport ? `${importAs.moduleImport.text}.${importAs.symbol}` :
+                                             `${importName}`;
 }
 
 function getNextSiblingInArray<T extends ts.Node>(node: T, array: ts.NodeArray<T>): T|null {
diff --git a/packages/compiler-cli/ngcc/src/rendering/renderer.ts b/packages/compiler-cli/ngcc/src/rendering/renderer.ts
index cffe8b0639eb5..8e02accfda01c 100644
--- a/packages/compiler-cli/ngcc/src/rendering/renderer.ts
+++ b/packages/compiler-cli/ngcc/src/rendering/renderer.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 {CommentStmt, ConstantPool, Expression, Statement, WrappedNodeExpr, WritePropExpr} from '@angular/compiler';
+import {ConstantPool, Expression, jsDocComment, LeadingComment, Statement, WrappedNodeExpr, WritePropExpr} from '@angular/compiler';
 import MagicString from 'magic-string';
 import * as ts from 'typescript';
 
@@ -166,11 +166,11 @@ export class Renderer {
       sourceFile: ts.SourceFile, compiledClass: CompiledClass, imports: ImportManager,
       annotateForClosureCompiler: boolean): string {
     const name = this.host.getInternalNameOfClass(compiledClass.declaration);
-    const statements: Statement[][] = compiledClass.compilation.map(c => {
-      return createAssignmentStatements(
-          name, c.name, c.initializer, annotateForClosureCompiler ? '* @nocollapse ' : undefined);
-    });
-    return this.renderStatements(sourceFile, Array.prototype.concat.apply([], statements), imports);
+    const leadingComment =
+        annotateForClosureCompiler ? jsDocComment([{tagName: 'nocollapse'}]) : undefined;
+    const statements: Statement[] = compiledClass.compilation.map(
+        c => createAssignmentStatement(name, c.name, c.initializer, leadingComment));
+    return this.renderStatements(sourceFile, statements, imports);
   }
 
   /**
@@ -213,16 +213,16 @@ export function renderConstantPool(
  * compiled decorator to be applied to the class.
  * @param analyzedClass The info about the class whose statement we want to create.
  */
-function createAssignmentStatements(
+function createAssignmentStatement(
     receiverName: ts.DeclarationName, propName: string, initializer: Expression,
-    leadingComment?: string): Statement[] {
+    leadingComment?: LeadingComment): Statement {
   const receiver = new WrappedNodeExpr(receiverName);
-  const statements =
-      [new WritePropExpr(
-           receiver, propName, initializer, /* type */ undefined, /* sourceSpan */ undefined)
-           .toStmt()];
+  const statement =
+      new WritePropExpr(
+          receiver, propName, initializer, /* type */ undefined, /* sourceSpan */ undefined)
+          .toStmt();
   if (leadingComment !== undefined) {
-    statements.unshift(new CommentStmt(leadingComment, true));
+    statement.addLeadingComment(leadingComment);
   }
-  return statements;
+  return statement;
 }
diff --git a/packages/compiler-cli/ngcc/src/rendering/umd_rendering_formatter.ts b/packages/compiler-cli/ngcc/src/rendering/umd_rendering_formatter.ts
index 0a696b0e0d0cb..3fbf9755de0f4 100644
--- a/packages/compiler-cli/ngcc/src/rendering/umd_rendering_formatter.ts
+++ b/packages/compiler-cli/ngcc/src/rendering/umd_rendering_formatter.ts
@@ -91,7 +91,7 @@ export class UmdRenderingFormatter extends Esm5RenderingFormatter {
       const namedImport = entryPointBasePath !== basePath ?
           importManager.generateNamedImport(relativePath, e.identifier) :
           {symbol: e.identifier, moduleImport: null};
-      const importNamespace = namedImport.moduleImport ? `${namedImport.moduleImport}.` : '';
+      const importNamespace = namedImport.moduleImport ? `${namedImport.moduleImport.text}.` : '';
       const exportStr = `\nexports.${e.identifier} = ${importNamespace}${namedImport.symbol};`;
       output.appendRight(insertionPoint, exportStr);
     });
@@ -111,7 +111,7 @@ export class UmdRenderingFormatter extends Esm5RenderingFormatter {
         lastStatement ? lastStatement.getEnd() : factoryFunction.body.getEnd() - 1;
     for (const e of exports) {
       const namedImport = importManager.generateNamedImport(e.fromModule, e.symbolName);
-      const importNamespace = namedImport.moduleImport ? `${namedImport.moduleImport}.` : '';
+      const importNamespace = namedImport.moduleImport ? `${namedImport.moduleImport.text}.` : '';
       const exportStr = `\nexports.${e.asAlias} = ${importNamespace}${namedImport.symbol};`;
       output.appendRight(insertionPoint, exportStr);
     }
diff --git a/packages/compiler-cli/ngcc/src/utils.ts b/packages/compiler-cli/ngcc/src/utils.ts
index caaea704b291f..de8b4c3193c01 100644
--- a/packages/compiler-cli/ngcc/src/utils.ts
+++ b/packages/compiler-cli/ngcc/src/utils.ts
@@ -8,7 +8,7 @@
 import * as ts from 'typescript';
 
 import {absoluteFrom, AbsoluteFsPath, FileSystem, isRooted} from '../../src/ngtsc/file_system';
-import {KnownDeclaration} from '../../src/ngtsc/reflection';
+import {DeclarationNode, KnownDeclaration} from '../../src/ngtsc/reflection';
 
 /**
  * A list (`Array`) of partially ordered `T` items.
@@ -71,9 +71,9 @@ export function findAll<T>(node: ts.Node, test: (node: ts.Node) => node is ts.No
  * @param declaration The declaration to test.
  * @returns true if the declaration has an identifier for a name.
  */
-export function hasNameIdentifier(declaration: ts.Declaration): declaration is ts.Declaration&
+export function hasNameIdentifier(declaration: ts.Node): declaration is DeclarationNode&
     {name: ts.Identifier} {
-  const namedDeclaration: ts.Declaration&{name?: ts.Node} = declaration;
+  const namedDeclaration: ts.Node&{name?: ts.Node} = declaration;
   return namedDeclaration.name !== undefined && ts.isIdentifier(namedDeclaration.name);
 }
 
@@ -136,7 +136,7 @@ export function resolveFileWithPostfixes(
  * Determine whether a function declaration corresponds with a TypeScript helper function, returning
  * its kind if so or null if the declaration does not seem to correspond with such a helper.
  */
-export function getTsHelperFnFromDeclaration(decl: ts.Declaration): KnownDeclaration|null {
+export function getTsHelperFnFromDeclaration(decl: DeclarationNode): KnownDeclaration|null {
   if (!ts.isFunctionDeclaration(decl) && !ts.isVariableDeclaration(decl)) {
     return null;
   }
diff --git a/packages/compiler-cli/ngcc/test/analysis/decoration_analyzer_spec.ts b/packages/compiler-cli/ngcc/test/analysis/decoration_analyzer_spec.ts
index 51419b10566bd..632490941456e 100644
--- a/packages/compiler-cli/ngcc/test/analysis/decoration_analyzer_spec.ts
+++ b/packages/compiler-cli/ngcc/test/analysis/decoration_analyzer_spec.ts
@@ -11,7 +11,7 @@ import {FatalDiagnosticError, makeDiagnostic} from '../../../src/ngtsc/diagnosti
 import {absoluteFrom, getFileSystem, getSourceFileOrError} from '../../../src/ngtsc/file_system';
 import {runInEachFileSystem, TestFile} from '../../../src/ngtsc/file_system/testing';
 import {MockLogger} from '../../../src/ngtsc/logging/testing';
-import {ClassDeclaration, Decorator} from '../../../src/ngtsc/reflection';
+import {ClassDeclaration, DeclarationNode, Decorator} from '../../../src/ngtsc/reflection';
 import {AnalysisOutput, CompileResult, DecoratorHandler, DetectResult, HandlerPrecedence} from '../../../src/ngtsc/transform';
 import {loadFakeCore, loadTestFiles} from '../../../test/helpers';
 import {DecorationAnalyzer} from '../../src/analysis/decoration_analyzer';
@@ -48,11 +48,11 @@ runInEachFileSystem(() => {
           'analyze',
           'register',
           'resolve',
-          'compile',
+          'compileFull',
         ]);
         // Only detect the Component and Directive decorators
         handler.detect.and.callFake(
-            (node: ts.Declaration, decorators: Decorator[]|null): DetectResult<unknown>|
+            (node: DeclarationNode, decorators: Decorator[]|null): DetectResult<unknown>|
             undefined => {
               const className = (node as any).name.text;
               if (decorators === null) {
@@ -76,7 +76,7 @@ runInEachFileSystem(() => {
               }
             });
         // The "test" analysis is an object with the name of the decorator being analyzed
-        handler.analyze.and.callFake((decl: ts.Declaration, dec: Decorator) => {
+        handler.analyze.and.callFake((decl: DeclarationNode, dec: Decorator) => {
           logs.push(`analyze: ${(decl as any).name.text}@${dec.name}`);
           return {
             analysis: {decoratorName: dec.name},
@@ -85,7 +85,7 @@ runInEachFileSystem(() => {
           };
         });
         // The "test" resolution is just setting `resolved: true` on the analysis
-        handler.resolve.and.callFake((decl: ts.Declaration, analysis: any) => {
+        handler.resolve.and.callFake((decl: DeclarationNode, analysis: any) => {
           logs.push(`resolve: ${(decl as any).name.text}@${analysis.decoratorName}`);
           analysis.resolved = true;
           return {
@@ -95,10 +95,10 @@ runInEachFileSystem(() => {
         });
         // The "test" compilation result is just the name of the decorator being compiled
         // (suffixed with `(compiled)`)
-        (handler.compile as any).and.callFake((decl: ts.Declaration, analysis: any) => {
+        handler.compileFull.and.callFake((decl: DeclarationNode, analysis: any) => {
           logs.push(`compile: ${(decl as any).name.text}@${analysis.decoratorName} (resolved: ${
               analysis.resolved})`);
-          return `@${analysis.decoratorName} (compiled)`;
+          return `@${analysis.decoratorName} (compiled)` as any;
         });
         return handler;
       };
@@ -414,7 +414,7 @@ runInEachFileSystem(() => {
           expect(testHandler.analyze).toHaveBeenCalled();
           expect(testHandler.register).not.toHaveBeenCalled();
           expect(testHandler.resolve).not.toHaveBeenCalled();
-          expect(testHandler.compile).not.toHaveBeenCalled();
+          expect(testHandler.compileFull).not.toHaveBeenCalled();
         });
 
         it('should report resolve diagnostics to the `diagnosticHandler` callback', () => {
@@ -436,7 +436,7 @@ runInEachFileSystem(() => {
           expect(testHandler.analyze).toHaveBeenCalled();
           expect(testHandler.register).toHaveBeenCalled();
           expect(testHandler.resolve).toHaveBeenCalled();
-          expect(testHandler.compile).not.toHaveBeenCalled();
+          expect(testHandler.compileFull).not.toHaveBeenCalled();
         });
       });
 
@@ -452,7 +452,7 @@ runInEachFileSystem(() => {
             analyze(): AnalysisOutput<unknown> {
               throw new Error('analyze should not have been called');
             }
-            compile(): CompileResult {
+            compileFull(): CompileResult {
               throw new Error('compile should not have been called');
             }
           }
diff --git a/packages/compiler-cli/ngcc/test/analysis/migration_host_spec.ts b/packages/compiler-cli/ngcc/test/analysis/migration_host_spec.ts
index 2e08a9d7f2272..b4053aca9787b 100644
--- a/packages/compiler-cli/ngcc/test/analysis/migration_host_spec.ts
+++ b/packages/compiler-cli/ngcc/test/analysis/migration_host_spec.ts
@@ -209,7 +209,7 @@ class DetectDecoratorHandler implements DecoratorHandler<unknown, unknown, unkno
     return {};
   }
 
-  compile(node: ClassDeclaration): CompileResult|CompileResult[] {
+  compileFull(node: ClassDeclaration): CompileResult|CompileResult[] {
     return [];
   }
 }
@@ -227,7 +227,7 @@ class DiagnosticProducingHandler implements DecoratorHandler<unknown, unknown, u
     return {diagnostics: [makeDiagnostic(9999, node, 'test diagnostic')]};
   }
 
-  compile(node: ClassDeclaration): CompileResult|CompileResult[] {
+  compileFull(node: ClassDeclaration): CompileResult|CompileResult[] {
     return [];
   }
 }
diff --git a/packages/compiler-cli/ngcc/test/analysis/module_with_providers_analyzer_spec.ts b/packages/compiler-cli/ngcc/test/analysis/module_with_providers_analyzer_spec.ts
index 5280fcb551353..c3735c4184da3 100644
--- a/packages/compiler-cli/ngcc/test/analysis/module_with_providers_analyzer_spec.ts
+++ b/packages/compiler-cli/ngcc/test/analysis/module_with_providers_analyzer_spec.ts
@@ -10,8 +10,8 @@ import * as ts from 'typescript';
 import {absoluteFrom, AbsoluteFsPath, getSourceFileOrError} from '../../../src/ngtsc/file_system';
 import {runInEachFileSystem, TestFile} from '../../../src/ngtsc/file_system/testing';
 import {MockLogger} from '../../../src/ngtsc/logging/testing';
-import {isNamedClassDeclaration, isNamedVariableDeclaration} from '../../../src/ngtsc/reflection';
-import {getDeclaration} from '../../../src/ngtsc/testing';
+import {DeclarationNode} from '../../../src/ngtsc/reflection';
+import {getDeclaration, isNamedDeclaration} from '../../../src/ngtsc/testing';
 import {loadTestFiles} from '../../../test/helpers';
 import {ModuleWithProvidersAnalyses, ModuleWithProvidersAnalyzer} from '../../src/analysis/module_with_providers_analyzer';
 import {NgccReferencesRegistry} from '../../src/analysis/ngcc_references_registry';
@@ -660,10 +660,8 @@ runInEachFileSystem(() => {
                           [];
       }
 
-      function getName(node: ts.Declaration|null): string {
-        return node && (isNamedVariableDeclaration(node) || isNamedClassDeclaration(node)) ?
-            `${node.name.text}.` :
-            '';
+      function getName(node: DeclarationNode|null): string {
+        return node && isNamedDeclaration(node) ? `${node.name.text}.` : '';
       }
     });
   });
diff --git a/packages/compiler-cli/ngcc/test/analysis/ngcc_trait_compiler_spec.ts b/packages/compiler-cli/ngcc/test/analysis/ngcc_trait_compiler_spec.ts
index 6e232ea856aaf..ab09980e3a2d9 100644
--- a/packages/compiler-cli/ngcc/test/analysis/ngcc_trait_compiler_spec.ts
+++ b/packages/compiler-cli/ngcc/test/analysis/ngcc_trait_compiler_spec.ts
@@ -309,7 +309,7 @@ class TestHandler implements DecoratorHandler<unknown, unknown, unknown> {
     return {};
   }
 
-  compile(node: ClassDeclaration): CompileResult|CompileResult[] {
+  compileFull(node: ClassDeclaration): CompileResult|CompileResult[] {
     this.log.push(this.name + ':compile:' + node.name.text);
     return [];
   }
diff --git a/packages/compiler-cli/ngcc/test/analysis/references_registry_spec.ts b/packages/compiler-cli/ngcc/test/analysis/references_registry_spec.ts
index 9bb668ae085a9..dbd10a017742a 100644
--- a/packages/compiler-cli/ngcc/test/analysis/references_registry_spec.ts
+++ b/packages/compiler-cli/ngcc/test/analysis/references_registry_spec.ts
@@ -11,7 +11,7 @@ import {absoluteFrom} from '../../../src/ngtsc/file_system';
 import {runInEachFileSystem, TestFile} from '../../../src/ngtsc/file_system/testing';
 import {Reference} from '../../../src/ngtsc/imports';
 import {PartialEvaluator} from '../../../src/ngtsc/partial_evaluator';
-import {TypeScriptReflectionHost} from '../../../src/ngtsc/reflection';
+import {DeclarationNode, TypeScriptReflectionHost} from '../../../src/ngtsc/reflection';
 import {getDeclaration} from '../../../src/ngtsc/testing';
 import {loadTestFiles} from '../../../test/helpers';
 import {NgccReferencesRegistry} from '../../src/analysis/ngcc_references_registry';
@@ -61,7 +61,7 @@ runInEachFileSystem(() => {
     });
   });
 
-  function isReference(ref: any): ref is Reference<ts.Declaration> {
+  function isReference(ref: any): ref is Reference<DeclarationNode> {
     return ref instanceof Reference;
   }
 });
diff --git a/packages/compiler-cli/ngcc/test/entry_point_finder/program_based_entry_point_finder_spec.ts b/packages/compiler-cli/ngcc/test/entry_point_finder/program_based_entry_point_finder_spec.ts
index d48d7cf7035f3..af847efcb99c4 100644
--- a/packages/compiler-cli/ngcc/test/entry_point_finder/program_based_entry_point_finder_spec.ts
+++ b/packages/compiler-cli/ngcc/test/entry_point_finder/program_based_entry_point_finder_spec.ts
@@ -59,6 +59,75 @@ runInEachFileSystem(() => {
         ]);
       });
 
+      it('should scan source files only once, even if they are referenced from multiple root files',
+         () => {
+           // https://github.com/angular/angular/issues/39240
+           // When scanning the program for imports to determine which entry-points to process, the
+           // root files as configured in the tsconfig file are used to start scanning from. This
+           // test asserts that a file is not scanned multiple times even if it is referenced from
+           // multiple root files.
+           loadTestFiles([
+             {
+               name: _Abs(`${projectPath}/package.json`),
+               contents: '',
+             },
+             {
+               name: _Abs(`${projectPath}/tsconfig.json`),
+               contents: `{
+                 "files": [
+                   "root-one.ts",
+                   "root-two.ts",
+                 ],
+                 "compilerOptions": {
+                   "baseUrl": ".",
+                   "paths": {
+                     "lib/*": ["lib/*"]
+                   }
+                 }
+               }`,
+             },
+             {
+               name: _Abs(`${projectPath}/root-one.ts`),
+               contents: `
+                 import './root-two';
+                 import './not-root';
+               `,
+             },
+             {
+               name: _Abs(`${projectPath}/root-two.ts`),
+               contents: `
+                 import './not-root';
+               `,
+             },
+             {
+               name: _Abs(`${projectPath}/not-root.ts`),
+               contents: `
+              import {Component} from '@angular/core';
+              `,
+             },
+             ...createPackage(angularNamespacePath, 'core'),
+           ]);
+
+           const extractImportsSpy =
+               spyOn(EsmDependencyHost.prototype, 'extractImports' as any).and.callThrough();
+
+           const finder = createFinder();
+           const {entryPoints} = finder.findEntryPoints();
+           expect(dumpEntryPointPaths(basePath, entryPoints)).toEqual([
+             ['@angular/core', '@angular/core'],
+           ]);
+
+           // Three `extractImports` calls should have been made corresponding with the three
+           // distinct source files in the project.
+           const extractImportFiles =
+               extractImportsSpy.calls.all().map((call: jasmine.CallInfo<any>) => call.args[0]);
+           expect(extractImportFiles).toEqual([
+             _Abs(`${projectPath}/root-one.ts`),
+             _Abs(`${projectPath}/root-two.ts`),
+             _Abs(`${projectPath}/not-root.ts`),
+           ]);
+         });
+
       function createFinder(): ProgramBasedEntryPointFinder {
         const tsConfig = readConfiguration(`${projectPath}/tsconfig.json`);
         const baseUrl = fs.resolve(projectPath, tsConfig.options.basePath!);
diff --git a/packages/compiler-cli/ngcc/test/helpers/utils.ts b/packages/compiler-cli/ngcc/test/helpers/utils.ts
index 75a23805543c5..382758f3c370b 100644
--- a/packages/compiler-cli/ngcc/test/helpers/utils.ts
+++ b/packages/compiler-cli/ngcc/test/helpers/utils.ts
@@ -14,6 +14,7 @@ import {NgccEntryPointConfig} from '../../src/packages/configuration';
 import {EntryPoint, EntryPointFormat} from '../../src/packages/entry_point';
 import {EntryPointBundle} from '../../src/packages/entry_point_bundle';
 import {NgccSourcesCompilerHost} from '../../src/packages/ngcc_compiler_host';
+import {createModuleResolutionCache, EntryPointFileCache, SharedFileCache} from '../../src/packages/source_file_cache';
 
 export type TestConfig = Pick<NgccEntryPointConfig, 'generateDeepReexports'>;
 
@@ -68,7 +69,10 @@ export function makeTestBundleProgram(
   const rootDir = fs.dirname(entryPointPath);
   const options: ts.CompilerOptions =
       {allowJs: true, maxNodeModuleJsDepth: Infinity, checkJs: false, rootDir, rootDirs: [rootDir]};
-  const host = new NgccSourcesCompilerHost(fs, options, rootDir);
+  const moduleResolutionCache = createModuleResolutionCache(fs);
+  const entryPointFileCache = new EntryPointFileCache(fs, new SharedFileCache(fs));
+  const host =
+      new NgccSourcesCompilerHost(fs, options, entryPointFileCache, moduleResolutionCache, rootDir);
   return makeBundleProgram(
       fs, isCore, rootDir, path, 'r3_symbols.js', options, host, additionalFiles);
 }
diff --git a/packages/compiler-cli/ngcc/test/host/commonjs_host_spec.ts b/packages/compiler-cli/ngcc/test/host/commonjs_host_spec.ts
index df863ee554a9a..0ffe3ed485049 100644
--- a/packages/compiler-cli/ngcc/test/host/commonjs_host_spec.ts
+++ b/packages/compiler-cli/ngcc/test/host/commonjs_host_spec.ts
@@ -10,7 +10,7 @@ import * as ts from 'typescript';
 import {absoluteFrom, getFileSystem, getSourceFileOrError} from '../../../src/ngtsc/file_system';
 import {runInEachFileSystem, TestFile} from '../../../src/ngtsc/file_system/testing';
 import {MockLogger} from '../../../src/ngtsc/logging/testing';
-import {ClassMemberKind, ConcreteDeclaration, CtorParameter, DownleveledEnum, InlineDeclaration, isNamedClassDeclaration, isNamedFunctionDeclaration, isNamedVariableDeclaration, KnownDeclaration, TypeScriptReflectionHost} from '../../../src/ngtsc/reflection';
+import {ClassMemberKind, ConcreteDeclaration, CtorParameter, DeclarationKind, DownleveledEnum, InlineDeclaration, isNamedClassDeclaration, isNamedFunctionDeclaration, isNamedVariableDeclaration, KnownDeclaration, TypeScriptReflectionHost, TypeValueReferenceKind} from '../../../src/ngtsc/reflection';
 import {getDeclaration} from '../../../src/ngtsc/testing';
 import {loadFakeCore, loadTestFiles} from '../../../test/helpers';
 import {CommonJsReflectionHost} from '../../src/host/commonjs_host';
@@ -178,7 +178,7 @@ var OuterClass2 = (function() {
 }());
 var SuperClass = (function() { function SuperClass() {} return SuperClass; }());
 var ChildClass = /** @class */ (function (_super) {
-  __extends(ChildClass, _super);
+  __extends(InnerChildClass, _super);
   function InnerChildClass() {}
   return InnerChildClass;
 }(SuperClass);
@@ -1211,6 +1211,69 @@ exports.MissingClass2 = MissingClass2;
       });
 
       describe('getConstructorParameters', () => {
+        it('should retain imported name for type value references for decorated constructor parameter types',
+           () => {
+             const files = [
+               {
+                 name: _('/node_modules/shared-lib/foo.d.ts'),
+                 contents: `
+          declare class Foo {}
+          export {Foo as Bar};
+        `,
+               },
+               {
+                 name: _('/node_modules/shared-lib/index.d.ts'),
+                 contents: `
+          export {Bar as Baz} from './foo';
+        `,
+               },
+               {
+                 name: _('/local.js'),
+                 contents: `
+          var Internal = (function() {
+            function Internal() {
+            }
+            return Internal;
+          }());
+          exports.External = Internal;
+           `
+               },
+               {
+                 name: _('/main.js'),
+                 contents: `
+          var shared = require('shared-lib');
+          var local = require('./local');
+          var SameFile = (function() {
+            function SameFile() {
+            }
+            return SameFile;
+          }());
+          exports.SameFile = SameFile;
+
+          var SomeClass = (function() {
+            function SomeClass(arg1, arg2, arg3) {}
+            return SomeClass;
+          }());
+          SomeClass.ctorParameters = function() { return [{ type: shared.Baz }, { type: local.External }, { type: SameFile }]; };
+          exports.SomeClass = SomeClass;
+        `,
+               },
+             ];
+
+             loadTestFiles(files);
+             const bundle = makeTestBundleProgram(_('/main.js'));
+             const host =
+                 createHost(bundle, new CommonJsReflectionHost(new MockLogger(), false, bundle));
+             const classNode = getDeclaration(
+                 bundle.program, _('/main.js'), 'SomeClass', isNamedVariableDeclaration);
+
+             const parameters = host.getConstructorParameters(classNode)!;
+
+             expect(parameters.map(p => p.name)).toEqual(['arg1', 'arg2', 'arg3']);
+             expectTypeValueReferencesForParameters(
+                 parameters, ['Baz', 'External', 'SameFile'], ['shared-lib', './local', null]);
+           });
+
         it('should find the decorated constructor parameters', () => {
           loadTestFiles([SOME_DIRECTIVE_FILE]);
           const bundle = makeTestBundleProgram(SOME_DIRECTIVE_FILE.name);
@@ -1456,6 +1519,210 @@ exports.MissingClass2 = MissingClass2;
             expect(decorators[0].args).toEqual([]);
           });
         });
+
+        function getConstructorParameters(
+            constructor: string, mode?: 'inlined'|'inlined_with_suffix'|'imported') {
+          let fileHeader = '';
+
+          switch (mode) {
+            case 'imported':
+              fileHeader = `const tslib = require('tslib');`;
+              break;
+            case 'inlined':
+              fileHeader =
+                  `var __spread = (this && this.__spread) || function (...args) { /* ... */ }`;
+              break;
+            case 'inlined_with_suffix':
+              fileHeader =
+                  `var __spread$1 = (this && this.__spread$1) || function (...args) { /* ... */ }`;
+              break;
+          }
+          const file = {
+            name: _('/synthesized_constructors.js'),
+            contents: `
+                ${fileHeader}
+
+                var TestClass = /** @class */ (function (_super) {
+                  __extends(TestClass, _super);
+                  ${constructor}
+                  return TestClass;
+                }(null));
+
+                exports.TestClass = TestClass;`,
+          };
+
+          loadTestFiles([file]);
+          const bundle = makeTestBundleProgram(file.name);
+          const host =
+              createHost(bundle, new CommonJsReflectionHost(new MockLogger(), false, bundle));
+          const classNode =
+              getDeclaration(bundle.program, file.name, 'TestClass', isNamedVariableDeclaration);
+          return host.getConstructorParameters(classNode);
+        }
+
+        describe('TS -> ES5: synthesized constructors', () => {
+          it('recognizes _this assignment from super call', () => {
+            const parameters = getConstructorParameters(`
+              function TestClass() {
+                var _this = _super !== null && _super.apply(this, arguments) || this;
+                _this.synthesizedProperty = null;
+                return _this;
+              }
+            `);
+
+            expect(parameters).toBeNull();
+          });
+
+          it('recognizes super call as return statement', () => {
+            const parameters = getConstructorParameters(`
+              function TestClass() {
+                return _super !== null && _super.apply(this, arguments) || this;
+              }
+            `);
+
+            expect(parameters).toBeNull();
+          });
+
+          it('handles the case where a unique name was generated for _super or _this', () => {
+            const parameters = getConstructorParameters(`
+              function TestClass() {
+                var _this_1 = _super_1 !== null && _super_1.apply(this, arguments) || this;
+                _this_1._this = null;
+                _this_1._super = null;
+                return _this_1;
+              }
+            `);
+
+            expect(parameters).toBeNull();
+          });
+
+          it('does not consider constructors with parameters as synthesized', () => {
+            const parameters = getConstructorParameters(`
+              function TestClass(arg) {
+                return _super !== null && _super.apply(this, arguments) || this;
+              }
+            `);
+
+            expect(parameters!.length).toBe(1);
+          });
+
+          it('does not consider manual super calls as synthesized', () => {
+            const parameters = getConstructorParameters(`
+              function TestClass() {
+                return _super.call(this) || this;
+              }
+            `);
+
+            expect(parameters!.length).toBe(0);
+          });
+
+          it('does not consider empty constructors as synthesized', () => {
+            const parameters = getConstructorParameters(`function TestClass() {}`);
+            expect(parameters!.length).toBe(0);
+          });
+        });
+
+        // See: https://github.com/angular/angular/issues/38453.
+        describe('ES2015 -> ES5: synthesized constructors through TSC downleveling', () => {
+          it('recognizes delegate super call using inline spread helper', () => {
+            const parameters = getConstructorParameters(
+                `
+              function TestClass() {
+                return _super.apply(this, __spread(arguments)) || this;
+              }`,
+                'inlined');
+
+            expect(parameters).toBeNull();
+          });
+
+          it('recognizes delegate super call using inline spread helper with suffix', () => {
+            const parameters = getConstructorParameters(
+                `
+              function TestClass() {
+                return _super.apply(this, __spread$1(arguments)) || this;
+              }`,
+                'inlined_with_suffix');
+
+            expect(parameters).toBeNull();
+          });
+
+          it('recognizes delegate super call using imported spread helper', () => {
+            const parameters = getConstructorParameters(
+                `
+              function TestClass() {
+                return _super.apply(this, tslib.__spread(arguments)) || this;
+              }`,
+                'imported');
+
+            expect(parameters).toBeNull();
+          });
+
+          describe('with class member assignment', () => {
+            it('recognizes delegate super call using inline spread helper', () => {
+              const parameters = getConstructorParameters(
+                  `
+                function TestClass() {
+                  var _this = _super.apply(this, __spread(arguments)) || this;
+                  _this.synthesizedProperty = null;
+                  return _this;
+                }`,
+                  'inlined');
+
+              expect(parameters).toBeNull();
+            });
+
+            it('recognizes delegate super call using inline spread helper with suffix', () => {
+              const parameters = getConstructorParameters(
+                  `
+                function TestClass() {
+                  var _this = _super.apply(this, __spread$1(arguments)) || this;
+                  _this.synthesizedProperty = null;
+                  return _this;
+                }`,
+                  'inlined_with_suffix');
+
+              expect(parameters).toBeNull();
+            });
+
+            it('recognizes delegate super call using imported spread helper', () => {
+              const parameters = getConstructorParameters(
+                  `
+                function TestClass() {
+                  var _this = _super.apply(this, tslib.__spread(arguments)) || this;
+                  _this.synthesizedProperty = null;
+                  return _this;
+                }`,
+                  'imported');
+
+              expect(parameters).toBeNull();
+            });
+          });
+
+          it('handles the case where a unique name was generated for _super or _this', () => {
+            const parameters = getConstructorParameters(
+                `
+              function TestClass() {
+                var _this_1 = _super_1.apply(this, __spread(arguments)) || this;
+                _this_1._this = null;
+                _this_1._super = null;
+                return _this_1;
+              }`,
+                'inlined');
+
+            expect(parameters).toBeNull();
+          });
+
+          it('does not consider constructors with parameters as synthesized', () => {
+            const parameters = getConstructorParameters(
+                `
+              function TestClass(arg) {
+                return _super.apply(this, __spread(arguments)) || this;
+              }`,
+                'inlined');
+
+            expect(parameters!.length).toBe(1);
+          });
+        });
       });
 
       describe('getDefinitionOfFunction()', () => {
@@ -1573,6 +1840,7 @@ exports.MissingClass2 = MissingClass2;
                   const helperDeclaration = host.getDeclarationOfIdentifier(helperIdentifier);
 
                   expect(helperDeclaration).toEqual({
+                    kind: DeclarationKind.Concrete,
                     known: knownAs,
                     node: getHelperDeclaration(helperName),
                     viaModule,
@@ -1599,7 +1867,7 @@ exports.MissingClass2 = MissingClass2;
               isNamedVariableDeclaration);
           const ctrDecorators = host.getConstructorParameters(classNode)!;
           const identifierOfViewContainerRef = (ctrDecorators[0].typeValueReference! as {
-                                                 local: true,
+                                                 kind: TypeValueReferenceKind.LOCAL,
                                                  expression: ts.Identifier,
                                                  defaultImportStatement: null,
                                                }).expression;
@@ -1896,9 +2164,9 @@ exports.MissingClass2 = MissingClass2;
                 const helperDeclaration = host.getDeclarationOfIdentifier(helperIdentifier);
 
                 expect(helperDeclaration).toEqual({
+                  kind: DeclarationKind.Inline,
                   known: knownAs,
-                  expression: helperIdentifier,
-                  node: null,
+                  node: helperIdentifier,
                   viaModule: null,
                 });
               };
@@ -1930,9 +2198,9 @@ exports.MissingClass2 = MissingClass2;
                 const helperDeclaration = host.getDeclarationOfIdentifier(helperIdentifier);
 
                 expect(helperDeclaration).toEqual({
+                  kind: DeclarationKind.Inline,
                   known: knownAs,
-                  expression: helperIdentifier,
-                  node: null,
+                  node: helperIdentifier,
                   viaModule: null,
                 });
               };
@@ -2155,9 +2423,10 @@ exports.MissingClass2 = MissingClass2;
           const exportDeclarations = host.getExportsOfModule(file);
           expect(exportDeclarations).not.toBeNull();
           const decl = exportDeclarations!.get('directives') as InlineDeclaration;
-          expect(decl).not.toBeUndefined();
-          expect(decl.node).toBeNull();
-          expect(decl.expression).toBeDefined();
+          expect(decl).toBeDefined();
+          expect(decl.node.getText()).toEqual('exports.directives');
+          expect(decl.implementation!.getText()).toEqual('[foo]');
+          expect(decl.kind).toEqual(DeclarationKind.Inline);
         });
 
         it('should recognize declarations of known TypeScript helpers', () => {
diff --git a/packages/compiler-cli/ngcc/test/host/esm2015_host_import_helper_spec.ts b/packages/compiler-cli/ngcc/test/host/esm2015_host_import_helper_spec.ts
index 466484722abbe..20a8c35a8b240 100644
--- a/packages/compiler-cli/ngcc/test/host/esm2015_host_import_helper_spec.ts
+++ b/packages/compiler-cli/ngcc/test/host/esm2015_host_import_helper_spec.ts
@@ -11,7 +11,7 @@ import * as ts from 'typescript';
 import {absoluteFrom, getFileSystem, getSourceFileOrError} from '../../../src/ngtsc/file_system';
 import {runInEachFileSystem, TestFile} from '../../../src/ngtsc/file_system/testing';
 import {MockLogger} from '../../../src/ngtsc/logging/testing';
-import {ClassMemberKind, isNamedVariableDeclaration} from '../../../src/ngtsc/reflection';
+import {ClassMemberKind, isNamedVariableDeclaration, TypeValueReferenceKind} from '../../../src/ngtsc/reflection';
 import {getDeclaration} from '../../../src/ngtsc/testing';
 import {loadFakeCore, loadTestFiles, loadTsLib} from '../../../test/helpers';
 import {Esm2015ReflectionHost} from '../../src/host/esm2015_host';
@@ -484,7 +484,7 @@ runInEachFileSystem(() => {
                 isNamedVariableDeclaration);
             const ctrDecorators = host.getConstructorParameters(classNode)!;
             const identifierOfViewContainerRef = (ctrDecorators[0].typeValueReference! as {
-                                                   local: true,
+                                                   kind: TypeValueReferenceKind.LOCAL,
                                                    expression: ts.Identifier,
                                                    defaultImportStatement: null,
                                                  }).expression;
diff --git a/packages/compiler-cli/ngcc/test/host/esm2015_host_spec.ts b/packages/compiler-cli/ngcc/test/host/esm2015_host_spec.ts
index b5db58d50b2b0..a33dda88ae8a7 100644
--- a/packages/compiler-cli/ngcc/test/host/esm2015_host_spec.ts
+++ b/packages/compiler-cli/ngcc/test/host/esm2015_host_spec.ts
@@ -13,7 +13,7 @@ import {runInEachFileSystem, TestFile} from '../../../src/ngtsc/file_system/test
 import {MockLogger} from '../../../src/ngtsc/logging/testing';
 import {ClassMemberKind, ConcreteDeclaration, CtorParameter, DownleveledEnum, isNamedClassDeclaration, isNamedFunctionDeclaration, isNamedVariableDeclaration, TypeScriptReflectionHost} from '../../../src/ngtsc/reflection';
 import {getDeclaration} from '../../../src/ngtsc/testing';
-import {walkForDeclaration} from '../../../src/ngtsc/testing/src/utils';
+import {walkForDeclarations} from '../../../src/ngtsc/testing/src/utils';
 import {loadFakeCore, loadTestFiles} from '../../../test/helpers';
 import {DelegatingReflectionHost} from '../../src/host/delegating_host';
 import {Esm2015ReflectionHost} from '../../src/host/esm2015_host';
@@ -1140,6 +1140,58 @@ runInEachFileSystem(() => {
     });
 
     describe('getConstructorParameters()', () => {
+      it('should retain imported name for type value references for decorated constructor parameter types',
+         () => {
+           const files = [
+             {
+               name: _('/node_modules/shared-lib/foo.d.ts'),
+               contents: `
+                declare class Foo {}
+                export {Foo as Bar};
+              `,
+             },
+             {
+               name: _('/node_modules/shared-lib/index.d.ts'),
+               contents: `
+                export {Bar as Baz} from './foo';
+              `,
+             },
+             {
+               name: _('/local.js'),
+               contents: `
+                 class Internal {}
+                 export {Internal as External};
+                 `
+             },
+             {
+               name: _('/main.js'),
+               contents: `
+                import {Baz} from 'shared-lib';
+                import {External} from './local';
+                export class SameFile {}
+
+                export class SomeClass {
+                  constructor(arg1, arg2, arg3) {}
+                }
+                SomeClass.ctorParameters = [{ type: Baz }, { type: External }, { type: SameFile }];
+              `,
+             },
+           ];
+
+           loadTestFiles(files);
+           const bundle = makeTestBundleProgram(_('/main.js'));
+           const host =
+               createHost(bundle, new Esm2015ReflectionHost(new MockLogger(), false, bundle));
+           const classNode =
+               getDeclaration(bundle.program, _('/main.js'), 'SomeClass', isNamedClassDeclaration);
+
+           const parameters = host.getConstructorParameters(classNode)!;
+
+           expect(parameters.map(p => p.name)).toEqual(['arg1', 'arg2', 'arg3']);
+           expectTypeValueReferencesForParameters(
+               parameters, ['Baz', 'External', 'SameFile'], ['shared-lib', './local', null]);
+         });
+
       it('should find the decorated constructor parameters', () => {
         loadFakeCore(getFileSystem());
         loadTestFiles([SOME_DIRECTIVE_FILE]);
@@ -1154,7 +1206,8 @@ runInEachFileSystem(() => {
           '_viewContainer', '_template', 'injected'
         ]);
         expectTypeValueReferencesForParameters(
-            parameters, ['ViewContainerRef', 'TemplateRef', null], '@angular/core');
+            parameters, ['ViewContainerRef', 'TemplateRef', null],
+            ['@angular/core', '@angular/core', null]);
       });
 
       it('should accept `ctorParameters` as an array', () => {
@@ -1679,13 +1732,13 @@ runInEachFileSystem(() => {
            const classDeclaration = getDeclaration(
                bundle.program, WRAPPED_CLASS_EXPRESSION_FILE.name, 'DecoratedWrappedClass',
                ts.isVariableDeclaration);
-           const innerClassDeclaration =
-               walkForDeclaration('InnerDecoratedWrappedClass', classDeclaration);
-           if (innerClassDeclaration === null) {
+           const innerClassDeclarations =
+               walkForDeclarations('InnerDecoratedWrappedClass', classDeclaration);
+           if (innerClassDeclarations.length === 0) {
              throw new Error('Expected InnerDecoratedWrappedClass to exist');
            }
            const aliasedClassIdentifier =
-               (innerClassDeclaration.parent as ts.BinaryExpression).left as ts.Identifier;
+               (innerClassDeclarations[0].parent as ts.BinaryExpression).left as ts.Identifier;
            expect(aliasedClassIdentifier.text).toBe('DecoratedWrappedClass_1');
            const d = host.getDeclarationOfIdentifier(aliasedClassIdentifier);
            expect(d!.node).toBe(classDeclaration);
@@ -2012,18 +2065,19 @@ runInEachFileSystem(() => {
            const outerNode = getDeclaration(
                bundle.program, WRAPPED_CLASS_EXPRESSION_FILE.name, 'DecoratedWrappedClass',
                isNamedVariableDeclaration);
-           const innerNode = walkForDeclaration('InnerDecoratedWrappedClass', outerNode);
-           if (innerNode === null) {
+           const innerNodes = walkForDeclarations('InnerDecoratedWrappedClass', outerNode);
+           if (innerNodes.length === 0) {
              throw new Error('Expected to find InnerDecoratedWrappedClass');
            }
-           const classSymbol = host.getClassSymbol(innerNode);
+           const classSymbol = host.getClassSymbol(innerNodes[0]);
 
            if (classSymbol === undefined) {
              return fail('Expected classSymbol to be defined');
            }
            expect(classSymbol.name).toEqual('DecoratedWrappedClass');
            expect(classSymbol.declaration.valueDeclaration).toBe(outerNode);
-           expect(classSymbol.implementation.valueDeclaration).toBe(innerNode);
+           expect(classSymbol.implementation.valueDeclaration)
+               .toBe(innerNodes[0] as ts.Declaration);
 
            if (classSymbol.adjacent === undefined ||
                !isNamedVariableDeclaration(classSymbol.adjacent.valueDeclaration)) {
@@ -2043,8 +2097,8 @@ runInEachFileSystem(() => {
            const outerNode = getDeclaration(
                bundle.program, WRAPPED_CLASS_EXPRESSION_FILE.name, 'DecoratedWrappedClass',
                isNamedVariableDeclaration);
-           const innerNode = walkForDeclaration('InnerDecoratedWrappedClass', outerNode);
-           if (innerNode === null) {
+           const innerNodes = walkForDeclarations('InnerDecoratedWrappedClass', outerNode);
+           if (innerNodes.length === 0) {
              throw new Error('Expected to find InnerDecoratedWrappedClass');
            }
            const adjacentNode: ts.ClassExpression =
@@ -2059,7 +2113,8 @@ runInEachFileSystem(() => {
            }
            expect(classSymbol.name).toEqual('DecoratedWrappedClass');
            expect(classSymbol.declaration.valueDeclaration).toBe(outerNode);
-           expect(classSymbol.implementation.valueDeclaration).toBe(innerNode);
+           expect(classSymbol.implementation.valueDeclaration)
+               .toBe(innerNodes[0] as ts.Declaration);
 
            if (classSymbol.adjacent === undefined ||
                !isNamedVariableDeclaration(classSymbol.adjacent.valueDeclaration)) {
@@ -2078,12 +2133,12 @@ runInEachFileSystem(() => {
            const outerNode = getDeclaration(
                bundle.program, WRAPPED_CLASS_EXPRESSION_FILE.name, 'DecoratedWrappedClass',
                isNamedVariableDeclaration);
-           const innerNode = walkForDeclaration('InnerDecoratedWrappedClass', outerNode);
-           if (innerNode === null) {
+           const innerNodes = walkForDeclarations('InnerDecoratedWrappedClass', outerNode);
+           if (innerNodes.length === 0) {
              throw new Error('Expected to find InnerDecoratedWrappedClass');
            }
 
-           const innerSymbol = host.getClassSymbol(innerNode)!;
+           const innerSymbol = host.getClassSymbol(innerNodes[0])!;
            const outerSymbol = host.getClassSymbol(outerNode)!;
            expect(innerSymbol.declaration).toBe(outerSymbol.declaration);
            expect(innerSymbol.implementation).toBe(outerSymbol.implementation);
diff --git a/packages/compiler-cli/ngcc/test/host/esm5_host_import_helper_spec.ts b/packages/compiler-cli/ngcc/test/host/esm5_host_import_helper_spec.ts
index 6b91881644be6..5e7251bfc33cf 100644
--- a/packages/compiler-cli/ngcc/test/host/esm5_host_import_helper_spec.ts
+++ b/packages/compiler-cli/ngcc/test/host/esm5_host_import_helper_spec.ts
@@ -10,7 +10,7 @@ import * as ts from 'typescript';
 import {absoluteFrom, getFileSystem, getSourceFileOrError} from '../../../src/ngtsc/file_system';
 import {runInEachFileSystem, TestFile} from '../../../src/ngtsc/file_system/testing';
 import {MockLogger} from '../../../src/ngtsc/logging/testing';
-import {ClassMemberKind, isNamedFunctionDeclaration, isNamedVariableDeclaration} from '../../../src/ngtsc/reflection';
+import {ClassMemberKind, isNamedFunctionDeclaration, isNamedVariableDeclaration, TypeValueReferenceKind} from '../../../src/ngtsc/reflection';
 import {getDeclaration} from '../../../src/ngtsc/testing';
 import {loadFakeCore, loadTestFiles, loadTsLib} from '../../../test/helpers';
 import {getIifeBody} from '../../src/host/esm2015_host';
@@ -544,7 +544,7 @@ export { AliasedDirective$1 };
                 isNamedVariableDeclaration);
             const ctrDecorators = host.getConstructorParameters(classNode)!;
             const identifierOfViewContainerRef = (ctrDecorators[0].typeValueReference! as {
-                                                   local: true,
+                                                   kind: TypeValueReferenceKind.LOCAL,
                                                    expression: ts.Identifier,
                                                    defaultImportStatement: null,
                                                  }).expression;
diff --git a/packages/compiler-cli/ngcc/test/host/esm5_host_spec.ts b/packages/compiler-cli/ngcc/test/host/esm5_host_spec.ts
index e7663a72ee7f6..46d7c5a18fecc 100644
--- a/packages/compiler-cli/ngcc/test/host/esm5_host_spec.ts
+++ b/packages/compiler-cli/ngcc/test/host/esm5_host_spec.ts
@@ -11,7 +11,7 @@ import * as ts from 'typescript';
 import {absoluteFrom, getFileSystem, getSourceFileOrError} from '../../../src/ngtsc/file_system';
 import {runInEachFileSystem, TestFile} from '../../../src/ngtsc/file_system/testing';
 import {MockLogger} from '../../../src/ngtsc/logging/testing';
-import {ClassMemberKind, ConcreteDeclaration, CtorParameter, Decorator, DownleveledEnum, isNamedClassDeclaration, isNamedFunctionDeclaration, isNamedVariableDeclaration, KnownDeclaration, TypeScriptReflectionHost} from '../../../src/ngtsc/reflection';
+import {ClassMemberKind, ConcreteDeclaration, CtorParameter, DeclarationKind, Decorator, DownleveledEnum, isNamedClassDeclaration, isNamedFunctionDeclaration, isNamedVariableDeclaration, KnownDeclaration, TypeScriptReflectionHost, TypeValueReferenceKind} from '../../../src/ngtsc/reflection';
 import {getDeclaration} from '../../../src/ngtsc/testing';
 import {loadFakeCore, loadTestFiles} from '../../../test/helpers';
 import {DelegatingReflectionHost} from '../../src/host/delegating_host';
@@ -223,7 +223,7 @@ runInEachFileSystem(() => {
     }());
     var SuperClass = (function() { function SuperClass() {} return SuperClass; }());
     var ChildClass = /** @class */ (function (_super) {
-      __extends(ChildClass, _super);
+      __extends(InnerChildClass, _super);
       function InnerChildClass() {}
       return InnerChildClass;
     }(SuperClass);
@@ -1252,6 +1252,68 @@ runInEachFileSystem(() => {
     });
 
     describe('getConstructorParameters()', () => {
+      it('should retain imported name for type value references for decorated constructor parameter types',
+         () => {
+           const files = [
+             {
+               name: _('/node_modules/shared-lib/foo.d.ts'),
+               contents: `
+           declare class Foo {}
+           export {Foo as Bar};
+         `,
+             },
+             {
+               name: _('/node_modules/shared-lib/index.d.ts'),
+               contents: `
+           export {Bar as Baz} from './foo';
+         `,
+             },
+             {
+               name: _('/local.js'),
+               contents: `
+           var Internal = (function() {
+             function Internal() {
+             }
+             return Internal;
+           }());
+           export {Internal as External};
+            `
+             },
+             {
+               name: _('/main.js'),
+               contents: `
+           import {Baz} from 'shared-lib';
+           import {External} from './local';
+           var SameFile = (function() {
+             function SameFile() {
+             }
+             return SameFile;
+           }());
+           export SameFile;
+
+           var SomeClass = (function() {
+             function SomeClass(arg1, arg2, arg3) {}
+             return SomeClass;
+           }());
+           SomeClass.ctorParameters = function() { return [{ type: Baz }, { type: External }, { type: SameFile }]; };
+           export SomeClass;
+         `,
+             },
+           ];
+
+           loadTestFiles(files);
+           const bundle = makeTestBundleProgram(_('/main.js'));
+           const host = createHost(bundle, new Esm5ReflectionHost(new MockLogger(), false, bundle));
+           const classNode = getDeclaration(
+               bundle.program, _('/main.js'), 'SomeClass', isNamedVariableDeclaration);
+
+           const parameters = host.getConstructorParameters(classNode)!;
+
+           expect(parameters.map(p => p.name)).toEqual(['arg1', 'arg2', 'arg3']);
+           expectTypeValueReferencesForParameters(
+               parameters, ['Baz', 'External', 'SameFile'], ['shared-lib', './local', null]);
+         });
+
       it('should find the decorated constructor parameters', () => {
         loadTestFiles([SOME_DIRECTIVE_FILE]);
         const bundle = makeTestBundleProgram(SOME_DIRECTIVE_FILE.name);
@@ -1417,86 +1479,236 @@ runInEachFileSystem(() => {
         });
       });
 
-      describe('synthesized constructors', () => {
-        function getConstructorParameters(constructor: string) {
-          const file = {
-            name: _('/synthesized_constructors.js'),
-            contents: `
+      function getConstructorParameters(
+          constructor: string,
+          mode?: 'inlined'|'inlined_with_suffix'|'imported'|'imported_namespace') {
+        let fileHeader = '';
+
+        switch (mode) {
+          case 'imported':
+            fileHeader = `import {__spread} from 'tslib';`;
+            break;
+          case 'imported_namespace':
+            fileHeader = `import * as tslib from 'tslib';`;
+            break;
+          case 'inlined':
+            fileHeader =
+                `var __spread = (this && this.__spread) || function (...args) { /* ... */ }`;
+            break;
+          case 'inlined_with_suffix':
+            fileHeader =
+                `var __spread$1 = (this && this.__spread$1) || function (...args) { /* ... */ }`;
+            break;
+        }
+
+        const file = {
+          name: _('/synthesized_constructors.js'),
+          contents: `
+            ${fileHeader}
             var TestClass = /** @class */ (function (_super) {
               __extends(TestClass, _super);
               ${constructor}
               return TestClass;
             }(null));
           `,
-          };
+        };
 
-          loadTestFiles([file]);
-          const bundle = makeTestBundleProgram(file.name);
-          const host = createHost(bundle, new Esm5ReflectionHost(new MockLogger(), false, bundle));
-          const classNode =
-              getDeclaration(bundle.program, file.name, 'TestClass', isNamedVariableDeclaration);
-          return host.getConstructorParameters(classNode);
-        }
+        loadTestFiles([file]);
+        const bundle = makeTestBundleProgram(file.name);
+        const host = createHost(bundle, new Esm5ReflectionHost(new MockLogger(), false, bundle));
+        const classNode =
+            getDeclaration(bundle.program, file.name, 'TestClass', isNamedVariableDeclaration);
+        return host.getConstructorParameters(classNode);
+      }
 
+      describe('TS -> ES5: synthesized constructors', () => {
         it('recognizes _this assignment from super call', () => {
           const parameters = getConstructorParameters(`
-          function TestClass() {
-            var _this = _super !== null && _super.apply(this, arguments) || this;
-            _this.synthesizedProperty = null;
-            return _this;
-          }`);
+            function TestClass() {
+              var _this = _super !== null && _super.apply(this, arguments) || this;
+              _this.synthesizedProperty = null;
+              return _this;
+            }
+          `);
 
           expect(parameters).toBeNull();
         });
 
         it('recognizes super call as return statement', () => {
           const parameters = getConstructorParameters(`
-          function TestClass() {
-            return _super !== null && _super.apply(this, arguments) || this;
-          }`);
+            function TestClass() {
+              return _super !== null && _super.apply(this, arguments) || this;
+            }
+          `);
 
           expect(parameters).toBeNull();
         });
 
         it('handles the case where a unique name was generated for _super or _this', () => {
           const parameters = getConstructorParameters(`
-          function TestClass() {
-            var _this_1 = _super_1 !== null && _super_1.apply(this, arguments) || this;
-            _this_1._this = null;
-            _this_1._super = null;
-            return _this_1;
-          }`);
+            function TestClass() {
+              var _this_1 = _super_1 !== null && _super_1.apply(this, arguments) || this;
+              _this_1._this = null;
+              _this_1._super = null;
+              return _this_1;
+            }
+          `);
 
           expect(parameters).toBeNull();
         });
 
         it('does not consider constructors with parameters as synthesized', () => {
           const parameters = getConstructorParameters(`
-          function TestClass(arg) {
-            return _super !== null && _super.apply(this, arguments) || this;
-          }`);
+            function TestClass(arg) {
+              return _super !== null && _super.apply(this, arguments) || this;
+            }
+          `);
 
           expect(parameters!.length).toBe(1);
         });
 
         it('does not consider manual super calls as synthesized', () => {
           const parameters = getConstructorParameters(`
-          function TestClass() {
-            return _super.call(this) || this;
-          }`);
+            function TestClass() {
+              return _super.call(this) || this;
+            }
+          `);
 
           expect(parameters!.length).toBe(0);
         });
 
         it('does not consider empty constructors as synthesized', () => {
-          const parameters = getConstructorParameters(`
-          function TestClass() {
-          }`);
-
+          const parameters = getConstructorParameters(`function TestClass() {}`);
           expect(parameters!.length).toBe(0);
         });
       });
 
+      // See: https://github.com/angular/angular/issues/38453.
+      describe('ES2015 -> ES5: synthesized constructors through TSC downleveling', () => {
+        it('recognizes delegate super call using inline spread helper', () => {
+          const parameters = getConstructorParameters(
+              `
+            function TestClass() {
+              return _super.apply(this, __spread(arguments)) || this;
+            }`,
+              'inlined');
+
+          expect(parameters).toBeNull();
+        });
+
+        it('recognizes delegate super call using inline spread helper with suffix', () => {
+          const parameters = getConstructorParameters(
+              `
+            function TestClass() {
+              return _super.apply(this, __spread$1(arguments)) || this;
+            }`,
+              'inlined_with_suffix');
+
+          expect(parameters).toBeNull();
+        });
+
+        it('recognizes delegate super call using imported spread helper', () => {
+          const parameters = getConstructorParameters(
+              `
+            function TestClass() {
+              return _super.apply(this, __spread(arguments)) || this;
+            }`,
+              'imported');
+
+          expect(parameters).toBeNull();
+        });
+
+        it('recognizes delegate super call using namespace imported spread helper', () => {
+          const parameters = getConstructorParameters(
+              `
+            function TestClass() {
+              return _super.apply(this, tslib.__spread(arguments)) || this;
+            }`,
+              'imported_namespace');
+
+          expect(parameters).toBeNull();
+        });
+
+        describe('with class member assignment', () => {
+          it('recognizes delegate super call using inline spread helper', () => {
+            const parameters = getConstructorParameters(
+                `
+              function TestClass() {
+                var _this = _super.apply(this, __spread(arguments)) || this;
+                _this.synthesizedProperty = null;
+                return _this;
+              }`,
+                'inlined');
+
+            expect(parameters).toBeNull();
+          });
+
+          it('recognizes delegate super call using inline spread helper with suffix', () => {
+            const parameters = getConstructorParameters(
+                `
+              function TestClass() {
+                var _this = _super.apply(this, __spread$1(arguments)) || this;
+                _this.synthesizedProperty = null;
+                return _this;
+              }`,
+                'inlined_with_suffix');
+
+            expect(parameters).toBeNull();
+          });
+
+          it('recognizes delegate super call using imported spread helper', () => {
+            const parameters = getConstructorParameters(
+                `
+              function TestClass() {
+                var _this = _super.apply(this, __spread(arguments)) || this;
+                _this.synthesizedProperty = null;
+                return _this;
+              }`,
+                'imported');
+
+            expect(parameters).toBeNull();
+          });
+
+          it('recognizes delegate super call using namespace imported spread helper', () => {
+            const parameters = getConstructorParameters(
+                `
+              function TestClass() {
+                var _this = _super.apply(this, tslib.__spread(arguments)) || this;
+                _this.synthesizedProperty = null;
+                return _this;
+              }`,
+                'imported_namespace');
+
+            expect(parameters).toBeNull();
+          });
+        });
+
+        it('handles the case where a unique name was generated for _super or _this', () => {
+          const parameters = getConstructorParameters(
+              `
+            function TestClass() {
+              var _this_1 = _super_1.apply(this, __spread(arguments)) || this;
+              _this_1._this = null;
+              _this_1._super = null;
+              return _this_1;
+            }`,
+              'inlined');
+
+          expect(parameters).toBeNull();
+        });
+
+        it('does not consider constructors with parameters as synthesized', () => {
+          const parameters = getConstructorParameters(
+              `
+            function TestClass(arg) {
+              return _super.apply(this, __spread(arguments)) || this;
+            }`,
+              'inlined');
+
+          expect(parameters!.length).toBe(1);
+        });
+      });
+
       describe('(returned parameters `decorators.args`)', () => {
         it('should be an empty array if param decorator has no `args` property', () => {
           loadTestFiles([INVALID_CTOR_DECORATOR_ARGS_FILE]);
@@ -1646,6 +1858,7 @@ runInEachFileSystem(() => {
                 const helperDeclaration = host.getDeclarationOfIdentifier(helperIdentifier);
 
                 expect(helperDeclaration).toEqual({
+                  kind: DeclarationKind.Concrete,
                   known: knownAs,
                   node: getHelperDeclaration(helperName),
                   viaModule,
@@ -1670,7 +1883,7 @@ runInEachFileSystem(() => {
             bundle.program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedVariableDeclaration);
         const ctrDecorators = host.getConstructorParameters(classNode)!;
         const identifierOfViewContainerRef = (ctrDecorators[0].typeValueReference! as {
-                                               local: true,
+                                               kind: TypeValueReferenceKind.LOCAL,
                                                expression: ts.Identifier,
                                                defaultImportStatement: null,
                                              }).expression;
@@ -2041,9 +2254,9 @@ runInEachFileSystem(() => {
           const helperDeclaration = host.getDeclarationOfIdentifier(helperIdentifier);
 
           expect(helperDeclaration).toEqual({
+            kind: DeclarationKind.Inline,
             known: knownAs,
-            expression: helperIdentifier,
-            node: null,
+            node: helperIdentifier,
             viaModule: null,
           });
         };
@@ -2072,9 +2285,9 @@ runInEachFileSystem(() => {
           const helperDeclaration = host.getDeclarationOfIdentifier(helperIdentifier);
 
           expect(helperDeclaration).toEqual({
+            kind: DeclarationKind.Inline,
             known: knownAs,
-            expression: helperIdentifier,
-            node: null,
+            node: helperIdentifier,
             viaModule: null,
           });
         };
diff --git a/packages/compiler-cli/ngcc/test/host/umd_host_spec.ts b/packages/compiler-cli/ngcc/test/host/umd_host_spec.ts
index e4f712f0f6d44..8eda983323b55 100644
--- a/packages/compiler-cli/ngcc/test/host/umd_host_spec.ts
+++ b/packages/compiler-cli/ngcc/test/host/umd_host_spec.ts
@@ -11,54 +11,107 @@ import * as ts from 'typescript';
 import {absoluteFrom, getFileSystem, getSourceFileOrError} from '../../../src/ngtsc/file_system';
 import {runInEachFileSystem, TestFile} from '../../../src/ngtsc/file_system/testing';
 import {MockLogger} from '../../../src/ngtsc/logging/testing';
-import {ClassMemberKind, ConcreteDeclaration, CtorParameter, DownleveledEnum, Import, InlineDeclaration, isNamedClassDeclaration, isNamedFunctionDeclaration, isNamedVariableDeclaration, KnownDeclaration, TypeScriptReflectionHost} from '../../../src/ngtsc/reflection';
+import {ClassMemberKind, ConcreteDeclaration, CtorParameter, DeclarationKind, DownleveledEnum, Import, InlineDeclaration, isNamedClassDeclaration, isNamedFunctionDeclaration, isNamedVariableDeclaration, KnownDeclaration, TypeScriptReflectionHost, TypeValueReferenceKind} from '../../../src/ngtsc/reflection';
 import {getDeclaration} from '../../../src/ngtsc/testing';
 import {loadFakeCore, loadTestFiles} from '../../../test/helpers';
+import {isExportsDeclaration, isExportsStatement} from '../../src/host/commonjs_umd_utils';
 import {DelegatingReflectionHost} from '../../src/host/delegating_host';
-import {getIifeBody} from '../../src/host/esm2015_host';
 import {NgccReflectionHost} from '../../src/host/ngcc_host';
 import {parseStatementForUmdModule, UmdReflectionHost} from '../../src/host/umd_host';
 import {BundleProgram} from '../../src/packages/bundle_program';
+import {hasNameIdentifier} from '../../src/utils';
 import {getRootFiles, makeTestBundleProgram} from '../helpers/utils';
 
 import {expectTypeValueReferencesForParameters} from './util';
 
 runInEachFileSystem(() => {
-  describe('UmdReflectionHost', () => {
-    let _: typeof absoluteFrom;
-
-    let SOME_DIRECTIVE_FILE: TestFile;
-    let TOPLEVEL_DECORATORS_FILE: TestFile;
-    let CTOR_DECORATORS_ARRAY_FILE: TestFile;
-    let SIMPLE_ES2015_CLASS_FILE: TestFile;
-    let SIMPLE_CLASS_FILE: TestFile;
-    let FOO_FUNCTION_FILE: TestFile;
-    let INLINE_EXPORT_FILE: TestFile;
-    let INVALID_DECORATORS_FILE: TestFile;
-    let INVALID_DECORATOR_ARGS_FILE: TestFile;
-    let INVALID_PROP_DECORATORS_FILE: TestFile;
-    let INVALID_PROP_DECORATOR_ARGS_FILE: TestFile;
-    let INVALID_CTOR_DECORATORS_FILE: TestFile;
-    let INVALID_CTOR_DECORATOR_ARGS_FILE: TestFile;
-    let IMPORTS_FILES: TestFile[];
-    let EXPORTS_FILES: TestFile[];
-    let FUNCTION_BODY_FILE: TestFile;
-    let DECORATED_FILES: TestFile[];
-    let TYPINGS_SRC_FILES: TestFile[];
-    let TYPINGS_DTS_FILES: TestFile[];
-
-    // Helpers
-    const createHost = (bundle: BundleProgram, ngccHost: UmdReflectionHost) => {
-      const tsHost = new TypeScriptReflectionHost(bundle.program.getTypeChecker());
-      return new DelegatingReflectionHost(tsHost, ngccHost);
-    };
+  for (const mode of ['inline exports', 'exported vars']) {
+    describe(`UmdReflectionHost [with ${mode}]`, () => {
+      let _: typeof absoluteFrom;
+
+      let SOME_DIRECTIVE_FILE: TestFile;
+      let TOPLEVEL_DECORATORS_FILE: TestFile;
+      let CTOR_DECORATORS_ARRAY_FILE: TestFile;
+      let SIMPLE_ES2015_CLASS_FILE: TestFile;
+      let SIMPLE_CLASS_FILE: TestFile;
+      let FOO_FUNCTION_FILE: TestFile;
+      let INLINE_EXPORT_FILE: TestFile;
+      let EXPORTS_IDENTIFIERS_FILE: TestFile;
+      let INVALID_DECORATORS_FILE: TestFile;
+      let INVALID_DECORATOR_ARGS_FILE: TestFile;
+      let INVALID_PROP_DECORATORS_FILE: TestFile;
+      let INVALID_PROP_DECORATOR_ARGS_FILE: TestFile;
+      let INVALID_CTOR_DECORATORS_FILE: TestFile;
+      let INVALID_CTOR_DECORATOR_ARGS_FILE: TestFile;
+      let IMPORTS_FILES: TestFile[];
+      let EXPORTS_FILES: TestFile[];
+      let FUNCTION_BODY_FILE: TestFile;
+      let DECORATED_FILES: TestFile[];
+      let TYPINGS_SRC_FILES: TestFile[];
+      let TYPINGS_DTS_FILES: TestFile[];
 
-    beforeEach(() => {
-      _ = absoluteFrom;
+      // Helpers
+      const createHost = (bundle: BundleProgram, ngccHost: UmdReflectionHost) => {
+        const tsHost = new TypeScriptReflectionHost(bundle.program.getTypeChecker());
+        return new DelegatingReflectionHost(tsHost, ngccHost);
+      };
 
-      SOME_DIRECTIVE_FILE = {
-        name: _('/some_directive.umd.js'),
-        contents: `
+      // There are two different forms of UMD export declaration.
+      //
+      // - "exported vars" where there is a variable declaration that is then assigned to the
+      //   `exports` object. For example:
+      //   ```
+      //   var MyClass = <...>;
+      //   exports.MyClass = MyClass;
+      //   ```
+      //
+      // - "inline exports" where there is no intemediate variable declaration. For example:
+      //   ```
+      //   exports.MyClass = <...>;
+      //   ```
+
+      // The following helpers allow us to setup code examples to use these two different
+      // approaches.
+
+      /**
+       * Create an export declaration: e.g.
+       *
+       * ```
+       * exports.<name> = <implementation>;
+       * ```
+       *
+       * or
+       *
+       * ```
+       * var <name> = <implementation>;
+       * ```
+       */
+      const expDecl = (name: string, noVar = false) =>
+          mode === 'exported vars' ? `${noVar ? '' : 'var '}${name}` : `exports.${name}`;
+
+      /**
+       * Export a variable that references a declaration (only for when the export was defined as a
+       * variable). For example:
+       *
+       * ```
+       * exports.<name> = <name>;
+       * ```
+       */
+      const varExp = (name: string) => mode === 'exported vars' ? `exports.${name} = ${name};` : '';
+
+      /**
+       * Select a predicate for matching an exported declaration based on whether the code contains
+       * "exported vars" or "inline exports".
+       */
+      const isDesiredDeclaration: typeof hasNameIdentifier =
+          mode === 'exported vars' ? isNamedVariableDeclaration : isExportsDeclaration;
+
+      beforeEach(() => {
+        _ = absoluteFrom;
+
+        SOME_DIRECTIVE_FILE = {
+          name: _('/some_directive.umd.js'),
+          contents: `
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core')) :
   typeof define === 'function' && define.amd ? define('some_directive', ['exports', '@angular/core'], factory) :
@@ -69,7 +122,7 @@ runInEachFileSystem(() => {
   var ViewContainerRef = {};
   var TemplateRef = {};
 
-  var SomeDirective = (function() {
+  ${expDecl('SomeDirective')} = (function() {
     function SomeDirective(_viewContainer, _template, injected) {
       this.instanceProperty = 'instance';
     }
@@ -92,13 +145,13 @@ runInEachFileSystem(() => {
     };
     return SomeDirective;
   }());
-  exports.SomeDirective = SomeDirective;
+  ${varExp('SomeDirective')}
 })));`,
-      };
+        };
 
-      TOPLEVEL_DECORATORS_FILE = {
-        name: _('/toplevel_decorators.umd.js'),
-        contents: `
+        TOPLEVEL_DECORATORS_FILE = {
+          name: _('/toplevel_decorators.umd.js'),
+          contents: `
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core')) :
   typeof define === 'function' && define.amd ? define('some_directive', ['exports', '@angular/core'], factory) :
@@ -109,105 +162,105 @@ runInEachFileSystem(() => {
   var ViewContainerRef = {};
   var TemplateRef = {};
 
-  var SomeDirective = (function() {
+  ${expDecl('SomeDirective')} = (function() {
     function SomeDirective(_viewContainer, _template, injected) {}
     return SomeDirective;
   }());
-  SomeDirective.decorators = [
+  ${expDecl('SomeDirective', true)}.decorators = [
     { type: core.Directive, args: [{ selector: '[someDirective]' },] }
   ];
-  SomeDirective.ctorParameters = function() { return [
+  ${expDecl('SomeDirective', true)}.ctorParameters = function() { return [
     { type: ViewContainerRef, },
     { type: TemplateRef, },
     { type: undefined, decorators: [{ type: core.Inject, args: [INJECTED_TOKEN,] },] },
   ]; };
-  SomeDirective.propDecorators = {
+  ${expDecl('SomeDirective', true)}.propDecorators = {
     "input1": [{ type: core.Input },],
     "input2": [{ type: core.Input },],
   };
-  exports.SomeDirective = SomeDirective;
+  ${varExp('SomeDirective')}
 })));`,
-      };
+        };
 
-      CTOR_DECORATORS_ARRAY_FILE = {
-        name: _('/ctor_decorated_as_array.js'),
-        contents: `
+        CTOR_DECORATORS_ARRAY_FILE = {
+          name: _('/ctor_decorated_as_array.js'),
+          contents: `
         (function (global, factory) {
           typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core')) :
           typeof define === 'function' && define.amd ? define('ctor_decorated_as_array', ['exports', '@angular/core'], factory) :
           (factory(global.ctor_decorated_as_array,global.ng.core));
         }(this, (function (exports,core) { 'use strict';
-            var CtorDecoratedAsArray = (function() {
+          ${expDecl('CtorDecoratedAsArray')} = (function() {
             function CtorDecoratedAsArray(arg1) {
             }
             CtorDecoratedAsArray.ctorParameters = [{ type: ParamType, decorators: [{ type: Inject },] }];
             return CtorDecoratedAsArray;
           }());
-          exports.CtorDecoratedAsArray = CtorDecoratedAsArray;
+          ${varExp('CtorDecoratedAsArray')}
         })));`,
-      };
+        };
 
-      SIMPLE_ES2015_CLASS_FILE = {
-        name: _('/simple_es2015_class.d.ts'),
-        contents: `
+        SIMPLE_ES2015_CLASS_FILE = {
+          name: _('/simple_es2015_class.d.ts'),
+          contents: `
     export class EmptyClass {}
   `,
-      };
+        };
 
-      SIMPLE_CLASS_FILE = {
-        name: _('/simple_class.js'),
-        contents: `
+        SIMPLE_CLASS_FILE = {
+          name: _('/simple_class.js'),
+          contents: `
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
   typeof define === 'function' && define.amd ? define('simple_class', ['exports'], factory) :
   (factory(global.simple_class));
 }(this, (function (exports) { 'use strict';
-  var EmptyClass = (function() {
+  ${expDecl('EmptyClass')} = (function() {
     function EmptyClass() {
     }
     return EmptyClass;
   }());
-  var NoParensClass = function() {
-    function EmptyClass() {
+  ${expDecl('NoParensClass')} = function() {
+    function NoParensClass() {
     }
-    return EmptyClass;
+    return NoParensClass;
   }();
-  var InnerParensClass = (function() {
-    function EmptyClass() {
+  ${expDecl('InnerParensClass')} = (function() {
+    function InnerParensClass() {
     }
-    return EmptyClass;
+    return InnerParensClass;
   })();
-  var NoDecoratorConstructorClass = (function() {
+  ${expDecl('NoDecoratorConstructorClass')} = (function() {
     function NoDecoratorConstructorClass(foo) {
     }
     return NoDecoratorConstructorClass;
   }());
-  var OuterClass1 = (function() {
+  ${expDecl('OuterClass1')} = (function() {
     function InnerClass1() {
     }
     return InnerClass1;
   }());
-  var OuterClass2 = (function() {
+  ${expDecl('OuterClass2')} = (function() {
     function InnerClass2() {
     }
     InnerClass2_1 = InnerClass12
     var InnerClass2_1;
     return InnerClass2;
   }());
-  var SuperClass = (function() { function SuperClass() {} return SuperClass; }());
-  var ChildClass = /** @class */ (function (_super) {
-    __extends(ChildClass, _super);
+  ${expDecl('SuperClass')} = (function() { function SuperClass() {} return SuperClass; }());
+  ${expDecl('ChildClass')} = /** @class */ (function (_super) {
+  __extends(InnerChildClass, _super);
     function InnerChildClass() {}
     return InnerChildClass;
   }(SuperClass);
-  exports.EmptyClass = EmptyClass;
-  exports.NoDecoratorConstructorClass = NoDecoratorConstructorClass;
+  ${varExp('EmptyClass')}
+  ${varExp('NoDecoratorConstructorClass')}
 })));`,
-      };
+        };
 
-      FOO_FUNCTION_FILE = {
-        name: _('/foo_function.js'),
-        contents: `
+        FOO_FUNCTION_FILE = {
+          name: _('/foo_function.js'),
+          contents: `
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core')) :
   typeof define === 'function' && define.amd ? define('foo_function', ['exports', '@angular/core'], factory) :
@@ -217,13 +270,13 @@ runInEachFileSystem(() => {
   foo.decorators = [
     { type: core.Directive, args: [{ selector: '[ignored]' },] }
   ];
-  exports.foo = foo;
+  ${varExp('foo')}
 })));`,
-      };
+        };
 
-      INLINE_EXPORT_FILE = {
-        name: _('/inline_export.js'),
-        contents: `
+        INLINE_EXPORT_FILE = {
+          name: _('/inline_export.js'),
+          contents: `
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core')) :
   typeof define === 'function' && define.amd ? define('foo_function', ['exports', '@angular/core'], factory) :
@@ -236,17 +289,44 @@ runInEachFileSystem(() => {
   exports.directives = [foo];
 })));
 `,
-      };
+        };
+
+        EXPORTS_IDENTIFIERS_FILE = {
+          name: _('/exports_identifiers.js'),
+          contents: `
+(function (global, factory) {
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core')) :
+  typeof define === 'function' && define.amd ? define('foo_function', ['exports', '@angular/core'], factory) :
+  (factory(global.inline_export,global.ng.core));
+}(this, (function (exports,core) { 'use strict';
+  var x = exports;
+  exports.foo = 42;
+
+  function simpleFn() {
+    exports.foo = 42;
+  }
+
+  function localVar() {
+    var exports = {};
+    exports.foo = 42;
+  }
+
+  function exportsArg(exports) {
+    exports.foo = 42;
+  }
+})));
+`,
+        };
 
-      INVALID_DECORATORS_FILE = {
-        name: _('/invalid_decorators.js'),
-        contents: `
+        INVALID_DECORATORS_FILE = {
+          name: _('/invalid_decorators.js'),
+          contents: `
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core')) :
   typeof define === 'function' && define.amd ? define('invalid_decorators', ['exports', '@angular/core'], factory) :
   (factory(global.invalid_decorators, global.ng.core));
 }(this, (function (exports,core) { 'use strict';
-  var NotArrayLiteral = (function() {
+  ${expDecl('NotArrayLiteral')} = (function() {
     function NotArrayLiteral() {
     }
     NotArrayLiteral.decorators = () => [
@@ -255,7 +335,7 @@ runInEachFileSystem(() => {
     return NotArrayLiteral;
   }());
 
-  var NotObjectLiteral = (function() {
+  ${expDecl('NotObjectLiteral')} = (function() {
     function NotObjectLiteral() {
     }
     NotObjectLiteral.decorators = [
@@ -265,7 +345,7 @@ runInEachFileSystem(() => {
     return NotObjectLiteral;
   }());
 
-  var NoTypeProperty = (function() {
+  ${expDecl('NoTypeProperty')} = (function() {
     function NoTypeProperty() {
     }
     NoTypeProperty.decorators = [
@@ -275,7 +355,7 @@ runInEachFileSystem(() => {
     return NoTypeProperty;
   }());
 
-  var NotIdentifier = (function() {
+  ${expDecl('NotIdentifier')} = (function() {
     function NotIdentifier() {
     }
     NotIdentifier.decorators = [
@@ -285,17 +365,17 @@ runInEachFileSystem(() => {
     return NotIdentifier;
   }());
 })));`,
-      };
+        };
 
-      INVALID_DECORATOR_ARGS_FILE = {
-        name: _('/invalid_decorator_args.js'),
-        contents: `
+        INVALID_DECORATOR_ARGS_FILE = {
+          name: _('/invalid_decorator_args.js'),
+          contents: `
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core')) :
   typeof define === 'function' && define.amd ? define('invalid_decorator_args', ['exports', '@angular/core'], factory) :
   (factory(global.invalid_decorator_args, global.ng.core));
 }(this, (function (exports,core) { 'use strict';
-  var NoArgsProperty = (function() {
+  ${expDecl('NoArgsProperty')} = (function() {
     function NoArgsProperty() {
     }
     NoArgsProperty.decorators = [
@@ -305,7 +385,7 @@ runInEachFileSystem(() => {
   }());
 
   var args = [{ selector: '[ignored]' },];
-  var NoPropertyAssignment = (function() {
+  ${expDecl('NoPropertyAssignment')} = (function() {
     function NoPropertyAssignment() {
     }
     NoPropertyAssignment.decorators = [
@@ -314,7 +394,7 @@ runInEachFileSystem(() => {
     return NoPropertyAssignment;
   }());
 
-  var NotArrayLiteral = (function() {
+  ${expDecl('NotArrayLiteral')} = (function() {
     function NotArrayLiteral() {
     }
     NotArrayLiteral.decorators = [
@@ -323,17 +403,17 @@ runInEachFileSystem(() => {
     return NotArrayLiteral;
   }());
 })));`,
-      };
+        };
 
-      INVALID_PROP_DECORATORS_FILE = {
-        name: _('/invalid_prop_decorators.js'),
-        contents: `
+        INVALID_PROP_DECORATORS_FILE = {
+          name: _('/invalid_prop_decorators.js'),
+          contents: `
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core')) :
   typeof define === 'function' && define.amd ? define('invalid_prop_decorators', ['exports', '@angular/core'], factory) :
   (factory(global.invalid_prop_decorators, global.ng.core));
 }(this, (function (exports,core) { 'use strict';
-  var NotObjectLiteral = (function() {
+  ${expDecl('NotObjectLiteral')} = (function() {
     function NotObjectLiteral() {
     }
     NotObjectLiteral.propDecorators = () => ({
@@ -342,7 +422,7 @@ runInEachFileSystem(() => {
     return NotObjectLiteral;
   }());
 
-  var NotObjectLiteralProp = (function() {
+  ${expDecl('NotObjectLiteralProp')} = (function() {
     function NotObjectLiteralProp() {
     }
     NotObjectLiteralProp.propDecorators = {
@@ -354,7 +434,7 @@ runInEachFileSystem(() => {
     return NotObjectLiteralProp;
   }());
 
-  var NoTypeProperty = (function() {
+  ${expDecl('NoTypeProperty')} = (function() {
     function NoTypeProperty() {
     }
     NoTypeProperty.propDecorators = {
@@ -366,7 +446,7 @@ runInEachFileSystem(() => {
     return NoTypeProperty;
   }());
 
-  var NotIdentifier = (function() {
+  ${expDecl('NotIdentifier')} = (function() {
     function NotIdentifier() {
     }
     NotIdentifier.propDecorators = {
@@ -378,17 +458,17 @@ runInEachFileSystem(() => {
     return NotIdentifier;
   }());
 })));`,
-      };
+        };
 
-      INVALID_PROP_DECORATOR_ARGS_FILE = {
-        name: _('/invalid_prop_decorator_args.js'),
-        contents: `
+        INVALID_PROP_DECORATOR_ARGS_FILE = {
+          name: _('/invalid_prop_decorator_args.js'),
+          contents: `
   (function (global, factory) {
     typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core')) :
     typeof define === 'function' && define.amd ? define('invalid_prop_decorator_args', ['exports', '@angular/core'], factory) :
     (factory(global.invalid_prop_decorator_args, global.ng.core));
   }(this, (function (exports,core) { 'use strict';
-  var NoArgsProperty = (function() {
+  ${expDecl('NoArgsProperty')} = (function() {
     function NoArgsProperty() {
     }
     NoArgsProperty.propDecorators = {
@@ -398,7 +478,7 @@ runInEachFileSystem(() => {
   }());
 
   var args = [{ selector: '[ignored]' },];
-  var NoPropertyAssignment = (function() {
+  ${expDecl('NoPropertyAssignment')} = (function() {
     function NoPropertyAssignment() {
     }
     NoPropertyAssignment.propDecorators = {
@@ -407,7 +487,7 @@ runInEachFileSystem(() => {
     return NoPropertyAssignment;
   }());
 
-  var NotArrayLiteral = (function() {
+  ${expDecl('NotArrayLiteral')} = (function() {
     function NotArrayLiteral() {
     }
     NotArrayLiteral.propDecorators = {
@@ -416,29 +496,29 @@ runInEachFileSystem(() => {
     return NotArrayLiteral;
   }());
 })));`,
-      };
+        };
 
-      INVALID_CTOR_DECORATORS_FILE = {
-        name: _('/invalid_ctor_decorators.js'),
-        contents: `
+        INVALID_CTOR_DECORATORS_FILE = {
+          name: _('/invalid_ctor_decorators.js'),
+          contents: `
   (function (global, factory) {
     typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core')) :
     typeof define === 'function' && define.amd ? define('invalid_ctor_decorators', ['exports', '@angular/core'], factory) :
     (factory(global.invalid_ctor_decorators,global.ng.core));
   }(this, (function (exports,core) { 'use strict';
-    var NoParameters = (function() {
+    ${expDecl('NoParameters')} = (function() {
     function NoParameters() {}
     return NoParameters;
   }());
 
-  var NotArrayLiteral = (function() {
+  ${expDecl('NotArrayLiteral')} = (function() {
     function NotArrayLiteral(arg1) {
     }
     NotArrayLiteral.ctorParameters = function() { return 'StringsAreNotArrayLiterals'; };
     return NotArrayLiteral;
   }());
 
-  var NotObjectLiteral = (function() {
+  ${expDecl('NotObjectLiteral')} = (function() {
     function NotObjectLiteral(arg1, arg2) {
     }
     NotObjectLiteral.ctorParameters = function() { return [
@@ -448,7 +528,7 @@ runInEachFileSystem(() => {
     return NotObjectLiteral;
   }());
 
-  var NoTypeProperty = (function() {
+  ${expDecl('NoTypeProperty')} = (function() {
     function NoTypeProperty(arg1, arg2) {
     }
     NoTypeProperty.ctorParameters = function() { return [
@@ -463,7 +543,7 @@ runInEachFileSystem(() => {
     return NoTypeProperty;
   }());
 
-  var NotIdentifier = (function() {
+  ${expDecl('NotIdentifier')} = (function() {
     function NotIdentifier(arg1, arg2) {
     }
     NotIdentifier.ctorParameters = function() { return [
@@ -478,17 +558,17 @@ runInEachFileSystem(() => {
     return NotIdentifier;
   }());
 })));`,
-      };
+        };
 
-      INVALID_CTOR_DECORATOR_ARGS_FILE = {
-        name: _('/invalid_ctor_decorator_args.js'),
-        contents: `
+        INVALID_CTOR_DECORATOR_ARGS_FILE = {
+          name: _('/invalid_ctor_decorator_args.js'),
+          contents: `
   (function (global, factory) {
     typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core')) :
     typeof define === 'function' && define.amd ? define('invalid_ctor_decorator_args', ['exports', '@angular/core'], factory) :
     (factory(global.invalid_ctor_decorator_args,global.ng.core));
   }(this, (function (exports,core) { 'use strict';
-    var NoArgsProperty = (function() {
+    ${expDecl('NoArgsProperty')} = (function() {
     function NoArgsProperty(arg1) {
     }
     NoArgsProperty.ctorParameters = function() { return [
@@ -498,7 +578,7 @@ runInEachFileSystem(() => {
   }());
 
   var args = [{ selector: '[ignored]' },];
-  var NoPropertyAssignment = (function() {
+  ${expDecl('NoPropertyAssignment')} = (function() {
     function NoPropertyAssignment(arg1) {
     }
     NoPropertyAssignment.ctorParameters = function() { return [
@@ -507,7 +587,7 @@ runInEachFileSystem(() => {
     return NoPropertyAssignment;
   }());
 
-  var NotArrayLiteral = (function() {
+  ${expDecl('NotArrayLiteral')} = (function() {
     function NotArrayLiteral(arg1) {
     }
     NotArrayLiteral.ctorParameters = function() { return [
@@ -516,34 +596,34 @@ runInEachFileSystem(() => {
     return NotArrayLiteral;
   }());
 })));`,
-      };
+        };
 
-      IMPORTS_FILES = [
-        {
-          name: _('/index.js'),
-          contents: `
+        IMPORTS_FILES = [
+          {
+            name: _('/index.js'),
+            contents: `
           (function (global, factory) {
             typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('./file_a'), require('./file_b'), require('./file_c')) :
             typeof define === 'function' && define.amd ? define('index', ['exports', './file_a', './file_b', './file_c'], factory) :
             (factory(global.index, global.file_a, global.file_b, global.file_c));
           }(this, (function (exports, file_a, file_b, file_c) { 'use strict';
           })));`,
-        },
-        {
-          name: _('/file_a.js'),
-          contents: `
+          },
+          {
+            name: _('/file_a.js'),
+            contents: `
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
   typeof define === 'function' && define.amd ? define('file_a', ['exports'], factory) :
   (factory(global.file_a));
 }(this, (function (exports) { 'use strict';
   var a = 'a';
-  exports.a = a;
+  ${varExp('a')}
 })));`,
-        },
-        {
-          name: _('/file_b.js'),
-          contents: `
+          },
+          {
+            name: _('/file_b.js'),
+            contents: `
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('./file_a')) :
   typeof define === 'function' && define.amd ? define('file_b', ['exports', './file_a'], factory) :
@@ -553,10 +633,10 @@ runInEachFileSystem(() => {
   var c = 'c';
   var d = c;
 })));`,
-        },
-        {
-          name: _('/file_c.js'),
-          contents: `
+          },
+          {
+            name: _('/file_c.js'),
+            contents: `
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('./file_a')) :
   typeof define === 'function' && define.amd ? define('file_c', ['exports', 'file_a'], factory) :
@@ -564,121 +644,146 @@ runInEachFileSystem(() => {
 }(this, function (exports, file_a) { 'use strict';
   var c = file_a.a;
 }));`,
-        },
-      ];
+          },
+        ];
 
-      EXPORTS_FILES = [
-        {
-          name: _('/index.js'),
-          contents: `(function (global, factory) {\n` +
-              `  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('./a_module'), require('./b_module'), require('./wildcard_reexports'), require('./wildcard_reexports_imported_helpers'), require('./wildcard_reexports_with_require'), require('./define_property_reexports')) :\n` +
-              `  typeof define === 'function' && define.amd ? define('index', ['exports', './a_module', './b_module', './wildcard_reexports', './wildcard_reexports_imported_helpers', './wildcard_reexports_with_require', './define_property_reexports'], factory) :\n` +
-              `  (factory(global.index, global.a_module, global.b_module, global.wildcard_reexports, global.wildcard_reexports_imported_helpers, global.wildcard_reexports_with_require, global.define_property_reexports));\n` +
-              `}(this, (function (exports, a_module, b_module, wildcard_reexports, wildcard_reexports_imported_helpers, wildcard_reexports_with_require, define_property_reexports) { 'use strict';\n` +
-              `})));\n`
-        },
-        {
-          name: _('/a_module.js'),
-          contents: `(function (global, factory) {\n` +
-              `  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :\n` +
-              `  typeof define === 'function' && define.amd ? define('a_module', ['exports'], factory) :\n` +
-              `  (factory(global.a_module));\n` +
-              `}(this, (function (exports) { 'use strict';\n` +
-              `  var a = 'a';\n` +
-              `  exports.a = a;\n` +
-              `})));\n`,
-        },
-        {
-          name: _('/b_module.js'),
-          contents: `(function (global, factory) {\n` +
-              `  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('./a_module')) :\n` +
-              `  typeof define === 'function' && define.amd ? define('b_module', ['exports', '@angular/core', './a_module'], factory) :\n` +
-              `  (factory(global.b_module));\n` +
-              `}(this, (function (exports, core, a_module) { 'use strict';\n` +
-              `  var b = a_module.a;\n` +
-              `  var e = 'e';\n` +
-              `  var SomeClass = (function() {\n` +
-              `    function SomeClass() {}\n` +
-              `    return SomeClass;\n` +
-              `  }());\n` +
-              `\n` +
-              `  exports.Directive = core.Directive;\n` +
-              `  exports.a = a_module.a;\n` +
-              `  exports.b = b;\n` +
-              `  exports.c = a_module.a;\n` +
-              `  exports.d = b;\n` +
-              `  exports.e = e;\n` +
-              `  exports.DirectiveX = core.Directive;\n` +
-              `  exports.SomeClass = SomeClass;\n` +
-              `})));\n`,
-        },
-        {
-          name: _('/xtra_module.js'),
-          contents: `(function (global, factory) {\n` +
-              `  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :\n` +
-              `  typeof define === 'function' && define.amd ? define('xtra_module', ['exports'], factory) :\n` +
-              `  (factory(global.xtra_module));\n` +
-              `}(this, (function (exports) { 'use strict';\n` +
-              `  var xtra1 = 'xtra1';\n` +
-              `  var xtra2 = 'xtra2';\n` +
-              `  exports.xtra1 = xtra1;\n` +
-              `  exports.xtra2 = xtra2;\n` +
-              `})));\n`,
-        },
-        {
-          name: _('/wildcard_reexports.js'),
-          contents: `(function (global, factory) {\n` +
-              `  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('./b_module'), require('./xtra_module')) :\n` +
-              `  typeof define === 'function' && define.amd ? define('wildcard_reexports', ['exports', './b_module', './xtra_module'], factory) :\n` +
-              `  (factory(global.wildcard_reexports, b_module, xtra_module));\n` +
-              `}(this, (function (exports, b_module, xtra_module) { 'use strict';\n` +
-              `  function __export(m) {\n` +
-              `    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];\n` +
-              `  }\n` +
-              `  __export(b_module);\n` +
-              `  __export(xtra_module);\n` +
-              `})));\n`,
-        },
-        {
-          name: _('/wildcard_reexports_imported_helpers.js'),
-          contents: `(function (global, factory) {\n` +
-              `  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('tslib'), require('./b_module'), require('./xtra_module')) :\n` +
-              `  typeof define === 'function' && define.amd ? define('wildcard_reexports', ['exports', 'tslib', './b_module', './xtra_module'], factory) :\n` +
-              `  (factory(global.wildcard_reexports_imported_helpers, tslib, b_module, xtra_module));\n` +
-              `}(this, (function (exports, tslib, b_module, xtra_module) { 'use strict';\n` +
-              `  tslib.__exportStar(b_module, exports);\n` +
-              `  tslib.__exportStar(xtra_module, exports);\n` +
-              `})));\n`,
-        },
-        {
-          name: _('/wildcard_reexports_with_require.js'),
-          contents: `(function (global, factory) {\n` +
-              `  typeof exports === 'object' && typeof module !== 'undefined' ? factory(require, exports) :\n` +
-              `  typeof define === 'function' && define.amd ? define('wildcard_reexports_with_require', ['require', 'exports'], factory);\n` +
-              `}(this, (function (require, exports) { 'use strict';\n` +
-              `  function __export(m) {\n` +
-              `    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];\n` +
-              `  }\n` +
-              `  var b_module = require('./b_module');\n` +
-              `  __export(b_module);\n` +
-              `  __export(require('./xtra_module'));\n` +
-              `})));\n`,
-        },
-        {
-          name: _('/define_property_reexports.js'),
-          contents: `(function (global, factory) {\n` +
-              `  typeof exports === 'object' && typeof module !== 'undefined' ? factory(require, exports) :\n` +
-              `  typeof define === 'function' && define.amd ? define('define_property_reexports', ['require', 'exports'], factory);\n` +
-              `}(this, (function (require, exports) { 'use strict';\n` +
-              `var moduleA = require("./a_module");\n` +
-              `Object.defineProperty(exports, "newA", { enumerable: true, get: function () { return moduleA.a; } });\n` +
-              `})));`,
-        },
-      ];
+        EXPORTS_FILES = [
+          {
+            name: _('/index.js'),
+            contents: `(function (global, factory) {\n` +
+                `  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('./a_module'), require('./b_module'), require('./wildcard_reexports'), require('./wildcard_reexports_imported_helpers'), require('./wildcard_reexports_with_require'), require('./define_property_reexports')) :\n` +
+                `  typeof define === 'function' && define.amd ? define('index', ['exports', './a_module', './b_module', './wildcard_reexports', './wildcard_reexports_imported_helpers', './wildcard_reexports_with_require', './define_property_reexports'], factory) :\n` +
+                `  (factory(global.index, global.a_module, global.b_module, global.wildcard_reexports, global.wildcard_reexports_imported_helpers, global.wildcard_reexports_with_require, global.define_property_reexports));\n` +
+                `}(this, (function (exports, a_module, b_module, wildcard_reexports, wildcard_reexports_imported_helpers, wildcard_reexports_with_require, define_property_reexports) { 'use strict';\n` +
+                `})));\n`
+          },
+          {
+            name: _('/a_module.js'),
+            contents: `(function (global, factory) {\n` +
+                `  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :\n` +
+                `  typeof define === 'function' && define.amd ? define('a_module', ['exports'], factory) :\n` +
+                `  (factory(global.a_module));\n` +
+                `}(this, (function (exports) { 'use strict';\n` +
+                `  var a = 'a';\n` +
+                `  exports.a = a;\n` +
+                `})));\n`,
+          },
+          {
+            name: _('/b_module.js'),
+            contents: `(function (global, factory) {\n` +
+                `  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('./a_module')) :\n` +
+                `  typeof define === 'function' && define.amd ? define('b_module', ['exports', '@angular/core', './a_module'], factory) :\n` +
+                `  (factory(global.b_module));\n` +
+                `}(this, (function (exports, core, a_module) { 'use strict';\n` +
+                `  var b = a_module.a;\n` +
+                `  var e = 'e';\n` +
+                `  var SomeClass = (function() {\n` +
+                `    function SomeClass() {}\n` +
+                `    return SomeClass;\n` +
+                `  }());\n` +
+                `\n` +
+                `  exports.Directive = core.Directive;\n` +
+                `  exports.a = a_module.a;\n` +
+                `  exports.b = b;\n` +
+                `  exports.c = a_module.a;\n` +
+                `  exports.d = b;\n` +
+                `  exports.e = e;\n` +
+                `  exports.DirectiveX = core.Directive;\n` +
+                `  var SomeClass_1;\n` +
+                `  exports.SomeClass = SomeClass_1 = SomeClass;\n` +
+                `})));\n`,
+          },
+          {
+            name: _('/xtra_module.js'),
+            contents: `(function (global, factory) {\n` +
+                `  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :\n` +
+                `  typeof define === 'function' && define.amd ? define('xtra_module', ['exports'], factory) :\n` +
+                `  (factory(global.xtra_module));\n` +
+                `}(this, (function (exports) { 'use strict';\n` +
+                `  var xtra1 = 'xtra1';\n` +
+                `  var xtra2 = 'xtra2';\n` +
+                `  exports.xtra1 = xtra1;\n` +
+                `  exports.xtra2 = xtra2;\n` +
+                `})));\n`,
+          },
+          {
+            name: _('/wildcard_reexports.js'),
+            contents: `(function (global, factory) {\n` +
+                `  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('./b_module'), require('./xtra_module')) :\n` +
+                `  typeof define === 'function' && define.amd ? define('wildcard_reexports', ['exports', './b_module', './xtra_module'], factory) :\n` +
+                `  (factory(global.wildcard_reexports, b_module, xtra_module));\n` +
+                `}(this, (function (exports, b_module, xtra_module) { 'use strict';\n` +
+                `  function __export(m) {\n` +
+                `    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];\n` +
+                `  }\n` +
+                `  __export(b_module);\n` +
+                `  __export(xtra_module);\n` +
+                `})));\n`,
+          },
+          {
+            name: _('/wildcard_reexports_imported_helpers.js'),
+            contents: `(function (global, factory) {\n` +
+                `  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('tslib'), require('./b_module'), require('./xtra_module')) :\n` +
+                `  typeof define === 'function' && define.amd ? define('wildcard_reexports', ['exports', 'tslib', './b_module', './xtra_module'], factory) :\n` +
+                `  (factory(global.wildcard_reexports_imported_helpers, tslib, b_module, xtra_module));\n` +
+                `}(this, (function (exports, tslib, b_module, xtra_module) { 'use strict';\n` +
+                `  tslib.__exportStar(b_module, exports);\n` +
+                `  tslib.__exportStar(xtra_module, exports);\n` +
+                `})));\n`,
+          },
+          {
+            name: _('/wildcard_reexports_with_require.js'),
+            contents: `(function (global, factory) {\n` +
+                `  typeof exports === 'object' && typeof module !== 'undefined' ? factory(require, exports) :\n` +
+                `  typeof define === 'function' && define.amd ? define('wildcard_reexports_with_require', ['require', 'exports'], factory);\n` +
+                `}(this, (function (require, exports) { 'use strict';\n` +
+                `  function __export(m) {\n` +
+                `    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];\n` +
+                `  }\n` +
+                `  var b_module = require('./b_module');\n` +
+                `  __export(b_module);\n` +
+                `  __export(require('./xtra_module'));\n` +
+                `})));\n`,
+          },
+          {
+            name: _('/define_property_reexports.js'),
+            contents: `(function (global, factory) {\n` +
+                `  typeof exports === 'object' && typeof module !== 'undefined' ? factory(require, exports) :\n` +
+                `  typeof define === 'function' && define.amd ? define('define_property_reexports', ['require', 'exports'], factory);\n` +
+                `}(this, (function (require, exports) { 'use strict';\n` +
+                `var moduleA = require("./a_module");\n` +
+                `Object.defineProperty(exports, "newA", { enumerable: true, get: function () { return moduleA.a; } });\n` +
+                `})));`,
+          },
+          {
+            name: _('/decorated_class.js'),
+            contents: `(function (global, factory) {\n` +
+                `  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :\n` +
+                `  typeof define === 'function' && define.amd ? define('decorated_class', ['exports'], factory) :\n` +
+                `  (factory(global.decorated_class));\n` +
+                `}(this, (function (exports) { 'use strict';\n` +
+                `var DecoratedClass_1;\n` +
+                `\n` +
+                `exports.DecoratedClass = DecoratedClass_1 = (function() {\n` +
+                `  function DecoratedClass() {\n` +
+                `  }\n` +
+                `  return DecoratedClass;\n` +
+                `}());\n` +
+                `\n` +
+                `exports.DecoratedClass = DecoratedClass_1 = __decorate([\n` +
+                `  SomeDecorator([ej2AngularBase.ComponentBase, ej2AngularBase.FormBase]),\n` +
+                `  __metadata("design:paramtypes", [core.ElementRef,\n` +
+                `      core.Renderer2,\n` +
+                `      core.ViewContainerRef,\n` +
+                `      core.Injector])\n` +
+                `], exports.DecoratedClass);\n` +
+                `})));\n`,
+          }
+        ];
 
-      FUNCTION_BODY_FILE = {
-        name: _('/function_body.js'),
-        contents: `
+        FUNCTION_BODY_FILE = {
+          name: _('/function_body.js'),
+          contents: `
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
   typeof define === 'function' && define.amd ? define('function_body', ['exports'], factory) :
@@ -716,67 +821,67 @@ runInEachFileSystem(() => {
     return x;
   }
 })));`
-      };
+        };
 
-      DECORATED_FILES = [
-        {
-          name: _('/primary.js'),
-          contents: `
+        DECORATED_FILES = [
+          {
+            name: _('/primary.js'),
+            contents: `
     (function (global, factory) {
       typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('./secondary')) :
       typeof define === 'function' && define.amd ? define('primary', ['exports', '@angular/core', './secondary'], factory) :
       (factory(global.primary,global.ng.core, global.secondary));
     }(this, (function (exports,core,secondary) { 'use strict';
-    var A = (function() {
+    ${expDecl('A')} = (function() {
       function A() {}
       A.decorators = [
         { type: core.Directive, args: [{ selector: '[a]' }] }
       ];
       return A;
     }());
-     var B = (function() {
+    var B = (function() {
       function B() {}
       B.decorators = [
         { type: core.Directive, args: [{ selector: '[b]' }] }
       ];
       return B;
     }());
-     function x() {}
-     function y() {}
-     var C = (function() {
+    function x() {}
+    function y() {}
+    ${expDecl('C')} = (function() {
       function C() {}
       return C;
     });
-    exports.A = A;
+    ${varExp('A')}
     exports.x = x;
-    exports.C = C;
+    ${varExp('C')}
     })));`
-        },
-        {
-          name: _('/secondary.js'),
-          contents: `
+          },
+          {
+            name: _('/secondary.js'),
+            contents: `
     (function (global, factory) {
       typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core')) :
       typeof define === 'function' && define.amd ? define('primary', ['exports', '@angular/core'], factory) :
       (factory(global.primary,global.ng.core));
     }(this, (function (exports,core) { 'use strict';
-    var D = (function() {
+    ${expDecl('D')} = (function() {
       function D() {}
       D.decorators = [
         { type: core.Directive, args: [{ selector: '[d]' }] }
       ];
       return D;
     }());
-    exports.D = D;
+    ${varExp('D')}
   })));
     `
-        }
-      ];
+          }
+        ];
 
-      TYPINGS_SRC_FILES = [
-        {
-          name: _('/ep/src/index.js'),
-          contents: `
+        TYPINGS_SRC_FILES = [
+          {
+            name: _('/ep/src/index.js'),
+            contents: `
     (function (global, factory) {
       typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('./internal'), require('./class1'), require('./class2'), require('./missing-class'), require('./flat-file'), require('./func1')) :
       typeof define === 'function' && define.amd ? define('index', ['exports', './internal', './class1', './class2', './missing-class', './flat-file', './func1'], factory) :
@@ -790,98 +895,111 @@ runInEachFileSystem(() => {
       __export(class2);
     })));
     `
-        },
-        {
-          name: _('/ep/src/class1.js'),
-          contents: `
+          },
+          {
+            name: _('/ep/src/class1.js'),
+            contents: `
     (function (global, factory) {
       typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
       typeof define === 'function' && define.amd ? define('class1', ['exports'], factory) :
       (factory(global.class1));
     }(this, (function (exports) { 'use strict';
-      var Class1 = (function() {
+      ${expDecl('Class1')} = (function() {
         function Class1() {}
         return Class1;
       }());
-      var MissingClass1 = (function() {
+      ${expDecl('MissingClass1')} = (function() {
         function MissingClass1() {}
         return MissingClass1;
       }());
-      exports.Class1 = Class1;
-      exports.MissingClass1 = MissingClass1;
+      ${varExp('Class1')}
+      ${varExp('MissingClass1')}
     })));
     `
-        },
-        {
-          name: _('/ep/src/class2.js'),
-          contents: `
+          },
+          {
+            name: _('/ep/src/class2.js'),
+            contents: `
     (function (global, factory) {
       typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
       typeof define === 'function' && define.amd ? define('class2', ['exports'], factory) :
       (factory(global.class2));
     }(this, (function (exports) { 'use strict';
-      var Class2 = (function() {
+      ${expDecl('Class2')} = (function() {
         function Class2() {}
         return Class2;
       }());
-      exports.Class2 = Class2;
+      ${varExp('Class2')}
     })));
     `
-        },
-        {name: _('/ep/src/func1.js'), contents: 'function mooFn() {} export {mooFn}'}, {
-          name: _('/ep/src/internal.js'),
-          contents: `
+          },
+          {
+            name: _('/ep/src/func1.js'),
+            contents: `
+    (function (global, factory) {
+      typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
+      typeof define === 'function' && define.amd ? define('internal', ['exports'], factory) :
+      (factory(global.internal));
+    }(this, (function (exports) { 'use strict';
+      function mooFn() {}
+      exports.mooFn = mooFn;
+    })));
+    `
+          },
+          {
+            name: _('/ep/src/internal.js'),
+            contents: `
     (function (global, factory) {
       typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
       typeof define === 'function' && define.amd ? define('internal', ['exports'], factory) :
       (factory(global.internal));
     }(this, (function (exports) { 'use strict';
-      var InternalClass = (function() {
+      ${expDecl('InternalClass')} = (function() {
         function InternalClass() {}
         return InternalClass;
       }());
-      var Class2 = (function() {
+      ${expDecl('Class2')} = (function() {
         function Class2() {}
         return Class2;
       }());
-      exports.InternalClass =InternalClass;
-      exports.Class2 = Class2;
+      ${varExp('InternalClass')}
+      ${varExp('Class2')}
     })));
     `
-        },
-        {
-          name: _('/ep/src/missing-class.js'),
-          contents: `
+          },
+          {
+            name: _('/ep/src/missing-class.js'),
+            contents: `
     (function (global, factory) {
       typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
       typeof define === 'function' && define.amd ? define('missingClass', ['exports'], factory) :
       (factory(global.missingClass));
     }(this, (function (exports) { 'use strict';
-      var MissingClass2 = (function() {
+      ${expDecl('MissingClass2')} = (function() {
         function MissingClass2() {}
         return MissingClass2;
       }());
       exports. MissingClass2 = MissingClass2;
     })));
     `
-        },
-        {
-          name: _('/ep/src/flat-file.js'),
-          contents: `
+          },
+          {
+            name: _('/ep/src/flat-file.js'),
+            contents: `
     (function (global, factory) {
       typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
       typeof define === 'function' && define.amd ? define('missingClass', ['exports'], factory) :
       (factory(global.missingClass));
     }(this, (function (exports) { 'use strict';
-      var Class1 = (function() {
+      ${expDecl('Class1')} = (function() {
         function Class1() {}
         return Class1;
       }());
-      var MissingClass1 = (function() {
+      ${expDecl('MissingClass1')} = (function() {
         function MissingClass1() {}
         return MissingClass1;
       }());
-      var MissingClass2 = (function() {
+      ${expDecl('MissingClass2')} = (function() {
         function MissingClass2() {}
         return MissingClass2;
       }());
@@ -889,361 +1007,377 @@ runInEachFileSystem(() => {
         function SourceClass() {}
         return SourceClass;
       }());
-    exports.Class1 = Class1;
+      ${varExp('Class1')}
       exports.AliasedClass = SourceClass;
-      exports.MissingClass1 = MissingClass1;
-      exports.MissingClass2 = MissingClass2;
+      ${varExp('MissingClass1')}
+      ${varExp('MissingClass2')}
     })));
     `
-        }
-      ];
+          }
+        ];
 
-      TYPINGS_DTS_FILES = [
-        {
-          name: _('/ep/typings/index.d.ts'),
-          contents: `
+        TYPINGS_DTS_FILES = [
+          {
+            name: _('/ep/typings/index.d.ts'),
+            contents: `
             import '../../an_external_lib/index';
             import {InternalClass} from './internal';
             import {mooFn} from './func1';
             export * from './class1';
             export * from './class2';
             `
-        },
-        {
-          name: _('/ep/typings/class1.d.ts'),
-          contents: `export declare class Class1 {}\nexport declare class OtherClass {}`
-        },
-        {
-          name: _('/ep/typings/class2.d.ts'),
-          contents: `
+          },
+          {
+            name: _('/ep/typings/class1.d.ts'),
+            contents: `export declare class Class1 {}\nexport declare class OtherClass {}`
+          },
+          {
+            name: _('/ep/typings/class2.d.ts'),
+            contents: `
             export declare class Class2 {}
             export declare interface SomeInterface {}
             export {TypingsClass as AliasedClass} from './typings-class';
           `
-        },
-        {name: _('/ep/typings/func1.d.ts'), contents: 'export declare function mooFn(): void;'},
-        {
-          name: _('/ep/typings/internal.d.ts'),
-          contents: `export declare class InternalClass {}\nexport declare class Class2 {}`
-        },
-        {
-          name: _('/ep/typings/typings-class.d.ts'),
-          contents: `export declare class TypingsClass {}`
-        },
-        {name: _('/ep/typings/shadow-class.d.ts'), contents: `export declare class ShadowClass {}`},
-        {name: _('/an_external_lib/index.d.ts'), contents: 'export declare class ShadowClass {}'},
-      ];
-    });
-
-    describe('getDecoratorsOfDeclaration()', () => {
-      it('should find the decorators on a class', () => {
-        loadTestFiles([SOME_DIRECTIVE_FILE]);
-        const bundle = makeTestBundleProgram(SOME_DIRECTIVE_FILE.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const classNode = getDeclaration(
-            bundle.program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedVariableDeclaration);
-        const decorators = host.getDecoratorsOfDeclaration(classNode)!;
-
-        expect(decorators).toBeDefined();
-        expect(decorators.length).toEqual(1);
-
-        const decorator = decorators[0];
-        expect(decorator.name).toEqual('Directive');
-        expect(decorator.import).toEqual({name: 'Directive', from: '@angular/core'});
-        expect(decorator.args!.map(arg => arg.getText())).toEqual([
-          '{ selector: \'[someDirective]\' }',
-        ]);
-      });
-
-      it('should find the decorators on a class at the top level', () => {
-        loadTestFiles([TOPLEVEL_DECORATORS_FILE]);
-        const bundle = makeTestBundleProgram(TOPLEVEL_DECORATORS_FILE.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const classNode = getDeclaration(
-            bundle.program, TOPLEVEL_DECORATORS_FILE.name, 'SomeDirective',
-            isNamedVariableDeclaration);
-        const decorators = host.getDecoratorsOfDeclaration(classNode)!;
-
-        expect(decorators).toBeDefined();
-        expect(decorators.length).toEqual(1);
-
-        const decorator = decorators[0];
-        expect(decorator.name).toEqual('Directive');
-        expect(decorator.import).toEqual({name: 'Directive', from: '@angular/core'});
-        expect(decorator.args!.map(arg => arg.getText())).toEqual([
-          '{ selector: \'[someDirective]\' }',
-        ]);
-      });
-
-      it('should return null if the symbol is not a class', () => {
-        loadTestFiles([FOO_FUNCTION_FILE]);
-        const bundle = makeTestBundleProgram(FOO_FUNCTION_FILE.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const functionNode = getDeclaration(
-            bundle.program, FOO_FUNCTION_FILE.name, 'foo', isNamedFunctionDeclaration);
-        const decorators = host.getDecoratorsOfDeclaration(functionNode);
-        expect(decorators).toBe(null);
-      });
-
-      it('should return null if there are no decorators', () => {
-        loadTestFiles([SIMPLE_CLASS_FILE]);
-        const bundle = makeTestBundleProgram(SIMPLE_CLASS_FILE.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const classNode = getDeclaration(
-            bundle.program, SIMPLE_CLASS_FILE.name, 'EmptyClass', isNamedVariableDeclaration);
-        const decorators = host.getDecoratorsOfDeclaration(classNode);
-        expect(decorators).toBe(null);
-      });
-
-      it('should ignore `decorators` if it is not an array literal', () => {
-        loadTestFiles([INVALID_DECORATORS_FILE]);
-        const bundle = makeTestBundleProgram(INVALID_DECORATORS_FILE.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const classNode = getDeclaration(
-            bundle.program, INVALID_DECORATORS_FILE.name, 'NotArrayLiteral',
-            isNamedVariableDeclaration);
-        const decorators = host.getDecoratorsOfDeclaration(classNode);
-        expect(decorators).toEqual([]);
-      });
-
-      it('should ignore decorator elements that are not object literals', () => {
-        loadTestFiles([INVALID_DECORATORS_FILE]);
-        const bundle = makeTestBundleProgram(INVALID_DECORATORS_FILE.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const classNode = getDeclaration(
-            bundle.program, INVALID_DECORATORS_FILE.name, 'NotObjectLiteral',
-            isNamedVariableDeclaration);
-        const decorators = host.getDecoratorsOfDeclaration(classNode)!;
-
-        expect(decorators.length).toBe(1);
-        expect(decorators[0]).toEqual(jasmine.objectContaining({name: 'Directive'}));
+          },
+          {name: _('/ep/typings/func1.d.ts'), contents: 'export declare function mooFn(): void;'},
+          {
+            name: _('/ep/typings/internal.d.ts'),
+            contents: `export declare class InternalClass {}\nexport declare class Class2 {}`
+          },
+          {
+            name: _('/ep/typings/typings-class.d.ts'),
+            contents: `export declare class TypingsClass {}`
+          },
+          {
+            name: _('/ep/typings/shadow-class.d.ts'),
+            contents: `export declare class ShadowClass {}`
+          },
+          {name: _('/an_external_lib/index.d.ts'), contents: 'export declare class ShadowClass {}'},
+        ];
       });
 
-      it('should ignore decorator elements that have no `type` property', () => {
-        loadTestFiles([INVALID_DECORATORS_FILE]);
-        const bundle = makeTestBundleProgram(INVALID_DECORATORS_FILE.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const classNode = getDeclaration(
-            bundle.program, INVALID_DECORATORS_FILE.name, 'NoTypeProperty',
-            isNamedVariableDeclaration);
-        const decorators = host.getDecoratorsOfDeclaration(classNode)!;
-
-        expect(decorators.length).toBe(1);
-        expect(decorators[0]).toEqual(jasmine.objectContaining({name: 'Directive'}));
-      });
+      describe('getDecoratorsOfDeclaration()', () => {
+        it('should find the decorators on a class', () => {
+          loadTestFiles([SOME_DIRECTIVE_FILE]);
+          const bundle = makeTestBundleProgram(SOME_DIRECTIVE_FILE.name);
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const classNode = getDeclaration(
+              bundle.program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isDesiredDeclaration);
+          const decorators = host.getDecoratorsOfDeclaration(classNode)!;
 
-      it('should ignore decorator elements whose `type` value is not an identifier', () => {
-        loadTestFiles([INVALID_DECORATORS_FILE]);
-        const bundle = makeTestBundleProgram(INVALID_DECORATORS_FILE.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const classNode = getDeclaration(
-            bundle.program, INVALID_DECORATORS_FILE.name, 'NotIdentifier',
-            isNamedVariableDeclaration);
-        const decorators = host.getDecoratorsOfDeclaration(classNode)!;
+          expect(decorators).toBeDefined();
+          expect(decorators.length).toEqual(1);
 
-        expect(decorators.length).toBe(1);
-        expect(decorators[0]).toEqual(jasmine.objectContaining({name: 'Directive'}));
-      });
+          const decorator = decorators[0];
+          expect(decorator.name).toEqual('Directive');
+          expect(decorator.import).toEqual({name: 'Directive', from: '@angular/core'});
+          expect(decorator.args!.map(arg => arg.getText())).toEqual([
+            '{ selector: \'[someDirective]\' }',
+          ]);
+        });
 
-      it('should have import information on decorators', () => {
-        loadTestFiles([SOME_DIRECTIVE_FILE]);
-        const bundle = makeTestBundleProgram(SOME_DIRECTIVE_FILE.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+        it('should find the decorators on a class at the top level', () => {
+          loadTestFiles([TOPLEVEL_DECORATORS_FILE]);
+          const bundle = makeTestBundleProgram(TOPLEVEL_DECORATORS_FILE.name);
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const classNode = getDeclaration(
+              bundle.program, TOPLEVEL_DECORATORS_FILE.name, 'SomeDirective', isDesiredDeclaration);
+          const decorators = host.getDecoratorsOfDeclaration(classNode)!;
 
-        const classNode = getDeclaration(
-            bundle.program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedVariableDeclaration);
-        const decorators = host.getDecoratorsOfDeclaration(classNode)!;
+          expect(decorators).toBeDefined();
+          expect(decorators.length).toEqual(1);
 
-        expect(decorators.length).toEqual(1);
-        expect(decorators[0].import).toEqual({name: 'Directive', from: '@angular/core'});
-      });
+          const decorator = decorators[0];
+          expect(decorator.name).toEqual('Directive');
+          expect(decorator.import).toEqual({name: 'Directive', from: '@angular/core'});
+          expect(decorator.args!.map(arg => arg.getText())).toEqual([
+            '{ selector: \'[someDirective]\' }',
+          ]);
+        });
 
-      it('should find decorated members on a class at the top level', () => {
-        loadTestFiles([TOPLEVEL_DECORATORS_FILE]);
-        const bundle = makeTestBundleProgram(TOPLEVEL_DECORATORS_FILE.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const classNode = getDeclaration(
-            bundle.program, TOPLEVEL_DECORATORS_FILE.name, 'SomeDirective',
-            isNamedVariableDeclaration);
-        const members = host.getMembersOfClass(classNode);
+        it('should return null if the symbol is not a class', () => {
+          loadTestFiles([FOO_FUNCTION_FILE]);
+          const bundle = makeTestBundleProgram(FOO_FUNCTION_FILE.name);
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const functionNode = getDeclaration(
+              bundle.program, FOO_FUNCTION_FILE.name, 'foo', isNamedFunctionDeclaration);
+          const decorators = host.getDecoratorsOfDeclaration(functionNode);
+          expect(decorators).toBe(null);
+        });
 
-        const input1 = members.find(member => member.name === 'input1')!;
-        expect(input1.kind).toEqual(ClassMemberKind.Property);
-        expect(input1.isStatic).toEqual(false);
-        expect(input1.decorators!.map(d => d.name)).toEqual(['Input']);
+        it('should return null if there are no decorators', () => {
+          loadTestFiles([SIMPLE_CLASS_FILE]);
+          const bundle = makeTestBundleProgram(SIMPLE_CLASS_FILE.name);
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const classNode = getDeclaration(
+              bundle.program, SIMPLE_CLASS_FILE.name, 'EmptyClass', isDesiredDeclaration);
+          const decorators = host.getDecoratorsOfDeclaration(classNode);
+          expect(decorators).toBe(null);
+        });
 
-        const input2 = members.find(member => member.name === 'input2')!;
-        expect(input2.kind).toEqual(ClassMemberKind.Property);
-        expect(input2.isStatic).toEqual(false);
-        expect(input1.decorators!.map(d => d.name)).toEqual(['Input']);
-      });
+        it('should ignore `decorators` if it is not an array literal', () => {
+          loadTestFiles([INVALID_DECORATORS_FILE]);
+          const bundle = makeTestBundleProgram(INVALID_DECORATORS_FILE.name);
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const classNode = getDeclaration(
+              bundle.program, INVALID_DECORATORS_FILE.name, 'NotArrayLiteral',
+              isDesiredDeclaration);
+          const decorators = host.getDecoratorsOfDeclaration(classNode);
+          expect(decorators).toEqual([]);
+        });
 
-      describe('(returned decorators `args`)', () => {
-        it('should be an empty array if decorator has no `args` property', () => {
-          loadTestFiles([INVALID_DECORATOR_ARGS_FILE]);
-          const bundle = makeTestBundleProgram(INVALID_DECORATOR_ARGS_FILE.name);
+        it('should ignore decorator elements that are not object literals', () => {
+          loadTestFiles([INVALID_DECORATORS_FILE]);
+          const bundle = makeTestBundleProgram(INVALID_DECORATORS_FILE.name);
           const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
           const classNode = getDeclaration(
-              bundle.program, INVALID_DECORATOR_ARGS_FILE.name, 'NoArgsProperty',
-              isNamedVariableDeclaration);
+              bundle.program, INVALID_DECORATORS_FILE.name, 'NotObjectLiteral',
+              isDesiredDeclaration);
           const decorators = host.getDecoratorsOfDeclaration(classNode)!;
 
           expect(decorators.length).toBe(1);
-          expect(decorators[0].name).toBe('Directive');
-          expect(decorators[0].args).toEqual([]);
+          expect(decorators[0]).toEqual(jasmine.objectContaining({name: 'Directive'}));
         });
 
-        it('should be an empty array if decorator\'s `args` has no property assignment', () => {
-          loadTestFiles([INVALID_DECORATOR_ARGS_FILE]);
-          const bundle = makeTestBundleProgram(INVALID_DECORATOR_ARGS_FILE.name);
+        it('should ignore decorator elements that have no `type` property', () => {
+          loadTestFiles([INVALID_DECORATORS_FILE]);
+          const bundle = makeTestBundleProgram(INVALID_DECORATORS_FILE.name);
           const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
           const classNode = getDeclaration(
-              bundle.program, INVALID_DECORATOR_ARGS_FILE.name, 'NoPropertyAssignment',
-              isNamedVariableDeclaration);
+              bundle.program, INVALID_DECORATORS_FILE.name, 'NoTypeProperty', isDesiredDeclaration);
           const decorators = host.getDecoratorsOfDeclaration(classNode)!;
 
           expect(decorators.length).toBe(1);
-          expect(decorators[0].name).toBe('Directive');
-          expect(decorators[0].args).toEqual([]);
+          expect(decorators[0]).toEqual(jasmine.objectContaining({name: 'Directive'}));
         });
 
-        it('should be an empty array if `args` property value is not an array literal', () => {
-          loadTestFiles([INVALID_DECORATOR_ARGS_FILE]);
-          const bundle = makeTestBundleProgram(INVALID_DECORATOR_ARGS_FILE.name);
+        it('should ignore decorator elements whose `type` value is not an identifier', () => {
+          loadTestFiles([INVALID_DECORATORS_FILE]);
+          const bundle = makeTestBundleProgram(INVALID_DECORATORS_FILE.name);
           const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
           const classNode = getDeclaration(
-              bundle.program, INVALID_DECORATOR_ARGS_FILE.name, 'NotArrayLiteral',
-              isNamedVariableDeclaration);
+              bundle.program, INVALID_DECORATORS_FILE.name, 'NotIdentifier', isDesiredDeclaration);
           const decorators = host.getDecoratorsOfDeclaration(classNode)!;
 
           expect(decorators.length).toBe(1);
-          expect(decorators[0].name).toBe('Directive');
-          expect(decorators[0].args).toEqual([]);
+          expect(decorators[0]).toEqual(jasmine.objectContaining({name: 'Directive'}));
         });
-      });
-    });
 
-    describe('getMembersOfClass()', () => {
-      it('should find decorated members on a class', () => {
-        loadTestFiles([SOME_DIRECTIVE_FILE]);
-        const bundle = makeTestBundleProgram(SOME_DIRECTIVE_FILE.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const classNode = getDeclaration(
-            bundle.program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedVariableDeclaration);
-        const members = host.getMembersOfClass(classNode);
+        it('should have import information on decorators', () => {
+          loadTestFiles([SOME_DIRECTIVE_FILE]);
+          const bundle = makeTestBundleProgram(SOME_DIRECTIVE_FILE.name);
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
 
-        const input1 = members.find(member => member.name === 'input1')!;
-        expect(input1.kind).toEqual(ClassMemberKind.Property);
-        expect(input1.isStatic).toEqual(false);
-        expect(input1.decorators!.map(d => d.name)).toEqual(['Input']);
+          const classNode = getDeclaration(
+              bundle.program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isDesiredDeclaration);
+          const decorators = host.getDecoratorsOfDeclaration(classNode)!;
 
-        const input2 = members.find(member => member.name === 'input2')!;
-        expect(input2.kind).toEqual(ClassMemberKind.Property);
-        expect(input2.isStatic).toEqual(false);
-        expect(input1.decorators!.map(d => d.name)).toEqual(['Input']);
-      });
+          expect(decorators.length).toEqual(1);
+          expect(decorators[0].import).toEqual({name: 'Directive', from: '@angular/core'});
+        });
 
-      it('should find non decorated properties on a class', () => {
-        loadTestFiles([SOME_DIRECTIVE_FILE]);
-        const bundle = makeTestBundleProgram(SOME_DIRECTIVE_FILE.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const classNode = getDeclaration(
-            bundle.program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedVariableDeclaration);
-        const members = host.getMembersOfClass(classNode);
+        it('should find decorated members on a class at the top level', () => {
+          loadTestFiles([TOPLEVEL_DECORATORS_FILE]);
+          const bundle = makeTestBundleProgram(TOPLEVEL_DECORATORS_FILE.name);
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const classNode = getDeclaration(
+              bundle.program, TOPLEVEL_DECORATORS_FILE.name, 'SomeDirective', isDesiredDeclaration);
+          const members = host.getMembersOfClass(classNode);
+
+          const input1 = members.find(member => member.name === 'input1')!;
+          expect(input1.kind).toEqual(ClassMemberKind.Property);
+          expect(input1.isStatic).toEqual(false);
+          expect(input1.decorators!.map(d => d.name)).toEqual(['Input']);
+
+          const input2 = members.find(member => member.name === 'input2')!;
+          expect(input2.kind).toEqual(ClassMemberKind.Property);
+          expect(input2.isStatic).toEqual(false);
+          expect(input1.decorators!.map(d => d.name)).toEqual(['Input']);
+        });
 
-        const instanceProperty = members.find(member => member.name === 'instanceProperty')!;
-        expect(instanceProperty.kind).toEqual(ClassMemberKind.Property);
-        expect(instanceProperty.isStatic).toEqual(false);
-        expect(ts.isBinaryExpression(instanceProperty.implementation!)).toEqual(true);
-        expect(instanceProperty.value!.getText()).toEqual(`'instance'`);
-      });
+        describe('(returned decorators `args`)', () => {
+          it('should be an empty array if decorator has no `args` property', () => {
+            loadTestFiles([INVALID_DECORATOR_ARGS_FILE]);
+            const bundle = makeTestBundleProgram(INVALID_DECORATOR_ARGS_FILE.name);
+            const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+            const classNode = getDeclaration(
+                bundle.program, INVALID_DECORATOR_ARGS_FILE.name, 'NoArgsProperty',
+                isDesiredDeclaration);
+            const decorators = host.getDecoratorsOfDeclaration(classNode)!;
+
+            expect(decorators.length).toBe(1);
+            expect(decorators[0].name).toBe('Directive');
+            expect(decorators[0].args).toEqual([]);
+          });
 
-      it('should find static methods on a class', () => {
-        loadTestFiles([SOME_DIRECTIVE_FILE]);
-        const bundle = makeTestBundleProgram(SOME_DIRECTIVE_FILE.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const classNode = getDeclaration(
-            bundle.program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedVariableDeclaration);
-        const members = host.getMembersOfClass(classNode);
+          it('should be an empty array if decorator\'s `args` has no property assignment', () => {
+            loadTestFiles([INVALID_DECORATOR_ARGS_FILE]);
+            const bundle = makeTestBundleProgram(INVALID_DECORATOR_ARGS_FILE.name);
+            const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+            const classNode = getDeclaration(
+                bundle.program, INVALID_DECORATOR_ARGS_FILE.name, 'NoPropertyAssignment',
+                isDesiredDeclaration);
+            const decorators = host.getDecoratorsOfDeclaration(classNode)!;
+
+            expect(decorators.length).toBe(1);
+            expect(decorators[0].name).toBe('Directive');
+            expect(decorators[0].args).toEqual([]);
+          });
 
-        const staticMethod = members.find(member => member.name === 'staticMethod')!;
-        expect(staticMethod.kind).toEqual(ClassMemberKind.Method);
-        expect(staticMethod.isStatic).toEqual(true);
-        expect(ts.isFunctionExpression(staticMethod.implementation!)).toEqual(true);
+          it('should be an empty array if `args` property value is not an array literal', () => {
+            loadTestFiles([INVALID_DECORATOR_ARGS_FILE]);
+            const bundle = makeTestBundleProgram(INVALID_DECORATOR_ARGS_FILE.name);
+            const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+            const classNode = getDeclaration(
+                bundle.program, INVALID_DECORATOR_ARGS_FILE.name, 'NotArrayLiteral',
+                isDesiredDeclaration);
+            const decorators = host.getDecoratorsOfDeclaration(classNode)!;
+
+            expect(decorators.length).toBe(1);
+            expect(decorators[0].name).toBe('Directive');
+            expect(decorators[0].args).toEqual([]);
+          });
+        });
       });
 
-      it('should find static properties on a class', () => {
-        loadTestFiles([SOME_DIRECTIVE_FILE]);
-        const bundle = makeTestBundleProgram(SOME_DIRECTIVE_FILE.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const classNode = getDeclaration(
-            bundle.program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedVariableDeclaration);
-        const members = host.getMembersOfClass(classNode);
+      describe('getMembersOfClass()', () => {
+        it('should find decorated members on a class', () => {
+          loadTestFiles([SOME_DIRECTIVE_FILE]);
+          const bundle = makeTestBundleProgram(SOME_DIRECTIVE_FILE.name);
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const classNode = getDeclaration(
+              bundle.program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isDesiredDeclaration);
+          const members = host.getMembersOfClass(classNode);
+
+          const input1 = members.find(member => member.name === 'input1')!;
+          expect(input1.kind).toEqual(ClassMemberKind.Property);
+          expect(input1.isStatic).toEqual(false);
+          expect(input1.decorators!.map(d => d.name)).toEqual(['Input']);
+
+          const input2 = members.find(member => member.name === 'input2')!;
+          expect(input2.kind).toEqual(ClassMemberKind.Property);
+          expect(input2.isStatic).toEqual(false);
+          expect(input1.decorators!.map(d => d.name)).toEqual(['Input']);
+        });
 
-        const staticProperty = members.find(member => member.name === 'staticProperty')!;
-        expect(staticProperty.kind).toEqual(ClassMemberKind.Property);
-        expect(staticProperty.isStatic).toEqual(true);
-        expect(ts.isPropertyAccessExpression(staticProperty.implementation!)).toEqual(true);
-        expect(staticProperty.value!.getText()).toEqual(`'static'`);
-      });
+        it('should find non decorated properties on a class', () => {
+          loadTestFiles([SOME_DIRECTIVE_FILE]);
+          const bundle = makeTestBundleProgram(SOME_DIRECTIVE_FILE.name);
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const classNode = getDeclaration(
+              bundle.program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isDesiredDeclaration);
+          const members = host.getMembersOfClass(classNode);
+
+          const instanceProperty = members.find(member => member.name === 'instanceProperty')!;
+          expect(instanceProperty.kind).toEqual(ClassMemberKind.Property);
+          expect(instanceProperty.isStatic).toEqual(false);
+          expect(ts.isBinaryExpression(instanceProperty.implementation!)).toEqual(true);
+          expect(instanceProperty.value!.getText()).toEqual(`'instance'`);
+        });
 
-      it('should throw if the symbol is not a class', () => {
-        loadTestFiles([FOO_FUNCTION_FILE]);
-        const bundle = makeTestBundleProgram(FOO_FUNCTION_FILE.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const functionNode = getDeclaration(
-            bundle.program, FOO_FUNCTION_FILE.name, 'foo', isNamedFunctionDeclaration);
-        expect(() => {
-          host.getMembersOfClass(functionNode);
-        }).toThrowError(`Attempted to get members of a non-class: "function foo() {}"`);
-      });
+        it('should find static methods on a class', () => {
+          loadTestFiles([SOME_DIRECTIVE_FILE]);
+          const bundle = makeTestBundleProgram(SOME_DIRECTIVE_FILE.name);
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const classNode = getDeclaration(
+              bundle.program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isDesiredDeclaration);
+          const members = host.getMembersOfClass(classNode);
 
-      it('should return an empty array if there are no prop decorators', () => {
-        loadTestFiles([SIMPLE_CLASS_FILE]);
-        const bundle = makeTestBundleProgram(SIMPLE_CLASS_FILE.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const classNode = getDeclaration(
-            bundle.program, SIMPLE_CLASS_FILE.name, 'EmptyClass', isNamedVariableDeclaration);
-        const members = host.getMembersOfClass(classNode);
+          const staticMethod = members.find(member => member.name === 'staticMethod')!;
+          expect(staticMethod.kind).toEqual(ClassMemberKind.Method);
+          expect(staticMethod.isStatic).toEqual(true);
+          expect(ts.isFunctionExpression(staticMethod.implementation!)).toEqual(true);
+        });
 
-        expect(members).toEqual([]);
-      });
+        it('should find static properties on a class', () => {
+          loadTestFiles([SOME_DIRECTIVE_FILE]);
+          const bundle = makeTestBundleProgram(SOME_DIRECTIVE_FILE.name);
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const classNode = getDeclaration(
+              bundle.program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isDesiredDeclaration);
+          const members = host.getMembersOfClass(classNode);
+
+          const staticProperty = members.find(member => member.name === 'staticProperty')!;
+          expect(staticProperty.kind).toEqual(ClassMemberKind.Property);
+          expect(staticProperty.isStatic).toEqual(true);
+          expect(ts.isPropertyAccessExpression(staticProperty.implementation!)).toEqual(true);
+          expect(staticProperty.value!.getText()).toEqual(`'static'`);
+        });
 
-      it('should not process decorated properties in `propDecorators` if it is not an object literal',
-         () => {
-           loadTestFiles([INVALID_PROP_DECORATORS_FILE]);
-           const bundle = makeTestBundleProgram(INVALID_PROP_DECORATORS_FILE.name);
-           const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-           const classNode = getDeclaration(
-               bundle.program, INVALID_PROP_DECORATORS_FILE.name, 'NotObjectLiteral',
-               isNamedVariableDeclaration);
-           const members = host.getMembersOfClass(classNode);
+        it('should throw if the symbol is not a class', () => {
+          loadTestFiles([FOO_FUNCTION_FILE]);
+          const bundle = makeTestBundleProgram(FOO_FUNCTION_FILE.name);
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const functionNode = getDeclaration(
+              bundle.program, FOO_FUNCTION_FILE.name, 'foo', isNamedFunctionDeclaration);
+          expect(() => {
+            host.getMembersOfClass(functionNode);
+          }).toThrowError(`Attempted to get members of a non-class: "function foo() {}"`);
+        });
 
-           expect(members.map(member => member.name)).not.toContain('prop');
-         });
+        it('should return an empty array if there are no prop decorators', () => {
+          loadTestFiles([SIMPLE_CLASS_FILE]);
+          const bundle = makeTestBundleProgram(SIMPLE_CLASS_FILE.name);
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const classNode = getDeclaration(
+              bundle.program, SIMPLE_CLASS_FILE.name, 'EmptyClass', isDesiredDeclaration);
+          const members = host.getMembersOfClass(classNode);
 
-      it('should ignore prop decorator elements that are not object literals', () => {
-        loadTestFiles([INVALID_PROP_DECORATORS_FILE]);
-        const bundle = makeTestBundleProgram(INVALID_PROP_DECORATORS_FILE.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const classNode = getDeclaration(
-            bundle.program, INVALID_PROP_DECORATORS_FILE.name, 'NotObjectLiteralProp',
-            isNamedVariableDeclaration);
-        const members = host.getMembersOfClass(classNode);
-        const prop = members.find(m => m.name === 'prop')!;
-        const decorators = prop.decorators!;
+          expect(members).toEqual([]);
+        });
 
-        expect(decorators.length).toBe(1);
-        expect(decorators[0]).toEqual(jasmine.objectContaining({name: 'Directive'}));
+        it('should not process decorated properties in `propDecorators` if it is not an object literal',
+           () => {
+             loadTestFiles([INVALID_PROP_DECORATORS_FILE]);
+             const bundle = makeTestBundleProgram(INVALID_PROP_DECORATORS_FILE.name);
+             const host =
+                 createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+             const classNode = getDeclaration(
+                 bundle.program, INVALID_PROP_DECORATORS_FILE.name, 'NotObjectLiteral',
+                 isDesiredDeclaration);
+             const members = host.getMembersOfClass(classNode);
+
+             expect(members.map(member => member.name)).not.toContain('prop');
+           });
+
+        it('should ignore prop decorator elements that are not object literals', () => {
+          loadTestFiles([INVALID_PROP_DECORATORS_FILE]);
+          const bundle = makeTestBundleProgram(INVALID_PROP_DECORATORS_FILE.name);
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const classNode = getDeclaration(
+              bundle.program, INVALID_PROP_DECORATORS_FILE.name, 'NotObjectLiteralProp',
+              isDesiredDeclaration);
+          const members = host.getMembersOfClass(classNode);
+          const prop = members.find(m => m.name === 'prop')!;
+          const decorators = prop.decorators!;
+
+          expect(decorators.length).toBe(1);
+          expect(decorators[0]).toEqual(jasmine.objectContaining({name: 'Directive'}));
+        });
+
+        it('should ignore prop decorator elements that have no `type` property', () => {
+          loadTestFiles([INVALID_PROP_DECORATORS_FILE]);
+          const bundle = makeTestBundleProgram(INVALID_PROP_DECORATORS_FILE.name);
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const classNode = getDeclaration(
+              bundle.program, INVALID_PROP_DECORATORS_FILE.name, 'NoTypeProperty',
+              isDesiredDeclaration);
+          const members = host.getMembersOfClass(classNode);
+          const prop = members.find(m => m.name === 'prop')!;
+          const decorators = prop.decorators!;
+
+          expect(decorators.length).toBe(1);
+          expect(decorators[0]).toEqual(jasmine.objectContaining({name: 'Directive'}));
+        });
       });
 
-      it('should ignore prop decorator elements that have no `type` property', () => {
+      it('should ignore prop decorator elements whose `type` value is not an identifier', () => {
         loadTestFiles([INVALID_PROP_DECORATORS_FILE]);
         const bundle = makeTestBundleProgram(INVALID_PROP_DECORATORS_FILE.name);
         const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
         const classNode = getDeclaration(
-            bundle.program, INVALID_PROP_DECORATORS_FILE.name, 'NoTypeProperty',
-            isNamedVariableDeclaration);
+            bundle.program, INVALID_PROP_DECORATORS_FILE.name, 'NotIdentifier',
+            isDesiredDeclaration);
         const members = host.getMembersOfClass(classNode);
         const prop = members.find(m => m.name === 'prop')!;
         const decorators = prop.decorators!;
@@ -1251,489 +1385,779 @@ runInEachFileSystem(() => {
         expect(decorators.length).toBe(1);
         expect(decorators[0]).toEqual(jasmine.objectContaining({name: 'Directive'}));
       });
-    });
 
-    it('should ignore prop decorator elements whose `type` value is not an identifier', () => {
-      loadTestFiles([INVALID_PROP_DECORATORS_FILE]);
-      const bundle = makeTestBundleProgram(INVALID_PROP_DECORATORS_FILE.name);
-      const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-      const classNode = getDeclaration(
-          bundle.program, INVALID_PROP_DECORATORS_FILE.name, 'NotIdentifier',
-          isNamedVariableDeclaration);
-      const members = host.getMembersOfClass(classNode);
-      const prop = members.find(m => m.name === 'prop')!;
-      const decorators = prop.decorators!;
-
-      expect(decorators.length).toBe(1);
-      expect(decorators[0]).toEqual(jasmine.objectContaining({name: 'Directive'}));
-    });
+      it('should have import information on decorators', () => {
+        loadTestFiles([SOME_DIRECTIVE_FILE]);
+        const bundle = makeTestBundleProgram(SOME_DIRECTIVE_FILE.name);
+        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+
+        const classNode = getDeclaration(
+            bundle.program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isDesiredDeclaration);
+        const decorators = host.getDecoratorsOfDeclaration(classNode)!;
 
-    it('should have import information on decorators', () => {
-      loadTestFiles([SOME_DIRECTIVE_FILE]);
-      const bundle = makeTestBundleProgram(SOME_DIRECTIVE_FILE.name);
-      const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+        expect(decorators.length).toEqual(1);
+        expect(decorators[0].import).toEqual({name: 'Directive', from: '@angular/core'});
+      });
 
-      const classNode = getDeclaration(
-          bundle.program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedVariableDeclaration);
-      const decorators = host.getDecoratorsOfDeclaration(classNode)!;
+      describe('(returned prop decorators `args`)', () => {
+        it('should be an empty array if prop decorator has no `args` property', () => {
+          loadTestFiles([INVALID_PROP_DECORATOR_ARGS_FILE]);
+          const bundle = makeTestBundleProgram(INVALID_PROP_DECORATOR_ARGS_FILE.name);
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const classNode = getDeclaration(
+              bundle.program, INVALID_PROP_DECORATOR_ARGS_FILE.name, 'NoArgsProperty',
+              isDesiredDeclaration);
+          const members = host.getMembersOfClass(classNode);
+          const prop = members.find(m => m.name === 'prop')!;
+          const decorators = prop.decorators!;
 
-      expect(decorators.length).toEqual(1);
-      expect(decorators[0].import).toEqual({name: 'Directive', from: '@angular/core'});
-    });
+          expect(decorators.length).toBe(1);
+          expect(decorators[0].name).toBe('Input');
+          expect(decorators[0].args).toEqual([]);
+        });
 
-    describe('(returned prop decorators `args`)', () => {
-      it('should be an empty array if prop decorator has no `args` property', () => {
-        loadTestFiles([INVALID_PROP_DECORATOR_ARGS_FILE]);
-        const bundle = makeTestBundleProgram(INVALID_PROP_DECORATOR_ARGS_FILE.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const classNode = getDeclaration(
-            bundle.program, INVALID_PROP_DECORATOR_ARGS_FILE.name, 'NoArgsProperty',
-            isNamedVariableDeclaration);
-        const members = host.getMembersOfClass(classNode);
-        const prop = members.find(m => m.name === 'prop')!;
-        const decorators = prop.decorators!;
+        it('should be an empty array if prop decorator\'s `args` has no property assignment',
+           () => {
+             loadTestFiles([INVALID_PROP_DECORATOR_ARGS_FILE]);
+             const bundle = makeTestBundleProgram(INVALID_PROP_DECORATOR_ARGS_FILE.name);
+             const host =
+                 createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+             const classNode = getDeclaration(
+                 bundle.program, INVALID_PROP_DECORATOR_ARGS_FILE.name, 'NoPropertyAssignment',
+                 isDesiredDeclaration);
+             const members = host.getMembersOfClass(classNode);
+             const prop = members.find(m => m.name === 'prop')!;
+             const decorators = prop.decorators!;
 
-        expect(decorators.length).toBe(1);
-        expect(decorators[0].name).toBe('Input');
-        expect(decorators[0].args).toEqual([]);
-      });
+             expect(decorators.length).toBe(1);
+             expect(decorators[0].name).toBe('Input');
+             expect(decorators[0].args).toEqual([]);
+           });
 
-      it('should be an empty array if prop decorator\'s `args` has no property assignment', () => {
-        loadTestFiles([INVALID_PROP_DECORATOR_ARGS_FILE]);
-        const bundle = makeTestBundleProgram(INVALID_PROP_DECORATOR_ARGS_FILE.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const classNode = getDeclaration(
-            bundle.program, INVALID_PROP_DECORATOR_ARGS_FILE.name, 'NoPropertyAssignment',
-            isNamedVariableDeclaration);
-        const members = host.getMembersOfClass(classNode);
-        const prop = members.find(m => m.name === 'prop')!;
-        const decorators = prop.decorators!;
+        it('should be an empty array if `args` property value is not an array literal', () => {
+          loadTestFiles([INVALID_PROP_DECORATOR_ARGS_FILE]);
+          const bundle = makeTestBundleProgram(INVALID_PROP_DECORATOR_ARGS_FILE.name);
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const classNode = getDeclaration(
+              bundle.program, INVALID_PROP_DECORATOR_ARGS_FILE.name, 'NotArrayLiteral',
+              isDesiredDeclaration);
+          const members = host.getMembersOfClass(classNode);
+          const prop = members.find(m => m.name === 'prop')!;
+          const decorators = prop.decorators!;
 
-        expect(decorators.length).toBe(1);
-        expect(decorators[0].name).toBe('Input');
-        expect(decorators[0].args).toEqual([]);
+          expect(decorators.length).toBe(1);
+          expect(decorators[0].name).toBe('Input');
+          expect(decorators[0].args).toEqual([]);
+        });
       });
 
-      it('should be an empty array if `args` property value is not an array literal', () => {
-        loadTestFiles([INVALID_PROP_DECORATOR_ARGS_FILE]);
-        const bundle = makeTestBundleProgram(INVALID_PROP_DECORATOR_ARGS_FILE.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const classNode = getDeclaration(
-            bundle.program, INVALID_PROP_DECORATOR_ARGS_FILE.name, 'NotArrayLiteral',
-            isNamedVariableDeclaration);
-        const members = host.getMembersOfClass(classNode);
-        const prop = members.find(m => m.name === 'prop')!;
-        const decorators = prop.decorators!;
+      describe('getConstructorParameters', () => {
+        it('should retain imported name for type value references for decorated constructor parameter types',
+           () => {
+             const files = [
+               {
+                 name: _('/node_modules/shared-lib/foo.d.ts'),
+                 contents: `
+    declare class Foo {}
+    export {Foo as Bar};
+  `,
+               },
+               {
+                 name: _('/node_modules/shared-lib/index.d.ts'),
+                 contents: `
+    export {Bar as Baz} from './foo';
+  `,
+               },
+               {
+                 name: _('/local.js'),
+                 contents: `
+  (function (global, factory) {
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
+    typeof define === 'function' && define.amd ? define('local', ['exports'], factory) :
+    (factory(global.local));
+  }(this, (function (exports) { 'use strict';
+    var Internal = (function() {
+      function Internal() {
+      }
+      return Internal;
+    }());
+    exports.External = Internal;
+  })));
+     `
+               },
+               {
+                 name: _('/main.js'),
+                 contents: `
+  (function (global, factory) {
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('shared-lib'), require('./local')) :
+    typeof define === 'function' && define.amd ? define('main', ['exports', 'shared-lib', './local'], factory) :
+    (factory(global.main, global.shared, global.local));
+  }(this, (function (exports, shared, local) { 'use strict';
+    ${expDecl('SameFile')} = (function() {
+      function SameFile() {
+      }
+      return SameFile;
+    }());
+    ${varExp('SameFile')}
 
-        expect(decorators.length).toBe(1);
-        expect(decorators[0].name).toBe('Input');
-        expect(decorators[0].args).toEqual([]);
-      });
-    });
+    ${expDecl('SomeClass')} = (function() {
+      function SomeClass(arg1, arg2, arg3) {}
+      return SomeClass;
+    }());
+    ${
+                     expDecl(
+                         'SomeClass',
+                         true)}.ctorParameters = function() { return [{ type: shared.Baz }, { type: local.External }, { type: SameFile }]; };
+    ${varExp('SomeClass')}
+  })));
+  `,
+               },
+             ];
 
-    describe('getConstructorParameters', () => {
-      it('should find the decorated constructor parameters', () => {
-        loadTestFiles([SOME_DIRECTIVE_FILE]);
-        const bundle = makeTestBundleProgram(SOME_DIRECTIVE_FILE.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const classNode = getDeclaration(
-            bundle.program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedVariableDeclaration);
-        const parameters = host.getConstructorParameters(classNode);
-
-        expect(parameters).toBeDefined();
-        expect(parameters!.map(parameter => parameter.name)).toEqual([
-          '_viewContainer', '_template', 'injected'
-        ]);
-        expectTypeValueReferencesForParameters(parameters!, [
-          'ViewContainerRef',
-          'TemplateRef',
-          null,
-        ]);
-      });
+             loadTestFiles(files);
+             const bundle = makeTestBundleProgram(_('/main.js'));
+             const host =
+                 createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+             const classNode = getDeclaration(
+                 bundle.program, _('/main.js'), 'SomeClass', isNamedFunctionDeclaration);
 
-      it('should find the decorated constructor parameters at the top level', () => {
-        loadTestFiles([TOPLEVEL_DECORATORS_FILE]);
-        const bundle = makeTestBundleProgram(TOPLEVEL_DECORATORS_FILE.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const classNode = getDeclaration(
-            bundle.program, TOPLEVEL_DECORATORS_FILE.name, 'SomeDirective',
-            isNamedVariableDeclaration);
-        const parameters = host.getConstructorParameters(classNode);
-
-        expect(parameters).toBeDefined();
-        expect(parameters!.map(parameter => parameter.name)).toEqual([
-          '_viewContainer', '_template', 'injected'
-        ]);
-        expectTypeValueReferencesForParameters(parameters!, [
-          'ViewContainerRef',
-          'TemplateRef',
-          null,
-        ]);
-      });
+             const parameters = host.getConstructorParameters(classNode)!;
 
-      it('should accept `ctorParameters` as an array', () => {
-        loadTestFiles([CTOR_DECORATORS_ARRAY_FILE]);
-        const bundle = makeTestBundleProgram(CTOR_DECORATORS_ARRAY_FILE.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const classNode = getDeclaration(
-            bundle.program, CTOR_DECORATORS_ARRAY_FILE.name, 'CtorDecoratedAsArray',
-            isNamedVariableDeclaration);
-        const parameters = host.getConstructorParameters(classNode)!;
+             expect(parameters.map(p => p.name)).toEqual(['arg1', 'arg2', 'arg3']);
+             expectTypeValueReferencesForParameters(
+                 parameters, ['Baz', 'External', 'SameFile'], ['shared-lib', './local', null]);
+           });
 
-        expect(parameters).toBeDefined();
-        expect(parameters.map(parameter => parameter.name)).toEqual(['arg1']);
-        expectTypeValueReferencesForParameters(parameters, ['ParamType']);
-      });
+        it('should find the decorated constructor parameters', () => {
+          loadTestFiles([SOME_DIRECTIVE_FILE]);
+          const bundle = makeTestBundleProgram(SOME_DIRECTIVE_FILE.name);
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const classNode = getDeclaration(
+              bundle.program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isDesiredDeclaration);
+          const parameters = host.getConstructorParameters(classNode);
 
-      it('should throw if the symbol is not a class', () => {
-        loadTestFiles([FOO_FUNCTION_FILE]);
-        const bundle = makeTestBundleProgram(FOO_FUNCTION_FILE.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const functionNode = getDeclaration(
-            bundle.program, FOO_FUNCTION_FILE.name, 'foo', isNamedFunctionDeclaration);
-        expect(() => {
-          host.getConstructorParameters(functionNode);
-        })
-            .toThrowError(
-                'Attempted to get constructor parameters of a non-class: "function foo() {}"');
-      });
+          expect(parameters).toBeDefined();
+          expect(parameters!.map(parameter => parameter.name)).toEqual([
+            '_viewContainer', '_template', 'injected'
+          ]);
+          expectTypeValueReferencesForParameters(parameters!, [
+            'ViewContainerRef',
+            'TemplateRef',
+            null,
+          ]);
+        });
 
-      // In ES5 there is no such thing as a constructor-less class
-      // it('should return `null` if there is no constructor', () => { });
+        it('should find the decorated constructor parameters at the top level', () => {
+          loadTestFiles([TOPLEVEL_DECORATORS_FILE]);
+          const bundle = makeTestBundleProgram(TOPLEVEL_DECORATORS_FILE.name);
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const classNode = getDeclaration(
+              bundle.program, TOPLEVEL_DECORATORS_FILE.name, 'SomeDirective', isDesiredDeclaration);
+          const parameters = host.getConstructorParameters(classNode);
 
-      it('should return an array even if there are no decorators', () => {
-        loadTestFiles([SIMPLE_CLASS_FILE]);
-        const bundle = makeTestBundleProgram(SIMPLE_CLASS_FILE.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const classNode = getDeclaration(
-            bundle.program, SIMPLE_CLASS_FILE.name, 'NoDecoratorConstructorClass',
-            isNamedVariableDeclaration);
-        const parameters = host.getConstructorParameters(classNode);
-
-        expect(parameters).toEqual(jasmine.any(Array));
-        expect(parameters!.length).toEqual(1);
-        expect(parameters![0].name).toEqual('foo');
-        expect(parameters![0].decorators).toBe(null);
-      });
+          expect(parameters).toBeDefined();
+          expect(parameters!.map(parameter => parameter.name)).toEqual([
+            '_viewContainer', '_template', 'injected'
+          ]);
+          expectTypeValueReferencesForParameters(parameters!, [
+            'ViewContainerRef',
+            'TemplateRef',
+            null,
+          ]);
+        });
 
-      it('should return an empty array if there are no constructor parameters', () => {
-        loadTestFiles([INVALID_CTOR_DECORATORS_FILE]);
-        const bundle = makeTestBundleProgram(INVALID_CTOR_DECORATORS_FILE.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const classNode = getDeclaration(
-            bundle.program, INVALID_CTOR_DECORATORS_FILE.name, 'NoParameters',
-            isNamedVariableDeclaration);
-        const parameters = host.getConstructorParameters(classNode);
+        it('should accept `ctorParameters` as an array', () => {
+          loadTestFiles([CTOR_DECORATORS_ARRAY_FILE]);
+          const bundle = makeTestBundleProgram(CTOR_DECORATORS_ARRAY_FILE.name);
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const classNode = getDeclaration(
+              bundle.program, CTOR_DECORATORS_ARRAY_FILE.name, 'CtorDecoratedAsArray',
+              isDesiredDeclaration);
+          const parameters = host.getConstructorParameters(classNode)!;
 
-        expect(parameters).toEqual([]);
-      });
+          expect(parameters).toBeDefined();
+          expect(parameters.map(parameter => parameter.name)).toEqual(['arg1']);
+          expectTypeValueReferencesForParameters(parameters, ['ParamType']);
+        });
 
-      // In ES5 there are no arrow functions
-      // it('should ignore `ctorParameters` if it is an arrow function', () => { });
+        it('should throw if the symbol is not a class', () => {
+          loadTestFiles([FOO_FUNCTION_FILE]);
+          const bundle = makeTestBundleProgram(FOO_FUNCTION_FILE.name);
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const functionNode = getDeclaration(
+              bundle.program, FOO_FUNCTION_FILE.name, 'foo', isNamedFunctionDeclaration);
+          expect(() => {
+            host.getConstructorParameters(functionNode);
+          })
+              .toThrowError(
+                  'Attempted to get constructor parameters of a non-class: "function foo() {}"');
+        });
 
-      it('should ignore `ctorParameters` if it does not return an array literal', () => {
-        loadTestFiles([INVALID_CTOR_DECORATORS_FILE]);
-        const bundle = makeTestBundleProgram(INVALID_CTOR_DECORATORS_FILE.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const classNode = getDeclaration(
-            bundle.program, INVALID_CTOR_DECORATORS_FILE.name, 'NotArrayLiteral',
-            isNamedVariableDeclaration);
-        const parameters = host.getConstructorParameters(classNode);
-
-        expect(parameters!.length).toBe(1);
-        expect(parameters![0]).toEqual(jasmine.objectContaining<CtorParameter>({
-          name: 'arg1',
-          decorators: null,
-        }));
-      });
+        // In ES5 there is no such thing as a constructor-less class
+        // it('should return `null` if there is no constructor', () => { });
 
-      describe('(returned parameters `decorators`)', () => {
-        it('should ignore param decorator elements that are not object literals', () => {
-          loadTestFiles([INVALID_CTOR_DECORATORS_FILE]);
-          const bundle = makeTestBundleProgram(INVALID_CTOR_DECORATORS_FILE.name);
+        it('should return an array even if there are no decorators', () => {
+          loadTestFiles([SIMPLE_CLASS_FILE]);
+          const bundle = makeTestBundleProgram(SIMPLE_CLASS_FILE.name);
           const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
           const classNode = getDeclaration(
-              bundle.program, INVALID_CTOR_DECORATORS_FILE.name, 'NotObjectLiteral',
-              isNamedVariableDeclaration);
+              bundle.program, SIMPLE_CLASS_FILE.name, 'NoDecoratorConstructorClass',
+              isDesiredDeclaration);
           const parameters = host.getConstructorParameters(classNode);
 
-          expect(parameters!.length).toBe(2);
-          expect(parameters![0]).toEqual(jasmine.objectContaining<CtorParameter>({
-            name: 'arg1',
-            decorators: null,
-          }));
-          expect(parameters![1]).toEqual(jasmine.objectContaining<CtorParameter>({
-            name: 'arg2',
-            decorators: jasmine.any(Array) as any
-          }));
+          expect(parameters).toEqual(jasmine.any(Array));
+          expect(parameters!.length).toEqual(1);
+          expect(parameters![0].name).toEqual('foo');
+          expect(parameters![0].decorators).toBe(null);
         });
 
-        it('should ignore param decorator elements that have no `type` property', () => {
+        it('should return an empty array if there are no constructor parameters', () => {
           loadTestFiles([INVALID_CTOR_DECORATORS_FILE]);
           const bundle = makeTestBundleProgram(INVALID_CTOR_DECORATORS_FILE.name);
           const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
           const classNode = getDeclaration(
-              bundle.program, INVALID_CTOR_DECORATORS_FILE.name, 'NoTypeProperty',
-              isNamedVariableDeclaration);
+              bundle.program, INVALID_CTOR_DECORATORS_FILE.name, 'NoParameters',
+              isDesiredDeclaration);
           const parameters = host.getConstructorParameters(classNode);
-          const decorators = parameters![0].decorators!;
 
-          expect(decorators.length).toBe(1);
-          expect(decorators[0]).toEqual(jasmine.objectContaining({name: 'Inject'}));
+          expect(parameters).toEqual([]);
         });
 
-        it('should ignore param decorator elements whose `type` value is not an identifier', () => {
+        // In ES5 there are no arrow functions
+        // it('should ignore `ctorParameters` if it is an arrow function', () => { });
+
+        it('should ignore `ctorParameters` if it does not return an array literal', () => {
           loadTestFiles([INVALID_CTOR_DECORATORS_FILE]);
           const bundle = makeTestBundleProgram(INVALID_CTOR_DECORATORS_FILE.name);
           const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
           const classNode = getDeclaration(
-              bundle.program, INVALID_CTOR_DECORATORS_FILE.name, 'NotIdentifier',
-              isNamedVariableDeclaration);
+              bundle.program, INVALID_CTOR_DECORATORS_FILE.name, 'NotArrayLiteral',
+              isDesiredDeclaration);
           const parameters = host.getConstructorParameters(classNode);
-          const decorators = parameters![0].decorators!;
 
-          expect(decorators.length).toBe(1);
-          expect(decorators[0]).toEqual(jasmine.objectContaining({name: 'Inject'}));
+          expect(parameters!.length).toBe(1);
+          expect(parameters![0]).toEqual(jasmine.objectContaining<CtorParameter>({
+            name: 'arg1',
+            decorators: null,
+          }));
         });
 
-        it('should use `getImportOfIdentifier()` to retrieve import info', () => {
-          loadTestFiles([SOME_DIRECTIVE_FILE]);
-          const bundle = makeTestBundleProgram(SOME_DIRECTIVE_FILE.name);
-          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-          const classNode = getDeclaration(
-              bundle.program, SOME_DIRECTIVE_FILE.name, 'SomeDirective',
-              isNamedVariableDeclaration);
-          const mockImportInfo: Import = {from: '@angular/core', name: 'Directive'};
-          const spy = spyOn(UmdReflectionHost.prototype, 'getImportOfIdentifier')
-                          .and.returnValue(mockImportInfo);
+        describe('(returned parameters `decorators`)', () => {
+          it('should ignore param decorator elements that are not object literals', () => {
+            loadTestFiles([INVALID_CTOR_DECORATORS_FILE]);
+            const bundle = makeTestBundleProgram(INVALID_CTOR_DECORATORS_FILE.name);
+            const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+            const classNode = getDeclaration(
+                bundle.program, INVALID_CTOR_DECORATORS_FILE.name, 'NotObjectLiteral',
+                isDesiredDeclaration);
+            const parameters = host.getConstructorParameters(classNode);
+
+            expect(parameters!.length).toBe(2);
+            expect(parameters![0]).toEqual(jasmine.objectContaining<CtorParameter>({
+              name: 'arg1',
+              decorators: null,
+            }));
+            expect(parameters![1]).toEqual(jasmine.objectContaining<CtorParameter>({
+              name: 'arg2',
+              decorators: jasmine.any(Array) as any
+            }));
+          });
 
-          const parameters = host.getConstructorParameters(classNode);
-          const decorators = parameters![2].decorators!;
+          it('should ignore param decorator elements that have no `type` property', () => {
+            loadTestFiles([INVALID_CTOR_DECORATORS_FILE]);
+            const bundle = makeTestBundleProgram(INVALID_CTOR_DECORATORS_FILE.name);
+            const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+            const classNode = getDeclaration(
+                bundle.program, INVALID_CTOR_DECORATORS_FILE.name, 'NoTypeProperty',
+                isDesiredDeclaration);
+            const parameters = host.getConstructorParameters(classNode);
+            const decorators = parameters![0].decorators!;
+
+            expect(decorators.length).toBe(1);
+            expect(decorators[0]).toEqual(jasmine.objectContaining({name: 'Inject'}));
+          });
 
-          expect(decorators.length).toEqual(1);
-          expect(decorators[0].import).toBe(mockImportInfo);
+          it('should ignore param decorator elements whose `type` value is not an identifier',
+             () => {
+               loadTestFiles([INVALID_CTOR_DECORATORS_FILE]);
+               const bundle = makeTestBundleProgram(INVALID_CTOR_DECORATORS_FILE.name);
+               const host =
+                   createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+               const classNode = getDeclaration(
+                   bundle.program, INVALID_CTOR_DECORATORS_FILE.name, 'NotIdentifier',
+                   isDesiredDeclaration);
+               const parameters = host.getConstructorParameters(classNode);
+               const decorators = parameters![0].decorators!;
+
+               expect(decorators.length).toBe(1);
+               expect(decorators[0]).toEqual(jasmine.objectContaining({name: 'Inject'}));
+             });
+
+          it('should use `getImportOfIdentifier()` to retrieve import info', () => {
+            loadTestFiles([SOME_DIRECTIVE_FILE]);
+            const bundle = makeTestBundleProgram(SOME_DIRECTIVE_FILE.name);
+            const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+            const classNode = getDeclaration(
+                bundle.program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isDesiredDeclaration);
+            const mockImportInfo: Import = {from: '@angular/core', name: 'Directive'};
+            const spy = spyOn(UmdReflectionHost.prototype, 'getImportOfIdentifier')
+                            .and.returnValue(mockImportInfo);
+
+            const parameters = host.getConstructorParameters(classNode);
+            const decorators = parameters![2].decorators!;
+
+            expect(decorators.length).toEqual(1);
+            expect(decorators[0].import).toBe(mockImportInfo);
+          });
         });
-      });
 
-      describe('(returned parameters `decorators.args`)', () => {
-        it('should be an empty array if param decorator has no `args` property', () => {
-          loadTestFiles([INVALID_CTOR_DECORATOR_ARGS_FILE]);
-          const bundle = makeTestBundleProgram(INVALID_CTOR_DECORATOR_ARGS_FILE.name);
-          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-          const classNode = getDeclaration(
-              bundle.program, INVALID_CTOR_DECORATOR_ARGS_FILE.name, 'NoArgsProperty',
-              isNamedVariableDeclaration);
-          const parameters = host.getConstructorParameters(classNode);
-          expect(parameters!.length).toBe(1);
-          const decorators = parameters![0].decorators!;
+        describe('(returned parameters `decorators.args`)', () => {
+          it('should be an empty array if param decorator has no `args` property', () => {
+            loadTestFiles([INVALID_CTOR_DECORATOR_ARGS_FILE]);
+            const bundle = makeTestBundleProgram(INVALID_CTOR_DECORATOR_ARGS_FILE.name);
+            const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+            const classNode = getDeclaration(
+                bundle.program, INVALID_CTOR_DECORATOR_ARGS_FILE.name, 'NoArgsProperty',
+                isDesiredDeclaration);
+            const parameters = host.getConstructorParameters(classNode);
+            expect(parameters!.length).toBe(1);
+            const decorators = parameters![0].decorators!;
+
+            expect(decorators.length).toBe(1);
+            expect(decorators[0].name).toBe('Inject');
+            expect(decorators[0].args).toEqual([]);
+          });
 
-          expect(decorators.length).toBe(1);
-          expect(decorators[0].name).toBe('Inject');
-          expect(decorators[0].args).toEqual([]);
+          it('should be an empty array if param decorator\'s `args` has no property assignment',
+             () => {
+               loadTestFiles([INVALID_CTOR_DECORATOR_ARGS_FILE]);
+               const bundle = makeTestBundleProgram(INVALID_CTOR_DECORATOR_ARGS_FILE.name);
+               const host =
+                   createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+               const classNode = getDeclaration(
+                   bundle.program, INVALID_CTOR_DECORATOR_ARGS_FILE.name, 'NoPropertyAssignment',
+                   isDesiredDeclaration);
+               const parameters = host.getConstructorParameters(classNode);
+               const decorators = parameters![0].decorators!;
+
+               expect(decorators.length).toBe(1);
+               expect(decorators[0].name).toBe('Inject');
+               expect(decorators[0].args).toEqual([]);
+             });
+
+          it('should be an empty array if `args` property value is not an array literal', () => {
+            loadTestFiles([INVALID_CTOR_DECORATOR_ARGS_FILE]);
+            const bundle = makeTestBundleProgram(INVALID_CTOR_DECORATOR_ARGS_FILE.name);
+            const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+            const classNode = getDeclaration(
+                bundle.program, INVALID_CTOR_DECORATOR_ARGS_FILE.name, 'NotArrayLiteral',
+                isDesiredDeclaration);
+            const parameters = host.getConstructorParameters(classNode);
+            const decorators = parameters![0].decorators!;
+
+            expect(decorators.length).toBe(1);
+            expect(decorators[0].name).toBe('Inject');
+            expect(decorators[0].args).toEqual([]);
+          });
         });
 
-        it('should be an empty array if param decorator\'s `args` has no property assignment',
-           () => {
-             loadTestFiles([INVALID_CTOR_DECORATOR_ARGS_FILE]);
-             const bundle = makeTestBundleProgram(INVALID_CTOR_DECORATOR_ARGS_FILE.name);
-             const host =
-                 createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-             const classNode = getDeclaration(
-                 bundle.program, INVALID_CTOR_DECORATOR_ARGS_FILE.name, 'NoPropertyAssignment',
-                 isNamedVariableDeclaration);
-             const parameters = host.getConstructorParameters(classNode);
-             const decorators = parameters![0].decorators!;
+        function getConstructorParameters(
+            constructor: string, mode: 'inlined'|'inlined_with_suffix'|'imported' = 'imported') {
+          let fileHeaderWithUmd = '';
 
-             expect(decorators.length).toBe(1);
-             expect(decorators[0].name).toBe('Inject');
-             expect(decorators[0].args).toEqual([]);
-           });
+          switch (mode) {
+            case 'imported':
+              fileHeaderWithUmd = `
+              (function (global, factory) {
+                typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('tslib'))) :
+                typeof define === 'function' && define.amd ? define('test', ['exports', 'tslib'], factory) :
+                    (factory(global.test, global.tslib));
+                }(this, (function (exports, tslib) { 'use strict';
+            `;
+              break;
+            case 'inlined':
+              fileHeaderWithUmd = `
+              (function (global, factory) {
+                typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports)) :
+                typeof define === 'function' && define.amd ? define('test', ['exports'], factory) :
+                    (factory(global.test));
+                }(this, (function (exports) { 'use strict';
+
+                  var __spread = (this && this.__spread) || function (...args) { /* ... */ }
+            `;
+              break;
+            case 'inlined_with_suffix':
+              fileHeaderWithUmd = `
+              (function (global, factory) {
+                typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports)) :
+                typeof define === 'function' && define.amd ? define('test', ['exports'], factory) :
+                    (factory(global.test));
+                }(this, (function (exports) { 'use strict';
+
+                  var __spread$1 = (this && this.__spread$1) || function (...args) { /* ... */ }
+              `;
+              break;
+          }
+
+          const file = {
+            name: _('/synthesized_constructors.js'),
+            contents: `
+            ${fileHeaderWithUmd}
+                var TestClass = /** @class */ (function (_super) {
+                  __extends(TestClass, _super);
+                  ${constructor}
+                  return TestClass;
+                }(null));
+
+                exports.TestClass = TestClass;
+              })));
+          `,
+          };
 
-        it('should be an empty array if `args` property value is not an array literal', () => {
-          loadTestFiles([INVALID_CTOR_DECORATOR_ARGS_FILE]);
-          const bundle = makeTestBundleProgram(INVALID_CTOR_DECORATOR_ARGS_FILE.name);
+          loadTestFiles([file]);
+          const bundle = makeTestBundleProgram(file.name);
           const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-          const classNode = getDeclaration(
-              bundle.program, INVALID_CTOR_DECORATOR_ARGS_FILE.name, 'NotArrayLiteral',
-              isNamedVariableDeclaration);
-          const parameters = host.getConstructorParameters(classNode);
-          const decorators = parameters![0].decorators!;
+          const classNode =
+              getDeclaration(bundle.program, file.name, 'TestClass', isNamedVariableDeclaration);
+          return host.getConstructorParameters(classNode);
+        }
 
-          expect(decorators.length).toBe(1);
-          expect(decorators[0].name).toBe('Inject');
-          expect(decorators[0].args).toEqual([]);
+        describe('TS -> ES5: synthesized constructors', () => {
+          it('recognizes _this assignment from super call', () => {
+            const parameters = getConstructorParameters(`
+            function TestClass() {
+              var _this = _super !== null && _super.apply(this, arguments) || this;
+              _this.synthesizedProperty = null;
+              return _this;
+            }
+          `);
+
+            expect(parameters).toBeNull();
+          });
+
+          it('recognizes super call as return statement', () => {
+            const parameters = getConstructorParameters(`
+            function TestClass() {
+              return _super !== null && _super.apply(this, arguments) || this;
+            }
+          `);
+
+            expect(parameters).toBeNull();
+          });
+
+          it('handles the case where a unique name was generated for _super or _this', () => {
+            const parameters = getConstructorParameters(`
+            function TestClass() {
+              var _this_1 = _super_1 !== null && _super_1.apply(this, arguments) || this;
+              _this_1._this = null;
+              _this_1._super = null;
+              return _this_1;
+            }
+          `);
+
+            expect(parameters).toBeNull();
+          });
+
+          it('does not consider constructors with parameters as synthesized', () => {
+            const parameters = getConstructorParameters(`
+            function TestClass(arg) {
+              return _super !== null && _super.apply(this, arguments) || this;
+            }
+          `);
+
+            expect(parameters!.length).toBe(1);
+          });
+
+          it('does not consider manual super calls as synthesized', () => {
+            const parameters = getConstructorParameters(`
+            function TestClass() {
+              return _super.call(this) || this;
+            }
+          `);
+
+            expect(parameters!.length).toBe(0);
+          });
+
+          it('does not consider empty constructors as synthesized', () => {
+            const parameters = getConstructorParameters(`function TestClass() {}`);
+            expect(parameters!.length).toBe(0);
+          });
         });
-      });
-    });
 
-    describe('getDefinitionOfFunction()', () => {
-      it('should return an object describing the function declaration passed as an argument',
-         () => {
-           loadTestFiles([FUNCTION_BODY_FILE]);
-           const bundle = makeTestBundleProgram(FUNCTION_BODY_FILE.name);
-           const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-
-           const fooNode = getDeclaration(
-               bundle.program, FUNCTION_BODY_FILE.name, 'foo', isNamedFunctionDeclaration)!;
-           const fooDef = host.getDefinitionOfFunction(fooNode)!;
-           expect(fooDef.node).toBe(fooNode);
-           expect(fooDef.body!.length).toEqual(1);
-           expect(fooDef.body![0].getText()).toEqual(`return x;`);
-           expect(fooDef.parameters.length).toEqual(1);
-           expect(fooDef.parameters[0].name).toEqual('x');
-           expect(fooDef.parameters[0].initializer).toBe(null);
-
-           const barNode = getDeclaration(
-               bundle.program, FUNCTION_BODY_FILE.name, 'bar', isNamedFunctionDeclaration)!;
-           const barDef = host.getDefinitionOfFunction(barNode)!;
-           expect(barDef.node).toBe(barNode);
-           expect(barDef.body!.length).toEqual(1);
-           expect(ts.isReturnStatement(barDef.body![0])).toBeTruthy();
-           expect(barDef.body![0].getText()).toEqual(`return x + y;`);
-           expect(barDef.parameters.length).toEqual(2);
-           expect(barDef.parameters[0].name).toEqual('x');
-           expect(fooDef.parameters[0].initializer).toBe(null);
-           expect(barDef.parameters[1].name).toEqual('y');
-           expect(barDef.parameters[1].initializer!.getText()).toEqual('42');
-
-           const bazNode = getDeclaration(
-               bundle.program, FUNCTION_BODY_FILE.name, 'baz', isNamedFunctionDeclaration)!;
-           const bazDef = host.getDefinitionOfFunction(bazNode)!;
-           expect(bazDef.node).toBe(bazNode);
-           expect(bazDef.body!.length).toEqual(3);
-           expect(bazDef.parameters.length).toEqual(1);
-           expect(bazDef.parameters[0].name).toEqual('x');
-           expect(bazDef.parameters[0].initializer).toBe(null);
-
-           const quxNode = getDeclaration(
-               bundle.program, FUNCTION_BODY_FILE.name, 'qux', isNamedFunctionDeclaration)!;
-           const quxDef = host.getDefinitionOfFunction(quxNode)!;
-           expect(quxDef.node).toBe(quxNode);
-           expect(quxDef.body!.length).toEqual(2);
-           expect(quxDef.parameters.length).toEqual(1);
-           expect(quxDef.parameters[0].name).toEqual('x');
-           expect(quxDef.parameters[0].initializer).toBe(null);
-         });
-    });
+        // See: https://github.com/angular/angular/issues/38453.
+        describe('ES2015 -> ES5: synthesized constructors through TSC downleveling', () => {
+          it('recognizes delegate super call using inline spread helper', () => {
+            const parameters = getConstructorParameters(
+                `
+            function TestClass() {
+              return _super.apply(this, __spread(arguments)) || this;
+            }`,
+                'inlined');
+
+            expect(parameters).toBeNull();
+          });
 
-    describe('getImportOfIdentifier', () => {
-      it('should find the import of an identifier', () => {
-        loadTestFiles(IMPORTS_FILES);
-        const bundle = makeTestBundleProgram(_('/index.js'));
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const variableNode =
-            getDeclaration(bundle.program, _('/file_b.js'), 'b', isNamedVariableDeclaration);
-        const identifier =
-            (variableNode.initializer && ts.isPropertyAccessExpression(variableNode.initializer) &&
-             ts.isIdentifier(variableNode.initializer.name)) ?
-            variableNode.initializer.name :
-            null;
-
-        expect(identifier).not.toBe(null);
-        const importOfIdent = host.getImportOfIdentifier(identifier!);
-        expect(importOfIdent).toEqual({name: 'a', from: './file_a'});
-      });
+          it('recognizes delegate super call using inline spread helper with suffix', () => {
+            const parameters = getConstructorParameters(
+                `
+            function TestClass() {
+              return _super.apply(this, __spread$1(arguments)) || this;
+            }`,
+                'inlined_with_suffix');
 
-      it('should return null if the identifier was not imported', () => {
-        loadTestFiles(IMPORTS_FILES);
-        const bundle = makeTestBundleProgram(_('/index.js'));
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const variableNode =
-            getDeclaration(bundle.program, _('/file_b.js'), 'd', isNamedVariableDeclaration);
-        const importOfIdent = host.getImportOfIdentifier(variableNode.initializer as ts.Identifier);
+            expect(parameters).toBeNull();
+          });
 
-        expect(importOfIdent).toBeNull();
-      });
+          it('recognizes delegate super call using imported spread helper', () => {
+            const parameters = getConstructorParameters(
+                `
+            function TestClass() {
+              return _super.apply(this, tslib_1.__spread(arguments)) || this;
+            }`,
+                'imported');
 
-      it('should handle factory functions not wrapped in parentheses', () => {
-        loadTestFiles(IMPORTS_FILES);
-        const bundle = makeTestBundleProgram(_('/index.js'));
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const variableNode =
-            getDeclaration(bundle.program, _('/file_c.js'), 'c', isNamedVariableDeclaration);
-        const identifier =
-            (variableNode.initializer && ts.isPropertyAccessExpression(variableNode.initializer) &&
-             ts.isIdentifier(variableNode.initializer.name)) ?
-            variableNode.initializer.name :
-            null;
-
-        expect(identifier).not.toBe(null);
-        const importOfIdent = host.getImportOfIdentifier(identifier!);
-        expect(importOfIdent).toEqual({name: 'a', from: './file_a'});
+            expect(parameters).toBeNull();
+          });
+
+          describe('with class member assignment', () => {
+            it('recognizes delegate super call using inline spread helper', () => {
+              const parameters = getConstructorParameters(
+                  `
+              function TestClass() {
+                var _this = _super.apply(this, __spread(arguments)) || this;
+                _this.synthesizedProperty = null;
+                return _this;
+              }`,
+                  'inlined');
+
+              expect(parameters).toBeNull();
+            });
+
+            it('recognizes delegate super call using inline spread helper with suffix', () => {
+              const parameters = getConstructorParameters(
+                  `
+              function TestClass() {
+                var _this = _super.apply(this, __spread$1(arguments)) || this;
+                _this.synthesizedProperty = null;
+                return _this;
+              }`,
+                  'inlined_with_suffix');
+
+              expect(parameters).toBeNull();
+            });
+
+            it('recognizes delegate super call using imported spread helper', () => {
+              const parameters = getConstructorParameters(
+                  `
+              function TestClass() {
+                var _this = _super.apply(this, tslib_1.__spread(arguments)) || this;
+                _this.synthesizedProperty = null;
+                return _this;
+              }`,
+                  'imported');
+
+              expect(parameters).toBeNull();
+            });
+          });
+
+          it('handles the case where a unique name was generated for _super or _this', () => {
+            const parameters = getConstructorParameters(
+                `
+            function TestClass() {
+              var _this_1 = _super_1.apply(this, __spread(arguments)) || this;
+              _this_1._this = null;
+              _this_1._super = null;
+              return _this_1;
+            }`,
+                'inlined');
+
+            expect(parameters).toBeNull();
+          });
+
+          it('does not consider constructors with parameters as synthesized', () => {
+            const parameters = getConstructorParameters(
+                `
+            function TestClass(arg) {
+              return _super.apply(this, __spread(arguments)) || this;
+            }`,
+                'inlined');
+
+            expect(parameters!.length).toBe(1);
+          });
+        });
       });
-    });
 
-    describe('getDeclarationOfIdentifier', () => {
-      // Helpers
-      const createTestForTsHelper =
-          (host: NgccReflectionHost, factoryFn: ts.FunctionExpression,
-           getHelperDeclaration: (factoryFn: ts.FunctionExpression, name: string) =>
-               ts.Declaration) =>
-              (varName: string, helperName: string, knownAs: KnownDeclaration,
-               viaModule: string|null = null) => {
-                const node = getVariableDeclaration(factoryFn, varName);
-                const helperIdentifier = getIdentifierFromCallExpression(node);
-                const helperDeclaration = host.getDeclarationOfIdentifier(helperIdentifier);
+      describe('getDefinitionOfFunction()', () => {
+        it('should return an object describing the function declaration passed as an argument',
+           () => {
+             loadTestFiles([FUNCTION_BODY_FILE]);
+             const bundle = makeTestBundleProgram(FUNCTION_BODY_FILE.name);
+             const host =
+                 createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
 
-                expect(helperDeclaration).toEqual({
-                  known: knownAs,
-                  node: getHelperDeclaration(factoryFn, helperName),
-                  viaModule,
-                  identity: null,
-                });
-              };
+             const fooNode = getDeclaration(
+                 bundle.program, FUNCTION_BODY_FILE.name, 'foo', isNamedFunctionDeclaration)!;
+             const fooDef = host.getDefinitionOfFunction(fooNode)!;
+             expect(fooDef.node).toBe(fooNode);
+             expect(fooDef.body!.length).toEqual(1);
+             expect(fooDef.body![0].getText()).toEqual(`return x;`);
+             expect(fooDef.parameters.length).toEqual(1);
+             expect(fooDef.parameters[0].name).toEqual('x');
+             expect(fooDef.parameters[0].initializer).toBe(null);
+
+             const barNode = getDeclaration(
+                 bundle.program, FUNCTION_BODY_FILE.name, 'bar', isNamedFunctionDeclaration)!;
+             const barDef = host.getDefinitionOfFunction(barNode)!;
+             expect(barDef.node).toBe(barNode);
+             expect(barDef.body!.length).toEqual(1);
+             expect(ts.isReturnStatement(barDef.body![0])).toBeTruthy();
+             expect(barDef.body![0].getText()).toEqual(`return x + y;`);
+             expect(barDef.parameters.length).toEqual(2);
+             expect(barDef.parameters[0].name).toEqual('x');
+             expect(fooDef.parameters[0].initializer).toBe(null);
+             expect(barDef.parameters[1].name).toEqual('y');
+             expect(barDef.parameters[1].initializer!.getText()).toEqual('42');
+
+             const bazNode = getDeclaration(
+                 bundle.program, FUNCTION_BODY_FILE.name, 'baz', isNamedFunctionDeclaration)!;
+             const bazDef = host.getDefinitionOfFunction(bazNode)!;
+             expect(bazDef.node).toBe(bazNode);
+             expect(bazDef.body!.length).toEqual(3);
+             expect(bazDef.parameters.length).toEqual(1);
+             expect(bazDef.parameters[0].name).toEqual('x');
+             expect(bazDef.parameters[0].initializer).toBe(null);
+
+             const quxNode = getDeclaration(
+                 bundle.program, FUNCTION_BODY_FILE.name, 'qux', isNamedFunctionDeclaration)!;
+             const quxDef = host.getDefinitionOfFunction(quxNode)!;
+             expect(quxDef.node).toBe(quxNode);
+             expect(quxDef.body!.length).toEqual(2);
+             expect(quxDef.parameters.length).toEqual(1);
+             expect(quxDef.parameters[0].name).toEqual('x');
+             expect(quxDef.parameters[0].initializer).toBe(null);
+           });
+      });
 
-      const getFunctionDeclaration = (factoryFn: ts.FunctionExpression, name: string) =>
-          factoryFn.body.statements.filter(ts.isFunctionDeclaration)
-              .find(decl => (decl.name !== undefined) && (decl.name.text === name))!;
+      describe('getImportOfIdentifier', () => {
+        it('should find the import of an identifier', () => {
+          loadTestFiles(IMPORTS_FILES);
+          const bundle = makeTestBundleProgram(_('/index.js'));
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const variableNode =
+              getDeclaration(bundle.program, _('/file_b.js'), 'b', isNamedVariableDeclaration);
+          const identifier = (variableNode.initializer &&
+                              ts.isPropertyAccessExpression(variableNode.initializer) &&
+                              ts.isIdentifier(variableNode.initializer.name)) ?
+              variableNode.initializer.name :
+              null;
+
+          expect(identifier).not.toBe(null);
+          const importOfIdent = host.getImportOfIdentifier(identifier!);
+          expect(importOfIdent).toEqual({name: 'a', from: './file_a'});
+        });
 
-      const getIdentifierFromCallExpression = (decl: ts.VariableDeclaration) => {
-        if (decl.initializer !== undefined && ts.isCallExpression(decl.initializer)) {
-          const expr = decl.initializer.expression;
-          if (ts.isIdentifier(expr)) return expr;
-          if (ts.isPropertyAccessExpression(expr) && ts.isIdentifier(expr.name)) return expr.name;
-        }
-        throw new Error(`Unable to extract identifier from declaration '${decl.getText()}'.`);
-      };
+        it('should return null if the identifier was not imported', () => {
+          loadTestFiles(IMPORTS_FILES);
+          const bundle = makeTestBundleProgram(_('/index.js'));
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const variableNode =
+              getDeclaration(bundle.program, _('/file_b.js'), 'd', isNamedVariableDeclaration);
+          const importOfIdent =
+              host.getImportOfIdentifier(variableNode.initializer as ts.Identifier);
 
-      const getVariableDeclaration = (factoryFn: ts.FunctionExpression, name: string) =>
-          factoryFn.body.statements.filter(ts.isVariableStatement)
-              .map(stmt => stmt.declarationList.declarations[0])
-              .find(decl => ts.isIdentifier(decl.name) && (decl.name.text === name))!;
+          expect(importOfIdent).toBeNull();
+        });
 
-      it('should return the declaration of a locally defined identifier', () => {
-        loadTestFiles([SOME_DIRECTIVE_FILE]);
-        const bundle = makeTestBundleProgram(SOME_DIRECTIVE_FILE.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const classNode = getDeclaration(
-            bundle.program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedVariableDeclaration);
-        const ctrDecorators = host.getConstructorParameters(classNode)!;
-        const identifierOfViewContainerRef = (ctrDecorators[0].typeValueReference! as {
-                                               local: true,
-                                               expression: ts.Identifier,
-                                               defaultImportStatement: null,
-                                             }).expression;
-
-        const expectedDeclarationNode = getDeclaration(
-            bundle.program, SOME_DIRECTIVE_FILE.name, 'ViewContainerRef',
-            isNamedVariableDeclaration);
-        const actualDeclaration = host.getDeclarationOfIdentifier(identifierOfViewContainerRef);
-        expect(actualDeclaration).not.toBe(null);
-        expect(actualDeclaration!.node).toBe(expectedDeclarationNode);
-        expect(actualDeclaration!.viaModule).toBe(null);
-        expect((actualDeclaration as ConcreteDeclaration).identity).toBe(null);
+        it('should handle factory functions not wrapped in parentheses', () => {
+          loadTestFiles(IMPORTS_FILES);
+          const bundle = makeTestBundleProgram(_('/index.js'));
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const variableNode =
+              getDeclaration(bundle.program, _('/file_c.js'), 'c', isNamedVariableDeclaration);
+          const identifier = (variableNode.initializer &&
+                              ts.isPropertyAccessExpression(variableNode.initializer) &&
+                              ts.isIdentifier(variableNode.initializer.name)) ?
+              variableNode.initializer.name :
+              null;
+
+          expect(identifier).not.toBe(null);
+          const importOfIdent = host.getImportOfIdentifier(identifier!);
+          expect(importOfIdent).toEqual({name: 'a', from: './file_a'});
+        });
       });
 
-      it('should return the correct declaration for an outer alias identifier', () => {
-        const PROGRAM_FILE: TestFile = {
-          name: _('/test.js'),
-          contents: `
+      describe('getDeclarationOfIdentifier', () => {
+        // Helpers
+        const createTestForTsHelper =
+            (host: NgccReflectionHost, factoryFn: ts.FunctionExpression,
+             getHelperDeclaration: (factoryFn: ts.FunctionExpression, name: string) =>
+                 ts.Declaration) =>
+                (varName: string, helperName: string, knownAs: KnownDeclaration,
+                 viaModule: string|null = null) => {
+                  const node = getVariableDeclaration(factoryFn, varName);
+                  const helperIdentifier = getIdentifierFromCallExpression(node);
+                  const helperDeclaration = host.getDeclarationOfIdentifier(helperIdentifier);
+
+                  expect(helperDeclaration).toEqual({
+                    kind: DeclarationKind.Concrete,
+                    known: knownAs,
+                    node: getHelperDeclaration(factoryFn, helperName),
+                    viaModule,
+                    identity: null,
+                  });
+                };
+
+        const getFunctionDeclaration = (factoryFn: ts.FunctionExpression, name: string) =>
+            factoryFn.body.statements.filter(ts.isFunctionDeclaration)
+                .find(decl => (decl.name !== undefined) && (decl.name.text === name))!;
+
+        const getIdentifierFromCallExpression = (decl: ts.VariableDeclaration) => {
+          if (decl.initializer !== undefined && ts.isCallExpression(decl.initializer)) {
+            const expr = decl.initializer.expression;
+            if (ts.isIdentifier(expr)) return expr;
+            if (ts.isPropertyAccessExpression(expr) && ts.isIdentifier(expr.name)) return expr.name;
+          }
+          throw new Error(`Unable to extract identifier from declaration '${decl.getText()}'.`);
+        };
+
+        const getVariableDeclaration = (factoryFn: ts.FunctionExpression, name: string) =>
+            factoryFn.body.statements.filter(ts.isVariableStatement)
+                .map(stmt => stmt.declarationList.declarations[0])
+                .find(decl => ts.isIdentifier(decl.name) && (decl.name.text === name))!;
+
+        it('should return the declaration of a locally defined identifier', () => {
+          loadTestFiles([SOME_DIRECTIVE_FILE]);
+          const bundle = makeTestBundleProgram(SOME_DIRECTIVE_FILE.name);
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const classNode = getDeclaration(
+              bundle.program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isDesiredDeclaration);
+          const ctrDecorators = host.getConstructorParameters(classNode)!;
+          const identifierOfViewContainerRef = (ctrDecorators[0].typeValueReference! as {
+                                                 kind: TypeValueReferenceKind.LOCAL,
+                                                 expression: ts.Identifier,
+                                                 defaultImportStatement: null,
+                                               }).expression;
+
+          const expectedDeclarationNode = getDeclaration(
+              bundle.program, SOME_DIRECTIVE_FILE.name, 'ViewContainerRef',
+              isNamedVariableDeclaration);
+          const actualDeclaration = host.getDeclarationOfIdentifier(identifierOfViewContainerRef);
+          expect(actualDeclaration).not.toBe(null);
+          expect(actualDeclaration!.node).toBe(expectedDeclarationNode);
+          expect(actualDeclaration!.viaModule).toBe(null);
+          expect((actualDeclaration as ConcreteDeclaration).identity).toBe(null);
+        });
+
+        it('should return the correct declaration for an outer alias identifier', () => {
+          const PROGRAM_FILE: TestFile = {
+            name: _('/test.js'),
+            contents: `
             (function (global, factory) {
               typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
               typeof define === 'function' && define.amd ? define('test', ['exports'], factory) :
               (factory(global.test));
             }(this, (function (exports,module) { 'use strict';
-              var AliasedClass = AliasedClass_1 = (function () {
+              ${expDecl('AliasedClass')} = AliasedClass_1 = (function () {
                 function InnerClass() {
                 }
                 return InnerClass;
@@ -1741,50 +2165,164 @@ runInEachFileSystem(() => {
               var AliasedClass_1;
             })));
           `,
-        };
+          };
 
-        loadTestFiles([PROGRAM_FILE]);
-        const bundle = makeTestBundleProgram(PROGRAM_FILE.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          loadTestFiles([PROGRAM_FILE]);
+          const bundle = makeTestBundleProgram(PROGRAM_FILE.name);
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
 
-        const expectedDeclaration = getDeclaration(
-            bundle.program, PROGRAM_FILE.name, 'AliasedClass', isNamedVariableDeclaration);
-        // Grab the `AliasedClass_1` identifier (which is an alias for `AliasedClass`).
-        const aliasIdentifier =
-            (expectedDeclaration.initializer as ts.BinaryExpression).left as ts.Identifier;
-        const actualDeclaration = host.getDeclarationOfIdentifier(aliasIdentifier);
+          const expectedDeclaration = getDeclaration(
+              bundle.program, PROGRAM_FILE.name, 'AliasedClass', isDesiredDeclaration);
+          // Grab the `AliasedClass_1` identifier (which is an alias for `AliasedClass`).
+          const aliasIdentifier = getDeclaration(
+              bundle.program, PROGRAM_FILE.name, 'AliasedClass_1', isNamedVariableDeclaration);
+          const actualDeclaration = host.getDeclarationOfIdentifier(aliasIdentifier.name);
 
-        expect(aliasIdentifier.getText()).toBe('AliasedClass_1');
-        expect(actualDeclaration).not.toBe(null);
-        expect(actualDeclaration!.node).toBe(expectedDeclaration);
-      });
+          expect(aliasIdentifier.getText()).toBe('AliasedClass_1');
+          expect(actualDeclaration).not.toBe(null);
+          expect(actualDeclaration!.node).toBe(expectedDeclaration);
+        });
 
-      it('should return the source-file of an import namespace', () => {
-        loadFakeCore(getFileSystem());
-        loadTestFiles([SOME_DIRECTIVE_FILE]);
-        const bundle = makeTestBundleProgram(SOME_DIRECTIVE_FILE.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const classNode = getDeclaration(
-            bundle.program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedVariableDeclaration);
-        const classDecorators = host.getDecoratorsOfDeclaration(classNode)!;
-        const identifierOfDirective =
-            (((classDecorators[0].node as ts.ObjectLiteralExpression).properties[0] as
-              ts.PropertyAssignment)
-                 .initializer as ts.PropertyAccessExpression)
-                .expression as ts.Identifier;
-
-        const expectedDeclarationNode =
-            getSourceFileOrError(bundle.program, _('/node_modules/@angular/core/index.d.ts'));
-        const actualDeclaration = host.getDeclarationOfIdentifier(identifierOfDirective);
-        expect(actualDeclaration).not.toBe(null);
-        expect(actualDeclaration!.node).toBe(expectedDeclarationNode);
-        expect(actualDeclaration!.viaModule).toBe('@angular/core');
-      });
+        it('should return the source-file of an import namespace', () => {
+          loadFakeCore(getFileSystem());
+          loadTestFiles([SOME_DIRECTIVE_FILE]);
+          const bundle = makeTestBundleProgram(SOME_DIRECTIVE_FILE.name);
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const classNode = getDeclaration(
+              bundle.program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isDesiredDeclaration);
+          const classDecorators = host.getDecoratorsOfDeclaration(classNode)!;
+          const identifierOfDirective =
+              (((classDecorators[0].node as ts.ObjectLiteralExpression).properties[0] as
+                ts.PropertyAssignment)
+                   .initializer as ts.PropertyAccessExpression)
+                  .expression as ts.Identifier;
+
+          const expectedDeclarationNode =
+              getSourceFileOrError(bundle.program, _('/node_modules/@angular/core/index.d.ts'));
+          const actualDeclaration = host.getDeclarationOfIdentifier(identifierOfDirective);
+          expect(actualDeclaration).not.toBe(null);
+          expect(actualDeclaration!.node).toBe(expectedDeclarationNode);
+          expect(actualDeclaration!.viaModule).toBe('@angular/core');
+        });
 
-      it('should recognize TypeScript helpers (as function declarations)', () => {
-        const file: TestFile = {
-          name: _('/test.js'),
-          contents: `
+        it('should return the source file as the declaration of a standalone "exports" identifier',
+           () => {
+             loadTestFiles([EXPORTS_IDENTIFIERS_FILE]);
+             const bundle = makeTestBundleProgram(EXPORTS_IDENTIFIERS_FILE.name);
+             const host =
+                 createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+             const xVar = getDeclaration(
+                 bundle.program, EXPORTS_IDENTIFIERS_FILE.name, 'x', isNamedVariableDeclaration);
+             const exportsIdentifier = xVar.initializer;
+             if (exportsIdentifier === undefined || !ts.isIdentifier(exportsIdentifier)) {
+               throw new Error('Bad test - unable to find `var x = exports;` statement');
+             }
+             const exportsDeclaration = host.getDeclarationOfIdentifier(exportsIdentifier);
+             expect(exportsDeclaration).not.toBeNull();
+             expect(exportsDeclaration!.node).toBe(bundle.file);
+           });
+
+        it('should return the source file as the declaration of "exports" in the LHS of a property access',
+           () => {
+             loadTestFiles([EXPORTS_IDENTIFIERS_FILE]);
+             const bundle = makeTestBundleProgram(EXPORTS_IDENTIFIERS_FILE.name);
+             const host =
+                 createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+             const exportsStatement = walkForNode(bundle.file, isExportsStatement);
+             if (exportsStatement === undefined) {
+               throw new Error('Bad test - unable to find `exports.foo = 42;` statement');
+             }
+             const exportsIdentifier = exportsStatement.expression.left.expression;
+             const exportsDeclaration = host.getDeclarationOfIdentifier(exportsIdentifier);
+             expect(exportsDeclaration).not.toBeNull();
+             expect(exportsDeclaration!.node).toBe(bundle.file);
+           });
+
+        it('should return the source file as the declaration of "exports" in the LHS of a property access inside a local function',
+           () => {
+             loadTestFiles([EXPORTS_IDENTIFIERS_FILE]);
+             const bundle = makeTestBundleProgram(EXPORTS_IDENTIFIERS_FILE.name);
+             const host =
+                 createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+             const simpleFn = getDeclaration(
+                 bundle.program, EXPORTS_IDENTIFIERS_FILE.name, 'simpleFn',
+                 ts.isFunctionDeclaration);
+             const exportsStatement = walkForNode(simpleFn, isExportsStatement);
+             if (exportsStatement === undefined) {
+               throw new Error('Bad test - unable to find `exports.foo = 42;` statement');
+             }
+             const exportsIdentifier = exportsStatement.expression.left.expression;
+             const exportDeclaration = host.getDeclarationOfIdentifier(exportsIdentifier);
+             expect(exportDeclaration).not.toBeNull();
+             expect(exportDeclaration!.node).toBe(bundle.file);
+           });
+
+        it('should return the variable declaration if a standalone "exports" is declared locally',
+           () => {
+             loadTestFiles([EXPORTS_IDENTIFIERS_FILE]);
+             const bundle = makeTestBundleProgram(EXPORTS_IDENTIFIERS_FILE.name);
+             const host =
+                 createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+             const localVarFn = getDeclaration(
+                 bundle.program, EXPORTS_IDENTIFIERS_FILE.name, 'localVar',
+                 ts.isFunctionDeclaration);
+             const exportsVar = walkForNode(localVarFn, isNamedVariableDeclaration);
+             if (exportsVar === undefined) {
+               throw new Error('Bad test - unable to find `var exports = {}` statement');
+             }
+             const exportsIdentifier = exportsVar.name;
+             if (exportsIdentifier === undefined || !ts.isIdentifier(exportsIdentifier)) {
+               throw new Error('Bad test - unable to find `var exports = {};` statement');
+             }
+             const exportsDeclaration = host.getDeclarationOfIdentifier(exportsIdentifier);
+             expect(exportsDeclaration).not.toBeNull();
+             expect(exportsDeclaration!.node).toBe(exportsVar);
+           });
+
+        it('should return the variable declaration of "exports" in the LHS of a property access, if it is declared locally',
+           () => {
+             loadTestFiles([EXPORTS_IDENTIFIERS_FILE]);
+             const bundle = makeTestBundleProgram(EXPORTS_IDENTIFIERS_FILE.name);
+             const host =
+                 createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+             const localVarFn = getDeclaration(
+                 bundle.program, EXPORTS_IDENTIFIERS_FILE.name, 'localVar',
+                 ts.isFunctionDeclaration);
+             const exportsVar = walkForNode(localVarFn, isNamedVariableDeclaration);
+             const exportsStatement = walkForNode(localVarFn, isExportsStatement);
+             if (exportsStatement === undefined) {
+               throw new Error('Bad test - unable to find `exports.foo = 42;` statement');
+             }
+             const exportsIdentifier = exportsStatement.expression.left.expression;
+             const exportDeclaration = host.getDeclarationOfIdentifier(exportsIdentifier);
+             expect(exportDeclaration).not.toBeNull();
+             expect(exportDeclaration?.node).toBe(exportsVar);
+           });
+
+        it('should return the variable declaration of "exports" in the LHS of a property access, if it is a local function parameter',
+           () => {
+             loadTestFiles([EXPORTS_IDENTIFIERS_FILE]);
+             const bundle = makeTestBundleProgram(EXPORTS_IDENTIFIERS_FILE.name);
+             const host =
+                 createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+             const exportsArgFn = getDeclaration(
+                 bundle.program, EXPORTS_IDENTIFIERS_FILE.name, 'exportsArg',
+                 ts.isFunctionDeclaration);
+             const exportsVar = exportsArgFn.parameters[0];
+             const exportsStatement = walkForNode(exportsArgFn, isExportsStatement);
+             if (exportsStatement === undefined) {
+               throw new Error('Bad test - unable to find `exports.foo = 42;` statement');
+             }
+             const exportsIdentifier = exportsStatement.expression.left.expression;
+             const exportDeclaration = host.getDeclarationOfIdentifier(exportsIdentifier);
+             expect(exportDeclaration).not.toBeNull();
+             expect(exportDeclaration?.node).toBe(exportsVar);
+           });
+
+        it('should recognize TypeScript helpers (as function declarations)', () => {
+          const file: TestFile = {
+            name: _('/test.js'),
+            contents: `
             (function (global, factory) {
               typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
               typeof define === 'function' && define.amd ? define('test', ['exports'], factory) :
@@ -1799,24 +2337,24 @@ runInEachFileSystem(() => {
               var c = __spreadArrays(['foo', 'bar'], ['baz', 'qux']);
             })));
           `,
-        };
-        loadTestFiles([file]);
-        const bundle = makeTestBundleProgram(file.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const {factoryFn} = parseStatementForUmdModule(
-            getSourceFileOrError(bundle.program, file.name).statements[0])!;
+          };
+          loadTestFiles([file]);
+          const bundle = makeTestBundleProgram(file.name);
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const {factoryFn} = parseStatementForUmdModule(
+              getSourceFileOrError(bundle.program, file.name).statements[0])!;
 
-        const testForHelper = createTestForTsHelper(host, factoryFn, getFunctionDeclaration);
+          const testForHelper = createTestForTsHelper(host, factoryFn, getFunctionDeclaration);
 
-        testForHelper('a', '__assign', KnownDeclaration.TsHelperAssign);
-        testForHelper('b', '__spread', KnownDeclaration.TsHelperSpread);
-        testForHelper('c', '__spreadArrays', KnownDeclaration.TsHelperSpreadArrays);
-      });
+          testForHelper('a', '__assign', KnownDeclaration.TsHelperAssign);
+          testForHelper('b', '__spread', KnownDeclaration.TsHelperSpread);
+          testForHelper('c', '__spreadArrays', KnownDeclaration.TsHelperSpreadArrays);
+        });
 
-      it('should recognize suffixed TypeScript helpers (as function declarations)', () => {
-        const file: TestFile = {
-          name: _('/test.js'),
-          contents: `
+        it('should recognize suffixed TypeScript helpers (as function declarations)', () => {
+          const file: TestFile = {
+            name: _('/test.js'),
+            contents: `
             (function (global, factory) {
               typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
               typeof define === 'function' && define.amd ? define('test', ['exports'], factory) :
@@ -1831,24 +2369,24 @@ runInEachFileSystem(() => {
               var c = __spreadArrays$3(['foo', 'bar'], ['baz', 'qux']);
             })));
           `,
-        };
-        loadTestFiles([file]);
-        const bundle = makeTestBundleProgram(file.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const {factoryFn} = parseStatementForUmdModule(
-            getSourceFileOrError(bundle.program, file.name).statements[0])!;
+          };
+          loadTestFiles([file]);
+          const bundle = makeTestBundleProgram(file.name);
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const {factoryFn} = parseStatementForUmdModule(
+              getSourceFileOrError(bundle.program, file.name).statements[0])!;
 
-        const testForHelper = createTestForTsHelper(host, factoryFn, getFunctionDeclaration);
+          const testForHelper = createTestForTsHelper(host, factoryFn, getFunctionDeclaration);
 
-        testForHelper('a', '__assign$1', KnownDeclaration.TsHelperAssign);
-        testForHelper('b', '__spread$2', KnownDeclaration.TsHelperSpread);
-        testForHelper('c', '__spreadArrays$3', KnownDeclaration.TsHelperSpreadArrays);
-      });
+          testForHelper('a', '__assign$1', KnownDeclaration.TsHelperAssign);
+          testForHelper('b', '__spread$2', KnownDeclaration.TsHelperSpread);
+          testForHelper('c', '__spreadArrays$3', KnownDeclaration.TsHelperSpreadArrays);
+        });
 
-      it('should recognize TypeScript helpers (as variable declarations)', () => {
-        const file: TestFile = {
-          name: _('/test.js'),
-          contents: `
+        it('should recognize TypeScript helpers (as variable declarations)', () => {
+          const file: TestFile = {
+            name: _('/test.js'),
+            contents: `
             (function (global, factory) {
               typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
               typeof define === 'function' && define.amd ? define('test', ['exports'], factory) :
@@ -1863,24 +2401,24 @@ runInEachFileSystem(() => {
               var c = __spreadArrays(['foo', 'bar'], ['baz', 'qux']);
             })));
           `,
-        };
-        loadTestFiles([file]);
-        const bundle = makeTestBundleProgram(file.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const {factoryFn} = parseStatementForUmdModule(
-            getSourceFileOrError(bundle.program, file.name).statements[0])!;
+          };
+          loadTestFiles([file]);
+          const bundle = makeTestBundleProgram(file.name);
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const {factoryFn} = parseStatementForUmdModule(
+              getSourceFileOrError(bundle.program, file.name).statements[0])!;
 
-        const testForHelper = createTestForTsHelper(host, factoryFn, getVariableDeclaration);
+          const testForHelper = createTestForTsHelper(host, factoryFn, getVariableDeclaration);
 
-        testForHelper('a', '__assign', KnownDeclaration.TsHelperAssign);
-        testForHelper('b', '__spread', KnownDeclaration.TsHelperSpread);
-        testForHelper('c', '__spreadArrays', KnownDeclaration.TsHelperSpreadArrays);
-      });
+          testForHelper('a', '__assign', KnownDeclaration.TsHelperAssign);
+          testForHelper('b', '__spread', KnownDeclaration.TsHelperSpread);
+          testForHelper('c', '__spreadArrays', KnownDeclaration.TsHelperSpreadArrays);
+        });
 
-      it('should recognize suffixed TypeScript helpers (as variable declarations)', () => {
-        const file: TestFile = {
-          name: _('/test.js'),
-          contents: `
+        it('should recognize suffixed TypeScript helpers (as variable declarations)', () => {
+          const file: TestFile = {
+            name: _('/test.js'),
+            contents: `
             (function (global, factory) {
               typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
               typeof define === 'function' && define.amd ? define('test', ['exports'], factory) :
@@ -1895,25 +2433,25 @@ runInEachFileSystem(() => {
               var c = __spreadArrays$3(['foo', 'bar'], ['baz', 'qux']);
             })));
           `,
-        };
-        loadTestFiles([file]);
-        const bundle = makeTestBundleProgram(file.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const {factoryFn} = parseStatementForUmdModule(
-            getSourceFileOrError(bundle.program, file.name).statements[0])!;
-
-        const testForHelper = createTestForTsHelper(host, factoryFn, getVariableDeclaration);
+          };
+          loadTestFiles([file]);
+          const bundle = makeTestBundleProgram(file.name);
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const {factoryFn} = parseStatementForUmdModule(
+              getSourceFileOrError(bundle.program, file.name).statements[0])!;
 
-        testForHelper('a', '__assign$1', KnownDeclaration.TsHelperAssign);
-        testForHelper('b', '__spread$2', KnownDeclaration.TsHelperSpread);
-        testForHelper('c', '__spreadArrays$3', KnownDeclaration.TsHelperSpreadArrays);
-      });
+          const testForHelper = createTestForTsHelper(host, factoryFn, getVariableDeclaration);
 
-      it('should recognize imported TypeScript helpers', () => {
-        const files: TestFile[] = [
-          {
-            name: _('/test.js'),
-            contents: `
+          testForHelper('a', '__assign$1', KnownDeclaration.TsHelperAssign);
+          testForHelper('b', '__spread$2', KnownDeclaration.TsHelperSpread);
+          testForHelper('c', '__spreadArrays$3', KnownDeclaration.TsHelperSpreadArrays);
+        });
+
+        it('should recognize imported TypeScript helpers', () => {
+          const files: TestFile[] = [
+            {
+              name: _('/test.js'),
+              contents: `
               (function (global, factory) {
                 typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('tslib')) :
                 typeof define === 'function' && define.amd ? define('test', ['exports', 'tslib'], factory) :
@@ -1924,37 +2462,37 @@ runInEachFileSystem(() => {
                 var c = tslib_1.__spreadArrays(['foo', 'bar'], ['baz', 'qux']);
               })));
             `,
-          },
-          {
-            name: _('/node_modules/tslib/index.d.ts'),
-            contents: `
+            },
+            {
+              name: _('/node_modules/tslib/index.d.ts'),
+              contents: `
               export declare function __assign(t: any, ...sources: any[]): any;
               export declare function __spread(...args: any[][]): any[];
               export declare function __spreadArrays(...args: any[][]): any[];
             `,
-          },
-        ];
-        loadTestFiles(files);
+            },
+          ];
+          loadTestFiles(files);
 
-        const [testFile, tslibFile] = files;
-        const bundle = makeTestBundleProgram(testFile.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const {factoryFn} = parseStatementForUmdModule(
-            getSourceFileOrError(bundle.program, testFile.name).statements[0])!;
-        const testForHelper = createTestForTsHelper(
-            host, factoryFn,
-            (_fn, helperName) => getDeclaration(
-                bundle.program, tslibFile.name, helperName, ts.isFunctionDeclaration));
-
-        testForHelper('a', '__assign', KnownDeclaration.TsHelperAssign, 'tslib');
-        testForHelper('b', '__spread', KnownDeclaration.TsHelperSpread, 'tslib');
-        testForHelper('c', '__spreadArrays', KnownDeclaration.TsHelperSpreadArrays, 'tslib');
-      });
+          const [testFile, tslibFile] = files;
+          const bundle = makeTestBundleProgram(testFile.name);
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const {factoryFn} = parseStatementForUmdModule(
+              getSourceFileOrError(bundle.program, testFile.name).statements[0])!;
+          const testForHelper = createTestForTsHelper(
+              host, factoryFn,
+              (_fn, helperName) => getDeclaration(
+                  bundle.program, tslibFile.name, helperName, ts.isFunctionDeclaration));
+
+          testForHelper('a', '__assign', KnownDeclaration.TsHelperAssign, 'tslib');
+          testForHelper('b', '__spread', KnownDeclaration.TsHelperSpread, 'tslib');
+          testForHelper('c', '__spreadArrays', KnownDeclaration.TsHelperSpreadArrays, 'tslib');
+        });
 
-      it('should recognize undeclared, unimported TypeScript helpers (by name)', () => {
-        const file: TestFile = {
-          name: _('/test.js'),
-          contents: `
+        it('should recognize undeclared, unimported TypeScript helpers (by name)', () => {
+          const file: TestFile = {
+            name: _('/test.js'),
+            contents: `
             (function (global, factory) {
               typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
               typeof define === 'function' && define.amd ? define('test', ['exports'], factory) :
@@ -1965,35 +2503,36 @@ runInEachFileSystem(() => {
               var c = __spreadArrays(['foo', 'bar'], ['baz', 'qux']);
             })));
           `,
-        };
-        loadTestFiles([file]);
-        const bundle = makeTestBundleProgram(file.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const {factoryFn} = parseStatementForUmdModule(
-            getSourceFileOrError(bundle.program, file.name).statements[0])!;
-
-        const testForHelper = (varName: string, helperName: string, knownAs: KnownDeclaration) => {
-          const node = getVariableDeclaration(factoryFn, varName);
-          const helperIdentifier = getIdentifierFromCallExpression(node);
-          const helperDeclaration = host.getDeclarationOfIdentifier(helperIdentifier);
-
-          expect(helperDeclaration).toEqual({
-            known: knownAs,
-            expression: helperIdentifier,
-            node: null,
-            viaModule: null,
-          });
-        };
+          };
+          loadTestFiles([file]);
+          const bundle = makeTestBundleProgram(file.name);
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const {factoryFn} = parseStatementForUmdModule(
+              getSourceFileOrError(bundle.program, file.name).statements[0])!;
 
-        testForHelper('a', '__assign', KnownDeclaration.TsHelperAssign);
-        testForHelper('b', '__spread', KnownDeclaration.TsHelperSpread);
-        testForHelper('c', '__spreadArrays', KnownDeclaration.TsHelperSpreadArrays);
-      });
+          const testForHelper =
+              (varName: string, helperName: string, knownAs: KnownDeclaration) => {
+                const node = getVariableDeclaration(factoryFn, varName);
+                const helperIdentifier = getIdentifierFromCallExpression(node);
+                const helperDeclaration = host.getDeclarationOfIdentifier(helperIdentifier);
 
-      it('should recognize suffixed, undeclared, unimported TypeScript helpers (by name)', () => {
-        const file: TestFile = {
-          name: _('/test.js'),
-          contents: `
+                expect(helperDeclaration).toEqual({
+                  kind: DeclarationKind.Inline,
+                  known: knownAs,
+                  node: helperIdentifier,
+                  viaModule: null,
+                });
+              };
+
+          testForHelper('a', '__assign', KnownDeclaration.TsHelperAssign);
+          testForHelper('b', '__spread', KnownDeclaration.TsHelperSpread);
+          testForHelper('c', '__spreadArrays', KnownDeclaration.TsHelperSpreadArrays);
+        });
+
+        it('should recognize suffixed, undeclared, unimported TypeScript helpers (by name)', () => {
+          const file: TestFile = {
+            name: _('/test.js'),
+            contents: `
             (function (global, factory) {
               typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
               typeof define === 'function' && define.amd ? define('test', ['exports'], factory) :
@@ -2004,35 +2543,36 @@ runInEachFileSystem(() => {
               var c = __spreadArrays$3(['foo', 'bar'], ['baz', 'qux']);
             })));
           `,
-        };
-        loadTestFiles([file]);
-        const bundle = makeTestBundleProgram(file.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const {factoryFn} = parseStatementForUmdModule(
-            getSourceFileOrError(bundle.program, file.name).statements[0])!;
-
-        const testForHelper = (varName: string, helperName: string, knownAs: KnownDeclaration) => {
-          const node = getVariableDeclaration(factoryFn, varName);
-          const helperIdentifier = getIdentifierFromCallExpression(node);
-          const helperDeclaration = host.getDeclarationOfIdentifier(helperIdentifier);
-
-          expect(helperDeclaration).toEqual({
-            known: knownAs,
-            expression: helperIdentifier,
-            node: null,
-            viaModule: null,
-          });
-        };
+          };
+          loadTestFiles([file]);
+          const bundle = makeTestBundleProgram(file.name);
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const {factoryFn} = parseStatementForUmdModule(
+              getSourceFileOrError(bundle.program, file.name).statements[0])!;
 
-        testForHelper('a', '__assign$1', KnownDeclaration.TsHelperAssign);
-        testForHelper('b', '__spread$2', KnownDeclaration.TsHelperSpread);
-        testForHelper('c', '__spreadArrays$3', KnownDeclaration.TsHelperSpreadArrays);
-      });
+          const testForHelper =
+              (varName: string, helperName: string, knownAs: KnownDeclaration) => {
+                const node = getVariableDeclaration(factoryFn, varName);
+                const helperIdentifier = getIdentifierFromCallExpression(node);
+                const helperDeclaration = host.getDeclarationOfIdentifier(helperIdentifier);
 
-      it('should recognize enum declarations with string values', () => {
-        const testFile: TestFile = {
-          name: _('/node_modules/test-package/some/file.js'),
-          contents: `
+                expect(helperDeclaration).toEqual({
+                  kind: DeclarationKind.Inline,
+                  known: knownAs,
+                  node: helperIdentifier,
+                  viaModule: null,
+                });
+              };
+
+          testForHelper('a', '__assign$1', KnownDeclaration.TsHelperAssign);
+          testForHelper('b', '__spread$2', KnownDeclaration.TsHelperSpread);
+          testForHelper('c', '__spreadArrays$3', KnownDeclaration.TsHelperSpreadArrays);
+        });
+
+        it('should recognize enum declarations with string values', () => {
+          const testFile: TestFile = {
+            name: _('/node_modules/test-package/some/file.js'),
+            contents: `
           (function (global, factory) {
             typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core')) :
             typeof define === 'function' && define.amd ? define('some_directive', ['exports', '@angular/core'], factory) :
@@ -2047,30 +2587,30 @@ runInEachFileSystem(() => {
             var value = Enum;
           })));
           `
-        };
-        loadTestFiles([testFile]);
-        const bundle = makeTestBundleProgram(testFile.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const {factoryFn} = parseStatementForUmdModule(
-            getSourceFileOrError(bundle.program, _('/node_modules/test-package/some/file.js'))
-                .statements[0])!;
-        const valueDecl = getVariableDeclaration(factoryFn, 'value');
-        const declaration = host.getDeclarationOfIdentifier(
-                                valueDecl.initializer as ts.Identifier) as ConcreteDeclaration;
-
-        const enumMembers = (declaration.identity as DownleveledEnum).enumMembers;
-        expect(declaration.node.parent.parent.getText()).toBe('var Enum;');
-        expect(enumMembers!.length).toBe(2);
-        expect(enumMembers![0].name.getText()).toBe('"ValueA"');
-        expect(enumMembers![0].initializer!.getText()).toBe('"1"');
-        expect(enumMembers![1].name.getText()).toBe('"ValueB"');
-        expect(enumMembers![1].initializer!.getText()).toBe('"2"');
-      });
+          };
+          loadTestFiles([testFile]);
+          const bundle = makeTestBundleProgram(testFile.name);
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const {factoryFn} = parseStatementForUmdModule(
+              getSourceFileOrError(bundle.program, _('/node_modules/test-package/some/file.js'))
+                  .statements[0])!;
+          const valueDecl = getVariableDeclaration(factoryFn, 'value');
+          const declaration = host.getDeclarationOfIdentifier(
+                                  valueDecl.initializer as ts.Identifier) as ConcreteDeclaration;
+
+          const enumMembers = (declaration.identity as DownleveledEnum).enumMembers;
+          expect(declaration.node.parent.parent.getText()).toBe('var Enum;');
+          expect(enumMembers!.length).toBe(2);
+          expect(enumMembers![0].name.getText()).toBe('"ValueA"');
+          expect(enumMembers![0].initializer!.getText()).toBe('"1"');
+          expect(enumMembers![1].name.getText()).toBe('"ValueB"');
+          expect(enumMembers![1].initializer!.getText()).toBe('"2"');
+        });
 
-      it('should recognize enum declarations with numeric values', () => {
-        const testFile: TestFile = {
-          name: _('/node_modules/test-package/some/file.js'),
-          contents: `
+        it('should recognize enum declarations with numeric values', () => {
+          const testFile: TestFile = {
+            name: _('/node_modules/test-package/some/file.js'),
+            contents: `
           (function (global, factory) {
             typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core')) :
             typeof define === 'function' && define.amd ? define('some_directive', ['exports', '@angular/core'], factory) :
@@ -2085,31 +2625,31 @@ runInEachFileSystem(() => {
             var value = Enum;
           })));
           `
-        };
-        loadTestFiles([testFile]);
-        const bundle = makeTestBundleProgram(testFile.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const {factoryFn} = parseStatementForUmdModule(
-            getSourceFileOrError(bundle.program, _('/node_modules/test-package/some/file.js'))
-                .statements[0])!;
-        const valueDecl = getVariableDeclaration(factoryFn, 'value');
-        const declaration = host.getDeclarationOfIdentifier(
-                                valueDecl.initializer as ts.Identifier) as ConcreteDeclaration;
-
-        const enumMembers = (declaration.identity as DownleveledEnum).enumMembers;
-        expect(declaration.node.parent.parent.getText()).toBe('var Enum;');
-        expect(enumMembers!.length).toBe(2);
-        expect(enumMembers![0].name.getText()).toBe('"ValueA"');
-        expect(enumMembers![0].initializer!.getText()).toBe('"1"');
-        expect(enumMembers![1].name.getText()).toBe('"ValueB"');
-        expect(enumMembers![1].initializer!.getText()).toBe('"2"');
-      });
+          };
+          loadTestFiles([testFile]);
+          const bundle = makeTestBundleProgram(testFile.name);
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const {factoryFn} = parseStatementForUmdModule(
+              getSourceFileOrError(bundle.program, _('/node_modules/test-package/some/file.js'))
+                  .statements[0])!;
+          const valueDecl = getVariableDeclaration(factoryFn, 'value');
+          const declaration = host.getDeclarationOfIdentifier(
+                                  valueDecl.initializer as ts.Identifier) as ConcreteDeclaration;
+
+          const enumMembers = (declaration.identity as DownleveledEnum).enumMembers;
+          expect(declaration.node.parent.parent.getText()).toBe('var Enum;');
+          expect(enumMembers!.length).toBe(2);
+          expect(enumMembers![0].name.getText()).toBe('"ValueA"');
+          expect(enumMembers![0].initializer!.getText()).toBe('"1"');
+          expect(enumMembers![1].name.getText()).toBe('"ValueB"');
+          expect(enumMembers![1].initializer!.getText()).toBe('"2"');
+        });
 
-      it('should not consider IIFEs that do no assign members to the parameter as an enum declaration',
-         () => {
-           const testFile: TestFile = {
-             name: _('/node_modules/test-package/some/file.js'),
-             contents: `
+        it('should not consider IIFEs that do no assign members to the parameter as an enum declaration',
+           () => {
+             const testFile: TestFile = {
+               name: _('/node_modules/test-package/some/file.js'),
+               contents: `
           (function (global, factory) {
             typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core')) :
             typeof define === 'function' && define.amd ? define('some_directive', ['exports', '@angular/core'], factory) :
@@ -2124,24 +2664,25 @@ runInEachFileSystem(() => {
             var value = Enum;
           })));
           `
-           };
-           loadTestFiles([testFile]);
-           const bundle = makeTestBundleProgram(testFile.name);
-           const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-           const valueDecl = getDeclaration(
-               bundle.program, _('/node_modules/test-package/some/file.js'), 'value',
-               ts.isVariableDeclaration);
-           const declaration = host.getDeclarationOfIdentifier(
-                                   valueDecl.initializer as ts.Identifier) as ConcreteDeclaration;
-
-           expect(declaration.node.parent.parent.getText()).toBe('var Enum;');
-           expect(declaration.identity).toBe(null);
-         });
-
-      it('should not consider IIFEs without call argument as an enum declaration', () => {
-        const testFile: TestFile = {
-          name: _('/node_modules/test-package/some/file.js'),
-          contents: `
+             };
+             loadTestFiles([testFile]);
+             const bundle = makeTestBundleProgram(testFile.name);
+             const host =
+                 createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+             const valueDecl = getDeclaration(
+                 bundle.program, _('/node_modules/test-package/some/file.js'), 'value',
+                 isNamedVariableDeclaration);
+             const declaration = host.getDeclarationOfIdentifier(
+                                     valueDecl.initializer as ts.Identifier) as ConcreteDeclaration;
+
+             expect(declaration.node.parent.parent.getText()).toBe('var Enum;');
+             expect(declaration.identity).toBe(null);
+           });
+
+        it('should not consider IIFEs without call argument as an enum declaration', () => {
+          const testFile: TestFile = {
+            name: _('/node_modules/test-package/some/file.js'),
+            contents: `
           (function (global, factory) {
             typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core')) :
             typeof define === 'function' && define.amd ? define('some_directive', ['exports', '@angular/core'], factory) :
@@ -2156,782 +2697,802 @@ runInEachFileSystem(() => {
             var value = Enum;
           })));
           `
-        };
-        loadTestFiles([testFile]);
-        const bundle = makeTestBundleProgram(testFile.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const valueDecl = getDeclaration(
-            bundle.program, _('/node_modules/test-package/some/file.js'), 'value',
-            ts.isVariableDeclaration);
-        const declaration = host.getDeclarationOfIdentifier(
-                                valueDecl.initializer as ts.Identifier) as ConcreteDeclaration;
-
-        expect(declaration.node.parent.parent.getText()).toBe('var Enum;');
-        expect(declaration.identity).toBe(null);
+          };
+          loadTestFiles([testFile]);
+          const bundle = makeTestBundleProgram(testFile.name);
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const valueDecl = getDeclaration(
+              bundle.program, _('/node_modules/test-package/some/file.js'), 'value',
+              isNamedVariableDeclaration);
+          const declaration = host.getDeclarationOfIdentifier(
+                                  valueDecl.initializer as ts.Identifier) as ConcreteDeclaration;
+
+          expect(declaration.node.parent.parent.getText()).toBe('var Enum;');
+          expect(declaration.identity).toBe(null);
+        });
       });
-    });
 
-    describe('getExportsOfModule()', () => {
-      it('should return a map of all the exports from a given module', () => {
-        loadFakeCore(getFileSystem());
-        loadTestFiles(EXPORTS_FILES);
-        const bundle = makeTestBundleProgram(_('/index.js'));
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const file = getSourceFileOrError(bundle.program, _('/b_module.js'));
-        const exportDeclarations = host.getExportsOfModule(file);
-        expect(exportDeclarations).not.toBe(null);
-        expect(Array.from(exportDeclarations!.entries())
-                   .map(entry => [entry[0], entry[1].node!.getText(), entry[1].viaModule]))
-            .toEqual([
-              ['Directive', `Directive: FnWithArg<(clazz: any) => any>`, '@angular/core'],
-              ['a', `a = 'a'`, null],
-              ['b', `b = a_module.a`, null],
-              ['c', `a = 'a'`, null],
-              ['d', `b = a_module.a`, null],
-              ['e', `e = 'e'`, null],
-              ['DirectiveX', `Directive: FnWithArg<(clazz: any) => any>`, '@angular/core'],
-              [
-                'SomeClass', `SomeClass = (function() {
+      describe('getExportsOfModule()', () => {
+        it('should return a map of all the exports from a given module', () => {
+          loadFakeCore(getFileSystem());
+          loadTestFiles(EXPORTS_FILES);
+          const bundle = makeTestBundleProgram(_('/index.js'));
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const file = getSourceFileOrError(bundle.program, _('/b_module.js'));
+          const exportDeclarations = host.getExportsOfModule(file);
+          expect(exportDeclarations).not.toBe(null);
+          expect(Array.from(exportDeclarations!.entries())
+                     .map(entry => [entry[0], entry[1].node!.getText(), entry[1].viaModule]))
+              .toEqual([
+                ['Directive', `Directive: FnWithArg<(clazz: any) => any>`, '@angular/core'],
+                ['a', `a = 'a'`, null],
+                ['b', `b = a_module.a`, null],
+                ['c', `a = 'a'`, null],
+                ['d', `b = a_module.a`, null],
+                ['e', `e = 'e'`, null],
+                ['DirectiveX', `Directive: FnWithArg<(clazz: any) => any>`, '@angular/core'],
+                [
+                  'SomeClass', `SomeClass = (function() {
     function SomeClass() {}
     return SomeClass;
   }())`,
-                null
-              ],
-            ]);
-      });
+                  null
+                ],
+              ]);
+        });
 
-      it('should handle wildcard re-exports of other modules (with emitted helpers)', () => {
-        loadFakeCore(getFileSystem());
-        loadTestFiles(EXPORTS_FILES);
-        const bundle = makeTestBundleProgram(_('/index.js'));
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const file = getSourceFileOrError(bundle.program, _('/wildcard_reexports.js'));
-        const exportDeclarations = host.getExportsOfModule(file);
-        expect(exportDeclarations).not.toBe(null);
-        expect(Array.from(exportDeclarations!.entries())
-                   .map(entry => [entry[0], entry[1].node!.getText(), entry[1].viaModule]))
-            .toEqual([
-              ['Directive', `Directive: FnWithArg<(clazz: any) => any>`, _('/b_module')],
-              ['a', `a = 'a'`, _('/b_module')],
-              ['b', `b = a_module.a`, _('/b_module')],
-              ['c', `a = 'a'`, _('/b_module')],
-              ['d', `b = a_module.a`, _('/b_module')],
-              ['e', `e = 'e'`, _('/b_module')],
-              ['DirectiveX', `Directive: FnWithArg<(clazz: any) => any>`, _('/b_module')],
-              [
-                'SomeClass',
-                `SomeClass = (function() {\n    function SomeClass() {}\n    return SomeClass;\n  }())`,
-                _('/b_module')
-              ],
-              ['xtra1', `xtra1 = 'xtra1'`, _('/xtra_module')],
-              ['xtra2', `xtra2 = 'xtra2'`, _('/xtra_module')],
-            ]);
-      });
+        it('should return the correct declaration for a decorated class', () => {
+          loadFakeCore(getFileSystem());
+          loadTestFiles(EXPORTS_FILES);
+          const bundle = makeTestBundleProgram(_('/decorated_class.js'));
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const file = getSourceFileOrError(bundle.program, _('/decorated_class.js'));
+          const exportDeclarations = host.getExportsOfModule(file);
+          expect(exportDeclarations).not.toBe(null);
+          expect(exportDeclarations!.size).toEqual(1);
+          const classDecl = exportDeclarations!.get('DecoratedClass') as InlineDeclaration;
+          expect(classDecl).toBeDefined();
+          expect(classDecl.kind).toEqual(DeclarationKind.Inline);
+          expect(classDecl.known).toBe(null);
+          expect(classDecl.viaModule).toBe(null);
+          expect(classDecl.node.getText()).toEqual('exports.DecoratedClass');
+          expect(classDecl.implementation!.getText()).toContain('function DecoratedClass() {');
+        });
 
-      it('should handle wildcard re-exports of other modules (with imported helpers)', () => {
-        loadFakeCore(getFileSystem());
-        loadTestFiles(EXPORTS_FILES);
-        const bundle = makeTestBundleProgram(_('/index.js'));
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const file =
-            getSourceFileOrError(bundle.program, _('/wildcard_reexports_imported_helpers.js'));
-        const exportDeclarations = host.getExportsOfModule(file);
-        expect(exportDeclarations).not.toBe(null);
-        expect(Array.from(exportDeclarations!.entries())
-                   .map(entry => [entry[0], entry[1].node!.getText(), entry[1].viaModule]))
-            .toEqual([
-              ['Directive', `Directive: FnWithArg<(clazz: any) => any>`, _('/b_module')],
-              ['a', `a = 'a'`, _('/b_module')],
-              ['b', `b = a_module.a`, _('/b_module')],
-              ['c', `a = 'a'`, _('/b_module')],
-              ['d', `b = a_module.a`, _('/b_module')],
-              ['e', `e = 'e'`, _('/b_module')],
-              ['DirectiveX', `Directive: FnWithArg<(clazz: any) => any>`, _('/b_module')],
-              [
-                'SomeClass',
-                `SomeClass = (function() {\n    function SomeClass() {}\n    return SomeClass;\n  }())`,
-                _('/b_module')
-              ],
-              ['xtra1', `xtra1 = 'xtra1'`, _('/xtra_module')],
-              ['xtra2', `xtra2 = 'xtra2'`, _('/xtra_module')],
-            ]);
-      });
+        it('should handle wildcard re-exports of other modules (with emitted helpers)', () => {
+          loadFakeCore(getFileSystem());
+          loadTestFiles(EXPORTS_FILES);
+          const bundle = makeTestBundleProgram(_('/index.js'));
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const file = getSourceFileOrError(bundle.program, _('/wildcard_reexports.js'));
+          const exportDeclarations = host.getExportsOfModule(file);
+          expect(exportDeclarations).not.toBe(null);
+          expect(Array.from(exportDeclarations!.entries())
+                     .map(entry => [entry[0], entry[1].node!.getText(), entry[1].viaModule]))
+              .toEqual([
+                ['Directive', `Directive: FnWithArg<(clazz: any) => any>`, _('/b_module')],
+                ['a', `a = 'a'`, _('/b_module')],
+                ['b', `b = a_module.a`, _('/b_module')],
+                ['c', `a = 'a'`, _('/b_module')],
+                ['d', `b = a_module.a`, _('/b_module')],
+                ['e', `e = 'e'`, _('/b_module')],
+                ['DirectiveX', `Directive: FnWithArg<(clazz: any) => any>`, _('/b_module')],
+                [
+                  'SomeClass',
+                  `SomeClass = (function() {\n    function SomeClass() {}\n    return SomeClass;\n  }())`,
+                  _('/b_module')
+                ],
+                ['xtra1', `xtra1 = 'xtra1'`, _('/xtra_module')],
+                ['xtra2', `xtra2 = 'xtra2'`, _('/xtra_module')],
+              ]);
+        });
 
-      it('should handle inline exports', () => {
-        loadFakeCore(getFileSystem());
-        loadTestFiles([INLINE_EXPORT_FILE]);
-        const bundle = makeTestBundleProgram(INLINE_EXPORT_FILE.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const file = getSourceFileOrError(bundle.program, INLINE_EXPORT_FILE.name);
-        const exportDeclarations = host.getExportsOfModule(file);
-        expect(exportDeclarations).not.toBe(null);
-        const decl = exportDeclarations!.get('directives') as InlineDeclaration;
-        expect(decl).not.toBeUndefined();
-        expect(decl.node).toBeNull();
-        expect(decl.expression).toBeDefined();
-      });
+        it('should handle wildcard re-exports of other modules (with imported helpers)', () => {
+          loadFakeCore(getFileSystem());
+          loadTestFiles(EXPORTS_FILES);
+          const bundle = makeTestBundleProgram(_('/index.js'));
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const file =
+              getSourceFileOrError(bundle.program, _('/wildcard_reexports_imported_helpers.js'));
+          const exportDeclarations = host.getExportsOfModule(file);
+          expect(exportDeclarations).not.toBe(null);
+          expect(Array.from(exportDeclarations!.entries())
+                     .map(entry => [entry[0], entry[1].node!.getText(), entry[1].viaModule]))
+              .toEqual([
+                ['Directive', `Directive: FnWithArg<(clazz: any) => any>`, _('/b_module')],
+                ['a', `a = 'a'`, _('/b_module')],
+                ['b', `b = a_module.a`, _('/b_module')],
+                ['c', `a = 'a'`, _('/b_module')],
+                ['d', `b = a_module.a`, _('/b_module')],
+                ['e', `e = 'e'`, _('/b_module')],
+                ['DirectiveX', `Directive: FnWithArg<(clazz: any) => any>`, _('/b_module')],
+                [
+                  'SomeClass',
+                  `SomeClass = (function() {\n    function SomeClass() {}\n    return SomeClass;\n  }())`,
+                  _('/b_module')
+                ],
+                ['xtra1', `xtra1 = 'xtra1'`, _('/xtra_module')],
+                ['xtra2', `xtra2 = 'xtra2'`, _('/xtra_module')],
+              ]);
+        });
 
-      it('should recognize declarations of known TypeScript helpers', () => {
-        const tslib = {
-          name: _('/tslib.d.ts'),
-          contents: `
+        it('should handle inline exports', () => {
+          loadFakeCore(getFileSystem());
+          loadTestFiles([INLINE_EXPORT_FILE]);
+          const bundle = makeTestBundleProgram(INLINE_EXPORT_FILE.name);
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const file = getSourceFileOrError(bundle.program, INLINE_EXPORT_FILE.name);
+          const exportDeclarations = host.getExportsOfModule(file);
+          expect(exportDeclarations).not.toBe(null);
+          const decl = exportDeclarations!.get('directives') as InlineDeclaration;
+          expect(decl).toBeDefined();
+          expect(decl.node.getText()).toEqual('exports.directives');
+          expect(decl.implementation!.getText()).toEqual('[foo]');
+          expect(decl.kind).toEqual(DeclarationKind.Inline);
+        });
+
+        it('should recognize declarations of known TypeScript helpers', () => {
+          const tslib = {
+            name: _('/tslib.d.ts'),
+            contents: `
             export declare function __assign(t: any, ...sources: any[]): any;
             export declare function __spread(...args: any[][]): any[];
             export declare function __spreadArrays(...args: any[][]): any[];
             export declare function __unknownHelper(...args: any[]): any;
           `,
-        };
-        loadTestFiles([tslib]);
-        const bundle = makeTestBundleProgram(tslib.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const sf = getSourceFileOrError(bundle.program, tslib.name);
-        const exportDeclarations = host.getExportsOfModule(sf)!;
-
-        expect([...exportDeclarations].map(([exportName, {known}]) => [exportName, known]))
-            .toEqual([
-              ['__assign', KnownDeclaration.TsHelperAssign],
-              ['__spread', KnownDeclaration.TsHelperSpread],
-              ['__spreadArrays', KnownDeclaration.TsHelperSpreadArrays],
-              ['__unknownHelper', null],
-            ]);
-      });
+          };
+          loadTestFiles([tslib]);
+          const bundle = makeTestBundleProgram(tslib.name);
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const sf = getSourceFileOrError(bundle.program, tslib.name);
+          const exportDeclarations = host.getExportsOfModule(sf)!;
+
+          expect([...exportDeclarations].map(([exportName, {known}]) => [exportName, known]))
+              .toEqual([
+                ['__assign', KnownDeclaration.TsHelperAssign],
+                ['__spread', KnownDeclaration.TsHelperSpread],
+                ['__spreadArrays', KnownDeclaration.TsHelperSpreadArrays],
+                ['__unknownHelper', null],
+              ]);
+        });
 
-      it('should define property exports from a module', () => {
-        loadFakeCore(getFileSystem());
-        loadTestFiles(EXPORTS_FILES);
-        const bundle = makeTestBundleProgram(_('/index.js'));
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const file = getSourceFileOrError(bundle.program, _('/define_property_reexports.js'));
-        const exportDeclarations = host.getExportsOfModule(file);
-        expect(exportDeclarations).not.toBe(null);
-        expect(Array.from(exportDeclarations!.entries())
-                   .map(entry => [entry[0], entry[1].node!.getText(), entry[1].viaModule]))
-            .toEqual([
-              ['newA', `a = 'a'`, null],
-            ]);
+        it('should define property exports from a module', () => {
+          loadFakeCore(getFileSystem());
+          loadTestFiles(EXPORTS_FILES);
+          const bundle = makeTestBundleProgram(_('/index.js'));
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const file = getSourceFileOrError(bundle.program, _('/define_property_reexports.js'));
+          const exportDeclarations = host.getExportsOfModule(file);
+          expect(exportDeclarations).not.toBe(null);
+          expect(Array.from(exportDeclarations!.entries())
+                     .map(entry => [entry[0], entry[1].node!.getText(), entry[1].viaModule]))
+              .toEqual([
+                ['newA', `a = 'a'`, null],
+              ]);
+        });
       });
-    });
 
-    describe('getClassSymbol()', () => {
-      it('should return the class symbol for an ES2015 class', () => {
-        loadTestFiles([SIMPLE_ES2015_CLASS_FILE]);
-        const bundle = makeTestBundleProgram(SIMPLE_ES2015_CLASS_FILE.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const node = getDeclaration(
-            bundle.program, SIMPLE_ES2015_CLASS_FILE.name, 'EmptyClass', isNamedClassDeclaration);
-        const classSymbol = host.getClassSymbol(node);
+      describe('getClassSymbol()', () => {
+        it('should return the class symbol for an ES2015 class', () => {
+          loadTestFiles([SIMPLE_ES2015_CLASS_FILE]);
+          const bundle = makeTestBundleProgram(SIMPLE_ES2015_CLASS_FILE.name);
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const node = getDeclaration(
+              bundle.program, SIMPLE_ES2015_CLASS_FILE.name, 'EmptyClass', isNamedClassDeclaration);
+          const classSymbol = host.getClassSymbol(node);
 
-        expect(classSymbol).toBeDefined();
-        expect(classSymbol!.declaration.valueDeclaration).toBe(node);
-        expect(classSymbol!.implementation.valueDeclaration).toBe(node);
-      });
+          expect(classSymbol).toBeDefined();
+          expect(classSymbol!.declaration.valueDeclaration).toBe(node);
+          expect(classSymbol!.implementation.valueDeclaration).toBe(node);
+        });
 
-      it('should handle wildcard re-exports of other modules (with emitted helpers)', () => {
-        loadFakeCore(getFileSystem());
-        loadTestFiles(EXPORTS_FILES);
-        const bundle = makeTestBundleProgram(_('/index.js'));
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const file = getSourceFileOrError(bundle.program, _('/wildcard_reexports.js'));
-        const exportDeclarations = host.getExportsOfModule(file);
-        expect(exportDeclarations).not.toBe(null);
-        expect(Array.from(exportDeclarations!.entries())
-                   .map(entry => [entry[0], entry[1].node!.getText(), entry[1].viaModule]))
-            .toEqual([
-              ['Directive', `Directive: FnWithArg<(clazz: any) => any>`, _('/b_module')],
-              ['a', `a = 'a'`, _('/b_module')],
-              ['b', `b = a_module.a`, _('/b_module')],
-              ['c', `a = 'a'`, _('/b_module')],
-              ['d', `b = a_module.a`, _('/b_module')],
-              ['e', `e = 'e'`, _('/b_module')],
-              ['DirectiveX', `Directive: FnWithArg<(clazz: any) => any>`, _('/b_module')],
-              [
-                'SomeClass',
-                `SomeClass = (function() {\n    function SomeClass() {}\n    return SomeClass;\n  }())`,
-                _('/b_module')
-              ],
-              ['xtra1', `xtra1 = 'xtra1'`, _('/xtra_module')],
-              ['xtra2', `xtra2 = 'xtra2'`, _('/xtra_module')],
-            ]);
-      });
+        it('should handle wildcard re-exports of other modules (with emitted helpers)', () => {
+          loadFakeCore(getFileSystem());
+          loadTestFiles(EXPORTS_FILES);
+          const bundle = makeTestBundleProgram(_('/index.js'));
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const file = getSourceFileOrError(bundle.program, _('/wildcard_reexports.js'));
+          const exportDeclarations = host.getExportsOfModule(file);
+          expect(exportDeclarations).not.toBe(null);
+          expect(Array.from(exportDeclarations!.entries())
+                     .map(entry => [entry[0], entry[1].node!.getText(), entry[1].viaModule]))
+              .toEqual([
+                ['Directive', `Directive: FnWithArg<(clazz: any) => any>`, _('/b_module')],
+                ['a', `a = 'a'`, _('/b_module')],
+                ['b', `b = a_module.a`, _('/b_module')],
+                ['c', `a = 'a'`, _('/b_module')],
+                ['d', `b = a_module.a`, _('/b_module')],
+                ['e', `e = 'e'`, _('/b_module')],
+                ['DirectiveX', `Directive: FnWithArg<(clazz: any) => any>`, _('/b_module')],
+                [
+                  'SomeClass',
+                  `SomeClass = (function() {\n    function SomeClass() {}\n    return SomeClass;\n  }())`,
+                  _('/b_module')
+                ],
+                ['xtra1', `xtra1 = 'xtra1'`, _('/xtra_module')],
+                ['xtra2', `xtra2 = 'xtra2'`, _('/xtra_module')],
+              ]);
+        });
 
-      it('should handle wildcard re-exports of other modules (with imported helpers)', () => {
-        loadFakeCore(getFileSystem());
-        loadTestFiles(EXPORTS_FILES);
-        const bundle = makeTestBundleProgram(_('/index.js'));
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const file =
-            getSourceFileOrError(bundle.program, _('/wildcard_reexports_imported_helpers.js'));
-        const exportDeclarations = host.getExportsOfModule(file);
-        expect(exportDeclarations).not.toBe(null);
-        expect(Array.from(exportDeclarations!.entries())
-                   .map(entry => [entry[0], entry[1].node!.getText(), entry[1].viaModule]))
-            .toEqual([
-              ['Directive', `Directive: FnWithArg<(clazz: any) => any>`, _('/b_module')],
-              ['a', `a = 'a'`, _('/b_module')],
-              ['b', `b = a_module.a`, _('/b_module')],
-              ['c', `a = 'a'`, _('/b_module')],
-              ['d', `b = a_module.a`, _('/b_module')],
-              ['e', `e = 'e'`, _('/b_module')],
-              ['DirectiveX', `Directive: FnWithArg<(clazz: any) => any>`, _('/b_module')],
-              [
-                'SomeClass',
-                `SomeClass = (function() {\n    function SomeClass() {}\n    return SomeClass;\n  }())`,
-                _('/b_module')
-              ],
-              ['xtra1', `xtra1 = 'xtra1'`, _('/xtra_module')],
-              ['xtra2', `xtra2 = 'xtra2'`, _('/xtra_module')],
-            ]);
-      });
+        it('should handle wildcard re-exports of other modules (with imported helpers)', () => {
+          loadFakeCore(getFileSystem());
+          loadTestFiles(EXPORTS_FILES);
+          const bundle = makeTestBundleProgram(_('/index.js'));
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const file =
+              getSourceFileOrError(bundle.program, _('/wildcard_reexports_imported_helpers.js'));
+          const exportDeclarations = host.getExportsOfModule(file);
+          expect(exportDeclarations).not.toBe(null);
+          expect(Array.from(exportDeclarations!.entries())
+                     .map(entry => [entry[0], entry[1].node!.getText(), entry[1].viaModule]))
+              .toEqual([
+                ['Directive', `Directive: FnWithArg<(clazz: any) => any>`, _('/b_module')],
+                ['a', `a = 'a'`, _('/b_module')],
+                ['b', `b = a_module.a`, _('/b_module')],
+                ['c', `a = 'a'`, _('/b_module')],
+                ['d', `b = a_module.a`, _('/b_module')],
+                ['e', `e = 'e'`, _('/b_module')],
+                ['DirectiveX', `Directive: FnWithArg<(clazz: any) => any>`, _('/b_module')],
+                [
+                  'SomeClass',
+                  `SomeClass = (function() {\n    function SomeClass() {}\n    return SomeClass;\n  }())`,
+                  _('/b_module')
+                ],
+                ['xtra1', `xtra1 = 'xtra1'`, _('/xtra_module')],
+                ['xtra2', `xtra2 = 'xtra2'`, _('/xtra_module')],
+              ]);
+        });
 
-      it('should handle wildcard re-exports of other modules using `require()` calls', () => {
-        loadFakeCore(getFileSystem());
-        loadTestFiles(EXPORTS_FILES);
-        const bundle = makeTestBundleProgram(_('/index.js'));
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const file = getSourceFileOrError(bundle.program, _('/wildcard_reexports_with_require.js'));
-        const exportDeclarations = host.getExportsOfModule(file);
-        expect(exportDeclarations).not.toBe(null);
-        expect(Array.from(exportDeclarations!.entries())
-                   .map(entry => [entry[0], entry[1].node!.getText(), entry[1].viaModule]))
-            .toEqual([
-              ['Directive', `Directive: FnWithArg<(clazz: any) => any>`, _('/b_module')],
-              ['a', `a = 'a'`, _('/b_module')],
-              ['b', `b = a_module.a`, _('/b_module')],
-              ['c', `a = 'a'`, _('/b_module')],
-              ['d', `b = a_module.a`, _('/b_module')],
-              ['e', `e = 'e'`, _('/b_module')],
-              ['DirectiveX', `Directive: FnWithArg<(clazz: any) => any>`, _('/b_module')],
-              [
-                'SomeClass',
-                `SomeClass = (function() {\n    function SomeClass() {}\n    return SomeClass;\n  }())`,
-                _('/b_module')
-              ],
-              ['xtra1', `xtra1 = 'xtra1'`, _('/xtra_module')],
-              ['xtra2', `xtra2 = 'xtra2'`, _('/xtra_module')],
-            ]);
-      });
+        it('should handle wildcard re-exports of other modules using `require()` calls', () => {
+          loadFakeCore(getFileSystem());
+          loadTestFiles(EXPORTS_FILES);
+          const bundle = makeTestBundleProgram(_('/index.js'));
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const file =
+              getSourceFileOrError(bundle.program, _('/wildcard_reexports_with_require.js'));
+          const exportDeclarations = host.getExportsOfModule(file);
+          expect(exportDeclarations).not.toBe(null);
+          expect(Array.from(exportDeclarations!.entries())
+                     .map(entry => [entry[0], entry[1].node!.getText(), entry[1].viaModule]))
+              .toEqual([
+                ['Directive', `Directive: FnWithArg<(clazz: any) => any>`, _('/b_module')],
+                ['a', `a = 'a'`, _('/b_module')],
+                ['b', `b = a_module.a`, _('/b_module')],
+                ['c', `a = 'a'`, _('/b_module')],
+                ['d', `b = a_module.a`, _('/b_module')],
+                ['e', `e = 'e'`, _('/b_module')],
+                ['DirectiveX', `Directive: FnWithArg<(clazz: any) => any>`, _('/b_module')],
+                [
+                  'SomeClass',
+                  `SomeClass = (function() {\n    function SomeClass() {}\n    return SomeClass;\n  }())`,
+                  _('/b_module')
+                ],
+                ['xtra1', `xtra1 = 'xtra1'`, _('/xtra_module')],
+                ['xtra2', `xtra2 = 'xtra2'`, _('/xtra_module')],
+              ]);
+        });
 
-      it('should return the class symbol for an ES5 class (outer variable declaration)', () => {
-        loadTestFiles([SIMPLE_CLASS_FILE]);
-        const bundle = makeTestBundleProgram(SIMPLE_CLASS_FILE.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const outerNode = getDeclaration(
-            bundle.program, SIMPLE_CLASS_FILE.name, 'EmptyClass', isNamedVariableDeclaration);
-        const innerNode = (getIifeBody(outerNode.initializer!) as ts.Block)
-                              .statements.find(isNamedFunctionDeclaration)!;
-        const classSymbol = host.getClassSymbol(outerNode);
-
-        expect(classSymbol).toBeDefined();
-        expect(classSymbol!.declaration.valueDeclaration).toBe(outerNode);
-        expect(classSymbol!.implementation.valueDeclaration).toBe(innerNode);
-      });
+        it('should return the class symbol for an ES5 class (outer variable declaration)', () => {
+          loadTestFiles([SIMPLE_CLASS_FILE]);
+          const bundle = makeTestBundleProgram(SIMPLE_CLASS_FILE.name);
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const outerNode = getDeclaration(
+              bundle.program, SIMPLE_CLASS_FILE.name, 'EmptyClass', isDesiredDeclaration);
+          const innerNode = getDeclaration(
+              bundle.program, SIMPLE_CLASS_FILE.name, 'EmptyClass', isNamedFunctionDeclaration);
+          const classSymbol = host.getClassSymbol(outerNode);
+
+          expect(classSymbol).toBeDefined();
+          expect(classSymbol!.declaration.valueDeclaration).toBe(outerNode as any);
+          expect(classSymbol!.implementation.valueDeclaration).toBe(innerNode);
+        });
 
-      it('should return the class symbol for an ES5 class (inner function declaration)', () => {
-        loadTestFiles([SIMPLE_CLASS_FILE]);
-        const bundle = makeTestBundleProgram(SIMPLE_CLASS_FILE.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const outerNode = getDeclaration(
-            bundle.program, SIMPLE_CLASS_FILE.name, 'EmptyClass', isNamedVariableDeclaration);
-        const innerNode = (getIifeBody(outerNode.initializer!) as ts.Block)
-                              .statements.find(isNamedFunctionDeclaration)!;
-        const classSymbol = host.getClassSymbol(innerNode);
-
-        expect(classSymbol).toBeDefined();
-        expect(classSymbol!.declaration.valueDeclaration).toBe(outerNode);
-        expect(classSymbol!.implementation.valueDeclaration).toBe(innerNode);
-      });
+        it('should return the class symbol for an ES5 class (inner function declaration)', () => {
+          loadTestFiles([SIMPLE_CLASS_FILE]);
+          const bundle = makeTestBundleProgram(SIMPLE_CLASS_FILE.name);
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const outerNode = getDeclaration(
+              bundle.program, SIMPLE_CLASS_FILE.name, 'EmptyClass', isDesiredDeclaration);
+          const innerNode = getDeclaration(
+              bundle.program, SIMPLE_CLASS_FILE.name, 'EmptyClass', isNamedFunctionDeclaration);
+          const classSymbol = host.getClassSymbol(innerNode);
+
+          expect(classSymbol).toBeDefined();
+          expect(classSymbol!.declaration.valueDeclaration).toBe(outerNode as any);
+          expect(classSymbol!.implementation.valueDeclaration).toBe(innerNode);
+        });
 
-      it('should return the same class symbol (of the outer declaration) for outer and inner declarations',
-         () => {
-           loadTestFiles([SIMPLE_CLASS_FILE]);
-           const bundle = makeTestBundleProgram(SIMPLE_CLASS_FILE.name);
-           const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-           const outerNode = getDeclaration(
-               bundle.program, SIMPLE_CLASS_FILE.name, 'EmptyClass', isNamedVariableDeclaration);
-           const innerNode = (getIifeBody(outerNode.initializer!) as ts.Block)
-                                 .statements.find(isNamedFunctionDeclaration)!;
-
-           const innerSymbol = host.getClassSymbol(innerNode)!;
-           const outerSymbol = host.getClassSymbol(outerNode)!;
-           expect(innerSymbol.declaration).toBe(outerSymbol.declaration);
-           expect(innerSymbol.implementation).toBe(outerSymbol.implementation);
-         });
-
-      it('should return the class symbol for an ES5 class whose IIFE is not wrapped in parens',
-         () => {
-           loadTestFiles([SIMPLE_CLASS_FILE]);
-           const bundle = makeTestBundleProgram(SIMPLE_CLASS_FILE.name);
-           const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-           const outerNode = getDeclaration(
-               bundle.program, SIMPLE_CLASS_FILE.name, 'NoParensClass', isNamedVariableDeclaration);
-           const innerNode = (getIifeBody(outerNode.initializer!) as ts.Block)
-                                 .statements.find(isNamedFunctionDeclaration)!;
-           const classSymbol = host.getClassSymbol(outerNode);
-
-           expect(classSymbol).toBeDefined();
-           expect(classSymbol!.declaration.valueDeclaration).toBe(outerNode);
-           expect(classSymbol!.implementation.valueDeclaration).toBe(innerNode);
-         });
-
-      it('should return the class symbol for an ES5 class whose IIFE is not wrapped with inner parens',
-         () => {
-           loadTestFiles([SIMPLE_CLASS_FILE]);
-           const bundle = makeTestBundleProgram(SIMPLE_CLASS_FILE.name);
-           const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-           const outerNode = getDeclaration(
-               bundle.program, SIMPLE_CLASS_FILE.name, 'InnerParensClass',
-               isNamedVariableDeclaration);
-           const innerNode = (getIifeBody(outerNode.initializer!) as ts.Block)
-                                 .statements.find(isNamedFunctionDeclaration)!;
-           const classSymbol = host.getClassSymbol(outerNode);
-
-           expect(classSymbol).toBeDefined();
-           expect(classSymbol!.declaration.valueDeclaration).toBe(outerNode);
-           expect(classSymbol!.implementation.valueDeclaration).toBe(innerNode);
-         });
-
-      it('should return undefined if node is not an ES5 class', () => {
-        loadTestFiles([FOO_FUNCTION_FILE]);
-        const bundle = makeTestBundleProgram(FOO_FUNCTION_FILE.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const node = getDeclaration(
-            bundle.program, FOO_FUNCTION_FILE.name, 'foo', isNamedFunctionDeclaration);
-        const classSymbol = host.getClassSymbol(node);
+        it('should return the same class symbol (of the outer declaration) for outer and inner declarations',
+           () => {
+             loadTestFiles([SIMPLE_CLASS_FILE]);
+             const bundle = makeTestBundleProgram(SIMPLE_CLASS_FILE.name);
+             const host =
+                 createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+             const outerNode = getDeclaration(
+                 bundle.program, SIMPLE_CLASS_FILE.name, 'EmptyClass', isDesiredDeclaration);
+             const innerNode = getDeclaration(
+                 bundle.program, SIMPLE_CLASS_FILE.name, 'EmptyClass', isNamedFunctionDeclaration);
+
+             const innerSymbol = host.getClassSymbol(innerNode)!;
+             const outerSymbol = host.getClassSymbol(outerNode)!;
+             expect(innerSymbol.declaration).toBe(outerSymbol.declaration);
+             expect(innerSymbol.implementation).toBe(outerSymbol.implementation);
+           });
 
-        expect(classSymbol).toBeUndefined();
-      });
+        it('should return the class symbol for an ES5 class whose IIFE is not wrapped in parens',
+           () => {
+             loadTestFiles([SIMPLE_CLASS_FILE]);
+             const bundle = makeTestBundleProgram(SIMPLE_CLASS_FILE.name);
+             const host =
+                 createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+             const outerNode = getDeclaration(
+                 bundle.program, SIMPLE_CLASS_FILE.name, 'NoParensClass', isDesiredDeclaration);
+             const innerNode = getDeclaration(
+                 bundle.program, SIMPLE_CLASS_FILE.name, 'NoParensClass',
+                 isNamedFunctionDeclaration);
+             const classSymbol = host.getClassSymbol(outerNode);
+
+             expect(classSymbol).toBeDefined();
+             expect(classSymbol!.declaration.valueDeclaration).toBe(outerNode as any);
+             expect(classSymbol!.implementation.valueDeclaration).toBe(innerNode);
+           });
 
-      it('should return undefined if variable declaration is not initialized using an IIFE', () => {
-        const testFile = {
-          name: _('/test.js'),
-          contents: `var MyClass = null;`,
-        };
-        loadTestFiles([testFile]);
-        const bundle = makeTestBundleProgram(testFile.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const node =
-            getDeclaration(bundle.program, testFile.name, 'MyClass', isNamedVariableDeclaration);
-        const classSymbol = host.getClassSymbol(node);
+        it('should return the class symbol for an ES5 class whose IIFE is not wrapped with inner parens',
+           () => {
+             loadTestFiles([SIMPLE_CLASS_FILE]);
+             const bundle = makeTestBundleProgram(SIMPLE_CLASS_FILE.name);
+             const host =
+                 createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+             const outerNode = getDeclaration(
+                 bundle.program, SIMPLE_CLASS_FILE.name, 'InnerParensClass', isDesiredDeclaration);
+             const innerNode = getDeclaration(
+                 bundle.program, SIMPLE_CLASS_FILE.name, 'InnerParensClass',
+                 isNamedFunctionDeclaration);
+             const classSymbol = host.getClassSymbol(outerNode);
+
+             expect(classSymbol).toBeDefined();
+             expect(classSymbol!.declaration.valueDeclaration).toBe(outerNode as any);
+             expect(classSymbol!.implementation.valueDeclaration).toBe(innerNode);
+           });
 
-        expect(classSymbol).toBeUndefined();
-      });
-    });
+        it('should return undefined if node is not an ES5 class', () => {
+          loadTestFiles([FOO_FUNCTION_FILE]);
+          const bundle = makeTestBundleProgram(FOO_FUNCTION_FILE.name);
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const node = getDeclaration(
+              bundle.program, FOO_FUNCTION_FILE.name, 'foo', isNamedFunctionDeclaration);
+          const classSymbol = host.getClassSymbol(node);
 
-    describe('isClass()', () => {
-      it('should return true if a given node is a TS class declaration', () => {
-        loadTestFiles([SIMPLE_ES2015_CLASS_FILE]);
-        const bundle = makeTestBundleProgram(SIMPLE_ES2015_CLASS_FILE.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const node = getDeclaration(
-            bundle.program, SIMPLE_ES2015_CLASS_FILE.name, 'EmptyClass', isNamedClassDeclaration);
-        expect(host.isClass(node)).toBe(true);
-      });
+          expect(classSymbol).toBeUndefined();
+        });
 
-      it('should return true if a given node is the outer variable declaration of a class', () => {
-        loadTestFiles([SIMPLE_CLASS_FILE]);
-        const bundle = makeTestBundleProgram(SIMPLE_CLASS_FILE.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const node = getDeclaration(
-            bundle.program, SIMPLE_CLASS_FILE.name, 'EmptyClass', ts.isVariableDeclaration);
-        expect(host.isClass(node)).toBe(true);
-      });
+        it('should return undefined if variable declaration is not initialized using an IIFE',
+           () => {
+             const testFile = {
+               name: _('/test.js'),
+               contents: `var MyClass = null;`,
+             };
+             loadTestFiles([testFile]);
+             const bundle = makeTestBundleProgram(testFile.name);
+             const host =
+                 createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+             const node = getDeclaration(
+                 bundle.program, testFile.name, 'MyClass', isNamedVariableDeclaration);
+             const classSymbol = host.getClassSymbol(node);
 
-      it('should return true if a given node is the inner variable declaration of a class', () => {
-        loadTestFiles([SIMPLE_CLASS_FILE]);
-        const bundle = makeTestBundleProgram(SIMPLE_CLASS_FILE.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const outerNode = getDeclaration(
-            bundle.program, SIMPLE_CLASS_FILE.name, 'EmptyClass', ts.isVariableDeclaration);
-        const innerNode = (getIifeBody(outerNode.initializer!) as ts.Block)
-                              .statements.find(isNamedFunctionDeclaration)!;
-        expect(host.isClass(innerNode)).toBe(true);
+             expect(classSymbol).toBeUndefined();
+           });
       });
 
-      it('should return false if a given node is a function declaration', () => {
-        loadTestFiles([FOO_FUNCTION_FILE]);
-        const bundle = makeTestBundleProgram(FOO_FUNCTION_FILE.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const node = getDeclaration(
-            bundle.program, FOO_FUNCTION_FILE.name, 'foo', isNamedFunctionDeclaration);
-        expect(host.isClass(node)).toBe(false);
+      describe('isClass()', () => {
+        it('should return true if a given node is a TS class declaration', () => {
+          loadTestFiles([SIMPLE_ES2015_CLASS_FILE]);
+          const bundle = makeTestBundleProgram(SIMPLE_ES2015_CLASS_FILE.name);
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const node = getDeclaration(
+              bundle.program, SIMPLE_ES2015_CLASS_FILE.name, 'EmptyClass', isNamedClassDeclaration);
+          expect(host.isClass(node)).toBe(true);
+        });
+
+        it('should return true if a given node is the outer variable declaration of a class',
+           () => {
+             loadTestFiles([SIMPLE_CLASS_FILE]);
+             const bundle = makeTestBundleProgram(SIMPLE_CLASS_FILE.name);
+             const host =
+                 createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+             const node = getDeclaration(
+                 bundle.program, SIMPLE_CLASS_FILE.name, 'EmptyClass', isDesiredDeclaration);
+             expect(host.isClass(node)).toBe(true);
+           });
+
+        it('should return true if a given node is the inner variable declaration of a class',
+           () => {
+             loadTestFiles([SIMPLE_CLASS_FILE]);
+             const bundle = makeTestBundleProgram(SIMPLE_CLASS_FILE.name);
+             const host =
+                 createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+             const node = getDeclaration(
+                 bundle.program, SIMPLE_CLASS_FILE.name, 'EmptyClass', isNamedFunctionDeclaration);
+             expect(host.isClass(node)).toBe(true);
+           });
+
+        it('should return false if a given node is a function declaration', () => {
+          loadTestFiles([FOO_FUNCTION_FILE]);
+          const bundle = makeTestBundleProgram(FOO_FUNCTION_FILE.name);
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const node = getDeclaration(
+              bundle.program, FOO_FUNCTION_FILE.name, 'foo', isNamedFunctionDeclaration);
+          expect(host.isClass(node)).toBe(false);
+        });
       });
-    });
 
-    describe('hasBaseClass()', () => {
-      function hasBaseClass(source: string) {
-        const file = {
-          name: _('/synthesized_constructors.js'),
-          contents: source,
-        };
+      describe('hasBaseClass()', () => {
+        function hasBaseClass(source: string) {
+          const file = {
+            name: _('/synthesized_constructors.js'),
+            contents: source,
+          };
 
-        loadTestFiles([file]);
-        const bundle = makeTestBundleProgram(file.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const classNode =
-            getDeclaration(bundle.program, file.name, 'TestClass', isNamedVariableDeclaration);
-        return host.hasBaseClass(classNode);
-      }
+          loadTestFiles([file]);
+          const bundle = makeTestBundleProgram(file.name);
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const classNode =
+              getDeclaration(bundle.program, file.name, 'TestClass', isDesiredDeclaration);
+          return host.hasBaseClass(classNode);
+        }
 
-      it('should consider an IIFE with _super parameter as having a base class', () => {
-        const result = hasBaseClass(`
-      var TestClass = /** @class */ (function (_super) {
+        it('should consider an IIFE with _super parameter as having a base class', () => {
+          const result = hasBaseClass(`
+      ${expDecl('TestClass')} = /** @class */ (function (_super) {
         __extends(TestClass, _super);
         function TestClass() {}
         return TestClass;
       }(null));`);
-        expect(result).toBe(true);
-      });
+          expect(result).toBe(true);
+        });
 
-      it('should consider an IIFE with a unique name generated for the _super parameter as having a base class',
-         () => {
-           const result = hasBaseClass(`
-      var TestClass = /** @class */ (function (_super_1) {
+        it('should consider an IIFE with a unique name generated for the _super parameter as having a base class',
+           () => {
+             const result = hasBaseClass(`
+      ${expDecl('TestClass')} = /** @class */ (function (_super_1) {
         __extends(TestClass, _super_1);
         function TestClass() {}
         return TestClass;
       }(null));`);
-           expect(result).toBe(true);
-         });
+             expect(result).toBe(true);
+           });
 
-      it('should not consider an IIFE without parameter as having a base class', () => {
-        const result = hasBaseClass(`
-      var TestClass = /** @class */ (function () {
+        it('should not consider an IIFE without parameter as having a base class', () => {
+          const result = hasBaseClass(`
+      ${expDecl('TestClass')} = /** @class */ (function () {
         __extends(TestClass, _super);
         function TestClass() {}
         return TestClass;
       }(null));`);
-        expect(result).toBe(false);
+          expect(result).toBe(false);
+        });
       });
-    });
 
-    describe('getBaseClassExpression()', () => {
-      function getBaseClassIdentifier(source: string): ts.Identifier|null {
-        const file = {
-          name: _('/synthesized_constructors.js'),
-          contents: source,
-        };
+      describe('getBaseClassExpression()', () => {
+        function getBaseClassIdentifier(source: string): ts.Identifier|null {
+          const file = {
+            name: _('/synthesized_constructors.js'),
+            contents: source,
+          };
 
-        loadTestFiles([file]);
-        const bundle = makeTestBundleProgram(file.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const classNode =
-            getDeclaration(bundle.program, file.name, 'TestClass', isNamedVariableDeclaration);
-        const expression = host.getBaseClassExpression(classNode);
-        if (expression !== null && !ts.isIdentifier(expression)) {
-          throw new Error(
-              'Expected class to inherit via an identifier but got: ' + expression.getText());
+          loadTestFiles([file]);
+          const bundle = makeTestBundleProgram(file.name);
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const classNode =
+              getDeclaration(bundle.program, file.name, 'TestClass', isDesiredDeclaration);
+          const expression = host.getBaseClassExpression(classNode);
+          if (expression !== null && !ts.isIdentifier(expression)) {
+            throw new Error(
+                'Expected class to inherit via an identifier but got: ' + expression.getText());
+          }
+          return expression;
         }
-        return expression;
-      }
 
-      it('should find the base class of an IIFE with _super parameter', () => {
-        const identifier = getBaseClassIdentifier(`
-        var BaseClass = /** @class */ (function () {
+        it('should find the base class of an IIFE with _super parameter', () => {
+          const identifier = getBaseClassIdentifier(`
+        ${expDecl('BaseClass')} = /** @class */ (function () {
           function BaseClass() {}
           return BaseClass;
         }());
-        var TestClass = /** @class */ (function (_super) {
+        ${expDecl('TestClass')} = /** @class */ (function (_super) {
           __extends(TestClass, _super);
           function TestClass() {}
           return TestClass;
         }(BaseClass));`);
-        expect(identifier!.text).toBe('BaseClass');
-      });
+          expect(identifier!.text).toBe('BaseClass');
+        });
 
-      it('should find the base class of an IIFE with a unique name generated for the _super parameter',
-         () => {
-           const identifier = getBaseClassIdentifier(`
-        var BaseClass = /** @class */ (function () {
+        it('should find the base class of an IIFE with a unique name generated for the _super parameter',
+           () => {
+             const identifier = getBaseClassIdentifier(`
+        ${expDecl('BaseClass')} = /** @class */ (function () {
           function BaseClass() {}
           return BaseClass;
         }());
-        var TestClass = /** @class */ (function (_super_1) {
+        ${expDecl('TestClass')} = /** @class */ (function (_super_1) {
           __extends(TestClass, _super_1);
           function TestClass() {}
           return TestClass;
         }(BaseClass));`);
-           expect(identifier!.text).toBe('BaseClass');
-         });
+             expect(identifier!.text).toBe('BaseClass');
+           });
 
-      it('should not find a base class for an IIFE without parameter', () => {
-        const identifier = getBaseClassIdentifier(`
-        var BaseClass = /** @class */ (function () {
+        it('should not find a base class for an IIFE without parameter', () => {
+          const identifier = getBaseClassIdentifier(`
+        ${expDecl('BaseClass')} = /** @class */ (function () {
           function BaseClass() {}
           return BaseClass;
         }());
-        var TestClass = /** @class */ (function () {
+        ${expDecl('TestClass')} = /** @class */ (function () {
           __extends(TestClass, _super);
           function TestClass() {}
           return TestClass;
         }(BaseClass));`);
-        expect(identifier).toBe(null);
-      });
+          expect(identifier).toBe(null);
+        });
 
-      it('should find a dynamic base class expression of an IIFE', () => {
-        const file = {
-          name: _('/synthesized_constructors.js'),
-          contents: `
-          var BaseClass = /** @class */ (function () {
+        it('should find a dynamic base class expression of an IIFE', () => {
+          const file = {
+            name: _('/synthesized_constructors.js'),
+            contents: `
+          ${expDecl('BaseClass')} = /** @class */ (function () {
             function BaseClass() {}
             return BaseClass;
           }());
           function foo() { return BaseClass; }
-          var TestClass = /** @class */ (function (_super) {
+          ${expDecl('TestClass')} = /** @class */ (function (_super) {
             __extends(TestClass, _super);
             function TestClass() {}
             return TestClass;
           }(foo()));`,
-        };
+          };
 
-        loadTestFiles([file]);
-        const bundle = makeTestBundleProgram(file.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const classNode =
-            getDeclaration(bundle.program, file.name, 'TestClass', isNamedVariableDeclaration);
-        const expression = host.getBaseClassExpression(classNode)!;
-        expect(expression.getText()).toBe('foo()');
+          loadTestFiles([file]);
+          const bundle = makeTestBundleProgram(file.name);
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const classNode =
+              getDeclaration(bundle.program, file.name, 'TestClass', isDesiredDeclaration);
+          const expression = host.getBaseClassExpression(classNode)!;
+          expect(expression.getText()).toBe('foo()');
+        });
       });
-    });
 
-    describe('findClassSymbols()', () => {
-      it('should return an array of all classes in the given source file', () => {
-        loadTestFiles(DECORATED_FILES);
-        const bundle = makeTestBundleProgram(DECORATED_FILES[0].name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const primaryFile = getSourceFileOrError(bundle.program, DECORATED_FILES[0].name);
-        const secondaryFile = getSourceFileOrError(bundle.program, DECORATED_FILES[1].name);
+      describe('findClassSymbols()', () => {
+        it('should return an array of all classes in the given source file', () => {
+          loadTestFiles(DECORATED_FILES);
+          const bundle = makeTestBundleProgram(DECORATED_FILES[0].name);
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const primaryFile = getSourceFileOrError(bundle.program, DECORATED_FILES[0].name);
+          const secondaryFile = getSourceFileOrError(bundle.program, DECORATED_FILES[1].name);
 
-        const classSymbolsPrimary = host.findClassSymbols(primaryFile);
-        expect(classSymbolsPrimary.length).toEqual(2);
-        expect(classSymbolsPrimary.map(c => c.name)).toEqual(['A', 'B']);
+          const classSymbolsPrimary = host.findClassSymbols(primaryFile);
+          expect(classSymbolsPrimary.length).toEqual(2);
+          expect(classSymbolsPrimary.map(c => c.name)).toEqual(['A', 'B']);
 
-        const classSymbolsSecondary = host.findClassSymbols(secondaryFile);
-        expect(classSymbolsSecondary.length).toEqual(1);
-        expect(classSymbolsSecondary.map(c => c.name)).toEqual(['D']);
+          const classSymbolsSecondary = host.findClassSymbols(secondaryFile);
+          expect(classSymbolsSecondary.length).toEqual(1);
+          expect(classSymbolsSecondary.map(c => c.name)).toEqual(['D']);
+        });
       });
-    });
 
-    describe('getDecoratorsOfSymbol()', () => {
-      it('should return decorators of class symbol', () => {
-        loadTestFiles(DECORATED_FILES);
-        const bundle = makeTestBundleProgram(DECORATED_FILES[0].name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
-        const primaryFile = getSourceFileOrError(bundle.program, DECORATED_FILES[0].name);
-        const secondaryFile = getSourceFileOrError(bundle.program, DECORATED_FILES[1].name);
-
-        const classSymbolsPrimary = host.findClassSymbols(primaryFile);
-        const classDecoratorsPrimary = classSymbolsPrimary.map(s => host.getDecoratorsOfSymbol(s));
-        expect(classDecoratorsPrimary.length).toEqual(2);
-        expect(classDecoratorsPrimary[0]!.map(d => d.name)).toEqual(['Directive']);
-        expect(classDecoratorsPrimary[1]!.map(d => d.name)).toEqual(['Directive']);
-
-        const classSymbolsSecondary = host.findClassSymbols(secondaryFile);
-        const classDecoratorsSecondary =
-            classSymbolsSecondary.map(s => host.getDecoratorsOfSymbol(s));
-        expect(classDecoratorsSecondary.length).toEqual(1);
-        expect(classDecoratorsSecondary[0]!.map(d => d.name)).toEqual(['Directive']);
+      describe('getDecoratorsOfSymbol()', () => {
+        it('should return decorators of class symbol', () => {
+          loadTestFiles(DECORATED_FILES);
+          const bundle = makeTestBundleProgram(DECORATED_FILES[0].name);
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+          const primaryFile = getSourceFileOrError(bundle.program, DECORATED_FILES[0].name);
+          const secondaryFile = getSourceFileOrError(bundle.program, DECORATED_FILES[1].name);
+
+          const classSymbolsPrimary = host.findClassSymbols(primaryFile);
+          const classDecoratorsPrimary =
+              classSymbolsPrimary.map(s => host.getDecoratorsOfSymbol(s));
+          expect(classDecoratorsPrimary.length).toEqual(2);
+          expect(classDecoratorsPrimary[0]!.map(d => d.name)).toEqual(['Directive']);
+          expect(classDecoratorsPrimary[1]!.map(d => d.name)).toEqual(['Directive']);
+
+          const classSymbolsSecondary = host.findClassSymbols(secondaryFile);
+          const classDecoratorsSecondary =
+              classSymbolsSecondary.map(s => host.getDecoratorsOfSymbol(s));
+          expect(classDecoratorsSecondary.length).toEqual(1);
+          expect(classDecoratorsSecondary[0]!.map(d => d.name)).toEqual(['Directive']);
+        });
       });
-    });
 
-    describe('getDtsDeclaration()', () => {
-      it('should find the dts declaration that has the same relative path to the source file',
-         () => {
-           loadTestFiles(TYPINGS_SRC_FILES);
-           loadTestFiles(TYPINGS_DTS_FILES);
-           const bundle = makeTestBundleProgram(getRootFiles(TYPINGS_SRC_FILES)[0]);
-           const dts = makeTestBundleProgram(getRootFiles(TYPINGS_DTS_FILES)[0]);
-           const class1 = getDeclaration(
-               bundle.program, _('/ep/src/class1.js'), 'Class1', ts.isVariableDeclaration);
-           const host =
-               createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle, dts));
-
-           const dtsDeclaration = host.getDtsDeclaration(class1);
-           expect(dtsDeclaration!.getSourceFile().fileName).toEqual(_('/ep/typings/class1.d.ts'));
-         });
-
-      it('should find the dts declaration for exported functions', () => {
-        loadTestFiles(TYPINGS_SRC_FILES);
-        loadTestFiles(TYPINGS_DTS_FILES);
-        const bundle = makeTestBundleProgram(_('/ep/src/func1.js'));
-        const dts = makeTestBundleProgram(_('/ep/typings/func1.d.ts'));
-        const mooFn = getDeclaration(
-            bundle.program, _('/ep/src/func1.js'), 'mooFn', ts.isFunctionDeclaration);
-        const host =
-            createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle, dts));
-
-        const dtsDeclaration = host.getDtsDeclaration(mooFn);
-        expect(dtsDeclaration!.getSourceFile().fileName).toEqual(_('/ep/typings/func1.d.ts'));
-      });
+      describe('getDtsDeclaration()', () => {
+        it('should find the dts declaration that has the same relative path to the source file',
+           () => {
+             loadTestFiles(TYPINGS_SRC_FILES);
+             loadTestFiles(TYPINGS_DTS_FILES);
+             const bundle = makeTestBundleProgram(getRootFiles(TYPINGS_SRC_FILES)[0]);
+             const dts = makeTestBundleProgram(getRootFiles(TYPINGS_DTS_FILES)[0]);
+             const host =
+                 createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle, dts));
+             const class1 = getDeclaration(
+                 bundle.program, _('/ep/src/class1.js'), 'Class1', isDesiredDeclaration);
 
-      it('should return null if there is no matching class in the matching dts file', () => {
-        loadTestFiles(TYPINGS_SRC_FILES);
-        loadTestFiles(TYPINGS_DTS_FILES);
-        const bundle = makeTestBundleProgram(getRootFiles(TYPINGS_SRC_FILES)[0]);
-        const dts = makeTestBundleProgram(getRootFiles(TYPINGS_DTS_FILES)[0]);
-        const missingClass = getDeclaration(
-            bundle.program, _('/ep/src/class1.js'), 'MissingClass1', ts.isVariableDeclaration);
-        const host =
-            createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle, dts));
-        expect(host.getDtsDeclaration(missingClass)).toBe(null);
-      });
+             const dtsDeclaration = host.getDtsDeclaration(class1);
+             expect(dtsDeclaration!.getSourceFile().fileName).toEqual(_('/ep/typings/class1.d.ts'));
+           });
 
-      it('should return null if there is no matching dts file', () => {
-        loadTestFiles(TYPINGS_SRC_FILES);
-        loadTestFiles(TYPINGS_DTS_FILES);
-        const bundle = makeTestBundleProgram(getRootFiles(TYPINGS_SRC_FILES)[0]);
-        const dts = makeTestBundleProgram(getRootFiles(TYPINGS_DTS_FILES)[0]);
-        const missingClass = getDeclaration(
-            bundle.program, _('/ep/src/missing-class.js'), 'MissingClass2',
-            ts.isVariableDeclaration);
-        const host =
-            createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle, dts));
-
-        expect(host.getDtsDeclaration(missingClass)).toBe(null);
-      });
+        it('should find the dts declaration for exported functions', () => {
+          loadTestFiles(TYPINGS_SRC_FILES);
+          loadTestFiles(TYPINGS_DTS_FILES);
+          const bundle = makeTestBundleProgram(_('/ep/src/func1.js'));
+          const dts = makeTestBundleProgram(_('/ep/typings/func1.d.ts'));
+          const mooFn =
+              getDeclaration(bundle.program, _('/ep/src/func1.js'), 'mooFn', isExportsDeclaration);
+          const host =
+              createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle, dts));
+
+          const dtsDeclaration = host.getDtsDeclaration(mooFn);
+          expect(dtsDeclaration!.getSourceFile().fileName).toEqual(_('/ep/typings/func1.d.ts'));
+        });
 
-      it('should find the dts file that contains a matching class declaration, even if the source files do not match',
-         () => {
-           loadTestFiles(TYPINGS_SRC_FILES);
-           loadTestFiles(TYPINGS_DTS_FILES);
-           const bundle = makeTestBundleProgram(getRootFiles(TYPINGS_SRC_FILES)[0]);
-           const dts = makeTestBundleProgram(getRootFiles(TYPINGS_DTS_FILES)[0]);
-           const class1 = getDeclaration(
-               bundle.program, _('/ep/src/flat-file.js'), 'Class1', ts.isVariableDeclaration);
-           const host =
-               createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle, dts));
-
-           const dtsDeclaration = host.getDtsDeclaration(class1);
-           expect(dtsDeclaration!.getSourceFile().fileName).toEqual(_('/ep/typings/class1.d.ts'));
-         });
-
-      it('should find the dts file that contains a matching class declaration, even if the source files do not match',
-         () => {
-           loadTestFiles(TYPINGS_SRC_FILES);
-           loadTestFiles(TYPINGS_DTS_FILES);
-           const bundle = makeTestBundleProgram(_('/ep/src/flat-file.js'));
-           const dts = makeTestBundleProgram(getRootFiles(TYPINGS_DTS_FILES)[0]);
-           const class1 = getDeclaration(
-               bundle.program, _('/ep/src/flat-file.js'), 'Class1', ts.isVariableDeclaration);
-           const host =
-               createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle, dts));
-
-           const dtsDeclaration = host.getDtsDeclaration(class1);
-           expect(dtsDeclaration!.getSourceFile().fileName).toEqual(_('/ep/typings/class1.d.ts'));
-         });
-
-      it('should find aliased exports', () => {
-        loadTestFiles(TYPINGS_SRC_FILES);
-        loadTestFiles(TYPINGS_DTS_FILES);
-        const bundle = makeTestBundleProgram(_('/ep/src/flat-file.js'));
-        const dts = makeTestBundleProgram(getRootFiles(TYPINGS_DTS_FILES)[0]);
-        const sourceClass = getDeclaration(
-            bundle.program, _('/ep/src/flat-file.js'), 'SourceClass', ts.isVariableDeclaration);
-        const host =
-            createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle, dts));
-
-        const dtsDeclaration = host.getDtsDeclaration(sourceClass);
-        if (dtsDeclaration === null) {
-          return fail('Expected dts class to be found');
-        }
-        if (!isNamedClassDeclaration(dtsDeclaration)) {
-          return fail('Expected a named class to be found.');
-        }
-        expect(dtsDeclaration.name.text).toEqual('TypingsClass');
-        expect(_(dtsDeclaration.getSourceFile().fileName))
-            .toEqual(_('/ep/typings/typings-class.d.ts'));
-      });
+        it('should return null if there is no matching class in the matching dts file', () => {
+          loadTestFiles(TYPINGS_SRC_FILES);
+          loadTestFiles(TYPINGS_DTS_FILES);
+          const bundle = makeTestBundleProgram(getRootFiles(TYPINGS_SRC_FILES)[0]);
+          const dts = makeTestBundleProgram(getRootFiles(TYPINGS_DTS_FILES)[0]);
+          const missingClass = getDeclaration(
+              bundle.program, _('/ep/src/class1.js'), 'MissingClass1', isDesiredDeclaration);
+          const host =
+              createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle, dts));
+          expect(host.getDtsDeclaration(missingClass)).toBe(null);
+        });
 
-      it('should match publicly and internal exported classes correctly, even if they have the same name',
-         () => {
-           loadTestFiles(TYPINGS_SRC_FILES);
-           loadTestFiles(TYPINGS_DTS_FILES);
-           const bundle = makeTestBundleProgram(getRootFiles(TYPINGS_SRC_FILES)[0]);
-           const dts = makeTestBundleProgram(getRootFiles(TYPINGS_DTS_FILES)[0]);
-           const host =
-               createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle, dts));
-
-           const class2 = getDeclaration(
-               bundle.program, _('/ep/src/class2.js'), 'Class2', isNamedVariableDeclaration);
-           const class2DtsDeclaration = host.getDtsDeclaration(class2);
-           expect(class2DtsDeclaration!.getSourceFile().fileName)
-               .toEqual(_('/ep/typings/class2.d.ts'));
-
-           const internalClass2 = getDeclaration(
-               bundle.program, _('/ep/src/internal.js'), 'Class2', isNamedVariableDeclaration);
-           const internalClass2DtsDeclaration = host.getDtsDeclaration(internalClass2);
-           expect(internalClass2DtsDeclaration!.getSourceFile().fileName)
-               .toEqual(_('/ep/typings/internal.d.ts'));
-         });
-
-      it('should prefer the publicly exported class if there are multiple classes with the same name',
-         () => {
-           loadTestFiles(TYPINGS_SRC_FILES);
-           loadTestFiles(TYPINGS_DTS_FILES);
-           const bundle = makeTestBundleProgram(_('/ep/src/index.js'));
-           const dts = makeTestBundleProgram(_('/ep/typings/index.d.ts'));
-           const class2 = getDeclaration(
-               bundle.program, _('/ep/src/class2.js'), 'Class2', ts.isVariableDeclaration);
-           const internalClass2 = getDeclaration(
-               bundle.program, _('/ep/src/internal.js'), 'Class2', ts.isVariableDeclaration);
-           const host =
-               createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle, dts));
-
-           const class2DtsDeclaration = host.getDtsDeclaration(class2);
-           expect(class2DtsDeclaration!.getSourceFile().fileName)
-               .toEqual(_('/ep/typings/class2.d.ts'));
-
-           const internalClass2DtsDeclaration = host.getDtsDeclaration(internalClass2);
-           expect(internalClass2DtsDeclaration!.getSourceFile().fileName)
-               .toEqual(_('/ep/typings/internal.d.ts'));
-         });
-    });
+        it('should return null if there is no matching dts file', () => {
+          loadTestFiles(TYPINGS_SRC_FILES);
+          loadTestFiles(TYPINGS_DTS_FILES);
+          const bundle = makeTestBundleProgram(getRootFiles(TYPINGS_SRC_FILES)[0]);
+          const dts = makeTestBundleProgram(getRootFiles(TYPINGS_DTS_FILES)[0]);
+          const missingClass = getDeclaration(
+              bundle.program, _('/ep/src/missing-class.js'), 'MissingClass2', isDesiredDeclaration);
+          const host =
+              createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle, dts));
+
+          expect(host.getDtsDeclaration(missingClass)).toBe(null);
+        });
 
-    describe('getInternalNameOfClass()', () => {
-      it('should return the name of the inner class declaration', () => {
-        loadTestFiles([SIMPLE_CLASS_FILE]);
-        const bundle = makeTestBundleProgram(SIMPLE_CLASS_FILE.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
 
-        const emptyClass = getDeclaration(
-            bundle.program, SIMPLE_CLASS_FILE.name, 'EmptyClass', isNamedVariableDeclaration);
-        expect(host.getInternalNameOfClass(emptyClass).text).toEqual('EmptyClass');
 
-        const class1 = getDeclaration(
-            bundle.program, SIMPLE_CLASS_FILE.name, 'OuterClass1', isNamedVariableDeclaration);
-        expect(host.getInternalNameOfClass(class1).text).toEqual('InnerClass1');
+        it('should find the dts file that contains a matching class declaration, even if the source files do not match',
+           () => {
+             loadTestFiles(TYPINGS_SRC_FILES);
+             loadTestFiles(TYPINGS_DTS_FILES);
+             const bundle = makeTestBundleProgram(_('/ep/src/flat-file.js'));
+             const dts = makeTestBundleProgram(getRootFiles(TYPINGS_DTS_FILES)[0]);
+             const class1 = getDeclaration(
+                 bundle.program, _('/ep/src/flat-file.js'), 'Class1', isDesiredDeclaration);
+             const host =
+                 createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle, dts));
+
+             const dtsDeclaration = host.getDtsDeclaration(class1);
+             expect(dtsDeclaration!.getSourceFile().fileName).toEqual(_('/ep/typings/class1.d.ts'));
+           });
+
+        it('should find aliased exports', () => {
+          loadTestFiles(TYPINGS_SRC_FILES);
+          loadTestFiles(TYPINGS_DTS_FILES);
+          const bundle = makeTestBundleProgram(_('/ep/src/flat-file.js'));
+          const dts = makeTestBundleProgram(getRootFiles(TYPINGS_DTS_FILES)[0]);
+          const sourceClass = getDeclaration(
+              bundle.program, _('/ep/src/flat-file.js'), 'AliasedClass', isExportsDeclaration);
+          const host =
+              createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle, dts));
+
+          const dtsDeclaration = host.getDtsDeclaration(sourceClass);
+          if (dtsDeclaration === null) {
+            return fail('Expected dts class to be found');
+          }
+          if (!isNamedClassDeclaration(dtsDeclaration)) {
+            return fail('Expected a named class to be found.');
+          }
+          expect(dtsDeclaration.name.text).toEqual('TypingsClass');
+          expect(_(dtsDeclaration.getSourceFile().fileName))
+              .toEqual(_('/ep/typings/typings-class.d.ts'));
+        });
+
+        it('should match publicly and internal exported classes correctly, even if they have the same name',
+           () => {
+             loadTestFiles(TYPINGS_SRC_FILES);
+             loadTestFiles(TYPINGS_DTS_FILES);
+             const bundle = makeTestBundleProgram(getRootFiles(TYPINGS_SRC_FILES)[0]);
+             const dts = makeTestBundleProgram(getRootFiles(TYPINGS_DTS_FILES)[0]);
+             const host =
+                 createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle, dts));
+             const class2 = getDeclaration(
+                 bundle.program, _('/ep/src/class2.js'), 'Class2', isDesiredDeclaration);
+             const class2DtsDeclaration = host.getDtsDeclaration(class2);
+             expect(class2DtsDeclaration!.getSourceFile().fileName)
+                 .toEqual(_('/ep/typings/class2.d.ts'));
+
+             const internalClass2 = getDeclaration(
+                 bundle.program, _('/ep/src/internal.js'), 'Class2', isDesiredDeclaration);
+             const internalClass2DtsDeclaration = host.getDtsDeclaration(internalClass2);
+             expect(internalClass2DtsDeclaration!.getSourceFile().fileName)
+                 .toEqual(_('/ep/typings/internal.d.ts'));
+           });
+
+        it('should prefer the publicly exported class if there are multiple classes with the same name',
+           () => {
+             loadTestFiles(TYPINGS_SRC_FILES);
+             loadTestFiles(TYPINGS_DTS_FILES);
+             const bundle = makeTestBundleProgram(_('/ep/src/index.js'));
+             const dts = makeTestBundleProgram(_('/ep/typings/index.d.ts'));
+             const class2 = getDeclaration(
+                 bundle.program, _('/ep/src/class2.js'), 'Class2', isDesiredDeclaration);
+             const internalClass2 = getDeclaration(
+                 bundle.program, _('/ep/src/internal.js'), 'Class2', isDesiredDeclaration);
+             const host =
+                 createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle, dts));
+
+             const class2DtsDeclaration = host.getDtsDeclaration(class2);
+             expect(class2DtsDeclaration!.getSourceFile().fileName)
+                 .toEqual(_('/ep/typings/class2.d.ts'));
+
+             const internalClass2DtsDeclaration = host.getDtsDeclaration(internalClass2);
+             expect(internalClass2DtsDeclaration!.getSourceFile().fileName)
+                 .toEqual(_('/ep/typings/internal.d.ts'));
+           });
+      });
+
+      describe('getInternalNameOfClass()', () => {
+        it('should return the name of the inner class declaration', () => {
+          loadTestFiles([SIMPLE_CLASS_FILE]);
+          const bundle = makeTestBundleProgram(SIMPLE_CLASS_FILE.name);
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+
+          const emptyClass = getDeclaration(
+              bundle.program, SIMPLE_CLASS_FILE.name, 'EmptyClass', isDesiredDeclaration);
+          expect(host.getInternalNameOfClass(emptyClass).text).toEqual('EmptyClass');
 
-        const class2 = getDeclaration(
-            bundle.program, SIMPLE_CLASS_FILE.name, 'OuterClass2', isNamedVariableDeclaration);
-        expect(host.getInternalNameOfClass(class2).text).toEqual('InnerClass2');
+          const class1 = getDeclaration(
+              bundle.program, SIMPLE_CLASS_FILE.name, 'OuterClass1', isDesiredDeclaration);
+          expect(host.getInternalNameOfClass(class1).text).toEqual('InnerClass1');
 
-        const childClass = getDeclaration(
-            bundle.program, SIMPLE_CLASS_FILE.name, 'ChildClass', isNamedVariableDeclaration);
-        expect(host.getInternalNameOfClass(childClass).text).toEqual('InnerChildClass');
+          const class2 = getDeclaration(
+              bundle.program, SIMPLE_CLASS_FILE.name, 'OuterClass2', isDesiredDeclaration);
+          expect(host.getInternalNameOfClass(class2).text).toEqual('InnerClass2');
+
+          const childClass = getDeclaration(
+              bundle.program, SIMPLE_CLASS_FILE.name, 'ChildClass', isDesiredDeclaration);
+          expect(host.getInternalNameOfClass(childClass).text).toEqual('InnerChildClass');
+        });
       });
-    });
 
-    describe('getAdjacentNameOfClass()', () => {
-      it('should return the name of the inner class declaration', () => {
-        loadTestFiles([SIMPLE_CLASS_FILE]);
-        const bundle = makeTestBundleProgram(SIMPLE_CLASS_FILE.name);
-        const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
+      describe('getAdjacentNameOfClass()', () => {
+        it('should return the name of the inner class declaration', () => {
+          loadTestFiles([SIMPLE_CLASS_FILE]);
+          const bundle = makeTestBundleProgram(SIMPLE_CLASS_FILE.name);
+          const host = createHost(bundle, new UmdReflectionHost(new MockLogger(), false, bundle));
 
-        const emptyClass = getDeclaration(
-            bundle.program, SIMPLE_CLASS_FILE.name, 'EmptyClass', isNamedVariableDeclaration);
-        expect(host.getAdjacentNameOfClass(emptyClass).text).toEqual('EmptyClass');
+          const emptyClass = getDeclaration(
+              bundle.program, SIMPLE_CLASS_FILE.name, 'EmptyClass', isDesiredDeclaration);
+          expect(host.getAdjacentNameOfClass(emptyClass).text).toEqual('EmptyClass');
 
-        const class1 = getDeclaration(
-            bundle.program, SIMPLE_CLASS_FILE.name, 'OuterClass1', isNamedVariableDeclaration);
-        expect(host.getAdjacentNameOfClass(class1).text).toEqual('InnerClass1');
+          const class1 = getDeclaration(
+              bundle.program, SIMPLE_CLASS_FILE.name, 'OuterClass1', isDesiredDeclaration);
+          expect(host.getAdjacentNameOfClass(class1).text).toEqual('InnerClass1');
 
-        const class2 = getDeclaration(
-            bundle.program, SIMPLE_CLASS_FILE.name, 'OuterClass2', isNamedVariableDeclaration);
-        expect(host.getAdjacentNameOfClass(class2).text).toEqual('InnerClass2');
+          const class2 = getDeclaration(
+              bundle.program, SIMPLE_CLASS_FILE.name, 'OuterClass2', isDesiredDeclaration);
+          expect(host.getAdjacentNameOfClass(class2).text).toEqual('InnerClass2');
 
-        const childClass = getDeclaration(
-            bundle.program, SIMPLE_CLASS_FILE.name, 'ChildClass', isNamedVariableDeclaration);
-        expect(host.getAdjacentNameOfClass(childClass).text).toEqual('InnerChildClass');
+          const childClass = getDeclaration(
+              bundle.program, SIMPLE_CLASS_FILE.name, 'ChildClass', isDesiredDeclaration);
+          expect(host.getAdjacentNameOfClass(childClass).text).toEqual('InnerChildClass');
+        });
       });
     });
-  });
+  }
 });
+
+type WalkerPredicate<T extends ts.Node> = (node: ts.Node) => node is T;
+function walkForNode<T extends ts.Node>(node: ts.Node, predicate: WalkerPredicate<T>): T|undefined {
+  return node.forEachChild(child => predicate(child) ? child : walkForNode(child, predicate));
+}
diff --git a/packages/compiler-cli/ngcc/test/host/util.ts b/packages/compiler-cli/ngcc/test/host/util.ts
index 0295155af507f..5767be4bf789f 100644
--- a/packages/compiler-cli/ngcc/test/host/util.ts
+++ b/packages/compiler-cli/ngcc/test/host/util.ts
@@ -1,4 +1,3 @@
-
 /**
  * @license
  * Copyright Google LLC All Rights Reserved.
@@ -7,31 +6,43 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import * as ts from 'typescript';
-import {CtorParameter} from '../../../src/ngtsc/reflection';
+import {CtorParameter, TypeValueReferenceKind} from '../../../src/ngtsc/reflection';
 
 /**
  * Check that a given list of `CtorParameter`s has `typeValueReference`s of specific `ts.Identifier`
  * names.
  */
 export function expectTypeValueReferencesForParameters(
-    parameters: CtorParameter[], expectedParams: (string|null)[], fromModule: string|null = null) {
+    parameters: CtorParameter[], expectedParams: (string|null)[],
+    fromModule: (string|null)[] = []) {
   parameters!.forEach((param, idx) => {
     const expected = expectedParams[idx];
     if (expected !== null) {
-      if (param.typeValueReference === null) {
-        fail(`Incorrect typeValueReference generated, expected ${expected}`);
-      } else if (param.typeValueReference.local && fromModule !== null) {
-        fail(`Incorrect typeValueReference generated, expected non-local`);
-      } else if (!param.typeValueReference.local && fromModule === null) {
-        fail(`Incorrect typeValueReference generated, expected local`);
-      } else if (param.typeValueReference.local) {
-        if (!ts.isIdentifier(param.typeValueReference.expression)) {
-          fail(`Incorrect typeValueReference generated, expected identifer`);
+      if (param.typeValueReference.kind === TypeValueReferenceKind.UNAVAILABLE) {
+        fail(`Incorrect typeValueReference generated for ${param.name}, expected "${
+            expected}" because "${param.typeValueReference.reason}"`);
+      } else if (
+          param.typeValueReference.kind === TypeValueReferenceKind.LOCAL &&
+          fromModule[idx] != null) {
+        fail(`Incorrect typeValueReference generated for ${param.name}, expected non-LOCAL (from ${
+            fromModule[idx]}) but was marked LOCAL`);
+      } else if (
+          param.typeValueReference.kind !== TypeValueReferenceKind.LOCAL &&
+          fromModule[idx] == null) {
+        fail(`Incorrect typeValueReference generated for ${
+            param.name}, expected LOCAL but was imported from ${
+            param.typeValueReference.moduleName}`);
+      } else if (param.typeValueReference.kind === TypeValueReferenceKind.LOCAL) {
+        if (!ts.isIdentifier(param.typeValueReference.expression) &&
+            !ts.isPropertyAccessExpression(param.typeValueReference.expression)) {
+          fail(`Incorrect typeValueReference generated for ${
+              param.name}, expected an identifier but got "${
+              param.typeValueReference.expression.getText()}"`);
         } else {
-          expect(param.typeValueReference.expression.text).toEqual(expected);
+          expect(param.typeValueReference.expression.getText()).toEqual(expected);
         }
-      } else if (param.typeValueReference !== null) {
-        expect(param.typeValueReference.moduleName).toBe(fromModule!);
+      } else if (param.typeValueReference.kind === TypeValueReferenceKind.IMPORTED) {
+        expect(param.typeValueReference.moduleName).toBe(fromModule[idx]!);
         expect(param.typeValueReference.importedName).toBe(expected);
       }
     }
diff --git a/packages/compiler-cli/ngcc/test/integration/ngcc_spec.ts b/packages/compiler-cli/ngcc/test/integration/ngcc_spec.ts
index edbc732621299..7208abe4df885 100644
--- a/packages/compiler-cli/ngcc/test/integration/ngcc_spec.ts
+++ b/packages/compiler-cli/ngcc/test/integration/ngcc_spec.ts
@@ -576,6 +576,35 @@ runInEachFileSystem(() => {
               `TestClass.ɵprov = ɵngcc0.ɵɵdefineInjectable({`);
     });
 
+    // https://github.com/angular/angular/issues/38883
+    it('should recognize ChangeDetectorRef as special symbol for pipes', () => {
+      compileIntoFlatEs2015Package('test-package', {
+        '/index.ts': `
+        import {ChangeDetectorRef, Pipe, PipeTransform} from '@angular/core';
+
+        @Pipe({
+          name: 'myTestPipe'
+        })
+        export class TestClass implements PipeTransform {
+          constructor(cdr: ChangeDetectorRef) {}
+          transform(value: any) { return value; }
+        }
+        `,
+      });
+
+      mainNgcc({
+        basePath: '/node_modules',
+        targetEntryPointPath: 'test-package',
+        propertiesToConsider: ['esm2015'],
+      });
+
+      const jsContents = fs.readFile(_(`/node_modules/test-package/index.js`));
+      expect(jsContents)
+          .toContain(
+              `TestClass.ɵfac = function TestClass_Factory(t) { ` +
+              `return new (t || TestClass)(ɵngcc0.ɵɵinjectPipeChangeDetectorRef()); };`);
+    });
+
     it('should use the correct type name in typings files when an export has a different name in source files',
        () => {
          // We need to make sure that changes to the typings files use the correct name
@@ -1663,12 +1692,12 @@ runInEachFileSystem(() => {
             JSON.stringify({angularCompilerOptions: {annotateForClosureCompiler: true}}));
         mainNgcc({basePath: '/dist', propertiesToConsider: ['es2015']});
         const jsContents = fs.readFile(_(`/dist/local-package/index.js`));
-        expect(jsContents).toContain('/** @nocollapse */ \nAppComponent.ɵcmp =');
+        expect(jsContents).toContain('/** @nocollapse */\nAppComponent.ɵcmp =');
       });
       it('should default to not give closure annotated output', () => {
         mainNgcc({basePath: '/dist', propertiesToConsider: ['es2015']});
         const jsContents = fs.readFile(_(`/dist/local-package/index.js`));
-        expect(jsContents).not.toContain('/** @nocollapse */');
+        expect(jsContents).not.toContain('@nocollapse');
       });
     });
 
diff --git a/packages/compiler-cli/ngcc/test/integration/util.ts b/packages/compiler-cli/ngcc/test/integration/util.ts
index 53f272cb231b0..e8ab286ee2422 100644
--- a/packages/compiler-cli/ngcc/test/integration/util.ts
+++ b/packages/compiler-cli/ngcc/test/integration/util.ts
@@ -99,7 +99,14 @@ function compileIntoFlatPackage(
     program.emit();
   };
 
-  emit({declaration: true, module: options.module, target: options.target, lib: []});
+  emit({
+    declaration: true,
+    emitDecoratorMetadata: true,
+    moduleResolution: ts.ModuleResolutionKind.NodeJs,
+    module: options.module,
+    target: options.target,
+    lib: [],
+  });
 
   // Copy over the JS and .d.ts files, and add a .metadata.json for each .d.ts file.
   for (const file of rootNames) {
@@ -152,7 +159,9 @@ export function compileIntoApf(
   compileFs.ensureDir(compileFs.resolve('esm2015'));
   emit({
     declaration: true,
+    emitDecoratorMetadata: true,
     outDir: './esm2015',
+    moduleResolution: ts.ModuleResolutionKind.NodeJs,
     module: ts.ModuleKind.ESNext,
     target: ts.ScriptTarget.ES2015,
     lib: [],
@@ -178,7 +187,9 @@ export function compileIntoApf(
   compileFs.ensureDir(compileFs.resolve('esm5'));
   emit({
     declaration: false,
+    emitDecoratorMetadata: true,
     outDir: './esm5',
+    moduleResolution: ts.ModuleResolutionKind.NodeJs,
     module: ts.ModuleKind.ESNext,
     target: ts.ScriptTarget.ES5,
     lib: [],
@@ -213,13 +224,15 @@ export function compileIntoApf(
       fs.resolve(`/node_modules/${pkgName}/package.json`), JSON.stringify(pkgJson, null, 2));
 }
 
+const stdFiles = loadStandardTestFiles({fakeCore: false});
+
 /**
  * Prepares a mock filesystem that contains all provided source files, which can be used to emit
  * compiled code into.
  */
 function setupCompileFs(sources: PackageSources): {rootNames: string[], compileFs: FileSystem} {
   const compileFs = new MockFileSystemPosix(true);
-  compileFs.init(loadStandardTestFiles({fakeCore: false}));
+  compileFs.init(stdFiles);
 
   const rootNames = Object.keys(sources);
 
diff --git a/packages/compiler-cli/ngcc/test/ngcc_options_spec.ts b/packages/compiler-cli/ngcc/test/ngcc_options_spec.ts
index 56fa85b7eb3a7..1ecb30b037955 100644
--- a/packages/compiler-cli/ngcc/test/ngcc_options_spec.ts
+++ b/packages/compiler-cli/ngcc/test/ngcc_options_spec.ts
@@ -5,12 +5,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
  */
+import * as os from 'os';
 
 import {absoluteFrom, AbsoluteFsPath, FileSystem, getFileSystem} from '../../src/ngtsc/file_system';
 import {runInEachFileSystem} from '../../src/ngtsc/file_system/testing';
 import {MockLogger} from '../../src/ngtsc/logging/testing';
 
-import {clearTsConfigCache, getSharedSetup, NgccOptions} from '../src/ngcc_options';
+import {clearTsConfigCache, getMaxNumberOfWorkers, getSharedSetup, NgccOptions} from '../src/ngcc_options';
 
 
 
@@ -100,6 +101,67 @@ runInEachFileSystem(() => {
     });
   });
 
+  describe('getMaxNumberOfWorkers', () => {
+    let processEnv: NodeJS.ProcessEnv;
+    let cpuSpy: jasmine.Spy;
+    beforeEach(() => {
+      processEnv = process.env;
+      process.env = {...process.env};
+      cpuSpy = spyOn(os, 'cpus');
+    });
+    afterEach(() => {
+      process.env = processEnv;
+    });
+
+    it('should use NGCC_MAX_WORKERS environment variable if set', () => {
+      process.env.NGCC_MAX_WORKERS = '16';
+      expect(getMaxNumberOfWorkers()).toBe(16);
+      process.env.NGCC_MAX_WORKERS = '8';
+      expect(getMaxNumberOfWorkers()).toBe(8);
+      process.env.NGCC_MAX_WORKERS = ' 8 ';
+      expect(getMaxNumberOfWorkers()).toBe(8);
+    });
+
+    it('should throw an error if NGCC_MAX_WORKERS is less than 1', () => {
+      process.env.NGCC_MAX_WORKERS = '0';
+      expect(() => getMaxNumberOfWorkers())
+          .toThrow(new Error('NGCC_MAX_WORKERS should be at least 1.'));
+      process.env.NGCC_MAX_WORKERS = '-1';
+      expect(() => getMaxNumberOfWorkers())
+          .toThrow(new Error('NGCC_MAX_WORKERS should be at least 1.'));
+    });
+
+    it('should throw an error if NGCC_MAX_WORKERS is not an integer', () => {
+      process.env.NGCC_MAX_WORKERS = 'a';
+      expect(() => getMaxNumberOfWorkers())
+          .toThrow(new Error('NGCC_MAX_WORKERS should be an integer.'));
+      process.env.NGCC_MAX_WORKERS = '1.5';
+      expect(() => getMaxNumberOfWorkers())
+          .toThrow(new Error('NGCC_MAX_WORKERS should be an integer.'));
+      process.env.NGCC_MAX_WORKERS = '-';
+      expect(() => getMaxNumberOfWorkers())
+          .toThrow(new Error('NGCC_MAX_WORKERS should be an integer.'));
+    });
+
+    it('should fallback to the number of cpus, minus one (for the master process), with a maximum of 4 workers',
+       () => {
+         simulateNumberOfCpus(1);
+         expect(getMaxNumberOfWorkers()).toBe(1);
+         simulateNumberOfCpus(2);
+         expect(getMaxNumberOfWorkers()).toBe(1);
+         simulateNumberOfCpus(4);
+         expect(getMaxNumberOfWorkers()).toBe(3);
+         simulateNumberOfCpus(6);
+         expect(getMaxNumberOfWorkers()).toBe(4);
+         simulateNumberOfCpus(8);
+         expect(getMaxNumberOfWorkers()).toBe(4);
+       });
+
+    function simulateNumberOfCpus(cpus: number): void {
+      cpuSpy.and.returnValue(new Array(cpus).fill({model: 'Mock CPU'} as any));
+    }
+  });
+
   /**
    * This function creates an object that contains the minimal required properties for NgccOptions.
    */
diff --git a/packages/compiler-cli/ngcc/test/packages/entry_point_bundle_spec.ts b/packages/compiler-cli/ngcc/test/packages/entry_point_bundle_spec.ts
index 8eb133ed0a23a..a5878794af169 100644
--- a/packages/compiler-cli/ngcc/test/packages/entry_point_bundle_spec.ts
+++ b/packages/compiler-cli/ngcc/test/packages/entry_point_bundle_spec.ts
@@ -10,6 +10,7 @@ import {runInEachFileSystem} from '../../../src/ngtsc/file_system/testing';
 import {loadTestFiles} from '../../../test/helpers';
 import {EntryPoint} from '../../src/packages/entry_point';
 import {makeEntryPointBundle} from '../../src/packages/entry_point_bundle';
+import {createModuleResolutionCache, SharedFileCache} from '../../src/packages/source_file_cache';
 
 runInEachFileSystem(() => {
   describe('entry point bundle', () => {
@@ -180,7 +181,10 @@ runInEachFileSystem(() => {
            ignoreMissingDependencies: false,
            generateDeepReexports: false,
          };
-         const esm5bundle = makeEntryPointBundle(fs, entryPoint, './index.js', false, 'esm5', true);
+         const moduleResolutionCache = createModuleResolutionCache(fs);
+         const esm5bundle = makeEntryPointBundle(
+             fs, entryPoint, new SharedFileCache(fs), moduleResolutionCache, './index.js', false,
+             'esm5', true);
 
          expect(esm5bundle.src.program.getSourceFiles().map(sf => sf.fileName))
              .toEqual(jasmine.arrayWithExactContents([
@@ -291,8 +295,11 @@ runInEachFileSystem(() => {
         ignoreMissingDependencies: false,
         generateDeepReexports: false,
       };
+      const moduleResolutionCache = createModuleResolutionCache(fs);
       const esm5bundle = makeEntryPointBundle(
-          fs, entryPoint, './index.js', false, 'esm5', /* transformDts */ true,
+          fs, entryPoint, new SharedFileCache(fs), moduleResolutionCache, './index.js', false,
+          'esm5',
+          /* transformDts */ true,
           /* pathMappings */ undefined, /* mirrorDtsFromSrc */ true);
 
       expect(esm5bundle.src.program.getSourceFiles().map(sf => _(sf.fileName)))
@@ -328,8 +335,11 @@ runInEachFileSystem(() => {
               ignoreMissingDependencies: false,
               generateDeepReexports: false,
             };
+            const moduleResolutionCache = createModuleResolutionCache(fs);
             const esm5bundle = makeEntryPointBundle(
-                fs, entryPoint, './index.js', false, 'esm5', /* transformDts */ true,
+                fs, entryPoint, new SharedFileCache(fs), moduleResolutionCache, './index.js', false,
+                'esm5',
+                /* transformDts */ true,
                 /* pathMappings */ undefined, /* mirrorDtsFromSrc */ true);
             expect(esm5bundle.src.program.getSourceFiles().map(sf => sf.fileName))
                 .toContain(absoluteFrom('/node_modules/test/internal.js'));
@@ -351,8 +361,11 @@ runInEachFileSystem(() => {
               ignoreMissingDependencies: false,
               generateDeepReexports: false,
             };
+            const moduleResolutionCache = createModuleResolutionCache(fs);
             const esm5bundle = makeEntryPointBundle(
-                fs, entryPoint, './esm2015/index.js', false, 'esm2015', /* transformDts */ true,
+                fs, entryPoint, new SharedFileCache(fs), moduleResolutionCache,
+                './esm2015/index.js', false, 'esm2015',
+                /* transformDts */ true,
                 /* pathMappings */ undefined, /* mirrorDtsFromSrc */ true);
             expect(esm5bundle.src.program.getSourceFiles().map(sf => sf.fileName))
                 .toContain(absoluteFrom('/node_modules/internal/esm2015/src/internal.js'));
@@ -374,8 +387,11 @@ runInEachFileSystem(() => {
               ignoreMissingDependencies: false,
               generateDeepReexports: false,
             };
+            const moduleResolutionCache = createModuleResolutionCache(fs);
             const esm5bundle = makeEntryPointBundle(
-                fs, entryPoint, './index.js', false, 'esm5', /* transformDts */ true,
+                fs, entryPoint, new SharedFileCache(fs), moduleResolutionCache, './index.js', false,
+                'esm5',
+                /* transformDts */ true,
                 /* pathMappings */ undefined, /* mirrorDtsFromSrc */ false);
             expect(esm5bundle.src.program.getSourceFiles().map(sf => sf.fileName))
                 .toContain(absoluteFrom('/node_modules/test/internal.js'));
@@ -398,8 +414,11 @@ runInEachFileSystem(() => {
         ignoreMissingDependencies: false,
         generateDeepReexports: false,
       };
+      const moduleResolutionCache = createModuleResolutionCache(fs);
       const bundle = makeEntryPointBundle(
-          fs, entryPoint, './index.js', false, 'esm2015', /* transformDts */ true,
+          fs, entryPoint, new SharedFileCache(fs), moduleResolutionCache, './index.js', false,
+          'esm2015',
+          /* transformDts */ true,
           /* pathMappings */ undefined, /* mirrorDtsFromSrc */ true);
       expect(bundle.rootDirs).toEqual([absoluteFrom('/node_modules/primary')]);
     });
diff --git a/packages/compiler-cli/ngcc/test/packages/source_file_cache_spec.ts b/packages/compiler-cli/ngcc/test/packages/source_file_cache_spec.ts
new file mode 100644
index 0000000000000..8c3ca880897ab
--- /dev/null
+++ b/packages/compiler-cli/ngcc/test/packages/source_file_cache_spec.ts
@@ -0,0 +1,223 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {absoluteFrom, FileSystem, getFileSystem} from '../../../src/ngtsc/file_system';
+import {runInEachFileSystem} from '../../../src/ngtsc/file_system/testing';
+import {loadTestFiles} from '../../../test/helpers';
+import {EntryPointFileCache, isAngularDts, isDefaultLibrary, SharedFileCache} from '../../src/packages/source_file_cache';
+
+runInEachFileSystem(() => {
+  describe('caching', () => {
+    let _: typeof absoluteFrom;
+    let fs: FileSystem;
+    beforeEach(() => {
+      _ = absoluteFrom;
+      fs = getFileSystem();
+      loadTestFiles([
+        {
+          name: _('/node_modules/typescript/lib/lib.es5.d.ts'),
+          contents: `export declare interface Array {}`,
+        },
+        {
+          name: _('/node_modules/typescript/lib/lib.dom.d.ts'),
+          contents: `export declare interface Window {}`,
+        },
+        {
+          name: _('/node_modules/@angular/core/core.d.ts'),
+          contents: `export declare interface Component {}`,
+        },
+        {
+          name: _('/node_modules/@angular/common/common.d.ts'),
+          contents: `export declare interface NgIf {}`,
+        },
+        {
+          name: _('/index.ts'),
+          contents: `export const index = true;`,
+        },
+        {
+          name: _('/main.ts'),
+          contents: `export const main = true;`,
+        },
+      ]);
+    });
+
+    describe('SharedFileCache', () => {
+      it('should cache a parsed source file for default libraries', () => {
+        const cache = new SharedFileCache(fs);
+
+        const libEs5 = cache.getCachedSourceFile('/node_modules/typescript/lib/lib.es5.d.ts')!;
+        expect(libEs5).not.toBeUndefined();
+        expect(libEs5.text).toContain('Array');
+
+        const libDom = cache.getCachedSourceFile('/node_modules/typescript/lib/lib.dom.d.ts')!;
+        expect(libDom).not.toBeUndefined();
+        expect(libDom.text).toContain('Window');
+
+        const libEs5_2 = cache.getCachedSourceFile('/node_modules/typescript/lib/lib.es5.d.ts')!;
+        expect(libEs5_2).toBe(libEs5);
+
+        const libDom_2 = cache.getCachedSourceFile('/node_modules/typescript/lib/lib.dom.d.ts')!;
+        expect(libDom_2).toBe(libDom);
+      });
+
+      it('should cache a parsed source file for @angular scoped packages', () => {
+        const cache = new SharedFileCache(fs);
+
+        const core = cache.getCachedSourceFile('/node_modules/@angular/core/core.d.ts')!;
+        expect(core).not.toBeUndefined();
+        expect(core.text).toContain('Component');
+
+        const common = cache.getCachedSourceFile('/node_modules/@angular/common/common.d.ts')!;
+        expect(common).not.toBeUndefined();
+        expect(common.text).toContain('NgIf');
+
+        const core_2 = cache.getCachedSourceFile('/node_modules/@angular/core/core.d.ts')!;
+        expect(core_2).toBe(core);
+
+        const common_2 = cache.getCachedSourceFile('/node_modules/@angular/common/common.d.ts')!;
+        expect(common_2).toBe(common);
+      });
+
+      it('should reparse @angular d.ts files when they change', () => {
+        const cache = new SharedFileCache(fs);
+
+        const core = cache.getCachedSourceFile('/node_modules/@angular/core/core.d.ts')!;
+        expect(core).not.toBeUndefined();
+        expect(core.text).toContain('Component');
+
+        const common = cache.getCachedSourceFile('/node_modules/@angular/common/common.d.ts')!;
+        expect(common).not.toBeUndefined();
+        expect(common.text).toContain('NgIf');
+
+        fs.writeFile(
+            _('/node_modules/@angular/core/core.d.ts'), `export declare interface Directive {}`);
+
+        const core_2 = cache.getCachedSourceFile('/node_modules/@angular/core/core.d.ts')!;
+        expect(core_2).not.toBe(core);
+        expect(core_2.text).toContain('Directive');
+
+        const core_3 = cache.getCachedSourceFile('/node_modules/@angular/core/core.d.ts')!;
+        expect(core_3).toBe(core_2);
+
+        const common_2 = cache.getCachedSourceFile('/node_modules/@angular/common/common.d.ts')!;
+        expect(common_2).toBe(common);
+      });
+
+      it('should not cache files that are not default library files inside of the typescript package',
+         () => {
+           const cache = new SharedFileCache(fs);
+
+           expect(cache.getCachedSourceFile('/node_modules/typescript/lib/typescript.d.ts'))
+               .toBeUndefined();
+           expect(cache.getCachedSourceFile('/typescript/lib.es5.d.ts')).toBeUndefined();
+         });
+    });
+
+    describe('isDefaultLibrary()', () => {
+      it('should accept lib files inside of the typescript package', () => {
+        expect(isDefaultLibrary(_('/node_modules/typescript/lib/lib.es5.d.ts'), fs)).toBe(true);
+        expect(isDefaultLibrary(_('/node_modules/typescript/lib/lib.dom.d.ts'), fs)).toBe(true);
+        expect(isDefaultLibrary(_('/node_modules/typescript/lib/lib.es2015.core.d.ts'), fs))
+            .toBe(true);
+        expect(isDefaultLibrary(_('/root/node_modules/typescript/lib/lib.es5.d.ts'), fs))
+            .toBe(true);
+      });
+      it('should reject non lib files inside of the typescript package', () => {
+        expect(isDefaultLibrary(_('/node_modules/typescript/lib/typescript.d.ts'), fs)).toBe(false);
+        expect(isDefaultLibrary(_('/node_modules/typescript/lib/lib.es5.ts'), fs)).toBe(false);
+        expect(isDefaultLibrary(_('/node_modules/typescript/lib/lib.d.ts'), fs)).toBe(false);
+        expect(isDefaultLibrary(_('/node_modules/typescript/lib.es5.d.ts'), fs)).toBe(false);
+      });
+      it('should reject lib files outside of the typescript package', () => {
+        expect(isDefaultLibrary(_('/node_modules/ttypescript/lib/lib.es5.d.ts'), fs)).toBe(false);
+        expect(isDefaultLibrary(_('/node_modules/ttypescript/lib/lib.es5.d.ts'), fs)).toBe(false);
+        expect(isDefaultLibrary(_('/typescript/lib/lib.es5.d.ts'), fs)).toBe(false);
+      });
+    });
+
+    describe('isAngularDts()', () => {
+      it('should accept .d.ts files inside of the @angular scope', () => {
+        expect(isAngularDts(_('/node_modules/@angular/core/core.d.ts'), fs)).toBe(true);
+        expect(isAngularDts(_('/node_modules/@angular/common/common.d.ts'), fs)).toBe(true);
+      });
+      it('should reject non-.d.ts files inside @angular scoped packages', () => {
+        expect(isAngularDts(_('/node_modules/@angular/common/src/common.ts'), fs)).toBe(false);
+      });
+      it('should reject .d.ts files nested deeply inside @angular scoped packages', () => {
+        expect(isAngularDts(_('/node_modules/@angular/common/src/common.d.ts'), fs)).toBe(false);
+      });
+      it('should reject .d.ts files directly inside the @angular scope', () => {
+        expect(isAngularDts(_('/node_modules/@angular/common.d.ts'), fs)).toBe(false);
+      });
+      it('should reject files that are not inside node_modules', () => {
+        expect(isAngularDts(_('/@angular/core/core.d.ts'), fs)).toBe(false);
+      });
+    });
+
+    describe('EntryPointFileCache', () => {
+      let sharedFileCache: SharedFileCache;
+      beforeEach(() => {
+        sharedFileCache = new SharedFileCache(fs);
+      });
+
+      it('should prefer source files cached in SharedFileCache', () => {
+        const cache1 = new EntryPointFileCache(fs, sharedFileCache);
+        const libEs5_1 = cache1.getCachedSourceFile(
+            '/node_modules/typescript/lib/lib.es5.d.ts', ts.ScriptTarget.ESNext)!;
+        expect(libEs5_1).not.toBeUndefined();
+        expect(libEs5_1.text).toContain('Array');
+        expect(libEs5_1.languageVersion).toBe(ts.ScriptTarget.ES2015);
+
+        const cache2 = new EntryPointFileCache(fs, sharedFileCache);
+        const libEs5_2 = cache2.getCachedSourceFile(
+            '/node_modules/typescript/lib/lib.es5.d.ts', ts.ScriptTarget.ESNext)!;
+        expect(libEs5_1).toBe(libEs5_2);
+      });
+
+      it('should cache source files that are not default library files', () => {
+        const cache = new EntryPointFileCache(fs, sharedFileCache);
+        const index = cache.getCachedSourceFile('/index.ts', ts.ScriptTarget.ESNext)!;
+        expect(index).not.toBeUndefined();
+        expect(index.text).toContain('index');
+        expect(index.languageVersion).toBe(ts.ScriptTarget.ESNext);
+
+        const main = cache.getCachedSourceFile('/main.ts', ts.ScriptTarget.ESNext)!;
+        expect(main).not.toBeUndefined();
+        expect(main.text).toContain('main');
+        expect(main.languageVersion).toBe(ts.ScriptTarget.ESNext);
+
+        const index_2 = cache.getCachedSourceFile('/index.ts', ts.ScriptTarget.ESNext)!;
+        expect(index_2).toBe(index);
+
+        const main_2 = cache.getCachedSourceFile('/main.ts', ts.ScriptTarget.ESNext)!;
+        expect(main_2).toBe(main);
+      });
+
+      it('should not share non-library files across multiple cache instances', () => {
+        const cache1 = new EntryPointFileCache(fs, sharedFileCache);
+        const cache2 = new EntryPointFileCache(fs, sharedFileCache);
+
+        const index1 = cache1.getCachedSourceFile('/index.ts', ts.ScriptTarget.ESNext)!;
+        const index2 = cache2.getCachedSourceFile('/index.ts', ts.ScriptTarget.ESNext)!;
+        expect(index1).not.toBe(index2);
+      });
+
+      it('should return undefined if the file does not exist', () => {
+        const cache = new EntryPointFileCache(fs, sharedFileCache);
+        expect(cache.getCachedSourceFile('/nonexistent.ts', ts.ScriptTarget.ESNext))
+            .toBeUndefined();
+      });
+
+      it('should return undefined if the path is a directory', () => {
+        const cache = new EntryPointFileCache(fs, sharedFileCache);
+        expect(cache.getCachedSourceFile('/node_modules', ts.ScriptTarget.ESNext)).toBeUndefined();
+      });
+    });
+  });
+});
diff --git a/packages/compiler-cli/ngcc/test/rendering/esm_rendering_formatter_spec.ts b/packages/compiler-cli/ngcc/test/rendering/esm_rendering_formatter_spec.ts
index bec7eafb960bd..b34c9a40799fc 100644
--- a/packages/compiler-cli/ngcc/test/rendering/esm_rendering_formatter_spec.ts
+++ b/packages/compiler-cli/ngcc/test/rendering/esm_rendering_formatter_spec.ts
@@ -69,7 +69,7 @@ B.decorators = [
   { type: OtherB },
   { type: Directive, args: [{ selector: '[b]' }] }
 ];
-var C_1;
+let C_1;
 let C = C_1 = class C {};
 C.decorators = [
   { type: Directive, args: [{ selector: '[c]' }] },
@@ -111,7 +111,7 @@ B.decorators = [
 ];
 return B;
 })();
-var C_1;
+let C_1;
 let C = C_1 = /** @class */ (() => {
 class C {}
 C.decorators = [
@@ -432,7 +432,7 @@ A.decorators = [
             name: _('/node_modules/test-package/some/file.js'),
             contents: `
 import * as tslib_1 from "tslib";
-var D_1;
+let D_1;
 /* A copyright notice */
 import { Directive } from '@angular/core';
 const OtherA = () => (node) => { };
@@ -681,9 +681,9 @@ export { D };
           const stmt3 = new DeclareVarStmt('baz', new LiteralExpr('qux'), undefined, []);
 
           expect(renderer.printStatement(stmt1, sourceFile, importManager)).toBe('const foo = 42;');
-          expect(renderer.printStatement(stmt2, sourceFile, importManager)).toBe('var bar = true;');
+          expect(renderer.printStatement(stmt2, sourceFile, importManager)).toBe('let bar = true;');
           expect(renderer.printStatement(stmt3, sourceFile, importManager))
-              .toBe('var baz = "qux";');
+              .toBe('let baz = "qux";');
         });
       });
     });
diff --git a/packages/compiler-cli/ngcc/test/rendering/renderer_spec.ts b/packages/compiler-cli/ngcc/test/rendering/renderer_spec.ts
index d21888d7967cf..78121b5dada58 100644
--- a/packages/compiler-cli/ngcc/test/rendering/renderer_spec.ts
+++ b/packages/compiler-cli/ngcc/test/rendering/renderer_spec.ts
@@ -13,7 +13,7 @@ import * as ts from 'typescript';
 
 import {absoluteFrom, getFileSystem} from '../../../src/ngtsc/file_system';
 import {runInEachFileSystem, TestFile} from '../../../src/ngtsc/file_system/testing';
-import {NOOP_DEFAULT_IMPORT_RECORDER, Reexport} from '../../../src/ngtsc/imports';
+import {Reexport} from '../../../src/ngtsc/imports';
 import {MockLogger} from '../../../src/ngtsc/logging/testing';
 import {Import, ImportManager, translateStatement} from '../../../src/ngtsc/translator';
 import {loadTestFiles} from '../../../test/helpers';
@@ -32,6 +32,8 @@ import {getRootFiles, makeTestEntryPointBundle} from '../helpers/utils';
 class TestRenderingFormatter implements RenderingFormatter {
   private printer = ts.createPrinter({newLine: ts.NewLineKind.LineFeed});
 
+  constructor(private isEs5: boolean) {}
+
   addImports(output: MagicString, imports: Import[], sf: ts.SourceFile) {
     output.prepend('\n// ADD IMPORTS\n');
   }
@@ -63,7 +65,8 @@ class TestRenderingFormatter implements RenderingFormatter {
   }
   printStatement(stmt: Statement, sourceFile: ts.SourceFile, importManager: ImportManager): string {
     const node = translateStatement(
-        stmt, importManager, NOOP_DEFAULT_IMPORT_RECORDER, ts.ScriptTarget.ES2015);
+        stmt, importManager,
+        {downlevelLocalizedStrings: this.isEs5, downlevelVariableDeclarations: this.isEs5});
     const code = this.printer.printNode(ts.EmitHint.Unspecified, node, sourceFile);
 
     return `// TRANSPILED\n${code}`;
@@ -94,7 +97,7 @@ function createTestRenderer(
                                    .analyzeProgram(bundle.src.program);
   const privateDeclarationsAnalyses =
       new PrivateDeclarationsAnalyzer(host, referencesRegistry).analyzeProgram(bundle.src.program);
-  const testFormatter = new TestRenderingFormatter();
+  const testFormatter = new TestRenderingFormatter(isEs5);
   spyOn(testFormatter, 'addExports').and.callThrough();
   spyOn(testFormatter, 'addImports').and.callThrough();
   spyOn(testFormatter, 'addDefinitions').and.callThrough();
@@ -569,7 +572,7 @@ UndecoratedBase.ɵfac = function UndecoratedBase_Factory(t) { return new (t || U
 UndecoratedBase.ɵdir = ɵngcc0.ɵɵdefineDirective({ type: UndecoratedBase, viewQuery: function UndecoratedBase_Query(rf, ctx) { if (rf & 1) {
         ɵngcc0.ɵɵstaticViewQuery(_c0, true);
     } if (rf & 2) {
-        var _t;
+        let _t;
         ɵngcc0.ɵɵqueryRefresh(_t = ɵngcc0.ɵɵloadQuery()) && (ctx.test = _t.first);
     } } });`);
         });
diff --git a/packages/compiler-cli/ngcc/test/writing/new_entry_point_file_writer_spec.ts b/packages/compiler-cli/ngcc/test/writing/new_entry_point_file_writer_spec.ts
index b8fb4aba3382b..255212a20c9d0 100644
--- a/packages/compiler-cli/ngcc/test/writing/new_entry_point_file_writer_spec.ts
+++ b/packages/compiler-cli/ngcc/test/writing/new_entry_point_file_writer_spec.ts
@@ -12,6 +12,7 @@ import {loadTestFiles} from '../../../test/helpers';
 import {NgccConfiguration} from '../../src/packages/configuration';
 import {EntryPoint, EntryPointFormat, EntryPointJsonProperty, getEntryPointInfo, isEntryPoint} from '../../src/packages/entry_point';
 import {EntryPointBundle, makeEntryPointBundle} from '../../src/packages/entry_point_bundle';
+import {createModuleResolutionCache, SharedFileCache} from '../../src/packages/source_file_cache';
 import {FileWriter} from '../../src/writing/file_writer';
 import {NewEntryPointFileWriter} from '../../src/writing/new_entry_point_file_writer';
 import {DirectPackageJsonUpdater} from '../../src/writing/package_json_updater';
@@ -634,7 +635,9 @@ runInEachFileSystem(() => {
   function makeTestBundle(
       fs: FileSystem, entryPoint: EntryPoint, formatProperty: EntryPointJsonProperty,
       format: EntryPointFormat): EntryPointBundle {
+    const moduleResolutionCache = createModuleResolutionCache(fs);
     return makeEntryPointBundle(
-        fs, entryPoint, entryPoint.packageJson[formatProperty]!, false, format, true);
+        fs, entryPoint, new SharedFileCache(fs), moduleResolutionCache,
+        entryPoint.packageJson[formatProperty]!, false, format, true);
   }
 });
diff --git a/packages/compiler-cli/package.json b/packages/compiler-cli/package.json
index 785e0fdd3af32..55d9fa63867a7 100644
--- a/packages/compiler-cli/package.json
+++ b/packages/compiler-cli/package.json
@@ -11,6 +11,8 @@
     "ng-xi18n": "./src/extract_i18n.js"
   },
   "dependencies": {
+    "@babel/core": "^7.8.6",
+    "@babel/types": "^7.8.6",
     "reflect-metadata": "^0.1.2",
     "minimist": "^1.2.0",
     "canonical-path": "1.0.0",
@@ -27,7 +29,7 @@
   },
   "peerDependencies": {
     "@angular/compiler": "0.0.0-PLACEHOLDER",
-    "typescript": ">=3.9 <4.0"
+    "typescript": ">=4.0 <4.1"
   },
   "engines": {
     "node": ">=10.0"
@@ -52,4 +54,4 @@
   "publishConfig": {
     "registry": "https://wombat-dressing-room.appspot.com"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/compiler-cli/src/main.ts b/packages/compiler-cli/src/main.ts
index 0c8eb8ddb899f..88facc55871ec 100644
--- a/packages/compiler-cli/src/main.ts
+++ b/packages/compiler-cli/src/main.ts
@@ -172,7 +172,6 @@ export function readCommandLineAndConfiguration(
       emitFlags: api.EmitFlags.Default
     };
   }
-  const allDiagnostics: Diagnostics = [];
   const config = readConfiguration(project, cmdConfig.options);
   const options = {...config.options, ...existingOptions};
   if (options.locale) {
diff --git a/packages/compiler-cli/src/metadata/evaluator.ts b/packages/compiler-cli/src/metadata/evaluator.ts
index f064afea73103..a7afb4e01df9c 100644
--- a/packages/compiler-cli/src/metadata/evaluator.ts
+++ b/packages/compiler-cli/src/metadata/evaluator.ts
@@ -476,13 +476,16 @@ export class Evaluator {
         return recordEntry(typeReference, node);
       case ts.SyntaxKind.UnionType:
         const unionType = <ts.UnionTypeNode>node;
-
         // Remove null and undefined from the list of unions.
-        const references = unionType.types
-                               .filter(
-                                   n => n.kind != ts.SyntaxKind.NullKeyword &&
-                                       n.kind != ts.SyntaxKind.UndefinedKeyword)
-                               .map(n => this.evaluateNode(n));
+        // TODO(alan-agius4): remove `n.kind !== ts.SyntaxKind.NullKeyword` when
+        // TS 3.9 support is dropped. In TS 4.0 NullKeyword is a child of LiteralType.
+        const references =
+            unionType.types
+                .filter(
+                    n => n.kind !== ts.SyntaxKind.NullKeyword &&
+                        n.kind !== ts.SyntaxKind.UndefinedKeyword &&
+                        !(ts.isLiteralTypeNode(n) && n.literal.kind === ts.SyntaxKind.NullKeyword))
+                .map(n => this.evaluateNode(n));
 
         // The remmaining reference must be the same. If two have type arguments consider them
         // different even if the type arguments are the same.
diff --git a/packages/compiler-cli/src/metadata/symbols.ts b/packages/compiler-cli/src/metadata/symbols.ts
index 262056014cebe..21400f45bb60f 100644
--- a/packages/compiler-cli/src/metadata/symbols.ts
+++ b/packages/compiler-cli/src/metadata/symbols.ts
@@ -62,8 +62,8 @@ export class Symbols {
                 // even if the `SourceFile` was not type checked (which looks for `SourceFile`
                 // in the parent chain). This doesn't damage the node as the binder unconditionally
                 // sets the parent.
-                externalReference.expression.parent = externalReference;
-                externalReference.parent = this.sourceFile as any;
+                (externalReference.expression.parent as ts.Node) = externalReference;
+                (externalReference.parent as ts.Node) = this.sourceFile;
               }
               const from = stripQuotes(externalReference.expression.getText());
               symbols.set(
@@ -83,8 +83,8 @@ export class Symbols {
           }
           if (!importDecl.moduleSpecifier.parent) {
             // See note above in the `ImportEqualDeclaration` case.
-            importDecl.moduleSpecifier.parent = importDecl;
-            importDecl.parent = this.sourceFile;
+            (importDecl.moduleSpecifier.parent as ts.Node) = importDecl;
+            (importDecl.parent as ts.Node) = this.sourceFile;
           }
           const from = stripQuotes(importDecl.moduleSpecifier.getText());
           if (importDecl.importClause.name) {
diff --git a/packages/compiler-cli/src/ngtsc/annotations/BUILD.bazel b/packages/compiler-cli/src/ngtsc/annotations/BUILD.bazel
index b2687e727d10a..7e089a796f80d 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/BUILD.bazel
+++ b/packages/compiler-cli/src/ngtsc/annotations/BUILD.bazel
@@ -23,6 +23,7 @@ ts_library(
         "//packages/compiler-cli/src/ngtsc/shims:api",
         "//packages/compiler-cli/src/ngtsc/transform",
         "//packages/compiler-cli/src/ngtsc/typecheck/api",
+        "//packages/compiler-cli/src/ngtsc/typecheck/diagnostics",
         "//packages/compiler-cli/src/ngtsc/util",
         "@npm//@types/node",
         "@npm//typescript",
diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/component.ts b/packages/compiler-cli/src/ngtsc/annotations/src/component.ts
index c2b5559f6ac31..74c5c73b83420 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/component.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/component.ts
@@ -6,22 +6,22 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {compileComponentFromMetadata, ConstantPool, CssSelector, DEFAULT_INTERPOLATION_CONFIG, DomElementSchemaRegistry, Expression, ExternalExpr, Identifiers, InterpolationConfig, LexerRange, makeBindingParser, ParseError, ParseSourceFile, parseTemplate, ParseTemplateOptions, R3ComponentMetadata, R3FactoryTarget, R3TargetBinder, SchemaMetadata, SelectorMatcher, Statement, TmplAstNode, WrappedNodeExpr} from '@angular/compiler';
+import {compileComponentFromMetadata, ConstantPool, CssSelector, DEFAULT_INTERPOLATION_CONFIG, DomElementSchemaRegistry, Expression, ExternalExpr, Identifiers, InterpolationConfig, LexerRange, makeBindingParser, ParsedTemplate, ParseSourceFile, parseTemplate, R3ComponentMetadata, R3FactoryTarget, R3TargetBinder, SchemaMetadata, SelectorMatcher, Statement, TmplAstNode, WrappedNodeExpr} from '@angular/compiler';
 import * as ts from 'typescript';
 
 import {CycleAnalyzer} from '../../cycles';
-import {ErrorCode, FatalDiagnosticError} from '../../diagnostics';
-import {absoluteFrom, relative} from '../../file_system';
+import {ErrorCode, FatalDiagnosticError, ngErrorCode} from '../../diagnostics';
+import {absoluteFrom, relative, resolve} from '../../file_system';
 import {DefaultImportRecorder, ModuleResolver, Reference, ReferenceEmitter} from '../../imports';
 import {DependencyTracker} from '../../incremental/api';
 import {IndexingContext} from '../../indexer';
-import {DirectiveMeta, extractDirectiveGuards, InjectableClassRegistry, MetadataReader, MetadataRegistry} from '../../metadata';
-import {flattenInheritedDirectiveMetadata} from '../../metadata/src/inheritance';
+import {ClassPropertyMapping, DirectiveMeta, DirectiveTypeCheckMeta, extractDirectiveTypeCheckMeta, InjectableClassRegistry, MetadataReader, MetadataRegistry, TemplateMapping} from '../../metadata';
 import {EnumValue, PartialEvaluator} from '../../partial_evaluator';
-import {ClassDeclaration, Decorator, ReflectionHost, reflectObjectLiteral} from '../../reflection';
+import {ClassDeclaration, DeclarationNode, Decorator, ReflectionHost, reflectObjectLiteral} from '../../reflection';
 import {ComponentScopeReader, LocalModuleScopeRegistry} from '../../scope';
 import {AnalysisOutput, CompileResult, DecoratorHandler, DetectResult, HandlerFlags, HandlerPrecedence, ResolveResult} from '../../transform';
 import {TemplateSourceMapping, TypeCheckContext} from '../../typecheck/api';
+import {getTemplateId, makeTemplateDiagnostic} from '../../typecheck/diagnostics';
 import {tsSourceMapBug29300Fixed} from '../../util/src/ts_source_map_bug_29300';
 import {SubsetOfKeys} from '../../util/src/typescript';
 
@@ -30,7 +30,8 @@ import {createValueHasWrongTypeError, getDirectiveDiagnostics, getProviderDiagno
 import {extractDirectiveMetadata, parseFieldArrayValue} from './directive';
 import {compileNgFactoryDefField} from './factory';
 import {generateSetClassMetadataCall} from './metadata';
-import {findAngularDecorator, isAngularCoreReference, isExpressionForwardReference, makeDuplicateDeclarationError, readBaseClass, resolveProvidersRequiringFactory, unwrapExpression, wrapFunctionExpressionsInParens} from './util';
+import {TypeCheckScopes} from './typecheck_scopes';
+import {findAngularDecorator, isAngularCoreReference, isExpressionForwardReference, readBaseClass, resolveProvidersRequiringFactory, unwrapExpression, wrapFunctionExpressionsInParens} from './util';
 
 const EMPTY_MAP = new Map<string, Expression>();
 const EMPTY_ARRAY: any[] = [];
@@ -51,10 +52,13 @@ export interface ComponentAnalysisData {
    */
   meta: Omit<R3ComponentMetadata, ComponentMetadataResolvedFields>;
   baseClass: Reference<ClassDeclaration>|'dynamic'|null;
-  guards: ReturnType<typeof extractDirectiveGuards>;
+  typeCheckMeta: DirectiveTypeCheckMeta;
   template: ParsedTemplateWithSource;
   metadataStmt: Statement|null;
 
+  inputs: ClassPropertyMapping;
+  outputs: ClassPropertyMapping;
+
   /**
    * Providers extracted from the `providers` field of the component annotation which will require
    * an Angular factory definition at runtime.
@@ -79,9 +83,10 @@ export class ComponentDecoratorHandler implements
       private reflector: ReflectionHost, private evaluator: PartialEvaluator,
       private metaRegistry: MetadataRegistry, private metaReader: MetadataReader,
       private scopeReader: ComponentScopeReader, private scopeRegistry: LocalModuleScopeRegistry,
-      private isCore: boolean, private resourceLoader: ResourceLoader,
-      private rootDirs: ReadonlyArray<string>, private defaultPreserveWhitespaces: boolean,
-      private i18nUseExternalIds: boolean, private enableI18nLegacyMessageIdFormat: boolean,
+      private templateMapping: TemplateMapping, private isCore: boolean,
+      private resourceLoader: ResourceLoader, private rootDirs: ReadonlyArray<string>,
+      private defaultPreserveWhitespaces: boolean, private i18nUseExternalIds: boolean,
+      private enableI18nLegacyMessageIdFormat: boolean,
       private i18nNormalizeLineEndingsInICUs: boolean|undefined,
       private moduleResolver: ModuleResolver, private cycleAnalyzer: CycleAnalyzer,
       private refEmitter: ReferenceEmitter, private defaultImportRecorder: DefaultImportRecorder,
@@ -91,13 +96,14 @@ export class ComponentDecoratorHandler implements
 
   private literalCache = new Map<Decorator, ts.ObjectLiteralExpression>();
   private elementSchemaRegistry = new DomElementSchemaRegistry();
+  private typeCheckScopes = new TypeCheckScopes(this.scopeReader, this.metaReader);
 
   /**
    * During the asynchronous preanalyze phase, it's necessary to parse the template to extract
    * any potential <link> tags which might need to be loaded. This cache ensures that work is not
    * thrown away, and the parsed template is reused during the analyze phase.
    */
-  private preanalyzeTemplateCache = new Map<ts.Declaration, ParsedTemplateWithSource>();
+  private preanalyzeTemplateCache = new Map<DeclarationNode, ParsedTemplateWithSource>();
 
   readonly precedence = HandlerPrecedence.PRIMARY;
   readonly name = ComponentDecoratorHandler.name;
@@ -190,7 +196,7 @@ export class ComponentDecoratorHandler implements
     }
 
     // Next, read the `@Component`-specific fields.
-    const {decorator: component, metadata} = directiveResult;
+    const {decorator: component, metadata, inputs, outputs} = directiveResult;
 
     // Go through the root directories for this project, and select the one with the smallest
     // relative path representation.
@@ -254,9 +260,26 @@ export class ComponentDecoratorHandler implements
       }
     }
 
-    if (template.errors !== undefined) {
-      throw new Error(
-          `Errors parsing template: ${template.errors.map(e => e.toString()).join(', ')}`);
+    let diagnostics: ts.Diagnostic[]|undefined = undefined;
+
+    if (template.errors !== null) {
+      // If there are any template parsing errors, convert them to `ts.Diagnostic`s for display.
+      const id = getTemplateId(node);
+      diagnostics = template.errors.map(error => {
+        const span = error.span;
+
+        if (span.start.offset === span.end.offset) {
+          // Template errors can contain zero-length spans, if the error occurs at a single point.
+          // However, TypeScript does not handle displaying a zero-length diagnostic very well, so
+          // increase the ending offset by 1 for such errors, to ensure the position is shown in the
+          // diagnostic.
+          span.end.offset++;
+        }
+
+        return makeTemplateDiagnostic(
+            id, template.sourceMapping, span, ts.DiagnosticCategory.Error,
+            ngErrorCode(ErrorCode.TEMPLATE_PARSE_ERROR), error.msg);
+      });
     }
 
     // Figure out the set of styles. The ordering here is important: external resources (styleUrls)
@@ -310,14 +333,16 @@ export class ComponentDecoratorHandler implements
     const output: AnalysisOutput<ComponentAnalysisData> = {
       analysis: {
         baseClass: readBaseClass(node, this.reflector, this.evaluator),
+        inputs,
+        outputs,
         meta: {
           ...metadata,
           template: {
-            nodes: template.emitNodes,
+            nodes: template.nodes,
             ngContentSelectors: template.ngContentSelectors,
           },
           encapsulation,
-          interpolation: template.interpolation,
+          interpolation: template.interpolationConfig ?? DEFAULT_INTERPOLATION_CONFIG,
           styles: styles || [],
 
           // These will be replaced during the compilation step, after all `NgModule`s have been
@@ -327,7 +352,7 @@ export class ComponentDecoratorHandler implements
           i18nUseExternalIds: this.i18nUseExternalIds,
           relativeContextFilePath,
         },
-        guards: extractDirectiveGuards(node, this.reflector),
+        typeCheckMeta: extractDirectiveTypeCheckMeta(node, inputs, this.reflector),
         metadataStmt: generateSetClassMetadataCall(
             node, this.reflector, this.defaultImportRecorder, this.isCore,
             this.annotateForClosureCompiler),
@@ -335,6 +360,7 @@ export class ComponentDecoratorHandler implements
         providersRequiringFactory,
         viewProvidersRequiringFactory,
       },
+      diagnostics,
     };
     if (changeDetection !== null) {
       output.analysis!.meta.changeDetection = changeDetection;
@@ -351,14 +377,18 @@ export class ComponentDecoratorHandler implements
       name: node.name.text,
       selector: analysis.meta.selector,
       exportAs: analysis.meta.exportAs,
-      inputs: analysis.meta.inputs,
-      outputs: analysis.meta.outputs,
+      inputs: analysis.inputs,
+      outputs: analysis.outputs,
       queries: analysis.meta.queries.map(query => query.propertyName),
       isComponent: true,
       baseClass: analysis.baseClass,
-      ...analysis.guards,
+      ...analysis.typeCheckMeta,
     });
 
+    if (!analysis.template.isInline) {
+      this.templateMapping.register(resolve(analysis.template.templateUrl), node);
+    }
+
     this.injectableRegistry.registerInjectable(node);
   }
 
@@ -399,36 +429,15 @@ export class ComponentDecoratorHandler implements
       return;
     }
 
-    const matcher = new SelectorMatcher<DirectiveMeta>();
-    const pipes = new Map<string, Reference<ClassDeclaration<ts.ClassDeclaration>>>();
-    let schemas: SchemaMetadata[] = [];
-
-    const scope = this.scopeReader.getScopeForComponent(node);
+    const scope = this.typeCheckScopes.getTypeCheckScope(node);
     if (scope === 'error') {
       // Don't type-check components that had errors in their scopes.
       return;
     }
 
-    if (scope !== null) {
-      for (const meta of scope.compilation.directives) {
-        if (meta.selector !== null) {
-          const extMeta = flattenInheritedDirectiveMetadata(this.metaReader, meta.ref);
-          matcher.addSelectables(CssSelector.parse(meta.selector), extMeta);
-        }
-      }
-      for (const {name, ref} of scope.compilation.pipes) {
-        if (!ts.isClassDeclaration(ref.node)) {
-          throw new Error(`Unexpected non-class declaration ${
-              ts.SyntaxKind[ref.node.kind]} for pipe ${ref.debugName}`);
-        }
-        pipes.set(name, ref as Reference<ClassDeclaration<ts.ClassDeclaration>>);
-      }
-      schemas = scope.schemas;
-    }
-
-    const binder = new R3TargetBinder(matcher);
+    const binder = new R3TargetBinder(scope.matcher);
     ctx.addTemplate(
-        new Reference(node), binder, meta.template.diagNodes, pipes, schemas,
+        new Reference(node), binder, meta.template.diagNodes, scope.pipes, scope.schemas,
         meta.template.sourceMapping, meta.template.file);
   }
 
@@ -471,36 +480,49 @@ export class ComponentDecoratorHandler implements
       // Set up the R3TargetBinder, as well as a 'directives' array and a 'pipes' map that are later
       // fed to the TemplateDefinitionBuilder. First, a SelectorMatcher is constructed to match
       // directives that are in scope.
-      const matcher = new SelectorMatcher<DirectiveMeta&{expression: Expression}>();
-      const directives: {selector: string, expression: Expression}[] = [];
+      type MatchedDirective = DirectiveMeta&{selector: string};
+      const matcher = new SelectorMatcher<MatchedDirective>();
 
       for (const dir of scope.compilation.directives) {
-        const {ref, selector} = dir;
-        if (selector !== null) {
-          const expression = this.refEmitter.emit(ref, context);
-          directives.push({selector, expression});
-          matcher.addSelectables(CssSelector.parse(selector), {...dir, expression});
+        if (dir.selector !== null) {
+          matcher.addSelectables(CssSelector.parse(dir.selector), dir as MatchedDirective);
         }
       }
-      const pipes = new Map<string, Expression>();
+      const pipes = new Map<string, Reference<ClassDeclaration>>();
       for (const pipe of scope.compilation.pipes) {
-        pipes.set(pipe.name, this.refEmitter.emit(pipe.ref, context));
+        pipes.set(pipe.name, pipe.ref);
       }
 
-      // Next, the component template AST is bound using the R3TargetBinder. This produces an
+      // Next, the component template AST is bound using the R3TargetBinder. This produces a
       // BoundTarget, which is similar to a ts.TypeChecker.
       const binder = new R3TargetBinder(matcher);
       const bound = binder.bind({template: metadata.template.nodes});
 
       // The BoundTarget knows which directives and pipes matched the template.
-      const usedDirectives = bound.getUsedDirectives();
-      const usedPipes = bound.getUsedPipes().map(name => pipes.get(name)!);
+      const usedDirectives = bound.getUsedDirectives().map(directive => {
+        return {
+          selector: directive.selector,
+          expression: this.refEmitter.emit(directive.ref, context),
+        };
+      });
+
+      const usedPipes: {pipeName: string, expression: Expression}[] = [];
+      for (const pipeName of bound.getUsedPipes()) {
+        if (!pipes.has(pipeName)) {
+          continue;
+        }
+        const pipe = pipes.get(pipeName)!;
+        usedPipes.push({
+          pipeName,
+          expression: this.refEmitter.emit(pipe, context),
+        });
+      }
 
       // Scan through the directives/pipes actually used in the template and check whether any
       // import which needs to be generated would create a cycle.
       const cycleDetected =
           usedDirectives.some(dir => this._isCyclicImport(dir.expression, context)) ||
-          usedPipes.some(pipe => this._isCyclicImport(pipe, context));
+          usedPipes.some(pipe => this._isCyclicImport(pipe.expression, context));
 
       if (!cycleDetected) {
         // No cycle was detected. Record the imports that need to be created in the cycle detector
@@ -508,8 +530,8 @@ export class ComponentDecoratorHandler implements
         for (const {expression} of usedDirectives) {
           this._recordSyntheticImport(expression, context);
         }
-        for (const pipe of usedPipes) {
-          this._recordSyntheticImport(pipe, context);
+        for (const {expression} of usedPipes) {
+          this._recordSyntheticImport(expression, context);
         }
 
         // Check whether the directive/pipe arrays in ɵcmp need to be wrapped in closures.
@@ -518,16 +540,11 @@ export class ComponentDecoratorHandler implements
         const wrapDirectivesAndPipesInClosure =
             usedDirectives.some(
                 dir => isExpressionForwardReference(dir.expression, node.name, context)) ||
-            usedPipes.some(pipe => isExpressionForwardReference(pipe, node.name, context));
-
-        // Actual compilation still uses the full scope, not the narrowed scope determined by
-        // R3TargetBinder. This is a hedge against potential issues with the R3TargetBinder - right
-        // now the TemplateDefinitionBuilder is the "source of truth" for which directives/pipes are
-        // actually used (though the two should agree perfectly).
-        //
-        // TODO(alxhub): switch TemplateDefinitionBuilder over to using R3TargetBinder directly.
-        data.directives = directives;
-        data.pipes = pipes;
+            usedPipes.some(
+                pipe => isExpressionForwardReference(pipe.expression, node.name, context));
+
+        data.directives = usedDirectives;
+        data.pipes = new Map(usedPipes.map(pipe => [pipe.pipeName, pipe.expression]));
         data.wrapDirectivesAndPipesInClosure = wrapDirectivesAndPipesInClosure;
       } else {
         // Declaring the directiveDefs/pipeDefs arrays directly would require imports that would
@@ -568,7 +585,7 @@ export class ComponentDecoratorHandler implements
     return {data};
   }
 
-  compile(
+  compileFull(
       node: ClassDeclaration, analysis: Readonly<ComponentAnalysisData>,
       resolution: Readonly<ComponentResolutionData>, pool: ConstantPool): CompileResult[] {
     const meta: R3ComponentMetadata = {...analysis.meta, ...resolution};
@@ -748,7 +765,7 @@ export class ComponentDecoratorHandler implements
 
   private _parseTemplate(
       component: Map<string, ts.Expression>, templateStr: string, templateUrl: string,
-      templateRange: LexerRange|undefined, escapedString: boolean): ParsedTemplate {
+      templateRange: LexerRange|undefined, escapedString: boolean): ParsedComponentTemplate {
     let preserveWhitespaces: boolean = this.defaultPreserveWhitespaces;
     if (component.has('preserveWhitespaces')) {
       const expr = component.get('preserveWhitespaces')!;
@@ -759,7 +776,7 @@ export class ComponentDecoratorHandler implements
       preserveWhitespaces = value;
     }
 
-    let interpolation: InterpolationConfig = DEFAULT_INTERPOLATION_CONFIG;
+    let interpolationConfig = DEFAULT_INTERPOLATION_CONFIG;
     if (component.has('interpolation')) {
       const expr = component.get('interpolation')!;
       const value = this.evaluator.evaluate(expr);
@@ -768,18 +785,20 @@ export class ComponentDecoratorHandler implements
         throw createValueHasWrongTypeError(
             expr, value, 'interpolation must be an array with 2 elements of string type');
       }
-      interpolation = InterpolationConfig.fromArray(value as [string, string]);
+      interpolationConfig = InterpolationConfig.fromArray(value as [string, string]);
     }
 
-    const {errors, nodes: emitNodes, styleUrls, styles, ngContentSelectors} =
-        parseTemplate(templateStr, templateUrl, {
-          preserveWhitespaces,
-          interpolationConfig: interpolation,
-          range: templateRange,
-          escapedString,
-          enableI18nLegacyMessageIdFormat: this.enableI18nLegacyMessageIdFormat,
-          i18nNormalizeLineEndingsInICUs: this.i18nNormalizeLineEndingsInICUs,
-        });
+    // We always normalize line endings if the template has been escaped (i.e. is inline).
+    const i18nNormalizeLineEndingsInICUs = escapedString || this.i18nNormalizeLineEndingsInICUs;
+
+    const parsedTemplate = parseTemplate(templateStr, templateUrl, {
+      preserveWhitespaces,
+      interpolationConfig,
+      range: templateRange,
+      escapedString,
+      enableI18nLegacyMessageIdFormat: this.enableI18nLegacyMessageIdFormat,
+      i18nNormalizeLineEndingsInICUs,
+    });
 
     // Unfortunately, the primary parse of the template above may not contain accurate source map
     // information. If used directly, it would result in incorrect code locations in template
@@ -796,22 +815,17 @@ export class ComponentDecoratorHandler implements
 
     const {nodes: diagNodes} = parseTemplate(templateStr, templateUrl, {
       preserveWhitespaces: true,
-      interpolationConfig: interpolation,
+      interpolationConfig,
       range: templateRange,
       escapedString,
       enableI18nLegacyMessageIdFormat: this.enableI18nLegacyMessageIdFormat,
-      i18nNormalizeLineEndingsInICUs: this.i18nNormalizeLineEndingsInICUs,
+      i18nNormalizeLineEndingsInICUs,
       leadingTriviaChars: [],
     });
 
     return {
-      interpolation,
-      emitNodes,
+      ...parsedTemplate,
       diagNodes,
-      styleUrls,
-      styles,
-      ngContentSelectors,
-      errors,
       template: templateStr,
       templateUrl,
       isInline: component.has('template'),
@@ -878,12 +892,7 @@ function sourceMapUrl(resourceUrl: string): string {
  * This contains the actual parsed template as well as any metadata collected during its parsing,
  * some of which might be useful for re-parsing the template with different options.
  */
-export interface ParsedTemplate {
-  /**
-   * The `InterpolationConfig` specified by the user.
-   */
-  interpolation: InterpolationConfig;
-
+export interface ParsedComponentTemplate extends ParsedTemplate {
   /**
    * A full path to the file which contains the template.
    *
@@ -893,22 +902,10 @@ export interface ParsedTemplate {
   templateUrl: string;
 
   /**
-   * The string contents of the template.
-   *
-   * This is the "logical" template string, after expansion of any escaped characters (for inline
-   * templates). This may differ from the actual template bytes as they appear in the .ts file.
-   */
-  template: string;
-
-  /**
-   * Any errors from parsing the template the first time.
+   * True if the original template was stored inline;
+   * False if the template was in an external file.
    */
-  errors?: ParseError[]|undefined;
-
-  /**
-   * The template AST, parsed according to the user's specifications.
-   */
-  emitNodes: TmplAstNode[];
+  isInline: boolean;
 
   /**
    * The template AST, parsed in a manner which preserves source map information for diagnostics.
@@ -917,36 +914,12 @@ export interface ParsedTemplate {
    */
   diagNodes: TmplAstNode[];
 
-  /**
-   *
-   */
-
-  /**
-   * Any styleUrls extracted from the metadata.
-   */
-  styleUrls: string[];
-
-  /**
-   * Any inline styles extracted from the metadata.
-   */
-  styles: string[];
-
-  /**
-   * Any ng-content selectors extracted from the template.
-   */
-  ngContentSelectors: string[];
-
-  /**
-   * Whether the template was inline.
-   */
-  isInline: boolean;
-
   /**
    * The `ParseSourceFile` for the template.
    */
   file: ParseSourceFile;
 }
 
-export interface ParsedTemplateWithSource extends ParsedTemplate {
+export interface ParsedTemplateWithSource extends ParsedComponentTemplate {
   sourceMapping: TemplateSourceMapping;
 }
diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts b/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts
index 04c6f3f2c426a..2505b3ef44791 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts
@@ -11,8 +11,8 @@ import * as ts from 'typescript';
 
 import {ErrorCode, FatalDiagnosticError} from '../../diagnostics';
 import {DefaultImportRecorder, Reference} from '../../imports';
-import {InjectableClassRegistry, MetadataReader, MetadataRegistry} from '../../metadata';
-import {extractDirectiveGuards} from '../../metadata/src/util';
+import {ClassPropertyMapping, DirectiveTypeCheckMeta, InjectableClassRegistry, MetadataReader, MetadataRegistry} from '../../metadata';
+import {extractDirectiveTypeCheckMeta} from '../../metadata/src/util';
 import {DynamicValue, EnumValue, PartialEvaluator} from '../../partial_evaluator';
 import {ClassDeclaration, ClassMember, ClassMemberKind, Decorator, filterToMembersWithDecorator, ReflectionHost, reflectObjectLiteral} from '../../reflection';
 import {LocalModuleScopeRegistry} from '../../scope';
@@ -35,10 +35,12 @@ const LIFECYCLE_HOOKS = new Set([
 
 export interface DirectiveHandlerData {
   baseClass: Reference<ClassDeclaration>|'dynamic'|null;
-  guards: ReturnType<typeof extractDirectiveGuards>;
+  typeCheckMeta: DirectiveTypeCheckMeta;
   meta: R3DirectiveMetadata;
   metadataStmt: Statement|null;
   providersRequiringFactory: Set<Reference<ClassDeclaration>>|null;
+  inputs: ClassPropertyMapping;
+  outputs: ClassPropertyMapping;
 }
 
 export class DirectiveDecoratorHandler implements
@@ -83,11 +85,10 @@ export class DirectiveDecoratorHandler implements
     const directiveResult = extractDirectiveMetadata(
         node, decorator, this.reflector, this.evaluator, this.defaultImportRecorder, this.isCore,
         flags, this.annotateForClosureCompiler);
-    const analysis = directiveResult && directiveResult.metadata;
-
-    if (analysis === undefined) {
+    if (directiveResult === undefined) {
       return {};
     }
+    const analysis = directiveResult.metadata;
 
     let providersRequiringFactory: Set<Reference<ClassDeclaration>>|null = null;
     if (directiveResult !== undefined && directiveResult.decorator.has('providers')) {
@@ -97,12 +98,14 @@ export class DirectiveDecoratorHandler implements
 
     return {
       analysis: {
+        inputs: directiveResult.inputs,
+        outputs: directiveResult.outputs,
         meta: analysis,
         metadataStmt: generateSetClassMetadataCall(
             node, this.reflector, this.defaultImportRecorder, this.isCore,
             this.annotateForClosureCompiler),
         baseClass: readBaseClass(node, this.reflector, this.evaluator),
-        guards: extractDirectiveGuards(node, this.reflector),
+        typeCheckMeta: extractDirectiveTypeCheckMeta(node, directiveResult.inputs, this.reflector),
         providersRequiringFactory
       }
     };
@@ -117,12 +120,12 @@ export class DirectiveDecoratorHandler implements
       name: node.name.text,
       selector: analysis.meta.selector,
       exportAs: analysis.meta.exportAs,
-      inputs: analysis.meta.inputs,
-      outputs: analysis.meta.outputs,
+      inputs: analysis.inputs,
+      outputs: analysis.outputs,
       queries: analysis.meta.queries.map(query => query.propertyName),
       isComponent: false,
       baseClass: analysis.baseClass,
-      ...analysis.guards,
+      ...analysis.typeCheckMeta,
     });
 
     this.injectableRegistry.registerInjectable(node);
@@ -148,7 +151,7 @@ export class DirectiveDecoratorHandler implements
     return {diagnostics: diagnostics.length > 0 ? diagnostics : undefined};
   }
 
-  compile(
+  compileFull(
       node: ClassDeclaration, analysis: Readonly<DirectiveHandlerData>,
       resolution: Readonly<unknown>, pool: ConstantPool): CompileResult[] {
     const meta = analysis.meta;
@@ -199,8 +202,13 @@ export class DirectiveDecoratorHandler implements
 export function extractDirectiveMetadata(
     clazz: ClassDeclaration, decorator: Readonly<Decorator|null>, reflector: ReflectionHost,
     evaluator: PartialEvaluator, defaultImportRecorder: DefaultImportRecorder, isCore: boolean,
-    flags: HandlerFlags, annotateForClosureCompiler: boolean, defaultSelector: string|null = null):
-    {decorator: Map<string, ts.Expression>, metadata: R3DirectiveMetadata}|undefined {
+    flags: HandlerFlags, annotateForClosureCompiler: boolean,
+    defaultSelector: string|null = null): {
+  decorator: Map<string, ts.Expression>,
+  metadata: R3DirectiveMetadata,
+  inputs: ClassPropertyMapping,
+  outputs: ClassPropertyMapping,
+}|undefined {
   let directive: Map<string, ts.Expression>;
   if (decorator === null || decorator.args === null || decorator.args.length === 0) {
     directive = new Map<string, ts.Expression>();
@@ -331,6 +339,9 @@ export function extractDirectiveMetadata(
   const type = wrapTypeReference(reflector, clazz);
   const internalType = new WrappedNodeExpr(reflector.getInternalNameOfClass(clazz));
 
+  const inputs = ClassPropertyMapping.fromMappedObject({...inputsFromMeta, ...inputsFromFields});
+  const outputs = ClassPropertyMapping.fromMappedObject({...outputsFromMeta, ...outputsFromFields});
+
   const metadata: R3DirectiveMetadata = {
     name: clazz.name.text,
     deps: ctorDeps,
@@ -338,8 +349,8 @@ export function extractDirectiveMetadata(
     lifecycle: {
       usesOnChanges,
     },
-    inputs: {...inputsFromMeta, ...inputsFromFields},
-    outputs: {...outputsFromMeta, ...outputsFromFields},
+    inputs: inputs.toJointMappedObject(),
+    outputs: outputs.toDirectMappedObject(),
     queries,
     viewQueries,
     selector,
@@ -352,7 +363,12 @@ export function extractDirectiveMetadata(
     exportAs,
     providers
   };
-  return {decorator: directive, metadata};
+  return {
+    decorator: directive,
+    metadata,
+    inputs,
+    outputs,
+  };
 }
 
 export function extractQueryMetadata(
@@ -447,12 +463,20 @@ export function extractQueriesFromDecorator(
   }
   reflectObjectLiteral(queryData).forEach((queryExpr, propertyName) => {
     queryExpr = unwrapExpression(queryExpr);
-    if (!ts.isNewExpression(queryExpr) || !ts.isIdentifier(queryExpr.expression)) {
+    if (!ts.isNewExpression(queryExpr)) {
+      throw new FatalDiagnosticError(
+          ErrorCode.VALUE_HAS_WRONG_TYPE, queryData,
+          'Decorator query metadata must be an instance of a query type');
+    }
+    const queryType = ts.isPropertyAccessExpression(queryExpr.expression) ?
+        queryExpr.expression.name :
+        queryExpr.expression;
+    if (!ts.isIdentifier(queryType)) {
       throw new FatalDiagnosticError(
           ErrorCode.VALUE_HAS_WRONG_TYPE, queryData,
           'Decorator query metadata must be an instance of a query type');
     }
-    const type = reflector.getImportOfIdentifier(queryExpr.expression);
+    const type = reflector.getImportOfIdentifier(queryType);
     if (type === null || (!isCore && type.from !== '@angular/core') ||
         !QUERY_TYPES.has(type.name)) {
       throw new FatalDiagnosticError(
diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/injectable.ts b/packages/compiler-cli/src/ngtsc/annotations/src/injectable.ts
index 49cf0e97a0532..a9fbbe86cec9f 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/injectable.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/injectable.ts
@@ -87,7 +87,7 @@ export class InjectableDecoratorHandler implements
     this.injectableRegistry.registerInjectable(node);
   }
 
-  compile(node: ClassDeclaration, analysis: Readonly<InjectableHandlerData>): CompileResult[] {
+  compileFull(node: ClassDeclaration, analysis: Readonly<InjectableHandlerData>): CompileResult[] {
     const res = compileIvyInjectable(analysis.meta);
     const statements = res.statements;
     const results: CompileResult[] = [];
diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/metadata.ts b/packages/compiler-cli/src/ngtsc/annotations/src/metadata.ts
index 56676ac84da13..e0ac434c4bc8d 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/metadata.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/metadata.ts
@@ -10,7 +10,7 @@ import {Expression, ExternalExpr, FunctionExpr, Identifiers, InvokeFunctionExpr,
 import * as ts from 'typescript';
 
 import {DefaultImportRecorder} from '../../imports';
-import {CtorParameter, Decorator, ReflectionHost} from '../../reflection';
+import {CtorParameter, DeclarationNode, Decorator, ReflectionHost, TypeValueReferenceKind} from '../../reflection';
 
 import {valueReferenceToExpression, wrapFunctionExpressionsInParens} from './util';
 
@@ -23,12 +23,13 @@ import {valueReferenceToExpression, wrapFunctionExpressionsInParens} from './uti
  * as a `Statement` for inclusion along with the class.
  */
 export function generateSetClassMetadataCall(
-    clazz: ts.Declaration, reflection: ReflectionHost, defaultImportRecorder: DefaultImportRecorder,
-    isCore: boolean, annotateForClosureCompiler?: boolean): Statement|null {
+    clazz: DeclarationNode, reflection: ReflectionHost,
+    defaultImportRecorder: DefaultImportRecorder, isCore: boolean,
+    annotateForClosureCompiler?: boolean): Statement|null {
   if (!reflection.isClass(clazz)) {
     return null;
   }
-  const id = ts.updateIdentifier(reflection.getAdjacentNameOfClass(clazz));
+  const id = reflection.getAdjacentNameOfClass(clazz);
 
   // Reflect over the class decorators. If none are present, or those that are aren't from
   // Angular, then return null. Otherwise, turn them into metadata.
@@ -70,8 +71,8 @@ export function generateSetClassMetadataCall(
         `Duplicate decorated properties found on class '${clazz.name.text}': ` +
         duplicateDecoratedMemberNames.join(', '));
   }
-  const decoratedMembers =
-      classMembers.map(member => classMemberToMetadata(member.name, member.decorators!, isCore));
+  const decoratedMembers = classMembers.map(
+      member => classMemberToMetadata(member.nameNode ?? member.name, member.decorators!, isCore));
   if (decoratedMembers.length > 0) {
     metaPropDecorators = ts.createObjectLiteral(decoratedMembers);
   }
@@ -105,7 +106,7 @@ function ctorParameterToMetadata(
     isCore: boolean): Expression {
   // Parameters sometimes have a type that can be referenced. If so, then use it, otherwise
   // its type is undefined.
-  const type = param.typeValueReference !== null ?
+  const type = param.typeValueReference.kind !== TypeValueReferenceKind.UNAVAILABLE ?
       valueReferenceToExpression(param.typeValueReference, defaultImportRecorder) :
       new LiteralExpr(undefined);
 
@@ -127,7 +128,7 @@ function ctorParameterToMetadata(
  * Convert a reflected class member to metadata.
  */
 function classMemberToMetadata(
-    name: string, decorators: Decorator[], isCore: boolean): ts.PropertyAssignment {
+    name: ts.PropertyName|string, decorators: Decorator[], isCore: boolean): ts.PropertyAssignment {
   const ngDecorators = decorators.filter(dec => isAngularDecorator(dec, isCore))
                            .map((decorator: Decorator) => decoratorToMetadata(decorator));
   const decoratorMeta = ts.createArrayLiteral(ngDecorators);
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 115a9e736103a..37afa3b8fccfc 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts
@@ -12,8 +12,8 @@ import * as ts from 'typescript';
 import {ErrorCode, FatalDiagnosticError, makeDiagnostic, makeRelatedInformation} from '../../diagnostics';
 import {DefaultImportRecorder, Reference, ReferenceEmitter} from '../../imports';
 import {InjectableClassRegistry, MetadataReader, MetadataRegistry} from '../../metadata';
-import {PartialEvaluator, ResolvedValue, ResolvedValueArray} from '../../partial_evaluator';
-import {ClassDeclaration, Decorator, ReflectionHost, reflectObjectLiteral, typeNodeToValueExpr} from '../../reflection';
+import {PartialEvaluator, ResolvedValue} from '../../partial_evaluator';
+import {ClassDeclaration, DeclarationNode, Decorator, isNamedClassDeclaration, ReflectionHost, reflectObjectLiteral, typeNodeToValueExpr} from '../../reflection';
 import {NgModuleRouteAnalyzer} from '../../routing';
 import {LocalModuleScopeRegistry, ScopeData} from '../../scope';
 import {FactoryTracker} from '../../shims/api';
@@ -371,7 +371,7 @@ export class NgModuleDecoratorHandler implements
     }
   }
 
-  compile(
+  compileFull(
       node: ClassDeclaration, analysis: Readonly<NgModuleAnalysis>,
       resolution: Readonly<NgModuleResolution>): CompileResult[] {
     //  Merge the injector imports (which are 'exports' that were later found to be NgModules)
@@ -434,14 +434,14 @@ export class NgModuleDecoratorHandler implements
   }
 
   private _toR3Reference(
-      valueRef: Reference<ts.Declaration>, valueContext: ts.SourceFile,
+      valueRef: Reference<ClassDeclaration>, valueContext: ts.SourceFile,
       typeContext: ts.SourceFile): R3Reference {
     if (valueRef.hasOwningModuleGuess) {
       return toR3Reference(valueRef, valueRef, valueContext, valueContext, this.refEmitter);
     } else {
       let typeRef = valueRef;
       let typeNode = this.reflector.getDtsDeclaration(typeRef.node);
-      if (typeNode !== null && ts.isClassDeclaration(typeNode)) {
+      if (typeNode !== null && isNamedClassDeclaration(typeNode)) {
         typeRef = new Reference(typeNode);
       }
       return toR3Reference(valueRef, typeRef, valueContext, typeContext, this.refEmitter);
@@ -539,9 +539,8 @@ export class NgModuleDecoratorHandler implements
     return null;
   }
 
-  // Verify that a `ts.Declaration` reference is a `ClassDeclaration` reference.
-  private isClassDeclarationReference(ref: Reference<ts.Declaration>):
-      ref is Reference<ClassDeclaration> {
+  // Verify that a "Declaration" reference is a `ClassDeclaration` reference.
+  private isClassDeclarationReference(ref: Reference): ref is Reference<ClassDeclaration> {
     return this.reflector.isClass(ref.node);
   }
 
@@ -568,7 +567,7 @@ export class NgModuleDecoratorHandler implements
       if (Array.isArray(entry)) {
         // Recurse into nested arrays.
         refList.push(...this.resolveTypeList(expr, entry, className, arrayName));
-      } else if (isDeclarationReference(entry)) {
+      } else if (entry instanceof Reference) {
         if (!this.isClassDeclarationReference(entry)) {
           throw createValueHasWrongTypeError(
               entry.node, entry,
@@ -593,9 +592,3 @@ function isNgModule(node: ClassDeclaration, compilation: ScopeData): boolean {
   return !compilation.directives.some(directive => directive.ref.node === node) &&
       !compilation.pipes.some(pipe => pipe.ref.node === node);
 }
-
-function isDeclarationReference(ref: any): ref is Reference<ts.Declaration> {
-  return ref instanceof Reference &&
-      (ts.isClassDeclaration(ref.node) || ts.isFunctionDeclaration(ref.node) ||
-       ts.isVariableDeclaration(ref.node));
-}
diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/pipe.ts b/packages/compiler-cli/src/ngtsc/annotations/src/pipe.ts
index f79d9ad07066d..2bbc29719a88a 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/pipe.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/pipe.ts
@@ -133,7 +133,7 @@ export class PipeDecoratorHandler implements DecoratorHandler<Decorator, PipeHan
     return {};
   }
 
-  compile(node: ClassDeclaration, analysis: Readonly<PipeHandlerData>): CompileResult[] {
+  compileFull(node: ClassDeclaration, analysis: Readonly<PipeHandlerData>): CompileResult[] {
     const meta = analysis.meta;
     const res = compilePipeFromMetadata(meta);
     const factoryRes = compileNgFactoryDefField({
diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/references_registry.ts b/packages/compiler-cli/src/ngtsc/annotations/src/references_registry.ts
index 7198f1c42b47f..65cf0996086b4 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/references_registry.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/references_registry.ts
@@ -6,8 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import * as ts from 'typescript';
 import {Reference} from '../../imports';
+import {DeclarationNode} from '../../reflection';
 
 /**
  * Implement this interface if you want DecoratorHandlers to register
@@ -18,7 +18,7 @@ export interface ReferencesRegistry {
    * Register one or more references in the registry.
    * @param references A collection of references to register.
    */
-  add(source: ts.Declaration, ...references: Reference<ts.Declaration>[]): void;
+  add(source: DeclarationNode, ...references: Reference<DeclarationNode>[]): void;
 }
 
 /**
@@ -27,5 +27,5 @@ export interface ReferencesRegistry {
  * The ngcc tool implements a working version for its purposes.
  */
 export class NoopReferencesRegistry implements ReferencesRegistry {
-  add(source: ts.Declaration, ...references: Reference<ts.Declaration>[]): void {}
+  add(source: DeclarationNode, ...references: Reference<DeclarationNode>[]): void {}
 }
diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/typecheck_scopes.ts b/packages/compiler-cli/src/ngtsc/annotations/src/typecheck_scopes.ts
new file mode 100644
index 0000000000000..aada9e0df4e55
--- /dev/null
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/typecheck_scopes.ts
@@ -0,0 +1,105 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {CssSelector, SchemaMetadata, SelectorMatcher} from '@angular/compiler';
+import * as ts from 'typescript';
+
+import {Reference} from '../../imports';
+import {DirectiveMeta, flattenInheritedDirectiveMetadata, MetadataReader} from '../../metadata';
+import {ClassDeclaration} from '../../reflection';
+import {ComponentScopeReader} from '../../scope';
+
+/**
+ * The scope that is used for type-check code generation of a component template.
+ */
+export interface TypeCheckScope {
+  /**
+   * A `SelectorMatcher` instance that contains the flattened directive metadata of all directives
+   * that are in the compilation scope of the declaring NgModule.
+   */
+  matcher: SelectorMatcher<DirectiveMeta>;
+
+  /**
+   * The pipes that are available in the compilation scope.
+   */
+  pipes: Map<string, Reference<ClassDeclaration<ts.ClassDeclaration>>>;
+
+  /**
+   * The schemas that are used in this scope.
+   */
+  schemas: SchemaMetadata[];
+}
+
+/**
+ * Computes scope information to be used in template type checking.
+ */
+export class TypeCheckScopes {
+  /**
+   * Cache of flattened directive metadata. Because flattened metadata is scope-invariant it's
+   * cached individually, such that all scopes refer to the same flattened metadata.
+   */
+  private flattenedDirectiveMetaCache = new Map<ClassDeclaration, DirectiveMeta>();
+
+  /**
+   * Cache of the computed type check scope per NgModule declaration.
+   */
+  private scopeCache = new Map<ClassDeclaration, TypeCheckScope>();
+
+  constructor(private scopeReader: ComponentScopeReader, private metaReader: MetadataReader) {}
+
+  /**
+   * Computes the type-check scope information for the component declaration. If the NgModule
+   * contains an error, then 'error' is returned. If the component is not declared in any NgModule,
+   * an empty type-check scope is returned.
+   */
+  getTypeCheckScope(node: ClassDeclaration): TypeCheckScope|'error' {
+    const matcher = new SelectorMatcher<DirectiveMeta>();
+    const pipes = new Map<string, Reference<ClassDeclaration<ts.ClassDeclaration>>>();
+
+    const scope = this.scopeReader.getScopeForComponent(node);
+    if (scope === null) {
+      return {matcher, pipes, schemas: []};
+    } else if (scope === 'error') {
+      return scope;
+    }
+
+    if (this.scopeCache.has(scope.ngModule)) {
+      return this.scopeCache.get(scope.ngModule)!;
+    }
+
+    for (const meta of scope.compilation.directives) {
+      if (meta.selector !== null) {
+        const extMeta = this.getInheritedDirectiveMetadata(meta.ref);
+        matcher.addSelectables(CssSelector.parse(meta.selector), extMeta);
+      }
+    }
+
+    for (const {name, ref} of scope.compilation.pipes) {
+      if (!ts.isClassDeclaration(ref.node)) {
+        throw new Error(`Unexpected non-class declaration ${
+            ts.SyntaxKind[ref.node.kind]} for pipe ${ref.debugName}`);
+      }
+      pipes.set(name, ref as Reference<ClassDeclaration<ts.ClassDeclaration>>);
+    }
+
+    const typeCheckScope: TypeCheckScope = {matcher, pipes, schemas: scope.schemas};
+    this.scopeCache.set(scope.ngModule, typeCheckScope);
+    return typeCheckScope;
+  }
+
+  private getInheritedDirectiveMetadata(ref: Reference<ClassDeclaration>): DirectiveMeta {
+    const clazz = ref.node;
+    if (this.flattenedDirectiveMetaCache.has(clazz)) {
+      return this.flattenedDirectiveMetaCache.get(clazz)!;
+    }
+
+    const meta = flattenInheritedDirectiveMetadata(this.metaReader, ref);
+    this.flattenedDirectiveMetaCache.set(clazz, meta);
+    return meta;
+  }
+}
diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/util.ts b/packages/compiler-cli/src/ngtsc/annotations/src/util.ts
index 53c93fc86829b..4d52eb6b805c3 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/util.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/util.ts
@@ -12,13 +12,9 @@ import * as ts from 'typescript';
 import {ErrorCode, FatalDiagnosticError, makeDiagnostic, makeRelatedInformation} from '../../diagnostics';
 import {DefaultImportRecorder, ImportFlags, Reference, ReferenceEmitter} from '../../imports';
 import {ForeignFunctionResolver, PartialEvaluator} from '../../partial_evaluator';
-import {ClassDeclaration, CtorParameter, Decorator, Import, isNamedClassDeclaration, ReflectionHost, TypeValueReference} from '../../reflection';
+import {ClassDeclaration, CtorParameter, Decorator, Import, ImportedTypeValueReference, isNamedClassDeclaration, LocalTypeValueReference, ReflectionHost, TypeValueReference, TypeValueReferenceKind, UnavailableValue, ValueUnavailableKind} from '../../reflection';
 import {DeclarationData} from '../../scope';
 
-export enum ConstructorDepErrorKind {
-  NO_SUITABLE_TOKEN,
-}
-
 export type ConstructorDeps = {
   deps: R3DependencyMetadata[];
 }|{
@@ -29,7 +25,7 @@ export type ConstructorDeps = {
 export interface ConstructorDepError {
   index: number;
   param: CtorParameter;
-  kind: ConstructorDepErrorKind;
+  reason: UnavailableValue;
 }
 
 export function getConstructorDependencies(
@@ -94,10 +90,14 @@ export function getConstructorDependencies(
       resolved = R3ResolvedDependencyType.ChangeDetectorRef;
     }
     if (token === null) {
+      if (param.typeValueReference.kind !== TypeValueReferenceKind.UNAVAILABLE) {
+        throw new Error(
+            'Illegal state: expected value reference to be unavailable if no token is present');
+      }
       errors.push({
         index: idx,
-        kind: ConstructorDepErrorKind.NO_SUITABLE_TOKEN,
         param,
+        reason: param.typeValueReference.reason,
       });
     } else {
       deps.push({token, attribute, optional, self, skipSelf, host, resolved});
@@ -118,18 +118,15 @@ export function getConstructorDependencies(
  * file in which the `TypeValueReference` originated.
  */
 export function valueReferenceToExpression(
-    valueRef: TypeValueReference, defaultImportRecorder: DefaultImportRecorder): Expression;
-export function valueReferenceToExpression(
-    valueRef: null, defaultImportRecorder: DefaultImportRecorder): null;
+    valueRef: LocalTypeValueReference|ImportedTypeValueReference,
+    defaultImportRecorder: DefaultImportRecorder): Expression;
 export function valueReferenceToExpression(
-    valueRef: TypeValueReference|null, defaultImportRecorder: DefaultImportRecorder): Expression|
-    null;
+    valueRef: TypeValueReference, defaultImportRecorder: DefaultImportRecorder): Expression|null;
 export function valueReferenceToExpression(
-    valueRef: TypeValueReference|null, defaultImportRecorder: DefaultImportRecorder): Expression|
-    null {
-  if (valueRef === null) {
+    valueRef: TypeValueReference, defaultImportRecorder: DefaultImportRecorder): Expression|null {
+  if (valueRef.kind === TypeValueReferenceKind.UNAVAILABLE) {
     return null;
-  } else if (valueRef.local) {
+  } else if (valueRef.kind === TypeValueReferenceKind.LOCAL) {
     if (defaultImportRecorder !== null && valueRef.defaultImportStatement !== null &&
         ts.isIdentifier(valueRef.expression)) {
       defaultImportRecorder.recordImportedIdentifier(
@@ -137,16 +134,10 @@ export function valueReferenceToExpression(
     }
     return new WrappedNodeExpr(valueRef.expression);
   } else {
-    // TODO(alxhub): this cast is necessary because the g3 typescript version doesn't narrow here.
-    const ref = valueRef as {
-      moduleName: string;
-      importedName: string;
-      nestedPath: string[]|null;
-    };
     let importExpr: Expression =
-        new ExternalExpr({moduleName: ref.moduleName, name: ref.importedName});
-    if (ref.nestedPath !== null) {
-      for (const property of ref.nestedPath) {
+        new ExternalExpr({moduleName: valueRef.moduleName, name: valueRef.importedName});
+    if (valueRef.nestedPath !== null) {
+      for (const property of valueRef.nestedPath) {
         importExpr = new ReadPropExpr(importExpr, property);
       }
     }
@@ -195,17 +186,84 @@ export function validateConstructorDependencies(
     return deps.deps;
   } else {
     // TODO(alxhub): this cast is necessary because the g3 typescript version doesn't narrow here.
-    const {param, index} = (deps as {errors: ConstructorDepError[]}).errors[0];
     // There is at least one error.
-    throw new FatalDiagnosticError(
-        ErrorCode.PARAM_MISSING_TOKEN, param.nameNode,
-        `No suitable injection token for parameter '${param.name || index}' of class '${
-            clazz.name.text}'.\n` +
-            (param.typeNode !== null ? `Found ${param.typeNode.getText()}` :
-                                       'no type or decorator'));
+    const error = (deps as {errors: ConstructorDepError[]}).errors[0];
+    throw createUnsuitableInjectionTokenError(clazz, error);
   }
 }
 
+/**
+ * Creates a fatal error with diagnostic for an invalid injection token.
+ * @param clazz The class for which the injection token was unavailable.
+ * @param error The reason why no valid injection token is available.
+ */
+function createUnsuitableInjectionTokenError(
+    clazz: ClassDeclaration, error: ConstructorDepError): FatalDiagnosticError {
+  const {param, index, reason} = error;
+  let chainMessage: string|undefined = undefined;
+  let hints: ts.DiagnosticRelatedInformation[]|undefined = undefined;
+  switch (reason.kind) {
+    case ValueUnavailableKind.UNSUPPORTED:
+      chainMessage = 'Consider using the @Inject decorator to specify an injection token.';
+      hints = [
+        makeRelatedInformation(reason.typeNode, 'This type is not supported as injection token.'),
+      ];
+      break;
+    case ValueUnavailableKind.NO_VALUE_DECLARATION:
+      chainMessage = 'Consider using the @Inject decorator to specify an injection token.';
+      hints = [
+        makeRelatedInformation(
+            reason.typeNode,
+            'This type does not have a value, so it cannot be used as injection token.'),
+      ];
+      if (reason.decl !== null) {
+        hints.push(makeRelatedInformation(reason.decl, 'The type is declared here.'));
+      }
+      break;
+    case ValueUnavailableKind.TYPE_ONLY_IMPORT:
+      chainMessage =
+          'Consider changing the type-only import to a regular import, or use the @Inject decorator to specify an injection token.';
+      hints = [
+        makeRelatedInformation(
+            reason.typeNode,
+            'This type is imported using a type-only import, which prevents it from being usable as an injection token.'),
+        makeRelatedInformation(reason.importClause, 'The type-only import occurs here.'),
+      ];
+      break;
+    case ValueUnavailableKind.NAMESPACE:
+      chainMessage = 'Consider using the @Inject decorator to specify an injection token.';
+      hints = [
+        makeRelatedInformation(
+            reason.typeNode,
+            'This type corresponds with a namespace, which cannot be used as injection token.'),
+        makeRelatedInformation(reason.importClause, 'The namespace import occurs here.'),
+      ];
+      break;
+    case ValueUnavailableKind.UNKNOWN_REFERENCE:
+      chainMessage = 'The type should reference a known declaration.';
+      hints = [makeRelatedInformation(reason.typeNode, 'This type could not be resolved.')];
+      break;
+    case ValueUnavailableKind.MISSING_TYPE:
+      chainMessage =
+          'Consider adding a type to the parameter or use the @Inject decorator to specify an injection token.';
+      break;
+  }
+
+  const chain: ts.DiagnosticMessageChain = {
+    messageText: `No suitable injection token for parameter '${param.name || index}' of class '${
+        clazz.name.text}'.`,
+    category: ts.DiagnosticCategory.Error,
+    code: 0,
+    next: [{
+      messageText: chainMessage,
+      category: ts.DiagnosticCategory.Message,
+      code: 0,
+    }],
+  };
+
+  return new FatalDiagnosticError(ErrorCode.PARAM_MISSING_TOKEN, param.nameNode, chain, hints);
+}
+
 export function toR3Reference(
     valueRef: Reference, typeRef: Reference, valueContext: ts.SourceFile,
     typeContext: ts.SourceFile, refEmitter: ReferenceEmitter): R3Reference {
diff --git a/packages/compiler-cli/src/ngtsc/annotations/test/component_spec.ts b/packages/compiler-cli/src/ngtsc/annotations/test/component_spec.ts
index 5fc7139e281b3..14ceb191c7de2 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/test/component_spec.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/test/component_spec.ts
@@ -10,7 +10,7 @@ import {ErrorCode, FatalDiagnosticError} from '../../diagnostics';
 import {absoluteFrom} from '../../file_system';
 import {runInEachFileSystem} from '../../file_system/testing';
 import {ModuleResolver, NOOP_DEFAULT_IMPORT_RECORDER, ReferenceEmitter} from '../../imports';
-import {CompoundMetadataReader, DtsMetadataReader, InjectableClassRegistry, LocalMetadataRegistry} from '../../metadata';
+import {CompoundMetadataReader, DtsMetadataReader, InjectableClassRegistry, LocalMetadataRegistry, TemplateMapping} from '../../metadata';
 import {PartialEvaluator} from '../../partial_evaluator';
 import {isNamedClassDeclaration, TypeScriptReflectionHost} from '../../reflection';
 import {LocalModuleScopeRegistry, MetadataDtsModuleScopeResolver} from '../../scope';
@@ -69,6 +69,7 @@ runInEachFileSystem(() => {
 
       const handler = new ComponentDecoratorHandler(
           reflectionHost, evaluator, metaRegistry, metaReader, scopeRegistry, scopeRegistry,
+          new TemplateMapping(),
           /* isCore */ false, new NoopResourceLoader(), /* rootDirs */[''],
           /* defaultPreserveWhitespaces */ false, /* i18nUseExternalIds */ true,
           /* enableI18nLegacyMessageIdFormat */ false,
diff --git a/packages/compiler-cli/src/ngtsc/annotations/test/diagnostics_spec.ts b/packages/compiler-cli/src/ngtsc/annotations/test/diagnostics_spec.ts
index 86e77709e91d0..390c6ee93366f 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/test/diagnostics_spec.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/test/diagnostics_spec.ts
@@ -6,99 +6,92 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {platform} from 'os';
 import * as ts from 'typescript';
 
-import {FatalDiagnosticError} from '../../diagnostics';
-import {absoluteFrom as _} from '../../file_system';
+import {absoluteFrom as _, getSourceFileOrError} from '../../file_system';
 import {runInEachFileSystem, TestFile} from '../../file_system/testing';
 import {PartialEvaluator} from '../../partial_evaluator';
 import {TypeScriptReflectionHost} from '../../reflection';
 import {getDeclaration, makeProgram} from '../../testing';
 import {createValueHasWrongTypeError} from '../src/diagnostics';
 
-runInEachFileSystem(os => {
+runInEachFileSystem(() => {
   describe('ngtsc annotation diagnostics', () => {
-    // These tests are currently disabled when running in Windows mode as the assertions involving
-    // the filename attached to the diagnostic are suffering from a case-sensitivity issue.
-    //
-    // TODO(JoostK): re-enable on Windows once the case issue has been solved.
-    if (os !== 'Windows' && platform() !== 'win32') {
-      describe('createValueError()', () => {
-        it('should include a trace for dynamic values', () => {
-          const error = createError('', 'nonexistent', 'Error message');
-
-          if (typeof error.message === 'string') {
-            return fail('Created error must have a message chain');
-          }
-          expect(error.message.messageText).toBe('Error message');
-          expect(error.message.next!.length).toBe(1);
-          expect(error.message.next![0].messageText)
-              .toBe(`Value could not be determined statically.`);
-
-          expect(error.relatedInformation).toBeDefined();
-          expect(error.relatedInformation!.length).toBe(1);
-
-          expect(error.relatedInformation![0].messageText).toBe('Unknown reference.');
-          expect(error.relatedInformation![0].file!.fileName).toBe(_('/entry.ts'));
-          expect(getSourceCode(error.relatedInformation![0])).toBe('nonexistent');
-        });
-
-        it('should include a pointer for a reference to a named declaration', () => {
-          const error = createError(
-              `import {Foo} from './foo';`, 'Foo', 'Error message',
-              [{name: _('/foo.ts'), contents: 'export class Foo {}'}]);
-
-          if (typeof error.message === 'string') {
-            return fail('Created error must have a message chain');
-          }
-          expect(error.message.messageText).toBe('Error message');
-          expect(error.message.next!.length).toBe(1);
-          expect(error.message.next![0].messageText).toBe(`Value is a reference to 'Foo'.`);
-
-          expect(error.relatedInformation).toBeDefined();
-          expect(error.relatedInformation!.length).toBe(1);
-          expect(error.relatedInformation![0].messageText).toBe('Reference is declared here.');
-          expect(error.relatedInformation![0].file!.fileName).toBe(_('/foo.ts'));
-          expect(getSourceCode(error.relatedInformation![0])).toBe('Foo');
-        });
-
-        it('should include a pointer for a reference to an anonymous declaration', () => {
-          const error = createError(
-              `import Foo from './foo';`, 'Foo', 'Error message',
-              [{name: _('/foo.ts'), contents: 'export default class {}'}]);
-
-          if (typeof error.message === 'string') {
-            return fail('Created error must have a message chain');
-          }
-          expect(error.message.messageText).toBe('Error message');
-          expect(error.message.next!.length).toBe(1);
-          expect(error.message.next![0].messageText)
-              .toBe(`Value is a reference to an anonymous declaration.`);
-
-          expect(error.relatedInformation).toBeDefined();
-          expect(error.relatedInformation!.length).toBe(1);
-          expect(error.relatedInformation![0].messageText).toBe('Reference is declared here.');
-          expect(error.relatedInformation![0].file!.fileName).toBe(_('/foo.ts'));
-          expect(getSourceCode(error.relatedInformation![0])).toBe('export default class {}');
-        });
-
-        it('should include a representation of the value\'s type', () => {
-          const error = createError('', '{a: 2}', 'Error message');
-
-          if (typeof error.message === 'string') {
-            return fail('Created error must have a message chain');
-          }
-          expect(error.message.messageText).toBe('Error message');
-          expect(error.message.next!.length).toBe(1);
-          expect(error.message.next![0].messageText).toBe(`Value is of type '{ a: number }'.`);
-
-          expect(error.relatedInformation).not.toBeDefined();
-        });
+    describe('createValueError()', () => {
+      it('should include a trace for dynamic values', () => {
+        const {error, program} = createError('', 'nonexistent', 'Error message');
+        const entrySf = getSourceFileOrError(program, _('/entry.ts'));
+
+        if (typeof error.message === 'string') {
+          return fail('Created error must have a message chain');
+        }
+        expect(error.message.messageText).toBe('Error message');
+        expect(error.message.next!.length).toBe(1);
+        expect(error.message.next![0].messageText)
+            .toBe(`Value could not be determined statically.`);
+
+        expect(error.relatedInformation).toBeDefined();
+        expect(error.relatedInformation!.length).toBe(1);
+
+        expect(error.relatedInformation![0].messageText).toBe('Unknown reference.');
+        expect(error.relatedInformation![0].file!.fileName).toBe(entrySf.fileName);
+        expect(getSourceCode(error.relatedInformation![0])).toBe('nonexistent');
       });
-    }
 
-    it('should not be empty', () => {});
+      it('should include a pointer for a reference to a named declaration', () => {
+        const {error, program} = createError(
+            `import {Foo} from './foo';`, 'Foo', 'Error message',
+            [{name: _('/foo.ts'), contents: 'export class Foo {}'}]);
+        const fooSf = getSourceFileOrError(program, _('/foo.ts'));
+
+        if (typeof error.message === 'string') {
+          return fail('Created error must have a message chain');
+        }
+        expect(error.message.messageText).toBe('Error message');
+        expect(error.message.next!.length).toBe(1);
+        expect(error.message.next![0].messageText).toBe(`Value is a reference to 'Foo'.`);
+
+        expect(error.relatedInformation).toBeDefined();
+        expect(error.relatedInformation!.length).toBe(1);
+        expect(error.relatedInformation![0].messageText).toBe('Reference is declared here.');
+        expect(error.relatedInformation![0].file!.fileName).toBe(fooSf.fileName);
+        expect(getSourceCode(error.relatedInformation![0])).toBe('Foo');
+      });
+
+      it('should include a pointer for a reference to an anonymous declaration', () => {
+        const {error, program} = createError(
+            `import Foo from './foo';`, 'Foo', 'Error message',
+            [{name: _('/foo.ts'), contents: 'export default class {}'}]);
+        const fooSf = getSourceFileOrError(program, _('/foo.ts'));
+
+        if (typeof error.message === 'string') {
+          return fail('Created error must have a message chain');
+        }
+        expect(error.message.messageText).toBe('Error message');
+        expect(error.message.next!.length).toBe(1);
+        expect(error.message.next![0].messageText)
+            .toBe(`Value is a reference to an anonymous declaration.`);
+
+        expect(error.relatedInformation).toBeDefined();
+        expect(error.relatedInformation!.length).toBe(1);
+        expect(error.relatedInformation![0].messageText).toBe('Reference is declared here.');
+        expect(error.relatedInformation![0].file!.fileName).toBe(fooSf.fileName);
+        expect(getSourceCode(error.relatedInformation![0])).toBe('export default class {}');
+      });
+
+      it('should include a representation of the value\'s type', () => {
+        const {error} = createError('', '{a: 2}', 'Error message');
+
+        if (typeof error.message === 'string') {
+          return fail('Created error must have a message chain');
+        }
+        expect(error.message.messageText).toBe('Error message');
+        expect(error.message.next!.length).toBe(1);
+        expect(error.message.next![0].messageText).toBe(`Value is of type '{ a: number }'.`);
+
+        expect(error.relatedInformation).not.toBeDefined();
+      });
+    });
   });
 });
 
@@ -108,8 +101,7 @@ function getSourceCode(diag: ts.DiagnosticRelatedInformation): string {
 }
 
 function createError(
-    code: string, expr: string, messageText: string,
-    supportingFiles: TestFile[] = []): FatalDiagnosticError {
+    code: string, expr: string, messageText: string, supportingFiles: TestFile[] = []) {
   const {program} = makeProgram(
       [{name: _('/entry.ts'), contents: `${code}; const target$ = ${expr}`}, ...supportingFiles],
       /* options */ undefined, /* host */ undefined, /* checkForErrors */ false);
@@ -121,5 +113,6 @@ function createError(
   const evaluator = new PartialEvaluator(reflectionHost, checker, /* dependencyTracker */ null);
 
   const value = evaluator.evaluate(valueExpr);
-  return createValueHasWrongTypeError(valueExpr, value, messageText);
+  const error = createValueHasWrongTypeError(valueExpr, value, messageText);
+  return {error, program};
 }
diff --git a/packages/compiler-cli/src/ngtsc/annotations/test/directive_spec.ts b/packages/compiler-cli/src/ngtsc/annotations/test/directive_spec.ts
index bfdee6b4b1478..630980dc0df00 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/test/directive_spec.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/test/directive_spec.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 {CssSelector, DirectiveMeta as T2DirectiveMeta, parseTemplate, R3TargetBinder, SelectorMatcher, TmplAstElement} from '@angular/compiler';
 import * as ts from 'typescript';
 
 import {absoluteFrom} from '../../file_system';
@@ -73,6 +74,50 @@ runInEachFileSystem(() => {
       expect(span.start.toString()).toContain('/entry.ts@5:22');
       expect(span.end.toString()).toContain('/entry.ts@5:29');
     });
+
+    it('should produce metadata compatible with template binding', () => {
+      const src = `
+        import {Directive, Input} from '@angular/core';
+
+        @Directive({selector: '[dir]'})
+        export class TestDir {
+          @Input('propName')
+          fieldName: string;
+        }
+      `;
+      const {program} = makeProgram([
+        {
+          name: _('/node_modules/@angular/core/index.d.ts'),
+          contents: 'export const Directive: any; export const Input: any;',
+        },
+        {
+          name: _('/entry.ts'),
+          contents: src,
+        },
+      ]);
+
+      const analysis = analyzeDirective(program, 'TestDir');
+      const matcher = new SelectorMatcher<T2DirectiveMeta>();
+      const dirMeta: T2DirectiveMeta = {
+        exportAs: null,
+        inputs: analysis.inputs,
+        outputs: analysis.outputs,
+        isComponent: false,
+        name: 'Dir',
+        selector: '[dir]',
+      };
+      matcher.addSelectables(CssSelector.parse('[dir]'), dirMeta);
+
+      const {nodes} = parseTemplate('<div dir [propName]="expr"></div>', 'unimportant.html');
+      const binder = new R3TargetBinder(matcher).bind({template: nodes});
+      const propBinding = (nodes[0] as TmplAstElement).inputs[0];
+      const propBindingConsumer = binder.getConsumerOfBinding(propBinding);
+
+      // Assert that the consumer of the binding is the directive, which means that the metadata
+      // fed into the SelectorMatcher was compatible with the binder, and did not confuse property
+      // and field names.
+      expect(propBindingConsumer).toBe(dirMeta);
+    });
   });
 
   // Helpers
diff --git a/packages/compiler-cli/src/ngtsc/annotations/test/injectable_spec.ts b/packages/compiler-cli/src/ngtsc/annotations/test/injectable_spec.ts
index ce10c0bee6ebd..eab3b82aa6bda 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/test/injectable_spec.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/test/injectable_spec.ts
@@ -22,7 +22,7 @@ runInEachFileSystem(() => {
            const {handler, TestClass, ɵprov, analysis} =
                setupHandler(/* errorOnDuplicateProv */ true);
            try {
-             handler.compile(TestClass, analysis);
+             handler.compileFull(TestClass, analysis);
              return fail('Compilation should have failed');
            } catch (err) {
              if (!(err instanceof FatalDiagnosticError)) {
@@ -39,7 +39,7 @@ runInEachFileSystem(() => {
          () => {
            const {handler, TestClass, ɵprov, analysis} =
                setupHandler(/* errorOnDuplicateProv */ false);
-           const res = handler.compile(TestClass, analysis);
+           const res = handler.compileFull(TestClass, analysis);
            expect(res).not.toContain(jasmine.objectContaining({name: 'ɵprov'}));
          });
     });
diff --git a/packages/compiler-cli/src/ngtsc/annotations/test/metadata_spec.ts b/packages/compiler-cli/src/ngtsc/annotations/test/metadata_spec.ts
index b830a433264db..9a09329bad165 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/test/metadata_spec.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/test/metadata_spec.ts
@@ -90,6 +90,19 @@ runInEachFileSystem(() => {
     `);
       expect(res).toBe('');
     });
+
+    it('should preserve quotes around class member names', () => {
+      const res = compileAndPrint(`
+        import {Component, Input} from '@angular/core';
+
+        @Component('metadata') class Target {
+          @Input() 'has-dashes-in-name' = 123;
+          @Input() noDashesInName = 456;
+        }
+      `);
+      expect(res).toContain(
+          `{ 'has-dashes-in-name': [{ type: Input }], noDashesInName: [{ type: Input }] })`);
+    });
   });
 
   function compileAndPrint(contents: string): string {
@@ -120,8 +133,7 @@ runInEachFileSystem(() => {
     }
     const sf = getSourceFileOrError(program, _('/index.ts'));
     const im = new ImportManager(new NoopImportRewriter(), 'i');
-    const tsStatement =
-        translateStatement(call, im, NOOP_DEFAULT_IMPORT_RECORDER, ts.ScriptTarget.ES2015);
+    const tsStatement = translateStatement(call, im);
     const res = ts.createPrinter().printNode(ts.EmitHint.Unspecified, tsStatement, sf);
     return res.replace(/\s+/g, ' ');
   }
diff --git a/packages/compiler-cli/src/ngtsc/core/BUILD.bazel b/packages/compiler-cli/src/ngtsc/core/BUILD.bazel
index e6b2d8fe54465..ce0cef9979c2c 100644
--- a/packages/compiler-cli/src/ngtsc/core/BUILD.bazel
+++ b/packages/compiler-cli/src/ngtsc/core/BUILD.bazel
@@ -34,6 +34,7 @@ ts_library(
         "//packages/compiler-cli/src/ngtsc/transform",
         "//packages/compiler-cli/src/ngtsc/typecheck",
         "//packages/compiler-cli/src/ngtsc/typecheck/api",
+        "//packages/compiler-cli/src/ngtsc/typecheck/diagnostics",
         "//packages/compiler-cli/src/ngtsc/util",
         "@npm//typescript",
     ],
diff --git a/packages/compiler-cli/src/ngtsc/core/api/src/options.ts b/packages/compiler-cli/src/ngtsc/core/api/src/options.ts
index b6b2f678d94a9..2b168db5400f6 100644
--- a/packages/compiler-cli/src/ngtsc/core/api/src/options.ts
+++ b/packages/compiler-cli/src/ngtsc/core/api/src/options.ts
@@ -48,6 +48,22 @@ export interface TestOnlyOptions {
   tracePerformance?: string;
 }
 
+/**
+ * Options that specify compilation target.
+ */
+export interface TargetOptions {
+  /**
+   * Specifies the compilation mode to use. The following modes are available:
+   * - 'full': generates fully AOT compiled code using Ivy instructions.
+   * - 'partial': generates code in a stable, but intermediate form suitable to be published to NPM.
+   *
+   * To become public once the linker is ready.
+   *
+   * @internal
+   */
+  compilationMode?: 'full'|'partial';
+}
+
 /**
  * A merged interface of all of the various Angular compiler options, as well as the standard
  * `ts.CompilerOptions`.
@@ -56,4 +72,5 @@ export interface TestOnlyOptions {
  */
 export interface NgCompilerOptions extends ts.CompilerOptions, LegacyNgcOptions, BazelAndG3Options,
                                            NgcCompatibilityOptions, StrictTemplateOptions,
-                                           TestOnlyOptions, I18nOptions, MiscOptions {}
+                                           TestOnlyOptions, I18nOptions, TargetOptions,
+                                           MiscOptions {}
diff --git a/packages/compiler-cli/src/ngtsc/core/api/src/public_options.ts b/packages/compiler-cli/src/ngtsc/core/api/src/public_options.ts
index bb682ce21f1fc..98b41f8f07a12 100644
--- a/packages/compiler-cli/src/ngtsc/core/api/src/public_options.ts
+++ b/packages/compiler-cli/src/ngtsc/core/api/src/public_options.ts
@@ -147,6 +147,18 @@ export interface StrictTemplateOptions {
    */
   strictInputTypes?: boolean;
 
+  /**
+   * Whether to check if the input binding attempts to assign to a restricted field (readonly,
+   * private, or protected) on the directive/component.
+   *
+   * Defaults to `false`, even if "fullTemplateTypeCheck", "strictTemplates" and/or
+   * "strictInputTypes" is set. Note that if `strictInputTypes` is not set, or set to `false`, this
+   * flag has no effect.
+   *
+   * Tracking issue for enabling this by default: https://github.com/angular/angular/issues/38400
+   */
+  strictInputAccessModifiers?: boolean;
+
   /**
    * Whether to use strict null types for input bindings for directives.
    *
diff --git a/packages/compiler-cli/src/ngtsc/core/src/compiler.ts b/packages/compiler-cli/src/ngtsc/core/src/compiler.ts
index 6e7cd3ff04c6a..0350590747548 100644
--- a/packages/compiler-cli/src/ngtsc/core/src/compiler.ts
+++ b/packages/compiler-cli/src/ngtsc/core/src/compiler.ts
@@ -13,23 +13,24 @@ import {ComponentDecoratorHandler, DirectiveDecoratorHandler, InjectableDecorato
 import {CycleAnalyzer, ImportGraph} from '../../cycles';
 import {ErrorCode, ngErrorCode} from '../../diagnostics';
 import {checkForPrivateExports, ReferenceGraph} from '../../entry_point';
-import {LogicalFileSystem} from '../../file_system';
+import {LogicalFileSystem, resolve} from '../../file_system';
 import {AbsoluteModuleStrategy, AliasingHost, AliasStrategy, DefaultImportTracker, ImportRewriter, LocalIdentifierStrategy, LogicalProjectStrategy, ModuleResolver, NoopImportRewriter, PrivateExportAliasingHost, R3SymbolsImportRewriter, Reference, ReferenceEmitStrategy, ReferenceEmitter, RelativePathStrategy, UnifiedModulesAliasingHost, UnifiedModulesStrategy} from '../../imports';
 import {IncrementalBuildStrategy, IncrementalDriver} from '../../incremental';
 import {generateAnalysis, IndexedComponent, IndexingContext} from '../../indexer';
-import {CompoundMetadataReader, CompoundMetadataRegistry, DtsMetadataReader, InjectableClassRegistry, LocalMetadataRegistry, MetadataReader} from '../../metadata';
+import {CompoundMetadataReader, CompoundMetadataRegistry, DtsMetadataReader, InjectableClassRegistry, LocalMetadataRegistry, MetadataReader, TemplateMapping} from '../../metadata';
 import {ModuleWithProvidersScanner} from '../../modulewithproviders';
 import {PartialEvaluator} from '../../partial_evaluator';
 import {NOOP_PERF_RECORDER, PerfRecorder} from '../../perf';
-import {TypeScriptReflectionHost} from '../../reflection';
+import {DeclarationNode, TypeScriptReflectionHost} from '../../reflection';
 import {AdapterResourceLoader} from '../../resource';
 import {entryPointKeyFor, NgModuleRouteAnalyzer} from '../../routing';
 import {ComponentScopeReader, LocalModuleScopeRegistry, MetadataDtsModuleScopeResolver} from '../../scope';
 import {generatedFactoryTransform} from '../../shims';
 import {ivySwitchTransform} from '../../switch';
-import {aliasTransformFactory, declarationTransformFactory, DecoratorHandler, DtsTransformRegistry, ivyTransformFactory, TraitCompiler} from '../../transform';
-import {isTemplateDiagnostic, TemplateTypeCheckerImpl} from '../../typecheck';
+import {aliasTransformFactory, CompilationMode, declarationTransformFactory, DecoratorHandler, DtsTransformRegistry, ivyTransformFactory, TraitCompiler} from '../../transform';
+import {TemplateTypeCheckerImpl} from '../../typecheck';
 import {OptimizeFor, TemplateTypeChecker, TypeCheckingConfig, TypeCheckingProgramStrategy} from '../../typecheck/api';
+import {isTemplateDiagnostic} from '../../typecheck/diagnostics';
 import {getSourceFileOrNull, isDtsPath, resolveModuleName} from '../../util/src/typescript';
 import {LazyRoute, NgCompilerAdapter, NgCompilerOptions} from '../api';
 
@@ -51,6 +52,7 @@ interface LazyCompilationState {
   aliasingHost: AliasingHost|null;
   refEmitter: ReferenceEmitter;
   templateTypeChecker: TemplateTypeChecker;
+  templateMapping: TemplateMapping;
 }
 
 /**
@@ -98,11 +100,15 @@ export class NgCompiler {
   readonly ignoreForEmit: Set<ts.SourceFile>;
 
   constructor(
-      private adapter: NgCompilerAdapter, private options: NgCompilerOptions,
+      private adapter: NgCompilerAdapter,
+      private options: NgCompilerOptions,
       private tsProgram: ts.Program,
       private typeCheckingProgramStrategy: TypeCheckingProgramStrategy,
-      private incrementalStrategy: IncrementalBuildStrategy, oldProgram: ts.Program|null = null,
-      private perfRecorder: PerfRecorder = NOOP_PERF_RECORDER) {
+      private incrementalStrategy: IncrementalBuildStrategy,
+      private enableTemplateTypeChecker: boolean,
+      oldProgram: ts.Program|null = null,
+      private perfRecorder: PerfRecorder = NOOP_PERF_RECORDER,
+  ) {
     this.constructionDiagnostics.push(...this.adapter.constructionDiagnostics);
     const incompatibleTypeCheckOptionsDiagnostic = verifyCompatibleTypeCheckOptions(this.options);
     if (incompatibleTypeCheckOptionsDiagnostic !== null) {
@@ -156,6 +162,17 @@ export class NgCompiler {
     this.ignoreForEmit = this.adapter.ignoreForEmit;
   }
 
+  /**
+   * Get the resource dependencies of a file.
+   *
+   * If the file is not part of the compilation, an empty array will be returned.
+   */
+  getResourceDependencies(file: ts.SourceFile): string[] {
+    this.ensureAnalyzed();
+
+    return this.incrementalDriver.depGraph.getResourceDependencies(file);
+  }
+
   /**
    * Get all Angular-related diagnostics for this compilation.
    *
@@ -211,9 +228,21 @@ export class NgCompiler {
   }
 
   getTemplateTypeChecker(): TemplateTypeChecker {
+    if (!this.enableTemplateTypeChecker) {
+      throw new Error(
+          'The `TemplateTypeChecker` does not work without `enableTemplateTypeChecker`.');
+    }
     return this.ensureAnalyzed().templateTypeChecker;
   }
 
+  /**
+   * Retrieves the `ts.Declaration`s for any component(s) which use the given template file.
+   */
+  getComponentsWithTemplateFile(templateFilePath: string): ReadonlySet<DeclarationNode> {
+    const {templateMapping} = this.ensureAnalyzed();
+    return templateMapping.getComponentsWithTemplate(resolve(templateFilePath));
+  }
+
   /**
    * Perform Angular's analysis step (as a precursor to `getDiagnostics` or `prepareEmit`)
    * asynchronously.
@@ -349,7 +378,7 @@ export class NgCompiler {
    *
    * See the `indexing` package for more details.
    */
-  getIndexedComponents(): Map<ts.Declaration, IndexedComponent> {
+  getIndexedComponents(): Map<DeclarationNode, IndexedComponent> {
     const compilation = this.ensureAnalyzed();
     const context = new IndexingContext();
     compilation.traitCompiler.index(context);
@@ -414,7 +443,9 @@ export class NgCompiler {
         applyTemplateContextGuards: strictTemplates,
         checkQueries: false,
         checkTemplateBodies: true,
+        alwaysCheckSchemaInTemplateBodies: true,
         checkTypeOfInputBindings: strictTemplates,
+        honorAccessModifiersForInputBindings: false,
         strictNullInputBindings: strictTemplates,
         checkTypeOfAttributes: strictTemplates,
         // Even in full template type-checking mode, DOM binding checks are not quite ready yet.
@@ -434,14 +465,19 @@ export class NgCompiler {
         strictSafeNavigationTypes: strictTemplates,
         useContextGenericType: strictTemplates,
         strictLiteralTypes: true,
+        enableTemplateTypeChecker: this.enableTemplateTypeChecker,
       };
     } else {
       typeCheckingConfig = {
         applyTemplateContextGuards: false,
         checkQueries: false,
         checkTemplateBodies: false,
+        // Enable deep schema checking in "basic" template type-checking mode only if Closure
+        // compilation is requested, which is a good proxy for "only in google3".
+        alwaysCheckSchemaInTemplateBodies: this.closureCompilerEnabled,
         checkTypeOfInputBindings: false,
         strictNullInputBindings: false,
+        honorAccessModifiersForInputBindings: false,
         checkTypeOfAttributes: false,
         checkTypeOfDomBindings: false,
         checkTypeOfOutputEvents: false,
@@ -453,6 +489,7 @@ export class NgCompiler {
         strictSafeNavigationTypes: false,
         useContextGenericType: false,
         strictLiteralTypes: false,
+        enableTemplateTypeChecker: this.enableTemplateTypeChecker,
       };
     }
 
@@ -462,6 +499,10 @@ export class NgCompiler {
       typeCheckingConfig.checkTypeOfInputBindings = this.options.strictInputTypes;
       typeCheckingConfig.applyTemplateContextGuards = this.options.strictInputTypes;
     }
+    if (this.options.strictInputAccessModifiers !== undefined) {
+      typeCheckingConfig.honorAccessModifiersForInputBindings =
+          this.options.strictInputAccessModifiers;
+    }
     if (this.options.strictNullInputTypes !== undefined) {
       typeCheckingConfig.strictNullInputBindings = this.options.strictNullInputTypes;
     }
@@ -693,13 +734,14 @@ export class NgCompiler {
     const isCore = isAngularCorePackage(this.tsProgram);
 
     const defaultImportTracker = new DefaultImportTracker();
+    const templateMapping = new TemplateMapping();
 
     // Set up the IvyCompilation, which manages state for the Ivy transformer.
     const handlers: DecoratorHandler<unknown, unknown, unknown>[] = [
       new ComponentDecoratorHandler(
-          reflector, evaluator, metaRegistry, metaReader, scopeReader, scopeRegistry, isCore,
-          this.resourceManager, this.adapter.rootDirs, this.options.preserveWhitespaces || false,
-          this.options.i18nUseExternalIds !== false,
+          reflector, evaluator, metaRegistry, metaReader, scopeReader, scopeRegistry,
+          templateMapping, isCore, this.resourceManager, this.adapter.rootDirs,
+          this.options.preserveWhitespaces || false, this.options.i18nUseExternalIds !== false,
           this.options.enableI18nLegacyMessageIdFormat !== false,
           this.options.i18nNormalizeLineEndingsInICUs, this.moduleResolver, this.cycleAnalyzer,
           refEmitter, defaultImportTracker, this.incrementalDriver.depGraph, injectableRegistry,
@@ -730,13 +772,16 @@ export class NgCompiler {
           this.closureCompilerEnabled, injectableRegistry, this.options.i18nInLocale),
     ];
 
+    const compilationMode =
+        this.options.compilationMode === 'partial' ? CompilationMode.PARTIAL : CompilationMode.FULL;
     const traitCompiler = new TraitCompiler(
         handlers, reflector, this.perfRecorder, this.incrementalDriver,
-        this.options.compileNonExportedClasses !== false, dtsTransforms);
+        this.options.compileNonExportedClasses !== false, compilationMode, dtsTransforms);
 
     const templateTypeChecker = new TemplateTypeCheckerImpl(
         this.tsProgram, this.typeCheckingProgramStrategy, traitCompiler,
-        this.getTypeCheckingConfig(), refEmitter, reflector, this.adapter, this.incrementalDriver);
+        this.getTypeCheckingConfig(), refEmitter, reflector, this.adapter, this.incrementalDriver,
+        scopeRegistry);
 
     return {
       isCore,
@@ -752,6 +797,7 @@ export class NgCompiler {
       aliasingHost,
       refEmitter,
       templateTypeChecker,
+      templateMapping,
     };
   }
 }
@@ -834,7 +880,7 @@ https://v9.angular.io/guide/template-typecheck#template-type-checking`,
 class ReferenceGraphAdapter implements ReferencesRegistry {
   constructor(private graph: ReferenceGraph) {}
 
-  add(source: ts.Declaration, ...references: Reference<ts.Declaration>[]): void {
+  add(source: DeclarationNode, ...references: Reference<DeclarationNode>[]): void {
     for (const {node} of references) {
       let sourceFile = node.getSourceFile();
       if (sourceFile === undefined) {
diff --git a/packages/compiler-cli/src/ngtsc/core/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/core/test/BUILD.bazel
index ec34344c911a4..54dcaad509c81 100644
--- a/packages/compiler-cli/src/ngtsc/core/test/BUILD.bazel
+++ b/packages/compiler-cli/src/ngtsc/core/test/BUILD.bazel
@@ -15,6 +15,7 @@ ts_library(
         "//packages/compiler-cli/src/ngtsc/file_system",
         "//packages/compiler-cli/src/ngtsc/file_system/testing",
         "//packages/compiler-cli/src/ngtsc/incremental",
+        "//packages/compiler-cli/src/ngtsc/reflection",
         "//packages/compiler-cli/src/ngtsc/typecheck",
         "@npm//typescript",
     ],
diff --git a/packages/compiler-cli/src/ngtsc/core/test/compiler_test.ts b/packages/compiler-cli/src/ngtsc/core/test/compiler_test.ts
index cb4589494b69c..9e873e720e1ff 100644
--- a/packages/compiler-cli/src/ngtsc/core/test/compiler_test.ts
+++ b/packages/compiler-cli/src/ngtsc/core/test/compiler_test.ts
@@ -11,12 +11,14 @@ import * as ts from 'typescript';
 import {absoluteFrom as _, FileSystem, getFileSystem, getSourceFileOrError, NgtscCompilerHost, setFileSystem} from '../../file_system';
 import {runInEachFileSystem} from '../../file_system/testing';
 import {NoopIncrementalBuildStrategy} from '../../incremental';
+import {ClassDeclaration, isNamedClassDeclaration} from '../../reflection';
 import {ReusedProgramStrategy} from '../../typecheck';
+
 import {NgCompilerOptions} from '../api';
+
 import {NgCompiler} from '../src/compiler';
 import {NgCompilerHost} from '../src/host';
 
-
 runInEachFileSystem(() => {
   describe('NgCompiler', () => {
     let fs: FileSystem;
@@ -49,11 +51,103 @@ runInEachFileSystem(() => {
       const program = ts.createProgram({host, options, rootNames: host.inputFiles});
       const compiler = new NgCompiler(
           host, options, program, new ReusedProgramStrategy(program, host, options, []),
-          new NoopIncrementalBuildStrategy());
+          new NoopIncrementalBuildStrategy(), /** enableTemplateTypeChecker */ false);
 
       const diags = compiler.getDiagnostics(getSourceFileOrError(program, COMPONENT));
       expect(diags.length).toBe(1);
       expect(diags[0].messageText).toContain('does_not_exist');
     });
+
+    describe('getComponentsWithTemplateFile', () => {
+      it('should return the component(s) using a template file', () => {
+        const templateFile = _('/template.html');
+        fs.writeFile(templateFile, `This is the template, used by components CmpA and CmpC`);
+        const cmpAFile = _('/cmp-a.ts');
+        fs.writeFile(cmpAFile, `
+            import {Component} from '@angular/core';
+            @Component({
+              selector: 'cmp-a',
+              templateUrl: './template.html',
+            })
+            export class CmpA {}
+          `);
+        const cmpBFile = _('/cmp-b.ts');
+        fs.writeFile(cmpBFile, `
+            import {Component} from '@angular/core';
+            @Component({
+              selector: 'cmp-b',
+              template: 'CmpB does not use an external template',
+            })
+            export class CmpB {}
+          `);
+        const cmpCFile = _('/cmp-c.ts');
+        fs.writeFile(cmpCFile, `
+            import {Component} from '@angular/core';
+            @Component({
+              selector: 'cmp-c',
+              templateUrl: './template.html',
+            })
+            export class CmpC {}
+          `);
+
+        const options: NgCompilerOptions = {};
+
+        const baseHost = new NgtscCompilerHost(getFileSystem(), options);
+        const host = NgCompilerHost.wrap(
+            baseHost, [cmpAFile, cmpBFile, cmpCFile], options, /* oldProgram */ null);
+        const program = ts.createProgram({host, options, rootNames: host.inputFiles});
+        const CmpA = getClass(getSourceFileOrError(program, cmpAFile), 'CmpA');
+        const CmpC = getClass(getSourceFileOrError(program, cmpCFile), 'CmpC');
+        const compiler = new NgCompiler(
+            host, options, program, new ReusedProgramStrategy(program, host, options, []),
+            new NoopIncrementalBuildStrategy(), /** enableTemplateTypeChecker */ false);
+        const components = compiler.getComponentsWithTemplateFile(templateFile);
+        expect(components).toEqual(new Set([CmpA, CmpC]));
+      });
+    });
+
+    describe('getResourceDependencies', () => {
+      it('should return resource dependencies of a component source file', () => {
+        const COMPONENT = _('/cmp.ts');
+        fs.writeFile(COMPONENT, `
+          import {Component} from '@angular/core';
+          @Component({
+            selector: 'test-cmp',
+            templateUrl: './template.html',
+            styleUrls: ['./style.css'],
+          })
+          export class Cmp {}
+        `);
+        fs.writeFile(_('/template.html'), `<h1>Resource</h1>`);
+        fs.writeFile(_('/style.css'), `h1 { }`);
+
+        const options: NgCompilerOptions = {
+          strictTemplates: true,
+        };
+        const baseHost = new NgtscCompilerHost(getFileSystem(), options);
+        const host = NgCompilerHost.wrap(baseHost, [COMPONENT], options, /* oldProgram */ null);
+        const program = ts.createProgram({host, options, rootNames: host.inputFiles});
+        const compiler = new NgCompiler(
+            host, options, program, new ReusedProgramStrategy(program, host, options, []),
+            new NoopIncrementalBuildStrategy(), /** enableTemplateTypeChecker */ false);
+
+        const deps = compiler.getResourceDependencies(getSourceFileOrError(program, COMPONENT));
+        expect(deps.length).toBe(2);
+        expect(deps).toEqual(jasmine.arrayContaining([
+          jasmine.stringMatching(/\/template.html$/),
+          jasmine.stringMatching(/\/style.css$/),
+        ]));
+      });
+    });
   });
 });
+
+
+function getClass(sf: ts.SourceFile, name: string): ClassDeclaration<ts.ClassDeclaration> {
+  for (const stmt of sf.statements) {
+    if (isNamedClassDeclaration(stmt) && stmt.name.text === name) {
+      return stmt;
+    }
+  }
+  throw new Error(`Class ${name} not found in file: ${sf.fileName}: ${sf.text}`);
+}
diff --git a/packages/compiler-cli/src/ngtsc/diagnostics/src/error_code.ts b/packages/compiler-cli/src/ngtsc/diagnostics/src/error_code.ts
index 91eb8123840cd..b1e767dcf25e7 100644
--- a/packages/compiler-cli/src/ngtsc/diagnostics/src/error_code.ts
+++ b/packages/compiler-cli/src/ngtsc/diagnostics/src/error_code.ts
@@ -56,6 +56,11 @@ export enum ErrorCode {
    */
   HOST_BINDING_PARSE_ERROR = 5001,
 
+  /**
+   * Raised when the compiler cannot parse a component's template.
+   */
+  TEMPLATE_PARSE_ERROR = 5002,
+
   /**
    * Raised when an NgModule contains an invalid reference in `declarations`.
    */
diff --git a/packages/compiler-cli/src/ngtsc/entry_point/BUILD.bazel b/packages/compiler-cli/src/ngtsc/entry_point/BUILD.bazel
index 0bc6323756d6d..6c22d2b902275 100644
--- a/packages/compiler-cli/src/ngtsc/entry_point/BUILD.bazel
+++ b/packages/compiler-cli/src/ngtsc/entry_point/BUILD.bazel
@@ -11,6 +11,7 @@ ts_library(
     deps = [
         "//packages/compiler-cli/src/ngtsc/diagnostics",
         "//packages/compiler-cli/src/ngtsc/file_system",
+        "//packages/compiler-cli/src/ngtsc/reflection",
         "//packages/compiler-cli/src/ngtsc/shims:api",
         "//packages/compiler-cli/src/ngtsc/util",
         "@npm//@types/node",
diff --git a/packages/compiler-cli/src/ngtsc/entry_point/src/private_export_checker.ts b/packages/compiler-cli/src/ngtsc/entry_point/src/private_export_checker.ts
index 307e4543036db..3dd66134d6239 100644
--- a/packages/compiler-cli/src/ngtsc/entry_point/src/private_export_checker.ts
+++ b/packages/compiler-cli/src/ngtsc/entry_point/src/private_export_checker.ts
@@ -9,6 +9,7 @@
 import * as ts from 'typescript';
 
 import {ErrorCode, ngErrorCode} from '../../diagnostics';
+import {DeclarationNode} from '../../reflection';
 
 import {ReferenceGraph} from './reference_graph';
 
@@ -39,7 +40,7 @@ export function checkForPrivateExports(
   const diagnostics: ts.Diagnostic[] = [];
 
   // Firstly, compute the exports of the entry point. These are all the Exported classes.
-  const topLevelExports = new Set<ts.Declaration>();
+  const topLevelExports = new Set<DeclarationNode>();
 
   // Do this via `ts.TypeChecker.getExportsOfModule`.
   const moduleSymbol = checker.getSymbolAtLocation(entryPoint);
@@ -63,7 +64,7 @@ export function checkForPrivateExports(
   // Next, go through each exported class and expand it to the set of classes it makes Visible,
   // using the `ReferenceGraph`. For each Visible class, verify that it's also Exported, and queue
   // an error if it isn't. `checkedSet` ensures only one error is queued per class.
-  const checkedSet = new Set<ts.Declaration>();
+  const checkedSet = new Set<DeclarationNode>();
 
   // Loop through each Exported class.
   // TODO(alxhub): use proper iteration when the legacy build is removed. (#27762)
@@ -110,7 +111,7 @@ export function checkForPrivateExports(
   return diagnostics;
 }
 
-function getPosOfDeclaration(decl: ts.Declaration): {start: number, length: number} {
+function getPosOfDeclaration(decl: DeclarationNode): {start: number, length: number} {
   const node: ts.Node = getIdentifierOfDeclaration(decl) || decl;
   return {
     start: node.getStart(),
@@ -118,7 +119,7 @@ function getPosOfDeclaration(decl: ts.Declaration): {start: number, length: numb
   };
 }
 
-function getIdentifierOfDeclaration(decl: ts.Declaration): ts.Identifier|null {
+function getIdentifierOfDeclaration(decl: DeclarationNode): ts.Identifier|null {
   if ((ts.isClassDeclaration(decl) || ts.isVariableDeclaration(decl) ||
        ts.isFunctionDeclaration(decl)) &&
       decl.name !== undefined && ts.isIdentifier(decl.name)) {
@@ -128,12 +129,12 @@ function getIdentifierOfDeclaration(decl: ts.Declaration): ts.Identifier|null {
   }
 }
 
-function getNameOfDeclaration(decl: ts.Declaration): string {
+function getNameOfDeclaration(decl: DeclarationNode): string {
   const id = getIdentifierOfDeclaration(decl);
   return id !== null ? id.text : '(unnamed)';
 }
 
-function getDescriptorOfDeclaration(decl: ts.Declaration): string {
+function getDescriptorOfDeclaration(decl: DeclarationNode): string {
   switch (decl.kind) {
     case ts.SyntaxKind.ClassDeclaration:
       return 'class';
diff --git a/packages/compiler-cli/src/ngtsc/entry_point/src/reference_graph.ts b/packages/compiler-cli/src/ngtsc/entry_point/src/reference_graph.ts
index 4063c437b532b..168943cf6a98b 100644
--- a/packages/compiler-cli/src/ngtsc/entry_point/src/reference_graph.ts
+++ b/packages/compiler-cli/src/ngtsc/entry_point/src/reference_graph.ts
@@ -6,9 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import * as ts from 'typescript';
+import {DeclarationNode} from '../../reflection';
 
-export class ReferenceGraph<T = ts.Declaration> {
+export class ReferenceGraph<T = DeclarationNode> {
   private references = new Map<T, Set<T>>();
 
   add(from: T, to: T): void {
diff --git a/packages/compiler-cli/src/ngtsc/file_system/src/invalid_file_system.ts b/packages/compiler-cli/src/ngtsc/file_system/src/invalid_file_system.ts
index b55223efa8cad..5dadaa1fbdb4b 100644
--- a/packages/compiler-cli/src/ngtsc/file_system/src/invalid_file_system.ts
+++ b/packages/compiler-cli/src/ngtsc/file_system/src/invalid_file_system.ts
@@ -22,10 +22,10 @@ export class InvalidFileSystem implements FileSystem {
   readFile(path: AbsoluteFsPath): string {
     throw makeError();
   }
-  readFileBuffer(path: AbsoluteFsPath): Buffer {
+  readFileBuffer(path: AbsoluteFsPath): Uint8Array {
     throw makeError();
   }
-  writeFile(path: AbsoluteFsPath, data: string|Buffer, exclusive?: boolean): void {
+  writeFile(path: AbsoluteFsPath, data: string|Uint8Array, exclusive?: boolean): void {
     throw makeError();
   }
   removeFile(path: AbsoluteFsPath): void {
diff --git a/packages/compiler-cli/src/ngtsc/file_system/src/node_js_file_system.ts b/packages/compiler-cli/src/ngtsc/file_system/src/node_js_file_system.ts
index 44ad46a16dd5f..444092831978d 100644
--- a/packages/compiler-cli/src/ngtsc/file_system/src/node_js_file_system.ts
+++ b/packages/compiler-cli/src/ngtsc/file_system/src/node_js_file_system.ts
@@ -23,10 +23,10 @@ export class NodeJSFileSystem implements FileSystem {
   readFile(path: AbsoluteFsPath): string {
     return fs.readFileSync(path, 'utf8');
   }
-  readFileBuffer(path: AbsoluteFsPath): Buffer {
+  readFileBuffer(path: AbsoluteFsPath): Uint8Array {
     return fs.readFileSync(path);
   }
-  writeFile(path: AbsoluteFsPath, data: string|Buffer, exclusive: boolean = false): void {
+  writeFile(path: AbsoluteFsPath, data: string|Uint8Array, exclusive: boolean = false): void {
     fs.writeFileSync(path, data, exclusive ? {flag: 'wx'} : undefined);
   }
   removeFile(path: AbsoluteFsPath): void {
diff --git a/packages/compiler-cli/src/ngtsc/file_system/src/types.ts b/packages/compiler-cli/src/ngtsc/file_system/src/types.ts
index b232db828c832..bdc660e3011f4 100644
--- a/packages/compiler-cli/src/ngtsc/file_system/src/types.ts
+++ b/packages/compiler-cli/src/ngtsc/file_system/src/types.ts
@@ -37,8 +37,8 @@ export type PathSegment = BrandedPath<'PathSegment'>;
 export interface FileSystem {
   exists(path: AbsoluteFsPath): boolean;
   readFile(path: AbsoluteFsPath): string;
-  readFileBuffer(path: AbsoluteFsPath): Buffer;
-  writeFile(path: AbsoluteFsPath, data: string|Buffer, exclusive?: boolean): void;
+  readFileBuffer(path: AbsoluteFsPath): Uint8Array;
+  writeFile(path: AbsoluteFsPath, data: string|Uint8Array, exclusive?: boolean): void;
   removeFile(path: AbsoluteFsPath): void;
   symlink(target: AbsoluteFsPath, path: AbsoluteFsPath): void;
   readdir(path: AbsoluteFsPath): PathSegment[];
diff --git a/packages/compiler-cli/src/ngtsc/file_system/testing/src/mock_file_system.ts b/packages/compiler-cli/src/ngtsc/file_system/testing/src/mock_file_system.ts
index 5d4cc337bac56..220ac4e0d55d6 100644
--- a/packages/compiler-cli/src/ngtsc/file_system/testing/src/mock_file_system.ts
+++ b/packages/compiler-cli/src/ngtsc/file_system/testing/src/mock_file_system.ts
@@ -38,16 +38,16 @@ export abstract class MockFileSystem implements FileSystem {
     }
   }
 
-  readFileBuffer(path: AbsoluteFsPath): Buffer {
+  readFileBuffer(path: AbsoluteFsPath): Uint8Array {
     const {entity} = this.findFromPath(path);
     if (isFile(entity)) {
-      return Buffer.isBuffer(entity) ? entity : new Buffer(entity);
+      return entity instanceof Uint8Array ? entity : new Buffer(entity);
     } else {
       throw new MockFileSystemError('ENOENT', path, `File "${path}" does not exist.`);
     }
   }
 
-  writeFile(path: AbsoluteFsPath, data: string|Buffer, exclusive: boolean = false): void {
+  writeFile(path: AbsoluteFsPath, data: string|Uint8Array, exclusive: boolean = false): void {
     const [folderPath, basename] = this.splitIntoFolderAndFile(path);
     const {entity} = this.findFromPath(folderPath);
     if (entity === null || !isFolder(entity)) {
@@ -127,12 +127,17 @@ export abstract class MockFileSystem implements FileSystem {
     delete folder[name];
   }
 
-  ensureDir(path: AbsoluteFsPath): void {
+  ensureDir(path: AbsoluteFsPath): Folder {
     const segments = this.splitPath(path).map(segment => this.getCanonicalPath(segment));
-    let current: Folder = this._fileTree;
 
     // Convert the root folder to a canonical empty string `''` (on Windows it would be `'C:'`).
     segments[0] = '';
+    if (segments.length > 1 && segments[segments.length - 1] === '') {
+      // Remove a trailing slash (unless the path was only `/`)
+      segments.pop();
+    }
+
+    let current: Folder = this._fileTree;
     for (const segment of segments) {
       if (isFile(current[segment])) {
         throw new Error(`Folder already exists as a file.`);
@@ -142,6 +147,7 @@ export abstract class MockFileSystem implements FileSystem {
       }
       current = current[segment] as Folder;
     }
+    return current;
   }
 
   removeDeep(path: AbsoluteFsPath): void {
@@ -221,26 +227,45 @@ export abstract class MockFileSystem implements FileSystem {
   protected abstract splitPath<T extends PathString>(path: T): string[];
 
   dump(): Folder {
-    return this.cloneFolder(this._fileTree);
+    const {entity} = this.findFromPath(this.resolve('/'));
+    if (entity === null || !isFolder(entity)) {
+      return {};
+    }
+
+    return this.cloneFolder(entity);
   }
+
   init(folder: Folder): void {
-    this._fileTree = this.cloneFolder(folder);
+    this.mount(this.resolve('/'), folder);
+  }
+
+  mount(path: AbsoluteFsPath, folder: Folder): void {
+    if (this.exists(path)) {
+      throw new Error(`Unable to mount in '${path}' as it already exists.`);
+    }
+    const mountFolder = this.ensureDir(path);
+
+    this.copyInto(folder, mountFolder);
   }
 
   private cloneFolder(folder: Folder): Folder {
     const clone: Folder = {};
-    for (const path in folder) {
-      const item = folder[path];
+    this.copyInto(folder, clone);
+    return clone;
+  }
+
+  private copyInto(from: Folder, to: Folder): void {
+    for (const path in from) {
+      const item = from[path];
       const canonicalPath = this.getCanonicalPath(path);
       if (isSymLink(item)) {
-        clone[canonicalPath] = new SymLink(this.getCanonicalPath(item.path));
+        to[canonicalPath] = new SymLink(this.getCanonicalPath(item.path));
       } else if (isFolder(item)) {
-        clone[canonicalPath] = this.cloneFolder(item);
+        to[canonicalPath] = this.cloneFolder(item);
       } else {
-        clone[canonicalPath] = folder[path];
+        to[canonicalPath] = from[path];
       }
     }
-    return clone;
   }
 
 
@@ -295,7 +320,7 @@ export type Entity = Folder|File|SymLink;
 export interface Folder {
   [pathSegments: string]: Entity;
 }
-export type File = string|Buffer;
+export type File = string|Uint8Array;
 export class SymLink {
   constructor(public path: AbsoluteFsPath) {}
 }
diff --git a/packages/compiler-cli/src/ngtsc/file_system/testing/src/mock_file_system_windows.ts b/packages/compiler-cli/src/ngtsc/file_system/testing/src/mock_file_system_windows.ts
index a34a7f61b9db5..e41f288e0c6cd 100644
--- a/packages/compiler-cli/src/ngtsc/file_system/testing/src/mock_file_system_windows.ts
+++ b/packages/compiler-cli/src/ngtsc/file_system/testing/src/mock_file_system_windows.ts
@@ -42,6 +42,6 @@ export class MockFileSystemWindows extends MockFileSystem {
   }
 
   normalize<T extends PathString>(path: T): T {
-    return path.replace(/^[\/\\]/i, 'c:/').replace(/\\/g, '/') as T;
+    return path.replace(/^[\/\\]/i, 'C:/').replace(/\\/g, '/') as T;
   }
 }
diff --git a/packages/compiler-cli/src/ngtsc/imports/src/emitter.ts b/packages/compiler-cli/src/ngtsc/imports/src/emitter.ts
index 2fa42012c84f8..4835935d0c1a3 100644
--- a/packages/compiler-cli/src/ngtsc/imports/src/emitter.ts
+++ b/packages/compiler-cli/src/ngtsc/imports/src/emitter.ts
@@ -11,7 +11,7 @@ import * as ts from 'typescript';
 import {UnifiedModulesHost} from '../../core/api';
 import {absoluteFromSourceFile, dirname, LogicalFileSystem, LogicalProjectPath, relative, toRelativeImport} from '../../file_system';
 import {stripExtension} from '../../file_system/src/util';
-import {ReflectionHost} from '../../reflection';
+import {DeclarationNode, isConcreteDeclaration, ReflectionHost} from '../../reflection';
 import {getSourceFile, isDeclaration, isTypeDeclaration, nodeNameForError} from '../../util/src/typescript';
 
 import {findExportedNameOfNode} from './find_export';
@@ -136,7 +136,7 @@ export class AbsoluteModuleStrategy implements ReferenceEmitStrategy {
    * A cache of the exports of specific modules, because resolving a module to its exports is a
    * costly operation.
    */
-  private moduleExportsCache = new Map<string, Map<ts.Declaration, string>|null>();
+  private moduleExportsCache = new Map<string, Map<DeclarationNode, string>|null>();
 
   constructor(
       protected program: ts.Program, protected checker: ts.TypeChecker,
@@ -170,7 +170,7 @@ export class AbsoluteModuleStrategy implements ReferenceEmitStrategy {
     return new ExternalExpr(new ExternalReference(specifier, symbolName));
   }
 
-  private resolveImportName(moduleName: string, target: ts.Declaration, fromFile: string): string
+  private resolveImportName(moduleName: string, target: DeclarationNode, fromFile: string): string
       |null {
     const exports = this.getExportsOfModule(moduleName, fromFile);
     if (exports !== null && exports.has(target)) {
@@ -181,7 +181,7 @@ export class AbsoluteModuleStrategy implements ReferenceEmitStrategy {
   }
 
   private getExportsOfModule(moduleName: string, fromFile: string):
-      Map<ts.Declaration, string>|null {
+      Map<DeclarationNode, string>|null {
     if (!this.moduleExportsCache.has(moduleName)) {
       this.moduleExportsCache.set(moduleName, this.enumerateExportsOfModule(moduleName, fromFile));
     }
@@ -189,7 +189,7 @@ export class AbsoluteModuleStrategy implements ReferenceEmitStrategy {
   }
 
   protected enumerateExportsOfModule(specifier: string, fromFile: string):
-      Map<ts.Declaration, string>|null {
+      Map<DeclarationNode, string>|null {
     // First, resolve the module specifier to its entry point, and get the ts.Symbol for it.
     const entryPointFile = this.moduleResolver.resolveModule(specifier, fromFile);
     if (entryPointFile === null) {
@@ -200,13 +200,9 @@ export class AbsoluteModuleStrategy implements ReferenceEmitStrategy {
     if (exports === null) {
       return null;
     }
-    const exportMap = new Map<ts.Declaration, string>();
+    const exportMap = new Map<DeclarationNode, string>();
     exports.forEach((declaration, name) => {
-      // It's okay to skip inline declarations, since by definition they're not target-able with a
-      // ts.Declaration anyway.
-      if (declaration.node !== null) {
-        exportMap.set(declaration.node, name);
-      }
+      exportMap.set(declaration.node, name);
     });
     return exportMap;
   }
diff --git a/packages/compiler-cli/src/ngtsc/imports/test/default_spec.ts b/packages/compiler-cli/src/ngtsc/imports/test/default_spec.ts
index 01714592321bc..f07ea36462a0b 100644
--- a/packages/compiler-cli/src/ngtsc/imports/test/default_spec.ts
+++ b/packages/compiler-cli/src/ngtsc/imports/test/default_spec.ts
@@ -69,7 +69,7 @@ runInEachFileSystem(() => {
             module: ts.ModuleKind.CommonJS,
           });
       const fooClause = getDeclaration(program, _('/test.ts'), 'Foo', ts.isImportClause);
-      const fooId = ts.updateIdentifier(fooClause.name!);
+      const fooId = fooClause.name!;
       const fooDecl = fooClause.parent;
 
       const tracker = new DefaultImportTracker();
diff --git a/packages/compiler-cli/src/ngtsc/incremental/src/dependency_tracking.ts b/packages/compiler-cli/src/ngtsc/incremental/src/dependency_tracking.ts
index e884aefbaa99d..42fc122f00e60 100644
--- a/packages/compiler-cli/src/ngtsc/incremental/src/dependency_tracking.ts
+++ b/packages/compiler-cli/src/ngtsc/incremental/src/dependency_tracking.ts
@@ -53,6 +53,12 @@ export class FileDependencyGraph<T extends {fileName: string} = ts.SourceFile> i
     }
   }
 
+  getResourceDependencies(from: T): AbsoluteFsPath[] {
+    const node = this.nodes.get(from);
+
+    return node ? [...node.usesResources] : [];
+  }
+
   isStale(sf: T, changedTsPaths: Set<string>, changedResources: Set<AbsoluteFsPath>): boolean {
     return isLogicallyChanged(sf, this.nodeFor(sf), changedTsPaths, EMPTY_SET, changedResources);
   }
diff --git a/packages/compiler-cli/src/ngtsc/indexer/src/api.ts b/packages/compiler-cli/src/ngtsc/indexer/src/api.ts
index 9948c69211526..515b286fe6691 100644
--- a/packages/compiler-cli/src/ngtsc/indexer/src/api.ts
+++ b/packages/compiler-cli/src/ngtsc/indexer/src/api.ts
@@ -7,8 +7,7 @@
  */
 
 import {ParseSourceFile} from '@angular/compiler';
-import * as ts from 'typescript';
-import {ClassDeclaration} from '../../reflection';
+import {ClassDeclaration, DeclarationNode} from '../../reflection';
 
 /**
  * Describes the kind of identifier found in a template.
@@ -129,7 +128,7 @@ export interface IndexedComponent {
   file: ParseSourceFile;
   template: {
     identifiers: Set<TopLevelIdentifier>,
-    usedComponents: Set<ts.Declaration>,
+    usedComponents: Set<DeclarationNode>,
     isInline: boolean,
     file: ParseSourceFile;
   };
diff --git a/packages/compiler-cli/src/ngtsc/indexer/src/template.ts b/packages/compiler-cli/src/ngtsc/indexer/src/template.ts
index b6b08c29d4b7d..e8ec2507edc4f 100644
--- a/packages/compiler-cli/src/ngtsc/indexer/src/template.ts
+++ b/packages/compiler-cli/src/ngtsc/indexer/src/template.ts
@@ -97,15 +97,12 @@ class ExpressionVisitor extends RecursiveAstVisitor {
       return;
     }
 
-    // Get the location of the identifier of real interest.
-    // The compiler's expression parser records the location of some expressions in a manner not
-    // useful to the indexer. For example, a `MethodCall` `foo(a, b)` will record the span of the
-    // entire method call, but the indexer is interested only in the method identifier.
-    const localExpression = this.expressionStr.substr(ast.span.start);
-    if (!localExpression.includes(ast.name)) {
-      throw new Error(`Impossible state: "${ast.name}" not found in "${localExpression}"`);
+    // The source span of the requested AST starts at a location that is offset from the expression.
+    const identifierStart = ast.sourceSpan.start - this.absoluteOffset;
+    if (!this.expressionStr.substring(identifierStart).startsWith(ast.name)) {
+      throw new Error(`Impossible state: "${ast.name}" not found in "${
+          this.expressionStr}" at location ${identifierStart}`);
     }
-    const identifierStart = ast.span.start + localExpression.indexOf(ast.name);
 
     // Join the relative position of the expression within a node with the absolute position
     // of the node to get the absolute position of the expression in the source code.
@@ -191,25 +188,14 @@ class TemplateVisitor extends TmplAstRecursiveVisitor {
     this.visitAll(template.references);
   }
   visitBoundAttribute(attribute: TmplAstBoundAttribute) {
-    // A BoundAttribute's value (the parent AST) may have subexpressions (children ASTs) that have
-    // recorded spans extending past the recorded span of the parent. The most common example of
-    // this is with `*ngFor`.
-    // To resolve this, use the information on the BoundAttribute Template AST, which is always
-    // correct, to determine locations of identifiers in the expression.
-    //
-    // TODO(ayazhafiz): Remove this when https://github.com/angular/angular/pull/31813 lands.
-    const attributeSrc = attribute.sourceSpan.toString();
-    const attributeAbsolutePosition = attribute.sourceSpan.start.offset;
-
-    // Skip the bytes of the attribute name so that there are no collisions between the attribute
-    // name and expression identifier names later.
-    const nameSkipOffet = attributeSrc.indexOf(attribute.name) + attribute.name.length;
-    const expressionSrc = attributeSrc.substring(nameSkipOffet);
-    const expressionAbsolutePosition = attributeAbsolutePosition + nameSkipOffet;
+    // If the bound attribute has no value, it cannot have any identifiers in the value expression.
+    if (attribute.valueSpan === undefined) {
+      return;
+    }
 
     const identifiers = ExpressionVisitor.getIdentifiers(
-        attribute.value, expressionSrc, expressionAbsolutePosition, this.boundTemplate,
-        this.targetToIdentifier.bind(this));
+        attribute.value, attribute.valueSpan.toString(), attribute.valueSpan.start.offset,
+        this.boundTemplate, this.targetToIdentifier.bind(this));
     identifiers.forEach(id => this.identifiers.add(id));
   }
   visitBoundEvent(attribute: TmplAstBoundEvent) {
@@ -246,7 +232,7 @@ class TemplateVisitor extends TmplAstRecursiveVisitor {
       name = node.name;
       kind = IdentifierKind.Element;
     }
-    const {sourceSpan} = node;
+    const sourceSpan = node.startSourceSpan;
     // An element's or template's source span can be of the form `<element>`, `<element />`, or
     // `<element></element>`. Only the selector is interesting to the indexer, so the source is
     // searched for the first occurrence of the element (selector) name.
diff --git a/packages/compiler-cli/src/ngtsc/indexer/src/transform.ts b/packages/compiler-cli/src/ngtsc/indexer/src/transform.ts
index e5d3f7774bbd9..d96846180082d 100644
--- a/packages/compiler-cli/src/ngtsc/indexer/src/transform.ts
+++ b/packages/compiler-cli/src/ngtsc/indexer/src/transform.ts
@@ -7,7 +7,7 @@
  */
 
 import {ParseSourceFile} from '@angular/compiler';
-import * as ts from 'typescript';
+import {DeclarationNode} from '../../reflection';
 import {IndexedComponent} from './api';
 import {IndexingContext} from './context';
 import {getTemplateIdentifiers} from './template';
@@ -18,13 +18,13 @@ import {getTemplateIdentifiers} from './template';
  *
  * The context must be populated before `generateAnalysis` is called.
  */
-export function generateAnalysis(context: IndexingContext): Map<ts.Declaration, IndexedComponent> {
-  const analysis = new Map<ts.Declaration, IndexedComponent>();
+export function generateAnalysis(context: IndexingContext): Map<DeclarationNode, IndexedComponent> {
+  const analysis = new Map<DeclarationNode, IndexedComponent>();
 
   context.components.forEach(({declaration, selector, boundTemplate, templateMeta}) => {
     const name = declaration.name.getText();
 
-    const usedComponents = new Set<ts.Declaration>();
+    const usedComponents = new Set<DeclarationNode>();
     const usedDirs = boundTemplate.getUsedDirectives();
     usedDirs.forEach(dir => {
       if (dir.isComponent) {
diff --git a/packages/compiler-cli/src/ngtsc/indexer/test/template_spec.ts b/packages/compiler-cli/src/ngtsc/indexer/test/template_spec.ts
index f013d6204e177..b7c0ff1153802 100644
--- a/packages/compiler-cli/src/ngtsc/indexer/test/template_spec.ts
+++ b/packages/compiler-cli/src/ngtsc/indexer/test/template_spec.ts
@@ -124,6 +124,20 @@ runInEachFileSystem(() => {
         });
       });
 
+      it('should handle bound attributes with no value', () => {
+        const template = '<div [bar]></div>';
+        const refs = getTemplateIdentifiers(bind(template));
+
+        const refArr = Array.from(refs);
+        expect(refArr).toEqual([{
+          name: 'div',
+          kind: IdentifierKind.Element,
+          span: new AbsoluteSourceSpan(1, 4),
+          attributes: new Set(),
+          usedDirectives: new Set(),
+        }]);
+      });
+
       it('should discover variables in bound attributes', () => {
         const template = '<div #div [value]="div.innerText"></div>';
         const refs = getTemplateIdentifiers(bind(template));
@@ -189,6 +203,33 @@ runInEachFileSystem(() => {
           target: null,
         });
       });
+
+      it('should discover properties in template expressions and resist collisions', () => {
+        const template = '<div *ngFor="let foo of (foos ? foos : foos)"></div>';
+        const refs = getTemplateIdentifiers(bind(template));
+
+        const refArr = Array.from(refs);
+        expect(refArr).toEqual(jasmine.arrayContaining([
+          {
+            name: 'foos',
+            kind: IdentifierKind.Property,
+            span: new AbsoluteSourceSpan(25, 29),
+            target: null,
+          },
+          {
+            name: 'foos',
+            kind: IdentifierKind.Property,
+            span: new AbsoluteSourceSpan(32, 36),
+            target: null,
+          },
+          {
+            name: 'foos',
+            kind: IdentifierKind.Property,
+            span: new AbsoluteSourceSpan(39, 43),
+            target: null,
+          },
+        ]));
+      });
     });
 
     describe('generates identifiers for PropertyWrites', () => {
diff --git a/packages/compiler-cli/src/ngtsc/indexer/test/util.ts b/packages/compiler-cli/src/ngtsc/indexer/test/util.ts
index 4e16da6e111ca..7986cab520b3f 100644
--- a/packages/compiler-cli/src/ngtsc/indexer/test/util.ts
+++ b/packages/compiler-cli/src/ngtsc/indexer/test/util.ts
@@ -11,6 +11,7 @@ import * as ts from 'typescript';
 
 import {absoluteFrom, AbsoluteFsPath} from '../../file_system';
 import {Reference} from '../../imports';
+import {ClassPropertyMapping} from '../../metadata';
 import {ClassDeclaration} from '../../reflection';
 import {getDeclaration, makeProgram} from '../../testing';
 import {ComponentMeta} from '../src/context';
@@ -28,7 +29,7 @@ export function getComponentDeclaration(componentStr: string, className: string)
 
   return getDeclaration(
       program.program, getTestFilePath(), className,
-      (value: ts.Declaration): value is ClassDeclaration => ts.isClassDeclaration(value));
+      (value: ts.Node): value is ClassDeclaration => ts.isClassDeclaration(value));
 }
 
 /**
@@ -50,8 +51,8 @@ export function getBoundTemplate(
       selector,
       name: declaration.name.getText(),
       isComponent: true,
-      inputs: {},
-      outputs: {},
+      inputs: ClassPropertyMapping.fromMappedObject({}),
+      outputs: ClassPropertyMapping.fromMappedObject({}),
       exportAs: null,
     });
   });
diff --git a/packages/compiler-cli/src/ngtsc/metadata/BUILD.bazel b/packages/compiler-cli/src/ngtsc/metadata/BUILD.bazel
index 6c36eb70d386d..2cf7890186262 100644
--- a/packages/compiler-cli/src/ngtsc/metadata/BUILD.bazel
+++ b/packages/compiler-cli/src/ngtsc/metadata/BUILD.bazel
@@ -9,6 +9,7 @@ ts_library(
     ]),
     deps = [
         "//packages/compiler",
+        "//packages/compiler-cli/src/ngtsc/file_system",
         "//packages/compiler-cli/src/ngtsc/imports",
         "//packages/compiler-cli/src/ngtsc/reflection",
         "//packages/compiler-cli/src/ngtsc/util",
diff --git a/packages/compiler-cli/src/ngtsc/metadata/index.ts b/packages/compiler-cli/src/ngtsc/metadata/index.ts
index 9061d031466b6..b45207187527d 100644
--- a/packages/compiler-cli/src/ngtsc/metadata/index.ts
+++ b/packages/compiler-cli/src/ngtsc/metadata/index.ts
@@ -8,5 +8,8 @@
 
 export * from './src/api';
 export {DtsMetadataReader} from './src/dts';
+export {flattenInheritedDirectiveMetadata} from './src/inheritance';
 export {CompoundMetadataRegistry, LocalMetadataRegistry, InjectableClassRegistry} from './src/registry';
-export {extractDirectiveGuards, CompoundMetadataReader} from './src/util';
+export {TemplateRegistry as TemplateMapping} from './src/template_mapping';
+export {extractDirectiveTypeCheckMeta, CompoundMetadataReader} from './src/util';
+export {BindingPropertyName, ClassPropertyMapping, ClassPropertyName, InputOrOutput} from './src/property_mapping';
\ No newline at end of file
diff --git a/packages/compiler-cli/src/ngtsc/metadata/src/api.ts b/packages/compiler-cli/src/ngtsc/metadata/src/api.ts
index 45fac785ac730..3ec001db9578d 100644
--- a/packages/compiler-cli/src/ngtsc/metadata/src/api.ts
+++ b/packages/compiler-cli/src/ngtsc/metadata/src/api.ts
@@ -12,6 +12,8 @@ import * as ts from 'typescript';
 import {Reference} from '../../imports';
 import {ClassDeclaration} from '../../reflection';
 
+import {ClassPropertyMapping, ClassPropertyName} from './property_mapping';
+
 
 /**
  * Metadata collected for an `NgModule`.
@@ -32,19 +34,72 @@ export interface NgModuleMeta {
   rawDeclarations: ts.Expression|null;
 }
 
+/**
+ * Typing metadata collected for a directive within an NgModule's scope.
+ */
+export interface DirectiveTypeCheckMeta {
+  /**
+   * List of static `ngTemplateGuard_xx` members found on the Directive's class.
+   * @see `TemplateGuardMeta`
+   */
+  ngTemplateGuards: TemplateGuardMeta[];
+
+  /**
+   * Whether the Directive's class has a static ngTemplateContextGuard function.
+   */
+  hasNgTemplateContextGuard: boolean;
+
+  /**
+   * The set of input fields which have a corresponding static `ngAcceptInputType_` on the
+   * Directive's class. This allows inputs to accept a wider range of types and coerce the input to
+   * a narrower type with a getter/setter. See https://angular.io/guide/template-typecheck.
+   */
+  coercedInputFields: Set<ClassPropertyName>;
+
+  /**
+   * The set of input fields which map to `readonly`, `private`, or `protected` members in the
+   * Directive's class.
+   */
+  restrictedInputFields: Set<ClassPropertyName>;
+
+  /**
+   * The set of input fields which are declared as string literal members in the Directive's class.
+   * We need to track these separately because these fields may not be valid JS identifiers so
+   * we cannot use them with property access expressions when assigning inputs.
+   */
+  stringLiteralInputFields: Set<ClassPropertyName>;
+
+  /**
+   * The set of input fields which do not have corresponding members in the Directive's class.
+   */
+  undeclaredInputFields: Set<ClassPropertyName>;
+
+  /**
+   * Whether the Directive's class is generic, i.e. `class MyDir<T> {...}`.
+   */
+  isGeneric: boolean;
+}
+
 /**
  * Metadata collected for a directive within an NgModule's scope.
  */
-export interface DirectiveMeta extends T2DirectiveMeta {
+export interface DirectiveMeta extends T2DirectiveMeta, DirectiveTypeCheckMeta {
   ref: Reference<ClassDeclaration>;
   /**
    * Unparsed selector of the directive, or null if the directive does not have a selector.
    */
   selector: string|null;
   queries: string[];
-  ngTemplateGuards: TemplateGuardMeta[];
-  hasNgTemplateContextGuard: boolean;
-  coercedInputFields: Set<string>;
+
+  /**
+   * A mapping of input field names to the property names.
+   */
+  inputs: ClassPropertyMapping;
+
+  /**
+   * A mapping of output field names to the property names.
+   */
+  outputs: ClassPropertyMapping;
 
   /**
    * A `Reference` to the base class for the directive, if one was detected.
diff --git a/packages/compiler-cli/src/ngtsc/metadata/src/dts.ts b/packages/compiler-cli/src/ngtsc/metadata/src/dts.ts
index c8f2c8b2b1619..4bbdc14fd8acf 100644
--- a/packages/compiler-cli/src/ngtsc/metadata/src/dts.ts
+++ b/packages/compiler-cli/src/ngtsc/metadata/src/dts.ts
@@ -12,7 +12,8 @@ import {Reference} from '../../imports';
 import {ClassDeclaration, isNamedClassDeclaration, ReflectionHost} from '../../reflection';
 
 import {DirectiveMeta, MetadataReader, NgModuleMeta, PipeMeta} from './api';
-import {extractDirectiveGuards, extractReferencesFromType, readStringArrayType, readStringMapType, readStringType} from './util';
+import {ClassPropertyMapping} from './property_mapping';
+import {extractDirectiveTypeCheckMeta, extractReferencesFromType, readStringArrayType, readStringMapType, readStringType} from './util';
 
 /**
  * A `MetadataReader` that can read metadata from `.d.ts` files, which have static Ivy properties
@@ -76,16 +77,20 @@ export class DtsMetadataReader implements MetadataReader {
       return null;
     }
 
+    const inputs =
+        ClassPropertyMapping.fromMappedObject(readStringMapType(def.type.typeArguments[3]));
+    const outputs =
+        ClassPropertyMapping.fromMappedObject(readStringMapType(def.type.typeArguments[4]));
     return {
       ref,
       name: clazz.name.text,
       isComponent: def.name === 'ɵcmp',
       selector: readStringType(def.type.typeArguments[1]),
       exportAs: readStringArrayType(def.type.typeArguments[2]),
-      inputs: readStringMapType(def.type.typeArguments[3]),
-      outputs: readStringMapType(def.type.typeArguments[4]),
+      inputs,
+      outputs,
       queries: readStringArrayType(def.type.typeArguments[5]),
-      ...extractDirectiveGuards(clazz, this.reflector),
+      ...extractDirectiveTypeCheckMeta(clazz, inputs, this.reflector),
       baseClass: readBaseClass(clazz, this.checker, this.reflector),
     };
   }
diff --git a/packages/compiler-cli/src/ngtsc/metadata/src/inheritance.ts b/packages/compiler-cli/src/ngtsc/metadata/src/inheritance.ts
index 119a7a0e3937e..b923de6e2a589 100644
--- a/packages/compiler-cli/src/ngtsc/metadata/src/inheritance.ts
+++ b/packages/compiler-cli/src/ngtsc/metadata/src/inheritance.ts
@@ -7,9 +7,11 @@
  */
 
 import {Reference} from '../../imports';
-import {DirectiveMeta, MetadataReader} from '../../metadata';
 import {ClassDeclaration} from '../../reflection';
 
+import {DirectiveMeta, MetadataReader} from './api';
+import {ClassPropertyMapping, ClassPropertyName} from './property_mapping';
+
 /**
  * Given a reference to a directive, return a flattened version of its `DirectiveMeta` metadata
  * which includes metadata from its entire inheritance chain.
@@ -24,11 +26,17 @@ export function flattenInheritedDirectiveMetadata(
   if (topMeta === null) {
     throw new Error(`Metadata not found for directive: ${dir.debugName}`);
   }
+  if (topMeta.baseClass === null) {
+    return topMeta;
+  }
 
-  let inputs: {[key: string]: string|[string, string]} = {};
-  let outputs: {[key: string]: string} = {};
-  let coercedInputFields = new Set<string>();
+  const coercedInputFields = new Set<ClassPropertyName>();
+  const undeclaredInputFields = new Set<ClassPropertyName>();
+  const restrictedInputFields = new Set<ClassPropertyName>();
+  const stringLiteralInputFields = new Set<ClassPropertyName>();
   let isDynamic = false;
+  let inputs = ClassPropertyMapping.empty();
+  let outputs = ClassPropertyMapping.empty();
 
   const addMetadata = (meta: DirectiveMeta): void => {
     if (meta.baseClass === 'dynamic') {
@@ -42,12 +50,22 @@ export function flattenInheritedDirectiveMetadata(
         isDynamic = true;
       }
     }
-    inputs = {...inputs, ...meta.inputs};
-    outputs = {...outputs, ...meta.outputs};
+
+    inputs = ClassPropertyMapping.merge(inputs, meta.inputs);
+    outputs = ClassPropertyMapping.merge(outputs, meta.outputs);
 
     for (const coercedInputField of meta.coercedInputFields) {
       coercedInputFields.add(coercedInputField);
     }
+    for (const undeclaredInputField of meta.undeclaredInputFields) {
+      undeclaredInputFields.add(undeclaredInputField);
+    }
+    for (const restrictedInputField of meta.restrictedInputFields) {
+      restrictedInputFields.add(restrictedInputField);
+    }
+    for (const field of meta.stringLiteralInputFields) {
+      stringLiteralInputFields.add(field);
+    }
   };
 
   addMetadata(topMeta);
@@ -57,6 +75,9 @@ export function flattenInheritedDirectiveMetadata(
     inputs,
     outputs,
     coercedInputFields,
+    undeclaredInputFields,
+    restrictedInputFields,
+    stringLiteralInputFields,
     baseClass: isDynamic ? 'dynamic' : null,
   };
 }
diff --git a/packages/compiler-cli/src/ngtsc/metadata/src/property_mapping.ts b/packages/compiler-cli/src/ngtsc/metadata/src/property_mapping.ts
new file mode 100644
index 0000000000000..6a78fe1e68dbb
--- /dev/null
+++ b/packages/compiler-cli/src/ngtsc/metadata/src/property_mapping.ts
@@ -0,0 +1,200 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {InputOutputPropertySet} from '@angular/compiler';
+
+/**
+ * The name of a class property that backs an input or output declared by a directive or component.
+ *
+ * This type exists for documentation only.
+ */
+export type ClassPropertyName = string;
+
+/**
+ * The name by which an input or output of a directive or component is bound in an Angular template.
+ *
+ * This type exists for documentation only.
+ */
+export type BindingPropertyName = string;
+
+/**
+ * An input or output of a directive that has both a named JavaScript class property on a component
+ * or directive class, as well as an Angular template property name used for binding.
+ */
+export interface InputOrOutput {
+  /**
+   * The name of the JavaScript property on the component or directive instance for this input or
+   * output.
+   */
+  readonly classPropertyName: ClassPropertyName;
+
+  /**
+   * The property name used to bind this input or output in an Angular template.
+   */
+  readonly bindingPropertyName: BindingPropertyName;
+}
+
+/**
+ * A mapping of component property and template binding property names, for example containing the
+ * inputs of a particular directive or component.
+ *
+ * A single component property has exactly one input/output annotation (and therefore one binding
+ * property name) associated with it, but the same binding property name may be shared across many
+ * component property names.
+ *
+ * Allows bidirectional querying of the mapping - looking up all inputs/outputs with a given
+ * property name, or mapping from a specific class property to its binding property name.
+ */
+export class ClassPropertyMapping implements InputOutputPropertySet {
+  /**
+   * Mapping from class property names to the single `InputOrOutput` for that class property.
+   */
+  private forwardMap: Map<ClassPropertyName, InputOrOutput>;
+
+  /**
+   * Mapping from property names to one or more `InputOrOutput`s which share that name.
+   */
+  private reverseMap: Map<BindingPropertyName, InputOrOutput[]>;
+
+  private constructor(forwardMap: Map<ClassPropertyName, InputOrOutput>) {
+    this.forwardMap = forwardMap;
+    this.reverseMap = reverseMapFromForwardMap(forwardMap);
+  }
+
+  /**
+   * Construct a `ClassPropertyMapping` with no entries.
+   */
+  static empty(): ClassPropertyMapping {
+    return new ClassPropertyMapping(new Map());
+  }
+
+  /**
+   * Construct a `ClassPropertyMapping` from a primitive JS object which maps class property names
+   * to either binding property names or an array that contains both names, which is used in on-disk
+   * metadata formats (e.g. in .d.ts files).
+   */
+  static fromMappedObject(obj: {
+    [classPropertyName: string]: BindingPropertyName|[ClassPropertyName, BindingPropertyName]
+  }): ClassPropertyMapping {
+    const forwardMap = new Map<ClassPropertyName, InputOrOutput>();
+
+    for (const classPropertyName of Object.keys(obj)) {
+      const value = obj[classPropertyName];
+      const bindingPropertyName = Array.isArray(value) ? value[0] : value;
+      const inputOrOutput: InputOrOutput = {classPropertyName, bindingPropertyName};
+      forwardMap.set(classPropertyName, inputOrOutput);
+    }
+
+    return new ClassPropertyMapping(forwardMap);
+  }
+
+  /**
+   * Merge two mappings into one, with class properties from `b` taking precedence over class
+   * properties from `a`.
+   */
+  static merge(a: ClassPropertyMapping, b: ClassPropertyMapping): ClassPropertyMapping {
+    const forwardMap = new Map<ClassPropertyName, InputOrOutput>(a.forwardMap.entries());
+    for (const [classPropertyName, inputOrOutput] of b.forwardMap) {
+      forwardMap.set(classPropertyName, inputOrOutput);
+    }
+
+    return new ClassPropertyMapping(forwardMap);
+  }
+
+  /**
+   * All class property names mapped in this mapping.
+   */
+  get classPropertyNames(): ClassPropertyName[] {
+    return Array.from(this.forwardMap.keys());
+  }
+
+  /**
+   * All binding property names mapped in this mapping.
+   */
+  get propertyNames(): BindingPropertyName[] {
+    return Array.from(this.reverseMap.keys());
+  }
+
+  /**
+   * Check whether a mapping for the given property name exists.
+   */
+  hasBindingPropertyName(propertyName: BindingPropertyName): boolean {
+    return this.reverseMap.has(propertyName);
+  }
+
+  /**
+   * Lookup all `InputOrOutput`s that use this `propertyName`.
+   */
+  getByBindingPropertyName(propertyName: string): ReadonlyArray<InputOrOutput>|null {
+    return this.reverseMap.has(propertyName) ? this.reverseMap.get(propertyName)! : null;
+  }
+
+  /**
+   * Lookup the `InputOrOutput` associated with a `classPropertyName`.
+   */
+  getByClassPropertyName(classPropertyName: string): InputOrOutput|null {
+    return this.forwardMap.has(classPropertyName) ? this.forwardMap.get(classPropertyName)! : null;
+  }
+
+  /**
+   * Convert this mapping to a primitive JS object which maps each class property directly to the
+   * binding property name associated with it.
+   */
+  toDirectMappedObject(): {[classPropertyName: string]: BindingPropertyName} {
+    const obj: {[classPropertyName: string]: BindingPropertyName} = {};
+    for (const [classPropertyName, inputOrOutput] of this.forwardMap) {
+      obj[classPropertyName] = inputOrOutput.bindingPropertyName;
+    }
+    return obj;
+  }
+
+  /**
+   * Convert this mapping to a primitive JS object which maps each class property either to itself
+   * (for cases where the binding property name is the same) or to an array which contains both
+   * names if they differ.
+   *
+   * This object format is used when mappings are serialized (for example into .d.ts files).
+   */
+  toJointMappedObject():
+      {[classPropertyName: string]: BindingPropertyName|[BindingPropertyName, ClassPropertyName]} {
+    const obj: {
+      [classPropertyName: string]: BindingPropertyName|[BindingPropertyName, ClassPropertyName]
+    } = {};
+    for (const [classPropertyName, inputOrOutput] of this.forwardMap) {
+      if (inputOrOutput.bindingPropertyName as string === classPropertyName as string) {
+        obj[classPropertyName] = inputOrOutput.bindingPropertyName;
+      } else {
+        obj[classPropertyName] = [inputOrOutput.bindingPropertyName, classPropertyName];
+      }
+    }
+    return obj;
+  }
+
+  /**
+   * Implement the iterator protocol and return entry objects which contain the class and binding
+   * property names (and are useful for destructuring).
+   */
+  * [Symbol.iterator](): IterableIterator<[ClassPropertyName, BindingPropertyName]> {
+    for (const [classPropertyName, inputOrOutput] of this.forwardMap.entries()) {
+      yield [classPropertyName, inputOrOutput.bindingPropertyName];
+    }
+  }
+}
+
+function reverseMapFromForwardMap(forwardMap: Map<ClassPropertyName, InputOrOutput>):
+    Map<BindingPropertyName, InputOrOutput[]> {
+  const reverseMap = new Map<BindingPropertyName, InputOrOutput[]>();
+  for (const [_, inputOrOutput] of forwardMap) {
+    if (!reverseMap.has(inputOrOutput.bindingPropertyName)) {
+      reverseMap.set(inputOrOutput.bindingPropertyName, []);
+    }
+
+    reverseMap.get(inputOrOutput.bindingPropertyName)!.push(inputOrOutput);
+  }
+  return reverseMap;
+}
diff --git a/packages/compiler-cli/src/ngtsc/metadata/src/template_mapping.ts b/packages/compiler-cli/src/ngtsc/metadata/src/template_mapping.ts
new file mode 100644
index 0000000000000..2a5d49613ef6c
--- /dev/null
+++ b/packages/compiler-cli/src/ngtsc/metadata/src/template_mapping.ts
@@ -0,0 +1,36 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {AbsoluteFsPath} from '../../file_system';
+import {ClassDeclaration} from '../../reflection';
+
+/**
+ * Tracks the mapping between external template files and the component(s) which use them.
+ *
+ * This information is produced during analysis of the program and is used mainly to support
+ * external tooling, for which such a mapping is challenging to determine without compiler
+ * assistance.
+ */
+export class TemplateRegistry {
+  private map = new Map<AbsoluteFsPath, Set<ClassDeclaration>>();
+
+  getComponentsWithTemplate(template: AbsoluteFsPath): ReadonlySet<ClassDeclaration> {
+    if (!this.map.has(template)) {
+      return new Set();
+    }
+
+    return this.map.get(template)!;
+  }
+
+  register(template: AbsoluteFsPath, component: ClassDeclaration): void {
+    if (!this.map.has(template)) {
+      this.map.set(template, new Set());
+    }
+    this.map.get(template)!.add(component);
+  }
+}
diff --git a/packages/compiler-cli/src/ngtsc/metadata/src/util.ts b/packages/compiler-cli/src/ngtsc/metadata/src/util.ts
index 457c8cab2c750..5d7f6c9841174 100644
--- a/packages/compiler-cli/src/ngtsc/metadata/src/util.ts
+++ b/packages/compiler-cli/src/ngtsc/metadata/src/util.ts
@@ -12,7 +12,8 @@ import {Reference} from '../../imports';
 import {ClassDeclaration, ClassMember, ClassMemberKind, isNamedClassDeclaration, ReflectionHost, reflectTypeEntityToDeclaration} from '../../reflection';
 import {nodeDebugInfo} from '../../util/src/typescript';
 
-import {DirectiveMeta, MetadataReader, NgModuleMeta, PipeMeta, TemplateGuardMeta} from './api';
+import {DirectiveMeta, DirectiveTypeCheckMeta, MetadataReader, NgModuleMeta, PipeMeta, TemplateGuardMeta} from './api';
+import {ClassPropertyMapping, ClassPropertyName} from './property_mapping';
 
 export function extractReferencesFromType(
     checker: ts.TypeChecker, def: ts.TypeNode, ngModuleImportedFrom: string|null,
@@ -20,22 +21,26 @@ export function extractReferencesFromType(
   if (!ts.isTupleTypeNode(def)) {
     return [];
   }
-  return def.elementTypes.map(element => {
-    if (!ts.isTypeQueryNode(element)) {
-      throw new Error(`Expected TypeQueryNode: ${nodeDebugInfo(element)}`);
-    }
-    const type = element.exprName;
-    const {node, from} = reflectTypeEntityToDeclaration(type, checker);
-    if (!isNamedClassDeclaration(node)) {
-      throw new Error(`Expected named ClassDeclaration: ${nodeDebugInfo(node)}`);
-    }
-    const specifier = (from !== null && !from.startsWith('.') ? from : ngModuleImportedFrom);
-    if (specifier !== null) {
-      return new Reference(node, {specifier, resolutionContext});
-    } else {
-      return new Reference(node);
-    }
-  });
+
+  // TODO(alan-agius4): remove `def.elementTypes` and casts when TS 3.9 support is dropped and G3 is
+  // using TS 4.0.
+  return (((def as any).elements || (def as any).elementTypes) as ts.NodeArray<ts.TypeNode>)
+      .map(element => {
+        if (!ts.isTypeQueryNode(element)) {
+          throw new Error(`Expected TypeQueryNode: ${nodeDebugInfo(element)}`);
+        }
+        const type = element.exprName;
+        const {node, from} = reflectTypeEntityToDeclaration(type, checker);
+        if (!isNamedClassDeclaration(node)) {
+          throw new Error(`Expected named ClassDeclaration: ${nodeDebugInfo(node)}`);
+        }
+        const specifier = (from !== null && !from.startsWith('.') ? from : ngModuleImportedFrom);
+        if (specifier !== null) {
+          return new Reference(node, {specifier, resolutionContext});
+        } else {
+          return new Reference(node);
+        }
+      });
 }
 
 export function readStringType(type: ts.TypeNode): string|null {
@@ -69,22 +74,28 @@ export function readStringArrayType(type: ts.TypeNode): string[] {
     return [];
   }
   const res: string[] = [];
-  type.elementTypes.forEach(el => {
-    if (!ts.isLiteralTypeNode(el) || !ts.isStringLiteral(el.literal)) {
-      return;
-    }
-    res.push(el.literal.text);
-  });
+  // TODO(alan-agius4): remove `def.elementTypes` and casts when TS 3.9 support is dropped and G3 is
+  // using TS 4.0.
+  (((type as any).elements || (type as any).elementTypes) as ts.NodeArray<ts.TypeNode>)
+      .forEach(el => {
+        if (!ts.isLiteralTypeNode(el) || !ts.isStringLiteral(el.literal)) {
+          return;
+        }
+        res.push(el.literal.text);
+      });
   return res;
 }
 
-
-export function extractDirectiveGuards(node: ClassDeclaration, reflector: ReflectionHost): {
-  ngTemplateGuards: TemplateGuardMeta[],
-  hasNgTemplateContextGuard: boolean,
-  coercedInputFields: Set<string>,
-} {
-  const staticMembers = reflector.getMembersOfClass(node).filter(member => member.isStatic);
+/**
+ * Inspects the class' members and extracts the metadata that is used when type-checking templates
+ * that use the directive. This metadata does not contain information from a base class, if any,
+ * making this metadata invariant to changes of inherited classes.
+ */
+export function extractDirectiveTypeCheckMeta(
+    node: ClassDeclaration, inputs: ClassPropertyMapping,
+    reflector: ReflectionHost): DirectiveTypeCheckMeta {
+  const members = reflector.getMembersOfClass(node);
+  const staticMembers = members.filter(member => member.isStatic);
   const ngTemplateGuards = staticMembers.map(extractTemplateGuard)
                                .filter((guard): guard is TemplateGuardMeta => guard !== null);
   const hasNgTemplateContextGuard = staticMembers.some(
@@ -92,8 +103,48 @@ export function extractDirectiveGuards(node: ClassDeclaration, reflector: Reflec
 
   const coercedInputFields =
       new Set(staticMembers.map(extractCoercedInput)
-                  .filter((inputName): inputName is string => inputName !== null));
-  return {hasNgTemplateContextGuard, ngTemplateGuards, coercedInputFields};
+                  .filter((inputName): inputName is ClassPropertyName => inputName !== null));
+
+  const restrictedInputFields = new Set<ClassPropertyName>();
+  const stringLiteralInputFields = new Set<ClassPropertyName>();
+  const undeclaredInputFields = new Set<ClassPropertyName>();
+
+  for (const classPropertyName of inputs.classPropertyNames) {
+    const field = members.find(member => member.name === classPropertyName);
+    if (field === undefined || field.node === null) {
+      undeclaredInputFields.add(classPropertyName);
+      continue;
+    }
+    if (isRestricted(field.node)) {
+      restrictedInputFields.add(classPropertyName);
+    }
+    if (field.nameNode !== null && ts.isStringLiteral(field.nameNode)) {
+      stringLiteralInputFields.add(classPropertyName);
+    }
+  }
+
+  const arity = reflector.getGenericArityOfClass(node);
+
+  return {
+    hasNgTemplateContextGuard,
+    ngTemplateGuards,
+    coercedInputFields,
+    restrictedInputFields,
+    stringLiteralInputFields,
+    undeclaredInputFields,
+    isGeneric: arity !== null && arity > 0,
+  };
+}
+
+function isRestricted(node: ts.Node): boolean {
+  if (node.modifiers === undefined) {
+    return false;
+  }
+
+  return node.modifiers.some(
+      modifier => modifier.kind === ts.SyntaxKind.PrivateKeyword ||
+          modifier.kind === ts.SyntaxKind.ProtectedKeyword ||
+          modifier.kind === ts.SyntaxKind.ReadonlyKeyword);
 }
 
 function extractTemplateGuard(member: ClassMember): TemplateGuardMeta|null {
diff --git a/packages/compiler-cli/src/ngtsc/modulewithproviders/src/scanner.ts b/packages/compiler-cli/src/ngtsc/modulewithproviders/src/scanner.ts
index 0ccb7eba16998..f5635550e328c 100644
--- a/packages/compiler-cli/src/ngtsc/modulewithproviders/src/scanner.ts
+++ b/packages/compiler-cli/src/ngtsc/modulewithproviders/src/scanner.ts
@@ -103,7 +103,7 @@ export class ModuleWithProvidersScanner {
         this.emitter.emit(ngModule, decl.getSourceFile(), ImportFlags.ForceNewImport);
     const ngModuleType = new ExpressionType(ngModuleExpr);
     const mwpNgType = new ExpressionType(
-        new ExternalExpr(Identifiers.ModuleWithProviders), /* modifiers */ null, [ngModuleType]);
+        new ExternalExpr(Identifiers.ModuleWithProviders), [/* modifiers */], [ngModuleType]);
 
     dts.addTypeReplacement(decl, mwpNgType);
   }
diff --git a/packages/compiler-cli/src/ngtsc/partial_evaluator/src/interpreter.ts b/packages/compiler-cli/src/ngtsc/partial_evaluator/src/interpreter.ts
index af2034229725e..fcabb150327a4 100644
--- a/packages/compiler-cli/src/ngtsc/partial_evaluator/src/interpreter.ts
+++ b/packages/compiler-cli/src/ngtsc/partial_evaluator/src/interpreter.ts
@@ -11,7 +11,7 @@ import * as ts from 'typescript';
 import {Reference} from '../../imports';
 import {OwningModule} from '../../imports/src/references';
 import {DependencyTracker} from '../../incremental/api';
-import {ConcreteDeclaration, Declaration, EnumMember, FunctionDefinition, InlineDeclaration, ReflectionHost, SpecialDeclarationKind} from '../../reflection';
+import {Declaration, DeclarationKind, DeclarationNode, EnumMember, FunctionDefinition, isConcreteDeclaration, ReflectionHost, SpecialDeclarationKind} from '../../reflection';
 import {isDeclaration} from '../../util/src/typescript';
 
 import {ArrayConcatBuiltinFn, ArraySliceBuiltinFn} from './builtin';
@@ -231,12 +231,7 @@ export class StaticInterpreter {
       return this.getResolvedEnum(decl.node, decl.identity.enumMembers, context);
     }
     const declContext = {...context, ...joinModuleContext(context, node, decl)};
-    // The identifier's declaration is either concrete (a ts.Declaration exists for it) or inline
-    // (a direct reference to a ts.Expression).
-    // TODO(alxhub): remove cast once TS is upgraded in g3.
-    const result = decl.node !== null ?
-        this.visitDeclaration(decl.node, declContext) :
-        this.visitExpression((decl as InlineDeclaration).expression, declContext);
+    const result = this.visitAmbiguousDeclaration(decl, declContext);
     if (result instanceof Reference) {
       // Only record identifiers to non-synthetic references. Synthetic references may not have the
       // same value at runtime as they do at compile time, so it's not legal to refer to them by the
@@ -250,7 +245,7 @@ export class StaticInterpreter {
     return result;
   }
 
-  private visitDeclaration(node: ts.Declaration, context: Context): ResolvedValue {
+  private visitDeclaration(node: DeclarationNode, context: Context): ResolvedValue {
     if (this.dependencyTracker !== null) {
       this.dependencyTracker.addDependency(context.originatingFile, node.getSourceFile());
     }
@@ -342,13 +337,18 @@ export class StaticInterpreter {
       };
 
       // Visit both concrete and inline declarations.
-      // TODO(alxhub): remove cast once TS is upgraded in g3.
-      return decl.node !== null ?
-          this.visitDeclaration(decl.node, declContext) :
-          this.visitExpression((decl as InlineDeclaration).expression, declContext);
+      return this.visitAmbiguousDeclaration(decl, declContext);
     });
   }
 
+  private visitAmbiguousDeclaration(decl: Declaration, declContext: Context) {
+    return decl.kind === DeclarationKind.Inline && decl.implementation !== undefined ?
+        // Inline declarations with an `implementation` should be visited as expressions
+        this.visitExpression(decl.implementation, declContext) :
+        // Otherwise just visit the declaration `node`
+        this.visitDeclaration(decl.node, declContext);
+  }
+
   private accessHelper(node: ts.Node, lhs: ResolvedValue, rhs: string|number, context: Context):
       ResolvedValue {
     const strIndex = `${rhs}`;
@@ -667,7 +667,7 @@ export class StaticInterpreter {
     return map;
   }
 
-  private getReference<T extends ts.Declaration>(node: T, context: Context): Reference<T> {
+  private getReference<T extends DeclarationNode>(node: T, context: Context): Reference<T> {
     return new Reference(node, owningModule(context));
   }
 }
@@ -733,11 +733,3 @@ function owningModule(context: Context, override: OwningModule|null = null): Own
     return null;
   }
 }
-
-/**
- * Helper type guard to workaround a narrowing limitation in g3, where testing for
- * `decl.node !== null` would not narrow `decl` to be of type `ConcreteDeclaration`.
- */
-function isConcreteDeclaration(decl: Declaration): decl is ConcreteDeclaration {
-  return decl.node !== null;
-}
diff --git a/packages/compiler-cli/src/ngtsc/partial_evaluator/test/evaluator_spec.ts b/packages/compiler-cli/src/ngtsc/partial_evaluator/test/evaluator_spec.ts
index 7c8d53e9257ca..0f728bae4413a 100644
--- a/packages/compiler-cli/src/ngtsc/partial_evaluator/test/evaluator_spec.ts
+++ b/packages/compiler-cli/src/ngtsc/partial_evaluator/test/evaluator_spec.ts
@@ -11,7 +11,7 @@ import {absoluteFrom, getSourceFileOrError} from '../../file_system';
 import {runInEachFileSystem} from '../../file_system/testing';
 import {Reference} from '../../imports';
 import {DependencyTracker} from '../../incremental/api';
-import {Declaration, KnownDeclaration, SpecialDeclarationKind, TypeScriptReflectionHost} from '../../reflection';
+import {Declaration, DeclarationKind, isConcreteDeclaration, KnownDeclaration, SpecialDeclarationKind, TypeScriptReflectionHost} from '../../reflection';
 import {getDeclaration, makeProgram} from '../../testing';
 import {DynamicValue} from '../src/dynamic';
 import {PartialEvaluator} from '../src/interface';
@@ -920,7 +920,7 @@ runInEachFileSystem(() => {
   class DownleveledEnumReflectionHost extends TypeScriptReflectionHost {
     getDeclarationOfIdentifier(id: ts.Identifier): Declaration|null {
       const declaration = super.getDeclarationOfIdentifier(id);
-      if (declaration !== null && declaration.node !== null) {
+      if (declaration !== null && isConcreteDeclaration(declaration)) {
         const enumMembers = [
           {name: ts.createStringLiteral('ValueA'), initializer: ts.createStringLiteral('a')},
           {name: ts.createStringLiteral('ValueB'), initializer: ts.createStringLiteral('b')},
@@ -961,6 +961,7 @@ runInEachFileSystem(() => {
           node: id,
           viaModule: null,
           identity: null,
+          kind: DeclarationKind.Concrete,
         };
       }
 
@@ -968,8 +969,8 @@ runInEachFileSystem(() => {
     }
   }
 
-  function getTsHelperFn(node: ts.Declaration): KnownDeclaration|null {
-    const id = (node as ts.Declaration & {name?: ts.Identifier}).name || null;
+  function getTsHelperFn(node: ts.Node): KnownDeclaration|null {
+    const id = (node as ts.Node & {name?: ts.Identifier}).name || null;
     const name = id && id.text;
 
     switch (name) {
diff --git a/packages/compiler-cli/src/ngtsc/perf/BUILD.bazel b/packages/compiler-cli/src/ngtsc/perf/BUILD.bazel
index dd609410fdefc..f51e6b0a56a55 100644
--- a/packages/compiler-cli/src/ngtsc/perf/BUILD.bazel
+++ b/packages/compiler-cli/src/ngtsc/perf/BUILD.bazel
@@ -10,6 +10,7 @@ ts_library(
     deps = [
         "//packages:types",
         "//packages/compiler-cli/src/ngtsc/file_system",
+        "//packages/compiler-cli/src/ngtsc/reflection",
         "@npm//@types/node",
         "@npm//typescript",
     ],
diff --git a/packages/compiler-cli/src/ngtsc/perf/src/api.ts b/packages/compiler-cli/src/ngtsc/perf/src/api.ts
index 73875e88cbe45..a717808324820 100644
--- a/packages/compiler-cli/src/ngtsc/perf/src/api.ts
+++ b/packages/compiler-cli/src/ngtsc/perf/src/api.ts
@@ -6,13 +6,12 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import * as ts from 'typescript';
+import {DeclarationNode} from '../../reflection';
 
 export interface PerfRecorder {
   readonly enabled: boolean;
 
-  mark(name: string, node?: ts.SourceFile|ts.Declaration, category?: string, detail?: string): void;
-  start(name: string, node?: ts.SourceFile|ts.Declaration, category?: string, detail?: string):
-      number;
+  mark(name: string, node?: DeclarationNode, category?: string, detail?: string): void;
+  start(name: string, node?: DeclarationNode, category?: string, detail?: string): number;
   stop(span: number): void;
 }
diff --git a/packages/compiler-cli/src/ngtsc/perf/src/noop.ts b/packages/compiler-cli/src/ngtsc/perf/src/noop.ts
index 151a1af7ee40e..73f4384ddee41 100644
--- a/packages/compiler-cli/src/ngtsc/perf/src/noop.ts
+++ b/packages/compiler-cli/src/ngtsc/perf/src/noop.ts
@@ -5,18 +5,15 @@
  * 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 {DeclarationNode} from '../../reflection';
 
 import {PerfRecorder} from './api';
 
 export const NOOP_PERF_RECORDER: PerfRecorder = {
   enabled: false,
-  mark: (name: string, node: ts.SourceFile|ts.Declaration, category?: string, detail?: string):
-      void => {},
-  start: (name: string, node: ts.SourceFile|ts.Declaration, category?: string, detail?: string):
-      number => {
-        return 0;
-      },
+  mark: (name: string, node: DeclarationNode, category?: string, detail?: string): void => {},
+  start: (name: string, node: DeclarationNode, category?: string, detail?: string): number => {
+    return 0;
+  },
   stop: (span: number|false): void => {},
 };
diff --git a/packages/compiler-cli/src/ngtsc/perf/src/tracking.ts b/packages/compiler-cli/src/ngtsc/perf/src/tracking.ts
index e1d8a4a6f371f..732c8f03671e1 100644
--- a/packages/compiler-cli/src/ngtsc/perf/src/tracking.ts
+++ b/packages/compiler-cli/src/ngtsc/perf/src/tracking.ts
@@ -9,6 +9,7 @@
 import * as fs from 'fs';
 import * as ts from 'typescript';
 import {resolve} from '../../file_system';
+import {DeclarationNode} from '../../reflection';
 import {PerfRecorder} from './api';
 import {HrTime, mark, timeSinceInMicros} from './clock';
 
@@ -24,14 +25,12 @@ export class PerfTracker implements PerfRecorder {
     return new PerfTracker(mark());
   }
 
-  mark(name: string, node?: ts.SourceFile|ts.Declaration, category?: string, detail?: string):
-      void {
+  mark(name: string, node?: DeclarationNode, category?: string, detail?: string): void {
     const msg = this.makeLogMessage(PerfLogEventType.MARK, name, node, category, detail, undefined);
     this.log.push(msg);
   }
 
-  start(name: string, node?: ts.SourceFile|ts.Declaration, category?: string, detail?: string):
-      number {
+  start(name: string, node?: DeclarationNode, category?: string, detail?: string): number {
     const span = this.nextSpanId++;
     const msg = this.makeLogMessage(PerfLogEventType.SPAN_OPEN, name, node, category, detail, span);
     this.log.push(msg);
@@ -47,7 +46,7 @@ export class PerfTracker implements PerfRecorder {
   }
 
   private makeLogMessage(
-      type: PerfLogEventType, name: string, node: ts.SourceFile|ts.Declaration|undefined,
+      type: PerfLogEventType, name: string, node: DeclarationNode|undefined,
       category: string|undefined, detail: string|undefined, span: number|undefined): PerfLogEvent {
     const msg: PerfLogEvent = {
       type,
diff --git a/packages/compiler-cli/src/ngtsc/program.ts b/packages/compiler-cli/src/ngtsc/program.ts
index 2f118839536bd..13e209fc0ad15 100644
--- a/packages/compiler-cli/src/ngtsc/program.ts
+++ b/packages/compiler-cli/src/ngtsc/program.ts
@@ -17,6 +17,7 @@ import {NgCompilerOptions} from './core/api';
 import {TrackedIncrementalBuildStrategy} from './incremental';
 import {IndexedComponent} from './indexer';
 import {NOOP_PERF_RECORDER, PerfRecorder, PerfTracker} from './perf';
+import {DeclarationNode} from './reflection';
 import {retagAllTsFiles, untagAllTsFiles} from './shims';
 import {ReusedProgramStrategy} from './typecheck';
 
@@ -99,7 +100,7 @@ export class NgtscProgram implements api.Program {
     // Create the NgCompiler which will drive the rest of the compilation.
     this.compiler = new NgCompiler(
         this.host, options, this.tsProgram, reusedProgramStrategy, this.incrementalStrategy,
-        reuseProgram, this.perfRecorder);
+        /** enableTemplateTypeChecker */ false, reuseProgram, this.perfRecorder);
   }
 
   getTsProgram(): ts.Program {
@@ -276,7 +277,7 @@ export class NgtscProgram implements api.Program {
     return ((opts && opts.mergeEmitResultsCallback) || mergeEmitResults)(emitResults);
   }
 
-  getIndexedComponents(): Map<ts.Declaration, IndexedComponent> {
+  getIndexedComponents(): Map<DeclarationNode, IndexedComponent> {
     return this.compiler.getIndexedComponents();
   }
 
diff --git a/packages/compiler-cli/src/ngtsc/reflection/src/host.ts b/packages/compiler-cli/src/ngtsc/reflection/src/host.ts
index bb46477213c9c..3ae572f5c806f 100644
--- a/packages/compiler-cli/src/ngtsc/reflection/src/host.ts
+++ b/packages/compiler-cli/src/ngtsc/reflection/src/host.ts
@@ -113,7 +113,7 @@ export function isDecoratorIdentifier(exp: ts.Expression): exp is DecoratorIdent
  * For `ReflectionHost` purposes, a class declaration should always have a `name` identifier,
  * because we need to be able to reference it in other parts of the program.
  */
-export type ClassDeclaration<T extends ts.Declaration = ts.Declaration> = T&{name: ts.Identifier};
+export type ClassDeclaration<T extends DeclarationNode = DeclarationNode> = T&{name: ts.Identifier};
 
 /**
  * An enumeration of possible kinds of class members.
@@ -224,25 +224,39 @@ export interface ClassMember {
   decorators: Decorator[]|null;
 }
 
+export const enum TypeValueReferenceKind {
+  LOCAL,
+  IMPORTED,
+  UNAVAILABLE,
+}
+
 /**
- * A reference to a value that originated from a type position.
- *
- * For example, a constructor parameter could be declared as `foo: Foo`. A `TypeValueReference`
- * extracted from this would refer to the value of the class `Foo` (assuming it was actually a
- * type).
- *
- * There are two kinds of such references. A reference with `local: false` refers to a type that was
- * imported, and gives the symbol `name` and the `moduleName` of the import. Note that this
- * `moduleName` may be a relative path, and thus is likely only valid within the context of the file
- * which contained the original type reference.
- *
- * A reference with `local: true` refers to any other kind of type via a `ts.Expression` that's
- * valid within the local file where the type was referenced.
+ * A type reference that refers to any type via a `ts.Expression` that's valid within the local file
+ * where the type was referenced.
  */
-export type TypeValueReference = {
-  local: true; expression: ts.Expression; defaultImportStatement: ts.ImportDeclaration | null;
-}|{
-  local: false;
+export interface LocalTypeValueReference {
+  kind: TypeValueReferenceKind.LOCAL;
+
+  /**
+   * The synthesized expression to reference the type in a value position.
+   */
+  expression: ts.Expression;
+
+  /**
+   * If the type originates from a default import, the import statement is captured here to be able
+   * to track its usages, preventing the import from being elided if it was originally only used in
+   * a type-position. See `DefaultImportTracker` for details.
+   */
+  defaultImportStatement: ts.ImportDeclaration|null;
+}
+
+/**
+ * A reference that refers to a type that was imported, and gives the symbol `name` and the
+ * `moduleName` of the import. Note that this `moduleName` may be a relative path, and thus is
+ * likely only valid within the context of the file which contained the original type reference.
+ */
+export interface ImportedTypeValueReference {
+  kind: TypeValueReferenceKind.IMPORTED;
 
   /**
    * The module specifier from which the `importedName` symbol should be imported.
@@ -261,8 +275,108 @@ export type TypeValueReference = {
    */
   nestedPath: string[]|null;
 
-  valueDeclaration: ts.Declaration;
-};
+  valueDeclaration: DeclarationNode;
+}
+
+/**
+ * A representation for a type value reference that is used when no value is available. This can
+ * occur due to various reasons, which is indicated in the `reason` field.
+ */
+export interface UnavailableTypeValueReference {
+  kind: TypeValueReferenceKind.UNAVAILABLE;
+
+  /**
+   * The reason why no value reference could be determined for a type.
+   */
+  reason: UnavailableValue;
+}
+
+/**
+ * The various reasons why the compiler may be unable to synthesize a value from a type reference.
+ */
+export const enum ValueUnavailableKind {
+  /**
+   * No type node was available.
+   */
+  MISSING_TYPE,
+
+  /**
+   * The type does not have a value declaration, e.g. an interface.
+   */
+  NO_VALUE_DECLARATION,
+
+  /**
+   * The type is imported using a type-only imports, so it is not suitable to be used in a
+   * value-position.
+   */
+  TYPE_ONLY_IMPORT,
+
+  /**
+   * The type reference could not be resolved to a declaration.
+   */
+  UNKNOWN_REFERENCE,
+
+  /**
+   * The type corresponds with a namespace.
+   */
+  NAMESPACE,
+
+  /**
+   * The type is not supported in the compiler, for example union types.
+   */
+  UNSUPPORTED,
+}
+
+
+export interface UnsupportedType {
+  kind: ValueUnavailableKind.UNSUPPORTED;
+  typeNode: ts.TypeNode;
+}
+
+export interface NoValueDeclaration {
+  kind: ValueUnavailableKind.NO_VALUE_DECLARATION;
+  typeNode: ts.TypeNode;
+  decl: ts.Declaration|null;
+}
+
+export interface TypeOnlyImport {
+  kind: ValueUnavailableKind.TYPE_ONLY_IMPORT;
+  typeNode: ts.TypeNode;
+  importClause: ts.ImportClause;
+}
+
+export interface NamespaceImport {
+  kind: ValueUnavailableKind.NAMESPACE;
+  typeNode: ts.TypeNode;
+  importClause: ts.ImportClause;
+}
+
+export interface UnknownReference {
+  kind: ValueUnavailableKind.UNKNOWN_REFERENCE;
+  typeNode: ts.TypeNode;
+}
+
+export interface MissingType {
+  kind: ValueUnavailableKind.MISSING_TYPE;
+}
+
+/**
+ * The various reasons why a type node may not be referred to as a value.
+ */
+export type UnavailableValue =
+    UnsupportedType|NoValueDeclaration|TypeOnlyImport|NamespaceImport|UnknownReference|MissingType;
+
+/**
+ * A reference to a value that originated from a type position.
+ *
+ * For example, a constructor parameter could be declared as `foo: Foo`. A `TypeValueReference`
+ * extracted from this would refer to the value of the class `Foo` (assuming it was actually a
+ * type).
+ *
+ * See the individual types for additional information.
+ */
+export type TypeValueReference =
+    LocalTypeValueReference|ImportedTypeValueReference|UnavailableTypeValueReference;
 
 /**
  * A parameter to a constructor.
@@ -288,14 +402,10 @@ export interface CtorParameter {
    * Reference to the value of the parameter's type annotation, if it's possible to refer to the
    * parameter's type as a value.
    *
-   * This can either be a reference to a local value, in which case it has `local` set to `true` and
-   * contains a `ts.Expression`, or it's a reference to an imported value, in which case `local` is
-   * set to `false` and the symbol and module name of the imported value are provided instead.
-   *
-   * If the type is not present or cannot be represented as an expression, `typeValueReference` is
-   * `null`.
+   * This can either be a reference to a local value, a reference to an imported value, or no
+   * value if no is present or cannot be represented as an expression.
    */
-  typeValueReference: TypeValueReference|null;
+  typeValueReference: TypeValueReference;
 
   /**
    * TypeScript `ts.TypeNode` representing the type node found in the type position.
@@ -420,10 +530,38 @@ export interface EnumMember {
   initializer: ts.Expression;
 }
 
+/**
+ * A type that is used to identify a declaration.
+ *
+ * Declarations are normally `ts.Declaration` types such as variable declarations, class
+ * declarations, function declarations etc.
+ * But in some cases there is no `ts.Declaration` that can be used for a declaration, such
+ * as when they are declared inline as part of an exported expression. Then we must use a
+ * `ts.Expression` as the declaration.
+ * An example of this is `exports.someVar = 42` where the declaration expression would be
+ * `exports.someVar`.
+ */
+export type DeclarationNode = ts.Declaration|ts.Expression;
+
+/**
+ * The type of a Declaration - whether its node is concrete (ts.Declaration) or inline
+ * (ts.Expression). See `ConcreteDeclaration`, `InlineDeclaration` and `DeclarationNode` for more
+ * information about this.
+ */
+export const enum DeclarationKind {
+  Concrete,
+  Inline,
+}
+
 /**
  * Base type for all `Declaration`s.
  */
-export interface BaseDeclaration<T extends ts.Declaration = ts.Declaration> {
+export interface BaseDeclaration<T extends DeclarationNode> {
+  /**
+   * The type of the underlying `node`.
+   */
+  kind: DeclarationKind;
+
   /**
    * 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
@@ -434,7 +572,7 @@ export interface BaseDeclaration<T extends ts.Declaration = ts.Declaration> {
   /**
    * TypeScript reference to the declaration itself, if one exists.
    */
-  node: T|null;
+  node: T;
 
   /**
    * If set, describes the type of the known declaration this declaration resolves to.
@@ -443,13 +581,16 @@ export interface BaseDeclaration<T extends ts.Declaration = ts.Declaration> {
 }
 
 /**
- * A declaration that has an associated TypeScript `ts.Declaration`.
- *
- * The alternative is an `InlineDeclaration`.
+ * Returns true if the `decl` is a `ConcreteDeclaration` (ie. that its `node` property is a
+ * `ts.Declaration`).
  */
+export function isConcreteDeclaration(decl: Declaration): decl is ConcreteDeclaration {
+  return decl.kind === DeclarationKind.Concrete;
+}
+
 export interface ConcreteDeclaration<T extends ts.Declaration = ts.Declaration> extends
     BaseDeclaration<T> {
-  node: T;
+  kind: DeclarationKind.Concrete;
 
   /**
    * Optionally represents a special identity of the declaration, or `null` if the declaration
@@ -475,29 +616,21 @@ export interface DownleveledEnum {
 }
 
 /**
- * A declaration that does not have an associated TypeScript `ts.Declaration`, only a
- * `ts.Expression`.
+ * A declaration that does not have an associated TypeScript `ts.Declaration`.
  *
  * This can occur in some downlevelings when an `export const VAR = ...;` (a `ts.Declaration`) is
  * transpiled to an assignment statement (e.g. `exports.VAR = ...;`). There is no `ts.Declaration`
  * associated with `VAR` in that case, only an expression.
  */
-export interface InlineDeclaration extends BaseDeclaration {
-  node: null;
-
-  /**
-   * The `ts.Expression` which constitutes the value of the declaration.
-   */
-  expression: ts.Expression;
+export interface InlineDeclaration extends
+    BaseDeclaration<Exclude<DeclarationNode, ts.Declaration>> {
+  kind: DeclarationKind.Inline;
+  implementation?: ts.Expression;
 }
 
 /**
  * The declaration of a symbol, along with information about how it was imported into the
  * application.
- *
- * This can either be a `ConcreteDeclaration` if the underlying TypeScript node for the symbol is an
- * actual `ts.Declaration`, or an `InlineDeclaration` if the declaration was transpiled in certain
- * downlevelings to a `ts.Expression` instead.
  */
 export type Declaration<T extends ts.Declaration = ts.Declaration> =
     ConcreteDeclaration<T>|InlineDeclaration;
@@ -527,7 +660,7 @@ export interface ReflectionHost {
    * @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 decoratable type.
    */
-  getDecoratorsOfDeclaration(declaration: ts.Declaration): Decorator[]|null;
+  getDecoratorsOfDeclaration(declaration: DeclarationNode): Decorator[]|null;
 
   /**
    * Examine a declaration which should be of a class, and return metadata about the members of the
@@ -692,7 +825,7 @@ export interface ReflectionHost {
    * Note that the `ts.Declaration` returned from this function may not be from the same
    * `ts.Program` as the input declaration.
    */
-  getDtsDeclaration(declaration: ts.Declaration): ts.Declaration|null;
+  getDtsDeclaration(declaration: DeclarationNode): ts.Declaration|null;
 
   /**
    * Get a `ts.Identifier` for a given `ClassDeclaration` which can be used to refer to the class
diff --git a/packages/compiler-cli/src/ngtsc/reflection/src/type_to_value.ts b/packages/compiler-cli/src/ngtsc/reflection/src/type_to_value.ts
index 8b71bb3f49f2e..bfacb8987e6ae 100644
--- a/packages/compiler-cli/src/ngtsc/reflection/src/type_to_value.ts
+++ b/packages/compiler-cli/src/ngtsc/reflection/src/type_to_value.ts
@@ -8,7 +8,7 @@
 
 import * as ts from 'typescript';
 
-import {TypeValueReference} from './host';
+import {TypeValueReference, TypeValueReferenceKind, UnavailableTypeValueReference, ValueUnavailableKind} from './host';
 
 /**
  * Potentially convert a `ts.TypeNode` to a `TypeValueReference`, which indicates how to use the
@@ -18,22 +18,31 @@ import {TypeValueReference} from './host';
  * declaration, or if it is not possible to statically understand.
  */
 export function typeToValue(
-    typeNode: ts.TypeNode|null, checker: ts.TypeChecker): TypeValueReference|null {
+    typeNode: ts.TypeNode|null, checker: ts.TypeChecker): TypeValueReference {
   // It's not possible to get a value expression if the parameter doesn't even have a type.
-  if (typeNode === null || !ts.isTypeReferenceNode(typeNode)) {
-    return null;
+  if (typeNode === null) {
+    return missingType();
+  }
+
+  if (!ts.isTypeReferenceNode(typeNode)) {
+    return unsupportedType(typeNode);
   }
 
   const symbols = resolveTypeSymbols(typeNode, checker);
   if (symbols === null) {
-    return null;
+    return unknownReference(typeNode);
   }
 
   const {local, decl} = symbols;
   // It's only valid to convert a type reference to a value reference if the type actually
-  // has a value declaration associated with it.
-  if (decl.valueDeclaration === undefined) {
-    return null;
+  // has a value declaration associated with it. Note that const enums are an exception,
+  // because while they do have a value declaration, they don't exist at runtime.
+  if (decl.valueDeclaration === undefined || decl.flags & ts.SymbolFlags.ConstEnum) {
+    let typeOnlyDecl: ts.Declaration|null = null;
+    if (decl.declarations !== undefined && decl.declarations.length > 0) {
+      typeOnlyDecl = decl.declarations[0];
+    }
+    return noValueDeclaration(typeNode, typeOnlyDecl);
   }
 
   // The type points to a valid value declaration. Rewrite the TypeReference into an
@@ -47,11 +56,14 @@ export function typeToValue(
       // This is a default import.
       //   import Foo from 'foo';
 
+      if (firstDecl.isTypeOnly) {
+        // Type-only imports cannot be represented as value.
+        return typeOnlyImport(typeNode, firstDecl);
+      }
+
       return {
-        local: true,
-        // Copying the name here ensures the generated references will be correctly transformed
-        // along with the import.
-        expression: ts.updateIdentifier(firstDecl.name),
+        kind: TypeValueReferenceKind.LOCAL,
+        expression: firstDecl.name,
         defaultImportStatement: firstDecl.parent,
       };
     } else if (ts.isImportSpecifier(firstDecl)) {
@@ -60,6 +72,11 @@ export function typeToValue(
       // or
       //   import {Foo as Bar} from 'foo';
 
+      if (firstDecl.parent.parent.isTypeOnly) {
+        // Type-only imports cannot be represented as value.
+        return typeOnlyImport(typeNode, firstDecl.parent.parent);
+      }
+
       // Determine the name to import (`Foo`) from the import specifier, as the symbol names of
       // the imported type could refer to a local alias (like `Bar` in the example above).
       const importedName = (firstDecl.propertyName || firstDecl.name).text;
@@ -70,7 +87,7 @@ export function typeToValue(
 
       const moduleName = extractModuleName(firstDecl.parent.parent.parent);
       return {
-        local: false,
+        kind: TypeValueReferenceKind.IMPORTED,
         valueDeclaration: decl.valueDeclaration,
         moduleName,
         importedName,
@@ -80,9 +97,14 @@ export function typeToValue(
       // The import is a namespace import
       //   import * as Foo from 'foo';
 
+      if (firstDecl.parent.isTypeOnly) {
+        // Type-only imports cannot be represented as value.
+        return typeOnlyImport(typeNode, firstDecl.parent);
+      }
+
       if (symbols.symbolNames.length === 1) {
         // The type refers to the namespace itself, which cannot be represented as a value.
-        return null;
+        return namespaceImport(typeNode, firstDecl.parent);
       }
 
       // The first symbol name refers to the local name of the namespace, which is is discarded
@@ -92,7 +114,7 @@ export function typeToValue(
 
       const moduleName = extractModuleName(firstDecl.parent.parent);
       return {
-        local: false,
+        kind: TypeValueReferenceKind.IMPORTED,
         valueDeclaration: decl.valueDeclaration,
         moduleName,
         importedName,
@@ -105,15 +127,60 @@ export function typeToValue(
   const expression = typeNodeToValueExpr(typeNode);
   if (expression !== null) {
     return {
-      local: true,
+      kind: TypeValueReferenceKind.LOCAL,
       expression,
       defaultImportStatement: null,
     };
   } else {
-    return null;
+    return unsupportedType(typeNode);
   }
 }
 
+function unsupportedType(typeNode: ts.TypeNode): UnavailableTypeValueReference {
+  return {
+    kind: TypeValueReferenceKind.UNAVAILABLE,
+    reason: {kind: ValueUnavailableKind.UNSUPPORTED, typeNode},
+  };
+}
+
+function noValueDeclaration(
+    typeNode: ts.TypeNode, decl: ts.Declaration|null): UnavailableTypeValueReference {
+  return {
+    kind: TypeValueReferenceKind.UNAVAILABLE,
+    reason: {kind: ValueUnavailableKind.NO_VALUE_DECLARATION, typeNode, decl},
+  };
+}
+
+function typeOnlyImport(
+    typeNode: ts.TypeNode, importClause: ts.ImportClause): UnavailableTypeValueReference {
+  return {
+    kind: TypeValueReferenceKind.UNAVAILABLE,
+    reason: {kind: ValueUnavailableKind.TYPE_ONLY_IMPORT, typeNode, importClause},
+  };
+}
+
+function unknownReference(typeNode: ts.TypeNode): UnavailableTypeValueReference {
+  return {
+    kind: TypeValueReferenceKind.UNAVAILABLE,
+    reason: {kind: ValueUnavailableKind.UNKNOWN_REFERENCE, typeNode},
+  };
+}
+
+function namespaceImport(
+    typeNode: ts.TypeNode, importClause: ts.ImportClause): UnavailableTypeValueReference {
+  return {
+    kind: TypeValueReferenceKind.UNAVAILABLE,
+    reason: {kind: ValueUnavailableKind.NAMESPACE, typeNode, importClause},
+  };
+}
+
+function missingType(): UnavailableTypeValueReference {
+  return {
+    kind: TypeValueReferenceKind.UNAVAILABLE,
+    reason: {kind: ValueUnavailableKind.MISSING_TYPE},
+  };
+}
+
 /**
  * Attempt to extract a `ts.Expression` that's equivalent to a `ts.TypeNode`, as the two have
  * different AST shapes but can reference the same symbols.
diff --git a/packages/compiler-cli/src/ngtsc/reflection/src/typescript.ts b/packages/compiler-cli/src/ngtsc/reflection/src/typescript.ts
index 56b54b24dc3c7..72a8f54139689 100644
--- a/packages/compiler-cli/src/ngtsc/reflection/src/typescript.ts
+++ b/packages/compiler-cli/src/ngtsc/reflection/src/typescript.ts
@@ -8,7 +8,7 @@
 
 import * as ts from 'typescript';
 
-import {ClassDeclaration, ClassMember, ClassMemberKind, CtorParameter, Declaration, Decorator, FunctionDefinition, Import, isDecoratorIdentifier, ReflectionHost} from './host';
+import {ClassDeclaration, ClassMember, ClassMemberKind, CtorParameter, Declaration, DeclarationKind, DeclarationNode, Decorator, FunctionDefinition, Import, isDecoratorIdentifier, ReflectionHost} from './host';
 import {typeToValue} from './type_to_value';
 import {isNamedClassDeclaration} from './util';
 
@@ -19,7 +19,7 @@ import {isNamedClassDeclaration} from './util';
 export class TypeScriptReflectionHost implements ReflectionHost {
   constructor(protected checker: ts.TypeChecker) {}
 
-  getDecoratorsOfDeclaration(declaration: ts.Declaration): Decorator[]|null {
+  getDecoratorsOfDeclaration(declaration: DeclarationNode): Decorator[]|null {
     if (declaration.decorators === undefined || declaration.decorators.length === 0) {
       return null;
     }
@@ -64,12 +64,14 @@ export class TypeScriptReflectionHost implements ReflectionHost {
       // optional tokes that don't have providers.
       if (typeNode && ts.isUnionTypeNode(typeNode)) {
         let childTypeNodes = typeNode.types.filter(
-            childTypeNode => childTypeNode.kind !== ts.SyntaxKind.NullKeyword);
+            // TODO(alan-agius4): remove `childTypeNode.kind !== ts.SyntaxKind.NullKeyword` when
+            // TS 3.9 support is dropped. In TS 4.0 NullKeyword is a child of LiteralType.
+            childTypeNode => childTypeNode.kind !== ts.SyntaxKind.NullKeyword &&
+                !(ts.isLiteralTypeNode(childTypeNode) &&
+                  childTypeNode.literal.kind === ts.SyntaxKind.NullKeyword));
 
         if (childTypeNodes.length === 1) {
           typeNode = childTypeNodes[0];
-        } else {
-          typeNode = null;
         }
       }
 
@@ -103,7 +105,6 @@ export class TypeScriptReflectionHost implements ReflectionHost {
     if (!ts.isSourceFile(node)) {
       throw new Error(`getExportsOfModule() 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.
@@ -111,6 +112,8 @@ export class TypeScriptReflectionHost implements ReflectionHost {
     if (symbol === undefined) {
       return null;
     }
+
+    const map = new Map<string, Declaration>();
     this.checker.getExportsOfModule(symbol).forEach(exportSymbol => {
       // Map each exported Symbol to a Declaration and add it to the map.
       const decl = this.getDeclarationOfSymbol(exportSymbol, null);
@@ -184,7 +187,7 @@ export class TypeScriptReflectionHost implements ReflectionHost {
     return declaration.initializer || null;
   }
 
-  getDtsDeclaration(_: ts.Declaration): ts.Declaration|null {
+  getDtsDeclaration(_: ClassDeclaration): ts.Declaration|null {
     return null;
   }
 
@@ -204,7 +207,7 @@ export class TypeScriptReflectionHost implements ReflectionHost {
       return null;
     }
 
-    const decl: ts.Declaration = symbol.declarations[0];
+    const decl = symbol.declarations[0];
     const importDecl = getContainingImportDeclaration(decl);
 
     // Ignore declarations that are defined locally (not imported).
@@ -315,6 +318,7 @@ export class TypeScriptReflectionHost implements ReflectionHost {
         known: null,
         viaModule,
         identity: null,
+        kind: DeclarationKind.Concrete,
       };
     } else if (symbol.declarations !== undefined && symbol.declarations.length > 0) {
       return {
@@ -322,6 +326,7 @@ export class TypeScriptReflectionHost implements ReflectionHost {
         known: null,
         viaModule,
         identity: null,
+        kind: DeclarationKind.Concrete,
       };
     } else {
       return null;
diff --git a/packages/compiler-cli/src/ngtsc/reflection/src/util.ts b/packages/compiler-cli/src/ngtsc/reflection/src/util.ts
index f49d0b531e917..8aaffc8b24f9b 100644
--- a/packages/compiler-cli/src/ngtsc/reflection/src/util.ts
+++ b/packages/compiler-cli/src/ngtsc/reflection/src/util.ts
@@ -11,15 +11,19 @@ import {ClassDeclaration} from './host';
 
 export function isNamedClassDeclaration(node: ts.Node):
     node is ClassDeclaration<ts.ClassDeclaration> {
-  return ts.isClassDeclaration(node) && (node.name !== undefined);
+  return ts.isClassDeclaration(node) && isIdentifier(node.name);
 }
 
 export function isNamedFunctionDeclaration(node: ts.Node):
     node is ClassDeclaration<ts.FunctionDeclaration> {
-  return ts.isFunctionDeclaration(node) && (node.name !== undefined);
+  return ts.isFunctionDeclaration(node) && isIdentifier(node.name);
 }
 
 export function isNamedVariableDeclaration(node: ts.Node):
     node is ClassDeclaration<ts.VariableDeclaration> {
-  return ts.isVariableDeclaration(node) && (node.name !== undefined);
+  return ts.isVariableDeclaration(node) && isIdentifier(node.name);
+}
+
+function isIdentifier(node: ts.Node|undefined): node is ts.Identifier {
+  return node !== undefined && ts.isIdentifier(node);
 }
diff --git a/packages/compiler-cli/src/ngtsc/reflection/test/ts_host_spec.ts b/packages/compiler-cli/src/ngtsc/reflection/test/ts_host_spec.ts
index 54ce4125d2ed5..d298d2441cd3a 100644
--- a/packages/compiler-cli/src/ngtsc/reflection/test/ts_host_spec.ts
+++ b/packages/compiler-cli/src/ngtsc/reflection/test/ts_host_spec.ts
@@ -9,7 +9,7 @@ import * as ts from 'typescript';
 import {absoluteFrom, getSourceFileOrError} from '../../file_system';
 import {runInEachFileSystem} from '../../file_system/testing';
 import {getDeclaration, makeProgram} from '../../testing';
-import {ClassMember, ClassMemberKind, CtorParameter} from '../src/host';
+import {ClassMember, ClassMemberKind, CtorParameter, DeclarationKind, TypeValueReferenceKind} from '../src/host';
 import {TypeScriptReflectionHost} from '../src/typescript';
 import {isNamedClassDeclaration} from '../src/util';
 
@@ -178,7 +178,7 @@ runInEachFileSystem(() => {
         const args = host.getConstructorParameters(clazz)!;
         expect(args.length).toBe(1);
         const param = args[0].typeValueReference;
-        if (param === null || !param.local) {
+        if (param === null || param.kind !== TypeValueReferenceKind.LOCAL) {
           return fail('Expected local parameter');
         }
         expect(param).not.toBeNull();
@@ -360,6 +360,7 @@ runInEachFileSystem(() => {
         const Target = foo.type.typeName;
         const decl = host.getDeclarationOfIdentifier(Target);
         expect(decl).toEqual({
+          kind: DeclarationKind.Concrete,
           node: targetDecl,
           known: null,
           viaModule: 'absolute',
@@ -395,6 +396,7 @@ runInEachFileSystem(() => {
           known: null,
           viaModule: 'absolute',
           identity: null,
+          kind: DeclarationKind.Concrete
         });
       });
     });
@@ -548,17 +550,20 @@ runInEachFileSystem(() => {
     if (type === undefined) {
       expect(param.typeValueReference).toBeNull();
     } else {
-      if (param.typeValueReference === null) {
+      if (param.typeValueReference.kind === TypeValueReferenceKind.UNAVAILABLE) {
         return fail(`Expected parameter ${name} to have a typeValueReference`);
       }
-      if (param.typeValueReference.local && typeof type === 'string') {
+      if (param.typeValueReference.kind === TypeValueReferenceKind.LOCAL &&
+          typeof type === 'string') {
         expect(argExpressionToString(param.typeValueReference.expression)).toEqual(type);
-      } else if (!param.typeValueReference.local && typeof type !== 'string') {
+      } else if (
+          param.typeValueReference.kind === TypeValueReferenceKind.IMPORTED &&
+          typeof type !== 'string') {
         expect(param.typeValueReference.moduleName).toEqual(type.moduleName);
         expect(param.typeValueReference.importedName).toEqual(type.name);
       } else {
         return fail(`Mismatch between typeValueReference and expected type: ${param.name} / ${
-            param.typeValueReference.local}`);
+            param.typeValueReference.kind}`);
       }
     }
     if (decorator !== undefined) {
diff --git a/packages/compiler-cli/src/ngtsc/scope/src/local.ts b/packages/compiler-cli/src/ngtsc/scope/src/local.ts
index 985058a157d98..42990227ab81d 100644
--- a/packages/compiler-cli/src/ngtsc/scope/src/local.ts
+++ b/packages/compiler-cli/src/ngtsc/scope/src/local.ts
@@ -12,7 +12,7 @@ import * as ts from 'typescript';
 import {ErrorCode, makeDiagnostic, makeRelatedInformation} from '../../diagnostics';
 import {AliasingHost, Reexport, Reference, ReferenceEmitter} from '../../imports';
 import {DirectiveMeta, MetadataReader, MetadataRegistry, NgModuleMeta, PipeMeta} from '../../metadata';
-import {ClassDeclaration} from '../../reflection';
+import {ClassDeclaration, DeclarationNode} from '../../reflection';
 import {identifierOfNode, nodeNameForError} from '../../util/src/typescript';
 
 import {ExportScope, ScopeData} from './api';
@@ -26,6 +26,7 @@ export interface LocalNgModuleData {
 }
 
 export interface LocalModuleScope extends ExportScope {
+  ngModule: ClassDeclaration;
   compilation: ScopeData;
   reexports: Reexport[]|null;
   schemas: SchemaMetadata[];
@@ -292,14 +293,14 @@ export class LocalModuleScopeRegistry implements MetadataRegistry, ComponentScop
     // - the directives and pipes which are exported to any NgModules which import this one.
 
     // Directives and pipes in the compilation scope.
-    const compilationDirectives = new Map<ts.Declaration, DirectiveMeta>();
-    const compilationPipes = new Map<ts.Declaration, PipeMeta>();
+    const compilationDirectives = new Map<DeclarationNode, DirectiveMeta>();
+    const compilationPipes = new Map<DeclarationNode, PipeMeta>();
 
-    const declared = new Set<ts.Declaration>();
+    const declared = new Set<DeclarationNode>();
 
     // Directives and pipes exported to any importing NgModules.
-    const exportDirectives = new Map<ts.Declaration, DirectiveMeta>();
-    const exportPipes = new Map<ts.Declaration, PipeMeta>();
+    const exportDirectives = new Map<DeclarationNode, DirectiveMeta>();
+    const exportPipes = new Map<DeclarationNode, PipeMeta>();
 
     // The algorithm is as follows:
     // 1) Add all of the directives/pipes from each NgModule imported into the current one to the
@@ -433,7 +434,8 @@ export class LocalModuleScopeRegistry implements MetadataRegistry, ComponentScop
     }
 
     // Finally, produce the `LocalModuleScope` with both the compilation and export scopes.
-    const scope = {
+    const scope: LocalModuleScope = {
+      ngModule: ngModule.ref.node,
       compilation: {
         directives: Array.from(compilationDirectives.values()),
         pipes: Array.from(compilationPipes.values()),
@@ -475,7 +477,7 @@ export class LocalModuleScopeRegistry implements MetadataRegistry, ComponentScop
    */
   private getExportedScope(
       ref: Reference<ClassDeclaration>, diagnostics: ts.Diagnostic[],
-      ownerForErrors: ts.Declaration, type: 'import'|'export'): ExportScope|null|undefined {
+      ownerForErrors: DeclarationNode, type: 'import'|'export'): ExportScope|null|undefined {
     if (ref.node.getSourceFile().isDeclarationFile) {
       // The NgModule is declared in a .d.ts file. Resolve it with the `DependencyScopeReader`.
       if (!ts.isClassDeclaration(ref.node)) {
@@ -497,7 +499,7 @@ export class LocalModuleScopeRegistry implements MetadataRegistry, ComponentScop
   }
 
   private getReexports(
-      ngModule: NgModuleMeta, ref: Reference<ClassDeclaration>, declared: Set<ts.Declaration>,
+      ngModule: NgModuleMeta, ref: Reference<ClassDeclaration>, declared: Set<DeclarationNode>,
       exported: {directives: DirectiveMeta[], pipes: PipeMeta[]},
       diagnostics: ts.Diagnostic[]): Reexport[]|null {
     let reexports: Reexport[]|null = null;
@@ -567,7 +569,7 @@ export class LocalModuleScopeRegistry implements MetadataRegistry, ComponentScop
  * Produce a `ts.Diagnostic` for an invalid import or export from an NgModule.
  */
 function invalidRef(
-    clazz: ts.Declaration, decl: Reference<ts.Declaration>,
+    clazz: DeclarationNode, decl: Reference<DeclarationNode>,
     type: 'import'|'export'): ts.Diagnostic {
   const code =
       type === 'import' ? ErrorCode.NGMODULE_INVALID_IMPORT : ErrorCode.NGMODULE_INVALID_EXPORT;
@@ -605,7 +607,7 @@ function invalidRef(
  * Produce a `ts.Diagnostic` for an import or export which itself has errors.
  */
 function invalidTransitiveNgModuleRef(
-    clazz: ts.Declaration, decl: Reference<ts.Declaration>,
+    clazz: DeclarationNode, decl: Reference<DeclarationNode>,
     type: 'import'|'export'): ts.Diagnostic {
   const code =
       type === 'import' ? ErrorCode.NGMODULE_INVALID_IMPORT : ErrorCode.NGMODULE_INVALID_EXPORT;
@@ -618,7 +620,7 @@ function invalidTransitiveNgModuleRef(
  * Produce a `ts.Diagnostic` for an exported directive or pipe which was not declared or imported
  * by the NgModule in question.
  */
-function invalidReexport(clazz: ts.Declaration, decl: Reference<ts.Declaration>): ts.Diagnostic {
+function invalidReexport(clazz: DeclarationNode, decl: Reference<DeclarationNode>): ts.Diagnostic {
   return makeDiagnostic(
       ErrorCode.NGMODULE_INVALID_REEXPORT, identifierOfNode(decl.node) || decl.node,
       `Present in the NgModule.exports of ${
diff --git a/packages/compiler-cli/src/ngtsc/scope/test/local_spec.ts b/packages/compiler-cli/src/ngtsc/scope/test/local_spec.ts
index 7e98f45aa982d..0216fd8864c80 100644
--- a/packages/compiler-cli/src/ngtsc/scope/test/local_spec.ts
+++ b/packages/compiler-cli/src/ngtsc/scope/test/local_spec.ts
@@ -9,7 +9,7 @@
 import * as ts from 'typescript';
 
 import {Reference, ReferenceEmitter} from '../../imports';
-import {CompoundMetadataRegistry, DirectiveMeta, LocalMetadataRegistry, MetadataRegistry, PipeMeta} from '../../metadata';
+import {ClassPropertyMapping, CompoundMetadataRegistry, DirectiveMeta, LocalMetadataRegistry, MetadataRegistry, PipeMeta} from '../../metadata';
 import {ClassDeclaration} from '../../reflection';
 import {ScopeData} from '../src/api';
 import {DtsModuleScopeResolver} from '../src/dependency';
@@ -236,13 +236,17 @@ function fakeDirective(ref: Reference<ClassDeclaration>): DirectiveMeta {
     name,
     selector: `[${ref.debugName}]`,
     isComponent: name.startsWith('Cmp'),
-    inputs: {},
-    outputs: {},
+    inputs: ClassPropertyMapping.fromMappedObject({}),
+    outputs: ClassPropertyMapping.fromMappedObject({}),
     exportAs: null,
     queries: [],
     hasNgTemplateContextGuard: false,
     ngTemplateGuards: [],
     coercedInputFields: new Set<string>(),
+    restrictedInputFields: new Set<string>(),
+    stringLiteralInputFields: new Set<string>(),
+    undeclaredInputFields: new Set<string>(),
+    isGeneric: false,
     baseClass: null,
   };
 }
diff --git a/packages/compiler-cli/src/ngtsc/shims/src/factory_generator.ts b/packages/compiler-cli/src/ngtsc/shims/src/factory_generator.ts
index 4ee78ec5138b5..6746a8e0d20cb 100644
--- a/packages/compiler-cli/src/ngtsc/shims/src/factory_generator.ts
+++ b/packages/compiler-cli/src/ngtsc/shims/src/factory_generator.ts
@@ -128,8 +128,6 @@ function transformFactorySourceFile(
 
   const {moduleSymbols, sourceFilePath} = factoryMap.get(file.fileName)!;
 
-  file = ts.getMutableClone(file);
-
   // Not every exported factory statement is valid. They were generated before the program was
   // analyzed, and before ngtsc knew which symbols were actually NgModules. factoryMap contains
   // that knowledge now, so this transform filters the statement list and removes exported factories
@@ -221,7 +219,8 @@ function transformFactorySourceFile(
     // satisfy closure compiler.
     transformedStatements.push(nonEmptyExport);
   }
-  file.statements = ts.createNodeArray(transformedStatements);
+
+  file = ts.updateSourceFileNode(file, transformedStatements);
 
   // If any imports to @angular/core were detected and rewritten (which happens when compiling
   // @angular/core), go through the SourceFile and rewrite references to symbols imported from core.
diff --git a/packages/compiler-cli/src/ngtsc/sourcemaps/src/source_file.ts b/packages/compiler-cli/src/ngtsc/sourcemaps/src/source_file.ts
index 02589d6470ad4..43e1b841ea53e 100644
--- a/packages/compiler-cli/src/ngtsc/sourcemaps/src/source_file.ts
+++ b/packages/compiler-cli/src/ngtsc/sourcemaps/src/source_file.ts
@@ -8,7 +8,7 @@
 import {removeComments, removeMapFileComments} from 'convert-source-map';
 import {decode, encode, SourceMapMappings, SourceMapSegment} from 'sourcemap-codec';
 
-import {AbsoluteFsPath, dirname, relative} from '../../file_system';
+import {AbsoluteFsPath, FileSystem} from '../../file_system';
 
 import {RawSourceMap} from './raw_source_map';
 import {compareSegments, offsetSegment, SegmentMarker} from './segment_marker';
@@ -38,7 +38,9 @@ export class SourceFile {
       /** Whether this source file's source map was inline or external. */
       readonly inline: boolean,
       /** Any source files referenced by the raw source map associated with this source file. */
-      readonly sources: (SourceFile|null)[]) {
+      readonly sources: (SourceFile|null)[],
+      private fs: FileSystem,
+  ) {
     this.contents = removeSourceMapComments(contents);
     this.startOfLinePositions = computeStartOfLinePositions(this.contents);
     this.flattenedMappings = this.flattenMappings();
@@ -75,11 +77,11 @@ export class SourceFile {
       mappings[line].push(mappingArray);
     }
 
-    const sourcePathDir = dirname(this.sourcePath);
+    const sourcePathDir = this.fs.dirname(this.sourcePath);
     const sourceMap: RawSourceMap = {
       version: 3,
-      file: relative(sourcePathDir, this.sourcePath),
-      sources: sources.map(sf => relative(sourcePathDir, sf.sourcePath)),
+      file: this.fs.relative(sourcePathDir, this.sourcePath),
+      sources: sources.map(sf => this.fs.relative(sourcePathDir, sf.sourcePath)),
       names,
       mappings: encode(mappings),
       sourcesContent: sources.map(sf => sf.contents),
diff --git a/packages/compiler-cli/src/ngtsc/sourcemaps/src/source_file_loader.ts b/packages/compiler-cli/src/ngtsc/sourcemaps/src/source_file_loader.ts
index 395a1ad62e566..7017144bb675a 100644
--- a/packages/compiler-cli/src/ngtsc/sourcemaps/src/source_file_loader.ts
+++ b/packages/compiler-cli/src/ngtsc/sourcemaps/src/source_file_loader.ts
@@ -7,7 +7,7 @@
  */
 import {commentRegex, fromComment, mapFileCommentRegex} from 'convert-source-map';
 
-import {absoluteFrom, AbsoluteFsPath, FileSystem} from '../../file_system';
+import {AbsoluteFsPath, FileSystem} from '../../file_system';
 import {Logger} from '../../logging';
 
 import {RawSourceMap} from './raw_source_map';
@@ -83,7 +83,7 @@ export class SourceFileLoader {
         inline = mapAndPath.mapPath === null;
       }
 
-      return new SourceFile(sourcePath, contents, map, inline, sources);
+      return new SourceFile(sourcePath, contents, map, inline, sources, this.fs);
     } catch (e) {
       this.logger.warn(
           `Unable to fully load ${sourcePath} for source-map flattening: ${e.message}`);
@@ -124,7 +124,7 @@ export class SourceFileLoader {
       }
     }
 
-    const impliedMapPath = absoluteFrom(sourcePath + '.map');
+    const impliedMapPath = this.fs.resolve(sourcePath + '.map');
     if (this.fs.exists(impliedMapPath)) {
       return {map: this.readRawSourceMap(impliedMapPath), mapPath: impliedMapPath};
     }
diff --git a/packages/compiler-cli/src/ngtsc/sourcemaps/test/source_file_spec.ts b/packages/compiler-cli/src/ngtsc/sourcemaps/test/source_file_spec.ts
index e11fd8248892a..a6fb591a4f279 100644
--- a/packages/compiler-cli/src/ngtsc/sourcemaps/test/source_file_spec.ts
+++ b/packages/compiler-cli/src/ngtsc/sourcemaps/test/source_file_spec.ts
@@ -7,7 +7,7 @@
  */
 import {encode} from 'sourcemap-codec';
 
-import {absoluteFrom} from '../../file_system';
+import {absoluteFrom, FileSystem, getFileSystem} from '../../file_system';
 import {runInEachFileSystem} from '../../file_system/testing';
 import {RawSourceMap} from '../src/raw_source_map';
 import {SegmentMarker} from '../src/segment_marker';
@@ -15,9 +15,11 @@ import {computeStartOfLinePositions, ensureOriginalSegmentLinks, extractOriginal
 
 runInEachFileSystem(() => {
   describe('SourceFile and utilities', () => {
+    let fs: FileSystem;
     let _: typeof absoluteFrom;
 
     beforeEach(() => {
+      fs = getFileSystem();
       _ = absoluteFrom;
     });
 
@@ -40,7 +42,7 @@ runInEachFileSystem(() => {
           sources: ['a.js'],
           version: 3
         };
-        const originalSource = new SourceFile(_('/foo/src/a.js'), 'abcdefg', null, false, []);
+        const originalSource = new SourceFile(_('/foo/src/a.js'), 'abcdefg', null, false, [], fs);
         const mappings = parseMappings(rawSourceMap, [originalSource], [0, 8]);
         expect(mappings).toEqual([
           {
@@ -71,7 +73,8 @@ runInEachFileSystem(() => {
 
       it('should parse the segments in ascending order of original position from the raw source map',
          () => {
-           const originalSource = new SourceFile(_('/foo/src/a.js'), 'abcdefg', null, false, []);
+           const originalSource =
+               new SourceFile(_('/foo/src/a.js'), 'abcdefg', null, false, [], fs);
            const rawSourceMap: RawSourceMap = {
              mappings: encode([[[0, 0, 0, 0], [2, 0, 0, 3], [4, 0, 0, 2]]]),
              names: [],
@@ -88,8 +91,8 @@ runInEachFileSystem(() => {
          });
 
       it('should create separate arrays for each original source file', () => {
-        const sourceA = new SourceFile(_('/foo/src/a.js'), 'abcdefg', null, false, []);
-        const sourceB = new SourceFile(_('/foo/src/b.js'), '1234567', null, false, []);
+        const sourceA = new SourceFile(_('/foo/src/a.js'), 'abcdefg', null, false, [], fs);
+        const sourceB = new SourceFile(_('/foo/src/b.js'), '1234567', null, false, [], fs);
         const rawSourceMap: RawSourceMap = {
           mappings:
               encode([[[0, 0, 0, 0], [2, 1, 0, 3], [4, 0, 0, 2], [5, 1, 0, 5], [6, 1, 0, 2]]]),
@@ -313,8 +316,8 @@ runInEachFileSystem(() => {
     describe('ensureOriginalSegmentLinks', () => {
       it('should add `next` properties to each segment that point to the next segment in the same source file',
          () => {
-           const sourceA = new SourceFile(_('/foo/src/a.js'), 'abcdefg', null, false, []);
-           const sourceB = new SourceFile(_('/foo/src/b.js'), '1234567', null, false, []);
+           const sourceA = new SourceFile(_('/foo/src/a.js'), 'abcdefg', null, false, [], fs);
+           const sourceB = new SourceFile(_('/foo/src/b.js'), '1234567', null, false, [], fs);
            const rawSourceMap: RawSourceMap = {
              mappings:
                  encode([[[0, 0, 0, 0], [2, 1, 0, 3], [4, 0, 0, 2], [5, 1, 0, 5], [6, 1, 0, 2]]]),
@@ -336,14 +339,14 @@ runInEachFileSystem(() => {
       describe('flattenedMappings', () => {
         it('should be an empty array for source files with no source map', () => {
           const sourceFile =
-              new SourceFile(_('/foo/src/index.js'), 'index contents', null, false, []);
+              new SourceFile(_('/foo/src/index.js'), 'index contents', null, false, [], fs);
           expect(sourceFile.flattenedMappings).toEqual([]);
         });
 
         it('should be empty array for source files with no source map mappings', () => {
           const rawSourceMap: RawSourceMap = {mappings: '', names: [], sources: [], version: 3};
           const sourceFile =
-              new SourceFile(_('/foo/src/index.js'), 'index contents', rawSourceMap, false, []);
+              new SourceFile(_('/foo/src/index.js'), 'index contents', rawSourceMap, false, [], fs);
           expect(sourceFile.flattenedMappings).toEqual([]);
         });
 
@@ -355,16 +358,17 @@ runInEachFileSystem(() => {
                sources: ['a.js'],
                version: 3
              };
-             const originalSource = new SourceFile(_('/foo/src/a.js'), 'abcdefg', null, false, []);
+             const originalSource =
+                 new SourceFile(_('/foo/src/a.js'), 'abcdefg', null, false, [], fs);
              const sourceFile = new SourceFile(
-                 _('/foo/src/index.js'), 'abc123defg', rawSourceMap, false, [originalSource]);
+                 _('/foo/src/index.js'), 'abc123defg', rawSourceMap, false, [originalSource], fs);
              expect(removeOriginalSegmentLinks(sourceFile.flattenedMappings))
                  .toEqual(parseMappings(rawSourceMap, [originalSource], [0, 11]));
            });
 
         it('should merge mappings from flattened original source files', () => {
-          const cSource = new SourceFile(_('/foo/src/c.js'), 'bcd123', null, false, []);
-          const dSource = new SourceFile(_('/foo/src/d.js'), 'aef', null, false, []);
+          const cSource = new SourceFile(_('/foo/src/c.js'), 'bcd123', null, false, [], fs);
+          const dSource = new SourceFile(_('/foo/src/d.js'), 'aef', null, false, [], fs);
 
           const bSourceMap: RawSourceMap = {
             mappings: encode([[[0, 1, 0, 0], [1, 0, 0, 0], [4, 1, 0, 1]]]),
@@ -372,8 +376,8 @@ runInEachFileSystem(() => {
             sources: ['c.js', 'd.js'],
             version: 3
           };
-          const bSource =
-              new SourceFile(_('/foo/src/b.js'), 'abcdef', bSourceMap, false, [cSource, dSource]);
+          const bSource = new SourceFile(
+              _('/foo/src/b.js'), 'abcdef', bSourceMap, false, [cSource, dSource], fs);
 
           const aSourceMap: RawSourceMap = {
             mappings: encode([[[0, 0, 0, 0], [2, 0, 0, 3], [4, 0, 0, 2], [5, 0, 0, 5]]]),
@@ -382,7 +386,7 @@ runInEachFileSystem(() => {
             version: 3
           };
           const aSource =
-              new SourceFile(_('/foo/src/a.js'), 'abdecf', aSourceMap, false, [bSource]);
+              new SourceFile(_('/foo/src/a.js'), 'abdecf', aSourceMap, false, [bSource], fs);
 
           expect(removeOriginalSegmentLinks(aSource.flattenedMappings)).toEqual([
             {
@@ -431,7 +435,8 @@ runInEachFileSystem(() => {
             sources: ['c.js'],
             version: 3
           };
-          const bSource = new SourceFile(_('/foo/src/b.js'), 'abcdef', bSourceMap, false, [null]);
+          const bSource =
+              new SourceFile(_('/foo/src/b.js'), 'abcdef', bSourceMap, false, [null], fs);
           const aSourceMap: RawSourceMap = {
             mappings: encode([[[0, 0, 0, 0], [2, 0, 0, 3], [4, 0, 0, 2], [5, 0, 0, 5]]]),
             names: [],
@@ -439,7 +444,7 @@ runInEachFileSystem(() => {
             version: 3
           };
           const aSource =
-              new SourceFile(_('/foo/src/a.js'), 'abdecf', aSourceMap, false, [bSource]);
+              new SourceFile(_('/foo/src/a.js'), 'abdecf', aSourceMap, false, [bSource], fs);
 
           // These flattened mappings are just the mappings from a to b.
           // (The mappings to c are dropped since there is no source file to map to.)
@@ -462,7 +467,7 @@ runInEachFileSystem(() => {
 
       describe('renderFlattenedSourceMap()', () => {
         it('should convert the flattenedMappings into a raw source-map object', () => {
-          const cSource = new SourceFile(_('/foo/src/c.js'), 'bcd123e', null, false, []);
+          const cSource = new SourceFile(_('/foo/src/c.js'), 'bcd123e', null, false, [], fs);
           const bToCSourceMap: RawSourceMap = {
             mappings: encode([[[1, 0, 0, 0], [4, 0, 0, 3], [4, 0, 0, 6], [5, 0, 0, 7]]]),
             names: [],
@@ -470,7 +475,7 @@ runInEachFileSystem(() => {
             version: 3
           };
           const bSource =
-              new SourceFile(_('/foo/src/b.js'), 'abcdef', bToCSourceMap, false, [cSource]);
+              new SourceFile(_('/foo/src/b.js'), 'abcdef', bToCSourceMap, false, [cSource], fs);
           const aToBSourceMap: RawSourceMap = {
             mappings: encode([[[0, 0, 0, 0], [2, 0, 0, 3], [4, 0, 0, 2], [5, 0, 0, 5]]]),
             names: [],
@@ -478,7 +483,7 @@ runInEachFileSystem(() => {
             version: 3
           };
           const aSource =
-              new SourceFile(_('/foo/src/a.js'), 'abdecf', aToBSourceMap, false, [bSource]);
+              new SourceFile(_('/foo/src/a.js'), 'abdecf', aToBSourceMap, false, [bSource], fs);
 
           const aTocSourceMap = aSource.renderFlattenedSourceMap();
           expect(aTocSourceMap.version).toEqual(3);
@@ -493,7 +498,7 @@ runInEachFileSystem(() => {
         });
 
         it('should handle mappings that map from lines outside of the actual content lines', () => {
-          const bSource = new SourceFile(_('/foo/src/b.js'), 'abcdef', null, false, []);
+          const bSource = new SourceFile(_('/foo/src/b.js'), 'abcdef', null, false, [], fs);
           const aToBSourceMap: RawSourceMap = {
             mappings: encode([
               [[0, 0, 0, 0], [2, 0, 0, 3], [4, 0, 0, 2], [5, 0, 0, 5]],
@@ -506,7 +511,7 @@ runInEachFileSystem(() => {
             version: 3
           };
           const aSource =
-              new SourceFile(_('/foo/src/a.js'), 'abdecf', aToBSourceMap, false, [bSource]);
+              new SourceFile(_('/foo/src/a.js'), 'abdecf', aToBSourceMap, false, [bSource], fs);
 
           const aTocSourceMap = aSource.renderFlattenedSourceMap();
           expect(aTocSourceMap.version).toEqual(3);
@@ -522,13 +527,13 @@ runInEachFileSystem(() => {
       describe('getOriginalLocation()', () => {
         it('should return null for source files with no flattened mappings', () => {
           const sourceFile =
-              new SourceFile(_('/foo/src/index.js'), 'index contents', null, false, []);
+              new SourceFile(_('/foo/src/index.js'), 'index contents', null, false, [], fs);
           expect(sourceFile.getOriginalLocation(1, 1)).toEqual(null);
         });
 
         it('should return offset locations in multiple flattened original source files', () => {
-          const cSource = new SourceFile(_('/foo/src/c.js'), 'bcd123', null, false, []);
-          const dSource = new SourceFile(_('/foo/src/d.js'), 'aef', null, false, []);
+          const cSource = new SourceFile(_('/foo/src/c.js'), 'bcd123', null, false, [], fs);
+          const dSource = new SourceFile(_('/foo/src/d.js'), 'aef', null, false, [], fs);
 
           const bSourceMap: RawSourceMap = {
             mappings: encode([
@@ -542,8 +547,8 @@ runInEachFileSystem(() => {
             sources: ['c.js', 'd.js'],
             version: 3
           };
-          const bSource =
-              new SourceFile(_('/foo/src/b.js'), 'abcdef', bSourceMap, false, [cSource, dSource]);
+          const bSource = new SourceFile(
+              _('/foo/src/b.js'), 'abcdef', bSourceMap, false, [cSource, dSource], fs);
 
           const aSourceMap: RawSourceMap = {
             mappings: encode([
@@ -560,7 +565,7 @@ runInEachFileSystem(() => {
             version: 3
           };
           const aSource =
-              new SourceFile(_('/foo/src/a.js'), 'abde\n    cf', aSourceMap, false, [bSource]);
+              new SourceFile(_('/foo/src/a.js'), 'abde\n    cf', aSourceMap, false, [bSource], fs);
 
           // Line 0
           expect(aSource.getOriginalLocation(0, 0))  // a
@@ -592,8 +597,8 @@ runInEachFileSystem(() => {
         });
 
         it('should return offset locations across multiple lines', () => {
-          const originalSource =
-              new SourceFile(_('/foo/src/original.js'), 'abcdef\nghijk\nlmnop', null, false, []);
+          const originalSource = new SourceFile(
+              _('/foo/src/original.js'), 'abcdef\nghijk\nlmnop', null, false, [], fs);
           const generatedSourceMap: RawSourceMap = {
             mappings: encode([
               [
@@ -614,7 +619,7 @@ runInEachFileSystem(() => {
           };
           const generatedSource = new SourceFile(
               _('/foo/src/generated.js'), 'ABC\nGHIJDEFK\nLMNOP', generatedSourceMap, false,
-              [originalSource]);
+              [originalSource], fs);
 
           // Line 0
           expect(generatedSource.getOriginalLocation(0, 0))  // A
diff --git a/packages/compiler-cli/src/ngtsc/switch/src/switch.ts b/packages/compiler-cli/src/ngtsc/switch/src/switch.ts
index 9697b6a53e9b9..8d40c1e3dbd03 100644
--- a/packages/compiler-cli/src/ngtsc/switch/src/switch.ts
+++ b/packages/compiler-cli/src/ngtsc/switch/src/switch.ts
@@ -42,8 +42,7 @@ function flipIvySwitchInFile(sf: ts.SourceFile): ts.SourceFile {
 
   // Only update the statements in the SourceFile if any have changed.
   if (newStatements !== undefined) {
-    sf = ts.getMutableClone(sf);
-    sf.statements = ts.createNodeArray(newStatements);
+    return ts.updateSourceFileNode(sf, newStatements);
   }
   return sf;
 }
@@ -105,16 +104,12 @@ function flipIvySwitchesInVariableStatement(
 
     // Find the post-switch variable identifier. If one can't be found, it's an error. This is
     // reported as a thrown error and not a diagnostic as transformers cannot output diagnostics.
-    let newIdentifier = findPostSwitchIdentifier(statements, postSwitchName);
+    const newIdentifier = findPostSwitchIdentifier(statements, postSwitchName);
     if (newIdentifier === null) {
       throw new Error(`Unable to find identifier ${postSwitchName} in ${
           stmt.getSourceFile().fileName} for the Ivy switch.`);
     }
 
-    // Copy the identifier with updateIdentifier(). This copies the internal information which
-    // allows TS to write a correct reference to the identifier.
-    newIdentifier = ts.updateIdentifier(newIdentifier);
-
     newDeclarations[i] = ts.updateVariableDeclaration(
         /* node */ decl,
         /* name */ decl.name,
diff --git a/packages/compiler-cli/src/ngtsc/testing/BUILD.bazel b/packages/compiler-cli/src/ngtsc/testing/BUILD.bazel
index e28599e6ae7a4..2fe8466d92a3b 100644
--- a/packages/compiler-cli/src/ngtsc/testing/BUILD.bazel
+++ b/packages/compiler-cli/src/ngtsc/testing/BUILD.bazel
@@ -11,6 +11,7 @@ ts_library(
     deps = [
         "//packages:types",
         "//packages/compiler-cli/src/ngtsc/file_system",
+        "//packages/compiler-cli/src/ngtsc/reflection",
         "@npm//typescript",
     ],
 )
diff --git a/packages/compiler-cli/src/ngtsc/testing/index.ts b/packages/compiler-cli/src/ngtsc/testing/index.ts
index 354d8a38768f8..052bfc8773609 100644
--- a/packages/compiler-cli/src/ngtsc/testing/index.ts
+++ b/packages/compiler-cli/src/ngtsc/testing/index.ts
@@ -5,4 +5,4 @@
  * 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 {expectCompleteReuse, getDeclaration, makeProgram} from './src/utils';
+export {expectCompleteReuse, getDeclaration, isNamedDeclaration, makeProgram} from './src/utils';
diff --git a/packages/compiler-cli/src/ngtsc/testing/src/utils.ts b/packages/compiler-cli/src/ngtsc/testing/src/utils.ts
index f2c84d263d2b9..7fe09b6686811 100644
--- a/packages/compiler-cli/src/ngtsc/testing/src/utils.ts
+++ b/packages/compiler-cli/src/ngtsc/testing/src/utils.ts
@@ -11,6 +11,7 @@
 import * as ts from 'typescript';
 
 import {AbsoluteFsPath, dirname, getFileSystem, getSourceFileOrError, NgtscCompilerHost} from '../../file_system';
+import {DeclarationNode} from '../../reflection';
 
 export function makeProgram(
     files: {name: AbsoluteFsPath, contents: string, isRoot?: boolean}[],
@@ -50,51 +51,67 @@ export function makeProgram(
   return {program, host: compilerHost, options: compilerOptions};
 }
 
-export function getDeclaration<T extends ts.Declaration>(
+/**
+ * Search the file specified by `fileName` in the given `program` for a declaration that has the
+ * name `name` and passes the `predicate` function.
+ *
+ * An error will be thrown if there is not at least one AST node with the given `name` and passes
+ * the `predicate` test.
+ */
+export function getDeclaration<T extends DeclarationNode>(
     program: ts.Program, fileName: AbsoluteFsPath, name: string,
     assert: (value: any) => value is T): T {
   const sf = getSourceFileOrError(program, fileName);
-  const chosenDecl = walkForDeclaration(name, sf);
+  const chosenDecls = walkForDeclarations(name, sf);
 
-  if (chosenDecl === null) {
+  if (chosenDecls.length === 0) {
     throw new Error(`No such symbol: ${name} in ${fileName}`);
   }
-  if (!assert(chosenDecl)) {
-    throw new Error(`Symbol ${name} from ${fileName} is a ${ts.SyntaxKind[chosenDecl.kind]}`);
+  const chosenDecl = chosenDecls.find(assert);
+  if (chosenDecl === undefined) {
+    throw new Error(`Symbols with name ${name} in ${fileName} have types: ${
+        chosenDecls.map(decl => ts.SyntaxKind[decl.kind])}. Expected one to pass predicate "${
+        assert.name}()".`);
   }
   return chosenDecl;
 }
 
-// We walk the AST tree looking for a declaration that matches
-export function walkForDeclaration(name: string, rootNode: ts.Node): ts.Declaration|null {
-  let chosenDecl: ts.Declaration|null = null;
+/**
+ * Walk the AST tree from the `rootNode` looking for a declaration that has the given `name`.
+ */
+export function walkForDeclarations(name: string, rootNode: ts.Node): DeclarationNode[] {
+  const chosenDecls: DeclarationNode[] = [];
   rootNode.forEachChild(node => {
-    if (chosenDecl !== null) {
-      return;
-    }
     if (ts.isVariableStatement(node)) {
       node.declarationList.declarations.forEach(decl => {
         if (bindingNameEquals(decl.name, name)) {
-          chosenDecl = decl;
+          chosenDecls.push(decl);
+          if (decl.initializer) {
+            chosenDecls.push(...walkForDeclarations(name, decl.initializer));
+          }
         } else {
-          chosenDecl = walkForDeclaration(name, node);
+          chosenDecls.push(...walkForDeclarations(name, node));
         }
       });
-    } else if (
-        ts.isClassDeclaration(node) || ts.isFunctionDeclaration(node) ||
-        ts.isInterfaceDeclaration(node) || ts.isClassExpression(node)) {
+    } else if (isNamedDeclaration(node)) {
       if (node.name !== undefined && node.name.text === name) {
-        chosenDecl = node;
+        chosenDecls.push(node);
       }
+      chosenDecls.push(...walkForDeclarations(name, node));
     } else if (
         ts.isImportDeclaration(node) && node.importClause !== undefined &&
         node.importClause.name !== undefined && node.importClause.name.text === name) {
-      chosenDecl = node.importClause;
+      chosenDecls.push(node.importClause);
     } else {
-      chosenDecl = walkForDeclaration(name, node);
+      chosenDecls.push(...walkForDeclarations(name, node));
     }
   });
-  return chosenDecl;
+  return chosenDecls;
+}
+
+export function isNamedDeclaration(node: ts.Node): node is ts.Declaration&{name: ts.Identifier} {
+  const namedNode = node as {name?: ts.Identifier};
+  return namedNode.name !== undefined && ts.isIdentifier(namedNode.name);
 }
 
 const COMPLETE_REUSE_FAILURE_MESSAGE =
diff --git a/packages/compiler-cli/src/ngtsc/transform/src/alias.ts b/packages/compiler-cli/src/ngtsc/transform/src/alias.ts
index ea21926e682ff..a5ba308a92586 100644
--- a/packages/compiler-cli/src/ngtsc/transform/src/alias.ts
+++ b/packages/compiler-cli/src/ngtsc/transform/src/alias.ts
@@ -28,9 +28,7 @@ export function aliasTransformFactory(exportStatements: Map<string, Map<string,
         statements.push(stmt);
       });
 
-      file = ts.getMutableClone(file);
-      file.statements = ts.createNodeArray(statements);
-      return file;
+      return ts.updateSourceFileNode(file, statements);
     };
   };
 }
diff --git a/packages/compiler-cli/src/ngtsc/transform/src/api.ts b/packages/compiler-cli/src/ngtsc/transform/src/api.ts
index d6651f5c444f0..fe097179664d6 100644
--- a/packages/compiler-cli/src/ngtsc/transform/src/api.ts
+++ b/packages/compiler-cli/src/ngtsc/transform/src/api.ts
@@ -15,6 +15,21 @@ import {ClassDeclaration, Decorator} from '../../reflection';
 import {ImportManager} from '../../translator';
 import {TypeCheckContext} from '../../typecheck/api';
 
+/**
+ * Specifies the compilation mode that is used for the compilation.
+ */
+export enum CompilationMode {
+  /**
+   * Generates fully AOT compiled code using Ivy instructions.
+   */
+  FULL,
+
+  /**
+   * Generates code using a stable, but intermediate format suitable to be published to NPM.
+   */
+  PARTIAL,
+}
+
 export enum HandlerPrecedence {
   /**
    * Handler with PRIMARY precedence cannot overlap - there can only be one on a given class.
@@ -147,10 +162,25 @@ export interface DecoratorHandler<D, A, R> {
   /**
    * Generate a description of the field which should be added to the class, including any
    * initialization code to be generated.
+   *
+   * If the compilation mode is configured as partial, and an implementation of `compilePartial` is
+   * provided, then this method is not called.
    */
-  compile(
+  compileFull(
       node: ClassDeclaration, analysis: Readonly<A>, resolution: Readonly<R>,
       constantPool: ConstantPool): CompileResult|CompileResult[];
+
+  /**
+   * Generates code for the decorator using a stable, but intermediate format suitable to be
+   * published to NPM. This code is meant to be processed by the linker to achieve the final AOT
+   * compiled code.
+   *
+   * If present, this method is used if the compilation mode is configured as partial, otherwise
+   * `compileFull` is.
+   */
+  compilePartial?
+      (node: ClassDeclaration, analysis: Readonly<A>, resolution: Readonly<R>): CompileResult
+      |CompileResult[];
 }
 
 /**
diff --git a/packages/compiler-cli/src/ngtsc/transform/src/compilation.ts b/packages/compiler-cli/src/ngtsc/transform/src/compilation.ts
index 812fdfabb7476..01415026c3eb5 100644
--- a/packages/compiler-cli/src/ngtsc/transform/src/compilation.ts
+++ b/packages/compiler-cli/src/ngtsc/transform/src/compilation.ts
@@ -13,11 +13,11 @@ import {ErrorCode, FatalDiagnosticError} from '../../diagnostics';
 import {IncrementalBuild} from '../../incremental/api';
 import {IndexingContext} from '../../indexer';
 import {PerfRecorder} from '../../perf';
-import {ClassDeclaration, Decorator, ReflectionHost} from '../../reflection';
+import {ClassDeclaration, DeclarationNode, Decorator, ReflectionHost} from '../../reflection';
 import {ProgramTypeCheckAdapter, TypeCheckContext} from '../../typecheck/api';
 import {getSourceFile, isExported} from '../../util/src/typescript';
 
-import {AnalysisOutput, CompileResult, DecoratorHandler, HandlerFlags, HandlerPrecedence, ResolveResult} from './api';
+import {AnalysisOutput, CompilationMode, CompileResult, DecoratorHandler, HandlerFlags, HandlerPrecedence, ResolveResult} from './api';
 import {DtsTransformRegistry} from './declaration';
 import {PendingTrait, Trait, TraitState} from './trait';
 
@@ -88,7 +88,8 @@ export class TraitCompiler implements ProgramTypeCheckAdapter {
       private handlers: DecoratorHandler<unknown, unknown, unknown>[],
       private reflector: ReflectionHost, private perf: PerfRecorder,
       private incrementalBuild: IncrementalBuild<ClassRecord, unknown>,
-      private compileNonExportedClasses: boolean, private dtsTransforms: DtsTransformRegistry) {
+      private compileNonExportedClasses: boolean, private compilationMode: CompilationMode,
+      private dtsTransforms: DtsTransformRegistry) {
     for (const handler of handlers) {
       this.handlersByName.set(handler.name, handler);
     }
@@ -462,7 +463,7 @@ export class TraitCompiler implements ProgramTypeCheckAdapter {
     }
   }
 
-  compile(clazz: ts.Declaration, constantPool: ConstantPool): CompileResult[]|null {
+  compile(clazz: DeclarationNode, constantPool: ConstantPool): CompileResult[]|null {
     const original = ts.getOriginalNode(clazz) as typeof clazz;
     if (!this.reflector.isClass(clazz) || !this.reflector.isClass(original) ||
         !this.classes.has(original)) {
@@ -479,8 +480,17 @@ export class TraitCompiler implements ProgramTypeCheckAdapter {
       }
 
       const compileSpan = this.perf.start('compileClass', original);
-      const compileMatchRes =
-          trait.handler.compile(clazz, trait.analysis, trait.resolution, constantPool);
+
+      let compileRes: CompileResult|CompileResult[];
+      if (this.compilationMode === CompilationMode.PARTIAL &&
+          trait.handler.compilePartial !== undefined) {
+        compileRes = trait.handler.compilePartial(clazz, trait.analysis, trait.resolution);
+      } else {
+        compileRes =
+            trait.handler.compileFull(clazz, trait.analysis, trait.resolution, constantPool);
+      }
+
+      const compileMatchRes = compileRes;
       this.perf.stop(compileSpan);
       if (Array.isArray(compileMatchRes)) {
         for (const result of compileMatchRes) {
diff --git a/packages/compiler-cli/src/ngtsc/transform/src/declaration.ts b/packages/compiler-cli/src/ngtsc/transform/src/declaration.ts
index 8dded958ce0e6..acc757c6e6d1f 100644
--- a/packages/compiler-cli/src/ngtsc/transform/src/declaration.ts
+++ b/packages/compiler-cli/src/ngtsc/transform/src/declaration.ts
@@ -239,32 +239,48 @@ export class ReturnTypeTransform implements DtsTransform {
   }
 
   transformClassElement(element: ts.ClassElement, imports: ImportManager): ts.ClassElement {
-    if (!ts.isMethodSignature(element)) {
-      return element;
-    }
-
-    const original = ts.getOriginalNode(element) as ts.MethodDeclaration;
-    if (!this.typeReplacements.has(original)) {
-      return element;
+    // // TODO(alan-agius4): Remove when we no longer support TS 3.9
+    // TS <= 3.9
+    if (ts.isMethodSignature(element)) {
+      const original = ts.getOriginalNode(element) as ts.MethodDeclaration;
+      if (!this.typeReplacements.has(original)) {
+        return element;
+      }
+      const returnType = this.typeReplacements.get(original)!;
+      const tsReturnType = translateType(returnType, imports);
+      const methodSignature = ts.updateMethodSignature(
+          /* node */ element,
+          /* typeParameters */ element.typeParameters,
+          /* parameters */ element.parameters,
+          /* type */ tsReturnType,
+          /* name */ element.name,
+          /* questionToken */ element.questionToken);
+
+      // Copy over any modifiers, these cannot be set during the `ts.updateMethodSignature` call.
+      (methodSignature.modifiers as ts.ModifiersArray | undefined) = element.modifiers;
+
+      // A bug in the TypeScript declaration causes `ts.MethodSignature` not to be assignable to
+      // `ts.ClassElement`. Since `element` was a `ts.MethodSignature` already, transforming it into
+      // this type is actually correct.
+      return methodSignature as unknown as ts.ClassElement;
     }
-    const returnType = this.typeReplacements.get(original)!;
-    const tsReturnType = translateType(returnType, imports);
 
-    const methodSignature = ts.updateMethodSignature(
-        /* node */ element,
-        /* typeParameters */ element.typeParameters,
-        /* parameters */ element.parameters,
-        /* type */ tsReturnType,
-        /* name */ element.name,
-        /* questionToken */ element.questionToken);
+    // TS 4.0 +
+    if (ts.isMethodDeclaration(element)) {
+      const original = ts.getOriginalNode(element, ts.isMethodDeclaration);
+      if (!this.typeReplacements.has(original)) {
+        return element;
+      }
+      const returnType = this.typeReplacements.get(original)!;
+      const tsReturnType = translateType(returnType, imports);
 
-    // Copy over any modifiers, these cannot be set during the `ts.updateMethodSignature` call.
-    methodSignature.modifiers = element.modifiers;
+      return ts.updateMethod(
+          element, element.decorators, element.modifiers, element.asteriskToken, element.name,
+          element.questionToken, element.typeParameters, element.parameters, tsReturnType,
+          element.body);
+    }
 
-    // A bug in the TypeScript declaration causes `ts.MethodSignature` not to be assignable to
-    // `ts.ClassElement`. Since `element` was a `ts.MethodSignature` already, transforming it into
-    // this type is actually correct.
-    return methodSignature as unknown as ts.ClassElement;
+    return element;
   }
 
   transformFunctionDeclaration(element: ts.FunctionDeclaration, imports: ImportManager):
diff --git a/packages/compiler-cli/src/ngtsc/transform/src/transform.ts b/packages/compiler-cli/src/ngtsc/transform/src/transform.ts
index af1e79be95e7b..96ea10d553d10 100644
--- a/packages/compiler-cli/src/ngtsc/transform/src/transform.ts
+++ b/packages/compiler-cli/src/ngtsc/transform/src/transform.ts
@@ -11,7 +11,7 @@ import * as ts from 'typescript';
 
 import {DefaultImportRecorder, ImportRewriter} from '../../imports';
 import {Decorator, ReflectionHost} from '../../reflection';
-import {ImportManager, translateExpression, translateStatement} from '../../translator';
+import {ImportManager, RecordWrappedNodeExprFn, translateExpression, translateStatement} from '../../translator';
 import {visit, VisitListEntryResult, Visitor} from '../../util/src/visitor';
 
 import {CompileResult} from './api';
@@ -35,11 +35,12 @@ export function ivyTransformFactory(
     compilation: TraitCompiler, reflector: ReflectionHost, importRewriter: ImportRewriter,
     defaultImportRecorder: DefaultImportRecorder, isCore: boolean,
     isClosureCompilerEnabled: boolean): ts.TransformerFactory<ts.SourceFile> {
+  const recordWrappedNodeExpr = createRecorderFn(defaultImportRecorder);
   return (context: ts.TransformationContext): ts.Transformer<ts.SourceFile> => {
     return (file: ts.SourceFile): ts.SourceFile => {
       return transformIvySourceFile(
           compilation, context, reflector, importRewriter, file, isCore, isClosureCompilerEnabled,
-          defaultImportRecorder);
+          recordWrappedNodeExpr);
     };
   };
 }
@@ -77,7 +78,7 @@ class IvyTransformationVisitor extends Visitor {
       private compilation: TraitCompiler,
       private classCompilationMap: Map<ts.ClassDeclaration, CompileResult[]>,
       private reflector: ReflectionHost, private importManager: ImportManager,
-      private defaultImportRecorder: DefaultImportRecorder,
+      private recordWrappedNodeExpr: RecordWrappedNodeExprFn<ts.Expression>,
       private isClosureCompilerEnabled: boolean, private isCore: boolean) {
     super();
   }
@@ -97,8 +98,8 @@ class IvyTransformationVisitor extends Visitor {
     for (const field of this.classCompilationMap.get(node)!) {
       // Translate the initializer for the field into TS nodes.
       const exprNode = translateExpression(
-          field.initializer, this.importManager, this.defaultImportRecorder,
-          ts.ScriptTarget.ES2015);
+          field.initializer, this.importManager,
+          {recordWrappedNodeExpr: this.recordWrappedNodeExpr});
 
       // Create a static property declaration for the new field.
       const property = ts.createProperty(
@@ -118,7 +119,7 @@ class IvyTransformationVisitor extends Visitor {
       field.statements
           .map(
               stmt => translateStatement(
-                  stmt, this.importManager, this.defaultImportRecorder, ts.ScriptTarget.ES2015))
+                  stmt, this.importManager, {recordWrappedNodeExpr: this.recordWrappedNodeExpr}))
           .forEach(stmt => statements.push(stmt));
 
       members.push(property);
@@ -187,8 +188,8 @@ class IvyTransformationVisitor extends Visitor {
 
     // 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;
+    (array.pos as number) = node.decorators.pos;
+    (array.end as number) = node.decorators.end;
     return array;
   }
 
@@ -248,7 +249,7 @@ function transformIvySourceFile(
     compilation: TraitCompiler, context: ts.TransformationContext, reflector: ReflectionHost,
     importRewriter: ImportRewriter, file: ts.SourceFile, isCore: boolean,
     isClosureCompilerEnabled: boolean,
-    defaultImportRecorder: DefaultImportRecorder): ts.SourceFile {
+    recordWrappedNodeExpr: RecordWrappedNodeExprFn<ts.Expression>): ts.SourceFile {
   const constantPool = new ConstantPool(isClosureCompilerEnabled);
   const importManager = new ImportManager(importRewriter);
 
@@ -270,14 +271,18 @@ function transformIvySourceFile(
   // results obtained at Step 1.
   const transformationVisitor = new IvyTransformationVisitor(
       compilation, compilationVisitor.classCompilationMap, reflector, importManager,
-      defaultImportRecorder, isClosureCompilerEnabled, isCore);
+      recordWrappedNodeExpr, isClosureCompilerEnabled, isCore);
   let sf = visit(file, transformationVisitor, context);
 
   // Generate the constant statements first, as they may involve adding additional imports
   // to the ImportManager.
-  const constants = constantPool.statements.map(
-      stmt => translateStatement(
-          stmt, importManager, defaultImportRecorder, getLocalizeCompileTarget(context)));
+  const downlevelTranslatedCode = getLocalizeCompileTarget(context) < ts.ScriptTarget.ES2015;
+  const constants =
+      constantPool.statements.map(stmt => translateStatement(stmt, importManager, {
+                                    recordWrappedNodeExpr,
+                                    downlevelLocalizedStrings: downlevelTranslatedCode,
+                                    downlevelVariableDeclarations: downlevelTranslatedCode,
+                                  }));
 
   // Preserve @fileoverview comments required by Closure, since the location might change as a
   // result of adding extra imports and constant pool statements.
@@ -360,3 +365,12 @@ function maybeFilterDecorator(
 function isFromAngularCore(decorator: Decorator): boolean {
   return decorator.import !== null && decorator.import.from === '@angular/core';
 }
+
+function createRecorderFn(defaultImportRecorder: DefaultImportRecorder):
+    RecordWrappedNodeExprFn<ts.Expression> {
+  return expr => {
+    if (ts.isIdentifier(expr)) {
+      defaultImportRecorder.recordUsedIdentifier(expr);
+    }
+  };
+}
diff --git a/packages/compiler-cli/src/ngtsc/transform/src/utils.ts b/packages/compiler-cli/src/ngtsc/transform/src/utils.ts
index e8f8814bce38f..ddbdfe7397914 100644
--- a/packages/compiler-cli/src/ngtsc/transform/src/utils.ts
+++ b/packages/compiler-cli/src/ngtsc/transform/src/utils.ts
@@ -40,8 +40,9 @@ export function addImports(
     // for @fileoverview Closure annotation. If there is no @fileoverview annotations, this
     // statement would be a noop.
     const fileoverviewAnchorStmt = ts.createNotEmittedStatement(sf);
-    sf.statements = ts.createNodeArray(
-        [fileoverviewAnchorStmt, ...existingImports, ...addedImports, ...extraStatements, ...body]);
+    return ts.updateSourceFileNode(sf, ts.createNodeArray([
+      fileoverviewAnchorStmt, ...existingImports, ...addedImports, ...extraStatements, ...body
+    ]));
   }
 
   return sf;
diff --git a/packages/compiler-cli/src/ngtsc/transform/test/compilation_spec.ts b/packages/compiler-cli/src/ngtsc/transform/test/compilation_spec.ts
index baa7ddcd22c28..4d655636b0250 100644
--- a/packages/compiler-cli/src/ngtsc/transform/test/compilation_spec.ts
+++ b/packages/compiler-cli/src/ngtsc/transform/test/compilation_spec.ts
@@ -5,13 +5,16 @@
  * 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 '@angular/compiler';
+import * as o from '@angular/compiler/src/output/output_ast';
+
 import {absoluteFrom} from '../../file_system';
 import {runInEachFileSystem} from '../../file_system/testing';
 import {NOOP_INCREMENTAL_BUILD} from '../../incremental';
 import {NOOP_PERF_RECORDER} from '../../perf';
-import {ClassDeclaration, TypeScriptReflectionHost} from '../../reflection';
-import {makeProgram} from '../../testing';
-import {DtsTransformRegistry, TraitCompiler} from '../../transform';
+import {ClassDeclaration, Decorator, isNamedClassDeclaration, TypeScriptReflectionHost} from '../../reflection';
+import {getDeclaration, makeProgram} from '../../testing';
+import {CompilationMode, DetectResult, DtsTransformRegistry, TraitCompiler} from '../../transform';
 import {AnalysisOutput, CompileResult, DecoratorHandler, HandlerPrecedence} from '../src/api';
 
 runInEachFileSystem(() => {
@@ -30,7 +33,7 @@ runInEachFileSystem(() => {
         analyze(): AnalysisOutput<unknown> {
           throw new Error('analyze should not have been called');
         }
-        compile(): CompileResult {
+        compileFull(): CompileResult {
           throw new Error('compile should not have been called');
         }
       }
@@ -43,12 +46,133 @@ runInEachFileSystem(() => {
       const reflectionHost = new TypeScriptReflectionHost(checker);
       const compiler = new TraitCompiler(
           [new FakeDecoratorHandler()], reflectionHost, NOOP_PERF_RECORDER, NOOP_INCREMENTAL_BUILD,
-          true, new DtsTransformRegistry());
+          true, CompilationMode.FULL, new DtsTransformRegistry());
       const sourceFile = program.getSourceFile('lib.d.ts')!;
       const analysis = compiler.analyzeSync(sourceFile);
 
       expect(sourceFile.isDeclarationFile).toBe(true);
       expect(analysis).toBeFalsy();
     });
+
+    describe('compilation mode', () => {
+      class PartialDecoratorHandler implements DecoratorHandler<{}, {}, unknown> {
+        name = 'PartialDecoratorHandler';
+        precedence = HandlerPrecedence.PRIMARY;
+
+        detect(node: ClassDeclaration, decorators: Decorator[]|null): DetectResult<{}>|undefined {
+          if (node.name.text !== 'Partial') {
+            return undefined;
+          }
+          return {trigger: node, decorator: null, metadata: {}};
+        }
+
+        analyze(): AnalysisOutput<unknown> {
+          return {analysis: {}};
+        }
+
+        compileFull(): CompileResult {
+          return {
+            name: 'compileFull',
+            initializer: o.literal(true),
+            statements: [],
+            type: o.BOOL_TYPE
+          };
+        }
+
+        compilePartial(): CompileResult {
+          return {
+            name: 'compilePartial',
+            initializer: o.literal(true),
+            statements: [],
+            type: o.BOOL_TYPE
+          };
+        }
+      }
+
+      class FullDecoratorHandler implements DecoratorHandler<{}, {}, unknown> {
+        name = 'FullDecoratorHandler';
+        precedence = HandlerPrecedence.PRIMARY;
+
+        detect(node: ClassDeclaration, decorators: Decorator[]|null): DetectResult<{}>|undefined {
+          if (node.name.text !== 'Full') {
+            return undefined;
+          }
+          return {trigger: node, decorator: null, metadata: {}};
+        }
+
+        analyze(): AnalysisOutput<unknown> {
+          return {analysis: {}};
+        }
+
+        compileFull(): CompileResult {
+          return {
+            name: 'compileFull',
+            initializer: o.literal(true),
+            statements: [],
+            type: o.BOOL_TYPE
+          };
+        }
+      }
+
+      it('should run partial compilation when implemented if compilation mode is partial', () => {
+        const {program} = makeProgram([{
+          name: _('/test.ts'),
+          contents: `
+            export class Full {}
+            export class Partial {}
+          `,
+        }]);
+        const checker = program.getTypeChecker();
+        const reflectionHost = new TypeScriptReflectionHost(checker);
+        const compiler = new TraitCompiler(
+            [new PartialDecoratorHandler(), new FullDecoratorHandler()], reflectionHost,
+            NOOP_PERF_RECORDER, NOOP_INCREMENTAL_BUILD, true, CompilationMode.PARTIAL,
+            new DtsTransformRegistry());
+        const sourceFile = program.getSourceFile('test.ts')!;
+        compiler.analyzeSync(sourceFile);
+        compiler.resolve();
+
+        const partialDecl =
+            getDeclaration(program, _('/test.ts'), 'Partial', isNamedClassDeclaration);
+        const partialResult = compiler.compile(partialDecl, new ConstantPool())!;
+        expect(partialResult.length).toBe(1);
+        expect(partialResult[0].name).toBe('compilePartial');
+
+        const fullDecl = getDeclaration(program, _('/test.ts'), 'Full', isNamedClassDeclaration);
+        const fullResult = compiler.compile(fullDecl, new ConstantPool())!;
+        expect(fullResult.length).toBe(1);
+        expect(fullResult[0].name).toBe('compileFull');
+      });
+
+      it('should run full compilation if compilation mode is full', () => {
+        const {program} = makeProgram([{
+          name: _('/test.ts'),
+          contents: `
+            export class Full {}
+            export class Partial {}
+          `,
+        }]);
+        const checker = program.getTypeChecker();
+        const reflectionHost = new TypeScriptReflectionHost(checker);
+        const compiler = new TraitCompiler(
+            [new PartialDecoratorHandler(), new FullDecoratorHandler()], reflectionHost,
+            NOOP_PERF_RECORDER, NOOP_INCREMENTAL_BUILD, true, CompilationMode.FULL,
+            new DtsTransformRegistry());
+        const sourceFile = program.getSourceFile('test.ts')!;
+        compiler.analyzeSync(sourceFile);
+        compiler.resolve();
+
+        const partialDecl =
+            getDeclaration(program, _('/test.ts'), 'Partial', isNamedClassDeclaration);
+        const partialResult = compiler.compile(partialDecl, new ConstantPool())!;
+        expect(partialResult.length).toBe(1);
+        expect(partialResult[0].name).toBe('compileFull');
+
+        const fullDecl = getDeclaration(program, _('/test.ts'), 'Full', isNamedClassDeclaration);
+        const fullResult = compiler.compile(fullDecl, new ConstantPool())!;
+        expect(fullResult.length).toBe(1);
+        expect(fullResult[0].name).toBe('compileFull');
+      });
+    });
   });
 });
diff --git a/packages/compiler-cli/src/ngtsc/translator/index.ts b/packages/compiler-cli/src/ngtsc/translator/index.ts
index 0e2dab70c5c87..8c0dfef49f728 100644
--- a/packages/compiler-cli/src/ngtsc/translator/index.ts
+++ b/packages/compiler-cli/src/ngtsc/translator/index.ts
@@ -6,4 +6,11 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export {Import, ImportManager, NamedImport, translateExpression, translateStatement, translateType} from './src/translator';
+export {AstFactory, BinaryOperator, LeadingComment, ObjectLiteralProperty, SourceMapLocation, SourceMapRange, TemplateElement, TemplateLiteral, UnaryOperator, VariableDeclarationType} from './src/api/ast_factory';
+export {Import, ImportGenerator, NamedImport} from './src/api/import_generator';
+export {Context} from './src/context';
+export {ImportManager} from './src/import_manager';
+export {ExpressionTranslatorVisitor, RecordWrappedNodeExprFn, TranslatorOptions} from './src/translator';
+export {translateType} from './src/type_translator';
+export {attachComments, TypeScriptAstFactory} from './src/typescript_ast_factory';
+export {translateExpression, translateStatement} from './src/typescript_translator';
diff --git a/packages/compiler-cli/src/ngtsc/translator/src/api/ast_factory.ts b/packages/compiler-cli/src/ngtsc/translator/src/api/ast_factory.ts
new file mode 100644
index 0000000000000..4a5890756d0f1
--- /dev/null
+++ b/packages/compiler-cli/src/ngtsc/translator/src/api/ast_factory.ts
@@ -0,0 +1,319 @@
+/**
+ * @license
+ * Copyright Google LLC 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
+ */
+
+/**
+ * Used to create transpiler specific AST nodes from Angular Output AST nodes in an abstract way.
+ *
+ * Note that the `AstFactory` makes no assumptions about the target language being generated.
+ * It is up to the caller to do this - e.g. only call `createTaggedTemplate()` or pass `let`|`const`
+ * to `createVariableDeclaration()` if the final JS will allow it.
+ */
+export interface AstFactory<TStatement, TExpression> {
+  /**
+   * Attach the `leadingComments` to the given `statement` node.
+   *
+   * @param statement the statement where the comments are to be attached.
+   * @param leadingComments the comments to attach.
+   */
+  attachComments(statement: TStatement, leadingComments: LeadingComment[]): void;
+
+  /**
+   * Create a literal array expresion (e.g. `[expr1, expr2]`).
+   *
+   * @param elements a collection of the expressions to appear in each array slot.
+   */
+  createArrayLiteral(elements: TExpression[]): TExpression;
+
+  /**
+   * Create an assignment expression (e.g. `lhsExpr = rhsExpr`).
+   *
+   * @param target an expression that evaluates to the left side of the assignment.
+   * @param value an expression that evaluates to the right side of the assignment.
+   */
+  createAssignment(target: TExpression, value: TExpression): TExpression;
+
+  /**
+   * Create a binary expression (e.g. `lhs && rhs`).
+   *
+   * @param leftOperand an expression that will appear on the left of the operator.
+   * @param operator the binary operator that will be applied.
+   * @param rightOperand an expression that will appear on the right of the operator.
+   */
+  createBinaryExpression(
+      leftOperand: TExpression, operator: BinaryOperator, rightOperand: TExpression): TExpression;
+
+  /**
+   * Create a block of statements (e.g. `{ stmt1; stmt2; }`).
+   *
+   * @param body an array of statements to be wrapped in a block.
+   */
+  createBlock(body: TStatement[]): TStatement;
+
+  /**
+   * Create an expression that is calling the `callee` with the given `args`.
+   *
+   * @param callee an expression that evaluates to a function to be called.
+   * @param args the arugments to be passed to the call.
+   * @param pure whether to mark the call as pure (having no side-effects).
+   */
+  createCallExpression(callee: TExpression, args: TExpression[], pure: boolean): TExpression;
+
+  /**
+   * Create a ternary expression (e.g. `testExpr ? trueExpr : falseExpr`).
+   *
+   * @param condition an expression that will be tested for truthiness.
+   * @param thenExpression an expression that is executed if `condition` is truthy.
+   * @param elseExpression an expression that is executed if `condition` is falsy.
+   */
+  createConditional(
+      condition: TExpression, thenExpression: TExpression,
+      elseExpression: TExpression): TExpression;
+
+  /**
+   * Create an element access (e.g. `obj[expr]`).
+   *
+   * @param expression an expression that evaluates to the object to be accessed.
+   * @param element an expression that evaluates to the element on the object.
+   */
+  createElementAccess(expression: TExpression, element: TExpression): TExpression;
+
+  /**
+   * Create a statement that is simply executing the given `expression` (e.g. `x = 10;`).
+   *
+   * @param expression the expression to be converted to a statement.
+   */
+  createExpressionStatement(expression: TExpression): TStatement;
+
+  /**
+   * Create a statement that declares a function (e.g. `function foo(param1, param2) { stmt; }`).
+   *
+   * @param functionName the name of the function.
+   * @param parameters the names of the function's parameters.
+   * @param body a statement (or a block of statements) that are the body of the function.
+   */
+  createFunctionDeclaration(functionName: string, parameters: string[], body: TStatement):
+      TStatement;
+
+  /**
+   * Create an expression that represents a function
+   * (e.g. `function foo(param1, param2) { stmt; }`).
+   *
+   * @param functionName the name of the function.
+   * @param parameters the names of the function's parameters.
+   * @param body a statement (or a block of statements) that are the body of the function.
+   */
+  createFunctionExpression(functionName: string|null, parameters: string[], body: TStatement):
+      TExpression;
+
+  /**
+   * Create an identifier.
+   *
+   * @param name the name of the identifier.
+   */
+  createIdentifier(name: string): TExpression;
+
+  /**
+   * Create an if statement (e.g. `if (testExpr) { trueStmt; } else { falseStmt; }`).
+   *
+   * @param condition an expression that will be tested for truthiness.
+   * @param thenStatement a statement (or block of statements) that is executed if `condition` is
+   *     truthy.
+   * @param elseStatement a statement (or block of statements) that is executed if `condition` is
+   *     falsy.
+   */
+  createIfStatement(
+      condition: TExpression, thenStatement: TStatement,
+      elseStatement: TStatement|null): TStatement;
+
+  /**
+   * Create a simple literal (e.g. `"string"`, `123`, `false`, etc).
+   *
+   * @param value the value of the literal.
+   */
+  createLiteral(value: string|number|boolean|null|undefined): TExpression;
+
+  /**
+   * Create an expression that is instantiating the `expression` as a class.
+   *
+   * @param expression an expression that evaluates to a constructor to be instantiated.
+   * @param args the arguments to be passed to the constructor.
+   */
+  createNewExpression(expression: TExpression, args: TExpression[]): TExpression;
+
+  /**
+   * Create a literal object expression (e.g. `{ prop1: expr1, prop2: expr2 }`).
+   *
+   * @param properties the properties (key and value) to appear in the object.
+   */
+  createObjectLiteral(properties: ObjectLiteralProperty<TExpression>[]): TExpression;
+
+  /**
+   * Wrap an expression in parentheses.
+   *
+   * @param expression the expression to wrap in parentheses.
+   */
+  createParenthesizedExpression(expression: TExpression): TExpression;
+
+  /**
+   * Create a property access (e.g. `obj.prop`).
+   *
+   * @param expression an expression that evaluates to the object to be accessed.
+   * @param propertyName the name of the property to access.
+   */
+  createPropertyAccess(expression: TExpression, propertyName: string): TExpression;
+
+  /**
+   * Create a return statement (e.g `return expr;`).
+   *
+   * @param expression the expression to be returned.
+   */
+  createReturnStatement(expression: TExpression|null): TStatement;
+
+  /**
+   * Create a tagged template literal string. E.g.
+   *
+   * ```
+   * tag`str1${expr1}str2${expr2}str3`
+   * ```
+   *
+   * @param tag an expression that is applied as a tag handler for this template string.
+   * @param template the collection of strings and expressions that constitute an interpolated
+   *     template literal.
+   */
+  createTaggedTemplate(tag: TExpression, template: TemplateLiteral<TExpression>): TExpression;
+
+  /**
+   * Create a throw statement (e.g. `throw expr;`).
+   *
+   * @param expression the expression to be thrown.
+   */
+  createThrowStatement(expression: TExpression): TStatement;
+
+  /**
+   * Create an expression that extracts the type of an expression (e.g. `typeof expr`).
+   *
+   * @param expression the expression whose type we want.
+   */
+  createTypeOfExpression(expression: TExpression): TExpression;
+
+  /**
+   * Prefix the `operand` with the given `operator` (e.g. `-expr`).
+   *
+   * @param operator the text of the operator to apply (e.g. `+`, `-` or `!`).
+   * @param operand the expression that the operator applies to.
+   */
+  createUnaryExpression(operator: UnaryOperator, operand: TExpression): TExpression;
+
+  /**
+   * Create an expression that declares a new variable, possibly initialized to `initializer`.
+   *
+   * @param variableName the name of the variable.
+   * @param initializer if not `null` then this expression is assigned to the declared variable.
+   * @param type whether this variable should be declared as `var`, `let` or `const`.
+   */
+  createVariableDeclaration(
+      variableName: string, initializer: TExpression|null,
+      type: VariableDeclarationType): TStatement;
+
+  /**
+   * Attach a source map range to the given node.
+   *
+   * @param node the node to which the range should be attached.
+   * @param sourceMapRange the range to attach to the node, or null if there is no range to attach.
+   * @returns the `node` with the `sourceMapRange` attached.
+   */
+  setSourceMapRange<T extends TStatement|TExpression>(node: T, sourceMapRange: SourceMapRange|null):
+      T;
+}
+
+/**
+ * The type of a variable declaration.
+ */
+export type VariableDeclarationType = 'const'|'let'|'var';
+
+/**
+ * The unary operators supported by the `AstFactory`.
+ */
+export type UnaryOperator = '+'|'-'|'!';
+
+/**
+ * The binary operators supported by the `AstFactory`.
+ */
+export type BinaryOperator =
+    '&&'|'>'|'>='|'&'|'/'|'=='|'==='|'<'|'<='|'-'|'%'|'*'|'!='|'!=='|'||'|'+';
+
+/**
+ * The original location of the start or end of a node created by the `AstFactory`.
+ */
+export interface SourceMapLocation {
+  /** 0-based character position of the location in the original source file. */
+  offset: number;
+  /** 0-based line index of the location in the original source file. */
+  line: number;
+  /** 0-based column position of the location in the original source file. */
+  column: number;
+}
+
+/**
+ * The original range of a node created by the `AstFactory`.
+ */
+export interface SourceMapRange {
+  url: string;
+  content: string;
+  start: SourceMapLocation;
+  end: SourceMapLocation;
+}
+
+/**
+ * Information used by the `AstFactory` to create a property on an object literal expression.
+ */
+export interface ObjectLiteralProperty<TExpression> {
+  propertyName: string;
+  value: TExpression;
+  /**
+   * Whether the `propertyName` should be enclosed in quotes.
+   */
+  quoted: boolean;
+}
+
+/**
+ * Information used by the `AstFactory` to create a template literal string (i.e. a back-ticked
+ * string with interpolations).
+ */
+export interface TemplateLiteral<TExpression> {
+  /**
+   * A collection of the static string pieces of the interpolated template literal string.
+   */
+  elements: TemplateElement[];
+  /**
+   * A collection of the interpolated expressions that are interleaved between the elements.
+   */
+  expressions: TExpression[];
+}
+
+/**
+ * Information about a static string piece of an interpolated template literal string.
+ */
+export interface TemplateElement {
+  /** The raw string as it was found in the original source code. */
+  raw: string;
+  /** The parsed string, with escape codes etc processed. */
+  cooked: string;
+  /** The original location of this piece of the template literal string. */
+  range: SourceMapRange|null;
+}
+
+/**
+ * Information used by the `AstFactory` to prepend a comment to a statement that was created by the
+ * `AstFactory`.
+ */
+export interface LeadingComment {
+  toString(): string;
+  multiline: boolean;
+  trailingNewline: boolean;
+}
diff --git a/packages/compiler-cli/src/ngtsc/translator/src/api/import_generator.ts b/packages/compiler-cli/src/ngtsc/translator/src/api/import_generator.ts
new file mode 100644
index 0000000000000..5e5fd3474de6c
--- /dev/null
+++ b/packages/compiler-cli/src/ngtsc/translator/src/api/import_generator.ts
@@ -0,0 +1,39 @@
+/**
+ * @license
+ * Copyright Google LLC 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
+ */
+
+/**
+ * Information about an import that has been added to a module.
+ */
+export interface Import {
+  /** The name of the module that has been imported. */
+  specifier: string;
+  /** The alias of the imported module. */
+  qualifier: string;
+}
+
+/**
+ * The symbol name and import namespace of an imported symbol,
+ * which has been registered through the ImportGenerator.
+ */
+export interface NamedImport<TExpression> {
+  /** The import namespace containing this imported symbol. */
+  moduleImport: TExpression|null;
+  /** The (possibly rewritten) name of the imported symbol. */
+  symbol: string;
+}
+
+/**
+ * Generate import information based on the context of the code being generated.
+ *
+ * Implementations of these methods return a specific identifier that corresponds to the imported
+ * module.
+ */
+export interface ImportGenerator<TExpression> {
+  generateNamespaceImport(moduleName: string): TExpression;
+  generateNamedImport(moduleName: string, originalSymbol: string): NamedImport<TExpression>;
+}
diff --git a/packages/compiler-cli/src/ngtsc/translator/src/context.ts b/packages/compiler-cli/src/ngtsc/translator/src/context.ts
new file mode 100644
index 0000000000000..9e606d0b76f84
--- /dev/null
+++ b/packages/compiler-cli/src/ngtsc/translator/src/context.ts
@@ -0,0 +1,24 @@
+/**
+ * @license
+ * Copyright Google LLC 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
+ */
+
+/**
+ * The current context of a translator visitor as it traverses the AST tree.
+ *
+ * It tracks whether we are in the process of outputting a statement or an expression.
+ */
+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;
+  }
+}
diff --git a/packages/compiler-cli/src/ngtsc/translator/src/import_manager.ts b/packages/compiler-cli/src/ngtsc/translator/src/import_manager.ts
new file mode 100644
index 0000000000000..f5eeec0f4bdcc
--- /dev/null
+++ b/packages/compiler-cli/src/ngtsc/translator/src/import_manager.ts
@@ -0,0 +1,52 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {ImportRewriter, NoopImportRewriter} from '../../imports';
+import {Import, ImportGenerator, NamedImport} from './api/import_generator';
+
+export class ImportManager implements ImportGenerator<ts.Identifier> {
+  private specifierToIdentifier = new Map<string, ts.Identifier>();
+  private nextIndex = 0;
+
+  constructor(protected rewriter: ImportRewriter = new NoopImportRewriter(), private prefix = 'i') {
+  }
+
+  generateNamespaceImport(moduleName: string): ts.Identifier {
+    if (!this.specifierToIdentifier.has(moduleName)) {
+      this.specifierToIdentifier.set(
+          moduleName, ts.createIdentifier(`${this.prefix}${this.nextIndex++}`));
+    }
+    return this.specifierToIdentifier.get(moduleName)!;
+  }
+
+  generateNamedImport(moduleName: string, originalSymbol: string): NamedImport<ts.Identifier> {
+    // First, rewrite the symbol name.
+    const symbol = this.rewriter.rewriteSymbol(originalSymbol, moduleName);
+
+    // Ask the rewriter if this symbol should be imported at all. If not, it can be referenced
+    // directly (moduleImport: null).
+    if (!this.rewriter.shouldImportSymbol(symbol, moduleName)) {
+      // The symbol should be referenced directly.
+      return {moduleImport: null, symbol};
+    }
+
+    // If not, this symbol will be imported using a generated namespace import.
+    const moduleImport = this.generateNamespaceImport(moduleName);
+
+    return {moduleImport, symbol};
+  }
+
+  getAllImports(contextPath: string): Import[] {
+    const imports: {specifier: string, qualifier: string}[] = [];
+    this.specifierToIdentifier.forEach((qualifier, specifier) => {
+      specifier = this.rewriter.rewriteSpecifier(specifier, contextPath);
+      imports.push({specifier, qualifier: qualifier.text});
+    });
+    return imports;
+  }
+}
diff --git a/packages/compiler-cli/src/ngtsc/translator/src/translator.ts b/packages/compiler-cli/src/ngtsc/translator/src/translator.ts
index c91a6bdf59b10..2a2da50088715 100644
--- a/packages/compiler-cli/src/ngtsc/translator/src/translator.ts
+++ b/packages/compiler-cli/src/ngtsc/translator/src/translator.ts
@@ -5,284 +5,249 @@
  * 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 '@angular/compiler';
 
-import {ArrayType, AssertNotNull, BinaryOperator, BinaryOperatorExpr, BuiltinType, BuiltinTypeName, CastExpr, ClassStmt, CommaExpr, CommentStmt, ConditionalExpr, DeclareFunctionStmt, DeclareVarStmt, Expression, ExpressionStatement, ExpressionType, ExpressionVisitor, ExternalExpr, FunctionExpr, IfStmt, InstantiateExpr, InvokeFunctionExpr, InvokeMethodExpr, JSDocCommentStmt, LiteralArrayExpr, LiteralExpr, LiteralMapExpr, MapType, NotExpr, ReadKeyExpr, ReadPropExpr, ReadVarExpr, ReturnStatement, Statement, StatementVisitor, StmtModifier, ThrowStmt, TryCatchStmt, Type, TypeofExpr, TypeVisitor, WrappedNodeExpr, WriteKeyExpr, WritePropExpr, WriteVarExpr} from '@angular/compiler';
-import {LocalizedString} from '@angular/compiler/src/output/output_ast';
-import * as ts from 'typescript';
+import {AstFactory, BinaryOperator, ObjectLiteralProperty, SourceMapRange, TemplateElement, TemplateLiteral, UnaryOperator} from './api/ast_factory';
+import {ImportGenerator} from './api/import_generator';
+import {Context} from './context';
 
-import {DefaultImportRecorder, ImportRewriter, NOOP_DEFAULT_IMPORT_RECORDER, NoopImportRewriter} from '../../imports';
-
-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],
-  [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],
+const UNARY_OPERATORS = new Map<o.UnaryOperator, UnaryOperator>([
+  [o.UnaryOperator.Minus, '-'],
+  [o.UnaryOperator.Plus, '+'],
 ]);
 
-/**
- * Information about an import that has been added to a module.
- */
-export interface Import {
-  /** The name of the module that has been imported. */
-  specifier: string;
-  /** The alias of the imported module. */
-  qualifier: string;
-}
-
-/**
- * The symbol name and import namespace of an imported symbol,
- * which has been registered through the ImportManager.
- */
-export interface NamedImport {
-  /** The import namespace containing this imported symbol. */
-  moduleImport: string|null;
-  /** The (possibly rewritten) name of the imported symbol. */
-  symbol: string;
-}
-
-export class ImportManager {
-  private specifierToIdentifier = new Map<string, string>();
-  private nextIndex = 0;
-
-  constructor(protected rewriter: ImportRewriter = new NoopImportRewriter(), private prefix = 'i') {
-  }
-
-  generateNamedImport(moduleName: string, originalSymbol: string): NamedImport {
-    // First, rewrite the symbol name.
-    const symbol = this.rewriter.rewriteSymbol(originalSymbol, moduleName);
-
-    // Ask the rewriter if this symbol should be imported at all. If not, it can be referenced
-    // directly (moduleImport: null).
-    if (!this.rewriter.shouldImportSymbol(symbol, moduleName)) {
-      // The symbol should be referenced directly.
-      return {moduleImport: null, symbol};
-    }
-
-    // If not, this symbol will be imported. Allocate a prefix for the imported module if needed.
-
-    if (!this.specifierToIdentifier.has(moduleName)) {
-      this.specifierToIdentifier.set(moduleName, `${this.prefix}${this.nextIndex++}`);
-    }
-    const moduleImport = this.specifierToIdentifier.get(moduleName)!;
-
-    return {moduleImport, symbol};
-  }
-
-  getAllImports(contextPath: string): Import[] {
-    const imports: {specifier: string, qualifier: string}[] = [];
-    this.specifierToIdentifier.forEach((qualifier, specifier) => {
-      specifier = this.rewriter.rewriteSpecifier(specifier, contextPath);
-      imports.push({specifier, qualifier});
-    });
-    return imports;
-  }
-}
+const BINARY_OPERATORS = new Map<o.BinaryOperator, BinaryOperator>([
+  [o.BinaryOperator.And, '&&'],
+  [o.BinaryOperator.Bigger, '>'],
+  [o.BinaryOperator.BiggerEquals, '>='],
+  [o.BinaryOperator.BitwiseAnd, '&'],
+  [o.BinaryOperator.Divide, '/'],
+  [o.BinaryOperator.Equals, '=='],
+  [o.BinaryOperator.Identical, '==='],
+  [o.BinaryOperator.Lower, '<'],
+  [o.BinaryOperator.LowerEquals, '<='],
+  [o.BinaryOperator.Minus, '-'],
+  [o.BinaryOperator.Modulo, '%'],
+  [o.BinaryOperator.Multiply, '*'],
+  [o.BinaryOperator.NotEquals, '!='],
+  [o.BinaryOperator.NotIdentical, '!=='],
+  [o.BinaryOperator.Or, '||'],
+  [o.BinaryOperator.Plus, '+'],
+]);
 
-export function translateExpression(
-    expression: Expression, imports: ImportManager, defaultImportRecorder: DefaultImportRecorder,
-    scriptTarget: Exclude<ts.ScriptTarget, ts.ScriptTarget.JSON>): ts.Expression {
-  return expression.visitExpression(
-      new ExpressionTranslatorVisitor(imports, defaultImportRecorder, scriptTarget),
-      new Context(false));
-}
+export type RecordWrappedNodeExprFn<TExpression> = (expr: TExpression) => void;
 
-export function translateStatement(
-    statement: Statement, imports: ImportManager, defaultImportRecorder: DefaultImportRecorder,
-    scriptTarget: Exclude<ts.ScriptTarget, ts.ScriptTarget.JSON>): ts.Statement {
-  return statement.visitStatement(
-      new ExpressionTranslatorVisitor(imports, defaultImportRecorder, scriptTarget),
-      new Context(true));
+export interface TranslatorOptions<TExpression> {
+  downlevelLocalizedStrings?: boolean;
+  downlevelVariableDeclarations?: boolean;
+  recordWrappedNodeExpr?: RecordWrappedNodeExprFn<TExpression>;
 }
 
-export function translateType(type: Type, imports: ImportManager): ts.TypeNode {
-  return type.visitType(new TypeTranslatorVisitor(imports), new Context(false));
-}
+export class ExpressionTranslatorVisitor<TStatement, TExpression> implements o.ExpressionVisitor,
+                                                                             o.StatementVisitor {
+  private downlevelLocalizedStrings: boolean;
+  private downlevelVariableDeclarations: boolean;
+  private recordWrappedNodeExpr: RecordWrappedNodeExprFn<TExpression>;
 
-class ExpressionTranslatorVisitor implements ExpressionVisitor, StatementVisitor {
-  private externalSourceFiles = new Map<string, ts.SourceMapSource>();
   constructor(
-      private imports: ImportManager, private defaultImportRecorder: DefaultImportRecorder,
-      private scriptTarget: Exclude<ts.ScriptTarget, ts.ScriptTarget.JSON>) {}
-
-  visitDeclareVarStmt(stmt: DeclareVarStmt, context: Context): ts.VariableStatement {
-    const nodeFlags =
-        ((this.scriptTarget >= ts.ScriptTarget.ES2015) && 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.withExpressionMode))],
-            nodeFlags));
+      private factory: AstFactory<TStatement, TExpression>,
+      private imports: ImportGenerator<TExpression>, options: TranslatorOptions<TExpression>) {
+    this.downlevelLocalizedStrings = options.downlevelLocalizedStrings === true;
+    this.downlevelVariableDeclarations = options.downlevelVariableDeclarations === true;
+    this.recordWrappedNodeExpr = options.recordWrappedNodeExpr || (() => {});
   }
 
-  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.withStatementMode))));
+  visitDeclareVarStmt(stmt: o.DeclareVarStmt, context: Context): TStatement {
+    const varType = this.downlevelVariableDeclarations ?
+        'var' :
+        stmt.hasModifier(o.StmtModifier.Final) ? 'const' : 'let';
+    return this.attachComments(
+        this.factory.createVariableDeclaration(
+            stmt.name, stmt.value?.visitExpression(this, context.withExpressionMode), varType),
+        stmt.leadingComments);
   }
 
-  visitExpressionStmt(stmt: ExpressionStatement, context: Context): ts.ExpressionStatement {
-    return ts.createStatement(stmt.expr.visitExpression(this, context.withStatementMode));
+  visitDeclareFunctionStmt(stmt: o.DeclareFunctionStmt, context: Context): TStatement {
+    return this.attachComments(
+        this.factory.createFunctionDeclaration(
+            stmt.name, stmt.params.map(param => param.name),
+            this.factory.createBlock(
+                this.visitStatements(stmt.statements, context.withStatementMode))),
+        stmt.leadingComments);
   }
 
-  visitReturnStmt(stmt: ReturnStatement, context: Context): ts.ReturnStatement {
-    return ts.createReturn(stmt.value.visitExpression(this, context.withExpressionMode));
-  }
-
-  visitDeclareClassStmt(stmt: ClassStmt, context: Context) {
-    if (this.scriptTarget < ts.ScriptTarget.ES2015) {
-      throw new Error(
-          `Unsupported mode: Visiting a "declare class" statement (class ${stmt.name}) while ` +
-          `targeting ${ts.ScriptTarget[this.scriptTarget]}.`);
-    }
-    throw new Error('Method not implemented.');
+  visitExpressionStmt(stmt: o.ExpressionStatement, context: Context): TStatement {
+    return this.attachComments(
+        this.factory.createExpressionStatement(
+            stmt.expr.visitExpression(this, context.withStatementMode)),
+        stmt.leadingComments);
   }
 
-  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.withStatementMode))),
-        stmt.falseCase.length > 0 ?
-            ts.createBlock(stmt.falseCase.map(
-                child => child.visitStatement(this, context.withStatementMode))) :
-            undefined);
+  visitReturnStmt(stmt: o.ReturnStatement, context: Context): TStatement {
+    return this.attachComments(
+        this.factory.createReturnStatement(
+            stmt.value.visitExpression(this, context.withExpressionMode)),
+        stmt.leadingComments);
   }
 
-  visitTryCatchStmt(stmt: TryCatchStmt, context: Context) {
+  visitDeclareClassStmt(_stmt: o.ClassStmt, _context: Context): never {
     throw new Error('Method not implemented.');
   }
 
-  visitThrowStmt(stmt: ThrowStmt, context: Context): ts.ThrowStatement {
-    return ts.createThrow(stmt.error.visitExpression(this, context.withExpressionMode));
+  visitIfStmt(stmt: o.IfStmt, context: Context): TStatement {
+    return this.attachComments(
+        this.factory.createIfStatement(
+            stmt.condition.visitExpression(this, context),
+            this.factory.createBlock(
+                this.visitStatements(stmt.trueCase, context.withStatementMode)),
+            stmt.falseCase.length > 0 ? this.factory.createBlock(this.visitStatements(
+                                            stmt.falseCase, context.withStatementMode)) :
+                                        null),
+        stmt.leadingComments);
   }
 
-  visitCommentStmt(stmt: CommentStmt, context: Context): ts.NotEmittedStatement {
-    const commentStmt = ts.createNotEmittedStatement(ts.createLiteral(''));
-    ts.addSyntheticLeadingComment(
-        commentStmt,
-        stmt.multiline ? ts.SyntaxKind.MultiLineCommentTrivia :
-                         ts.SyntaxKind.SingleLineCommentTrivia,
-        stmt.comment, /** hasTrailingNewLine */ false);
-    return commentStmt;
+  visitTryCatchStmt(_stmt: o.TryCatchStmt, _context: Context): 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;
+  visitThrowStmt(stmt: o.ThrowStmt, context: Context): TStatement {
+    return this.attachComments(
+        this.factory.createThrowStatement(
+            stmt.error.visitExpression(this, context.withExpressionMode)),
+        stmt.leadingComments);
   }
 
-  visitReadVarExpr(ast: ReadVarExpr, context: Context): ts.Identifier {
-    const identifier = ts.createIdentifier(ast.name!);
-    this.setSourceMapRange(identifier, ast);
+  visitReadVarExpr(ast: o.ReadVarExpr, _context: Context): TExpression {
+    const identifier = this.factory.createIdentifier(ast.name!);
+    this.setSourceMapRange(identifier, ast.sourceSpan);
     return identifier;
   }
 
-  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);
+  visitWriteVarExpr(expr: o.WriteVarExpr, context: Context): TExpression {
+    const assignment = this.factory.createAssignment(
+        this.setSourceMapRange(this.factory.createIdentifier(expr.name), expr.sourceSpan),
+        expr.value.visitExpression(this, context),
+    );
+    return context.isStatement ? assignment :
+                                 this.factory.createParenthesizedExpression(assignment);
   }
 
-  visitWriteKeyExpr(expr: WriteKeyExpr, context: Context): ts.Expression {
+  visitWriteKeyExpr(expr: o.WriteKeyExpr, context: Context): TExpression {
     const exprContext = context.withExpressionMode;
-    const lhs = ts.createElementAccess(
+    const target = this.factory.createElementAccess(
         expr.receiver.visitExpression(this, exprContext),
-        expr.index.visitExpression(this, exprContext));
-    const rhs = expr.value.visitExpression(this, exprContext);
-    const result: ts.Expression = ts.createBinary(lhs, ts.SyntaxKind.EqualsToken, rhs);
-    return context.isStatement ? result : ts.createParen(result);
+        expr.index.visitExpression(this, exprContext),
+    );
+    const assignment =
+        this.factory.createAssignment(target, expr.value.visitExpression(this, exprContext));
+    return context.isStatement ? assignment :
+                                 this.factory.createParenthesizedExpression(assignment);
   }
 
-  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));
+  visitWritePropExpr(expr: o.WritePropExpr, context: Context): TExpression {
+    const target =
+        this.factory.createPropertyAccess(expr.receiver.visitExpression(this, context), expr.name);
+    return this.factory.createAssignment(target, expr.value.visitExpression(this, context));
   }
 
-  visitInvokeMethodExpr(ast: InvokeMethodExpr, context: Context): ts.CallExpression {
+  visitInvokeMethodExpr(ast: o.InvokeMethodExpr, context: Context): TExpression {
     const target = ast.receiver.visitExpression(this, context);
-    const call = ts.createCall(
-        ast.name !== null ? ts.createPropertyAccess(target, ast.name) : target, undefined,
-        ast.args.map(arg => arg.visitExpression(this, context)));
-    this.setSourceMapRange(call, ast);
-    return call;
+    return this.setSourceMapRange(
+        this.factory.createCallExpression(
+            ast.name !== null ? this.factory.createPropertyAccess(target, ast.name) : target,
+            ast.args.map(arg => arg.visitExpression(this, context)),
+            /* pure */ false),
+        ast.sourceSpan);
   }
 
-  visitInvokeFunctionExpr(ast: InvokeFunctionExpr, context: Context): ts.CallExpression {
-    const expr = ts.createCall(
-        ast.fn.visitExpression(this, context), undefined,
-        ast.args.map(arg => arg.visitExpression(this, context)));
-    if (ast.pure) {
-      ts.addSyntheticLeadingComment(expr, ts.SyntaxKind.MultiLineCommentTrivia, '@__PURE__', false);
-    }
-    this.setSourceMapRange(expr, ast);
-    return expr;
+  visitInvokeFunctionExpr(ast: o.InvokeFunctionExpr, context: Context): TExpression {
+    return this.setSourceMapRange(
+        this.factory.createCallExpression(
+            ast.fn.visitExpression(this, context),
+            ast.args.map(arg => arg.visitExpression(this, context)), ast.pure),
+        ast.sourceSpan);
   }
 
-  visitInstantiateExpr(ast: InstantiateExpr, context: Context): ts.NewExpression {
-    return ts.createNew(
-        ast.classExpr.visitExpression(this, context), undefined,
+  visitInstantiateExpr(ast: o.InstantiateExpr, context: Context): TExpression {
+    return this.factory.createNewExpression(
+        ast.classExpr.visitExpression(this, context),
         ast.args.map(arg => arg.visitExpression(this, context)));
   }
 
-  visitLiteralExpr(ast: LiteralExpr, context: Context): ts.Expression {
-    let expr: ts.Expression;
-    if (ast.value === undefined) {
-      expr = ts.createIdentifier('undefined');
-    } else if (ast.value === null) {
-      expr = ts.createNull();
-    } else {
-      expr = ts.createLiteral(ast.value);
+  visitLiteralExpr(ast: o.LiteralExpr, _context: Context): TExpression {
+    return this.setSourceMapRange(this.factory.createLiteral(ast.value), ast.sourceSpan);
+  }
+
+  visitLocalizedString(ast: o.LocalizedString, context: Context): TExpression {
+    // A `$localize` message consists of `messageParts` and `expressions`, which get interleaved
+    // together. The interleaved pieces look like:
+    // `[messagePart0, expression0, messagePart1, expression1, messagePart2]`
+    //
+    // Note that there is always a message part at the start and end, and so therefore
+    // `messageParts.length === expressions.length + 1`.
+    //
+    // Each message part may be prefixed with "metadata", which is wrapped in colons (:) delimiters.
+    // The metadata is attached to the first and subsequent message parts by calls to
+    // `serializeI18nHead()` and `serializeI18nTemplatePart()` respectively.
+    //
+    // The first message part (i.e. `ast.messageParts[0]`) is used to initialize `messageParts`
+    // array.
+    const elements: TemplateElement[] = [createTemplateElement(ast.serializeI18nHead())];
+    const expressions: TExpression[] = [];
+    for (let i = 0; i < ast.expressions.length; i++) {
+      const placeholder = this.setSourceMapRange(
+          ast.expressions[i].visitExpression(this, context), ast.getPlaceholderSourceSpan(i));
+      expressions.push(placeholder);
+      elements.push(createTemplateElement(ast.serializeI18nTemplatePart(i + 1)));
     }
-    this.setSourceMapRange(expr, ast);
-    return expr;
+
+    const localizeTag = this.factory.createIdentifier('$localize');
+
+    // Now choose which implementation to use to actually create the necessary AST nodes.
+    const localizeCall = this.downlevelLocalizedStrings ?
+        this.createES5TaggedTemplateFunctionCall(localizeTag, {elements, expressions}) :
+        this.factory.createTaggedTemplate(localizeTag, {elements, expressions});
+
+    return this.setSourceMapRange(localizeCall, ast.sourceSpan);
   }
 
-  visitLocalizedString(ast: LocalizedString, context: Context): ts.Expression {
-    const localizedString = this.scriptTarget >= ts.ScriptTarget.ES2015 ?
-        createLocalizedStringTaggedTemplate(ast, context, this) :
-        createLocalizedStringFunctionCall(ast, context, this, this.imports);
-    this.setSourceMapRange(localizedString, ast);
-    return localizedString;
+  /**
+   * Translate the tagged template literal into a call that is compatible with ES5, using the
+   * imported `__makeTemplateObject` helper for ES5 formatted output.
+   */
+  private createES5TaggedTemplateFunctionCall(
+      tagHandler: TExpression, {elements, expressions}: TemplateLiteral<TExpression>): TExpression {
+    // Ensure that the `__makeTemplateObject()` helper has been imported.
+    const {moduleImport, symbol} =
+        this.imports.generateNamedImport('tslib', '__makeTemplateObject');
+    const __makeTemplateObjectHelper = (moduleImport === null) ?
+        this.factory.createIdentifier(symbol) :
+        this.factory.createPropertyAccess(moduleImport, symbol);
+
+    // Collect up the cooked and raw strings into two separate arrays.
+    const cooked: TExpression[] = [];
+    const raw: TExpression[] = [];
+    for (const element of elements) {
+      cooked.push(this.factory.setSourceMapRange(
+          this.factory.createLiteral(element.cooked), element.range));
+      raw.push(
+          this.factory.setSourceMapRange(this.factory.createLiteral(element.raw), element.range));
+    }
+
+    // Generate the helper call in the form: `__makeTemplateObject([cooked], [raw]);`
+    const templateHelperCall = this.factory.createCallExpression(
+        __makeTemplateObjectHelper,
+        [this.factory.createArrayLiteral(cooked), this.factory.createArrayLiteral(raw)],
+        /* pure */ false);
+
+    // Finally create the tagged handler call in the form:
+    // `tag(__makeTemplateObject([cooked], [raw]), ...expressions);`
+    return this.factory.createCallExpression(
+        tagHandler, [templateHelperCall, ...expressions],
+        /* pure */ false);
   }
 
-  visitExternalExpr(ast: ExternalExpr, context: Context): ts.PropertyAccessExpression
-      |ts.Identifier {
+  visitExternalExpr(ast: o.ExternalExpr, _context: Context): TExpression {
     if (ast.value.name === null) {
       throw new Error(`Import unknown module or symbol ${ast.value}`);
     }
@@ -294,19 +259,18 @@ class ExpressionTranslatorVisitor implements ExpressionVisitor, StatementVisitor
           this.imports.generateNamedImport(ast.value.moduleName, ast.value.name);
       if (moduleImport === null) {
         // The symbol was ambient after all.
-        return ts.createIdentifier(symbol);
+        return this.factory.createIdentifier(symbol);
       } else {
-        return ts.createPropertyAccess(
-            ts.createIdentifier(moduleImport), ts.createIdentifier(symbol));
+        return this.factory.createPropertyAccess(moduleImport, symbol);
       }
     } else {
       // The symbol is ambient, so just reference it.
-      return ts.createIdentifier(ast.value.name);
+      return this.factory.createIdentifier(ast.value.name);
     }
   }
 
-  visitConditionalExpr(ast: ConditionalExpr, context: Context): ts.ConditionalExpression {
-    let cond: ts.Expression = ast.condition.visitExpression(this, context);
+  visitConditionalExpr(ast: o.ConditionalExpr, context: Context): TExpression {
+    let cond: TExpression = ast.condition.visitExpression(this, context);
 
     // Ordinarily the ternary operator is right-associative. The following are equivalent:
     //   `a ? b : c ? d : e` => `a ? b : (c ? d : e)`
@@ -328,420 +292,136 @@ class ExpressionTranslatorVisitor implements ExpressionVisitor, StatementVisitor
     // conditional expression is directly used as the condition of another.
     //
     // TODO(alxhub): investigate better logic for precendence of conditional operators
-    if (ast.condition instanceof ConditionalExpr) {
+    if (ast.condition instanceof o.ConditionalExpr) {
       // The condition of this ternary needs to be wrapped in parentheses to maintain
       // left-associativity.
-      cond = ts.createParen(cond);
+      cond = this.factory.createParenthesizedExpression(cond);
     }
 
-    return ts.createConditional(
+    return this.factory.createConditional(
         cond, ast.trueCase.visitExpression(this, context),
         ast.falseCase!.visitExpression(this, context));
   }
 
-  visitNotExpr(ast: NotExpr, context: Context): ts.PrefixUnaryExpression {
-    return ts.createPrefix(
-        ts.SyntaxKind.ExclamationToken, ast.condition.visitExpression(this, context));
+  visitNotExpr(ast: o.NotExpr, context: Context): TExpression {
+    return this.factory.createUnaryExpression('!', ast.condition.visitExpression(this, context));
   }
 
-  visitAssertNotNullExpr(ast: AssertNotNull, context: Context): ts.NonNullExpression {
+  visitAssertNotNullExpr(ast: o.AssertNotNull, context: Context): TExpression {
     return ast.condition.visitExpression(this, context);
   }
 
-  visitCastExpr(ast: CastExpr, context: Context): ts.Expression {
+  visitCastExpr(ast: o.CastExpr, context: Context): TExpression {
     return ast.value.visitExpression(this, context);
   }
 
-  visitFunctionExpr(ast: FunctionExpr, context: Context): ts.FunctionExpression {
-    return ts.createFunctionExpression(
-        undefined, undefined, ast.name || undefined, undefined,
-        ast.params.map(
-            param => ts.createParameter(
-                undefined, undefined, undefined, param.name, undefined, undefined, undefined)),
-        undefined, ts.createBlock(ast.statements.map(stmt => stmt.visitStatement(this, context))));
+  visitFunctionExpr(ast: o.FunctionExpr, context: Context): TExpression {
+    return this.factory.createFunctionExpression(
+        ast.name ?? null, ast.params.map(param => param.name),
+        this.factory.createBlock(this.visitStatements(ast.statements, context)));
   }
 
-  visitBinaryOperatorExpr(ast: BinaryOperatorExpr, context: Context): ts.Expression {
+  visitBinaryOperatorExpr(ast: o.BinaryOperatorExpr, context: Context): TExpression {
     if (!BINARY_OPERATORS.has(ast.operator)) {
-      throw new Error(`Unknown binary operator: ${BinaryOperator[ast.operator]}`);
+      throw new Error(`Unknown binary operator: ${o.BinaryOperator[ast.operator]}`);
     }
-    return ts.createBinary(
-        ast.lhs.visitExpression(this, context), BINARY_OPERATORS.get(ast.operator)!,
-        ast.rhs.visitExpression(this, context));
+    return this.factory.createBinaryExpression(
+        ast.lhs.visitExpression(this, context),
+        BINARY_OPERATORS.get(ast.operator)!,
+        ast.rhs.visitExpression(this, context),
+    );
   }
 
-  visitReadPropExpr(ast: ReadPropExpr, context: Context): ts.PropertyAccessExpression {
-    return ts.createPropertyAccess(ast.receiver.visitExpression(this, context), ast.name);
+  visitReadPropExpr(ast: o.ReadPropExpr, context: Context): TExpression {
+    return this.factory.createPropertyAccess(ast.receiver.visitExpression(this, context), ast.name);
   }
 
-  visitReadKeyExpr(ast: ReadKeyExpr, context: Context): ts.ElementAccessExpression {
-    return ts.createElementAccess(
+  visitReadKeyExpr(ast: o.ReadKeyExpr, context: Context): TExpression {
+    return this.factory.createElementAccess(
         ast.receiver.visitExpression(this, context), ast.index.visitExpression(this, context));
   }
 
-  visitLiteralArrayExpr(ast: LiteralArrayExpr, context: Context): ts.ArrayLiteralExpression {
-    const expr =
-        ts.createArrayLiteral(ast.entries.map(expr => expr.visitExpression(this, context)));
-    this.setSourceMapRange(expr, ast);
-    return expr;
+  visitLiteralArrayExpr(ast: o.LiteralArrayExpr, context: Context): TExpression {
+    return this.factory.createArrayLiteral(ast.entries.map(
+        expr => this.setSourceMapRange(expr.visitExpression(this, context), ast.sourceSpan)));
   }
 
-  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),
-            entry.value.visitExpression(this, context)));
-    const expr = ts.createObjectLiteral(entries);
-    this.setSourceMapRange(expr, ast);
-    return expr;
+  visitLiteralMapExpr(ast: o.LiteralMapExpr, context: Context): TExpression {
+    const properties: ObjectLiteralProperty<TExpression>[] = ast.entries.map(entry => {
+      return {
+        propertyName: entry.key,
+        quoted: entry.quoted,
+        value: entry.value.visitExpression(this, context)
+      };
+    });
+    return this.setSourceMapRange(this.factory.createObjectLiteral(properties), ast.sourceSpan);
   }
 
-  visitCommaExpr(ast: CommaExpr, context: Context): never {
+  visitCommaExpr(ast: o.CommaExpr, context: Context): never {
     throw new Error('Method not implemented.');
   }
 
-  visitWrappedNodeExpr(ast: WrappedNodeExpr<any>, context: Context): any {
-    if (ts.isIdentifier(ast.node)) {
-      this.defaultImportRecorder.recordUsedIdentifier(ast.node);
-    }
+  visitWrappedNodeExpr(ast: o.WrappedNodeExpr<any>, _context: Context): any {
+    this.recordWrappedNodeExpr(ast.node);
     return ast.node;
   }
 
-  visitTypeofExpr(ast: TypeofExpr, context: Context): ts.TypeOfExpression {
-    return ts.createTypeOf(ast.expr.visitExpression(this, context));
-  }
-
-  private setSourceMapRange(expr: ts.Expression, ast: Expression) {
-    if (ast.sourceSpan) {
-      const {start, end} = ast.sourceSpan;
-      const {url, content} = start.file;
-      if (url) {
-        if (!this.externalSourceFiles.has(url)) {
-          this.externalSourceFiles.set(url, ts.createSourceMapSource(url, content, pos => pos));
-        }
-        const source = this.externalSourceFiles.get(url);
-        ts.setSourceMapRange(expr, {pos: start.offset, end: end.offset, source});
-      }
-    }
-  }
-}
-
-export class TypeTranslatorVisitor implements ExpressionVisitor, TypeVisitor {
-  constructor(private imports: ImportManager) {}
-
-  visitBuiltinType(type: BuiltinType, context: Context): ts.KeywordTypeNode {
-    switch (type.name) {
-      case BuiltinTypeName.Bool:
-        return ts.createKeywordTypeNode(ts.SyntaxKind.BooleanKeyword);
-      case BuiltinTypeName.Dynamic:
-        return ts.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword);
-      case BuiltinTypeName.Int:
-      case BuiltinTypeName.Number:
-        return ts.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword);
-      case BuiltinTypeName.String:
-        return ts.createKeywordTypeNode(ts.SyntaxKind.StringKeyword);
-      case BuiltinTypeName.None:
-        return ts.createKeywordTypeNode(ts.SyntaxKind.NeverKeyword);
-      default:
-        throw new Error(`Unsupported builtin type: ${BuiltinTypeName[type.name]}`);
-    }
-  }
-
-  visitExpressionType(type: ExpressionType, context: Context): ts.TypeNode {
-    const typeNode = this.translateExpression(type.value, context);
-    if (type.typeParams === null) {
-      return typeNode;
-    }
-
-    if (!ts.isTypeReferenceNode(typeNode)) {
-      throw new Error(
-          'An ExpressionType with type arguments must translate into a TypeReferenceNode');
-    } else if (typeNode.typeArguments !== undefined) {
-      throw new Error(
-          `An ExpressionType with type arguments cannot have multiple levels of type arguments`);
-    }
-
-    const typeArgs = type.typeParams.map(param => this.translateType(param, context));
-    return ts.createTypeReferenceNode(typeNode.typeName, typeArgs);
-  }
-
-  visitArrayType(type: ArrayType, context: Context): ts.ArrayTypeNode {
-    return ts.createArrayTypeNode(this.translateType(type.of, context));
-  }
-
-  visitMapType(type: MapType, context: Context): ts.TypeLiteralNode {
-    const parameter = ts.createParameter(
-        undefined, undefined, undefined, 'key', undefined,
-        ts.createKeywordTypeNode(ts.SyntaxKind.StringKeyword));
-    const typeArgs = type.valueType !== null ?
-        this.translateType(type.valueType, context) :
-        ts.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword);
-    const indexSignature = ts.createIndexSignature(undefined, undefined, [parameter], typeArgs);
-    return ts.createTypeLiteralNode([indexSignature]);
+  visitTypeofExpr(ast: o.TypeofExpr, context: Context): TExpression {
+    return this.factory.createTypeOfExpression(ast.expr.visitExpression(this, context));
   }
 
-  visitReadVarExpr(ast: ReadVarExpr, context: Context): ts.TypeQueryNode {
-    if (ast.name === null) {
-      throw new Error(`ReadVarExpr with no variable name in type`);
+  visitUnaryOperatorExpr(ast: o.UnaryOperatorExpr, context: Context): TExpression {
+    if (!UNARY_OPERATORS.has(ast.operator)) {
+      throw new Error(`Unknown unary operator: ${o.UnaryOperator[ast.operator]}`);
     }
-    return ts.createTypeQueryNode(ts.createIdentifier(ast.name));
+    return this.factory.createUnaryExpression(
+        UNARY_OPERATORS.get(ast.operator)!, ast.expr.visitExpression(this, context));
   }
 
-  visitWriteVarExpr(expr: WriteVarExpr, context: Context): never {
-    throw new Error('Method not implemented.');
-  }
-
-  visitWriteKeyExpr(expr: WriteKeyExpr, context: Context): never {
-    throw new Error('Method not implemented.');
-  }
-
-  visitWritePropExpr(expr: WritePropExpr, context: Context): never {
-    throw new Error('Method not implemented.');
-  }
-
-  visitInvokeMethodExpr(ast: InvokeMethodExpr, context: Context): never {
-    throw new Error('Method not implemented.');
-  }
-
-  visitInvokeFunctionExpr(ast: InvokeFunctionExpr, context: Context): never {
-    throw new Error('Method not implemented.');
-  }
-
-  visitInstantiateExpr(ast: InstantiateExpr, context: Context): never {
-    throw new Error('Method not implemented.');
-  }
-
-  visitLiteralExpr(ast: LiteralExpr, context: Context): ts.TypeNode {
-    if (ast.value === null) {
-      return ts.createKeywordTypeNode(ts.SyntaxKind.NullKeyword);
-    } else if (ast.value === undefined) {
-      return ts.createKeywordTypeNode(ts.SyntaxKind.UndefinedKeyword);
-    } else if (typeof ast.value === 'boolean') {
-      return ts.createLiteralTypeNode(ts.createLiteral(ast.value));
-    } else if (typeof ast.value === 'number') {
-      return ts.createLiteralTypeNode(ts.createLiteral(ast.value));
-    } else {
-      return ts.createLiteralTypeNode(ts.createLiteral(ast.value));
-    }
-  }
-
-  visitLocalizedString(ast: LocalizedString, context: Context): never {
-    throw new Error('Method not implemented.');
-  }
-
-  visitExternalExpr(ast: ExternalExpr, context: Context): ts.EntityName|ts.TypeReferenceNode {
-    if (ast.value.moduleName === null || ast.value.name === null) {
-      throw new Error(`Import unknown module or symbol`);
-    }
-    const {moduleImport, symbol} =
-        this.imports.generateNamedImport(ast.value.moduleName, ast.value.name);
-    const symbolIdentifier = ts.createIdentifier(symbol);
-
-    const typeName = moduleImport ?
-        ts.createQualifiedName(ts.createIdentifier(moduleImport), symbolIdentifier) :
-        symbolIdentifier;
-
-    const typeArguments = ast.typeParams !== null ?
-        ast.typeParams.map(type => this.translateType(type, context)) :
-        undefined;
-    return ts.createTypeReferenceNode(typeName, typeArguments);
-  }
-
-  visitConditionalExpr(ast: ConditionalExpr, context: Context) {
-    throw new Error('Method not implemented.');
-  }
-
-  visitNotExpr(ast: NotExpr, context: Context) {
-    throw new Error('Method not implemented.');
-  }
-
-  visitAssertNotNullExpr(ast: AssertNotNull, context: Context) {
-    throw new Error('Method not implemented.');
-  }
-
-  visitCastExpr(ast: CastExpr, context: Context) {
-    throw new Error('Method not implemented.');
-  }
-
-  visitFunctionExpr(ast: FunctionExpr, context: Context) {
-    throw new Error('Method not implemented.');
-  }
-
-  visitBinaryOperatorExpr(ast: BinaryOperatorExpr, context: Context) {
-    throw new Error('Method not implemented.');
+  private visitStatements(statements: o.Statement[], context: Context): TStatement[] {
+    return statements.map(stmt => stmt.visitStatement(this, context))
+        .filter(stmt => stmt !== undefined);
   }
 
-  visitReadPropExpr(ast: ReadPropExpr, context: Context) {
-    throw new Error('Method not implemented.');
-  }
-
-  visitReadKeyExpr(ast: ReadKeyExpr, context: Context) {
-    throw new Error('Method not implemented.');
-  }
-
-  visitLiteralArrayExpr(ast: LiteralArrayExpr, context: Context): ts.TupleTypeNode {
-    const values = ast.entries.map(expr => this.translateExpression(expr, context));
-    return ts.createTupleTypeNode(values);
-  }
-
-  visitLiteralMapExpr(ast: LiteralMapExpr, context: Context): ts.TypeLiteralNode {
-    const entries = ast.entries.map(entry => {
-      const {key, quoted} = entry;
-      const type = this.translateExpression(entry.value, context);
-      return ts.createPropertySignature(
-          /* modifiers */ undefined,
-          /* name */ quoted ? ts.createStringLiteral(key) : key,
-          /* questionToken */ undefined,
-          /* type */ type,
-          /* initializer */ undefined);
-    });
-    return ts.createTypeLiteralNode(entries);
+  private setSourceMapRange<T extends TExpression|TStatement>(ast: T, span: o.ParseSourceSpan|null):
+      T {
+    return this.factory.setSourceMapRange(ast, createRange(span));
   }
 
-  visitCommaExpr(ast: CommaExpr, context: Context) {
-    throw new Error('Method not implemented.');
-  }
-
-  visitWrappedNodeExpr(ast: WrappedNodeExpr<any>, context: Context): ts.TypeNode {
-    const node: ts.Node = ast.node;
-    if (ts.isEntityName(node)) {
-      return ts.createTypeReferenceNode(node, /* typeArguments */ undefined);
-    } else if (ts.isTypeNode(node)) {
-      return node;
-    } else if (ts.isLiteralExpression(node)) {
-      return ts.createLiteralTypeNode(node);
-    } else {
-      throw new Error(
-          `Unsupported WrappedNodeExpr in TypeTranslatorVisitor: ${ts.SyntaxKind[node.kind]}`);
-    }
-  }
-
-  visitTypeofExpr(ast: TypeofExpr, context: Context): ts.TypeQueryNode {
-    let expr = translateExpression(
-        ast.expr, this.imports, NOOP_DEFAULT_IMPORT_RECORDER, ts.ScriptTarget.ES2015);
-    return ts.createTypeQueryNode(expr as ts.Identifier);
-  }
-
-  private translateType(type: Type, context: Context): ts.TypeNode {
-    const typeNode = type.visitType(this, context);
-    if (!ts.isTypeNode(typeNode)) {
-      throw new Error(
-          `A Type must translate to a TypeNode, but was ${ts.SyntaxKind[typeNode.kind]}`);
+  private attachComments(statement: TStatement, leadingComments: o.LeadingComment[]|undefined):
+      TStatement {
+    if (leadingComments !== undefined) {
+      this.factory.attachComments(statement, leadingComments);
     }
-    return typeNode;
-  }
-
-  private translateExpression(expr: Expression, context: Context): ts.TypeNode {
-    const typeNode = expr.visitExpression(this, context);
-    if (!ts.isTypeNode(typeNode)) {
-      throw new Error(
-          `An Expression must translate to a TypeNode, but was ${ts.SyntaxKind[typeNode.kind]}`);
-    }
-    return typeNode;
+    return statement;
   }
 }
 
 /**
- * Translate the `LocalizedString` node into a `TaggedTemplateExpression` for ES2015 formatted
- * output.
+ * Convert a cooked-raw string object into one that can be used by the AST factories.
  */
-function createLocalizedStringTaggedTemplate(
-    ast: LocalizedString, context: Context, visitor: ExpressionVisitor) {
-  let template: ts.TemplateLiteral;
-  const length = ast.messageParts.length;
-  const metaBlock = ast.serializeI18nHead();
-  if (length === 1) {
-    template = ts.createNoSubstitutionTemplateLiteral(metaBlock.cooked, metaBlock.raw);
-  } else {
-    // Create the head part
-    const head = ts.createTemplateHead(metaBlock.cooked, metaBlock.raw);
-    const spans: ts.TemplateSpan[] = [];
-    // Create the middle parts
-    for (let i = 1; i < length - 1; i++) {
-      const resolvedExpression = ast.expressions[i - 1].visitExpression(visitor, context);
-      const templatePart = ast.serializeI18nTemplatePart(i);
-      const templateMiddle = createTemplateMiddle(templatePart.cooked, templatePart.raw);
-      spans.push(ts.createTemplateSpan(resolvedExpression, templateMiddle));
-    }
-    // Create the tail part
-    const resolvedExpression = ast.expressions[length - 2].visitExpression(visitor, context);
-    const templatePart = ast.serializeI18nTemplatePart(length - 1);
-    const templateTail = createTemplateTail(templatePart.cooked, templatePart.raw);
-    spans.push(ts.createTemplateSpan(resolvedExpression, templateTail));
-    // Put it all together
-    template = ts.createTemplateExpression(head, spans);
-  }
-  return ts.createTaggedTemplate(ts.createIdentifier('$localize'), template);
-}
-
-
-// HACK: Use this in place of `ts.createTemplateMiddle()`.
-// Revert once https://github.com/microsoft/TypeScript/issues/35374 is fixed
-function createTemplateMiddle(cooked: string, raw: string): ts.TemplateMiddle {
-  const node: ts.TemplateLiteralLikeNode = ts.createTemplateHead(cooked, raw);
-  node.kind = ts.SyntaxKind.TemplateMiddle;
-  return node as ts.TemplateMiddle;
-}
-
-// HACK: Use this in place of `ts.createTemplateTail()`.
-// Revert once https://github.com/microsoft/TypeScript/issues/35374 is fixed
-function createTemplateTail(cooked: string, raw: string): ts.TemplateTail {
-  const node: ts.TemplateLiteralLikeNode = ts.createTemplateHead(cooked, raw);
-  node.kind = ts.SyntaxKind.TemplateTail;
-  return node as ts.TemplateTail;
+function createTemplateElement(
+    {cooked, raw, range}: {cooked: string, raw: string, range: o.ParseSourceSpan|null}):
+    TemplateElement {
+  return {cooked, raw, range: createRange(range)};
 }
 
 /**
- * Translate the `LocalizedString` node into a `$localize` call using the imported
- * `__makeTemplateObject` helper for ES5 formatted output.
+ * Convert an OutputAST source-span into a range that can be used by the AST factories.
  */
-function createLocalizedStringFunctionCall(
-    ast: LocalizedString, context: Context, visitor: ExpressionVisitor, imports: ImportManager) {
-  // A `$localize` message consists `messageParts` and `expressions`, which get interleaved
-  // together. The interleaved pieces look like:
-  // `[messagePart0, expression0, messagePart1, expression1, messagePart2]`
-  //
-  // Note that there is always a message part at the start and end, and so therefore
-  // `messageParts.length === expressions.length + 1`.
-  //
-  // Each message part may be prefixed with "metadata", which is wrapped in colons (:) delimiters.
-  // The metadata is attached to the first and subsequent message parts by calls to
-  // `serializeI18nHead()` and `serializeI18nTemplatePart()` respectively.
-
-  // The first message part (i.e. `ast.messageParts[0]`) is used to initialize `messageParts` array.
-  const messageParts = [ast.serializeI18nHead()];
-  const expressions: any[] = [];
-
-  // The rest of the `ast.messageParts` and each of the expressions are `ast.expressions` pushed
-  // into the arrays. Note that `ast.messagePart[i]` corresponds to `expressions[i-1]`
-  for (let i = 1; i < ast.messageParts.length; i++) {
-    expressions.push(ast.expressions[i - 1].visitExpression(visitor, context));
-    messageParts.push(ast.serializeI18nTemplatePart(i));
-  }
-
-  // The resulting downlevelled tagged template string uses a call to the `__makeTemplateObject()`
-  // helper, so we must ensure it has been imported.
-  const {moduleImport, symbol} = imports.generateNamedImport('tslib', '__makeTemplateObject');
-  const __makeTemplateObjectHelper = (moduleImport === null) ?
-      ts.createIdentifier(symbol) :
-      ts.createPropertyAccess(ts.createIdentifier(moduleImport), ts.createIdentifier(symbol));
-
-  // Generate the call in the form:
-  // `$localize(__makeTemplateObject(cookedMessageParts, rawMessageParts), ...expressions);`
-  return ts.createCall(
-      /* expression */ ts.createIdentifier('$localize'),
-      /* typeArguments */ undefined,
-      /* argumentsArray */[
-        ts.createCall(
-            /* expression */ __makeTemplateObjectHelper,
-            /* typeArguments */ undefined,
-            /* argumentsArray */
-            [
-              ts.createArrayLiteral(
-                  messageParts.map(messagePart => ts.createStringLiteral(messagePart.cooked))),
-              ts.createArrayLiteral(
-                  messageParts.map(messagePart => ts.createStringLiteral(messagePart.raw))),
-            ]),
-        ...expressions,
-      ]);
+function createRange(span: o.ParseSourceSpan|null): SourceMapRange|null {
+  if (span === null) {
+    return null;
+  }
+  const {start, end} = span;
+  const {url, content} = start.file;
+  if (!url) {
+    return null;
+  }
+  return {
+    url,
+    content,
+    start: {offset: start.offset, line: start.line, column: start.col},
+    end: {offset: end.offset, line: end.line, column: end.col},
+  };
 }
diff --git a/packages/compiler-cli/src/ngtsc/translator/src/type_translator.ts b/packages/compiler-cli/src/ngtsc/translator/src/type_translator.ts
new file mode 100644
index 0000000000000..eb898e05af7ed
--- /dev/null
+++ b/packages/compiler-cli/src/ngtsc/translator/src/type_translator.ts
@@ -0,0 +1,243 @@
+/**
+ * @license
+ * Copyright Google LLC 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 '@angular/compiler';
+import * as ts from 'typescript';
+
+import {Context} from './context';
+import {ImportManager} from './import_manager';
+
+
+export function translateType(type: o.Type, imports: ImportManager): ts.TypeNode {
+  return type.visitType(new TypeTranslatorVisitor(imports), new Context(false));
+}
+
+export class TypeTranslatorVisitor implements o.ExpressionVisitor, o.TypeVisitor {
+  constructor(private imports: ImportManager) {}
+
+  visitBuiltinType(type: o.BuiltinType, context: Context): ts.KeywordTypeNode {
+    switch (type.name) {
+      case o.BuiltinTypeName.Bool:
+        return ts.createKeywordTypeNode(ts.SyntaxKind.BooleanKeyword);
+      case o.BuiltinTypeName.Dynamic:
+        return ts.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword);
+      case o.BuiltinTypeName.Int:
+      case o.BuiltinTypeName.Number:
+        return ts.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword);
+      case o.BuiltinTypeName.String:
+        return ts.createKeywordTypeNode(ts.SyntaxKind.StringKeyword);
+      case o.BuiltinTypeName.None:
+        return ts.createKeywordTypeNode(ts.SyntaxKind.NeverKeyword);
+      default:
+        throw new Error(`Unsupported builtin type: ${o.BuiltinTypeName[type.name]}`);
+    }
+  }
+
+  visitExpressionType(type: o.ExpressionType, context: Context): ts.TypeNode {
+    const typeNode = this.translateExpression(type.value, context);
+    if (type.typeParams === null) {
+      return typeNode;
+    }
+
+    if (!ts.isTypeReferenceNode(typeNode)) {
+      throw new Error(
+          'An ExpressionType with type arguments must translate into a TypeReferenceNode');
+    } else if (typeNode.typeArguments !== undefined) {
+      throw new Error(
+          `An ExpressionType with type arguments cannot have multiple levels of type arguments`);
+    }
+
+    const typeArgs = type.typeParams.map(param => this.translateType(param, context));
+    return ts.createTypeReferenceNode(typeNode.typeName, typeArgs);
+  }
+
+  visitArrayType(type: o.ArrayType, context: Context): ts.ArrayTypeNode {
+    return ts.createArrayTypeNode(this.translateType(type.of, context));
+  }
+
+  visitMapType(type: o.MapType, context: Context): ts.TypeLiteralNode {
+    const parameter = ts.createParameter(
+        undefined, undefined, undefined, 'key', undefined,
+        ts.createKeywordTypeNode(ts.SyntaxKind.StringKeyword));
+    const typeArgs = type.valueType !== null ?
+        this.translateType(type.valueType, context) :
+        ts.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword);
+    const indexSignature = ts.createIndexSignature(undefined, undefined, [parameter], typeArgs);
+    return ts.createTypeLiteralNode([indexSignature]);
+  }
+
+  visitReadVarExpr(ast: o.ReadVarExpr, context: Context): ts.TypeQueryNode {
+    if (ast.name === null) {
+      throw new Error(`ReadVarExpr with no variable name in type`);
+    }
+    return ts.createTypeQueryNode(ts.createIdentifier(ast.name));
+  }
+
+  visitWriteVarExpr(expr: o.WriteVarExpr, context: Context): never {
+    throw new Error('Method not implemented.');
+  }
+
+  visitWriteKeyExpr(expr: o.WriteKeyExpr, context: Context): never {
+    throw new Error('Method not implemented.');
+  }
+
+  visitWritePropExpr(expr: o.WritePropExpr, context: Context): never {
+    throw new Error('Method not implemented.');
+  }
+
+  visitInvokeMethodExpr(ast: o.InvokeMethodExpr, context: Context): never {
+    throw new Error('Method not implemented.');
+  }
+
+  visitInvokeFunctionExpr(ast: o.InvokeFunctionExpr, context: Context): never {
+    throw new Error('Method not implemented.');
+  }
+
+  visitInstantiateExpr(ast: o.InstantiateExpr, context: Context): never {
+    throw new Error('Method not implemented.');
+  }
+
+  visitLiteralExpr(ast: o.LiteralExpr, context: Context): ts.TypeNode {
+    if (ast.value === null) {
+      // TODO(alan-agius4): Remove when we no longer support TS 3.9
+      // Use: return ts.createLiteralTypeNode(ts.createNull()) directly.
+      return ts.versionMajorMinor.charAt(0) === '4' ?
+          ts.createLiteralTypeNode(ts.createNull() as any) :
+          ts.createKeywordTypeNode(ts.SyntaxKind.NullKeyword as any);
+    } else if (ast.value === undefined) {
+      return ts.createKeywordTypeNode(ts.SyntaxKind.UndefinedKeyword);
+    } else if (typeof ast.value === 'boolean') {
+      return ts.createLiteralTypeNode(ts.createLiteral(ast.value));
+    } else if (typeof ast.value === 'number') {
+      return ts.createLiteralTypeNode(ts.createLiteral(ast.value));
+    } else {
+      return ts.createLiteralTypeNode(ts.createLiteral(ast.value));
+    }
+  }
+
+  visitLocalizedString(ast: o.LocalizedString, context: Context): never {
+    throw new Error('Method not implemented.');
+  }
+
+  visitExternalExpr(ast: o.ExternalExpr, context: Context): ts.EntityName|ts.TypeReferenceNode {
+    if (ast.value.moduleName === null || ast.value.name === null) {
+      throw new Error(`Import unknown module or symbol`);
+    }
+    const {moduleImport, symbol} =
+        this.imports.generateNamedImport(ast.value.moduleName, ast.value.name);
+    const symbolIdentifier = ts.createIdentifier(symbol);
+
+    const typeName =
+        moduleImport ? ts.createQualifiedName(moduleImport, symbolIdentifier) : symbolIdentifier;
+
+    const typeArguments = ast.typeParams !== null ?
+        ast.typeParams.map(type => this.translateType(type, context)) :
+        undefined;
+    return ts.createTypeReferenceNode(typeName, typeArguments);
+  }
+
+  visitConditionalExpr(ast: o.ConditionalExpr, context: Context) {
+    throw new Error('Method not implemented.');
+  }
+
+  visitNotExpr(ast: o.NotExpr, context: Context) {
+    throw new Error('Method not implemented.');
+  }
+
+  visitAssertNotNullExpr(ast: o.AssertNotNull, context: Context) {
+    throw new Error('Method not implemented.');
+  }
+
+  visitCastExpr(ast: o.CastExpr, context: Context) {
+    throw new Error('Method not implemented.');
+  }
+
+  visitFunctionExpr(ast: o.FunctionExpr, context: Context) {
+    throw new Error('Method not implemented.');
+  }
+
+  visitUnaryOperatorExpr(ast: o.UnaryOperatorExpr, context: Context) {
+    throw new Error('Method not implemented.');
+  }
+
+  visitBinaryOperatorExpr(ast: o.BinaryOperatorExpr, context: Context) {
+    throw new Error('Method not implemented.');
+  }
+
+  visitReadPropExpr(ast: o.ReadPropExpr, context: Context) {
+    throw new Error('Method not implemented.');
+  }
+
+  visitReadKeyExpr(ast: o.ReadKeyExpr, context: Context) {
+    throw new Error('Method not implemented.');
+  }
+
+  visitLiteralArrayExpr(ast: o.LiteralArrayExpr, context: Context): ts.TupleTypeNode {
+    const values = ast.entries.map(expr => this.translateExpression(expr, context));
+    return ts.createTupleTypeNode(values);
+  }
+
+  visitLiteralMapExpr(ast: o.LiteralMapExpr, context: Context): ts.TypeLiteralNode {
+    const entries = ast.entries.map(entry => {
+      const {key, quoted} = entry;
+      const type = this.translateExpression(entry.value, context);
+      return ts.createPropertySignature(
+          /* modifiers */ undefined,
+          /* name */ quoted ? ts.createStringLiteral(key) : key,
+          /* questionToken */ undefined,
+          /* type */ type,
+          /* initializer */ undefined);
+    });
+    return ts.createTypeLiteralNode(entries);
+  }
+
+  visitCommaExpr(ast: o.CommaExpr, context: Context) {
+    throw new Error('Method not implemented.');
+  }
+
+  visitWrappedNodeExpr(ast: o.WrappedNodeExpr<any>, context: Context): ts.TypeNode {
+    const node: ts.Node = ast.node;
+    if (ts.isEntityName(node)) {
+      return ts.createTypeReferenceNode(node, /* typeArguments */ undefined);
+    } else if (ts.isTypeNode(node)) {
+      return node;
+    } else if (ts.isLiteralExpression(node)) {
+      return ts.createLiteralTypeNode(node);
+    } else {
+      throw new Error(
+          `Unsupported WrappedNodeExpr in TypeTranslatorVisitor: ${ts.SyntaxKind[node.kind]}`);
+    }
+  }
+
+  visitTypeofExpr(ast: o.TypeofExpr, context: Context): ts.TypeQueryNode {
+    const typeNode = this.translateExpression(ast.expr, context);
+    if (!ts.isTypeReferenceNode(typeNode)) {
+      throw new Error(`The target of a typeof expression must be a type reference, but it was
+          ${ts.SyntaxKind[typeNode.kind]}`);
+    }
+    return ts.createTypeQueryNode(typeNode.typeName);
+  }
+
+  private translateType(type: o.Type, context: Context): ts.TypeNode {
+    const typeNode = type.visitType(this, context);
+    if (!ts.isTypeNode(typeNode)) {
+      throw new Error(
+          `A Type must translate to a TypeNode, but was ${ts.SyntaxKind[typeNode.kind]}`);
+    }
+    return typeNode;
+  }
+
+  private translateExpression(expr: o.Expression, context: Context): ts.TypeNode {
+    const typeNode = expr.visitExpression(this, context);
+    if (!ts.isTypeNode(typeNode)) {
+      throw new Error(
+          `An Expression must translate to a TypeNode, but was ${ts.SyntaxKind[typeNode.kind]}`);
+    }
+    return typeNode;
+  }
+}
diff --git a/packages/compiler-cli/src/ngtsc/translator/src/typescript_ast_factory.ts b/packages/compiler-cli/src/ngtsc/translator/src/typescript_ast_factory.ts
new file mode 100644
index 0000000000000..a75c03c324fa6
--- /dev/null
+++ b/packages/compiler-cli/src/ngtsc/translator/src/typescript_ast_factory.ts
@@ -0,0 +1,250 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {AstFactory, BinaryOperator, LeadingComment, ObjectLiteralProperty, SourceMapRange, TemplateLiteral, UnaryOperator, VariableDeclarationType} from './api/ast_factory';
+
+const UNARY_OPERATORS: Record<UnaryOperator, ts.PrefixUnaryOperator> = {
+  '+': ts.SyntaxKind.PlusToken,
+  '-': ts.SyntaxKind.MinusToken,
+  '!': ts.SyntaxKind.ExclamationToken,
+};
+
+const BINARY_OPERATORS: Record<BinaryOperator, ts.BinaryOperator> = {
+  '&&': ts.SyntaxKind.AmpersandAmpersandToken,
+  '>': ts.SyntaxKind.GreaterThanToken,
+  '>=': ts.SyntaxKind.GreaterThanEqualsToken,
+  '&': ts.SyntaxKind.AmpersandToken,
+  '/': ts.SyntaxKind.SlashToken,
+  '==': ts.SyntaxKind.EqualsEqualsToken,
+  '===': ts.SyntaxKind.EqualsEqualsEqualsToken,
+  '<': ts.SyntaxKind.LessThanToken,
+  '<=': ts.SyntaxKind.LessThanEqualsToken,
+  '-': ts.SyntaxKind.MinusToken,
+  '%': ts.SyntaxKind.PercentToken,
+  '*': ts.SyntaxKind.AsteriskToken,
+  '!=': ts.SyntaxKind.ExclamationEqualsToken,
+  '!==': ts.SyntaxKind.ExclamationEqualsEqualsToken,
+  '||': ts.SyntaxKind.BarBarToken,
+  '+': ts.SyntaxKind.PlusToken,
+};
+
+const VAR_TYPES: Record<VariableDeclarationType, ts.NodeFlags> = {
+  'const': ts.NodeFlags.Const,
+  'let': ts.NodeFlags.Let,
+  'var': ts.NodeFlags.None,
+};
+
+/**
+ * A TypeScript flavoured implementation of the AstFactory.
+ */
+export class TypeScriptAstFactory implements AstFactory<ts.Statement, ts.Expression> {
+  private externalSourceFiles = new Map<string, ts.SourceMapSource>();
+
+  attachComments = attachComments;
+
+  createArrayLiteral = ts.createArrayLiteral;
+
+  createAssignment(target: ts.Expression, value: ts.Expression): ts.Expression {
+    return ts.createBinary(target, ts.SyntaxKind.EqualsToken, value);
+  }
+
+  createBinaryExpression(
+      leftOperand: ts.Expression, operator: BinaryOperator,
+      rightOperand: ts.Expression): ts.Expression {
+    return ts.createBinary(leftOperand, BINARY_OPERATORS[operator], rightOperand);
+  }
+
+  createBlock(body: ts.Statement[]): ts.Statement {
+    return ts.createBlock(body);
+  }
+
+  createCallExpression(callee: ts.Expression, args: ts.Expression[], pure: boolean): ts.Expression {
+    const call = ts.createCall(callee, undefined, args);
+    if (pure) {
+      ts.addSyntheticLeadingComment(
+          call, ts.SyntaxKind.MultiLineCommentTrivia, '@__PURE__', /* trailing newline */ false);
+    }
+    return call;
+  }
+
+  createConditional = ts.createConditional;
+
+  createElementAccess = ts.createElementAccess;
+
+  createExpressionStatement = ts.createExpressionStatement;
+
+  createFunctionDeclaration(functionName: string, parameters: string[], body: ts.Statement):
+      ts.Statement {
+    if (!ts.isBlock(body)) {
+      throw new Error(`Invalid syntax, expected a block, but got ${ts.SyntaxKind[body.kind]}.`);
+    }
+    return ts.createFunctionDeclaration(
+        undefined, undefined, undefined, functionName, undefined,
+        parameters.map(param => ts.createParameter(undefined, undefined, undefined, param)),
+        undefined, body);
+  }
+
+  createFunctionExpression(functionName: string|null, parameters: string[], body: ts.Statement):
+      ts.Expression {
+    if (!ts.isBlock(body)) {
+      throw new Error(`Invalid syntax, expected a block, but got ${ts.SyntaxKind[body.kind]}.`);
+    }
+    return ts.createFunctionExpression(
+        undefined, undefined, functionName ?? undefined, undefined,
+        parameters.map(param => ts.createParameter(undefined, undefined, undefined, param)),
+        undefined, body);
+  }
+
+  createIdentifier = ts.createIdentifier;
+
+  createIfStatement(
+      condition: ts.Expression, thenStatement: ts.Statement,
+      elseStatement: ts.Statement|null): ts.Statement {
+    return ts.createIf(condition, thenStatement, elseStatement ?? undefined);
+  }
+
+  createLiteral(value: string|number|boolean|null|undefined): ts.Expression {
+    if (value === undefined) {
+      return ts.createIdentifier('undefined');
+    } else if (value === null) {
+      return ts.createNull();
+    } else {
+      return ts.createLiteral(value);
+    }
+  }
+
+  createNewExpression(expression: ts.Expression, args: ts.Expression[]): ts.Expression {
+    return ts.createNew(expression, undefined, args);
+  }
+
+  createObjectLiteral(properties: ObjectLiteralProperty<ts.Expression>[]): ts.Expression {
+    return ts.createObjectLiteral(properties.map(
+        prop => ts.createPropertyAssignment(
+            prop.quoted ? ts.createLiteral(prop.propertyName) :
+                          ts.createIdentifier(prop.propertyName),
+            prop.value)));
+  }
+
+  createParenthesizedExpression = ts.createParen;
+
+  createPropertyAccess = ts.createPropertyAccess;
+
+  createReturnStatement(expression: ts.Expression|null): ts.Statement {
+    return ts.createReturn(expression ?? undefined);
+  }
+
+  createTaggedTemplate(tag: ts.Expression, template: TemplateLiteral<ts.Expression>):
+      ts.Expression {
+    let templateLiteral: ts.TemplateLiteral;
+    const length = template.elements.length;
+    const head = template.elements[0];
+    if (length === 1) {
+      templateLiteral = ts.createNoSubstitutionTemplateLiteral(head.cooked, head.raw);
+    } else {
+      const spans: ts.TemplateSpan[] = [];
+      // Create the middle parts
+      for (let i = 1; i < length - 1; i++) {
+        const {cooked, raw, range} = template.elements[i];
+        const middle = createTemplateMiddle(cooked, raw);
+        if (range !== null) {
+          this.setSourceMapRange(middle, range);
+        }
+        spans.push(ts.createTemplateSpan(template.expressions[i - 1], middle));
+      }
+      // Create the tail part
+      const resolvedExpression = template.expressions[length - 2];
+      const templatePart = template.elements[length - 1];
+      const templateTail = createTemplateTail(templatePart.cooked, templatePart.raw);
+      if (templatePart.range !== null) {
+        this.setSourceMapRange(templateTail, templatePart.range);
+      }
+      spans.push(ts.createTemplateSpan(resolvedExpression, templateTail));
+      // Put it all together
+      templateLiteral =
+          ts.createTemplateExpression(ts.createTemplateHead(head.cooked, head.raw), spans);
+    }
+    if (head.range !== null) {
+      this.setSourceMapRange(templateLiteral, head.range);
+    }
+    return ts.createTaggedTemplate(tag, templateLiteral);
+  }
+
+  createThrowStatement = ts.createThrow;
+
+  createTypeOfExpression = ts.createTypeOf;
+
+
+  createUnaryExpression(operator: UnaryOperator, operand: ts.Expression): ts.Expression {
+    return ts.createPrefix(UNARY_OPERATORS[operator], operand);
+  }
+
+  createVariableDeclaration(
+      variableName: string, initializer: ts.Expression|null,
+      type: VariableDeclarationType): ts.Statement {
+    return ts.createVariableStatement(
+        undefined,
+        ts.createVariableDeclarationList(
+            [ts.createVariableDeclaration(variableName, undefined, initializer ?? undefined)],
+            VAR_TYPES[type]),
+    );
+  }
+
+  setSourceMapRange<T extends ts.Node>(node: T, sourceMapRange: SourceMapRange|null): T {
+    if (sourceMapRange === null) {
+      return node;
+    }
+
+    const url = sourceMapRange.url;
+    if (!this.externalSourceFiles.has(url)) {
+      this.externalSourceFiles.set(
+          url, ts.createSourceMapSource(url, sourceMapRange.content, pos => pos));
+    }
+    const source = this.externalSourceFiles.get(url);
+    ts.setSourceMapRange(
+        node, {pos: sourceMapRange.start.offset, end: sourceMapRange.end.offset, source});
+    return node;
+  }
+}
+
+// HACK: Use this in place of `ts.createTemplateMiddle()`.
+// Revert once https://github.com/microsoft/TypeScript/issues/35374 is fixed.
+export function createTemplateMiddle(cooked: string, raw: string): ts.TemplateMiddle {
+  const node: ts.TemplateLiteralLikeNode = ts.createTemplateHead(cooked, raw);
+  (node.kind as ts.SyntaxKind) = ts.SyntaxKind.TemplateMiddle;
+  return node as ts.TemplateMiddle;
+}
+
+// HACK: Use this in place of `ts.createTemplateTail()`.
+// Revert once https://github.com/microsoft/TypeScript/issues/35374 is fixed.
+export function createTemplateTail(cooked: string, raw: string): ts.TemplateTail {
+  const node: ts.TemplateLiteralLikeNode = ts.createTemplateHead(cooked, raw);
+  (node.kind as ts.SyntaxKind) = ts.SyntaxKind.TemplateTail;
+  return node as ts.TemplateTail;
+}
+
+/**
+ * Attach the given `leadingComments` to the `statement` node.
+ *
+ * @param statement The statement that will have comments attached.
+ * @param leadingComments The comments to attach to the statement.
+ */
+export function attachComments(statement: ts.Statement, leadingComments: LeadingComment[]): void {
+  for (const comment of leadingComments) {
+    const commentKind = comment.multiline ? ts.SyntaxKind.MultiLineCommentTrivia :
+                                            ts.SyntaxKind.SingleLineCommentTrivia;
+    if (comment.multiline) {
+      ts.addSyntheticLeadingComment(
+          statement, commentKind, comment.toString(), comment.trailingNewline);
+    } else {
+      for (const line of comment.toString().split('\n')) {
+        ts.addSyntheticLeadingComment(statement, commentKind, line, comment.trailingNewline);
+      }
+    }
+  }
+}
diff --git a/packages/compiler-cli/src/ngtsc/translator/src/typescript_translator.ts b/packages/compiler-cli/src/ngtsc/translator/src/typescript_translator.ts
new file mode 100644
index 0000000000000..5e71dd760f0f8
--- /dev/null
+++ b/packages/compiler-cli/src/ngtsc/translator/src/typescript_translator.ts
@@ -0,0 +1,33 @@
+/**
+ * @license
+ * Copyright Google LLC 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 '@angular/compiler';
+import * as ts from 'typescript';
+
+import {ImportGenerator} from './api/import_generator';
+import {Context} from './context';
+import {ExpressionTranslatorVisitor, TranslatorOptions} from './translator';
+import {TypeScriptAstFactory} from './typescript_ast_factory';
+
+export function translateExpression(
+    expression: o.Expression, imports: ImportGenerator<ts.Expression>,
+    options: TranslatorOptions<ts.Expression> = {}): ts.Expression {
+  return expression.visitExpression(
+      new ExpressionTranslatorVisitor<ts.Statement, ts.Expression>(
+          new TypeScriptAstFactory(), imports, options),
+      new Context(false));
+}
+
+export function translateStatement(
+    statement: o.Statement, imports: ImportGenerator<ts.Expression>,
+    options: TranslatorOptions<ts.Expression> = {}): ts.Statement {
+  return statement.visitStatement(
+      new ExpressionTranslatorVisitor<ts.Statement, ts.Expression>(
+          new TypeScriptAstFactory(), imports, options),
+      new Context(true));
+}
diff --git a/packages/compiler-cli/src/ngtsc/translator/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/translator/test/BUILD.bazel
new file mode 100644
index 0000000000000..ab5851162f3c1
--- /dev/null
+++ b/packages/compiler-cli/src/ngtsc/translator/test/BUILD.bazel
@@ -0,0 +1,25 @@
+load("//tools:defaults.bzl", "jasmine_node_test", "ts_library")
+
+package(default_visibility = ["//visibility:public"])
+
+ts_library(
+    name = "test_lib",
+    testonly = True,
+    srcs = glob([
+        "**/*.ts",
+    ]),
+    deps = [
+        "//packages:types",
+        "//packages/compiler",
+        "//packages/compiler-cli/src/ngtsc/translator",
+        "@npm//typescript",
+    ],
+)
+
+jasmine_node_test(
+    name = "test",
+    bootstrap = ["//tools/testing:node_no_angular_es5"],
+    deps = [
+        ":test_lib",
+    ],
+)
diff --git a/packages/compiler-cli/src/ngtsc/translator/test/typescript_ast_factory_spec.ts b/packages/compiler-cli/src/ngtsc/translator/test/typescript_ast_factory_spec.ts
new file mode 100644
index 0000000000000..a341535f60225
--- /dev/null
+++ b/packages/compiler-cli/src/ngtsc/translator/test/typescript_ast_factory_spec.ts
@@ -0,0 +1,389 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {leadingComment} from '@angular/compiler';
+import * as ts from 'typescript';
+
+import {TypeScriptAstFactory} from '../src/typescript_ast_factory';
+
+describe('TypeScriptAstFactory', () => {
+  let factory: TypeScriptAstFactory;
+  beforeEach(() => factory = new TypeScriptAstFactory());
+
+  describe('attachComments()', () => {
+    it('should add the comments to the given statement', () => {
+      const {items: [stmt], generate} = setupStatements('x = 10;');
+      factory.attachComments(
+          stmt, [leadingComment('comment 1', true), leadingComment('comment 2', false)]);
+
+      expect(generate(stmt)).toEqual([
+        '/* comment 1 */',
+        '//comment 2',
+        'x = 10;',
+      ].join('\n'));
+    });
+  });
+
+  describe('createArrayLiteral()', () => {
+    it('should create an array node containing the provided expressions', () => {
+      const {items: [expr1, expr2], generate} = setupExpressions(`42`, '"moo"');
+      const array = factory.createArrayLiteral([expr1, expr2]);
+      expect(generate(array)).toEqual('[42, "moo"]');
+    });
+  });
+
+  describe('createAssignment()', () => {
+    it('should create an assignment node using the target and value expressions', () => {
+      const {items: [target, value], generate} = setupExpressions(`x`, `42`);
+      const assignment = factory.createAssignment(target, value);
+      expect(generate(assignment)).toEqual('x = 42');
+    });
+  });
+
+  describe('createBinaryExpression()', () => {
+    it('should create a binary operation node using the left and right expressions', () => {
+      const {items: [left, right], generate} = setupExpressions(`17`, `42`);
+      const assignment = factory.createBinaryExpression(left, '+', right);
+      expect(generate(assignment)).toEqual('17 + 42');
+    });
+  });
+
+  describe('createBlock()', () => {
+    it('should create a block statement containing the given statements', () => {
+      const {items: stmts, generate} = setupStatements('x = 10; y = 20;');
+      const block = factory.createBlock(stmts);
+      expect(generate(block)).toEqual([
+        '{',
+        '    x = 10;',
+        '    y = 20;',
+        '}',
+      ].join('\n'));
+    });
+  });
+
+  describe('createCallExpression()', () => {
+    it('should create a call on the `callee` with the given `args`', () => {
+      const {items: [callee, arg1, arg2], generate} = setupExpressions('foo', '42', '"moo"');
+      const call = factory.createCallExpression(callee, [arg1, arg2], false);
+      expect(generate(call)).toEqual('foo(42, "moo")');
+    });
+
+    it('should create a call marked with a PURE comment if `pure` is true', () => {
+      const {items: [callee, arg1, arg2], generate} = setupExpressions(`foo`, `42`, `"moo"`);
+      const call = factory.createCallExpression(callee, [arg1, arg2], true);
+      expect(generate(call)).toEqual('/*@__PURE__*/ foo(42, "moo")');
+    });
+  });
+
+  describe('createConditional()', () => {
+    it('should create a condition expression', () => {
+      const {items: [test, thenExpr, elseExpr], generate} =
+          setupExpressions(`!test`, `42`, `"moo"`);
+      const conditional = factory.createConditional(test, thenExpr, elseExpr);
+      expect(generate(conditional)).toEqual('!test ? 42 : "moo"');
+    });
+  });
+
+  describe('createElementAccess()', () => {
+    it('should create an expression accessing the element of an array/object', () => {
+      const {items: [expr, element], generate} = setupExpressions(`obj`, `"moo"`);
+      const access = factory.createElementAccess(expr, element);
+      expect(generate(access)).toEqual('obj["moo"]');
+    });
+  });
+
+  describe('createExpressionStatement()', () => {
+    it('should create a statement node from the given expression', () => {
+      const {items: [expr], generate} = setupExpressions(`x = 10`);
+      const stmt = factory.createExpressionStatement(expr);
+      expect(ts.isExpressionStatement(stmt)).toBe(true);
+      expect(generate(stmt)).toEqual('x = 10;');
+    });
+  });
+
+  describe('createFunctionDeclaration()', () => {
+    it('should create a function declaration node with the given name, parameters and body statements',
+       () => {
+         const {items: [body], generate} = setupStatements('{x = 10; y = 20;}');
+         const fn = factory.createFunctionDeclaration('foo', ['arg1', 'arg2'], body);
+         expect(generate(fn))
+             .toEqual(
+                 'function foo(arg1, arg2) { x = 10; y = 20; }',
+             );
+       });
+  });
+
+  describe('createFunctionExpression()', () => {
+    it('should create a function expression node with the given name, parameters and body statements',
+       () => {
+         const {items: [body], generate} = setupStatements('{x = 10; y = 20;}');
+         const fn = factory.createFunctionExpression('foo', ['arg1', 'arg2'], body);
+         expect(ts.isExpressionStatement(fn)).toBe(false);
+         expect(generate(fn)).toEqual('function foo(arg1, arg2) { x = 10; y = 20; }');
+       });
+
+    it('should create an anonymous function expression node if the name is null', () => {
+      const {items: [body], generate} = setupStatements('{x = 10; y = 20;}');
+      const fn = factory.createFunctionExpression(null, ['arg1', 'arg2'], body);
+      expect(generate(fn)).toEqual('function (arg1, arg2) { x = 10; y = 20; }');
+    });
+  });
+
+  describe('createIdentifier()', () => {
+    it('should create an identifier with the given name', () => {
+      const id = factory.createIdentifier('someId') as ts.Identifier;
+      expect(ts.isIdentifier(id)).toBe(true);
+      expect(id.text).toEqual('someId');
+    });
+  });
+
+  describe('createIfStatement()', () => {
+    it('should create an if-else statement', () => {
+      const {items: [testStmt, thenStmt, elseStmt], generate} =
+          setupStatements('!test;x = 10;x = 42;');
+      const test = (testStmt as ts.ExpressionStatement).expression;
+      const ifStmt = factory.createIfStatement(test, thenStmt, elseStmt);
+      expect(generate(ifStmt)).toEqual([
+        'if (!test)',
+        '    x = 10;',
+        'else',
+        '    x = 42;',
+      ].join('\n'));
+    });
+
+    it('should create an if statement if the else expression is null', () => {
+      const {items: [testStmt, thenStmt], generate} = setupStatements('!test;x = 10;');
+      const test = (testStmt as ts.ExpressionStatement).expression;
+      const ifStmt = factory.createIfStatement(test, thenStmt, null);
+      expect(generate(ifStmt)).toEqual([
+        'if (!test)',
+        '    x = 10;',
+      ].join('\n'));
+    });
+  });
+
+  describe('createLiteral()', () => {
+    it('should create a string literal', () => {
+      const {generate} = setupStatements();
+      const literal = factory.createLiteral('moo');
+      expect(ts.isStringLiteral(literal)).toBe(true);
+      expect(generate(literal)).toEqual('"moo"');
+    });
+
+    it('should create a number literal', () => {
+      const {generate} = setupStatements();
+      const literal = factory.createLiteral(42);
+      expect(ts.isNumericLiteral(literal)).toBe(true);
+      expect(generate(literal)).toEqual('42');
+    });
+
+    it('should create a number literal for `NaN`', () => {
+      const {generate} = setupStatements();
+      const literal = factory.createLiteral(NaN);
+      expect(ts.isNumericLiteral(literal)).toBe(true);
+      expect(generate(literal)).toEqual('NaN');
+    });
+
+    it('should create a boolean literal', () => {
+      const {generate} = setupStatements();
+      const literal = factory.createLiteral(true);
+      expect(ts.isToken(literal)).toBe(true);
+      expect(generate(literal)).toEqual('true');
+    });
+
+    it('should create an `undefined` literal', () => {
+      const {generate} = setupStatements();
+      const literal = factory.createLiteral(undefined);
+      expect(ts.isIdentifier(literal)).toBe(true);
+      expect(generate(literal)).toEqual('undefined');
+    });
+
+    it('should create a `null` literal', () => {
+      const {generate} = setupStatements();
+      const literal = factory.createLiteral(null);
+      expect(ts.isToken(literal)).toBe(true);
+      expect(generate(literal)).toEqual('null');
+    });
+  });
+
+  describe('createNewExpression()', () => {
+    it('should create a `new` operation on the constructor `expression` with the given `args`',
+       () => {
+         const {items: [expr, arg1, arg2], generate} = setupExpressions('Foo', '42', '"moo"');
+         const call = factory.createNewExpression(expr, [arg1, arg2]);
+         expect(generate(call)).toEqual('new Foo(42, "moo")');
+       });
+  });
+
+  describe('createObjectLiteral()', () => {
+    it('should create an object literal node, with the given properties', () => {
+      const {items: [prop1, prop2], generate} = setupExpressions('42', '"moo"');
+      const obj = factory.createObjectLiteral([
+        {propertyName: 'prop1', value: prop1, quoted: false},
+        {propertyName: 'prop2', value: prop2, quoted: true},
+      ]);
+      expect(generate(obj)).toEqual('{ prop1: 42, "prop2": "moo" }');
+    });
+  });
+
+  describe('createParenthesizedExpression()', () => {
+    it('should add parentheses around the given expression', () => {
+      const {items: [expr], generate} = setupExpressions(`a + b`);
+      const paren = factory.createParenthesizedExpression(expr);
+      expect(generate(paren)).toEqual('(a + b)');
+    });
+  });
+
+  describe('createPropertyAccess()', () => {
+    it('should create a property access expression node', () => {
+      const {items: [expr], generate} = setupExpressions(`obj`);
+      const access = factory.createPropertyAccess(expr, 'moo');
+      expect(generate(access)).toEqual('obj.moo');
+    });
+  });
+
+  describe('createReturnStatement()', () => {
+    it('should create a return statement returning the given expression', () => {
+      const {items: [expr], generate} = setupExpressions(`42`);
+      const returnStmt = factory.createReturnStatement(expr);
+      expect(generate(returnStmt)).toEqual('return 42;');
+    });
+
+    it('should create a void return statement if the expression is null', () => {
+      const {generate} = setupStatements();
+      const returnStmt = factory.createReturnStatement(null);
+      expect(generate(returnStmt)).toEqual('return;');
+    });
+  });
+
+  describe('createTaggedTemplate()', () => {
+    it('should create a tagged template node from the tag, elements and expressions', () => {
+      const elements = [
+        {raw: 'raw\\n1', cooked: 'raw\n1', range: null},
+        {raw: 'raw\\n2', cooked: 'raw\n2', range: null},
+        {raw: 'raw\\n3', cooked: 'raw\n3', range: null},
+      ];
+      const {items: [tag, ...expressions], generate} = setupExpressions('tagFn', '42', '"moo"');
+      const template = factory.createTaggedTemplate(tag, {elements, expressions});
+      expect(generate(template)).toEqual('tagFn `raw\\n1${42}raw\\n2${"moo"}raw\\n3`');
+    });
+  });
+
+  describe('createThrowStatement()', () => {
+    it('should create a throw statement, throwing the given expression', () => {
+      const {items: [expr], generate} = setupExpressions(`new Error("bad")`);
+      const throwStmt = factory.createThrowStatement(expr);
+      expect(generate(throwStmt)).toEqual('throw new Error("bad");');
+    });
+  });
+
+  describe('createTypeOfExpression()', () => {
+    it('should create a typeof expression node', () => {
+      const {items: [expr], generate} = setupExpressions(`42`);
+      const typeofExpr = factory.createTypeOfExpression(expr);
+      expect(generate(typeofExpr)).toEqual('typeof 42');
+    });
+  });
+
+  describe('createUnaryExpression()', () => {
+    it('should create a unary expression with the operator and operand', () => {
+      const {items: [expr], generate} = setupExpressions(`value`);
+      const unaryExpr = factory.createUnaryExpression('!', expr);
+      expect(generate(unaryExpr)).toEqual('!value');
+    });
+  });
+
+  describe('createVariableDeclaration()', () => {
+    it('should create a variable declaration statement node for the given variable name and initializer',
+       () => {
+         const {items: [initializer], generate} = setupExpressions(`42`);
+         const varDecl = factory.createVariableDeclaration('foo', initializer, 'let');
+         expect(generate(varDecl)).toEqual('let foo = 42;');
+       });
+
+    it('should create a constant declaration statement node for the given variable name and initializer',
+       () => {
+         const {items: [initializer], generate} = setupExpressions(`42`);
+         const varDecl = factory.createVariableDeclaration('foo', initializer, 'const');
+         expect(generate(varDecl)).toEqual('const foo = 42;');
+       });
+
+    it('should create a downleveled declaration statement node for the given variable name and initializer',
+       () => {
+         const {items: [initializer], generate} = setupExpressions(`42`);
+         const varDecl = factory.createVariableDeclaration('foo', initializer, 'var');
+         expect(generate(varDecl)).toEqual('var foo = 42;');
+       });
+
+    it('should create an uninitialized variable declaration statement node for the given variable name and a null initializer',
+       () => {
+         const {generate} = setupStatements();
+         const varDecl = factory.createVariableDeclaration('foo', null, 'let');
+         expect(generate(varDecl)).toEqual('let foo;');
+       });
+  });
+
+  describe('setSourceMapRange()', () => {
+    it('should attach the `sourceMapRange` to the given `node`', () => {
+      const {items: [expr]} = setupExpressions(`42`);
+
+      factory.setSourceMapRange(expr, {
+        start: {line: 0, column: 1, offset: 1},
+        end: {line: 2, column: 3, offset: 15},
+        content: '-****\n*****\n****',
+        url: 'original.ts'
+      });
+
+      const range = ts.getSourceMapRange(expr);
+      expect(range.pos).toEqual(1);
+      expect(range.end).toEqual(15);
+      expect(range.source?.getLineAndCharacterOfPosition(range.pos))
+          .toEqual({line: 0, character: 1});
+      expect(range.source?.getLineAndCharacterOfPosition(range.end))
+          .toEqual({line: 2, character: 3});
+    });
+  });
+});
+
+/**
+ * Setup some statements to use in a test, along with a generate function to print the created nodes
+ * out.
+ *
+ * The TypeScript printer requires access to the original source of non-synthesized nodes.
+ * It uses the source content to output things like text between parts of nodes, which it doesn't
+ * store in the AST node itself.
+ *
+ * So this helper (and its sister `setupExpressions()`) capture the original source file used to
+ * provide the original statements/expressions that are used in the tests so that the printing will
+ * work via the returned `generate()` function.
+ */
+function setupStatements(stmts: string = ''): SetupResult<ts.Statement> {
+  const printer = ts.createPrinter({newLine: ts.NewLineKind.LineFeed});
+  const sf = ts.createSourceFile('test.ts', stmts, ts.ScriptTarget.ES2015, true);
+  return {
+    items: Array.from(sf.statements),
+    generate: (node: ts.Node) => printer.printNode(ts.EmitHint.Unspecified, node, sf),
+  };
+}
+
+/**
+ * Setup some statements to use in a test, along with a generate function to print the created nodes
+ * out.
+ *
+ * See `setupStatements()` for more information about this helper function.
+ */
+function setupExpressions(...exprs: string[]): SetupResult<ts.Expression> {
+  const {items: [arrayStmt], generate} = setupStatements(`[${exprs.join(',')}];`);
+  const expressions = Array.from(
+      ((arrayStmt as ts.ExpressionStatement).expression as ts.ArrayLiteralExpression).elements);
+  return {items: expressions, generate};
+}
+
+interface SetupResult<TNode extends ts.Node> {
+  items: TNode[];
+  generate(node: ts.Node): string;
+}
diff --git a/packages/compiler-cli/src/ngtsc/tsc_plugin.ts b/packages/compiler-cli/src/ngtsc/tsc_plugin.ts
index 54c6238521cfa..dcd62d5093e35 100644
--- a/packages/compiler-cli/src/ngtsc/tsc_plugin.ts
+++ b/packages/compiler-cli/src/ngtsc/tsc_plugin.ts
@@ -102,7 +102,8 @@ export class NgTscPlugin implements TscPlugin {
         program, this.host, this.options, this.host.shimExtensionPrefixes);
     this._compiler = new NgCompiler(
         this.host, this.options, program, typeCheckStrategy,
-        new PatchedProgramIncrementalBuildStrategy(), oldProgram, NOOP_PERF_RECORDER);
+        new PatchedProgramIncrementalBuildStrategy(), /** enableTemplateTypeChecker */ false,
+        oldProgram, NOOP_PERF_RECORDER);
     return {
       ignoreForDiagnostics: this._compiler.ignoreForDiagnostics,
       ignoreForEmit: this._compiler.ignoreForEmit,
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/BUILD.bazel b/packages/compiler-cli/src/ngtsc/typecheck/BUILD.bazel
index 9676cb540f0bc..f1553346ed978 100644
--- a/packages/compiler-cli/src/ngtsc/typecheck/BUILD.bazel
+++ b/packages/compiler-cli/src/ngtsc/typecheck/BUILD.bazel
@@ -16,10 +16,12 @@ ts_library(
         "//packages/compiler-cli/src/ngtsc/incremental:api",
         "//packages/compiler-cli/src/ngtsc/metadata",
         "//packages/compiler-cli/src/ngtsc/reflection",
+        "//packages/compiler-cli/src/ngtsc/scope",
         "//packages/compiler-cli/src/ngtsc/shims",
         "//packages/compiler-cli/src/ngtsc/shims:api",
         "//packages/compiler-cli/src/ngtsc/translator",
         "//packages/compiler-cli/src/ngtsc/typecheck/api",
+        "//packages/compiler-cli/src/ngtsc/typecheck/diagnostics",
         "//packages/compiler-cli/src/ngtsc/util",
         "@npm//@types/node",
         "@npm//typescript",
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/api/api.ts b/packages/compiler-cli/src/ngtsc/typecheck/api/api.ts
index b7db3f0f6d841..2ff9d963df848 100644
--- a/packages/compiler-cli/src/ngtsc/typecheck/api/api.ts
+++ b/packages/compiler-cli/src/ngtsc/typecheck/api/api.ts
@@ -11,7 +11,7 @@ import * as ts from 'typescript';
 
 import {AbsoluteFsPath} from '../../file_system';
 import {Reference} from '../../imports';
-import {TemplateGuardMeta} from '../../metadata';
+import {ClassPropertyMapping, DirectiveTypeCheckMeta} from '../../metadata';
 import {ClassDeclaration} from '../../reflection';
 
 
@@ -19,12 +19,11 @@ import {ClassDeclaration} from '../../reflection';
  * Extension of `DirectiveMeta` that includes additional information required to type-check the
  * usage of a particular directive.
  */
-export interface TypeCheckableDirectiveMeta extends DirectiveMeta {
+export interface TypeCheckableDirectiveMeta extends DirectiveMeta, DirectiveTypeCheckMeta {
   ref: Reference<ClassDeclaration>;
   queries: string[];
-  ngTemplateGuards: TemplateGuardMeta[];
-  coercedInputFields: Set<string>;
-  hasNgTemplateContextGuard: boolean;
+  inputs: ClassPropertyMapping;
+  outputs: ClassPropertyMapping;
 }
 
 export type TemplateId = string&{__brand: 'TemplateId'};
@@ -93,6 +92,14 @@ export interface TypeCheckingConfig {
    */
   checkTypeOfInputBindings: boolean;
 
+  /**
+   * Whether to honor the access modifiers on input bindings for the component/directive.
+   *
+   * If a template binding attempts to assign to an input that is private/protected/readonly,
+   * this will produce errors when enabled but will not when disabled.
+   */
+  honorAccessModifiersForInputBindings: boolean;
+
   /**
    * Whether to use strict null types for input bindings for directives.
    *
@@ -178,6 +185,22 @@ export interface TypeCheckingConfig {
    */
   checkTypeOfNonDomReferences: boolean;
 
+  /**
+   * Whether to adjust the output of the TCB to ensure compatibility with the `TemplateTypeChecker`.
+   *
+   * The statements generated in the TCB are optimized for performance and producing diagnostics.
+   * These optimizations can result in generating a TCB that does not have all the information
+   * needed by the `TemplateTypeChecker` for retrieving `Symbol`s. For example, as an optimization,
+   * the TCB will not generate variable declaration statements for directives that have no
+   * references, inputs, or outputs. However, the `TemplateTypeChecker` always needs these
+   * statements to be present in order to provide `ts.Symbol`s and `ts.Type`s for the directives.
+   *
+   * When set to `false`, enables TCB optimizations for template diagnostics.
+   * When set to `true`, ensures all information required by `TemplateTypeChecker` to
+   * retrieve symbols for template nodes is available in the TCB.
+   */
+  enableTemplateTypeChecker: boolean;
+
   /**
    * Whether to include type information from pipes in the type-checking operation.
    *
@@ -207,6 +230,12 @@ export interface TypeCheckingConfig {
    */
   checkTemplateBodies: boolean;
 
+  /**
+   * Whether to always apply DOM schema checks in template bodies, independently of the
+   * `checkTemplateBodies` setting.
+   */
+  alwaysCheckSchemaInTemplateBodies: boolean;
+
   /**
    * Whether to check resolvable queries.
    *
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/api/checker.ts b/packages/compiler-cli/src/ngtsc/typecheck/api/checker.ts
index 32a804c4e71b1..97f36e6b63b15 100644
--- a/packages/compiler-cli/src/ngtsc/typecheck/api/checker.ts
+++ b/packages/compiler-cli/src/ngtsc/typecheck/api/checker.ts
@@ -6,9 +6,12 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ParseError, TmplAstNode} from '@angular/compiler';
+import {AST, ParseError, TmplAstNode, TmplAstTemplate} from '@angular/compiler';
 import * as ts from 'typescript';
 
+import {GlobalCompletion} from './completion';
+import {Symbol} from './symbols';
+
 /**
  * Interface to the Angular Template Type Checker to extract diagnostics and intelligence from the
  * compiler's understanding of component templates.
@@ -28,6 +31,14 @@ export interface TemplateTypeChecker {
    */
   resetOverrides(): void;
 
+  /**
+   * Retrieve the template in use for the given component.
+   *
+   * If the template has been overridden via `overrideComponentTemplate`, this will retrieve the
+   * overridden template nodes.
+   */
+  getTemplate(component: ts.ClassDeclaration): TmplAstNode[]|null;
+
   /**
    * Provide a new template string that will be used in place of the user-defined template when
    * checking or operating on the given component.
@@ -69,6 +80,27 @@ export interface TemplateTypeChecker {
    * This method always runs in `OptimizeFor.SingleFile` mode.
    */
   getTypeCheckBlock(component: ts.ClassDeclaration): ts.Node|null;
+
+  /**
+   * Retrieves a `Symbol` for the node in a component's template.
+   *
+   * This method can return `null` if a valid `Symbol` cannot be determined for the node.
+   *
+   * @see Symbol
+   */
+  getSymbolOfNode(node: AST|TmplAstNode, component: ts.ClassDeclaration): Symbol|null;
+
+  /**
+   * Get "global" `Completion`s in the given context.
+   *
+   * Global completions are completions in the global context, as opposed to completions within an
+   * existing expression. For example, completing inside a new interpolation expression (`{{|}}`) or
+   * inside a new property binding `[input]="|" should retrieve global completions, which will
+   * include completions from the template's context component, as well as any local references or
+   * template variables which are in scope for that expression.
+   */
+  getGlobalCompletions(context: TmplAstTemplate|null, component: ts.ClassDeclaration):
+      GlobalCompletion[];
 }
 
 /**
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/api/completion.ts b/packages/compiler-cli/src/ngtsc/typecheck/api/completion.ts
new file mode 100644
index 0000000000000..9d5c5e16cac78
--- /dev/null
+++ b/packages/compiler-cli/src/ngtsc/typecheck/api/completion.ts
@@ -0,0 +1,62 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {TmplAstReference, TmplAstVariable} from '@angular/compiler';
+
+import {ShimLocation} from './symbols';
+
+/**
+ * An autocompletion source of any kind.
+ */
+export type Completion = CompletionContextComponent|CompletionReference|CompletionVariable;
+
+/**
+ * An autocompletion source that drives completion in a global context.
+ */
+export type GlobalCompletion = CompletionContextComponent|CompletionReference|CompletionVariable;
+
+/**
+ * Discriminant of an autocompletion source (a `Completion`).
+ */
+export enum CompletionKind {
+  ContextComponent,
+  Reference,
+  Variable,
+}
+
+/**
+ * An autocompletion source backed by a shim file position where TS APIs can be used to retrieve
+ * completions for the context component of a template.
+ */
+export interface CompletionContextComponent extends ShimLocation {
+  kind: CompletionKind.ContextComponent;
+}
+
+/**
+ * An autocompletion result representing a local reference declared in the template.
+ */
+export interface CompletionReference {
+  kind: CompletionKind.Reference;
+
+  /**
+   * The `TmplAstReference` from the template which should be available as a completion.
+   */
+  node: TmplAstReference;
+}
+
+/**
+ * An autocompletion result representing a variable declared in the template.
+ */
+export interface CompletionVariable {
+  kind: CompletionKind.Variable;
+
+  /**
+   * The `TmplAstVariable` from the template which should be available as a completion.
+   */
+  node: TmplAstVariable;
+}
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/api/index.ts b/packages/compiler-cli/src/ngtsc/typecheck/api/index.ts
index 5a59d80402113..675f02d4f042c 100644
--- a/packages/compiler-cli/src/ngtsc/typecheck/api/index.ts
+++ b/packages/compiler-cli/src/ngtsc/typecheck/api/index.ts
@@ -8,4 +8,6 @@
 
 export * from './api';
 export * from './checker';
+export * from './completion';
 export * from './context';
+export * from './symbols';
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/api/symbols.ts b/packages/compiler-cli/src/ngtsc/typecheck/api/symbols.ts
new file mode 100644
index 0000000000000..58428c7ae6fcc
--- /dev/null
+++ b/packages/compiler-cli/src/ngtsc/typecheck/api/symbols.ts
@@ -0,0 +1,257 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {TmplAstElement, TmplAstReference, TmplAstTemplate, TmplAstVariable} from '@angular/compiler';
+import * as ts from 'typescript';
+
+import {AbsoluteFsPath} from '../../file_system';
+import {ClassDeclaration} from '../../reflection';
+
+export enum SymbolKind {
+  Input,
+  Output,
+  Binding,
+  Reference,
+  Variable,
+  Directive,
+  Element,
+  Template,
+  Expression,
+  DomBinding,
+}
+
+/**
+ * A representation of an entity in the `TemplateAst`.
+ */
+export type Symbol = InputBindingSymbol|OutputBindingSymbol|ElementSymbol|ReferenceSymbol|
+    VariableSymbol|ExpressionSymbol|DirectiveSymbol|TemplateSymbol|DomBindingSymbol;
+
+/** Information about where a `ts.Node` can be found in the type check block shim file. */
+export interface ShimLocation {
+  /**
+   * The fully qualified path of the file which contains the generated TypeScript type check
+   * code for the component's template.
+   */
+  shimPath: AbsoluteFsPath;
+
+  /** The location in the shim file where node appears. */
+  positionInShimFile: number;
+}
+
+/**
+ * A generic representation of some node in a template.
+ */
+export interface TsNodeSymbolInfo {
+  /** The `ts.Type` of the template node. */
+  tsType: ts.Type;
+
+  /** The `ts.Symbol` for the template node */
+  tsSymbol: ts.Symbol|null;
+
+  /** The position of the most relevant part of the template node. */
+  shimLocation: ShimLocation;
+}
+
+/**
+ * A representation of an expression in a component template.
+ */
+export interface ExpressionSymbol {
+  kind: SymbolKind.Expression;
+
+  /** The `ts.Type` of the expression AST. */
+  tsType: ts.Type;
+
+  /**
+   * The `ts.Symbol` of the entity. This could be `null`, for example `AST` expression
+   * `{{foo.bar + foo.baz}}` does not have a `ts.Symbol` but `foo.bar` and `foo.baz` both do.
+   */
+  tsSymbol: ts.Symbol|null;
+
+  /** The position of the most relevant part of the expression. */
+  shimLocation: ShimLocation;
+}
+
+/** Represents either an input or output binding in a template. */
+export interface BindingSymbol {
+  kind: SymbolKind.Binding;
+
+  /** The `ts.Type` of the class member on the directive that is the target of the binding. */
+  tsType: ts.Type;
+
+  /** The `ts.Symbol` of the class member on the directive that is the target of the binding. */
+  tsSymbol: ts.Symbol;
+
+  /**
+   * The `DirectiveSymbol` or `ElementSymbol` for the Directive, Component, or `HTMLElement` with
+   * the binding.
+   */
+  target: DirectiveSymbol|ElementSymbol|TemplateSymbol;
+
+  /** The location in the shim file where the field access for the binding appears. */
+  shimLocation: ShimLocation;
+}
+
+/**
+ * A representation of an input binding in a component template.
+ */
+export interface InputBindingSymbol {
+  kind: SymbolKind.Input;
+
+  /** A single input may be bound to multiple components or directives. */
+  bindings: BindingSymbol[];
+}
+
+/**
+ * A representation of an output binding in a component template.
+ */
+export interface OutputBindingSymbol {
+  kind: SymbolKind.Output;
+
+  /** A single output may be bound to multiple components or directives. */
+  bindings: BindingSymbol[];
+}
+
+/**
+ * A representation of a local reference in a component template.
+ */
+export interface ReferenceSymbol {
+  kind: SymbolKind.Reference;
+
+  /**
+   * The `ts.Type` of the Reference value.
+   *
+   * `TmplAstTemplate` - The type of the `TemplateRef`
+   * `TmplAstElement` - The `ts.Type` for the `HTMLElement`.
+   * Directive - The `ts.Type` for the class declaration.
+   */
+  tsType: ts.Type;
+
+  /**
+   * The `ts.Symbol` for the Reference value.
+   *
+   * `TmplAstTemplate` - A `TemplateRef` symbol.
+   * `TmplAstElement` - The symbol for the `HTMLElement`.
+   * Directive - The symbol for the class declaration of the directive.
+   */
+  tsSymbol: ts.Symbol;
+
+  /**
+   * Depending on the type of the reference, this is one of the following:
+   *  - `TmplAstElement` when the local ref refers to the HTML element
+   *  - `TmplAstTemplate` when the ref refers to an `ng-template`
+   *  - `ts.ClassDeclaration` when the local ref refers to a Directive instance (#ref="myExportAs")
+   */
+  target: TmplAstElement|TmplAstTemplate|ts.ClassDeclaration;
+
+  /**
+   * The node in the `TemplateAst` where the symbol is declared. That is, node for the `#ref` or
+   * `#ref="exportAs"`.
+   */
+  declaration: TmplAstReference;
+
+  /** The location in the shim file of a variable that holds the type of the local ref. */
+  shimLocation: ShimLocation;
+}
+
+/**
+ * A representation of a context variable in a component template.
+ */
+export interface VariableSymbol {
+  kind: SymbolKind.Variable;
+
+  /**
+   * The `ts.Type` of the entity.
+   *
+   * This will be `any` if there is no `ngTemplateContextGuard`.
+   */
+  tsType: ts.Type;
+
+  /**
+   * The `ts.Symbol` for the context variable.
+   *
+   * This will be `null` if there is no `ngTemplateContextGuard`.
+   */
+  tsSymbol: ts.Symbol|null;
+
+  /**
+   * The node in the `TemplateAst` where the variable is declared. That is, the node for the `let-`
+   * node in the template.
+   */
+  declaration: TmplAstVariable;
+
+  /** The location in the shim file of a variable that holds the type of the template variable. */
+  shimLocation: ShimLocation;
+}
+
+/**
+ * A representation of an element in a component template.
+ */
+export interface ElementSymbol {
+  kind: SymbolKind.Element;
+
+  /** The `ts.Type` for the `HTMLElement`. */
+  tsType: ts.Type;
+
+  /** The `ts.Symbol` for the `HTMLElement`. */
+  tsSymbol: ts.Symbol|null;
+
+  /** A list of directives applied to the element. */
+  directives: DirectiveSymbol[];
+
+  /** The location in the shim file for the variable that holds the type of the element. */
+  shimLocation: ShimLocation;
+
+  templateNode: TmplAstElement;
+}
+
+export interface TemplateSymbol {
+  kind: SymbolKind.Template;
+
+  /** A list of directives applied to the element. */
+  directives: DirectiveSymbol[];
+
+  templateNode: TmplAstTemplate;
+}
+
+/**
+ * A representation of a directive/component whose selector matches a node in a component
+ * template.
+ */
+export interface DirectiveSymbol {
+  kind: SymbolKind.Directive;
+
+  /** The `ts.Type` for the class declaration. */
+  tsType: ts.Type;
+
+  /** The `ts.Symbol` for the class declaration. */
+  tsSymbol: ts.Symbol;
+
+  /** The location in the shim file for the variable that holds the type of the directive. */
+  shimLocation: ShimLocation;
+
+  /** The selector for the `Directive` / `Component`. */
+  selector: string|null;
+
+  /** `true` if this `DirectiveSymbol` is for a @Component. */
+  isComponent: boolean;
+
+  /** The `NgModule` that this directive is declared in or `null` if it could not be determined. */
+  ngModule: ClassDeclaration|null;
+}
+
+/**
+ * A representation of an attribute on an element or template. These bindings aren't currently
+ * type-checked (see `checkTypeOfDomBindings`) so they won't have a `ts.Type`, `ts.Symbol`, or shim
+ * location.
+ */
+export interface DomBindingSymbol {
+  kind: SymbolKind.DomBinding;
+
+  /** The symbol for the element or template of the text attribute. */
+  host: ElementSymbol|TemplateSymbol;
+}
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/diagnostics/BUILD.bazel b/packages/compiler-cli/src/ngtsc/typecheck/diagnostics/BUILD.bazel
new file mode 100644
index 0000000000000..535b5a64c88a0
--- /dev/null
+++ b/packages/compiler-cli/src/ngtsc/typecheck/diagnostics/BUILD.bazel
@@ -0,0 +1,16 @@
+load("//tools:defaults.bzl", "ts_library")
+
+package(default_visibility = ["//visibility:public"])
+
+ts_library(
+    name = "diagnostics",
+    srcs = glob(["**/*.ts"]),
+    module_name = "@angular/compiler-cli/src/ngtsc/typecheck/diagnostics",
+    deps = [
+        "//packages:types",
+        "//packages/compiler",
+        "//packages/compiler-cli/src/ngtsc/reflection",
+        "//packages/compiler-cli/src/ngtsc/typecheck/api",
+        "@npm//typescript",
+    ],
+)
diff --git a/modules/playground/src/web_workers/kitchen_sink/index.ts b/packages/compiler-cli/src/ngtsc/typecheck/diagnostics/index.ts
similarity index 67%
rename from modules/playground/src/web_workers/kitchen_sink/index.ts
rename to packages/compiler-cli/src/ngtsc/typecheck/diagnostics/index.ts
index f3791aca9123d..9d996df98fd8a 100644
--- a/modules/playground/src/web_workers/kitchen_sink/index.ts
+++ b/packages/compiler-cli/src/ngtsc/typecheck/diagnostics/index.ts
@@ -6,6 +6,5 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {bootstrapWorkerUi} from '@angular/platform-webworker';
-
-bootstrapWorkerUi('loader.js');
+export * from './src/diagnostic';
+export * from './src/id';
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/diagnostics/src/diagnostic.ts b/packages/compiler-cli/src/ngtsc/typecheck/diagnostics/src/diagnostic.ts
new file mode 100644
index 0000000000000..4070a47a7a4df
--- /dev/null
+++ b/packages/compiler-cli/src/ngtsc/typecheck/diagnostics/src/diagnostic.ts
@@ -0,0 +1,128 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {ParseSourceSpan} from '@angular/compiler';
+import * as ts from 'typescript';
+
+import {ExternalTemplateSourceMapping, TemplateId, TemplateSourceMapping} from '../../api';
+
+/**
+ * A `ts.Diagnostic` with additional information about the diagnostic related to template
+ * type-checking.
+ */
+export interface TemplateDiagnostic extends ts.Diagnostic {
+  /**
+   * The component with the template that resulted in this diagnostic.
+   */
+  componentFile: ts.SourceFile;
+
+  /**
+   * The template id of the component that resulted in this diagnostic.
+   */
+  templateId: TemplateId;
+}
+
+/**
+ * Constructs a `ts.Diagnostic` for a given `ParseSourceSpan` within a template.
+ */
+export function makeTemplateDiagnostic(
+    templateId: TemplateId, mapping: TemplateSourceMapping, span: ParseSourceSpan,
+    category: ts.DiagnosticCategory, code: number, messageText: string|ts.DiagnosticMessageChain,
+    relatedMessage?: {
+      text: string,
+      span: ParseSourceSpan,
+    }): TemplateDiagnostic {
+  if (mapping.type === 'direct') {
+    let relatedInformation: ts.DiagnosticRelatedInformation[]|undefined = undefined;
+    if (relatedMessage !== undefined) {
+      relatedInformation = [{
+        category: ts.DiagnosticCategory.Message,
+        code: 0,
+        file: mapping.node.getSourceFile(),
+        start: relatedMessage.span.start.offset,
+        length: relatedMessage.span.end.offset - relatedMessage.span.start.offset,
+        messageText: relatedMessage.text,
+      }];
+    }
+    // For direct mappings, the error is shown inline as ngtsc was able to pinpoint a string
+    // constant within the `@Component` decorator for the template. This allows us to map the error
+    // directly into the bytes of the source file.
+    return {
+      source: 'ngtsc',
+      code,
+      category,
+      messageText,
+      file: mapping.node.getSourceFile(),
+      componentFile: mapping.node.getSourceFile(),
+      templateId,
+      start: span.start.offset,
+      length: span.end.offset - span.start.offset,
+      relatedInformation,
+    };
+  } else if (mapping.type === 'indirect' || mapping.type === 'external') {
+    // For indirect mappings (template was declared inline, but ngtsc couldn't map it directly
+    // to a string constant in the decorator), the component's file name is given with a suffix
+    // indicating it's not the TS file being displayed, but a template.
+    // For external temoplates, the HTML filename is used.
+    const componentSf = mapping.componentClass.getSourceFile();
+    const componentName = mapping.componentClass.name.text;
+    // TODO(alxhub): remove cast when TS in g3 supports this narrowing.
+    const fileName = mapping.type === 'indirect' ?
+        `${componentSf.fileName} (${componentName} template)` :
+        (mapping as ExternalTemplateSourceMapping).templateUrl;
+    // TODO(alxhub): investigate creating a fake `ts.SourceFile` here instead of invoking the TS
+    // parser against the template (HTML is just really syntactically invalid TypeScript code ;).
+    // Also investigate caching the file to avoid running the parser multiple times.
+    const sf = ts.createSourceFile(
+        fileName, mapping.template, ts.ScriptTarget.Latest, false, ts.ScriptKind.JSX);
+
+    let relatedInformation: ts.DiagnosticRelatedInformation[] = [];
+    if (relatedMessage !== undefined) {
+      relatedInformation.push({
+        category: ts.DiagnosticCategory.Message,
+        code: 0,
+        file: sf,
+        start: relatedMessage.span.start.offset,
+        length: relatedMessage.span.end.offset - relatedMessage.span.start.offset,
+        messageText: relatedMessage.text,
+      });
+    }
+
+    relatedInformation.push({
+      category: ts.DiagnosticCategory.Message,
+      code: 0,
+      file: componentSf,
+      // mapping.node represents either the 'template' or 'templateUrl' expression. getStart()
+      // and getEnd() are used because they don't include surrounding whitespace.
+      start: mapping.node.getStart(),
+      length: mapping.node.getEnd() - mapping.node.getStart(),
+      messageText: `Error occurs in the template of component ${componentName}.`,
+    });
+
+    return {
+      source: 'ngtsc',
+      category,
+      code,
+      messageText,
+      file: sf,
+      componentFile: componentSf,
+      templateId,
+      start: span.start.offset,
+      length: span.end.offset - span.start.offset,
+      // Show a secondary message indicating the component whose template contains the error.
+      relatedInformation,
+    };
+  } else {
+    throw new Error(`Unexpected source mapping type: ${(mapping as {type: string}).type}`);
+  }
+}
+
+export function isTemplateDiagnostic(diagnostic: ts.Diagnostic): diagnostic is TemplateDiagnostic {
+  return diagnostic.hasOwnProperty('componentFile') &&
+      ts.isSourceFile((diagnostic as any).componentFile);
+}
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/diagnostics/src/id.ts b/packages/compiler-cli/src/ngtsc/typecheck/diagnostics/src/id.ts
new file mode 100644
index 0000000000000..22043f73a45a5
--- /dev/null
+++ b/packages/compiler-cli/src/ngtsc/typecheck/diagnostics/src/id.ts
@@ -0,0 +1,39 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {DeclarationNode} from '../../../reflection';
+
+import {TemplateId} from '../../api';
+
+
+const TEMPLATE_ID = Symbol('ngTemplateId');
+const NEXT_TEMPLATE_ID = Symbol('ngNextTemplateId');
+
+interface HasTemplateId {
+  [TEMPLATE_ID]: TemplateId;
+}
+
+interface HasNextTemplateId {
+  [NEXT_TEMPLATE_ID]: number;
+}
+
+export function getTemplateId(clazz: DeclarationNode): TemplateId {
+  const node = clazz as ts.Declaration & Partial<HasTemplateId>;
+  if (node[TEMPLATE_ID] === undefined) {
+    node[TEMPLATE_ID] = allocateTemplateId(node.getSourceFile());
+  }
+  return node[TEMPLATE_ID]!;
+}
+
+function allocateTemplateId(sf: ts.SourceFile&Partial<HasNextTemplateId>): TemplateId {
+  if (sf[NEXT_TEMPLATE_ID] === undefined) {
+    sf[NEXT_TEMPLATE_ID] = 1;
+  }
+  return (`tcb${sf[NEXT_TEMPLATE_ID]!++}`) as TemplateId;
+}
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/index.ts b/packages/compiler-cli/src/ngtsc/typecheck/index.ts
index 6c81aae86609f..aaa0b33c998e4 100644
--- a/packages/compiler-cli/src/ngtsc/typecheck/index.ts
+++ b/packages/compiler-cli/src/ngtsc/typecheck/index.ts
@@ -9,7 +9,6 @@
 export {ReusedProgramStrategy} from './src/augmented_program';
 export {FileTypeCheckingData, TemplateTypeCheckerImpl} from './src/checker';
 export {TypeCheckContextImpl} from './src/context';
-export {isTemplateDiagnostic, TemplateDiagnostic} from './src/diagnostics';
 export {TypeCheckProgramHost} from './src/host';
 export {TypeCheckShimGenerator} from './src/shim';
 export {typeCheckFilePath} from './src/type_check_file';
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/src/checker.ts b/packages/compiler-cli/src/ngtsc/typecheck/src/checker.ts
index defdc7f7057d3..ceab60d4c92ea 100644
--- a/packages/compiler-cli/src/ngtsc/typecheck/src/checker.ts
+++ b/packages/compiler-cli/src/ngtsc/typecheck/src/checker.ts
@@ -6,20 +6,24 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ParseError, parseTemplate, TmplAstNode} from '@angular/compiler';
+import {AST, ParseError, parseTemplate, TmplAstNode, TmplAstReference, TmplAstTemplate, TmplAstVariable} from '@angular/compiler';
 import * as ts from 'typescript';
 
 import {absoluteFromSourceFile, AbsoluteFsPath, getSourceFileOrError} from '../../file_system';
 import {ReferenceEmitter} from '../../imports';
 import {IncrementalBuild} from '../../incremental/api';
 import {ReflectionHost} from '../../reflection';
+import {ComponentScopeReader} from '../../scope';
 import {isShim} from '../../shims';
 import {getSourceFileOrNull} from '../../util/src/typescript';
-import {OptimizeFor, ProgramTypeCheckAdapter, TemplateId, TemplateTypeChecker, TypeCheckingConfig, TypeCheckingProgramStrategy, UpdateMode} from '../api';
+import {CompletionKind, GlobalCompletion, OptimizeFor, ProgramTypeCheckAdapter, Symbol, TemplateId, TemplateTypeChecker, TypeCheckingConfig, TypeCheckingProgramStrategy, UpdateMode} from '../api';
+import {TemplateDiagnostic} from '../diagnostics';
 
-import {InliningMode, ShimTypeCheckingData, TypeCheckContextImpl, TypeCheckingHost} from './context';
-import {findTypeCheckBlock, shouldReportDiagnostic, TemplateDiagnostic, TemplateSourceResolver, translateDiagnostic} from './diagnostics';
+import {ExpressionIdentifier, findFirstMatchingNode} from './comments';
+import {InliningMode, ShimTypeCheckingData, TemplateData, TypeCheckContextImpl, TypeCheckingHost} from './context';
+import {findTypeCheckBlock, shouldReportDiagnostic, TemplateSourceResolver, translateDiagnostic} from './diagnostics';
 import {TemplateSourceManager} from './source';
+import {SymbolBuilder} from './template_symbol_builder';
 
 /**
  * Primary template type-checking engine, which performs type-checking using a
@@ -36,7 +40,8 @@ export class TemplateTypeCheckerImpl implements TemplateTypeChecker {
       private typeCheckAdapter: ProgramTypeCheckAdapter, private config: TypeCheckingConfig,
       private refEmitter: ReferenceEmitter, private reflector: ReflectionHost,
       private compilerHost: Pick<ts.CompilerHost, 'getCanonicalFileName'>,
-      private priorBuild: IncrementalBuild<unknown, FileTypeCheckingData>) {}
+      private priorBuild: IncrementalBuild<unknown, FileTypeCheckingData>,
+      private readonly componentScopeReader: ComponentScopeReader) {}
 
   resetOverrides(): void {
     for (const fileRecord of this.state.values()) {
@@ -48,6 +53,55 @@ export class TemplateTypeCheckerImpl implements TemplateTypeChecker {
     }
   }
 
+  getTemplate(component: ts.ClassDeclaration): TmplAstNode[]|null {
+    const {data} = this.getLatestComponentState(component);
+    if (data === null) {
+      return null;
+    }
+    return data.template;
+  }
+
+  private getLatestComponentState(component: ts.ClassDeclaration):
+      {data: TemplateData|null, tcb: ts.Node|null, shimPath: AbsoluteFsPath} {
+    this.ensureShimForComponent(component);
+
+    const sf = component.getSourceFile();
+    const sfPath = absoluteFromSourceFile(sf);
+    const shimPath = this.typeCheckingStrategy.shimPathForComponent(component);
+
+    const fileRecord = this.getFileData(sfPath);
+
+    if (!fileRecord.shimData.has(shimPath)) {
+      return {data: null, tcb: null, shimPath};
+    }
+
+    const templateId = fileRecord.sourceManager.getTemplateId(component);
+    const shimRecord = fileRecord.shimData.get(shimPath)!;
+    const id = fileRecord.sourceManager.getTemplateId(component);
+
+    const program = this.typeCheckingStrategy.getProgram();
+    const shimSf = getSourceFileOrNull(program, shimPath);
+
+    if (shimSf === null || !fileRecord.shimData.has(shimPath)) {
+      throw new Error(`Error: no shim file in program: ${shimPath}`);
+    }
+
+    let tcb: ts.Node|null = findTypeCheckBlock(shimSf, id);
+
+    if (tcb === null) {
+      // Try for an inline block.
+      const inlineSf = getSourceFileOrError(program, sfPath);
+      tcb = findTypeCheckBlock(inlineSf, id);
+    }
+
+    let data: TemplateData|null = null;
+    if (shimRecord.templates.has(templateId)) {
+      data = shimRecord.templates.get(templateId)!;
+    }
+
+    return {data, tcb, shimPath};
+  }
+
   overrideComponentTemplate(component: ts.ClassDeclaration, template: string):
       {nodes: TmplAstNode[], errors?: ParseError[]} {
     const {nodes, errors} = parseTemplate(template, 'override.html', {
@@ -55,7 +109,7 @@ export class TemplateTypeCheckerImpl implements TemplateTypeChecker {
       leadingTriviaChars: [],
     });
 
-    if (errors !== undefined) {
+    if (errors !== null) {
       return {nodes, errors};
     }
 
@@ -151,31 +205,55 @@ export class TemplateTypeCheckerImpl implements TemplateTypeChecker {
   }
 
   getTypeCheckBlock(component: ts.ClassDeclaration): ts.Node|null {
-    this.ensureAllShimsForOneFile(component.getSourceFile());
-
-    const program = this.typeCheckingStrategy.getProgram();
-    const filePath = absoluteFromSourceFile(component.getSourceFile());
-    const shimPath = this.typeCheckingStrategy.shimPathForComponent(component);
+    return this.getLatestComponentState(component).tcb;
+  }
 
-    if (!this.state.has(filePath)) {
-      throw new Error(`Error: no data for source file: ${filePath}`);
+  getGlobalCompletions(context: TmplAstTemplate|null, component: ts.ClassDeclaration):
+      GlobalCompletion[] {
+    const {tcb, data, shimPath} = this.getLatestComponentState(component);
+    if (tcb === null || data === null) {
+      return [];
     }
-    const fileRecord = this.state.get(filePath)!;
-    const id = fileRecord.sourceManager.getTemplateId(component);
 
-    const shimSf = getSourceFileOrNull(program, shimPath);
-    if (shimSf === null || !fileRecord.shimData.has(shimPath)) {
-      throw new Error(`Error: no shim file in program: ${shimPath}`);
+    const {boundTarget} = data;
+
+    // Global completions are the union of two separate pieces: a `ContextComponentCompletion` which
+    // is created from an expression within the TCB, and a list of named entities (variables and
+    // references) which are visible within the given `context` template.
+    const completions: GlobalCompletion[] = [];
+
+    const globalRead = findFirstMatchingNode(tcb, {
+      filter: ts.isPropertyAccessExpression,
+      withExpressionIdentifier: ExpressionIdentifier.COMPONENT_COMPLETION
+    });
+
+    if (globalRead === null) {
+      return [];
     }
 
-    let node: ts.Node|null = findTypeCheckBlock(shimSf, id);
-    if (node === null) {
-      // Try for an inline block.
-      const inlineSf = getSourceFileOrError(program, filePath);
-      node = findTypeCheckBlock(inlineSf, id);
+    completions.push({
+      kind: CompletionKind.ContextComponent,
+      shimPath,
+      positionInShimFile: globalRead.name.getStart(),
+    });
+
+    // Add completions for each entity in the template scope. Since each entity is uniquely named,
+    // there is no special ordering applied here.
+    for (const node of boundTarget.getEntitiesInTemplateScope(context)) {
+      if (node instanceof TmplAstReference) {
+        completions.push({
+          kind: CompletionKind.Reference,
+          node: node,
+        });
+      } else {
+        completions.push({
+          kind: CompletionKind.Variable,
+          node: node,
+        });
+      }
     }
 
-    return node;
+    return completions;
   }
 
   private maybeAdoptPriorResultsForFile(sf: ts.SourceFile): void {
@@ -325,6 +403,18 @@ export class TemplateTypeCheckerImpl implements TemplateTypeChecker {
     }
     return this.state.get(path)!;
   }
+
+  getSymbolOfNode(node: AST|TmplAstNode, component: ts.ClassDeclaration): Symbol|null {
+    const {tcb, data, shimPath} = this.getLatestComponentState(component);
+    if (tcb === null || data === null) {
+      return null;
+    }
+
+    const typeChecker = this.typeCheckingStrategy.getProgram().getTypeChecker();
+
+    return new SymbolBuilder(typeChecker, shimPath, tcb, data, this.componentScopeReader)
+        .getSymbol(node);
+  }
 }
 
 function convertDiagnostic(
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/src/comments.ts b/packages/compiler-cli/src/ngtsc/typecheck/src/comments.ts
new file mode 100644
index 0000000000000..10b6c59dda828
--- /dev/null
+++ b/packages/compiler-cli/src/ngtsc/typecheck/src/comments.ts
@@ -0,0 +1,184 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {AbsoluteSourceSpan, ParseSourceSpan} from '@angular/compiler';
+import * as ts from 'typescript';
+
+const parseSpanComment = /^(\d+),(\d+)$/;
+
+/**
+ * Reads the trailing comments and finds the first match which is a span comment (i.e. 4,10) on a
+ * node and returns it as an `AbsoluteSourceSpan`.
+ *
+ * Will return `null` if no trailing comments on the node match the expected form of a source span.
+ */
+export function readSpanComment(
+    node: ts.Node, sourceFile: ts.SourceFile = node.getSourceFile()): AbsoluteSourceSpan|null {
+  return ts.forEachTrailingCommentRange(sourceFile.text, node.getEnd(), (pos, end, kind) => {
+    if (kind !== ts.SyntaxKind.MultiLineCommentTrivia) {
+      return null;
+    }
+    const commentText = sourceFile.text.substring(pos + 2, end - 2);
+    const match = commentText.match(parseSpanComment);
+    if (match === null) {
+      return null;
+    }
+
+    return new AbsoluteSourceSpan(+match[1], +match[2]);
+  }) || null;
+}
+
+/** Used to identify what type the comment is. */
+export enum CommentTriviaType {
+  DIAGNOSTIC = 'D',
+  EXPRESSION_TYPE_IDENTIFIER = 'T',
+}
+
+/** Identifies what the TCB expression is for (for example, a directive declaration). */
+export enum ExpressionIdentifier {
+  DIRECTIVE = 'DIR',
+  COMPONENT_COMPLETION = 'COMPCOMP',
+}
+
+/** Tags the node with the given expression identifier. */
+export function addExpressionIdentifier(node: ts.Node, identifier: ExpressionIdentifier) {
+  ts.addSyntheticTrailingComment(
+      node, ts.SyntaxKind.MultiLineCommentTrivia,
+      `${CommentTriviaType.EXPRESSION_TYPE_IDENTIFIER}:${identifier}`,
+      /* hasTrailingNewLine */ false);
+}
+
+const IGNORE_MARKER = `${CommentTriviaType.DIAGNOSTIC}:ignore`;
+
+/**
+ * Tag the `ts.Node` with an indication that any errors arising from the evaluation of the node
+ * should be ignored.
+ */
+export function markIgnoreDiagnostics(node: ts.Node): void {
+  ts.addSyntheticTrailingComment(
+      node, ts.SyntaxKind.MultiLineCommentTrivia, IGNORE_MARKER, /* hasTrailingNewLine */ false);
+}
+
+/** Returns true if the node has a marker that indicates diagnostics errors should be ignored.  */
+export function hasIgnoreMarker(node: ts.Node, sourceFile: ts.SourceFile): boolean {
+  return ts.forEachTrailingCommentRange(sourceFile.text, node.getEnd(), (pos, end, kind) => {
+    if (kind !== ts.SyntaxKind.MultiLineCommentTrivia) {
+      return null;
+    }
+    const commentText = sourceFile.text.substring(pos + 2, end - 2);
+    return commentText === IGNORE_MARKER;
+  }) === true;
+}
+
+function makeRecursiveVisitor<T extends ts.Node>(visitor: (node: ts.Node) => T | null):
+    (node: ts.Node) => T | undefined {
+  function recursiveVisitor(node: ts.Node): T|undefined {
+    const res = visitor(node);
+    return res !== null ? res : node.forEachChild(recursiveVisitor);
+  }
+  return recursiveVisitor;
+}
+
+export interface FindOptions<T extends ts.Node> {
+  filter: (node: ts.Node) => node is T;
+  withExpressionIdentifier?: ExpressionIdentifier;
+  withSpan?: AbsoluteSourceSpan|ParseSourceSpan;
+}
+
+function getSpanFromOptions(opts: FindOptions<ts.Node>) {
+  let withSpan: {start: number, end: number}|null = null;
+  if (opts.withSpan !== undefined) {
+    if (opts.withSpan instanceof AbsoluteSourceSpan) {
+      withSpan = opts.withSpan;
+    } else {
+      withSpan = {start: opts.withSpan.start.offset, end: opts.withSpan.end.offset};
+    }
+  }
+  return withSpan;
+}
+
+/**
+ * Given a `ts.Node` with finds the first node whose matching the criteria specified
+ * by the `FindOptions`.
+ *
+ * Returns `null` when no `ts.Node` matches the given conditions.
+ */
+export function findFirstMatchingNode<T extends ts.Node>(tcb: ts.Node, opts: FindOptions<T>): T|
+    null {
+  const withSpan = getSpanFromOptions(opts);
+  const withExpressionIdentifier = opts.withExpressionIdentifier;
+  const sf = tcb.getSourceFile();
+  const visitor = makeRecursiveVisitor<T>(node => {
+    if (!opts.filter(node)) {
+      return null;
+    }
+    if (withSpan !== null) {
+      const comment = readSpanComment(node, sf);
+      if (comment === null || withSpan.start !== comment.start || withSpan.end !== comment.end) {
+        return null;
+      }
+    }
+    if (withExpressionIdentifier !== undefined &&
+        !hasExpressionIdentifier(sf, node, withExpressionIdentifier)) {
+      return null;
+    }
+    return node;
+  });
+  return tcb.forEachChild(visitor) ?? null;
+}
+
+/**
+ * Given a `ts.Node` with source span comments, finds the first node whose source span comment
+ * matches the given `sourceSpan`. Additionally, the `filter` function allows matching only
+ * `ts.Nodes` of a given type, which provides the ability to select only matches of a given type
+ * when there may be more than one.
+ *
+ * Returns `null` when no `ts.Node` matches the given conditions.
+ */
+export function findAllMatchingNodes<T extends ts.Node>(tcb: ts.Node, opts: FindOptions<T>): T[] {
+  const withSpan = getSpanFromOptions(opts);
+  const withExpressionIdentifier = opts.withExpressionIdentifier;
+  const results: T[] = [];
+  const stack: ts.Node[] = [tcb];
+  const sf = tcb.getSourceFile();
+
+  while (stack.length > 0) {
+    const node = stack.pop()!;
+
+    if (!opts.filter(node)) {
+      stack.push(...node.getChildren());
+      continue;
+    }
+    if (withSpan !== null) {
+      const comment = readSpanComment(node, sf);
+      if (comment === null || withSpan.start !== comment.start || withSpan.end !== comment.end) {
+        stack.push(...node.getChildren());
+        continue;
+      }
+    }
+    if (withExpressionIdentifier !== undefined &&
+        !hasExpressionIdentifier(sf, node, withExpressionIdentifier)) {
+      continue;
+    }
+
+    results.push(node);
+  }
+
+  return results;
+}
+
+export function hasExpressionIdentifier(
+    sourceFile: ts.SourceFile, node: ts.Node, identifier: ExpressionIdentifier): boolean {
+  return ts.forEachTrailingCommentRange(sourceFile.text, node.getEnd(), (pos, end, kind) => {
+    if (kind !== ts.SyntaxKind.MultiLineCommentTrivia) {
+      return false;
+    }
+    const commentText = sourceFile.text.substring(pos + 2, end - 2);
+    return commentText === `${CommentTriviaType.EXPRESSION_TYPE_IDENTIFIER}:${identifier}`;
+  }) || false;
+}
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/src/context.ts b/packages/compiler-cli/src/ngtsc/typecheck/src/context.ts
index 9bd6897fdedbd..30c15189bc1ac 100644
--- a/packages/compiler-cli/src/ngtsc/typecheck/src/context.ts
+++ b/packages/compiler-cli/src/ngtsc/typecheck/src/context.ts
@@ -6,16 +6,16 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ParseSourceFile, R3TargetBinder, SchemaMetadata, TmplAstNode} from '@angular/compiler';
+import {BoundTarget, ParseSourceFile, R3TargetBinder, SchemaMetadata, TmplAstNode} from '@angular/compiler';
 import * as ts from 'typescript';
 
 import {absoluteFromSourceFile, AbsoluteFsPath} from '../../file_system';
 import {NoopImportRewriter, Reference, ReferenceEmitter} from '../../imports';
 import {ClassDeclaration, ReflectionHost} from '../../reflection';
 import {ImportManager} from '../../translator';
-import {ComponentToShimMappingStrategy, TemplateSourceMapping, TypeCheckableDirectiveMeta, TypeCheckBlockMetadata, TypeCheckContext, TypeCheckingConfig, TypeCtorMetadata} from '../api';
+import {ComponentToShimMappingStrategy, TemplateId, TemplateSourceMapping, TypeCheckableDirectiveMeta, TypeCheckBlockMetadata, TypeCheckContext, TypeCheckingConfig, TypeCtorMetadata} from '../api';
+import {TemplateDiagnostic} from '../diagnostics';
 
-import {TemplateDiagnostic} from './diagnostics';
 import {DomSchemaChecker, RegistryDomSchemaChecker} from './dom';
 import {Environment} from './environment';
 import {OutOfBandDiagnosticRecorder, OutOfBandDiagnosticRecorderImpl} from './oob';
@@ -41,6 +41,28 @@ export interface ShimTypeCheckingData {
    * Whether any inline operations for the input file were required to generate this shim.
    */
   hasInlines: boolean;
+
+  /**
+   * Map of `TemplateId` to information collected about the template during the template
+   * type-checking process.
+   */
+  templates: Map<TemplateId, TemplateData>;
+}
+
+/**
+ * Data tracked for each template processed by the template type-checking system.
+ */
+export interface TemplateData {
+  /**
+   * Template nodes for which the TCB was generated.
+   */
+  template: TmplAstNode[];
+
+  /**
+   * `BoundTarget` which was used to generate the TCB, and contains bindings for the associated
+   * template nodes.
+   */
+  boundTarget: BoundTarget<TypeCheckableDirectiveMeta>;
 }
 
 /**
@@ -79,6 +101,12 @@ export interface PendingShimData {
    * Shim file in the process of being generated.
    */
   file: TypeCheckFile;
+
+
+  /**
+   * Map of `TemplateId` to information collected about the template as it's ingested.
+   */
+  templates: Map<TemplateId, TemplateData>;
 }
 
 /**
@@ -195,16 +223,17 @@ export class TypeCheckContextImpl implements TypeCheckContext {
     const fileData = this.dataForFile(ref.node.getSourceFile());
     const shimData = this.pendingShimForComponent(ref.node);
     const boundTarget = binder.bind({template});
+
     // Get all of the directives used in the template and record type constructors for all of them.
     for (const dir of boundTarget.getUsedDirectives()) {
       const dirRef = dir.ref as Reference<ClassDeclaration<ts.ClassDeclaration>>;
       const dirNode = dirRef.node;
-      if (requiresInlineTypeCtor(dirNode, this.reflector)) {
+
+      if (dir.isGeneric && requiresInlineTypeCtor(dirNode, this.reflector)) {
         if (this.inlining === InliningMode.Error) {
           missingInlines.push(dirNode);
           continue;
         }
-
         // Add a type constructor operation for the directive.
         this.addInlineTypeCtor(fileData, dirNode.getSourceFile(), dirRef, {
           fnName: 'ngTypeCtor',
@@ -212,8 +241,8 @@ export class TypeCheckContextImpl implements TypeCheckContext {
           // it comes from a .d.ts file. .d.ts declarations don't have bodies.
           body: !dirNode.getSourceFile().isDeclarationFile,
           fields: {
-            inputs: Object.keys(dir.inputs),
-            outputs: Object.keys(dir.outputs),
+            inputs: dir.inputs.classPropertyNames,
+            outputs: dir.outputs.classPropertyNames,
             // TODO(alxhub): support queries
             queries: dir.queries,
           },
@@ -221,6 +250,11 @@ export class TypeCheckContextImpl implements TypeCheckContext {
         });
       }
     }
+    const templateId = fileData.sourceManager.getTemplateId(ref.node);
+    shimData.templates.set(templateId, {
+      template,
+      boundTarget,
+    });
 
     const tcbRequiresInline = requiresInlineTypeCheckBlock(ref.node);
 
@@ -231,7 +265,6 @@ export class TypeCheckContextImpl implements TypeCheckContext {
       // and inlining would be required.
 
       // Record diagnostics to indicate the issues with this template.
-      const templateId = fileData.sourceManager.getTemplateId(ref.node);
       if (tcbRequiresInline) {
         shimData.oobRecorder.requiresInlineTcb(templateId, ref.node);
       }
@@ -348,6 +381,7 @@ export class TypeCheckContextImpl implements TypeCheckContext {
           ],
           hasInlines: pendingFileData.hasInlines,
           path: pendingShimData.file.fileName,
+          templates: pendingShimData.templates,
         });
         updates.set(pendingShimData.file.fileName, pendingShimData.file.render());
       }
@@ -380,6 +414,7 @@ export class TypeCheckContextImpl implements TypeCheckContext {
         oobRecorder: new OutOfBandDiagnosticRecorderImpl(fileData.sourceManager),
         file: new TypeCheckFile(
             shimPath, this.config, this.refEmitter, this.reflector, this.compilerHost),
+        templates: new Map<TemplateId, TemplateData>(),
       });
     }
     return fileData.shimData.get(shimPath)!;
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/src/diagnostics.ts b/packages/compiler-cli/src/ngtsc/typecheck/src/diagnostics.ts
index 2b61b1bc39c26..ff8be749683ee 100644
--- a/packages/compiler-cli/src/ngtsc/typecheck/src/diagnostics.ts
+++ b/packages/compiler-cli/src/ngtsc/typecheck/src/diagnostics.ts
@@ -9,24 +9,11 @@ import {AbsoluteSourceSpan, ParseSourceSpan} from '@angular/compiler';
 import * as ts from 'typescript';
 
 import {getTokenAtPosition} from '../../util/src/typescript';
-import {ExternalTemplateSourceMapping, TemplateId, TemplateSourceMapping} from '../api';
+import {TemplateId, TemplateSourceMapping} from '../api';
+import {makeTemplateDiagnostic, TemplateDiagnostic} from '../diagnostics';
 
+import {hasIgnoreMarker, readSpanComment} from './comments';
 
-/**
- * A `ts.Diagnostic` with additional information about the diagnostic related to template
- * type-checking.
- */
-export interface TemplateDiagnostic extends ts.Diagnostic {
-  /**
-   * The component with the template that resulted in this diagnostic.
-   */
-  componentFile: ts.SourceFile;
-
-  /**
-   * The template id of the component that resulted in this diagnostic.
-   */
-  templateId: TemplateId;
-}
 
 /**
  * Adapter interface which allows the template type-checking diagnostics code to interpret offsets
@@ -63,14 +50,14 @@ export function wrapForDiagnostics(expr: ts.Expression): ts.Expression {
   return ts.createParen(expr);
 }
 
-const IGNORE_MARKER = 'ignore';
-
 /**
- * Adds a marker to the node that signifies that any errors within the node should not be reported.
+ * Wraps the node in parenthesis such that inserted span comments become attached to the proper
+ * node. This is an alias for `ts.createParen` with the benefit that it signifies that the
+ * inserted parenthesis are for use by the type checker, not for correctness of the rendered TCB
+ * code.
  */
-export function ignoreDiagnostics(node: ts.Node): void {
-  ts.addSyntheticTrailingComment(
-      node, ts.SyntaxKind.MultiLineCommentTrivia, IGNORE_MARKER, /* hasTrailingNewLine */ false);
+export function wrapForTypeChecker(expr: ts.Expression): ts.Expression {
+  return ts.createParen(expr);
 }
 
 /**
@@ -157,101 +144,6 @@ export function findTypeCheckBlock(file: ts.SourceFile, id: TemplateId): ts.Node
   return null;
 }
 
-/**
- * Constructs a `ts.Diagnostic` for a given `ParseSourceSpan` within a template.
- */
-export function makeTemplateDiagnostic(
-    templateId: TemplateId, mapping: TemplateSourceMapping, span: ParseSourceSpan,
-    category: ts.DiagnosticCategory, code: number, messageText: string|ts.DiagnosticMessageChain,
-    relatedMessage?: {
-      text: string,
-      span: ParseSourceSpan,
-    }): TemplateDiagnostic {
-  if (mapping.type === 'direct') {
-    let relatedInformation: ts.DiagnosticRelatedInformation[]|undefined = undefined;
-    if (relatedMessage !== undefined) {
-      relatedInformation = [{
-        category: ts.DiagnosticCategory.Message,
-        code: 0,
-        file: mapping.node.getSourceFile(),
-        start: relatedMessage.span.start.offset,
-        length: relatedMessage.span.end.offset - relatedMessage.span.start.offset,
-        messageText: relatedMessage.text,
-      }];
-    }
-    // For direct mappings, the error is shown inline as ngtsc was able to pinpoint a string
-    // constant within the `@Component` decorator for the template. This allows us to map the error
-    // directly into the bytes of the source file.
-    return {
-      source: 'ngtsc',
-      code,
-      category,
-      messageText,
-      file: mapping.node.getSourceFile(),
-      componentFile: mapping.node.getSourceFile(),
-      templateId,
-      start: span.start.offset,
-      length: span.end.offset - span.start.offset,
-      relatedInformation,
-    };
-  } else if (mapping.type === 'indirect' || mapping.type === 'external') {
-    // For indirect mappings (template was declared inline, but ngtsc couldn't map it directly
-    // to a string constant in the decorator), the component's file name is given with a suffix
-    // indicating it's not the TS file being displayed, but a template.
-    // For external temoplates, the HTML filename is used.
-    const componentSf = mapping.componentClass.getSourceFile();
-    const componentName = mapping.componentClass.name.text;
-    // TODO(alxhub): remove cast when TS in g3 supports this narrowing.
-    const fileName = mapping.type === 'indirect' ?
-        `${componentSf.fileName} (${componentName} template)` :
-        (mapping as ExternalTemplateSourceMapping).templateUrl;
-    // TODO(alxhub): investigate creating a fake `ts.SourceFile` here instead of invoking the TS
-    // parser against the template (HTML is just really syntactically invalid TypeScript code ;).
-    // Also investigate caching the file to avoid running the parser multiple times.
-    const sf = ts.createSourceFile(
-        fileName, mapping.template, ts.ScriptTarget.Latest, false, ts.ScriptKind.JSX);
-
-    let relatedInformation: ts.DiagnosticRelatedInformation[] = [];
-    if (relatedMessage !== undefined) {
-      relatedInformation.push({
-        category: ts.DiagnosticCategory.Message,
-        code: 0,
-        file: sf,
-        start: relatedMessage.span.start.offset,
-        length: relatedMessage.span.end.offset - relatedMessage.span.start.offset,
-        messageText: relatedMessage.text,
-      });
-    }
-
-    relatedInformation.push({
-      category: ts.DiagnosticCategory.Message,
-      code: 0,
-      file: componentSf,
-      // mapping.node represents either the 'template' or 'templateUrl' expression. getStart()
-      // and getEnd() are used because they don't include surrounding whitespace.
-      start: mapping.node.getStart(),
-      length: mapping.node.getEnd() - mapping.node.getStart(),
-      messageText: `Error occurs in the template of component ${componentName}.`,
-    });
-
-    return {
-      source: 'ngtsc',
-      category,
-      code,
-      messageText,
-      file: sf,
-      componentFile: componentSf,
-      templateId,
-      start: span.start.offset,
-      length: span.end.offset - span.start.offset,
-      // Show a secondary message indicating the component whose template contains the error.
-      relatedInformation,
-    };
-  } else {
-    throw new Error(`Unexpected source mapping type: ${(mapping as {type: string}).type}`);
-  }
-}
-
 interface SourceLocation {
   id: TemplateId;
   span: AbsoluteSourceSpan;
@@ -270,7 +162,7 @@ function findSourceLocation(node: ts.Node, sourceFile: ts.SourceFile): SourceLoc
       return null;
     }
 
-    const span = readSpanComment(sourceFile, node);
+    const span = readSpanComment(node, sourceFile);
     if (span !== null) {
       // Once the positional information has been extracted, search further up the TCB to extract
       // the unique id that is attached with the TCB's function declaration.
@@ -311,35 +203,3 @@ function getTemplateId(node: ts.Node, sourceFile: ts.SourceFile): TemplateId|nul
     return commentText;
   }) as TemplateId || null;
 }
-
-const parseSpanComment = /^(\d+),(\d+)$/;
-
-function readSpanComment(sourceFile: ts.SourceFile, node: ts.Node): AbsoluteSourceSpan|null {
-  return ts.forEachTrailingCommentRange(sourceFile.text, node.getEnd(), (pos, end, kind) => {
-    if (kind !== ts.SyntaxKind.MultiLineCommentTrivia) {
-      return null;
-    }
-    const commentText = sourceFile.text.substring(pos + 2, end - 2);
-    const match = commentText.match(parseSpanComment);
-    if (match === null) {
-      return null;
-    }
-
-    return new AbsoluteSourceSpan(+match[1], +match[2]);
-  }) || null;
-}
-
-function hasIgnoreMarker(node: ts.Node, sourceFile: ts.SourceFile): boolean {
-  return ts.forEachTrailingCommentRange(sourceFile.text, node.getEnd(), (pos, end, kind) => {
-    if (kind !== ts.SyntaxKind.MultiLineCommentTrivia) {
-      return null;
-    }
-    const commentText = sourceFile.text.substring(pos + 2, end - 2);
-    return commentText === IGNORE_MARKER;
-  }) === true;
-}
-
-export function isTemplateDiagnostic(diagnostic: ts.Diagnostic): diagnostic is TemplateDiagnostic {
-  return diagnostic.hasOwnProperty('componentFile') &&
-      ts.isSourceFile((diagnostic as any).componentFile);
-}
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/src/dom.ts b/packages/compiler-cli/src/ngtsc/typecheck/src/dom.ts
index c6b39be34dfd0..4d22fd92fb44e 100644
--- a/packages/compiler-cli/src/ngtsc/typecheck/src/dom.ts
+++ b/packages/compiler-cli/src/ngtsc/typecheck/src/dom.ts
@@ -11,8 +11,9 @@ import * as ts from 'typescript';
 
 import {ErrorCode, ngErrorCode} from '../../diagnostics';
 import {TemplateId} from '../api';
+import {makeTemplateDiagnostic, TemplateDiagnostic} from '../diagnostics';
 
-import {makeTemplateDiagnostic, TemplateDiagnostic, TemplateSourceResolver} from './diagnostics';
+import {TemplateSourceResolver} from './diagnostics';
 
 const REGISTRY = new DomElementSchemaRegistry();
 const REMOVE_XHTML_REGEX = /^:xhtml:/;
@@ -93,7 +94,7 @@ export class RegistryDomSchemaChecker implements DomSchemaChecker {
       }
 
       const diag = makeTemplateDiagnostic(
-          id, mapping, element.sourceSpan, ts.DiagnosticCategory.Error,
+          id, mapping, element.startSourceSpan, ts.DiagnosticCategory.Error,
           ngErrorCode(ErrorCode.SCHEMA_INVALID_ELEMENT), errorMsg);
       this._diagnostics.push(diag);
     }
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/src/environment.ts b/packages/compiler-cli/src/ngtsc/typecheck/src/environment.ts
index e0d8bb1905e77..d0c25504ba953 100644
--- a/packages/compiler-cli/src/ngtsc/typecheck/src/environment.ts
+++ b/packages/compiler-cli/src/ngtsc/typecheck/src/environment.ts
@@ -9,7 +9,7 @@
 import {ExpressionType, ExternalExpr, Type, WrappedNodeExpr} from '@angular/compiler';
 import * as ts from 'typescript';
 
-import {ImportFlags, NOOP_DEFAULT_IMPORT_RECORDER, Reference, ReferenceEmitter} from '../../imports';
+import {ImportFlags, Reference, ReferenceEmitter} from '../../imports';
 import {ClassDeclaration, ReflectionHost} from '../../reflection';
 import {ImportManager, translateExpression, translateType} from '../../translator';
 import {TypeCheckableDirectiveMeta, TypeCheckingConfig, TypeCtorMetadata} from '../api';
@@ -79,8 +79,8 @@ export class Environment {
         fnName,
         body: true,
         fields: {
-          inputs: Object.keys(dir.inputs),
-          outputs: Object.keys(dir.outputs),
+          inputs: dir.inputs.classPropertyNames,
+          outputs: dir.outputs.classPropertyNames,
           // TODO: support queries
           queries: dir.queries,
         },
@@ -213,8 +213,7 @@ export class Environment {
     const ngExpr = this.refEmitter.emit(ref, this.contextFile, ImportFlags.NoAliasing);
 
     // Use `translateExpression` to convert the `Expression` into a `ts.Expression`.
-    return translateExpression(
-        ngExpr, this.importManager, NOOP_DEFAULT_IMPORT_RECORDER, ts.ScriptTarget.ES2015);
+    return translateExpression(ngExpr, this.importManager);
   }
 
   /**
@@ -245,7 +244,8 @@ export class Environment {
    */
   referenceExternalType(moduleName: string, name: string, typeParams?: Type[]): ts.TypeNode {
     const external = new ExternalExpr({moduleName, name});
-    return translateType(new ExpressionType(external, null, typeParams), this.importManager);
+    return translateType(
+        new ExpressionType(external, [/* modifiers */], typeParams), this.importManager);
   }
 
   getPreludeStatements(): ts.Statement[] {
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/src/expression.ts b/packages/compiler-cli/src/ngtsc/typecheck/src/expression.ts
index e068cecb87f05..f462987f84c83 100644
--- a/packages/compiler-cli/src/ngtsc/typecheck/src/expression.ts
+++ b/packages/compiler-cli/src/ngtsc/typecheck/src/expression.ts
@@ -6,18 +6,23 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {AST, AstVisitor, ASTWithSource, Binary, BindingPipe, Chain, Conditional, EmptyExpr, FunctionCall, ImplicitReceiver, Interpolation, KeyedRead, KeyedWrite, LiteralArray, LiteralMap, LiteralPrimitive, MethodCall, NonNullAssert, PrefixNot, PropertyRead, PropertyWrite, Quote, SafeMethodCall, SafePropertyRead} from '@angular/compiler';
+import {AST, AstVisitor, ASTWithSource, Binary, BindingPipe, Chain, Conditional, EmptyExpr, FunctionCall, ImplicitReceiver, Interpolation, KeyedRead, KeyedWrite, LiteralArray, LiteralMap, LiteralPrimitive, MethodCall, NonNullAssert, PrefixNot, PropertyRead, PropertyWrite, Quote, SafeMethodCall, SafePropertyRead, Unary} from '@angular/compiler';
 import * as ts from 'typescript';
 import {TypeCheckingConfig} from '../api';
 
-import {addParseSpanInfo, wrapForDiagnostics} from './diagnostics';
+import {addParseSpanInfo, wrapForDiagnostics, wrapForTypeChecker} from './diagnostics';
 import {tsCastToAny} from './ts_util';
 
 export const NULL_AS_ANY =
     ts.createAsExpression(ts.createNull(), ts.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword));
 const UNDEFINED = ts.createIdentifier('undefined');
 
-const BINARY_OPS = new Map<string, ts.SyntaxKind>([
+const UNARY_OPS = new Map<string, ts.PrefixUnaryOperator>([
+  ['+', ts.SyntaxKind.PlusToken],
+  ['-', ts.SyntaxKind.MinusToken],
+]);
+
+const BINARY_OPS = new Map<string, ts.BinaryOperator>([
   ['+', ts.SyntaxKind.PlusToken],
   ['-', ts.SyntaxKind.MinusToken],
   ['<', ts.SyntaxKind.LessThanToken],
@@ -74,6 +79,17 @@ class AstTranslator implements AstVisitor {
     return ast.visit(this);
   }
 
+  visitUnary(ast: Unary): ts.Expression {
+    const expr = this.translate(ast.expr);
+    const op = UNARY_OPS.get(ast.operator);
+    if (op === undefined) {
+      throw new Error(`Unsupported Unary.operator: ${ast.operator}`);
+    }
+    const node = wrapForDiagnostics(ts.createPrefix(op, expr));
+    addParseSpanInfo(node, ast.sourceSpan);
+    return node;
+  }
+
   visitBinary(ast: Binary): ts.Expression {
     const lhs = wrapForDiagnostics(this.translate(ast.left));
     const rhs = wrapForDiagnostics(this.translate(ast.right));
@@ -81,7 +97,7 @@ class AstTranslator implements AstVisitor {
     if (op === undefined) {
       throw new Error(`Unsupported Binary.operation: ${ast.operation}`);
     }
-    const node = ts.createBinary(lhs, op as any, rhs);
+    const node = ts.createBinary(lhs, op, rhs);
     addParseSpanInfo(node, ast.sourceSpan);
     return node;
   }
@@ -96,7 +112,14 @@ class AstTranslator implements AstVisitor {
   visitConditional(ast: Conditional): ts.Expression {
     const condExpr = this.translate(ast.condition);
     const trueExpr = this.translate(ast.trueExp);
-    const falseExpr = this.translate(ast.falseExp);
+    // Wrap `falseExpr` in parens so that the trailing parse span info is not attributed to the
+    // whole conditional.
+    // In the following example, the last source span comment (5,6) could be seen as the
+    // trailing comment for _either_ the whole conditional expression _or_ just the `falseExpr` that
+    // is immediately before it:
+    // `conditional /*1,2*/ ? trueExpr /*3,4*/ : falseExpr /*5,6*/`
+    // This should be instead be `conditional /*1,2*/ ? trueExpr /*3,4*/ : (falseExpr /*5,6*/)`
+    const falseExpr = wrapForTypeChecker(this.translate(ast.falseExp));
     const node = ts.createParen(ts.createConditional(condExpr, trueExpr, falseExpr));
     addParseSpanInfo(node, ast.sourceSpan);
     return node;
@@ -119,7 +142,8 @@ class AstTranslator implements AstVisitor {
     // interpolation's expressions. The chain is started using an actual string literal to ensure
     // the type is inferred as 'string'.
     return ast.expressions.reduce(
-        (lhs, ast) => ts.createBinary(lhs, ts.SyntaxKind.PlusToken, this.translate(ast)),
+        (lhs, ast) =>
+            ts.createBinary(lhs, ts.SyntaxKind.PlusToken, wrapForTypeChecker(this.translate(ast))),
         ts.createLiteral(''));
   }
 
@@ -227,15 +251,22 @@ class AstTranslator implements AstVisitor {
     //     ^     nameSpan
     const leftWithPath = wrapForDiagnostics(left);
     addParseSpanInfo(leftWithPath, ast.sourceSpan);
-    const right = this.translate(ast.value);
+    let right = this.translate(ast.value);
+    // The right needs to be wrapped in parens as well or we cannot accurately match its
+    // span to just the RHS. For example, the span in `e = $event /*0,10*/` is ambiguous.
+    // It could refer to either the whole binary expression or just the RHS.
+    // We should instead generate `e = ($event /*0,10*/)` so we know the span 0,10 matches RHS.
+    if (!ts.isParenthesizedExpression(right)) {
+      right = wrapForTypeChecker(right);
+    }
     const node =
         wrapForDiagnostics(ts.createBinary(leftWithPath, ts.SyntaxKind.EqualsToken, right));
     addParseSpanInfo(node, ast.sourceSpan);
     return node;
   }
 
-  visitQuote(ast: Quote): never {
-    throw new Error('Method not implemented.');
+  visitQuote(ast: Quote): ts.Expression {
+    return NULL_AS_ANY;
   }
 
   visitSafeMethodCall(ast: SafeMethodCall): ts.Expression {
@@ -314,6 +345,9 @@ class VeSafeLhsInferenceBugDetector implements AstVisitor {
     return ast.receiver.visit(VeSafeLhsInferenceBugDetector.SINGLETON);
   }
 
+  visitUnary(ast: Unary): boolean {
+    return ast.expr.visit(this);
+  }
   visitBinary(ast: Binary): boolean {
     return ast.left.visit(this) || ast.right.visit(this);
   }
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/src/host.ts b/packages/compiler-cli/src/ngtsc/typecheck/src/host.ts
index 57a74db930c88..d7283890c1de9 100644
--- a/packages/compiler-cli/src/ngtsc/typecheck/src/host.ts
+++ b/packages/compiler-cli/src/ngtsc/typecheck/src/host.ts
@@ -10,11 +10,59 @@ import * as ts from 'typescript';
 
 import {copyFileShimData, ShimReferenceTagger} from '../../shims';
 
+/**
+ * Represents the `ts.CompilerHost` interface, with a transformation applied that turns all
+ * methods (even optional ones) into required fields (which may be `undefined`, if the method was
+ * optional).
+ */
+export type RequiredCompilerHostDelegations = {
+  [M in keyof Required<ts.CompilerHost>]: ts.CompilerHost[M];
+};
+
+/**
+ * Delegates all methods of `ts.CompilerHost` to a delegate, with the exception of
+ * `getSourceFile`, `fileExists` and `writeFile` which are implemented in `TypeCheckProgramHost`.
+ *
+ * If a new method is added to `ts.CompilerHost` which is not delegated, a type error will be
+ * generated for this class.
+ */
+export class DelegatingCompilerHost implements
+    Omit<RequiredCompilerHostDelegations, 'getSourceFile'|'fileExists'|'writeFile'> {
+  constructor(protected delegate: ts.CompilerHost) {}
+
+  private delegateMethod<M extends keyof ts.CompilerHost>(name: M): ts.CompilerHost[M] {
+    return this.delegate[name] !== undefined ? (this.delegate[name] as any).bind(this.delegate) :
+                                               undefined;
+  }
+
+  // Excluded are 'getSourceFile', 'fileExists' and 'writeFile', which are actually implemented by
+  // `TypeCheckProgramHost` below.
+  createHash = this.delegateMethod('createHash');
+  directoryExists = this.delegateMethod('directoryExists');
+  getCancellationToken = this.delegateMethod('getCancellationToken');
+  getCanonicalFileName = this.delegateMethod('getCanonicalFileName');
+  getCurrentDirectory = this.delegateMethod('getCurrentDirectory');
+  getDefaultLibFileName = this.delegateMethod('getDefaultLibFileName');
+  getDefaultLibLocation = this.delegateMethod('getDefaultLibLocation');
+  getDirectories = this.delegateMethod('getDirectories');
+  getEnvironmentVariable = this.delegateMethod('getEnvironmentVariable');
+  getNewLine = this.delegateMethod('getNewLine');
+  getParsedCommandLine = this.delegateMethod('getParsedCommandLine');
+  getSourceFileByPath = this.delegateMethod('getSourceFileByPath');
+  readDirectory = this.delegateMethod('readDirectory');
+  readFile = this.delegateMethod('readFile');
+  realpath = this.delegateMethod('realpath');
+  resolveModuleNames = this.delegateMethod('resolveModuleNames');
+  resolveTypeReferenceDirectives = this.delegateMethod('resolveTypeReferenceDirectives');
+  trace = this.delegateMethod('trace');
+  useCaseSensitiveFileNames = this.delegateMethod('useCaseSensitiveFileNames');
+}
+
 /**
  * A `ts.CompilerHost` which augments source files with type checking code from a
  * `TypeCheckContext`.
  */
-export class TypeCheckProgramHost implements ts.CompilerHost {
+export class TypeCheckProgramHost extends DelegatingCompilerHost {
   /**
    * Map of source file names to `ts.SourceFile` instances.
    */
@@ -32,20 +80,11 @@ export class TypeCheckProgramHost implements ts.CompilerHost {
    */
   private shimTagger = new ShimReferenceTagger(this.shimExtensionPrefixes);
 
-  readonly resolveModuleNames?: ts.CompilerHost['resolveModuleNames'];
-
   constructor(
       sfMap: Map<string, ts.SourceFile>, private originalProgram: ts.Program,
-      private delegate: ts.CompilerHost, private shimExtensionPrefixes: string[]) {
+      delegate: ts.CompilerHost, private shimExtensionPrefixes: string[]) {
+    super(delegate);
     this.sfMap = sfMap;
-
-    if (delegate.getDirectories !== undefined) {
-      this.getDirectories = (path: string) => delegate.getDirectories!(path);
-    }
-
-    if (delegate.resolveModuleNames !== undefined) {
-      this.resolveModuleNames = delegate.resolveModuleNames;
-    }
   }
 
   getSourceFile(
@@ -88,42 +127,11 @@ export class TypeCheckProgramHost implements ts.CompilerHost {
     this.shimTagger.finalize();
   }
 
-  // The rest of the methods simply delegate to the underlying `ts.CompilerHost`.
-
-  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>|undefined): void {
+  writeFile(): never {
     throw new Error(`TypeCheckProgramHost should never write files`);
   }
 
-  getCurrentDirectory(): string {
-    return this.delegate.getCurrentDirectory();
-  }
-
-  getDirectories?: (path: string) => string[];
-
-  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.sfMap.has(fileName) || this.delegate.fileExists(fileName);
   }
-
-  readFile(fileName: string): string|undefined {
-    return this.delegate.readFile(fileName);
-  }
 }
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/src/oob.ts b/packages/compiler-cli/src/ngtsc/typecheck/src/oob.ts
index 0d9ab782a67a5..2b7cbd02e5340 100644
--- a/packages/compiler-cli/src/ngtsc/typecheck/src/oob.ts
+++ b/packages/compiler-cli/src/ngtsc/typecheck/src/oob.ts
@@ -12,8 +12,9 @@ import * as ts from 'typescript';
 import {ErrorCode, makeDiagnostic, makeRelatedInformation, ngErrorCode} from '../../diagnostics';
 import {ClassDeclaration} from '../../reflection';
 import {TemplateId} from '../api';
+import {makeTemplateDiagnostic, TemplateDiagnostic} from '../diagnostics';
 
-import {makeTemplateDiagnostic, TemplateDiagnostic, TemplateSourceResolver} from './diagnostics';
+import {TemplateSourceResolver} from './diagnostics';
 
 
 
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/src/source.ts b/packages/compiler-cli/src/ngtsc/typecheck/src/source.ts
index 2401cc8aae457..6d0c7486fee9e 100644
--- a/packages/compiler-cli/src/ngtsc/typecheck/src/source.ts
+++ b/packages/compiler-cli/src/ngtsc/typecheck/src/source.ts
@@ -8,7 +8,9 @@
 
 import {AbsoluteSourceSpan, ParseLocation, ParseSourceFile, ParseSourceSpan} from '@angular/compiler';
 import * as ts from 'typescript';
+
 import {TemplateId, TemplateSourceMapping} from '../api';
+import {getTemplateId} from '../diagnostics';
 
 import {TemplateSourceResolver} from './diagnostics';
 import {computeLineStartsMap, getLineAndCharacterFromPosition} from './line_mappings';
@@ -81,28 +83,3 @@ export class TemplateSourceManager implements TemplateSourceResolver {
     return templateSource.toParseSourceSpan(span.start, span.end);
   }
 }
-
-const TEMPLATE_ID = Symbol('ngTemplateId');
-const NEXT_TEMPLATE_ID = Symbol('ngNextTemplateId');
-
-interface HasTemplateId {
-  [TEMPLATE_ID]: TemplateId;
-}
-
-interface HasNextTemplateId {
-  [NEXT_TEMPLATE_ID]: number;
-}
-
-function getTemplateId(node: ts.ClassDeclaration&Partial<HasTemplateId>): TemplateId {
-  if (node[TEMPLATE_ID] === undefined) {
-    node[TEMPLATE_ID] = allocateTemplateId(node.getSourceFile());
-  }
-  return node[TEMPLATE_ID]!;
-}
-
-function allocateTemplateId(sf: ts.SourceFile&Partial<HasNextTemplateId>): TemplateId {
-  if (sf[NEXT_TEMPLATE_ID] === undefined) {
-    sf[NEXT_TEMPLATE_ID] = 1;
-  }
-  return (`tcb${sf[NEXT_TEMPLATE_ID]!++}`) as TemplateId;
-}
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/src/template_symbol_builder.ts b/packages/compiler-cli/src/ngtsc/typecheck/src/template_symbol_builder.ts
new file mode 100644
index 0000000000000..20f28b58a8650
--- /dev/null
+++ b/packages/compiler-cli/src/ngtsc/typecheck/src/template_symbol_builder.ts
@@ -0,0 +1,438 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {AST, ASTWithSource, BindingPipe, MethodCall, PropertyWrite, SafeMethodCall, SafePropertyRead, TmplAstBoundAttribute, TmplAstBoundEvent, TmplAstElement, TmplAstNode, TmplAstReference, TmplAstTemplate, TmplAstTextAttribute, TmplAstVariable} from '@angular/compiler';
+import * as ts from 'typescript';
+
+import {AbsoluteFsPath} from '../../file_system';
+import {ClassDeclaration} from '../../reflection';
+import {ComponentScopeReader} from '../../scope';
+import {isAssignment} from '../../util/src/typescript';
+import {DirectiveSymbol, DomBindingSymbol, ElementSymbol, ExpressionSymbol, InputBindingSymbol, OutputBindingSymbol, ReferenceSymbol, Symbol, SymbolKind, TemplateSymbol, TsNodeSymbolInfo, TypeCheckableDirectiveMeta, VariableSymbol} from '../api';
+
+import {ExpressionIdentifier, findAllMatchingNodes, findFirstMatchingNode, hasExpressionIdentifier} from './comments';
+import {TemplateData} from './context';
+import {isAccessExpression} from './ts_util';
+import {TcbDirectiveOutputsOp} from './type_check_block';
+
+/**
+ * A class which extracts information from a type check block.
+ * This class is essentially used as just a closure around the constructor parameters.
+ */
+export class SymbolBuilder {
+  constructor(
+      private readonly typeChecker: ts.TypeChecker,
+      private readonly shimPath: AbsoluteFsPath,
+      private readonly typeCheckBlock: ts.Node,
+      private readonly templateData: TemplateData,
+      private readonly componentScopeReader: ComponentScopeReader,
+  ) {}
+
+  getSymbol(node: TmplAstTemplate|TmplAstElement): TemplateSymbol|ElementSymbol|null;
+  getSymbol(node: TmplAstReference|TmplAstVariable): ReferenceSymbol|VariableSymbol|null;
+  getSymbol(node: AST|TmplAstNode): Symbol|null;
+  getSymbol(node: AST|TmplAstNode): Symbol|null {
+    if (node instanceof TmplAstBoundAttribute || node instanceof TmplAstTextAttribute) {
+      // TODO(atscott): input and output bindings only return the first directive match but should
+      // return a list of bindings for all of them.
+      return this.getSymbolOfInputBinding(node);
+    } else if (node instanceof TmplAstBoundEvent) {
+      return this.getSymbolOfBoundEvent(node);
+    } else if (node instanceof TmplAstElement) {
+      return this.getSymbolOfElement(node);
+    } else if (node instanceof TmplAstTemplate) {
+      return this.getSymbolOfAstTemplate(node);
+    } else if (node instanceof TmplAstVariable) {
+      return this.getSymbolOfVariable(node);
+    } else if (node instanceof TmplAstReference) {
+      return this.getSymbolOfReference(node);
+    } else if (node instanceof AST) {
+      return this.getSymbolOfTemplateExpression(node);
+    }
+    // TODO(atscott): TmplAstContent, TmplAstIcu
+    return null;
+  }
+
+  private getSymbolOfAstTemplate(template: TmplAstTemplate): TemplateSymbol|null {
+    const directives = this.getDirectivesOfNode(template);
+    return {kind: SymbolKind.Template, directives, templateNode: template};
+  }
+
+  private getSymbolOfElement(element: TmplAstElement): ElementSymbol|null {
+    const elementSourceSpan = element.startSourceSpan ?? element.sourceSpan;
+
+    const node = findFirstMatchingNode(
+        this.typeCheckBlock, {withSpan: elementSourceSpan, filter: ts.isVariableDeclaration});
+    if (node === null) {
+      return null;
+    }
+
+    const symbolFromDeclaration = this.getSymbolOfTsNode(node);
+    if (symbolFromDeclaration === null || symbolFromDeclaration.tsSymbol === null) {
+      return null;
+    }
+
+    const directives = this.getDirectivesOfNode(element);
+    // All statements in the TCB are `Expression`s that optionally include more information.
+    // An `ElementSymbol` uses the information returned for the variable declaration expression,
+    // adds the directives for the element, and updates the `kind` to be `SymbolKind.Element`.
+    return {
+      ...symbolFromDeclaration,
+      kind: SymbolKind.Element,
+      directives,
+      templateNode: element,
+    };
+  }
+
+  private getDirectivesOfNode(element: TmplAstElement|TmplAstTemplate): DirectiveSymbol[] {
+    const elementSourceSpan = element.startSourceSpan ?? element.sourceSpan;
+    const tcbSourceFile = this.typeCheckBlock.getSourceFile();
+    // directives could be either:
+    // - var _t1: TestDir /*T:D*/ = (null!);
+    // - var _t1 /*T:D*/ = _ctor1({});
+    const isDirectiveDeclaration = (node: ts.Node): node is ts.TypeNode|ts.Identifier =>
+        (ts.isTypeNode(node) || ts.isIdentifier(node)) && ts.isVariableDeclaration(node.parent) &&
+        hasExpressionIdentifier(tcbSourceFile, node, ExpressionIdentifier.DIRECTIVE);
+
+    const nodes = findAllMatchingNodes(
+        this.typeCheckBlock, {withSpan: elementSourceSpan, filter: isDirectiveDeclaration});
+    return nodes
+        .map(node => {
+          const symbol = this.getSymbolOfTsNode(node.parent);
+          if (symbol === null || symbol.tsSymbol === null ||
+              symbol.tsSymbol.valueDeclaration === undefined ||
+              !ts.isClassDeclaration(symbol.tsSymbol.valueDeclaration)) {
+            return null;
+          }
+          const meta = this.getDirectiveMeta(element, symbol.tsSymbol.valueDeclaration);
+          if (meta === null) {
+            return null;
+          }
+
+          const ngModule = this.getDirectiveModule(symbol.tsSymbol.valueDeclaration);
+          const selector = meta.selector ?? null;
+          const isComponent = meta.isComponent ?? null;
+          const directiveSymbol: DirectiveSymbol = {
+            ...symbol,
+            tsSymbol: symbol.tsSymbol,
+            selector,
+            isComponent,
+            ngModule,
+            kind: SymbolKind.Directive
+          };
+          return directiveSymbol;
+        })
+        .filter((d): d is DirectiveSymbol => d !== null);
+  }
+
+  private getDirectiveMeta(
+      host: TmplAstTemplate|TmplAstElement,
+      directiveDeclaration: ts.Declaration): TypeCheckableDirectiveMeta|null {
+    const directives = this.templateData.boundTarget.getDirectivesOfNode(host);
+    if (directives === null) {
+      return null;
+    }
+
+    return directives.find(m => m.ref.node === directiveDeclaration) ?? null;
+  }
+
+  private getDirectiveModule(declaration: ts.ClassDeclaration): ClassDeclaration|null {
+    const scope = this.componentScopeReader.getScopeForComponent(declaration as ClassDeclaration);
+    if (scope === null || scope === 'error') {
+      return null;
+    }
+    return scope.ngModule;
+  }
+
+  private getSymbolOfBoundEvent(eventBinding: TmplAstBoundEvent): OutputBindingSymbol|null {
+    // Outputs are a `ts.CallExpression` that look like one of the two:
+    // * _outputHelper(_t1["outputField"]).subscribe(handler);
+    // * _t1.addEventListener(handler);
+    const node = findFirstMatchingNode(
+        this.typeCheckBlock, {withSpan: eventBinding.sourceSpan, filter: ts.isCallExpression});
+    if (node === null) {
+      return null;
+    }
+
+    const consumer = this.templateData.boundTarget.getConsumerOfBinding(eventBinding);
+    if (consumer === null || consumer instanceof TmplAstTemplate ||
+        consumer instanceof TmplAstElement) {
+      // Bindings to element or template events produce `addEventListener` which
+      // we cannot get the field for.
+      return null;
+    }
+    const outputFieldAccess = TcbDirectiveOutputsOp.decodeOutputCallExpression(node);
+    if (outputFieldAccess === null) {
+      return null;
+    }
+
+    const tsSymbol = this.typeChecker.getSymbolAtLocation(outputFieldAccess.argumentExpression);
+    if (tsSymbol === undefined) {
+      return null;
+    }
+
+
+    const target = this.getDirectiveSymbolForAccessExpression(outputFieldAccess, consumer);
+    if (target === null) {
+      return null;
+    }
+
+    const positionInShimFile = this.getShimPositionForNode(outputFieldAccess);
+    const tsType = this.typeChecker.getTypeAtLocation(node);
+    return {
+      kind: SymbolKind.Output,
+      bindings: [{
+        kind: SymbolKind.Binding,
+        tsSymbol,
+        tsType,
+        target,
+        shimLocation: {shimPath: this.shimPath, positionInShimFile},
+      }],
+    };
+  }
+
+  private getSymbolOfInputBinding(binding: TmplAstBoundAttribute|
+                                  TmplAstTextAttribute): InputBindingSymbol|DomBindingSymbol|null {
+    const consumer = this.templateData.boundTarget.getConsumerOfBinding(binding);
+    if (consumer === null) {
+      return null;
+    }
+
+    if (consumer instanceof TmplAstElement || consumer instanceof TmplAstTemplate) {
+      const host = this.getSymbol(consumer);
+      return host !== null ? {kind: SymbolKind.DomBinding, host} : null;
+    }
+
+    const node = findFirstMatchingNode(
+        this.typeCheckBlock, {withSpan: binding.sourceSpan, filter: isAssignment});
+    if (node === null || !isAccessExpression(node.left)) {
+      return null;
+    }
+
+    const symbolInfo = this.getSymbolOfTsNode(node.left);
+    if (symbolInfo === null || symbolInfo.tsSymbol === null) {
+      return null;
+    }
+
+    const target = this.getDirectiveSymbolForAccessExpression(node.left, consumer);
+    if (target === null) {
+      return null;
+    }
+
+    return {
+      kind: SymbolKind.Input,
+      bindings: [{
+        ...symbolInfo,
+        tsSymbol: symbolInfo.tsSymbol,
+        kind: SymbolKind.Binding,
+        target,
+      }],
+    };
+  }
+
+  private getDirectiveSymbolForAccessExpression(
+      node: ts.ElementAccessExpression|ts.PropertyAccessExpression,
+      {isComponent, selector}: TypeCheckableDirectiveMeta): DirectiveSymbol|null {
+    // In either case, `_t1["index"]` or `_t1.index`, `node.expression` is _t1.
+    // The retrieved symbol for _t1 will be the variable declaration.
+    const tsSymbol = this.typeChecker.getSymbolAtLocation(node.expression);
+    if (tsSymbol === undefined || tsSymbol.declarations.length === 0) {
+      return null;
+    }
+
+    const [declaration] = tsSymbol.declarations;
+    if (!ts.isVariableDeclaration(declaration) ||
+        !hasExpressionIdentifier(
+            // The expression identifier could be on the type (for regular directives) or the name
+            // (for generic directives and the ctor op).
+            declaration.getSourceFile(), declaration.type ?? declaration.name,
+            ExpressionIdentifier.DIRECTIVE)) {
+      return null;
+    }
+
+    const symbol = this.getSymbolOfTsNode(declaration);
+    if (symbol === null || symbol.tsSymbol === null ||
+        symbol.tsSymbol.valueDeclaration === undefined ||
+        !ts.isClassDeclaration(symbol.tsSymbol.valueDeclaration)) {
+      return null;
+    }
+
+    const ngModule = this.getDirectiveModule(symbol.tsSymbol.valueDeclaration);
+    return {
+      kind: SymbolKind.Directive,
+      tsSymbol: symbol.tsSymbol,
+      tsType: symbol.tsType,
+      shimLocation: symbol.shimLocation,
+      isComponent,
+      selector,
+      ngModule,
+    };
+  }
+
+  private getSymbolOfVariable(variable: TmplAstVariable): VariableSymbol|null {
+    const node = findFirstMatchingNode(
+        this.typeCheckBlock, {withSpan: variable.sourceSpan, filter: ts.isVariableDeclaration});
+    if (node === null || node.initializer === undefined) {
+      return null;
+    }
+
+    const expressionSymbol = this.getSymbolOfTsNode(node.initializer);
+    if (expressionSymbol === null) {
+      return null;
+    }
+
+    return {...expressionSymbol, kind: SymbolKind.Variable, declaration: variable};
+  }
+
+  private getSymbolOfReference(ref: TmplAstReference): ReferenceSymbol|null {
+    const target = this.templateData.boundTarget.getReferenceTarget(ref);
+    // Find the node for the reference declaration, i.e. `var _t2 = _t1;`
+    let node = findFirstMatchingNode(
+        this.typeCheckBlock, {withSpan: ref.sourceSpan, filter: ts.isVariableDeclaration});
+    if (node === null || target === null || node.initializer === undefined) {
+      return null;
+    }
+
+    // Get the original declaration for the references variable, with the exception of template refs
+    // which are of the form var _t3 = (_t2 as any as i2.TemplateRef<any>)
+    // TODO(atscott): Consider adding an `ExpressionIdentifier` to tag variable declaration
+    // initializers as invalid for symbol retrieval.
+    const originalDeclaration = ts.isParenthesizedExpression(node.initializer) &&
+            ts.isAsExpression(node.initializer.expression) ?
+        this.typeChecker.getSymbolAtLocation(node.name) :
+        this.typeChecker.getSymbolAtLocation(node.initializer);
+    if (originalDeclaration === undefined || originalDeclaration.valueDeclaration === undefined) {
+      return null;
+    }
+    const symbol = this.getSymbolOfTsNode(originalDeclaration.valueDeclaration);
+    if (symbol === null || symbol.tsSymbol === null) {
+      return null;
+    }
+
+    if (target instanceof TmplAstTemplate || target instanceof TmplAstElement) {
+      return {
+        ...symbol,
+        tsSymbol: symbol.tsSymbol,
+        kind: SymbolKind.Reference,
+        target,
+        declaration: ref,
+      };
+    } else {
+      if (!ts.isClassDeclaration(target.directive.ref.node)) {
+        return null;
+      }
+
+      return {
+        ...symbol,
+        kind: SymbolKind.Reference,
+        tsSymbol: symbol.tsSymbol,
+        declaration: ref,
+        target: target.directive.ref.node,
+      };
+    }
+  }
+
+  private getSymbolOfTemplateExpression(expression: AST): VariableSymbol|ReferenceSymbol
+      |ExpressionSymbol|null {
+    if (expression instanceof ASTWithSource) {
+      expression = expression.ast;
+    }
+
+    const expressionTarget = this.templateData.boundTarget.getExpressionTarget(expression);
+    if (expressionTarget !== null) {
+      return this.getSymbol(expressionTarget);
+    }
+
+    // The `name` part of a `PropertyWrite` and `MethodCall` does not have its own
+    // AST so there is no way to retrieve a `Symbol` for just the `name` via a specific node.
+    const withSpan = (expression instanceof PropertyWrite || expression instanceof MethodCall) ?
+        expression.nameSpan :
+        expression.sourceSpan;
+
+    let node = findFirstMatchingNode(
+        this.typeCheckBlock, {withSpan, filter: (n: ts.Node): n is ts.Node => true});
+    if (node === null) {
+      return null;
+    }
+
+    while (ts.isParenthesizedExpression(node)) {
+      node = node.expression;
+    }
+
+    // - If we have safe property read ("a?.b") we want to get the Symbol for b, the `whenTrue`
+    // expression.
+    // - If our expression is a pipe binding ("a | test:b:c"), we want the Symbol for the
+    // `transform` on the pipe.
+    // - Otherwise, we retrieve the symbol for the node itself with no special considerations
+    if ((expression instanceof SafePropertyRead || expression instanceof SafeMethodCall) &&
+        ts.isConditionalExpression(node)) {
+      const whenTrueSymbol =
+          (expression instanceof SafeMethodCall && ts.isCallExpression(node.whenTrue)) ?
+          this.getSymbolOfTsNode(node.whenTrue.expression) :
+          this.getSymbolOfTsNode(node.whenTrue);
+      if (whenTrueSymbol === null) {
+        return null;
+      }
+
+      return {
+        ...whenTrueSymbol,
+        kind: SymbolKind.Expression,
+        // Rather than using the type of only the `whenTrue` part of the expression, we should
+        // still get the type of the whole conditional expression to include `|undefined`.
+        tsType: this.typeChecker.getTypeAtLocation(node)
+      };
+    } else if (expression instanceof BindingPipe && ts.isCallExpression(node)) {
+      // TODO(atscott): Create a PipeSymbol to include symbol for the Pipe class
+      const symbolInfo = this.getSymbolOfTsNode(node.expression);
+      return symbolInfo === null ? null : {...symbolInfo, kind: SymbolKind.Expression};
+    } else {
+      const symbolInfo = this.getSymbolOfTsNode(node);
+      return symbolInfo === null ? null : {...symbolInfo, kind: SymbolKind.Expression};
+    }
+  }
+
+  private getSymbolOfTsNode(node: ts.Node): TsNodeSymbolInfo|null {
+    while (ts.isParenthesizedExpression(node)) {
+      node = node.expression;
+    }
+
+    let tsSymbol: ts.Symbol|undefined;
+    if (ts.isPropertyAccessExpression(node)) {
+      tsSymbol = this.typeChecker.getSymbolAtLocation(node.name);
+    } else if (ts.isElementAccessExpression(node)) {
+      tsSymbol = this.typeChecker.getSymbolAtLocation(node.argumentExpression);
+    } else {
+      tsSymbol = this.typeChecker.getSymbolAtLocation(node);
+    }
+
+    const positionInShimFile = this.getShimPositionForNode(node);
+    const type = this.typeChecker.getTypeAtLocation(node);
+    return {
+      // If we could not find a symbol, fall back to the symbol on the type for the node.
+      // Some nodes won't have a "symbol at location" but will have a symbol for the type.
+      // Examples of this would be literals and `document.createElement('div')`.
+      tsSymbol: tsSymbol ?? type.symbol ?? null,
+      tsType: type,
+      shimLocation: {shimPath: this.shimPath, positionInShimFile},
+    };
+  }
+
+  private getShimPositionForNode(node: ts.Node): number {
+    if (ts.isTypeReferenceNode(node)) {
+      return this.getShimPositionForNode(node.typeName);
+    } else if (ts.isQualifiedName(node)) {
+      return node.right.getStart();
+    } else if (ts.isPropertyAccessExpression(node)) {
+      return node.name.getStart();
+    } else if (ts.isElementAccessExpression(node)) {
+      return node.argumentExpression.getStart();
+    } else {
+      return node.getStart();
+    }
+  }
+}
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/src/ts_util.ts b/packages/compiler-cli/src/ngtsc/typecheck/src/ts_util.ts
index 7c58444851fce..8356fbd1f18d9 100644
--- a/packages/compiler-cli/src/ngtsc/typecheck/src/ts_util.ts
+++ b/packages/compiler-cli/src/ngtsc/typecheck/src/ts_util.ts
@@ -86,6 +86,21 @@ export function tsDeclareVariable(id: ts.Identifier, type: ts.TypeNode): ts.Vari
       /* declarationList */[decl]);
 }
 
+/**
+ * Creates a `ts.TypeQueryNode` for a coerced input.
+ *
+ * For example: `typeof MatInput.ngAcceptInputType_value`, where MatInput is `typeName` and `value`
+ * is the `coercedInputName`.
+ *
+ * @param typeName The `EntityName` of the Directive where the static coerced input is defined.
+ * @param coercedInputName The field name of the coerced input.
+ */
+export function tsCreateTypeQueryForCoercedInput(
+    typeName: ts.EntityName, coercedInputName: string): ts.TypeQueryNode {
+  return ts.createTypeQueryNode(
+      ts.createQualifiedName(typeName, `ngAcceptInputType_${coercedInputName}`));
+}
+
 /**
  * Create a `ts.VariableStatement` that initializes a variable with a given expression.
  *
@@ -157,3 +172,8 @@ export function checkIfGenericTypesAreUnbound(node: ClassDeclaration<ts.ClassDec
   }
   return node.typeParameters.every(param => param.constraint === undefined);
 }
+
+export function isAccessExpression(node: ts.Node): node is ts.ElementAccessExpression|
+    ts.PropertyAccessExpression {
+  return ts.isPropertyAccessExpression(node) || ts.isElementAccessExpression(node);
+}
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/src/type_check_block.ts b/packages/compiler-cli/src/ngtsc/typecheck/src/type_check_block.ts
index 014ff17e02dc0..4864dfaec28ab 100644
--- a/packages/compiler-cli/src/ngtsc/typecheck/src/type_check_block.ts
+++ b/packages/compiler-cli/src/ngtsc/typecheck/src/type_check_block.ts
@@ -6,22 +6,22 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {AST, BindingPipe, BindingType, BoundTarget, DYNAMIC_TYPE, ImplicitReceiver, MethodCall, ParsedEventType, ParseSourceSpan, PropertyRead, PropertyWrite, SchemaMetadata, TmplAstBoundAttribute, TmplAstBoundEvent, TmplAstBoundText, TmplAstElement, TmplAstNode, TmplAstReference, TmplAstTemplate, TmplAstTextAttribute, TmplAstVariable} from '@angular/compiler';
+import {AST, BindingPipe, BindingType, BoundTarget, DYNAMIC_TYPE, ImplicitReceiver, MethodCall, ParsedEventType, ParseSourceSpan, PropertyRead, PropertyWrite, SchemaMetadata, TmplAstBoundAttribute, TmplAstBoundEvent, TmplAstBoundText, TmplAstElement, TmplAstIcu, TmplAstNode, TmplAstReference, TmplAstTemplate, TmplAstTextAttribute, TmplAstVariable} from '@angular/compiler';
 import * as ts from 'typescript';
 
 import {Reference} from '../../imports';
+import {ClassPropertyName} from '../../metadata';
 import {ClassDeclaration} from '../../reflection';
 import {TemplateId, TypeCheckableDirectiveMeta, TypeCheckBlockMetadata} from '../api';
 
-import {addParseSpanInfo, addTemplateId, ignoreDiagnostics, wrapForDiagnostics} from './diagnostics';
+import {addExpressionIdentifier, ExpressionIdentifier, markIgnoreDiagnostics} from './comments';
+import {addParseSpanInfo, addTemplateId, wrapForDiagnostics} from './diagnostics';
 import {DomSchemaChecker} from './dom';
 import {Environment} from './environment';
 import {astToTypescript, NULL_AS_ANY} from './expression';
 import {OutOfBandDiagnosticRecorder} from './oob';
 import {ExpressionSemanticVisitor} from './template_semantics';
-import {checkIfClassIsExported, checkIfGenericTypesAreUnbound, tsCallMethod, tsCastToAny, tsCreateElement, tsCreateVariable, tsDeclareVariable} from './ts_util';
-
-
+import {checkIfClassIsExported, checkIfGenericTypesAreUnbound, tsCallMethod, tsCastToAny, tsCreateElement, tsCreateTypeQueryForCoercedInput, tsCreateVariable, tsDeclareVariable} from './ts_util';
 
 /**
  * Given a `ts.ClassDeclaration` for a component, and metadata regarding that component, compose a
@@ -99,6 +99,13 @@ export function generateTypeCheckBlock(
  * `ts.Expression` which can be used to reference the operation's result.
  */
 abstract class TcbOp {
+  /**
+   * Set to true if this operation can be considered optional. Optional operations are only executed
+   * when depended upon by other operations, otherwise they are disregarded. This allows for less
+   * code to generate, parse and type-check, overall positively contributing to performance.
+   */
+  abstract readonly optional: boolean;
+
   abstract execute(): ts.Expression|null;
 
   /**
@@ -125,6 +132,13 @@ class TcbElementOp extends TcbOp {
     super();
   }
 
+  get optional() {
+    // The statement generated by this operation is only used for type-inference of the DOM
+    // element's type and won't report diagnostics by itself, so the operation is marked as optional
+    // to avoid generating statements for DOM elements that are never referenced.
+    return true;
+  }
+
   execute(): ts.Identifier {
     const id = this.tcb.allocateId();
     // Add the declaration of the element using document.createElement.
@@ -148,6 +162,10 @@ class TcbVariableOp extends TcbOp {
     super();
   }
 
+  get optional() {
+    return false;
+  }
+
   execute(): ts.Identifier {
     // Look for a context variable for the template.
     const ctx = this.scope.resolve(this.template);
@@ -176,6 +194,10 @@ class TcbTemplateContextOp extends TcbOp {
     super();
   }
 
+  get optional() {
+    return false;
+  }
+
   execute(): ts.Identifier {
     // Allocate a template ctx variable and declare it with an 'any' type. The type of this variable
     // may be narrowed as a result of template guard conditions.
@@ -197,6 +219,11 @@ class TcbTemplateBodyOp extends TcbOp {
   constructor(private tcb: Context, private scope: Scope, private template: TmplAstTemplate) {
     super();
   }
+
+  get optional() {
+    return false;
+  }
+
   execute(): null {
     // An `if` will be constructed, within which the template's children will be type checked. The
     // `if` is used for two reasons: it creates a new syntactic scope, isolating variables declared
@@ -231,7 +258,7 @@ class TcbTemplateBodyOp extends TcbOp {
 
             // The expression has already been checked in the type constructor invocation, so
             // it should be ignored when used within a template guard.
-            ignoreDiagnostics(expr);
+            markIgnoreDiagnostics(expr);
 
             if (guard.type === 'binding') {
               // Use the binding expression itself as guard.
@@ -277,8 +304,19 @@ class TcbTemplateBodyOp extends TcbOp {
     // children, as well as tracks bindings within the template.
     const tmplScope = Scope.forNodes(this.tcb, this.scope, this.template, guard);
 
-    // Render the template's `Scope` into a block.
-    let tmplBlock: ts.Statement = ts.createBlock(tmplScope.render());
+    // Render the template's `Scope` into its statements.
+    const statements = tmplScope.render();
+    if (statements.length === 0) {
+      // As an optimization, don't generate the scope's block if it has no statements. This is
+      // beneficial for templates that contain for example `<span *ngIf="first"></span>`, in which
+      // case there's no need to render the `NgIf` guard expression. This seems like a minor
+      // improvement, however it reduces the number of flow-node antecedents that TypeScript needs
+      // to keep into account for such cases, resulting in an overall reduction of
+      // type-checking time.
+      return null;
+    }
+
+    let tmplBlock: ts.Statement = ts.createBlock(statements);
     if (guard !== null) {
       // The scope has a guard that needs to be applied, so wrap the template block into an `if`
       // statement containing the guard expression.
@@ -300,6 +338,10 @@ class TcbTextInterpolationOp extends TcbOp {
     super();
   }
 
+  get optional() {
+    return false;
+  }
+
   execute(): null {
     const expr = tcbExpression(this.binding.value, this.tcb, this.scope);
     this.scope.addStatement(ts.createExpressionStatement(expr));
@@ -308,58 +350,311 @@ class TcbTextInterpolationOp extends TcbOp {
 }
 
 /**
- * A `TcbOp` which constructs an instance of a directive with types inferred from its inputs, which
- * also checks the bindings to the directive in the process.
+ * A `TcbOp` which constructs an instance of a directive _without_ setting any of its inputs. Inputs
+ * are later set in the `TcbDirectiveInputsOp`. Type checking was found to be faster when done in
+ * this way as opposed to `TcbDirectiveCtorOp` which is only necessary when the directive is
+ * generic.
+ *
+ * Executing this operation returns a reference to the directive instance variable with its inferred
+ * type.
+ */
+class TcbDirectiveTypeOp extends TcbOp {
+  constructor(
+      private tcb: Context, private scope: Scope, private node: TmplAstTemplate|TmplAstElement,
+      private dir: TypeCheckableDirectiveMeta) {
+    super();
+  }
+
+  get optional() {
+    // The statement generated by this operation is only used to declare the directive's type and
+    // won't report diagnostics by itself, so the operation is marked as optional to avoid
+    // generating declarations for directives that don't have any inputs/outputs.
+    return true;
+  }
+
+  execute(): ts.Identifier {
+    const id = this.tcb.allocateId();
+
+    const type = this.tcb.env.referenceType(this.dir.ref);
+    addExpressionIdentifier(type, ExpressionIdentifier.DIRECTIVE);
+    addParseSpanInfo(type, this.node.startSourceSpan || this.node.sourceSpan);
+    this.scope.addStatement(tsDeclareVariable(id, type));
+    return id;
+  }
+}
+
+/**
+ * A `TcbOp` which creates a variable for a local ref in a template.
+ * The initializer for the variable is the variable expression for the directive, template, or
+ * element the ref refers to. When the reference is used in the template, those TCB statements will
+ * access this variable as well. For example:
+ * ```
+ * var _t1 = document.createElement('div');
+ * var _t2 = _t1;
+ * _t2.value
+ * ```
+ * This operation supports more fluent lookups for the `TemplateTypeChecker` when getting a symbol
+ * for a reference. In most cases, this isn't essential; that is, the information for the symbol
+ * could be gathered without this operation using the `BoundTarget`. However, for the case of
+ * ng-template references, we will need this reference variable to not only provide a location in
+ * the shim file, but also to narrow the variable to the correct `TemplateRef<T>` type rather than
+ * `TemplateRef<any>` (this work is still TODO).
+ *
+ * Executing this operation returns a reference to the directive instance variable with its inferred
+ * type.
+ */
+class TcbReferenceOp extends TcbOp {
+  constructor(
+      private readonly tcb: Context, private readonly scope: Scope,
+      private readonly node: TmplAstReference,
+      private readonly host: TmplAstElement|TmplAstTemplate,
+      private readonly target: TypeCheckableDirectiveMeta|TmplAstTemplate|TmplAstElement) {
+    super();
+  }
+
+  // The statement generated by this operation is only used to for the Type Checker
+  // so it can map a reference variable in the template directly to a node in the TCB.
+  readonly optional = true;
+
+  execute(): ts.Identifier {
+    const id = this.tcb.allocateId();
+    let initializer =
+        this.target instanceof TmplAstTemplate || this.target instanceof TmplAstElement ?
+        this.scope.resolve(this.target) :
+        this.scope.resolve(this.host, this.target);
+
+    // The reference is either to an element, an <ng-template> node, or to a directive on an
+    // element or template.
+    if ((this.target instanceof TmplAstElement && !this.tcb.env.config.checkTypeOfDomReferences) ||
+        !this.tcb.env.config.checkTypeOfNonDomReferences) {
+      // References to DOM nodes are pinned to 'any' when `checkTypeOfDomReferences` is `false`.
+      // References to `TemplateRef`s and directives are pinned to 'any' when
+      // `checkTypeOfNonDomReferences` is `false`.
+      initializer =
+          ts.createAsExpression(initializer, ts.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword));
+    } else if (this.target instanceof TmplAstTemplate) {
+      // Direct references to an <ng-template> node simply require a value of type
+      // `TemplateRef<any>`. To get this, an expression of the form
+      // `(_t1 as any as TemplateRef<any>)` is constructed.
+      initializer =
+          ts.createAsExpression(initializer, ts.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword));
+      initializer = ts.createAsExpression(
+          initializer,
+          this.tcb.env.referenceExternalType('@angular/core', 'TemplateRef', [DYNAMIC_TYPE]));
+      initializer = ts.createParen(initializer);
+    }
+    addParseSpanInfo(initializer, this.node.sourceSpan);
+
+    this.scope.addStatement(tsCreateVariable(id, initializer));
+    return id;
+  }
+}
+
+/**
+ * A `TcbOp` which constructs an instance of a directive with types inferred from its inputs. The
+ * inputs themselves are not checked here; checking of inputs is achieved in `TcbDirectiveInputsOp`.
+ * Any errors reported in this statement are ignored, as the type constructor call is only present
+ * for type-inference.
+ *
+ * When a Directive is generic, it is required that the TCB generates the instance using this method
+ * in order to infer the type information correctly.
  *
  * Executing this operation returns a reference to the directive instance variable with its inferred
  * type.
  */
-class TcbDirectiveOp extends TcbOp {
+class TcbDirectiveCtorOp extends TcbOp {
   constructor(
       private tcb: Context, private scope: Scope, private node: TmplAstTemplate|TmplAstElement,
       private dir: TypeCheckableDirectiveMeta) {
     super();
   }
 
+  get optional() {
+    // The statement generated by this operation is only used to infer the directive's type and
+    // won't report diagnostics by itself, so the operation is marked as optional.
+    return true;
+  }
+
   execute(): ts.Identifier {
     const id = this.tcb.allocateId();
-    // Process the directive and construct expressions for each of its bindings.
-    const inputs = tcbGetDirectiveInputs(this.node, this.dir, this.tcb, this.scope);
+    addExpressionIdentifier(id, ExpressionIdentifier.DIRECTIVE);
+    addParseSpanInfo(id, this.node.startSourceSpan || this.node.sourceSpan);
+
+    const genericInputs = new Map<string, TcbDirectiveInput>();
+
+    const inputs = getBoundInputs(this.dir, this.node, this.tcb);
+    for (const input of inputs) {
+      for (const fieldName of input.fieldNames) {
+        // Skip the field if an attribute has already been bound to it; we can't have a duplicate
+        // key in the type constructor call.
+        if (genericInputs.has(fieldName)) {
+          continue;
+        }
+
+        const expression = translateInput(input.attribute, this.tcb, this.scope);
+        genericInputs.set(fieldName, {
+          type: 'binding',
+          field: fieldName,
+          expression,
+          sourceSpan: input.attribute.sourceSpan
+        });
+      }
+    }
+
+    // Add unset directive inputs for each of the remaining unset fields.
+    for (const [fieldName] of this.dir.inputs) {
+      if (!genericInputs.has(fieldName)) {
+        genericInputs.set(fieldName, {type: 'unset', field: fieldName});
+      }
+    }
 
     // Call the type constructor of the directive to infer a type, and assign the directive
     // instance.
-    const typeCtor = tcbCallTypeCtor(this.dir, this.tcb, inputs);
-    addParseSpanInfo(typeCtor, this.node.sourceSpan);
+    const typeCtor = tcbCallTypeCtor(this.dir, this.tcb, Array.from(genericInputs.values()));
+    markIgnoreDiagnostics(typeCtor);
     this.scope.addStatement(tsCreateVariable(id, typeCtor));
     return id;
   }
 
   circularFallback(): TcbOp {
-    return new TcbDirectiveCircularFallbackOp(this.tcb, this.scope, this.node, this.dir);
+    return new TcbDirectiveCtorCircularFallbackOp(this.tcb, this.scope, this.node, this.dir);
+  }
+}
+
+/**
+ * A `TcbOp` which generates code to check input bindings on an element that correspond with the
+ * members of a directive.
+ *
+ * Executing this operation returns nothing.
+ */
+class TcbDirectiveInputsOp extends TcbOp {
+  constructor(
+      private tcb: Context, private scope: Scope, private node: TmplAstTemplate|TmplAstElement,
+      private dir: TypeCheckableDirectiveMeta) {
+    super();
+  }
+
+  get optional() {
+    return false;
+  }
+
+  execute(): null {
+    let dirId: ts.Expression|null = null;
+
+    // TODO(joost): report duplicate properties
+
+    const inputs = getBoundInputs(this.dir, this.node, this.tcb);
+    for (const input of inputs) {
+      // For bound inputs, the property is assigned the binding expression.
+      let expr = translateInput(input.attribute, this.tcb, this.scope);
+      if (!this.tcb.env.config.checkTypeOfInputBindings) {
+        // If checking the type of bindings is disabled, cast the resulting expression to 'any'
+        // before the assignment.
+        expr = tsCastToAny(expr);
+      } else if (!this.tcb.env.config.strictNullInputBindings) {
+        // If strict null checks are disabled, erase `null` and `undefined` from the type by
+        // wrapping the expression in a non-null assertion.
+        expr = ts.createNonNullExpression(expr);
+      }
+
+      let assignment: ts.Expression = wrapForDiagnostics(expr);
+
+      for (const fieldName of input.fieldNames) {
+        let target: ts.LeftHandSideExpression;
+        if (this.dir.coercedInputFields.has(fieldName)) {
+          // The input has a coercion declaration which should be used instead of assigning the
+          // expression into the input field directly. To achieve this, a variable is declared
+          // with a type of `typeof Directive.ngAcceptInputType_fieldName` which is then used as
+          // target of the assignment.
+          const dirTypeRef = this.tcb.env.referenceType(this.dir.ref);
+          if (!ts.isTypeReferenceNode(dirTypeRef)) {
+            throw new Error(
+                `Expected TypeReferenceNode from reference to ${this.dir.ref.debugName}`);
+          }
+
+          const id = this.tcb.allocateId();
+          const type = tsCreateTypeQueryForCoercedInput(dirTypeRef.typeName, fieldName);
+          this.scope.addStatement(tsDeclareVariable(id, type));
+
+          target = id;
+        } else if (this.dir.undeclaredInputFields.has(fieldName)) {
+          // If no coercion declaration is present nor is the field declared (i.e. the input is
+          // declared in a `@Directive` or `@Component` decorator's `inputs` property) there is no
+          // assignment target available, so this field is skipped.
+          continue;
+        } else if (
+            !this.tcb.env.config.honorAccessModifiersForInputBindings &&
+            this.dir.restrictedInputFields.has(fieldName)) {
+          // If strict checking of access modifiers is disabled and the field is restricted
+          // (i.e. private/protected/readonly), generate an assignment into a temporary variable
+          // that has the type of the field. This achieves type-checking but circumvents the access
+          // modifiers.
+          if (dirId === null) {
+            dirId = this.scope.resolve(this.node, this.dir);
+          }
+
+          const id = this.tcb.allocateId();
+          const dirTypeRef = this.tcb.env.referenceType(this.dir.ref);
+          if (!ts.isTypeReferenceNode(dirTypeRef)) {
+            throw new Error(
+                `Expected TypeReferenceNode from reference to ${this.dir.ref.debugName}`);
+          }
+          const type = ts.createIndexedAccessTypeNode(
+              ts.createTypeQueryNode(dirId as ts.Identifier),
+              ts.createLiteralTypeNode(ts.createStringLiteral(fieldName)));
+          const temp = tsDeclareVariable(id, type);
+          this.scope.addStatement(temp);
+          target = id;
+        } else {
+          if (dirId === null) {
+            dirId = this.scope.resolve(this.node, this.dir);
+          }
+
+          // To get errors assign directly to the fields on the instance, using property access
+          // when possible. String literal fields may not be valid JS identifiers so we use
+          // literal element access instead for those cases.
+          target = this.dir.stringLiteralInputFields.has(fieldName) ?
+              ts.createElementAccess(dirId, ts.createStringLiteral(fieldName)) :
+              ts.createPropertyAccess(dirId, ts.createIdentifier(fieldName));
+        }
+
+        // Finally the assignment is extended by assigning it into the target expression.
+        assignment = ts.createBinary(target, ts.SyntaxKind.EqualsToken, assignment);
+      }
+
+      addParseSpanInfo(assignment, input.attribute.sourceSpan);
+      this.scope.addStatement(ts.createExpressionStatement(assignment));
+    }
+
+    return null;
   }
 }
 
 /**
  * A `TcbOp` which is used to generate a fallback expression if the inference of a directive type
- * via `TcbDirectiveOp` requires a reference to its own type. This can happen using a template
+ * via `TcbDirectiveCtorOp` requires a reference to its own type. This can happen using a template
  * reference:
  *
  * ```html
  * <some-cmp #ref [prop]="ref.foo"></some-cmp>
  * ```
  *
- * In this case, `TcbDirectiveCircularFallbackOp` will add a second inference of the directive type
- * to the type-check block, this time calling the directive's type constructor without any input
- * expressions. This infers the widest possible supertype for the directive, which is used to
+ * In this case, `TcbDirectiveCtorCircularFallbackOp` will add a second inference of the directive
+ * type to the type-check block, this time calling the directive's type constructor without any
+ * input expressions. This infers the widest possible supertype for the directive, which is used to
  * resolve any recursive references required to infer the real type.
  */
-class TcbDirectiveCircularFallbackOp extends TcbOp {
+class TcbDirectiveCtorCircularFallbackOp extends TcbOp {
   constructor(
       private tcb: Context, private scope: Scope, private node: TmplAstTemplate|TmplAstElement,
       private dir: TypeCheckableDirectiveMeta) {
     super();
   }
 
+  get optional() {
+    return false;
+  }
+
   execute(): ts.Identifier {
     const id = this.tcb.allocateId();
     const typeCtor = this.tcb.env.typeCtorFor(this.dir);
@@ -387,6 +682,10 @@ class TcbDomSchemaCheckerOp extends TcbOp {
     super();
   }
 
+  get optional() {
+    return false;
+  }
+
   execute(): ts.Expression|null {
     if (this.checkElement) {
       this.tcb.domSchemaChecker.checkElement(this.tcb.id, this.element, this.tcb.schemas);
@@ -443,10 +742,14 @@ class TcbUnclaimedInputsOp extends TcbOp {
     super();
   }
 
+  get optional() {
+    return false;
+  }
+
   execute(): null {
     // `this.inputs` contains only those bindings not matched by any directive. These bindings go to
     // the element itself.
-    const elId = this.scope.resolve(this.element);
+    let elId: ts.Expression|null = null;
 
     // TODO(alxhub): this could be more efficient.
     for (const binding of this.element.inputs) {
@@ -468,6 +771,9 @@ class TcbUnclaimedInputsOp extends TcbOp {
 
       if (this.tcb.env.config.checkTypeOfDomBindings && binding.type === BindingType.Property) {
         if (binding.name !== 'style' && binding.name !== 'class') {
+          if (elId === null) {
+            elId = this.scope.resolve(this.element);
+          }
           // A direct binding to a property.
           const propertyName = ATTR_TO_PROP[binding.name] || binding.name;
           const prop = ts.createElementAccess(elId, ts.createStringLiteral(propertyName));
@@ -495,30 +801,27 @@ class TcbUnclaimedInputsOp extends TcbOp {
  *
  * Executing this operation returns nothing.
  */
-class TcbDirectiveOutputsOp extends TcbOp {
+export class TcbDirectiveOutputsOp extends TcbOp {
   constructor(
       private tcb: Context, private scope: Scope, private node: TmplAstTemplate|TmplAstElement,
       private dir: TypeCheckableDirectiveMeta) {
     super();
   }
 
-  execute(): null {
-    const dirId = this.scope.resolve(this.node, this.dir);
+  get optional() {
+    return false;
+  }
 
-    // `dir.outputs` is an object map of field names on the directive class to event names.
-    // This is backwards from what's needed to match event handlers - a map of event names to field
-    // names is desired. Invert `dir.outputs` into `fieldByEventName` to create this map.
-    const fieldByEventName = new Map<string, string>();
+  execute(): null {
+    let dirId: ts.Expression|null = null;
     const outputs = this.dir.outputs;
-    for (const key of Object.keys(outputs)) {
-      fieldByEventName.set(outputs[key], key);
-    }
 
     for (const output of this.node.outputs) {
-      if (output.type !== ParsedEventType.Regular || !fieldByEventName.has(output.name)) {
+      if (output.type !== ParsedEventType.Regular || !outputs.hasBindingPropertyName(output.name)) {
         continue;
       }
-      const field = fieldByEventName.get(output.name)!;
+      // TODO(alxhub): consider supporting multiple fields with the same property name for outputs.
+      const field = outputs.getByBindingPropertyName(output.name)![0].classPropertyName;
 
       if (this.tcb.env.config.checkTypeOfOutputEvents) {
         // For strict checking of directive events, generate a call to the `subscribe` method
@@ -533,6 +836,9 @@ class TcbDirectiveOutputsOp extends TcbOp {
         // that has a `subscribe` method that properly carries the `T` into the handler function.
         const handler = tcbCreateEventHandler(output, this.tcb, this.scope, EventParamType.Infer);
 
+        if (dirId === null) {
+          dirId = this.scope.resolve(this.node, this.dir);
+        }
         const outputField = ts.createElementAccess(dirId, ts.createStringLiteral(field));
         const outputHelper =
             ts.createCall(this.tcb.env.declareOutputHelper(), undefined, [outputField]);
@@ -553,6 +859,39 @@ class TcbDirectiveOutputsOp extends TcbOp {
 
     return null;
   }
+
+  /**
+   * Outputs are a `ts.CallExpression` that look like one of the two:
+   *  - `_outputHelper(_t1["outputField"]).subscribe(handler);`
+   *  - `_t1.addEventListener(handler);`
+   * This method reverses the operations to create a call expression for a directive output.
+   * It unpacks the given call expression and returns the original element access (i.e.
+   * `_t1["outputField"]` in the example above). Returns `null` if the given call expression is not
+   * the expected structure of an output binding
+   */
+  static decodeOutputCallExpression(node: ts.CallExpression): ts.ElementAccessExpression|null {
+    // `node.expression` === `_outputHelper(_t1["outputField"]).subscribe` or `_t1.addEventListener`
+    if (!ts.isPropertyAccessExpression(node.expression) ||
+        node.expression.name.text === 'addEventListener') {
+      // `addEventListener` outputs do not have an `ElementAccessExpression` for the output field.
+      return null;
+    }
+
+    if (!ts.isCallExpression(node.expression.expression)) {
+      return null;
+    }
+
+    // `node.expression.expression` === `_outputHelper(_t1["outputField"])`
+    if (node.expression.expression.arguments.length === 0) {
+      return null;
+    }
+
+    const [outputFieldAccess] = node.expression.expression.arguments;
+    if (!ts.isElementAccessExpression(outputFieldAccess)) {
+      return null;
+    }
+    return outputFieldAccess;
+  }
 }
 
 /**
@@ -569,8 +908,12 @@ class TcbUnclaimedOutputsOp extends TcbOp {
     super();
   }
 
+  get optional() {
+    return false;
+  }
+
   execute(): null {
-    const elId = this.scope.resolve(this.element);
+    let elId: ts.Expression|null = null;
 
     // TODO(alxhub): this could be more efficient.
     for (const output of this.element.outputs) {
@@ -595,6 +938,9 @@ class TcbUnclaimedOutputsOp extends TcbOp {
         // base `Event` type.
         const handler = tcbCreateEventHandler(output, this.tcb, this.scope, EventParamType.Infer);
 
+        if (elId === null) {
+          elId = this.scope.resolve(this.element);
+        }
         const call = ts.createCall(
             /* expression */ ts.createPropertyAccess(elId, 'addEventListener'),
             /* typeArguments */ undefined,
@@ -616,6 +962,30 @@ class TcbUnclaimedOutputsOp extends TcbOp {
   }
 }
 
+/**
+ * A `TcbOp` which generates a completion point for the component context.
+ *
+ * This completion point looks like `ctx. ;` in the TCB output, and does not produce diagnostics.
+ * TypeScript autocompletion APIs can be used at this completion point (after the '.') to produce
+ * autocompletion results of properties and methods from the template's component context.
+ */
+class TcbComponentContextCompletionOp extends TcbOp {
+  constructor(private scope: Scope) {
+    super();
+  }
+
+  readonly optional = false;
+
+  execute(): null {
+    const ctx = ts.createIdentifier('ctx');
+    const ctxDot = ts.createPropertyAccess(ctx, '');
+    markIgnoreDiagnostics(ctxDot);
+    addExpressionIdentifier(ctxDot, ExpressionIdentifier.COMPONENT_COMPLETION);
+    this.scope.addStatement(ts.createExpressionStatement(ctxDot));
+    return null;
+  }
+}
+
 /**
  * Value used to break a circular reference between `TcbOp`s.
  *
@@ -694,12 +1064,17 @@ class Scope {
    */
   private elementOpMap = new Map<TmplAstElement, number>();
   /**
-   * A map of maps which tracks the index of `TcbDirectiveOp`s in the `opQueue` for each directive
-   * on a `TmplAstElement` or `TmplAstTemplate` node.
+   * A map of maps which tracks the index of `TcbDirectiveCtorOp`s in the `opQueue` for each
+   * directive on a `TmplAstElement` or `TmplAstTemplate` node.
    */
   private directiveOpMap =
       new Map<TmplAstElement|TmplAstTemplate, Map<TypeCheckableDirectiveMeta, number>>();
 
+  /**
+   * A map of `TmplAstReference`s to the index of their `TcbReferenceOp` in the `opQueue`
+   */
+  private referenceOpMap = new Map<TmplAstReference, number>();
+
   /**
    * Map of immediately nested <ng-template>s (within this `Scope`) represented by `TmplAstTemplate`
    * nodes to the index of their `TcbTemplateContextOp`s in the `opQueue`.
@@ -738,6 +1113,11 @@ class Scope {
       guard: ts.Expression|null): Scope {
     const scope = new Scope(tcb, parent, guard);
 
+    if (parent === null && tcb.env.config.enableTemplateTypeChecker) {
+      // Add an autocompletion point for the component context.
+      scope.opQueue.push(new TcbComponentContextCompletionOp(scope));
+    }
+
     let children: TmplAstNode[];
 
     // If given an actual `TmplAstTemplate` instance, then process any additional information it
@@ -770,7 +1150,8 @@ class Scope {
 
   /**
    * Look up a `ts.Expression` representing the value of some operation in the current `Scope`,
-   * including any parent scope(s).
+   * including any parent scope(s). This method always returns a mutable clone of the
+   * `ts.Expression` with the comments cleared.
    *
    * @param node a `TmplAstNode` of the operation in question. The lookup performed will depend on
    * the type of this node:
@@ -780,17 +1161,29 @@ class Scope {
    * * `TmplAstElement` - retrieve the expression for the element DOM node
    * * `TmplAstTemplate` - retrieve the template context variable
    * * `TmplAstVariable` - retrieve a template let- variable
+   * * `TmplAstReference` - retrieve variable created for the local ref
    *
    * @param directive if present, a directive type on a `TmplAstElement` or `TmplAstTemplate` to
    * look up instead of the default for an element or template node.
    */
   resolve(
-      node: TmplAstElement|TmplAstTemplate|TmplAstVariable,
+      node: TmplAstElement|TmplAstTemplate|TmplAstVariable|TmplAstReference,
       directive?: TypeCheckableDirectiveMeta): ts.Expression {
     // Attempt to resolve the operation locally.
     const res = this.resolveLocal(node, directive);
     if (res !== null) {
-      return res;
+      // We want to get a clone of the resolved expression and clear the trailing comments
+      // so they don't continue to appear in every place the expression is used.
+      // As an example, this would otherwise produce:
+      // var _t1 /**T:DIR*/ /*1,2*/ = _ctor1();
+      // _t1 /**T:DIR*/ /*1,2*/.input = 'value';
+      //
+      // In addition, returning a clone prevents the consumer of `Scope#resolve` from
+      // attaching comments at the declaration site.
+
+      const clone = ts.getMutableClone(res);
+      ts.setSyntheticTrailingComments(clone, []);
+      return clone;
     } else if (this.parent !== null) {
       // Check with the parent.
       return this.parent.resolve(node, directive);
@@ -811,7 +1204,10 @@ class Scope {
    */
   render(): ts.Statement[] {
     for (let i = 0; i < this.opQueue.length; i++) {
-      this.executeOp(i);
+      // Optional statements cannot be skipped when we are generating the TCB for use
+      // by the TemplateTypeChecker.
+      const skipOptional = !this.tcb.env.config.enableTemplateTypeChecker;
+      this.executeOp(i, skipOptional);
     }
     return this.statements;
   }
@@ -843,9 +1239,11 @@ class Scope {
   }
 
   private resolveLocal(
-      ref: TmplAstElement|TmplAstTemplate|TmplAstVariable,
+      ref: TmplAstElement|TmplAstTemplate|TmplAstVariable|TmplAstReference,
       directive?: TypeCheckableDirectiveMeta): ts.Expression|null {
-    if (ref instanceof TmplAstVariable && this.varMap.has(ref)) {
+    if (ref instanceof TmplAstReference && this.referenceOpMap.has(ref)) {
+      return this.resolveOp(this.referenceOpMap.get(ref)!);
+    } else if (ref instanceof TmplAstVariable && this.varMap.has(ref)) {
       // Resolving a context variable for this template.
       // Execute the `TcbVariableOp` associated with the `TmplAstVariable`.
       return this.resolveOp(this.varMap.get(ref)!);
@@ -877,7 +1275,7 @@ class Scope {
    * Like `executeOp`, but assert that the operation actually returned `ts.Expression`.
    */
   private resolveOp(opIndex: number): ts.Expression {
-    const res = this.executeOp(opIndex);
+    const res = this.executeOp(opIndex, /* skipOptional */ false);
     if (res === null) {
       throw new Error(`Error resolving operation, got null`);
     }
@@ -891,12 +1289,16 @@ class Scope {
    * and also protects against a circular dependency from the operation to itself by temporarily
    * setting the operation's result to a special expression.
    */
-  private executeOp(opIndex: number): ts.Expression|null {
+  private executeOp(opIndex: number, skipOptional: boolean): ts.Expression|null {
     const op = this.opQueue[opIndex];
     if (!(op instanceof TcbOp)) {
       return op;
     }
 
+    if (skipOptional && op.optional) {
+      return null;
+    }
+
     // Set the result of the operation in the queue to its circular fallback. If executing this
     // operation results in a circular dependency, this will prevent an infinite loop and allow for
     // the resolution of such cycles.
@@ -916,27 +1318,42 @@ class Scope {
       for (const child of node.children) {
         this.appendNode(child);
       }
-      this.checkReferencesOfNode(node);
+      this.checkAndAppendReferencesOfNode(node);
     } else if (node instanceof TmplAstTemplate) {
       // Template children are rendered in a child scope.
       this.appendDirectivesAndInputsOfNode(node);
       this.appendOutputsOfNode(node);
+      const ctxIndex = this.opQueue.push(new TcbTemplateContextOp(this.tcb, this)) - 1;
+      this.templateCtxOpMap.set(node, ctxIndex);
       if (this.tcb.env.config.checkTemplateBodies) {
-        const ctxIndex = this.opQueue.push(new TcbTemplateContextOp(this.tcb, this)) - 1;
-        this.templateCtxOpMap.set(node, ctxIndex);
         this.opQueue.push(new TcbTemplateBodyOp(this.tcb, this, node));
+      } else if (this.tcb.env.config.alwaysCheckSchemaInTemplateBodies) {
+        this.appendDeepSchemaChecks(node.children);
       }
-      this.checkReferencesOfNode(node);
+      this.checkAndAppendReferencesOfNode(node);
     } else if (node instanceof TmplAstBoundText) {
       this.opQueue.push(new TcbTextInterpolationOp(this.tcb, this, node));
+    } else if (node instanceof TmplAstIcu) {
+      this.appendIcuExpressions(node);
     }
   }
 
-  private checkReferencesOfNode(node: TmplAstElement|TmplAstTemplate): void {
+  private checkAndAppendReferencesOfNode(node: TmplAstElement|TmplAstTemplate): void {
     for (const ref of node.references) {
-      if (this.tcb.boundTarget.getReferenceTarget(ref) === null) {
+      const target = this.tcb.boundTarget.getReferenceTarget(ref);
+      if (target === null) {
         this.tcb.oobRecorder.missingReferenceTarget(this.tcb.id, ref);
+        continue;
+      }
+
+      let ctxIndex: number;
+      if (target instanceof TmplAstTemplate || target instanceof TmplAstElement) {
+        ctxIndex = this.opQueue.push(new TcbReferenceOp(this.tcb, this, ref, node, target)) - 1;
+      } else {
+        ctxIndex =
+            this.opQueue.push(new TcbReferenceOp(this.tcb, this, ref, node, target.directive)) - 1;
       }
+      this.referenceOpMap.set(ref, ctxIndex);
     }
   }
 
@@ -957,8 +1374,12 @@ class Scope {
 
     const dirMap = new Map<TypeCheckableDirectiveMeta, number>();
     for (const dir of directives) {
-      const dirIndex = this.opQueue.push(new TcbDirectiveOp(this.tcb, this, node, dir)) - 1;
+      const directiveOp = dir.isGeneric ? new TcbDirectiveCtorOp(this.tcb, this, node, dir) :
+                                          new TcbDirectiveTypeOp(this.tcb, this, node, dir);
+      const dirIndex = this.opQueue.push(directiveOp) - 1;
       dirMap.set(dir, dirIndex);
+
+      this.opQueue.push(new TcbDirectiveInputsOp(this.tcb, this, node, dir));
     }
     this.directiveOpMap.set(node, dirMap);
 
@@ -967,9 +1388,8 @@ class Scope {
     if (node instanceof TmplAstElement) {
       // Go through the directives and remove any inputs that it claims from `elementInputs`.
       for (const dir of directives) {
-        for (const fieldName of Object.keys(dir.inputs)) {
-          const value = dir.inputs[fieldName];
-          claimedInputs.add(Array.isArray(value) ? value[0] : value);
+        for (const propertyName of dir.inputs.propertyNames) {
+          claimedInputs.add(propertyName);
         }
       }
 
@@ -1006,14 +1426,57 @@ class Scope {
     if (node instanceof TmplAstElement) {
       // Go through the directives and register any outputs that it claims in `claimedOutputs`.
       for (const dir of directives) {
-        for (const outputField of Object.keys(dir.outputs)) {
-          claimedOutputs.add(dir.outputs[outputField]);
+        for (const outputProperty of dir.outputs.propertyNames) {
+          claimedOutputs.add(outputProperty);
         }
       }
 
       this.opQueue.push(new TcbUnclaimedOutputsOp(this.tcb, this, node, claimedOutputs));
     }
   }
+
+  private appendDeepSchemaChecks(nodes: TmplAstNode[]): void {
+    for (const node of nodes) {
+      if (!(node instanceof TmplAstElement || node instanceof TmplAstTemplate)) {
+        continue;
+      }
+
+      if (node instanceof TmplAstElement) {
+        const claimedInputs = new Set<string>();
+        const directives = this.tcb.boundTarget.getDirectivesOfNode(node);
+        let hasDirectives: boolean;
+        if (directives === null || directives.length === 0) {
+          hasDirectives = false;
+        } else {
+          hasDirectives = true;
+          for (const dir of directives) {
+            for (const propertyName of dir.inputs.propertyNames) {
+              claimedInputs.add(propertyName);
+            }
+          }
+        }
+        this.opQueue.push(new TcbDomSchemaCheckerOp(this.tcb, node, !hasDirectives, claimedInputs));
+      }
+
+      this.appendDeepSchemaChecks(node.children);
+    }
+  }
+
+  private appendIcuExpressions(node: TmplAstIcu): void {
+    for (const variable of Object.values(node.vars)) {
+      this.opQueue.push(new TcbTextInterpolationOp(this.tcb, this, variable));
+    }
+    for (const placeholder of Object.values(node.placeholders)) {
+      if (placeholder instanceof TmplAstBoundText) {
+        this.opQueue.push(new TcbTextInterpolationOp(this.tcb, this, placeholder));
+      }
+    }
+  }
+}
+
+interface TcbBoundInput {
+  attribute: TmplAstBoundAttribute|TmplAstTextAttribute;
+  fieldNames: ClassPropertyName[];
 }
 
 /**
@@ -1167,62 +1630,9 @@ class TcbExpressionTranslator {
       return null;
     }
 
-    // This expression has a binding to some variable or reference in the template. Resolve it.
-    if (binding instanceof TmplAstVariable) {
-      const expr = ts.getMutableClone(this.scope.resolve(binding));
-      addParseSpanInfo(expr, ast.sourceSpan);
-      return expr;
-    } else if (binding instanceof TmplAstReference) {
-      const target = this.tcb.boundTarget.getReferenceTarget(binding);
-      if (target === null) {
-        // This reference is unbound. Traversal of the `TmplAstReference` itself should have
-        // recorded the error in the `OutOfBandDiagnosticRecorder`.
-        // Still check the rest of the expression if possible by using an `any` value.
-        return NULL_AS_ANY;
-      }
-
-      // The reference is either to an element, an <ng-template> node, or to a directive on an
-      // element or template.
-
-      if (target instanceof TmplAstElement) {
-        if (!this.tcb.env.config.checkTypeOfDomReferences) {
-          // References to DOM nodes are pinned to 'any'.
-          return NULL_AS_ANY;
-        }
-
-        const expr = ts.getMutableClone(this.scope.resolve(target));
-        addParseSpanInfo(expr, ast.sourceSpan);
-        return expr;
-      } else if (target instanceof TmplAstTemplate) {
-        if (!this.tcb.env.config.checkTypeOfNonDomReferences) {
-          // References to `TemplateRef`s pinned to 'any'.
-          return NULL_AS_ANY;
-        }
-
-        // Direct references to an <ng-template> node simply require a value of type
-        // `TemplateRef<any>`. To get this, an expression of the form
-        // `(null as any as TemplateRef<any>)` is constructed.
-        let value: ts.Expression = ts.createNull();
-        value = ts.createAsExpression(value, ts.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword));
-        value = ts.createAsExpression(
-            value,
-            this.tcb.env.referenceExternalType('@angular/core', 'TemplateRef', [DYNAMIC_TYPE]));
-        value = ts.createParen(value);
-        addParseSpanInfo(value, ast.sourceSpan);
-        return value;
-      } else {
-        if (!this.tcb.env.config.checkTypeOfNonDomReferences) {
-          // References to directives are pinned to 'any'.
-          return NULL_AS_ANY;
-        }
-
-        const expr = ts.getMutableClone(this.scope.resolve(target.node, target.directive));
-        addParseSpanInfo(expr, ast.sourceSpan);
-        return expr;
-      }
-    } else {
-      throw new Error(`Unreachable: ${binding}`);
-    }
+    const expr = this.scope.resolve(binding);
+    addParseSpanInfo(expr, ast.sourceSpan);
+    return expr;
   }
 }
 
@@ -1269,53 +1679,12 @@ function tcbCallTypeCtor(
       /* argumentsArray */[ts.createObjectLiteral(members)]);
 }
 
-type TcbDirectiveInput = {
-  type: 'binding'; field: string; expression: ts.Expression; sourceSpan: ParseSourceSpan;
-}|{
-  type: 'unset';
-  field: string;
-};
-
-function tcbGetDirectiveInputs(
-    el: TmplAstElement|TmplAstTemplate, dir: TypeCheckableDirectiveMeta, tcb: Context,
-    scope: Scope): TcbDirectiveInput[] {
-  // Only the first binding to a property is written.
-  // TODO(alxhub): produce an error for duplicate bindings to the same property, independently of
-  // this logic.
-  const directiveInputs = new Map<string, TcbDirectiveInput>();
-  // `dir.inputs` is an object map of field names on the directive class to property names.
-  // This is backwards from what's needed to match bindings - a map of properties to field names
-  // is desired. Invert `dir.inputs` into `propMatch` to create this map.
-  const propMatch = new Map<string, string>();
-  const inputs = dir.inputs;
-  Object.keys(inputs).forEach(key => {
-    Array.isArray(inputs[key]) ? propMatch.set(inputs[key][0], key) :
-                                 propMatch.set(inputs[key] as string, key);
-  });
-
-  el.inputs.forEach(processAttribute);
-  el.attributes.forEach(processAttribute);
-  if (el instanceof TmplAstTemplate) {
-    el.templateAttrs.forEach(processAttribute);
-  }
-
-  // Add unset directive inputs for each of the remaining unset fields.
-  // Note: it's actually important here that `propMatch.values()` isn't used, as there can be
-  // multiple fields which share the same property name and only one of them will be listed as a
-  // value in `propMatch`.
-  for (const field of Object.keys(inputs)) {
-    if (!directiveInputs.has(field)) {
-      directiveInputs.set(field, {type: 'unset', field});
-    }
-  }
+function getBoundInputs(
+    directive: TypeCheckableDirectiveMeta, node: TmplAstTemplate|TmplAstElement,
+    tcb: Context): TcbBoundInput[] {
+  const boundInputs: TcbBoundInput[] = [];
 
-  return Array.from(directiveInputs.values());
-
-  /**
-   * Add a binding expression to the map for each input/template attribute of the directive that has
-   * a matching binding.
-   */
-  function processAttribute(attr: TmplAstBoundAttribute|TmplAstTextAttribute): void {
+  const processAttribute = (attr: TmplAstBoundAttribute|TmplAstTextAttribute) => {
     // Skip non-property bindings.
     if (attr instanceof TmplAstBoundAttribute && attr.type !== BindingType.Property) {
       return;
@@ -1327,34 +1696,73 @@ function tcbGetDirectiveInputs(
     }
 
     // Skip the attribute if the directive does not have an input for it.
-    if (!propMatch.has(attr.name)) {
-      return;
-    }
-    const field = propMatch.get(attr.name)!;
-
-    // Skip the attribute if a previous binding also wrote to it.
-    if (directiveInputs.has(field)) {
+    const inputs = directive.inputs.getByBindingPropertyName(attr.name);
+    if (inputs === null) {
       return;
     }
+    const fieldNames = inputs.map(input => input.classPropertyName);
+    boundInputs.push({attribute: attr, fieldNames});
+  };
+
+  node.inputs.forEach(processAttribute);
+  node.attributes.forEach(processAttribute);
+  if (node instanceof TmplAstTemplate) {
+    node.templateAttrs.forEach(processAttribute);
+  }
 
-    let expr: ts.Expression;
-    if (attr instanceof TmplAstBoundAttribute) {
-      // Produce an expression representing the value of the binding.
-      expr = tcbExpression(attr.value, tcb, scope);
-    } else {
-      // For regular attributes with a static string value, use the represented string literal.
-      expr = ts.createStringLiteral(attr.value);
-    }
+  return boundInputs;
+}
 
-    directiveInputs.set(field, {
-      type: 'binding',
-      field: field,
-      expression: expr,
-      sourceSpan: attr.sourceSpan,
-    });
+/**
+ * Translates the given attribute binding to a `ts.Expression`.
+ */
+function translateInput(
+    attr: TmplAstBoundAttribute|TmplAstTextAttribute, tcb: Context, scope: Scope): ts.Expression {
+  if (attr instanceof TmplAstBoundAttribute) {
+    // Produce an expression representing the value of the binding.
+    return tcbExpression(attr.value, tcb, scope);
+  } else {
+    // For regular attributes with a static string value, use the represented string literal.
+    return ts.createStringLiteral(attr.value);
   }
 }
 
+/**
+ * An input binding that corresponds with a field of a directive.
+ */
+interface TcbDirectiveBoundInput {
+  type: 'binding';
+
+  /**
+   * The name of a field on the directive that is set.
+   */
+  field: string;
+
+  /**
+   * The `ts.Expression` corresponding with the input binding expression.
+   */
+  expression: ts.Expression;
+
+  /**
+   * The source span of the full attribute binding.
+   */
+  sourceSpan: ParseSourceSpan;
+}
+
+/**
+ * Indicates that a certain field of a directive does not have a corresponding input binding.
+ */
+interface TcbDirectiveUnsetInput {
+  type: 'unset';
+
+  /**
+   * The name of a field on the directive for which no input binding is present.
+   */
+  field: string;
+}
+
+type TcbDirectiveInput = TcbDirectiveBoundInput|TcbDirectiveUnsetInput;
+
 const EVENT_PARAMETER = '$event';
 
 const enum EventParamType {
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/src/type_constructor.ts b/packages/compiler-cli/src/ngtsc/typecheck/src/type_constructor.ts
index f80fd0fc69d9d..8cb2114ddffc3 100644
--- a/packages/compiler-cli/src/ngtsc/typecheck/src/type_constructor.ts
+++ b/packages/compiler-cli/src/ngtsc/typecheck/src/type_constructor.ts
@@ -11,6 +11,7 @@ import * as ts from 'typescript';
 import {ClassDeclaration, ReflectionHost} from '../../reflection';
 import {TypeCtorMetadata} from '../api';
 
+import {tsCreateTypeQueryForCoercedInput} from './ts_util';
 import {TypeParameterEmitter} from './type_parameter_emitter';
 
 export function generateTypeCtorDeclarationFn(
@@ -150,9 +151,7 @@ function constructTypeCtorParameter(
           /* modifiers */ undefined,
           /* name */ key,
           /* questionToken */ undefined,
-          /* type */
-          ts.createTypeQueryNode(
-              ts.createQualifiedName(rawType.typeName, `ngAcceptInputType_${key}`)),
+          /* type */ tsCreateTypeQueryForCoercedInput(rawType.typeName, key),
           /* initializer */ undefined));
     }
   }
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/src/type_emitter.ts b/packages/compiler-cli/src/ngtsc/typecheck/src/type_emitter.ts
index d9f725b1d827f..794cd2475da9c 100644
--- a/packages/compiler-cli/src/ngtsc/typecheck/src/type_emitter.ts
+++ b/packages/compiler-cli/src/ngtsc/typecheck/src/type_emitter.ts
@@ -36,6 +36,7 @@ export function canEmitType(type: ts.TypeNode, resolver: TypeReferenceResolver):
       visitTypeReferenceNode: type => canEmitTypeReference(type),
       visitArrayTypeNode: type => canEmitTypeWorker(type.elementType),
       visitKeywordType: () => true,
+      visitLiteralType: () => true,
       visitOtherType: () => false,
     });
   }
@@ -111,6 +112,7 @@ export class TypeEmitter {
       visitTypeReferenceNode: type => this.emitTypeReference(type),
       visitArrayTypeNode: type => ts.updateArrayTypeNode(type, this.emitType(type.elementType)),
       visitKeywordType: type => type,
+      visitLiteralType: type => type,
       visitOtherType: () => {
         throw new Error('Unable to emit a complex type');
       },
@@ -159,6 +161,7 @@ interface TypeEmitterVisitor<R> {
   visitTypeReferenceNode(type: ts.TypeReferenceNode): R;
   visitArrayTypeNode(type: ts.ArrayTypeNode): R;
   visitKeywordType(type: ts.KeywordTypeNode): R;
+  visitLiteralType(type: ts.LiteralTypeNode): R;
   visitOtherType(type: ts.TypeNode): R;
 }
 
@@ -167,6 +170,8 @@ function visitTypeNode<R>(type: ts.TypeNode, visitor: TypeEmitterVisitor<R>): R
     return visitor.visitTypeReferenceNode(type);
   } else if (ts.isArrayTypeNode(type)) {
     return visitor.visitArrayTypeNode(type);
+  } else if (ts.isLiteralTypeNode(type)) {
+    return visitor.visitLiteralType(type);
   }
 
   switch (type.kind) {
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/src/type_parameter_emitter.ts b/packages/compiler-cli/src/ngtsc/typecheck/src/type_parameter_emitter.ts
index 968043b89bd16..c973742ceab36 100644
--- a/packages/compiler-cli/src/ngtsc/typecheck/src/type_parameter_emitter.ts
+++ b/packages/compiler-cli/src/ngtsc/typecheck/src/type_parameter_emitter.ts
@@ -8,7 +8,7 @@
 import * as ts from 'typescript';
 
 import {OwningModule, Reference} from '../../imports';
-import {ReflectionHost} from '../../reflection';
+import {DeclarationNode, ReflectionHost} from '../../reflection';
 
 import {canEmitType, ResolvedTypeReference, TypeEmitter} from './type_emitter';
 
@@ -89,7 +89,7 @@ export class TypeParameterEmitter {
     return new Reference(declaration.node, owningModule);
   }
 
-  private isLocalTypeParameter(decl: ts.Declaration): boolean {
+  private isLocalTypeParameter(decl: DeclarationNode): boolean {
     // Checking for local type parameters only occurs during resolution of type parameters, so it is
     // guaranteed that type parameters are present.
     return this.typeParameters!.some(param => param === decl);
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/typecheck/test/BUILD.bazel
index cf18524f6334d..958d0c02fb2ec 100644
--- a/packages/compiler-cli/src/ngtsc/typecheck/test/BUILD.bazel
+++ b/packages/compiler-cli/src/ngtsc/typecheck/test/BUILD.bazel
@@ -16,11 +16,14 @@ ts_library(
         "//packages/compiler-cli/src/ngtsc/file_system/testing",
         "//packages/compiler-cli/src/ngtsc/imports",
         "//packages/compiler-cli/src/ngtsc/incremental",
+        "//packages/compiler-cli/src/ngtsc/metadata",
         "//packages/compiler-cli/src/ngtsc/reflection",
+        "//packages/compiler-cli/src/ngtsc/scope",
         "//packages/compiler-cli/src/ngtsc/shims",
         "//packages/compiler-cli/src/ngtsc/testing",
         "//packages/compiler-cli/src/ngtsc/typecheck",
         "//packages/compiler-cli/src/ngtsc/typecheck/api",
+        "//packages/compiler-cli/src/ngtsc/typecheck/diagnostics",
         "//packages/compiler-cli/src/ngtsc/util",
         "@npm//typescript",
     ],
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/test/diagnostics_spec.ts b/packages/compiler-cli/src/ngtsc/typecheck/test/diagnostics_spec.ts
index 081296f637634..0104b024a2851 100644
--- a/packages/compiler-cli/src/ngtsc/typecheck/test/diagnostics_spec.ts
+++ b/packages/compiler-cli/src/ngtsc/typecheck/test/diagnostics_spec.ts
@@ -176,6 +176,21 @@ runInEachFileSystem(() => {
       ]);
     });
 
+    it('checks expressions in ICUs', () => {
+      const messages = diagnose(
+          `<span i18n>{switch, plural, other { {{interpolation}}
+            {nestedSwitch, plural, other { {{nestedInterpolation}} }}
+          }}</span>`,
+          `class TestComponent {}`);
+
+      expect(messages.sort()).toEqual([
+        `TestComponent.html(1, 13): Property 'switch' does not exist on type 'TestComponent'.`,
+        `TestComponent.html(1, 39): Property 'interpolation' does not exist on type 'TestComponent'.`,
+        `TestComponent.html(2, 14): Property 'nestedSwitch' does not exist on type 'TestComponent'.`,
+        `TestComponent.html(2, 46): Property 'nestedInterpolation' does not exist on type 'TestComponent'.`,
+      ]);
+    });
+
     it('produces diagnostics for pipes', () => {
       const messages = diagnose(
           `<div>{{ person.name | pipe:person.age:1 }}</div>`, `
@@ -227,7 +242,8 @@ runInEachFileSystem(() => {
             name: 'GuardDir',
             selector: '[guard]',
             inputs: {'guard': 'guard'},
-            ngTemplateGuards: [{inputName: 'guard', type: 'binding'}]
+            ngTemplateGuards: [{inputName: 'guard', type: 'binding'}],
+            undeclaredInputFields: ['guard'],
           }]);
 
       expect(messages).toEqual([
@@ -247,6 +263,17 @@ runInEachFileSystem(() => {
       expect(messages).toEqual([]);
     });
 
+    it('should treat unary operators as literal types', () => {
+      const messages = diagnose(`{{ test(-1) + test(+1) + test(-2) }}`, `
+      class TestComponent {
+        test(value: -1 | 1): number { return value; }
+      }`);
+
+      expect(messages).toEqual([
+        `TestComponent.html(1, 31): Argument of type '-2' is not assignable to parameter of type '1 | -1'.`,
+      ]);
+    });
+
     describe('outputs', () => {
       it('should produce a diagnostic for directive outputs', () => {
         const messages = diagnose(
@@ -444,7 +471,7 @@ class TestComponent {
         }`);
 
       expect(messages).toEqual(
-          [`TestComponent.html(1, 15): Type '2' is not assignable to type 'string'.`]);
+          [`TestComponent.html(1, 15): Type 'number' is not assignable to type 'string'.`]);
     });
   });
 });
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/test/span_comments_spec.ts b/packages/compiler-cli/src/ngtsc/typecheck/test/span_comments_spec.ts
index b6c5322fbf4d6..84087895475b3 100644
--- a/packages/compiler-cli/src/ngtsc/typecheck/test/span_comments_spec.ts
+++ b/packages/compiler-cli/src/ngtsc/typecheck/test/span_comments_spec.ts
@@ -10,6 +10,10 @@ import {tcb, TestDeclaration} from './test_utils';
 
 describe('type check blocks diagnostics', () => {
   describe('parse spans', () => {
+    it('should annotate unary ops', () => {
+      expect(tcbWithSpans('{{ -a }}')).toContain('(-((ctx).a /*4,5*/) /*4,5*/) /*3,5*/');
+    });
+
     it('should annotate binary ops', () => {
       expect(tcbWithSpans('{{ a + b }}'))
           .toContain('(((ctx).a /*3,4*/) /*3,4*/) + (((ctx).b /*7,8*/) /*7,8*/) /*3,8*/');
@@ -18,12 +22,12 @@ describe('type check blocks diagnostics', () => {
     it('should annotate conditions', () => {
       expect(tcbWithSpans('{{ a ? b : c }}'))
           .toContain(
-              '(((ctx).a /*3,4*/) /*3,4*/ ? ((ctx).b /*7,8*/) /*7,8*/ : ((ctx).c /*11,12*/) /*11,12*/) /*3,12*/');
+              '(((ctx).a /*3,4*/) /*3,4*/ ? ((ctx).b /*7,8*/) /*7,8*/ : (((ctx).c /*11,12*/) /*11,12*/)) /*3,12*/');
     });
 
     it('should annotate interpolations', () => {
       expect(tcbWithSpans('{{ hello }} {{ world }}'))
-          .toContain('"" + ((ctx).hello /*3,8*/) /*3,8*/ + ((ctx).world /*15,20*/) /*15,20*/');
+          .toContain('"" + (((ctx).hello /*3,8*/) /*3,8*/) + (((ctx).world /*15,20*/) /*15,20*/)');
     });
 
     it('should annotate literal map expressions', () => {
@@ -43,7 +47,7 @@ describe('type check blocks diagnostics', () => {
 
     it('should annotate literals', () => {
       const TEMPLATE = '{{ 123 }}';
-      expect(tcbWithSpans(TEMPLATE)).toContain('123 /*3,6*/;');
+      expect(tcbWithSpans(TEMPLATE)).toContain('123 /*3,6*/');
     });
 
     it('should annotate non-null assertions', () => {
@@ -53,7 +57,7 @@ describe('type check blocks diagnostics', () => {
 
     it('should annotate prefix not', () => {
       const TEMPLATE = `{{ !a }}`;
-      expect(tcbWithSpans(TEMPLATE)).toContain('!(((ctx).a /*4,5*/) /*4,5*/) /*3,5*/;');
+      expect(tcbWithSpans(TEMPLATE)).toContain('!(((ctx).a /*4,5*/) /*4,5*/) /*3,5*/');
     });
 
     it('should annotate method calls', () => {
@@ -90,6 +94,12 @@ describe('type check blocks diagnostics', () => {
               '(((((((ctx).a /*14,15*/) /*14,15*/).b /*16,17*/) /*14,17*/).c /*18,19*/) /*14,23*/ = ((ctx).d /*22,23*/) /*22,23*/) /*14,23*/');
     });
 
+    it('should $event property writes', () => {
+      const TEMPLATE = `<div (click)='a = $event'></div>`;
+      expect(tcbWithSpans(TEMPLATE))
+          .toContain('(((ctx).a /*14,15*/) /*14,24*/ = ($event /*18,24*/)) /*14,24*/;');
+    });
+
     it('should annotate keyed property access', () => {
       const TEMPLATE = `{{ a[b] }}`;
       expect(tcbWithSpans(TEMPLATE))
@@ -137,7 +147,7 @@ describe('type check blocks diagnostics', () => {
       }];
       const block = tcbWithSpans(TEMPLATE, PIPES);
       expect(block).toContain(
-          '(null as TestPipe).transform(((ctx).a /*3,4*/) /*3,4*/, ((ctx).b /*12,13*/) /*12,13*/) /*3,13*/;');
+          '((null as TestPipe).transform(((ctx).a /*3,4*/) /*3,4*/, ((ctx).b /*12,13*/) /*12,13*/) /*3,13*/);');
     });
 
     describe('attaching multiple comments for multiple references', () => {
@@ -158,7 +168,23 @@ describe('type check blocks diagnostics', () => {
         }];
         const TEMPLATE = `<my-cmp #a></my-cmp>{{ a || a }}`;
         expect(tcbWithSpans(TEMPLATE, DIRECTIVES))
-            .toContain('((_t2 /*23,24*/) || (_t2 /*28,29*/) /*23,29*/);');
+            .toContain('((_t1 /*23,24*/) || (_t1 /*28,29*/) /*23,29*/);');
+      });
+    });
+
+    describe('attaching comments for generic directive inputs', () => {
+      it('should be correct for directive refs', () => {
+        const DIRECTIVES: TestDeclaration[] = [{
+          type: 'directive',
+          name: 'MyComponent',
+          selector: 'my-cmp',
+          isComponent: true,
+          isGeneric: true,
+          inputs: {'inputA': 'inputA'},
+        }];
+        const TEMPLATE = `<my-cmp [inputA]="''"></my-cmp>`;
+        expect(tcbWithSpans(TEMPLATE, DIRECTIVES))
+            .toContain('_t1.inputA = ("" /*18,20*/) /*8,21*/;');
       });
     });
   });
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/test/test_utils.ts b/packages/compiler-cli/src/ngtsc/typecheck/test/test_utils.ts
index 99043a6428fcf..a8eb8cf6dc85a 100644
--- a/packages/compiler-cli/src/ngtsc/typecheck/test/test_utils.ts
+++ b/packages/compiler-cli/src/ngtsc/typecheck/test/test_utils.ts
@@ -6,21 +6,23 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {CssSelector, ParseSourceFile, ParseSourceSpan, parseTemplate, R3TargetBinder, SchemaMetadata, SelectorMatcher, TmplAstElement, TmplAstReference, Type} from '@angular/compiler';
+import {CssSelector, ParseSourceFile, ParseSourceSpan, parseTemplate, R3TargetBinder, SchemaMetadata, SelectorMatcher, TmplAstElement, Type} from '@angular/compiler';
 import * as ts from 'typescript';
 
 import {absoluteFrom, AbsoluteFsPath, getSourceFileOrError, LogicalFileSystem} from '../../file_system';
 import {TestFile} from '../../file_system/testing';
-import {AbsoluteModuleStrategy, LocalIdentifierStrategy, LogicalProjectStrategy, ModuleResolver, Reference, ReferenceEmitter} from '../../imports';
+import {AbsoluteModuleStrategy, LocalIdentifierStrategy, LogicalProjectStrategy, ModuleResolver, Reexport, Reference, ReferenceEmitter} from '../../imports';
 import {NOOP_INCREMENTAL_BUILD} from '../../incremental';
+import {ClassPropertyMapping} from '../../metadata';
 import {ClassDeclaration, isNamedClassDeclaration, TypeScriptReflectionHost} from '../../reflection';
+import {ComponentScopeReader, ScopeData} from '../../scope';
 import {makeProgram} from '../../testing';
 import {getRootDirs} from '../../util/src/typescript';
 import {ProgramTypeCheckAdapter, TemplateTypeChecker, TypeCheckContext} from '../api';
 import {TemplateId, TemplateSourceMapping, TypeCheckableDirectiveMeta, TypeCheckBlockMetadata, TypeCheckingConfig, UpdateMode} from '../api/api';
+import {TemplateDiagnostic} from '../diagnostics';
 import {ReusedProgramStrategy} from '../src/augmented_program';
 import {TemplateTypeCheckerImpl} from '../src/checker';
-import {TemplateDiagnostic} from '../src/diagnostics';
 import {DomSchemaChecker} from '../src/dom';
 import {Environment} from '../src/environment';
 import {OutOfBandDiagnosticRecorder} from '../src/oob';
@@ -120,8 +122,9 @@ export function ngForDeclaration(): TestDeclaration {
     file: absoluteFrom('/ngfor.d.ts'),
     selector: '[ngForOf]',
     name: 'NgForOf',
-    inputs: {ngForOf: 'ngForOf'},
+    inputs: {ngForOf: 'ngForOf', ngForTrackBy: 'ngForTrackBy', ngForTemplate: 'ngForTemplate'},
     hasNgTemplateContextGuard: true,
+    isGeneric: true,
   };
 }
 
@@ -151,11 +154,23 @@ export function ngForDts(): TestFile {
   };
 }
 
+export function ngForTypeCheckTarget(): TypeCheckingTarget {
+  const dts = ngForDts();
+  return {
+    ...dts,
+    fileName: dts.name,
+    source: dts.contents,
+    templates: {},
+  };
+}
+
 export const ALL_ENABLED_CONFIG: TypeCheckingConfig = {
   applyTemplateContextGuards: true,
   checkQueries: false,
   checkTemplateBodies: true,
+  alwaysCheckSchemaInTemplateBodies: true,
   checkTypeOfInputBindings: true,
+  honorAccessModifiersForInputBindings: true,
   strictNullInputBindings: true,
   checkTypeOfAttributes: true,
   // Feature is still in development.
@@ -170,16 +185,20 @@ export const ALL_ENABLED_CONFIG: TypeCheckingConfig = {
   strictSafeNavigationTypes: true,
   useContextGenericType: true,
   strictLiteralTypes: true,
+  enableTemplateTypeChecker: false,
 };
 
 // Remove 'ref' from TypeCheckableDirectiveMeta and add a 'selector' instead.
 export type TestDirective = Partial<Pick<
     TypeCheckableDirectiveMeta,
-    Exclude<keyof TypeCheckableDirectiveMeta, 'ref'|'coercedInputFields'>>>&{
-  selector: string,
-  name: string,
-  file?: AbsoluteFsPath, type: 'directive',
-  coercedInputFields?: string[],
+    Exclude<
+        keyof TypeCheckableDirectiveMeta,
+        'ref'|'coercedInputFields'|'restrictedInputFields'|'stringLiteralInputFields'|
+        'undeclaredInputFields'|'inputs'|'outputs'>>>&{
+  selector: string, name: string, file?: AbsoluteFsPath, type: 'directive',
+      inputs?: {[fieldName: string]: string}, outputs?: {[fieldName: string]: string},
+      coercedInputFields?: string[], restrictedInputFields?: string[],
+      stringLiteralInputFields?: string[], undeclaredInputFields?: string[], isGeneric?: boolean;
 };
 export type TestPipe = {
   name: string,
@@ -210,6 +229,7 @@ export function tcb(
     applyTemplateContextGuards: true,
     checkQueries: false,
     checkTypeOfInputBindings: true,
+    honorAccessModifiersForInputBindings: false,
     strictNullInputBindings: true,
     checkTypeOfAttributes: true,
     checkTypeOfDomBindings: false,
@@ -220,9 +240,11 @@ export function tcb(
     checkTypeOfNonDomReferences: true,
     checkTypeOfPipes: true,
     checkTemplateBodies: true,
+    alwaysCheckSchemaInTemplateBodies: true,
     strictSafeNavigationTypes: true,
     useContextGenericType: true,
     strictLiteralTypes: true,
+    enableTemplateTypeChecker: false,
   };
   options = options || {
     emitSpans: false,
@@ -347,7 +369,7 @@ export function setup(targets: TypeCheckingTarget[], overrides: {
         const templateUrl = `${className}.html`;
         const templateFile = new ParseSourceFile(template, templateUrl);
         const {nodes, errors} = parseTemplate(template, templateUrl);
-        if (errors !== undefined) {
+        if (errors !== null) {
           throw new Error('Template parse errors: \n' + errors.join('\n'));
         }
 
@@ -383,9 +405,32 @@ export function setup(targets: TypeCheckingTarget[], overrides: {
     (programStrategy as any).supportsInlineOperations = overrides.inlining;
   }
 
+  const fakeScopeReader = {
+    getRequiresRemoteScope() {
+      return null;
+    },
+    // If there is a module with [className] + 'Module' in the same source file, returns
+    // `LocalModuleScope` with the ngModule class and empty arrays for everything else.
+    getScopeForComponent(clazz: ClassDeclaration) {
+      try {
+        const ngModule = getClass(clazz.getSourceFile(), `${clazz.name.getText()}Module`);
+        const stubScopeData = {directives: [], ngModules: [], pipes: []};
+        return {
+          ngModule,
+          compilation: stubScopeData,
+          reexports: [],
+          schemas: [],
+          exported: stubScopeData
+        };
+      } catch (e) {
+        return null;
+      }
+    }
+  };
+
   const templateTypeChecker = new TemplateTypeCheckerImpl(
       program, programStrategy, checkAdapter, fullConfig, emitter, reflectionHost, host,
-      NOOP_INCREMENTAL_BUILD);
+      NOOP_INCREMENTAL_BUILD, fakeScopeReader);
   return {
     templateTypeChecker,
     program,
@@ -412,12 +457,17 @@ function prepareDeclarations(
       name: decl.name,
       ref: new Reference(resolveDeclaration(decl)),
       exportAs: decl.exportAs || null,
+      selector: decl.selector || null,
       hasNgTemplateContextGuard: decl.hasNgTemplateContextGuard || false,
-      inputs: decl.inputs || {},
+      inputs: ClassPropertyMapping.fromMappedObject(decl.inputs || {}),
       isComponent: decl.isComponent || false,
       ngTemplateGuards: decl.ngTemplateGuards || [],
       coercedInputFields: new Set<string>(decl.coercedInputFields || []),
-      outputs: decl.outputs || {},
+      restrictedInputFields: new Set<string>(decl.restrictedInputFields || []),
+      stringLiteralInputFields: new Set<string>(decl.stringLiteralInputFields || []),
+      undeclaredInputFields: new Set<string>(decl.undeclaredInputFields || []),
+      isGeneric: decl.isGeneric ?? false,
+      outputs: ClassPropertyMapping.fromMappedObject(decl.outputs || {}),
       queries: decl.queries || [],
     };
     matcher.addSelectables(selector, meta);
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/test/type_check_block_spec.ts b/packages/compiler-cli/src/ngtsc/typecheck/test/type_check_block_spec.ts
index e9586441c1335..886a78f958f84 100644
--- a/packages/compiler-cli/src/ngtsc/typecheck/test/type_check_block_spec.ts
+++ b/packages/compiler-cli/src/ngtsc/typecheck/test/type_check_block_spec.ts
@@ -13,33 +13,43 @@ import {ALL_ENABLED_CONFIG, tcb, TestDeclaration, TestDirective} from './test_ut
 
 describe('type check blocks', () => {
   it('should generate a basic block for a binding', () => {
-    expect(tcb('{{hello}} {{world}}')).toContain('"" + ((ctx).hello) + ((ctx).world);');
+    expect(tcb('{{hello}} {{world}}')).toContain('"" + (((ctx).hello)) + (((ctx).world));');
   });
 
   it('should generate literal map expressions', () => {
     const TEMPLATE = '{{ method({foo: a, bar: b}) }}';
-    expect(tcb(TEMPLATE)).toContain('(ctx).method({ "foo": ((ctx).a), "bar": ((ctx).b) });');
+    expect(tcb(TEMPLATE)).toContain('(ctx).method({ "foo": ((ctx).a), "bar": ((ctx).b) })');
   });
 
   it('should generate literal array expressions', () => {
     const TEMPLATE = '{{ method([a, b]) }}';
-    expect(tcb(TEMPLATE)).toContain('(ctx).method([((ctx).a), ((ctx).b)]);');
+    expect(tcb(TEMPLATE)).toContain('(ctx).method([((ctx).a), ((ctx).b)])');
   });
 
   it('should handle non-null assertions', () => {
     const TEMPLATE = `{{a!}}`;
-    expect(tcb(TEMPLATE)).toContain('((((ctx).a))!);');
+    expect(tcb(TEMPLATE)).toContain('((((ctx).a))!)');
+  });
+
+  it('should handle unary - operator', () => {
+    const TEMPLATE = `{{-1}}`;
+    expect(tcb(TEMPLATE)).toContain('(-1)');
   });
 
   it('should handle keyed property access', () => {
     const TEMPLATE = `{{a[b]}}`;
-    expect(tcb(TEMPLATE)).toContain('(((ctx).a))[((ctx).b)];');
+    expect(tcb(TEMPLATE)).toContain('(((ctx).a))[((ctx).b)]');
   });
 
   it('should handle nested ternary expressions', () => {
     const TEMPLATE = `{{a ? b : c ? d : e}}`;
     expect(tcb(TEMPLATE))
-        .toContain('(((ctx).a) ? ((ctx).b) : (((ctx).c) ? ((ctx).d) : ((ctx).e)))');
+        .toContain('(((ctx).a) ? ((ctx).b) : ((((ctx).c) ? ((ctx).d) : (((ctx).e)))))');
+  });
+
+  it('should handle quote expressions as any type', () => {
+    const TEMPLATE = `<span [quote]="sql:expression"></span>`;
+    expect(tcb(TEMPLATE)).toContain('null as any');
   });
 
   it('should handle attribute values for directive inputs', () => {
@@ -50,7 +60,7 @@ describe('type check blocks', () => {
       selector: '[dir]',
       inputs: {inputA: 'inputA'},
     }];
-    expect(tcb(TEMPLATE, DIRECTIVES)).toContain('"inputA": ("value")');
+    expect(tcb(TEMPLATE, DIRECTIVES)).toContain('_t1: DirA = (null!); _t1.inputA = ("value");');
   });
 
   it('should handle multiple bindings to the same property', () => {
@@ -62,8 +72,8 @@ describe('type check blocks', () => {
       inputs: {inputA: 'inputA'},
     }];
     const block = tcb(TEMPLATE, DIRECTIVES);
-    expect(block).toContain('"inputA": (1)');
-    expect(block).not.toContain('"inputA": (2)');
+    expect(block).toContain('_t1.inputA = (1);');
+    expect(block).toContain('_t1.inputA = (2);');
   });
 
   it('should handle empty bindings', () => {
@@ -74,7 +84,7 @@ describe('type check blocks', () => {
       selector: '[dir-a]',
       inputs: {inputA: 'inputA'},
     }];
-    expect(tcb(TEMPLATE, DIRECTIVES)).toContain('"inputA": (undefined)');
+    expect(tcb(TEMPLATE, DIRECTIVES)).toContain('_t1.inputA = (undefined);');
   });
 
   it('should handle bindings without value', () => {
@@ -85,7 +95,7 @@ describe('type check blocks', () => {
       selector: '[dir-a]',
       inputs: {inputA: 'inputA'},
     }];
-    expect(tcb(TEMPLATE, DIRECTIVES)).toContain('"inputA": (undefined)');
+    expect(tcb(TEMPLATE, DIRECTIVES)).toContain('_t1.inputA = (undefined);');
   });
 
   it('should handle implicit vars on ng-template', () => {
@@ -96,7 +106,7 @@ describe('type check blocks', () => {
   it('should handle method calls of template variables', () => {
     const TEMPLATE = `<ng-template let-a>{{a(1)}}</ng-template>`;
     expect(tcb(TEMPLATE)).toContain('var _t2 = _t1.$implicit;');
-    expect(tcb(TEMPLATE)).toContain('(_t2).a(1);');
+    expect(tcb(TEMPLATE)).toContain('(_t2).a(1)');
   });
 
   it('should handle implicit vars when using microsyntax', () => {
@@ -104,20 +114,216 @@ describe('type check blocks', () => {
     expect(tcb(TEMPLATE)).toContain('var _t2 = _t1.$implicit;');
   });
 
-  it('should handle missing property bindings', () => {
-    const TEMPLATE = `<div dir [inputA]="foo"></div>`;
-    const DIRECTIVES: TestDeclaration[] = [{
-      type: 'directive',
-      name: 'Dir',
-      selector: '[dir]',
-      inputs: {
-        fieldA: 'inputA',
-        fieldB: 'inputB',
+  describe('type constructors', () => {
+    it('should handle missing property bindings', () => {
+      const TEMPLATE = `<div dir [inputA]="foo"></div>`;
+      const DIRECTIVES: TestDeclaration[] = [{
+        type: 'directive',
+        name: 'Dir',
+        selector: '[dir]',
+        inputs: {
+          fieldA: 'inputA',
+          fieldB: 'inputB',
+        },
+        isGeneric: true,
+      }];
+      expect(tcb(TEMPLATE, DIRECTIVES))
+          .toContain(
+              'var _t1 = Dir.ngTypeCtor({ "fieldA": (((ctx).foo)), "fieldB": (null as any) });');
+    });
+
+    it('should handle multiple bindings to the same property', () => {
+      const TEMPLATE = `<div dir [inputA]="1" [inputA]="2"></div>`;
+      const DIRECTIVES: TestDeclaration[] = [{
+        type: 'directive',
+        name: 'Dir',
+        selector: '[dir]',
+        inputs: {
+          fieldA: 'inputA',
+        },
+        isGeneric: true,
+      }];
+      const block = tcb(TEMPLATE, DIRECTIVES);
+      expect(block).toContain('"fieldA": (1)');
+      expect(block).not.toContain('"fieldA": (2)');
+    });
+
+
+    it('should only apply property bindings to directives', () => {
+      const TEMPLATE = `
+      <div dir [style.color]="'blue'" [class.strong]="false" [attr.enabled]="true"></div>
+    `;
+      const DIRECTIVES: TestDeclaration[] = [{
+        type: 'directive',
+        name: 'Dir',
+        selector: '[dir]',
+        inputs: {'color': 'color', 'strong': 'strong', 'enabled': 'enabled'},
+        isGeneric: true,
+      }];
+      const block = tcb(TEMPLATE, DIRECTIVES);
+      expect(block).not.toContain('Dir.ngTypeCtor');
+      expect(block).toContain('"blue"; false; true;');
+    });
+
+    it('should generate a circular directive reference correctly', () => {
+      const TEMPLATE = `
+      <div dir #d="dir" [input]="d"></div>
+    `;
+      const DIRECTIVES: TestDirective[] = [{
+        type: 'directive',
+        name: 'Dir',
+        selector: '[dir]',
+        exportAs: ['dir'],
+        inputs: {input: 'input'},
+        isGeneric: true,
+      }];
+      expect(tcb(TEMPLATE, DIRECTIVES))
+          .toContain(
+              'var _t2 = Dir.ngTypeCtor({ "input": (null!) }); ' +
+              'var _t1 = _t2; ' +
+              '_t2.input = (_t1);');
+    });
+
+    it('should generate circular references between two directives correctly', () => {
+      const TEMPLATE = `
+    <div #a="dirA" dir-a [inputA]="b">A</div>
+    <div #b="dirB" dir-b [inputB]="a">B</div>
+`;
+      const DIRECTIVES: TestDirective[] = [
+        {
+          type: 'directive',
+          name: 'DirA',
+          selector: '[dir-a]',
+          exportAs: ['dirA'],
+          inputs: {inputA: 'inputA'},
+          isGeneric: true,
+        },
+        {
+          type: 'directive',
+          name: 'DirB',
+          selector: '[dir-b]',
+          exportAs: ['dirB'],
+          inputs: {inputB: 'inputB'},
+          isGeneric: true,
+        }
+      ];
+      expect(tcb(TEMPLATE, DIRECTIVES))
+          .toContain(
+              'var _t4 = DirA.ngTypeCtor({ "inputA": (null!) }); ' +
+              'var _t3 = _t4; ' +
+              'var _t2 = DirB.ngTypeCtor({ "inputB": (_t3) }); ' +
+              'var _t1 = _t2; ' +
+              '_t4.inputA = (_t1); ' +
+              '_t2.inputB = (_t3);');
+    });
+
+    it('should handle empty bindings', () => {
+      const TEMPLATE = `<div dir-a [inputA]=""></div>`;
+      const DIRECTIVES: TestDeclaration[] = [{
+        type: 'directive',
+        name: 'DirA',
+        selector: '[dir-a]',
+        inputs: {inputA: 'inputA'},
+        isGeneric: true,
+      }];
+      expect(tcb(TEMPLATE, DIRECTIVES)).toContain('"inputA": (undefined)');
+    });
+
+    it('should handle bindings without value', () => {
+      const TEMPLATE = `<div dir-a [inputA]></div>`;
+      const DIRECTIVES: TestDeclaration[] = [{
+        type: 'directive',
+        name: 'DirA',
+        selector: '[dir-a]',
+        inputs: {inputA: 'inputA'},
+        isGeneric: true,
+      }];
+      expect(tcb(TEMPLATE, DIRECTIVES)).toContain('"inputA": (undefined)');
+    });
+
+    it('should use coercion types if declared', () => {
+      const TEMPLATE = `<div dir [inputA]="foo"></div>`;
+      const DIRECTIVES: TestDeclaration[] = [{
+        type: 'directive',
+        name: 'Dir',
+        selector: '[dir]',
+        inputs: {
+          fieldA: 'inputA',
+        },
+        isGeneric: true,
+        coercedInputFields: ['fieldA'],
+      }];
+      expect(tcb(TEMPLATE, DIRECTIVES))
+          .toContain(
+              'var _t1: typeof Dir.ngAcceptInputType_fieldA = (null!); ' +
+              '_t1 = (((ctx).foo));');
+    });
+  });
+
+  it('should only generate code for DOM elements that are actually referenced', () => {
+    const TEMPLATE = `
+      <div></div>
+      <button #me (click)="handle(me)"></button>
+    `;
+    const block = tcb(TEMPLATE);
+    expect(block).not.toContain('"div"');
+    expect(block).toContain(
+        'var _t2 = document.createElement("button"); ' +
+        'var _t1 = _t2; ' +
+        '_t2.addEventListener');
+  });
+
+  it('should only generate directive declarations that have bindings or are referenced', () => {
+    const TEMPLATE = `
+      <div
+        hasInput [input]="value"
+        hasOutput (output)="handle()"
+        hasReference #ref="ref"
+        noReference
+        noBindings>{{ref.a}}</div>
+    `;
+    const DIRECTIVES: TestDeclaration[] = [
+      {
+        type: 'directive',
+        name: 'HasInput',
+        selector: '[hasInput]',
+        inputs: {input: 'input'},
       },
-    }];
-    expect(tcb(TEMPLATE, DIRECTIVES))
-        .toContain(
-            'var _t2 = Dir.ngTypeCtor({ "fieldA": (((ctx).foo)), "fieldB": (null as any) });');
+      {
+        type: 'directive',
+        name: 'HasOutput',
+        selector: '[hasOutput]',
+        outputs: {output: 'output'},
+      },
+      {
+        type: 'directive',
+        name: 'HasReference',
+        selector: '[hasReference]',
+        exportAs: ['ref'],
+      },
+      {
+        type: 'directive',
+        name: 'NoReference',
+        selector: '[noReference]',
+        exportAs: ['no-ref'],
+      },
+      {
+        type: 'directive',
+        name: 'NoBindings',
+        selector: '[noBindings]',
+        inputs: {unset: 'unset'},
+      },
+    ];
+    const block = tcb(TEMPLATE, DIRECTIVES);
+    expect(block).toContain('var _t1: HasInput = (null!)');
+    expect(block).toContain('_t1.input = (((ctx).value));');
+    expect(block).toContain('var _t2: HasOutput = (null!)');
+    expect(block).toContain('_t2["output"]');
+    expect(block).toContain('var _t4: HasReference = (null!)');
+    expect(block).toContain('var _t3 = _t4;');
+    expect(block).toContain('(_t3).a');
+    expect(block).not.toContain('NoBindings');
+    expect(block).not.toContain('NoReference');
   });
 
   it('should generate a forward element reference correctly', () => {
@@ -126,7 +332,8 @@ describe('type check blocks', () => {
       <input #i>
     `;
     expect(tcb(TEMPLATE))
-        .toContain('var _t1 = document.createElement("input"); "" + ((_t1).value);');
+        .toContain(
+            'var _t2 = document.createElement("input"); var _t1 = _t2; "" + (((_t1).value));');
   });
 
   it('should generate a forward directive reference correctly', () => {
@@ -142,7 +349,9 @@ describe('type check blocks', () => {
     }];
     expect(tcb(TEMPLATE, DIRECTIVES))
         .toContain(
-            'var _t1 = Dir.ngTypeCtor({}); "" + ((_t1).value); var _t2 = document.createElement("div");');
+            'var _t2: Dir = (null!); ' +
+            'var _t1 = _t2; ' +
+            '"" + (((_t1).value));');
   });
 
   it('should handle style and class bindings specially', () => {
@@ -168,8 +377,10 @@ describe('type check blocks', () => {
       inputs: {'color': 'color', 'strong': 'strong', 'enabled': 'enabled'},
     }];
     const block = tcb(TEMPLATE, DIRECTIVES);
-    expect(block).toContain(
-        'var _t2 = Dir.ngTypeCtor({ "color": (null as any), "strong": (null as any), "enabled": (null as any) });');
+    expect(block).not.toContain('var _t1: Dir = (null!);');
+    expect(block).not.toContain('"color"');
+    expect(block).not.toContain('"strong"');
+    expect(block).not.toContain('"enabled"');
     expect(block).toContain('"blue"; false; true;');
   });
 
@@ -186,8 +397,9 @@ describe('type check blocks', () => {
     }];
     expect(tcb(TEMPLATE, DIRECTIVES))
         .toContain(
-            'var _t3 = Dir.ngTypeCtor((null!)); ' +
-            'var _t2 = Dir.ngTypeCtor({ "input": (_t3) });');
+            'var _t2: Dir = (null!); ' +
+            'var _t1 = _t2; ' +
+            '_t2.input = (_t1);');
   });
 
   it('should generate circular references between two directives correctly', () => {
@@ -213,15 +425,163 @@ describe('type check blocks', () => {
     ];
     expect(tcb(TEMPLATE, DIRECTIVES))
         .toContain(
-            'var _t4 = DirA.ngTypeCtor((null!)); ' +
-            'var _t3 = DirB.ngTypeCtor({ "inputA": (_t4) }); ' +
-            'var _t2 = DirA.ngTypeCtor({ "inputA": (_t3) });');
+            'var _t2: DirB = (null!); ' +
+            'var _t1 = _t2; ' +
+            'var _t3: DirA = (null!); ' +
+            '_t3.inputA = (_t1); ' +
+            'var _t4 = _t3; ' +
+            '_t2.inputA = (_t4);');
+  });
+
+  it('should handle undeclared properties', () => {
+    const TEMPLATE = `<div dir [inputA]="foo"></div>`;
+    const DIRECTIVES: TestDeclaration[] = [{
+      type: 'directive',
+      name: 'Dir',
+      selector: '[dir]',
+      inputs: {
+        fieldA: 'inputA',
+      },
+      undeclaredInputFields: ['fieldA']
+    }];
+    const block = tcb(TEMPLATE, DIRECTIVES);
+    expect(block).not.toContain('var _t1: Dir = (null!);');
+    expect(block).toContain('(((ctx).foo)); ');
+  });
+
+  it('should assign restricted properties to temp variables by default', () => {
+    const TEMPLATE = `<div dir [inputA]="foo"></div>`;
+    const DIRECTIVES: TestDeclaration[] = [{
+      type: 'directive',
+      name: 'Dir',
+      selector: '[dir]',
+      inputs: {
+        fieldA: 'inputA',
+      },
+      restrictedInputFields: ['fieldA']
+    }];
+    expect(tcb(TEMPLATE, DIRECTIVES))
+        .toContain(
+            'var _t1: Dir = (null!); ' +
+            'var _t2: typeof _t1["fieldA"] = (null!); ' +
+            '_t2 = (((ctx).foo)); ');
+  });
+
+  it('should assign properties via element access for field names that are not JS identifiers',
+     () => {
+       const TEMPLATE = `<div dir [inputA]="foo"></div>`;
+       const DIRECTIVES: TestDeclaration[] = [{
+         type: 'directive',
+         name: 'Dir',
+         selector: '[dir]',
+         inputs: {
+           'some-input.xs': 'inputA',
+         },
+         stringLiteralInputFields: ['some-input.xs'],
+       }];
+       const block = tcb(TEMPLATE, DIRECTIVES);
+       expect(block).toContain(
+           'var _t1: Dir = (null!); ' +
+           '_t1["some-input.xs"] = (((ctx).foo)); ');
+     });
+
+  it('should handle a single property bound to multiple fields', () => {
+    const TEMPLATE = `<div dir [inputA]="foo"></div>`;
+    const DIRECTIVES: TestDeclaration[] = [{
+      type: 'directive',
+      name: 'Dir',
+      selector: '[dir]',
+      inputs: {
+        field1: 'inputA',
+        field2: 'inputA',
+      },
+    }];
+    expect(tcb(TEMPLATE, DIRECTIVES))
+        .toContain(
+            'var _t1: Dir = (null!); ' +
+            '_t1.field2 = _t1.field1 = (((ctx).foo));');
+  });
+
+  it('should handle a single property bound to multiple fields, where one of them is coerced',
+     () => {
+       const TEMPLATE = `<div dir [inputA]="foo"></div>`;
+       const DIRECTIVES: TestDeclaration[] = [{
+         type: 'directive',
+         name: 'Dir',
+         selector: '[dir]',
+         inputs: {
+           field1: 'inputA',
+           field2: 'inputA',
+         },
+         coercedInputFields: ['field1'],
+       }];
+       expect(tcb(TEMPLATE, DIRECTIVES))
+           .toContain(
+               'var _t1: typeof Dir.ngAcceptInputType_field1 = (null!); ' +
+               'var _t2: Dir = (null!); ' +
+               '_t2.field2 = _t1 = (((ctx).foo));');
+     });
+
+  it('should handle a single property bound to multiple fields, where one of them is undeclared',
+     () => {
+       const TEMPLATE = `<div dir [inputA]="foo"></div>`;
+       const DIRECTIVES: TestDeclaration[] = [{
+         type: 'directive',
+         name: 'Dir',
+         selector: '[dir]',
+         inputs: {
+           field1: 'inputA',
+           field2: 'inputA',
+         },
+         undeclaredInputFields: ['field1'],
+       }];
+       expect(tcb(TEMPLATE, DIRECTIVES))
+           .toContain(
+               'var _t1: Dir = (null!); ' +
+               '_t1.field2 = (((ctx).foo));');
+     });
+
+  it('should use coercion types if declared', () => {
+    const TEMPLATE = `<div dir [inputA]="foo"></div>`;
+    const DIRECTIVES: TestDeclaration[] = [{
+      type: 'directive',
+      name: 'Dir',
+      selector: '[dir]',
+      inputs: {
+        fieldA: 'inputA',
+      },
+      coercedInputFields: ['fieldA'],
+    }];
+    const block = tcb(TEMPLATE, DIRECTIVES);
+    expect(block).not.toContain('var _t1: Dir = (null!);');
+    expect(block).toContain(
+        'var _t1: typeof Dir.ngAcceptInputType_fieldA = (null!); ' +
+        '_t1 = (((ctx).foo));');
+  });
+
+  it('should use coercion types if declared, even when backing field is not declared', () => {
+    const TEMPLATE = `<div dir [inputA]="foo"></div>`;
+    const DIRECTIVES: TestDeclaration[] = [{
+      type: 'directive',
+      name: 'Dir',
+      selector: '[dir]',
+      inputs: {
+        fieldA: 'inputA',
+      },
+      coercedInputFields: ['fieldA'],
+      undeclaredInputFields: ['fieldA'],
+    }];
+    const block = tcb(TEMPLATE, DIRECTIVES);
+    expect(block).not.toContain('var _t1: Dir = (null!);');
+    expect(block).toContain(
+        'var _t1: typeof Dir.ngAcceptInputType_fieldA = (null!); ' +
+        '_t1 = (((ctx).foo));');
   });
 
   it('should handle $any casts', () => {
     const TEMPLATE = `{{$any(a)}}`;
     const block = tcb(TEMPLATE);
-    expect(block).toContain('(((ctx).a) as any);');
+    expect(block).toContain('(((ctx).a) as any)');
   });
 
   describe('experimental DOM checking via lib.dom.d.ts', () => {
@@ -245,7 +605,7 @@ describe('type check blocks', () => {
           type: 'invocation',
         }]
       }];
-      const TEMPLATE = `<div *ngIf="person"></div>`;
+      const TEMPLATE = `<div *ngIf="person">{{person.name}}</div>`;
       const block = tcb(TEMPLATE, DIRECTIVES);
       expect(block).toContain('if (NgIf.ngTemplateGuard_ngIf(_t1, ((ctx).person)))');
     });
@@ -261,10 +621,26 @@ describe('type check blocks', () => {
           type: 'binding',
         }]
       }];
-      const TEMPLATE = `<div *ngIf="person !== null"></div>`;
+      const TEMPLATE = `<div *ngIf="person !== null">{{person.name}}</div>`;
       const block = tcb(TEMPLATE, DIRECTIVES);
       expect(block).toContain('if ((((ctx).person)) !== (null))');
     });
+
+    it('should not emit guards when the child scope is empty', () => {
+      const DIRECTIVES: TestDeclaration[] = [{
+        type: 'directive',
+        name: 'NgIf',
+        selector: '[ngIf]',
+        inputs: {'ngIf': 'ngIf'},
+        ngTemplateGuards: [{
+          inputName: 'ngIf',
+          type: 'invocation',
+        }]
+      }];
+      const TEMPLATE = `<div *ngIf="person">static</div>`;
+      const block = tcb(TEMPLATE, DIRECTIVES);
+      expect(block).not.toContain('NgIf.ngTemplateGuard_ngIf');
+    });
   });
 
   describe('outputs', () => {
@@ -278,7 +654,7 @@ describe('type check blocks', () => {
       const TEMPLATE = `<div dir (dirOutput)="foo($event)"></div>`;
       const block = tcb(TEMPLATE, DIRECTIVES);
       expect(block).toContain(
-          '_outputHelper(_t2["outputField"]).subscribe(function ($event): any { (ctx).foo($event); });');
+          '_outputHelper(_t1["outputField"]).subscribe(function ($event): any { (ctx).foo($event); });');
     });
 
     it('should emit a listener function with AnimationEvent for animation events', () => {
@@ -324,7 +700,9 @@ describe('type check blocks', () => {
       applyTemplateContextGuards: true,
       checkQueries: false,
       checkTemplateBodies: true,
+      alwaysCheckSchemaInTemplateBodies: true,
       checkTypeOfInputBindings: true,
+      honorAccessModifiersForInputBindings: false,
       strictNullInputBindings: true,
       checkTypeOfAttributes: true,
       checkTypeOfDomBindings: false,
@@ -337,10 +715,11 @@ describe('type check blocks', () => {
       strictSafeNavigationTypes: true,
       useContextGenericType: true,
       strictLiteralTypes: true,
+      enableTemplateTypeChecker: false,
     };
 
     describe('config.applyTemplateContextGuards', () => {
-      const TEMPLATE = `<div *dir></div>`;
+      const TEMPLATE = `<div *dir>{{ value }}</div>`;
       const GUARD_APPLIED = 'if (Dir.ngTemplateContextGuard(';
 
       it('should apply template context guards when enabled', () => {
@@ -356,16 +735,27 @@ describe('type check blocks', () => {
     });
 
     describe('config.checkTemplateBodies', () => {
-      const TEMPLATE = `<ng-template>{{a}}</ng-template>`;
+      const TEMPLATE = `<ng-template #ref>{{a}}</ng-template>{{ref}}`;
 
       it('should descend into template bodies when enabled', () => {
         const block = tcb(TEMPLATE, DIRECTIVES);
-        expect(block).toContain('((ctx).a);');
+        expect(block).toContain('((ctx).a)');
       });
       it('should not descend into template bodies when disabled', () => {
         const DISABLED_CONFIG: TypeCheckingConfig = {...BASE_CONFIG, checkTemplateBodies: false};
         const block = tcb(TEMPLATE, DIRECTIVES, DISABLED_CONFIG);
-        expect(block).not.toContain('((ctx).a);');
+        expect(block).not.toContain('((ctx).a)');
+      });
+
+      it('generates a references var when enabled', () => {
+        const block = tcb(TEMPLATE, DIRECTIVES);
+        expect(block).toContain('var _t2 = (_t1 as any as core.TemplateRef<any>);');
+      });
+
+      it('generates a reference var when disabled', () => {
+        const DISABLED_CONFIG: TypeCheckingConfig = {...BASE_CONFIG, checkTemplateBodies: false};
+        const block = tcb(TEMPLATE, DIRECTIVES, DISABLED_CONFIG);
+        expect(block).toContain('var _t2 = (_t1 as any as core.TemplateRef<any>);');
       });
     });
 
@@ -374,14 +764,14 @@ describe('type check blocks', () => {
 
       it('should include null and undefined when enabled', () => {
         const block = tcb(TEMPLATE, DIRECTIVES);
-        expect(block).toContain('Dir.ngTypeCtor({ "dirInput": (((ctx).a)) })');
+        expect(block).toContain('_t1.dirInput = (((ctx).a));');
         expect(block).toContain('((ctx).b);');
       });
       it('should use the non-null assertion operator when disabled', () => {
         const DISABLED_CONFIG:
             TypeCheckingConfig = {...BASE_CONFIG, strictNullInputBindings: false};
         const block = tcb(TEMPLATE, DIRECTIVES, DISABLED_CONFIG);
-        expect(block).toContain('Dir.ngTypeCtor({ "dirInput": (((ctx).a)!) })');
+        expect(block).toContain('_t1.dirInput = (((ctx).a)!);');
         expect(block).toContain('((ctx).b)!;');
       });
     });
@@ -390,7 +780,7 @@ describe('type check blocks', () => {
       it('should check types of bindings when enabled', () => {
         const TEMPLATE = `<div dir [dirInput]="a" [nonDirInput]="b"></div>`;
         const block = tcb(TEMPLATE, DIRECTIVES);
-        expect(block).toContain('Dir.ngTypeCtor({ "dirInput": (((ctx).a)) })');
+        expect(block).toContain('_t1.dirInput = (((ctx).a));');
         expect(block).toContain('((ctx).b);');
       });
 
@@ -399,7 +789,7 @@ describe('type check blocks', () => {
         const DISABLED_CONFIG:
             TypeCheckingConfig = {...BASE_CONFIG, checkTypeOfInputBindings: false};
         const block = tcb(TEMPLATE, DIRECTIVES, DISABLED_CONFIG);
-        expect(block).toContain('Dir.ngTypeCtor({ "dirInput": ((((ctx).a) as any)) })');
+        expect(block).toContain('_t1.dirInput = ((((ctx).a) as any));');
         expect(block).toContain('(((ctx).b) as any);');
       });
 
@@ -408,8 +798,7 @@ describe('type check blocks', () => {
         const DISABLED_CONFIG:
             TypeCheckingConfig = {...BASE_CONFIG, checkTypeOfInputBindings: false};
         const block = tcb(TEMPLATE, DIRECTIVES, DISABLED_CONFIG);
-        expect(block).toContain(
-            'Dir.ngTypeCtor({ "dirInput": ((((((ctx).a)) === (((ctx).b))) as any)) })');
+        expect(block).toContain('_t1.dirInput = ((((((ctx).a)) === (((ctx).b))) as any));');
       });
     });
 
@@ -419,9 +808,9 @@ describe('type check blocks', () => {
       it('should check types of directive outputs when enabled', () => {
         const block = tcb(TEMPLATE, DIRECTIVES);
         expect(block).toContain(
-            '_outputHelper(_t2["outputField"]).subscribe(function ($event): any { (ctx).foo($event); });');
+            '_outputHelper(_t1["outputField"]).subscribe(function ($event): any { (ctx).foo($event); });');
         expect(block).toContain(
-            '_t1.addEventListener("nonDirOutput", function ($event): any { (ctx).foo($event); });');
+            '_t2.addEventListener("nonDirOutput", function ($event): any { (ctx).foo($event); });');
       });
       it('should not check types of directive outputs when disabled', () => {
         const DISABLED_CONFIG:
@@ -456,9 +845,9 @@ describe('type check blocks', () => {
       it('should check types of DOM events when enabled', () => {
         const block = tcb(TEMPLATE, DIRECTIVES);
         expect(block).toContain(
-            '_outputHelper(_t2["outputField"]).subscribe(function ($event): any { (ctx).foo($event); });');
+            '_outputHelper(_t1["outputField"]).subscribe(function ($event): any { (ctx).foo($event); });');
         expect(block).toContain(
-            '_t1.addEventListener("nonDirOutput", function ($event): any { (ctx).foo($event); });');
+            '_t2.addEventListener("nonDirOutput", function ($event): any { (ctx).foo($event); });');
       });
       it('should not check types of DOM events when disabled', () => {
         const DISABLED_CONFIG: TypeCheckingConfig = {...BASE_CONFIG, checkTypeOfDomEvents: false};
@@ -466,7 +855,7 @@ describe('type check blocks', () => {
         // Note that directive outputs are still checked, that is controlled by
         // `checkTypeOfOutputEvents`
         expect(block).toContain(
-            '_outputHelper(_t2["outputField"]).subscribe(function ($event): any { (ctx).foo($event); });');
+            '_outputHelper(_t1["outputField"]).subscribe(function ($event): any { (ctx).foo($event); });');
         expect(block).toContain('function ($event: any): any { (ctx).foo($event); }');
       });
     });
@@ -483,7 +872,9 @@ describe('type check blocks', () => {
         const DISABLED_CONFIG:
             TypeCheckingConfig = {...BASE_CONFIG, checkTypeOfDomReferences: false};
         const block = tcb(TEMPLATE, [], DISABLED_CONFIG);
-        expect(block).toContain('(null as any).value');
+        expect(block).toContain(
+            'var _t1 = (_t2 as any); ' +
+            '"" + (((_t1).value));');
       });
     });
 
@@ -502,19 +893,23 @@ describe('type check blocks', () => {
 
       it('should trace references to a directive when enabled', () => {
         const block = tcb(TEMPLATE, DIRECTIVES);
-        expect(block).toContain('(_t2).value');
+        expect(block).toContain('(_t1).value');
       });
 
       it('should trace references to an <ng-template> when enabled', () => {
         const block = tcb(TEMPLATE, DIRECTIVES);
-        expect(block).toContain('((null as any as core.TemplateRef<any>)).value2');
+        expect(block).toContain(
+            'var _t4 = (_t3 as any as core.TemplateRef<any>); ' +
+            '"" + (((_t4).value2));');
       });
 
       it('should use any for reference types when disabled', () => {
         const DISABLED_CONFIG:
             TypeCheckingConfig = {...BASE_CONFIG, checkTypeOfNonDomReferences: false};
         const block = tcb(TEMPLATE, DIRECTIVES, DISABLED_CONFIG);
-        expect(block).toContain('(null as any).value');
+        expect(block).toContain(
+            'var _t1 = (_t2 as any); ' +
+            '"" + (((_t1).value));');
       });
     });
 
@@ -529,17 +924,17 @@ describe('type check blocks', () => {
 
       it('should assign string value to the input when enabled', () => {
         const block = tcb(TEMPLATE, DIRECTIVES);
-        expect(block).toContain('"disabled": ("")');
-        expect(block).toContain('"cols": ("3")');
-        expect(block).toContain('"rows": (2)');
+        expect(block).toContain('_t1.disabled = ("");');
+        expect(block).toContain('_t1.cols = ("3");');
+        expect(block).toContain('_t1.rows = (2);');
       });
 
       it('should use any for attributes but still check bound attributes when disabled', () => {
         const DISABLED_CONFIG: TypeCheckingConfig = {...BASE_CONFIG, checkTypeOfAttributes: false};
         const block = tcb(TEMPLATE, DIRECTIVES, DISABLED_CONFIG);
-        expect(block).toContain('"disabled": (null as any)');
-        expect(block).toContain('"cols": (null as any)');
-        expect(block).toContain('"rows": (2)');
+        expect(block).not.toContain('"disabled"');
+        expect(block).not.toContain('"cols"');
+        expect(block).toContain('_t1.rows = (2);');
       });
     });
 
@@ -553,12 +948,12 @@ describe('type check blocks', () => {
 
       it('should check types of pipes when enabled', () => {
         const block = tcb(TEMPLATE, PIPES);
-        expect(block).toContain('(null as TestPipe).transform(((ctx).a), ((ctx).b), ((ctx).c));');
+        expect(block).toContain('(null as TestPipe).transform(((ctx).a), ((ctx).b), ((ctx).c))');
       });
       it('should not check types of pipes when disabled', () => {
         const DISABLED_CONFIG: TypeCheckingConfig = {...BASE_CONFIG, checkTypeOfPipes: false};
         const block = tcb(TEMPLATE, PIPES, DISABLED_CONFIG);
-        expect(block).toContain('(null as any).transform(((ctx).a), ((ctx).b), ((ctx).c));');
+        expect(block).toContain('(null as any).transform(((ctx).a), ((ctx).b), ((ctx).c))');
       });
     });
 
@@ -609,5 +1004,47 @@ describe('type check blocks', () => {
         expect(block).toContain('function Test_TCB(ctx: Test<any>)');
       });
     });
+
+    describe('config.checkAccessModifiersForInputBindings', () => {
+      const TEMPLATE = `<div dir [inputA]="foo"></div>`;
+
+      it('should assign restricted properties via element access for field names that are not JS identifiers',
+         () => {
+           const DIRECTIVES: TestDeclaration[] = [{
+             type: 'directive',
+             name: 'Dir',
+             selector: '[dir]',
+             inputs: {
+               'some-input.xs': 'inputA',
+             },
+             restrictedInputFields: ['some-input.xs'],
+             stringLiteralInputFields: ['some-input.xs'],
+           }];
+           const enableChecks:
+               TypeCheckingConfig = {...BASE_CONFIG, honorAccessModifiersForInputBindings: true};
+           const block = tcb(TEMPLATE, DIRECTIVES, enableChecks);
+           expect(block).toContain(
+               'var _t1: Dir = (null!); ' +
+               '_t1["some-input.xs"] = (((ctx).foo)); ');
+         });
+
+      it('should assign restricted properties via property access', () => {
+        const DIRECTIVES: TestDeclaration[] = [{
+          type: 'directive',
+          name: 'Dir',
+          selector: '[dir]',
+          inputs: {
+            fieldA: 'inputA',
+          },
+          restrictedInputFields: ['fieldA']
+        }];
+        const enableChecks:
+            TypeCheckingConfig = {...BASE_CONFIG, honorAccessModifiersForInputBindings: true};
+        const block = tcb(TEMPLATE, DIRECTIVES, enableChecks);
+        expect(block).toContain(
+            'var _t1: Dir = (null!); ' +
+            '_t1.fieldA = (((ctx).foo)); ');
+      });
+    });
   });
 });
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/test/type_checker__completion_spec.ts b/packages/compiler-cli/src/ngtsc/typecheck/test/type_checker__completion_spec.ts
new file mode 100644
index 0000000000000..f9364d787b994
--- /dev/null
+++ b/packages/compiler-cli/src/ngtsc/typecheck/test/type_checker__completion_spec.ts
@@ -0,0 +1,138 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {TmplAstTemplate} from '@angular/compiler';
+import * as ts from 'typescript';
+
+import {absoluteFrom, getSourceFileOrError} from '../../file_system';
+import {runInEachFileSystem} from '../../file_system/testing';
+import {getTokenAtPosition} from '../../util/src/typescript';
+import {CompletionKind, TypeCheckingConfig} from '../api';
+
+import {getClass, setup as baseTestSetup, TypeCheckingTarget} from './test_utils';
+
+runInEachFileSystem(() => {
+  describe('TemplateTypeChecker.getGlobalCompletions()', () => {
+    it('should return a completion point in the TCB for the component context', () => {
+      const MAIN_TS = absoluteFrom('/main.ts');
+      const {templateTypeChecker, programStrategy} = setup([
+        {
+          fileName: MAIN_TS,
+          templates: {'SomeCmp': `No special template needed`},
+          source: `
+            export class SomeCmp {}
+          `,
+        },
+      ]);
+      const sf = getSourceFileOrError(programStrategy.getProgram(), MAIN_TS);
+      const SomeCmp = getClass(sf, 'SomeCmp');
+
+      const [global, ...rest] =
+          templateTypeChecker.getGlobalCompletions(/* root template */ null, SomeCmp);
+      expect(rest.length).toBe(0);
+      if (global.kind !== CompletionKind.ContextComponent) {
+        return fail(`Expected a ContextComponent completion`);
+      }
+      const tcbSf =
+          getSourceFileOrError(programStrategy.getProgram(), absoluteFrom(global.shimPath));
+      const node = getTokenAtPosition(tcbSf, global.positionInShimFile).parent;
+      if (!ts.isExpressionStatement(node)) {
+        return fail(`Expected a ts.ExpressionStatement`);
+      }
+      expect(node.expression.getText()).toEqual('ctx.');
+      // The position should be between the '.' and a following space.
+      expect(tcbSf.text.substr(global.positionInShimFile - 1, 2)).toEqual('. ');
+    });
+
+    it('should return additional completions for references and variables when available', () => {
+      const MAIN_TS = absoluteFrom('/main.ts');
+      const {templateTypeChecker, programStrategy} = setup([
+        {
+          fileName: MAIN_TS,
+          templates: {
+            'SomeCmp': `
+              <div *ngFor="let user of users">
+                <div #innerRef></div>
+                <div *ngIf="user">
+                  <div #notInScope></div>
+                </div>
+              </div>
+              <div #topLevelRef></div>
+          `
+          },
+          source: `
+            export class SomeCmp {
+              users: string[];
+            }
+          `,
+        },
+      ]);
+      const sf = getSourceFileOrError(programStrategy.getProgram(), MAIN_TS);
+      const SomeCmp = getClass(sf, 'SomeCmp');
+
+      const tmpl = templateTypeChecker.getTemplate(SomeCmp)!;
+      const ngForTemplate = tmpl[0] as TmplAstTemplate;
+
+      const [contextCmp, ...rest] =
+          templateTypeChecker.getGlobalCompletions(ngForTemplate, SomeCmp);
+      if (contextCmp.kind !== CompletionKind.ContextComponent) {
+        return fail(`Expected first completion to be a ContextComponent`);
+      }
+
+      const completionKeys: string[] = [];
+      for (const completion of rest) {
+        if (completion.kind !== CompletionKind.Reference &&
+            completion.kind !== CompletionKind.Variable) {
+          return fail(`Unexpected CompletionKind, expected a Reference or Variable`);
+        }
+        completionKeys.push(completion.node.name);
+      }
+
+      expect(new Set(completionKeys)).toEqual(new Set(['innerRef', 'user', 'topLevelRef']));
+    });
+
+    it('should support shadowing between outer and inner templates  ', () => {
+      const MAIN_TS = absoluteFrom('/main.ts');
+      const {templateTypeChecker, programStrategy} = setup([
+        {
+          fileName: MAIN_TS,
+          templates: {
+            'SomeCmp': `
+              <div *ngFor="let user of users">
+                Within this template, 'user' should be a variable, not a reference.
+              </div>
+              <div #user>Out here, 'user' is the reference.</div>
+          `
+          },
+          source: `
+            export class SomeCmp {
+              users: string[];
+            }
+          `,
+        },
+      ]);
+      const sf = getSourceFileOrError(programStrategy.getProgram(), MAIN_TS);
+      const SomeCmp = getClass(sf, 'SomeCmp');
+
+      const tmpl = templateTypeChecker.getTemplate(SomeCmp)!;
+      const ngForTemplate = tmpl[0] as TmplAstTemplate;
+
+      const [_a, userAtTopLevel] =
+          templateTypeChecker.getGlobalCompletions(/* root template */ null, SomeCmp);
+      const [_b, userInNgFor] = templateTypeChecker.getGlobalCompletions(ngForTemplate, SomeCmp);
+
+      expect(userAtTopLevel.kind).toBe(CompletionKind.Reference);
+      expect(userInNgFor.kind).toBe(CompletionKind.Variable);
+    });
+  });
+});
+
+function setup(targets: TypeCheckingTarget[], config?: Partial<TypeCheckingConfig>) {
+  return baseTestSetup(
+      targets, {inlining: false, config: {...config, enableTemplateTypeChecker: true}});
+}
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/test/type_checker__get_symbol_of_template_node_spec.ts b/packages/compiler-cli/src/ngtsc/typecheck/test/type_checker__get_symbol_of_template_node_spec.ts
new file mode 100644
index 0000000000000..1deb4dc9a9780
--- /dev/null
+++ b/packages/compiler-cli/src/ngtsc/typecheck/test/type_checker__get_symbol_of_template_node_spec.ts
@@ -0,0 +1,1445 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {ASTWithSource, Binary, BindingPipe, Conditional, Interpolation, PropertyRead, TmplAstBoundAttribute, TmplAstBoundText, TmplAstElement, TmplAstNode, TmplAstReference, TmplAstTemplate} from '@angular/compiler';
+import * as ts from 'typescript';
+
+import {absoluteFrom, getSourceFileOrError} from '../../file_system';
+import {runInEachFileSystem} from '../../file_system/testing';
+import {ClassDeclaration} from '../../reflection';
+import {DirectiveSymbol, DomBindingSymbol, ElementSymbol, ExpressionSymbol, InputBindingSymbol, OutputBindingSymbol, ReferenceSymbol, Symbol, SymbolKind, TemplateSymbol, TemplateTypeChecker, TypeCheckingConfig, VariableSymbol} from '../api';
+
+import {getClass, ngForDeclaration, ngForTypeCheckTarget, setup as baseTestSetup, TypeCheckingTarget} from './test_utils';
+
+runInEachFileSystem(() => {
+  describe('TemplateTypeChecker.getSymbolOfNode', () => {
+    it('should get a symbol for regular attributes', () => {
+      const fileName = absoluteFrom('/main.ts');
+      const templateString = `<div id="helloWorld"></div>`;
+      const {templateTypeChecker, program} = setup(
+          [
+            {
+              fileName,
+              templates: {'Cmp': templateString},
+              source: `export class Cmp {}`,
+            },
+          ],
+      );
+      const sf = getSourceFileOrError(program, fileName);
+      const cmp = getClass(sf, 'Cmp');
+      const {attributes} = getAstElements(templateTypeChecker, cmp)[0];
+
+      const symbol = templateTypeChecker.getSymbolOfNode(attributes[0], cmp)!;
+      assertDomBindingSymbol(symbol);
+      assertElementSymbol(symbol.host);
+    });
+
+    it('should get a symbol for text attributes corresponding with a directive input', () => {
+      const fileName = absoluteFrom('/main.ts');
+      const dirFile = absoluteFrom('/dir.ts');
+      const templateString = `<div name="helloWorld"></div>`;
+      const {templateTypeChecker, program} = setup(
+          [
+            {
+              fileName,
+              templates: {'Cmp': templateString},
+              declarations: [{
+                name: 'NameDiv',
+                selector: 'div[name]',
+                file: dirFile,
+                type: 'directive',
+                inputs: {name: 'name'},
+              }]
+            },
+            {
+              fileName: dirFile,
+              source: `export class NameDiv {name!: string;}`,
+              templates: {},
+            }
+          ],
+      );
+      const sf = getSourceFileOrError(program, fileName);
+      const cmp = getClass(sf, 'Cmp');
+      const {attributes} = getAstElements(templateTypeChecker, cmp)[0];
+
+      const symbol = templateTypeChecker.getSymbolOfNode(attributes[0], cmp)!;
+      assertInputBindingSymbol(symbol);
+      expect(
+          (symbol.bindings[0].tsSymbol!.declarations[0] as ts.PropertyDeclaration).name.getText())
+          .toEqual('name');
+    });
+
+    describe('templates', () => {
+      describe('ng-templates', () => {
+        let templateTypeChecker: TemplateTypeChecker;
+        let cmp: ClassDeclaration<ts.ClassDeclaration>;
+        let templateNode: TmplAstTemplate;
+        let program: ts.Program;
+
+        beforeEach(() => {
+          const fileName = absoluteFrom('/main.ts');
+          const dirFile = absoluteFrom('/dir.ts');
+          const templateString = `
+              <ng-template dir #ref0 #ref1="dir" let-contextFoo="bar">
+                <div [input0]="contextFoo" [input1]="ref0" [input2]="ref1"></div>
+              </ng-template>`;
+          const testValues = setup([
+            {
+              fileName,
+              templates: {'Cmp': templateString},
+              source: `
+                    export class Cmp { }`,
+              declarations: [{
+                name: 'TestDir',
+                selector: '[dir]',
+                file: dirFile,
+                type: 'directive',
+                exportAs: ['dir'],
+              }]
+            },
+            {
+              fileName: dirFile,
+              source: `export class TestDir {}`,
+              templates: {},
+            }
+          ]);
+          templateTypeChecker = testValues.templateTypeChecker;
+          program = testValues.program;
+          const sf = getSourceFileOrError(testValues.program, fileName);
+          cmp = getClass(sf, 'Cmp');
+          templateNode = getAstTemplates(templateTypeChecker, cmp)[0];
+        });
+
+        it('should get symbol for variables at the declaration', () => {
+          const symbol = templateTypeChecker.getSymbolOfNode(templateNode.variables[0], cmp)!;
+          assertVariableSymbol(symbol);
+          expect(program.getTypeChecker().typeToString(symbol.tsType!)).toEqual('any');
+          expect(symbol.declaration.name).toEqual('contextFoo');
+        });
+
+        it('should get symbol for variables when used', () => {
+          const symbol = templateTypeChecker.getSymbolOfNode(
+              (templateNode.children[0] as TmplAstTemplate).inputs[0].value, cmp)!;
+          assertVariableSymbol(symbol);
+          expect(program.getTypeChecker().typeToString(symbol.tsType!)).toEqual('any');
+          expect(symbol.declaration.name).toEqual('contextFoo');
+        });
+
+        it('should get a symbol for local ref which refers to a directive', () => {
+          const symbol = templateTypeChecker.getSymbolOfNode(templateNode.references[1], cmp)!;
+          assertReferenceSymbol(symbol);
+          expect(program.getTypeChecker().symbolToString(symbol.tsSymbol)).toEqual('TestDir');
+          assertDirectiveReference(symbol);
+        });
+
+        it('should get a symbol for usage local ref which refers to a directive', () => {
+          const symbol = templateTypeChecker.getSymbolOfNode(
+              (templateNode.children[0] as TmplAstTemplate).inputs[2].value, cmp)!;
+          assertReferenceSymbol(symbol);
+          expect(program.getTypeChecker().symbolToString(symbol.tsSymbol)).toEqual('TestDir');
+          assertDirectiveReference(symbol);
+        });
+
+        function assertDirectiveReference(symbol: ReferenceSymbol) {
+          expect(program.getTypeChecker().typeToString(symbol.tsType)).toEqual('TestDir');
+          expect((symbol.target as ts.ClassDeclaration).name!.getText()).toEqual('TestDir');
+          expect(symbol.declaration.name).toEqual('ref1');
+        }
+
+        it('should get a symbol for local ref which refers to the template', () => {
+          const symbol = templateTypeChecker.getSymbolOfNode(templateNode.references[0], cmp)!;
+          assertReferenceSymbol(symbol);
+          assertTemplateReference(symbol);
+        });
+
+        it('should get a symbol for usage local ref which refers to a template', () => {
+          const symbol = templateTypeChecker.getSymbolOfNode(
+              (templateNode.children[0] as TmplAstTemplate).inputs[1].value, cmp)!;
+          assertReferenceSymbol(symbol);
+          assertTemplateReference(symbol);
+        });
+
+        function assertTemplateReference(symbol: ReferenceSymbol) {
+          expect(program.getTypeChecker().typeToString(symbol.tsType)).toEqual('TemplateRef<any>');
+          expect((symbol.target as TmplAstTemplate).tagName).toEqual('ng-template');
+          expect(symbol.declaration.name).toEqual('ref0');
+        }
+
+        it('should get symbol for the template itself', () => {
+          const symbol = templateTypeChecker.getSymbolOfNode(templateNode, cmp)!;
+          assertTemplateSymbol(symbol);
+          expect(symbol.directives.length).toBe(1);
+          assertDirectiveSymbol(symbol.directives[0]);
+          expect(symbol.directives[0].tsSymbol.getName()).toBe('TestDir');
+        });
+      });
+
+      describe('structural directives', () => {
+        let templateTypeChecker: TemplateTypeChecker;
+        let cmp: ClassDeclaration<ts.ClassDeclaration>;
+        let templateNode: TmplAstTemplate;
+        let program: ts.Program;
+
+        beforeEach(() => {
+          const fileName = absoluteFrom('/main.ts');
+          const templateString = `
+              <div *ngFor="let user of users; let i = index;">
+                {{user.name}} {{user.streetNumber}}
+                <div [tabIndex]="i"></div>
+              </div>`;
+          const testValues = setup([
+            {
+              fileName,
+              templates: {'Cmp': templateString},
+              source: `
+            export interface User {
+              name: string;
+              streetNumber: number;
+            }
+            export class Cmp { users: User[]; }
+            `,
+              declarations: [ngForDeclaration()],
+            },
+            ngForTypeCheckTarget(),
+          ]);
+          templateTypeChecker = testValues.templateTypeChecker;
+          program = testValues.program;
+          const sf = getSourceFileOrError(testValues.program, fileName);
+          cmp = getClass(sf, 'Cmp');
+          templateNode = getAstTemplates(templateTypeChecker, cmp)[0];
+        });
+
+        it('should retrieve a symbol for an expression inside structural binding', () => {
+          const ngForOfBinding =
+              templateNode.templateAttrs.find(a => a.name === 'ngForOf')! as TmplAstBoundAttribute;
+          const symbol = templateTypeChecker.getSymbolOfNode(ngForOfBinding.value, cmp)!;
+          assertExpressionSymbol(symbol);
+          expect(program.getTypeChecker().symbolToString(symbol.tsSymbol!)).toEqual('users');
+          expect(program.getTypeChecker().typeToString(symbol.tsType)).toEqual('Array<User>');
+        });
+
+        it('should retrieve a symbol for property reads of implicit variable inside structural binding',
+           () => {
+             const boundText =
+                 (templateNode.children[0] as TmplAstElement).children[0] as TmplAstBoundText;
+             const interpolation = (boundText.value as ASTWithSource).ast as Interpolation;
+             const namePropRead = interpolation.expressions[0] as PropertyRead;
+             const streetNumberPropRead = interpolation.expressions[1] as PropertyRead;
+
+             const nameSymbol = templateTypeChecker.getSymbolOfNode(namePropRead, cmp)!;
+             assertExpressionSymbol(nameSymbol);
+             expect(program.getTypeChecker().symbolToString(nameSymbol.tsSymbol!)).toEqual('name');
+             expect(program.getTypeChecker().typeToString(nameSymbol.tsType)).toEqual('string');
+
+             const streetSymbol = templateTypeChecker.getSymbolOfNode(streetNumberPropRead, cmp)!;
+             assertExpressionSymbol(streetSymbol);
+             expect(program.getTypeChecker().symbolToString(streetSymbol.tsSymbol!))
+                 .toEqual('streetNumber');
+             expect(program.getTypeChecker().typeToString(streetSymbol.tsType)).toEqual('number');
+
+             const userSymbol = templateTypeChecker.getSymbolOfNode(namePropRead.receiver, cmp)!;
+             expectUserSymbol(userSymbol);
+           });
+
+        it('finds symbols for variables', () => {
+          const userVar = templateNode.variables.find(v => v.name === 'user')!;
+          const userSymbol = templateTypeChecker.getSymbolOfNode(userVar, cmp)!;
+          expectUserSymbol(userSymbol);
+
+          const iVar = templateNode.variables.find(v => v.name === 'i')!;
+          const iSymbol = templateTypeChecker.getSymbolOfNode(iVar, cmp)!;
+          expectIndexSymbol(iSymbol);
+        });
+
+        it('finds symbol when using a template variable', () => {
+          const innerElementNodes =
+              onlyAstElements((templateNode.children[0] as TmplAstElement).children);
+          const indexSymbol =
+              templateTypeChecker.getSymbolOfNode(innerElementNodes[0].inputs[0].value, cmp)!;
+          expectIndexSymbol(indexSymbol);
+        });
+
+        function expectUserSymbol(userSymbol: Symbol) {
+          assertVariableSymbol(userSymbol);
+          expect(userSymbol.tsSymbol!.escapedName).toContain('$implicit');
+          expect(userSymbol.tsSymbol!.declarations[0].parent!.getText())
+              .toContain('NgForOfContext');
+          expect(program.getTypeChecker().typeToString(userSymbol.tsType!)).toEqual('User');
+          expect((userSymbol).declaration).toEqual(templateNode.variables[0]);
+        }
+
+        function expectIndexSymbol(indexSymbol: Symbol) {
+          assertVariableSymbol(indexSymbol);
+          expect(indexSymbol.tsSymbol!.escapedName).toContain('index');
+          expect(indexSymbol.tsSymbol!.declarations[0].parent!.getText())
+              .toContain('NgForOfContext');
+          expect(program.getTypeChecker().typeToString(indexSymbol.tsType!)).toEqual('number');
+          expect((indexSymbol).declaration).toEqual(templateNode.variables[1]);
+        }
+      });
+    });
+
+    describe('for expressions', () => {
+      it('should get a symbol for a component property used in an input binding', () => {
+        const fileName = absoluteFrom('/main.ts');
+        const templateString = `<div [inputA]="helloWorld"></div>`;
+        const {templateTypeChecker, program} = setup([
+          {
+            fileName,
+            templates: {'Cmp': templateString},
+            source: `export class Cmp {helloWorld?: boolean;}`,
+          },
+        ]);
+        const sf = getSourceFileOrError(program, fileName);
+        const cmp = getClass(sf, 'Cmp');
+        const nodes = getAstElements(templateTypeChecker, cmp);
+
+        const symbol = templateTypeChecker.getSymbolOfNode(nodes[0].inputs[0].value, cmp)!;
+        assertExpressionSymbol(symbol);
+        expect(program.getTypeChecker().symbolToString(symbol.tsSymbol!)).toEqual('helloWorld');
+        expect(program.getTypeChecker().typeToString(symbol.tsType))
+            .toEqual('false | true | undefined');
+      });
+
+      it('should get a symbol for properties several levels deep', () => {
+        const fileName = absoluteFrom('/main.ts');
+        const templateString = `<div [inputA]="person.address.street"></div>`;
+        const {templateTypeChecker, program} = setup([
+          {
+            fileName,
+            templates: {'Cmp': templateString},
+            source: `
+              interface Address {
+                street: string;
+              }
+
+              interface Person {
+                address: Address;
+              }
+              export class Cmp {person?: Person;}
+            `,
+          },
+        ]);
+        const sf = getSourceFileOrError(program, fileName);
+        const cmp = getClass(sf, 'Cmp');
+        const nodes = getAstElements(templateTypeChecker, cmp);
+
+        const inputNode = nodes[0].inputs[0].value as ASTWithSource;
+
+        const symbol = templateTypeChecker.getSymbolOfNode(inputNode, cmp)!;
+        assertExpressionSymbol(symbol);
+        expect(program.getTypeChecker().symbolToString(symbol.tsSymbol!)).toEqual('street');
+        expect((symbol.tsSymbol!.declarations[0] as ts.PropertyDeclaration).parent.name!.getText())
+            .toEqual('Address');
+        expect(program.getTypeChecker().typeToString(symbol.tsType)).toEqual('string');
+
+        const personSymbol = templateTypeChecker.getSymbolOfNode(
+            ((inputNode.ast as PropertyRead).receiver as PropertyRead).receiver, cmp)!;
+        assertExpressionSymbol(personSymbol);
+        expect(program.getTypeChecker().symbolToString(personSymbol.tsSymbol!)).toEqual('person');
+        expect(program.getTypeChecker().typeToString(personSymbol.tsType))
+            .toEqual('Person | undefined');
+      });
+
+      describe('should get symbols for conditionals', () => {
+        let templateTypeChecker: TemplateTypeChecker;
+        let cmp: ClassDeclaration<ts.ClassDeclaration>;
+        let program: ts.Program;
+        let templateString: string;
+
+        beforeEach(() => {
+          const fileName = absoluteFrom('/main.ts');
+          templateString = `
+        <div [inputA]="person?.address?.street"></div>
+        <div [inputA]="person ? person.address : noPersonError"></div>
+        <div [inputA]="person?.speak()"></div>
+      `;
+          const testValues = setup(
+              [
+                {
+                  fileName,
+                  templates: {'Cmp': templateString},
+                  source: `
+              interface Address {
+                street: string;
+              }
+
+              interface Person {
+                address: Address;
+                speak(): string;
+              }
+              export class Cmp {person?: Person; noPersonError = 'no person'}
+            `,
+                },
+              ],
+          );
+          templateTypeChecker = testValues.templateTypeChecker;
+          program = testValues.program;
+          const sf = getSourceFileOrError(program, fileName);
+          cmp = getClass(sf, 'Cmp');
+        });
+
+        it('safe property reads', () => {
+          const nodes = getAstElements(templateTypeChecker, cmp);
+          const safePropertyRead = nodes[0].inputs[0].value as ASTWithSource;
+          const propReadSymbol = templateTypeChecker.getSymbolOfNode(safePropertyRead, cmp)!;
+          assertExpressionSymbol(propReadSymbol);
+          expect(program.getTypeChecker().symbolToString(propReadSymbol.tsSymbol!))
+              .toEqual('street');
+          expect((propReadSymbol.tsSymbol!.declarations[0] as ts.PropertyDeclaration)
+                     .parent.name!.getText())
+              .toEqual('Address');
+          expect(program.getTypeChecker().typeToString(propReadSymbol.tsType))
+              .toEqual('string | undefined');
+        });
+
+        it('safe method calls', () => {
+          const nodes = getAstElements(templateTypeChecker, cmp);
+          const safeMethodCall = nodes[2].inputs[0].value as ASTWithSource;
+          const methodCallSymbol = templateTypeChecker.getSymbolOfNode(safeMethodCall, cmp)!;
+          assertExpressionSymbol(methodCallSymbol);
+          expect(program.getTypeChecker().symbolToString(methodCallSymbol.tsSymbol!))
+              .toEqual('speak');
+          expect((methodCallSymbol.tsSymbol!.declarations[0] as ts.PropertyDeclaration)
+                     .parent.name!.getText())
+              .toEqual('Person');
+          expect(program.getTypeChecker().typeToString(methodCallSymbol.tsType))
+              .toEqual('string | undefined');
+        });
+
+        it('ternary expressions', () => {
+          const nodes = getAstElements(templateTypeChecker, cmp);
+
+          const ternary = (nodes[1].inputs[0].value as ASTWithSource).ast as Conditional;
+          const ternarySymbol = templateTypeChecker.getSymbolOfNode(ternary, cmp)!;
+          assertExpressionSymbol(ternarySymbol);
+          expect(ternarySymbol.tsSymbol).toBeNull();
+          expect(program.getTypeChecker().typeToString(ternarySymbol.tsType))
+              .toEqual('string | Address');
+          const addrSymbol = templateTypeChecker.getSymbolOfNode(ternary.trueExp, cmp)!;
+          assertExpressionSymbol(addrSymbol);
+          expect(program.getTypeChecker().symbolToString(addrSymbol.tsSymbol!)).toEqual('address');
+          expect(program.getTypeChecker().typeToString(addrSymbol.tsType)).toEqual('Address');
+
+          const noPersonSymbol = templateTypeChecker.getSymbolOfNode(ternary.falseExp, cmp)!;
+          assertExpressionSymbol(noPersonSymbol);
+          expect(program.getTypeChecker().symbolToString(noPersonSymbol.tsSymbol!))
+              .toEqual('noPersonError');
+          expect(program.getTypeChecker().typeToString(noPersonSymbol.tsType)).toEqual('string');
+        });
+      });
+
+      it('should get a symbol for function on a component used in an input binding', () => {
+        const fileName = absoluteFrom('/main.ts');
+        const templateString = `<div [inputA]="helloWorld"></div>`;
+        const {templateTypeChecker, program} = setup([
+          {
+            fileName,
+            templates: {'Cmp': templateString},
+            source: `
+            export class Cmp {
+              helloWorld() { return ''; }
+            }`,
+          },
+        ]);
+        const sf = getSourceFileOrError(program, fileName);
+        const cmp = getClass(sf, 'Cmp');
+        const nodes = getAstElements(templateTypeChecker, cmp);
+
+        const symbol = templateTypeChecker.getSymbolOfNode(nodes[0].inputs[0].value, cmp)!;
+        assertExpressionSymbol(symbol);
+        expect(program.getTypeChecker().symbolToString(symbol.tsSymbol!)).toEqual('helloWorld');
+        expect(program.getTypeChecker().typeToString(symbol.tsType)).toEqual('() => string');
+      });
+
+      it('should get a symbol for binary expressions', () => {
+        const fileName = absoluteFrom('/main.ts');
+        const templateString = `<div [inputA]="a + b"></div>`;
+        const {templateTypeChecker, program} = setup([
+          {
+            fileName,
+            templates: {'Cmp': templateString},
+            source: `
+            export class Cmp {
+              a!: string;
+              b!: number;
+            }`,
+          },
+        ]);
+        const sf = getSourceFileOrError(program, fileName);
+        const cmp = getClass(sf, 'Cmp');
+        const nodes = getAstElements(templateTypeChecker, cmp);
+
+        const valueAssignment = nodes[0].inputs[0].value as ASTWithSource;
+        const wholeExprSymbol = templateTypeChecker.getSymbolOfNode(valueAssignment, cmp)!;
+        assertExpressionSymbol(wholeExprSymbol);
+        expect(wholeExprSymbol.tsSymbol).toBeNull();
+        expect(program.getTypeChecker().typeToString(wholeExprSymbol.tsType)).toEqual('string');
+
+        const aSymbol =
+            templateTypeChecker.getSymbolOfNode((valueAssignment.ast as Binary).left, cmp)!;
+        assertExpressionSymbol(aSymbol);
+        expect(program.getTypeChecker().symbolToString(aSymbol.tsSymbol!)).toBe('a');
+        expect(program.getTypeChecker().typeToString(aSymbol.tsType)).toEqual('string');
+
+        const bSymbol =
+            templateTypeChecker.getSymbolOfNode((valueAssignment.ast as Binary).right, cmp)!;
+        assertExpressionSymbol(bSymbol);
+        expect(program.getTypeChecker().symbolToString(bSymbol.tsSymbol!)).toBe('b');
+        expect(program.getTypeChecker().typeToString(bSymbol.tsType)).toEqual('number');
+      });
+
+      it('should get symbol for local reference of an Element', () => {
+        const fileName = absoluteFrom('/main.ts');
+        const {templateTypeChecker, program} = setup([
+          {
+            fileName,
+            templates: {
+              'Cmp': `
+                  <input #myRef>
+                  <div [input]="myRef"></div>`
+            },
+          },
+        ]);
+        const sf = getSourceFileOrError(program, fileName);
+        const cmp = getClass(sf, 'Cmp');
+        const nodes = getAstElements(templateTypeChecker, cmp);
+
+        const refSymbol = templateTypeChecker.getSymbolOfNode(nodes[0].references[0], cmp)!;
+        assertReferenceSymbol(refSymbol);
+        expect((refSymbol.target as TmplAstElement).name).toEqual('input');
+        expect((refSymbol.declaration as TmplAstReference).name).toEqual('myRef');
+
+        const myRefUsage = templateTypeChecker.getSymbolOfNode(nodes[1].inputs[0].value, cmp)!;
+        assertReferenceSymbol(myRefUsage);
+        expect((myRefUsage.target as TmplAstElement).name).toEqual('input');
+        expect((myRefUsage.declaration as TmplAstReference).name).toEqual('myRef');
+      });
+
+      it('should get symbols for references which refer to directives', () => {
+        const fileName = absoluteFrom('/main.ts');
+        const dirFile = absoluteFrom('/dir.ts');
+        const templateString = `
+        <div dir #myDir1="dir"></div>
+        <div dir #myDir2="dir"></div>
+        <div [inputA]="myDir1.dirValue" [inputB]="myDir1"></div>
+        <div [inputA]="myDir2.dirValue" [inputB]="myDir2"></div>`;
+        const {templateTypeChecker, program} = setup([
+          {
+            fileName,
+            templates: {'Cmp': templateString},
+            declarations: [{
+              name: 'TestDir',
+              selector: '[dir]',
+              file: dirFile,
+              type: 'directive',
+              exportAs: ['dir'],
+            }]
+          },
+          {
+            fileName: dirFile,
+            source: `export class TestDir { dirValue = 'helloWorld' }`,
+            templates: {}
+          }
+        ]);
+        const sf = getSourceFileOrError(program, fileName);
+        const cmp = getClass(sf, 'Cmp');
+        const nodes = getAstElements(templateTypeChecker, cmp);
+
+        const ref1Declaration = templateTypeChecker.getSymbolOfNode(nodes[0].references[0], cmp)!;
+        assertReferenceSymbol(ref1Declaration);
+        expect((ref1Declaration.target as ts.ClassDeclaration).name!.getText()).toEqual('TestDir');
+        expect((ref1Declaration.declaration as TmplAstReference).name).toEqual('myDir1');
+
+        const ref2Declaration = templateTypeChecker.getSymbolOfNode(nodes[1].references[0], cmp)!;
+        assertReferenceSymbol(ref2Declaration);
+        expect((ref2Declaration.target as ts.ClassDeclaration).name!.getText()).toEqual('TestDir');
+        expect((ref2Declaration.declaration as TmplAstReference).name).toEqual('myDir2');
+
+        const dirValueSymbol = templateTypeChecker.getSymbolOfNode(nodes[2].inputs[0].value, cmp)!;
+        assertExpressionSymbol(dirValueSymbol);
+        expect(program.getTypeChecker().symbolToString(dirValueSymbol.tsSymbol!)).toBe('dirValue');
+        expect(program.getTypeChecker().typeToString(dirValueSymbol.tsType)).toEqual('string');
+
+        const dir1Symbol = templateTypeChecker.getSymbolOfNode(nodes[2].inputs[1].value, cmp)!;
+        assertReferenceSymbol(dir1Symbol);
+        expect((dir1Symbol.target as ts.ClassDeclaration).name!.getText()).toEqual('TestDir');
+        expect((dir1Symbol.declaration as TmplAstReference).name).toEqual('myDir1');
+
+        const dir2Symbol = templateTypeChecker.getSymbolOfNode(nodes[3].inputs[1].value, cmp)!;
+        assertReferenceSymbol(dir2Symbol);
+        expect((dir2Symbol.target as ts.ClassDeclaration).name!.getText()).toEqual('TestDir');
+        expect((dir2Symbol.declaration as TmplAstReference).name).toEqual('myDir2');
+      });
+
+      describe('literals', () => {
+        let templateTypeChecker: TemplateTypeChecker;
+        let cmp: ClassDeclaration<ts.ClassDeclaration>;
+        let interpolation: Interpolation;
+        let program: ts.Program;
+
+        beforeEach(() => {
+          const fileName = absoluteFrom('/main.ts');
+          const templateString = `
+          {{ [1, 2, 3] }}
+          {{ { hello: "world" } }}`;
+          const testValues = setup([
+            {
+              fileName,
+              templates: {'Cmp': templateString},
+              source: `export class Cmp {}`,
+            },
+          ]);
+          templateTypeChecker = testValues.templateTypeChecker;
+          program = testValues.program;
+          const sf = getSourceFileOrError(testValues.program, fileName);
+          cmp = getClass(sf, 'Cmp');
+          interpolation = ((templateTypeChecker.getTemplate(cmp)![0] as TmplAstBoundText).value as
+                           ASTWithSource)
+                              .ast as Interpolation;
+        });
+
+        it('literal array', () => {
+          const literalArray = interpolation.expressions[0];
+          const symbol = templateTypeChecker.getSymbolOfNode(literalArray, cmp)!;
+          assertExpressionSymbol(symbol);
+          expect(program.getTypeChecker().symbolToString(symbol.tsSymbol!)).toEqual('Array');
+          expect(program.getTypeChecker().typeToString(symbol.tsType)).toEqual('Array<number>');
+        });
+
+        it('literal map', () => {
+          const literalMap = interpolation.expressions[1];
+          const symbol = templateTypeChecker.getSymbolOfNode(literalMap, cmp)!;
+          assertExpressionSymbol(symbol);
+          expect(program.getTypeChecker().symbolToString(symbol.tsSymbol!)).toEqual('__object');
+          expect(program.getTypeChecker().typeToString(symbol.tsType))
+              .toEqual('{ hello: string; }');
+        });
+      });
+
+
+      describe('pipes', () => {
+        let templateTypeChecker: TemplateTypeChecker;
+        let cmp: ClassDeclaration<ts.ClassDeclaration>;
+        let binding: BindingPipe;
+        let program: ts.Program;
+
+        beforeEach(() => {
+          const fileName = absoluteFrom('/main.ts');
+          const templateString = `<div [inputA]="a | test:b:c"></div>`;
+          const testValues = setup([
+            {
+              fileName,
+              templates: {'Cmp': templateString},
+              source: `
+            export class Cmp { a: string; b: number; c: boolean }
+            export class TestPipe {
+              transform(value: string, repeat: number, commaSeparate: boolean): string[] {
+              }
+            }
+            `,
+              declarations: [{
+                type: 'pipe',
+                name: 'TestPipe',
+                pipeName: 'test',
+              }],
+            },
+          ]);
+          program = testValues.program;
+          templateTypeChecker = testValues.templateTypeChecker;
+          const sf = getSourceFileOrError(testValues.program, fileName);
+          cmp = getClass(sf, 'Cmp');
+          binding =
+              (getAstElements(templateTypeChecker, cmp)[0].inputs[0].value as ASTWithSource).ast as
+              BindingPipe;
+        });
+
+        it('should get symbol for pipe', () => {
+          const pipeSymbol = templateTypeChecker.getSymbolOfNode(binding, cmp)!;
+          assertExpressionSymbol(pipeSymbol);
+          expect(program.getTypeChecker().symbolToString(pipeSymbol.tsSymbol!))
+              .toEqual('transform');
+          expect(
+              (pipeSymbol.tsSymbol!.declarations[0].parent as ts.ClassDeclaration).name!.getText())
+              .toEqual('TestPipe');
+          expect(program.getTypeChecker().typeToString(pipeSymbol.tsType))
+              .toEqual('(value: string, repeat: number, commaSeparate: boolean) => string[]');
+        });
+
+        it('should get symbols for pipe expression and args', () => {
+          const aSymbol = templateTypeChecker.getSymbolOfNode(binding.exp, cmp)!;
+          assertExpressionSymbol(aSymbol);
+          expect(program.getTypeChecker().symbolToString(aSymbol.tsSymbol!)).toEqual('a');
+          expect(program.getTypeChecker().typeToString(aSymbol.tsType)).toEqual('string');
+
+          const bSymbol = templateTypeChecker.getSymbolOfNode(binding.args[0], cmp)!;
+          assertExpressionSymbol(bSymbol);
+          expect(program.getTypeChecker().symbolToString(bSymbol.tsSymbol!)).toEqual('b');
+          expect(program.getTypeChecker().typeToString(bSymbol.tsType)).toEqual('number');
+
+          const cSymbol = templateTypeChecker.getSymbolOfNode(binding.args[1], cmp)!;
+          assertExpressionSymbol(cSymbol);
+          expect(program.getTypeChecker().symbolToString(cSymbol.tsSymbol!)).toEqual('c');
+          expect(program.getTypeChecker().typeToString(cSymbol.tsType)).toEqual('boolean');
+        });
+      });
+
+
+      it('should get a symbol for PropertyWrite expressions', () => {
+        const fileName = absoluteFrom('/main.ts');
+        const {templateTypeChecker, program} = setup([
+          {
+            fileName,
+            templates: {'Cmp': '<div (output)="lastEvent = $event"></div>'},
+            source: `export class Cmp { lastEvent: any; }`
+          },
+        ]);
+        const sf = getSourceFileOrError(program, fileName);
+        const cmp = getClass(sf, 'Cmp');
+        const node = getAstElements(templateTypeChecker, cmp)[0];
+        const writeSymbol = templateTypeChecker.getSymbolOfNode(node.outputs[0].handler, cmp)!;
+        assertExpressionSymbol(writeSymbol);
+        // Note that the symbol returned is for the RHS of the PropertyWrite. The AST
+        // does not support specific designation for the RHS so we assume that's what
+        // is wanted in this case. We don't support retrieving a symbol for the whole
+        // expression and if you want to get a symbol for the '$event', you can
+        // use the `value` AST of the `PropertyWrite`.
+        expect(program.getTypeChecker().symbolToString(writeSymbol.tsSymbol!)).toEqual('lastEvent');
+        expect(program.getTypeChecker().typeToString(writeSymbol.tsType)).toEqual('any');
+      });
+
+      it('should get a symbol for MethodCall expressions', () => {
+        const fileName = absoluteFrom('/main.ts');
+        const {templateTypeChecker, program} = setup([
+          {
+            fileName,
+            templates: {'Cmp': '<div [input]="toString(123)"></div>'},
+            source: `export class Cmp { toString(v: any): string { return String(v); } }`
+          },
+        ]);
+        const sf = getSourceFileOrError(program, fileName);
+        const cmp = getClass(sf, 'Cmp');
+        const node = getAstElements(templateTypeChecker, cmp)[0];
+        const callSymbol = templateTypeChecker.getSymbolOfNode(node.inputs[0].value, cmp)!;
+        assertExpressionSymbol(callSymbol);
+        // Note that the symbol returned is for the method name of the MethodCall. The AST
+        // does not support specific designation for the name so we assume that's what
+        // is wanted in this case. We don't support retrieving a symbol for the whole
+        // call expression and if you want to get a symbol for the args, you can
+        // use the AST of the args in the `MethodCall`.
+        expect(program.getTypeChecker().symbolToString(callSymbol.tsSymbol!)).toEqual('toString');
+        expect(program.getTypeChecker().typeToString(callSymbol.tsType))
+            .toEqual('(v: any) => string');
+      });
+    });
+
+    describe('input bindings', () => {
+      it('can get a symbol for empty binding', () => {
+        const fileName = absoluteFrom('/main.ts');
+        const dirFile = absoluteFrom('/dir.ts');
+        const {program, templateTypeChecker} = setup([
+          {
+            fileName,
+            templates: {'Cmp': `<div dir [inputA]=""></div>`},
+            declarations: [{
+              name: 'TestDir',
+              selector: '[dir]',
+              file: dirFile,
+              type: 'directive',
+              inputs: {inputA: 'inputA'},
+            }]
+          },
+          {
+            fileName: dirFile,
+            source: `export class TestDir {inputA?: string; }`,
+            templates: {},
+          }
+        ]);
+        const sf = getSourceFileOrError(program, fileName);
+        const cmp = getClass(sf, 'Cmp');
+
+        const nodes = templateTypeChecker.getTemplate(cmp)!;
+
+        const inputAbinding = (nodes[0] as TmplAstElement).inputs[0];
+        const aSymbol = templateTypeChecker.getSymbolOfNode(inputAbinding, cmp)!;
+        assertInputBindingSymbol(aSymbol);
+        expect((aSymbol.bindings[0].tsSymbol!.declarations[0] as ts.PropertyDeclaration)
+                   .name.getText())
+            .toEqual('inputA');
+      });
+
+      it('can retrieve a symbol for an input binding', () => {
+        const fileName = absoluteFrom('/main.ts');
+        const dirFile = absoluteFrom('/dir.ts');
+        const templateString =
+            `<div dir [inputA]="'my input A'" [inputBRenamed]="'my inputB'"></div>`;
+        const {program, templateTypeChecker} = setup([
+          {
+            fileName,
+            templates: {'Cmp': templateString},
+            declarations: [{
+              name: 'TestDir',
+              selector: '[dir]',
+              file: dirFile,
+              type: 'directive',
+              inputs: {inputA: 'inputA', inputB: 'inputBRenamed'},
+            }]
+          },
+          {
+            fileName: dirFile,
+            source: `export class TestDir {inputA!: string; inputB!: string}`,
+            templates: {},
+          }
+        ]);
+        const sf = getSourceFileOrError(program, fileName);
+        const cmp = getClass(sf, 'Cmp');
+
+        const nodes = templateTypeChecker.getTemplate(cmp)!;
+
+        const inputAbinding = (nodes[0] as TmplAstElement).inputs[0];
+        const aSymbol = templateTypeChecker.getSymbolOfNode(inputAbinding, cmp)!;
+        assertInputBindingSymbol(aSymbol);
+        expect((aSymbol.bindings[0].tsSymbol!.declarations[0] as ts.PropertyDeclaration)
+                   .name.getText())
+            .toEqual('inputA');
+
+        const inputBbinding = (nodes[0] as TmplAstElement).inputs[1];
+        const bSymbol = templateTypeChecker.getSymbolOfNode(inputBbinding, cmp)!;
+        assertInputBindingSymbol(bSymbol);
+        expect((bSymbol.bindings[0].tsSymbol!.declarations[0] as ts.PropertyDeclaration)
+                   .name.getText())
+            .toEqual('inputB');
+      });
+
+      it('does not retrieve a symbol for an input when undeclared', () => {
+        const fileName = absoluteFrom('/main.ts');
+        const dirFile = absoluteFrom('/dir.ts');
+        const templateString = `<div dir [inputA]="'my input A'"></div>`;
+        const {program, templateTypeChecker} = setup([
+          {
+            fileName,
+            templates: {'Cmp': templateString},
+            declarations: [{
+              name: 'TestDir',
+              selector: '[dir]',
+              file: dirFile,
+              type: 'directive',
+              inputs: {inputA: 'inputA'},
+            }]
+          },
+          {
+            fileName: dirFile,
+            source: `export class TestDir {}`,
+            templates: {},
+          }
+        ]);
+        const sf = getSourceFileOrError(program, fileName);
+        const cmp = getClass(sf, 'Cmp');
+
+        const nodes = templateTypeChecker.getTemplate(cmp)!;
+
+        const inputAbinding = (nodes[0] as TmplAstElement).inputs[0];
+        const aSymbol = templateTypeChecker.getSymbolOfNode(inputAbinding, cmp)!;
+        expect(aSymbol).toBeNull();
+      });
+
+      it('can retrieve a symbol for an input of structural directive', () => {
+        const fileName = absoluteFrom('/main.ts');
+        const templateString = `<div *ngFor="let user of users"></div>`;
+        const {program, templateTypeChecker} = setup([
+          {fileName, templates: {'Cmp': templateString}, declarations: [ngForDeclaration()]},
+          ngForTypeCheckTarget(),
+        ]);
+        const sf = getSourceFileOrError(program, fileName);
+        const cmp = getClass(sf, 'Cmp');
+
+        const nodes = templateTypeChecker.getTemplate(cmp)!;
+
+        const ngForOfBinding =
+            (nodes[0] as TmplAstTemplate).templateAttrs.find(a => a.name === 'ngForOf')! as
+            TmplAstBoundAttribute;
+        const symbol = templateTypeChecker.getSymbolOfNode(ngForOfBinding, cmp)!;
+        assertInputBindingSymbol(symbol);
+        expect(
+            (symbol.bindings[0].tsSymbol!.declarations[0] as ts.PropertyDeclaration).name.getText())
+            .toEqual('ngForOf');
+      });
+
+      it('returns dom binding input binds only to the dom element', () => {
+        const fileName = absoluteFrom('/main.ts');
+        const templateString = `<div [name]="'my input'"></div>`;
+        const {program, templateTypeChecker} = setup([
+          {fileName, templates: {'Cmp': templateString}, declarations: []},
+        ]);
+        const sf = getSourceFileOrError(program, fileName);
+        const cmp = getClass(sf, 'Cmp');
+
+        const nodes = templateTypeChecker.getTemplate(cmp)!;
+        const binding = (nodes[0] as TmplAstElement).inputs[0];
+
+        const symbol = templateTypeChecker.getSymbolOfNode(binding, cmp)!;
+        assertDomBindingSymbol(symbol);
+        assertElementSymbol(symbol.host);
+      });
+
+      it('returns dom binding when directive members do not match the input', () => {
+        const fileName = absoluteFrom('/main.ts');
+        const dirFile = absoluteFrom('/dir.ts');
+        const templateString = `<div dir [inputA]="'my input A'"></div>`;
+        const {program, templateTypeChecker} = setup([
+          {
+            fileName,
+            templates: {'Cmp': templateString},
+            declarations: [{
+              name: 'TestDir',
+              selector: '[dir]',
+              file: dirFile,
+              type: 'directive',
+              inputs: {},
+            }]
+          },
+          {
+            fileName: dirFile,
+            source: `export class TestDir {}`,
+            templates: {},
+          }
+        ]);
+        const sf = getSourceFileOrError(program, fileName);
+        const cmp = getClass(sf, 'Cmp');
+
+        const nodes = templateTypeChecker.getTemplate(cmp)!;
+
+        const inputAbinding = (nodes[0] as TmplAstElement).inputs[0];
+        const symbol = templateTypeChecker.getSymbolOfNode(inputAbinding, cmp)!;
+        assertDomBindingSymbol(symbol);
+        assertElementSymbol(symbol.host);
+      });
+
+      it('can match binding when there are two directives', () => {
+        const fileName = absoluteFrom('/main.ts');
+        const dirFile = absoluteFrom('/dir.ts');
+        const templateString = `<div dir otherDir [inputA]="'my input A'"></div>`;
+        const {program, templateTypeChecker} = setup([
+          {
+            fileName,
+            templates: {'Cmp': templateString},
+            declarations: [
+              {
+                name: 'TestDir',
+                selector: '[dir]',
+                file: dirFile,
+                type: 'directive',
+                inputs: {inputA: 'inputA'},
+              },
+              {
+                name: 'OtherDir',
+                selector: '[otherDir]',
+                file: dirFile,
+                type: 'directive',
+                inputs: {},
+              }
+            ]
+          },
+          {
+            fileName: dirFile,
+            source: `
+              export class TestDir {inputA!: string;}
+              export class OtherDir {}
+              `,
+            templates: {},
+          }
+        ]);
+        const sf = getSourceFileOrError(program, fileName);
+        const cmp = getClass(sf, 'Cmp');
+
+        const nodes = templateTypeChecker.getTemplate(cmp)!;
+
+        const inputAbinding = (nodes[0] as TmplAstElement).inputs[0];
+        const symbol = templateTypeChecker.getSymbolOfNode(inputAbinding, cmp)!;
+        assertInputBindingSymbol(symbol);
+        expect(
+            (symbol.bindings[0].tsSymbol!.declarations[0] as ts.PropertyDeclaration).name.getText())
+            .toEqual('inputA');
+        expect((symbol.bindings[0].tsSymbol!.declarations[0] as ts.PropertyDeclaration)
+                   .parent.name?.text)
+            .toEqual('TestDir');
+      });
+
+      it('returns the first field match when directive maps same input to two fields', () => {
+        const fileName = absoluteFrom('/main.ts');
+        const dirFile = absoluteFrom('/dir.ts');
+        const {program, templateTypeChecker} = setup([
+          {
+            fileName,
+            templates: {'Cmp': `<div dir [inputA]="'my input A'"></div>`},
+            declarations: [
+              {
+                name: 'TestDir',
+                selector: '[dir]',
+                file: dirFile,
+                type: 'directive',
+                inputs: {inputA: 'inputA', otherInputA: 'inputA'},
+              },
+            ]
+          },
+          {
+            fileName: dirFile,
+            source: `
+              export class TestDir {inputA!: string; otherInputA!: string;}
+              `,
+            templates: {},
+          }
+        ]);
+        const sf = getSourceFileOrError(program, fileName);
+        const cmp = getClass(sf, 'Cmp');
+
+        const nodes = templateTypeChecker.getTemplate(cmp)!;
+
+        const inputAbinding = (nodes[0] as TmplAstElement).inputs[0];
+        const symbol = templateTypeChecker.getSymbolOfNode(inputAbinding, cmp)!;
+        assertInputBindingSymbol(symbol);
+        expect(
+            (symbol.bindings[0].tsSymbol!.declarations[0] as ts.PropertyDeclaration).name.getText())
+            .toEqual('otherInputA');
+        expect((symbol.bindings[0].tsSymbol!.declarations[0] as ts.PropertyDeclaration)
+                   .parent.name?.text)
+            .toEqual('TestDir');
+      });
+
+      it('returns the first directive match when two directives have the same input', () => {
+        const fileName = absoluteFrom('/main.ts');
+        const dirFile = absoluteFrom('/dir.ts');
+        const templateString = `<div dir otherDir [inputA]="'my input A'"></div>`;
+        const {program, templateTypeChecker} = setup([
+          {
+            fileName,
+            templates: {'Cmp': templateString},
+            declarations: [
+              {
+                name: 'TestDir',
+                selector: '[dir]',
+                file: dirFile,
+                type: 'directive',
+                inputs: {inputA: 'inputA'},
+              },
+              {
+                name: 'OtherDir',
+                selector: '[otherDir]',
+                file: dirFile,
+                type: 'directive',
+                inputs: {otherDirInputA: 'inputA'},
+              }
+            ]
+          },
+          {
+            fileName: dirFile,
+            source: `
+              export class TestDir {inputA!: string;}
+              export class OtherDir {otherDirInputA!: string;}
+              `,
+            templates: {},
+          }
+        ]);
+        const sf = getSourceFileOrError(program, fileName);
+        const cmp = getClass(sf, 'Cmp');
+
+        const nodes = templateTypeChecker.getTemplate(cmp)!;
+
+        const inputAbinding = (nodes[0] as TmplAstElement).inputs[0];
+        const symbol = templateTypeChecker.getSymbolOfNode(inputAbinding, cmp)!;
+        assertInputBindingSymbol(symbol);
+        expect(
+            (symbol.bindings[0].tsSymbol!.declarations[0] as ts.PropertyDeclaration).name.getText())
+            .toEqual('inputA');
+        expect((symbol.bindings[0].tsSymbol!.declarations[0] as ts.PropertyDeclaration)
+                   .parent.name?.text)
+            .toEqual('TestDir');
+      });
+    });
+
+    describe('output bindings', () => {
+      it('should find symbol for output binding', () => {
+        const fileName = absoluteFrom('/main.ts');
+        const dirFile = absoluteFrom('/dir.ts');
+        const templateString =
+            `<div dir (outputA)="handle($event)" (renamedOutputB)="handle($event)"></div>`;
+        const {program, templateTypeChecker} = setup([
+          {
+            fileName,
+            templates: {'Cmp': templateString},
+            declarations: [
+              {
+                name: 'TestDir',
+                selector: '[dir]',
+                file: dirFile,
+                type: 'directive',
+                outputs: {outputA: 'outputA', outputB: 'renamedOutputB'},
+              },
+            ]
+          },
+          {
+            fileName: dirFile,
+            source: `
+              export class TestDir {outputA!: EventEmitter<string>; outputB!: EventEmitter<string>}
+              `,
+            templates: {},
+          }
+        ]);
+        const sf = getSourceFileOrError(program, fileName);
+        const cmp = getClass(sf, 'Cmp');
+
+        const nodes = templateTypeChecker.getTemplate(cmp)!;
+
+        const outputABinding = (nodes[0] as TmplAstElement).outputs[0];
+        const aSymbol = templateTypeChecker.getSymbolOfNode(outputABinding, cmp)!;
+        assertOutputBindingSymbol(aSymbol);
+        expect((aSymbol.bindings[0].tsSymbol!.declarations[0] as ts.PropertyDeclaration)
+                   .name.getText())
+            .toEqual('outputA');
+
+        const outputBBinding = (nodes[0] as TmplAstElement).outputs[1];
+        const bSymbol = templateTypeChecker.getSymbolOfNode(outputBBinding, cmp)!;
+        assertOutputBindingSymbol(bSymbol);
+        expect((bSymbol.bindings[0].tsSymbol!.declarations[0] as ts.PropertyDeclaration)
+                   .name.getText())
+            .toEqual('outputB');
+      });
+
+      it('should find symbol for output binding when there are multiple directives', () => {
+        const fileName = absoluteFrom('/main.ts');
+        const dirFile = absoluteFrom('/dir.ts');
+        const {program, templateTypeChecker} = setup([
+          {
+            fileName,
+            templates: {'Cmp': `<div dir otherdir (outputA)="handle($event)"></div>`},
+            declarations: [
+              {
+                name: 'TestDir',
+                selector: '[dir]',
+                file: dirFile,
+                type: 'directive',
+                outputs: {outputA: 'outputA'},
+              },
+              {
+                name: 'OtherDir',
+                selector: '[otherdir]',
+                file: dirFile,
+                type: 'directive',
+                outputs: {unusedOutput: 'unusedOutput'},
+              },
+            ]
+          },
+          {
+            fileName: dirFile,
+            source: `
+              export class TestDir {outputA!: EventEmitter<string>;}
+              export class OtherDir {unusedOutput!: EventEmitter<string>;}
+              `,
+            templates: {},
+          }
+        ]);
+        const sf = getSourceFileOrError(program, fileName);
+        const cmp = getClass(sf, 'Cmp');
+
+        const nodes = templateTypeChecker.getTemplate(cmp)!;
+
+        const outputABinding = (nodes[0] as TmplAstElement).outputs[0];
+        const symbol = templateTypeChecker.getSymbolOfNode(outputABinding, cmp)!;
+        assertOutputBindingSymbol(symbol);
+        expect(
+            (symbol.bindings[0].tsSymbol!.declarations[0] as ts.PropertyDeclaration).name.getText())
+            .toEqual('outputA');
+        expect((symbol.bindings[0].tsSymbol!.declarations[0] as ts.PropertyDeclaration)
+                   .parent.name?.text)
+            .toEqual('TestDir');
+      });
+
+      it('returns empty list when binding does not match any directive output', () => {
+        const fileName = absoluteFrom('/main.ts');
+        const dirFile = absoluteFrom('/dir.ts');
+        const {program, templateTypeChecker} = setup([
+          {
+            fileName,
+            templates: {'Cmp': `<div dir (doesNotExist)="handle($event)"></div>`},
+            declarations: [
+              {
+                name: 'TestDir',
+                selector: '[dir]',
+                file: dirFile,
+                type: 'directive',
+                outputs: {outputA: 'outputA'},
+              },
+            ]
+          },
+          {
+            fileName: dirFile,
+            source: `export class TestDir {outputA!: EventEmitter<string>;}`,
+            templates: {},
+          }
+        ]);
+        const sf = getSourceFileOrError(program, fileName);
+        const cmp = getClass(sf, 'Cmp');
+
+        const nodes = templateTypeChecker.getTemplate(cmp)!;
+
+        const outputABinding = (nodes[0] as TmplAstElement).outputs[0];
+        const symbol = templateTypeChecker.getSymbolOfNode(outputABinding, cmp);
+        expect(symbol).toBeNull();
+      });
+
+      it('returns empty list when checkTypeOfOutputEvents is false', () => {
+        const fileName = absoluteFrom('/main.ts');
+        const dirFile = absoluteFrom('/dir.ts');
+        const {program, templateTypeChecker} = setup(
+            [
+              {
+                fileName,
+                templates: {'Cmp': `<div dir (outputA)="handle($event)"></div>`},
+                declarations: [
+                  {
+                    name: 'TestDir',
+                    selector: '[dir]',
+                    file: dirFile,
+                    type: 'directive',
+                    outputs: {outputA: 'outputA'},
+                  },
+                ]
+              },
+              {
+                fileName: dirFile,
+                source: `export class TestDir {outputA!: EventEmitter<string>;}`,
+                templates: {},
+              }
+            ],
+            {checkTypeOfOutputEvents: false});
+        const sf = getSourceFileOrError(program, fileName);
+        const cmp = getClass(sf, 'Cmp');
+
+        const nodes = templateTypeChecker.getTemplate(cmp)!;
+
+        const outputABinding = (nodes[0] as TmplAstElement).outputs[0];
+        const symbol = templateTypeChecker.getSymbolOfNode(outputABinding, cmp);
+        // TODO(atscott): should type checker still generate the subscription in this case?
+        expect(symbol).toBeNull();
+      });
+    });
+
+    describe('for elements', () => {
+      it('for elements that are components with no inputs', () => {
+        const fileName = absoluteFrom('/main.ts');
+        const dirFile = absoluteFrom('/dir.ts');
+        const {program, templateTypeChecker} = setup(
+            [
+              {
+                fileName,
+                templates: {'Cmp': `<child-component></child-component>`},
+                declarations: [
+                  {
+                    name: 'ChildComponent',
+                    selector: 'child-component',
+                    isComponent: true,
+                    file: dirFile,
+                    type: 'directive',
+                  },
+                ]
+              },
+              {
+                fileName: dirFile,
+                source: `
+              export class ChildComponent {}
+            `,
+                templates: {'ChildComponent': ''},
+              }
+            ],
+        );
+        const sf = getSourceFileOrError(program, fileName);
+        const cmp = getClass(sf, 'Cmp');
+
+        const nodes = templateTypeChecker.getTemplate(cmp)!;
+
+        const symbol = templateTypeChecker.getSymbolOfNode(nodes[0] as TmplAstElement, cmp)!;
+        assertElementSymbol(symbol);
+        expect(symbol.directives.length).toBe(1);
+        assertDirectiveSymbol(symbol.directives[0]);
+        expect(program.getTypeChecker().typeToString(symbol.directives[0].tsType))
+            .toEqual('ChildComponent');
+        expect(symbol.directives[0].isComponent).toBe(true);
+      });
+
+      it('element with directive matches', () => {
+        const fileName = absoluteFrom('/main.ts');
+        const dirFile = absoluteFrom('/dir.ts');
+        const {program, templateTypeChecker} = setup(
+            [
+              {
+                fileName,
+                templates: {'Cmp': `<div dir dir2></div>`},
+                declarations: [
+                  {
+                    name: 'TestDir',
+                    selector: '[dir]',
+                    file: dirFile,
+                    type: 'directive',
+                  },
+                  {
+                    name: 'TestDir2',
+                    selector: '[dir2]',
+                    file: dirFile,
+                    type: 'directive',
+                  },
+                  {
+                    name: 'TestDirAllDivs',
+                    selector: 'div',
+                    file: dirFile,
+                    type: 'directive',
+                  },
+                ]
+              },
+              {
+                fileName: dirFile,
+                source: `
+              export class TestDir {}
+              // Allow the fake ComponentScopeReader to return a module for TestDir
+              export class TestDirModule {}
+              export class TestDir2 {}
+              // Allow the fake ComponentScopeReader to return a module for TestDir2
+              export class TestDir2Module {}
+              export class TestDirAllDivs {}
+            `,
+                templates: {},
+              }
+            ],
+        );
+        const sf = getSourceFileOrError(program, fileName);
+        const cmp = getClass(sf, 'Cmp');
+
+        const nodes = templateTypeChecker.getTemplate(cmp)!;
+
+        const symbol = templateTypeChecker.getSymbolOfNode(nodes[0] as TmplAstElement, cmp)!;
+        assertElementSymbol(symbol);
+        expect(symbol.directives.length).toBe(3);
+        const expectedDirectives = ['TestDir', 'TestDir2', 'TestDirAllDivs'].sort();
+        const actualDirectives =
+            symbol.directives.map(dir => program.getTypeChecker().typeToString(dir.tsType)).sort();
+        expect(actualDirectives).toEqual(expectedDirectives);
+
+        const expectedSelectors = ['[dir]', '[dir2]', 'div'].sort();
+        const actualSelectors = symbol.directives.map(dir => dir.selector).sort();
+        expect(actualSelectors).toEqual(expectedSelectors);
+
+        // Testing this fully requires an integration test with a real `NgCompiler` (like in the
+        // Language Service, which uses the ngModule name for quick info). However, this path does
+        // assert that we are able to handle when the scope reader returns `null` or a class from
+        // the fake implementation.
+        const expectedModules = new Set([null, 'TestDirModule', 'TestDir2Module']);
+        const actualModules =
+            new Set(symbol.directives.map(dir => dir.ngModule?.name.getText() ?? null));
+        expect(actualModules).toEqual(expectedModules);
+      });
+    });
+
+    it('elements with generic directives', () => {
+      const fileName = absoluteFrom('/main.ts');
+      const dirFile = absoluteFrom('/dir.ts');
+      const {program, templateTypeChecker} = setup(
+          [
+            {
+              fileName,
+              templates: {'Cmp': `<div genericDir></div>`},
+              declarations: [
+                {
+                  name: 'GenericDir',
+                  selector: '[genericDir]',
+                  file: dirFile,
+                  type: 'directive',
+                  isGeneric: true
+                },
+              ]
+            },
+            {
+              fileName: dirFile,
+              source: `
+              export class GenericDir<T>{}
+            `,
+              templates: {},
+            }
+          ],
+      );
+      const sf = getSourceFileOrError(program, fileName);
+      const cmp = getClass(sf, 'Cmp');
+
+      const nodes = templateTypeChecker.getTemplate(cmp)!;
+
+      const symbol = templateTypeChecker.getSymbolOfNode(nodes[0] as TmplAstElement, cmp)!;
+      assertElementSymbol(symbol);
+      expect(symbol.directives.length).toBe(1);
+      const actualDirectives =
+          symbol.directives.map(dir => program.getTypeChecker().typeToString(dir.tsType)).sort();
+      expect(actualDirectives).toEqual(['GenericDir<any>']);
+    });
+  });
+});
+
+function onlyAstTemplates(nodes: TmplAstNode[]): TmplAstTemplate[] {
+  return nodes.filter((n): n is TmplAstTemplate => n instanceof TmplAstTemplate);
+}
+
+function onlyAstElements(nodes: TmplAstNode[]): TmplAstElement[] {
+  return nodes.filter((n): n is TmplAstElement => n instanceof TmplAstElement);
+}
+
+function getAstElements(
+    templateTypeChecker: TemplateTypeChecker, cmp: ts.ClassDeclaration&{name: ts.Identifier}) {
+  return onlyAstElements(templateTypeChecker.getTemplate(cmp)!);
+}
+
+function getAstTemplates(
+    templateTypeChecker: TemplateTypeChecker, cmp: ts.ClassDeclaration&{name: ts.Identifier}) {
+  return onlyAstTemplates(templateTypeChecker.getTemplate(cmp)!);
+}
+
+function assertDirectiveSymbol(tSymbol: Symbol): asserts tSymbol is DirectiveSymbol {
+  expect(tSymbol.kind).toEqual(SymbolKind.Directive);
+}
+
+function assertInputBindingSymbol(tSymbol: Symbol): asserts tSymbol is InputBindingSymbol {
+  expect(tSymbol.kind).toEqual(SymbolKind.Input);
+}
+
+function assertOutputBindingSymbol(tSymbol: Symbol): asserts tSymbol is OutputBindingSymbol {
+  expect(tSymbol.kind).toEqual(SymbolKind.Output);
+}
+
+function assertVariableSymbol(tSymbol: Symbol): asserts tSymbol is VariableSymbol {
+  expect(tSymbol.kind).toEqual(SymbolKind.Variable);
+}
+
+function assertTemplateSymbol(tSymbol: Symbol): asserts tSymbol is TemplateSymbol {
+  expect(tSymbol.kind).toEqual(SymbolKind.Template);
+}
+
+function assertReferenceSymbol(tSymbol: Symbol): asserts tSymbol is ReferenceSymbol {
+  expect(tSymbol.kind).toEqual(SymbolKind.Reference);
+}
+
+function assertExpressionSymbol(tSymbol: Symbol): asserts tSymbol is ExpressionSymbol {
+  expect(tSymbol.kind).toEqual(SymbolKind.Expression);
+}
+
+function assertElementSymbol(tSymbol: Symbol): asserts tSymbol is ElementSymbol {
+  expect(tSymbol.kind).toEqual(SymbolKind.Element);
+}
+
+function assertDomBindingSymbol(tSymbol: Symbol): asserts tSymbol is DomBindingSymbol {
+  expect(tSymbol.kind).toEqual(SymbolKind.DomBinding);
+}
+
+export function setup(targets: TypeCheckingTarget[], config?: Partial<TypeCheckingConfig>) {
+  return baseTestSetup(
+      targets, {inlining: false, config: {...config, enableTemplateTypeChecker: true}});
+}
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/test/type_checker_spec.ts b/packages/compiler-cli/src/ngtsc/typecheck/test/type_checker_spec.ts
index 432a1b8dd0e65..dd60007982a6f 100644
--- a/packages/compiler-cli/src/ngtsc/typecheck/test/type_checker_spec.ts
+++ b/packages/compiler-cli/src/ngtsc/typecheck/test/type_checker_spec.ts
@@ -6,8 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {platform} from 'os';
-
 import {ErrorCode, ngErrorCode} from '../../diagnostics';
 import {absoluteFrom, absoluteFromSourceFile, getSourceFileOrError} from '../../file_system';
 import {runInEachFileSystem} from '../../file_system/testing';
@@ -15,7 +13,7 @@ import {OptimizeFor} from '../api';
 
 import {getClass, setup, TestDeclaration} from './test_utils';
 
-runInEachFileSystem(os => {
+runInEachFileSystem(() => {
   describe('TemplateTypeChecker', () => {
     it('should batch diagnostic operations when requested in WholeProgram mode', () => {
       const file1 = absoluteFrom('/file1.ts');
@@ -66,7 +64,7 @@ runInEachFileSystem(os => {
       const file1 = absoluteFrom('/file1.ts');
       const file2 = absoluteFrom('/file2.ts');
       const {program, templateTypeChecker, programStrategy} = setup([
-        {fileName: file1, templates: {'Cmp1': '<div></div>'}},
+        {fileName: file1, templates: {'Cmp1': '<div>{{value}}</div>'}},
         {fileName: file2, templates: {'Cmp2': '<span></span>'}}
       ]);
 
@@ -74,7 +72,7 @@ runInEachFileSystem(os => {
       const block = templateTypeChecker.getTypeCheckBlock(cmp1);
       expect(block).not.toBeNull();
       expect(block!.getText()).toMatch(/: i[0-9]\.Cmp1/);
-      expect(block!.getText()).toContain(`document.createElement("div")`);
+      expect(block!.getText()).toContain(`value`);
     });
 
     it('should clear old inlines when necessary', () => {
@@ -86,6 +84,7 @@ runInEachFileSystem(os => {
         selector: '[dir]',
         file: dirFile,
         type: 'directive',
+        isGeneric: true,
       };
       const {program, templateTypeChecker, programStrategy} = setup([
         {
@@ -104,7 +103,7 @@ runInEachFileSystem(os => {
                 // A non-exported interface used as a type bound for a generic directive causes
                 // an inline type constructor to be required.
                 interface NotExported {}
-                export class TestDir<T extends NotExported> {}`,
+                export abstract class TestDir<T extends NotExported> {}`,
           templates: {},
         },
       ]);
@@ -161,7 +160,7 @@ runInEachFileSystem(os => {
         const {program, templateTypeChecker} = setup(
             [{
               fileName,
-              source: `class Cmp {} // not exported, so requires inline`,
+              source: `abstract class Cmp {} // not exported, so requires inline`,
               templates: {'Cmp': '<div></div>'}
             }],
             {inlining: false});
@@ -171,49 +170,47 @@ runInEachFileSystem(os => {
         expect(diags[0].code).toBe(ngErrorCode(ErrorCode.INLINE_TCB_REQUIRED));
       });
 
-      // These tests are currently disabled when running in Windows mode as the assertions involving
-      // the filename attached to the diagnostic are suffering from a case-sensitivity issue.
-      if (os !== 'Windows' && platform() !== 'win32') {
-        it('should produce errors for components that require type constructor inlining', () => {
-          const fileName = absoluteFrom('/main.ts');
-          const dirFile = absoluteFrom('/dir.ts');
-          const {program, templateTypeChecker} = setup(
-              [
-                {
-                  fileName,
-                  source: `export class Cmp {}`,
-                  templates: {'Cmp': '<div dir></div>'},
-                  declarations: [{
-                    name: 'TestDir',
-                    selector: '[dir]',
-                    file: dirFile,
-                    type: 'directive',
-                  }]
-                },
-                {
-                  fileName: dirFile,
-                  source: `
-                  // A non-exported interface used as a type bound for a generic directive causes
-                  // an inline type constructor to be required.
-                  interface NotExported {}
-                  export class TestDir<T extends NotExported> {}`,
-                  templates: {},
-                }
-              ],
-              {inlining: false});
-          const sf = getSourceFileOrError(program, fileName);
-          const diags = templateTypeChecker.getDiagnosticsForFile(sf, OptimizeFor.WholeProgram);
-          expect(diags.length).toBe(1);
-          expect(diags[0].code).toBe(ngErrorCode(ErrorCode.INLINE_TYPE_CTOR_REQUIRED));
-
-          // The relatedInformation of the diagnostic should point to the directive which required
-          // the inline type constructor.
-          expect(diags[0].relatedInformation).not.toBeUndefined();
-          expect(diags[0].relatedInformation!.length).toBe(1);
-          expect(diags[0].relatedInformation![0].file).not.toBeUndefined();
-          expect(absoluteFromSourceFile(diags[0].relatedInformation![0].file!)).toBe(dirFile);
-        });
-      }
+      it('should produce errors for components that require type constructor inlining', () => {
+        const fileName = absoluteFrom('/main.ts');
+        const dirFile = absoluteFrom('/dir.ts');
+        const {program, templateTypeChecker} = setup(
+            [
+              {
+                fileName,
+                source: `export class Cmp {}`,
+                templates: {'Cmp': '<div dir></div>'},
+                declarations: [{
+                  name: 'TestDir',
+                  selector: '[dir]',
+                  file: dirFile,
+                  type: 'directive',
+                  isGeneric: true,
+                }]
+              },
+              {
+                fileName: dirFile,
+                source: `
+                // A non-exported interface used as a type bound for a generic directive causes
+                // an inline type constructor to be required.
+                interface NotExported {}
+                export class TestDir<T extends NotExported> {}`,
+                templates: {},
+              }
+            ],
+            {inlining: false});
+        const sf = getSourceFileOrError(program, fileName);
+        const diags = templateTypeChecker.getDiagnosticsForFile(sf, OptimizeFor.WholeProgram);
+        expect(diags.length).toBe(1);
+        expect(diags[0].code).toBe(ngErrorCode(ErrorCode.INLINE_TYPE_CTOR_REQUIRED));
+
+        // The relatedInformation of the diagnostic should point to the directive which required
+        // the inline type constructor.
+        const dirSf = getSourceFileOrError(program, dirFile);
+        expect(diags[0].relatedInformation).not.toBeUndefined();
+        expect(diags[0].relatedInformation!.length).toBe(1);
+        expect(diags[0].relatedInformation![0].file).not.toBeUndefined();
+        expect(absoluteFromSourceFile(diags[0].relatedInformation![0].file!)).toBe(dirSf.fileName);
+      });
     });
 
     describe('template overrides', () => {
@@ -221,43 +218,43 @@ runInEachFileSystem(os => {
         const fileName = absoluteFrom('/main.ts');
         const {program, templateTypeChecker} = setup([{
           fileName,
-          templates: {'Cmp': '<div></div>'},
+          templates: {'Cmp': '<div>{{original}}</div>'},
         }]);
 
         const sf = getSourceFileOrError(program, fileName);
         const cmp = getClass(sf, 'Cmp');
 
         const tcbReal = templateTypeChecker.getTypeCheckBlock(cmp)!;
-        expect(tcbReal.getText()).toContain('div');
+        expect(tcbReal.getText()).toContain('original');
 
-        templateTypeChecker.overrideComponentTemplate(cmp, '<span></span>');
+        templateTypeChecker.overrideComponentTemplate(cmp, '<div>{{override}}</div>');
         const tcbOverridden = templateTypeChecker.getTypeCheckBlock(cmp);
         expect(tcbOverridden).not.toBeNull();
-        expect(tcbOverridden!.getText()).not.toContain('div');
-        expect(tcbOverridden!.getText()).toContain('span');
+        expect(tcbOverridden!.getText()).not.toContain('original');
+        expect(tcbOverridden!.getText()).toContain('override');
       });
 
       it('should clear overrides on request', () => {
         const fileName = absoluteFrom('/main.ts');
         const {program, templateTypeChecker} = setup([{
           fileName,
-          templates: {'Cmp': '<div></div>'},
+          templates: {'Cmp': '<div>{{original}}</div>'},
         }]);
 
         const sf = getSourceFileOrError(program, fileName);
         const cmp = getClass(sf, 'Cmp');
 
-        templateTypeChecker.overrideComponentTemplate(cmp, '<span></span>');
+        templateTypeChecker.overrideComponentTemplate(cmp, '<div>{{override}}</div>');
         const tcbOverridden = templateTypeChecker.getTypeCheckBlock(cmp)!;
-        expect(tcbOverridden.getText()).not.toContain('div');
-        expect(tcbOverridden.getText()).toContain('span');
+        expect(tcbOverridden.getText()).not.toContain('original');
+        expect(tcbOverridden.getText()).toContain('override');
 
         templateTypeChecker.resetOverrides();
 
-        // The template should be back to the original, which has <div> and not <span>.
+        // The template should be back to the original.
         const tcbReal = templateTypeChecker.getTypeCheckBlock(cmp)!;
-        expect(tcbReal.getText()).toContain('div');
-        expect(tcbReal.getText()).not.toContain('span');
+        expect(tcbReal.getText()).toContain('original');
+        expect(tcbReal.getText()).not.toContain('override');
       });
 
       it('should override a template and make use of previously unused directives', () => {
@@ -274,11 +271,13 @@ runInEachFileSystem(os => {
                   selector: '[dir]',
                   file: dirFile,
                   type: 'directive',
+                  inputs: {'input': 'input'},
+                  isGeneric: true,
                 }]
               },
               {
                 fileName: dirFile,
-                source: `export class TestDir {}`,
+                source: `export class TestDir<T> {}`,
                 templates: {},
               }
             ],
@@ -292,7 +291,7 @@ runInEachFileSystem(os => {
         const tcbReal = templateTypeChecker.getTypeCheckBlock(cmp)!;
         expect(tcbReal.getSourceFile().text).not.toContain('TestDir');
 
-        templateTypeChecker.overrideComponentTemplate(cmp, '<div dir></div>');
+        templateTypeChecker.overrideComponentTemplate(cmp, '<div dir [input]="value"></div>');
 
         const tcbOverridden = templateTypeChecker.getTypeCheckBlock(cmp);
         expect(tcbOverridden).not.toBeNull();
@@ -349,5 +348,40 @@ runInEachFileSystem(os => {
       expect(diags2[0].messageText).toContain('invalid-element-b');
       expect(diags2[0].messageText).not.toContain('invalid-element-a');
     });
+
+    describe('getTemplateOfComponent()', () => {
+      it('should provide access to a component\'s real template', () => {
+        const fileName = absoluteFrom('/main.ts');
+        const {program, templateTypeChecker} = setup([{
+          fileName,
+          templates: {
+            'Cmp': '<div>Template</div>',
+          },
+        }]);
+        const cmp = getClass(getSourceFileOrError(program, fileName), 'Cmp');
+
+        const nodes = templateTypeChecker.getTemplate(cmp)!;
+        expect(nodes).not.toBeNull();
+        expect(nodes[0].sourceSpan.start.file.content).toBe('<div>Template</div>');
+      });
+
+      it('should provide access to an overridden template', () => {
+        const fileName = absoluteFrom('/main.ts');
+        const {program, templateTypeChecker} = setup([{
+          fileName,
+          templates: {
+            'Cmp': '<div>Template</div>',
+          },
+        }]);
+        const cmp = getClass(getSourceFileOrError(program, fileName), 'Cmp');
+
+        templateTypeChecker.overrideComponentTemplate(cmp, '<div>Overridden</div>');
+        templateTypeChecker.getDiagnosticsForComponent(cmp);
+
+        const nodes = templateTypeChecker.getTemplate(cmp)!;
+        expect(nodes).not.toBeNull();
+        expect(nodes[0].sourceSpan.start.file.content).toBe('<div>Overridden</div>');
+      });
+    });
   });
 });
diff --git a/packages/compiler-cli/src/ngtsc/util/BUILD.bazel b/packages/compiler-cli/src/ngtsc/util/BUILD.bazel
index 59bcee27973ee..cb06267fdbaa5 100644
--- a/packages/compiler-cli/src/ngtsc/util/BUILD.bazel
+++ b/packages/compiler-cli/src/ngtsc/util/BUILD.bazel
@@ -11,6 +11,7 @@ ts_library(
         "//packages:types",
         "//packages/compiler-cli/src/ngtsc/file_system",
         "//packages/compiler-cli/src/ngtsc/incremental:api",
+        "//packages/compiler-cli/src/ngtsc/reflection",
         "@npm//@types/node",
         "@npm//typescript",
     ],
diff --git a/packages/compiler-cli/src/ngtsc/util/src/typescript.ts b/packages/compiler-cli/src/ngtsc/util/src/typescript.ts
index 13a90d3a3e80b..c7bf5eed6ba70 100644
--- a/packages/compiler-cli/src/ngtsc/util/src/typescript.ts
+++ b/packages/compiler-cli/src/ngtsc/util/src/typescript.ts
@@ -11,6 +11,7 @@ const D_TS = /\.d\.ts$/i;
 
 import * as ts from 'typescript';
 import {AbsoluteFsPath, absoluteFrom} from '../../file_system';
+import {DeclarationNode} from '../../reflection';
 
 export function isDtsPath(filePath: string): boolean {
   return D_TS.test(filePath);
@@ -82,7 +83,7 @@ export function isTypeDeclaration(node: ts.Node): node is ts.EnumDeclaration|
       ts.isInterfaceDeclaration(node);
 }
 
-export function isExported(node: ts.Declaration): boolean {
+export function isExported(node: DeclarationNode): boolean {
   let topLevel: ts.Node = node;
   if (ts.isVariableDeclaration(node) && ts.isVariableDeclarationList(node.parent)) {
     topLevel = node.parent.parent;
@@ -139,6 +140,11 @@ export function resolveModuleName(
   }
 }
 
+/** Returns true if the node is an assignment expression. */
+export function isAssignment(node: ts.Node): node is ts.BinaryExpression {
+  return ts.isBinaryExpression(node) && node.operatorToken.kind === ts.SyntaxKind.EqualsToken;
+}
+
 /**
  * Asserts that the keys `K` form a subset of the keys of `T`.
  */
diff --git a/packages/compiler-cli/src/transformers/downlevel_decorators_transform.ts b/packages/compiler-cli/src/transformers/downlevel_decorators_transform.ts
index aa30ce4da1cb9..97a0465b0a138 100644
--- a/packages/compiler-cli/src/transformers/downlevel_decorators_transform.ts
+++ b/packages/compiler-cli/src/transformers/downlevel_decorators_transform.ts
@@ -140,10 +140,16 @@ function createCtorParametersClassPropertyType(): ts.TypeNode {
             undefined),
       ])),
       undefined));
-  return ts.createFunctionTypeNode(
-      undefined, [],
-      ts.createArrayTypeNode(
-          ts.createUnionTypeNode([ts.createTypeLiteralNode(typeElements), ts.createNull()])));
+
+  // TODO(alan-agius4): Remove when we no longer support TS 3.9
+  const nullLiteral = ts.createNull() as any;
+  const nullType = ts.versionMajorMinor.charAt(0) === '4' ?
+      ts.createLiteralTypeNode(nullLiteral as any) :
+      nullLiteral;
+  return ts.createFunctionTypeNode(undefined, [], ts.createArrayTypeNode(ts.createUnionTypeNode([
+    ts.createTypeLiteralNode(typeElements),
+    nullType,
+  ])));
 }
 
 /**
@@ -287,8 +293,13 @@ function typeReferenceToExpression(
       // Ignore any generic types, just return the base type.
       return entityNameToExpression(typeRef.typeName);
     case ts.SyntaxKind.UnionType:
+      // TODO(alan-agius4): remove `t.kind !== ts.SyntaxKind.NullKeyword` when
+      // TS 3.9 support is dropped. In TS 4.0 NullKeyword is a child of LiteralType.
       const childTypeNodes =
-          (node as ts.UnionTypeNode).types.filter(t => t.kind !== ts.SyntaxKind.NullKeyword);
+          (node as ts.UnionTypeNode)
+              .types.filter(
+                  t => t.kind !== ts.SyntaxKind.NullKeyword &&
+                      !(ts.isLiteralTypeNode(t) && t.literal.kind === ts.SyntaxKind.NullKeyword));
       return childTypeNodes.length === 1 ?
           typeReferenceToExpression(entityNameToExpression, childTypeNodes[0]) :
           undefined;
@@ -298,15 +309,20 @@ function typeReferenceToExpression(
 }
 
 /**
- * Returns true if the given symbol refers to a value (as distinct from a type).
+ * Checks whether a given symbol refers to a value that exists at runtime (as distinct from a type).
  *
  * Expands aliases, which is important for the case where
  *   import * as x from 'some-module';
  * and x is now a value (the module object).
  */
-function symbolIsValue(tc: ts.TypeChecker, sym: ts.Symbol): boolean {
-  if (sym.flags & ts.SymbolFlags.Alias) sym = tc.getAliasedSymbol(sym);
-  return (sym.flags & ts.SymbolFlags.Value) !== 0;
+function symbolIsRuntimeValue(typeChecker: ts.TypeChecker, symbol: ts.Symbol): boolean {
+  if (symbol.flags & ts.SymbolFlags.Alias) {
+    symbol = typeChecker.getAliasedSymbol(symbol);
+  }
+
+  // Note that const enums are a special case, because
+  // while they have a value, they don't exist at runtime.
+  return (symbol.flags & ts.SymbolFlags.Value & ts.SymbolFlags.ConstEnumExcludes) !== 0;
 }
 
 /** ParameterDecorationInfo describes the information for a single constructor parameter. */
@@ -351,7 +367,7 @@ export function getDownlevelDecoratorsTransform(
       const symbol = typeChecker.getSymbolAtLocation(name);
       // Check if the entity name references a symbol that is an actual value. If it is not, it
       // cannot be referenced by an expression, so return undefined.
-      if (!symbol || !symbolIsValue(typeChecker, symbol) || !symbol.declarations ||
+      if (!symbol || !symbolIsRuntimeValue(typeChecker, symbol) || !symbol.declarations ||
           symbol.declarations.length === 0) {
         return undefined;
       }
@@ -429,7 +445,7 @@ export function getDownlevelDecoratorsTransform(
 
       const name = (element.name as ts.Identifier).text;
       const mutable = ts.getMutableClone(element);
-      mutable.decorators = decoratorsToKeep.length ?
+      (mutable as any).decorators = decoratorsToKeep.length ?
           ts.setTextRange(ts.createNodeArray(decoratorsToKeep), mutable.decorators) :
           undefined;
       return [name, mutable, toLower];
@@ -546,8 +562,6 @@ export function getDownlevelDecoratorsTransform(
         }
       }
 
-      const newClassDeclaration = ts.getMutableClone(classDecl);
-
       if (decoratorsToLower.length) {
         newMembers.push(createDecoratorClassProperty(decoratorsToLower));
       }
@@ -562,12 +576,13 @@ export function getDownlevelDecoratorsTransform(
       if (decoratedProperties.size) {
         newMembers.push(createPropDecoratorsClassProperty(diagnostics, decoratedProperties));
       }
-      newClassDeclaration.members = ts.setTextRange(
-          ts.createNodeArray(newMembers, newClassDeclaration.members.hasTrailingComma),
-          classDecl.members);
-      newClassDeclaration.decorators =
-          decoratorsToKeep.length ? ts.createNodeArray(decoratorsToKeep) : undefined;
-      return newClassDeclaration;
+
+      const members = ts.setTextRange(
+          ts.createNodeArray(newMembers, classDecl.members.hasTrailingComma), classDecl.members);
+
+      return ts.updateClassDeclaration(
+          classDecl, decoratorsToKeep.length ? decoratorsToKeep : undefined, classDecl.modifiers,
+          classDecl.name, classDecl.typeParameters, classDecl.heritageClauses, members);
     }
 
     /**
diff --git a/packages/compiler-cli/src/transformers/lower_expressions.ts b/packages/compiler-cli/src/transformers/lower_expressions.ts
index 15b24c3469f59..8a5dc858e1cd8 100644
--- a/packages/compiler-cli/src/transformers/lower_expressions.ts
+++ b/packages/compiler-cli/src/transformers/lower_expressions.ts
@@ -167,14 +167,13 @@ function transformSourceFile(
 
       newStatements = tmpStatements;
     }
-    // Note: We cannot use ts.updateSourcefile here as
-    // it does not work well with decorators.
-    // See https://github.com/Microsoft/TypeScript/issues/17384
-    const newSf = ts.getMutableClone(sourceFile);
+
+    const newSf = ts.updateSourceFileNode(
+        sourceFile, ts.setTextRange(ts.createNodeArray(newStatements), sourceFile.statements));
     if (!(sourceFile.flags & ts.NodeFlags.Synthesized)) {
-      newSf.flags &= ~ts.NodeFlags.Synthesized;
+      (newSf.flags as ts.NodeFlags) &= ~ts.NodeFlags.Synthesized;
     }
-    newSf.statements = ts.setTextRange(ts.createNodeArray(newStatements), sourceFile.statements);
+
     return newSf;
   }
 
@@ -209,11 +208,6 @@ export interface RequestsMap {
   getRequests(sourceFile: ts.SourceFile): RequestLocationMap;
 }
 
-interface MetadataAndLoweringRequests {
-  metadata: ModuleMetadata|undefined;
-  requests: RequestLocationMap;
-}
-
 function isEligibleForLowering(node: ts.Node|undefined): boolean {
   if (node) {
     switch (node.kind) {
diff --git a/packages/compiler-cli/src/transformers/node_emitter.ts b/packages/compiler-cli/src/transformers/node_emitter.ts
index 4a791b27bdf70..6a27f1798bf36 100644
--- a/packages/compiler-cli/src/transformers/node_emitter.ts
+++ b/packages/compiler-cli/src/transformers/node_emitter.ts
@@ -6,10 +6,10 @@
  * 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, TypeofExpr, WrappedNodeExpr, WriteKeyExpr, WritePropExpr, WriteVarExpr} from '@angular/compiler';
-import {LocalizedString} from '@angular/compiler/src/output/output_ast';
+import {AssertNotNull, BinaryOperator, BinaryOperatorExpr, BuiltinMethod, BuiltinVar, CastExpr, ClassStmt, CommaExpr, ConditionalExpr, DeclareFunctionStmt, DeclareVarStmt, ExpressionStatement, ExpressionVisitor, ExternalExpr, ExternalReference, FunctionExpr, IfStmt, InstantiateExpr, InvokeFunctionExpr, InvokeMethodExpr, LeadingComment, leadingComment, LiteralArrayExpr, LiteralExpr, LiteralMapExpr, LocalizedString, NotExpr, ParseSourceFile, ParseSourceSpan, PartialModule, ReadKeyExpr, ReadPropExpr, ReadVarExpr, ReturnStatement, Statement, StatementVisitor, StmtModifier, ThrowStmt, TryCatchStmt, TypeofExpr, UnaryOperator, UnaryOperatorExpr, WrappedNodeExpr, WriteKeyExpr, WritePropExpr, WriteVarExpr} from '@angular/compiler';
 import * as ts from 'typescript';
 
+import {attachComments} from '../ngtsc/translator';
 import {error} from './util';
 
 export interface Node {
@@ -31,30 +31,25 @@ export class TypeScriptNodeEmitter {
     // stmts.
     const statements: any[] = [].concat(
         ...stmts.map(stmt => stmt.visitStatement(converter, null)).filter(stmt => stmt != null));
-    const preambleStmts: ts.Statement[] = [];
+    const sourceStatements =
+        [...converter.getReexports(), ...converter.getImports(), ...statements];
     if (preamble) {
-      const commentStmt = this.createCommentStatement(sourceFile, preamble);
-      preambleStmts.push(commentStmt);
+      // We always attach the preamble comment to a `NotEmittedStatement` node, because tsickle uses
+      // this node type as a marker of the preamble to ensure that it adds its own new nodes after
+      // the preamble.
+      const preambleCommentHolder = ts.createNotEmittedStatement(sourceFile);
+      // Preamble comments are passed through as-is, which means that they must already contain a
+      // leading `*` if they should be a JSDOC comment.
+      ts.addSyntheticLeadingComment(
+          preambleCommentHolder, ts.SyntaxKind.MultiLineCommentTrivia, preamble,
+          /* hasTrailingNewline */ true);
+      sourceStatements.unshift(preambleCommentHolder);
     }
-    const sourceStatements =
-        [...preambleStmts, ...converter.getReexports(), ...converter.getImports(), ...statements];
+
     converter.updateSourceMap(sourceStatements);
     const newSourceFile = ts.updateSourceFileNode(sourceFile, sourceStatements);
     return [newSourceFile, converter.getNodeMap()];
   }
-
-  /** Creates a not emitted statement containing the given comment. */
-  createCommentStatement(sourceFile: ts.SourceFile, comment: string): ts.Statement {
-    if (comment.startsWith('/*') && comment.endsWith('*/')) {
-      comment = comment.substr(2, comment.length - 4);
-    }
-    const commentStmt = ts.createNotEmittedStatement(sourceFile);
-    ts.setSyntheticLeadingComments(
-        commentStmt,
-        [{kind: ts.SyntaxKind.MultiLineCommentTrivia, text: comment, pos: -1, end: -1}]);
-    ts.setEmitFlags(commentStmt, ts.EmitFlags.CustomPrologue);
-    return commentStmt;
-  }
 }
 
 /**
@@ -288,10 +283,13 @@ export class NodeEmitterVisitor implements StatementVisitor, ExpressionVisitor {
     recordLastSourceRange();
   }
 
-  private record<T extends ts.Node>(ngNode: Node, tsNode: T|null): RecordedNode<T> {
+  private postProcess<T extends ts.Node>(ngNode: Node, tsNode: T|null): RecordedNode<T> {
     if (tsNode && !this._nodeMap.has(tsNode)) {
       this._nodeMap.set(tsNode, ngNode);
     }
+    if (tsNode !== null && ngNode instanceof Statement && ngNode.leadingComments !== undefined) {
+      attachComments(tsNode as unknown as ts.Statement, ngNode.leadingComments);
+    }
     return tsNode as RecordedNode<T>;
   }
 
@@ -347,19 +345,19 @@ export class NodeEmitterVisitor implements StatementVisitor, ExpressionVisitor {
       // Note: We need to add an explicit variable and export declaration so that
       // the variable can be referred in the same file as well.
       const tsVarStmt =
-          this.record(stmt, ts.createVariableStatement(/* modifiers */[], varDeclList));
-      const exportStmt = this.record(
+          this.postProcess(stmt, ts.createVariableStatement(/* modifiers */[], varDeclList));
+      const exportStmt = this.postProcess(
           stmt,
           ts.createExportDeclaration(
               /*decorators*/ undefined, /*modifiers*/ undefined,
               ts.createNamedExports([ts.createExportSpecifier(stmt.name, stmt.name)])));
       return [tsVarStmt, exportStmt];
     }
-    return this.record(stmt, ts.createVariableStatement(this.getModifiers(stmt), varDeclList));
+    return this.postProcess(stmt, ts.createVariableStatement(this.getModifiers(stmt), varDeclList));
   }
 
   visitDeclareFunctionStmt(stmt: DeclareFunctionStmt) {
-    return this.record(
+    return this.postProcess(
         stmt,
         ts.createFunctionDeclaration(
             /* decorators */ undefined, this.getModifiers(stmt),
@@ -372,11 +370,11 @@ export class NodeEmitterVisitor implements StatementVisitor, ExpressionVisitor {
   }
 
   visitExpressionStmt(stmt: ExpressionStatement) {
-    return this.record(stmt, ts.createStatement(stmt.expr.visitExpression(this, null)));
+    return this.postProcess(stmt, ts.createStatement(stmt.expr.visitExpression(this, null)));
   }
 
   visitReturnStmt(stmt: ReturnStatement) {
-    return this.record(
+    return this.postProcess(
         stmt, ts.createReturn(stmt.value ? stmt.value.visitExpression(this, null) : undefined));
   }
 
@@ -434,7 +432,7 @@ export class NodeEmitterVisitor implements StatementVisitor, ExpressionVisitor {
                                         /* decorators */ undefined, /* modifiers */ undefined,
                                         /* dotDotDotToken */ undefined, p.name)),
                                 /* type */ undefined, this._visitStatements(method.body)));
-    return this.record(
+    return this.postProcess(
         stmt,
         ts.createClassDeclaration(
             /* decorators */ undefined, modifiers, stmt.name, /* typeParameters*/ undefined,
@@ -446,7 +444,7 @@ export class NodeEmitterVisitor implements StatementVisitor, ExpressionVisitor {
   }
 
   visitIfStmt(stmt: IfStmt) {
-    return this.record(
+    return this.postProcess(
         stmt,
         ts.createIf(
             stmt.condition.visitExpression(this, null), this._visitStatements(stmt.trueCase),
@@ -455,7 +453,7 @@ export class NodeEmitterVisitor implements StatementVisitor, ExpressionVisitor {
   }
 
   visitTryCatchStmt(stmt: TryCatchStmt): RecordedNode<ts.TryStatement> {
-    return this.record(
+    return this.postProcess(
         stmt,
         ts.createTry(
             this._visitStatements(stmt.bodyStmts),
@@ -474,64 +472,46 @@ export class NodeEmitterVisitor implements StatementVisitor, ExpressionVisitor {
   }
 
   visitThrowStmt(stmt: ThrowStmt) {
-    return this.record(stmt, ts.createThrow(stmt.error.visitExpression(this, null)));
-  }
-
-  visitCommentStmt(stmt: CommentStmt, sourceFile: ts.SourceFile) {
-    const text = stmt.multiline ? ` ${stmt.comment} ` : ` ${stmt.comment}`;
-    return this.createCommentStmt(text, stmt.multiline, sourceFile);
-  }
-
-  visitJSDocCommentStmt(stmt: JSDocCommentStmt, sourceFile: ts.SourceFile) {
-    return this.createCommentStmt(stmt.toString(), true, sourceFile);
-  }
-
-  private createCommentStmt(text: string, multiline: boolean, sourceFile: ts.SourceFile):
-      ts.NotEmittedStatement {
-    const commentStmt = ts.createNotEmittedStatement(sourceFile);
-    const kind =
-        multiline ? ts.SyntaxKind.MultiLineCommentTrivia : ts.SyntaxKind.SingleLineCommentTrivia;
-    ts.setSyntheticLeadingComments(commentStmt, [{kind, text, pos: -1, end: -1}]);
-    return commentStmt;
+    return this.postProcess(stmt, ts.createThrow(stmt.error.visitExpression(this, null)));
   }
 
   // ExpressionVisitor
   visitWrappedNodeExpr(expr: WrappedNodeExpr<any>) {
-    return this.record(expr, expr.node);
+    return this.postProcess(expr, expr.node);
   }
 
   visitTypeofExpr(expr: TypeofExpr) {
     const typeOf = ts.createTypeOf(expr.expr.visitExpression(this, null));
-    return this.record(expr, typeOf);
+    return this.postProcess(expr, typeOf);
   }
 
   // ExpressionVisitor
   visitReadVarExpr(expr: ReadVarExpr) {
     switch (expr.builtin) {
       case BuiltinVar.This:
-        return this.record(expr, ts.createIdentifier(METHOD_THIS_NAME));
+        return this.postProcess(expr, ts.createIdentifier(METHOD_THIS_NAME));
       case BuiltinVar.CatchError:
-        return this.record(expr, ts.createIdentifier(CATCH_ERROR_NAME));
+        return this.postProcess(expr, ts.createIdentifier(CATCH_ERROR_NAME));
       case BuiltinVar.CatchStack:
-        return this.record(expr, ts.createIdentifier(CATCH_STACK_NAME));
+        return this.postProcess(expr, ts.createIdentifier(CATCH_STACK_NAME));
       case BuiltinVar.Super:
-        return this.record(expr, ts.createSuper());
+        return this.postProcess(expr, ts.createSuper());
     }
     if (expr.name) {
-      return this.record(expr, ts.createIdentifier(expr.name));
+      return this.postProcess(expr, ts.createIdentifier(expr.name));
     }
     throw Error(`Unexpected ReadVarExpr form`);
   }
 
   visitWriteVarExpr(expr: WriteVarExpr): RecordedNode<ts.BinaryExpression> {
-    return this.record(
+    return this.postProcess(
         expr,
         ts.createAssignment(
             ts.createIdentifier(expr.name), expr.value.visitExpression(this, null)));
   }
 
   visitWriteKeyExpr(expr: WriteKeyExpr): RecordedNode<ts.BinaryExpression> {
-    return this.record(
+    return this.postProcess(
         expr,
         ts.createAssignment(
             ts.createElementAccess(
@@ -540,7 +520,7 @@ export class NodeEmitterVisitor implements StatementVisitor, ExpressionVisitor {
   }
 
   visitWritePropExpr(expr: WritePropExpr): RecordedNode<ts.BinaryExpression> {
-    return this.record(
+    return this.postProcess(
         expr,
         ts.createAssignment(
             ts.createPropertyAccess(expr.receiver.visitExpression(this, null), expr.name),
@@ -549,7 +529,7 @@ export class NodeEmitterVisitor implements StatementVisitor, ExpressionVisitor {
 
   visitInvokeMethodExpr(expr: InvokeMethodExpr): RecordedNode<ts.CallExpression> {
     const methodName = getMethodName(expr);
-    return this.record(
+    return this.postProcess(
         expr,
         ts.createCall(
             ts.createPropertyAccess(expr.receiver.visitExpression(this, null), methodName),
@@ -557,7 +537,7 @@ export class NodeEmitterVisitor implements StatementVisitor, ExpressionVisitor {
   }
 
   visitInvokeFunctionExpr(expr: InvokeFunctionExpr): RecordedNode<ts.CallExpression> {
-    return this.record(
+    return this.postProcess(
         expr,
         ts.createCall(
             expr.fn.visitExpression(this, null), /* typeArguments */ undefined,
@@ -565,7 +545,7 @@ export class NodeEmitterVisitor implements StatementVisitor, ExpressionVisitor {
   }
 
   visitInstantiateExpr(expr: InstantiateExpr): RecordedNode<ts.NewExpression> {
-    return this.record(
+    return this.postProcess(
         expr,
         ts.createNew(
             expr.classExpr.visitExpression(this, null), /* typeArguments */ undefined,
@@ -573,7 +553,7 @@ export class NodeEmitterVisitor implements StatementVisitor, ExpressionVisitor {
   }
 
   visitLiteralExpr(expr: LiteralExpr) {
-    return this.record(expr, createLiteral(expr.value));
+    return this.postProcess(expr, createLiteral(expr.value));
   }
 
   visitLocalizedString(expr: LocalizedString, context: any) {
@@ -581,12 +561,12 @@ export class NodeEmitterVisitor implements StatementVisitor, ExpressionVisitor {
   }
 
   visitExternalExpr(expr: ExternalExpr) {
-    return this.record(expr, this._visitIdentifier(expr.value));
+    return this.postProcess(expr, this._visitIdentifier(expr.value));
   }
 
   visitConditionalExpr(expr: ConditionalExpr): RecordedNode<ts.ParenthesizedExpression> {
     // TODO {chuckj}: Review use of ! on falseCase. Should it be non-nullable?
-    return this.record(
+    return this.postProcess(
         expr,
         ts.createParen(ts.createConditional(
             expr.condition.visitExpression(this, null), expr.trueCase.visitExpression(this, null),
@@ -594,7 +574,7 @@ export class NodeEmitterVisitor implements StatementVisitor, ExpressionVisitor {
   }
 
   visitNotExpr(expr: NotExpr): RecordedNode<ts.PrefixUnaryExpression> {
-    return this.record(
+    return this.postProcess(
         expr,
         ts.createPrefix(
             ts.SyntaxKind.ExclamationToken, expr.condition.visitExpression(this, null)));
@@ -609,7 +589,7 @@ export class NodeEmitterVisitor implements StatementVisitor, ExpressionVisitor {
   }
 
   visitFunctionExpr(expr: FunctionExpr) {
-    return this.record(
+    return this.postProcess(
         expr,
         ts.createFunctionExpression(
             /* modifiers */ undefined, /* astriskToken */ undefined,
@@ -622,6 +602,23 @@ export class NodeEmitterVisitor implements StatementVisitor, ExpressionVisitor {
             /* type */ undefined, this._visitStatements(expr.statements)));
   }
 
+  visitUnaryOperatorExpr(expr: UnaryOperatorExpr):
+      RecordedNode<ts.UnaryExpression|ts.ParenthesizedExpression> {
+    let unaryOperator: ts.BinaryOperator;
+    switch (expr.operator) {
+      case UnaryOperator.Minus:
+        unaryOperator = ts.SyntaxKind.MinusToken;
+        break;
+      case UnaryOperator.Plus:
+        unaryOperator = ts.SyntaxKind.PlusToken;
+        break;
+      default:
+        throw new Error(`Unknown operator: ${expr.operator}`);
+    }
+    const binary = ts.createPrefix(unaryOperator, expr.expr.visitExpression(this, null));
+    return this.postProcess(expr, expr.parens ? ts.createParen(binary) : binary);
+  }
+
   visitBinaryOperatorExpr(expr: BinaryOperatorExpr):
       RecordedNode<ts.BinaryExpression|ts.ParenthesizedExpression> {
     let binaryOperator: ts.BinaryOperator;
@@ -679,28 +676,28 @@ export class NodeEmitterVisitor implements StatementVisitor, ExpressionVisitor {
     }
     const binary = ts.createBinary(
         expr.lhs.visitExpression(this, null), binaryOperator, expr.rhs.visitExpression(this, null));
-    return this.record(expr, expr.parens ? ts.createParen(binary) : binary);
+    return this.postProcess(expr, expr.parens ? ts.createParen(binary) : binary);
   }
 
   visitReadPropExpr(expr: ReadPropExpr): RecordedNode<ts.PropertyAccessExpression> {
-    return this.record(
+    return this.postProcess(
         expr, ts.createPropertyAccess(expr.receiver.visitExpression(this, null), expr.name));
   }
 
   visitReadKeyExpr(expr: ReadKeyExpr): RecordedNode<ts.ElementAccessExpression> {
-    return this.record(
+    return this.postProcess(
         expr,
         ts.createElementAccess(
             expr.receiver.visitExpression(this, null), expr.index.visitExpression(this, null)));
   }
 
   visitLiteralArrayExpr(expr: LiteralArrayExpr): RecordedNode<ts.ArrayLiteralExpression> {
-    return this.record(
+    return this.postProcess(
         expr, ts.createArrayLiteral(expr.entries.map(entry => entry.visitExpression(this, null))));
   }
 
   visitLiteralMapExpr(expr: LiteralMapExpr): RecordedNode<ts.ObjectLiteralExpression> {
-    return this.record(
+    return this.postProcess(
         expr,
         ts.createObjectLiteral(expr.entries.map(
             entry => ts.createPropertyAssignment(
@@ -711,7 +708,7 @@ export class NodeEmitterVisitor implements StatementVisitor, ExpressionVisitor {
   }
 
   visitCommaExpr(expr: CommaExpr): RecordedNode<ts.Expression> {
-    return this.record(
+    return this.postProcess(
         expr,
         expr.parts.map(e => e.visitExpression(this, null))
             .reduce<ts.Expression|null>(
@@ -756,7 +753,6 @@ export class NodeEmitterVisitor implements StatementVisitor, ExpressionVisitor {
   }
 }
 
-
 function getMethodName(methodRef: {name: string|null; builtin: BuiltinMethod | null}): string {
   if (methodRef.name) {
     return methodRef.name;
diff --git a/packages/compiler-cli/src/transformers/node_emitter_transform.ts b/packages/compiler-cli/src/transformers/node_emitter_transform.ts
index 0e3a499746a6a..043b6bcbecb8b 100644
--- a/packages/compiler-cli/src/transformers/node_emitter_transform.ts
+++ b/packages/compiler-cli/src/transformers/node_emitter_transform.ts
@@ -10,15 +10,15 @@ import {GeneratedFile} from '@angular/compiler';
 import * as ts from 'typescript';
 
 import {TypeScriptNodeEmitter} from './node_emitter';
-import {GENERATED_FILES} from './util';
+import {GENERATED_FILES, stripComment} from './util';
 
 function getPreamble(original: string) {
-  return `/**
+  return `*
  * @fileoverview This file was generated by the Angular template compiler. Do not edit.
  * ${original}
  * @suppress {suspiciousCode,uselessCode,missingProperties,missingOverride,checkTypes,extraRequire}
  * tslint:disable
- */`;
+ `;
 }
 
 /**
@@ -41,9 +41,6 @@ export function getAngularEmitterTransformFactory(
       if (orig) originalComment = getFileoverviewComment(orig);
       const preamble = getPreamble(originalComment);
       if (g && g.stmts) {
-        const orig = program.getSourceFile(g.srcFileUrl);
-        let originalComment = '';
-        if (orig) originalComment = getFileoverviewComment(orig);
         const [newSourceFile] = emitter.updateSourceFile(sourceFile, g.stmts, preamble);
         return newSourceFile;
       } else if (GENERATED_FILES.test(sourceFile.fileName)) {
@@ -51,8 +48,11 @@ export function getAngularEmitterTransformFactory(
         // and various minutiae.
         // Clear out the source file entirely, only including the preamble comment, so that
         // ngc produces an empty .js file.
-        return ts.updateSourceFileNode(
-            sourceFile, [emitter.createCommentStatement(sourceFile, preamble)]);
+        const commentStmt = ts.createNotEmittedStatement(sourceFile);
+        ts.addSyntheticLeadingComment(
+            commentStmt, ts.SyntaxKind.MultiLineCommentTrivia, preamble,
+            /* hasTrailingNewline */ true);
+        return ts.updateSourceFileNode(sourceFile, [commentStmt]);
       }
       return sourceFile;
     };
@@ -75,5 +75,6 @@ function getFileoverviewComment(sourceFile: ts.SourceFile): string {
   const commentText = sourceFile.getFullText().substring(comment.pos, comment.end);
   // Closure Compiler ignores @suppress and similar if the comment contains @license.
   if (commentText.indexOf('@license') !== -1) return '';
-  return commentText.replace(/^\/\*\*/, '').replace(/ ?\*\/$/, '');
+  // Also remove any leading `* ` from the first line in case it was a JSDOC comment
+  return stripComment(commentText).replace(/^\*\s+/, '');
 }
diff --git a/packages/compiler-cli/src/transformers/util.ts b/packages/compiler-cli/src/transformers/util.ts
index 6b139cb7b7b1c..47fdb141457b5 100644
--- a/packages/compiler-cli/src/transformers/util.ts
+++ b/packages/compiler-cli/src/transformers/util.ts
@@ -94,3 +94,12 @@ export function ngToTsDiagnostic(ng: Diagnostic): ts.Diagnostic {
     length,
   };
 }
+
+/**
+ * Strip multiline comment start and end markers from the `commentText` string.
+ *
+ * This will also strip the JSDOC comment start marker (`/**`).
+ */
+export function stripComment(commentText: string): string {
+  return commentText.replace(/^\/\*\*?/, '').replace(/\*\/$/, '').trim();
+}
diff --git a/packages/compiler-cli/src/typescript_support.ts b/packages/compiler-cli/src/typescript_support.ts
index 3adef9b986c3d..4404033259a26 100644
--- a/packages/compiler-cli/src/typescript_support.ts
+++ b/packages/compiler-cli/src/typescript_support.ts
@@ -11,15 +11,21 @@ import {compareVersions} from './diagnostics/typescript_version';
 /**
  * Minimum supported TypeScript version
  * ∀ supported typescript version v, v >= MIN_TS_VERSION
+ *
+ * Note: this check is disabled in g3, search for
+ * `angularCompilerOptions.disableTypeScriptVersionCheck` config param value in g3.
  */
-const MIN_TS_VERSION = '3.9.2';
+const MIN_TS_VERSION = '4.0.0';
 
 /**
  * Supremum of supported TypeScript versions
  * ∀ supported typescript version v, v < MAX_TS_VERSION
  * MAX_TS_VERSION is not considered as a supported TypeScript version
+ *
+ * Note: this check is disabled in g3, search for
+ * `angularCompilerOptions.disableTypeScriptVersionCheck` config param value in g3.
  */
-const MAX_TS_VERSION = '4.0.0';
+const MAX_TS_VERSION = '4.1.0';
 
 /**
  * The currently used version of TypeScript, which can be adjusted for testing purposes using
@@ -36,9 +42,8 @@ export function restoreTypeScriptVersionForTesting(): void {
 }
 
 /**
- * Checks whether a given version ∈ [minVersion, maxVersion[
- * An error will be thrown if the following statements are simultaneously true:
- * - the given version ∉ [minVersion, maxVersion[,
+ * Checks whether a given version ∈ [minVersion, maxVersion[.
+ * An error will be thrown when the given version ∉ [minVersion, maxVersion[.
  *
  * @param version The version on which the check will be performed
  * @param minVersion The lower bound version. A valid version needs to be greater than minVersion
diff --git a/packages/compiler-cli/test/compliance/BUILD.bazel b/packages/compiler-cli/test/compliance/BUILD.bazel
index d238d225a86a7..e9ca4aae4e2fc 100644
--- a/packages/compiler-cli/test/compliance/BUILD.bazel
+++ b/packages/compiler-cli/test/compliance/BUILD.bazel
@@ -6,11 +6,15 @@ ts_library(
     srcs = glob(
         ["**/*.ts"],
     ),
+    visibility = [
+        ":__subpackages__",
+    ],
     deps = [
         "//packages:types",
         "//packages/compiler",
         "//packages/compiler-cli",
         "//packages/compiler-cli/src/ngtsc/file_system",
+        "//packages/compiler-cli/test/compliance/mock_compile",
         "//packages/compiler/test:test_utils",
         "@npm//typescript",
     ],
@@ -22,7 +26,7 @@ jasmine_node_test(
     data = [
         "//packages/compiler-cli/test/ngtsc/fake_core:npm_package",
     ],
-    shard_count = 4,
+    shard_count = 2,
     tags = [
         "ivy-only",
     ],
diff --git a/packages/compiler-cli/test/compliance/mock_compile/BUILD.bazel b/packages/compiler-cli/test/compliance/mock_compile/BUILD.bazel
new file mode 100644
index 0000000000000..0dd814d256ebe
--- /dev/null
+++ b/packages/compiler-cli/test/compliance/mock_compile/BUILD.bazel
@@ -0,0 +1,19 @@
+load("//tools:defaults.bzl", "ts_library")
+
+ts_library(
+    name = "mock_compile",
+    testonly = True,
+    srcs = ["index.ts"],
+    visibility = [
+        "//packages/compiler-cli/test/compliance:__subpackages__",
+    ],
+    deps = [
+        "//packages:types",
+        "//packages/compiler",
+        "//packages/compiler-cli",
+        "//packages/compiler-cli/src/ngtsc/core:api",
+        "//packages/compiler-cli/src/ngtsc/file_system",
+        "//packages/compiler/test:test_utils",
+        "@npm//typescript",
+    ],
+)
diff --git a/packages/compiler-cli/test/compliance/mock_compile.ts b/packages/compiler-cli/test/compliance/mock_compile/index.ts
similarity index 91%
rename from packages/compiler-cli/test/compliance/mock_compile.ts
rename to packages/compiler-cli/test/compliance/mock_compile/index.ts
index 2f4185c8bdc90..4c56d03741b42 100644
--- a/packages/compiler-cli/test/compliance/mock_compile.ts
+++ b/packages/compiler-cli/test/compliance/mock_compile/index.ts
@@ -5,13 +5,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
  */
-import {AotCompilerOptions} from '@angular/compiler';
 import {escapeRegExp} from '@angular/compiler/src/util';
 import {arrayToMockDir, MockCompilerHost, MockData, MockDirectory, toMockFileArray} from '@angular/compiler/test/aot/test_util';
 import * as ts from 'typescript';
 
-import {NodeJSFileSystem, setFileSystem} from '../../src/ngtsc/file_system';
-import {NgtscProgram} from '../../src/ngtsc/program';
+import {NgCompilerOptions} from '../../../src/ngtsc/core/api';
+import {NodeJSFileSystem, setFileSystem} from '../../../src/ngtsc/file_system';
+import {NgtscProgram} from '../../../src/ngtsc/program';
 
 const IDENTIFIER = /[A-Za-z_$ɵ][A-Za-z0-9_$]*/;
 const OPERATOR =
@@ -196,12 +196,8 @@ function buildMatcher(pieces: (string|RegExp)[]): {regexp: RegExp, groups: Map<s
   };
 }
 
-
-export function compile(
-    data: MockDirectory, angularFiles: MockData, options: AotCompilerOptions = {},
-    errorCollector: (error: any, fileName?: string) => void = error => {
-      throw error;
-    }): {
+export function doCompile(
+    data: MockDirectory, angularFiles: MockData, options: NgCompilerOptions = {}): {
   source: string,
 } {
   setFileSystem(new NodeJSFileSystem());
@@ -226,3 +222,18 @@ export function compile(
 
   return {source};
 }
+
+export type CompileFn = typeof doCompile;
+
+/**
+ * The actual compile function that will be used to compile the test code.
+ * This can be updated by a test bootstrap script to provide an alternative compile function.
+ */
+export let compile: CompileFn = doCompile;
+
+/**
+ * Update the `compile` exported function to use a new implementation.
+ */
+export function setCompileFn(compileFn: CompileFn) {
+  compile = compileFn;
+}
diff --git a/packages/compiler-cli/test/compliance/prelink/BUILD.bazel b/packages/compiler-cli/test/compliance/prelink/BUILD.bazel
new file mode 100644
index 0000000000000..c0e657d274352
--- /dev/null
+++ b/packages/compiler-cli/test/compliance/prelink/BUILD.bazel
@@ -0,0 +1,29 @@
+load("//tools:defaults.bzl", "jasmine_node_test", "ts_library")
+
+ts_library(
+    name = "prelink_bootstrap",
+    testonly = True,
+    srcs = ["bootstrap.ts"],
+    deps = [
+        "//packages:types",
+        "//packages/compiler-cli/test/compliance/mock_compile",
+    ],
+)
+
+jasmine_node_test(
+    name = "prelink",
+    bootstrap = [
+        "//tools/testing:node_no_angular_es5",
+        ":prelink_bootstrap_es5",
+    ],
+    data = [
+        "//packages/compiler-cli/test/ngtsc/fake_core:npm_package",
+    ],
+    shard_count = 4,
+    tags = [
+        "ivy-only",
+    ],
+    deps = [
+        "//packages/compiler-cli/test/compliance:test_lib",
+    ],
+)
diff --git a/packages/compiler-cli/test/compliance/prelink/bootstrap.ts b/packages/compiler-cli/test/compliance/prelink/bootstrap.ts
new file mode 100644
index 0000000000000..38d8efa990401
--- /dev/null
+++ b/packages/compiler-cli/test/compliance/prelink/bootstrap.ts
@@ -0,0 +1,27 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {CompileFn, doCompile, setCompileFn} from '../mock_compile';
+
+/**
+ * A function to compile the given code in two steps:
+ *
+ * - first compile the code in partial mode
+ * - then compile the partially compiled code using the linker
+ *
+ * This should produce the same output as the full AOT compilation
+ */
+const linkedCompile: CompileFn = (data, angularFiles, options) => {
+  const result = doCompile(data, angularFiles, {...options, compilationMode: 'partial'});
+  // TODO: additional post linking
+  return result;
+};
+
+// Update the function that will do the compiling with this specialised version that
+// runs the prelink and postlink parts of AOT compilation, to check it produces the
+// same result as a normal full AOT compile.
+setCompileFn(linkedCompile);
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 b2c777d0e0aa7..157b724db0de3 100644
--- a/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts
@@ -167,9 +167,7 @@ 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 attributes.
-    xit('should support namespaced attributes', () => {
+    it('should support namespaced attributes', () => {
       const files = {
         app: {
           'spec.ts': `
@@ -194,7 +192,10 @@ describe('compiler compliance', () => {
       // The template should look like this (where IDENT is a wild card for an identifier):
       const template = `
           …
-          consts: [["class", "my-app", 0, "http://someuri/foo", "foo:bar", "baz", "title", "Hello", 0, "http://someuri/foo", "foo:qux", "quacks"]],
+          consts: [[${AttributeMarker.NamespaceURI}, "xmlns", "foo", "http://someuri/foo", ${
+          AttributeMarker.NamespaceURI}, "foo", "bar", "baz", "title", "Hello", ${
+          AttributeMarker.NamespaceURI}, "foo", "qux", "quacks", ${
+          AttributeMarker.Classes}, "my-app"]],
           template: function MyComponent_Template(rf, ctx) {
             if (rf & 1) {
               $r3$.ɵɵelementStart(0, "div", 0);
@@ -1638,7 +1639,7 @@ describe('compiler compliance', () => {
                 $r3$.ɵɵviewQuery(SomeDirective, true);
               }
               if (rf & 2) {
-                var $tmp$;
+                let $tmp$;
                 $r3$.ɵɵqueryRefresh($tmp$ = $r3$.ɵɵloadQuery()) && (ctx.someDir = $tmp$.first);
                 $r3$.ɵɵqueryRefresh($tmp$ = $r3$.ɵɵloadQuery()) && (ctx.someDirs = $tmp$);
               }
@@ -1697,7 +1698,7 @@ describe('compiler compliance', () => {
                 $r3$.ɵɵviewQuery($e1_attrs$, true);
               }
               if (rf & 2) {
-                var $tmp$;
+                let $tmp$;
                 $r3$.ɵɵqueryRefresh($tmp$ = $r3$.ɵɵloadQuery()) && (ctx.myRef = $tmp$.first);
                 $r3$.ɵɵqueryRefresh($tmp$ = $r3$.ɵɵloadQuery()) && (ctx.myRefs = $tmp$);
               }
@@ -1748,7 +1749,7 @@ describe('compiler compliance', () => {
                 $r3$.ɵɵviewQuery($refs$, true);
               }
               if (rf & 2) {
-                var $tmp$;
+                let $tmp$;
                 $r3$.ɵɵqueryRefresh($tmp$ = $r3$.ɵɵloadQuery()) && (ctx.someDir = $tmp$.first);
                 $r3$.ɵɵqueryRefresh($tmp$ = $r3$.ɵɵloadQuery()) && (ctx.foo = $tmp$.first);
               }
@@ -1814,7 +1815,7 @@ describe('compiler compliance', () => {
                 $r3$.ɵɵviewQuery(SomeDirective, true, TemplateRef);
               }
               if (rf & 2) {
-                var $tmp$;
+                let $tmp$;
                 $r3$.ɵɵqueryRefresh($tmp$ = $r3$.ɵɵloadQuery()) && (ctx.myRef = $tmp$.first);
                 $r3$.ɵɵqueryRefresh($tmp$ = $r3$.ɵɵloadQuery()) && (ctx.someDir = $tmp$.first);
                 $r3$.ɵɵqueryRefresh($tmp$ = $r3$.ɵɵloadQuery()) && (ctx.myRefs = $tmp$);
@@ -1875,7 +1876,7 @@ describe('compiler compliance', () => {
               $r3$.ɵɵcontentQuery(dirIndex, SomeDirective, false);
               }
               if (rf & 2) {
-              var $tmp$;
+              let $tmp$;
                 $r3$.ɵɵqueryRefresh($tmp$ = $r3$.ɵɵloadQuery()) && (ctx.someDir = $tmp$.first);
                 $r3$.ɵɵqueryRefresh($tmp$ = $r3$.ɵɵloadQuery()) && (ctx.someDirList = $tmp$);
               }
@@ -1935,7 +1936,7 @@ describe('compiler compliance', () => {
               $r3$.ɵɵcontentQuery(dirIndex, $e1_attrs$, false);
               }
               if (rf & 2) {
-              var $tmp$;
+              let $tmp$;
                 $r3$.ɵɵqueryRefresh($tmp$ = $r3$.ɵɵloadQuery()) && (ctx.myRef = $tmp$.first);
                 $r3$.ɵɵqueryRefresh($tmp$ = $r3$.ɵɵloadQuery()) && (ctx.myRefs = $tmp$);
               }
@@ -1994,7 +1995,7 @@ describe('compiler compliance', () => {
               $r3$.ɵɵcontentQuery(dirIndex, $ref0$, true);
               }
               if (rf & 2) {
-              var $tmp$;
+              let $tmp$;
                 $r3$.ɵɵqueryRefresh($tmp$ = $r3$.ɵɵloadQuery()) && (ctx.someDir = $tmp$.first);
                 $r3$.ɵɵqueryRefresh($tmp$ = $r3$.ɵɵloadQuery()) && (ctx.foo = $tmp$.first);
               }
@@ -2061,7 +2062,7 @@ describe('compiler compliance', () => {
               $r3$.ɵɵcontentQuery(dirIndex, SomeDirective, false, TemplateRef);
               }
               if (rf & 2) {
-              var $tmp$;
+              let $tmp$;
                 $r3$.ɵɵqueryRefresh($tmp$ = $r3$.ɵɵloadQuery()) && (ctx.myRef = $tmp$.first);
                 $r3$.ɵɵqueryRefresh($tmp$ = $r3$.ɵɵloadQuery()) && (ctx.someDir = $tmp$.first);
                 $r3$.ɵɵqueryRefresh($tmp$ = $r3$.ɵɵloadQuery()) && (ctx.myRefs = $tmp$);
diff --git a/packages/compiler-cli/test/compliance/r3_view_compiler_binding_spec.ts b/packages/compiler-cli/test/compliance/r3_view_compiler_binding_spec.ts
index 59b857e7baad2..213718ceb697d 100644
--- a/packages/compiler-cli/test/compliance/r3_view_compiler_binding_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_view_compiler_binding_spec.ts
@@ -180,6 +180,44 @@ describe('compiler compliance: bindings', () => {
          expectEmit(result.source, template, 'Incorrect template');
        });
 
+    it('should emit temporary evaluation within the binding expression for in-order execution',
+       () => {
+         // https://github.com/angular/angular/issues/37194
+         // Verifies that temporary expressions used for expressions with potential side-effects in
+         // the LHS of a safe navigation access are emitted within the binding expression itself, to
+         // ensure that these temporaries are evaluated during the evaluation of the binding. This
+         // is important for when the LHS contains a pipe, as pipe evaluation depends on the current
+         // binding index.
+         const files = {
+           app: {
+             'example.ts': `
+            import {Component} from '@angular/core';
+
+            @Component({
+              template: '<button [title]="myTitle" [id]="(auth()?.identity() | async)?.id" [tabindex]="1"></button>'
+            })
+            export class MyComponent {
+              myTitle = 'hello';
+              auth?: () => { identity(): any; };
+            }`
+           }
+         };
+
+         const result = compile(files, angularFiles);
+         const template = `
+          …
+          template: function MyComponent_Template(rf, ctx) {
+            …
+            if (rf & 2) {
+              let $tmp0$ = null;
+              $r3$.ɵɵproperty("title", ctx.myTitle)("id", ($tmp0$ = $r3$.ɵɵpipeBind1(1, 3, ($tmp0$ = ctx.auth()) == null ? null : $tmp0$.identity())) == null ? null : $tmp0$.id)("tabindex", 1);
+            }
+          }
+        `;
+
+         expectEmit(result.source, template, 'Incorrect template');
+       });
+
     it('should chain multiple property bindings into a single instruction', () => {
       const files = {
         app: {
@@ -685,6 +723,46 @@ describe('compiler compliance: bindings', () => {
       expectEmit(source, HostBindingDirDeclaration, 'Invalid host binding code');
     });
 
+    it('should support host bindings with temporary expressions', () => {
+      const files = {
+        app: {
+          'spec.ts': `
+            import {Directive, NgModule} from '@angular/core';
+
+            @Directive({
+              selector: '[hostBindingDir]',
+              host: {'[id]': 'getData()?.id'}
+            })
+            export class HostBindingDir {
+              getData?: () => { id: number };
+            }
+
+            @NgModule({declarations: [HostBindingDir]})
+            export class MyModule {}
+          `
+        }
+      };
+
+      const HostBindingDirDeclaration = `
+      HostBindingDir.ɵdir = $r3$.ɵɵdefineDirective({
+        type: HostBindingDir,
+        selectors: [["", "hostBindingDir", ""]],
+          hostVars: 1,
+          hostBindings: function HostBindingDir_HostBindings(rf, ctx) {
+            if (rf & 2) {
+              let $tmp0$ = null;
+              $r3$.ɵɵhostProperty("id", ($tmp0$ = ctx.getData()) == null ? null : $tmp0$.id);
+            }
+          }
+        });
+      `;
+
+      const result = compile(files, angularFiles);
+      const source = result.source;
+
+      expectEmit(source, HostBindingDirDeclaration, 'Invalid host binding code');
+    });
+
     it('should support host bindings with pure functions', () => {
       const files = {
         app: {
diff --git a/packages/compiler-cli/test/compliance/r3_view_compiler_di_spec.ts b/packages/compiler-cli/test/compliance/r3_view_compiler_di_spec.ts
index b2d95142b8f9d..3c299e8f2c512 100644
--- a/packages/compiler-cli/test/compliance/r3_view_compiler_di_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_view_compiler_di_spec.ts
@@ -212,7 +212,7 @@ describe('compiler compliance: dependency injection', () => {
           MyService.ɵprov = $r3$.ɵɵdefineInjectable({
             token: MyService,
             factory: function MyService_Factory(t) {
-              var r = null;
+              let r = null;
               if (t) {
                 r = new t();
               } else {
@@ -285,7 +285,7 @@ describe('compiler compliance: dependency injection', () => {
           MyService.ɵprov = $r3$.ɵɵdefineInjectable({
             token: MyService,
             factory: function MyService_Factory(t) {
-              var r = null;
+              let r = null;
               if (t) {
                 r = new t();
               } else {
diff --git a/packages/compiler-cli/test/compliance/r3_view_compiler_i18n_spec.ts b/packages/compiler-cli/test/compliance/r3_view_compiler_i18n_spec.ts
index 2755e0b57ade7..1de26927d04b3 100644
--- a/packages/compiler-cli/test/compliance/r3_view_compiler_i18n_spec.ts
+++ b/packages/compiler-cli/test/compliance/r3_view_compiler_i18n_spec.ts
@@ -182,6 +182,105 @@ const verify = (input: string, output: string, extra: any = {}): void => {
   }
 };
 
+// Describes message metadata object.
+interface Meta {
+  desc?: string;
+  meaning?: string;
+  id?: string;
+}
+
+// Describes placeholder type used in tests. Note: the type is an array (not an object), since it's
+// important to preserve the order of placeholders (so that we can compare it with generated
+// output).
+type Placeholder = [string, string];
+
+// Unique message id index that is needed to avoid different i18n vars with the same name to appear
+// in the i18n block while generating an output string (used to verify compiler-generated code).
+let msgIndex = 0;
+
+// Wraps a string into quotes is needed.
+// Note: if a string starts with `$` is a special case in tests when ICU reference
+// is used as a placeholder value, this we should not wrap it in quotes.
+const quotedValue = (value: string) => value.startsWith('$') ? value : `"${value}"`;
+
+// Generates a string that represents expected Closure metadata output.
+const i18nMsgClosureMeta = (meta?: Meta): string => {
+  if (!meta || !(meta.desc || meta.meaning)) return '';
+  return `
+    /**
+     ${meta.desc ? '* @desc ' + meta.desc : ''}
+     ${meta.meaning ? '* @meaning ' + meta.meaning : ''}
+     */
+  `;
+};
+
+// Converts a set of placeholders to a string (as it's expected from compiler).
+const i18nPlaceholdersToString = (placeholders: Placeholder[]): string => {
+  if (placeholders.length === 0) return '';
+  const result = placeholders.map(([key, value]) => `"${key}": ${quotedValue(value)}`);
+  return `, { ${result.join(',')} }`;
+};
+
+// Generates a string that represents expected $localize metadata output.
+const i18nMsgLocalizeMeta = (meta?: Meta): string => {
+  if (!meta) return '';
+  let localizeMeta = '';
+  if (meta.meaning) localizeMeta += `${meta.meaning}|`;
+  if (meta.desc) localizeMeta += meta.desc;
+  if (meta.id) localizeMeta += `@@${meta.id}`;
+  return `:${localizeMeta}:`;
+};
+
+// Transforms a message in a Closure format to a $localize version.
+const i18nMsgInsertLocalizePlaceholders =
+    (message: string, placeholders: Placeholder[]): string => {
+      if (placeholders.length > 0) {
+        message = message.replace(/{\$(.*?)}/g, function(_, name) {
+          const value = placeholders.find(([k, _]) => k === name)![1];
+          // e.g. startDivTag -> START_DIV_TAG
+          const key = name.replace(/[A-Z]/g, (ch: string) => '_' + ch).toUpperCase();
+          return '$' + String.raw`{${quotedValue(value)}}:${key}:`;
+        });
+      }
+      return message;
+    };
+
+// Generates a string that represents expected i18n block content for simple message.
+const i18nMsg = (message: string, placeholders: Placeholder[] = [], meta?: Meta) => {
+  const varName = `$I18N_${msgIndex++}$`;
+  const closurePlaceholders = i18nPlaceholdersToString(placeholders);
+  const locMessageWithPlaceholders = i18nMsgInsertLocalizePlaceholders(message, placeholders);
+  return String.raw`
+    let ${varName};
+    if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
+        ${i18nMsgClosureMeta(meta)}
+        const $MSG_EXTERNAL_${msgIndex}$ = goog.getMsg("${message}"${closurePlaceholders});
+        ${varName} = $MSG_EXTERNAL_${msgIndex}$;
+    }
+    else {
+      ${varName} = $localize \`${i18nMsgLocalizeMeta(meta)}${locMessageWithPlaceholders}\`;
+    }`;
+};
+
+// Generates a string that represents expected i18n block content for a message that requires
+// post-processing (thus includes `ɵɵi18nPostprocess` in generated code).
+const i18nMsgWithPostprocess =
+    (message: string, placeholders: Placeholder[] = [], meta?: Meta,
+     postprocessPlaceholders?: Placeholder[]) => {
+      const varName = `$I18N_${msgIndex}$`;
+      const ppPaceholders =
+          postprocessPlaceholders ? i18nPlaceholdersToString(postprocessPlaceholders) : '';
+      return String.raw`
+        ${i18nMsg(message, placeholders, meta)}
+        ${varName} = $r3$.ɵɵi18nPostprocess($${varName}$${ppPaceholders});
+      `;
+    };
+
+// Generates a string that represents expected i18n block content for an ICU.
+const i18nIcuMsg = (message: string, placeholders: Placeholder[] = []) => {
+  return i18nMsgWithPostprocess(message, [], undefined, placeholders);
+};
+
 describe('i18n support in the template compiler', () => {
   describe('element attributes', () => {
     it('should add the meaning and description as JsDoc comments and metadata blocks', () => {
@@ -196,136 +295,98 @@ describe('i18n support in the template compiler', () => {
         <div i18n="Some text \\' [BACKUP_MESSAGE_ID: xxx]">Content H</div>
       `;
 
-      const output = String.raw`
-        var $I18N_0$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            /**
-             * @desc descA
-             * @meaning meaningA
-             */
-            const $MSG_EXTERNAL_idA$$APP_SPEC_TS_1$ = goog.getMsg("Content A");
-            $I18N_0$ = $MSG_EXTERNAL_idA$$APP_SPEC_TS_1$;
-        }
-        else {
-          $I18N_0$ = $localize \`:meaningA|descA@@idA:Content A\`;
-        }
-        var $I18N_3$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            /**
-             * @desc descB
-             * @meaning meaningB
-             */
-            const $MSG_EXTERNAL_idB$$APP_SPEC_TS_4$ = goog.getMsg("Title B");
-            $I18N_3$ = $MSG_EXTERNAL_idB$$APP_SPEC_TS_4$;
-        }
-        else {
-          $I18N_3$ = $localize \`:meaningB|descB@@idB:Title B\`;
-        }
-        const $_c5$ = ["title", $I18N_3$];
-        var $I18N_7$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            /**
-             * @meaning meaningC
-             */
-            const $MSG_EXTERNAL_6435899732746131543$$APP_SPEC_TS_8$ = goog.getMsg("Title C");
-            $I18N_7$ = $MSG_EXTERNAL_6435899732746131543$$APP_SPEC_TS_8$;
-        }
-        else {
-          $I18N_7$ = $localize \`:meaningC|:Title C\`;
-        }
-        const $_c9$ = ["title", $I18N_7$];
-        var $I18N_11$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            /**
-             * @desc descD
-             * @meaning meaningD
-             */
-            const $MSG_EXTERNAL_5200291527729162531$$APP_SPEC_TS_12$ = goog.getMsg("Title D");
-            $I18N_11$ = $MSG_EXTERNAL_5200291527729162531$$APP_SPEC_TS_12$;
-        }
-        else {
-          $I18N_11$ = $localize \`:meaningD|descD:Title D\`;
-        }
-        const $_c13$ = ["title", $I18N_11$];
-        var $I18N_15$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            /**
-             * @desc meaningE
-             */
-            const $MSG_EXTERNAL_idE$$APP_SPEC_TS_16$ = goog.getMsg("Title E");
-            $I18N_15$ = $MSG_EXTERNAL_idE$$APP_SPEC_TS_16$;
-        }
-        else {
-          $I18N_15$ = $localize \`:meaningE@@idE:Title E\`;
-        }
-        const $_c17$ = ["title", $I18N_15$];
-        var $I18N_19$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_idF$$APP_SPEC_TS_20$ = goog.getMsg("Title F");
-            $I18N_19$ = $MSG_EXTERNAL_idF$$APP_SPEC_TS_20$;
-        }
-        else {
-            $I18N_19$ = $localize \`:@@idF:Title F\`;
-        }
-        const $_c21$ = ["title", $I18N_19$];
-        var $I18N_23$;
+      const i18n_0 = i18nMsg('Content A', [], {id: 'idA', meaning: 'meaningA', desc: 'descA'});
+      const i18n_1 = i18nMsg('Title B', [], {id: 'idB', meaning: 'meaningB', desc: 'descB'});
+      const i18n_2 = i18nMsg('Title C', [], {meaning: 'meaningC'});
+      const i18n_3 = i18nMsg('Title D', [], {meaning: 'meaningD', desc: 'descD'});
+      const i18n_4 = i18nMsg('Title E', [], {id: 'idE', desc: 'meaningE'});
+      const i18n_5 = i18nMsg('Title F', [], {id: 'idF'});
+
+      // Keeping this block as a raw string, since it checks escaping of special chars.
+      const i18n_6 = String.raw`
+        let $i18n_23$;
         if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            /**
-             * @desc [BACKUP_$` +
+          /**
+           * @desc [BACKUP_$` +
           String.raw`{MESSAGE}_ID:idH]` +
           '`' + String.raw`desc
-             */
-            const $MSG_EXTERNAL_idG$$APP_SPEC_TS_24$ = goog.getMsg("Title G");
-            $I18N_23$ = $MSG_EXTERNAL_idG$$APP_SPEC_TS_24$;
+           */
+          const $MSG_EXTERNAL_idG$$APP_SPEC_TS_24$ = goog.getMsg("Title G");
+          $i18n_23$ = $MSG_EXTERNAL_idG$$APP_SPEC_TS_24$;
         }
         else {
-          $I18N_23$ = $localize \`:[BACKUP_$\{MESSAGE}_ID\:idH]\\\`desc@@idG:Title G\`;
+          $i18n_23$ = $localize \`:[BACKUP_$\{MESSAGE}_ID\:idH]\\\`desc@@idG:Title G\`;
         }
-        const $_c25$ = ["title", $I18N_23$];
-        var $I18N_20$;
+      `;
+
+      // Keeping this block as a raw string, since it checks escaping of special chars.
+      const i18n_7 = String.raw`
+        let $i18n_7$;
         if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            /**
-             * @desc Some text \' [BACKUP_MESSAGE_ID: xxx]
-             */
-            const $MSG_EXTERNAL_idG$$APP_SPEC_TS_21$ = goog.getMsg("Content H");
-            $I18N_20$ = $MSG_EXTERNAL_idG$$APP_SPEC_TS_21$;
+          /**
+           * @desc Some text \' [BACKUP_MESSAGE_ID: xxx]
+           */
+          const $MSG_EXTERNAL_idG$$APP_SPEC_TS_21$ = goog.getMsg("Content H");
+          $i18n_7$ = $MSG_EXTERNAL_idG$$APP_SPEC_TS_21$;
         }
         else {
-          $I18N_20$ = $localize \`:Some text \\' [BACKUP_MESSAGE_ID\: xxx]:Content H\`;
+          $i18n_7$ = $localize \`:Some text \\' [BACKUP_MESSAGE_ID\: xxx]:Content H\`;
         }
-        …
-        consts: [[${AttributeMarker.I18n}, "title"]],
+      `;
+
+      const output = String.raw`
+        consts: function () {
+          ${i18n_0}
+          ${i18n_1}
+          ${i18n_2}
+          ${i18n_3}
+          ${i18n_4}
+          ${i18n_5}
+          ${i18n_6}
+          ${i18n_7}
+          return [
+            $i18n_0$,
+            [${AttributeMarker.I18n}, "title"],
+            ["title", $i18n_1$],
+            ["title", $i18n_2$],
+            ["title", $i18n_3$],
+            ["title", $i18n_4$],
+            ["title", $i18n_5$],
+            ["title", $i18n_6$],
+            $i18n_7$
+          ];
+        },
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵi18n(1, $I18N_0$);
+            $r3$.ɵɵi18n(1, 0);
             $r3$.ɵɵelementEnd();
-            $r3$.ɵɵelementStart(2, "div", 0);
-            $r3$.ɵɵi18nAttributes(3, $_c5$);
+            $r3$.ɵɵelementStart(2, "div", 1);
+            $r3$.ɵɵi18nAttributes(3, 2);
             $r3$.ɵɵtext(4, "Content B");
             $r3$.ɵɵelementEnd();
-            $r3$.ɵɵelementStart(5, "div", 0);
-            $r3$.ɵɵi18nAttributes(6, $_c9$);
+            $r3$.ɵɵelementStart(5, "div", 1);
+            $r3$.ɵɵi18nAttributes(6, 3);
             $r3$.ɵɵtext(7, "Content C");
             $r3$.ɵɵelementEnd();
-            $r3$.ɵɵelementStart(8, "div", 0);
-            $r3$.ɵɵi18nAttributes(9, $_c13$);
+            $r3$.ɵɵelementStart(8, "div", 1);
+            $r3$.ɵɵi18nAttributes(9, 4);
             $r3$.ɵɵtext(10, "Content D");
             $r3$.ɵɵelementEnd();
-            $r3$.ɵɵelementStart(11, "div", 0);
-            $r3$.ɵɵi18nAttributes(12, $_c17$);
+            $r3$.ɵɵelementStart(11, "div", 1);
+            $r3$.ɵɵi18nAttributes(12, 5);
             $r3$.ɵɵtext(13, "Content E");
             $r3$.ɵɵelementEnd();
-            $r3$.ɵɵelementStart(14, "div", 0);
-            $r3$.ɵɵi18nAttributes(15, $_c21$);
+            $r3$.ɵɵelementStart(14, "div", 1);
+            $r3$.ɵɵi18nAttributes(15, 6);
             $r3$.ɵɵtext(16, "Content F");
             $r3$.ɵɵelementEnd();
-            $r3$.ɵɵelementStart(17, "div", 0);
-            $r3$.ɵɵi18nAttributes(18, $_c25$);
+            $r3$.ɵɵelementStart(17, "div", 1);
+            $r3$.ɵɵi18nAttributes(18, 7);
             $r3$.ɵɵtext(19, "Content G");
             $r3$.ɵɵelementEnd();
             $r3$.ɵɵelementStart(20, "div");
-            $r3$.ɵɵi18n(21, $I18N_20$);
+            $r3$.ɵɵi18n(21, 8);
             $r3$.ɵɵelementEnd();
           }
         }
@@ -339,22 +400,19 @@ describe('i18n support in the template compiler', () => {
         <ng-template i18n-title title="Hello"></ng-template>
       `;
 
+      const i18n_0 = i18nMsg('Hello');
       const output = String.raw`
-        var $I18N_0$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_6616505470450179563$$APP_SPEC_TS_1$ = goog.getMsg("Hello");
-            $I18N_0$ = $MSG_EXTERNAL_6616505470450179563$$APP_SPEC_TS_1$;
-        }
-        else {
-            $I18N_0$ = $localize \`Hello\`;
-        }
-        const $_c2$ = ["title", $I18N_0$];
-        …
-        consts: [[${AttributeMarker.I18n}, "title"]],
+        consts: function () {
+          ${i18n_0}
+          return [
+            [${AttributeMarker.I18n}, "title"],
+            ["title", $i18n_0$]
+          ];
+        },
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵtemplate(0, MyComponent_ng_template_0_Template, 0, 0, "ng-template", 0);
-            $r3$.ɵɵi18nAttributes(1, $_c2$);
+            $r3$.ɵɵi18nAttributes(1, 1);
           }
         }
       `;
@@ -367,16 +425,9 @@ describe('i18n support in the template compiler', () => {
             <ng-template *ngIf="visible" i18n-title title="Hello">Test</ng-template>
           `;
 
+         const i18n_0 = i18nMsg('Hello');
+
          const output = String.raw`
-            var $I18N_0$;
-            if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-                const $MSG_EXTERNAL_6616505470450179563$$APP_SPEC_TS_1$ = goog.getMsg("Hello");
-                $I18N_0$ = $MSG_EXTERNAL_6616505470450179563$$APP_SPEC_TS_1$;
-            }
-            else {
-                $I18N_0$ = $localize \`Hello\`;
-            }
-            const $_c2$ = ["title", $I18N_0$];
             function MyComponent_0_ng_template_0_Template(rf, ctx) {
               if (rf & 1) {
                 $r3$.ɵɵtext(0, "Test");
@@ -385,11 +436,18 @@ describe('i18n support in the template compiler', () => {
             function MyComponent_0_Template(rf, ctx) {
               if (rf & 1) {
                 $r3$.ɵɵtemplate(0, MyComponent_0_ng_template_0_Template, 1, 0, "ng-template", 1);
-                $r3$.ɵɵi18nAttributes(1, $_c2$);
+                $r3$.ɵɵi18nAttributes(1, 2);
               }
             }
             …
-            consts: [[${AttributeMarker.Template}, "ngIf"], [${AttributeMarker.I18n}, "title"]],
+            consts: function() {
+              ${i18n_0}
+              return [
+                [${AttributeMarker.Template}, "ngIf"],
+                [${AttributeMarker.I18n}, "title"],
+                ["title", $i18n_0$]
+              ];
+            },
             template: function MyComponent_Template(rf, ctx) {
               if (rf & 1) {
                 $r3$.ɵɵtemplate(0, MyComponent_0_Template, 2, 0, undefined, 0);
@@ -408,25 +466,20 @@ describe('i18n support in the template compiler', () => {
            <ng-template i18n-title title="Hello {{ name }}"></ng-template>
          `;
 
+         const i18n_0 =
+             i18nMsg('Hello {$interpolation}', [['interpolation', String.raw`\uFFFD0\uFFFD`]]);
          const output = String.raw`
-           var $I18N_0$;
-           if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-             const $MSG_EXTERNAL_3771704108176831903$$APP_SPEC_TS_1$ = goog.getMsg("Hello {$interpolation}", {
-               "interpolation": "\uFFFD0\uFFFD"
-              });
-             $I18N_0$ = $MSG_EXTERNAL_3771704108176831903$$APP_SPEC_TS_1$;
-           }
-           else {
-             $I18N_0$ = $localize \`Hello $` +
-             String.raw`{"\uFFFD0\uFFFD"}:INTERPOLATION:\`;
-           }
-           const $_c2$ = ["title", $I18N_0$];
-           …
-           consts: [[${AttributeMarker.Bindings}, "title"]],
+           consts: function() {
+             ${i18n_0}
+             return [
+               [${AttributeMarker.Bindings}, "title"],
+               ["title", $i18n_0$]
+             ];
+           },
            template: function MyComponent_Template(rf, ctx) {
              if (rf & 1) {
                $r3$.ɵɵtemplate(0, MyComponent_ng_template_0_Template, 0, 0, "ng-template", 0);
-               $r3$.ɵɵi18nAttributes(1, $_c2$);
+               $r3$.ɵɵi18nAttributes(1, 1);
              }
              if (rf & 2) {
                $r3$.ɵɵi18nExp(ctx.name);
@@ -443,24 +496,13 @@ describe('i18n support in the template compiler', () => {
             <ng-template *ngIf="true" i18n-title title="Hello {{ name }}"></ng-template>
           `;
 
+         const i18n_0 =
+             i18nMsg('Hello {$interpolation}', [['interpolation', String.raw`\uFFFD0\uFFFD`]]);
          const output = String.raw`
-            var $I18N_0$;
-            if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-              const $MSG_EXTERNAL_3771704108176831903$$APP_SPEC_TS__1$ = goog.getMsg("Hello {$interpolation}", {
-                "interpolation": "\uFFFD0\uFFFD"
-              });
-              $I18N_0$ = $MSG_EXTERNAL_3771704108176831903$$APP_SPEC_TS__1$;
-            }
-            else {
-              $I18N_0$ = $localize \`Hello $` +
-             String.raw`{"\uFFFD0\uFFFD"}:INTERPOLATION:\`;
-            }
-            const $_c2$ = ["title", $I18N_0$];
-            …
             function MyComponent_0_Template(rf, ctx) {
               if (rf & 1) {
                 $r3$.ɵɵtemplate(0, MyComponent_0_ng_template_0_Template, 0, 0, "ng-template", 1);
-                $r3$.ɵɵi18nAttributes(1, $_c2$);
+                $r3$.ɵɵi18nAttributes(1, 2);
               }
               if (rf & 2) {
                 const $ctx_r2$ = $r3$.ɵɵnextContext();
@@ -469,7 +511,14 @@ describe('i18n support in the template compiler', () => {
               }
             }
             …
-            consts: [[${AttributeMarker.Template}, "ngIf"], [${AttributeMarker.Bindings}, "title"]],
+            consts: function() {
+              ${i18n_0}
+              return [
+                [${AttributeMarker.Template}, "ngIf"],
+                [${AttributeMarker.Bindings}, "title"],
+                ["title", $i18n_0$]
+              ];
+            },
             template: function MyComponent_Template(rf, ctx) {
               if (rf & 1) {
                 $r3$.ɵɵtemplate(0, MyComponent_0_Template, 2, 1, undefined, 0);
@@ -509,7 +558,6 @@ describe('i18n support in the template compiler', () => {
       `;
 
       const output = `
-        …
         consts: [[3, "title"]],
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
@@ -530,26 +578,20 @@ describe('i18n support in the template compiler', () => {
         <div id="static" i18n-title="m|d" title="introduction"></div>
       `;
 
+      const i18n_0 = i18nMsg('introduction', [], {meaning: 'm', desc: 'd'});
+
       const output = String.raw`
-        var $I18N_1$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-          /**
-           * @desc d
-           * @meaning m
-           */
-          const $MSG_EXTERNAL_8809028065680254561$$APP_SPEC_TS_1$ = goog.getMsg("introduction");
-          $I18N_1$ = $MSG_EXTERNAL_8809028065680254561$$APP_SPEC_TS_1$;
-        }
-        else {
-          $I18N_1$ = $localize \`:m|d:introduction\`;
-        }
-        const $_c1$ = ["title", $I18N_1$];
-        …
-        consts: [["id", "static", ${AttributeMarker.I18n}, "title"]],
+        consts: function() {
+          ${i18n_0}
+          return [
+            ["id", "static", ${AttributeMarker.I18n}, "title"],
+            ["title", $i18n_0$]
+          ];
+        },
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵelementStart(0, "div", 0);
-            $r3$.ɵɵi18nAttributes(1, $_c1$);
+            $r3$.ɵɵi18nAttributes(1, 1);
             $r3$.ɵɵelementEnd();
           }
         }
@@ -571,97 +613,48 @@ describe('i18n support in the template compiler', () => {
         ></div>
       `;
 
+      const i18n_0 = i18nMsg('static text');
+      const i18n_1 = i18nMsg(
+          'intro {$interpolation}', [['interpolation', String.raw`\uFFFD0\uFFFD`]],
+          {meaning: 'm', desc: 'd'});
+      const i18n_2 = i18nMsg(
+          '{$interpolation}', [['interpolation', String.raw`\uFFFD0\uFFFD`]],
+          {meaning: 'm1', desc: 'd1'});
+      const i18n_3 = i18nMsg(
+          '{$interpolation} and {$interpolation_1} and again {$interpolation_2}',
+          [
+            ['interpolation', String.raw`\uFFFD0\uFFFD`],
+            ['interpolation_1', String.raw`\uFFFD1\uFFFD`],
+            ['interpolation_2', String.raw`\uFFFD2\uFFFD`]
+          ],
+          {meaning: 'm2', desc: 'd2'});
+      const i18n_4 = i18nMsg('{$interpolation}', [['interpolation', String.raw`\uFFFD0\uFFFD`]]);
+
       const output = String.raw`
-        var $I18N_1$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-          const $MSG_EXTERNAL_5526535577705876535$$APP_SPEC_TS_1$ = goog.getMsg("static text");
-          $I18N_1$ = $MSG_EXTERNAL_5526535577705876535$$APP_SPEC_TS_1$;
-        }
-        else {
-          $I18N_1$ = $localize \`static text\`;
-        }
-        var $I18N_2$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-          /**
-           * @desc d
-           * @meaning m
-           */
-          const $MSG_EXTERNAL_8977039798304050198$$APP_SPEC_TS_2$ = goog.getMsg("intro {$interpolation}", {
-            "interpolation": "\uFFFD0\uFFFD"
-          });
-          $I18N_2$ = $MSG_EXTERNAL_8977039798304050198$$APP_SPEC_TS_2$;
-        }
-        else {
-          $I18N_2$ = $localize \`:m|d:intro $` +
-          String.raw`{"\uFFFD0\uFFFD"}:INTERPOLATION:\`;
-        }
-        var $I18N_3$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            /**
-             * @desc d1
-             * @meaning m1
-             */
-            const $MSG_EXTERNAL_7432761130955693041$$APP_SPEC_TS_3$ = goog.getMsg("{$interpolation}", {
-              "interpolation": "\uFFFD0\uFFFD"
-            });
-            $I18N_3$ = $MSG_EXTERNAL_7432761130955693041$$APP_SPEC_TS_3$;
-        }
-        else {
-          $I18N_3$ = $localize \`:m1|d1:$` +
-          String.raw`{"\uFFFD0\uFFFD"}:INTERPOLATION:\`;
-        }
-        const $_c1$ = [
-          "aria-roledescription", $I18N_1$,
-          "title", $I18N_2$,
-          "aria-label", $I18N_3$
-        ];
-        var $I18N_6$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            /**
-             * @desc d2
-             * @meaning m2
-             */
-            const $MSG_EXTERNAL_7566208596013750546$$APP_SPEC_TS_6$ = goog.getMsg("{$interpolation} and {$interpolation_1} and again {$interpolation_2}", {
-              "interpolation": "\uFFFD0\uFFFD", "interpolation_1": "\uFFFD1\uFFFD", "interpolation_2": "\uFFFD2\uFFFD"
-            });
-            $I18N_6$ = $MSG_EXTERNAL_7566208596013750546$$APP_SPEC_TS_6$;
-        }
-        else {
-          $I18N_6$ = $localize \`:m2|d2:$` +
-          String.raw`{"\uFFFD0\uFFFD"}:INTERPOLATION: and $` +
-          String.raw`{"\uFFFD1\uFFFD"}:INTERPOLATION_1: and again $` +
-          String.raw`{"\uFFFD2\uFFFD"}:INTERPOLATION_2:\`;
-        }
-        var $I18N_7$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_6639222533406278123$$APP_SPEC_TS_7$ = goog.getMsg("{$interpolation}", {
-              "interpolation": "\uFFFD0\uFFFD"
-            });
-            $I18N_7$ = $MSG_EXTERNAL_6639222533406278123$$APP_SPEC_TS_7$;
-        }
-        else {
-            $I18N_7$ = $localize \`$` +
-          String.raw`{"\uFFFD0\uFFFD"}:INTERPOLATION:\`;
-        }
-        const $_c3$ = [
-          "title", $I18N_6$,
-          "aria-roledescription", $I18N_7$
-        ];
-        …
         decls: 5,
         vars: 8,
-        consts: [["id", "dynamic-1", ${
-              AttributeMarker
-                  .I18n}, "aria-roledescription", "title", "aria-label"], ["id", "dynamic-2", ${
-              AttributeMarker.I18n}, "title", "aria-roledescription"]],
+        consts: function() {
+          ${i18n_0}
+          ${i18n_1}
+          ${i18n_2}
+          ${i18n_3}
+          ${i18n_4}
+          return [
+            ["id", "dynamic-1", ${AttributeMarker.I18n}, "aria-roledescription",
+                                                                "title", "aria-label"],
+            ["aria-roledescription", $i18n_0$, "title", $i18n_1$, "aria-label", $i18n_2$],
+            ["id", "dynamic-2", ${AttributeMarker.I18n}, "title", "aria-roledescription"],
+            ["title", $i18n_3$, "aria-roledescription", $i18n_4$]
+          ];
+        },
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵelementStart(0, "div", 0);
             $r3$.ɵɵpipe(1, "uppercase");
-            $r3$.ɵɵi18nAttributes(2, $_c1$);
+            $r3$.ɵɵi18nAttributes(2, 1);
             $r3$.ɵɵelementEnd();
-            $r3$.ɵɵelementStart(3, "div", 1);
-            $r3$.ɵɵi18nAttributes(4, $_c3$);
+            $r3$.ɵɵelementStart(3, "div", 2);
+            $r3$.ɵɵi18nAttributes(4, 3);
             $r3$.ɵɵelementEnd();
           }
           if (rf & 2) {
@@ -682,30 +675,23 @@ describe('i18n support in the template compiler', () => {
         <div i18n-title="m|d" title="intro {% valueA | uppercase %}"></div>
       `;
 
+      const i18n_0 = i18nMsg(
+          'intro {$interpolation}', [['interpolation', String.raw`\uFFFD0\uFFFD`]],
+          {meaning: 'm', desc: 'd'});
+
       const output = String.raw`
-        var $I18N_1$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            /**
-             * @desc d
-             * @meaning m
-             */
-            const $MSG_EXTERNAL_8977039798304050198$ = goog.getMsg("intro {$interpolation}", {
-              "interpolation": "\uFFFD0\uFFFD"
-            });
-            $I18N_1$ = $MSG_EXTERNAL_8977039798304050198$;
-        }
-        else {
-          $I18N_1$ = $localize \`:m|d:intro $` +
-          String.raw`{"\uFFFD0\uFFFD"}:INTERPOLATION:\`;
-        }
-        const $_c3$ = ["title", $I18N_1$];
-        …
-        consts: [[${AttributeMarker.I18n}, "title"]],
+        consts: function() {
+          ${i18n_0}
+          return [
+            [${AttributeMarker.I18n}, "title"],
+            ["title", $i18n_0$]
+          ];
+        },
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵelementStart(0, "div", 0);
             $r3$.ɵɵpipe(1, "uppercase");
-            $r3$.ɵɵi18nAttributes(2, $_c3$);
+            $r3$.ɵɵi18nAttributes(2, 1);
             $r3$.ɵɵelementEnd();
           }
           if (rf & 2) {
@@ -724,29 +710,17 @@ describe('i18n support in the template compiler', () => {
         </div>
       `;
 
+      const i18n_0 = i18nMsg(
+          'different scope {$interpolation}', [['interpolation', String.raw`\uFFFD0\uFFFD`]],
+          {meaning: 'm', desc: 'd'});
+
       const output = String.raw`
-        var $I18N_1$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            /**
-             * @desc d
-             * @meaning m
-             */
-            const $MSG_EXTERNAL_8538466649243975456$$APP_SPEC_TS__1$ = goog.getMsg("different scope {$interpolation}", {
-              "interpolation": "\uFFFD0\uFFFD"
-            });
-            $I18N_1$ = $MSG_EXTERNAL_8538466649243975456$$APP_SPEC_TS__1$;
-        }
-        else {
-          $I18N_1$ = $localize \`:m|d:different scope $` +
-          String.raw`{"\uFFFD0\uFFFD"}:INTERPOLATION:\`;
-        }
-        const $_c2$ = ["title", $I18N_1$];
         function MyComponent_div_0_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵelementStart(0, "div");
             $r3$.ɵɵelementStart(1, "div", 1);
             $r3$.ɵɵpipe(2, "uppercase");
-            $r3$.ɵɵi18nAttributes(3, $_c2$);
+            $r3$.ɵɵi18nAttributes(3, 2);
             $r3$.ɵɵelementEnd();
             $r3$.ɵɵelementEnd();
           }
@@ -760,8 +734,14 @@ describe('i18n support in the template compiler', () => {
         …
         decls: 1,
         vars: 1,
-        consts: [[${AttributeMarker.Template}, "ngFor", "ngForOf"], [${
-              AttributeMarker.I18n}, "title"]],
+        consts: function() {
+          ${i18n_0}
+          return [
+            [${AttributeMarker.Template}, "ngFor", "ngForOf"],
+            [${AttributeMarker.I18n}, "title"],
+            ["title", $i18n_0$]
+          ];
+        },
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵtemplate(0, MyComponent_div_0_Template, 4, 3, "div", 0);
@@ -780,33 +760,28 @@ describe('i18n support in the template compiler', () => {
         <div i18n-title title="{{valueA.getRawValue()?.getTitle()}} title"></div>
       `;
 
+      const i18n_0 =
+          i18nMsg('{$interpolation} title', [['interpolation', String.raw`\uFFFD0\uFFFD`]]);
+
       const output = String.raw`
-        var $I18N_1$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_3462388422673575127$$APP_SPEC_TS_2$ = goog.getMsg("{$interpolation} title", {
-              "interpolation": "\uFFFD0\uFFFD"
-            });
-            $I18N_1$ = $MSG_EXTERNAL_3462388422673575127$$APP_SPEC_TS_2$;
-        }
-        else {
-            $I18N_1$ = $localize \`$` +
-          String.raw`{"\uFFFD0\uFFFD"}:INTERPOLATION: title\`;
-        }
-        const $_c3$ = ["title", $I18N_1$];
-        …
         decls: 2,
         vars: 1,
-        consts: [[${AttributeMarker.I18n}, "title"]],
+        consts: function() {
+          ${i18n_0}
+          return [
+            [${AttributeMarker.I18n}, "title"],
+            ["title", $i18n_0$]
+          ];
+        },
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵelementStart(0, "div", 0);
-            $r3$.ɵɵi18nAttributes(1, $_c3$);
+            $r3$.ɵɵi18nAttributes(1, 1);
             $r3$.ɵɵelementEnd();
           }
           if (rf & 2) {
-              var $tmp_0_0$ = null;
-              const $currVal_0$ = ($tmp_0_0$ = ctx.valueA.getRawValue()) == null ? null : $tmp_0_0$.getTitle();
-              $r3$.ɵɵi18nExp($currVal_0$);
+              let $tmp_0_0$ = null;
+              $r3$.ɵɵi18nExp(($tmp_0_0$ = ctx.valueA.getRawValue()) == null ? null : $tmp_0_0$.getTitle());
               $r3$.ɵɵi18nApply(1);
           }
         }
@@ -828,97 +803,48 @@ describe('i18n support in the template compiler', () => {
         ></div>
       `;
 
+      const i18n_0 = i18nMsg('static text');
+      const i18n_1 = i18nMsg(
+          'intro {$interpolation}', [['interpolation', String.raw`\uFFFD0\uFFFD`]],
+          {meaning: 'm', desc: 'd'});
+      const i18n_2 = i18nMsg(
+          '{$interpolation}', [['interpolation', String.raw`\uFFFD0\uFFFD`]],
+          {meaning: 'm1', desc: 'd1'});
+      const i18n_3 = i18nMsg(
+          '{$interpolation} and {$interpolation_1} and again {$interpolation_2}',
+          [
+            ['interpolation', String.raw`\uFFFD0\uFFFD`],
+            ['interpolation_1', String.raw`\uFFFD1\uFFFD`],
+            ['interpolation_2', String.raw`\uFFFD2\uFFFD`]
+          ],
+          {meaning: 'm2', desc: 'd2'});
+      const i18n_4 = i18nMsg('{$interpolation}', [['interpolation', String.raw`\uFFFD0\uFFFD`]]);
+
       const output = String.raw`
-        var $I18N_1$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_5526535577705876535$$APP_SPEC_TS_1$ = goog.getMsg("static text");
-            $I18N_1$ = $MSG_EXTERNAL_5526535577705876535$$APP_SPEC_TS_1$;
-        }
-        else {
-            $I18N_1$ = $localize \`static text\`;
-        }
-        var $I18N_2$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            /**
-             * @desc d
-             * @meaning m
-             */
-            const $MSG_EXTERNAL_8977039798304050198$$APP_SPEC_TS_2$ = goog.getMsg("intro {$interpolation}", {
-              "interpolation": "\uFFFD0\uFFFD"
-            });
-            $I18N_2$ = $MSG_EXTERNAL_8977039798304050198$$APP_SPEC_TS_2$;
-        }
-        else {
-          $I18N_2$ = $localize \`:m|d:intro $` +
-          String.raw`{"\uFFFD0\uFFFD"}:INTERPOLATION:\`;
-        }
-        var $I18N_3$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            /**
-             * @desc d1
-             * @meaning m1
-             */
-            const $MSG_EXTERNAL_7432761130955693041$$APP_SPEC_TS_3$ = goog.getMsg("{$interpolation}", {
-              "interpolation": "\uFFFD0\uFFFD"
-            });
-            $I18N_3$ = $MSG_EXTERNAL_7432761130955693041$$APP_SPEC_TS_3$;
-        }
-        else {
-          $I18N_3$ = $localize \`:m1|d1:$` +
-          String.raw`{"\uFFFD0\uFFFD"}:INTERPOLATION:\`;
-        }
-        const $_c1$ = [
-          "aria-roledescription", $I18N_1$,
-          "title", $I18N_2$,
-          "aria-label", $I18N_3$
-        ];
-        var $I18N_6$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            /**
-             * @desc d2
-             * @meaning m2
-             */
-            const $MSG_EXTERNAL_7566208596013750546$$APP_SPEC_TS_6$ = goog.getMsg("{$interpolation} and {$interpolation_1} and again {$interpolation_2}", {
-              "interpolation": "\uFFFD0\uFFFD", "interpolation_1": "\uFFFD1\uFFFD", "interpolation_2": "\uFFFD2\uFFFD"
-            });
-            $I18N_6$ = $MSG_EXTERNAL_7566208596013750546$$APP_SPEC_TS_6$;
-        }
-        else {
-          $I18N_6$ = $localize \`:m2|d2:$` +
-          String.raw`{"\uFFFD0\uFFFD"}:INTERPOLATION: and $` +
-          String.raw`{"\uFFFD1\uFFFD"}:INTERPOLATION_1: and again $` +
-          String.raw`{"\uFFFD2\uFFFD"}:INTERPOLATION_2:\`;
-        }
-        var $I18N_7$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_6639222533406278123$$APP_SPEC_TS_7$ = goog.getMsg("{$interpolation}", {
-              "interpolation": "\uFFFD0\uFFFD"
-            });
-            $I18N_7$ = $MSG_EXTERNAL_6639222533406278123$$APP_SPEC_TS_7$;
-        }
-        else {
-            $I18N_7$ = $localize \`$` +
-          String.raw`{"\uFFFD0\uFFFD"}:INTERPOLATION:\`;
-        }
-        const $_c3$ = [
-          "title", $I18N_6$,
-          "aria-roledescription", $I18N_7$
-        ];
-        …
         decls: 5,
         vars: 8,
-        consts: [[
-          "id", "dynamic-1",
-          ${AttributeMarker.I18n}, "aria-roledescription", "title", "aria-label"
-        ], ["id", "dynamic-2", ${AttributeMarker.I18n}, "title", "aria-roledescription"]],
+        consts: function() {
+          ${i18n_0}
+          ${i18n_1}
+          ${i18n_2}
+          ${i18n_3}
+          ${i18n_4}
+          return [
+            ["id", "dynamic-1", ${AttributeMarker.I18n}, "aria-roledescription",
+                                                                "title", "aria-label"],
+            ["aria-roledescription", $i18n_0$, "title", $i18n_1$, "aria-label", $i18n_2$],
+            ["id", "dynamic-2", ${AttributeMarker.I18n}, "title", "aria-roledescription"],
+            ["title", $i18n_3$, "aria-roledescription", $i18n_4$]
+          ];
+        },
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵelementStart(0, "div", 0);
             $r3$.ɵɵpipe(1, "uppercase");
-            $r3$.ɵɵi18nAttributes(2, $_c1$);
+            $r3$.ɵɵi18nAttributes(2, 1);
             $r3$.ɵɵelementEnd();
-            $r3$.ɵɵelementStart(3, "div", 1);
-            $r3$.ɵɵi18nAttributes(4, $_c3$);
+            $r3$.ɵɵelementStart(3, "div", 2);
+            $r3$.ɵɵi18nAttributes(4, 3);
             $r3$.ɵɵelementEnd();
           }
           if (rf & 2) {
@@ -941,29 +867,17 @@ describe('i18n support in the template compiler', () => {
         </div>
       `;
 
+      const i18n_0 = i18nMsg(
+          'different scope {$interpolation}', [['interpolation', String.raw`\uFFFD0\uFFFD`]],
+          {meaning: 'm', desc: 'd'});
+
       const output = String.raw`
-        var $I18N_2$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            /**
-             * @desc d
-             * @meaning m
-             */
-            const $MSG_EXTERNAL_8538466649243975456$$APP_SPEC_TS__3$ = goog.getMsg("different scope {$interpolation}", {
-              "interpolation": "\uFFFD0\uFFFD"
-            });
-            $I18N_2$ = $MSG_EXTERNAL_8538466649243975456$$APP_SPEC_TS__3$;
-        }
-        else {
-          $I18N_2$ = $localize \`:m|d:different scope $` +
-          String.raw`{"\uFFFD0\uFFFD"}:INTERPOLATION:\`;
-        }
-        const $_c4$ = ["title", $I18N_2$];
         function MyComponent_div_0_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵelementStart(0, "div");
             $r3$.ɵɵelementStart(1, "div", 1);
             $r3$.ɵɵpipe(2, "uppercase");
-            $r3$.ɵɵi18nAttributes(3, $_c4$);
+            $r3$.ɵɵi18nAttributes(3, 2);
             $r3$.ɵɵelementEnd();
             $r3$.ɵɵelementEnd();
           }
@@ -977,8 +891,14 @@ describe('i18n support in the template compiler', () => {
         …
         decls: 1,
         vars: 1,
-        consts: [[${AttributeMarker.Template}, "ngFor", "ngForOf"], [${
-              AttributeMarker.I18n}, "title"]],
+        consts: function() {
+          ${i18n_0}
+          return [
+            [${AttributeMarker.Template}, "ngFor", "ngForOf"],
+            [${AttributeMarker.I18n}, "title"],
+            ["title", $i18n_0$]
+          ];
+        },
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵtemplate(0, MyComponent_div_0_Template, 4, 3, "div", 0);
@@ -997,35 +917,24 @@ describe('i18n support in the template compiler', () => {
         <div i18n i18n-title="m|d" title="Element title">Some content</div>
       `;
 
+      const i18n_0 = i18nMsg('Element title', [], {meaning: 'm', desc: 'd'});
+      const i18n_1 = i18nMsg('Some content');
+
       const output = String.raw`
-        var $I18N_0$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            /**
-             * @desc d
-             * @meaning m
-             */
-            const $MSG_EXTERNAL_7727043314656808423$$APP_SPEC_TS_0$ = goog.getMsg("Element title");
-            $I18N_0$ = $MSG_EXTERNAL_7727043314656808423$$APP_SPEC_TS_0$;
-        }
-        else {
-          $I18N_0$ = $localize \`:m|d:Element title\`;
-        }
-        const $_c1$ = ["title", $I18N_0$];
-        var $I18N_2$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_4969674997806975147$$APP_SPEC_TS_2$ = goog.getMsg("Some content");
-            $I18N_2$ = $MSG_EXTERNAL_4969674997806975147$$APP_SPEC_TS_2$;
-        }
-        else {
-            $I18N_2$ = $localize \`Some content\`;
-        }
-        …
-        consts: [[${AttributeMarker.I18n}, "title"]],
+        consts: function() {
+          ${i18n_0}
+          ${i18n_1}
+          return [
+            [${AttributeMarker.I18n}, "title"],
+            ["title", $i18n_0$],
+            $i18n_1$
+          ];
+        },
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵelementStart(0, "div", 0);
-            $r3$.ɵɵi18nAttributes(1, $_c1$);
-            $r3$.ɵɵi18n(2, $I18N_2$);
+            $r3$.ɵɵi18nAttributes(1, 1);
+            $r3$.ɵɵi18n(2, 2);
             $r3$.ɵɵelementEnd();
           }
         }
@@ -1033,15 +942,16 @@ describe('i18n support in the template compiler', () => {
       verify(input, output);
     });
 
-    it('should sanitize ids and generate proper var names', () => {
+    it('should sanitize ids and generate proper variable names', () => {
       const input = `
         <div i18n="@@ID.WITH.INVALID.CHARS.2" i18n-title="@@ID.WITH.INVALID.CHARS" title="Element title">
           Some content
         </div>
       `;
 
+      // Keeping raw content (avoiding `i18nMsg`) to illustrate message id sanitization.
       const output = String.raw`
-        var $I18N_0$;
+        let $I18N_0$;
         if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
             const $MSG_EXTERNAL_ID_WITH_INVALID_CHARS$$APP_SPEC_TS_1$ = goog.getMsg("Element title");
             $I18N_0$ = $MSG_EXTERNAL_ID_WITH_INVALID_CHARS$$APP_SPEC_TS_1$;
@@ -1049,8 +959,8 @@ describe('i18n support in the template compiler', () => {
         else {
             $I18N_0$ = $localize \`:@@ID.WITH.INVALID.CHARS:Element title\`;
         }
-        const $_c1$ = ["title", $I18N_0$];
-        var $I18N_2$;
+        …
+        let $I18N_2$;
         if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
             const $MSG_EXTERNAL_ID_WITH_INVALID_CHARS_2$$APP_SPEC_TS_4$ = goog.getMsg(" Some content ");
             $I18N_2$ = $MSG_EXTERNAL_ID_WITH_INVALID_CHARS_2$$APP_SPEC_TS_4$;
@@ -1058,7 +968,6 @@ describe('i18n support in the template compiler', () => {
         else {
             $I18N_2$ = $localize \`:@@ID.WITH.INVALID.CHARS.2: Some content \`;
         }
-        …
       `;
 
       const exceptions = {
@@ -1097,20 +1006,8 @@ describe('i18n support in the template compiler', () => {
     });
 
     it('should ignore HTML comments within translated text', () => {
-      const input = `
-        <div i18n>Some <!-- comments --> text</div>
-      `;
-
-      const output = String.raw`
-      var $I18N_0$;
-      if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-          const $MSG_APP_SPEC_TS_1$ = goog.getMsg("Some  text");
-          $I18N_0$ = $MSG_APP_SPEC_TS_1$;
-      }
-      else {
-          $I18N_0$ = $localize \`Some  text\`;
-      }
-    `;
+      const input = `<div i18n>Some <!-- comments --> text</div>`;
+      const output = i18nMsg('Some  text');
       verify(input, output);
     });
 
@@ -1119,8 +1016,9 @@ describe('i18n support in the template compiler', () => {
         <div i18n>Some text 'with single quotes', "with double quotes", \`with backticks\` and without quotes.</div>
       `;
 
+      // Keeping raw content (avoiding `i18nMsg`) to illustrate quotes escaping.
       const output = String.raw`
-        var $I18N_0$;
+        let $I18N_0$;
         if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
             const $MSG_EXTERNAL_4924931801512133405$$APP_SPEC_TS_0$ = goog.getMsg("Some text 'with single quotes', \"with double quotes\", ` +
           '`with backticks`' + String.raw` and without quotes.");
@@ -1136,8 +1034,9 @@ describe('i18n support in the template compiler', () => {
 
     it('should handle interpolations wrapped in backticks', () => {
       const input = '<div i18n>`{{ count }}`</div>';
+      // Keeping raw content (avoiding `i18nMsg`) to illustrate backticks escaping.
       const output = String.raw`
-      var $I18N_0$;
+      let $I18N_0$;
       if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
           const $MSG_APP_SPEC_TS_1$ = goog.getMsg("` +
           '`{$interpolation}`' + String.raw`", { "interpolation": "\uFFFD0\uFFFD" });
@@ -1159,48 +1058,37 @@ describe('i18n support in the template compiler', () => {
         <div i18n>My i18n block #3</div>
       `;
 
+      const i18n_0 = i18nMsg('My i18n block #1');
+      const i18n_1 = i18nMsg('My i18n block #2');
+      const i18n_2 = i18nMsg('My i18n block #3');
+
       const output = String.raw`
-        var $I18N_0$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_4890179241114413722$$APP_SPEC_TS_0$ = goog.getMsg("My i18n block #1");
-            $I18N_0$ = $MSG_EXTERNAL_4890179241114413722$$APP_SPEC_TS_0$;
-        }
-        else {
-            $I18N_0$ = $localize \`My i18n block #1\`;
-        }
-        var $I18N_1$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_2413150872298537152$$APP_SPEC_TS_1$ = goog.getMsg("My i18n block #2");
-            $I18N_1$ = $MSG_EXTERNAL_2413150872298537152$$APP_SPEC_TS_1$;
-        }
-        else {
-            $I18N_1$ = $localize \`My i18n block #2\`;
-        }
-        var $I18N_2$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_5023003143537152794$$APP_SPEC_TS_2$ = goog.getMsg("My i18n block #3");
-            $I18N_2$ = $MSG_EXTERNAL_5023003143537152794$$APP_SPEC_TS_2$;
-        }
-        else {
-            $I18N_2$ = $localize \`My i18n block #3\`;
-        }
-        …
+        consts: function() {
+          ${i18n_0}
+          ${i18n_1}
+          ${i18n_2}
+          return [
+            $i18n_0$,
+            $i18n_1$,
+            $i18n_2$
+          ];
+        },
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵi18n(1, $I18N_0$);
+            $r3$.ɵɵi18n(1, 0);
             $r3$.ɵɵelementEnd();
             $r3$.ɵɵelementStart(2, "div");
             $r3$.ɵɵtext(3, "My non-i18n block #1");
             $r3$.ɵɵelementEnd();
             $r3$.ɵɵelementStart(4, "div");
-            $r3$.ɵɵi18n(5, $I18N_1$);
+            $r3$.ɵɵi18n(5, 1);
             $r3$.ɵɵelementEnd();
             $r3$.ɵɵelementStart(6, "div");
             $r3$.ɵɵtext(7, "My non-i18n block #2");
             $r3$.ɵɵelementEnd();
             $r3$.ɵɵelementStart(8, "div");
-            $r3$.ɵɵi18n(9, $I18N_2$);
+            $r3$.ɵɵi18n(9, 2);
             $r3$.ɵɵelementEnd();
           }
         }
@@ -1217,8 +1105,10 @@ describe('i18n support in the template compiler', () => {
         </div>
       `;
 
-      const output = String.raw`
-        var $I18N_0$;
+      // Keeping raw content (avoiding `i18nMsg`) to illustrate how named interpolations are
+      // generated.
+      const i18n_0 = String.raw`
+        let $I18N_0$;
         if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
             const $MSG_EXTERNAL_7597881511811528589$$APP_SPEC_TS_0$ = goog.getMsg(" Named interpolation: {$phA} Named interpolation with spaces: {$phB} ", {
               "phA": "\uFFFD0\uFFFD",
@@ -1231,13 +1121,21 @@ describe('i18n support in the template compiler', () => {
           String.raw`{"\uFFFD0\uFFFD"}:PH_A: Named interpolation with spaces: $` +
           String.raw`{"\uFFFD1\uFFFD"}:PH_B: \`;
         }
-        …
+      `;
+
+      const output = String.raw`
         decls: 2,
         vars: 2,
+        consts: function() {
+          ${i18n_0}
+          return [
+            $i18n_0$
+          ];
+        },
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵi18n(1, $I18N_0$);
+            $r3$.ɵɵi18n(1, 0);
             $r3$.ɵɵelementEnd();
           }
           if (rf & 2) {
@@ -1256,23 +1154,19 @@ describe('i18n support in the template compiler', () => {
         <div i18n>{% valueA %}</div>
       `;
 
+      const i18n_0 = i18nMsg('{$interpolation}', [['interpolation', String.raw`\uFFFD0\uFFFD`]]);
+
       const output = String.raw`
-        var $I18N_0$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_6749967533321674787$$APP_SPEC_TS_0$ = goog.getMsg("{$interpolation}", {
-              "interpolation": "\uFFFD0\uFFFD"
-            });
-            $I18N_0$ = $MSG_EXTERNAL_6749967533321674787$$APP_SPEC_TS_0$;
-        }
-        else {
-            $I18N_0$ = $localize \`$` +
-          String.raw`{"\uFFFD0\uFFFD"}:INTERPOLATION:\`;
-        }
-        …
+        consts: function() {
+          ${i18n_0}
+          return [
+            $i18n_0$
+          ];
+        },
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵi18n(1, $I18N_0$);
+            $r3$.ɵɵi18n(1, 0);
             $r3$.ɵɵelementEnd();
           }
           if (rf & 2) {
@@ -1294,35 +1188,32 @@ describe('i18n support in the template compiler', () => {
         </div>
       `;
 
+      const i18n_0 = i18nMsg(' {$interpolation} {$interpolation_1} {$interpolation_2} ', [
+        ['interpolation', String.raw`\uFFFD0\uFFFD`],
+        ['interpolation_1', String.raw`\uFFFD1\uFFFD`],
+        ['interpolation_2', String.raw`\uFFFD2\uFFFD`]
+      ]);
+
       const output = String.raw`
-        var $I18N_0$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_APP_SPEC_TS_1$$APP_SPEC_TS_1$ = goog.getMsg(" {$interpolation} {$interpolation_1} {$interpolation_2} ", {
-              "interpolation": "\uFFFD0\uFFFD",
-              "interpolation_1": "\uFFFD1\uFFFD",
-              "interpolation_2": "\uFFFD2\uFFFD"
-            });
-            $I18N_0$ = $MSG_APP_SPEC_TS_1$$APP_SPEC_TS_1$;
-        }
-        else {
-            $I18N_0$ = $localize \` $` +
-          String.raw`{"\uFFFD0\uFFFD"}:INTERPOLATION: $` +
-          String.raw`{"\uFFFD1\uFFFD"}:INTERPOLATION_1: $` +
-          String.raw`{"\uFFFD2\uFFFD"}:INTERPOLATION_2: \`;
-        }
-        …
+        consts: function() {
+          ${i18n_0}
+          return [
+            $i18n_0$
+          ];
+        },
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵi18n(1, $I18N_0$);
+            $r3$.ɵɵi18n(1, 0);
             $r3$.ɵɵpipe(2, "async");
             $r3$.ɵɵelementEnd();
           }
           if (rf & 2) {
-            var $tmp_2_0$ = null;
-            const $currVal_2$ = ($tmp_2_0$ = ctx.valueA.getRawValue()) == null ? null : $tmp_2_0$.getTitle();
+            let $tmp_2_0$ = null;
             $r3$.ɵɵadvance(2);
-            $r3$.ɵɵi18nExp($r3$.ɵɵpipeBind1(2, 3, ctx.valueA))(ctx.valueA == null ? null : ctx.valueA.a == null ? null : ctx.valueA.a.b)($currVal_2$);
+            $r3$.ɵɵi18nExp($r3$.ɵɵpipeBind1(2, 3, ctx.valueA))
+                          (ctx.valueA == null ? null : ctx.valueA.a == null ? null : ctx.valueA.a.b)
+                          (($tmp_2_0$ = ctx.valueA.getRawValue()) == null ? null : $tmp_2_0$.getTitle());
             $r3$.ɵɵi18nApply(1);
           }
         }
@@ -1337,54 +1228,37 @@ describe('i18n support in the template compiler', () => {
         <div i18n>My i18n block #{{ three + four + five }}</div>
       `;
 
+      const i18n_0 = i18nMsg(
+          'My i18n block #{$interpolation}', [['interpolation', String.raw`\uFFFD0\uFFFD`]]);
+      const i18n_1 = i18nMsg(
+          'My i18n block #{$interpolation}', [['interpolation', String.raw`\uFFFD0\uFFFD`]]);
+      const i18n_2 = i18nMsg(
+          'My i18n block #{$interpolation}', [['interpolation', String.raw`\uFFFD0\uFFFD`]]);
+
       const output = String.raw`
-        var $I18N_0$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_572579892698764378$$APP_SPEC_TS_0$ = goog.getMsg("My i18n block #{$interpolation}", {
-              "interpolation": "\uFFFD0\uFFFD"
-            });
-            $I18N_0$ = $MSG_EXTERNAL_572579892698764378$$APP_SPEC_TS_0$;
-        }
-        else {
-            $I18N_0$ = $localize \`My i18n block #$` +
-          String.raw`{"\uFFFD0\uFFFD"}:INTERPOLATION:\`;
-        }
-        var $I18N_1$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_609623417156596326$$APP_SPEC_TS_1$ = goog.getMsg("My i18n block #{$interpolation}", {
-              "interpolation": "\uFFFD0\uFFFD"
-            });
-            $I18N_1$ = $MSG_EXTERNAL_609623417156596326$$APP_SPEC_TS_1$;
-        }
-        else {
-            $I18N_1$ = $localize \`My i18n block #$` +
-          String.raw`{"\uFFFD0\uFFFD"}:INTERPOLATION:\`;
-        }
-        var $I18N_2$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_3998119318957372120$$APP_SPEC_TS_2$ = goog.getMsg("My i18n block #{$interpolation}", {
-              "interpolation": "\uFFFD0\uFFFD"
-            });
-            $I18N_2$ = $MSG_EXTERNAL_3998119318957372120$$APP_SPEC_TS_2$;
-        }
-        else {
-            $I18N_2$ = $localize \`My i18n block #$` +
-          String.raw`{"\uFFFD0\uFFFD"}:INTERPOLATION:\`;
-        }
-        …
         decls: 7,
         vars: 5,
+        consts: function() {
+          ${i18n_0}
+          ${i18n_1}
+          ${i18n_2}
+          return [
+            $i18n_0$,
+            $i18n_1$,
+            $i18n_2$
+          ];
+        },
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵi18n(1, $I18N_0$);
+            $r3$.ɵɵi18n(1, 0);
             $r3$.ɵɵelementEnd();
             $r3$.ɵɵelementStart(2, "div");
-            $r3$.ɵɵi18n(3, $I18N_1$);
+            $r3$.ɵɵi18n(3, 1);
             $r3$.ɵɵpipe(4, "uppercase");
             $r3$.ɵɵelementEnd();
             $r3$.ɵɵelementStart(5, "div");
-            $r3$.ɵɵi18n(6, $I18N_2$);
+            $r3$.ɵɵi18n(6, 2);
             $r3$.ɵɵelementEnd();
           }
           if (rf & 2) {
@@ -1422,58 +1296,44 @@ describe('i18n support in the template compiler', () => {
         </div>
       `;
 
+      const i18n_0 = i18nMsg(
+          ' My i18n block #{$interpolation} {$startTagSpan}Plain text in nested element{$closeTagSpan}',
+          [
+            ['interpolation', String.raw`\uFFFD0\uFFFD`],
+            ['startTagSpan', String.raw`\uFFFD#2\uFFFD`],
+            ['closeTagSpan', String.raw`\uFFFD/#2\uFFFD`]
+          ]);
+      const i18n_1 = i18nMsgWithPostprocess(
+          ' My i18n block #{$interpolation} {$startTagDiv}{$startTagDiv}{$startTagSpan} More bindings in more nested element: {$interpolation_1} {$closeTagSpan}{$closeTagDiv}{$closeTagDiv}',
+          [
+            ['interpolation', String.raw`\uFFFD0\uFFFD`],
+            ['startTagDiv', String.raw`[\uFFFD#6\uFFFD|\uFFFD#7\uFFFD]`],
+            ['startTagSpan', String.raw`\uFFFD#8\uFFFD`],
+            ['interpolation_1', String.raw`\uFFFD1\uFFFD`],
+            ['closeTagSpan', String.raw`\uFFFD/#8\uFFFD`],
+            ['closeTagDiv', String.raw`[\uFFFD/#7\uFFFD|\uFFFD/#6\uFFFD]`]
+          ]);
+
       const output = String.raw`
-        var $I18N_0$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_7905233330103651696$$APP_SPEC_TS_0$ = goog.getMsg(" My i18n block #{$interpolation} {$startTagSpan}Plain text in nested element{$closeTagSpan}", {
-              "interpolation": "\uFFFD0\uFFFD",
-              "startTagSpan": "\uFFFD#2\uFFFD",
-              "closeTagSpan": "\uFFFD/#2\uFFFD"
-            });
-            $I18N_0$ = $MSG_EXTERNAL_7905233330103651696$$APP_SPEC_TS_0$;
-        }
-        else {
-            $I18N_0$ = $localize \` My i18n block #$` +
-          String.raw`{"\uFFFD0\uFFFD"}:INTERPOLATION: $` +
-          String.raw`{"\uFFFD#2\uFFFD"}:START_TAG_SPAN:Plain text in nested element$` +
-          String.raw`{"\uFFFD/#2\uFFFD"}:CLOSE_TAG_SPAN:\`;
-        }
-        var $I18N_1$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_5788821996131681377$$APP_SPEC_TS_1$ = goog.getMsg(" My i18n block #{$interpolation} {$startTagDiv}{$startTagDiv}{$startTagSpan} More bindings in more nested element: {$interpolation_1} {$closeTagSpan}{$closeTagDiv}{$closeTagDiv}", {
-              "interpolation": "\uFFFD0\uFFFD",
-              "startTagDiv": "[\uFFFD#6\uFFFD|\uFFFD#7\uFFFD]",
-              "startTagSpan": "\uFFFD#8\uFFFD",
-              "interpolation_1": "\uFFFD1\uFFFD",
-              "closeTagSpan": "\uFFFD/#8\uFFFD",
-              "closeTagDiv": "[\uFFFD/#7\uFFFD|\uFFFD/#6\uFFFD]"
-            });
-            $I18N_1$ = $MSG_EXTERNAL_5788821996131681377$$APP_SPEC_TS_1$;
-        }
-        else {
-            $I18N_1$ = $localize \` My i18n block #$` +
-          String.raw`{"\uFFFD0\uFFFD"}:INTERPOLATION: $` +
-          String.raw`{"[\uFFFD#6\uFFFD|\uFFFD#7\uFFFD]"}:START_TAG_DIV:$` +
-          String.raw`{"[\uFFFD#6\uFFFD|\uFFFD#7\uFFFD]"}:START_TAG_DIV:$` + String.raw
-      `{"\uFFFD#8\uFFFD"}:START_TAG_SPAN: More bindings in more nested element: $` +
-          String.raw`{"\uFFFD1\uFFFD"}:INTERPOLATION_1: $` +
-          String.raw`{"\uFFFD/#8\uFFFD"}:CLOSE_TAG_SPAN:$` +
-          String.raw`{"[\uFFFD/#7\uFFFD|\uFFFD/#6\uFFFD]"}:CLOSE_TAG_DIV:$` +
-          String.raw`{"[\uFFFD/#7\uFFFD|\uFFFD/#6\uFFFD]"}:CLOSE_TAG_DIV:\`;
-        }
-        $I18N_1$ = $r3$.ɵɵi18nPostprocess($I18N_1$);
-        …
         decls: 9,
         vars: 5,
+        consts: function() {
+          ${i18n_0}
+          ${i18n_1}
+          return [
+            $i18n_0$,
+            $i18n_1$
+          ];
+        },
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵi18nStart(1, $I18N_0$);
+            $r3$.ɵɵi18nStart(1, 0);
             $r3$.ɵɵelement(2, "span");
             $r3$.ɵɵi18nEnd();
             $r3$.ɵɵelementEnd();
             $r3$.ɵɵelementStart(3, "div");
-            $r3$.ɵɵi18nStart(4, $I18N_1$);
+            $r3$.ɵɵi18nStart(4, 1);
             $r3$.ɵɵpipe(5, "uppercase");
             $r3$.ɵɵelementStart(6, "div");
             $r3$.ɵɵelementStart(7, "div");
@@ -1513,81 +1373,56 @@ describe('i18n support in the template compiler', () => {
         </div>
       `;
 
+      const i18n_0 = i18nMsg('Span title {$interpolation} and {$interpolation_1}', [
+        ['interpolation', String.raw`\uFFFD0\uFFFD`], ['interpolation_1', String.raw`\uFFFD1\uFFFD`]
+      ]);
+      const i18n_1 = i18nMsg(
+          ' My i18n block #1 with value: {$interpolation} {$startTagSpan} Plain text in nested element (block #1) {$closeTagSpan}',
+          [
+            ['interpolation', String.raw`\uFFFD0\uFFFD`],
+            ['startTagSpan', String.raw`\uFFFD#2\uFFFD`],
+            ['closeTagSpan', String.raw`\uFFFD/#2\uFFFD`]
+          ]);
+      const i18n_2 =
+          i18nMsg('Span title {$interpolation}', [['interpolation', String.raw`\uFFFD0\uFFFD`]]);
+      const i18n_3 = i18nMsg(
+          ' My i18n block #2 with value {$interpolation} {$startTagSpan} Plain text in nested element (block #2) {$closeTagSpan}',
+          [
+            ['interpolation', String.raw`\uFFFD0\uFFFD`],
+            ['startTagSpan', String.raw`\uFFFD#7\uFFFD`],
+            ['closeTagSpan', String.raw`\uFFFD/#7\uFFFD`]
+          ]);
+
       const output = String.raw`
-        var $I18N_2$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_4782264005467235841$$APP_SPEC_TS_3$ = goog.getMsg("Span title {$interpolation} and {$interpolation_1}", {
-              "interpolation": "\uFFFD0\uFFFD",
-              "interpolation_1": "\uFFFD1\uFFFD"
-            });
-            $I18N_2$ = $MSG_EXTERNAL_4782264005467235841$$APP_SPEC_TS_3$;
-        }
-        else {
-            $I18N_2$ = $localize \`Span title $` +
-          String.raw`{"\uFFFD0\uFFFD"}:INTERPOLATION: and $` +
-          String.raw`{"\uFFFD1\uFFFD"}:INTERPOLATION_1:\`;
-        }
-        const $_c4$ = ["title", $I18N_2$];
-        var $I18N_0$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_4446430594603971069$$APP_SPEC_TS_5$ = goog.getMsg(" My i18n block #1 with value: {$interpolation} {$startTagSpan} Plain text in nested element (block #1) {$closeTagSpan}", {
-              "interpolation": "\uFFFD0\uFFFD",
-              "startTagSpan": "\uFFFD#2\uFFFD",
-              "closeTagSpan": "\uFFFD/#2\uFFFD"
-            });
-            $I18N_0$ = $MSG_EXTERNAL_4446430594603971069$$APP_SPEC_TS_5$;
-        }
-        else {
-            $I18N_0$ = $localize \` My i18n block #1 with value: $` +
-          String.raw`{"\uFFFD0\uFFFD"}:INTERPOLATION: $` + String.raw
-      `{"\uFFFD#2\uFFFD"}:START_TAG_SPAN: Plain text in nested element (block #1) $` +
-          String.raw`{"\uFFFD/#2\uFFFD"}:CLOSE_TAG_SPAN:\`;
-        }
-        var $I18N_7$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_2719594642740200058$$APP_SPEC_TS_8$ = goog.getMsg("Span title {$interpolation}", {
-              "interpolation": "\uFFFD0\uFFFD"
-            });
-            $I18N_7$ = $MSG_EXTERNAL_2719594642740200058$$APP_SPEC_TS_8$;
-        }
-        else {
-            $I18N_7$ = $localize \`Span title $` +
-          String.raw`{"\uFFFD0\uFFFD"}:INTERPOLATION:\`;
-        }
-        const $_c9$ = ["title", $I18N_7$];
-        var $I18N_6$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_2778714953278357902$$APP_SPEC_TS_10$ = goog.getMsg(" My i18n block #2 with value {$interpolation} {$startTagSpan} Plain text in nested element (block #2) {$closeTagSpan}", {
-              "interpolation": "\uFFFD0\uFFFD",
-              "startTagSpan": "\uFFFD#7\uFFFD",
-              "closeTagSpan": "\uFFFD/#7\uFFFD"
-            });
-            $I18N_6$ = $MSG_EXTERNAL_2778714953278357902$$APP_SPEC_TS_10$;
-        }
-        else {
-            $I18N_6$ = $localize \` My i18n block #2 with value $` +
-          String.raw`{"\uFFFD0\uFFFD"}:INTERPOLATION: $` + String.raw
-      `{"\uFFFD#7\uFFFD"}:START_TAG_SPAN: Plain text in nested element (block #2) $` +
-          String.raw`{"\uFFFD/#7\uFFFD"}:CLOSE_TAG_SPAN:\`;
-        }
-        …
         decls: 9,
         vars: 7,
-        consts: [[${AttributeMarker.I18n}, "title"]],
+        consts: function() {
+          ${i18n_0}
+          ${i18n_1}
+          ${i18n_2}
+          ${i18n_3}
+          return [
+            $i18n_0$,
+            [${AttributeMarker.I18n}, "title"],
+            ["title", $i18n_1$],
+            $i18n_2$,
+            ["title", $i18n_3$]
+          ];
+        },
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵi18nStart(1, $I18N_0$);
-            $r3$.ɵɵelementStart(2, "span", 0);
-            $r3$.ɵɵi18nAttributes(3, $_c4$);
+            $r3$.ɵɵi18nStart(1, 0);
+            $r3$.ɵɵelementStart(2, "span", 1);
+            $r3$.ɵɵi18nAttributes(3, 2);
             $r3$.ɵɵelementEnd();
             $r3$.ɵɵi18nEnd();
             $r3$.ɵɵelementEnd();
             $r3$.ɵɵelementStart(4, "div");
-            $r3$.ɵɵi18nStart(5, $I18N_6$);
+            $r3$.ɵɵi18nStart(5, 3);
             $r3$.ɵɵpipe(6, "uppercase");
-            $r3$.ɵɵelementStart(7, "span", 0);
-            $r3$.ɵɵi18nAttributes(8, $_c9$);
+            $r3$.ɵɵelementStart(7, "span", 1);
+            $r3$.ɵɵi18nAttributes(8, 4);
             $r3$.ɵɵelementEnd();
             $r3$.ɵɵi18nEnd();
             $r3$.ɵɵelementEnd();
@@ -1627,30 +1462,21 @@ describe('i18n support in the template compiler', () => {
         </div>
       `;
 
+      const i18n_0 = i18nMsg(
+          ' Some other content {$interpolation} {$startTagDiv} More nested levels with bindings {$interpolation_1} {$closeTagDiv}',
+          [
+            ['interpolation', String.raw`\uFFFD0\uFFFD`],
+            ['startTagDiv', String.raw`\uFFFD#3\uFFFD`],
+            ['interpolation_1', String.raw`\uFFFD1\uFFFD`],
+            ['closeTagDiv', String.raw`\uFFFD/#3\uFFFD`]
+          ]);
+
       const output = String.raw`
-        var $I18N_1$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_7679414751795588050$$APP_SPEC_TS__1$ = goog.getMsg(" Some other content {$interpolation} {$startTagDiv} More nested levels with bindings {$interpolation_1} {$closeTagDiv}", {
-              "interpolation": "\uFFFD0\uFFFD",
-              "startTagDiv": "\uFFFD#3\uFFFD",
-              "interpolation_1": "\uFFFD1\uFFFD",
-              "closeTagDiv": "\uFFFD/#3\uFFFD"
-            });
-            $I18N_1$ = $MSG_EXTERNAL_7679414751795588050$$APP_SPEC_TS__1$;
-        }
-        else {
-            $I18N_1$ = $localize \` Some other content $` +
-          String.raw`{"\uFFFD0\uFFFD"}:INTERPOLATION: $` +
-          String.raw`{"\uFFFD#3\uFFFD"}:START_TAG_DIV: More nested levels with bindings $` +
-          String.raw`{"\uFFFD1\uFFFD"}:INTERPOLATION_1: $` +
-          String.raw`{"\uFFFD/#3\uFFFD"}:CLOSE_TAG_DIV:\`;
-        }
-        …
         function MyComponent_div_2_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵelementStart(0, "div");
             $r3$.ɵɵelementStart(1, "div");
-            $r3$.ɵɵi18nStart(2, $I18N_1$);
+            $r3$.ɵɵi18nStart(2, 1);
             $r3$.ɵɵelement(3, "div");
             $r3$.ɵɵpipe(4, "uppercase");
             $r3$.ɵɵi18nEnd();
@@ -1667,7 +1493,13 @@ describe('i18n support in the template compiler', () => {
         …
         decls: 3,
         vars: 1,
-        consts: [[${AttributeMarker.Template}, "ngIf"]],
+        consts: function() {
+          ${i18n_0}
+          return [
+            [${AttributeMarker.Template}, "ngIf"],
+            $i18n_0$
+          ];
+        },
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵelementStart(0, "div");
@@ -1692,28 +1524,20 @@ describe('i18n support in the template compiler', () => {
         <img src="logo.png" i18n *ngIf="visible" i18n-title title="App logo #{{ id }}" />
       `;
 
+      const i18n_0 =
+          i18nMsg('App logo #{$interpolation}', [['interpolation', String.raw`\uFFFD0\uFFFD`]]);
+
       const output = String.raw`
         function MyComponent_img_1_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵelement(0, "img", 0);
           }
         }
-        var $I18N_2$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_2367729185105559721$$APP_SPEC_TS__2$ = goog.getMsg("App logo #{$interpolation}", {
-              "interpolation": "\uFFFD0\uFFFD"
-            });
-            $I18N_2$ = $MSG_EXTERNAL_2367729185105559721$$APP_SPEC_TS__2$;
-        }
-        else {
-            $I18N_2$ = $localize \`App logo #$` +
-          String.raw`{"\uFFFD0\uFFFD"}:INTERPOLATION:\`;
-        }
-        const $_c4$ = ["title", $I18N_2$];
+        …
         function MyComponent_img_2_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵelementStart(0, "img", 3);
-            $r3$.ɵɵi18nAttributes(1, $_c4$);
+            $r3$.ɵɵi18nAttributes(1, 4);
             $r3$.ɵɵelementEnd();
           }
           if (rf & 2) {
@@ -1725,11 +1549,17 @@ describe('i18n support in the template compiler', () => {
         …
         decls: 3,
         vars: 2,
-        consts: [["src", "logo.png"], ["src", "logo.png", ${
-              AttributeMarker.Template}, "ngIf"], ["src", "logo.png", ${
-              AttributeMarker.Bindings}, "title", ${
-              AttributeMarker.Template}, "ngIf"], ["src", "logo.png", ${
-              AttributeMarker.I18n}, "title"]],
+        consts: function() {
+          ${i18n_0}
+          return [
+            ["src", "logo.png"],
+            ["src", "logo.png", ${AttributeMarker.Template}, "ngIf"],
+            ["src", "logo.png", ${AttributeMarker.Bindings}, "title",
+                                ${AttributeMarker.Template}, "ngIf"],
+            ["src", "logo.png", ${AttributeMarker.I18n}, "title"],
+            ["title", $i18n_0$]
+          ];
+        },
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵelement(0, "img", 0);
@@ -1773,10 +1603,30 @@ describe('i18n support in the template compiler', () => {
         </div>
       `;
 
+      const i18n_0 = i18nMsgWithPostprocess(
+          ' Some content {$startTagDiv_2} Some other content {$interpolation} {$startTagDiv} More nested levels with bindings {$interpolation_1} {$startTagDiv_1} Content inside sub-template {$interpolation_2} {$startTagDiv} Bottom level element {$interpolation_3} {$closeTagDiv}{$closeTagDiv}{$closeTagDiv}{$closeTagDiv}{$startTagDiv_3} Some other content {$interpolation_4} {$startTagDiv} More nested levels with bindings {$interpolation_5} {$closeTagDiv}{$closeTagDiv}',
+          [
+            ['startTagDiv_2', String.raw`\uFFFD*2:1\uFFFD\uFFFD#1:1\uFFFD`],
+            [
+              'closeTagDiv',
+              String
+                  .raw`[\uFFFD/#2:2\uFFFD|\uFFFD/#1:2\uFFFD\uFFFD/*4:2\uFFFD|\uFFFD/#2:1\uFFFD|\uFFFD/#1:1\uFFFD\uFFFD/*2:1\uFFFD|\uFFFD/#2:3\uFFFD|\uFFFD/#1:3\uFFFD\uFFFD/*3:3\uFFFD]`
+            ],
+            ['startTagDiv_3', String.raw`\uFFFD*3:3\uFFFD\uFFFD#1:3\uFFFD`],
+            ['interpolation', String.raw`\uFFFD0:1\uFFFD`],
+            ['startTagDiv', String.raw`[\uFFFD#2:1\uFFFD|\uFFFD#2:2\uFFFD|\uFFFD#2:3\uFFFD]`],
+            ['interpolation_1', String.raw`\uFFFD1:1\uFFFD`],
+            ['startTagDiv_1', String.raw`\uFFFD*4:2\uFFFD\uFFFD#1:2\uFFFD`],
+            ['interpolation_2', String.raw`\uFFFD0:2\uFFFD`],
+            ['interpolation_3', String.raw`\uFFFD1:2\uFFFD`],
+            ['interpolation_4', String.raw`\uFFFD0:3\uFFFD`],
+            ['interpolation_5', String.raw`\uFFFD1:3\uFFFD`]
+          ]);
+
       const output = String.raw`
         function MyComponent_div_2_div_4_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵi18nStart(0, $I18N_0$, 2);
+            $r3$.ɵɵi18nStart(0, 0, 2);
             $r3$.ɵɵelementStart(1, "div");
             $r3$.ɵɵelement(2, "div");
             $r3$.ɵɵelementEnd();
@@ -1791,11 +1641,11 @@ describe('i18n support in the template compiler', () => {
         }
         function MyComponent_div_2_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵi18nStart(0, $I18N_0$, 1);
+            $r3$.ɵɵi18nStart(0, 0, 1);
             $r3$.ɵɵelementStart(1, "div");
             $r3$.ɵɵelementStart(2, "div");
             $r3$.ɵɵpipe(3, "uppercase");
-            $r3$.ɵɵtemplate(4, MyComponent_div_2_div_4_Template, 3, 2, "div", 0);
+            $r3$.ɵɵtemplate(4, MyComponent_div_2_div_4_Template, 3, 2, "div", 1);
             $r3$.ɵɵelementEnd();
             $r3$.ɵɵelementEnd();
             $r3$.ɵɵi18nEnd();
@@ -1808,54 +1658,10 @@ describe('i18n support in the template compiler', () => {
             $r3$.ɵɵi18nApply(0);
           }
         }
-        var $I18N_0$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_1221890473527419724$$APP_SPEC_TS_0$ = goog.getMsg(" Some content {$startTagDiv_2} Some other content {$interpolation} {$startTagDiv} More nested levels with bindings {$interpolation_1} {$startTagDiv_1} Content inside sub-template {$interpolation_2} {$startTagDiv} Bottom level element {$interpolation_3} {$closeTagDiv}{$closeTagDiv}{$closeTagDiv}{$closeTagDiv}{$startTagDiv_3} Some other content {$interpolation_4} {$startTagDiv} More nested levels with bindings {$interpolation_5} {$closeTagDiv}{$closeTagDiv}", {
-              "startTagDiv_2": "\uFFFD*2:1\uFFFD\uFFFD#1:1\uFFFD",
-              "closeTagDiv": "[\uFFFD/#2:2\uFFFD|\uFFFD/#1:2\uFFFD\uFFFD/*4:2\uFFFD|\uFFFD/#2:1\uFFFD|\uFFFD/#1:1\uFFFD\uFFFD/*2:1\uFFFD|\uFFFD/#2:3\uFFFD|\uFFFD/#1:3\uFFFD\uFFFD/*3:3\uFFFD]",
-              "startTagDiv_3": "\uFFFD*3:3\uFFFD\uFFFD#1:3\uFFFD",
-              "interpolation": "\uFFFD0:1\uFFFD",
-              "startTagDiv": "[\uFFFD#2:1\uFFFD|\uFFFD#2:2\uFFFD|\uFFFD#2:3\uFFFD]",
-              "interpolation_1": "\uFFFD1:1\uFFFD",
-              "startTagDiv_1": "\uFFFD*4:2\uFFFD\uFFFD#1:2\uFFFD",
-              "interpolation_2": "\uFFFD0:2\uFFFD",
-              "interpolation_3": "\uFFFD1:2\uFFFD",
-              "interpolation_4": "\uFFFD0:3\uFFFD",
-              "interpolation_5": "\uFFFD1:3\uFFFD"
-            });
-            $I18N_0$ = $MSG_EXTERNAL_1221890473527419724$$APP_SPEC_TS_0$;
-        }
-        else {
-            $I18N_0$ = $localize \` Some content $` +
-          String.raw
-      `{"\uFFFD*2:1\uFFFD\uFFFD#1:1\uFFFD"}:START_TAG_DIV_2: Some other content $` +
-          String.raw`{"\uFFFD0:1\uFFFD"}:INTERPOLATION: $` + String.raw
-      `{"[\uFFFD#2:1\uFFFD|\uFFFD#2:2\uFFFD|\uFFFD#2:3\uFFFD]"}:START_TAG_DIV: More nested levels with bindings $` +
-          String.raw`{"\uFFFD1:1\uFFFD"}:INTERPOLATION_1: $` + String.raw
-      `{"\uFFFD*4:2\uFFFD\uFFFD#1:2\uFFFD"}:START_TAG_DIV_1: Content inside sub-template $` +
-          String.raw`{"\uFFFD0:2\uFFFD"}:INTERPOLATION_2: $` + String.raw
-      `{"[\uFFFD#2:1\uFFFD|\uFFFD#2:2\uFFFD|\uFFFD#2:3\uFFFD]"}:START_TAG_DIV: Bottom level element $` +
-          String.raw`{"\uFFFD1:2\uFFFD"}:INTERPOLATION_3: $` + String.raw
-      `{"[\uFFFD/#2:2\uFFFD|\uFFFD/#1:2\uFFFD\uFFFD/*4:2\uFFFD|\uFFFD/#2:1\uFFFD|\uFFFD/#1:1\uFFFD\uFFFD/*2:1\uFFFD|\uFFFD/#2:3\uFFFD|\uFFFD/#1:3\uFFFD\uFFFD/*3:3\uFFFD]"}:CLOSE_TAG_DIV:$` +
-          String.raw
-      `{"[\uFFFD/#2:2\uFFFD|\uFFFD/#1:2\uFFFD\uFFFD/*4:2\uFFFD|\uFFFD/#2:1\uFFFD|\uFFFD/#1:1\uFFFD\uFFFD/*2:1\uFFFD|\uFFFD/#2:3\uFFFD|\uFFFD/#1:3\uFFFD\uFFFD/*3:3\uFFFD]"}:CLOSE_TAG_DIV:$` +
-          String.raw
-      `{"[\uFFFD/#2:2\uFFFD|\uFFFD/#1:2\uFFFD\uFFFD/*4:2\uFFFD|\uFFFD/#2:1\uFFFD|\uFFFD/#1:1\uFFFD\uFFFD/*2:1\uFFFD|\uFFFD/#2:3\uFFFD|\uFFFD/#1:3\uFFFD\uFFFD/*3:3\uFFFD]"}:CLOSE_TAG_DIV:$` +
-          String.raw
-      `{"[\uFFFD/#2:2\uFFFD|\uFFFD/#1:2\uFFFD\uFFFD/*4:2\uFFFD|\uFFFD/#2:1\uFFFD|\uFFFD/#1:1\uFFFD\uFFFD/*2:1\uFFFD|\uFFFD/#2:3\uFFFD|\uFFFD/#1:3\uFFFD\uFFFD/*3:3\uFFFD]"}:CLOSE_TAG_DIV:$` +
-          String.raw
-      `{"\uFFFD*3:3\uFFFD\uFFFD#1:3\uFFFD"}:START_TAG_DIV_3: Some other content $` +
-          String.raw`{"\uFFFD0:3\uFFFD"}:INTERPOLATION_4: $` + String.raw
-      `{"[\uFFFD#2:1\uFFFD|\uFFFD#2:2\uFFFD|\uFFFD#2:3\uFFFD]"}:START_TAG_DIV: More nested levels with bindings $` +
-          String.raw`{"\uFFFD1:3\uFFFD"}:INTERPOLATION_5: $` + String.raw
-      `{"[\uFFFD/#2:2\uFFFD|\uFFFD/#1:2\uFFFD\uFFFD/*4:2\uFFFD|\uFFFD/#2:1\uFFFD|\uFFFD/#1:1\uFFFD\uFFFD/*2:1\uFFFD|\uFFFD/#2:3\uFFFD|\uFFFD/#1:3\uFFFD\uFFFD/*3:3\uFFFD]"}:CLOSE_TAG_DIV:$` +
-          String.raw
-      `{"[\uFFFD/#2:2\uFFFD|\uFFFD/#1:2\uFFFD\uFFFD/*4:2\uFFFD|\uFFFD/#2:1\uFFFD|\uFFFD/#1:1\uFFFD\uFFFD/*2:1\uFFFD|\uFFFD/#2:3\uFFFD|\uFFFD/#1:3\uFFFD\uFFFD/*3:3\uFFFD]"}:CLOSE_TAG_DIV:\`;
-        }
-        $I18N_0$ = $r3$.ɵɵi18nPostprocess($I18N_0$);
+        …
         function MyComponent_div_3_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵi18nStart(0, $I18N_0$, 3);
+            $r3$.ɵɵi18nStart(0, 0, 3);
             $r3$.ɵɵelementStart(1, "div");
             $r3$.ɵɵelement(2, "div");
             $r3$.ɵɵpipe(3, "uppercase");
@@ -1872,13 +1678,19 @@ describe('i18n support in the template compiler', () => {
         …
         decls: 4,
         vars: 2,
-        consts: [[${AttributeMarker.Template}, "ngIf"]],
+        consts: function() {
+          ${i18n_0}
+          return [
+            $i18n_0$,
+            [${AttributeMarker.Template}, "ngIf"]
+          ];
+        },
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵi18nStart(1, $I18N_0$);
-            $r3$.ɵɵtemplate(2, MyComponent_div_2_Template, 5, 5, "div", 0);
-            $r3$.ɵɵtemplate(3, MyComponent_div_3_Template, 4, 4, "div", 0);
+            $r3$.ɵɵi18nStart(1, 0);
+            $r3$.ɵɵtemplate(2, MyComponent_div_2_Template, 5, 5, "div", 1);
+            $r3$.ɵɵtemplate(3, MyComponent_div_3_Template, 4, 4, "div", 1);
             $r3$.ɵɵi18nEnd();
             $r3$.ɵɵelementEnd();
           }
@@ -1899,27 +1711,16 @@ describe('i18n support in the template compiler', () => {
         <div i18n *ngIf="visible">Some other content <span>{{ valueA }}</span></div>
       `;
 
+      const i18n_0 = i18nMsg('Some other content {$startTagSpan}{$interpolation}{$closeTagSpan}', [
+        ['startTagSpan', String.raw`\uFFFD#2\uFFFD`], ['interpolation', String.raw`\uFFFD0\uFFFD`],
+        ['closeTagSpan', String.raw`\uFFFD/#2\uFFFD`]
+      ]);
+
       const output = String.raw`
-        var $I18N_1$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_119975189388320493$$APP_SPEC_TS__1$ = goog.getMsg("Some other content {$startTagSpan}{$interpolation}{$closeTagSpan}", {
-              "startTagSpan": "\uFFFD#2\uFFFD",
-              "interpolation": "\uFFFD0\uFFFD",
-              "closeTagSpan": "\uFFFD/#2\uFFFD"
-            });
-            $I18N_1$ = $MSG_EXTERNAL_119975189388320493$$APP_SPEC_TS__1$;
-        }
-        else {
-            $I18N_1$ = $localize \`Some other content $` +
-          String.raw`{"\uFFFD#2\uFFFD"}:START_TAG_SPAN:$` +
-          String.raw`{"\uFFFD0\uFFFD"}:INTERPOLATION:$` +
-          String.raw`{"\uFFFD/#2\uFFFD"}:CLOSE_TAG_SPAN:\`;
-        }
-        …
         function MyComponent_div_0_Template(rf, ctx) {
           if (rf & 1) {
               $r3$.ɵɵelementStart(0, "div");
-              $r3$.ɵɵi18nStart(1, $I18N_1$);
+              $r3$.ɵɵi18nStart(1, 1);
               $r3$.ɵɵelement(2, "span");
               $r3$.ɵɵi18nEnd();
               $r3$.ɵɵelementEnd();
@@ -1934,7 +1735,13 @@ describe('i18n support in the template compiler', () => {
         …
         decls: 1,
         vars: 1,
-        consts: [[${AttributeMarker.Template}, "ngIf"]],
+        consts: function() {
+          ${i18n_0}
+          return [
+            [${AttributeMarker.Template}, "ngIf"],
+            $i18n_0$
+          ];
+        },
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵtemplate(0, MyComponent_div_0_Template, 3, 1, "div", 0);
@@ -1953,22 +1760,21 @@ describe('i18n support in the template compiler', () => {
         <div i18n (click)="onClick()">Hello</div>
       `;
 
+      const i18n_0 = i18nMsg('Hello');
+
       const output = String.raw`
-        var $I18N_1$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_APP_SPEC_TS_2$ = goog.getMsg("Hello");
-            $I18N_1$ = $MSG_APP_SPEC_TS_2$;
-        }
-        else {
-            $I18N_1$ = $localize \`Hello\`;
-        }
-        …
-        consts: [[${AttributeMarker.Bindings}, "click"]],
+        consts: function() {
+          ${i18n_0}
+          return [
+            [${AttributeMarker.Bindings}, "click"],
+            $i18n_0$
+          ];
+        },
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵelementStart(0, "div", 0);
             $r3$.ɵɵlistener("click", function MyComponent_Template_div_click_0_listener() { return ctx.onClick(); });
-            $r3$.ɵɵi18n(1, $I18N_1$);
+            $r3$.ɵɵi18n(1, 1);
             $r3$.ɵɵelementEnd();
           }
         }
@@ -1984,20 +1790,19 @@ describe('i18n support in the template compiler', () => {
         <div i18n>My i18n block #1</div>
       `;
 
+      const i18n_0 = i18nMsg('My i18n block #1');
+
       const output = String.raw`
-        var $I18N_0$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_4890179241114413722$$APP_SPEC_TS_0$ = goog.getMsg("My i18n block #1");
-            $I18N_0$ = $MSG_EXTERNAL_4890179241114413722$$APP_SPEC_TS_0$;
-        }
-        else {
-            $I18N_0$ = $localize \`My i18n block #1\`;
-        }
-        …
+        consts: function() {
+          ${i18n_0}
+          return [
+            $i18n_0$
+          ];
+        },
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵi18n(1, $I18N_0$);
+            $r3$.ɵɵi18n(1, 0);
             $r3$.ɵɵelementEnd();
           }
         }
@@ -2011,25 +1816,23 @@ describe('i18n support in the template compiler', () => {
         <div i18n>{age, select, 10 {ten} 20 {twenty} other {other}}</div>
       `;
 
+      const i18n_0 = i18nIcuMsg(
+          '{VAR_SELECT, select, 10 {ten} 20 {twenty} other {other}}',
+          [['VAR_SELECT', String.raw`\uFFFD0\uFFFD`]]);
+
       const output = String.raw`
-        var $I18N_0$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_8806993169187953163$$APP_SPEC_TS_0$ = goog.getMsg("{VAR_SELECT, select, 10 {ten} 20 {twenty} other {other}}");
-            $I18N_0$ = $MSG_EXTERNAL_8806993169187953163$$APP_SPEC_TS_0$;
-        }
-        else {
-            $I18N_0$ = $localize \`{VAR_SELECT, select, 10 {ten} 20 {twenty} other {other}}\`;
-        }
-        $I18N_0$ = $r3$.ɵɵi18nPostprocess($I18N_0$, {
-          "VAR_SELECT": "\uFFFD0\uFFFD"
-        });
-        …
         decls: 2,
         vars: 1,
+        consts: function() {
+          ${i18n_0}
+          return [
+            $i18n_0$
+          ];
+        },
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵi18n(1, $I18N_0$);
+            $r3$.ɵɵi18n(1, 0);
             $r3$.ɵɵelementEnd();
           }
           if (rf & 2) {
@@ -2049,34 +1852,29 @@ describe('i18n support in the template compiler', () => {
         <ng-container i18n>My i18n block #2</ng-container>
       `;
 
+      const i18n_0 = i18nMsg('My i18n block #2');
+      const i18n_1 = i18nMsg('My i18n block #1');
+
       const output = String.raw`
-        var $I18N_0$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_2413150872298537152$$APP_SPEC_TS_0$ = goog.getMsg("My i18n block #2");
-            $I18N_0$ = $MSG_EXTERNAL_2413150872298537152$$APP_SPEC_TS_0$;
-        }
-        else {
-            $I18N_0$ = $localize \`My i18n block #2\`;
-        }
-        var $I18N_1$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_4890179241114413722$$APP_SPEC_TS__1$ = goog.getMsg("My i18n block #1");
-            $I18N_1$ = $MSG_EXTERNAL_4890179241114413722$$APP_SPEC_TS__1$;
-        }
-        else {
-            $I18N_1$ = $localize \`My i18n block #1\`;
-        }
         function MyComponent_ng_template_0_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵi18n(0, $I18N_1$);
+            $r3$.ɵɵi18n(0, 1);
           }
         }
         …
+        consts: function() {
+          ${i18n_0}
+          ${i18n_1}
+          return [
+            $i18n_0$,
+            $i18n_1$
+          ];
+        },
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵtemplate(0, MyComponent_ng_template_0_Template, 1, 0, "ng-template");
             $r3$.ɵɵelementContainerStart(1);
-            $r3$.ɵɵi18n(2, $I18N_0$);
+            $r3$.ɵɵi18n(2, 0);
             $r3$.ɵɵelementContainerEnd();
           }
         }
@@ -2091,35 +1889,29 @@ describe('i18n support in the template compiler', () => {
         <span i18n style="padding: 10px;">Text #2</span>
       `;
 
+      const i18n_0 = i18nMsg('Text #1');
+      const i18n_1 = i18nMsg('Text #2');
+
       const output = String.raw`
-        var $I18N_1$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_5295701706185791735$$APP_SPEC_TS_1$ = goog.getMsg("Text #1");
-            $I18N_1$ = $MSG_EXTERNAL_5295701706185791735$$APP_SPEC_TS_1$;
-        }
-        else {
-            $I18N_1$ = $localize \`Text #1\`;
-        }
-        var $I18N_3$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_4722270221386399294$$APP_SPEC_TS_3$ = goog.getMsg("Text #2");
-            $I18N_3$ = $MSG_EXTERNAL_4722270221386399294$$APP_SPEC_TS_3$;
-        }
-        else {
-            $I18N_3$ = $localize \`Text #2\`;
-        }
-        …
         decls: 4,
         vars: 0,
-        consts: [[${AttributeMarker.Classes}, "myClass"], [${
-          AttributeMarker.Styles}, "padding", "10px"]],
+        consts: function() {
+          ${i18n_0}
+          ${i18n_1}
+          return [
+            [${AttributeMarker.Classes}, "myClass"],
+            $i18n_0$,
+            [${AttributeMarker.Styles}, "padding", "10px"],
+            $i18n_1$
+          ];
+        },
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵelementStart(0, "span", 0);
-            $r3$.ɵɵi18n(1, $I18N_1$);
+            $r3$.ɵɵi18n(1, 1);
             $r3$.ɵɵelementEnd();
-            $r3$.ɵɵelementStart(2, "span", 1);
-            $r3$.ɵɵi18n(3, $I18N_3$);
+            $r3$.ɵɵelementStart(2, "span", 2);
+            $r3$.ɵɵi18n(3, 3);
             $r3$.ɵɵelementEnd();
           }
         }
@@ -2135,25 +1927,22 @@ describe('i18n support in the template compiler', () => {
         <ng-container i18n>Some content: {{ valueA | uppercase }}</ng-container>
       `;
 
+      const i18n_0 =
+          i18nMsg('Some content: {$interpolation}', [['interpolation', String.raw`\uFFFD0\uFFFD`]]);
+
       const output = String.raw`
-        var $I18N_0$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-          const $MSG_EXTERNAL_355394464191978948$$APP_SPEC_TS_0$ = goog.getMsg("Some content: {$interpolation}", {
-              "interpolation": "\uFFFD0\uFFFD"
-            });
-          $I18N_0$ = $MSG_EXTERNAL_355394464191978948$$APP_SPEC_TS_0$;
-        }
-        else {
-          $I18N_0$ = $localize \`Some content: $` +
-          String.raw`{"\uFFFD0\uFFFD"}:INTERPOLATION:\`;
-        }
-        …
         decls: 3,
         vars: 3,
+        consts: function() {
+          ${i18n_0}
+          return [
+            $i18n_0$
+          ];
+        },
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵelementContainerStart(0);
-            $r3$.ɵɵi18n(1, $I18N_0$);
+            $r3$.ɵɵi18n(1, 0);
             $r3$.ɵɵpipe(2, "uppercase");
             $r3$.ɵɵelementContainerEnd();
           }
@@ -2173,21 +1962,13 @@ describe('i18n support in the template compiler', () => {
         <ng-template i18n>Some content: {{ valueA | uppercase }}</ng-template>
       `;
 
+      const i18n_0 =
+          i18nMsg('Some content: {$interpolation}', [['interpolation', String.raw`\uFFFD0\uFFFD`]]);
+
       const output = String.raw`
-        var $I18N_0$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_355394464191978948$$APP_SPEC_TS__0$ = goog.getMsg("Some content: {$interpolation}", {
-              "interpolation": "\uFFFD0\uFFFD"
-            });
-            $I18N_0$ = $MSG_EXTERNAL_355394464191978948$$APP_SPEC_TS__0$;
-        }
-        else {
-            $I18N_0$ = $localize \`Some content: $` +
-          String.raw`{"\uFFFD0\uFFFD"}:INTERPOLATION:\`;
-        }
         function MyComponent_ng_template_0_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵi18n(0, $I18N_0$);
+            $r3$.ɵɵi18n(0, 0);
             $r3$.ɵɵpipe(1, "uppercase");
           } if (rf & 2) {
             const $ctx_r0$ = $r3$.ɵɵnextContext();
@@ -2199,6 +1980,12 @@ describe('i18n support in the template compiler', () => {
         …
         decls: 1,
         vars: 0,
+        consts: function() {
+          ${i18n_0}
+          return [
+            $i18n_0$
+          ];
+        },
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵtemplate(0, MyComponent_ng_template_0_Template, 2, 3, "ng-template");
@@ -2217,31 +2004,21 @@ describe('i18n support in the template compiler', () => {
         </div>
       `;
 
+      const i18n_0 = i18nMsg(
+          '{$startTagNgTemplate}Template content: {$interpolation}{$closeTagNgTemplate}{$startTagNgContainer}Container content: {$interpolation_1}{$closeTagNgContainer}',
+          [
+            ['startTagNgTemplate', String.raw`\uFFFD*2:1\uFFFD`],
+            ['closeTagNgTemplate', String.raw`\uFFFD/*2:1\uFFFD`],
+            ['startTagNgContainer', String.raw`\uFFFD#3\uFFFD`],
+            ['interpolation_1', String.raw`\uFFFD0\uFFFD`],
+            ['closeTagNgContainer', String.raw`\uFFFD/#3\uFFFD`],
+            ['interpolation', String.raw`\uFFFD0:1\uFFFD`]
+          ]);
+
       const output = String.raw`
-        var $I18N_0$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-          const $MSG_EXTERNAL_702706566400598764$$APP_SPEC_TS_0$ = goog.getMsg("{$startTagNgTemplate}Template content: {$interpolation}{$closeTagNgTemplate}{$startTagNgContainer}Container content: {$interpolation_1}{$closeTagNgContainer}", {
-            "startTagNgTemplate": "\uFFFD*2:1\uFFFD",
-            "closeTagNgTemplate": "\uFFFD/*2:1\uFFFD",
-            "startTagNgContainer": "\uFFFD#3\uFFFD",
-            "interpolation_1": "\uFFFD0\uFFFD",
-            "closeTagNgContainer": "\uFFFD/#3\uFFFD",
-            "interpolation": "\uFFFD0:1\uFFFD"
-          });
-          $I18N_0$ = $MSG_EXTERNAL_702706566400598764$$APP_SPEC_TS_0$;
-        }
-        else {
-          $I18N_0$ = $localize \`$` +
-          String.raw`{"\uFFFD*2:1\uFFFD"}:START_TAG_NG_TEMPLATE:Template content: $` +
-          String.raw`{"\uFFFD0:1\uFFFD"}:INTERPOLATION:$` +
-          String.raw`{"\uFFFD/*2:1\uFFFD"}:CLOSE_TAG_NG_TEMPLATE:$` +
-          String.raw`{"\uFFFD#3\uFFFD"}:START_TAG_NG_CONTAINER:Container content: $` +
-          String.raw`{"\uFFFD0\uFFFD"}:INTERPOLATION_1:$` +
-          String.raw`{"\uFFFD/#3\uFFFD"}:CLOSE_TAG_NG_CONTAINER:\`;
-        }
         function MyComponent_ng_template_2_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵi18n(0, $I18N_0$, 1);
+            $r3$.ɵɵi18n(0, 0, 1);
             $r3$.ɵɵpipe(1, "uppercase");
           }
           if (rf & 2) {
@@ -2254,10 +2031,16 @@ describe('i18n support in the template compiler', () => {
         …
         decls: 5,
         vars: 3,
+        consts: function() {
+          ${i18n_0}
+          return [
+            $i18n_0$
+          ];
+        },
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵi18nStart(1, $I18N_0$);
+            $r3$.ɵɵi18nStart(1, 0);
             $r3$.ɵɵtemplate(2, MyComponent_ng_template_2_Template, 2, 3, "ng-template");
             $r3$.ɵɵelementContainer(3);
             $r3$.ɵɵpipe(4, "uppercase");
@@ -2281,32 +2064,17 @@ describe('i18n support in the template compiler', () => {
         <ng-container>{age, select, 10 {ten} 20 {twenty} other {other}}</ng-container>
       `;
 
+      const i18n_0 = i18nIcuMsg(
+          '{VAR_SELECT, select, 10 {ten} 20 {twenty} other {other}}',
+          [['VAR_SELECT', String.raw`\uFFFD0\uFFFD`]]);
+      const i18n_1 = i18nIcuMsg(
+          '{VAR_SELECT, select, male {male} female {female} other {other}}',
+          [['VAR_SELECT', String.raw`\uFFFD0\uFFFD`]]);
+
       const output = String.raw`
-        var $I18N_0$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_8806993169187953163$$APP_SPEC_TS_0$ = goog.getMsg("{VAR_SELECT, select, 10 {ten} 20 {twenty} other {other}}");
-            $I18N_0$ = $MSG_EXTERNAL_8806993169187953163$$APP_SPEC_TS_0$;
-        }
-        else {
-            $I18N_0$ = $localize \`{VAR_SELECT, select, 10 {ten} 20 {twenty} other {other}}\`;
-        }
-        $I18N_0$ = $r3$.ɵɵi18nPostprocess($I18N_0$, {
-          "VAR_SELECT": "\uFFFD0\uFFFD"
-        });
-        var $I18N_1$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_7842238767399919809$$APP_SPEC_TS__1$ = goog.getMsg("{VAR_SELECT, select, male {male} female {female} other {other}}");
-            $I18N_1$ = $MSG_EXTERNAL_7842238767399919809$$APP_SPEC_TS__1$;
-        }
-        else {
-            $I18N_1$ = $localize \`{VAR_SELECT, select, male {male} female {female} other {other}}\`;
-        }
-        $I18N_1$ = $r3$.ɵɵi18nPostprocess($I18N_1$, {
-          "VAR_SELECT": "\uFFFD0\uFFFD"
-        });
         function MyComponent_ng_template_0_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵi18n(0, $I18N_1$);
+            $r3$.ɵɵi18n(0, 1);
           }
           if (rf & 2) {
             const $ctx_r0$ = $r3$.ɵɵnextContext();
@@ -2317,11 +2085,19 @@ describe('i18n support in the template compiler', () => {
         …
         decls: 3,
         vars: 1,
+        consts: function() {
+          ${i18n_0}
+          ${i18n_1}
+          return [
+            $i18n_0$,
+            $i18n_1$
+          ];
+        },
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵtemplate(0, MyComponent_ng_template_0_Template, 1, 1, "ng-template");
             $r3$.ɵɵelementContainerStart(1);
-            $r3$.ɵɵi18n(2, $I18N_0$);
+            $r3$.ɵɵi18n(2, 0);
             $r3$.ɵɵelementContainerEnd();
           }
           if (rf & 2) {
@@ -2350,10 +2126,25 @@ describe('i18n support in the template compiler', () => {
         </div>
       `;
 
+      const i18n_0 = i18nMsgWithPostprocess(
+          '{$startTagNgTemplate} Template A: {$interpolation} {$startTagNgTemplate} Template B: {$interpolation_1} {$startTagNgTemplate} Template C: {$interpolation_2} {$closeTagNgTemplate}{$closeTagNgTemplate}{$closeTagNgTemplate}',
+          [
+            [
+              'startTagNgTemplate', String.raw`[\uFFFD*2:1\uFFFD|\uFFFD*2:2\uFFFD|\uFFFD*1:3\uFFFD]`
+            ],
+            [
+              'closeTagNgTemplate',
+              String.raw`[\uFFFD/*1:3\uFFFD|\uFFFD/*2:2\uFFFD|\uFFFD/*2:1\uFFFD]`
+            ],
+            ['interpolation', String.raw`\uFFFD0:1\uFFFD`],
+            ['interpolation_1', String.raw`\uFFFD0:2\uFFFD`],
+            ['interpolation_2', String.raw`\uFFFD0:3\uFFFD`]
+          ]);
+
       const output = String.raw`
         function MyComponent_ng_template_2_ng_template_2_ng_template_1_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵi18n(0, $I18N_0$, 3);
+            $r3$.ɵɵi18n(0, 0, 3);
           }
           if (rf & 2) {
             const $ctx_r2$ = $r3$.ɵɵnextContext(3);
@@ -2363,7 +2154,7 @@ describe('i18n support in the template compiler', () => {
         }
         function MyComponent_ng_template_2_ng_template_2_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵi18nStart(0, $I18N_0$, 2);
+            $r3$.ɵɵi18nStart(0, 0, 2);
             $r3$.ɵɵtemplate(1, MyComponent_ng_template_2_ng_template_2_ng_template_1_Template, 1, 1, "ng-template");
             $r3$.ɵɵi18nEnd();
           }
@@ -2374,36 +2165,10 @@ describe('i18n support in the template compiler', () => {
             $r3$.ɵɵi18nApply(0);
           }
         }
-        var $I18N_0$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_2051477021417799640$$APP_SPEC_TS_0$ = goog.getMsg("{$startTagNgTemplate} Template A: {$interpolation} {$startTagNgTemplate} Template B: {$interpolation_1} {$startTagNgTemplate} Template C: {$interpolation_2} {$closeTagNgTemplate}{$closeTagNgTemplate}{$closeTagNgTemplate}", {
-              "startTagNgTemplate": "[\uFFFD*2:1\uFFFD|\uFFFD*2:2\uFFFD|\uFFFD*1:3\uFFFD]",
-              "closeTagNgTemplate": "[\uFFFD/*1:3\uFFFD|\uFFFD/*2:2\uFFFD|\uFFFD/*2:1\uFFFD]",
-              "interpolation": "\uFFFD0:1\uFFFD",
-              "interpolation_1": "\uFFFD0:2\uFFFD",
-              "interpolation_2": "\uFFFD0:3\uFFFD"
-            });
-            $I18N_0$ = $MSG_EXTERNAL_2051477021417799640$$APP_SPEC_TS_0$;
-        }
-        else {
-            $I18N_0$ = $localize \`$` +
-          String.raw
-      `{"[\uFFFD*2:1\uFFFD|\uFFFD*2:2\uFFFD|\uFFFD*1:3\uFFFD]"}:START_TAG_NG_TEMPLATE: Template A: $` +
-          String.raw`{"\uFFFD0:1\uFFFD"}:INTERPOLATION: $` + String.raw
-      `{"[\uFFFD*2:1\uFFFD|\uFFFD*2:2\uFFFD|\uFFFD*1:3\uFFFD]"}:START_TAG_NG_TEMPLATE: Template B: $` +
-          String.raw`{"\uFFFD0:2\uFFFD"}:INTERPOLATION_1: $` + String.raw
-      `{"[\uFFFD*2:1\uFFFD|\uFFFD*2:2\uFFFD|\uFFFD*1:3\uFFFD]"}:START_TAG_NG_TEMPLATE: Template C: $` +
-          String.raw`{"\uFFFD0:3\uFFFD"}:INTERPOLATION_2: $` + String.raw
-      `{"[\uFFFD/*1:3\uFFFD|\uFFFD/*2:2\uFFFD|\uFFFD/*2:1\uFFFD]"}:CLOSE_TAG_NG_TEMPLATE:$` +
-          String.raw
-      `{"[\uFFFD/*1:3\uFFFD|\uFFFD/*2:2\uFFFD|\uFFFD/*2:1\uFFFD]"}:CLOSE_TAG_NG_TEMPLATE:$` +
-          String.raw
-      `{"[\uFFFD/*1:3\uFFFD|\uFFFD/*2:2\uFFFD|\uFFFD/*2:1\uFFFD]"}:CLOSE_TAG_NG_TEMPLATE:\`;
-        }
-        $I18N_0$ = $r3$.ɵɵi18nPostprocess($I18N_0$);
+        …
         function MyComponent_ng_template_2_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵi18nStart(0, $I18N_0$, 1);
+            $r3$.ɵɵi18nStart(0, 0, 1);
             $r3$.ɵɵpipe(1, "uppercase");
             $r3$.ɵɵtemplate(2, MyComponent_ng_template_2_ng_template_2_Template, 2, 1, "ng-template");
             $r3$.ɵɵi18nEnd();
@@ -2418,10 +2183,16 @@ describe('i18n support in the template compiler', () => {
         …
         decls: 3,
         vars: 0,
+        consts: function() {
+          ${i18n_0}
+          return [
+            $i18n_0$
+          ];
+        },
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵi18nStart(1, $I18N_0$);
+            $r3$.ɵɵi18nStart(1, 0);
             $r3$.ɵɵtemplate(2, MyComponent_ng_template_2_Template, 3, 3, "ng-template");
             $r3$.ɵɵi18nEnd();
             $r3$.ɵɵelementEnd();
@@ -2438,32 +2209,17 @@ describe('i18n support in the template compiler', () => {
         <ng-template i18n>{age, select, 10 {ten} 20 {twenty} other {other}}</ng-template>
       `;
 
+      const i18n_0 = i18nIcuMsg(
+          '{VAR_SELECT, select, male {male} female {female} other {other}}',
+          [['VAR_SELECT', String.raw`\uFFFD0\uFFFD`]]);
+      const i18n_1 = i18nIcuMsg(
+          '{VAR_SELECT, select, 10 {ten} 20 {twenty} other {other}}',
+          [['VAR_SELECT', String.raw`\uFFFD0\uFFFD`]]);
+
       const output = String.raw`
-        var $I18N_0$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_7842238767399919809$$APP_SPEC_TS_0$ = goog.getMsg("{VAR_SELECT, select, male {male} female {female} other {other}}");
-            $I18N_0$ = $MSG_EXTERNAL_7842238767399919809$$APP_SPEC_TS_0$;
-        }
-        else {
-            $I18N_0$ = $localize \`{VAR_SELECT, select, male {male} female {female} other {other}}\`;
-        }
-        $I18N_0$ = $r3$.ɵɵi18nPostprocess($I18N_0$, {
-          "VAR_SELECT": "\uFFFD0\uFFFD"
-        });
-        var $I18N_1$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_8806993169187953163$$APP_SPEC_TS__1$ = goog.getMsg("{VAR_SELECT, select, 10 {ten} 20 {twenty} other {other}}");
-            $I18N_1$ = $MSG_EXTERNAL_8806993169187953163$$APP_SPEC_TS__1$;
-        }
-        else {
-            $I18N_1$ = $localize \`{VAR_SELECT, select, 10 {ten} 20 {twenty} other {other}}\`;
-        }
-        $I18N_1$ = $r3$.ɵɵi18nPostprocess($I18N_1$, {
-          "VAR_SELECT": "\uFFFD0\uFFFD"
-        });
         function MyComponent_ng_template_2_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵi18n(0, $I18N_1$);
+            $r3$.ɵɵi18n(0, 1);
           }
           if (rf & 2) {
             const $ctx_r0$ = $r3$.ɵɵnextContext();
@@ -2474,10 +2230,18 @@ describe('i18n support in the template compiler', () => {
         …
         decls: 3,
         vars: 1,
+        consts: function() {
+          ${i18n_0}
+          ${i18n_1}
+          return [
+            $i18n_0$,
+            $i18n_1$
+          ];
+        },
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵelementContainerStart(0);
-            $r3$.ɵɵi18n(1, $I18N_0$);
+            $r3$.ɵɵi18n(1, 0);
             $r3$.ɵɵelementContainerEnd();
             $r3$.ɵɵtemplate(2, MyComponent_ng_template_2_Template, 1, 1, "ng-template");
           }
@@ -2495,50 +2259,41 @@ describe('i18n support in the template compiler', () => {
     it('should handle self-closing tags as content', () => {
       const input = `
         <ng-container i18n>
-          <img src="logo.png" title="Logo" /> is my logo #1
-        </ng-container>
-        <ng-template i18n>
-          <img src="logo.png" title="Logo" /> is my logo #2
-        </ng-template>
-      `;
-
-      const output = String.raw`
-        var $I18N_0$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_4891196282781544695$$APP_SPEC_TS_0$ = goog.getMsg("{$tagImg} is my logo #1 ", {
-              "tagImg": "\uFFFD#2\uFFFD\uFFFD/#2\uFFFD"
-            });
-            $I18N_0$ = $MSG_EXTERNAL_4891196282781544695$$APP_SPEC_TS_0$;
-        }
-        else {
-            $I18N_0$ = $localize \`$` +
-          String.raw`{"\uFFFD#2\uFFFD\uFFFD/#2\uFFFD"}:TAG_IMG: is my logo #1 \`;
-        }
-        var $I18N_2$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_461986953980355147$$APP_SPEC_TS__2$ = goog.getMsg("{$tagImg} is my logo #2 ", {
-              "tagImg": "\uFFFD#1\uFFFD\uFFFD/#1\uFFFD"
-            });
-            $I18N_2$ = $MSG_EXTERNAL_461986953980355147$$APP_SPEC_TS__2$;
-        }
-        else {
-            $I18N_2$ = $localize \`$` +
-          String.raw`{"\uFFFD#1\uFFFD\uFFFD/#1\uFFFD"}:TAG_IMG: is my logo #2 \`;
-        }
+          <img src="logo.png" title="Logo" /> is my logo #1
+        </ng-container>
+        <ng-template i18n>
+          <img src="logo.png" title="Logo" /> is my logo #2
+        </ng-template>
+      `;
+
+      const i18n_0 = i18nMsg(
+          '{$tagImg} is my logo #1 ', [['tagImg', String.raw`\uFFFD#2\uFFFD\uFFFD/#2\uFFFD`]]);
+      const i18n_1 = i18nMsg(
+          '{$tagImg} is my logo #2 ', [['tagImg', String.raw`\uFFFD#1\uFFFD\uFFFD/#1\uFFFD`]]);
+
+      const output = String.raw`
         function MyComponent_ng_template_3_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵi18nStart(0, $I18N_2$);
-            $r3$.ɵɵelement(1, "img", 0);
+            $r3$.ɵɵi18nStart(0, 2);
+            $r3$.ɵɵelement(1, "img", 1);
             $r3$.ɵɵi18nEnd();
           }
         }
         …
-        consts: [["src", "logo.png", "title", "Logo"]],
+        consts: function() {
+          ${i18n_0}
+          ${i18n_1}
+          return [
+            $i18n_0$,
+            ["src", "logo.png", "title", "Logo"],
+            $i18n_1$
+          ];
+        },
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵelementContainerStart(0);
-            $r3$.ɵɵi18nStart(1, $I18N_0$);
-            $r3$.ɵɵelement(2, "img", 0);
+            $r3$.ɵɵi18nStart(1, 0);
+            $r3$.ɵɵelement(2, "img", 1);
             $r3$.ɵɵi18nEnd();
             $r3$.ɵɵelementContainerEnd();
             $r3$.ɵɵtemplate(3, MyComponent_ng_template_3_Template, 2, 0, "ng-template");
@@ -2559,23 +2314,11 @@ describe('i18n support in the template compiler', () => {
         </ng-template>
       `;
 
-      const output = String.raw`
-        var $I18N_0$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_8537814667662432133$$APP_SPEC_TS__0$ = goog.getMsg(" Root content {$startTagNgContainer} Nested content {$closeTagNgContainer}", {
-              "startTagNgContainer": "\uFFFD*1:1\uFFFD\uFFFD#1:1\uFFFD",
-              "closeTagNgContainer": "\uFFFD/#1:1\uFFFD\uFFFD/*1:1\uFFFD"
-            });
-            $I18N_0$ = $MSG_EXTERNAL_8537814667662432133$$APP_SPEC_TS__0$;
-        }
-        else {
-            $I18N_0$ = $localize \` Root content $` +
-          String.raw
-      `{"\uFFFD*1:1\uFFFD\uFFFD#1:1\uFFFD"}:START_TAG_NG_CONTAINER: Nested content $` +
-          String.raw`{"\uFFFD/#1:1\uFFFD\uFFFD/*1:1\uFFFD"}:CLOSE_TAG_NG_CONTAINER:\`;
-        }
-        …
-      `;
+      const output =
+          i18nMsg(' Root content {$startTagNgContainer} Nested content {$closeTagNgContainer}', [
+            ['startTagNgContainer', String.raw`\uFFFD*1:1\uFFFD\uFFFD#1:1\uFFFD`],
+            ['closeTagNgContainer', String.raw`\uFFFD/#1:1\uFFFD\uFFFD/*1:1\uFFFD`]
+          ]);
 
       verify(input, output);
     });
@@ -2588,25 +2331,10 @@ describe('i18n support in the template compiler', () => {
 
       // TODO(FW-635): currently we generate unique consts for each i18n block even though it
       // might contain the same content. This should be optimized by translation statements caching,
-      // that can be implemented in the future within FW-635.
+      // that can be implemented in the future.
       const output = String.raw`
-        var $I18N_0$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_6563391987554512024$$APP_SPEC_TS_0$ = goog.getMsg("Test");
-            $I18N_0$ = $MSG_EXTERNAL_6563391987554512024$$APP_SPEC_TS_0$;
-        }
-        else {
-            $I18N_0$ = $localize \`Test\`;
-        }
-        var $I18N_1$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_6563391987554512024$$APP_SPEC_TS_1$ = goog.getMsg("Test");
-            $I18N_1$ = $MSG_EXTERNAL_6563391987554512024$$APP_SPEC_TS_1$;
-        }
-        else {
-            $I18N_1$ = $localize \`Test\`;
-        }
-        …
+        ${i18nMsg('Test')}
+        ${i18nMsg('Test')}
       `;
 
       verify(input, output);
@@ -2619,24 +2347,24 @@ describe('i18n support in the template compiler', () => {
         </div>
       `;
 
+      const i18n_0 = i18nMsg(' Hello {$startTagNgContainer}there{$closeTagNgContainer}', [
+        ['startTagNgContainer', String.raw`\uFFFD#2\uFFFD`],
+        ['closeTagNgContainer', String.raw`\uFFFD/#2\uFFFD`]
+      ]);
+
       const output = String.raw`
-        var $I18N_0$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-          const $MSG_APP_SPEC_TS_1$ = goog.getMsg(" Hello {$startTagNgContainer}there{$closeTagNgContainer}", { "startTagNgContainer": "\uFFFD#2\uFFFD", "closeTagNgContainer": "\uFFFD/#2\uFFFD" });
-          $I18N_0$ = $MSG_APP_SPEC_TS_1$;
-        }
-        else {
-          $I18N_0$ = $localize \` Hello $` +
-          String.raw`{"\uFFFD#2\uFFFD"}:START_TAG_NG_CONTAINER:there$` +
-          String.raw`{"\uFFFD/#2\uFFFD"}:CLOSE_TAG_NG_CONTAINER:\`;
-        }
-        …
         decls: 3,
         vars: 0,
+        consts: function() {
+          ${i18n_0}
+          return [
+            $i18n_0$
+          ];
+        },
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵi18nStart(1, I18N_0);
+            $r3$.ɵɵi18nStart(1, 0);
             $r3$.ɵɵelementContainer(2);
             $r3$.ɵɵi18nEnd();
             $r3$.ɵɵelementEnd();
@@ -2655,26 +2383,28 @@ describe('i18n support in the template compiler', () => {
           </div>
         `;
 
+         const i18n_0 = i18nMsg(
+             ' Hello {$startTagNgContainer}there {$startTagStrong}!{$closeTagStrong}{$closeTagNgContainer}',
+             [
+               ['startTagNgContainer', String.raw`\uFFFD#2\uFFFD`],
+               ['startTagStrong', String.raw`\uFFFD#3\uFFFD`],
+               ['closeTagStrong', String.raw`\uFFFD/#3\uFFFD`],
+               ['closeTagNgContainer', String.raw`\uFFFD/#2\uFFFD`]
+             ]);
+
          const output = String.raw`
-          var $I18N_0$;
-          if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_APP_SPEC_TS_1$ = goog.getMsg(" Hello {$startTagNgContainer}there {$startTagStrong}!{$closeTagStrong}{$closeTagNgContainer}", { "startTagNgContainer": "\uFFFD#2\uFFFD", "startTagStrong": "\uFFFD#3\uFFFD", "closeTagStrong": "\uFFFD/#3\uFFFD", "closeTagNgContainer": "\uFFFD/#2\uFFFD" });
-            $I18N_0$ = $MSG_APP_SPEC_TS_1$;
-          }
-          else {
-            $I18N_0$ = $localize \` Hello $` +
-             String.raw`{"\uFFFD#2\uFFFD"}:START_TAG_NG_CONTAINER:there $` +
-             String.raw`{"\uFFFD#3\uFFFD"}:START_TAG_STRONG:!$` +
-             String.raw`{"\uFFFD/#3\uFFFD"}:CLOSE_TAG_STRONG:$` +
-             String.raw`{"\uFFFD/#2\uFFFD"}:CLOSE_TAG_NG_CONTAINER:\`;
-          }
-          …
           decls: 4,
           vars: 0,
+          consts: function() {
+            ${i18n_0}
+            return [
+              $i18n_0$
+            ];
+          },
           template: function MyComponent_Template(rf, ctx) {
             if (rf & 1) {
               $r3$.ɵɵelementStart(0, "div");
-              $r3$.ɵɵi18nStart(1, I18N_0);
+              $r3$.ɵɵi18nStart(1, 0);
               $r3$.ɵɵelementContainerStart(2);
               $r3$.ɵɵelement(3, "strong");
               $r3$.ɵɵelementContainerEnd();
@@ -2687,25 +2417,21 @@ describe('i18n support in the template compiler', () => {
          verify(input, output);
        });
 
-    // Note: applying structural directives to <ng-template> is typically user error, but it is
-    // technically allowed, so we need to support it.
+    // Note: applying structural directives to <ng-template> is typically user error,
+    // but it is technically allowed, so we need to support it.
     it('should handle structural directives', () => {
       const input = `
         <ng-template *ngIf="someFlag" i18n>Content A</ng-template>
         <ng-container *ngIf="someFlag" i18n>Content B</ng-container>
       `;
 
+      const i18n_0 = i18nMsg('Content A');
+      const i18n_1 = i18nMsg('Content B');
+
       const output = String.raw`
-        var $I18N_1$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_3308216566145348998$$APP_SPEC_TS___2$ = goog.getMsg("Content A");
-            $I18N_1$ = $MSG_EXTERNAL_3308216566145348998$$APP_SPEC_TS___2$;
-        } else {
-            $I18N_1$ = $localize \`Content A\`;
-        }
         function MyComponent_0_ng_template_0_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵi18n(0, $I18N_1$);
+            $r3$.ɵɵi18n(0, 1);
           }
         }
         function MyComponent_0_Template(rf, ctx) {
@@ -2713,24 +2439,26 @@ describe('i18n support in the template compiler', () => {
             $r3$.ɵɵtemplate(0, MyComponent_0_ng_template_0_Template, 1, 0, "ng-template");
           }
         }
-        var $I18N_3$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_8349021389088127654$$APP_SPEC_TS__4$ = goog.getMsg("Content B");
-            $I18N_3$ = $MSG_EXTERNAL_8349021389088127654$$APP_SPEC_TS__4$;
-        } else {
-            $I18N_3$ = $localize \`Content B\`;
-        }
+        …
         function MyComponent_ng_container_1_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵelementContainerStart(0);
-            $r3$.ɵɵi18n(1, $I18N_3$);
+            $r3$.ɵɵi18n(1, 2);
             $r3$.ɵɵelementContainerEnd();
           }
         }
         …
         decls: 2,
         vars: 2,
-        consts: [[4, "ngIf"]],
+        consts: function() {
+          ${i18n_0}
+          ${i18n_1}
+          return [
+            [${AttributeMarker.Template}, "ngIf"],
+            $i18n_0$,
+            $i18n_1$
+          ];
+        },
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵtemplate(0, MyComponent_0_Template, 1, 0, undefined, 0);
@@ -2756,8 +2484,10 @@ describe('i18n support in the template compiler', () => {
         </div>
       `;
 
-      const output = String.raw`
-        var $I18N_0$;
+      // Keeping raw content (avoiding `i18nMsg`) to illustrate message layout
+      // in case of whitespace preserving mode.
+      const i18n_0 = String.raw`
+        let $I18N_0$;
         if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
             const $MSG_EXTERNAL_963542717423364282$$APP_SPEC_TS_0$ = goog.getMsg("\n          Some text\n          {$startTagSpan}Text inside span{$closeTagSpan}\n        ", {
               "startTagSpan": "\uFFFD#3\uFFFD",
@@ -2773,12 +2503,20 @@ describe('i18n support in the template compiler', () => {
           String.raw`{"\uFFFD/#3\uFFFD"}:CLOSE_TAG_SPAN:
         \`;
         }
-        …
+      `;
+
+      const output = String.raw`
+        consts: function() {
+          ${i18n_0}
+          return [
+            $i18n_0$
+          ];
+        },
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵtext(0, "\n        ");
             $r3$.ɵɵelementStart(1, "div");
-            $r3$.ɵɵi18nStart(2, $I18N_0$);
+            $r3$.ɵɵi18nStart(2, 0);
             $r3$.ɵɵelement(3, "span");
             $r3$.ɵɵi18nEnd();
             $r3$.ɵɵelementEnd();
@@ -2797,25 +2535,23 @@ describe('i18n support in the template compiler', () => {
         <div i18n>{gender, select, male {male} female {female} other {other}}</div>
       `;
 
+      const i18n_0 = i18nIcuMsg(
+          '{VAR_SELECT, select, male {male} female {female} other {other}}',
+          [['VAR_SELECT', String.raw`\uFFFD0\uFFFD`]]);
+
       const output = String.raw`
-        var $I18N_0$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_7842238767399919809$$APP_SPEC_TS_0$ = goog.getMsg("{VAR_SELECT, select, male {male} female {female} other {other}}");
-            $I18N_0$ = $MSG_EXTERNAL_7842238767399919809$$APP_SPEC_TS_0$;
-        }
-        else {
-            $I18N_0$ = $localize \`{VAR_SELECT, select, male {male} female {female} other {other}}\`;
-        }
-        $I18N_0$ = $r3$.ɵɵi18nPostprocess($I18N_0$, {
-          "VAR_SELECT": "\uFFFD0\uFFFD"
-        });
-        …
         decls: 2,
         vars: 1,
+        consts: function() {
+          ${i18n_0}
+          return [
+            $i18n_0$
+          ];
+        },
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵi18n(1, $I18N_0$);
+            $r3$.ɵɵi18n(1, 0);
             $r3$.ɵɵelementEnd();
           }
           if (rf & 2) {
@@ -2835,7 +2571,7 @@ describe('i18n support in the template compiler', () => {
       `;
 
       const output = String.raw`
-        var $I18N_0$;
+        let $I18N_0$;
         if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
             const $MSG_EXTERNAL_4166854826696768832$$APP_SPEC_TS_0$ = goog.getMsg("{VAR_SELECT, select, single {'single quotes'} double {\"double quotes\"} other {other}}");
             $I18N_0$ = $MSG_EXTERNAL_4166854826696768832$$APP_SPEC_TS_0$;
@@ -2856,24 +2592,22 @@ describe('i18n support in the template compiler', () => {
         {age, select, 10 {ten} 20 {twenty} other {other}}
       `;
 
+      const i18n_0 = i18nIcuMsg(
+          '{VAR_SELECT, select, 10 {ten} 20 {twenty} other {other}}',
+          [['VAR_SELECT', String.raw`\uFFFD0\uFFFD`]]);
+
       const output = String.raw`
-        var $I18N_0$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_8806993169187953163$$APP_SPEC_TS_0$ = goog.getMsg("{VAR_SELECT, select, 10 {ten} 20 {twenty} other {other}}");
-            $I18N_0$ = $MSG_EXTERNAL_8806993169187953163$$APP_SPEC_TS_0$;
-        }
-        else {
-            $I18N_0$ = $localize \`{VAR_SELECT, select, 10 {ten} 20 {twenty} other {other}}\`;
-        }
-        $I18N_0$ = $r3$.ɵɵi18nPostprocess($I18N_0$, {
-          "VAR_SELECT": "\uFFFD0\uFFFD"
-        });
-        …
         decls: 1,
         vars: 1,
+        consts: function() {
+          ${i18n_0}
+          return [
+            $i18n_0$
+          ];
+        },
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵi18n(0, $I18N_0$);
+            $r3$.ɵɵi18n(0, 0);
           }
           if (rf & 2) {
             $r3$.ɵɵi18nExp(ctx.age);
@@ -2896,34 +2630,23 @@ describe('i18n support in the template compiler', () => {
         </div>
       `;
 
+      const i18n_0 = i18nIcuMsg(
+          '{VAR_SELECT, select, male {male} female {female} other {other}}',
+          [['VAR_SELECT', String.raw`\uFFFD0\uFFFD`]]);
+      const i18n_1 = i18nIcuMsg(
+          '{VAR_SELECT, select, 10 {ten} 20 {twenty} other {other}}',
+          [['VAR_SELECT', String.raw`\uFFFD0\uFFFD`]]);
+      const i18n_2 = i18nIcuMsg(
+          '{VAR_SELECT, select, 0 {no emails} 1 {one email} other {{INTERPOLATION} emails}}', [
+            ['VAR_SELECT', String.raw`\uFFFD0\uFFFD`], ['INTERPOLATION', String.raw`\uFFFD1\uFFFD`]
+          ]);
+
       const output = String.raw`
-        var $I18N_0$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_7842238767399919809$$APP_SPEC_TS_0$ = goog.getMsg("{VAR_SELECT, select, male {male} female {female} other {other}}");
-            $I18N_0$ = $MSG_EXTERNAL_7842238767399919809$$APP_SPEC_TS_0$;
-        }
-        else {
-            $I18N_0$ = $localize \`{VAR_SELECT, select, male {male} female {female} other {other}}\`;
-        }
-        $I18N_0$ = $r3$.ɵɵi18nPostprocess($I18N_0$, {
-          "VAR_SELECT": "\uFFFD0\uFFFD"
-        });
-        var $I18N_3$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_8806993169187953163$$APP_SPEC_TS__3$ = goog.getMsg("{VAR_SELECT, select, 10 {ten} 20 {twenty} other {other}}");
-            $I18N_3$ = $MSG_EXTERNAL_8806993169187953163$$APP_SPEC_TS__3$;
-        }
-        else {
-            $I18N_3$ = $localize \`{VAR_SELECT, select, 10 {ten} 20 {twenty} other {other}}\`;
-        }
-        $I18N_3$ = $r3$.ɵɵi18nPostprocess($I18N_3$, {
-          "VAR_SELECT": "\uFFFD0\uFFFD"
-        });
         function MyComponent_div_2_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelementStart(0, "div", 2);
+            $r3$.ɵɵelementStart(0, "div", 3);
             $r3$.ɵɵtext(1, " ");
-            $r3$.ɵɵi18n(2, $I18N_3$);
+            $r3$.ɵɵi18n(2, 4);
             $r3$.ɵɵtext(3, " ");
             $r3$.ɵɵelementEnd();
           }
@@ -2934,23 +2657,12 @@ describe('i18n support in the template compiler', () => {
             $r3$.ɵɵi18nApply(2);
           }
         }
-        var $I18N_5$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_1922743304863699161$$APP_SPEC_TS__5$ = goog.getMsg("{VAR_SELECT, select, 0 {no emails} 1 {one email} other {{INTERPOLATION} emails}}");
-            $I18N_5$ = $MSG_EXTERNAL_1922743304863699161$$APP_SPEC_TS__5$;
-        }
-        else {
-            $I18N_5$ = $localize \`{VAR_SELECT, select, 0 {no emails} 1 {one email} other {{INTERPOLATION} emails}}\`;
-        }
-        $I18N_5$ = $r3$.ɵɵi18nPostprocess($I18N_5$, {
-          "VAR_SELECT": "\uFFFD0\uFFFD",
-          "INTERPOLATION": "\uFFFD1\uFFFD"
-        });
+        …
         function MyComponent_div_3_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵelementStart(0, "div", 3);
+            $r3$.ɵɵelementStart(0, "div", 5);
             $r3$.ɵɵtext(1, " You have ");
-            $r3$.ɵɵi18n(2, $I18N_5$);
+            $r3$.ɵɵi18n(2, 6);
             $r3$.ɵɵtext(3, ". ");
             $r3$.ɵɵelementEnd();
           }
@@ -2964,16 +2676,27 @@ describe('i18n support in the template compiler', () => {
         …
         decls: 4,
         vars: 3,
-        consts: [["title", "icu only", ${
-          AttributeMarker.Template}, "ngIf"], ["title", "icu and text", ${
-          AttributeMarker.Template}, "ngIf"], ["title", "icu only"], ["title", "icu and text"]],
+        consts: function() {
+          ${i18n_0}
+          ${i18n_1}
+          ${i18n_2}
+          return [
+            $i18n_0$,
+            ["title", "icu only", ${AttributeMarker.Template}, "ngIf"],
+            ["title", "icu and text", ${AttributeMarker.Template}, "ngIf"],
+            ["title", "icu only"],
+            $i18n_1$,
+            ["title", "icu and text"],
+            $i18n_2$
+          ];
+        },
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵi18n(1, $I18N_0$);
+            $r3$.ɵɵi18n(1, 0);
             $r3$.ɵɵelementEnd();
-            $r3$.ɵɵtemplate(2, MyComponent_div_2_Template, 4, 1, "div", 0);
-            $r3$.ɵɵtemplate(3, MyComponent_div_3_Template, 4, 2, "div", 1);
+            $r3$.ɵɵtemplate(2, MyComponent_div_2_Template, 4, 1, "div", 1);
+            $r3$.ɵɵtemplate(3, MyComponent_div_3_Template, 4, 2, "div", 2);
           }
           if (rf & 2) {
             $r3$.ɵɵadvance(1);
@@ -2995,24 +2718,22 @@ describe('i18n support in the template compiler', () => {
         <div i18n>{age, select, 10 {ten} 20 {twenty} other {{% other %}}}</div>
       `;
 
+      const i18n_0 =
+          i18nIcuMsg('{VAR_SELECT, select, 10 {ten} 20 {twenty} other {{INTERPOLATION}}}', [
+            ['VAR_SELECT', String.raw`\uFFFD0\uFFFD`], ['INTERPOLATION', String.raw`\uFFFD1\uFFFD`]
+          ]);
+
       const output = String.raw`
-        var $I18N_0$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_2949673783721159566$$APP_SPEC_TS_0$ = goog.getMsg("{VAR_SELECT, select, 10 {ten} 20 {twenty} other {{INTERPOLATION}}}");
-            $I18N_0$ = $MSG_EXTERNAL_2949673783721159566$$APP_SPEC_TS_0$;
-        }
-        else {
-            $I18N_0$ = $localize \`{VAR_SELECT, select, 10 {ten} 20 {twenty} other {{INTERPOLATION}}}\`;
-        }
-        $I18N_0$ = $r3$.ɵɵi18nPostprocess($I18N_0$, {
-          "VAR_SELECT": "\uFFFD0\uFFFD",
-          "INTERPOLATION": "\uFFFD1\uFFFD"
-        });
-        …
+        consts: function() {
+          ${i18n_0}
+          return [
+            $i18n_0$
+          ];
+        },
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵi18n(1, $I18N_0$);
+            $r3$.ɵɵi18n(1, 0);
             $r3$.ɵɵelementEnd();
           }
           if (rf & 2) {
@@ -3035,57 +2756,47 @@ describe('i18n support in the template compiler', () => {
         </div>
       `;
 
+      const i18n_0 = i18nIcuMsg(
+          '{VAR_SELECT, select, male {male - {START_BOLD_TEXT}male{CLOSE_BOLD_TEXT}} female {female {START_BOLD_TEXT}female{CLOSE_BOLD_TEXT}} other {{START_TAG_DIV}{START_ITALIC_TEXT}other{CLOSE_ITALIC_TEXT}{CLOSE_TAG_DIV}}}',
+          [
+            ['VAR_SELECT', String.raw`\uFFFD0\uFFFD`],
+            ['START_BOLD_TEXT', '<b>'],
+            ['CLOSE_BOLD_TEXT', '</b>'],
+            ['START_ITALIC_TEXT', '<i>'],
+            ['CLOSE_ITALIC_TEXT', '</i>'],
+            ['START_TAG_DIV', '<div class=\\"other\\">'],
+            ['CLOSE_TAG_DIV', '</div>'],
+          ]);
+
+      const i18n_1 = i18nMsg(
+          ' {$icu} {$startBoldText}Other content{$closeBoldText}{$startTagDiv}{$startItalicText}Another content{$closeItalicText}{$closeTagDiv}',
+          [
+            ['startBoldText', String.raw`\uFFFD#2\uFFFD`],
+            ['closeBoldText', String.raw`\uFFFD/#2\uFFFD`],
+            ['startTagDiv', String.raw`\uFFFD#3\uFFFD`],
+            ['startItalicText', String.raw`\uFFFD#4\uFFFD`],
+            ['closeItalicText', String.raw`\uFFFD/#4\uFFFD`],
+            ['closeTagDiv', String.raw`\uFFFD/#3\uFFFD`],
+            ['icu', '$I18N_0$'],
+          ]);
+
       const output = String.raw`
-        var $I18N_1$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_2417296354340576868$$APP_SPEC_TS_1$ = goog.getMsg("{VAR_SELECT, select, male {male - {START_BOLD_TEXT}male{CLOSE_BOLD_TEXT}} female {female {START_BOLD_TEXT}female{CLOSE_BOLD_TEXT}} other {{START_TAG_DIV}{START_ITALIC_TEXT}other{CLOSE_ITALIC_TEXT}{CLOSE_TAG_DIV}}}");
-            $I18N_1$ = $MSG_EXTERNAL_2417296354340576868$$APP_SPEC_TS_1$;
-        }
-        else {
-            $I18N_1$ = $localize \`{VAR_SELECT, select, male {male - {START_BOLD_TEXT}male{CLOSE_BOLD_TEXT}} female {female {START_BOLD_TEXT}female{CLOSE_BOLD_TEXT}} other {{START_TAG_DIV}{START_ITALIC_TEXT}other{CLOSE_ITALIC_TEXT}{CLOSE_TAG_DIV}}}\`;
-        }
-        $I18N_1$ = $r3$.ɵɵi18nPostprocess($I18N_1$, {
-          "VAR_SELECT": "\uFFFD0\uFFFD",
-          "START_BOLD_TEXT": "<b>",
-          "CLOSE_BOLD_TEXT": "</b>",
-          "START_ITALIC_TEXT": "<i>",
-          "CLOSE_ITALIC_TEXT": "</i>",
-          "START_TAG_DIV": "<div class=\"other\">",
-          "CLOSE_TAG_DIV": "</div>"
-        });
-        var $I18N_0$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_5791551881115084301$$APP_SPEC_TS_0$ = goog.getMsg(" {$icu} {$startBoldText}Other content{$closeBoldText}{$startTagDiv}{$startItalicText}Another content{$closeItalicText}{$closeTagDiv}", {
-              "startBoldText": "\uFFFD#2\uFFFD",
-              "closeBoldText": "\uFFFD/#2\uFFFD",
-              "startTagDiv": "\uFFFD#3\uFFFD",
-              "startItalicText": "\uFFFD#4\uFFFD",
-              "closeItalicText": "\uFFFD/#4\uFFFD",
-              "closeTagDiv": "\uFFFD/#3\uFFFD",
-              "icu": $I18N_1$
-            });
-            $I18N_0$ = $MSG_EXTERNAL_5791551881115084301$$APP_SPEC_TS_0$;
-        }
-        else {
-            $I18N_0$ = $localize \` $` +
-          String.raw`{$I18N_1$}:ICU: $` +
-          String.raw`{"\uFFFD#2\uFFFD"}:START_BOLD_TEXT:Other content$` +
-          String.raw`{"\uFFFD/#2\uFFFD"}:CLOSE_BOLD_TEXT:$` +
-          String.raw`{"\uFFFD#3\uFFFD"}:START_TAG_DIV:$` +
-          String.raw`{"\uFFFD#4\uFFFD"}:START_ITALIC_TEXT:Another content$` +
-          String.raw`{"\uFFFD/#4\uFFFD"}:CLOSE_ITALIC_TEXT:$` +
-          String.raw`{"\uFFFD/#3\uFFFD"}:CLOSE_TAG_DIV:\`;
-        }
-        …
         decls: 5,
         vars: 1,
-        consts: [[1, "other"]],
+        consts: function() {
+          ${i18n_0}
+          ${i18n_1}
+          return [
+            $i18n_1$,
+            [${AttributeMarker.Classes}, "other"]
+          ];
+        },
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵi18nStart(1, $I18N_0$);
+            $r3$.ɵɵi18nStart(1, 0);
             $r3$.ɵɵelement(2, "b");
-            $r3$.ɵɵelementStart(3, "div", 0);
+            $r3$.ɵɵelementStart(3, "div", 1);
             $r3$.ɵɵelement(4, "i");
             $r3$.ɵɵelementEnd();
             $r3$.ɵɵi18nEnd();
@@ -3107,26 +2818,26 @@ describe('i18n support in the template compiler', () => {
         <div i18n>{gender, select, male {male of age: {{ ageA + ageB + ageC }}} female {female} other {other}}</div>
       `;
 
+      const i18n_0 = i18nIcuMsg(
+          '{VAR_SELECT, select, male {male of age: {INTERPOLATION}} female {female} other {other}}',
+          [
+            ['VAR_SELECT', String.raw`\uFFFD0\uFFFD`],
+            ['INTERPOLATION', String.raw`\uFFFD1\uFFFD`],
+          ]);
+
       const output = String.raw`
-        var $I18N_0$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_6879461626778511059$$APP_SPEC_TS_0$ = goog.getMsg("{VAR_SELECT, select, male {male of age: {INTERPOLATION}} female {female} other {other}}");
-            $I18N_0$ = $MSG_EXTERNAL_6879461626778511059$$APP_SPEC_TS_0$;
-        }
-        else {
-            $I18N_0$ = $localize \`{VAR_SELECT, select, male {male of age: {INTERPOLATION}} female {female} other {other}}\`;
-        }
-        $I18N_0$ = $r3$.ɵɵi18nPostprocess($I18N_0$, {
-          "VAR_SELECT": "\uFFFD0\uFFFD",
-          "INTERPOLATION": "\uFFFD1\uFFFD"
-        });
-        …
         decls: 2,
         vars: 2,
+        consts: function() {
+          ${i18n_0}
+          return [
+            $i18n_0$
+          ];
+        },
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵi18n(1, $I18N_0$);
+            $r3$.ɵɵi18n(1, 0);
             $r3$.ɵɵelementEnd();
           }
           if (rf & 2) {
@@ -3148,48 +2859,32 @@ describe('i18n support in the template compiler', () => {
         </div>
       `;
 
+      const i18n_0 = i18nIcuMsg(
+          '{VAR_SELECT, select, male {male} female {female} other {other}}',
+          [['VAR_SELECT', String.raw`\uFFFD0\uFFFD`]]);
+      const i18n_1 = i18nIcuMsg(
+          '{VAR_SELECT, select, 10 {ten} 20 {twenty} 30 {thirty} other {other}}',
+          [['VAR_SELECT', String.raw`\uFFFD1\uFFFD`]]);
+      const i18n_2 = i18nMsg(' {$icu} {$icu_1} ', [
+        ['icu', '$i18n_0$'],
+        ['icu_1', '$i18n_1$'],
+      ]);
+
       const output = String.raw`
-        var $I18N_1$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_7842238767399919809$$APP_SPEC_TS_1$ = goog.getMsg("{VAR_SELECT, select, male {male} female {female} other {other}}");
-            $I18N_1$ = $MSG_EXTERNAL_7842238767399919809$$APP_SPEC_TS_1$;
-        }
-        else {
-            $I18N_1$ = $localize \`{VAR_SELECT, select, male {male} female {female} other {other}}\`;
-        }
-        $I18N_1$ = $r3$.ɵɵi18nPostprocess($I18N_1$, {
-          "VAR_SELECT": "\uFFFD0\uFFFD"
-        });
-        var $I18N_2$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_7068143081688428291$$APP_SPEC_TS_2$ = goog.getMsg("{VAR_SELECT, select, 10 {ten} 20 {twenty} 30 {thirty} other {other}}");
-            $I18N_2$ = $MSG_EXTERNAL_7068143081688428291$$APP_SPEC_TS_2$;
-        }
-        else {
-            $I18N_2$ = $localize \`{VAR_SELECT, select, 10 {ten} 20 {twenty} 30 {thirty} other {other}}\`;
-        }
-        $I18N_2$ = $r3$.ɵɵi18nPostprocess($I18N_2$, {
-          "VAR_SELECT": "\uFFFD1\uFFFD"
-        });
-        var $I18N_0$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_2967249209167308918$$APP_SPEC_TS_0$ = goog.getMsg(" {$icu} {$icu_1} ", {
-              "icu": $I18N_1$,
-              "icu_1": $I18N_2$
-            });
-            $I18N_0$ = $MSG_EXTERNAL_2967249209167308918$$APP_SPEC_TS_0$;
-        }
-        else {
-            $I18N_0$ = $localize \` $` +
-          String.raw`{$I18N_1$}:ICU: $` + String.raw`{$I18N_2$}:ICU_1: \`;
-        }
-        …
         decls: 2,
         vars: 2,
+        consts: function() {
+          ${i18n_0}
+          ${i18n_1}
+          ${i18n_2}
+          return [
+            $i18n_2$
+          ];
+        },
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵi18n(1, $I18N_0$);
+            $r3$.ɵɵi18n(1, 0);
             $r3$.ɵɵelementEnd();
           }
           if (rf & 2) {
@@ -3216,8 +2911,10 @@ describe('i18n support in the template compiler', () => {
         </div>
       `;
 
-      const output = String.raw`
-        var $I18N_1$;
+      // Keeping raw content here to illustrate the difference in placeholders generated for
+      // goog.getMsg and $localize calls (see last i18n block).
+      const i18n_0 = String.raw`
+        let $I18N_1$;
         if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
             const $MSG_APP_SPEC_TS_1$ = goog.getMsg("{VAR_SELECT, select, male {male} female {female} other {other}}");
             $I18N_1$ = $MSG_APP_SPEC_TS_1$;
@@ -3228,7 +2925,7 @@ describe('i18n support in the template compiler', () => {
         $I18N_1$ = $r3$.ɵɵi18nPostprocess($I18N_1$, {
           "VAR_SELECT": "\uFFFD0\uFFFD"
         });
-        var $I18N_2$;
+        let $I18N_2$;
         if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
             const $MSG_APP_SPEC_TS_2$ = goog.getMsg("{VAR_SELECT, select, male {male} female {female} other {other}}");
             $I18N_2$ = $MSG_APP_SPEC_TS_2$;
@@ -3239,7 +2936,7 @@ describe('i18n support in the template compiler', () => {
         $I18N_2$ = $r3$.ɵɵi18nPostprocess($I18N_2$, {
           "VAR_SELECT": "\uFFFD1\uFFFD"
         });
-        var $I18N_4$;
+        let $I18N_4$;
         if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
             const $MSG_APP_SPEC_TS__4$ = goog.getMsg("{VAR_SELECT, select, male {male} female {female} other {other}}");
             $I18N_4$ = $MSG_APP_SPEC_TS__4$;
@@ -3250,7 +2947,7 @@ describe('i18n support in the template compiler', () => {
         $I18N_4$ = $r3$.ɵɵi18nPostprocess($I18N_4$, {
           "VAR_SELECT": "\uFFFD0:1\uFFFD"
         });
-        var $I18N_0$;
+        let $I18N_0$;
         if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
             const $MSG_APP_SPEC_TS_0$ = goog.getMsg(" {$icu} {$startTagDiv} {$icu} {$closeTagDiv}{$startTagDiv_1} {$icu} {$closeTagDiv}", {
               "startTagDiv": "\uFFFD#2\uFFFD",
@@ -3273,9 +2970,12 @@ describe('i18n support in the template compiler', () => {
         $I18N_0$ = $r3$.ɵɵi18nPostprocess($I18N_0$, {
           "ICU": [$I18N_1$, $I18N_2$, $I18N_4$]
         });
+      `;
+
+      const output = String.raw`
         function MyComponent_div_3_Template(rf, ctx) {
           if (rf & 1) {
-              $r3$.ɵɵi18nStart(0, $I18N_0$, 1);
+              $r3$.ɵɵi18nStart(0, 0, 1);
               $r3$.ɵɵelement(1, "div");
               $r3$.ɵɵi18nEnd();
           }
@@ -3289,13 +2989,19 @@ describe('i18n support in the template compiler', () => {
         …
         decls: 4,
         vars: 3,
-        consts: [[${AttributeMarker.Template}, "ngIf"]],
+        consts: function() {
+          ${i18n_0}
+          return [
+            $i18n_0$,
+            [${AttributeMarker.Template}, "ngIf"]
+          ];
+        },
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵi18nStart(1, $I18N_0$);
+            $r3$.ɵɵi18nStart(1, 0);
             $r3$.ɵɵelement(2, "div");
-            $r3$.ɵɵtemplate(3, MyComponent_div_3_Template, 2, 1, "div", 0);
+            $r3$.ɵɵtemplate(3, MyComponent_div_3_Template, 2, 1, "div", 1);
             $r3$.ɵɵi18nEnd();
             $r3$.ɵɵelementEnd();
           }
@@ -3308,9 +3014,9 @@ describe('i18n support in the template compiler', () => {
         }
       `;
 
-      // TODO(akushnir): this use-case is currently supported with
+      // TODO(FW-635): this use-case is currently supported with
       // file-based prefix for translation const names. Translation statements
-      // caching is required to support this use-case (FW-635) with id-based consts.
+      // caching is required to support this use-case with id-based consts.
       verify(input, output, {skipIdBasedCheck: true});
     });
 
@@ -3325,34 +3031,25 @@ describe('i18n support in the template compiler', () => {
         </div>
       `;
 
+      const i18n_0 = i18nIcuMsg(
+          '{VAR_SELECT_1, select, male {male of age: {VAR_SELECT, select, 10 {ten} 20 {twenty} 30 {thirty} other {other}}} female {female} other {other}}',
+          [['VAR_SELECT', String.raw`\uFFFD0\uFFFD`], ['VAR_SELECT_1', String.raw`\uFFFD1\uFFFD`]]);
+      const i18n_1 = i18nMsg(' {$icu} ', [['icu', '$i18n_0$']]);
+
       const output = String.raw`
-        var $I18N_1$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_343563413083115114$$APP_SPEC_TS_0$ = goog.getMsg("{VAR_SELECT_1, select, male {male of age: {VAR_SELECT, select, 10 {ten} 20 {twenty} 30 {thirty} other {other}}} female {female} other {other}}");
-            $I18N_1$ = $MSG_EXTERNAL_343563413083115114$$APP_SPEC_TS_0$;
-        }
-        else {
-            $I18N_1$ = $localize \`{VAR_SELECT_1, select, male {male of age: {VAR_SELECT, select, 10 {ten} 20 {twenty} 30 {thirty} other {other}}} female {female} other {other}}\`;
-        }
-        $I18N_1$ = $r3$.ɵɵi18nPostprocess($I18N_1$, {
-          "VAR_SELECT": "\uFFFD0\uFFFD",
-          "VAR_SELECT_1": "\uFFFD1\uFFFD"
-        });
-        var $I18N_0$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_3052001905251380936$$APP_SPEC_TS_3$ = goog.getMsg(" {$icu} ", { "icu": $I18N_1$ });
-            $I18N_0$ = $MSG_EXTERNAL_3052001905251380936$$APP_SPEC_TS_3$;
-        }
-        else {
-            $I18N_0$ = $localize \` $` +
-          String.raw`{$I18N_1$}:ICU: \`;
-        }        …
         decls: 2,
         vars: 2,
+        consts: function() {
+          ${i18n_0}
+          ${i18n_1}
+          return [
+            $i18n_1$
+          ];
+        },
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵi18n(1, $I18N_0$);
+            $r3$.ɵɵi18n(1, 0);
             $r3$.ɵɵelementEnd();
           }
           if (rf & 2) {
@@ -3381,27 +3078,27 @@ describe('i18n support in the template compiler', () => {
         }</div>
       `;
 
+      const i18n_0 = i18nIcuMsg(
+          '{VAR_PLURAL, plural, =0 {zero} =2 {{INTERPOLATION} {VAR_SELECT, select, cat {cats} dog {dogs} other {animals}} !} other {other - {INTERPOLATION}}}',
+          [
+            ['VAR_SELECT', String.raw`\uFFFD0\uFFFD`],
+            ['VAR_PLURAL', String.raw`\uFFFD1\uFFFD`],
+            ['INTERPOLATION', String.raw`\uFFFD2\uFFFD`],
+          ]);
+
       const output = String.raw`
-        var $I18N_0$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_6870293071705078389$$APP_SPEC_TS_1$ = goog.getMsg("{VAR_PLURAL, plural, =0 {zero} =2 {{INTERPOLATION} {VAR_SELECT, select, cat {cats} dog {dogs} other {animals}} !} other {other - {INTERPOLATION}}}");
-            $I18N_0$ = $MSG_EXTERNAL_6870293071705078389$$APP_SPEC_TS_1$;
-        }
-        else {
-            $I18N_0$ = $localize \`{VAR_PLURAL, plural, =0 {zero} =2 {{INTERPOLATION} {VAR_SELECT, select, cat {cats} dog {dogs} other {animals}} !} other {other - {INTERPOLATION}}}\`;
-        }
-        $I18N_0$ = $r3$.ɵɵi18nPostprocess($I18N_0$, {
-          "VAR_SELECT": "\uFFFD0\uFFFD",
-          "VAR_PLURAL": "\uFFFD1\uFFFD",
-          "INTERPOLATION": "\uFFFD2\uFFFD"
-        });
-        …
         decls: 2,
         vars: 3,
+        consts: function() {
+          ${i18n_0}
+          return [
+            $i18n_0$
+          ];
+        },
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵi18n(1, $I18N_0$);
+            $r3$.ɵɵi18n(1, 0);
             $r3$.ɵɵelementEnd();
           }
           if (rf & 2) {
@@ -3425,49 +3122,23 @@ describe('i18n support in the template compiler', () => {
         </div>
       `;
 
+      const i18n_0 = i18nIcuMsg(
+          '{VAR_SELECT, select, male {male} female {female} other {other}}',
+          [['VAR_SELECT', String.raw`\uFFFD0\uFFFD`]]);
+      const i18n_1 = i18nIcuMsg(
+          '{VAR_SELECT, select, 10 {ten} 20 {twenty} 30 {thirty} other {other}}',
+          [['VAR_SELECT', String.raw`\uFFFD0:1\uFFFD`]]);
+      const i18n_2 = i18nMsg(' {$icu} {$startTagSpan} {$icu_1} {$closeTagSpan}', [
+        ['startTagSpan', String.raw`\uFFFD*2:1\uFFFD\uFFFD#1:1\uFFFD`],
+        ['closeTagSpan', String.raw`\uFFFD/#1:1\uFFFD\uFFFD/*2:1\uFFFD`],
+        ['icu', '$i18n_0$'],
+        ['icu_1', '$i18n_1$'],
+      ]);
+
       const output = String.raw`
-        var $I18N_1$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_7842238767399919809$$APP_SPEC_TS_1$ = goog.getMsg("{VAR_SELECT, select, male {male} female {female} other {other}}");
-            $I18N_1$ = $MSG_EXTERNAL_7842238767399919809$$APP_SPEC_TS_1$;
-        }
-        else {
-            $I18N_1$ = $localize \`{VAR_SELECT, select, male {male} female {female} other {other}}\`;
-        }
-        $I18N_1$ = $r3$.ɵɵi18nPostprocess($I18N_1$, {
-          "VAR_SELECT": "\uFFFD0\uFFFD"
-        });
-        var $I18N_3$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_7068143081688428291$$APP_SPEC_TS__3$ = goog.getMsg("{VAR_SELECT, select, 10 {ten} 20 {twenty} 30 {thirty} other {other}}");
-            $I18N_3$ = $MSG_EXTERNAL_7068143081688428291$$APP_SPEC_TS__3$;
-        }
-        else {
-            $I18N_3$ = $localize \`{VAR_SELECT, select, 10 {ten} 20 {twenty} 30 {thirty} other {other}}\`;
-        }
-        $I18N_3$ = $r3$.ɵɵi18nPostprocess($I18N_3$, {
-          "VAR_SELECT": "\uFFFD0:1\uFFFD"
-        });
-        var $I18N_0$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_1194472282609532229$$APP_SPEC_TS_0$ = goog.getMsg(" {$icu} {$startTagSpan} {$icu_1} {$closeTagSpan}", {
-              "startTagSpan": "\uFFFD*2:1\uFFFD\uFFFD#1:1\uFFFD",
-              "closeTagSpan": "\uFFFD/#1:1\uFFFD\uFFFD/*2:1\uFFFD",
-              "icu": $I18N_1$,
-              "icu_1": $I18N_3$
-            });
-            $I18N_0$ = $MSG_EXTERNAL_1194472282609532229$$APP_SPEC_TS_0$;
-        }
-        else {
-            $I18N_0$ = $localize \` $` +
-          String.raw`{$I18N_1$}:ICU: $` +
-          String.raw`{"\uFFFD*2:1\uFFFD\uFFFD#1:1\uFFFD"}:START_TAG_SPAN: $` +
-          String.raw`{$I18N_3$}:ICU_1: $` +
-          String.raw`{"\uFFFD/#1:1\uFFFD\uFFFD/*2:1\uFFFD"}:CLOSE_TAG_SPAN:\`;
-        }
         function MyComponent_span_2_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵi18nStart(0, $I18N_0$, 1);
+            $r3$.ɵɵi18nStart(0, 0, 1);
             $r3$.ɵɵelement(1, "span");
             $r3$.ɵɵi18nEnd();
           }
@@ -3481,12 +3152,20 @@ describe('i18n support in the template compiler', () => {
         …
         decls: 3,
         vars: 2,
-        consts: [[${AttributeMarker.Template}, "ngIf"]],
+        consts: function() {
+          ${i18n_0}
+          ${i18n_1}
+          ${i18n_2}
+          return [
+            $i18n_2$,
+            [${AttributeMarker.Template}, "ngIf"]
+          ];
+        },
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵi18nStart(1, $I18N_0$);
-            $r3$.ɵɵtemplate(2, MyComponent_span_2_Template, 2, 1, "span", 0);
+            $r3$.ɵɵi18nStart(1, 0);
+            $r3$.ɵɵtemplate(2, MyComponent_span_2_Template, 2, 1, "span", 1);
             $r3$.ɵɵi18nEnd();
             $r3$.ɵɵelementEnd();
           }
@@ -3512,52 +3191,29 @@ describe('i18n support in the template compiler', () => {
         </div>
       `;
 
+      const i18n_0 = i18nIcuMsg(
+          '{VAR_SELECT, select, male {male {INTERPOLATION}} female {female {INTERPOLATION_1}} other {other}}',
+          [
+            ['VAR_SELECT', String.raw`\uFFFD0\uFFFD`],
+            ['INTERPOLATION', String.raw`\uFFFD1\uFFFD`],
+            ['INTERPOLATION_1', String.raw`\uFFFD2\uFFFD`],
+          ]);
+      const i18n_1 = i18nIcuMsg(
+          '{VAR_SELECT, select, 10 {ten} 20 {twenty} 30 {thirty} other {other: {INTERPOLATION}}}', [
+            ['VAR_SELECT', String.raw`\uFFFD0:1\uFFFD`],
+            ['INTERPOLATION', String.raw`\uFFFD1:1\uFFFD`],
+          ]);
+      const i18n_2 = i18nMsg(' {$icu} {$startTagSpan} {$icu_1} {$closeTagSpan}', [
+        ['startTagSpan', String.raw`\uFFFD*2:1\uFFFD\uFFFD#1:1\uFFFD`],
+        ['closeTagSpan', String.raw`\uFFFD/#1:1\uFFFD\uFFFD/*2:1\uFFFD`],
+        ['icu', '$i18n_0$'],
+        ['icu_1', '$i18n_1$'],
+      ]);
+
       const output = String.raw`
-        var $I18N_1$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_7825031864601787094$$APP_SPEC_TS_1$ = goog.getMsg("{VAR_SELECT, select, male {male {INTERPOLATION}} female {female {INTERPOLATION_1}} other {other}}");
-            $I18N_1$ = $MSG_EXTERNAL_7825031864601787094$$APP_SPEC_TS_1$;
-        }
-        else {
-            $I18N_1$ = $localize \`{VAR_SELECT, select, male {male {INTERPOLATION}} female {female {INTERPOLATION_1}} other {other}}\`;
-        }
-        $I18N_1$ = $r3$.ɵɵi18nPostprocess($I18N_1$, {
-          "VAR_SELECT": "\uFFFD0\uFFFD",
-          "INTERPOLATION": "\uFFFD1\uFFFD",
-          "INTERPOLATION_1": "\uFFFD2\uFFFD"
-        });
-        var $I18N_3$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_2310343208266678305$$APP_SPEC_TS__3$ = goog.getMsg("{VAR_SELECT, select, 10 {ten} 20 {twenty} 30 {thirty} other {other: {INTERPOLATION}}}");
-            $I18N_3$ = $MSG_EXTERNAL_2310343208266678305$$APP_SPEC_TS__3$;
-        }
-        else {
-            $I18N_4$ = $localize \`{VAR_SELECT, select, 10 {ten} 20 {twenty} 30 {thirty} other {other: {INTERPOLATION}}}\`;
-        }
-        $I18N_3$ = $r3$.ɵɵi18nPostprocess($I18N_3$, {
-          "VAR_SELECT": "\uFFFD0:1\uFFFD",
-          "INTERPOLATION": "\uFFFD1:1\uFFFD"
-        });
-        var $I18N_0$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_7186042105600518133$$APP_SPEC_TS_0$ = goog.getMsg(" {$icu} {$startTagSpan} {$icu_1} {$closeTagSpan}", {
-              "startTagSpan": "\uFFFD*2:1\uFFFD\uFFFD#1:1\uFFFD",
-              "closeTagSpan": "\uFFFD/#1:1\uFFFD\uFFFD/*2:1\uFFFD",
-              "icu": $I18N_1$,
-              "icu_1": $I18N_3$
-            });
-            $I18N_0$ = $MSG_EXTERNAL_7186042105600518133$$APP_SPEC_TS_0$;
-        }
-        else {
-            $I18N_0$ = $localize \` $` +
-          String.raw`{I18N_1}:ICU: $` +
-          String.raw`{"\uFFFD*2:1\uFFFD\uFFFD#1:1\uFFFD"}:START_TAG_SPAN: $` +
-          String.raw`{I18N_3}:ICU_1: $` +
-          String.raw`{"\uFFFD/#1:1\uFFFD\uFFFD/*2:1\uFFFD"}:CLOSE_TAG_SPAN:\`;
-        }
         function MyComponent_span_2_Template(rf, ctx) {
           if (rf & 1) {
-            $r3$.ɵɵi18nStart(0, $I18N_0$, 1);
+            $r3$.ɵɵi18nStart(0, 0, 1);
             $r3$.ɵɵelement(1, "span");
             $r3$.ɵɵi18nEnd();
           }
@@ -3571,12 +3227,20 @@ describe('i18n support in the template compiler', () => {
         …
         decls: 3,
         vars: 4,
-        consts: [[${AttributeMarker.Template}, "ngIf"]],
+        consts: function() {
+          ${i18n_0}
+          ${i18n_1}
+          ${i18n_2}
+          return [
+            $i18n_2$,
+            [${AttributeMarker.Template}, "ngIf"]
+          ];
+        },
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵi18nStart(1, $I18N_0$);
-            $r3$.ɵɵtemplate(2, MyComponent_span_2_Template, 2, 2, "span", 0);
+            $r3$.ɵɵi18nStart(1, 0);
+            $r3$.ɵɵtemplate(2, MyComponent_span_2_Template, 2, 2, "span", 1);
             $r3$.ɵɵi18nEnd();
             $r3$.ɵɵelementEnd();
           }
@@ -3603,28 +3267,28 @@ describe('i18n support in the template compiler', () => {
         }</div>
       `;
 
+      const i18n_0 = i18nIcuMsg(
+          '{VAR_SELECT, select, male {male {PH_A}} female {female {PH_B}} other {other {PH_WITH_SPACES}}}',
+          [
+            ['VAR_SELECT', String.raw`\uFFFD0\uFFFD`],
+            ['PH_A', String.raw`\uFFFD1\uFFFD`],
+            ['PH_B', String.raw`\uFFFD2\uFFFD`],
+            ['PH_WITH_SPACES', String.raw`\uFFFD3\uFFFD`],
+          ]);
+
       const output = String.raw`
-        var $I18N_0$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            const $MSG_EXTERNAL_6318060397235942326$$APP_SPEC_TS_0$ = goog.getMsg("{VAR_SELECT, select, male {male {PH_A}} female {female {PH_B}} other {other {PH_WITH_SPACES}}}");
-            $I18N_0$ = $MSG_EXTERNAL_6318060397235942326$$APP_SPEC_TS_0$;
-        }
-        else {
-            $I18N_0$ = $localize \`{VAR_SELECT, select, male {male {PH_A}} female {female {PH_B}} other {other {PH_WITH_SPACES}}}\`;
-        }
-        $I18N_0$ = $r3$.ɵɵi18nPostprocess($I18N_0$, {
-          "VAR_SELECT": "\uFFFD0\uFFFD",
-          "PH_A": "\uFFFD1\uFFFD",
-          "PH_B": "\uFFFD2\uFFFD",
-          "PH_WITH_SPACES": "\uFFFD3\uFFFD"
-        });
-        …
         decls: 2,
         vars: 4,
+        consts: function() {
+          ${i18n_0}
+          return [
+            $i18n_0$
+          ];
+        },
         template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵelementStart(0, "div");
-            $r3$.ɵɵi18n(1, $I18N_0$);
+            $r3$.ɵɵi18n(1, 0);
             $r3$.ɵɵelementEnd();
           }
           if (rf & 2) {
@@ -3643,21 +3307,10 @@ describe('i18n support in the template compiler', () => {
         <div i18n="meaningA|descA@@idA">{count, select, 1 {one} other {more than one}}</div>
       `;
 
-      const output = String.raw`
-        var $I18N_0$;
-        if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-            /**
-             * @desc descA
-             * @meaning meaningA
-             */
-            const $MSG_EXTERNAL_idA$$APP_SPEC_TS_1$ = goog.getMsg("{VAR_SELECT, select, 1 {one} other {more than one}}");
-            $I18N_0$ = $MSG_EXTERNAL_idA$$APP_SPEC_TS_1$;
-        }
-        else {
-            $I18N_0$ = $localize \`:meaningA|descA@@idA:{VAR_SELECT, select, 1 {one} other {more than one}}\`;
-        }
-        $I18N_0$ = i0.ɵɵi18nPostprocess($I18N_0$, { "VAR_SELECT": "\uFFFD0\uFFFD" });
-      `;
+      const output = i18nMsgWithPostprocess(
+          '{VAR_SELECT, select, 1 {one} other {more than one}}', [],
+          {meaning: 'meaningA', desc: 'descA', id: 'idA'},
+          [['VAR_SELECT', String.raw`\uFFFD0\uFFFD`]]);
 
       verify(input, output);
     });
@@ -3671,25 +3324,16 @@ describe('i18n support in the template compiler', () => {
             </div>
           `;
 
+         const i18n_0 = i18nIcuMsg(
+             '{VAR_SELECT , select , 1 {one} other {more than one}}',
+             [['VAR_SELECT', String.raw`\uFFFD0\uFFFD`]]);
+         const i18n_1 = i18nIcuMsg(
+             '{VAR_PLURAL , plural , =1 {one} other {more than one}}',
+             [['VAR_PLURAL', String.raw`\uFFFD1\uFFFD`]]);
+
          const output = String.raw`
-            var $I18N_1$;
-            if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-                const $MSG_EXTERNAL_199763560911211963$$APP_SPEC_TS_2$ = goog.getMsg("{VAR_SELECT , select , 1 {one} other {more than one}}");
-                $I18N_1$ = $MSG_EXTERNAL_199763560911211963$$APP_SPEC_TS_2$;
-            }
-            else {
-                $I18N_1$ = $localize \`{VAR_SELECT , select , 1 {one} other {more than one}}\`;
-            }
-            $I18N_1$ = i0.ɵɵi18nPostprocess($I18N_1$, { "VAR_SELECT": "\uFFFD0\uFFFD" });
-            var $I18N_3$;
-            if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
-                const $MSG_EXTERNAL_3383986062053865025$$APP_SPEC_TS_4$ = goog.getMsg("{VAR_PLURAL , plural , =1 {one} other {more than one}}");
-                $I18N_3$ = $MSG_EXTERNAL_3383986062053865025$$APP_SPEC_TS_4$;
-            }
-            else {
-                $I18N_3$ = $localize \`{VAR_PLURAL , plural , =1 {one} other {more than one}}\`;
-            }
-            $I18N_3$ = i0.ɵɵi18nPostprocess($I18N_3$, { "VAR_PLURAL": "\uFFFD1\uFFFD" });
+            ${i18n_0}
+            ${i18n_1}
           `;
 
          verify(input, output);
@@ -3701,7 +3345,7 @@ describe('i18n support in the template compiler', () => {
       const input = `<div i18n>Some Message</div>`;
 
       const output = String.raw`
-        var $I18N_0$;
+        let $I18N_0$;
         if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) { … }
         else {
             $I18N_0$ = $localize \`:␟ec93160d6d6a8822214060dd7938bf821c22b226␟6795333002533525253:Some Message\`;
@@ -3716,7 +3360,7 @@ describe('i18n support in the template compiler', () => {
       const input = `<div i18n>Some Message</div>`;
 
       const output = String.raw`
-        var $I18N_0$;
+        let $I18N_0$;
         if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) { … }
         else {
             $I18N_0$ = $localize \`:␟ec93160d6d6a8822214060dd7938bf821c22b226␟6795333002533525253:Some Message\`;
@@ -3878,8 +3522,8 @@ $` + String.raw`{$I18N_4$}:ICU:\`;
         </svg>
       `;
 
-      const output = String.raw`
-        var $I18N_0$;
+      const i18n_0 = String.raw`
+        let $I18N_0$;
         if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
           const $MSG_EXTERNAL_7128002169381370313$$APP_SPEC_TS_1$ = goog.getMsg("{$startTagXhtmlDiv} Count: {$startTagXhtmlSpan}5{$closeTagXhtmlSpan}{$closeTagXhtmlDiv}", {
             "startTagXhtmlDiv": "\uFFFD#3\uFFFD",
@@ -3896,15 +3540,26 @@ $` + String.raw`{$I18N_4$}:ICU:\`;
           String.raw`{"\uFFFD/#4\uFFFD"}:CLOSE_TAG__XHTML_SPAN:$` +
           String.raw`{"\uFFFD/#3\uFFFD"}:CLOSE_TAG__XHTML_DIV:\`;
         }
+      `;
+
+      const output = String.raw`
         …
-        function MyComponent_Template(rf, ctx) {
+        consts: function() {
+          ${i18n_0}
+          return [
+            ["xmlns", "http://www.w3.org/2000/svg"],
+            $i18n_0$,
+            ["xmlns", "http://www.w3.org/1999/xhtml"]
+          ];
+        },
+        template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵnamespaceSVG();
             $r3$.ɵɵelementStart(0, "svg", 0);
             $r3$.ɵɵelementStart(1, "foreignObject");
-            $r3$.ɵɵi18nStart(2, $I18N_0$);
+            $r3$.ɵɵi18nStart(2, 1);
             $r3$.ɵɵnamespaceHTML();
-            $r3$.ɵɵelementStart(3, "div", 1);
+            $r3$.ɵɵelementStart(3, "div", 2);
             $r3$.ɵɵelement(4, "span");
             $r3$.ɵɵelementEnd();
             $r3$.ɵɵi18nEnd();
@@ -3928,8 +3583,8 @@ $` + String.raw`{$I18N_4$}:ICU:\`;
         </svg>
       `;
 
-      const output = String.raw`
-        var $I18N_0$;
+      const i18n_0 = String.raw`
+        let $I18N_0$;
         if (typeof ngI18nClosureMode !== "undefined" && ngI18nClosureMode) {
           const $MSG_EXTERNAL_7428861019045796010$$APP_SPEC_TS_1$ = goog.getMsg(" Count: {$startTagXhtmlSpan}5{$closeTagXhtmlSpan}", {
             "startTagXhtmlSpan": "\uFFFD#4\uFFFD",
@@ -3942,15 +3597,25 @@ $` + String.raw`{$I18N_4$}:ICU:\`;
           String.raw`{"\uFFFD#4\uFFFD"}:START_TAG__XHTML_SPAN:5$` +
           String.raw`{"\uFFFD/#4\uFFFD"}:CLOSE_TAG__XHTML_SPAN:\`;
         }
-        …
-        function MyComponent_Template(rf, ctx) {
+      `;
+
+      const output = String.raw`
+        consts: function() {
+          ${i18n_0}
+          return [
+            ["xmlns", "http://www.w3.org/2000/svg"],
+            ["xmlns", "http://www.w3.org/1999/xhtml"],
+            $i18n_0$
+          ];
+        },
+        template: function MyComponent_Template(rf, ctx) {
           if (rf & 1) {
             $r3$.ɵɵnamespaceSVG();
             $r3$.ɵɵelementStart(0, "svg", 0);
             $r3$.ɵɵelementStart(1, "foreignObject");
             $r3$.ɵɵnamespaceHTML();
             $r3$.ɵɵelementStart(2, "div", 1);
-            $r3$.ɵɵi18nStart(3, $I18N_0$);
+            $r3$.ɵɵi18nStart(3, 2);
             $r3$.ɵɵelement(4, "span");
             $r3$.ɵɵi18nEnd();
             $r3$.ɵɵelementEnd();
@@ -3960,7 +3625,7 @@ $` + String.raw`{$I18N_4$}:ICU:\`;
         }
       `;
 
-      verify(input, output, {verbose: true});
+      verify(input, output);
     });
   });
 });
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 80b97f9df95cd..7fdd3a4132652 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
@@ -72,7 +72,7 @@ describe('compiler compliance: styling', () => {
          expectEmit(result.source, template, 'Incorrect template');
        });
 
-    it('should pass in the component metadata styles into the component definition but skip shimming when style encapsulation is set to native',
+    it('should pass in the component metadata styles into the component definition but skip shimming when style encapsulation is set to shadow dom',
        () => {
          const files = {
            app: {
@@ -80,7 +80,7 @@ describe('compiler compliance: styling', () => {
                 import {Component, NgModule, ViewEncapsulation} from '@angular/core';
 
                 @Component({
-                  encapsulation: ViewEncapsulation.Native,
+                  encapsulation: ViewEncapsulation.ShadowDom,
                   selector: "my-component",
                   styles: ["div.cool { color: blue; }", ":host.nice p { color: gold; }"],
                   template: "..."
@@ -98,7 +98,7 @@ describe('compiler compliance: styling', () => {
          MyComponent.ɵcmp = $r3$.ɵɵdefineComponent({
            …
            styles: ["div.cool { color: blue; }", ":host.nice p { color: gold; }"],
-           encapsulation: 1
+           encapsulation: 3
          })
          `;
          const result = compile(files, angularFiles);
diff --git a/packages/compiler-cli/test/diagnostics/check_types_spec.ts b/packages/compiler-cli/test/diagnostics/check_types_spec.ts
index 68d3f28114d86..13fff9ad356e3 100644
--- a/packages/compiler-cli/test/diagnostics/check_types_spec.ts
+++ b/packages/compiler-cli/test/diagnostics/check_types_spec.ts
@@ -787,7 +787,7 @@ describe('ng type checker', () => {
     it('should report an invalid call to a pipe', () => {
       rejectOnlyWithFullTemplateTypeCheck(
           '<div>{{"hello" | aPipe}}</div>',
-          `Argument of type '"hello"' is not assignable to parameter of type 'number'.`, '0:5');
+          `Argument of type 'string' is not assignable to parameter of type 'number'.`, '0:5');
     });
     it('should report an invalid property on an exportAs directive', () => {
       rejectOnlyWithFullTemplateTypeCheck(
diff --git a/packages/compiler-cli/test/extract_i18n_spec.ts b/packages/compiler-cli/test/extract_i18n_spec.ts
index e06f4f81080c8..4e77cced287f9 100644
--- a/packages/compiler-cli/test/extract_i18n_spec.ts
+++ b/packages/compiler-cli/test/extract_i18n_spec.ts
@@ -42,7 +42,7 @@ const EXPECTED_XMB = `<?xml version="1.0" encoding="UTF-8" ?>
   <msg id="5811701742971715242" desc="with ICU and other things"><source>src/icu.html:4,6</source>
      foo <ph name="ICU"><ex>{ count, plural, =1 {...} other {...}}</ex>{ count, plural, =1 {...} other {...}}</ph>
     </msg>
-  <msg id="7254052530614200029" desc="with placeholders"><source>src/placeholders.html:1</source>Name: <ph name="START_BOLD_TEXT"><ex>&lt;b&gt;</ex>&lt;b&gt;</ph><ph name="NAME"><ex>{{
+  <msg id="7254052530614200029" desc="with placeholders"><source>src/placeholders.html:1,3</source>Name: <ph name="START_BOLD_TEXT"><ex>&lt;b&gt;</ex>&lt;b&gt;</ph><ph name="NAME"><ex>{{
       name // i18n(ph=&quot;name&quot;)
     }}</ex>{{
       name // i18n(ph=&quot;name&quot;)
@@ -182,7 +182,7 @@ const EXPECTED_XLIFF2 = `<?xml version="1.0" encoding="UTF-8" ?>
     <unit id="7254052530614200029">
       <notes>
         <note category="description">with placeholders</note>
-        <note category="location">src/placeholders.html:1</note>
+        <note category="location">src/placeholders.html:1,3</note>
       </notes>
       <segment>
         <source>Name: <pc id="0" equivStart="START_BOLD_TEXT" equivEnd="CLOSE_BOLD_TEXT" type="fmt" dispStart="&lt;b&gt;" dispEnd="&lt;/b&gt;"><ph id="1" equiv="NAME" disp="{{
diff --git a/packages/compiler-cli/test/helpers/index.ts b/packages/compiler-cli/test/helpers/index.ts
index 2c8ece941dc60..5c504e39cf6b2 100644
--- a/packages/compiler-cli/test/helpers/index.ts
+++ b/packages/compiler-cli/test/helpers/index.ts
@@ -7,3 +7,4 @@
  */
 export {getAngularPackagesFromRunfiles, resolveNpmTreeArtifact} from './src/runfile_helpers';
 export * from './src/mock_file_loading';
+export * from './src/cached_source_files';
diff --git a/packages/compiler-cli/test/helpers/src/cached_source_files.ts b/packages/compiler-cli/test/helpers/src/cached_source_files.ts
new file mode 100644
index 0000000000000..64dbd95529c49
--- /dev/null
+++ b/packages/compiler-cli/test/helpers/src/cached_source_files.ts
@@ -0,0 +1,44 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {basename} from '../../../src/ngtsc/file_system';
+
+// A cache of source files that are typically used across tests and are expensive to parse.
+let sourceFileCache = new Map<string, ts.SourceFile>();
+
+/**
+ * If the `fileName` is determined to benefit from caching across tests, a parsed `ts.SourceFile`
+ * is returned from a shared cache. If caching is not applicable for the requested `fileName`, then
+ * `null` is returned.
+ *
+ * Even if a `ts.SourceFile` already exists for the given `fileName` will the contents be loaded
+ * from disk, such that it can be verified whether the cached `ts.SourceFile` is identical to the
+ * disk contents. If there is a difference, a new `ts.SourceFile` is parsed from the loaded contents
+ * which replaces the prior cache entry.
+ *
+ * @param fileName the path of the file to request a source file for.
+ * @param load a callback to load the contents of the file; this is even called when a cache entry
+ * is available to verify that the cached `ts.SourceFile` corresponds with the contents on disk.
+ */
+export function getCachedSourceFile(
+    fileName: string, load: () => string | undefined): ts.SourceFile|null {
+  if (!/^lib\..+\.d\.ts$/.test(basename(fileName))) {
+    return null;
+  }
+
+  const content = load();
+  if (content === undefined) {
+    return null;
+  }
+  if (!sourceFileCache.has(fileName) || sourceFileCache.get(fileName)!.text !== content) {
+    const sf = ts.createSourceFile(fileName, content, ts.ScriptTarget.ES2015);
+    sourceFileCache.set(fileName, sf);
+  }
+  return sourceFileCache.get(fileName)!;
+}
diff --git a/packages/compiler-cli/test/helpers/src/mock_file_loading.ts b/packages/compiler-cli/test/helpers/src/mock_file_loading.ts
index e5e8cb79b92ea..7a575789107d1 100644
--- a/packages/compiler-cli/test/helpers/src/mock_file_loading.ts
+++ b/packages/compiler-cli/test/helpers/src/mock_file_loading.ts
@@ -22,28 +22,43 @@ export function loadTestFiles(files: TestFile[]) {
   });
 }
 
+/**
+ * A folder that is lazily loaded upon first access and then cached.
+ */
+class CachedFolder {
+  private folder: Folder|null = null;
+
+  constructor(private loader: () => Folder) {}
+
+  get(): Folder {
+    if (this.folder === null) {
+      this.folder = this.loader();
+    }
+    return this.folder;
+  }
+}
+
+const typescriptFolder = new CachedFolder(() => loadFolder(resolveNpmTreeArtifact('typescript')));
+const angularFolder = new CachedFolder(loadAngularFolder);
+const rxjsFolder = new CachedFolder(() => loadFolder(resolveNpmTreeArtifact('rxjs')));
+
 export function loadStandardTestFiles(
     {fakeCore = true, rxjs = false}: {fakeCore?: boolean, rxjs?: boolean} = {}): Folder {
   const tmpFs = new MockFileSystemPosix(true);
   const basePath = '/' as AbsoluteFsPath;
 
-  loadTestDirectory(
-      tmpFs, resolveNpmTreeArtifact('typescript'),
-      tmpFs.resolve(basePath, 'node_modules/typescript'));
+  tmpFs.mount(tmpFs.resolve('/node_modules/typescript'), typescriptFolder.get());
 
   loadTsLib(tmpFs, basePath);
 
   if (fakeCore) {
     loadFakeCore(tmpFs, basePath);
   } else {
-    getAngularPackagesFromRunfiles().forEach(({name, pkgPath}) => {
-      loadTestDirectory(tmpFs, pkgPath, tmpFs.resolve(basePath, 'node_modules/@angular', name));
-    });
+    tmpFs.mount(tmpFs.resolve('/node_modules/@angular'), angularFolder.get());
   }
 
   if (rxjs) {
-    loadTestDirectory(
-        tmpFs, resolveNpmTreeArtifact('rxjs'), tmpFs.resolve(basePath, 'node_modules/rxjs'));
+    tmpFs.mount(tmpFs.resolve('/node_modules/rxjs'), rxjsFolder.get());
   }
 
   return tmpFs.dump();
@@ -60,6 +75,22 @@ export function loadFakeCore(fs: FileSystem, basePath: string = '/') {
       fs.resolve(basePath, 'node_modules/@angular/core'));
 }
 
+function loadFolder(path: string): Folder {
+  const tmpFs = new MockFileSystemPosix(true);
+  // Note that we intentionally pass the native `path`, without resolving it through the file
+  // system, because the mock posix file system may break paths coming from a non-posix system.
+  loadTestDirectory(tmpFs, path, tmpFs.resolve('/'));
+  return tmpFs.dump();
+}
+
+function loadAngularFolder(): Folder {
+  const tmpFs = new MockFileSystemPosix(true);
+  getAngularPackagesFromRunfiles().forEach(({name, pkgPath}) => {
+    loadTestDirectory(tmpFs, pkgPath, tmpFs.resolve(name));
+  });
+  return tmpFs.dump();
+}
+
 /**
  * Load real files from the real file-system into a mock file-system.
  * @param fs the file-system where the directory is to be loaded.
diff --git a/packages/compiler-cli/test/ngc_spec.ts b/packages/compiler-cli/test/ngc_spec.ts
index b310c5adf705a..0e35c3ee8ca99 100644
--- a/packages/compiler-cli/test/ngc_spec.ts
+++ b/packages/compiler-cli/test/ngc_spec.ts
@@ -141,7 +141,7 @@ describe('ngc transformer command-line', () => {
       write('mymodule.ts', `
         import {NgModule} from '@angular/core';
         import {AClass} from './aclass';
-  
+
         @NgModule({declarations: []})
         export class MyModule {
           constructor(importedClass: AClass) {}
@@ -382,13 +382,13 @@ describe('ngc transformer command-line', () => {
         })
         export class MyModule {}
       `);
-        expect(contents).toContain('@fileoverview');
-        expect(contents).toContain('generated by the Angular template compiler');
-        expect(contents).toContain('@suppress {suspiciousCode');
+        expect(contents).toContain(
+            '/**\n * @fileoverview This file was generated by the Angular template compiler. Do not edit.');
+        expect(contents).toContain('\n * @suppress {suspiciousCode');
       });
 
       it('should be merged with existing fileoverview comments', () => {
-        const contents = compileAndRead(`/** Hello world. */
+        const contents = compileAndRead(`/**\n * @fileoverview Hello world.\n */
 
         import {CommonModule} from '@angular/common';
         import {NgModule} from '@angular/core';
@@ -398,7 +398,7 @@ describe('ngc transformer command-line', () => {
         })
         export class MyModule {}
       `);
-        expect(contents).toContain('Hello world.');
+        expect(contents).toContain('\n * @fileoverview Hello world.\n');
       });
 
       it('should only pick file comments', () => {
diff --git a/packages/compiler-cli/test/ngtsc/BUILD.bazel b/packages/compiler-cli/test/ngtsc/BUILD.bazel
index 96e2a67c9e228..20359c531ce38 100644
--- a/packages/compiler-cli/test/ngtsc/BUILD.bazel
+++ b/packages/compiler-cli/test/ngtsc/BUILD.bazel
@@ -11,6 +11,7 @@ ts_library(
         "//packages/compiler-cli/src/ngtsc/file_system",
         "//packages/compiler-cli/src/ngtsc/file_system/testing",
         "//packages/compiler-cli/src/ngtsc/indexer",
+        "//packages/compiler-cli/src/ngtsc/reflection",
         "//packages/compiler-cli/src/ngtsc/routing",
         "//packages/compiler-cli/src/ngtsc/testing",
         "//packages/compiler-cli/src/ngtsc/util",
diff --git a/packages/compiler-cli/test/ngtsc/env.ts b/packages/compiler-cli/test/ngtsc/env.ts
index dcf3a3f25d9e7..9cf9c48dfdfe2 100644
--- a/packages/compiler-cli/test/ngtsc/env.ts
+++ b/packages/compiler-cli/test/ngtsc/env.ts
@@ -16,8 +16,10 @@ import {absoluteFrom, AbsoluteFsPath, FileSystem, getFileSystem, NgtscCompilerHo
 import {Folder, MockFileSystem} from '../../src/ngtsc/file_system/testing';
 import {IndexedComponent} from '../../src/ngtsc/indexer';
 import {NgtscProgram} from '../../src/ngtsc/program';
+import {DeclarationNode} from '../../src/ngtsc/reflection';
 import {LazyRoute} from '../../src/ngtsc/routing';
 import {setWrapHostForTest} from '../../src/transformers/compiler_host';
+import {getCachedSourceFile} from '../helpers';
 
 
 /**
@@ -258,7 +260,7 @@ export class NgtscTestEnvironment {
     return program.listLazyRoutes(entryPoint);
   }
 
-  driveIndexer(): Map<ts.Declaration, IndexedComponent> {
+  driveIndexer(): Map<DeclarationNode, IndexedComponent> {
     const {rootNames, options} = readNgcCommandLineAndConfiguration(['-p', this.basePath]);
     const host = createCompilerHost({options});
     const program = createProgram({rootNames, host, options});
@@ -266,7 +268,17 @@ export class NgtscTestEnvironment {
   }
 }
 
-class AugmentedCompilerHost extends NgtscCompilerHost {
+class NgtscTestCompilerHost extends NgtscCompilerHost {
+  getSourceFile(fileName: string, languageVersion: ts.ScriptTarget): ts.SourceFile|undefined {
+    const cachedSf = getCachedSourceFile(fileName, () => this.readFile(fileName));
+    if (cachedSf !== null) {
+      return cachedSf;
+    }
+    return super.getSourceFile(fileName, languageVersion);
+  }
+}
+
+class AugmentedCompilerHost extends NgtscTestCompilerHost {
   delegate!: ts.CompilerHost;
 }
 
diff --git a/packages/compiler-cli/test/ngtsc/fake_core/index.ts b/packages/compiler-cli/test/ngtsc/fake_core/index.ts
index 7aad1050cff0d..4d9f8d3efb997 100644
--- a/packages/compiler-cli/test/ngtsc/fake_core/index.ts
+++ b/packages/compiler-cli/test/ngtsc/fake_core/index.ts
@@ -77,7 +77,7 @@ export type ɵɵPipeDefWithMeta<PipeT, NameT> = any;
 
 export enum ViewEncapsulation {
   Emulated = 0,
-  Native = 1,
+  // Historically the 1 value was for `Native` encapsulation which has been removed as of v11.
   None = 2,
   ShadowDom = 3
 }
diff --git a/packages/compiler-cli/test/ngtsc/incremental_spec.ts b/packages/compiler-cli/test/ngtsc/incremental_spec.ts
index ee637eecd7524..59be3f750de9b 100644
--- a/packages/compiler-cli/test/ngtsc/incremental_spec.ts
+++ b/packages/compiler-cli/test/ngtsc/incremental_spec.ts
@@ -433,8 +433,13 @@ runInEachFileSystem(() => {
     });
 
     it('should compile incrementally with template type-checking turned on', () => {
-      env.tsconfig({ivyTemplateTypeCheck: true});
-      env.write('main.ts', 'export class Foo {}');
+      env.tsconfig({fullTemplateTypeCheck: true});
+      env.write('main.ts', `
+        import {Component} from '@angular/core';
+
+        @Component({template: ''})
+        export class MyComponent {}
+      `);
       env.driveMain();
       env.invalidateCachedFile('main.ts');
       env.driveMain();
@@ -442,6 +447,27 @@ runInEachFileSystem(() => {
       // https://github.com/angular/angular/issues/30079), this would have crashed.
     });
 
+    // https://github.com/angular/angular/issues/38979
+    it('should retain ambient types provided by auto-discovered @types', () => {
+      // This test verifies that ambient types declared in node_modules/@types are still available
+      // in incremental compilations. In the below code, the usage of `require` should be valid
+      // in the original program and the incremental program.
+      env.tsconfig({fullTemplateTypeCheck: true});
+      env.write('node_modules/@types/node/index.d.ts', 'declare var require: any;');
+      env.write('main.ts', `
+        import {Component} from '@angular/core';
+
+        require('path');
+
+        @Component({template: ''})
+        export class MyComponent {}
+      `);
+      env.driveMain();
+      env.invalidateCachedFile('main.ts');
+      const diags = env.driveDiagnostics();
+      expect(diags.length).toBe(0);
+    });
+
     // https://github.com/angular/angular/pull/26036
     it('should handle redirected source files', () => {
       env.tsconfig({fullTemplateTypeCheck: true});
@@ -461,8 +487,12 @@ runInEachFileSystem(() => {
       env.write('node_modules/b/index.js', `export {ServiceA as ServiceB} from 'a';`);
       env.write('node_modules/b/index.d.ts', `export {ServiceA as ServiceB} from 'a';`);
       env.write('test.ts', `
+        import {Component} from '@angular/core';
         import {ServiceA} from 'a';
         import {ServiceB} from 'b';
+
+        @Component({template: ''})
+        export class MyComponent {}
       `);
       env.driveMain();
       env.flushWrittenFileTracking();
diff --git a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
index 5ae96b6e5c13f..2642e233be322 100644
--- a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
+++ b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
@@ -390,6 +390,43 @@ runInEachFileSystem(os => {
           expect(jsContents).toContain('/** @nocollapse */ TestCmp.ɵcmp');
         });
 
+        it('should still perform schema checks in embedded views', () => {
+          env.tsconfig({
+            'fullTemplateTypeCheck': false,
+            'annotateForClosureCompiler': true,
+            'ivyTemplateTypeCheck': true,
+          });
+          env.write('test.ts', `
+            import {Component, Directive, NgModule} from '@angular/core';
+
+            @Component({
+              selector: 'test-cmp',
+              template: \`
+                <ng-template>
+                  <some-dir>Has a directive, should be okay</some-dir>
+                  <not-a-cmp>Should trigger a schema error</not-a-cmp>
+                </ng-template>
+              \`
+            })
+            export class TestCmp {}
+
+            @Directive({
+              selector: 'some-dir',
+            })
+            export class TestDir {}
+
+            @NgModule({
+              declarations: [TestCmp, TestDir],
+            })
+            export class TestModule {}
+          `);
+
+          const diags = env.driveDiagnostics();
+          expect(diags.length).toBe(1);
+          expect(diags[0].code).toBe(ngErrorCode(ErrorCode.SCHEMA_INVALID_ELEMENT));
+          expect(ts.flattenDiagnosticMessageText(diags[0].messageText, '\n'))
+              .toContain('not-a-cmp');
+        });
         /**
          * The following set of tests verify that after Tsickle run we do not have cases
          * which trigger automatic semicolon insertion, which breaks the code. In order
@@ -2079,7 +2116,13 @@ runInEachFileSystem(os => {
 
              const errors = env.driveDiagnostics();
              expect(errors.length).toBe(1);
-             expect(errors[0].messageText).toContain('No suitable injection token for parameter');
+             expect(ts.flattenDiagnosticMessageText(errors[0].messageText, '\n'))
+                 .toBe(
+                     `No suitable injection token for parameter 'notInjectable' of class 'Test'.\n` +
+                     `  Consider using the @Inject decorator to specify an injection token.`);
+             expect(errors[0].relatedInformation!.length).toBe(1);
+             expect(errors[0].relatedInformation![0].messageText)
+                 .toBe('This type is not supported as injection token.');
            });
 
         it('should give a compile-time error if an invalid @Injectable is used with an argument',
@@ -2096,9 +2139,168 @@ runInEachFileSystem(os => {
 
              const errors = env.driveDiagnostics();
              expect(errors.length).toBe(1);
-             expect(errors[0].messageText).toContain('No suitable injection token for parameter');
+             expect(ts.flattenDiagnosticMessageText(errors[0].messageText, '\n'))
+                 .toBe(
+                     `No suitable injection token for parameter 'notInjectable' of class 'Test'.\n` +
+                     `  Consider using the @Inject decorator to specify an injection token.`);
+             expect(errors[0].relatedInformation!.length).toBe(1);
+             expect(errors[0].relatedInformation![0].messageText)
+                 .toBe('This type is not supported as injection token.');
            });
 
+        it('should report an error when using a type-only import as injection token', () => {
+          env.tsconfig({strictInjectionParameters: true});
+          env.write(`types.ts`, `
+             export class TypeOnly {}
+           `);
+          env.write(`test.ts`, `
+             import {Injectable} from '@angular/core';
+             import type {TypeOnly} from './types';
+
+             @Injectable()
+             export class MyService {
+               constructor(param: TypeOnly) {}
+             }
+          `);
+
+          const diags = env.driveDiagnostics();
+          expect(diags.length).toBe(1);
+          expect(ts.flattenDiagnosticMessageText(diags[0].messageText, '\n'))
+              .toBe(
+                  `No suitable injection token for parameter 'param' of class 'MyService'.\n` +
+                  `  Consider changing the type-only import to a regular import, ` +
+                  `or use the @Inject decorator to specify an injection token.`);
+          expect(diags[0].relatedInformation!.length).toBe(2);
+          expect(diags[0].relatedInformation![0].messageText)
+              .toBe(
+                  'This type is imported using a type-only import, ' +
+                  'which prevents it from being usable as an injection token.');
+          expect(diags[0].relatedInformation![1].messageText)
+              .toBe('The type-only import occurs here.');
+        });
+
+        it('should report an error when using a primitive type as injection token', () => {
+          env.tsconfig({strictInjectionParameters: true});
+          env.write(`test.ts`, `
+             import {Injectable} from '@angular/core';
+
+             @Injectable()
+             export class MyService {
+               constructor(param: string) {}
+             }
+          `);
+
+          const diags = env.driveDiagnostics();
+          expect(diags.length).toBe(1);
+          expect(ts.flattenDiagnosticMessageText(diags[0].messageText, '\n'))
+              .toBe(
+                  `No suitable injection token for parameter 'param' of class 'MyService'.\n` +
+                  `  Consider using the @Inject decorator to specify an injection token.`);
+          expect(diags[0].relatedInformation!.length).toBe(1);
+          expect(diags[0].relatedInformation![0].messageText)
+              .toBe('This type is not supported as injection token.');
+        });
+
+        it('should report an error when using a union type as injection token', () => {
+          env.tsconfig({strictInjectionParameters: true});
+          env.write(`test.ts`, `
+             import {Injectable} from '@angular/core';
+
+             export class ClassA {}
+             export class ClassB {}
+
+             @Injectable()
+             export class MyService {
+               constructor(param: ClassA|ClassB) {}
+             }
+          `);
+
+          const diags = env.driveDiagnostics();
+          expect(diags.length).toBe(1);
+          expect(ts.flattenDiagnosticMessageText(diags[0].messageText, '\n'))
+              .toBe(
+                  `No suitable injection token for parameter 'param' of class 'MyService'.\n` +
+                  `  Consider using the @Inject decorator to specify an injection token.`);
+          expect(diags[0].relatedInformation!.length).toBe(1);
+          expect(diags[0].relatedInformation![0].messageText)
+              .toBe('This type is not supported as injection token.');
+        });
+
+        it('should report an error when using an interface as injection token', () => {
+          env.tsconfig({strictInjectionParameters: true});
+          env.write(`test.ts`, `
+             import {Injectable} from '@angular/core';
+
+             export interface Interface {}
+
+             @Injectable()
+             export class MyService {
+               constructor(param: Interface) {}
+             }
+          `);
+
+          const diags = env.driveDiagnostics();
+          expect(diags.length).toBe(1);
+          expect(ts.flattenDiagnosticMessageText(diags[0].messageText, '\n'))
+              .toBe(
+                  `No suitable injection token for parameter 'param' of class 'MyService'.\n` +
+                  `  Consider using the @Inject decorator to specify an injection token.`);
+          expect(diags[0].relatedInformation!.length).toBe(2);
+          expect(diags[0].relatedInformation![0].messageText)
+              .toBe('This type does not have a value, so it cannot be used as injection token.');
+          expect(diags[0].relatedInformation![1].messageText).toBe('The type is declared here.');
+        });
+
+        it('should report an error when using a missing type as injection token', () => {
+          // This test replicates the situation where a symbol does not have any declarations at
+          // all, e.g. because it's imported from a missing module. This would result in a
+          // semantic TypeScript diagnostic which we ignore in this test to verify that ngtsc's
+          // analysis is able to operate in this situation.
+          env.tsconfig({strictInjectionParameters: true});
+          env.write(`test.ts`, `
+             import {Injectable} from '@angular/core';
+             // @ts-expect-error
+             import {Interface} from 'missing';
+
+             @Injectable()
+             export class MyService {
+               constructor(param: Interface) {}
+             }
+          `);
+
+          const diags = env.driveDiagnostics();
+          expect(diags.length).toBe(1);
+          expect(ts.flattenDiagnosticMessageText(diags[0].messageText, '\n'))
+              .toBe(
+                  `No suitable injection token for parameter 'param' of ` +
+                  `class 'MyService'.\n` +
+                  `  Consider using the @Inject decorator to specify an injection token.`);
+          expect(diags[0].relatedInformation!.length).toBe(1);
+          expect(diags[0].relatedInformation![0].messageText)
+              .toBe('This type does not have a value, so it cannot be used as injection token.');
+        });
+
+        it('should report an error when no type is present', () => {
+          env.tsconfig({strictInjectionParameters: true, noImplicitAny: false});
+          env.write(`test.ts`, `
+             import {Injectable} from '@angular/core';
+
+             @Injectable()
+             export class MyService {
+               constructor(param) {}
+             }
+          `);
+
+          const diags = env.driveDiagnostics();
+          expect(diags.length).toBe(1);
+          expect(ts.flattenDiagnosticMessageText(diags[0].messageText, '\n'))
+              .toBe(
+                  `No suitable injection token for parameter 'param' of class 'MyService'.\n` +
+                  `  Consider adding a type to the parameter or ` +
+                  `use the @Inject decorator to specify an injection token.`);
+          expect(diags[0].relatedInformation).toBeUndefined();
+        });
+
         it('should not give a compile-time error if an invalid @Injectable is used with useValue',
            () => {
              env.tsconfig({strictInjectionParameters: true});
@@ -2240,7 +2442,8 @@ runInEachFileSystem(os => {
 
           const errors = env.driveDiagnostics();
           expect(errors.length).toBe(1);
-          expect(errors[0].messageText).toContain('No suitable injection token for parameter');
+          expect(ts.flattenDiagnosticMessageText(errors[0].messageText, '\n'))
+              .toContain('No suitable injection token for parameter');
         });
       });
 
@@ -2861,12 +3064,13 @@ runInEachFileSystem(os => {
     it('should generate queries for directives', () => {
       env.write(`test.ts`, `
         import {Directive, ContentChild, ContentChildren, TemplateRef, ViewChild} from '@angular/core';
+        import * as core from '@angular/core';
 
         @Directive({
           selector: '[test]',
           queries: {
             'mview': new ViewChild('test1'),
-            'mcontent': new ContentChild('test2'),
+            'mcontent': new core.ContentChild('test2'),
           }
         })
         class FooCmp {
@@ -4194,9 +4398,16 @@ runInEachFileSystem(os => {
 
         const diags = env.driveDiagnostics();
         expect(diags.length).toBe(1);
-        expect(diags[0].messageText)
+        expect(ts.flattenDiagnosticMessageText(diags[0].messageText, '\n'))
+            .toBe(
+                `No suitable injection token for parameter 'foo' of class 'MyService'.\n` +
+                `  Consider using the @Inject decorator to specify an injection token.`);
+        expect(diags[0].relatedInformation!.length).toBe(2);
+        expect(diags[0].relatedInformation![0].messageText)
             .toBe(
-                `No suitable injection token for parameter 'foo' of class 'MyService'.\nFound Foo`);
+                'This type corresponds with a namespace, which cannot be used as injection token.');
+        expect(diags[0].relatedInformation![1].messageText)
+            .toBe('The namespace import occurs here.');
       });
     });
 
@@ -4225,6 +4436,90 @@ runInEachFileSystem(os => {
          expect(jsContents).toMatch(setClassMetadataRegExp('type: undefined'));
        });
 
+    it('should use `undefined` in setClassMetadata for const enums', () => {
+      env.write(`keycodes.ts`, `
+        export const enum KeyCodes {A, B};
+      `);
+      env.write(`test.ts`, `
+        import {Component, Inject} from '@angular/core';
+        import {KeyCodes} from './keycodes';
+
+        @Component({
+          selector: 'some-comp',
+          template: '...',
+        })
+        export class SomeComp {
+          constructor(@Inject('arg-token') arg: KeyCodes) {}
+        }
+      `);
+
+      env.driveMain();
+      const jsContents = trim(env.getContents('test.js'));
+      expect(jsContents).not.toContain(`import { KeyCodes } from './keycodes';`);
+      // Note: `type: undefined` below, since KeyCodes can't be represented as a value
+      expect(jsContents).toMatch(setClassMetadataRegExp('type: undefined'));
+    });
+
+    it('should preserve the types of non-const enums in setClassMetadata', () => {
+      env.write(`keycodes.ts`, `
+        export enum KeyCodes {A, B};
+      `);
+      env.write(`test.ts`, `
+        import {Component, Inject} from '@angular/core';
+        import {KeyCodes} from './keycodes';
+
+        @Component({
+          selector: 'some-comp',
+          template: '...',
+        })
+        export class SomeComp {
+          constructor(@Inject('arg-token') arg: KeyCodes) {}
+        }
+      `);
+
+      env.driveMain();
+      const jsContents = trim(env.getContents('test.js'));
+      expect(jsContents).toContain(`import { KeyCodes } from './keycodes';`);
+      expect(jsContents).toMatch(setClassMetadataRegExp('type: i1.KeyCodes'));
+    });
+
+    it('should use `undefined` in setClassMetadata if types originate from type-only imports',
+       () => {
+         env.write(`types.ts`, `
+           export default class {}
+           export class TypeOnly {}
+         `);
+         env.write(`test.ts`, `
+           import {Component, Inject, Injectable} from '@angular/core';
+           import type DefaultImport from './types';
+           import type {TypeOnly} from './types';
+           import type * as types from './types';
+
+           @Component({
+             selector: 'some-comp',
+             template: '...',
+           })
+           export class SomeComp {
+             constructor(
+               @Inject('token') namedImport: TypeOnly,
+               @Inject('token') defaultImport: DefaultImport,
+               @Inject('token') namespacedImport: types.TypeOnly,
+             ) {}
+           }
+        `);
+
+         env.driveMain();
+         const jsContents = trim(env.getContents('test.js'));
+         // Module specifier for type-only import should not be emitted
+         expect(jsContents).not.toContain('./types');
+         // Default type-only import should not be emitted
+         expect(jsContents).not.toContain('DefaultImport');
+         // Named type-only import should not be emitted
+         expect(jsContents).not.toContain('TypeOnly');
+         // The parameter type in class metadata should be undefined
+         expect(jsContents).toMatch(setClassMetadataRegExp('type: undefined'));
+       });
+
     it('should not throw in case whitespaces and HTML comments are present inside <ng-content>',
        () => {
          env.write('test.ts', `
@@ -7150,6 +7445,54 @@ export const Foo = Foo__PRE_R3__;
            const diags = env.driveDiagnostics();
            expect(diags.length).toBe(0);
          });
+
+      describe('template parsing diagnostics', () => {
+        // These tests validate that errors which occur during template parsing are expressed as
+        // diagnostics instead of a compiler crash (which used to be the case). They only assert
+        // that the error is produced with an accurate span - the exact semantics of the errors are
+        // tested separately, via the parser tests.
+        it('should emit a diagnostic for a template parsing error', () => {
+          env.write('test.ts', `
+            import {Component} from '@angular/core';
+            @Component({
+              template: '<div></span>',
+              selector: 'test-cmp',
+            })
+            export class TestCmp {}
+          `);
+          const diags = env.driveDiagnostics();
+          expect(diags.length).toBe(1);
+          expect(getDiagnosticSourceCode(diags[0])).toBe('</span>');
+        });
+
+        it('should emit a diagnostic for an expression parsing error', () => {
+          env.write('test.ts', `
+            import {Component} from '@angular/core';
+            @Component({
+              template: '<cmp [input]="x ? y">',
+              selector: 'test-cmp',
+            })
+            export class TestCmp {}
+          `);
+          const diags = env.driveDiagnostics();
+          expect(diags.length).toBe(1);
+          expect(getDiagnosticSourceCode(diags[0])).toBe('x ? y');
+        });
+
+        it('should use a single character span for an unexpected EOF parsing error', () => {
+          env.write('test.ts', `
+              import {Component} from '@angular/core';
+              @Component({
+                template: '<cmp [input]="x>',
+                selector: 'test-cmp',
+              })
+              export class TestCmp {}
+            `);
+          const diags = env.driveDiagnostics();
+          expect(diags.length).toBe(1);
+          expect(getDiagnosticSourceCode(diags[0])).toBe('\'');
+        });
+      });
     });
   });
 
diff --git a/packages/compiler-cli/test/ngtsc/template_mapping_spec.ts b/packages/compiler-cli/test/ngtsc/template_mapping_spec.ts
index c6865f8efac6f..c830f30f8e482 100644
--- a/packages/compiler-cli/test/ngtsc/template_mapping_spec.ts
+++ b/packages/compiler-cli/test/ngtsc/template_mapping_spec.ts
@@ -24,7 +24,7 @@ runInEachFileSystem((os) => {
 
     beforeEach(() => {
       env = NgtscTestEnvironment.setup(testFiles);
-      env.tsconfig();
+      env.tsconfig({sourceMap: true, target: 'es2015', enableI18nLegacyMessageIdFormat: false});
     });
 
     describe('Inline templates', () => {
@@ -342,7 +342,7 @@ runInEachFileSystem((os) => {
           expect(mappings).toContain(
               {source: '<h3>', generated: 'i0.ɵɵelementStart(0, "h3")', sourceUrl: '../test.ts'});
           expect(mappings).toContain({
-            source: '<ng-content select="title">',
+            source: '<ng-content select="title"></ng-content>',
             generated: 'i0.ɵɵprojection(1)',
             sourceUrl: '../test.ts'
           });
@@ -351,7 +351,7 @@ runInEachFileSystem((os) => {
           expect(mappings).toContain(
               {source: '<div>', generated: 'i0.ɵɵelementStart(2, "div")', sourceUrl: '../test.ts'});
           expect(mappings).toContain({
-            source: '<ng-content>',
+            source: '<ng-content></ng-content>',
             generated: 'i0.ɵɵprojection(3, 1)',
             sourceUrl: '../test.ts'
           });
@@ -360,6 +360,90 @@ runInEachFileSystem((os) => {
         });
       });
 
+      describe('$localize', () => {
+        it('should create simple i18n message source-mapping', () => {
+          const mappings = compileAndMap(`<div i18n>Hello, World!</div>`);
+          expect(mappings).toContain({
+            source: '<div i18n>',
+            generated: 'i0.ɵɵelementStart(0, "div")',
+            sourceUrl: '../test.ts',
+          });
+          expect(mappings).toContain({
+            source: 'Hello, World!',
+            generated: '`Hello, World!`',
+            sourceUrl: '../test.ts',
+          });
+        });
+
+        it('should create placeholder source-mappings', () => {
+          const mappings = compileAndMap(`<div i18n>Hello, {{name}}!</div>`);
+          expect(mappings).toContain({
+            source: '<div i18n>',
+            generated: 'i0.ɵɵelementStart(0, "div")',
+            sourceUrl: '../test.ts',
+          });
+          expect(mappings).toContain({
+            source: '</div>',
+            generated: 'i0.ɵɵelementEnd()',
+            sourceUrl: '../test.ts',
+          });
+          expect(mappings).toContain({
+            source: 'Hello, ',
+            generated: '`Hello, ${',
+            sourceUrl: '../test.ts',
+          });
+          expect(mappings).toContain({
+            source: '{{name}}',
+            generated: '"\\uFFFD0\\uFFFD"',
+            sourceUrl: '../test.ts',
+          });
+          expect(mappings).toContain({
+            source: '!',
+            generated: '}:INTERPOLATION:!`',
+            sourceUrl: '../test.ts',
+          });
+        });
+
+        it('should create tag (container) placeholder source-mappings', () => {
+          const mappings = compileAndMap(`<div i18n>Hello, <b>World</b>!</div>`);
+          expect(mappings).toContain({
+            source: '<div i18n>',
+            generated: 'i0.ɵɵelementStart(0, "div")',
+            sourceUrl: '../test.ts',
+          });
+          expect(mappings).toContain({
+            source: '</div>',
+            generated: 'i0.ɵɵelementEnd()',
+            sourceUrl: '../test.ts',
+          });
+          expect(mappings).toContain({
+            source: 'Hello, ',
+            generated: '`Hello, ${',
+            sourceUrl: '../test.ts',
+          });
+          expect(mappings).toContain({
+            source: '<b>',
+            generated: '"\\uFFFD#2\\uFFFD"',
+            sourceUrl: '../test.ts',
+          });
+          expect(mappings).toContain({
+            source: 'World',
+            generated: '}:START_BOLD_TEXT:World${',
+            sourceUrl: '../test.ts',
+          });
+          expect(mappings).toContain({
+            source: '</b>',
+            generated: '"\\uFFFD/#2\\uFFFD"',
+            sourceUrl: '../test.ts',
+          });
+          expect(mappings).toContain({
+            source: '!',
+            generated: '}:CLOSE_BOLD_TEXT:!`',
+            sourceUrl: '../test.ts',
+          });
+        });
+      });
+
       it('should create (simple string) inline template source-mapping', () => {
         const mappings = compileAndMap('<div>this is a test</div><div>{{ 1 + 2 }}</div>');
 
@@ -520,7 +604,6 @@ runInEachFileSystem((os) => {
     function compileAndMap(template: string, templateUrl: string|null = null) {
       const templateConfig = templateUrl ? `templateUrl: '${templateUrl}'` :
                                            ('template: `' + template.replace(/`/g, '\\`') + '`');
-      env.tsconfig({sourceMap: true});
       env.write('test.ts', `
         import {Component} from '@angular/core';
 
diff --git a/packages/compiler-cli/test/ngtsc/template_typecheck_spec.ts b/packages/compiler-cli/test/ngtsc/template_typecheck_spec.ts
index 7c9ec4dbf464d..26212e3bc1e64 100644
--- a/packages/compiler-cli/test/ngtsc/template_typecheck_spec.ts
+++ b/packages/compiler-cli/test/ngtsc/template_typecheck_spec.ts
@@ -141,6 +141,37 @@ export declare class AnimationEvent {
       expect(diags[0].code).toBeGreaterThan(0);
     });
 
+    it('should produce diagnostics when mapping to multiple fields and bound types are incorrect',
+       () => {
+         env.tsconfig(
+             {fullTemplateTypeCheck: true, strictInputTypes: true, strictAttributeTypes: true});
+         env.write('test.ts', `
+        import {Component, Directive, NgModule, Input} from '@angular/core';
+
+        @Component({
+          selector: 'test',
+          template: '<div dir foo="2"></div>',
+        })
+        class TestCmp {}
+
+        @Directive({selector: '[dir]'})
+        class TestDir {
+          @Input('foo') foo1: number;
+          @Input('foo') foo2: number;
+        }
+
+        @NgModule({
+          declarations: [TestCmp, TestDir],
+        })
+        class Module {}
+      `);
+
+         const diags = env.driveDiagnostics();
+         expect(diags.length).toBe(2);
+         expect(diags[0].messageText).toEqual(`Type 'string' is not assignable to type 'number'.`);
+         expect(diags[1].messageText).toEqual(`Type 'string' is not assignable to type 'number'.`);
+       });
+
     it('should support inputs and outputs with names that are not JavaScript identifiers', () => {
       env.tsconfig(
           {fullTemplateTypeCheck: true, strictInputTypes: true, strictOutputEventTypes: true});
@@ -1088,7 +1119,7 @@ export declare class AnimationEvent {
       const allErrors = [
         `'does_not_exist' does not exist on type '{ name: string; }'`,
         `Expected 2 arguments, but got 3.`,
-        `Argument of type '"test"' is not assignable to parameter of type 'number'`,
+        `Argument of type 'string' is not assignable to parameter of type 'number'`,
         `Argument of type '{ name: string; }' is not assignable to parameter of type 'unknown[]'`,
       ];
 
@@ -1210,7 +1241,7 @@ export declare class AnimationEvent {
 
       const diags = env.driveDiagnostics();
       expect(diags.length).toBe(3);
-      expect(diags[0].messageText).toBe(`Type 'true' is not assignable to type 'number'.`);
+      expect(diags[0].messageText).toBe(`Type 'boolean' is not assignable to type 'number'.`);
       expect(getSourceCodeForDiagnostic(diags[0])).toEqual('[fromAbstract]="true"');
       expect(diags[1].messageText).toBe(`Type 'number' is not assignable to type 'string'.`);
       expect(getSourceCodeForDiagnostic(diags[1])).toEqual('[fromBase]="3"');
@@ -1267,7 +1298,7 @@ export declare class AnimationEvent {
 
       const diags = env.driveDiagnostics();
       expect(diags.length).toBe(3);
-      expect(diags[0].messageText).toBe(`Type 'true' is not assignable to type 'number'.`);
+      expect(diags[0].messageText).toBe(`Type 'boolean' is not assignable to type 'number'.`);
       expect(getSourceCodeForDiagnostic(diags[0])).toEqual('[fromAbstract]="true"');
       expect(diags[1].messageText).toBe(`Type 'number' is not assignable to type 'string'.`);
       expect(getSourceCodeForDiagnostic(diags[1])).toEqual('[fromBase]="3"');
@@ -1476,7 +1507,7 @@ export declare class AnimationEvent {
       it('should give an error if the binding expression type is not accepted by the coercion function',
          () => {
            env.write('test.ts', `
-            import {Component, NgModule} from '@angular/core';
+            import {Component, NgModule, Input, Directive} from '@angular/core';
             import {MatInputModule} from '@angular/material';
 
             @Component({
@@ -1533,6 +1564,265 @@ export declare class AnimationEvent {
          });
     });
 
+    describe('restricted inputs', () => {
+      const directiveDeclaration = `
+            @Directive({selector: '[dir]'})
+            export class TestDir {
+              @Input()
+              protected protectedField!: string;
+              @Input()
+              private privateField!: string;
+              @Input()
+              readonly readonlyField!: string;
+            }
+      `;
+
+      const correctTypeInputsToRestrictedFields = `
+            import {Component, NgModule, Input, Directive} from '@angular/core';
+
+            @Component({
+              selector: 'blah',
+              template: '<div dir [readonlyField]="value" [protectedField]="value" [privateField]="value"></div>',
+            })
+            export class FooCmp {
+              value = "value";
+            }
+
+            ${directiveDeclaration}
+
+            @NgModule({
+              declarations: [FooCmp, TestDir],
+            })
+            export class FooModule {}
+        `;
+
+      const correctInputsToRestrictedFieldsFromBaseClass = `
+            import {Component, NgModule, Input, Directive} from '@angular/core';
+
+            @Component({
+              selector: 'blah',
+              template: '<div child-dir [readonlyField]="value" [protectedField]="value" [privateField]="value"></div>',
+            })
+            export class FooCmp {
+              value = "value";
+            }
+
+            ${directiveDeclaration}
+
+            @Directive({selector: '[child-dir]'})
+            export class ChildDir extends TestDir {
+            }
+
+            @NgModule({
+              declarations: [FooCmp, ChildDir],
+            })
+            export class FooModule {}
+        `;
+      describe('with strictInputAccessModifiers', () => {
+        beforeEach(() => {
+          env.tsconfig({
+            fullTemplateTypeCheck: true,
+            strictInputTypes: true,
+            strictInputAccessModifiers: true
+          });
+        });
+
+        it('should produce diagnostics for inputs which assign to readonly, private, and protected fields',
+           () => {
+             env.write('test.ts', correctTypeInputsToRestrictedFields);
+             expectIllegalAssignmentErrors(env.driveDiagnostics());
+           });
+
+        it('should produce diagnostics for inputs which assign to readonly, private, and protected fields inherited from a base class',
+           () => {
+             env.write('test.ts', correctInputsToRestrictedFieldsFromBaseClass);
+             expectIllegalAssignmentErrors(env.driveDiagnostics());
+           });
+
+        function expectIllegalAssignmentErrors(diags: ReadonlyArray<ts.Diagnostic>) {
+          expect(diags.length).toBe(3);
+          const actualMessages = diags.map(d => d.messageText).sort();
+          const expectedMessages = [
+            `Property 'protectedField' is protected and only accessible within class 'TestDir' and its subclasses.`,
+            `Property 'privateField' is private and only accessible within class 'TestDir'.`,
+            `Cannot assign to 'readonlyField' because it is a read-only property.`,
+          ].sort();
+          expect(actualMessages).toEqual(expectedMessages);
+        }
+
+        it('should report invalid type assignment when field name is not a valid JS identifier',
+           () => {
+             env.write('test.ts', `
+            import {Component, NgModule, Input, Directive} from '@angular/core';
+
+            @Component({
+              selector: 'blah',
+              template: '<div dir [private-input.xs]="value"></div>',
+            })
+            export class FooCmp {
+              value = 5;
+            }
+
+            @Directive({selector: '[dir]'})
+            export class TestDir {
+              @Input()
+              private 'private-input.xs'!: string;
+            }
+
+            @NgModule({
+              declarations: [FooCmp, TestDir],
+            })
+            export class FooModule {}
+          `);
+             const diags = env.driveDiagnostics();
+             expect(diags.length).toBe(1);
+             expect(diags[0].messageText)
+                 .toEqual(`Type 'number' is not assignable to type 'string'.`);
+           });
+      });
+
+      describe('with strict inputs', () => {
+        beforeEach(() => {
+          env.tsconfig({fullTemplateTypeCheck: true, strictInputTypes: true});
+        });
+
+        it('should not produce diagnostics for correct inputs which assign to readonly, private, or protected fields',
+           () => {
+             env.write('test.ts', correctTypeInputsToRestrictedFields);
+             const diags = env.driveDiagnostics();
+             expect(diags.length).toBe(0);
+           });
+
+        it('should not produce diagnostics for correct inputs which assign to readonly, private, or protected fields inherited from a base class',
+           () => {
+             env.write('test.ts', correctInputsToRestrictedFieldsFromBaseClass);
+             const diags = env.driveDiagnostics();
+             expect(diags.length).toBe(0);
+           });
+
+        it('should produce diagnostics when assigning incorrect type to readonly, private, or protected fields',
+           () => {
+             env.write('test.ts', `
+            import {Component, NgModule, Input, Directive} from '@angular/core';
+
+            @Component({
+              selector: 'blah',
+              template: '<div dir [readonlyField]="value" [protectedField]="value" [privateField]="value"></div>',
+            })
+            export class FooCmp {
+              value = 1;
+            }
+
+            ${directiveDeclaration}
+
+            @NgModule({
+              declarations: [FooCmp, TestDir],
+            })
+            export class FooModule {}
+        `);
+             const diags = env.driveDiagnostics();
+             expect(diags.length).toBe(3);
+             expect(diags[0].messageText)
+                 .toEqual(`Type 'number' is not assignable to type 'string'.`);
+             expect(diags[1].messageText)
+                 .toEqual(`Type 'number' is not assignable to type 'string'.`);
+             expect(diags[2].messageText)
+                 .toEqual(`Type 'number' is not assignable to type 'string'.`);
+           });
+      });
+    });
+
+    it('should not produce diagnostics for undeclared inputs', () => {
+      env.tsconfig({fullTemplateTypeCheck: true, strictInputTypes: true});
+      env.write('test.ts', `
+            import {Component, NgModule, Input, Directive} from '@angular/core';
+
+            @Component({
+              selector: 'blah',
+              template: '<div dir [undeclared]="value"></div>',
+            })
+            export class FooCmp {
+              value = "value";
+            }
+
+            @Directive({
+              selector: '[dir]',
+              inputs: ['undeclared'],
+            })
+            export class TestDir {
+            }
+
+            @NgModule({
+              declarations: [FooCmp, TestDir],
+            })
+            export class FooModule {}
+        `);
+      const diags = env.driveDiagnostics();
+      expect(diags.length).toBe(0);
+    });
+
+    it('should produce diagnostics for invalid expressions when assigned into an undeclared input',
+       () => {
+         env.tsconfig({fullTemplateTypeCheck: true, strictInputTypes: true});
+         env.write('test.ts', `
+            import {Component, NgModule, Input, Directive} from '@angular/core';
+
+            @Component({
+              selector: 'blah',
+              template: '<div dir [undeclared]="value"></div>',
+            })
+            export class FooCmp {
+            }
+
+            @Directive({
+              selector: '[dir]',
+              inputs: ['undeclared'],
+            })
+            export class TestDir {
+            }
+
+            @NgModule({
+              declarations: [FooCmp, TestDir],
+            })
+            export class FooModule {}
+        `);
+         const diags = env.driveDiagnostics();
+         expect(diags.length).toBe(1);
+         expect(diags[0].messageText).toBe(`Property 'value' does not exist on type 'FooCmp'.`);
+       });
+
+    it('should not produce diagnostics for undeclared inputs inherited from a base class', () => {
+      env.tsconfig({fullTemplateTypeCheck: true, strictInputTypes: true});
+      env.write('test.ts', `
+            import {Component, NgModule, Input, Directive} from '@angular/core';
+
+            @Component({
+              selector: 'blah',
+              template: '<div dir [undeclaredBase]="value"></div>',
+            })
+            export class FooCmp {
+              value = "value";
+            }
+
+            @Directive({
+              inputs: ['undeclaredBase'],
+            })
+            export class BaseDir {
+            }
+
+            @Directive({selector: '[dir]'})
+            export class TestDir extends BaseDir {
+            }
+
+            @NgModule({
+              declarations: [FooCmp, TestDir],
+            })
+            export class FooModule {}
+        `);
+      const diags = env.driveDiagnostics();
+      expect(diags.length).toBe(0);
+    });
+
     describe('legacy schema checking with the DOM schema', () => {
       beforeEach(() => {
         env.tsconfig({ivyTemplateTypeCheck: true, fullTemplateTypeCheck: false});
@@ -1727,6 +2017,28 @@ export declare class AnimationEvent {
         expect(diags.length).toBe(0);
       });
 
+      it('should allow HTML elements without explicit namespace inside SVG foreignObject', () => {
+        env.write('test.ts', `
+        import {Component, NgModule} from '@angular/core';
+        @Component({
+          template: \`
+            <svg>
+              <foreignObject>
+                <div>Hello</div>
+              </foreignObject>
+            </svg>
+          \`,
+        })
+        export class FooCmp {}
+        @NgModule({
+          declarations: [FooCmp],
+        })
+        export class FooModule {}
+      `);
+        const diags = env.driveDiagnostics();
+        expect(diags.length).toBe(0);
+      });
+
       it('should check for unknown elements inside an SVG foreignObject', () => {
         env.write('test.ts', `
         import {Component, NgModule} from '@angular/core';
@@ -1752,6 +2064,33 @@ export declare class AnimationEvent {
 1. If 'foo' is an Angular component, then verify that it is part of this module.
 2. To allow any element add 'NO_ERRORS_SCHEMA' to the '@NgModule.schemas' of this component.`);
       });
+
+      it('should check for unknown elements without explicit namespace inside an SVG foreignObject',
+         () => {
+           env.write('test.ts', `
+        import {Component, NgModule} from '@angular/core';
+        @Component({
+          selector: 'blah',
+          template: \`
+            <svg>
+              <foreignObject>
+                <foo>Hello</foo>
+              </foreignObject>
+            </svg>
+          \`,
+        })
+        export class FooCmp {}
+        @NgModule({
+          declarations: [FooCmp],
+        })
+        export class FooModule {}
+      `);
+           const diags = env.driveDiagnostics();
+           expect(diags.length).toBe(1);
+           expect(diags[0].messageText).toBe(`'foo' is not a known element:
+1. If 'foo' is an Angular component, then verify that it is part of this module.
+2. To allow any element add 'NO_ERRORS_SCHEMA' to the '@NgModule.schemas' of this component.`);
+         });
     });
 
     // Test both sync and async compilations, see https://github.com/angular/angular/issues/32538
diff --git a/packages/compiler-cli/test/transformers/downlevel_decorators_transform_spec.ts b/packages/compiler-cli/test/transformers/downlevel_decorators_transform_spec.ts
index d1200b92a0267..daf5d946a0515 100644
--- a/packages/compiler-cli/test/transformers/downlevel_decorators_transform_spec.ts
+++ b/packages/compiler-cli/test/transformers/downlevel_decorators_transform_spec.ts
@@ -192,7 +192,7 @@ describe('downlevel decorator transform', () => {
   it('should downlevel Angular-decorated class member', () => {
     const {output} = transform(`
       import {Input} from '@angular/core';
-      
+
       export class MyDir {
         @Input() disabled: boolean = false;
       }
@@ -231,7 +231,7 @@ describe('downlevel decorator transform', () => {
     const {output} = transform(`
       import {Input} from '@angular/core';
       import {MyOtherClass} from './other-file';
-      
+
       export class MyDir {
         @Input() trigger: HTMLElement;
         @Input() fromOtherFile: MyOtherClass;
@@ -255,7 +255,7 @@ describe('downlevel decorator transform', () => {
         `
       import {Directive} from '@angular/core';
       import {MyOtherClass} from './other-file';
-      
+
       @Directive()
       export class MyDir {
         constructor(other: MyOtherClass) {}
@@ -281,7 +281,7 @@ describe('downlevel decorator transform', () => {
         `
       import {Directive} from '@angular/core';
       import {MyOtherClass} from './other-file';
-      
+
       @Directive()
       export class MyDir {
         constructor(other: MyOtherClass) {}
@@ -307,7 +307,7 @@ describe('downlevel decorator transform', () => {
     const {output} = transform(`
       import {Directive} from '@angular/core';
       import * as externalFile from './other-file';
-      
+
       @Directive()
       export class MyDir {
         constructor(other: externalFile.MyOtherClass) {}
@@ -329,11 +329,11 @@ describe('downlevel decorator transform', () => {
   it('should properly serialize constructor parameter with local qualified name type', () => {
     const {output} = transform(`
       import {Directive} from '@angular/core';
-      
+
       namespace other {
         export class OtherClass {}
       };
-      
+
       @Directive()
       export class MyDir {
         constructor(other: other.OtherClass) {}
@@ -355,7 +355,7 @@ describe('downlevel decorator transform', () => {
   it('should properly downlevel constructor parameter decorators', () => {
     const {output} = transform(`
       import {Inject, Directive, DOCUMENT} from '@angular/core';
-      
+
       @Directive()
       export class MyDir {
         constructor(@Inject(DOCUMENT) document: Document) {}
@@ -376,7 +376,7 @@ describe('downlevel decorator transform', () => {
   it('should properly downlevel constructor parameters with union type', () => {
     const {output} = transform(`
       import {Optional, Directive, NgZone} from '@angular/core';
-      
+
       @Directive()
       export class MyDir {
         constructor(@Optional() ngZone: NgZone|null) {}
@@ -546,18 +546,20 @@ describe('downlevel decorator transform', () => {
       export default interface {
         hello: false;
       }
+      export const enum KeyCodes {A, B}
     `);
     const {output} = transform(`
       import {Directive, Inject} from '@angular/core';
       import * as angular from './external';
-      import {IOverlay} from './external';
+      import {IOverlay, KeyCodes} from './external';
       import TypeFromDefaultImport from './external';
 
       @Directive()
       export class MyDir {
         constructor(@Inject('$state') param: angular.IState,
                     @Inject('$overlay') other: IOverlay,
-                    @Inject('$default') default: TypeFromDefaultImport) {}
+                    @Inject('$default') default: TypeFromDefaultImport,
+                    @Inject('$keyCodes') keyCodes: KeyCodes) {}
       }
     `);
 
@@ -570,7 +572,8 @@ describe('downlevel decorator transform', () => {
       MyDir.ctorParameters = () => [
         { type: undefined, decorators: [{ type: core_1.Inject, args: ['$state',] }] },
         { type: undefined, decorators: [{ type: core_1.Inject, args: ['$overlay',] }] },
-        { type: undefined, decorators: [{ type: core_1.Inject, args: ['$default',] }] }
+        { type: undefined, decorators: [{ type: core_1.Inject, args: ['$default',] }] },
+        { type: undefined, decorators: [{ type: core_1.Inject, args: ['$keyCodes',] }] }
       ];
     `);
   });
@@ -581,7 +584,7 @@ describe('downlevel decorator transform', () => {
         const visitNode = (node: ts.Node): ts.Node => {
           if (ts.isClassDeclaration(node) || ts.isClassElement(node)) {
             const cloned = ts.getMutableClone(node);
-            cloned.decorators = undefined;
+            (cloned.decorators as undefined) = undefined;
             return cloned;
           }
           return ts.visitEachChild(node, visitNode, context);
@@ -593,7 +596,7 @@ describe('downlevel decorator transform', () => {
     const {output} = transform(
         `
       import {Directive} from '@angular/core';
-      
+
       export class MyInjectedClass {}
 
       @Directive()
@@ -609,13 +612,36 @@ describe('downlevel decorator transform', () => {
     expect(output).not.toContain('tslib');
   });
 
+  it('should capture a non-const enum used as a constructor type', () => {
+    const {output} = transform(`
+      import {Component} from '@angular/core';
+
+      export enum Values {A, B};
+
+      @Component({template: 'hello'})
+      export class MyComp {
+        constructor(v: Values) {}
+      }
+    `);
+
+    expect(diagnostics.length).toBe(0);
+    expect(output).toContain(dedent`
+      MyComp.decorators = [
+        { type: core_1.Component, args: [{ template: 'hello' },] }
+      ];
+      MyComp.ctorParameters = () => [
+        { type: Values }
+      ];`);
+    expect(output).not.toContain('tslib');
+  });
+
   describe('class decorators skipped', () => {
     beforeEach(() => skipClassDecorators = true);
 
     it('should not downlevel Angular class decorators', () => {
       const {output} = transform(`
         import {Injectable} from '@angular/core';
-  
+
         @Injectable()
         export class MyService {}
       `);
@@ -632,10 +658,10 @@ describe('downlevel decorator transform', () => {
     it('should downlevel constructor parameters', () => {
       const {output} = transform(`
         import {Injectable} from '@angular/core';
- 
+
         @Injectable()
         export class InjectClass {}
- 
+
         @Injectable()
         export class MyService {
           constructor(dep: InjectClass) {}
@@ -658,10 +684,10 @@ describe('downlevel decorator transform', () => {
     it('should downlevel constructor parameter decorators', () => {
       const {output} = transform(`
         import {Injectable, Inject} from '@angular/core';
- 
+
         @Injectable()
         export class InjectClass {}
- 
+
         @Injectable()
         export class MyService {
           constructor(@Inject('test') dep: InjectClass) {}
@@ -684,7 +710,7 @@ describe('downlevel decorator transform', () => {
     it('should downlevel class member Angular decorators', () => {
       const {output} = transform(`
         import {Injectable, Input} from '@angular/core';
- 
+
         export class MyService {
           @Input() disabled: boolean;
         }
diff --git a/packages/compiler-cli/test/transformers/node_emitter_spec.ts b/packages/compiler-cli/test/transformers/node_emitter_spec.ts
index 35638fb4f08f2..f4915d77043dd 100644
--- a/packages/compiler-cli/test/transformers/node_emitter_spec.ts
+++ b/packages/compiler-cli/test/transformers/node_emitter_spec.ts
@@ -267,48 +267,69 @@ describe('TypeScriptNodeEmitter', () => {
   });
 
   describe('comments', () => {
-    it('should support a preamble', () => {
-      expect(emitStmt(o.variable('a').toStmt(), Format.Flat, '/* SomePreamble */'))
-          .toBe('/* SomePreamble */ a;');
-    });
+    it('should support a preamble, which is wrapped as a multi-line comment with no trimming or padding',
+       () => {
+         expect(emitStmt(o.variable('a').toStmt(), Format.Raw, '*\n * SomePreamble\n '))
+             .toBe('/**\n * SomePreamble\n */\na;');
+       });
 
     it('should support singleline comments', () => {
-      expect(emitStmt(new o.CommentStmt('Simple comment'))).toBe('// Simple comment');
+      expect(emitStmt(
+                 new o.ReturnStatement(o.literal(1), null, [o.leadingComment(' a\n b', false)]),
+                 Format.Raw))
+          .toBe('// a\n// b\nreturn 1;');
     });
 
     it('should support multiline comments', () => {
-      expect(emitStmt(new o.CommentStmt('Multiline comment', true)))
-          .toBe('/* Multiline comment */');
-      expect(emitStmt(new o.CommentStmt(`Multiline\ncomment`, true), Format.Raw))
-          .toBe(`/* Multiline\ncomment */`);
+      expect(emitStmt(
+                 new o.ReturnStatement(
+                     o.literal(1), null, [o.leadingComment('Multiline comment', true)]),
+                 Format.Raw))
+          .toBe('/* Multiline comment */\nreturn 1;');
+      expect(emitStmt(
+                 new o.ReturnStatement(
+                     o.literal(1), null, [o.leadingComment(`Multiline\ncomment`, true)]),
+                 Format.Raw))
+          .toBe(`/* Multiline\ncomment */\nreturn 1;`);
     });
 
     describe('JSDoc comments', () => {
       it('should be supported', () => {
-        expect(emitStmt(new o.JSDocCommentStmt([{text: 'Intro comment'}]), Format.Raw))
-            .toBe(`/**\n * Intro comment\n */`);
         expect(emitStmt(
-                   new o.JSDocCommentStmt([{tagName: o.JSDocTagName.Desc, text: 'description'}]),
+                   new o.ReturnStatement(
+                       o.literal(1), null, [o.jsDocComment([{text: 'Intro comment'}])]),
                    Format.Raw))
-            .toBe(`/**\n * @desc description\n */`);
+            .toBe(`/**\n * Intro comment\n */\nreturn 1;`);
         expect(emitStmt(
-                   new o.JSDocCommentStmt([
-                     {text: 'Intro comment'},
-                     {tagName: o.JSDocTagName.Desc, text: 'description'},
-                     {tagName: o.JSDocTagName.Id, text: '{number} identifier 123'},
-                   ]),
+                   new o.ReturnStatement(
+                       o.literal(1), null,
+                       [o.jsDocComment([{tagName: o.JSDocTagName.Desc, text: 'description'}])]),
+                   Format.Raw))
+            .toBe(`/**\n * @desc description\n */\nreturn 1;`);
+        expect(emitStmt(
+                   new o.ReturnStatement(
+                       o.literal(1), null, [o.jsDocComment([
+                         {text: 'Intro comment'},
+                         {tagName: o.JSDocTagName.Desc, text: 'description'},
+                         {tagName: o.JSDocTagName.Id, text: '{number} identifier 123'},
+                       ])]),
                    Format.Raw))
             .toBe(
-                `/**\n * Intro comment\n * @desc description\n * @id {number} identifier 123\n */`);
+                `/**\n * Intro comment\n * @desc description\n * @id {number} identifier 123\n */\nreturn 1;`);
       });
 
       it('should escape @ in the text', () => {
-        expect(emitStmt(new o.JSDocCommentStmt([{text: 'email@google.com'}]), Format.Raw))
-            .toBe(`/**\n * email\\@google.com\n */`);
+        expect(emitStmt(
+                   new o.ReturnStatement(
+                       o.literal(1), null, [o.jsDocComment([{text: 'email@google.com'}])]),
+                   Format.Raw))
+            .toBe(`/**\n * email\\@google.com\n */\nreturn 1;`);
       });
 
       it('should not allow /* and */ in the text', () => {
-        expect(() => emitStmt(new o.JSDocCommentStmt([{text: 'some text /* */'}]), Format.Raw))
+        expect(
+            () => emitStmt(new o.ReturnStatement(
+                o.literal(1), null, [o.jsDocComment([{text: 'some text /* */'}])])))
             .toThrowError(`JSDoc text cannot contain "/*" and "*/"`);
       });
     });
diff --git a/packages/compiler-cli/test/transformers/program_spec.ts b/packages/compiler-cli/test/transformers/program_spec.ts
index a4186583b12bc..683612d72351a 100644
--- a/packages/compiler-cli/test/transformers/program_spec.ts
+++ b/packages/compiler-cli/test/transformers/program_spec.ts
@@ -492,11 +492,11 @@ describe('ng program', () => {
           .toBe(true);
       switch (checks.shouldBe) {
         case ShouldBe.Empty:
-          expect(writeData!.data).toMatch(/^(\s*\/\*([^*]|\*[^/])*\*\/\s*)?$/);
+          expect(writeData!.data).toMatch(/^(\s*\/\*([^*]|\*[^\/])*\*\/\s*)?$/);
           break;
         case ShouldBe.EmptyExport:
           expect(writeData!.data)
-              .toMatch(/^((\s*\/\*([^*]|\*[^/])*\*\/\s*)|(\s*export\s*{\s*}\s*;\s*)|())$/);
+              .toMatch(/^((\s*\/\*([^*]|\*[^\/])*\*\/\s*)|(\s*export\s*{\s*};\s*))$/m);
           break;
         case ShouldBe.NoneEmpty:
           expect(writeData!.data).not.toBe('');
@@ -505,12 +505,14 @@ describe('ng program', () => {
     }
 
     assertGenFile(
-        'built/src/util.ngfactory.js', {originalFileName: 'src/util.ts', shouldBe: ShouldBe.Empty});
+        'built/src/util.ngfactory.js',
+        {originalFileName: 'src/util.ts', shouldBe: ShouldBe.EmptyExport});
     assertGenFile(
         'built/src/util.ngfactory.d.ts',
         {originalFileName: 'src/util.ts', shouldBe: ShouldBe.EmptyExport});
     assertGenFile(
-        'built/src/util.ngsummary.js', {originalFileName: 'src/util.ts', shouldBe: ShouldBe.Empty});
+        'built/src/util.ngsummary.js',
+        {originalFileName: 'src/util.ts', shouldBe: ShouldBe.EmptyExport});
     assertGenFile(
         'built/src/util.ngsummary.d.ts',
         {originalFileName: 'src/util.ts', shouldBe: ShouldBe.EmptyExport});
@@ -987,7 +989,8 @@ describe('ng program', () => {
     const errorDiags =
         program1.emit().diagnostics.filter(d => d.category === ts.DiagnosticCategory.Error);
     expect(stripAnsi(formatDiagnostics(errorDiags)))
-        .toContain(`src/main.ts:5:13 - error TS2322: Type '1' is not assignable to type 'string'.`);
+        .toContain(
+            `src/main.ts:5:13 - error TS2322: Type 'number' is not assignable to type 'string'.`);
     expect(stripAnsi(formatDiagnostics(errorDiags)))
         .toContain(
             `src/main.html:1:1 - error TS100: Property 'nonExistent' does not exist on type 'MyComp'.`);
diff --git a/packages/compiler/design/architecture.md b/packages/compiler/design/architecture.md
index d8427a61c8572..68cabad86ba7b 100644
--- a/packages/compiler/design/architecture.md
+++ b/packages/compiler/design/architecture.md
@@ -23,7 +23,7 @@ Existing Angular libraries exist on NPM today and are distributed in the Angular
 
 We will produce two compiler entry-points, `ngtsc` and `ngcc`.
 
-`ngtsc` will be an Typescript-to-Javascript transpiler that reifies Angular decorators into static properties. It is a minimal wrapper around `tsc` which includes a set of Angular transforms. While Ivy is experimental, `ngc` operates as `ngtsc` when the `angularCompilerOption` `enableIvy` flag is set to `true` in the `tsconfig.json` file for the project.
+`ngtsc` will be a Typescript-to-Javascript transpiler that reifies Angular decorators into static properties. It is a minimal wrapper around `tsc` which includes a set of Angular transforms. While Ivy is experimental, `ngc` operates as `ngtsc` when the `angularCompilerOption` `enableIvy` flag is set to `true` in the `tsconfig.json` file for the project.
 
 `ngcc` (which stands for Angular compatibility compiler) is designed to process code coming from NPM and produce the equivalent Ivy version, as if the code was compiled with `ngtsc`. It will operate given a `node_modules` directory and a set of packages to compile, and will produce an equivalent directory from which the Ivy equivalents of those modules can be read. `ngcc` is a separate script entry point to `@angular/compiler-cli`.
 
@@ -49,7 +49,7 @@ export class GreetComponent {
 }
 ```
 
-will normally be translated this into something like,
+will normally be translated into something like this:
 
 ```js
 const tslib_1 = require("tslib");
@@ -137,7 +137,7 @@ The overall architecure of TypeScript is:
 
 The parse step is a traditional recursive descent parser, augmented to support incremental parsing, that emits an abstract syntax tree (AST).
 
-The type-checker construct a symbol table and then performs type analysis of every expression in the file, reporting errors it finds. This process not extended or modified by `ngtsc`.
+The type-checker construct a symbol table and then performs type analysis of every expression in the file, reporting errors it finds. This process is not extended or modified by `ngtsc`.
 
 The transform step is a set of AST to AST transformations that perform various tasks such as, removing type declarations, lowering module and class declarations to ES5, converting `async` methods to state-machines, etc.
 
@@ -276,7 +276,7 @@ Given a selector scope, a dependency list is formed by producing the set of type
 
 ##### Finding a components module.
 
-A component's module can be found by using the TypeScript language service's `findReferences`. If one of the references is to a class declaration with an `@NgModule` annotation, process the class as described above to produce the selector scope. If the class is the declaration list of the `@NgModule` then use the scope produce for that module.
+A component's module can be found by using the TypeScript language service's `findReferences`. If one of the references is to a class declaration with an `@NgModule` annotation, process the class as described above to produce the selector scope. If the class is the declaration list of the `@NgModule` then use the scope produced for that module.
 
 When processing the `@NgModule` class, the type references can be found using the program's `checker` `getSymbolAtLocation` (potentially calling `getAliasedSymbol` if it is an alias symbol, `SymbolFlags.Alias`) and then using `Symbol`'s `declarations` field to get the list of declarations nodes (there should only be one for a `class`, there can be several for an `interface`).
 
diff --git a/packages/compiler/src/compiler.ts b/packages/compiler/src/compiler.ts
index ca5cd12c065f3..e60ef28312c09 100644
--- a/packages/compiler/src/compiler.ts
+++ b/packages/compiler/src/compiler.ts
@@ -78,7 +78,7 @@ export * from './ml_parser/tags';
 export {LexerRange} from './ml_parser/lexer';
 export * from './ml_parser/xml_parser';
 export {NgModuleCompiler} from './ng_module_compiler';
-export {ArrayType, AssertNotNull, DYNAMIC_TYPE, BinaryOperator, BinaryOperatorExpr, BuiltinMethod, BuiltinType, BuiltinTypeName, BuiltinVar, CastExpr, ClassField, ClassMethod, ClassStmt, CommaExpr, CommentStmt, ConditionalExpr, DeclareFunctionStmt, DeclareVarStmt, Expression, ExpressionStatement, ExpressionType, ExpressionVisitor, ExternalExpr, ExternalReference, literalMap, FunctionExpr, IfStmt, InstantiateExpr, InvokeFunctionExpr, InvokeMethodExpr, JSDocCommentStmt, LiteralArrayExpr, LiteralExpr, LiteralMapExpr, MapType, NotExpr, NONE_TYPE, ReadKeyExpr, ReadPropExpr, ReadVarExpr, ReturnStatement, StatementVisitor, ThrowStmt, TryCatchStmt, Type, TypeVisitor, WrappedNodeExpr, WriteKeyExpr, WritePropExpr, WriteVarExpr, StmtModifier, Statement, STRING_TYPE, TypeofExpr, collectExternalReferences} from './output/output_ast';
+export {ArrayType, AssertNotNull, DYNAMIC_TYPE, BinaryOperator, BinaryOperatorExpr, BuiltinMethod, BuiltinType, BuiltinTypeName, BuiltinVar, CastExpr, ClassField, ClassMethod, ClassStmt, CommaExpr, ConditionalExpr, DeclareFunctionStmt, DeclareVarStmt, Expression, ExpressionStatement, ExpressionType, ExpressionVisitor, ExternalExpr, ExternalReference, literalMap, FunctionExpr, IfStmt, InstantiateExpr, InvokeFunctionExpr, InvokeMethodExpr, LiteralArrayExpr, LiteralExpr, LiteralMapExpr, MapType, NotExpr, NONE_TYPE, ReadKeyExpr, ReadPropExpr, ReadVarExpr, ReturnStatement, StatementVisitor, ThrowStmt, TryCatchStmt, Type, TypeVisitor, WrappedNodeExpr, WriteKeyExpr, WritePropExpr, WriteVarExpr, StmtModifier, Statement, STRING_TYPE, TypeofExpr, collectExternalReferences, jsDocComment, leadingComment, LeadingComment, JSDocComment, UnaryOperator, UnaryOperatorExpr, LocalizedString} from './output/output_ast';
 export {EmitterVisitorContext} from './output/abstract_emitter';
 export {JitEvaluator} from './output/output_jit';
 export * from './output/ts_emitter';
@@ -92,14 +92,14 @@ export {getParseErrors, isSyntaxError, syntaxError, Version} from './util';
 export {SourceMap} from './output/source_map';
 export * from './injectable_compiler_2';
 export * from './render3/view/api';
-export {BoundAttribute as TmplAstBoundAttribute, BoundEvent as TmplAstBoundEvent, BoundText as TmplAstBoundText, Content as TmplAstContent, Element as TmplAstElement, Node as TmplAstNode, RecursiveVisitor as TmplAstRecursiveVisitor, Reference as TmplAstReference, Template as TmplAstTemplate, Text as TmplAstText, TextAttribute as TmplAstTextAttribute, Variable as TmplAstVariable,} from './render3/r3_ast';
+export {BoundAttribute as TmplAstBoundAttribute, BoundEvent as TmplAstBoundEvent, BoundText as TmplAstBoundText, Content as TmplAstContent, Element as TmplAstElement, Icu as TmplAstIcu, Node as TmplAstNode, RecursiveVisitor as TmplAstRecursiveVisitor, Reference as TmplAstReference, Template as TmplAstTemplate, Text as TmplAstText, TextAttribute as TmplAstTextAttribute, Variable as TmplAstVariable} from './render3/r3_ast';
 export * from './render3/view/t2_api';
 export * from './render3/view/t2_binder';
 export {Identifiers as R3Identifiers} from './render3/r3_identifiers';
 export {R3DependencyMetadata, R3ResolvedDependencyType, compileFactoryFunction, R3FactoryMetadata, R3FactoryTarget} 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, ParseTemplateOptions} from './render3/view/template';
+export {makeBindingParser, ParsedTemplate, parseTemplate, ParseTemplateOptions} from './render3/view/template';
 export {R3Reference} from './render3/util';
 export {compileComponentFromMetadata, compileDirectiveFromMetadata, parseHostBindings, ParsedHostBindings, verifyHostBindings} from './render3/view/compiler';
 export {publishFacade} from './jit_compiler_facade';
diff --git a/packages/compiler/src/compiler_facade_interface.ts b/packages/compiler/src/compiler_facade_interface.ts
index 94e9a87fe9203..dc0253771c654 100644
--- a/packages/compiler/src/compiler_facade_interface.ts
+++ b/packages/compiler/src/compiler_facade_interface.ts
@@ -173,7 +173,7 @@ export interface R3FactoryDefMetadataFacade {
 
 export enum ViewEncapsulation {
   Emulated = 0,
-  Native = 1,
+  // Historically the 1 value was for `Native` encapsulation which has been removed as of v11.
   None = 2,
   ShadowDom = 3
 }
diff --git a/packages/compiler/src/compiler_util/expression_converter.ts b/packages/compiler/src/compiler_util/expression_converter.ts
index 1abb1c39a5c0b..1bae07ce32ef2 100644
--- a/packages/compiler/src/compiler_util/expression_converter.ts
+++ b/packages/compiler/src/compiler_util/expression_converter.ts
@@ -154,6 +154,11 @@ export enum BindingForm {
   // Try to generate a simple binding (no temporaries or statements)
   // otherwise generate a general binding
   TrySimple,
+
+  // Inlines assignment of temporaries into the generated expression. The result may still
+  // have statements attached for declarations of temporary variables.
+  // This is the only relevant form for Ivy, the other forms are only used in ViewEngine.
+  Expression,
 }
 
 /**
@@ -168,7 +173,6 @@ export function convertPropertyBinding(
   if (!localResolver) {
     localResolver = new DefaultLocalResolver();
   }
-  const currValExpr = createCurrValueExpr(bindingId);
   const visitor =
       new _AstToIrVisitor(localResolver, implicitReceiver, bindingId, interpolationFunction);
   const outputExpr: o.Expression = expressionWithoutBuiltins.visit(visitor, _Mode.Expression);
@@ -180,8 +184,11 @@ export function convertPropertyBinding(
 
   if (visitor.temporaryCount === 0 && form == BindingForm.TrySimple) {
     return new ConvertPropertyBindingResult([], outputExpr);
+  } else if (form === BindingForm.Expression) {
+    return new ConvertPropertyBindingResult(stmts, outputExpr);
   }
 
+  const currValExpr = createCurrValueExpr(bindingId);
   stmts.push(currValExpr.set(outputExpr).toDeclStmt(o.DYNAMIC_TYPE, [o.StmtModifier.Final]));
   return new ConvertPropertyBindingResult(stmts, currValExpr);
 }
@@ -323,6 +330,26 @@ class _AstToIrVisitor implements cdAst.AstVisitor {
       private bindingId: string, private interpolationFunction: InterpolationFunction|undefined,
       private baseSourceSpan?: ParseSourceSpan, private implicitReceiverAccesses?: Set<string>) {}
 
+  visitUnary(ast: cdAst.Unary, mode: _Mode): any {
+    let op: o.UnaryOperator;
+    switch (ast.operator) {
+      case '+':
+        op = o.UnaryOperator.Plus;
+        break;
+      case '-':
+        op = o.UnaryOperator.Minus;
+        break;
+      default:
+        throw new Error(`Unsupported operator ${ast.operator}`);
+    }
+
+    return convertToStatementIfNeeded(
+        mode,
+        new o.UnaryOperatorExpr(
+            op, this._visit(ast.expr, _Mode.Expression), undefined,
+            this.convertSourceSpan(ast.span)));
+  }
+
   visitBinary(ast: cdAst.Binary, mode: _Mode): any {
     let op: o.BinaryOperator;
     switch (ast.operation) {
@@ -703,6 +730,9 @@ class _AstToIrVisitor implements cdAst.AstVisitor {
       return (this._nodeMap.get(ast) || ast).visit(visitor);
     };
     return ast.visit({
+      visitUnary(ast: cdAst.Unary) {
+        return null;
+      },
       visitBinary(ast: cdAst.Binary) {
         return null;
       },
@@ -777,6 +807,9 @@ class _AstToIrVisitor implements cdAst.AstVisitor {
       return ast.some(ast => visit(visitor, ast));
     };
     return ast.visit({
+      visitUnary(ast: cdAst.Unary): boolean {
+        return visit(this, ast.expr);
+      },
       visitBinary(ast: cdAst.Binary): boolean {
         return visit(this, ast.left) || visit(this, ast.right);
       },
diff --git a/packages/compiler/src/constant_pool.ts b/packages/compiler/src/constant_pool.ts
index ae9f7c3009b93..0046f7cc8790f 100644
--- a/packages/compiler/src/constant_pool.ts
+++ b/packages/compiler/src/constant_pool.ts
@@ -330,6 +330,7 @@ class KeyVisitor implements o.ExpressionVisitor {
   visitAssertNotNullExpr = invalid;
   visitCastExpr = invalid;
   visitFunctionExpr = invalid;
+  visitUnaryOperatorExpr = invalid;
   visitBinaryOperatorExpr = invalid;
   visitReadPropExpr = invalid;
   visitReadKeyExpr = invalid;
diff --git a/packages/compiler/src/core.ts b/packages/compiler/src/core.ts
index f6612c93de288..d9360f45fab0a 100644
--- a/packages/compiler/src/core.ts
+++ b/packages/compiler/src/core.ts
@@ -82,7 +82,7 @@ export interface Component extends Directive {
 }
 export enum ViewEncapsulation {
   Emulated = 0,
-  Native = 1,
+  // Historically the 1 value was for `Native` encapsulation which has been removed as of v11.
   None = 2,
   ShadowDom = 3
 }
diff --git a/packages/compiler/src/expression_parser/ast.ts b/packages/compiler/src/expression_parser/ast.ts
index 18ab08e533d0b..2773a5458d18c 100644
--- a/packages/compiler/src/expression_parser/ast.ts
+++ b/packages/compiler/src/expression_parser/ast.ts
@@ -227,6 +227,52 @@ export class Binary extends AST {
   }
 }
 
+/**
+ * For backwards compatibility reasons, `Unary` inherits from `Binary` and mimics the binary AST
+ * node that was originally used. This inheritance relation can be deleted in some future major,
+ * after consumers have been given a chance to fully support Unary.
+ */
+export class Unary extends Binary {
+  // Redeclare the properties that are inherited from `Binary` as `never`, as consumers should not
+  // depend on these fields when operating on `Unary`.
+  left: never;
+  right: never;
+  operation: never;
+
+  /**
+   * Creates a unary minus expression "-x", represented as `Binary` using "0 - x".
+   */
+  static createMinus(span: ParseSpan, sourceSpan: AbsoluteSourceSpan, expr: AST): Unary {
+    return new Unary(
+        span, sourceSpan, '-', expr, '-', new LiteralPrimitive(span, sourceSpan, 0), expr);
+  }
+
+  /**
+   * Creates a unary plus expression "+x", represented as `Binary` using "x - 0".
+   */
+  static createPlus(span: ParseSpan, sourceSpan: AbsoluteSourceSpan, expr: AST): Unary {
+    return new Unary(
+        span, sourceSpan, '+', expr, '-', expr, new LiteralPrimitive(span, sourceSpan, 0));
+  }
+
+  /**
+   * During the deprecation period this constructor is private, to avoid consumers from creating
+   * a `Unary` with the fallback properties for `Binary`.
+   */
+  private constructor(
+      span: ParseSpan, sourceSpan: AbsoluteSourceSpan, public operator: string, public expr: AST,
+      binaryOp: string, binaryLeft: AST, binaryRight: AST) {
+    super(span, sourceSpan, binaryOp, binaryLeft, binaryRight);
+  }
+
+  visit(visitor: AstVisitor, context: any = null): any {
+    if (visitor.visitUnary !== undefined) {
+      return visitor.visitUnary(this, context);
+    }
+    return visitor.visitBinary(this, context);
+  }
+}
+
 export class PrefixNot extends AST {
   constructor(span: ParseSpan, sourceSpan: AbsoluteSourceSpan, public expression: AST) {
     super(span, sourceSpan);
@@ -361,6 +407,11 @@ export interface TemplateBindingIdentifier {
 }
 
 export interface AstVisitor {
+  /**
+   * The `visitUnary` method is declared as optional for backwards compatibility. In an upcoming
+   * major release, this method will be made required.
+   */
+  visitUnary?(ast: Unary, context: any): any;
   visitBinary(ast: Binary, context: any): any;
   visitChain(ast: Chain, context: any): any;
   visitConditional(ast: Conditional, context: any): any;
@@ -398,6 +449,9 @@ export class RecursiveAstVisitor implements AstVisitor {
     // to selectively visit the specified node.
     ast.visit(this, context);
   }
+  visitUnary(ast: Unary, context: any): any {
+    this.visit(ast.expr, context);
+  }
   visitBinary(ast: Binary, context: any): any {
     this.visit(ast.left, context);
     this.visit(ast.right, context);
@@ -527,6 +581,17 @@ export class AstTransformer implements AstVisitor {
     return new LiteralMap(ast.span, ast.sourceSpan, ast.keys, this.visitAll(ast.values));
   }
 
+  visitUnary(ast: Unary, context: any): AST {
+    switch (ast.operator) {
+      case '+':
+        return Unary.createPlus(ast.span, ast.sourceSpan, ast.expr.visit(this));
+      case '-':
+        return Unary.createMinus(ast.span, ast.sourceSpan, ast.expr.visit(this));
+      default:
+        throw new Error(`Unknown unary operator ${ast.operator}`);
+    }
+  }
+
   visitBinary(ast: Binary, context: any): AST {
     return new Binary(
         ast.span, ast.sourceSpan, ast.operation, ast.left.visit(this), ast.right.visit(this));
@@ -665,6 +730,21 @@ export class AstMemoryEfficientTransformer implements AstVisitor {
     return ast;
   }
 
+  visitUnary(ast: Unary, context: any): AST {
+    const expr = ast.expr.visit(this);
+    if (expr !== ast.expr) {
+      switch (ast.operator) {
+        case '+':
+          return Unary.createPlus(ast.span, ast.sourceSpan, expr);
+        case '-':
+          return Unary.createMinus(ast.span, ast.sourceSpan, expr);
+        default:
+          throw new Error(`Unknown unary operator ${ast.operator}`);
+      }
+    }
+    return ast;
+  }
+
   visitBinary(ast: Binary, context: any): AST {
     const left = ast.left.visit(this);
     const right = ast.right.visit(this);
@@ -761,7 +841,10 @@ export class ParsedProperty {
 
   constructor(
       public name: string, public expression: ASTWithSource, public type: ParsedPropertyType,
-      public sourceSpan: ParseSourceSpan, public valueSpan?: ParseSourceSpan) {
+      // TODO(atscott): `keySpan` should really be required but allows `undefined` so VE does
+      // not need to be updated. Make `keySpan` required when VE is removed.
+      public sourceSpan: ParseSourceSpan, readonly keySpan: ParseSourceSpan|undefined,
+      public valueSpan: ParseSourceSpan|undefined) {
     this.isLiteral = this.type === ParsedPropertyType.LITERAL_ATTR;
     this.isAnimation = this.type === ParsedPropertyType.ANIMATION;
   }
@@ -816,5 +899,5 @@ export class BoundElementProperty {
   constructor(
       public name: string, public type: BindingType, public securityContext: SecurityContext,
       public value: ASTWithSource, public unit: string|null, public sourceSpan: ParseSourceSpan,
-      public valueSpan?: ParseSourceSpan) {}
+      readonly keySpan: ParseSourceSpan|undefined, public valueSpan: ParseSourceSpan|undefined) {}
 }
diff --git a/packages/compiler/src/expression_parser/parser.ts b/packages/compiler/src/expression_parser/parser.ts
index 8f97b71ff3856..707f4f02a257f 100644
--- a/packages/compiler/src/expression_parser/parser.ts
+++ b/packages/compiler/src/expression_parser/parser.ts
@@ -10,11 +10,14 @@ import * as chars from '../chars';
 import {DEFAULT_INTERPOLATION_CONFIG, InterpolationConfig} from '../ml_parser/interpolation_config';
 import {escapeRegExp} from '../util';
 
-import {AbsoluteSourceSpan, AST, AstVisitor, ASTWithSource, Binary, BindingPipe, Chain, Conditional, EmptyExpr, ExpressionBinding, FunctionCall, ImplicitReceiver, Interpolation, KeyedRead, KeyedWrite, LiteralArray, LiteralMap, LiteralMapKey, LiteralPrimitive, MethodCall, NonNullAssert, ParserError, ParseSpan, PrefixNot, PropertyRead, PropertyWrite, Quote, RecursiveAstVisitor, SafeMethodCall, SafePropertyRead, TemplateBinding, TemplateBindingIdentifier, VariableBinding} from './ast';
+import {AbsoluteSourceSpan, AST, AstVisitor, ASTWithSource, Binary, BindingPipe, Chain, Conditional, EmptyExpr, ExpressionBinding, FunctionCall, ImplicitReceiver, Interpolation, KeyedRead, KeyedWrite, LiteralArray, LiteralMap, LiteralMapKey, LiteralPrimitive, MethodCall, NonNullAssert, ParserError, ParseSpan, PrefixNot, PropertyRead, PropertyWrite, Quote, RecursiveAstVisitor, SafeMethodCall, SafePropertyRead, TemplateBinding, TemplateBindingIdentifier, Unary, VariableBinding} from './ast';
 import {EOF, isIdentifier, isQuote, Lexer, Token, TokenType} from './lexer';
 
 export class SplitInterpolation {
-  constructor(public strings: string[], public expressions: string[], public offsets: number[]) {}
+  constructor(
+      public strings: string[], public stringSpans: {start: number, end: number}[],
+      public expressions: string[], public expressionsSpans: {start: number, end: number}[],
+      public offsets: number[]) {}
 }
 
 export class TemplateBindingParseResult {
@@ -176,46 +179,111 @@ export class Parser {
       expressions.push(ast);
     }
 
-    const span = new ParseSpan(0, input == null ? 0 : input.length);
-    return new ASTWithSource(
-        new Interpolation(span, span.toAbsolute(absoluteOffset), split.strings, expressions), input,
-        location, absoluteOffset, this.errors);
+    return this.createInterpolationAst(split.strings, expressions, input, location, absoluteOffset);
+  }
+
+  /**
+   * Similar to `parseInterpolation`, but treats the provided string as a single expression
+   * element that would normally appear within the interpolation prefix and suffix (`{{` and `}}`).
+   * This is used for parsing the switch expression in ICUs.
+   */
+  parseInterpolationExpression(expression: string, location: any, absoluteOffset: number):
+      ASTWithSource {
+    const sourceToLex = this._stripComments(expression);
+    const tokens = this._lexer.tokenize(sourceToLex);
+    const ast = new _ParseAST(
+                    expression, location, absoluteOffset, tokens, sourceToLex.length,
+                    /* parseAction */ false, this.errors, 0)
+                    .parseChain();
+    const strings = ['', ''];  // The prefix and suffix strings are both empty
+    return this.createInterpolationAst(strings, [ast], expression, location, absoluteOffset);
   }
 
+  private createInterpolationAst(
+      strings: string[], expressions: AST[], input: string, location: string,
+      absoluteOffset: number): ASTWithSource {
+    const span = new ParseSpan(0, input.length);
+    const interpolation =
+        new Interpolation(span, span.toAbsolute(absoluteOffset), strings, expressions);
+    return new ASTWithSource(interpolation, input, location, absoluteOffset, this.errors);
+  }
+
+  /**
+   * Splits a string of text into "raw" text segments and expressions present in interpolations in
+   * the string.
+   * Returns `null` if there are no interpolations, otherwise a
+   * `SplitInterpolation` with splits that look like
+   *   <raw text> <expression> <raw text> ... <raw text> <expression> <raw text>
+   */
   splitInterpolation(
       input: string, location: string,
       interpolationConfig: InterpolationConfig = DEFAULT_INTERPOLATION_CONFIG): SplitInterpolation
       |null {
-    const regexp = _getInterpolateRegExp(interpolationConfig);
-    const parts = input.split(regexp);
-    if (parts.length <= 1) {
-      return null;
-    }
     const strings: string[] = [];
     const expressions: string[] = [];
     const offsets: number[] = [];
-    let offset = 0;
-    for (let i = 0; i < parts.length; i++) {
-      const part: string = parts[i];
-      if (i % 2 === 0) {
-        // fixed string
+    const stringSpans: {start: number, end: number}[] = [];
+    const expressionSpans: {start: number, end: number}[] = [];
+    let i = 0;
+    let atInterpolation = false;
+    let extendLastString = false;
+    let {start: interpStart, end: interpEnd} = interpolationConfig;
+    while (i < input.length) {
+      if (!atInterpolation) {
+        // parse until starting {{
+        const start = i;
+        i = input.indexOf(interpStart, i);
+        if (i === -1) {
+          i = input.length;
+        }
+        const part = input.substring(start, i);
         strings.push(part);
-        offset += part.length;
-      } else if (part.trim().length > 0) {
-        offset += interpolationConfig.start.length;
-        expressions.push(part);
-        offsets.push(offset);
-        offset += part.length + interpolationConfig.end.length;
+        stringSpans.push({start, end: i});
+
+        atInterpolation = true;
       } else {
-        this._reportError(
-            'Blank expressions are not allowed in interpolated strings', input,
-            `at column ${this._findInterpolationErrorColumn(parts, i, interpolationConfig)} in`,
-            location);
-        expressions.push('$implicit');
-        offsets.push(offset);
+        // parse from starting {{ to ending }}
+        const fullStart = i;
+        const exprStart = fullStart + interpStart.length;
+        const exprEnd = input.indexOf(interpEnd, exprStart);
+        if (exprEnd === -1) {
+          // Could not find the end of the interpolation; do not parse an expression.
+          // Instead we should extend the content on the last raw string.
+          atInterpolation = false;
+          extendLastString = true;
+          break;
+        }
+        const fullEnd = exprEnd + interpEnd.length;
+
+        const part = input.substring(exprStart, exprEnd);
+        if (part.trim().length > 0) {
+          expressions.push(part);
+        } else {
+          this._reportError(
+              'Blank expressions are not allowed in interpolated strings', input,
+              `at column ${i} in`, location);
+          expressions.push('$implicit');
+        }
+        offsets.push(exprStart);
+        expressionSpans.push({start: fullStart, end: fullEnd});
+
+        i = fullEnd;
+        atInterpolation = false;
       }
     }
-    return new SplitInterpolation(strings, expressions, offsets);
+    if (!atInterpolation) {
+      // If we are now at a text section, add the remaining content as a raw string.
+      if (extendLastString) {
+        strings[strings.length - 1] += input.substring(i);
+        stringSpans[stringSpans.length - 1].end = input.length;
+      } else {
+        strings.push(input.substring(i));
+        stringSpans.push({start: i, end: input.length});
+      }
+    }
+    return expressions.length === 0 ?
+        null :
+        new SplitInterpolation(strings, stringSpans, expressions, expressionSpans, offsets);
   }
 
   wrapLiteralPrimitive(input: string|null, location: any, absoluteOffset: number): ASTWithSource {
@@ -278,10 +346,24 @@ export class IvyParser extends Parser {
   simpleExpressionChecker = IvySimpleExpressionChecker;  //
 }
 
+/** Describes a stateful context an expression parser is in. */
+enum ParseContextFlags {
+  None = 0,
+  /**
+   * A Writable context is one in which a value may be written to an lvalue.
+   * For example, after we see a property access, we may expect a write to the
+   * property via the "=" operator.
+   *   prop
+   *        ^ possible "=" after
+   */
+  Writable = 1,
+}
+
 export class _ParseAST {
   private rparensExpected = 0;
   private rbracketsExpected = 0;
   private rbracesExpected = 0;
+  private context = ParseContextFlags.None;
 
   // Cache of expression start and input indeces to the absolute source span they map to, used to
   // prevent creating superfluous source spans in `sourceSpan`.
@@ -358,6 +440,16 @@ export class _ParseAST {
     this.index++;
   }
 
+  /**
+   * Executes a callback in the provided context.
+   */
+  private withContext<T>(context: ParseContextFlags, cb: () => T): T {
+    this.context |= context;
+    const ret = cb();
+    this.context ^= context;
+    return ret;
+  }
+
   consumeOptionalCharacter(code: number): boolean {
     if (this.next.isCharacter(code)) {
       this.advance();
@@ -374,6 +466,12 @@ export class _ParseAST {
     return this.next.isKeywordAs();
   }
 
+  /**
+   * Consumes an expected character, otherwise emits an error about the missing expected character
+   * and skips over the token stream until reaching a recoverable point.
+   *
+   * See `this.error` and `this.skip` for more details.
+   */
   expectCharacter(code: number) {
     if (this.consumeOptionalCharacter(code)) return;
     this.error(`Missing expected ${String.fromCharCode(code)}`);
@@ -591,22 +689,16 @@ export class _ParseAST {
     if (this.next.type == TokenType.Operator) {
       const start = this.inputIndex;
       const operator = this.next.strValue;
-      const literalSpan = new ParseSpan(start, start);
-      const literalSourceSpan = literalSpan.toAbsolute(this.absoluteOffset);
       let result: AST;
       switch (operator) {
         case '+':
           this.advance();
           result = this.parsePrefix();
-          return new Binary(
-              this.span(start), this.sourceSpan(start), '-', result,
-              new LiteralPrimitive(literalSpan, literalSourceSpan, 0));
+          return Unary.createPlus(this.span(start), this.sourceSpan(start), result);
         case '-':
           this.advance();
           result = this.parsePrefix();
-          return new Binary(
-              this.span(start), this.sourceSpan(start), operator,
-              new LiteralPrimitive(literalSpan, literalSourceSpan, 0), result);
+          return Unary.createMinus(this.span(start), this.sourceSpan(start), result);
         case '!':
           this.advance();
           result = this.parsePrefix();
@@ -627,18 +719,23 @@ export class _ParseAST {
         result = this.parseAccessMemberOrMethodCall(result, true);
 
       } else if (this.consumeOptionalCharacter(chars.$LBRACKET)) {
-        this.rbracketsExpected++;
-        const key = this.parsePipe();
-        this.rbracketsExpected--;
-        this.expectCharacter(chars.$RBRACKET);
-        if (this.consumeOptionalOperator('=')) {
-          const value = this.parseConditional();
-          result = new KeyedWrite(
-              this.span(resultStart), this.sourceSpan(resultStart), result, key, value);
-        } else {
-          result = new KeyedRead(this.span(resultStart), this.sourceSpan(resultStart), result, key);
-        }
-
+        this.withContext(ParseContextFlags.Writable, () => {
+          this.rbracketsExpected++;
+          const key = this.parsePipe();
+          if (key instanceof EmptyExpr) {
+            this.error(`Key access cannot be empty`);
+          }
+          this.rbracketsExpected--;
+          this.expectCharacter(chars.$RBRACKET);
+          if (this.consumeOptionalOperator('=')) {
+            const value = this.parseConditional();
+            result = new KeyedWrite(
+                this.span(resultStart), this.sourceSpan(resultStart), result, key, value);
+          } else {
+            result =
+                new KeyedRead(this.span(resultStart), this.sourceSpan(resultStart), result, key);
+          }
+        });
       } else if (this.consumeOptionalCharacter(chars.$LPAREN)) {
         this.rparensExpected++;
         const args = this.parseCallArguments();
@@ -990,6 +1087,10 @@ export class _ParseAST {
     this.consumeOptionalCharacter(chars.$SEMICOLON) || this.consumeOptionalCharacter(chars.$COMMA);
   }
 
+  /**
+   * Records an error and skips over the token stream until reaching a recoverable point. See
+   * `this.skip` for more details on token skipping.
+   */
   error(message: string, index: number|null = null) {
     this.errors.push(new ParserError(message, this.input, this.locationText(index), this.location));
     this.skip();
@@ -1001,25 +1102,32 @@ export class _ParseAST {
                                           `at the end of the expression`;
   }
 
-  // Error recovery should skip tokens until it encounters a recovery point. skip() treats
-  // the end of input and a ';' as unconditionally a recovery point. It also treats ')',
-  // '}' and ']' as conditional recovery points if one of calling productions is expecting
-  // one of these symbols. This allows skip() to recover from errors such as '(a.) + 1' allowing
-  // more of the AST to be retained (it doesn't skip any tokens as the ')' is retained because
-  // of the '(' begins an '(' <expr> ')' production). The recovery points of grouping symbols
-  // must be conditional as they must be skipped if none of the calling productions are not
-  // expecting the closing token else we will never make progress in the case of an
-  // extraneous group closing symbol (such as a stray ')'). This is not the case for ';' because
-  // parseChain() is always the root production and it expects a ';'.
-
-  // If a production expects one of these token it increments the corresponding nesting count,
-  // and then decrements it just prior to checking if the token is in the input.
+  /**
+   * Error recovery should skip tokens until it encounters a recovery point. skip() treats
+   * the end of input and a ';' as unconditionally a recovery point. It also treats ')',
+   * '}' and ']' as conditional recovery points if one of calling productions is expecting
+   * one of these symbols. This allows skip() to recover from errors such as '(a.) + 1' allowing
+   * more of the AST to be retained (it doesn't skip any tokens as the ')' is retained because
+   * of the '(' begins an '(' <expr> ')' production). The recovery points of grouping symbols
+   * must be conditional as they must be skipped if none of the calling productions are not
+   * expecting the closing token else we will never make progress in the case of an
+   * extraneous group closing symbol (such as a stray ')'). This is not the case for ';' because
+   * parseChain() is always the root production and it expects a ';'.
+   *
+   * Furthermore, the presence of a stateful context can add more recovery points.
+   *   - in a `Writable` context, we are able to recover after seeing the `=` operator, which
+   *     signals the presence of an independent rvalue expression following the `=` operator.
+   *
+   * If a production expects one of these token it increments the corresponding nesting count,
+   * and then decrements it just prior to checking if the token is in the input.
+   */
   private skip() {
     let n = this.next;
     while (this.index < this.tokens.length && !n.isCharacter(chars.$SEMICOLON) &&
            (this.rparensExpected <= 0 || !n.isCharacter(chars.$RPAREN)) &&
            (this.rbracesExpected <= 0 || !n.isCharacter(chars.$RBRACE)) &&
-           (this.rbracketsExpected <= 0 || !n.isCharacter(chars.$RBRACKET))) {
+           (this.rbracketsExpected <= 0 || !n.isCharacter(chars.$RBRACKET)) &&
+           (!(this.context & ParseContextFlags.Writable) || !n.isOperator('='))) {
       if (this.next.isError()) {
         this.errors.push(
             new ParserError(this.next.toString()!, this.input, this.locationText(), this.location));
@@ -1059,6 +1167,8 @@ class SimpleExpressionChecker implements AstVisitor {
     this.visitAll(ast.values, context);
   }
 
+  visitUnary(ast: Unary, context: any) {}
+
   visitBinary(ast: Binary, context: any) {}
 
   visitPrefixNot(ast: PrefixNot, context: any) {}
diff --git a/packages/compiler/src/i18n/extractor_merger.ts b/packages/compiler/src/i18n/extractor_merger.ts
index 771515575e40d..66a8e7a1df180 100644
--- a/packages/compiler/src/i18n/extractor_merger.ts
+++ b/packages/compiler/src/i18n/extractor_merger.ts
@@ -124,7 +124,7 @@ class _Visitor implements html.Visitor {
     this._translations = translations;
 
     // Construct a single fake root element
-    const wrapper = new html.Element('wrapper', [], nodes, undefined!, undefined, undefined);
+    const wrapper = new html.Element('wrapper', [], nodes, undefined!, undefined!, undefined);
 
     const translatedNode = wrapper.visit(this, null);
 
@@ -492,7 +492,7 @@ class _Visitor implements html.Visitor {
   }
 
   private _reportError(node: html.Node, msg: string): void {
-    this._errors.push(new I18nError(node.sourceSpan!, msg));
+    this._errors.push(new I18nError(node.sourceSpan, msg));
   }
 }
 
diff --git a/packages/compiler/src/i18n/i18n_ast.ts b/packages/compiler/src/i18n/i18n_ast.ts
index 0a7159bbc185c..f202ba9e067bd 100644
--- a/packages/compiler/src/i18n/i18n_ast.ts
+++ b/packages/compiler/src/i18n/i18n_ast.ts
@@ -8,6 +8,18 @@
 
 import {ParseSourceSpan} from '../parse_util';
 
+/**
+ * Describes the text contents of a placeholder as it appears in an ICU expression, including its
+ * source span information.
+ */
+export interface MessagePlaceholder {
+  /** The text contents of the placeholder */
+  text: string;
+
+  /** The source span of the placeholder */
+  sourceSpan: ParseSourceSpan;
+}
+
 export class Message {
   sources: MessageSpan[];
   id: string = this.customId;
@@ -16,14 +28,14 @@ export class Message {
 
   /**
    * @param nodes message AST
-   * @param placeholders maps placeholder names to static content
+   * @param placeholders maps placeholder names to static content and their source spans
    * @param placeholderToMessage maps placeholder names to messages (used for nested ICU messages)
    * @param meaning
    * @param description
    * @param customId
    */
   constructor(
-      public nodes: Node[], public placeholders: {[phName: string]: string},
+      public nodes: Node[], public placeholders: {[phName: string]: MessagePlaceholder},
       public placeholderToMessage: {[phName: string]: Message}, public meaning: string,
       public description: string, public customId: string) {
     if (nodes.length) {
@@ -87,7 +99,9 @@ export class TagPlaceholder implements Node {
   constructor(
       public tag: string, public attrs: {[k: string]: string}, public startName: string,
       public closeName: string, public children: Node[], public isVoid: boolean,
-      public sourceSpan: ParseSourceSpan) {}
+      // TODO sourceSpan should cover all (we need a startSourceSpan and endSourceSpan)
+      public sourceSpan: ParseSourceSpan, public startSourceSpan: ParseSourceSpan|null,
+      public endSourceSpan: ParseSourceSpan|null) {}
 
   visit(visitor: Visitor, context?: any): any {
     return visitor.visitTagPlaceholder(this, context);
@@ -151,7 +165,8 @@ export class CloneVisitor implements Visitor {
   visitTagPlaceholder(ph: TagPlaceholder, context?: any): TagPlaceholder {
     const children = ph.children.map(n => n.visit(this, context));
     return new TagPlaceholder(
-        ph.tag, ph.attrs, ph.startName, ph.closeName, children, ph.isVoid, ph.sourceSpan);
+        ph.tag, ph.attrs, ph.startName, ph.closeName, children, ph.isVoid, ph.sourceSpan,
+        ph.startSourceSpan, ph.endSourceSpan);
   }
 
   visitPlaceholder(ph: Placeholder, context?: any): Placeholder {
diff --git a/packages/compiler/src/i18n/i18n_parser.ts b/packages/compiler/src/i18n/i18n_parser.ts
index 1a1f7f35bd179..4fa1f55f4b5ea 100644
--- a/packages/compiler/src/i18n/i18n_parser.ts
+++ b/packages/compiler/src/i18n/i18n_parser.ts
@@ -39,7 +39,7 @@ interface I18nMessageVisitorContext {
   isIcu: boolean;
   icuDepth: number;
   placeholderRegistry: PlaceholderRegistry;
-  placeholderToContent: {[phName: string]: string};
+  placeholderToContent: {[phName: string]: i18n.MessagePlaceholder};
   placeholderToMessage: {[phName: string]: i18n.Message};
   visitNodeFn: VisitNodeFn;
 }
@@ -83,17 +83,24 @@ class _I18nVisitor implements html.Visitor {
     const isVoid: boolean = getHtmlTagDefinition(el.name).isVoid;
     const startPhName =
         context.placeholderRegistry.getStartTagPlaceholderName(el.name, attrs, isVoid);
-    context.placeholderToContent[startPhName] = el.sourceSpan!.toString();
+    context.placeholderToContent[startPhName] = {
+      text: el.startSourceSpan.toString(),
+      sourceSpan: el.startSourceSpan,
+    };
 
     let closePhName = '';
 
     if (!isVoid) {
       closePhName = context.placeholderRegistry.getCloseTagPlaceholderName(el.name);
-      context.placeholderToContent[closePhName] = `</${el.name}>`;
+      context.placeholderToContent[closePhName] = {
+        text: `</${el.name}>`,
+        sourceSpan: el.endSourceSpan ?? el.sourceSpan,
+      };
     }
 
     const node = new i18n.TagPlaceholder(
-        el.name, attrs, startPhName, closePhName, children, isVoid, el.sourceSpan!);
+        el.name, attrs, startPhName, closePhName, children, isVoid, el.sourceSpan,
+        el.startSourceSpan, el.endSourceSpan);
     return context.visitNodeFn(el, node);
   }
 
@@ -103,7 +110,7 @@ class _I18nVisitor implements html.Visitor {
   }
 
   visitText(text: html.Text, context: I18nMessageVisitorContext): i18n.Node {
-    const node = this._visitTextWithInterpolation(text.value, text.sourceSpan!, context);
+    const node = this._visitTextWithInterpolation(text.value, text.sourceSpan, context);
     return context.visitNodeFn(text, node);
   }
 
@@ -127,7 +134,10 @@ class _I18nVisitor implements html.Visitor {
       // - the ICU message is nested.
       const expPh = context.placeholderRegistry.getUniquePlaceholder(`VAR_${icu.type}`);
       i18nIcu.expressionPlaceholder = expPh;
-      context.placeholderToContent[expPh] = icu.switchValue;
+      context.placeholderToContent[expPh] = {
+        text: icu.switchValue,
+        sourceSpan: icu.switchValueSourceSpan,
+      };
       return context.visitNodeFn(icu, i18nIcu);
     }
 
@@ -167,22 +177,35 @@ class _I18nVisitor implements html.Visitor {
 
       if (splitInterpolation.strings[i].length) {
         // No need to add empty strings
-        nodes.push(new i18n.Text(splitInterpolation.strings[i], sourceSpan));
+        const stringSpan = getOffsetSourceSpan(sourceSpan, splitInterpolation.stringSpans[i]);
+        nodes.push(new i18n.Text(splitInterpolation.strings[i], stringSpan));
       }
 
-      nodes.push(new i18n.Placeholder(expression, phName, sourceSpan));
-      context.placeholderToContent[phName] = sDelimiter + expression + eDelimiter;
+      const expressionSpan =
+          getOffsetSourceSpan(sourceSpan, splitInterpolation.expressionsSpans[i]);
+      nodes.push(new i18n.Placeholder(expression, phName, expressionSpan));
+      context.placeholderToContent[phName] = {
+        text: sDelimiter + expression + eDelimiter,
+        sourceSpan: expressionSpan,
+      };
     }
 
     // The last index contains no expression
     const lastStringIdx = splitInterpolation.strings.length - 1;
     if (splitInterpolation.strings[lastStringIdx].length) {
-      nodes.push(new i18n.Text(splitInterpolation.strings[lastStringIdx], sourceSpan));
+      const stringSpan =
+          getOffsetSourceSpan(sourceSpan, splitInterpolation.stringSpans[lastStringIdx]);
+      nodes.push(new i18n.Text(splitInterpolation.strings[lastStringIdx], stringSpan));
     }
     return container;
   }
 }
 
+function getOffsetSourceSpan(
+    sourceSpan: ParseSourceSpan, {start, end}: {start: number, end: number}): ParseSourceSpan {
+  return new ParseSourceSpan(sourceSpan.start.moveBy(start), sourceSpan.start.moveBy(end));
+}
+
 const _CUSTOM_PH_EXP =
     /\/\/[\s\S]*i18n[\s\S]*\([\s\S]*ph[\s\S]*=[\s\S]*("|')([\s\S]*?)\1[\s\S]*\)/g;
 
diff --git a/packages/compiler/src/i18n/message_bundle.ts b/packages/compiler/src/i18n/message_bundle.ts
index 37fb284604d53..b3fa5895384b8 100644
--- a/packages/compiler/src/i18n/message_bundle.ts
+++ b/packages/compiler/src/i18n/message_bundle.ts
@@ -94,7 +94,8 @@ class MapPlaceholderNames extends i18n.CloneVisitor {
     const closeName = ph.closeName ? mapper.toPublicName(ph.closeName)! : ph.closeName;
     const children = ph.children.map(n => n.visit(this, mapper));
     return new i18n.TagPlaceholder(
-        ph.tag, ph.attrs, startName, closeName, children, ph.isVoid, ph.sourceSpan);
+        ph.tag, ph.attrs, startName, closeName, children, ph.isVoid, ph.sourceSpan,
+        ph.startSourceSpan, ph.endSourceSpan);
   }
 
   visitPlaceholder(ph: i18n.Placeholder, mapper: PlaceholderMapper): i18n.Placeholder {
diff --git a/packages/compiler/src/i18n/serializers/xliff.ts b/packages/compiler/src/i18n/serializers/xliff.ts
index 0278b517b7cf5..8fca51e8d6a48 100644
--- a/packages/compiler/src/i18n/serializers/xliff.ts
+++ b/packages/compiler/src/i18n/serializers/xliff.ts
@@ -231,9 +231,9 @@ class XliffParser implements ml.Visitor {
         break;
 
       case _TARGET_TAG:
-        const innerTextStart = element.startSourceSpan!.end.offset;
+        const innerTextStart = element.startSourceSpan.end.offset;
         const innerTextEnd = element.endSourceSpan!.start.offset;
-        const content = element.startSourceSpan!.start.file.content;
+        const content = element.startSourceSpan.start.file.content;
         const innerText = content.slice(innerTextStart, innerTextEnd);
         this._unitMlString = innerText;
         break;
@@ -264,7 +264,7 @@ class XliffParser implements ml.Visitor {
   visitExpansionCase(expansionCase: ml.ExpansionCase, context: any): any {}
 
   private _addError(node: ml.Node, message: string): void {
-    this._errors.push(new I18nError(node.sourceSpan!, message));
+    this._errors.push(new I18nError(node.sourceSpan, message));
   }
 }
 
@@ -288,14 +288,14 @@ class XmlToI18n implements ml.Visitor {
   }
 
   visitText(text: ml.Text, context: any) {
-    return new i18n.Text(text.value, text.sourceSpan!);
+    return new i18n.Text(text.value, text.sourceSpan);
   }
 
   visitElement(el: ml.Element, context: any): i18n.Placeholder|ml.Node[]|null {
     if (el.name === _PLACEHOLDER_TAG) {
       const nameAttr = el.attrs.find((attr) => attr.name === 'id');
       if (nameAttr) {
-        return new i18n.Placeholder('', nameAttr.value, el.sourceSpan!);
+        return new i18n.Placeholder('', nameAttr.value, el.sourceSpan);
       }
 
       this._addError(el, `<${_PLACEHOLDER_TAG}> misses the "id" attribute`);
@@ -332,7 +332,7 @@ class XmlToI18n implements ml.Visitor {
   visitAttribute(attribute: ml.Attribute, context: any) {}
 
   private _addError(node: ml.Node, message: string): void {
-    this._errors.push(new I18nError(node.sourceSpan!, message));
+    this._errors.push(new I18nError(node.sourceSpan, message));
   }
 }
 
diff --git a/packages/compiler/src/i18n/serializers/xliff2.ts b/packages/compiler/src/i18n/serializers/xliff2.ts
index 7e97464f98372..f3499e7fcd8ed 100644
--- a/packages/compiler/src/i18n/serializers/xliff2.ts
+++ b/packages/compiler/src/i18n/serializers/xliff2.ts
@@ -246,9 +246,9 @@ class Xliff2Parser implements ml.Visitor {
         break;
 
       case _TARGET_TAG:
-        const innerTextStart = element.startSourceSpan!.end.offset;
+        const innerTextStart = element.startSourceSpan.end.offset;
         const innerTextEnd = element.endSourceSpan!.start.offset;
-        const content = element.startSourceSpan!.start.file.content;
+        const content = element.startSourceSpan.start.file.content;
         const innerText = content.slice(innerTextStart, innerTextEnd);
         this._unitMlString = innerText;
         break;
diff --git a/packages/compiler/src/i18n/serializers/xtb.ts b/packages/compiler/src/i18n/serializers/xtb.ts
index 5483e5029db28..ed7eab95f1d7d 100644
--- a/packages/compiler/src/i18n/serializers/xtb.ts
+++ b/packages/compiler/src/i18n/serializers/xtb.ts
@@ -130,9 +130,9 @@ class XtbParser implements ml.Visitor {
           if (this._msgIdToHtml.hasOwnProperty(id)) {
             this._addError(element, `Duplicated translations for msg ${id}`);
           } else {
-            const innerTextStart = element.startSourceSpan!.end.offset;
+            const innerTextStart = element.startSourceSpan.end.offset;
             const innerTextEnd = element.endSourceSpan!.start.offset;
-            const content = element.startSourceSpan!.start.file.content;
+            const content = element.startSourceSpan.start.file.content;
             const innerText = content.slice(innerTextStart!, innerTextEnd!);
             this._msgIdToHtml[id] = innerText;
           }
@@ -155,7 +155,7 @@ class XtbParser implements ml.Visitor {
   visitExpansionCase(expansionCase: ml.ExpansionCase, context: any): any {}
 
   private _addError(node: ml.Node, message: string): void {
-    this._errors.push(new I18nError(node.sourceSpan!, message));
+    this._errors.push(new I18nError(node.sourceSpan, message));
   }
 }
 
@@ -179,7 +179,7 @@ class XmlToI18n implements ml.Visitor {
   }
 
   visitText(text: ml.Text, context: any) {
-    return new i18n.Text(text.value, text.sourceSpan!);
+    return new i18n.Text(text.value, text.sourceSpan);
   }
 
   visitExpansion(icu: ml.Expansion, context: any) {
@@ -203,7 +203,7 @@ class XmlToI18n implements ml.Visitor {
     if (el.name === _PLACEHOLDER_TAG) {
       const nameAttr = el.attrs.find((attr) => attr.name === 'name');
       if (nameAttr) {
-        return new i18n.Placeholder('', nameAttr.value, el.sourceSpan!);
+        return new i18n.Placeholder('', nameAttr.value, el.sourceSpan);
       }
 
       this._addError(el, `<${_PLACEHOLDER_TAG}> misses the "name" attribute`);
@@ -218,6 +218,6 @@ class XmlToI18n implements ml.Visitor {
   visitAttribute(attribute: ml.Attribute, context: any) {}
 
   private _addError(node: ml.Node, message: string): void {
-    this._errors.push(new I18nError(node.sourceSpan!, message));
+    this._errors.push(new I18nError(node.sourceSpan, message));
   }
 }
diff --git a/packages/compiler/src/i18n/translation_bundle.ts b/packages/compiler/src/i18n/translation_bundle.ts
index 5fa66c6ae466d..79e899e2e095b 100644
--- a/packages/compiler/src/i18n/translation_bundle.ts
+++ b/packages/compiler/src/i18n/translation_bundle.ts
@@ -109,7 +109,7 @@ class I18nToHtmlVisitor implements i18n.Visitor {
     // TODO(vicb): Once all format switch to using expression placeholders
     // we should throw when the placeholder is not in the source message
     const exp = this._srcMsg.placeholders.hasOwnProperty(icu.expression) ?
-        this._srcMsg.placeholders[icu.expression] :
+        this._srcMsg.placeholders[icu.expression].text :
         icu.expression;
 
     return `{${exp}, ${icu.type}, ${cases.join(' ')}}`;
@@ -118,7 +118,7 @@ class I18nToHtmlVisitor implements i18n.Visitor {
   visitPlaceholder(ph: i18n.Placeholder, context?: any): string {
     const phName = this._mapper(ph.name);
     if (this._srcMsg.placeholders.hasOwnProperty(phName)) {
-      return this._srcMsg.placeholders[phName];
+      return this._srcMsg.placeholders[phName].text;
     }
 
     if (this._srcMsg.placeholderToMessage.hasOwnProperty(phName)) {
diff --git a/packages/compiler/src/jit_compiler_facade.ts b/packages/compiler/src/jit_compiler_facade.ts
index b3c92ac387df8..540c0a3e22f6d 100644
--- a/packages/compiler/src/jit_compiler_facade.ts
+++ b/packages/compiler/src/jit_compiler_facade.ts
@@ -129,7 +129,7 @@ export class CompilerFacadeImpl implements CompilerFacade {
     const template = parseTemplate(
         facade.template, sourceMapUrl,
         {preserveWhitespaces: facade.preserveWhitespaces, interpolationConfig});
-    if (template.errors !== undefined) {
+    if (template.errors !== null) {
       const errors = template.errors.map(err => err.toString()).join(', ');
       throw new Error(`Errors during JIT compilation of template for ${facade.name}: ${errors}`);
     }
diff --git a/packages/compiler/src/ml_parser/ast.ts b/packages/compiler/src/ml_parser/ast.ts
index 05abef7cccfd3..ead5c11cce5b0 100644
--- a/packages/compiler/src/ml_parser/ast.ts
+++ b/packages/compiler/src/ml_parser/ast.ts
@@ -64,7 +64,7 @@ export class Attribute extends NodeWithI18n {
 export class Element extends NodeWithI18n {
   constructor(
       public name: string, public attrs: Attribute[], public children: Node[],
-      sourceSpan: ParseSourceSpan, public startSourceSpan: ParseSourceSpan|null = null,
+      sourceSpan: ParseSourceSpan, public startSourceSpan: ParseSourceSpan,
       public endSourceSpan: ParseSourceSpan|null = null, i18n?: I18nMeta) {
     super(sourceSpan, i18n);
   }
diff --git a/packages/compiler/src/ml_parser/html_tags.ts b/packages/compiler/src/ml_parser/html_tags.ts
index 969fb0f95fac2..e83d7aa670ab4 100644
--- a/packages/compiler/src/ml_parser/html_tags.ts
+++ b/packages/compiler/src/ml_parser/html_tags.ts
@@ -17,6 +17,7 @@ export class HtmlTagDefinition implements TagDefinition {
   isVoid: boolean;
   ignoreFirstLf: boolean;
   canSelfClose: boolean = false;
+  preventNamespaceInheritance: boolean;
 
   constructor({
     closedByChildren,
@@ -24,14 +25,16 @@ export class HtmlTagDefinition implements TagDefinition {
     contentType = TagContentType.PARSABLE_DATA,
     closedByParent = false,
     isVoid = false,
-    ignoreFirstLf = false
+    ignoreFirstLf = false,
+    preventNamespaceInheritance = false
   }: {
     closedByChildren?: string[],
     closedByParent?: boolean,
     implicitNamespacePrefix?: string,
     contentType?: TagContentType,
     isVoid?: boolean,
-    ignoreFirstLf?: boolean
+    ignoreFirstLf?: boolean,
+    preventNamespaceInheritance?: boolean
   } = {}) {
     if (closedByChildren && closedByChildren.length > 0) {
       closedByChildren.forEach(tagName => this.closedByChildren[tagName] = true);
@@ -41,6 +44,7 @@ export class HtmlTagDefinition implements TagDefinition {
     this.implicitNamespacePrefix = implicitNamespacePrefix || null;
     this.contentType = contentType;
     this.ignoreFirstLf = ignoreFirstLf;
+    this.preventNamespaceInheritance = preventNamespaceInheritance;
   }
 
   isClosedByChild(name: string): boolean {
@@ -88,6 +92,17 @@ export function getHtmlTagDefinition(tagName: string): HtmlTagDefinition {
       'th': new HtmlTagDefinition({closedByChildren: ['td', 'th'], closedByParent: true}),
       'col': new HtmlTagDefinition({isVoid: true}),
       'svg': new HtmlTagDefinition({implicitNamespacePrefix: 'svg'}),
+      'foreignObject': new HtmlTagDefinition({
+        // Usually the implicit namespace here would be redundant since it will be inherited from
+        // the parent `svg`, but we have to do it for `foreignObject`, because the way the parser
+        // works is that the parent node of an end tag is its own start tag which means that
+        // the `preventNamespaceInheritance` on `foreignObject` would have it default to the
+        // implicit namespace which is `html`, unless specified otherwise.
+        implicitNamespacePrefix: 'svg',
+        // We want to prevent children of foreignObject from inheriting its namespace, because
+        // the point of the element is to allow nodes from other namespaces to be inserted.
+        preventNamespaceInheritance: true,
+      }),
       'math': new HtmlTagDefinition({implicitNamespacePrefix: 'math'}),
       'li': new HtmlTagDefinition({closedByChildren: ['li'], closedByParent: true}),
       'dt': new HtmlTagDefinition({closedByChildren: ['dt', 'dd']}),
@@ -111,5 +126,8 @@ export function getHtmlTagDefinition(tagName: string): HtmlTagDefinition {
           {contentType: TagContentType.ESCAPABLE_RAW_TEXT, ignoreFirstLf: true}),
     };
   }
-  return TAG_DEFINITIONS[tagName.toLowerCase()] || _DEFAULT_TAG_DEFINITION;
+  // We have to make both a case-sensitive and a case-insesitive lookup, because
+  // HTML tag names are case insensitive, whereas some SVG tags are case sensitive.
+  return TAG_DEFINITIONS[tagName] ?? TAG_DEFINITIONS[tagName.toLowerCase()] ??
+      _DEFAULT_TAG_DEFINITION;
 }
diff --git a/packages/compiler/src/ml_parser/lexer.ts b/packages/compiler/src/ml_parser/lexer.ts
index 38a82a7d23f6a..e7bbb08aeb345 100644
--- a/packages/compiler/src/ml_parser/lexer.ts
+++ b/packages/compiler/src/ml_parser/lexer.ts
@@ -17,6 +17,7 @@ export enum TokenType {
   TAG_OPEN_END,
   TAG_OPEN_END_VOID,
   TAG_CLOSE,
+  INCOMPLETE_TAG_OPEN,
   TEXT,
   ESCAPABLE_RAW_TEXT,
   RAW_TEXT,
@@ -511,8 +512,6 @@ class _Tokenizer {
     let tagName: string;
     let prefix: string;
     let openTagToken: Token|undefined;
-    let tokensBeforeTagOpen = this.tokens.length;
-    const innerStart = this._cursor.clone();
     try {
       if (!chars.isAsciiLetter(this._cursor.peek())) {
         throw this._createError(
@@ -523,7 +522,8 @@ class _Tokenizer {
       prefix = openTagToken.parts[0];
       tagName = openTagToken.parts[1];
       this._attemptCharCodeUntilFn(isNotWhitespace);
-      while (this._cursor.peek() !== chars.$SLASH && this._cursor.peek() !== chars.$GT) {
+      while (this._cursor.peek() !== chars.$SLASH && this._cursor.peek() !== chars.$GT &&
+             this._cursor.peek() !== chars.$LT) {
         this._consumeAttributeName();
         this._attemptCharCodeUntilFn(isNotWhitespace);
         if (this._attemptCharCode(chars.$EQ)) {
@@ -535,14 +535,15 @@ class _Tokenizer {
       this._consumeTagOpenEnd();
     } catch (e) {
       if (e instanceof _ControlFlowError) {
-        // When the start tag is invalid (including invalid "attributes"), assume we want a "<"
-        this._cursor = innerStart;
         if (openTagToken) {
-          this.tokens.length = tokensBeforeTagOpen;
+          // We errored before we could close the opening tag, so it is incomplete.
+          openTagToken.type = TokenType.INCOMPLETE_TAG_OPEN;
+        } else {
+          // When the start tag is invalid, assume we want a "<" as text.
+          // Back to back text tokens are merged at the end.
+          this._beginToken(TokenType.TEXT, start);
+          this._endToken(['<']);
         }
-        // Back to back text tokens are merged at the end
-        this._beginToken(TokenType.TEXT, start);
-        this._endToken(['<']);
         return;
       }
 
@@ -642,13 +643,11 @@ class _Tokenizer {
     this._beginToken(TokenType.RAW_TEXT);
     const condition = this._readUntil(chars.$COMMA);
     const normalizedCondition = this._processCarriageReturns(condition);
-    if (this._escapedString || this._i18nNormalizeLineEndingsInICUs) {
-      // Either the template is inline or,
-      // we explicitly want to normalize line endings for this text.
+    if (this._i18nNormalizeLineEndingsInICUs) {
+      // We explicitly want to normalize line endings for this text.
       this._endToken([normalizedCondition]);
     } else {
-      // The expression is in an external template and, for backward compatibility,
-      // we are not normalizing line endings.
+      // We are not normalizing line endings.
       const conditionToken = this._endToken([condition]);
       if (normalizedCondition !== condition) {
         this.nonNormalizedIcuExpressions.push(conditionToken);
@@ -774,8 +773,8 @@ function isNotWhitespace(code: number): boolean {
 }
 
 function isNameEnd(code: number): boolean {
-  return chars.isWhitespace(code) || code === chars.$GT || code === chars.$SLASH ||
-      code === chars.$SQ || code === chars.$DQ || code === chars.$EQ;
+  return chars.isWhitespace(code) || code === chars.$GT || code === chars.$LT ||
+      code === chars.$SLASH || code === chars.$SQ || code === chars.$DQ || code === chars.$EQ;
 }
 
 function isPrefixEnd(code: number): boolean {
diff --git a/packages/compiler/src/ml_parser/parser.ts b/packages/compiler/src/ml_parser/parser.ts
index b31db0c25cfc0..1194a8b7ba978 100644
--- a/packages/compiler/src/ml_parser/parser.ts
+++ b/packages/compiler/src/ml_parser/parser.ts
@@ -10,7 +10,7 @@ import {ParseError, ParseSourceSpan} from '../parse_util';
 
 import * as html from './ast';
 import * as lex from './lexer';
-import {getNsPrefix, isNgContainer, mergeNsAndName, TagDefinition} from './tags';
+import {getNsPrefix, mergeNsAndName, splitNsName, TagDefinition} from './tags';
 
 export class TreeError extends ParseError {
   static create(elementName: string|null, span: ParseSourceSpan, msg: string): TreeError {
@@ -56,7 +56,8 @@ class _TreeBuilder {
 
   build(): void {
     while (this._peek.type !== lex.TokenType.EOF) {
-      if (this._peek.type === lex.TokenType.TAG_OPEN_START) {
+      if (this._peek.type === lex.TokenType.TAG_OPEN_START ||
+          this._peek.type === lex.TokenType.INCOMPLETE_TAG_OPEN) {
         this._consumeStartTag(this._advance());
       } else if (this._peek.type === lex.TokenType.TAG_CLOSE) {
         this._consumeEndTag(this._advance());
@@ -233,8 +234,7 @@ class _TreeBuilder {
   }
 
   private _consumeStartTag(startTagToken: lex.Token) {
-    const prefix = startTagToken.parts[0];
-    const name = startTagToken.parts[1];
+    const [prefix, name] = startTagToken.parts;
     const attrs: html.Attribute[] = [];
     while (this._peek.type === lex.TokenType.ATTR_NAME) {
       attrs.push(this._consumeAttr(this._advance()));
@@ -258,12 +258,20 @@ class _TreeBuilder {
     }
     const end = this._peek.sourceSpan.start;
     const span = new ParseSourceSpan(startTagToken.sourceSpan.start, end);
-    const el = new html.Element(fullName, attrs, [], span, span, undefined);
+    // Create a separate `startSpan` because `span` will be modified when there is an `end` span.
+    const startSpan = new ParseSourceSpan(startTagToken.sourceSpan.start, end);
+    const el = new html.Element(fullName, attrs, [], span, startSpan, undefined);
     this._pushElement(el);
     if (selfClosing) {
       // Elements that are self-closed have their `endSourceSpan` set to the full span, as the
       // element start tag also represents the end tag.
       this._popElement(fullName, span);
+    } else if (startTagToken.type === lex.TokenType.INCOMPLETE_TAG_OPEN) {
+      // We already know the opening tag is not complete, so it is unlikely it has a corresponding
+      // close tag. Let's optimistically parse it as a full element and emit an error.
+      this._popElement(fullName, null);
+      this.errors.push(
+          TreeError.create(fullName, span, `Opening tag "${fullName}" not terminated.`));
     }
   }
 
@@ -293,7 +301,13 @@ class _TreeBuilder {
     }
   }
 
-  private _popElement(fullName: string, endSourceSpan: ParseSourceSpan): boolean {
+  /**
+   * Closes the nearest element with the tag name `fullName` in the parse tree.
+   * `endSourceSpan` is the span of the closing tag, or null if the element does
+   * not have a closing tag (for example, this happens when an incomplete
+   * opening tag is recovered).
+   */
+  private _popElement(fullName: string, endSourceSpan: ParseSourceSpan|null): boolean {
     for (let stackIndex = this._elementStack.length - 1; stackIndex >= 0; stackIndex--) {
       const el = this._elementStack[stackIndex];
       if (el.name == fullName) {
@@ -301,6 +315,7 @@ class _TreeBuilder {
         // removed from the element stack at this point are closed implicitly, so they won't get
         // an end source span (as there is no explicit closing element).
         el.endSourceSpan = endSourceSpan;
+        el.sourceSpan.end = endSourceSpan !== null ? endSourceSpan.end : el.sourceSpan.end;
 
         this._elementStack.splice(stackIndex, this._elementStack.length - stackIndex);
         return true;
@@ -353,7 +368,11 @@ class _TreeBuilder {
     if (prefix === '') {
       prefix = this.getTagDefinition(localName).implicitNamespacePrefix || '';
       if (prefix === '' && parentElement != null) {
-        prefix = getNsPrefix(parentElement.name);
+        const parentTagName = splitNsName(parentElement.name)[1];
+        const parentTagDefinition = this.getTagDefinition(parentTagName);
+        if (!parentTagDefinition.preventNamespaceInheritance) {
+          prefix = getNsPrefix(parentElement.name);
+        }
       }
     }
 
diff --git a/packages/compiler/src/ml_parser/tags.ts b/packages/compiler/src/ml_parser/tags.ts
index 279ab0aacb78e..32b3aab2af624 100644
--- a/packages/compiler/src/ml_parser/tags.ts
+++ b/packages/compiler/src/ml_parser/tags.ts
@@ -19,6 +19,7 @@ export interface TagDefinition {
   isVoid: boolean;
   ignoreFirstLf: boolean;
   canSelfClose: boolean;
+  preventNamespaceInheritance: boolean;
 
   isClosedByChild(name: string): boolean;
 }
diff --git a/packages/compiler/src/ml_parser/xml_tags.ts b/packages/compiler/src/ml_parser/xml_tags.ts
index 81af50d6898e3..e4a76ed2456b0 100644
--- a/packages/compiler/src/ml_parser/xml_tags.ts
+++ b/packages/compiler/src/ml_parser/xml_tags.ts
@@ -20,6 +20,7 @@ export class XmlTagDefinition implements TagDefinition {
   isVoid: boolean = false;
   ignoreFirstLf: boolean = false;
   canSelfClose: boolean = true;
+  preventNamespaceInheritance: boolean = false;
 
   requireExtraParent(currentParent: string): boolean {
     return false;
diff --git a/packages/compiler/src/output/abstract_emitter.ts b/packages/compiler/src/output/abstract_emitter.ts
index 412ab3196094f..bbb561bacc8a2 100644
--- a/packages/compiler/src/output/abstract_emitter.ts
+++ b/packages/compiler/src/output/abstract_emitter.ts
@@ -202,13 +202,34 @@ export class EmitterVisitorContext {
 export abstract class AbstractEmitterVisitor implements o.StatementVisitor, o.ExpressionVisitor {
   constructor(private _escapeDollarInStrings: boolean) {}
 
+  protected printLeadingComments(stmt: o.Statement, ctx: EmitterVisitorContext): void {
+    if (stmt.leadingComments === undefined) {
+      return;
+    }
+    for (const comment of stmt.leadingComments) {
+      if (comment instanceof o.JSDocComment) {
+        ctx.print(stmt, `/*${comment.toString()}*/`, comment.trailingNewline);
+      } else {
+        if (comment.multiline) {
+          ctx.print(stmt, `/* ${comment.text} */`, comment.trailingNewline);
+        } else {
+          comment.text.split('\n').forEach((line) => {
+            ctx.println(stmt, `// ${line}`);
+          });
+        }
+      }
+    }
+  }
+
   visitExpressionStmt(stmt: o.ExpressionStatement, ctx: EmitterVisitorContext): any {
+    this.printLeadingComments(stmt, ctx);
     stmt.expr.visitExpression(this, ctx);
     ctx.println(stmt, ';');
     return null;
   }
 
   visitReturnStmt(stmt: o.ReturnStatement, ctx: EmitterVisitorContext): any {
+    this.printLeadingComments(stmt, ctx);
     ctx.print(stmt, `return `);
     stmt.value.visitExpression(this, ctx);
     ctx.println(stmt, ';');
@@ -220,6 +241,7 @@ export abstract class AbstractEmitterVisitor implements o.StatementVisitor, o.Ex
   abstract visitDeclareClassStmt(stmt: o.ClassStmt, ctx: EmitterVisitorContext): any;
 
   visitIfStmt(stmt: o.IfStmt, ctx: EmitterVisitorContext): any {
+    this.printLeadingComments(stmt, ctx);
     ctx.print(stmt, `if (`);
     stmt.condition.visitExpression(this, ctx);
     ctx.print(stmt, `) {`);
@@ -248,25 +270,12 @@ export abstract class AbstractEmitterVisitor implements o.StatementVisitor, o.Ex
   abstract visitTryCatchStmt(stmt: o.TryCatchStmt, ctx: EmitterVisitorContext): any;
 
   visitThrowStmt(stmt: o.ThrowStmt, ctx: EmitterVisitorContext): any {
+    this.printLeadingComments(stmt, ctx);
     ctx.print(stmt, `throw `);
     stmt.error.visitExpression(this, ctx);
     ctx.println(stmt, `;`);
     return null;
   }
-  visitCommentStmt(stmt: o.CommentStmt, ctx: EmitterVisitorContext): any {
-    if (stmt.multiline) {
-      ctx.println(stmt, `/* ${stmt.comment} */`);
-    } else {
-      stmt.comment.split('\n').forEach((line) => {
-        ctx.println(stmt, `// ${line}`);
-      });
-    }
-    return null;
-  }
-  visitJSDocCommentStmt(stmt: o.JSDocCommentStmt, ctx: EmitterVisitorContext) {
-    ctx.println(stmt, `/*${stmt.toString()}*/`);
-    return null;
-  }
 
   abstract visitDeclareVarStmt(stmt: o.DeclareVarStmt, ctx: EmitterVisitorContext): any;
 
@@ -420,6 +429,25 @@ export abstract class AbstractEmitterVisitor implements o.StatementVisitor, o.Ex
   abstract visitFunctionExpr(ast: o.FunctionExpr, ctx: EmitterVisitorContext): any;
   abstract visitDeclareFunctionStmt(stmt: o.DeclareFunctionStmt, context: any): any;
 
+  visitUnaryOperatorExpr(ast: o.UnaryOperatorExpr, ctx: EmitterVisitorContext): any {
+    let opStr: string;
+    switch (ast.operator) {
+      case o.UnaryOperator.Plus:
+        opStr = '+';
+        break;
+      case o.UnaryOperator.Minus:
+        opStr = '-';
+        break;
+      default:
+        throw new Error(`Unknown operator ${ast.operator}`);
+    }
+    if (ast.parens) ctx.print(ast, `(`);
+    ctx.print(ast, opStr);
+    ast.expr.visitExpression(this, ctx);
+    if (ast.parens) ctx.print(ast, `)`);
+    return null;
+  }
+
   visitBinaryOperatorExpr(ast: o.BinaryOperatorExpr, ctx: EmitterVisitorContext): any {
     let opStr: string;
     switch (ast.operator) {
diff --git a/packages/compiler/src/output/output_ast.ts b/packages/compiler/src/output/output_ast.ts
index dfac81e170e10..d74bff43891b0 100644
--- a/packages/compiler/src/output/output_ast.ts
+++ b/packages/compiler/src/output/output_ast.ts
@@ -9,7 +9,6 @@
 
 import {ParseSourceSpan} from '../parse_util';
 import {I18nMeta} from '../render3/view/i18n/meta';
-import {error} from '../util';
 
 //// Types
 export enum TypeModifier {
@@ -17,15 +16,11 @@ export enum TypeModifier {
 }
 
 export abstract class Type {
-  constructor(public modifiers: TypeModifier[]|null = null) {
-    if (!modifiers) {
-      this.modifiers = [];
-    }
-  }
+  constructor(public modifiers: TypeModifier[] = []) {}
   abstract visitType(visitor: TypeVisitor, context: any): any;
 
   hasModifier(modifier: TypeModifier): boolean {
-    return this.modifiers!.indexOf(modifier) !== -1;
+    return this.modifiers.indexOf(modifier) !== -1;
   }
 }
 
@@ -41,7 +36,7 @@ export enum BuiltinTypeName {
 }
 
 export class BuiltinType extends Type {
-  constructor(public name: BuiltinTypeName, modifiers: TypeModifier[]|null = null) {
+  constructor(public name: BuiltinTypeName, modifiers?: TypeModifier[]) {
     super(modifiers);
   }
   visitType(visitor: TypeVisitor, context: any): any {
@@ -51,8 +46,7 @@ export class BuiltinType extends Type {
 
 export class ExpressionType extends Type {
   constructor(
-      public value: Expression, modifiers: TypeModifier[]|null = null,
-      public typeParams: Type[]|null = null) {
+      public value: Expression, modifiers?: TypeModifier[], public typeParams: Type[]|null = null) {
     super(modifiers);
   }
   visitType(visitor: TypeVisitor, context: any): any {
@@ -62,7 +56,7 @@ export class ExpressionType extends Type {
 
 
 export class ArrayType extends Type {
-  constructor(public of: Type, modifiers: TypeModifier[]|null = null) {
+  constructor(public of: Type, modifiers?: TypeModifier[]) {
     super(modifiers);
   }
   visitType(visitor: TypeVisitor, context: any): any {
@@ -73,7 +67,7 @@ export class ArrayType extends Type {
 
 export class MapType extends Type {
   public valueType: Type|null;
-  constructor(valueType: Type|null|undefined, modifiers: TypeModifier[]|null = null) {
+  constructor(valueType: Type|null|undefined, modifiers?: TypeModifier[]) {
     super(modifiers);
     this.valueType = valueType || null;
   }
@@ -100,6 +94,11 @@ export interface TypeVisitor {
 
 ///// Expressions
 
+export enum UnaryOperator {
+  Minus,
+  Plus,
+}
+
 export enum BinaryOperator {
   Equals,
   NotEquals,
@@ -353,7 +352,7 @@ export class WriteVarExpr extends Expression {
     return visitor.visitWriteVarExpr(this, context);
   }
 
-  toDeclStmt(type?: Type|null, modifiers?: StmtModifier[]|null): DeclareVarStmt {
+  toDeclStmt(type?: Type|null, modifiers?: StmtModifier[]): DeclareVarStmt {
     return new DeclareVarStmt(this.name, this.value, type, modifiers, this.sourceSpan);
   }
 
@@ -511,11 +510,16 @@ export class LiteralExpr extends Expression {
   }
 }
 
+export abstract class MessagePiece {
+  constructor(public text: string, public sourceSpan: ParseSourceSpan) {}
+}
+export class LiteralPiece extends MessagePiece {}
+export class PlaceholderPiece extends MessagePiece {}
 
 export class LocalizedString extends Expression {
   constructor(
-      readonly metaBlock: I18nMeta, readonly messageParts: string[],
-      readonly placeHolderNames: string[], readonly expressions: Expression[],
+      readonly metaBlock: I18nMeta, readonly messageParts: LiteralPiece[],
+      readonly placeHolderNames: PlaceholderPiece[], readonly expressions: Expression[],
       sourceSpan?: ParseSourceSpan|null) {
     super(STRING_TYPE, sourceSpan);
   }
@@ -541,7 +545,7 @@ export class LocalizedString extends Expression {
    * @param meta The metadata to serialize
    * @param messagePart The first part of the tagged string
    */
-  serializeI18nHead(): {cooked: string, raw: string} {
+  serializeI18nHead(): CookedRawString {
     const MEANING_SEPARATOR = '|';
     const ID_SEPARATOR = '@@';
     const LEGACY_ID_INDICATOR = '␟';
@@ -558,7 +562,17 @@ export class LocalizedString extends Expression {
         metaBlock = `${metaBlock}${LEGACY_ID_INDICATOR}${legacyId}`;
       });
     }
-    return createCookedRawString(metaBlock, this.messageParts[0]);
+    return createCookedRawString(
+        metaBlock, this.messageParts[0].text, this.getMessagePartSourceSpan(0));
+  }
+
+  getMessagePartSourceSpan(i: number): ParseSourceSpan|null {
+    return this.messageParts[i]?.sourceSpan ?? this.sourceSpan;
+  }
+
+  getPlaceholderSourceSpan(i: number): ParseSourceSpan {
+    return this.placeHolderNames[i]?.sourceSpan ?? this.expressions[i]?.sourceSpan ??
+        this.sourceSpan;
   }
 
   /**
@@ -568,13 +582,24 @@ export class LocalizedString extends Expression {
    * @param placeholderName The placeholder name to serialize
    * @param messagePart The following message string after this placeholder
    */
-  serializeI18nTemplatePart(partIndex: number): {cooked: string, raw: string} {
-    const placeholderName = this.placeHolderNames[partIndex - 1];
+  serializeI18nTemplatePart(partIndex: number): CookedRawString {
+    const placeholderName = this.placeHolderNames[partIndex - 1].text;
     const messagePart = this.messageParts[partIndex];
-    return createCookedRawString(placeholderName, messagePart);
+    return createCookedRawString(
+        placeholderName, messagePart.text, this.getMessagePartSourceSpan(partIndex));
   }
 }
 
+/**
+ * A structure to hold the cooked and raw strings of a template literal element, along with its
+ * source-span range.
+ */
+export interface CookedRawString {
+  cooked: string;
+  raw: string;
+  range: ParseSourceSpan|null;
+}
+
 const escapeSlashes = (str: string): string => str.replace(/\\/g, '\\\\');
 const escapeStartingColon = (str: string): string => str.replace(/^:/, '\\:');
 const escapeColons = (str: string): string => str.replace(/:/g, '\\:');
@@ -595,17 +620,20 @@ const escapeForMessagePart = (str: string): string =>
  * @param metaBlock Any metadata that should be prepended to the string
  * @param messagePart The message part of the string
  */
-function createCookedRawString(metaBlock: string, messagePart: string) {
+function createCookedRawString(
+    metaBlock: string, messagePart: string, range: ParseSourceSpan|null): CookedRawString {
   if (metaBlock === '') {
     return {
       cooked: messagePart,
-      raw: escapeForMessagePart(escapeStartingColon(escapeSlashes(messagePart)))
+      raw: escapeForMessagePart(escapeStartingColon(escapeSlashes(messagePart))),
+      range,
     };
   } else {
     return {
       cooked: `:${metaBlock}:${messagePart}`,
       raw: escapeForMessagePart(
-          `:${escapeColons(escapeSlashes(metaBlock))}:${escapeSlashes(messagePart)}`)
+          `:${escapeColons(escapeSlashes(metaBlock))}:${escapeSlashes(messagePart)}`),
+      range,
     };
   }
 }
@@ -746,13 +774,35 @@ export class FunctionExpr extends Expression {
     return visitor.visitFunctionExpr(this, context);
   }
 
-  toDeclStmt(name: string, modifiers: StmtModifier[]|null = null): DeclareFunctionStmt {
+  toDeclStmt(name: string, modifiers?: StmtModifier[]): DeclareFunctionStmt {
     return new DeclareFunctionStmt(
         name, this.params, this.statements, this.type, modifiers, this.sourceSpan);
   }
 }
 
 
+export class UnaryOperatorExpr extends Expression {
+  constructor(
+      public operator: UnaryOperator, public expr: Expression, type?: Type|null,
+      sourceSpan?: ParseSourceSpan|null, public parens: boolean = true) {
+    super(type || NUMBER_TYPE, sourceSpan);
+  }
+
+  isEquivalent(e: Expression): boolean {
+    return e instanceof UnaryOperatorExpr && this.operator === e.operator &&
+        this.expr.isEquivalent(e.expr);
+  }
+
+  isConstant() {
+    return false;
+  }
+
+  visitExpression(visitor: ExpressionVisitor, context: any): any {
+    return visitor.visitUnaryOperatorExpr(this, context);
+  }
+}
+
+
 export class BinaryOperatorExpr extends Expression {
   public lhs: Expression;
   constructor(
@@ -912,6 +962,7 @@ export interface ExpressionVisitor {
   visitAssertNotNullExpr(ast: AssertNotNull, context: any): any;
   visitCastExpr(ast: CastExpr, context: any): any;
   visitFunctionExpr(ast: FunctionExpr, context: any): any;
+  visitUnaryOperatorExpr(ast: UnaryOperatorExpr, context: any): any;
   visitBinaryOperatorExpr(ast: BinaryOperatorExpr, context: any): any;
   visitReadPropExpr(ast: ReadPropExpr, context: any): any;
   visitReadKeyExpr(ast: ReadKeyExpr, context: any): any;
@@ -937,13 +988,25 @@ export enum StmtModifier {
   Static,
 }
 
-export abstract class Statement {
-  public modifiers: StmtModifier[];
-  public sourceSpan: ParseSourceSpan|null;
-  constructor(modifiers?: StmtModifier[]|null, sourceSpan?: ParseSourceSpan|null) {
-    this.modifiers = modifiers || [];
-    this.sourceSpan = sourceSpan || null;
+export class LeadingComment {
+  constructor(public text: string, public multiline: boolean, public trailingNewline: boolean) {}
+  toString() {
+    return this.multiline ? ` ${this.text} ` : this.text;
+  }
+}
+export class JSDocComment extends LeadingComment {
+  constructor(public tags: JSDocTag[]) {
+    super('', /* multiline */ true, /* trailingNewline */ true);
   }
+  toString(): string {
+    return serializeTags(this.tags);
+  }
+}
+
+export abstract class Statement {
+  constructor(
+      public modifiers: StmtModifier[] = [], public sourceSpan: ParseSourceSpan|null = null,
+      public leadingComments?: LeadingComment[]) {}
   /**
    * Calculates whether this statement produces the same value as the given statement.
    * Note: We don't check Types nor ParseSourceSpans nor function arguments.
@@ -953,7 +1016,12 @@ export abstract class Statement {
   abstract visitStatement(visitor: StatementVisitor, context: any): any;
 
   hasModifier(modifier: StmtModifier): boolean {
-    return this.modifiers!.indexOf(modifier) !== -1;
+    return this.modifiers.indexOf(modifier) !== -1;
+  }
+
+  addLeadingComment(leadingComment: LeadingComment): void {
+    this.leadingComments = this.leadingComments ?? [];
+    this.leadingComments.push(leadingComment);
   }
 }
 
@@ -961,9 +1029,9 @@ export abstract class Statement {
 export class DeclareVarStmt extends Statement {
   public type: Type|null;
   constructor(
-      public name: string, public value?: Expression, type?: Type|null,
-      modifiers: StmtModifier[]|null = null, sourceSpan?: ParseSourceSpan|null) {
-    super(modifiers, sourceSpan);
+      public name: string, public value?: Expression, type?: Type|null, modifiers?: StmtModifier[],
+      sourceSpan?: ParseSourceSpan|null, leadingComments?: LeadingComment[]) {
+    super(modifiers, sourceSpan, leadingComments);
     this.type = type || (value && value.type) || null;
   }
   isEquivalent(stmt: Statement): boolean {
@@ -979,28 +1047,29 @@ export class DeclareFunctionStmt extends Statement {
   public type: Type|null;
   constructor(
       public name: string, public params: FnParam[], public statements: Statement[],
-      type?: Type|null, modifiers: StmtModifier[]|null = null, sourceSpan?: ParseSourceSpan|null) {
-    super(modifiers, sourceSpan);
+      type?: Type|null, modifiers?: StmtModifier[], sourceSpan?: ParseSourceSpan|null,
+      leadingComments?: LeadingComment[]) {
+    super(modifiers, sourceSpan, leadingComments);
     this.type = type || null;
   }
   isEquivalent(stmt: Statement): boolean {
     return stmt instanceof DeclareFunctionStmt && areAllEquivalent(this.params, stmt.params) &&
         areAllEquivalent(this.statements, stmt.statements);
   }
-
   visitStatement(visitor: StatementVisitor, context: any): any {
     return visitor.visitDeclareFunctionStmt(this, context);
   }
 }
 
 export class ExpressionStatement extends Statement {
-  constructor(public expr: Expression, sourceSpan?: ParseSourceSpan|null) {
-    super(null, sourceSpan);
+  constructor(
+      public expr: Expression, sourceSpan?: ParseSourceSpan|null,
+      leadingComments?: LeadingComment[]) {
+    super([], sourceSpan, leadingComments);
   }
   isEquivalent(stmt: Statement): boolean {
     return stmt instanceof ExpressionStatement && this.expr.isEquivalent(stmt.expr);
   }
-
   visitStatement(visitor: StatementVisitor, context: any): any {
     return visitor.visitExpressionStmt(this, context);
   }
@@ -1008,8 +1077,10 @@ export class ExpressionStatement extends Statement {
 
 
 export class ReturnStatement extends Statement {
-  constructor(public value: Expression, sourceSpan?: ParseSourceSpan|null) {
-    super(null, sourceSpan);
+  constructor(
+      public value: Expression, sourceSpan: ParseSourceSpan|null = null,
+      leadingComments?: LeadingComment[]) {
+    super([], sourceSpan, leadingComments);
   }
   isEquivalent(stmt: Statement): boolean {
     return stmt instanceof ReturnStatement && this.value.isEquivalent(stmt.value);
@@ -1020,21 +1091,15 @@ export class ReturnStatement extends Statement {
 }
 
 export class AbstractClassPart {
-  public type: Type|null;
-  constructor(type: Type|null|undefined, public modifiers: StmtModifier[]|null) {
-    if (!modifiers) {
-      this.modifiers = [];
-    }
-    this.type = type || null;
-  }
+  constructor(public type: Type|null = null, public modifiers: StmtModifier[] = []) {}
   hasModifier(modifier: StmtModifier): boolean {
-    return this.modifiers!.indexOf(modifier) !== -1;
+    return this.modifiers.indexOf(modifier) !== -1;
   }
 }
 
 export class ClassField extends AbstractClassPart {
   constructor(
-      public name: string, type?: Type|null, modifiers: StmtModifier[]|null = null,
+      public name: string, type?: Type|null, modifiers?: StmtModifier[],
       public initializer?: Expression) {
     super(type, modifiers);
   }
@@ -1047,7 +1112,7 @@ export class ClassField extends AbstractClassPart {
 export class ClassMethod extends AbstractClassPart {
   constructor(
       public name: string|null, public params: FnParam[], public body: Statement[],
-      type?: Type|null, modifiers: StmtModifier[]|null = null) {
+      type?: Type|null, modifiers?: StmtModifier[]) {
     super(type, modifiers);
   }
   isEquivalent(m: ClassMethod) {
@@ -1058,8 +1123,7 @@ export class ClassMethod extends AbstractClassPart {
 
 export class ClassGetter extends AbstractClassPart {
   constructor(
-      public name: string, public body: Statement[], type?: Type|null,
-      modifiers: StmtModifier[]|null = null) {
+      public name: string, public body: Statement[], type?: Type|null, modifiers?: StmtModifier[]) {
     super(type, modifiers);
   }
   isEquivalent(m: ClassGetter) {
@@ -1072,9 +1136,9 @@ export class ClassStmt extends Statement {
   constructor(
       public name: string, public parent: Expression|null, public fields: ClassField[],
       public getters: ClassGetter[], public constructorMethod: ClassMethod,
-      public methods: ClassMethod[], modifiers: StmtModifier[]|null = null,
-      sourceSpan?: ParseSourceSpan|null) {
-    super(modifiers, sourceSpan);
+      public methods: ClassMethod[], modifiers?: StmtModifier[], sourceSpan?: ParseSourceSpan|null,
+      leadingComments?: LeadingComment[]) {
+    super(modifiers, sourceSpan, leadingComments);
   }
   isEquivalent(stmt: Statement): boolean {
     return stmt instanceof ClassStmt && this.name === stmt.name &&
@@ -1093,8 +1157,9 @@ export class ClassStmt extends Statement {
 export class IfStmt extends Statement {
   constructor(
       public condition: Expression, public trueCase: Statement[],
-      public falseCase: Statement[] = [], sourceSpan?: ParseSourceSpan|null) {
-    super(null, sourceSpan);
+      public falseCase: Statement[] = [], sourceSpan?: ParseSourceSpan|null,
+      leadingComments?: LeadingComment[]) {
+    super([], sourceSpan, leadingComments);
   }
   isEquivalent(stmt: Statement): boolean {
     return stmt instanceof IfStmt && this.condition.isEquivalent(stmt.condition) &&
@@ -1106,38 +1171,11 @@ export class IfStmt extends Statement {
   }
 }
 
-export class CommentStmt extends Statement {
-  constructor(public comment: string, public multiline = false, sourceSpan?: ParseSourceSpan|null) {
-    super(null, sourceSpan);
-  }
-  isEquivalent(stmt: Statement): boolean {
-    return stmt instanceof CommentStmt;
-  }
-  visitStatement(visitor: StatementVisitor, context: any): any {
-    return visitor.visitCommentStmt(this, context);
-  }
-}
-
-export class JSDocCommentStmt extends Statement {
-  constructor(public tags: JSDocTag[] = [], sourceSpan?: ParseSourceSpan|null) {
-    super(null, sourceSpan);
-  }
-  isEquivalent(stmt: Statement): boolean {
-    return stmt instanceof JSDocCommentStmt && this.toString() === stmt.toString();
-  }
-  visitStatement(visitor: StatementVisitor, context: any): any {
-    return visitor.visitJSDocCommentStmt(this, context);
-  }
-  toString(): string {
-    return serializeTags(this.tags);
-  }
-}
-
 export class TryCatchStmt extends Statement {
   constructor(
       public bodyStmts: Statement[], public catchStmts: Statement[],
-      sourceSpan?: ParseSourceSpan|null) {
-    super(null, sourceSpan);
+      sourceSpan: ParseSourceSpan|null = null, leadingComments?: LeadingComment[]) {
+    super([], sourceSpan, leadingComments);
   }
   isEquivalent(stmt: Statement): boolean {
     return stmt instanceof TryCatchStmt && areAllEquivalent(this.bodyStmts, stmt.bodyStmts) &&
@@ -1150,8 +1188,10 @@ export class TryCatchStmt extends Statement {
 
 
 export class ThrowStmt extends Statement {
-  constructor(public error: Expression, sourceSpan?: ParseSourceSpan|null) {
-    super(null, sourceSpan);
+  constructor(
+      public error: Expression, sourceSpan: ParseSourceSpan|null = null,
+      leadingComments?: LeadingComment[]) {
+    super([], sourceSpan, leadingComments);
   }
   isEquivalent(stmt: ThrowStmt): boolean {
     return stmt instanceof TryCatchStmt && this.error.isEquivalent(stmt.error);
@@ -1170,8 +1210,6 @@ export interface StatementVisitor {
   visitIfStmt(stmt: IfStmt, context: any): any;
   visitTryCatchStmt(stmt: TryCatchStmt, context: any): any;
   visitThrowStmt(stmt: ThrowStmt, context: any): any;
-  visitCommentStmt(stmt: CommentStmt, context: any): any;
-  visitJSDocCommentStmt(stmt: JSDocCommentStmt, context: any): any;
 }
 
 export class AstTransformer implements StatementVisitor, ExpressionVisitor {
@@ -1292,6 +1330,13 @@ export class AstTransformer implements StatementVisitor, ExpressionVisitor {
         context);
   }
 
+  visitUnaryOperatorExpr(ast: UnaryOperatorExpr, context: any): any {
+    return this.transformExpr(
+        new UnaryOperatorExpr(
+            ast.operator, ast.expr.visitExpression(this, context), ast.type, ast.sourceSpan),
+        context);
+  }
+
   visitBinaryOperatorExpr(ast: BinaryOperatorExpr, context: any): any {
     return this.transformExpr(
         new BinaryOperatorExpr(
@@ -1326,7 +1371,7 @@ export class AstTransformer implements StatementVisitor, ExpressionVisitor {
     const entries = ast.entries.map(
         (entry): LiteralMapEntry => new LiteralMapEntry(
             entry.key, entry.value.visitExpression(this, context), entry.quoted));
-    const mapType = new MapType(ast.valueType, null);
+    const mapType = new MapType(ast.valueType);
     return this.transformExpr(new LiteralMapExpr(entries, mapType, ast.sourceSpan), context);
   }
   visitCommaExpr(ast: CommaExpr, context: any): any {
@@ -1340,25 +1385,30 @@ export class AstTransformer implements StatementVisitor, ExpressionVisitor {
   visitDeclareVarStmt(stmt: DeclareVarStmt, context: any): any {
     const value = stmt.value && stmt.value.visitExpression(this, context);
     return this.transformStmt(
-        new DeclareVarStmt(stmt.name, value, stmt.type, stmt.modifiers, stmt.sourceSpan), context);
+        new DeclareVarStmt(
+            stmt.name, value, stmt.type, stmt.modifiers, stmt.sourceSpan, stmt.leadingComments),
+        context);
   }
   visitDeclareFunctionStmt(stmt: DeclareFunctionStmt, context: any): any {
     return this.transformStmt(
         new DeclareFunctionStmt(
             stmt.name, stmt.params, this.visitAllStatements(stmt.statements, context), stmt.type,
-            stmt.modifiers, stmt.sourceSpan),
+            stmt.modifiers, stmt.sourceSpan, stmt.leadingComments),
         context);
   }
 
   visitExpressionStmt(stmt: ExpressionStatement, context: any): any {
     return this.transformStmt(
-        new ExpressionStatement(stmt.expr.visitExpression(this, context), stmt.sourceSpan),
+        new ExpressionStatement(
+            stmt.expr.visitExpression(this, context), stmt.sourceSpan, stmt.leadingComments),
         context);
   }
 
   visitReturnStmt(stmt: ReturnStatement, context: any): any {
     return this.transformStmt(
-        new ReturnStatement(stmt.value.visitExpression(this, context), stmt.sourceSpan), context);
+        new ReturnStatement(
+            stmt.value.visitExpression(this, context), stmt.sourceSpan, stmt.leadingComments),
+        context);
   }
 
   visitDeclareClassStmt(stmt: ClassStmt, context: any): any {
@@ -1387,7 +1437,8 @@ export class AstTransformer implements StatementVisitor, ExpressionVisitor {
         new IfStmt(
             stmt.condition.visitExpression(this, context),
             this.visitAllStatements(stmt.trueCase, context),
-            this.visitAllStatements(stmt.falseCase, context), stmt.sourceSpan),
+            this.visitAllStatements(stmt.falseCase, context), stmt.sourceSpan,
+            stmt.leadingComments),
         context);
   }
 
@@ -1395,21 +1446,16 @@ export class AstTransformer implements StatementVisitor, ExpressionVisitor {
     return this.transformStmt(
         new TryCatchStmt(
             this.visitAllStatements(stmt.bodyStmts, context),
-            this.visitAllStatements(stmt.catchStmts, context), stmt.sourceSpan),
+            this.visitAllStatements(stmt.catchStmts, context), stmt.sourceSpan,
+            stmt.leadingComments),
         context);
   }
 
   visitThrowStmt(stmt: ThrowStmt, context: any): any {
     return this.transformStmt(
-        new ThrowStmt(stmt.error.visitExpression(this, context), stmt.sourceSpan), context);
-  }
-
-  visitCommentStmt(stmt: CommentStmt, context: any): any {
-    return this.transformStmt(stmt, context);
-  }
-
-  visitJSDocCommentStmt(stmt: JSDocCommentStmt, context: any): any {
-    return this.transformStmt(stmt, context);
+        new ThrowStmt(
+            stmt.error.visitExpression(this, context), stmt.sourceSpan, stmt.leadingComments),
+        context);
   }
 
   visitAllStatements(stmts: Statement[], context: any): Statement[] {
@@ -1517,6 +1563,10 @@ export class RecursiveAstVisitor implements StatementVisitor, ExpressionVisitor
     this.visitAllStatements(ast.statements, context);
     return this.visitExpression(ast, context);
   }
+  visitUnaryOperatorExpr(ast: UnaryOperatorExpr, context: any): any {
+    ast.expr.visitExpression(this, context);
+    return this.visitExpression(ast, context);
+  }
   visitBinaryOperatorExpr(ast: BinaryOperatorExpr, context: any): any {
     ast.lhs.visitExpression(this, context);
     ast.rhs.visitExpression(this, context);
@@ -1595,12 +1645,6 @@ export class RecursiveAstVisitor implements StatementVisitor, ExpressionVisitor
     stmt.error.visitExpression(this, context);
     return stmt;
   }
-  visitCommentStmt(stmt: CommentStmt, context: any): any {
-    return stmt;
-  }
-  visitJSDocCommentStmt(stmt: JSDocCommentStmt, context: any): any {
-    return stmt;
-  }
   visitAllStatements(stmts: Statement[], context: any): void {
     stmts.forEach(stmt => stmt.visitStatement(this, context));
   }
@@ -1691,6 +1735,15 @@ class _ApplySourceSpanTransformer extends AstTransformer {
   }
 }
 
+export function leadingComment(
+    text: string, multiline: boolean = false, trailingNewline: boolean = true): LeadingComment {
+  return new LeadingComment(text, multiline, trailingNewline);
+}
+
+export function jsDocComment(tags: JSDocTag[] = []): JSDocComment {
+  return new JSDocComment(tags);
+}
+
 export function variable(
     name: string, type?: Type|null, sourceSpan?: ParseSourceSpan|null): ReadVarExpr {
   return new ReadVarExpr(name, type, sourceSpan);
@@ -1703,14 +1756,13 @@ export function importExpr(
 }
 
 export function importType(
-    id: ExternalReference, typeParams: Type[]|null = null,
-    typeModifiers: TypeModifier[]|null = null): ExpressionType|null {
+    id: ExternalReference, typeParams?: Type[]|null,
+    typeModifiers?: TypeModifier[]): ExpressionType|null {
   return id != null ? expressionType(importExpr(id, typeParams, null), typeModifiers) : null;
 }
 
 export function expressionType(
-    expr: Expression, typeModifiers: TypeModifier[]|null = null,
-    typeParams: Type[]|null = null): ExpressionType {
+    expr: Expression, typeModifiers?: TypeModifier[], typeParams?: Type[]|null): ExpressionType {
   return new ExpressionType(expr, typeModifiers, typeParams);
 }
 
@@ -1730,6 +1782,12 @@ export function literalMap(
       values.map(e => new LiteralMapEntry(e.key, e.value, e.quoted)), type, null);
 }
 
+export function unary(
+    operator: UnaryOperator, expr: Expression, type?: Type,
+    sourceSpan?: ParseSourceSpan|null): UnaryOperatorExpr {
+  return new UnaryOperatorExpr(operator, expr, type, sourceSpan);
+}
+
 export function not(expr: Expression, sourceSpan?: ParseSourceSpan|null): NotExpr {
   return new NotExpr(expr, sourceSpan);
 }
@@ -1744,8 +1802,10 @@ export function fn(
   return new FunctionExpr(params, body, type, sourceSpan, name);
 }
 
-export function ifStmt(condition: Expression, thenClause: Statement[], elseClause?: Statement[]) {
-  return new IfStmt(condition, thenClause, elseClause);
+export function ifStmt(
+    condition: Expression, thenClause: Statement[], elseClause?: Statement[],
+    sourceSpan?: ParseSourceSpan, leadingComments?: LeadingComment[]) {
+  return new IfStmt(condition, thenClause, elseClause, sourceSpan, leadingComments);
 }
 
 export function literal(
@@ -1754,7 +1814,7 @@ export function literal(
 }
 
 export function localizedString(
-    metaBlock: I18nMeta, messageParts: string[], placeholderNames: string[],
+    metaBlock: I18nMeta, messageParts: LiteralPiece[], placeholderNames: PlaceholderPiece[],
     expressions: Expression[], sourceSpan?: ParseSourceSpan|null): LocalizedString {
   return new LocalizedString(metaBlock, messageParts, placeholderNames, expressions, sourceSpan);
 }
@@ -1807,10 +1867,15 @@ function tagToString(tag: JSDocTag): string {
 function serializeTags(tags: JSDocTag[]): string {
   if (tags.length === 0) return '';
 
+  if (tags.length === 1 && tags[0].tagName && !tags[0].text) {
+    // The JSDOC comment is a single simple tag: e.g `/** @tagname */`.
+    return `*${tagToString(tags[0])} `;
+  }
+
   let out = '*\n';
   for (const tag of tags) {
     out += ' *';
-    // If the tagToString is multi-line, insert " * " prefixes on subsequent lines.
+    // If the tagToString is multi-line, insert " * " prefixes on lines.
     out += tagToString(tag).replace(/\n/g, '\n * ');
     out += '\n';
   }
diff --git a/packages/compiler/src/output/output_interpreter.ts b/packages/compiler/src/output/output_interpreter.ts
index 7aa35963aae8c..72ae1871ca442 100644
--- a/packages/compiler/src/output/output_interpreter.ts
+++ b/packages/compiler/src/output/output_interpreter.ts
@@ -233,12 +233,6 @@ class StatementInterpreter implements o.StatementVisitor, o.ExpressionVisitor {
   visitThrowStmt(stmt: o.ThrowStmt, ctx: _ExecutionContext): any {
     throw stmt.error.visitExpression(this, ctx);
   }
-  visitCommentStmt(stmt: o.CommentStmt, context?: any): any {
-    return null;
-  }
-  visitJSDocCommentStmt(stmt: o.JSDocCommentStmt, context?: any): any {
-    return null;
-  }
   visitInstantiateExpr(ast: o.InstantiateExpr, ctx: _ExecutionContext): any {
     const args = this.visitAllExpressions(ast.args, ctx);
     const clazz = ast.classExpr.visitExpression(this, ctx);
@@ -282,6 +276,18 @@ class StatementInterpreter implements o.StatementVisitor, o.ExpressionVisitor {
     }
     return null;
   }
+  visitUnaryOperatorExpr(ast: o.UnaryOperatorExpr, ctx: _ExecutionContext): any {
+    const rhs = () => ast.expr.visitExpression(this, ctx);
+
+    switch (ast.operator) {
+      case o.UnaryOperator.Plus:
+        return +rhs();
+      case o.UnaryOperator.Minus:
+        return -rhs();
+      default:
+        throw new Error(`Unknown operator ${ast.operator}`);
+    }
+  }
   visitBinaryOperatorExpr(ast: o.BinaryOperatorExpr, ctx: _ExecutionContext): any {
     const lhs = () => ast.lhs.visitExpression(this, ctx);
     const rhs = () => ast.rhs.visitExpression(this, ctx);
diff --git a/packages/compiler/src/output/output_jit.ts b/packages/compiler/src/output/output_jit.ts
index 75be4da280531..d672098bcaa8f 100644
--- a/packages/compiler/src/output/output_jit.ts
+++ b/packages/compiler/src/output/output_jit.ts
@@ -12,6 +12,7 @@ import {CompileReflector} from '../compile_reflector';
 import {EmitterVisitorContext} from './abstract_emitter';
 import {AbstractJsEmitterVisitor} from './abstract_js_emitter';
 import * as o from './output_ast';
+import {newTrustedFunctionForJIT} from './output_jit_trusted_types';
 
 /**
  * A helper class to manage the evaluation of JIT generated code.
@@ -69,11 +70,11 @@ export class JitEvaluator {
       // function anonymous(a,b,c
       // /**/) { ... }```
       // We don't want to hard code this fact, so we auto detect it via an empty function first.
-      const emptyFn = new Function(...fnArgNames.concat('return null;')).toString();
+      const emptyFn = newTrustedFunctionForJIT(...fnArgNames.concat('return null;')).toString();
       const headerLines = emptyFn.slice(0, emptyFn.indexOf('return null;')).split('\n').length - 1;
       fnBody += `\n${ctx.toSourceMapGenerator(sourceUrl, headerLines).toJsComment()}`;
     }
-    const fn = new Function(...fnArgNames.concat(fnBody));
+    const fn = newTrustedFunctionForJIT(...fnArgNames.concat(fnBody));
     return this.executeFunction(fn, fnArgValues);
   }
 
diff --git a/packages/compiler/src/output/output_jit_trusted_types.ts b/packages/compiler/src/output/output_jit_trusted_types.ts
new file mode 100644
index 0000000000000..242f7105c7938
--- /dev/null
+++ b/packages/compiler/src/output/output_jit_trusted_types.ts
@@ -0,0 +1,135 @@
+/**
+ * @license
+ * Copyright Google LLC 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 module to facilitate use of a Trusted Types policy within the JIT
+ * compiler. It lazily constructs the Trusted Types policy, providing helper
+ * utilities for promoting strings to Trusted Types. When Trusted Types are not
+ * available, strings are used as a fallback.
+ * @security All use of this module is security-sensitive and should go through
+ * security review.
+ */
+
+import {global} from '../util';
+
+/**
+ * While Angular only uses Trusted Types internally for the time being,
+ * references to Trusted Types could leak into our core.d.ts, which would force
+ * anyone compiling against @angular/core to provide the @types/trusted-types
+ * package in their compilation unit.
+ *
+ * Until https://github.com/microsoft/TypeScript/issues/30024 is resolved, we
+ * will keep Angular's public API surface free of references to Trusted Types.
+ * For internal and semi-private APIs that need to reference Trusted Types, the
+ * minimal type definitions for the Trusted Types API provided by this module
+ * should be used instead.
+ *
+ * Adapted from
+ * https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/trusted-types/index.d.ts
+ * but restricted to the API surface used within Angular.
+ */
+
+export type TrustedScript = {
+  __brand__: 'TrustedScript'
+};
+
+export interface TrustedTypePolicyFactory {
+  createPolicy(policyName: string, policyOptions: {
+    createScript?: (input: string) => string,
+  }): TrustedTypePolicy;
+}
+
+export interface TrustedTypePolicy {
+  createScript(input: string): TrustedScript;
+}
+
+
+/**
+ * The Trusted Types policy, or null if Trusted Types are not
+ * enabled/supported, or undefined if the policy has not been created yet.
+ */
+let policy: TrustedTypePolicy|null|undefined;
+
+/**
+ * Returns the Trusted Types policy, or null if Trusted Types are not
+ * enabled/supported. The first call to this function will create the policy.
+ */
+function getPolicy(): TrustedTypePolicy|null {
+  if (policy === undefined) {
+    policy = null;
+    if (global.trustedTypes) {
+      try {
+        policy =
+            (global.trustedTypes as TrustedTypePolicyFactory).createPolicy('angular#unsafe-jit', {
+              createScript: (s: string) => s,
+            });
+      } catch {
+        // trustedTypes.createPolicy throws if called with a name that is
+        // already registered, even in report-only mode. Until the API changes,
+        // catch the error not to break the applications functionally. In such
+        // cases, the code will fall back to using strings.
+      }
+    }
+  }
+  return policy;
+}
+
+/**
+ * Unsafely promote a string to a TrustedScript, falling back to strings when
+ * Trusted Types are not available.
+ * @security In particular, it must be assured that the provided string will
+ * never cause an XSS vulnerability if used in a context that will be
+ * interpreted and executed as a script by a browser, e.g. when calling eval.
+ */
+function trustedScriptFromString(script: string): TrustedScript|string {
+  return getPolicy()?.createScript(script) || script;
+}
+
+/**
+ * Unsafely call the Function constructor with the given string arguments. It
+ * is only available in development mode, and should be stripped out of
+ * production code.
+ * @security This is a security-sensitive function; any use of this function
+ * must go through security review. In particular, it must be assured that it
+ * is only called from the JIT compiler, as use in other code can lead to XSS
+ * vulnerabilities.
+ */
+export function newTrustedFunctionForJIT(...args: string[]): Function {
+  if (!global.trustedTypes) {
+    // In environments that don't support Trusted Types, fall back to the most
+    // straightforward implementation:
+    return new Function(...args);
+  }
+
+  // Chrome currently does not support passing TrustedScript to the Function
+  // constructor. The following implements the workaround proposed on the page
+  // below, where the Chromium bug is also referenced:
+  // https://github.com/w3c/webappsec-trusted-types/wiki/Trusted-Types-for-function-constructor
+  const fnArgs = args.slice(0, -1).join(',');
+  const fnBody = args.pop()!.toString();
+  const body = `(function anonymous(${fnArgs}
+) { ${fnBody}
+})`;
+
+  // Using eval directly confuses the compiler and prevents this module from
+  // being stripped out of JS binaries even if not used. The global['eval']
+  // indirection fixes that.
+  const fn = global['eval'](trustedScriptFromString(body) as string) as Function;
+
+  // To completely mimic the behavior of calling "new Function", two more
+  // things need to happen:
+  // 1. Stringifying the resulting function should return its source code
+  fn.toString = () => body;
+  // 2. When calling the resulting function, `this` should refer to `global`
+  return fn.bind(global);
+
+  // When Trusted Types support in Function constructors is widely available,
+  // the implementation of this function can be simplified to:
+  // return new Function(...args.map(a => trustedScriptFromString(a)));
+}
diff --git a/packages/compiler/src/render3/r3_ast.ts b/packages/compiler/src/render3/r3_ast.ts
index 23ec4d6b693b1..ef2d1a732a4d6 100644
--- a/packages/compiler/src/render3/r3_ast.ts
+++ b/packages/compiler/src/render3/r3_ast.ts
@@ -43,12 +43,18 @@ export class BoundAttribute implements Node {
   constructor(
       public name: string, public type: BindingType, public securityContext: SecurityContext,
       public value: AST, public unit: string|null, public sourceSpan: ParseSourceSpan,
-      public valueSpan?: ParseSourceSpan, public i18n?: I18nMeta) {}
+      readonly keySpan: ParseSourceSpan, public valueSpan: ParseSourceSpan|undefined,
+      public i18n: I18nMeta|undefined) {}
 
-  static fromBoundElementProperty(prop: BoundElementProperty, i18n?: I18nMeta) {
+  static fromBoundElementProperty(prop: BoundElementProperty, i18n?: I18nMeta): BoundAttribute {
+    if (prop.keySpan === undefined) {
+      throw new Error(
+          `Unexpected state: keySpan must be defined for bound attributes but was not for ${
+              prop.name}: ${prop.sourceSpan}`);
+    }
     return new BoundAttribute(
         prop.name, prop.type, prop.securityContext, prop.value, prop.unit, prop.sourceSpan,
-        prop.valueSpan, i18n);
+        prop.keySpan, prop.valueSpan, i18n);
   }
 
   visit<Result>(visitor: Visitor<Result>): Result {
@@ -79,13 +85,8 @@ export class Element implements Node {
   constructor(
       public name: string, public attributes: TextAttribute[], public inputs: BoundAttribute[],
       public outputs: BoundEvent[], public children: Node[], public references: Reference[],
-      public sourceSpan: ParseSourceSpan, public startSourceSpan: ParseSourceSpan|null,
-      public endSourceSpan: ParseSourceSpan|null, public i18n?: I18nMeta) {
-    // If the element is empty then the source span should include any closing tag
-    if (children.length === 0 && startSourceSpan && endSourceSpan) {
-      this.sourceSpan = new ParseSourceSpan(sourceSpan.start, endSourceSpan.end);
-    }
-  }
+      public sourceSpan: ParseSourceSpan, public startSourceSpan: ParseSourceSpan,
+      public endSourceSpan: ParseSourceSpan|null, public i18n?: I18nMeta) {}
   visit<Result>(visitor: Visitor<Result>): Result {
     return visitor.visitElement(this);
   }
@@ -96,7 +97,7 @@ export class Template implements Node {
       public tagName: string, public attributes: TextAttribute[], public inputs: BoundAttribute[],
       public outputs: BoundEvent[], public templateAttrs: (BoundAttribute|TextAttribute)[],
       public children: Node[], public references: Reference[], public variables: Variable[],
-      public sourceSpan: ParseSourceSpan, public startSourceSpan: ParseSourceSpan|null,
+      public sourceSpan: ParseSourceSpan, public startSourceSpan: ParseSourceSpan,
       public endSourceSpan: ParseSourceSpan|null, public i18n?: I18nMeta) {}
   visit<Result>(visitor: Visitor<Result>): Result {
     return visitor.visitTemplate(this);
@@ -117,7 +118,7 @@ export class Content implements Node {
 export class Variable implements Node {
   constructor(
       public name: string, public value: string, public sourceSpan: ParseSourceSpan,
-      public valueSpan?: ParseSourceSpan) {}
+      readonly keySpan: ParseSourceSpan, public valueSpan?: ParseSourceSpan) {}
   visit<Result>(visitor: Visitor<Result>): Result {
     return visitor.visitVariable(this);
   }
diff --git a/packages/compiler/src/render3/r3_identifiers.ts b/packages/compiler/src/render3/r3_identifiers.ts
index 7d59830c6d240..87e108d8e43d3 100644
--- a/packages/compiler/src/render3/r3_identifiers.ts
+++ b/packages/compiler/src/render3/r3_identifiers.ts
@@ -29,7 +29,6 @@ export class Identifiers {
 
   static elementEnd: o.ExternalReference = {name: 'ɵɵelementEnd', moduleName: CORE};
 
-  static select: o.ExternalReference = {name: 'ɵɵselect', moduleName: CORE};
   static advance: o.ExternalReference = {name: 'ɵɵadvance', moduleName: CORE};
 
   static syntheticHostProperty:
@@ -321,4 +320,9 @@ export class Identifiers {
   static sanitizeUrl: o.ExternalReference = {name: 'ɵɵsanitizeUrl', moduleName: CORE};
   static sanitizeUrlOrResourceUrl:
       o.ExternalReference = {name: 'ɵɵsanitizeUrlOrResourceUrl', moduleName: CORE};
+  static trustConstantHtml: o.ExternalReference = {name: 'ɵɵtrustConstantHtml', moduleName: CORE};
+  static trustConstantScript:
+      o.ExternalReference = {name: 'ɵɵtrustConstantScript', moduleName: CORE};
+  static trustConstantResourceUrl:
+      o.ExternalReference = {name: 'ɵɵtrustConstantResourceUrl', moduleName: CORE};
 }
diff --git a/packages/compiler/src/render3/r3_template_transform.ts b/packages/compiler/src/render3/r3_template_transform.ts
index 52a5e514062ce..fe29a9bc40c32 100644
--- a/packages/compiler/src/render3/r3_template_transform.ts
+++ b/packages/compiler/src/render3/r3_template_transform.ts
@@ -62,12 +62,6 @@ export function htmlAstToRender3Ast(
 
   // 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,
@@ -163,9 +157,9 @@ class HtmlAstToIvyAst implements html.Visitor {
 
         this.bindingParser.parseInlineTemplateBinding(
             templateKey, templateValue, attribute.sourceSpan, absoluteValueOffset, [],
-            templateParsedProperties, parsedVariables);
+            templateParsedProperties, parsedVariables, true /* isIvyAst */);
         templateVariables.push(...parsedVariables.map(
-            v => new t.Variable(v.name, v.value, v.sourceSpan, v.valueSpan)));
+            v => new t.Variable(v.name, v.value, v.sourceSpan, v.keySpan, v.valueSpan)));
       } else {
         // Check for variables, events, property bindings, interpolation
         hasBinding = this.parseAttribute(
@@ -272,12 +266,6 @@ class HtmlAstToIvyAst implements html.Visitor {
     Object.keys(message.placeholders).forEach(key => {
       const value = message.placeholders[key];
       if (key.startsWith(I18N_ICU_VAR_PREFIX)) {
-        const config = this.bindingParser.interpolationConfig;
-
-        // ICU expression is a plain string, not wrapped into start
-        // and end tags, so we wrap it before passing to binding parser
-        const wrapped = `${config.start}${value}${config.end}`;
-
         // Currently when the `plural` or `select` keywords in an ICU contain trailing spaces (e.g.
         // `{count, select , ...}`), these spaces are also included into the key names in ICU vars
         // (e.g. "VAR_SELECT "). These trailing spaces are not desirable, since they will later be
@@ -285,10 +273,11 @@ class HtmlAstToIvyAst implements html.Visitor {
         // mismatches at runtime (i.e. placeholder will not be replaced with the correct value).
         const formattedKey = key.trim();
 
-        vars[formattedKey] =
-            this._visitTextWithInterpolation(wrapped, expansion.sourceSpan) as t.BoundText;
+        const ast = this.bindingParser.parseInterpolationExpression(value.text, value.sourceSpan);
+
+        vars[formattedKey] = new t.BoundText(ast, value.sourceSpan);
       } else {
-        placeholders[key] = this._visitTextWithInterpolation(value, expansion.sourceSpan);
+        placeholders[key] = this._visitTextWithInterpolation(value.text, value.sourceSpan);
       }
     });
     return new t.Icu(vars, placeholders, expansion.sourceSpan, message);
@@ -338,20 +327,32 @@ class HtmlAstToIvyAst implements html.Visitor {
     const absoluteOffset =
         attribute.valueSpan ? attribute.valueSpan.start.offset : srcSpan.start.offset;
 
+    function createKeySpan(srcSpan: ParseSourceSpan, prefix: string, identifier: string) {
+      // We need to adjust the start location for the keySpan to account for the removed 'data-'
+      // prefix from `normalizeAttributeName`.
+      const normalizationAdjustment = attribute.name.length - name.length;
+      const keySpanStart = srcSpan.start.moveBy(prefix.length + normalizationAdjustment);
+      const keySpanEnd = keySpanStart.moveBy(identifier.length);
+      return new ParseSourceSpan(keySpanStart, keySpanEnd, identifier);
+    }
+
     const bindParts = name.match(BIND_NAME_REGEXP);
     let hasBinding = false;
 
     if (bindParts) {
       hasBinding = true;
       if (bindParts[KW_BIND_IDX] != null) {
+        const identifier = bindParts[IDENT_KW_IDX];
+        const keySpan = createKeySpan(srcSpan, bindParts[KW_BIND_IDX], identifier);
         this.bindingParser.parsePropertyBinding(
-            bindParts[IDENT_KW_IDX], value, false, srcSpan, absoluteOffset, attribute.valueSpan,
-            matchableAttributes, parsedProperties);
+            identifier, value, false, srcSpan, absoluteOffset, attribute.valueSpan,
+            matchableAttributes, parsedProperties, keySpan);
 
       } else if (bindParts[KW_LET_IDX]) {
         if (isTemplateElement) {
           const identifier = bindParts[IDENT_KW_IDX];
-          this.parseVariable(identifier, value, srcSpan, attribute.valueSpan, variables);
+          const keySpan = createKeySpan(srcSpan, bindParts[KW_LET_IDX], identifier);
+          this.parseVariable(identifier, value, srcSpan, keySpan, attribute.valueSpan, variables);
         } else {
           this.reportError(`"let-" is only supported on ng-template elements.`, srcSpan);
         }
@@ -359,37 +360,41 @@ class HtmlAstToIvyAst implements html.Visitor {
       } else if (bindParts[KW_REF_IDX]) {
         const identifier = bindParts[IDENT_KW_IDX];
         this.parseReference(identifier, value, srcSpan, attribute.valueSpan, references);
-
       } else if (bindParts[KW_ON_IDX]) {
         const events: ParsedEvent[] = [];
+        const identifier = bindParts[IDENT_KW_IDX];
         this.bindingParser.parseEvent(
-            bindParts[IDENT_KW_IDX], value, srcSpan, attribute.valueSpan || srcSpan,
-            matchableAttributes, events);
+            identifier, value, srcSpan, attribute.valueSpan || srcSpan, matchableAttributes,
+            events);
         addEvents(events, boundEvents);
       } else if (bindParts[KW_BINDON_IDX]) {
+        const identifier = bindParts[IDENT_KW_IDX];
+        const keySpan = createKeySpan(srcSpan, bindParts[KW_BINDON_IDX], identifier);
         this.bindingParser.parsePropertyBinding(
-            bindParts[IDENT_KW_IDX], value, false, srcSpan, absoluteOffset, attribute.valueSpan,
-            matchableAttributes, parsedProperties);
+            identifier, value, false, srcSpan, absoluteOffset, attribute.valueSpan,
+            matchableAttributes, parsedProperties, keySpan);
         this.parseAssignmentEvent(
-            bindParts[IDENT_KW_IDX], value, srcSpan, attribute.valueSpan, matchableAttributes,
-            boundEvents);
+            identifier, value, srcSpan, attribute.valueSpan, matchableAttributes, boundEvents);
       } else if (bindParts[KW_AT_IDX]) {
+        const keySpan = createKeySpan(srcSpan, '', name);
         this.bindingParser.parseLiteralAttr(
             name, value, srcSpan, absoluteOffset, attribute.valueSpan, matchableAttributes,
-            parsedProperties);
+            parsedProperties, keySpan);
 
       } else if (bindParts[IDENT_BANANA_BOX_IDX]) {
+        const keySpan = createKeySpan(srcSpan, '[(', bindParts[IDENT_BANANA_BOX_IDX]);
         this.bindingParser.parsePropertyBinding(
             bindParts[IDENT_BANANA_BOX_IDX], value, false, srcSpan, absoluteOffset,
-            attribute.valueSpan, matchableAttributes, parsedProperties);
+            attribute.valueSpan, matchableAttributes, parsedProperties, keySpan);
         this.parseAssignmentEvent(
             bindParts[IDENT_BANANA_BOX_IDX], value, srcSpan, attribute.valueSpan,
             matchableAttributes, boundEvents);
 
       } else if (bindParts[IDENT_PROPERTY_IDX]) {
+        const keySpan = createKeySpan(srcSpan, '[', bindParts[IDENT_PROPERTY_IDX]);
         this.bindingParser.parsePropertyBinding(
             bindParts[IDENT_PROPERTY_IDX], value, false, srcSpan, absoluteOffset,
-            attribute.valueSpan, matchableAttributes, parsedProperties);
+            attribute.valueSpan, matchableAttributes, parsedProperties, keySpan);
 
       } else if (bindParts[IDENT_EVENT_IDX]) {
         const events: ParsedEvent[] = [];
@@ -399,8 +404,10 @@ class HtmlAstToIvyAst implements html.Visitor {
         addEvents(events, boundEvents);
       }
     } else {
+      const keySpan = createKeySpan(srcSpan, '' /* prefix */, name);
       hasBinding = this.bindingParser.parsePropertyInterpolation(
-          name, value, srcSpan, attribute.valueSpan, matchableAttributes, parsedProperties);
+          name, value, srcSpan, attribute.valueSpan, matchableAttributes, parsedProperties,
+          keySpan);
     }
 
     return hasBinding;
@@ -414,7 +421,7 @@ class HtmlAstToIvyAst implements html.Visitor {
   }
 
   private parseVariable(
-      identifier: string, value: string, sourceSpan: ParseSourceSpan,
+      identifier: string, value: string, sourceSpan: ParseSourceSpan, keySpan: ParseSourceSpan,
       valueSpan: ParseSourceSpan|undefined, variables: t.Variable[]) {
     if (identifier.indexOf('-') > -1) {
       this.reportError(`"-" is not allowed in variable names`, sourceSpan);
@@ -422,7 +429,7 @@ class HtmlAstToIvyAst implements html.Visitor {
       this.reportError(`Variable does not have a name`, sourceSpan);
     }
 
-    variables.push(new t.Variable(identifier, value, sourceSpan, valueSpan));
+    variables.push(new t.Variable(identifier, value, sourceSpan, keySpan, valueSpan));
   }
 
   private parseReference(
diff --git a/packages/compiler/src/render3/util.ts b/packages/compiler/src/render3/util.ts
index 50a61414389d4..5c1d7bb40a31d 100644
--- a/packages/compiler/src/render3/util.ts
+++ b/packages/compiler/src/render3/util.ts
@@ -45,14 +45,14 @@ export function convertMetaToOutput(meta: any, ctx: OutputContext): o.Expression
 }
 
 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);
-    }
+  if (numParams === 0) {
+    return o.expressionType(type);
   }
-  return o.expressionType(type, null, params);
+  const params: o.Type[] = [];
+  for (let i = 0; i < numParams; i++) {
+    params.push(o.DYNAMIC_TYPE);
+  }
+  return o.expressionType(type, undefined, params);
 }
 
 export interface R3Reference {
diff --git a/packages/compiler/src/render3/view/api.ts b/packages/compiler/src/render3/view/api.ts
index acc8126c83fe9..162f74fdfa7bf 100644
--- a/packages/compiler/src/render3/view/api.ts
+++ b/packages/compiler/src/render3/view/api.ts
@@ -163,8 +163,6 @@ export interface R3ComponentMetadata extends R3DirectiveMetadata {
 
   /**
    * 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 (note that this is marked the as the "deprecated shadow DOM" as of Angular v6.1.
    * - `ViewEncapsulation.Emulated`: Use shimmed CSS that emulates the native behavior.
    * - `ViewEncapsulation.None`: Use global CSS without any encapsulation.
    * - `ViewEncapsulation.ShadowDom`: Use the latest ShadowDOM API to natively encapsulate styles
diff --git a/packages/compiler/src/render3/view/compiler.ts b/packages/compiler/src/render3/view/compiler.ts
index 7adf55fb43893..790a14df236a3 100644
--- a/packages/compiler/src/render3/view/compiler.ts
+++ b/packages/compiler/src/render3/view/compiler.ts
@@ -196,10 +196,19 @@ export function compileComponentFromMetadata(
   // e.g. `vars: 2`
   definitionMap.set('vars', o.literal(templateBuilder.getVarCount()));
 
-  // e.g. `consts: [['one', 'two'], ['three', 'four']]
-  const consts = templateBuilder.getConsts();
-  if (consts.length > 0) {
-    definitionMap.set('consts', o.literalArr(consts));
+  // Generate `consts` section of ComponentDef:
+  // - either as an array:
+  //   `consts: [['one', 'two'], ['three', 'four']]`
+  // - or as a factory function in case additional statements are present (to support i18n):
+  //   `consts: function() { var i18n_0; if (ngI18nClosureMode) {...} else {...} return [i18n_0]; }`
+  const {constExpressions, prepareStatements} = templateBuilder.getConsts();
+  if (constExpressions.length > 0) {
+    let constsExpr: o.LiteralArrayExpr|o.FunctionExpr = o.literalArr(constExpressions);
+    // Prepare statements are present - turn `consts` into a function.
+    if (prepareStatements.length > 0) {
+      constsExpr = o.fn([], [...prepareStatements, new o.ReturnStatement(constsExpr)]);
+    }
+    definitionMap.set('consts', constsExpr);
   }
 
   definitionMap.set('template', templateFunctionExpression);
@@ -573,9 +582,8 @@ function createHostBindingsFunction(
   // bindings with pipes. These calculates happen after this block.
   let totalHostVarsCount = 0;
   bindings && bindings.forEach((binding: ParsedProperty) => {
-    const name = binding.name;
-    const stylingInputWasSet =
-        styleBuilder.registerInputBasedOnName(name, binding.expression, binding.sourceSpan);
+    const stylingInputWasSet = styleBuilder.registerInputBasedOnName(
+        binding.name, binding.expression, hostBindingSourceSpan);
     if (stylingInputWasSet) {
       totalHostVarsCount += MIN_STYLING_BINDING_SLOTS_REQUIRED;
     } else {
@@ -714,7 +722,7 @@ function createHostBindingsFunction(
 
 function bindingFn(implicit: any, value: AST) {
   return convertPropertyBinding(
-      null, implicit, value, 'b', BindingForm.TrySimple, () => error('Unexpected interpolation'));
+      null, implicit, value, 'b', BindingForm.Expression, () => error('Unexpected interpolation'));
 }
 
 function convertStylingCall(
diff --git a/packages/compiler/src/render3/view/i18n/get_msg_utils.ts b/packages/compiler/src/render3/view/i18n/get_msg_utils.ts
index c3987f028b444..1ead29cb4e651 100644
--- a/packages/compiler/src/render3/view/i18n/get_msg_utils.ts
+++ b/packages/compiler/src/render3/view/i18n/get_msg_utils.ts
@@ -10,7 +10,7 @@ import {mapLiteral} from '../../../output/map_util';
 import * as o from '../../../output/output_ast';
 
 import {serializeIcuNode} from './icu_serializer';
-import {i18nMetaToDocStmt} from './meta';
+import {i18nMetaToJSDoc} from './meta';
 import {formatI18nPlaceholderName} from './util';
 
 /** Closure uses `goog.getMsg(message)` to lookup translations */
@@ -31,15 +31,13 @@ export function createGoogleGetMsgStatements(
   //  */
   // const MSG_... = goog.getMsg(..);
   // I18N_X = MSG_...;
-  const statements = [];
-  const jsdocComment = i18nMetaToDocStmt(message);
-  if (jsdocComment !== null) {
-    statements.push(jsdocComment);
+  const googGetMsgStmt = closureVar.set(o.variable(GOOG_GET_MSG).callFn(args)).toConstDecl();
+  const metaComment = i18nMetaToJSDoc(message);
+  if (metaComment !== null) {
+    googGetMsgStmt.addLeadingComment(metaComment);
   }
-  statements.push(closureVar.set(o.variable(GOOG_GET_MSG).callFn(args)).toConstDecl());
-  statements.push(new o.ExpressionStatement(variable.set(closureVar)));
-
-  return statements;
+  const i18nAssignmentStmt = new o.ExpressionStatement(variable.set(closureVar));
+  return [googGetMsgStmt, i18nAssignmentStmt];
 }
 
 /**
diff --git a/packages/compiler/src/render3/view/i18n/localize_utils.ts b/packages/compiler/src/render3/view/i18n/localize_utils.ts
index 127a3f6d94699..444139ecacb61 100644
--- a/packages/compiler/src/render3/view/i18n/localize_utils.ts
+++ b/packages/compiler/src/render3/view/i18n/localize_utils.ts
@@ -7,7 +7,7 @@
  */
 import * as i18n from '../../../i18n/i18n_ast';
 import * as o from '../../../output/output_ast';
-import {ParseSourceSpan} from '../../../parse_util';
+import {ParseLocation, ParseSourceSpan} from '../../../parse_util';
 
 import {serializeIcuNode} from './icu_serializer';
 import {formatI18nPlaceholderName} from './util';
@@ -17,60 +17,55 @@ export function createLocalizeStatements(
     params: {[name: string]: o.Expression}): o.Statement[] {
   const {messageParts, placeHolders} = serializeI18nMessageForLocalize(message);
   const sourceSpan = getSourceSpan(message);
-  const expressions = placeHolders.map(ph => params[ph]);
+  const expressions = placeHolders.map(ph => params[ph.text]);
   const localizedString =
       o.localizedString(message, messageParts, placeHolders, expressions, sourceSpan);
   const variableInitialization = variable.set(localizedString);
   return [new o.ExpressionStatement(variableInitialization)];
 }
 
-class MessagePiece {
-  constructor(public text: string) {}
-}
-class LiteralPiece extends MessagePiece {}
-class PlaceholderPiece extends MessagePiece {
-  constructor(name: string) {
-    super(formatI18nPlaceholderName(name, /* useCamelCase */ false));
-  }
-}
-
 /**
  * This visitor walks over an i18n tree, capturing literal strings and placeholders.
  *
  * The result can be used for generating the `$localize` tagged template literals.
  */
 class LocalizeSerializerVisitor implements i18n.Visitor {
-  visitText(text: i18n.Text, context: MessagePiece[]): any {
-    if (context[context.length - 1] instanceof LiteralPiece) {
+  visitText(text: i18n.Text, context: o.MessagePiece[]): any {
+    if (context[context.length - 1] instanceof o.LiteralPiece) {
       // Two literal pieces in a row means that there was some comment node in-between.
       context[context.length - 1].text += text.value;
     } else {
-      context.push(new LiteralPiece(text.value));
+      context.push(new o.LiteralPiece(text.value, text.sourceSpan));
     }
   }
 
-  visitContainer(container: i18n.Container, context: MessagePiece[]): any {
+  visitContainer(container: i18n.Container, context: o.MessagePiece[]): any {
     container.children.forEach(child => child.visit(this, context));
   }
 
-  visitIcu(icu: i18n.Icu, context: MessagePiece[]): any {
-    context.push(new LiteralPiece(serializeIcuNode(icu)));
+  visitIcu(icu: i18n.Icu, context: o.MessagePiece[]): any {
+    context.push(new o.LiteralPiece(serializeIcuNode(icu), icu.sourceSpan));
   }
 
-  visitTagPlaceholder(ph: i18n.TagPlaceholder, context: MessagePiece[]): any {
-    context.push(new PlaceholderPiece(ph.startName));
+  visitTagPlaceholder(ph: i18n.TagPlaceholder, context: o.MessagePiece[]): any {
+    context.push(this.createPlaceholderPiece(ph.startName, ph.startSourceSpan ?? ph.sourceSpan));
     if (!ph.isVoid) {
       ph.children.forEach(child => child.visit(this, context));
-      context.push(new PlaceholderPiece(ph.closeName));
+      context.push(this.createPlaceholderPiece(ph.closeName, ph.endSourceSpan ?? ph.sourceSpan));
     }
   }
 
-  visitPlaceholder(ph: i18n.Placeholder, context: MessagePiece[]): any {
-    context.push(new PlaceholderPiece(ph.name));
+  visitPlaceholder(ph: i18n.Placeholder, context: o.MessagePiece[]): any {
+    context.push(this.createPlaceholderPiece(ph.name, ph.sourceSpan));
   }
 
   visitIcuPlaceholder(ph: i18n.IcuPlaceholder, context?: any): any {
-    context.push(new PlaceholderPiece(ph.name));
+    context.push(this.createPlaceholderPiece(ph.name, ph.sourceSpan));
+  }
+
+  private createPlaceholderPiece(name: string, sourceSpan: ParseSourceSpan): o.PlaceholderPiece {
+    return new o.PlaceholderPiece(
+        formatI18nPlaceholderName(name, /* useCamelCase */ false), sourceSpan);
   }
 }
 
@@ -85,8 +80,8 @@ const serializerVisitor = new LocalizeSerializerVisitor();
  * @returns an object containing the messageParts and placeholders.
  */
 export function serializeI18nMessageForLocalize(message: i18n.Message):
-    {messageParts: string[], placeHolders: string[]} {
-  const pieces: MessagePiece[] = [];
+    {messageParts: o.LiteralPiece[], placeHolders: o.PlaceholderPiece[]} {
+  const pieces: o.MessagePiece[] = [];
   message.nodes.forEach(node => node.visit(serializerVisitor, pieces));
   return processMessagePieces(pieces);
 }
@@ -107,31 +102,35 @@ function getSourceSpan(message: i18n.Message): ParseSourceSpan {
  * @param pieces The pieces to process.
  * @returns an object containing the messageParts and placeholders.
  */
-function processMessagePieces(pieces: MessagePiece[]):
-    {messageParts: string[], placeHolders: string[]} {
-  const messageParts: string[] = [];
-  const placeHolders: string[] = [];
+function processMessagePieces(pieces: o.MessagePiece[]):
+    {messageParts: o.LiteralPiece[], placeHolders: o.PlaceholderPiece[]} {
+  const messageParts: o.LiteralPiece[] = [];
+  const placeHolders: o.PlaceholderPiece[] = [];
 
-  if (pieces[0] instanceof PlaceholderPiece) {
+  if (pieces[0] instanceof o.PlaceholderPiece) {
     // The first piece was a placeholder so we need to add an initial empty message part.
-    messageParts.push('');
+    messageParts.push(createEmptyMessagePart(pieces[0].sourceSpan.start));
   }
 
   for (let i = 0; i < pieces.length; i++) {
     const part = pieces[i];
-    if (part instanceof LiteralPiece) {
-      messageParts.push(part.text);
+    if (part instanceof o.LiteralPiece) {
+      messageParts.push(part);
     } else {
-      placeHolders.push(part.text);
-      if (pieces[i - 1] instanceof PlaceholderPiece) {
+      placeHolders.push(part);
+      if (pieces[i - 1] instanceof o.PlaceholderPiece) {
         // There were two placeholders in a row, so we need to add an empty message part.
-        messageParts.push('');
+        messageParts.push(createEmptyMessagePart(part.sourceSpan.end));
       }
     }
   }
-  if (pieces[pieces.length - 1] instanceof PlaceholderPiece) {
+  if (pieces[pieces.length - 1] instanceof o.PlaceholderPiece) {
     // The last piece was a placeholder so we need to add a final empty message part.
-    messageParts.push('');
+    messageParts.push(createEmptyMessagePart(pieces[pieces.length - 1].sourceSpan.end));
   }
   return {messageParts, placeHolders};
 }
+
+function createEmptyMessagePart(location: ParseLocation): o.LiteralPiece {
+  return new o.LiteralPiece('', new ParseSourceSpan(location, location));
+}
diff --git a/packages/compiler/src/render3/view/i18n/meta.ts b/packages/compiler/src/render3/view/i18n/meta.ts
index baa7e24e0160b..31e9e2bc1b3b7 100644
--- a/packages/compiler/src/render3/view/i18n/meta.ts
+++ b/packages/compiler/src/render3/view/i18n/meta.ts
@@ -231,7 +231,7 @@ export function parseI18nMeta(meta: string = ''): I18nMeta {
 
 // Converts i18n meta information for a message (id, description, meaning)
 // to a JsDoc statement formatted as expected by the Closure compiler.
-export function i18nMetaToDocStmt(meta: I18nMeta): o.JSDocCommentStmt|null {
+export function i18nMetaToJSDoc(meta: I18nMeta): o.JSDocComment|null {
   const tags: o.JSDocTag[] = [];
   if (meta.description) {
     tags.push({tagName: o.JSDocTagName.Desc, text: meta.description});
@@ -239,5 +239,5 @@ export function i18nMetaToDocStmt(meta: I18nMeta): o.JSDocCommentStmt|null {
   if (meta.meaning) {
     tags.push({tagName: o.JSDocTagName.Meaning, text: meta.meaning});
   }
-  return tags.length == 0 ? null : new o.JSDocCommentStmt(tags);
+  return tags.length == 0 ? null : o.jsDocComment(tags);
 }
diff --git a/packages/compiler/src/render3/view/i18n/util.ts b/packages/compiler/src/render3/view/i18n/util.ts
index f867dcc0c9315..3c0360cffeb99 100644
--- a/packages/compiler/src/render3/view/i18n/util.ts
+++ b/packages/compiler/src/render3/view/i18n/util.ts
@@ -12,10 +12,14 @@ import * as o from '../../../output/output_ast';
 import * as t from '../../r3_ast';
 
 /* Closure variables holding messages must be named `MSG_[A-Z0-9]+` */
-const CLOSURE_TRANSLATION_PREFIX = 'MSG_';
+const CLOSURE_TRANSLATION_VAR_PREFIX = 'MSG_';
 
-/* Prefix for non-`goog.getMsg` i18n-related vars */
-export const TRANSLATION_PREFIX = 'I18N_';
+/**
+ * Prefix for non-`goog.getMsg` i18n-related vars.
+ * Note: the prefix uses lowercase characters intentionally due to a Closure behavior that
+ * considers variables like `I18N_0` as constants and throws an error when their value changes.
+ */
+export const TRANSLATION_VAR_PREFIX = 'i18n_';
 
 /** Name of the i18n attributes **/
 export const I18N_ATTR = 'i18n';
@@ -166,7 +170,7 @@ export function formatI18nPlaceholderName(name: string, useCamelCase: boolean =
  * @returns Complete translation const prefix
  */
 export function getTranslationConstPrefix(extra: string): string {
-  return `${CLOSURE_TRANSLATION_PREFIX}${extra}`.toUpperCase();
+  return `${CLOSURE_TRANSLATION_VAR_PREFIX}${extra}`.toUpperCase();
 }
 
 /**
@@ -175,5 +179,5 @@ export function getTranslationConstPrefix(extra: string): string {
  */
 export function declareI18nVariable(variable: o.ReadVarExpr): o.Statement {
   return new o.DeclareVarStmt(
-      variable.name!, undefined, o.INFERRED_TYPE, null, variable.sourceSpan);
+      variable.name!, undefined, o.INFERRED_TYPE, undefined, variable.sourceSpan);
 }
diff --git a/packages/compiler/src/render3/view/t2_api.ts b/packages/compiler/src/render3/view/t2_api.ts
index e327c55b7951b..e87ee6cb94fae 100644
--- a/packages/compiler/src/render3/view/t2_api.ts
+++ b/packages/compiler/src/render3/view/t2_api.ts
@@ -26,6 +26,16 @@ export interface Target {
   template?: Node[];
 }
 
+/**
+ * A data structure which can indicate whether a given property name is present or not.
+ *
+ * This is used to represent the set of inputs or outputs present on a directive, and allows the
+ * binder to query for the presence of a mapping for property names.
+ */
+export interface InputOutputPropertySet {
+  hasBindingPropertyName(propertyName: string): boolean;
+}
+
 /**
  * Metadata regarding a directive that's needed to match it against template elements. This is
  * provided by a consumer of the t2 APIs.
@@ -36,6 +46,9 @@ export interface DirectiveMeta {
    */
   name: string;
 
+  /** The selector for the directive or `null` if there isn't one. */
+  selector: string|null;
+
   /**
    * Whether the directive is a component.
    */
@@ -46,14 +59,14 @@ export interface DirectiveMeta {
    *
    * Goes from property names to field names.
    */
-  inputs: {[property: string]: string|[string, string]};
+  inputs: InputOutputPropertySet;
 
   /**
    * Set of outputs which this directive claims.
    *
    * Goes from property names to field names.
    */
-  outputs: {[property: string]: string};
+  outputs: InputOutputPropertySet;
 
   /**
    * Name under which the directive is exported, if any (exportAs in Angular).
@@ -136,6 +149,12 @@ export interface BoundTarget<DirectiveT extends DirectiveMeta> {
    */
   getNestingLevel(template: Template): number;
 
+  /**
+   * Get all `Reference`s and `Variables` visible within the given `Template` (or at the top level,
+   * if `null` is passed).
+   */
+  getEntitiesInTemplateScope(template: Template|null): ReadonlySet<Reference|Variable>;
+
   /**
    * Get a list of all the directives used by the target.
    */
diff --git a/packages/compiler/src/render3/view/t2_binder.ts b/packages/compiler/src/render3/view/t2_binder.ts
index 35230722950d0..5226823a53d08 100644
--- a/packages/compiler/src/render3/view/t2_binder.ts
+++ b/packages/compiler/src/render3/view/t2_binder.ts
@@ -37,6 +37,10 @@ export class R3TargetBinder<DirectiveT extends DirectiveMeta> implements TargetB
     // scopes in the template and makes them available for later use.
     const scope = Scope.apply(target.template);
 
+
+    // Use the `Scope` to extract the entities present at every level of the template.
+    const templateEntities = extractTemplateEntities(scope);
+
     // Next, perform directive matching on the template using the `DirectiveBinder`. This returns:
     //   - directives: Map of nodes (elements & ng-templates) to the directives on them.
     //   - bindings: Map of inputs, outputs, and attributes to the directive/element that claims
@@ -49,7 +53,8 @@ export class R3TargetBinder<DirectiveT extends DirectiveMeta> implements TargetB
     const {expressions, symbols, nestingLevel, usedPipes} =
         TemplateBinder.apply(target.template, scope);
     return new R3BoundTarget(
-        target, directives, bindings, references, expressions, symbols, nestingLevel, usedPipes);
+        target, directives, bindings, references, expressions, symbols, nestingLevel,
+        templateEntities, usedPipes);
   }
 }
 
@@ -71,14 +76,18 @@ class Scope implements Visitor {
    */
   readonly childScopes = new Map<Template, Scope>();
 
-  private constructor(readonly parentScope?: Scope) {}
+  private constructor(readonly parentScope: Scope|null, readonly template: Template|null) {}
+
+  static newRootScope(): Scope {
+    return new Scope(null, null);
+  }
 
   /**
    * Process a template (either as a `Template` sub-template with variables, or a plain array of
    * template `Node`s) and construct its `Scope`.
    */
-  static apply(template: Template|Node[]): Scope {
-    const scope = new Scope();
+  static apply(template: Node[]): Scope {
+    const scope = Scope.newRootScope();
     scope.ingest(template);
     return scope;
   }
@@ -113,7 +122,7 @@ class Scope implements Visitor {
     template.references.forEach(node => this.visitReference(node));
 
     // Next, create an inner scope and process the template within it.
-    const scope = new Scope(this);
+    const scope = new Scope(this, template);
     scope.ingest(template);
     this.childScopes.set(template, scope);
   }
@@ -153,7 +162,7 @@ class Scope implements Visitor {
     if (this.namedEntities.has(name)) {
       // Found in the local scope.
       return this.namedEntities.get(name)!;
-    } else if (this.parentScope !== undefined) {
+    } else if (this.parentScope !== null) {
       // Not in the local scope, but there's a parent scope so check there.
       return this.parentScope.lookup(name);
     } else {
@@ -278,7 +287,7 @@ class DirectiveBinder<DirectiveT extends DirectiveMeta> implements Visitor {
     type BoundNode = BoundAttribute|BoundEvent|TextAttribute;
     const setAttributeBinding =
         (attribute: BoundNode, ioType: keyof Pick<DirectiveMeta, 'inputs'|'outputs'>) => {
-          const dir = directives.find(dir => dir[ioType].hasOwnProperty(attribute.name));
+          const dir = directives.find(dir => dir[ioType].hasBindingPropertyName(attribute.name));
           const binding = dir !== undefined ? dir : node;
           this.bindings.set(attribute, binding);
         };
@@ -434,7 +443,10 @@ class TemplateBinder extends RecursiveAstVisitor implements Visitor {
   visitText(text: Text) {}
   visitContent(content: Content) {}
   visitTextAttribute(attribute: TextAttribute) {}
-  visitIcu(icu: Icu): void {}
+  visitIcu(icu: Icu): void {
+    Object.keys(icu.vars).forEach(key => icu.vars[key].visit(this));
+    Object.keys(icu.placeholders).forEach(key => icu.placeholders[key].visit(this));
+  }
 
   // The remaining visitors are concerned with processing AST expressions within template bindings
 
@@ -514,7 +526,13 @@ export class R3BoundTarget<DirectiveT extends DirectiveMeta> implements BoundTar
               {directive: DirectiveT, node: Element|Template}|Element|Template>,
       private exprTargets: Map<AST, Reference|Variable>,
       private symbols: Map<Reference|Variable, Template>,
-      private nestingLevel: Map<Template, number>, private usedPipes: Set<string>) {}
+      private nestingLevel: Map<Template, number>,
+      private templateEntities: Map<Template|null, ReadonlySet<Reference|Variable>>,
+      private usedPipes: Set<string>) {}
+
+  getEntitiesInTemplateScope(template: Template|null): ReadonlySet<Reference|Variable> {
+    return this.templateEntities.get(template) ?? new Set();
+  }
 
   getDirectivesOfNode(node: Element|Template): DirectiveT[]|null {
     return this.directives.get(node) || null;
@@ -552,3 +570,40 @@ export class R3BoundTarget<DirectiveT extends DirectiveMeta> implements BoundTar
     return Array.from(this.usedPipes);
   }
 }
+
+function extractTemplateEntities(rootScope: Scope): Map<Template|null, Set<Reference|Variable>> {
+  const entityMap = new Map<Template|null, Map<string, Reference|Variable>>();
+
+  function extractScopeEntities(scope: Scope): Map<string, Reference|Variable> {
+    if (entityMap.has(scope.template)) {
+      return entityMap.get(scope.template)!;
+    }
+
+    const currentEntities = scope.namedEntities;
+
+    let templateEntities: Map<string, Reference|Variable>;
+    if (scope.parentScope !== null) {
+      templateEntities = new Map([...extractScopeEntities(scope.parentScope), ...currentEntities]);
+    } else {
+      templateEntities = new Map(currentEntities);
+    }
+
+    entityMap.set(scope.template, templateEntities);
+    return templateEntities;
+  }
+
+  const scopesToProcess: Scope[] = [rootScope];
+  while (scopesToProcess.length > 0) {
+    const scope = scopesToProcess.pop()!;
+    for (const childScope of scope.childScopes.values()) {
+      scopesToProcess.push(childScope);
+    }
+    extractScopeEntities(scope);
+  }
+
+  const templateEntities = new Map<Template|null, Set<Reference|Variable>>();
+  for (const [template, entities] of entityMap) {
+    templateEntities.set(template, new Set(entities.values()));
+  }
+  return templateEntities;
+}
diff --git a/packages/compiler/src/render3/view/template.ts b/packages/compiler/src/render3/view/template.ts
index 4e12be2daf715..e71b84c05dd7f 100644
--- a/packages/compiler/src/render3/view/template.ts
+++ b/packages/compiler/src/render3/view/template.ts
@@ -36,7 +36,7 @@ import {I18nContext} from './i18n/context';
 import {createGoogleGetMsgStatements} from './i18n/get_msg_utils';
 import {createLocalizeStatements} from './i18n/localize_utils';
 import {I18nMetaVisitor} from './i18n/meta';
-import {assembleBoundTextPlaceholders, assembleI18nBoundString, declareI18nVariable, getTranslationConstPrefix, hasI18nMeta, I18N_ICU_MAPPING_PREFIX, i18nFormatPlaceholderNames, icuFromI18nMessage, isI18nRootNode, isSingleI18nIcu, placeholdersToParams, TRANSLATION_PREFIX, wrapI18nPlaceholder} from './i18n/util';
+import {assembleBoundTextPlaceholders, assembleI18nBoundString, declareI18nVariable, getTranslationConstPrefix, hasI18nMeta, I18N_ICU_MAPPING_PREFIX, i18nFormatPlaceholderNames, icuFromI18nMessage, isI18nRootNode, isSingleI18nIcu, placeholdersToParams, TRANSLATION_VAR_PREFIX, wrapI18nPlaceholder} from './i18n/util';
 import {StylingBuilder, StylingInstruction} from './styling_builder';
 import {asLiteral, chainedInstruction, CONTEXT_NAME, getAttrsForDirectiveMatching, getInterpolationArgsLength, IMPLICIT_REFERENCE, invalid, NON_BINDABLE_ATTR, REFERENCE_PREFIX, RENDER_FLAGS, trimTrailingNulls, unsupported} from './util';
 
@@ -103,6 +103,18 @@ export function prepareEventListenerParameters(
   return params;
 }
 
+// Collects information needed to generate `consts` field of the ComponentDef.
+// When a constant requires some pre-processing, the `prepareStatements` section
+// contains corresponding statements.
+export interface ComponentDefConsts {
+  prepareStatements: o.Statement[];
+  constExpressions: o.Expression[];
+}
+
+function createComponentDefConsts(): ComponentDefConsts {
+  return {prepareStatements: [], constExpressions: []};
+}
+
 export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver {
   private _dataIndex = 0;
   private _bindingContext = 0;
@@ -171,7 +183,8 @@ 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, relativeContextFilePath: string,
-      private i18nUseExternalIds: boolean, private _constants: o.Expression[] = []) {
+      private i18nUseExternalIds: boolean,
+      private _constants: ComponentDefConsts = createComponentDefConsts()) {
     this._bindingScope = parentBindingScope.nestedScope(level);
 
     // Turn the relative context file path into an identifier by replacing non-alphanumeric
@@ -307,12 +320,12 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
   private i18nTranslate(
       message: i18n.Message, params: {[name: string]: o.Expression} = {}, ref?: o.ReadVarExpr,
       transformFn?: (raw: o.ReadVarExpr) => o.Expression): o.ReadVarExpr {
-    const _ref = ref || o.variable(this.constantPool.uniqueName(TRANSLATION_PREFIX));
+    const _ref = ref || this.i18nGenerateMainBlockVar();
     // Closure Compiler requires const names to start with `MSG_` but disallows any other const to
     // start with `MSG_`. We define a variable starting with `MSG_` just for the `goog.getMsg` call
     const closureVar = this.i18nGenerateClosureVar(message.id);
     const statements = getTranslationDeclStmts(message, _ref, closureVar, params, transformFn);
-    this.constantPool.statements.push(...statements);
+    this._constants.prepareStatements.push(...statements);
     return _ref;
   }
 
@@ -364,6 +377,12 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
     return bound;
   }
 
+  // Generates top level vars for i18n blocks (i.e. `i18n_N`).
+  private i18nGenerateMainBlockVar(): o.ReadVarExpr {
+    return o.variable(this.constantPool.uniqueName(TRANSLATION_VAR_PREFIX));
+  }
+
+  // Generates vars with Closure-specific names for i18n blocks (i.e. `MSG_XXX`).
   private i18nGenerateClosureVar(messageId: string): o.ReadVarExpr {
     let name: string;
     const suffix = this.fileBasedI18nSuffix.toUpperCase();
@@ -426,16 +445,13 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
   private i18nStart(span: ParseSourceSpan|null = null, meta: i18n.I18nMeta, selfClosing?: boolean):
       void {
     const index = this.allocateDataSlot();
-    if (this.i18nContext) {
-      this.i18n = this.i18nContext.forkChildContext(index, this.templateIndex!, meta);
-    } else {
-      const ref = o.variable(this.constantPool.uniqueName(TRANSLATION_PREFIX));
-      this.i18n = new I18nContext(index, ref, 0, this.templateIndex, meta);
-    }
+    this.i18n = this.i18nContext ?
+        this.i18nContext.forkChildContext(index, this.templateIndex!, meta) :
+        new I18nContext(index, this.i18nGenerateMainBlockVar(), 0, this.templateIndex, meta);
 
     // generate i18nStart instruction
     const {id, ref} = this.i18n;
-    const params: o.Expression[] = [o.literal(index), ref];
+    const params: o.Expression[] = [o.literal(index), this.addToConsts(ref)];
     if (id > 0) {
       // do not push 3rd argument (sub-block id)
       // into i18nStart call for top level i18n context
@@ -507,8 +523,8 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
     }
     if (i18nAttrArgs.length > 0) {
       const index: o.Expression = o.literal(this.allocateDataSlot());
-      const args = this.constantPool.getConstLiteral(o.literalArr(i18nAttrArgs), true);
-      this.creationInstruction(sourceSpan, R3.i18nAttributes, [index, args]);
+      const constIndex = this.addToConsts(o.literalArr(i18nAttrArgs));
+      this.creationInstruction(sourceSpan, R3.i18nAttributes, [index, constIndex]);
       if (hasBindings) {
         this.updateInstruction(sourceSpan, R3.i18nApply, [index]);
       }
@@ -528,7 +544,7 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
 
   private addNamespaceInstruction(nsInstruction: o.ExternalReference, element: t.Element) {
     this._namespace = nsInstruction;
-    this.creationInstruction(element.sourceSpan, nsInstruction);
+    this.creationInstruction(element.startSourceSpan, nsInstruction);
   }
 
   /**
@@ -552,7 +568,8 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
 
     const nonContentSelectAttributes =
         ngContent.attributes.filter(attr => attr.name.toLowerCase() !== NG_CONTENT_SELECT_ATTR);
-    const attributes = this.getAttributeExpressions(nonContentSelectAttributes, [], []);
+    const attributes =
+        this.getAttributeExpressions(ngContent.name, nonContentSelectAttributes, [], []);
 
     if (attributes.length > 0) {
       parameters.push(o.literal(projectionSlotIdx), o.literalArr(attributes));
@@ -619,7 +636,7 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
 
     // add attributes for directive and projection matching purposes
     const attributes: o.Expression[] = this.getAttributeExpressions(
-        outputAttrs, allOtherInputs, element.outputs, stylingBuilder, [], i18nAttrs);
+        element.name, outputAttrs, allOtherInputs, element.outputs, stylingBuilder, [], i18nAttrs);
     parameters.push(this.addAttrsToConsts(attributes));
 
     // local refs (ex.: <div #foo #bar="baz">)
@@ -655,15 +672,16 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
           trimTrailingNulls(parameters));
     } else {
       this.creationInstruction(
-          element.sourceSpan, isNgContainer ? R3.elementContainerStart : R3.elementStart,
+          element.startSourceSpan, isNgContainer ? R3.elementContainerStart : R3.elementStart,
           trimTrailingNulls(parameters));
 
       if (isNonBindableMode) {
-        this.creationInstruction(element.sourceSpan, R3.disableBindings);
+        this.creationInstruction(element.startSourceSpan, R3.disableBindings);
       }
 
       if (i18nAttrs.length > 0) {
-        this.i18nAttributesInstruction(elementIndex, i18nAttrs, element.sourceSpan);
+        this.i18nAttributesInstruction(
+            elementIndex, i18nAttrs, element.startSourceSpan ?? element.sourceSpan);
       }
 
       // Generate Listeners (outputs)
@@ -679,7 +697,7 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
       // Note: it's important to keep i18n/i18nStart instructions after i18nAttributes and
       // listeners, to make sure i18nAttributes instruction targets current element at runtime.
       if (isI18nRootElement) {
-        this.i18nStart(element.sourceSpan, element.i18n!, createSelfClosingI18nInstruction);
+        this.i18nStart(element.startSourceSpan, element.i18n!, createSelfClosingI18nInstruction);
       }
     }
 
@@ -811,7 +829,7 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
 
     if (!createSelfClosingInstruction) {
       // Finish element construction mode.
-      const span = element.endSourceSpan || element.sourceSpan;
+      const span = element.endSourceSpan ?? element.sourceSpan;
       if (isI18nRootElement) {
         this.i18nEnd(span, createSelfClosingI18nInstruction);
       }
@@ -850,8 +868,8 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
     // prepare attributes parameter (including attributes used for directive matching)
     const [i18nStaticAttrs, staticAttrs] = partitionArray(template.attributes, hasI18nMeta);
     const attrsExprs: o.Expression[] = this.getAttributeExpressions(
-        staticAttrs, template.inputs, template.outputs, undefined /* styles */,
-        template.templateAttrs, i18nStaticAttrs);
+        NG_TEMPLATE_TAG_NAME, staticAttrs, template.inputs, template.outputs,
+        undefined /* styles */, template.templateAttrs, i18nStaticAttrs);
     parameters.push(this.addAttrsToConsts(attrsExprs));
 
     // local refs (ex.: <ng-template #foo>)
@@ -876,7 +894,7 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
       const templateFunctionExpr = templateVisitor.buildTemplateFunction(
           template.children, template.variables,
           this._ngContentReservedSlots.length + this._ngContentSelectorsOffset, template.i18n);
-      this.constantPool.statements.push(templateFunctionExpr.toDeclStmt(templateName, null));
+      this.constantPool.statements.push(templateFunctionExpr.toDeclStmt(templateName));
       if (templateVisitor._ngContentReservedSlots.length) {
         this._ngContentReservedSlots.push(...templateVisitor._ngContentReservedSlots);
       }
@@ -903,7 +921,8 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
       // elements, in case of inline templates, corresponding instructions will be generated in the
       // nested template function.
       if (i18nAttrs.length > 0) {
-        this.i18nAttributesInstruction(templateIndex, i18nAttrs, template.sourceSpan);
+        this.i18nAttributesInstruction(
+            templateIndex, i18nAttrs, template.startSourceSpan ?? template.sourceSpan);
       }
 
       // Add the input bindings
@@ -1028,7 +1047,7 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
     return this._pureFunctionSlots;
   }
 
-  getConsts() {
+  getConsts(): ComponentDefConsts {
     return this._constants;
   }
 
@@ -1213,7 +1232,7 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
 
   private convertPropertyBinding(value: AST): o.Expression {
     const convertedPropertyBinding = convertPropertyBinding(
-        this, this.getImplicitReceiverExpr(), value, this.bindingContext(), BindingForm.TrySimple,
+        this, this.getImplicitReceiverExpr(), value, this.bindingContext(), BindingForm.Expression,
         () => error('Unexpected interpolation'));
     const valExpr = convertedPropertyBinding.currValExpr;
     this._tempVariables.push(...convertedPropertyBinding.stmts);
@@ -1267,8 +1286,9 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
    * because those values are intended to always be generated as property instructions.
    */
   private getAttributeExpressions(
-      renderAttributes: t.TextAttribute[], inputs: t.BoundAttribute[], outputs: t.BoundEvent[],
-      styles?: StylingBuilder, templateAttrs: (t.BoundAttribute|t.TextAttribute)[] = [],
+      elementName: string, renderAttributes: t.TextAttribute[], inputs: t.BoundAttribute[],
+      outputs: t.BoundEvent[], styles?: StylingBuilder,
+      templateAttrs: (t.BoundAttribute|t.TextAttribute)[] = [],
       i18nAttrs: (t.BoundAttribute|t.TextAttribute)[] = []): o.Expression[] {
     const alreadySeen = new Set<string>();
     const attrExprs: o.Expression[] = [];
@@ -1278,7 +1298,8 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
       if (attr.name === NG_PROJECT_AS_ATTR_NAME) {
         ngProjectAsAttr = attr;
       }
-      attrExprs.push(...getAttributeNameLiterals(attr.name), asLiteral(attr.value));
+      attrExprs.push(
+          ...getAttributeNameLiterals(attr.name), trustedConstAttribute(elementName, attr));
     });
 
     // Keep ngProjectAs next to the other name, value pairs so we can verify that we match
@@ -1352,14 +1373,16 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
       return o.TYPED_NULL_EXPR;
     }
 
+    const consts = this._constants.constExpressions;
+
     // Try to reuse a literal that's already in the array, if possible.
-    for (let i = 0; i < this._constants.length; i++) {
-      if (this._constants[i].isEquivalent(expression)) {
+    for (let i = 0; i < consts.length; i++) {
+      if (consts[i].isEquivalent(expression)) {
         return o.literal(i);
       }
     }
 
-    return o.literal(this._constants.push(expression) - 1);
+    return o.literal(consts.push(expression) - 1);
   }
 
   private addAttrsToConsts(attrs: o.Expression[]): o.LiteralExpr {
@@ -2005,13 +2028,7 @@ export interface ParseTemplateOptions {
  * @param options options to modify how the template is parsed
  */
 export function parseTemplate(
-    template: string, templateUrl: string, options: ParseTemplateOptions = {}): {
-  errors?: ParseError[],
-        nodes: t.Node[],
-        styleUrls: string[],
-        styles: string[],
-        ngContentSelectors: string[]
-} {
+    template: string, templateUrl: string, options: ParseTemplateOptions = {}): ParsedTemplate {
   const {interpolationConfig, preserveWhitespaces, enableI18nLegacyMessageIdFormat} = options;
   const bindingParser = makeBindingParser(interpolationConfig);
   const htmlParser = new HtmlParser();
@@ -2021,6 +2038,9 @@ export function parseTemplate(
 
   if (parseResult.errors && parseResult.errors.length > 0) {
     return {
+      interpolationConfig,
+      preserveWhitespaces,
+      template,
       errors: parseResult.errors,
       nodes: [],
       styleUrls: [],
@@ -2056,10 +2076,28 @@ export function parseTemplate(
   const {nodes, errors, styleUrls, styles, ngContentSelectors} =
       htmlAstToRender3Ast(rootNodes, bindingParser);
   if (errors && errors.length > 0) {
-    return {errors, nodes: [], styleUrls: [], styles: [], ngContentSelectors: []};
+    return {
+      interpolationConfig,
+      preserveWhitespaces,
+      template,
+      errors,
+      nodes: [],
+      styleUrls: [],
+      styles: [],
+      ngContentSelectors: []
+    };
   }
 
-  return {nodes, styleUrls, styles, ngContentSelectors};
+  return {
+    interpolationConfig,
+    preserveWhitespaces,
+    errors: null,
+    template,
+    nodes,
+    styleUrls,
+    styles,
+    ngContentSelectors
+  };
 }
 
 const elementRegistry = new DomElementSchemaRegistry();
@@ -2093,6 +2131,20 @@ export function resolveSanitizationFn(context: core.SecurityContext, isAttribute
   }
 }
 
+function trustedConstAttribute(tagName: string, attr: t.TextAttribute): o.Expression {
+  const value = asLiteral(attr.value);
+  switch (elementRegistry.securityContext(tagName, attr.name, /* isAttribute */ true)) {
+    case core.SecurityContext.HTML:
+      return o.importExpr(R3.trustConstantHtml).callFn([value], attr.valueSpan);
+    case core.SecurityContext.SCRIPT:
+      return o.importExpr(R3.trustConstantScript).callFn([value], attr.valueSpan);
+    case core.SecurityContext.RESOURCE_URL:
+      return o.importExpr(R3.trustConstantResourceUrl).callFn([value], attr.valueSpan);
+    default:
+      return value;
+  }
+}
+
 function isSingleElementTemplate(children: t.Node[]): children is[t.Element] {
   return children.length === 1 && children[0] instanceof t.Element;
 }
@@ -2176,3 +2228,54 @@ function createClosureModeGuard(): o.BinaryOperatorExpr {
       .notIdentical(o.literal('undefined', o.STRING_TYPE))
       .and(o.variable(NG_I18N_CLOSURE_MODE));
 }
+
+/**
+ * Information about the template which was extracted during parsing.
+ *
+ * This contains the actual parsed template as well as any metadata collected during its parsing,
+ * some of which might be useful for re-parsing the template with different options.
+ */
+export interface ParsedTemplate {
+  /**
+   * Include whitespace nodes in the parsed output.
+   */
+  preserveWhitespaces?: boolean;
+
+  /**
+   * How to parse interpolation markers.
+   */
+  interpolationConfig?: InterpolationConfig;
+
+  /**
+   * The string contents of the template.
+   *
+   * This is the "logical" template string, after expansion of any escaped characters (for inline
+   * templates). This may differ from the actual template bytes as they appear in the .ts file.
+   */
+  template: string;
+
+  /**
+   * Any errors from parsing the template the first time.
+   */
+  errors: ParseError[]|null;
+
+  /**
+   * The template AST, parsed from the template.
+   */
+  nodes: t.Node[];
+
+  /**
+   * Any styleUrls extracted from the metadata.
+   */
+  styleUrls: string[];
+
+  /**
+   * Any inline styles extracted from the metadata.
+   */
+  styles: string[];
+
+  /**
+   * Any ng-content selectors extracted from the template.
+   */
+  ngContentSelectors: string[];
+}
diff --git a/packages/compiler/src/shadow_css.ts b/packages/compiler/src/shadow_css.ts
index 554add303982b..72463ca8174f2 100644
--- a/packages/compiler/src/shadow_css.ts
+++ b/packages/compiler/src/shadow_css.ts
@@ -555,66 +555,83 @@ function extractCommentsWithHash(input: string): string[] {
   return input.match(_commentWithHashRe) || [];
 }
 
-const _ruleRe = /(\s*)([^;\{\}]+?)(\s*)((?:{%BLOCK%}?\s*;?)|(?:\s*;))/g;
-const _curlyRe = /([{}])/g;
-const OPEN_CURLY = '{';
-const CLOSE_CURLY = '}';
 const BLOCK_PLACEHOLDER = '%BLOCK%';
+const QUOTE_PLACEHOLDER = '%QUOTED%';
+const _ruleRe = /(\s*)([^;\{\}]+?)(\s*)((?:{%BLOCK%}?\s*;?)|(?:\s*;))/g;
+const _quotedRe = /%QUOTED%/g;
+const CONTENT_PAIRS = new Map([['{', '}']]);
+const QUOTE_PAIRS = new Map([[`"`, `"`], [`'`, `'`]]);
 
 export class CssRule {
   constructor(public selector: string, public content: string) {}
 }
 
 export function processRules(input: string, ruleCallback: (rule: CssRule) => CssRule): string {
-  const inputWithEscapedBlocks = escapeBlocks(input);
+  const inputWithEscapedQuotes = escapeBlocks(input, QUOTE_PAIRS, QUOTE_PLACEHOLDER);
+  const inputWithEscapedBlocks =
+      escapeBlocks(inputWithEscapedQuotes.escapedString, CONTENT_PAIRS, BLOCK_PLACEHOLDER);
   let nextBlockIndex = 0;
-  return inputWithEscapedBlocks.escapedString.replace(_ruleRe, function(...m: string[]) {
-    const selector = m[2];
-    let content = '';
-    let suffix = m[4];
-    let contentPrefix = '';
-    if (suffix && suffix.startsWith('{' + BLOCK_PLACEHOLDER)) {
-      content = inputWithEscapedBlocks.blocks[nextBlockIndex++];
-      suffix = suffix.substring(BLOCK_PLACEHOLDER.length + 1);
-      contentPrefix = '{';
-    }
-    const rule = ruleCallback(new CssRule(selector, content));
-    return `${m[1]}${rule.selector}${m[3]}${contentPrefix}${rule.content}${suffix}`;
-  });
+  let nextQuoteIndex = 0;
+  return inputWithEscapedBlocks.escapedString
+      .replace(
+          _ruleRe,
+          (...m: string[]) => {
+            const selector = m[2];
+            let content = '';
+            let suffix = m[4];
+            let contentPrefix = '';
+            if (suffix && suffix.startsWith('{' + BLOCK_PLACEHOLDER)) {
+              content = inputWithEscapedBlocks.blocks[nextBlockIndex++];
+              suffix = suffix.substring(BLOCK_PLACEHOLDER.length + 1);
+              contentPrefix = '{';
+            }
+            const rule = ruleCallback(new CssRule(selector, content));
+            return `${m[1]}${rule.selector}${m[3]}${contentPrefix}${rule.content}${suffix}`;
+          })
+      .replace(_quotedRe, () => inputWithEscapedQuotes.blocks[nextQuoteIndex++]);
 }
 
 class StringWithEscapedBlocks {
   constructor(public escapedString: string, public blocks: string[]) {}
 }
 
-function escapeBlocks(input: string): StringWithEscapedBlocks {
-  const inputParts = input.split(_curlyRe);
+function escapeBlocks(
+    input: string, charPairs: Map<string, string>, placeholder: string): StringWithEscapedBlocks {
   const resultParts: string[] = [];
   const escapedBlocks: string[] = [];
-  let bracketCount = 0;
-  let currentBlockParts: string[] = [];
-  for (let partIndex = 0; partIndex < inputParts.length; partIndex++) {
-    const part = inputParts[partIndex];
-    if (part == CLOSE_CURLY) {
-      bracketCount--;
-    }
-    if (bracketCount > 0) {
-      currentBlockParts.push(part);
-    } else {
-      if (currentBlockParts.length > 0) {
-        escapedBlocks.push(currentBlockParts.join(''));
-        resultParts.push(BLOCK_PLACEHOLDER);
-        currentBlockParts = [];
+  let openCharCount = 0;
+  let nonBlockStartIndex = 0;
+  let blockStartIndex = -1;
+  let openChar: string|undefined;
+  let closeChar: string|undefined;
+  for (let i = 0; i < input.length; i++) {
+    const char = input[i];
+    if (char === '\\') {
+      i++;
+    } else if (char === closeChar) {
+      openCharCount--;
+      if (openCharCount === 0) {
+        escapedBlocks.push(input.substring(blockStartIndex, i));
+        resultParts.push(placeholder);
+        nonBlockStartIndex = i;
+        blockStartIndex = -1;
+        openChar = closeChar = undefined;
       }
-      resultParts.push(part);
-    }
-    if (part == OPEN_CURLY) {
-      bracketCount++;
+    } else if (char === openChar) {
+      openCharCount++;
+    } else if (openCharCount === 0 && charPairs.has(char)) {
+      openChar = char;
+      closeChar = charPairs.get(char);
+      openCharCount = 1;
+      blockStartIndex = i + 1;
+      resultParts.push(input.substring(nonBlockStartIndex, blockStartIndex));
     }
   }
-  if (currentBlockParts.length > 0) {
-    escapedBlocks.push(currentBlockParts.join(''));
-    resultParts.push(BLOCK_PLACEHOLDER);
+  if (blockStartIndex !== -1) {
+    escapedBlocks.push(input.substring(blockStartIndex));
+    resultParts.push(placeholder);
+  } else {
+    resultParts.push(input.substring(nonBlockStartIndex));
   }
   return new StringWithEscapedBlocks(resultParts.join(''), escapedBlocks);
 }
diff --git a/packages/compiler/src/template_parser/binding_parser.ts b/packages/compiler/src/template_parser/binding_parser.ts
index 1c19d69c9c8ac..81e0b69b1d03f 100644
--- a/packages/compiler/src/template_parser/binding_parser.ts
+++ b/packages/compiler/src/template_parser/binding_parser.ts
@@ -62,7 +62,13 @@ export class BindingParser {
         if (typeof expression === 'string') {
           this.parsePropertyBinding(
               propName, expression, true, sourceSpan, sourceSpan.start.offset, undefined, [],
-              boundProps);
+              // Use the `sourceSpan` for  `keySpan`. This isn't really accurate, but neither is the
+              // sourceSpan, as it represents the sourceSpan of the host itself rather than the
+              // source of the host binding (which doesn't exist in the template). Regardless,
+              // neither of these values are used in Ivy but are only here to satisfy the function
+              // signature. This should likely be refactored in the future so that `sourceSpan`
+              // isn't being used inaccurately.
+              boundProps, sourceSpan);
         } else {
           this._reportError(
               `Value of the host property binding "${
@@ -121,6 +127,26 @@ export class BindingParser {
     }
   }
 
+  /**
+   * Similar to `parseInterpolation`, but treats the provided string as a single expression
+   * element that would normally appear within the interpolation prefix and suffix (`{{` and `}}`).
+   * This is used for parsing the switch expression in ICUs.
+   */
+  parseInterpolationExpression(expression: string, sourceSpan: ParseSourceSpan): ASTWithSource {
+    const sourceInfo = sourceSpan.start.toString();
+
+    try {
+      const ast = this._exprParser.parseInterpolationExpression(
+          expression, sourceInfo, sourceSpan.start.offset);
+      if (ast) this._reportExpressionParserErrors(ast.errors, sourceSpan);
+      this._checkPipes(ast, sourceSpan);
+      return ast;
+    } catch (e) {
+      this._reportError(`${e}`, sourceSpan);
+      return this._exprParser.wrapLiteralPrimitive('ERROR', sourceInfo, sourceSpan.start.offset);
+    }
+  }
+
   /**
    * Parses the bindings in a microsyntax expression, and converts them to
    * `ParsedProperty` or `ParsedVariable`.
@@ -135,8 +161,8 @@ export class BindingParser {
    */
   parseInlineTemplateBinding(
       tplKey: string, tplValue: string, sourceSpan: ParseSourceSpan, absoluteValueOffset: number,
-      targetMatchableAttrs: string[][], targetProps: ParsedProperty[],
-      targetVars: ParsedVariable[]) {
+      targetMatchableAttrs: string[][], targetProps: ParsedProperty[], targetVars: ParsedVariable[],
+      isIvyAst: boolean) {
     const absoluteKeyOffset = sourceSpan.start.offset + TEMPLATE_ATTR_PREFIX.length;
     const bindings = this._parseTemplateBindings(
         tplKey, tplValue, sourceSpan, absoluteKeyOffset, absoluteValueOffset);
@@ -153,14 +179,17 @@ export class BindingParser {
             binding.value ? moveParseSourceSpan(sourceSpan, binding.value.span) : undefined;
         targetVars.push(new ParsedVariable(key, value, bindingSpan, keySpan, valueSpan));
       } else if (binding.value) {
+        const srcSpan = isIvyAst ? bindingSpan : sourceSpan;
         const valueSpan = moveParseSourceSpan(sourceSpan, binding.value.ast.sourceSpan);
         this._parsePropertyAst(
-            key, binding.value, sourceSpan, valueSpan, targetMatchableAttrs, targetProps);
+            key, binding.value, srcSpan, keySpan, valueSpan, targetMatchableAttrs, targetProps);
       } else {
-        targetMatchableAttrs.push([key, '']);
+        targetMatchableAttrs.push([key, '' /* value */]);
+        // Since this is a literal attribute with no RHS, source span should be
+        // just the key span.
         this.parseLiteralAttr(
-            key, null, sourceSpan, absoluteValueOffset, undefined, targetMatchableAttrs,
-            targetProps);
+            key, null /* value */, keySpan, absoluteValueOffset, undefined /* valueSpan */,
+            targetMatchableAttrs, targetProps, keySpan);
       }
     }
   }
@@ -204,7 +233,9 @@ export class BindingParser {
   parseLiteralAttr(
       name: string, value: string|null, sourceSpan: ParseSourceSpan, absoluteOffset: number,
       valueSpan: ParseSourceSpan|undefined, targetMatchableAttrs: string[][],
-      targetProps: ParsedProperty[]) {
+      // TODO(atscott): keySpan is only optional here so VE template parser implementation does not
+      // have to change This should be required when VE is removed.
+      targetProps: ParsedProperty[], keySpan?: ParseSourceSpan) {
     if (isAnimationLabel(name)) {
       name = name.substring(1);
       if (value) {
@@ -214,18 +245,21 @@ export class BindingParser {
             sourceSpan, ParseErrorLevel.ERROR);
       }
       this._parseAnimation(
-          name, value, sourceSpan, absoluteOffset, valueSpan, targetMatchableAttrs, targetProps);
+          name, value, sourceSpan, absoluteOffset, keySpan, valueSpan, targetMatchableAttrs,
+          targetProps);
     } else {
       targetProps.push(new ParsedProperty(
           name, this._exprParser.wrapLiteralPrimitive(value, '', absoluteOffset),
-          ParsedPropertyType.LITERAL_ATTR, sourceSpan, valueSpan));
+          ParsedPropertyType.LITERAL_ATTR, sourceSpan, keySpan, valueSpan));
     }
   }
 
   parsePropertyBinding(
       name: string, expression: string, isHost: boolean, sourceSpan: ParseSourceSpan,
       absoluteOffset: number, valueSpan: ParseSourceSpan|undefined,
-      targetMatchableAttrs: string[][], targetProps: ParsedProperty[]) {
+      // TODO(atscott): keySpan is only optional here so VE template parser implementation does not
+      // have to change This should be required when VE is removed.
+      targetMatchableAttrs: string[][], targetProps: ParsedProperty[], keySpan?: ParseSourceSpan) {
     if (name.length === 0) {
       this._reportError(`Property name is missing in binding`, sourceSpan);
     }
@@ -241,22 +275,25 @@ export class BindingParser {
 
     if (isAnimationProp) {
       this._parseAnimation(
-          name, expression, sourceSpan, absoluteOffset, valueSpan, targetMatchableAttrs,
+          name, expression, sourceSpan, absoluteOffset, keySpan, valueSpan, targetMatchableAttrs,
           targetProps);
     } else {
       this._parsePropertyAst(
           name, this._parseBinding(expression, isHost, valueSpan || sourceSpan, absoluteOffset),
-          sourceSpan, valueSpan, targetMatchableAttrs, targetProps);
+          sourceSpan, keySpan, valueSpan, targetMatchableAttrs, targetProps);
     }
   }
 
   parsePropertyInterpolation(
       name: string, value: string, sourceSpan: ParseSourceSpan,
       valueSpan: ParseSourceSpan|undefined, targetMatchableAttrs: string[][],
-      targetProps: ParsedProperty[]): boolean {
+      // TODO(atscott): keySpan is only optional here so VE template parser implementation does not
+      // have to change This should be required when VE is removed.
+      targetProps: ParsedProperty[], keySpan?: ParseSourceSpan): boolean {
     const expr = this.parseInterpolation(value, valueSpan || sourceSpan);
     if (expr) {
-      this._parsePropertyAst(name, expr, sourceSpan, valueSpan, targetMatchableAttrs, targetProps);
+      this._parsePropertyAst(
+          name, expr, sourceSpan, keySpan, valueSpan, targetMatchableAttrs, targetProps);
       return true;
     }
     return false;
@@ -264,17 +301,17 @@ export class BindingParser {
 
   private _parsePropertyAst(
       name: string, ast: ASTWithSource, sourceSpan: ParseSourceSpan,
-      valueSpan: ParseSourceSpan|undefined, targetMatchableAttrs: string[][],
-      targetProps: ParsedProperty[]) {
+      keySpan: ParseSourceSpan|undefined, valueSpan: ParseSourceSpan|undefined,
+      targetMatchableAttrs: string[][], targetProps: ParsedProperty[]) {
     targetMatchableAttrs.push([name, ast.source!]);
     targetProps.push(
-        new ParsedProperty(name, ast, ParsedPropertyType.DEFAULT, sourceSpan, valueSpan));
+        new ParsedProperty(name, ast, ParsedPropertyType.DEFAULT, sourceSpan, keySpan, valueSpan));
   }
 
   private _parseAnimation(
       name: string, expression: string|null, sourceSpan: ParseSourceSpan, absoluteOffset: number,
-      valueSpan: ParseSourceSpan|undefined, targetMatchableAttrs: string[][],
-      targetProps: ParsedProperty[]) {
+      keySpan: ParseSourceSpan|undefined, valueSpan: ParseSourceSpan|undefined,
+      targetMatchableAttrs: string[][], targetProps: ParsedProperty[]) {
     if (name.length === 0) {
       this._reportError('Animation trigger is missing', sourceSpan);
     }
@@ -285,8 +322,8 @@ export class BindingParser {
     const ast = this._parseBinding(
         expression || 'undefined', false, valueSpan || sourceSpan, absoluteOffset);
     targetMatchableAttrs.push([name, ast.source!]);
-    targetProps.push(
-        new ParsedProperty(name, ast, ParsedPropertyType.ANIMATION, sourceSpan, valueSpan));
+    targetProps.push(new ParsedProperty(
+        name, ast, ParsedPropertyType.ANIMATION, sourceSpan, keySpan, valueSpan));
   }
 
   private _parseBinding(
@@ -315,7 +352,7 @@ export class BindingParser {
     if (boundProp.isAnimation) {
       return new BoundElementProperty(
           boundProp.name, BindingType.Animation, SecurityContext.NONE, boundProp.expression, null,
-          boundProp.sourceSpan, boundProp.valueSpan);
+          boundProp.sourceSpan, boundProp.keySpan, boundProp.valueSpan);
     }
 
     let unit: string|null = null;
@@ -368,7 +405,7 @@ export class BindingParser {
 
     return new BoundElementProperty(
         boundPropertyName, bindingType, securityContexts[0], boundProp.expression, unit,
-        boundProp.sourceSpan, boundProp.valueSpan);
+        boundProp.sourceSpan, boundProp.keySpan, boundProp.valueSpan);
   }
 
   parseEvent(
diff --git a/packages/compiler/src/template_parser/template_parser.ts b/packages/compiler/src/template_parser/template_parser.ts
index fde0f920c1f5e..19dfe8f3841b5 100644
--- a/packages/compiler/src/template_parser/template_parser.ts
+++ b/packages/compiler/src/template_parser/template_parser.ts
@@ -244,9 +244,9 @@ class TemplateParseVisitor implements html.Visitor {
   visitText(text: html.Text, parent: ElementContext): any {
     const ngContentIndex = parent.findNgContentIndex(TEXT_CSS_SELECTOR())!;
     const valueNoNgsp = replaceNgsp(text.value);
-    const expr = this._bindingParser.parseInterpolation(valueNoNgsp, text.sourceSpan!);
-    return expr ? new t.BoundTextAst(expr, ngContentIndex, text.sourceSpan!) :
-                  new t.TextAst(valueNoNgsp, ngContentIndex, text.sourceSpan!);
+    const expr = this._bindingParser.parseInterpolation(valueNoNgsp, text.sourceSpan);
+    return expr ? new t.BoundTextAst(expr, ngContentIndex, text.sourceSpan) :
+                  new t.TextAst(valueNoNgsp, ngContentIndex, text.sourceSpan);
   }
 
   visitAttribute(attribute: html.Attribute, context: any): any {
@@ -317,7 +317,7 @@ class TemplateParseVisitor implements html.Visitor {
         const absoluteOffset = (attr.valueSpan || attr.sourceSpan).start.offset;
         this._bindingParser.parseInlineTemplateBinding(
             templateKey!, templateValue!, attr.sourceSpan, absoluteOffset, templateMatchableAttrs,
-            templateElementOrDirectiveProps, parsedVariables);
+            templateElementOrDirectiveProps, parsedVariables, false /* isIvyAst */);
         templateElementVars.push(...parsedVariables.map(v => t.VariableAst.fromParsedVariable(v)));
       }
 
@@ -335,14 +335,14 @@ class TemplateParseVisitor implements html.Visitor {
     const boundDirectivePropNames = new Set<string>();
     const directiveAsts = this._createDirectiveAsts(
         isTemplateElement, element.name, directiveMetas, elementOrDirectiveProps,
-        elementOrDirectiveRefs, element.sourceSpan!, references, boundDirectivePropNames);
+        elementOrDirectiveRefs, element.sourceSpan, references, boundDirectivePropNames);
     const elementProps: t.BoundElementPropertyAst[] = this._createElementPropertyAsts(
         element.name, elementOrDirectiveProps, boundDirectivePropNames);
     const isViewRoot = parent.isTemplateElement || hasInlineTemplates;
 
     const providerContext = new ProviderElementContext(
         this.providerViewContext, parent.providerContext!, isViewRoot, directiveAsts, attrs,
-        references, isTemplateElement, queryStartIndex, element.sourceSpan!);
+        references, isTemplateElement, queryStartIndex, element.sourceSpan);
 
     const children: t.TemplateAst[] = html.visitAll(
         preparsedElement.nonBindable ? NON_BINDABLE_VISITOR : this, element.children,
@@ -360,26 +360,26 @@ class TemplateParseVisitor implements html.Visitor {
     if (preparsedElement.type === PreparsedElementType.NG_CONTENT) {
       // `<ng-content>` element
       if (element.children && !element.children.every(_isEmptyTextNode)) {
-        this._reportError(`<ng-content> element cannot have content.`, element.sourceSpan!);
+        this._reportError(`<ng-content> element cannot have content.`, element.sourceSpan);
       }
 
       parsedElement = new t.NgContentAst(
-          this.ngContentCount++, hasInlineTemplates ? null! : ngContentIndex, element.sourceSpan!);
+          this.ngContentCount++, hasInlineTemplates ? null! : ngContentIndex, element.sourceSpan);
     } else if (isTemplateElement) {
       // `<ng-template>` element
       this._assertAllEventsPublishedByDirectives(directiveAsts, events);
       this._assertNoComponentsNorElementBindingsOnTemplate(
-          directiveAsts, elementProps, element.sourceSpan!);
+          directiveAsts, elementProps, element.sourceSpan);
 
       parsedElement = new t.EmbeddedTemplateAst(
           attrs, events, references, elementVars, providerContext.transformedDirectiveAsts,
           providerContext.transformProviders, providerContext.transformedHasViewContainer,
           providerContext.queryMatches, children, hasInlineTemplates ? null! : ngContentIndex,
-          element.sourceSpan!);
+          element.sourceSpan);
     } else {
       // element other than `<ng-content>` and `<ng-template>`
       this._assertElementExists(matchElement, element);
-      this._assertOnlyOneComponent(directiveAsts, element.sourceSpan!);
+      this._assertOnlyOneComponent(directiveAsts, element.sourceSpan);
 
       const ngContentIndex =
           hasInlineTemplates ? null : parent.findNgContentIndex(projectionSelector);
@@ -397,22 +397,22 @@ class TemplateParseVisitor implements html.Visitor {
       const {directives} = this._parseDirectives(this.selectorMatcher, templateSelector);
       const templateBoundDirectivePropNames = new Set<string>();
       const templateDirectiveAsts = this._createDirectiveAsts(
-          true, elName, directives, templateElementOrDirectiveProps, [], element.sourceSpan!, [],
+          true, elName, directives, templateElementOrDirectiveProps, [], element.sourceSpan, [],
           templateBoundDirectivePropNames);
       const templateElementProps: t.BoundElementPropertyAst[] = this._createElementPropertyAsts(
           elName, templateElementOrDirectiveProps, templateBoundDirectivePropNames);
       this._assertNoComponentsNorElementBindingsOnTemplate(
-          templateDirectiveAsts, templateElementProps, element.sourceSpan!);
+          templateDirectiveAsts, templateElementProps, element.sourceSpan);
       const templateProviderContext = new ProviderElementContext(
           this.providerViewContext, parent.providerContext!, parent.isTemplateElement,
-          templateDirectiveAsts, [], [], true, templateQueryStartIndex, element.sourceSpan!);
+          templateDirectiveAsts, [], [], true, templateQueryStartIndex, element.sourceSpan);
       templateProviderContext.afterElement();
 
       parsedElement = new t.EmbeddedTemplateAst(
           [], [], [], templateElementVars, templateProviderContext.transformedDirectiveAsts,
           templateProviderContext.transformProviders,
           templateProviderContext.transformedHasViewContainer, templateProviderContext.queryMatches,
-          [parsedElement], ngContentIndex, element.sourceSpan!);
+          [parsedElement], ngContentIndex, element.sourceSpan);
     }
 
     return parsedElement;
@@ -707,7 +707,7 @@ class TemplateParseVisitor implements html.Visitor {
         errorMsg +=
             `2. To allow any element add 'NO_ERRORS_SCHEMA' to the '@NgModule.schemas' of this component.`;
       }
-      this._reportError(errorMsg, element.sourceSpan!);
+      this._reportError(errorMsg, element.sourceSpan);
     }
   }
 
@@ -815,7 +815,7 @@ class NonBindableVisitor implements html.Visitor {
 
   visitText(text: html.Text, parent: ElementContext): t.TextAst {
     const ngContentIndex = parent.findNgContentIndex(TEXT_CSS_SELECTOR())!;
-    return new t.TextAst(text.value, ngContentIndex, text.sourceSpan!);
+    return new t.TextAst(text.value, ngContentIndex, text.sourceSpan);
   }
 
   visitExpansion(expansion: html.Expansion, context: any): any {
diff --git a/packages/compiler/test/BUILD.bazel b/packages/compiler/test/BUILD.bazel
index ac43c2b336eb8..53444e27382ef 100644
--- a/packages/compiler/test/BUILD.bazel
+++ b/packages/compiler/test/BUILD.bazel
@@ -29,6 +29,7 @@ ts_library(
         "//packages:types",
         "//packages/compiler",
         "//packages/compiler-cli",
+        "//packages/compiler-cli/test/helpers",
         "@npm//typescript",
     ],
 )
diff --git a/packages/compiler/test/aot/test_util.ts b/packages/compiler/test/aot/test_util.ts
index 1ff49efb4a2d7..006678439a6e2 100644
--- a/packages/compiler/test/aot/test_util.ts
+++ b/packages/compiler/test/aot/test_util.ts
@@ -10,6 +10,7 @@ import {AotCompilerHost, AotCompilerOptions, createAotCompiler, GeneratedFile, t
 import {MetadataBundlerHost} from '@angular/compiler-cli/src/metadata/bundler';
 import {MetadataCollector} from '@angular/compiler-cli/src/metadata/collector';
 import {ModuleMetadata} from '@angular/compiler-cli/src/metadata/index';
+import {getCachedSourceFile} from '@angular/compiler-cli/test/helpers';
 import {newArray} from '@angular/compiler/src/util';
 import * as fs from 'fs';
 import * as path from 'path';
@@ -182,6 +183,10 @@ export class EmittingCompilerHost implements ts.CompilerHost {
       onError?: (message: string) => void): ts.SourceFile {
     const content = this.readFile(fileName);
     if (content) {
+      const cachedSf = getCachedSourceFile(fileName, () => content);
+      if (cachedSf !== null) {
+        return cachedSf;
+      }
       return ts.createSourceFile(fileName, content, languageVersion, /* setParentNodes */ true);
     }
     throw new Error(`File not found '${fileName}'.`);
@@ -316,16 +321,20 @@ export class MockCompilerHost implements ts.CompilerHost {
   // ts.CompilerHost
   getSourceFile(
       fileName: string, languageVersion: ts.ScriptTarget,
-      onError?: (message: string) => void): ts.SourceFile {
+      onError?: (message: string) => void): ts.SourceFile|undefined {
     let result = this.sourceFiles.get(fileName);
     if (!result) {
       const content = this.getFileContent(fileName);
+      const cachedSf = getCachedSourceFile(fileName, () => content);
+      if (cachedSf !== null) {
+        return cachedSf;
+      }
       if (content) {
         result = ts.createSourceFile(fileName, content, languageVersion);
         this.sourceFiles.set(fileName, result);
       }
     }
-    return result!;
+    return result;
   }
 
   getDefaultLibFileName(options: ts.CompilerOptions): string {
@@ -424,7 +433,7 @@ export class MockAotCompilerHost implements AotCompilerHost {
       }
     } else {
       const sf = this.tsHost.getSourceFile(modulePath, ts.ScriptTarget.Latest);
-      const metadata = this.metadataProvider.getMetadata(sf);
+      const metadata = sf && this.metadataProvider.getMetadata(sf);
       return metadata ? [metadata] : [];
     }
     return undefined;
diff --git a/packages/compiler/test/directive_normalizer_spec.ts b/packages/compiler/test/directive_normalizer_spec.ts
index a007b10fc2591..94df9dcdb658f 100644
--- a/packages/compiler/test/directive_normalizer_spec.ts
+++ b/packages/compiler/test/directive_normalizer_spec.ts
@@ -226,7 +226,7 @@ function normalizeTemplate(normalizer: DirectiveNormalizer, o: {
     describe('normalizeLoadedTemplate', () => {
       it('should store the viewEncapsulation in the result',
          inject([DirectiveNormalizer], (normalizer: DirectiveNormalizer) => {
-           const viewEncapsulation = ViewEncapsulation.Native;
+           const viewEncapsulation = ViewEncapsulation.ShadowDom;
            const template = <CompileTemplateMetadata>normalizeTemplate(normalizer, {
              encapsulation: viewEncapsulation,
              template: '',
diff --git a/packages/compiler/test/expression_parser/parser_spec.ts b/packages/compiler/test/expression_parser/parser_spec.ts
index e58f3a7efef4f..91a7de46218f1 100644
--- a/packages/compiler/test/expression_parser/parser_spec.ts
+++ b/packages/compiler/test/expression_parser/parser_spec.ts
@@ -34,11 +34,11 @@ describe('parser', () => {
       checkAction('undefined');
     });
 
-    it('should parse unary - expressions', () => {
-      checkAction('-1', '0 - 1');
-      checkAction('+1', '1 - 0');
-      checkAction(`-'1'`, `0 - "1"`);
-      checkAction(`+'1'`, `"1" - 0`);
+    it('should parse unary - and + expressions', () => {
+      checkAction('-1', '-1');
+      checkAction('+1', '+1');
+      checkAction(`-'1'`, `-"1"`);
+      checkAction(`+'1'`, `+"1"`);
     });
 
     it('should parse unary ! expressions', () => {
@@ -128,15 +128,22 @@ describe('parser', () => {
       });
 
       it('should only allow identifier or keyword as member names', () => {
-        expectActionError('x.(', 'identifier or keyword');
-        expectActionError('x. 1234', 'identifier or keyword');
-        expectActionError('x."foo"', 'identifier or keyword');
+        checkActionWithError('x.', 'x.', 'identifier or keyword');
+        checkActionWithError('x.(', 'x.', 'identifier or keyword');
+        checkActionWithError('x. 1234', 'x.', 'identifier or keyword');
+        checkActionWithError('x."foo"', 'x.', 'identifier or keyword');
       });
 
       it('should parse safe field access', () => {
         checkAction('a?.a');
         checkAction('a.a?.a');
       });
+
+      it('should parse incomplete safe field accesses', () => {
+        checkActionWithError('a?.a.', 'a?.a.', 'identifier or keyword');
+        checkActionWithError('a.a?.a.', 'a.a?.a.', 'identifier or keyword');
+        checkActionWithError('a.a?.a?. 1234', 'a.a?.a?.', 'identifier or keyword');
+      });
     });
 
     describe('method calls', () => {
@@ -154,6 +161,84 @@ describe('parser', () => {
       });
     });
 
+    describe('keyed read', () => {
+      it('should parse keyed reads', () => {
+        checkAction('a["a"]');
+        checkAction('this.a["a"]', 'a["a"]');
+        checkAction('a.a["a"]');
+      });
+
+      describe('malformed keyed reads', () => {
+        it('should recover on missing keys', () => {
+          checkActionWithError('a[]', 'a[]', 'Key access cannot be empty');
+        });
+
+        it('should recover on incomplete expression keys', () => {
+          checkActionWithError('a[1 + ]', 'a[1 + ]', 'Unexpected token ]');
+        });
+
+        it('should recover on unterminated keys', () => {
+          checkActionWithError(
+              'a[1 + 2', 'a[1 + 2]', 'Missing expected ] at the end of the expression');
+        });
+
+        it('should recover on incomplete and unterminated keys', () => {
+          checkActionWithError(
+              'a[1 + ', 'a[1 + ]', 'Missing expected ] at the end of the expression');
+        });
+      });
+    });
+
+    describe('keyed write', () => {
+      it('should parse keyed writes', () => {
+        checkAction('a["a"] = 1 + 2');
+        checkAction('this.a["a"] = 1 + 2', 'a["a"] = 1 + 2');
+        checkAction('a.a["a"] = 1 + 2');
+      });
+
+      describe('malformed keyed writes', () => {
+        it('should recover on empty rvalues', () => {
+          checkActionWithError('a["a"] = ', 'a["a"] = ', 'Unexpected end of expression');
+        });
+
+        it('should recover on incomplete rvalues', () => {
+          checkActionWithError('a["a"] = 1 + ', 'a["a"] = 1 + ', 'Unexpected end of expression');
+        });
+
+        it('should recover on missing keys', () => {
+          checkActionWithError('a[] = 1', 'a[] = 1', 'Key access cannot be empty');
+        });
+
+        it('should recover on incomplete expression keys', () => {
+          checkActionWithError('a[1 + ] = 1', 'a[1 + ] = 1', 'Unexpected token ]');
+        });
+
+        it('should recover on unterminated keys', () => {
+          checkActionWithError('a[1 + 2 = 1', 'a[1 + 2] = 1', 'Missing expected ]');
+        });
+
+        it('should recover on incomplete and unterminated keys', () => {
+          const ast = parseAction('a[1 + = 1');
+          expect(unparse(ast)).toEqual('a[1 + ] = 1');
+          validate(ast);
+
+          const errors = ast.errors.map(e => e.message);
+          expect(errors.length).toBe(2);
+          expect(errors[0]).toContain('Unexpected token =');
+          expect(errors[1]).toContain('Missing expected ]');
+        });
+
+        it('should error on writes after a keyed write', () => {
+          const ast = parseAction('a[1] = 1 = 2');
+          expect(unparse(ast)).toEqual('a[1] = 1');
+          validate(ast);
+
+          expect(ast.errors.length).toBe(1);
+          expect(ast.errors[0].message).toContain('Unexpected token \'=\'');
+        });
+      });
+    });
+
     describe('conditional', () => {
       it('should parse ternary/conditional expressions', () => {
         checkAction('7 == 3 + 4 ? 10 : 20');
@@ -650,6 +735,13 @@ describe('parser', () => {
       expect(parseInterpolation('nothing')).toBe(null);
     });
 
+    it('should not parse malformed interpolations as strings', () => {
+      const ast = parseInterpolation('{{a}} {{example}<!--->}')!.ast as Interpolation;
+      expect(ast.strings).toEqual(['', ' {{example}<!--->}']);
+      expect(ast.expressions.length).toEqual(1);
+      expect(ast.expressions[0].name).toEqual('a');
+    });
+
     it('should parse no prefix/suffix interpolation', () => {
       const ast = parseInterpolation('{{a}}')!.ast as Interpolation;
       expect(ast.strings).toEqual(['', '']);
@@ -926,3 +1018,11 @@ function expectActionError(text: string, message: string) {
 function expectBindingError(text: string, message: string) {
   expectError(validate(parseBinding(text)), message);
 }
+
+/**
+ * Check that a malformed action parses to a recovered AST while emitting an error.
+ */
+function checkActionWithError(text: string, expected: string, error: string) {
+  checkAction(text, expected);
+  expectActionError(text, error);
+}
diff --git a/packages/compiler/test/expression_parser/utils/unparser.ts b/packages/compiler/test/expression_parser/utils/unparser.ts
index 01a330e20438f..c16dae0d51131 100644
--- a/packages/compiler/test/expression_parser/utils/unparser.ts
+++ b/packages/compiler/test/expression_parser/utils/unparser.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {AbsoluteSourceSpan, AST, AstVisitor, ASTWithSource, Binary, BindingPipe, Chain, Conditional, FunctionCall, ImplicitReceiver, Interpolation, KeyedRead, KeyedWrite, LiteralArray, LiteralMap, LiteralPrimitive, MethodCall, NonNullAssert, ParseSpan, PrefixNot, PropertyRead, PropertyWrite, Quote, RecursiveAstVisitor, SafeMethodCall, SafePropertyRead} from '../../../src/expression_parser/ast';
+import {AST, AstVisitor, ASTWithSource, Binary, BindingPipe, Chain, Conditional, FunctionCall, ImplicitReceiver, Interpolation, KeyedRead, KeyedWrite, LiteralArray, LiteralMap, LiteralPrimitive, MethodCall, NonNullAssert, ParseSpan, PrefixNot, PropertyRead, PropertyWrite, Quote, RecursiveAstVisitor, SafeMethodCall, SafePropertyRead, Unary} from '../../../src/expression_parser/ast';
 import {DEFAULT_INTERPOLATION_CONFIG, InterpolationConfig} from '../../../src/ml_parser/interpolation_config';
 
 class Unparser implements AstVisitor {
@@ -35,6 +35,11 @@ class Unparser implements AstVisitor {
     this._visit(ast.value);
   }
 
+  visitUnary(ast: Unary, context: any) {
+    this._expression += ast.operator;
+    this._visit(ast.expr);
+  }
+
   visitBinary(ast: Binary, context: any) {
     this._visit(ast.left);
     this._expression += ` ${ast.operation} `;
diff --git a/packages/compiler/test/expression_parser/utils/validator.ts b/packages/compiler/test/expression_parser/utils/validator.ts
index 53082b0e642c9..0023fa77dde37 100644
--- a/packages/compiler/test/expression_parser/utils/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, Unary} from '../../../src/expression_parser/ast';
 
 import {unparse} from './unparser';
 
@@ -34,6 +34,10 @@ class ASTValidator extends RecursiveAstVisitor {
     this.parentSpan = oldParent;
   }
 
+  visitUnary(ast: Unary, context: any): any {
+    this.validate(ast, () => super.visitUnary(ast, context));
+  }
+
   visitBinary(ast: Binary, context: any): any {
     this.validate(ast, () => super.visitBinary(ast, context));
   }
diff --git a/packages/compiler/test/i18n/extractor_merger_spec.ts b/packages/compiler/test/i18n/extractor_merger_spec.ts
index eb7c4a8567e43..e607d42e4f318 100644
--- a/packages/compiler/test/i18n/extractor_merger_spec.ts
+++ b/packages/compiler/test/i18n/extractor_merger_spec.ts
@@ -322,19 +322,28 @@ import {serializeNodes as serializeHtmlNodes} from '../ml_parser/util/util';
       describe('elements', () => {
         it('should report nested translatable elements', () => {
           expect(extractErrors(`<p i18n><b i18n></b></p>`)).toEqual([
-            ['Could not mark an element as translatable inside a translatable section', '<b i18n>'],
+            [
+              'Could not mark an element as translatable inside a translatable section',
+              '<b i18n></b>'
+            ],
           ]);
         });
 
         it('should report translatable elements in implicit elements', () => {
           expect(extractErrors(`<p><b i18n></b></p>`, ['p'])).toEqual([
-            ['Could not mark an element as translatable inside a translatable section', '<b i18n>'],
+            [
+              'Could not mark an element as translatable inside a translatable section',
+              '<b i18n></b>'
+            ],
           ]);
         });
 
         it('should report translatable elements in translatable blocks', () => {
           expect(extractErrors(`<!-- i18n --><b i18n></b><!-- /i18n -->`)).toEqual([
-            ['Could not mark an element as translatable inside a translatable section', '<b i18n>'],
+            [
+              'Could not mark an element as translatable inside a translatable section',
+              '<b i18n></b>'
+            ],
           ]);
         });
       });
@@ -370,7 +379,7 @@ import {serializeNodes as serializeHtmlNodes} from '../ml_parser/util/util';
         it('should report when start and end of a block are not at the same level', () => {
           expect(extractErrors(`<!-- i18n --><p><!-- /i18n --></p>`)).toEqual([
             ['I18N blocks should not cross element boundaries', '<!--'],
-            ['Unclosed block', '<p>'],
+            ['Unclosed block', '<p><!-- /i18n --></p>'],
           ]);
 
           expect(extractErrors(`<p><!-- i18n --></p><!-- /i18n -->`)).toEqual([
diff --git a/packages/compiler/test/i18n/i18n_parser_spec.ts b/packages/compiler/test/i18n/i18n_parser_spec.ts
index dc84283cb3891..96945dfb4a558 100644
--- a/packages/compiler/test/i18n/i18n_parser_spec.ts
+++ b/packages/compiler/test/i18n/i18n_parser_spec.ts
@@ -324,7 +324,7 @@ function _humanizePlaceholders(
   // clang-format off
   // https://github.com/angular/clang-format/issues/35
   return _extractMessages(html, implicitTags, implicitAttrs).map(
-    msg => Object.keys(msg.placeholders).map((name) => `${name}=${msg.placeholders[name]}`).join(', '));
+    msg => Object.keys(msg.placeholders).map((name) => `${name}=${msg.placeholders[name].text}`).join(', '));
   // clang-format on
 }
 
diff --git a/packages/compiler/test/i18n/serializers/i18n_ast_spec.ts b/packages/compiler/test/i18n/serializers/i18n_ast_spec.ts
index 3ee5872d416f7..7b2fe3b7b715e 100644
--- a/packages/compiler/test/i18n/serializers/i18n_ast_spec.ts
+++ b/packages/compiler/test/i18n/serializers/i18n_ast_spec.ts
@@ -41,7 +41,7 @@ import {_extractMessages} from '../i18n_parser_spec';
               new i18n.IcuPlaceholder(null!, '', null!),
             ],
             null!);
-        const tag = new i18n.TagPlaceholder('', {}, '', '', [container], false, null!);
+        const tag = new i18n.TagPlaceholder('', {}, '', '', [container], false, null!, null, null);
         const icu = new i18n.Icu('', '', {tag}, null!);
 
         icu.visit(visitor);
diff --git a/packages/compiler/test/i18n/translation_bundle_spec.ts b/packages/compiler/test/i18n/translation_bundle_spec.ts
index 01f322adca995..b7aa290599714 100644
--- a/packages/compiler/test/i18n/translation_bundle_spec.ts
+++ b/packages/compiler/test/i18n/translation_bundle_spec.ts
@@ -50,7 +50,7 @@ import {_extractMessages} from './i18n_parser_spec';
         ]
       };
       const phMap = {
-        ph1: '*phContent*',
+        ph1: createPlaceholder('*phContent*'),
       };
       const tb = new TranslationBundle(msgMap, null, (_) => 'foo');
       const msg = new i18n.Message([srcNode], phMap, {}, 'm', 'd', 'i');
@@ -160,7 +160,7 @@ import {_extractMessages} from './i18n_parser_spec';
           ]
         };
         const phMap = {
-          ph1: '</b>',
+          ph1: createPlaceholder('</b>'),
         };
         const tb = new TranslationBundle(msgMap, null, (_) => 'foo');
         const msg = new i18n.Message([srcNode], phMap, {}, 'm', 'd', 'i');
@@ -169,3 +169,13 @@ import {_extractMessages} from './i18n_parser_spec';
     });
   });
 }
+
+function createPlaceholder(text: string): i18n.MessagePlaceholder {
+  const file = new ParseSourceFile(text, 'file://test');
+  const start = new ParseLocation(file, 0, 0, 0);
+  const end = new ParseLocation(file, text.length, 0, text.length);
+  return {
+    text,
+    sourceSpan: new ParseSourceSpan(start, end),
+  };
+}
diff --git a/packages/compiler/test/ml_parser/ast_spec_utils.ts b/packages/compiler/test/ml_parser/ast_spec_utils.ts
index 10060905bb253..a6f7ca65df5bd 100644
--- a/packages/compiler/test/ml_parser/ast_spec_utils.ts
+++ b/packages/compiler/test/ml_parser/ast_spec_utils.ts
@@ -42,7 +42,7 @@ class _Humanizer implements html.Visitor {
   visitElement(element: html.Element, context: any): any {
     const res = this._appendContext(element, [html.Element, element.name, this.elDepth++]);
     if (this.includeSourceSpan) {
-      res.push(element.startSourceSpan?.toString() ?? null);
+      res.push(element.startSourceSpan.toString() ?? null);
       res.push(element.endSourceSpan?.toString() ?? null);
     }
     this.result.push(res);
@@ -82,7 +82,7 @@ class _Humanizer implements html.Visitor {
 
   private _appendContext(ast: html.Node, input: any[]): any[] {
     if (!this.includeSourceSpan) return input;
-    input.push(ast.sourceSpan!.toString());
+    input.push(ast.sourceSpan.toString());
     return input;
   }
 }
diff --git a/packages/compiler/test/ml_parser/html_parser_spec.ts b/packages/compiler/test/ml_parser/html_parser_spec.ts
index af167cba9410f..87dee2f8aa657 100644
--- a/packages/compiler/test/ml_parser/html_parser_spec.ts
+++ b/packages/compiler/test/ml_parser/html_parser_spec.ts
@@ -11,7 +11,7 @@ import {HtmlParser, ParseTreeResult, TreeError} from '../../src/ml_parser/html_p
 import {TokenType} from '../../src/ml_parser/lexer';
 import {ParseError} from '../../src/parse_util';
 
-import {humanizeDom, humanizeDomSourceSpans, humanizeLineColumn} from './ast_spec_utils';
+import {humanizeDom, humanizeDomSourceSpans, humanizeLineColumn, humanizeNodes} from './ast_spec_utils';
 
 {
   describe('HtmlParser', () => {
@@ -332,40 +332,75 @@ import {humanizeDom, humanizeDomSourceSpans, humanizeLineColumn} from './ast_spe
           ]);
         });
 
-        it('should normalize line-endings in expansion forms in inline templates', () => {
-          const parsed = parser.parse(
-              `<div>\r\n` +
-                  `  {\r\n` +
-                  `    messages.length,\r\n` +
-                  `    plural,\r\n` +
-                  `    =0 {You have \r\nno\r\n messages}\r\n` +
-                  `    =1 {One {{message}}}}\r\n` +
-                  `</div>`,
-              'TestComp', {
-                tokenizeExpansionForms: true,
-                escapedString: true,
-              });
+        it('should normalize line-endings in expansion forms in inline templates if `i18nNormalizeLineEndingsInICUs` is true',
+           () => {
+             const parsed = parser.parse(
+                 `<div>\r\n` +
+                     `  {\r\n` +
+                     `    messages.length,\r\n` +
+                     `    plural,\r\n` +
+                     `    =0 {You have \r\nno\r\n messages}\r\n` +
+                     `    =1 {One {{message}}}}\r\n` +
+                     `</div>`,
+                 'TestComp', {
+                   tokenizeExpansionForms: true,
+                   escapedString: true,
+                   i18nNormalizeLineEndingsInICUs: true,
+                 });
 
-          expect(humanizeDom(parsed)).toEqual([
-            [html.Element, 'div', 0],
-            [html.Text, '\n  ', 1],
-            [html.Expansion, '\n    messages.length', 'plural', 1],
-            [html.ExpansionCase, '=0', 2],
-            [html.ExpansionCase, '=1', 2],
-            [html.Text, '\n', 1],
-          ]);
-          const cases = (<any>parsed.rootNodes[0]).children[1].cases;
+             expect(humanizeDom(parsed)).toEqual([
+               [html.Element, 'div', 0],
+               [html.Text, '\n  ', 1],
+               [html.Expansion, '\n    messages.length', 'plural', 1],
+               [html.ExpansionCase, '=0', 2],
+               [html.ExpansionCase, '=1', 2],
+               [html.Text, '\n', 1],
+             ]);
+             const cases = (<any>parsed.rootNodes[0]).children[1].cases;
 
-          expect(humanizeDom(new ParseTreeResult(cases[0].expression, []))).toEqual([
-            [html.Text, 'You have \nno\n messages', 0],
-          ]);
+             expect(humanizeDom(new ParseTreeResult(cases[0].expression, []))).toEqual([
+               [html.Text, 'You have \nno\n messages', 0],
+             ]);
 
-          expect(humanizeDom(new ParseTreeResult(cases[1].expression, []))).toEqual([
-            [html.Text, 'One {{message}}', 0]
-          ]);
+             expect(humanizeDom(new ParseTreeResult(cases[1].expression, []))).toEqual([
+               [html.Text, 'One {{message}}', 0]
+             ]);
 
-          expect(parsed.errors).toEqual([]);
-        });
+             expect(parsed.errors).toEqual([]);
+           });
+
+        it('should not normalize line-endings in ICU expressions in external templates when `i18nNormalizeLineEndingsInICUs` is not set',
+           () => {
+             const parsed = parser.parse(
+                 `<div>\r\n` +
+                     `  {\r\n` +
+                     `    messages.length,\r\n` +
+                     `    plural,\r\n` +
+                     `    =0 {You have \r\nno\r\n messages}\r\n` +
+                     `    =1 {One {{message}}}}\r\n` +
+                     `</div>`,
+                 'TestComp', {tokenizeExpansionForms: true, escapedString: true});
+
+             expect(humanizeDom(parsed)).toEqual([
+               [html.Element, 'div', 0],
+               [html.Text, '\n  ', 1],
+               [html.Expansion, '\r\n    messages.length', 'plural', 1],
+               [html.ExpansionCase, '=0', 2],
+               [html.ExpansionCase, '=1', 2],
+               [html.Text, '\n', 1],
+             ]);
+             const cases = (<any>parsed.rootNodes[0]).children[1].cases;
+
+             expect(humanizeDom(new ParseTreeResult(cases[0].expression, []))).toEqual([
+               [html.Text, 'You have \nno\n messages', 0],
+             ]);
+
+             expect(humanizeDom(new ParseTreeResult(cases[1].expression, []))).toEqual([
+               [html.Text, 'One {{message}}', 0]
+             ]);
+
+             expect(parsed.errors).toEqual([]);
+           });
 
         it('should normalize line-endings in expansion forms in external templates if `i18nNormalizeLineEndingsInICUs` is true',
            () => {
@@ -468,33 +503,67 @@ import {humanizeDom, humanizeDomSourceSpans, humanizeLineColumn} from './ast_spe
           ]);
         });
 
-        it('should normalize line endings in nested expansion forms for inline templates', () => {
-          const parsed = parser.parse(
-              `{\r\n` +
-                  `  messages.length, plural,\r\n` +
-                  `  =0 { zero \r\n` +
-                  `       {\r\n` +
-                  `         p.gender, select,\r\n` +
-                  `         male {m}\r\n` +
-                  `       }\r\n` +
-                  `     }\r\n` +
-                  `}`,
-              'TestComp', {tokenizeExpansionForms: true, escapedString: true});
-          expect(humanizeDom(parsed)).toEqual([
-            [html.Expansion, '\n  messages.length', 'plural', 0],
-            [html.ExpansionCase, '=0', 1],
-          ]);
+        it('should normalize line endings in nested expansion forms for inline templates, when `i18nNormalizeLineEndingsInICUs` is true',
+           () => {
+             const parsed = parser.parse(
+                 `{\r\n` +
+                     `  messages.length, plural,\r\n` +
+                     `  =0 { zero \r\n` +
+                     `       {\r\n` +
+                     `         p.gender, select,\r\n` +
+                     `         male {m}\r\n` +
+                     `       }\r\n` +
+                     `     }\r\n` +
+                     `}`,
+                 'TestComp', {
+                   tokenizeExpansionForms: true,
+                   escapedString: true,
+                   i18nNormalizeLineEndingsInICUs: true
+                 });
+             expect(humanizeDom(parsed)).toEqual([
+               [html.Expansion, '\n  messages.length', 'plural', 0],
+               [html.ExpansionCase, '=0', 1],
+             ]);
 
-          const expansion = parsed.rootNodes[0] as html.Expansion;
-          expect(humanizeDom(new ParseTreeResult(expansion.cases[0].expression, []))).toEqual([
-            [html.Text, 'zero \n       ', 0],
-            [html.Expansion, '\n         p.gender', 'select', 0],
-            [html.ExpansionCase, 'male', 1],
-            [html.Text, '\n     ', 0],
-          ]);
+             const expansion = parsed.rootNodes[0] as html.Expansion;
+             expect(humanizeDom(new ParseTreeResult(expansion.cases[0].expression, []))).toEqual([
+               [html.Text, 'zero \n       ', 0],
+               [html.Expansion, '\n         p.gender', 'select', 0],
+               [html.ExpansionCase, 'male', 1],
+               [html.Text, '\n     ', 0],
+             ]);
 
-          expect(parsed.errors).toEqual([]);
-        });
+             expect(parsed.errors).toEqual([]);
+           });
+
+        it('should not normalize line endings in nested expansion forms for inline templates, when `i18nNormalizeLineEndingsInICUs` is not defined',
+           () => {
+             const parsed = parser.parse(
+                 `{\r\n` +
+                     `  messages.length, plural,\r\n` +
+                     `  =0 { zero \r\n` +
+                     `       {\r\n` +
+                     `         p.gender, select,\r\n` +
+                     `         male {m}\r\n` +
+                     `       }\r\n` +
+                     `     }\r\n` +
+                     `}`,
+                 'TestComp', {tokenizeExpansionForms: true, escapedString: true});
+             expect(humanizeDom(parsed)).toEqual([
+               [html.Expansion, '\r\n  messages.length', 'plural', 0],
+               [html.ExpansionCase, '=0', 1],
+             ]);
+
+             const expansion = parsed.rootNodes[0] as html.Expansion;
+             expect(humanizeDom(new ParseTreeResult(expansion.cases[0].expression, []))).toEqual([
+               [html.Text, 'zero \n       ', 0],
+               [html.Expansion, '\r\n         p.gender', 'select', 0],
+               [html.ExpansionCase, 'male', 1],
+               [html.Text, '\n     ', 0],
+             ]);
+
+             expect(parsed.errors).toEqual([]);
+           });
 
         it('should not normalize line endings in nested expansion forms for external templates, when `i18nNormalizeLineEndingsInICUs` is not set',
            () => {
@@ -553,7 +622,7 @@ import {humanizeDom, humanizeDomSourceSpans, humanizeLineColumn} from './ast_spe
               `{a, select, b {foo} % { bar {% bar}}`, 'TestComp', {tokenizeExpansionForms: true});
           expect(humanizeErrors(p.errors)).toEqual([
             [
-              6,
+              TokenType.RAW_TEXT,
               'Unexpected character "EOF" (Do you have an unescaped "{" in your template? Use "{{ \'{\' }}") to escape it.)',
               '0:36'
             ],
@@ -584,7 +653,8 @@ import {humanizeDom, humanizeDomSourceSpans, humanizeLineColumn} from './ast_spe
                      '<div [prop]="v1" (e)="do()" attr="v2" noValue>\na\n</div>', 'TestComp')))
               .toEqual([
                 [
-                  html.Element, 'div', 0, '<div [prop]="v1" (e)="do()" attr="v2" noValue>',
+                  html.Element, 'div', 0,
+                  '<div [prop]="v1" (e)="do()" attr="v2" noValue>\na\n</div>',
                   '<div [prop]="v1" (e)="do()" attr="v2" noValue>', '</div>'
                 ],
                 [html.Attribute, '[prop]', 'v1', '[prop]="v1"'],
@@ -598,8 +668,8 @@ import {humanizeDom, humanizeDomSourceSpans, humanizeLineColumn} from './ast_spe
         it('should set the start and end source spans', () => {
           const node = <html.Element>parser.parse('<div>a</div>', 'TestComp').rootNodes[0];
 
-          expect(node.startSourceSpan!.start.offset).toEqual(0);
-          expect(node.startSourceSpan!.end.offset).toEqual(5);
+          expect(node.startSourceSpan.start.offset).toEqual(0);
+          expect(node.startSourceSpan.end.offset).toEqual(5);
 
           expect(node.endSourceSpan!.start.offset).toEqual(6);
           expect(node.endSourceSpan!.end.offset).toEqual(12);
@@ -607,14 +677,14 @@ import {humanizeDom, humanizeDomSourceSpans, humanizeLineColumn} from './ast_spe
 
         it('should not set the end source span for void elements', () => {
           expect(humanizeDomSourceSpans(parser.parse('<div><br></div>', 'TestComp'))).toEqual([
-            [html.Element, 'div', 0, '<div>', '<div>', '</div>'],
+            [html.Element, 'div', 0, '<div><br></div>', '<div>', '</div>'],
             [html.Element, 'br', 1, '<br>', '<br>', null],
           ]);
         });
 
         it('should not set the end source span for multiple void elements', () => {
           expect(humanizeDomSourceSpans(parser.parse('<div><br><hr></div>', 'TestComp'))).toEqual([
-            [html.Element, 'div', 0, '<div>', '<div>', '</div>'],
+            [html.Element, 'div', 0, '<div><br><hr></div>', '<div>', '</div>'],
             [html.Element, 'br', 1, '<br>', '<br>', null],
             [html.Element, 'hr', 1, '<hr>', '<hr>', null],
           ]);
@@ -634,19 +704,19 @@ import {humanizeDom, humanizeDomSourceSpans, humanizeLineColumn} from './ast_spe
 
         it('should set the end source span for self-closing elements', () => {
           expect(humanizeDomSourceSpans(parser.parse('<div><br/></div>', 'TestComp'))).toEqual([
-            [html.Element, 'div', 0, '<div>', '<div>', '</div>'],
+            [html.Element, 'div', 0, '<div><br/></div>', '<div>', '</div>'],
             [html.Element, 'br', 1, '<br/>', '<br/>', '<br/>'],
           ]);
         });
 
         it('should not set the end source span for elements that are implicitly closed', () => {
           expect(humanizeDomSourceSpans(parser.parse('<div><p></div>', 'TestComp'))).toEqual([
-            [html.Element, 'div', 0, '<div>', '<div>', '</div>'],
+            [html.Element, 'div', 0, '<div><p></div>', '<div>', '</div>'],
             [html.Element, 'p', 1, '<p>', '<p>', null],
           ]);
           expect(humanizeDomSourceSpans(parser.parse('<div><li>A<li>B</div>', 'TestComp')))
               .toEqual([
-                [html.Element, 'div', 0, '<div>', '<div>', '</div>'],
+                [html.Element, 'div', 0, '<div><li>A<li>B</div>', '<div>', '</div>'],
                 [html.Element, 'li', 1, '<li>', '<li>', null],
                 [html.Text, 'A', 2, 'A'],
                 [html.Element, 'li', 1, '<li>', '<li>', null],
@@ -659,7 +729,7 @@ import {humanizeDom, humanizeDomSourceSpans, humanizeLineColumn} from './ast_spe
                      '<div>{count, plural, =0 {msg}}</div>', 'TestComp',
                      {tokenizeExpansionForms: true})))
               .toEqual([
-                [html.Element, 'div', 0, '<div>', '<div>', '</div>'],
+                [html.Element, 'div', 0, '<div>{count, plural, =0 {msg}}</div>', '<div>', '</div>'],
                 [html.Expansion, 'count', 'plural', 1, '{count, plural, =0 {msg}}'],
                 [html.ExpansionCase, '=0', 2, '=0 {msg}'],
               ]);
@@ -770,14 +840,66 @@ import {humanizeDom, humanizeDomSourceSpans, humanizeLineColumn} from './ast_spe
           ]]);
         });
 
-        it('should report subsequent open tags without proper close tag', () => {
-          const errors = parser.parse('<div</div>', 'TestComp').errors;
-          expect(errors.length).toEqual(1);
-          expect(humanizeErrors(errors)).toEqual([[
-            'div',
-            'Unexpected closing tag "div". It may happen when the tag has already been closed by another tag. For more info see https://www.w3.org/TR/html5/syntax.html#closing-elements-that-have-implied-end-tags',
-            '0:4'
-          ]]);
+        describe('incomplete element tag', () => {
+          it('should parse and report incomplete tags after the tag name', () => {
+            const {errors, rootNodes} = parser.parse('<div<span><div  </span>', 'TestComp');
+
+            expect(humanizeNodes(rootNodes, true)).toEqual([
+              [html.Element, 'div', 0, '<div', '<div', null],
+              [html.Element, 'span', 0, '<span><div  </span>', '<span>', '</span>'],
+              [html.Element, 'div', 1, '<div  ', '<div  ', null],
+            ]);
+
+            expect(humanizeErrors(errors)).toEqual([
+              ['div', 'Opening tag "div" not terminated.', '0:0'],
+              ['div', 'Opening tag "div" not terminated.', '0:10'],
+            ]);
+          });
+
+          it('should parse and report incomplete tags after attribute', () => {
+            const {errors, rootNodes} =
+                parser.parse('<div class="hi" sty<span></span>', 'TestComp');
+
+            expect(humanizeNodes(rootNodes, true)).toEqual([
+              [html.Element, 'div', 0, '<div class="hi" sty', '<div class="hi" sty', null],
+              [html.Attribute, 'class', 'hi', 'class="hi"'],
+              [html.Attribute, 'sty', '', 'sty'],
+              [html.Element, 'span', 0, '<span></span>', '<span>', '</span>'],
+            ]);
+
+            expect(humanizeErrors(errors)).toEqual([
+              ['div', 'Opening tag "div" not terminated.', '0:0'],
+            ]);
+          });
+
+          it('should parse and report incomplete tags after quote', () => {
+            const {errors, rootNodes} = parser.parse('<div "<span></span>', 'TestComp');
+
+            expect(humanizeNodes(rootNodes, true)).toEqual([
+              [html.Element, 'div', 0, '<div ', '<div ', null],
+              [html.Text, '"', 0, '"'],
+              [html.Element, 'span', 0, '<span></span>', '<span>', '</span>'],
+            ]);
+
+            expect(humanizeErrors(errors)).toEqual([
+              ['div', 'Opening tag "div" not terminated.', '0:0'],
+            ]);
+          });
+
+          it('should report subsequent open tags without proper close tag', () => {
+            const errors = parser.parse('<div</div>', 'TestComp').errors;
+            expect(errors.length).toEqual(2);
+            expect(humanizeErrors(errors)).toEqual([
+              ['div', 'Opening tag "div" not terminated.', '0:0'],
+              // TODO(ayazhafiz): the following error is unnecessary and can be pruned if we keep
+              // track of the incomplete tag names.
+              [
+                'div',
+                'Unexpected closing tag "div". It may happen when the tag has already been closed by another tag. For more info see https://www.w3.org/TR/html5/syntax.html#closing-elements-that-have-implied-end-tags',
+                '0:4'
+              ]
+            ]);
+          });
         });
 
         it('should report closing tag for void elements', () => {
diff --git a/packages/compiler/test/ml_parser/icu_ast_expander_spec.ts b/packages/compiler/test/ml_parser/icu_ast_expander_spec.ts
index 881f09e58dae2..d9e8ed2407228 100644
--- a/packages/compiler/test/ml_parser/icu_ast_expander_spec.ts
+++ b/packages/compiler/test/ml_parser/icu_ast_expander_spec.ts
@@ -56,10 +56,10 @@ import {humanizeNodes} from './ast_spec_utils';
       const nodes = expand(`{messages.length, plural,=0 {<b>bold</b>}}`).nodes;
 
       const container: html.Element = <html.Element>nodes[0];
-      expect(container.sourceSpan!.start.col).toEqual(0);
-      expect(container.sourceSpan!.end.col).toEqual(42);
-      expect(container.startSourceSpan!.start.col).toEqual(0);
-      expect(container.startSourceSpan!.end.col).toEqual(42);
+      expect(container.sourceSpan.start.col).toEqual(0);
+      expect(container.sourceSpan.end.col).toEqual(42);
+      expect(container.startSourceSpan.start.col).toEqual(0);
+      expect(container.startSourceSpan.end.col).toEqual(42);
       expect(container.endSourceSpan!.start.col).toEqual(0);
       expect(container.endSourceSpan!.end.col).toEqual(42);
 
@@ -68,15 +68,15 @@ import {humanizeNodes} from './ast_spec_utils';
       expect(switchExp.sourceSpan.end.col).toEqual(16);
 
       const template: html.Element = <html.Element>container.children[0];
-      expect(template.sourceSpan!.start.col).toEqual(25);
-      expect(template.sourceSpan!.end.col).toEqual(41);
+      expect(template.sourceSpan.start.col).toEqual(25);
+      expect(template.sourceSpan.end.col).toEqual(41);
 
       const switchCheck = template.attrs[0];
       expect(switchCheck.sourceSpan.start.col).toEqual(25);
       expect(switchCheck.sourceSpan.end.col).toEqual(28);
 
       const b: html.Element = <html.Element>template.children[0];
-      expect(b.sourceSpan!.start.col).toEqual(29);
+      expect(b.sourceSpan.start.col).toEqual(29);
       expect(b.endSourceSpan!.end.col).toEqual(40);
     });
 
diff --git a/packages/compiler/test/ml_parser/lexer_spec.ts b/packages/compiler/test/ml_parser/lexer_spec.ts
index 32895b12eabd1..1b5e3e3bc423a 100644
--- a/packages/compiler/test/ml_parser/lexer_spec.ts
+++ b/packages/compiler/test/ml_parser/lexer_spec.ts
@@ -232,6 +232,45 @@ import {ParseLocation, ParseSourceFile, ParseSourceSpan} from '../../src/parse_u
           [lex.TokenType.EOF, ''],
         ]);
       });
+
+      describe('tags', () => {
+        it('after tag name', () => {
+          expect(tokenizeAndHumanizeSourceSpans('<div<span><div</span>')).toEqual([
+            [lex.TokenType.INCOMPLETE_TAG_OPEN, '<div'],
+            [lex.TokenType.TAG_OPEN_START, '<span'],
+            [lex.TokenType.TAG_OPEN_END, '>'],
+            [lex.TokenType.INCOMPLETE_TAG_OPEN, '<div'],
+            [lex.TokenType.TAG_CLOSE, '</span>'],
+            [lex.TokenType.EOF, ''],
+          ]);
+        });
+
+        it('in attribute', () => {
+          expect(tokenizeAndHumanizeSourceSpans('<div class="hi" sty<span></span>')).toEqual([
+            [lex.TokenType.INCOMPLETE_TAG_OPEN, '<div'],
+            [lex.TokenType.ATTR_NAME, 'class'],
+            [lex.TokenType.ATTR_QUOTE, '"'],
+            [lex.TokenType.ATTR_VALUE, 'hi'],
+            [lex.TokenType.ATTR_QUOTE, '"'],
+            [lex.TokenType.ATTR_NAME, 'sty'],
+            [lex.TokenType.TAG_OPEN_START, '<span'],
+            [lex.TokenType.TAG_OPEN_END, '>'],
+            [lex.TokenType.TAG_CLOSE, '</span>'],
+            [lex.TokenType.EOF, ''],
+          ]);
+        });
+
+        it('after quote', () => {
+          expect(tokenizeAndHumanizeSourceSpans('<div "<span></span>')).toEqual([
+            [lex.TokenType.INCOMPLETE_TAG_OPEN, '<div'],
+            [lex.TokenType.TEXT, '"'],
+            [lex.TokenType.TAG_OPEN_START, '<span'],
+            [lex.TokenType.TAG_OPEN_END, '>'],
+            [lex.TokenType.TAG_CLOSE, '</span>'],
+            [lex.TokenType.EOF, ''],
+          ]);
+        });
+      });
     });
 
     describe('attributes', () => {
@@ -554,7 +593,8 @@ import {ParseLocation, ParseSourceFile, ParseSourceSpan} from '../../src/parse_u
         expect(tokenizeAndHumanizeSourceSpans('<p>a<b</p>')).toEqual([
           [lex.TokenType.TAG_OPEN_START, '<p'],
           [lex.TokenType.TAG_OPEN_END, '>'],
-          [lex.TokenType.TEXT, 'a<b'],
+          [lex.TokenType.TEXT, 'a'],
+          [lex.TokenType.INCOMPLETE_TAG_OPEN, '<b'],
           [lex.TokenType.TAG_CLOSE, '</p>'],
           [lex.TokenType.EOF, ''],
         ]);
@@ -579,25 +619,41 @@ import {ParseLocation, ParseSourceFile, ParseSourceSpan} from '../../src/parse_u
 
       it('should parse start tags quotes in place of an attribute name as text', () => {
         expect(tokenizeAndHumanizeParts('<t ">')).toEqual([
-          [lex.TokenType.TEXT, '<t ">'],
+          [lex.TokenType.INCOMPLETE_TAG_OPEN, '', 't'],
+          [lex.TokenType.TEXT, '">'],
           [lex.TokenType.EOF],
         ]);
 
         expect(tokenizeAndHumanizeParts('<t \'>')).toEqual([
-          [lex.TokenType.TEXT, '<t \'>'],
+          [lex.TokenType.INCOMPLETE_TAG_OPEN, '', 't'],
+          [lex.TokenType.TEXT, '\'>'],
           [lex.TokenType.EOF],
         ]);
       });
 
-      it('should parse start tags quotes in place of an attribute name (after a valid attribute) as text',
+      it('should parse start tags quotes in place of an attribute name (after a valid attribute)',
          () => {
            expect(tokenizeAndHumanizeParts('<t a="b" ">')).toEqual([
-             [lex.TokenType.TEXT, '<t a="b" ">'],
+             [lex.TokenType.INCOMPLETE_TAG_OPEN, '', 't'],
+             [lex.TokenType.ATTR_NAME, '', 'a'],
+             [lex.TokenType.ATTR_QUOTE, '"'],
+             [lex.TokenType.ATTR_VALUE, 'b'],
+             [lex.TokenType.ATTR_QUOTE, '"'],
+             // TODO(ayazhafiz): the " symbol should be a synthetic attribute,
+             // allowing us to complete the opening tag correctly.
+             [lex.TokenType.TEXT, '">'],
              [lex.TokenType.EOF],
            ]);
 
            expect(tokenizeAndHumanizeParts('<t a=\'b\' \'>')).toEqual([
-             [lex.TokenType.TEXT, '<t a=\'b\' \'>'],
+             [lex.TokenType.INCOMPLETE_TAG_OPEN, '', 't'],
+             [lex.TokenType.ATTR_NAME, '', 'a'],
+             [lex.TokenType.ATTR_QUOTE, '\''],
+             [lex.TokenType.ATTR_VALUE, 'b'],
+             [lex.TokenType.ATTR_QUOTE, '\''],
+             // TODO(ayazhafiz): the ' symbol should be a synthetic attribute,
+             // allowing us to complete the opening tag correctly.
+             [lex.TokenType.TEXT, '\'>'],
              [lex.TokenType.EOF],
            ]);
          });
@@ -885,75 +941,114 @@ import {ParseLocation, ParseSourceFile, ParseSourceSpan} from '../../src/parse_u
 
       describe('[line ending normalization', () => {
         describe('{escapedString: true}', () => {
-          it('should normalize line-endings in expansion forms', () => {
-            const result = tokenizeWithoutErrors(
-                `{\r\n` +
-                    `    messages.length,\r\n` +
-                    `    plural,\r\n` +
-                    `    =0 {You have \r\nno\r\n messages}\r\n` +
-                    `    =1 {One {{message}}}}\r\n`,
-                {
-                  tokenizeExpansionForms: true,
-                  escapedString: true,
-                });
-
-            expect(humanizeParts(result.tokens)).toEqual([
-              [lex.TokenType.EXPANSION_FORM_START],
-              [lex.TokenType.RAW_TEXT, '\n    messages.length'],
-              [lex.TokenType.RAW_TEXT, 'plural'],
-              [lex.TokenType.EXPANSION_CASE_VALUE, '=0'],
-              [lex.TokenType.EXPANSION_CASE_EXP_START],
-              [lex.TokenType.TEXT, 'You have \nno\n messages'],
-              [lex.TokenType.EXPANSION_CASE_EXP_END],
-              [lex.TokenType.EXPANSION_CASE_VALUE, '=1'],
-              [lex.TokenType.EXPANSION_CASE_EXP_START],
-              [lex.TokenType.TEXT, 'One {{message}}'],
-              [lex.TokenType.EXPANSION_CASE_EXP_END],
-              [lex.TokenType.EXPANSION_FORM_END],
-              [lex.TokenType.TEXT, '\n'],
-              [lex.TokenType.EOF],
-            ]);
+          it('should normalize line-endings in expansion forms if `i18nNormalizeLineEndingsInICUs` is true',
+             () => {
+               const result = tokenizeWithoutErrors(
+                   `{\r\n` +
+                       `    messages.length,\r\n` +
+                       `    plural,\r\n` +
+                       `    =0 {You have \r\nno\r\n messages}\r\n` +
+                       `    =1 {One {{message}}}}\r\n`,
+                   {
+                     tokenizeExpansionForms: true,
+                     escapedString: true,
+                     i18nNormalizeLineEndingsInICUs: true
+                   });
 
-            expect(result.nonNormalizedIcuExpressions).toEqual([]);
-          });
-
-          it('should normalize line endings in nested expansion forms for inline templates', () => {
-            const result = tokenizeWithoutErrors(
-                `{\r\n` +
-                    `  messages.length, plural,\r\n` +
-                    `  =0 { zero \r\n` +
-                    `       {\r\n` +
-                    `         p.gender, select,\r\n` +
-                    `         male {m}\r\n` +
-                    `       }\r\n` +
-                    `     }\r\n` +
-                    `}`,
-                {tokenizeExpansionForms: true, escapedString: true});
-            expect(humanizeParts(result.tokens)).toEqual([
-              [lex.TokenType.EXPANSION_FORM_START],
-              [lex.TokenType.RAW_TEXT, '\n  messages.length'],
-              [lex.TokenType.RAW_TEXT, 'plural'],
-              [lex.TokenType.EXPANSION_CASE_VALUE, '=0'],
-              [lex.TokenType.EXPANSION_CASE_EXP_START],
-              [lex.TokenType.TEXT, 'zero \n       '],
+               expect(humanizeParts(result.tokens)).toEqual([
+                 [lex.TokenType.EXPANSION_FORM_START],
+                 [lex.TokenType.RAW_TEXT, '\n    messages.length'],
+                 [lex.TokenType.RAW_TEXT, 'plural'],
+                 [lex.TokenType.EXPANSION_CASE_VALUE, '=0'],
+                 [lex.TokenType.EXPANSION_CASE_EXP_START],
+                 [lex.TokenType.TEXT, 'You have \nno\n messages'],
+                 [lex.TokenType.EXPANSION_CASE_EXP_END],
+                 [lex.TokenType.EXPANSION_CASE_VALUE, '=1'],
+                 [lex.TokenType.EXPANSION_CASE_EXP_START],
+                 [lex.TokenType.TEXT, 'One {{message}}'],
+                 [lex.TokenType.EXPANSION_CASE_EXP_END],
+                 [lex.TokenType.EXPANSION_FORM_END],
+                 [lex.TokenType.TEXT, '\n'],
+                 [lex.TokenType.EOF],
+               ]);
 
-              [lex.TokenType.EXPANSION_FORM_START],
-              [lex.TokenType.RAW_TEXT, '\n         p.gender'],
-              [lex.TokenType.RAW_TEXT, 'select'],
-              [lex.TokenType.EXPANSION_CASE_VALUE, 'male'],
-              [lex.TokenType.EXPANSION_CASE_EXP_START],
-              [lex.TokenType.TEXT, 'm'],
-              [lex.TokenType.EXPANSION_CASE_EXP_END],
-              [lex.TokenType.EXPANSION_FORM_END],
+               expect(result.nonNormalizedIcuExpressions).toEqual([]);
+             });
 
-              [lex.TokenType.TEXT, '\n     '],
-              [lex.TokenType.EXPANSION_CASE_EXP_END],
-              [lex.TokenType.EXPANSION_FORM_END],
-              [lex.TokenType.EOF],
-            ]);
+          it('should not normalize line-endings in ICU expressions when `i18nNormalizeLineEndingsInICUs` is not defined',
+             () => {
+               const result = tokenizeWithoutErrors(
+                   `{\r\n` +
+                       `    messages.length,\r\n` +
+                       `    plural,\r\n` +
+                       `    =0 {You have \r\nno\r\n messages}\r\n` +
+                       `    =1 {One {{message}}}}\r\n`,
+                   {tokenizeExpansionForms: true, escapedString: true});
 
-            expect(result.nonNormalizedIcuExpressions).toEqual([]);
-          });
+               expect(humanizeParts(result.tokens)).toEqual([
+                 [lex.TokenType.EXPANSION_FORM_START],
+                 [lex.TokenType.RAW_TEXT, '\r\n    messages.length'],
+                 [lex.TokenType.RAW_TEXT, 'plural'],
+                 [lex.TokenType.EXPANSION_CASE_VALUE, '=0'],
+                 [lex.TokenType.EXPANSION_CASE_EXP_START],
+                 [lex.TokenType.TEXT, 'You have \nno\n messages'],
+                 [lex.TokenType.EXPANSION_CASE_EXP_END],
+                 [lex.TokenType.EXPANSION_CASE_VALUE, '=1'],
+                 [lex.TokenType.EXPANSION_CASE_EXP_START],
+                 [lex.TokenType.TEXT, 'One {{message}}'],
+                 [lex.TokenType.EXPANSION_CASE_EXP_END],
+                 [lex.TokenType.EXPANSION_FORM_END],
+                 [lex.TokenType.TEXT, '\n'],
+                 [lex.TokenType.EOF],
+               ]);
+
+               expect(result.nonNormalizedIcuExpressions!.length).toBe(1);
+               expect(result.nonNormalizedIcuExpressions![0].sourceSpan.toString())
+                   .toEqual('\r\n    messages.length');
+             });
+
+          it('should not normalize line endings in nested expansion forms when `i18nNormalizeLineEndingsInICUs` is not defined',
+             () => {
+               const result = tokenizeWithoutErrors(
+                   `{\r\n` +
+                       `  messages.length, plural,\r\n` +
+                       `  =0 { zero \r\n` +
+                       `       {\r\n` +
+                       `         p.gender, select,\r\n` +
+                       `         male {m}\r\n` +
+                       `       }\r\n` +
+                       `     }\r\n` +
+                       `}`,
+                   {tokenizeExpansionForms: true, escapedString: true});
+               expect(humanizeParts(result.tokens)).toEqual([
+                 [lex.TokenType.EXPANSION_FORM_START],
+                 [lex.TokenType.RAW_TEXT, '\r\n  messages.length'],
+                 [lex.TokenType.RAW_TEXT, 'plural'],
+                 [lex.TokenType.EXPANSION_CASE_VALUE, '=0'],
+                 [lex.TokenType.EXPANSION_CASE_EXP_START],
+                 [lex.TokenType.TEXT, 'zero \n       '],
+
+                 [lex.TokenType.EXPANSION_FORM_START],
+                 [lex.TokenType.RAW_TEXT, '\r\n         p.gender'],
+                 [lex.TokenType.RAW_TEXT, 'select'],
+                 [lex.TokenType.EXPANSION_CASE_VALUE, 'male'],
+                 [lex.TokenType.EXPANSION_CASE_EXP_START],
+                 [lex.TokenType.TEXT, 'm'],
+                 [lex.TokenType.EXPANSION_CASE_EXP_END],
+                 [lex.TokenType.EXPANSION_FORM_END],
+
+                 [lex.TokenType.TEXT, '\n     '],
+                 [lex.TokenType.EXPANSION_CASE_EXP_END],
+                 [lex.TokenType.EXPANSION_FORM_END],
+                 [lex.TokenType.EOF],
+               ]);
+
+               expect(result.nonNormalizedIcuExpressions!.length).toBe(2);
+               expect(result.nonNormalizedIcuExpressions![0].sourceSpan.toString())
+                   .toEqual('\r\n  messages.length');
+               expect(result.nonNormalizedIcuExpressions![1].sourceSpan.toString())
+                   .toEqual('\r\n         p.gender');
+             });
         });
 
         describe('{escapedString: false}', () => {
diff --git a/packages/compiler/test/output/js_emitter_spec.ts b/packages/compiler/test/output/js_emitter_spec.ts
index 9ab5e9d5a8fa0..e55c8e1339821 100644
--- a/packages/compiler/test/output/js_emitter_spec.ts
+++ b/packages/compiler/test/output/js_emitter_spec.ts
@@ -138,6 +138,8 @@ const externalModuleIdentifier = new o.ExternalReference(anotherModuleUrl, 'some
       const lhs = o.variable('lhs');
       const rhs = o.variable('rhs');
       expect(emitStmt(o.not(someVar).toStmt())).toEqual('!someVar;');
+      expect(emitStmt(o.unary(o.UnaryOperator.Minus, someVar).toStmt())).toEqual('(-someVar);');
+      expect(emitStmt(o.unary(o.UnaryOperator.Plus, someVar).toStmt())).toEqual('(+someVar);');
       expect(emitStmt(o.assertNotNull(someVar).toStmt())).toEqual('someVar;');
       expect(
           emitStmt(someVar.conditional(o.variable('trueCase'), o.variable('falseCase')).toStmt()))
@@ -187,8 +189,49 @@ const externalModuleIdentifier = new o.ExternalReference(anotherModuleUrl, 'some
       ].join('\n'));
     });
 
-    it('should support comments', () => {
-      expect(emitStmt(new o.CommentStmt('a\nb'))).toEqual(['// a', '// b'].join('\n'));
+    describe('comments', () => {
+      it('should support a preamble', () => {
+        expect(emitStmt(o.variable('a').toStmt(), '/* SomePreamble */')).toBe([
+          '/* SomePreamble */', 'a;'
+        ].join('\n'));
+      });
+
+      it('should support singleline comments', () => {
+        expect(emitStmt(new o.ReturnStatement(o.literal(1), null, [o.leadingComment('a\nb')])))
+            .toBe('// a\n// b\nreturn 1;');
+      });
+
+      it('should support multiline comments', () => {
+        expect(emitStmt(new o.ReturnStatement(o.literal(1), null, [
+          o.leadingComment('Multiline comment', true)
+        ]))).toBe('/* Multiline comment */\nreturn 1;');
+        expect(emitStmt(new o.ReturnStatement(o.literal(1), null, [
+          o.leadingComment(`Multiline\ncomment`, true)
+        ]))).toBe(`/* Multiline\ncomment */\nreturn 1;`);
+      });
+
+      it('should support inline multiline comments', () => {
+        expect(emitStmt(new o.ReturnStatement(o.literal(1), null, [
+          o.leadingComment('inline comment', true, false)
+        ]))).toBe('/* inline comment */return 1;');
+      });
+
+      it('should support JSDoc comments', () => {
+        expect(emitStmt(new o.ReturnStatement(o.literal(1), null, [
+          o.jsDocComment([{text: 'Intro comment'}])
+        ]))).toBe(`/**\n * Intro comment\n */\nreturn 1;`);
+        expect(emitStmt(new o.ReturnStatement(o.literal(1), null, [
+          o.jsDocComment([{tagName: o.JSDocTagName.Desc, text: 'description'}])
+        ]))).toBe(`/**\n * @desc description\n */\nreturn 1;`);
+        expect(emitStmt(new o.ReturnStatement(
+                   o.literal(1), null, [o.jsDocComment([
+                     {text: 'Intro comment'},
+                     {tagName: o.JSDocTagName.Desc, text: 'description'},
+                     {tagName: o.JSDocTagName.Id, text: '{number} identifier 123'},
+                   ])])))
+            .toBe(
+                `/**\n * Intro comment\n * @desc description\n * @id {number} identifier 123\n */\nreturn 1;`);
+      });
     });
 
     it('should support if stmt', () => {
@@ -203,9 +246,12 @@ const externalModuleIdentifier = new o.ExternalReference(anotherModuleUrl, 'some
     });
 
     it('should support ES5 localized strings', () => {
-      expect(emitStmt(new o.ExpressionStatement(o.localizedString(
-                 {}, ['ab\\:c', 'd"e\'f'], ['ph1'],
-                 [o.literal(7, o.NUMBER_TYPE).plus(o.literal(8, o.NUMBER_TYPE))]))))
+      const messageParts =
+          [new o.LiteralPiece('ab\\:c', {} as any), new o.LiteralPiece('d"e\'f', {} as any)];
+      const placeholders = [new o.PlaceholderPiece('ph1', {} as any)];
+      const expressions = [o.literal(7, o.NUMBER_TYPE).plus(o.literal(8, o.NUMBER_TYPE))];
+      const localizedString = o.localizedString({}, messageParts, placeholders, expressions);
+      expect(emitStmt(new o.ExpressionStatement(localizedString)))
           .toEqual(
               String.raw
               `$localize((this&&this.__makeTemplateObject||function(e,t){return Object.defineProperty?Object.defineProperty(e,"raw",{value:t}):e.raw=t,e})(['ab\\:c', ':ph1:d"e\'f'], ['ab\\\\:c', ':ph1:d"e\'f']), (7 + 8));`);
diff --git a/packages/compiler/test/output/output_ast_spec.ts b/packages/compiler/test/output/output_ast_spec.ts
index c330ad8aae98a..d0130d17191a9 100644
--- a/packages/compiler/test/output/output_ast_spec.ts
+++ b/packages/compiler/test/output/output_ast_spec.ts
@@ -21,22 +21,5 @@ import * as o from '../../src/output/output_ast';
         expect(o.collectExternalReferences([stmt])).toEqual([ref1, ref2]);
       });
     });
-
-    describe('comments', () => {
-      it('different JSDocCommentStmt should not be equivalent', () => {
-        const comment1 = new o.JSDocCommentStmt([{text: 'text'}]);
-        const comment2 = new o.JSDocCommentStmt([{text: 'text2'}]);
-        const comment3 = new o.JSDocCommentStmt([{tagName: o.JSDocTagName.Desc, text: 'text2'}]);
-        const comment4 = new o.JSDocCommentStmt([{text: 'text2'}, {text: 'text3'}]);
-
-        expect(comment1.isEquivalent(comment2)).toBeFalsy();
-        expect(comment1.isEquivalent(comment3)).toBeFalsy();
-        expect(comment1.isEquivalent(comment4)).toBeFalsy();
-        expect(comment2.isEquivalent(comment3)).toBeFalsy();
-        expect(comment2.isEquivalent(comment4)).toBeFalsy();
-        expect(comment3.isEquivalent(comment4)).toBeFalsy();
-        expect(comment1.isEquivalent(comment1)).toBeTruthy();
-      });
-    });
   });
 }
diff --git a/packages/compiler/test/output/ts_emitter_spec.ts b/packages/compiler/test/output/ts_emitter_spec.ts
index 810d24cbc2c85..33f659dbec6e7 100644
--- a/packages/compiler/test/output/ts_emitter_spec.ts
+++ b/packages/compiler/test/output/ts_emitter_spec.ts
@@ -191,6 +191,8 @@ const externalModuleIdentifier = new o.ExternalReference(anotherModuleUrl, 'some
       const rhs = o.variable('rhs');
       expect(emitStmt(someVar.cast(o.INT_TYPE).toStmt())).toEqual('(<number>someVar);');
       expect(emitStmt(o.not(someVar).toStmt())).toEqual('!someVar;');
+      expect(emitStmt(o.unary(o.UnaryOperator.Minus, someVar).toStmt())).toEqual('(-someVar);');
+      expect(emitStmt(o.unary(o.UnaryOperator.Plus, someVar).toStmt())).toEqual('(+someVar);');
       expect(emitStmt(o.assertNotNull(someVar).toStmt())).toEqual('someVar!;');
       expect(
           emitStmt(someVar.conditional(o.variable('trueCase'), o.variable('falseCase')).toStmt()))
@@ -237,7 +239,8 @@ const externalModuleIdentifier = new o.ExternalReference(anotherModuleUrl, 'some
     });
 
     it('should support comments', () => {
-      expect(emitStmt(new o.CommentStmt('a\nb'))).toEqual(['// a', '// b'].join('\n'));
+      expect(emitStmt(new o.ReturnStatement(o.literal(1), null, [o.leadingComment('a\nb')])))
+          .toEqual('// a\n// b\nreturn 1;');
     });
 
     it('should support if stmt', () => {
@@ -252,9 +255,12 @@ const externalModuleIdentifier = new o.ExternalReference(anotherModuleUrl, 'some
     });
 
     it('should support localized strings', () => {
-      expect(emitStmt(new o.ExpressionStatement(o.localizedString(
-                 {}, ['ab\\:c', 'd"e\'f'], ['ph1'],
-                 [o.literal(7, o.NUMBER_TYPE).plus(o.literal(8, o.NUMBER_TYPE))]))))
+      const messageParts =
+          [new o.LiteralPiece('ab\\:c', {} as any), new o.LiteralPiece('d"e\'f', {} as any)];
+      const placeholders = [new o.PlaceholderPiece('ph1', {} as any)];
+      const expressions = [o.literal(7, o.NUMBER_TYPE).plus(o.literal(8, o.NUMBER_TYPE))];
+      const localizedString = o.localizedString({}, messageParts, placeholders, expressions);
+      expect(emitStmt(new o.ExpressionStatement(localizedString)))
           .toEqual('$localize `ab\\\\:c${(7 + 8)}:ph1:d"e\'f`;');
     });
 
@@ -436,29 +442,40 @@ const externalModuleIdentifier = new o.ExternalReference(anotherModuleUrl, 'some
       });
 
       it('should support singleline comments', () => {
-        expect(emitStmt(new o.CommentStmt('Simple comment'))).toBe('// Simple comment');
+        expect(emitStmt(new o.ReturnStatement(o.literal(1), null, [o.leadingComment('a\nb')])))
+            .toBe('// a\n// b\nreturn 1;');
       });
 
       it('should support multiline comments', () => {
-        expect(emitStmt(new o.CommentStmt('Multiline comment', true)))
-            .toBe('/* Multiline comment */');
-        expect(emitStmt(new o.CommentStmt(`Multiline\ncomment`, true)))
-            .toBe(`/* Multiline\ncomment */`);
+        expect(emitStmt(new o.ReturnStatement(o.literal(1), null, [
+          o.leadingComment('Multiline comment', true)
+        ]))).toBe('/* Multiline comment */\nreturn 1;');
+        expect(emitStmt(new o.ReturnStatement(o.literal(1), null, [
+          o.leadingComment(`Multiline\ncomment`, true)
+        ]))).toBe(`/* Multiline\ncomment */\nreturn 1;`);
+      });
+
+      it('should support inline multiline comments', () => {
+        expect(emitStmt(new o.ReturnStatement(o.literal(1), null, [
+          o.leadingComment('inline comment', true, false)
+        ]))).toBe('/* inline comment */return 1;');
       });
 
       it('should support JSDoc comments', () => {
-        expect(emitStmt(new o.JSDocCommentStmt([{text: 'Intro comment'}])))
-            .toBe(`/**\n * Intro comment\n */`);
-        expect(emitStmt(new o.JSDocCommentStmt([
-          {tagName: o.JSDocTagName.Desc, text: 'description'}
-        ]))).toBe(`/**\n * @desc description\n */`);
-        expect(emitStmt(new o.JSDocCommentStmt([
-          {text: 'Intro comment'},
-          {tagName: o.JSDocTagName.Desc, text: 'description'},
-          {tagName: o.JSDocTagName.Id, text: '{number} identifier 123'},
-        ])))
+        expect(emitStmt(new o.ReturnStatement(o.literal(1), null, [
+          o.jsDocComment([{text: 'Intro comment'}])
+        ]))).toBe(`/**\n * Intro comment\n */\nreturn 1;`);
+        expect(emitStmt(new o.ReturnStatement(o.literal(1), null, [
+          o.jsDocComment([{tagName: o.JSDocTagName.Desc, text: 'description'}])
+        ]))).toBe(`/**\n * @desc description\n */\nreturn 1;`);
+        expect(emitStmt(new o.ReturnStatement(
+                   o.literal(1), null, [o.jsDocComment([
+                     {text: 'Intro comment'},
+                     {tagName: o.JSDocTagName.Desc, text: 'description'},
+                     {tagName: o.JSDocTagName.Id, text: '{number} identifier 123'},
+                   ])])))
             .toBe(
-                `/**\n * Intro comment\n * @desc description\n * @id {number} identifier 123\n */`);
+                `/**\n * Intro comment\n * @desc description\n * @id {number} identifier 123\n */\nreturn 1;`);
       });
     });
 
diff --git a/packages/compiler/test/render3/r3_ast_absolute_span_spec.ts b/packages/compiler/test/render3/r3_ast_absolute_span_spec.ts
index 4f3425d07c4ce..bb9082b245456 100644
--- a/packages/compiler/test/render3/r3_ast_absolute_span_spec.ts
+++ b/packages/compiler/test/render3/r3_ast_absolute_span_spec.ts
@@ -339,4 +339,25 @@ describe('expression AST absolute source spans', () => {
               [['As', new AbsoluteSourceSpan(22, 24)], ['Bs', new AbsoluteSourceSpan(35, 37)]]));
     });
   });
+
+  describe('ICU expressions', () => {
+    it('is correct for variables and placeholders', () => {
+      const spans = humanizeExpressionSource(
+          parse('<span i18n>{item.var, plural, other { {{item.placeholder}} items } }</span>')
+              .nodes);
+      expect(spans).toContain(['item.var', new AbsoluteSourceSpan(12, 20)]);
+      expect(spans).toContain(['item.placeholder', new AbsoluteSourceSpan(40, 56)]);
+    });
+
+    it('is correct for variables and placeholders', () => {
+      const spans = humanizeExpressionSource(
+          parse(
+              '<span i18n>{item.var, plural, other { {{item.placeholder}} {nestedVar, plural, other { {{nestedPlaceholder}} }}} }</span>')
+              .nodes);
+      expect(spans).toContain(['item.var', new AbsoluteSourceSpan(12, 20)]);
+      expect(spans).toContain(['item.placeholder', new AbsoluteSourceSpan(40, 56)]);
+      expect(spans).toContain(['nestedVar', new AbsoluteSourceSpan(60, 69)]);
+      expect(spans).toContain(['nestedPlaceholder', new AbsoluteSourceSpan(89, 106)]);
+    });
+  });
 });
diff --git a/packages/compiler/test/render3/r3_ast_spans_spec.ts b/packages/compiler/test/render3/r3_ast_spans_spec.ts
index 38f6d93d42797..7cbfc704ad7eb 100644
--- a/packages/compiler/test/render3/r3_ast_spans_spec.ts
+++ b/packages/compiler/test/render3/r3_ast_spans_spec.ts
@@ -50,8 +50,12 @@ class R3AstSourceSpans implements t.Visitor<void> {
   }
 
   visitVariable(variable: t.Variable) {
-    this.result.push(
-        ['Variable', humanizeSpan(variable.sourceSpan), humanizeSpan(variable.valueSpan)]);
+    this.result.push([
+      'Variable',
+      humanizeSpan(variable.sourceSpan),
+      humanizeSpan(variable.keySpan),
+      humanizeSpan(variable.valueSpan),
+    ]);
   }
 
   visitReference(reference: t.Reference) {
@@ -65,8 +69,10 @@ class R3AstSourceSpans implements t.Visitor<void> {
   }
 
   visitBoundAttribute(attribute: t.BoundAttribute) {
-    this.result.push(
-        ['BoundAttribute', humanizeSpan(attribute.sourceSpan), humanizeSpan(attribute.valueSpan)]);
+    this.result.push([
+      'BoundAttribute', humanizeSpan(attribute.sourceSpan), humanizeSpan(attribute.keySpan),
+      humanizeSpan(attribute.valueSpan)
+    ]);
   }
 
   visitBoundEvent(event: t.BoundEvent) {
@@ -83,7 +89,13 @@ class R3AstSourceSpans implements t.Visitor<void> {
   }
 
   visitIcu(icu: t.Icu) {
-    return null;
+    this.result.push(['Icu', humanizeSpan(icu.sourceSpan)]);
+    for (const key of Object.keys(icu.vars)) {
+      this.result.push(['Icu:Var', humanizeSpan(icu.vars[key].sourceSpan)]);
+    }
+    for (const key of Object.keys(icu.placeholders)) {
+      this.result.push(['Icu:Placeholder', humanizeSpan(icu.placeholders[key].sourceSpan)]);
+    }
   }
 
   private visitAll(nodes: t.Node[][]) {
@@ -95,7 +107,7 @@ function humanizeSpan(span: ParseSourceSpan|null|undefined): string {
   if (span === null || span === undefined) {
     return `<empty>`;
   }
-  return `${span.start.offset}:${span.end.offset}`;
+  return span.toString();
 }
 
 function expectFromHtml(html: string) {
@@ -113,21 +125,21 @@ describe('R3 AST source spans', () => {
   describe('nodes without binding', () => {
     it('is correct for text nodes', () => {
       expectFromHtml('a').toEqual([
-        ['Text', '0:1'],
+        ['Text', 'a'],
       ]);
     });
 
     it('is correct for elements with attributes', () => {
       expectFromHtml('<div a="b"></div>').toEqual([
-        ['Element', '0:17', '0:11', '11:17'],
-        ['TextAttribute', '5:10', '8:9'],
+        ['Element', '<div a="b"></div>', '<div a="b">', '</div>'],
+        ['TextAttribute', 'a="b"', 'b'],
       ]);
     });
 
     it('is correct for elements with attributes without value', () => {
       expectFromHtml('<div a></div>').toEqual([
-        ['Element', '0:13', '0:7', '7:13'],
-        ['TextAttribute', '5:6', '<empty>'],
+        ['Element', '<div a></div>', '<div a>', '</div>'],
+        ['TextAttribute', 'a', '<empty>'],
       ]);
     });
   });
@@ -135,7 +147,7 @@ describe('R3 AST source spans', () => {
   describe('bound text nodes', () => {
     it('is correct for bound text nodes', () => {
       expectFromHtml('{{a}}').toEqual([
-        ['BoundText', '0:5'],
+        ['BoundText', '{{a}}'],
       ]);
     });
   });
@@ -143,29 +155,36 @@ describe('R3 AST source spans', () => {
   describe('bound attributes', () => {
     it('is correct for bound properties', () => {
       expectFromHtml('<div [someProp]="v"></div>').toEqual([
-        ['Element', '0:26', '0:20', '20:26'],
-        ['BoundAttribute', '5:19', '17:18'],
+        ['Element', '<div [someProp]="v"></div>', '<div [someProp]="v">', '</div>'],
+        ['BoundAttribute', '[someProp]="v"', 'someProp', 'v'],
       ]);
     });
 
     it('is correct for bound properties without value', () => {
       expectFromHtml('<div [someProp]></div>').toEqual([
-        ['Element', '0:22', '0:16', '16:22'],
-        ['BoundAttribute', '5:15', '<empty>'],
+        ['Element', '<div [someProp]></div>', '<div [someProp]>', '</div>'],
+        ['BoundAttribute', '[someProp]', 'someProp', '<empty>'],
       ]);
     });
 
     it('is correct for bound properties via bind- ', () => {
       expectFromHtml('<div bind-prop="v"></div>').toEqual([
-        ['Element', '0:25', '0:19', '19:25'],
-        ['BoundAttribute', '5:18', '16:17'],
+        ['Element', '<div bind-prop="v"></div>', '<div bind-prop="v">', '</div>'],
+        ['BoundAttribute', 'bind-prop="v"', 'prop', 'v'],
       ]);
     });
 
     it('is correct for bound properties via {{...}}', () => {
       expectFromHtml('<div prop="{{v}}"></div>').toEqual([
-        ['Element', '0:24', '0:18', '18:24'],
-        ['BoundAttribute', '5:17', '11:16'],
+        ['Element', '<div prop="{{v}}"></div>', '<div prop="{{v}}">', '</div>'],
+        ['BoundAttribute', 'prop="{{v}}"', 'prop', '{{v}}'],
+      ]);
+    });
+
+    it('is correct for bound properties via data-', () => {
+      expectFromHtml('<div data-prop="{{v}}"></div>').toEqual([
+        ['Element', '<div data-prop="{{v}}"></div>', '<div data-prop="{{v}}">', '</div>'],
+        ['BoundAttribute', 'data-prop="{{v}}"', 'prop', '{{v}}'],
       ]);
     });
   });
@@ -173,57 +192,88 @@ describe('R3 AST source spans', () => {
   describe('templates', () => {
     it('is correct for * directives', () => {
       expectFromHtml('<div *ngIf></div>').toEqual([
-        ['Template', '0:11', '0:11', '11:17'],
-        ['TextAttribute', '5:10', '<empty>'],
-        ['Element', '0:17', '0:11', '11:17'],
+        ['Template', '<div *ngIf></div>', '<div *ngIf>', '</div>'],
+        ['TextAttribute', 'ngIf', '<empty>'],
+        ['Element', '<div *ngIf></div>', '<div *ngIf>', '</div>'],
       ]);
     });
 
     it('is correct for <ng-template>', () => {
       expectFromHtml('<ng-template></ng-template>').toEqual([
-        ['Template', '0:13', '0:13', '13:27'],
+        ['Template', '<ng-template></ng-template>', '<ng-template>', '</ng-template>'],
       ]);
     });
 
     it('is correct for reference via #...', () => {
       expectFromHtml('<ng-template #a></ng-template>').toEqual([
-        ['Template', '0:16', '0:16', '16:30'],
-        ['Reference', '13:15', '<empty>'],
+        ['Template', '<ng-template #a></ng-template>', '<ng-template #a>', '</ng-template>'],
+        ['Reference', '#a', '<empty>'],
       ]);
     });
 
     it('is correct for reference with name', () => {
       expectFromHtml('<ng-template #a="b"></ng-template>').toEqual([
-        ['Template', '0:20', '0:20', '20:34'],
-        ['Reference', '13:19', '17:18'],
+        [
+          'Template', '<ng-template #a="b"></ng-template>', '<ng-template #a="b">', '</ng-template>'
+        ],
+        ['Reference', '#a="b"', 'b'],
       ]);
     });
 
     it('is correct for reference via ref-...', () => {
       expectFromHtml('<ng-template ref-a></ng-template>').toEqual([
-        ['Template', '0:19', '0:19', '19:33'],
-        ['Reference', '13:18', '<empty>'],
+        ['Template', '<ng-template ref-a></ng-template>', '<ng-template ref-a>', '</ng-template>'],
+        ['Reference', 'ref-a', '<empty>'],
+      ]);
+    });
+
+    it('is correct for reference via data-ref-...', () => {
+      expectFromHtml('<ng-template data-ref-a></ng-template>').toEqual([
+        [
+          'Template', '<ng-template data-ref-a></ng-template>', '<ng-template data-ref-a>',
+          '</ng-template>'
+        ],
+        ['Reference', 'data-ref-a', '<empty>'],
       ]);
     });
 
     it('is correct for variables via let-...', () => {
       expectFromHtml('<ng-template let-a="b"></ng-template>').toEqual([
-        ['Template', '0:23', '0:23', '23:37'],
-        ['Variable', '13:22', '20:21'],
+        [
+          'Template', '<ng-template let-a="b"></ng-template>', '<ng-template let-a="b">',
+          '</ng-template>'
+        ],
+        ['Variable', 'let-a="b"', 'a', 'b'],
+      ]);
+    });
+
+    it('is correct for variables via data-let-...', () => {
+      expectFromHtml('<ng-template data-let-a="b"></ng-template>').toEqual([
+        [
+          'Template', '<ng-template data-let-a="b"></ng-template>', '<ng-template data-let-a="b">',
+          '</ng-template>'
+        ],
+        ['Variable', 'data-let-a="b"', 'a', 'b'],
       ]);
     });
 
     it('is correct for attributes', () => {
       expectFromHtml('<ng-template k1="v1"></ng-template>').toEqual([
-        ['Template', '0:21', '0:21', '21:35'],
-        ['TextAttribute', '13:20', '17:19'],
+        [
+          'Template', '<ng-template k1="v1"></ng-template>', '<ng-template k1="v1">',
+          '</ng-template>'
+        ],
+        ['TextAttribute', 'k1="v1"', 'v1'],
       ]);
     });
 
     it('is correct for bound attributes', () => {
       expectFromHtml('<ng-template [k1]="v1"></ng-template>').toEqual([
-        ['Template', '0:23', '0:23', '23:37'],
-        ['BoundAttribute', '13:22', '19:21'],
+        [
+          'Template', '<ng-template [k1]="v1"></ng-template>', '<ng-template [k1]="v1">',
+          '</ng-template>'
+        ],
+        ['BoundAttribute', '[k1]="v1"', 'k1', 'v1'],
       ]);
     });
   });
@@ -236,11 +286,17 @@ describe('R3 AST source spans', () => {
       //   <div></div>
       // </ng-template>
       expectFromHtml('<div *ngFor="let item of items"></div>').toEqual([
-        ['Template', '0:32', '0:32', '32:38'],
-        ['TextAttribute', '5:31', '<empty>'],
-        ['BoundAttribute', '5:31', '25:30'],  // *ngFor="let item of items" -> items
-        ['Variable', '13:22', '<empty>'],     // let item
-        ['Element', '0:38', '0:32', '32:38'],
+        [
+          'Template', '<div *ngFor="let item of items"></div>', '<div *ngFor="let item of items">',
+          '</div>'
+        ],
+        ['TextAttribute', 'ngFor', '<empty>'],
+        ['BoundAttribute', 'of items', 'of', 'items'],
+        ['Variable', 'let item ', 'item', '<empty>'],
+        [
+          'Element', '<div *ngFor="let item of items"></div>', '<div *ngFor="let item of items">',
+          '</div>'
+        ],
       ]);
 
       // Note that this test exercises an *incorrect* usage of the ngFor
@@ -250,28 +306,46 @@ describe('R3 AST source spans', () => {
       //   <div></div>
       // </ng-template>
       expectFromHtml('<div *ngFor="item of items"></div>').toEqual([
-        ['Template', '0:28', '0:28', '28:34'],
-        ['BoundAttribute', '5:27', '13:17'],  // ngFor="item of items" -> item
-        ['BoundAttribute', '5:27', '21:26'],  // ngFor="item of items" -> items
-        ['Element', '0:34', '0:28', '28:34'],
+        [
+          'Template', '<div *ngFor="item of items"></div>', '<div *ngFor="item of items">', '</div>'
+        ],
+        ['BoundAttribute', 'ngFor="item ', 'ngFor', 'item'],
+        ['BoundAttribute', 'of items', 'of', 'items'],
+        ['Element', '<div *ngFor="item of items"></div>', '<div *ngFor="item of items">', '</div>'],
+      ]);
+
+      expectFromHtml('<div *ngFor="let item of items; trackBy: trackByFn"></div>').toEqual([
+        [
+          'Template', '<div *ngFor="let item of items; trackBy: trackByFn"></div>',
+          '<div *ngFor="let item of items; trackBy: trackByFn">', '</div>'
+        ],
+        ['TextAttribute', 'ngFor', '<empty>'],
+        ['BoundAttribute', 'of items; ', 'of', 'items'],
+        ['BoundAttribute', 'trackBy: trackByFn', 'trackBy', 'trackByFn'],
+        ['Variable', 'let item ', 'item', '<empty>'],
+        [
+          'Element', '<div *ngFor="let item of items; trackBy: trackByFn"></div>',
+          '<div *ngFor="let item of items; trackBy: trackByFn">', '</div>'
+        ],
+
       ]);
     });
 
     it('is correct for variables via let ...', () => {
       expectFromHtml('<div *ngIf="let a=b"></div>').toEqual([
-        ['Template', '0:21', '0:21', '21:27'],
-        ['TextAttribute', '5:20', '<empty>'],
-        ['Variable', '12:19', '18:19'],  // let a=b -> b
-        ['Element', '0:27', '0:21', '21:27'],
+        ['Template', '<div *ngIf="let a=b"></div>', '<div *ngIf="let a=b">', '</div>'],
+        ['TextAttribute', 'ngIf', '<empty>'],
+        ['Variable', 'let a=b', 'a', 'b'],
+        ['Element', '<div *ngIf="let a=b"></div>', '<div *ngIf="let a=b">', '</div>'],
       ]);
     });
 
     it('is correct for variables via as ...', () => {
       expectFromHtml('<div *ngIf="expr as local"></div>').toEqual([
-        ['Template', '0:27', '0:27', '27:33'],
-        ['BoundAttribute', '5:26', '12:16'],  // ngIf="expr as local" -> expr
-        ['Variable', '6:25', '6:10'],         // ngIf="expr as local -> ngIf
-        ['Element', '0:33', '0:27', '27:33'],
+        ['Template', '<div *ngIf="expr as local"></div>', '<div *ngIf="expr as local">', '</div>'],
+        ['BoundAttribute', 'ngIf="expr ', 'ngIf', 'expr'],
+        ['Variable', 'ngIf="expr as local', 'local', 'ngIf'],
+        ['Element', '<div *ngIf="expr as local"></div>', '<div *ngIf="expr as local">', '</div>'],
       ]);
     });
   });
@@ -279,31 +353,46 @@ describe('R3 AST source spans', () => {
   describe('events', () => {
     it('is correct for event names case sensitive', () => {
       expectFromHtml('<div (someEvent)="v"></div>').toEqual([
-        ['Element', '0:27', '0:21', '21:27'],
-        ['BoundEvent', '5:20', '18:19'],
+        ['Element', '<div (someEvent)="v"></div>', '<div (someEvent)="v">', '</div>'],
+        ['BoundEvent', '(someEvent)="v"', 'v'],
       ]);
     });
 
     it('is correct for bound events via on-', () => {
       expectFromHtml('<div on-event="v"></div>').toEqual([
-        ['Element', '0:24', '0:18', '18:24'],
-        ['BoundEvent', '5:17', '15:16'],
+        ['Element', '<div on-event="v"></div>', '<div on-event="v">', '</div>'],
+        ['BoundEvent', 'on-event="v"', 'v'],
+      ]);
+    });
+
+    it('is correct for bound events via data-on-', () => {
+      expectFromHtml('<div data-on-event="v"></div>').toEqual([
+        ['Element', '<div data-on-event="v"></div>', '<div data-on-event="v">', '</div>'],
+        ['BoundEvent', 'data-on-event="v"', 'v'],
       ]);
     });
 
     it('is correct for bound events and properties via [(...)]', () => {
       expectFromHtml('<div [(prop)]="v"></div>').toEqual([
-        ['Element', '0:24', '0:18', '18:24'],
-        ['BoundAttribute', '5:17', '15:16'],
-        ['BoundEvent', '5:17', '15:16'],
+        ['Element', '<div [(prop)]="v"></div>', '<div [(prop)]="v">', '</div>'],
+        ['BoundAttribute', '[(prop)]="v"', 'prop', 'v'],
+        ['BoundEvent', '[(prop)]="v"', 'v'],
       ]);
     });
 
     it('is correct for bound events and properties via bindon-', () => {
       expectFromHtml('<div bindon-prop="v"></div>').toEqual([
-        ['Element', '0:27', '0:21', '21:27'],
-        ['BoundAttribute', '5:20', '18:19'],
-        ['BoundEvent', '5:20', '18:19'],
+        ['Element', '<div bindon-prop="v"></div>', '<div bindon-prop="v">', '</div>'],
+        ['BoundAttribute', 'bindon-prop="v"', 'prop', 'v'],
+        ['BoundEvent', 'bindon-prop="v"', 'v'],
+      ]);
+    });
+
+    it('is correct for bound events and properties via data-bindon-', () => {
+      expectFromHtml('<div data-bindon-prop="v"></div>').toEqual([
+        ['Element', '<div data-bindon-prop="v"></div>', '<div data-bindon-prop="v">', '</div>'],
+        ['BoundAttribute', 'data-bindon-prop="v"', 'prop', 'v'],
+        ['BoundEvent', 'data-bindon-prop="v"', 'v'],
       ]);
     });
   });
@@ -311,23 +400,66 @@ describe('R3 AST source spans', () => {
   describe('references', () => {
     it('is correct for references via #...', () => {
       expectFromHtml('<div #a></div>').toEqual([
-        ['Element', '0:14', '0:8', '8:14'],
-        ['Reference', '5:7', '<empty>'],
+        ['Element', '<div #a></div>', '<div #a>', '</div>'],
+        ['Reference', '#a', '<empty>'],
       ]);
     });
 
     it('is correct for references with name', () => {
       expectFromHtml('<div #a="b"></div>').toEqual([
-        ['Element', '0:18', '0:12', '12:18'],
-        ['Reference', '5:11', '9:10'],
+        ['Element', '<div #a="b"></div>', '<div #a="b">', '</div>'],
+        ['Reference', '#a="b"', 'b'],
       ]);
     });
 
     it('is correct for references via ref-', () => {
       expectFromHtml('<div ref-a></div>').toEqual([
-        ['Element', '0:17', '0:11', '11:17'],
-        ['Reference', '5:10', '<empty>'],
+        ['Element', '<div ref-a></div>', '<div ref-a>', '</div>'],
+        ['Reference', 'ref-a', '<empty>'],
+      ]);
+    });
+
+    it('is correct for references via data-ref-', () => {
+      expectFromHtml('<div ref-a></div>').toEqual([
+        ['Element', '<div ref-a></div>', '<div ref-a>', '</div>'],
+        ['Reference', 'ref-a', '<empty>'],
       ]);
     });
   });
+
+  describe('ICU expressions', () => {
+    it('is correct for variables and placeholders', () => {
+      expectFromHtml('<span i18n>{item.var, plural, other { {{item.placeholder}} items } }</span>')
+          .toEqual([
+            [
+              'Element',
+              '<span i18n>{item.var, plural, other { {{item.placeholder}} items } }</span>',
+              '<span i18n>', '</span>'
+            ],
+            ['Icu', '{item.var, plural, other { {{item.placeholder}} items } }'],
+            ['Icu:Var', 'item.var'],
+            ['Icu:Placeholder', '{{item.placeholder}}'],
+          ]);
+    });
+
+    it('is correct for nested ICUs', () => {
+      expectFromHtml(
+          '<span i18n>{item.var, plural, other { {{item.placeholder}} {nestedVar, plural, other { {{nestedPlaceholder}} }}} }</span>')
+          .toEqual([
+            [
+              'Element',
+              '<span i18n>{item.var, plural, other { {{item.placeholder}} {nestedVar, plural, other { {{nestedPlaceholder}} }}} }</span>',
+              '<span i18n>', '</span>'
+            ],
+            [
+              'Icu',
+              '{item.var, plural, other { {{item.placeholder}} {nestedVar, plural, other { {{nestedPlaceholder}} }}} }'
+            ],
+            ['Icu:Var', 'nestedVar'],
+            ['Icu:Var', 'item.var'],
+            ['Icu:Placeholder', '{{item.placeholder}}'],
+            ['Icu:Placeholder', '{{nestedPlaceholder}}'],
+          ]);
+    });
+  });
 });
diff --git a/packages/compiler/test/render3/util/expression.ts b/packages/compiler/test/render3/util/expression.ts
index 183151315820c..a0af48ba91e00 100644
--- a/packages/compiler/test/render3/util/expression.ts
+++ b/packages/compiler/test/render3/util/expression.ts
@@ -141,7 +141,14 @@ class ExpressionSourceHumanizer extends e.RecursiveAstVisitor implements t.Visit
   }
   visitContent(ast: t.Content) {}
   visitText(ast: t.Text) {}
-  visitIcu(ast: t.Icu) {}
+  visitIcu(ast: t.Icu) {
+    for (const key of Object.keys(ast.vars)) {
+      ast.vars[key].visit(this);
+    }
+    for (const key of Object.keys(ast.placeholders)) {
+      ast.placeholders[key].visit(this);
+    }
+  }
 }
 
 /**
diff --git a/packages/compiler/test/render3/view/binding_spec.ts b/packages/compiler/test/render3/view/binding_spec.ts
index 02e9a7ee9544e..5d792c338eb5a 100644
--- a/packages/compiler/test/render3/view/binding_spec.ts
+++ b/packages/compiler/test/render3/view/binding_spec.ts
@@ -8,42 +8,61 @@
 
 import * as e from '../../../src/expression_parser/ast';
 import * as a from '../../../src/render3/r3_ast';
-import {DirectiveMeta} from '../../../src/render3/view/t2_api';
+import {DirectiveMeta, InputOutputPropertySet} from '../../../src/render3/view/t2_api';
 import {R3TargetBinder} from '../../../src/render3/view/t2_binder';
 import {parseTemplate} from '../../../src/render3/view/template';
 import {CssSelector, SelectorMatcher} from '../../../src/selector';
 
 import {findExpression} from './util';
 
+/**
+ * A `InputOutputPropertySet` which only uses an identity mapping for fields and properties.
+ */
+class IdentityInputMapping implements InputOutputPropertySet {
+  private names: Set<string>;
+
+  constructor(names: string[]) {
+    this.names = new Set(names);
+  }
+
+  hasBindingPropertyName(propertyName: string): boolean {
+    return this.names.has(propertyName);
+  }
+}
+
 function makeSelectorMatcher(): SelectorMatcher<DirectiveMeta> {
   const matcher = new SelectorMatcher<DirectiveMeta>();
   matcher.addSelectables(CssSelector.parse('[ngFor][ngForOf]'), {
     name: 'NgFor',
     exportAs: null,
-    inputs: {'ngForOf': 'ngForOf'},
-    outputs: {},
+    inputs: new IdentityInputMapping(['ngForOf']),
+    outputs: new IdentityInputMapping([]),
     isComponent: false,
+    selector: '[ngFor][ngForOf]',
   });
   matcher.addSelectables(CssSelector.parse('[dir]'), {
     name: 'Dir',
     exportAs: null,
-    inputs: {},
-    outputs: {},
+    inputs: new IdentityInputMapping([]),
+    outputs: new IdentityInputMapping([]),
     isComponent: false,
+    selector: '[dir]'
   });
   matcher.addSelectables(CssSelector.parse('[hasOutput]'), {
     name: 'HasOutput',
     exportAs: null,
-    inputs: {},
-    outputs: {'outputBinding': 'outputBinding'},
+    inputs: new IdentityInputMapping([]),
+    outputs: new IdentityInputMapping(['outputBinding']),
     isComponent: false,
+    selector: '[hasOutput]'
   });
   matcher.addSelectables(CssSelector.parse('[hasInput]'), {
     name: 'HasInput',
     exportAs: null,
-    inputs: {'inputBinding': 'inputBinding'},
-    outputs: {},
+    inputs: new IdentityInputMapping(['inputBinding']),
+    outputs: new IdentityInputMapping([]),
     isComponent: false,
+    selector: '[hasInput]'
   });
   return matcher;
 }
@@ -85,9 +104,10 @@ describe('t2 binding', () => {
     matcher.addSelectables(CssSelector.parse('text[dir]'), {
       name: 'Dir',
       exportAs: null,
-      inputs: {},
-      outputs: {},
+      inputs: new IdentityInputMapping([]),
+      outputs: new IdentityInputMapping([]),
       isComponent: false,
+      selector: 'text[dir]'
     });
     const binder = new R3TargetBinder(matcher);
     const res = binder.bind({template: template.nodes});
@@ -179,4 +199,38 @@ describe('t2 binding', () => {
       expect(consumer).toEqual(el);
     });
   });
+
+  describe('used pipes', () => {
+    it('should record pipes used in interpolations', () => {
+      const template = parseTemplate('{{value|date}}', '', {});
+      const binder = new R3TargetBinder(makeSelectorMatcher());
+      const res = binder.bind({template: template.nodes});
+      expect(res.getUsedPipes()).toEqual(['date']);
+    });
+
+    it('should record pipes used in bound attributes', () => {
+      const template = parseTemplate('<person [age]="age|number"></person>', '', {});
+      const binder = new R3TargetBinder(makeSelectorMatcher());
+      const res = binder.bind({template: template.nodes});
+      expect(res.getUsedPipes()).toEqual(['number']);
+    });
+
+    it('should record pipes used in bound template attributes', () => {
+      const template = parseTemplate('<ng-template [ngIf]="obs|async"></ng-template>', '', {});
+      const binder = new R3TargetBinder(makeSelectorMatcher());
+      const res = binder.bind({template: template.nodes});
+      expect(res.getUsedPipes()).toEqual(['async']);
+    });
+
+    it('should record pipes used in ICUs', () => {
+      const template = parseTemplate(
+          `<span i18n>{count|number, plural,
+            =1 { {{value|date}} }
+          }</span>`,
+          '', {});
+      const binder = new R3TargetBinder(makeSelectorMatcher());
+      const res = binder.bind({template: template.nodes});
+      expect(res.getUsedPipes()).toEqual(['number', 'date']);
+    });
+  });
 });
diff --git a/packages/compiler/test/render3/view/i18n_spec.ts b/packages/compiler/test/render3/view/i18n_spec.ts
index f809a2523c1b2..2ed1dba0f7544 100644
--- a/packages/compiler/test/render3/view/i18n_spec.ts
+++ b/packages/compiler/test/render3/view/i18n_spec.ts
@@ -10,6 +10,7 @@ import {Lexer} from '../../../src/expression_parser/lexer';
 import {Parser} from '../../../src/expression_parser/parser';
 import * as i18n from '../../../src/i18n/i18n_ast';
 import * as o from '../../../src/output/output_ast';
+import {ParseSourceSpan} from '../../../src/parse_util';
 import * as t from '../../../src/render3/r3_ast';
 import {I18nContext} from '../../../src/render3/view/i18n/context';
 import {serializeI18nMessageForGetMsg} from '../../../src/render3/view/i18n/get_msg_utils';
@@ -221,66 +222,108 @@ describe('Utils', () => {
     });
 
     it('serializeI18nHead()', () => {
-      expect(o.localizedString(meta(), [''], [], []).serializeI18nHead())
-          .toEqual({cooked: '', raw: ''});
-      expect(o.localizedString(meta('', '', 'desc'), [''], [], []).serializeI18nHead())
-          .toEqual({cooked: ':desc:', raw: ':desc:'});
-      expect(o.localizedString(meta('id', '', 'desc'), [''], [], []).serializeI18nHead())
-          .toEqual({cooked: ':desc@@id:', raw: ':desc@@id:'});
-      expect(o.localizedString(meta('', 'meaning', 'desc'), [''], [], []).serializeI18nHead())
-          .toEqual({cooked: ':meaning|desc:', raw: ':meaning|desc:'});
-      expect(o.localizedString(meta('id', 'meaning', 'desc'), [''], [], []).serializeI18nHead())
-          .toEqual({cooked: ':meaning|desc@@id:', raw: ':meaning|desc@@id:'});
-      expect(o.localizedString(meta('id', '', ''), [''], [], []).serializeI18nHead())
-          .toEqual({cooked: ':@@id:', raw: ':@@id:'});
+      expect(o.localizedString(meta(), [literal('')], [], []).serializeI18nHead())
+          .toEqual({cooked: '', raw: '', range: jasmine.any(ParseSourceSpan)});
+      expect(o.localizedString(meta('', '', 'desc'), [literal('')], [], []).serializeI18nHead())
+          .toEqual({cooked: ':desc:', raw: ':desc:', range: jasmine.any(ParseSourceSpan)});
+      expect(o.localizedString(meta('id', '', 'desc'), [literal('')], [], []).serializeI18nHead())
+          .toEqual({cooked: ':desc@@id:', raw: ':desc@@id:', range: jasmine.any(ParseSourceSpan)});
+      expect(
+          o.localizedString(meta('', 'meaning', 'desc'), [literal('')], [], []).serializeI18nHead())
+          .toEqual({
+            cooked: ':meaning|desc:',
+            raw: ':meaning|desc:',
+            range: jasmine.any(ParseSourceSpan)
+          });
+      expect(o.localizedString(meta('id', 'meaning', 'desc'), [literal('')], [], [])
+                 .serializeI18nHead())
+          .toEqual({
+            cooked: ':meaning|desc@@id:',
+            raw: ':meaning|desc@@id:',
+            range: jasmine.any(ParseSourceSpan)
+          });
+      expect(o.localizedString(meta('id', '', ''), [literal('')], [], []).serializeI18nHead())
+          .toEqual({cooked: ':@@id:', raw: ':@@id:', range: jasmine.any(ParseSourceSpan)});
 
       // Escaping colons (block markers)
-      expect(
-          o.localizedString(meta('id:sub_id', 'meaning', 'desc'), [''], [], []).serializeI18nHead())
-          .toEqual({cooked: ':meaning|desc@@id:sub_id:', raw: ':meaning|desc@@id\\:sub_id:'});
-      expect(o.localizedString(meta('id', 'meaning:sub_meaning', 'desc'), [''], [], [])
+      expect(o.localizedString(meta('id:sub_id', 'meaning', 'desc'), [literal('')], [], [])
                  .serializeI18nHead())
-          .toEqual(
-              {cooked: ':meaning:sub_meaning|desc@@id:', raw: ':meaning\\:sub_meaning|desc@@id:'});
-      expect(o.localizedString(meta('id', 'meaning', 'desc:sub_desc'), [''], [], [])
+          .toEqual({
+            cooked: ':meaning|desc@@id:sub_id:',
+            raw: ':meaning|desc@@id\\:sub_id:',
+            range: jasmine.any(ParseSourceSpan)
+          });
+      expect(o.localizedString(meta('id', 'meaning:sub_meaning', 'desc'), [literal('')], [], [])
+                 .serializeI18nHead())
+          .toEqual({
+            cooked: ':meaning:sub_meaning|desc@@id:',
+            raw: ':meaning\\:sub_meaning|desc@@id:',
+            range: jasmine.any(ParseSourceSpan)
+          });
+      expect(o.localizedString(meta('id', 'meaning', 'desc:sub_desc'), [literal('')], [], [])
                  .serializeI18nHead())
-          .toEqual({cooked: ':meaning|desc:sub_desc@@id:', raw: ':meaning|desc\\:sub_desc@@id:'});
-      expect(o.localizedString(meta('id', 'meaning', 'desc'), ['message source'], [], [])
+          .toEqual({
+            cooked: ':meaning|desc:sub_desc@@id:',
+            raw: ':meaning|desc\\:sub_desc@@id:',
+            range: jasmine.any(ParseSourceSpan)
+          });
+      expect(o.localizedString(meta('id', 'meaning', 'desc'), [literal('message source')], [], [])
                  .serializeI18nHead())
           .toEqual({
             cooked: ':meaning|desc@@id:message source',
-            raw: ':meaning|desc@@id:message source'
+            raw: ':meaning|desc@@id:message source',
+            range: jasmine.any(ParseSourceSpan)
           });
-      expect(o.localizedString(meta('id', 'meaning', 'desc'), [':message source'], [], [])
+      expect(o.localizedString(meta('id', 'meaning', 'desc'), [literal(':message source')], [], [])
                  .serializeI18nHead())
           .toEqual({
             cooked: ':meaning|desc@@id::message source',
-            raw: ':meaning|desc@@id::message source'
+            raw: ':meaning|desc@@id::message source',
+            range: jasmine.any(ParseSourceSpan)
+          });
+      expect(o.localizedString(meta('', '', ''), [literal('message source')], [], [])
+                 .serializeI18nHead())
+          .toEqual({
+            cooked: 'message source',
+            raw: 'message source',
+            range: jasmine.any(ParseSourceSpan)
+          });
+      expect(o.localizedString(meta('', '', ''), [literal(':message source')], [], [])
+                 .serializeI18nHead())
+          .toEqual({
+            cooked: ':message source',
+            raw: '\\:message source',
+            range: jasmine.any(ParseSourceSpan)
           });
-      expect(o.localizedString(meta('', '', ''), ['message source'], [], []).serializeI18nHead())
-          .toEqual({cooked: 'message source', raw: 'message source'});
-      expect(o.localizedString(meta('', '', ''), [':message source'], [], []).serializeI18nHead())
-          .toEqual({cooked: ':message source', raw: '\\:message source'});
     });
 
     it('serializeI18nPlaceholderBlock()', () => {
-      expect(o.localizedString(meta('', '', ''), ['', ''], [''], []).serializeI18nTemplatePart(1))
-          .toEqual({cooked: '', raw: ''});
-      expect(
-          o.localizedString(meta('', '', ''), ['', ''], ['abc'], []).serializeI18nTemplatePart(1))
-          .toEqual({cooked: ':abc:', raw: ':abc:'});
-      expect(o.localizedString(meta('', '', ''), ['', 'message'], [''], [])
+      expect(o.localizedString(meta('', '', ''), [literal(''), literal('')], [literal('')], [])
                  .serializeI18nTemplatePart(1))
-          .toEqual({cooked: 'message', raw: 'message'});
-      expect(o.localizedString(meta('', '', ''), ['', 'message'], ['abc'], [])
+          .toEqual({cooked: '', raw: '', range: jasmine.any(ParseSourceSpan)});
+      expect(o.localizedString(
+                  meta('', '', ''), [literal(''), literal('')],
+                  [new o.LiteralPiece('abc', {} as any)], [])
                  .serializeI18nTemplatePart(1))
-          .toEqual({cooked: ':abc:message', raw: ':abc:message'});
-      expect(o.localizedString(meta('', '', ''), ['', ':message'], [''], [])
+          .toEqual({cooked: ':abc:', raw: ':abc:', range: jasmine.any(ParseSourceSpan)});
+      expect(
+          o.localizedString(meta('', '', ''), [literal(''), literal('message')], [literal('')], [])
+              .serializeI18nTemplatePart(1))
+          .toEqual({cooked: 'message', raw: 'message', range: jasmine.any(ParseSourceSpan)});
+      expect(o.localizedString(
+                  meta('', '', ''), [literal(''), literal('message')], [literal('abc')], [])
                  .serializeI18nTemplatePart(1))
-          .toEqual({cooked: ':message', raw: '\\:message'});
-      expect(o.localizedString(meta('', '', ''), ['', ':message'], ['abc'], [])
+          .toEqual(
+              {cooked: ':abc:message', raw: ':abc:message', range: jasmine.any(ParseSourceSpan)});
+      expect(
+          o.localizedString(meta('', '', ''), [literal(''), literal(':message')], [literal('')], [])
+              .serializeI18nTemplatePart(1))
+          .toEqual({cooked: ':message', raw: '\\:message', range: jasmine.any(ParseSourceSpan)});
+      expect(o.localizedString(
+                  meta('', '', ''), [literal(''), literal(':message')], [literal('abc')], [])
                  .serializeI18nTemplatePart(1))
-          .toEqual({cooked: ':abc::message', raw: ':abc::message'});
+          .toEqual(
+              {cooked: ':abc::message', raw: ':abc::message', range: jasmine.any(ParseSourceSpan)});
     });
 
     function meta(customId?: string, meaning?: string, description?: string): I18nMeta {
@@ -349,55 +392,106 @@ describe('serializeI18nMessageForLocalize', () => {
   };
 
   it('should serialize plain text for `$localize()`', () => {
-    expect(serialize('Some text')).toEqual({messageParts: ['Some text'], placeHolders: []});
+    expect(serialize('Some text'))
+        .toEqual({messageParts: [literal('Some text')], placeHolders: []});
   });
 
   it('should serialize text with interpolation for `$localize()`', () => {
     expect(serialize('Some text {{ valueA }} and {{ valueB + valueC }} done')).toEqual({
-      messageParts: ['Some text ', ' and ', ' done'],
-      placeHolders: ['INTERPOLATION', 'INTERPOLATION_1']
+      messageParts: [literal('Some text '), literal(' and '), literal(' done')],
+      placeHolders: [placeholder('INTERPOLATION'), placeholder('INTERPOLATION_1')],
     });
   });
 
+  it('should compute source-spans when serializing text with interpolation for `$localize()`',
+     () => {
+       const {messageParts, placeHolders} =
+           serialize('Some text {{ valueA }} and {{ valueB + valueC }} done');
+
+       expect(messageParts[0].text).toEqual('Some text ');
+       expect(messageParts[0].sourceSpan.toString()).toEqual('Some text ');
+       expect(messageParts[1].text).toEqual(' and ');
+       expect(messageParts[1].sourceSpan.toString()).toEqual(' and ');
+       expect(messageParts[2].text).toEqual(' done');
+       expect(messageParts[2].sourceSpan.toString()).toEqual(' done');
+
+       expect(placeHolders[0].text).toEqual('INTERPOLATION');
+       expect(placeHolders[0].sourceSpan.toString()).toEqual('{{ valueA }}');
+       expect(placeHolders[1].text).toEqual('INTERPOLATION_1');
+       expect(placeHolders[1].sourceSpan.toString()).toEqual('{{ valueB + valueC }}');
+     });
+
   it('should serialize text with interpolation at start for `$localize()`', () => {
     expect(serialize('{{ valueA }} and {{ valueB + valueC }} done')).toEqual({
-      messageParts: ['', ' and ', ' done'],
-      placeHolders: ['INTERPOLATION', 'INTERPOLATION_1']
+      messageParts: [literal(''), literal(' and '), literal(' done')],
+      placeHolders: [placeholder('INTERPOLATION'), placeholder('INTERPOLATION_1')],
     });
   });
 
 
   it('should serialize text with interpolation at end for `$localize()`', () => {
     expect(serialize('Some text {{ valueA }} and {{ valueB + valueC }}')).toEqual({
-      messageParts: ['Some text ', ' and ', ''],
-      placeHolders: ['INTERPOLATION', 'INTERPOLATION_1']
+      messageParts: [literal('Some text '), literal(' and '), literal('')],
+      placeHolders: [placeholder('INTERPOLATION'), placeholder('INTERPOLATION_1')],
     });
   });
 
 
   it('should serialize only interpolation for `$localize()`', () => {
-    expect(serialize('{{ valueB + valueC }}'))
-        .toEqual({messageParts: ['', ''], placeHolders: ['INTERPOLATION']});
+    expect(serialize('{{ valueB + valueC }}')).toEqual({
+      messageParts: [literal(''), literal('')],
+      placeHolders: [placeholder('INTERPOLATION')]
+    });
   });
 
 
   it('should serialize interpolation with named placeholder for `$localize()`', () => {
-    expect(serialize('{{ valueB + valueC // i18n(ph="PLACEHOLDER NAME") }}'))
-        .toEqual({messageParts: ['', ''], placeHolders: ['PLACEHOLDER_NAME']});
+    expect(serialize('{{ valueB + valueC // i18n(ph="PLACEHOLDER NAME") }}')).toEqual({
+      messageParts: [literal(''), literal('')],
+      placeHolders: [placeholder('PLACEHOLDER_NAME')]
+    });
   });
 
 
   it('should serialize content with HTML tags for `$localize()`', () => {
     expect(serialize('A <span>B<div>C</div></span> D')).toEqual({
-      messageParts: ['A ', 'B', 'C', '', ' D'],
-      placeHolders: ['START_TAG_SPAN', 'START_TAG_DIV', 'CLOSE_TAG_DIV', 'CLOSE_TAG_SPAN']
+      messageParts: [literal('A '), literal('B'), literal('C'), literal(''), literal(' D')],
+      placeHolders: [
+        placeholder('START_TAG_SPAN'), placeholder('START_TAG_DIV'), placeholder('CLOSE_TAG_DIV'),
+        placeholder('CLOSE_TAG_SPAN')
+      ]
     });
   });
 
 
+  it('should compute source-spans when serializing content with HTML tags for `$localize()`',
+     () => {
+       const {messageParts, placeHolders} = serialize('A <span>B<div>C</div></span> D');
+
+       expect(messageParts[0].text).toEqual('A ');
+       expect(messageParts[0].sourceSpan.toString()).toEqual('A ');
+       expect(messageParts[1].text).toEqual('B');
+       expect(messageParts[1].sourceSpan.toString()).toEqual('B');
+       expect(messageParts[2].text).toEqual('C');
+       expect(messageParts[2].sourceSpan.toString()).toEqual('C');
+       expect(messageParts[3].text).toEqual('');
+       expect(messageParts[3].sourceSpan.toString()).toEqual('');
+       expect(messageParts[4].text).toEqual(' D');
+       expect(messageParts[4].sourceSpan.toString()).toEqual(' D');
+
+       expect(placeHolders[0].text).toEqual('START_TAG_SPAN');
+       expect(placeHolders[0].sourceSpan.toString()).toEqual('<span>');
+       expect(placeHolders[1].text).toEqual('START_TAG_DIV');
+       expect(placeHolders[1].sourceSpan.toString()).toEqual('<div>');
+       expect(placeHolders[2].text).toEqual('CLOSE_TAG_DIV');
+       expect(placeHolders[2].sourceSpan.toString()).toEqual('</div>');
+       expect(placeHolders[3].text).toEqual('CLOSE_TAG_SPAN');
+       expect(placeHolders[3].sourceSpan.toString()).toEqual('</span>');
+     });
+
   it('should serialize simple ICU for `$localize()`', () => {
     expect(serialize('{age, plural, 10 {ten} other {other}}')).toEqual({
-      messageParts: ['{VAR_PLURAL, plural, 10 {ten} other {other}}'],
+      messageParts: [literal('{VAR_PLURAL, plural, 10 {ten} other {other}}')],
       placeHolders: []
     });
   });
@@ -408,17 +502,29 @@ describe('serializeI18nMessageForLocalize', () => {
                '{age, plural, 10 {ten {size, select, 1 {one} 2 {two} other {2+}}} other {other}}'))
         .toEqual({
           messageParts: [
-            '{VAR_PLURAL, plural, 10 {ten {VAR_SELECT, select, 1 {one} 2 {two} other {2+}}} other {other}}'
+            literal(
+                '{VAR_PLURAL, plural, 10 {ten {VAR_SELECT, select, 1 {one} 2 {two} other {2+}}} other {other}}')
           ],
           placeHolders: []
         });
   });
 
 
-  it('should serialize ICU with nested HTML for `$localize()`', () => {
+  it('should serialize ICU with embedded HTML for `$localize()`', () => {
     expect(serialize('{age, plural, 10 {<b>ten</b>} other {<div class="A">other</div>}}')).toEqual({
       messageParts: [
-        '{VAR_PLURAL, plural, 10 {{START_BOLD_TEXT}ten{CLOSE_BOLD_TEXT}} other {{START_TAG_DIV}other{CLOSE_TAG_DIV}}}'
+        literal(
+            '{VAR_PLURAL, plural, 10 {{START_BOLD_TEXT}ten{CLOSE_BOLD_TEXT}} other {{START_TAG_DIV}other{CLOSE_TAG_DIV}}}')
+      ],
+      placeHolders: []
+    });
+  });
+
+  it('should serialize ICU with embedded interpolation for `$localize()`', () => {
+    expect(serialize('{age, plural, 10 {<b>ten</b>} other {{{age}} years old}}')).toEqual({
+      messageParts: [
+        literal(
+            '{VAR_PLURAL, plural, 10 {{START_BOLD_TEXT}ten{CLOSE_BOLD_TEXT}} other {{INTERPOLATION} years old}}')
       ],
       placeHolders: []
     });
@@ -429,8 +535,24 @@ describe('serializeI18nMessageForLocalize', () => {
         serialize(
             '{gender, select, male {male} female {female} other {other}}<div>{gender, select, male {male} female {female} other {other}}</div>'))
         .toEqual({
-          messageParts: ['', '', '', '', ''],
-          placeHolders: ['ICU', 'START_TAG_DIV', 'ICU', 'CLOSE_TAG_DIV']
+          messageParts: [literal(''), literal(''), literal(''), literal(''), literal('')],
+          placeHolders: [
+            placeholder('ICU'), placeholder('START_TAG_DIV'), placeholder('ICU'),
+            placeholder('CLOSE_TAG_DIV')
+          ]
+        });
+  });
+
+  it('should serialize nested ICUs with embedded interpolation for `$localize()`', () => {
+    expect(
+        serialize(
+            '{age, plural, 10 {ten {size, select, 1 {{{ varOne }}} 2 {{{ varTwo }}} other {2+}}} other {other}}'))
+        .toEqual({
+          messageParts: [
+            literal(
+                '{VAR_PLURAL, plural, 10 {ten {VAR_SELECT, select, 1 {{INTERPOLATION}} 2 {{INTERPOLATION_1}} other {2+}}} other {other}}')
+          ],
+          placeHolders: []
         });
   });
 });
@@ -447,7 +569,7 @@ describe('serializeIcuNode', () => {
         .toEqual('{VAR_PLURAL, plural, 10 {ten} other {other}}');
   });
 
-  it('should serialize a next ICU', () => {
+  it('should serialize a nested ICU', () => {
     expect(serialize(
                '{age, plural, 10 {ten {size, select, 1 {one} 2 {two} other {2+}}} other {other}}'))
         .toEqual(
@@ -459,4 +581,17 @@ describe('serializeIcuNode', () => {
         .toEqual(
             '{VAR_PLURAL, plural, 10 {{START_BOLD_TEXT}ten{CLOSE_BOLD_TEXT}} other {{START_TAG_DIV}other{CLOSE_TAG_DIV}}}');
   });
+
+  it('should serialize an ICU with embedded interpolations', () => {
+    expect(serialize('{age, select, 10 {ten} other {{{age}} years old}}'))
+        .toEqual('{VAR_SELECT, select, 10 {ten} other {{INTERPOLATION} years old}}');
+  });
 });
+
+function literal(text: string, span: any = jasmine.any(ParseSourceSpan)): o.LiteralPiece {
+  return new o.LiteralPiece(text, span);
+}
+
+function placeholder(name: string, span: any = jasmine.any(ParseSourceSpan)): o.PlaceholderPiece {
+  return new o.PlaceholderPiece(name, span);
+}
\ No newline at end of file
diff --git a/packages/compiler/test/render3/view/util.ts b/packages/compiler/test/render3/view/util.ts
index d6347ad57390a..af3ed25c11820 100644
--- a/packages/compiler/test/render3/view/util.ts
+++ b/packages/compiler/test/render3/view/util.ts
@@ -101,7 +101,14 @@ export function parseR3(
       ['onEvent'], ['onEvent']);
   const bindingParser =
       new BindingParser(expressionParser, DEFAULT_INTERPOLATION_CONFIG, schemaRegistry, null, []);
-  return htmlAstToRender3Ast(htmlNodes, bindingParser);
+  const r3Result = htmlAstToRender3Ast(htmlNodes, bindingParser);
+
+  if (r3Result.errors.length > 0) {
+    const msg = r3Result.errors.map(e => e.toString()).join('\n');
+    throw new Error(msg);
+  }
+
+  return r3Result;
 }
 
 export function processI18nMeta(
diff --git a/packages/compiler/test/shadow_css_spec.ts b/packages/compiler/test/shadow_css_spec.ts
index 67d525cfbb49f..ea9c771972124 100644
--- a/packages/compiler/test/shadow_css_spec.ts
+++ b/packages/compiler/test/shadow_css_spec.ts
@@ -283,6 +283,28 @@ import {normalizeCSS} from '@angular/platform-browser/testing/src/browser_util';
       expect(css).toEqual('@import url("a"); div[contenta] {}');
     });
 
+    it('should shim rules with quoted content after @import', () => {
+      const styleStr = '@import url("a"); div {background-image: url("a.jpg"); color: red;}';
+      const css = s(styleStr, 'contenta');
+      expect(css).toEqual(
+          '@import url("a"); div[contenta] {background-image:url("a.jpg"); color:red;}');
+    });
+
+    it('should pass through @import directives whose URL contains colons and semicolons', () => {
+      const styleStr =
+          '@import url("https://fonts.googleapis.com/css2?family=Roboto:wght@400;500&display=swap");';
+      const css = s(styleStr, 'contenta');
+      expect(css).toEqual(styleStr);
+    });
+
+    it('should shim rules after @import with colons and semicolons', () => {
+      const styleStr =
+          '@import url("https://fonts.googleapis.com/css2?family=Roboto:wght@400;500&display=swap"); div {}';
+      const css = s(styleStr, 'contenta');
+      expect(css).toEqual(
+          '@import url("https://fonts.googleapis.com/css2?family=Roboto:wght@400;500&display=swap"); div[contenta] {}');
+    });
+
     it('should leave calc() unchanged', () => {
       const styleStr = 'div {height:calc(100% - 55px);}';
       const css = s(styleStr, 'contenta');
@@ -312,6 +334,24 @@ import {normalizeCSS} from '@angular/platform-browser/testing/src/browser_util';
       expect(s('/*# sourceMappingURL=data:x */b {c}/*# sourceURL=xxx */', 'contenta'))
           .toEqual('b[contenta] {c}/*# sourceMappingURL=data:x *//*# sourceURL=xxx */');
     });
+
+    it('should shim rules with quoted content', () => {
+      const styleStr = 'div {background-image: url("a.jpg"); color: red;}';
+      const css = s(styleStr, 'contenta');
+      expect(css).toEqual('div[contenta] {background-image:url("a.jpg"); color:red;}');
+    });
+
+    it('should shim rules with an escaped quote inside quoted content', () => {
+      const styleStr = 'div::after { content: "\\"" }';
+      const css = s(styleStr, 'contenta');
+      expect(css).toEqual('div[contenta]::after { content:"\\""}');
+    });
+
+    it('should shim rules with curly braces inside quoted content', () => {
+      const styleStr = 'div::after { content: "{}" }';
+      const css = s(styleStr, 'contenta');
+      expect(css).toEqual('div[contenta]::after { content:"{}"}');
+    });
   });
 
   describe('processRules', () => {
diff --git a/packages/compiler/test/template_parser/template_parser_spec.ts b/packages/compiler/test/template_parser/template_parser_spec.ts
index cf8729125f32f..d43238c102f16 100644
--- a/packages/compiler/test/template_parser/template_parser_spec.ts
+++ b/packages/compiler/test/template_parser/template_parser_spec.ts
@@ -140,7 +140,7 @@ class TemplateHumanizer implements TemplateAstVisitor {
 
   private _appendSourceSpan(ast: TemplateAst, input: any[]): any[] {
     if (!this.includeSourceSpan) return input;
-    input.push(ast.sourceSpan!.toString());
+    input.push(ast.sourceSpan.toString());
     return input;
   }
 }
@@ -1656,7 +1656,7 @@ Reference "#a" is defined several times ("<div #a></div><div [ERROR ->]#a></div>
         expect(humanizeTplAst(parse('<div *ngIf="-1">', [ngIf]))).toEqual([
           [EmbeddedTemplateAst],
           [DirectiveAst, ngIf],
-          [BoundDirectivePropertyAst, 'ngIf', '0 - 1'],
+          [BoundDirectivePropertyAst, 'ngIf', '-1'],
           [ElementAst, 'div'],
         ]);
       });
@@ -2046,7 +2046,7 @@ Property binding a not used by any directive on an embedded template. Make sure
 
     it('should support embedded template', () => {
       expect(humanizeTplAstSourceSpans(parse('<ng-template></ng-template>', []))).toEqual([
-        [EmbeddedTemplateAst, '<ng-template>']
+        [EmbeddedTemplateAst, '<ng-template></ng-template>']
       ]);
     });
 
@@ -2058,14 +2058,14 @@ Property binding a not used by any directive on an embedded template. Make sure
 
     it('should support references', () => {
       expect(humanizeTplAstSourceSpans(parse('<div #a></div>', []))).toEqual([
-        [ElementAst, 'div', '<div #a>'], [ReferenceAst, 'a', null, '#a']
+        [ElementAst, 'div', '<div #a></div>'], [ReferenceAst, 'a', null, '#a']
       ]);
     });
 
     it('should support variables', () => {
       expect(humanizeTplAstSourceSpans(parse('<ng-template let-a="b"></ng-template>', [])))
           .toEqual([
-            [EmbeddedTemplateAst, '<ng-template let-a="b">'],
+            [EmbeddedTemplateAst, '<ng-template let-a="b"></ng-template>'],
             [VariableAst, 'a', 'b', 'let-a="b"'],
           ]);
     });
@@ -2128,7 +2128,7 @@ Property binding a not used by any directive on an embedded template. Make sure
       expect(humanizeTplAstSourceSpans(
                  parse('<svg><circle /><use xlink:href="Port" /></svg>', [tagSel, attrSel])))
           .toEqual([
-            [ElementAst, ':svg:svg', '<svg>'],
+            [ElementAst, ':svg:svg', '<svg><circle /><use xlink:href="Port" /></svg>'],
             [ElementAst, ':svg:circle', '<circle />'],
             [DirectiveAst, tagSel, '<circle />'],
             [ElementAst, ':svg:use', '<use xlink:href="Port" />'],
@@ -2144,7 +2144,8 @@ Property binding a not used by any directive on an embedded template. Make sure
                      inputs: ['aProp']
                    }).toSummary();
       expect(humanizeTplAstSourceSpans(parse('<div [aProp]="foo"></div>', [dirA]))).toEqual([
-        [ElementAst, 'div', '<div [aProp]="foo">'], [DirectiveAst, dirA, '<div [aProp]="foo">'],
+        [ElementAst, 'div', '<div [aProp]="foo"></div>'],
+        [DirectiveAst, dirA, '<div [aProp]="foo"></div>'],
         [BoundDirectivePropertyAst, 'aProp', 'foo', '[aProp]="foo"']
       ]);
     });
diff --git a/packages/compiler/test/template_parser/util/expression.ts b/packages/compiler/test/template_parser/util/expression.ts
index e5ce110a5ea2b..bad905d9fffd9 100644
--- a/packages/compiler/test/template_parser/util/expression.ts
+++ b/packages/compiler/test/template_parser/util/expression.ts
@@ -30,6 +30,10 @@ class ExpressionSourceHumanizer extends e.RecursiveAstVisitor implements t.Templ
     this.recordAst(ast);
     this.visitAll([ast.ast], null);
   }
+  visitUnary(ast: e.Unary) {
+    this.recordAst(ast);
+    super.visitUnary(ast, null);
+  }
   visitBinary(ast: e.Binary) {
     this.recordAst(ast);
     super.visitBinary(ast, null);
diff --git a/packages/core/schematics/BUILD.bazel b/packages/core/schematics/BUILD.bazel
index 36303539083c8..b68ceb4eb97bc 100644
--- a/packages/core/schematics/BUILD.bazel
+++ b/packages/core/schematics/BUILD.bazel
@@ -10,14 +10,21 @@ pkg_npm(
     srcs = ["migrations.json"],
     visibility = ["//packages/core:__pkg__"],
     deps = [
+        "//packages/core/schematics/migrations/abstract-control-parent",
         "//packages/core/schematics/migrations/dynamic-queries",
+        "//packages/core/schematics/migrations/initial-navigation",
         "//packages/core/schematics/migrations/missing-injectable",
         "//packages/core/schematics/migrations/module-with-providers",
         "//packages/core/schematics/migrations/move-document",
+        "//packages/core/schematics/migrations/native-view-encapsulation",
+        "//packages/core/schematics/migrations/navigation-extras-omissions",
+        "//packages/core/schematics/migrations/relative-link-resolution",
         "//packages/core/schematics/migrations/renderer-to-renderer2",
+        "//packages/core/schematics/migrations/router-preserve-query-params",
         "//packages/core/schematics/migrations/static-queries",
         "//packages/core/schematics/migrations/template-var-assignment",
         "//packages/core/schematics/migrations/undecorated-classes-with-decorated-fields",
         "//packages/core/schematics/migrations/undecorated-classes-with-di",
+        "//packages/core/schematics/migrations/wait-for-async",
     ],
 )
diff --git a/packages/core/schematics/migrations.json b/packages/core/schematics/migrations.json
index e4a15c2d0cc70..818a1535a3831 100644
--- a/packages/core/schematics/migrations.json
+++ b/packages/core/schematics/migrations.json
@@ -44,6 +44,41 @@
       "version": "10.0.0-beta",
       "description": "Undecorated classes with Angular features migration. In version 10, classes that use Angular features and do not have an Angular decorator are no longer supported. Read more about this here: https://v10.angular.io/guide/migration-undecorated-classes",
       "factory": "./migrations/undecorated-classes-with-decorated-fields/index"
+    },
+    "migration-v11-navigation-extras-omissions": {
+      "version": "11.0.0-beta",
+      "description": "NavigationExtras omissions migration. In version 11, some unsupported properties were omitted from the `extras` parameter of the `Router.navigateByUrl` and `Router.createUrlTree` methods.",
+      "factory": "./migrations/navigation-extras-omissions/index"
+    },
+    "migration-v11-router-relative-link-resolution-default": {
+      "version": "11.0.0-beta",
+      "description": "The default value for `relativeLinkResolution` is changing from 'legacy' to 'corrected'.\nThis migration updates `RouterModule` configurations that use the default value to \nnow specifically use 'legacy' to prevent breakages when updating.",
+      "factory": "./migrations/relative-link-resolution/index"
+    },
+    "migration-v11-abstract-control-parent": {
+      "version": "11.0.0-beta",
+      "description": "In Angular version 11, the type of `AbstractControl.parent` can be `null` to reflect the runtime value more accurately. This migration automatically adds non-null assertions to existing accesses of the `parent` property on types like `FormControl`, `FormArray` and `FormGroup`.",
+      "factory": "./migrations/abstract-control-parent/index"
+    },
+    "migration-v11-native-view-encapsulation": {
+      "version": "11.0.0-beta",
+      "description": "ViewEncapsulation.Native has been removed as of Angular version 11. This migration replaces any usages with ViewEncapsulation.ShadowDom.",
+      "factory": "./migrations/native-view-encapsulation/index"
+    },
+    "migration-v11-wait-for-async": {
+      "version": "11.0.0-beta",
+      "description": "`async` to `waitForAsync` migration. The `async` testing function has been renamed to `waitForAsync` to avoid confusion with the native `async` keyword.",
+      "factory": "./migrations/wait-for-async/index"
+    },
+    "migration-v11-router-preserve-query-params": {
+      "version": "11.0.0-beta",
+      "description": "NavigationExtras.preserveQueryParams has been removed as of Angular version 11.  This migration replaces any usages with the appropriate assignment of the queryParamsHandler key.",
+      "factory": "./migrations/router-preserve-query-params/index"
+    },
+    "migration-v11-router-initial-navigation-options": {
+      "version": "11.0.0-beta",
+      "description": "Updates the `initialNavigation` property for `RouterModule.forRoot`.",
+      "factory": "./migrations/initial-navigation/index"
     }
   }
 }
diff --git a/packages/core/schematics/migrations/abstract-control-parent/BUILD.bazel b/packages/core/schematics/migrations/abstract-control-parent/BUILD.bazel
new file mode 100644
index 0000000000000..c78e69f55f13e
--- /dev/null
+++ b/packages/core/schematics/migrations/abstract-control-parent/BUILD.bazel
@@ -0,0 +1,18 @@
+load("//tools:defaults.bzl", "ts_library")
+
+ts_library(
+    name = "abstract-control-parent",
+    srcs = glob(["**/*.ts"]),
+    tsconfig = "//packages/core/schematics:tsconfig.json",
+    visibility = [
+        "//packages/core/schematics:__pkg__",
+        "//packages/core/schematics/migrations/google3:__pkg__",
+        "//packages/core/schematics/test:__pkg__",
+    ],
+    deps = [
+        "//packages/core/schematics/utils",
+        "@npm//@angular-devkit/schematics",
+        "@npm//@types/node",
+        "@npm//typescript",
+    ],
+)
diff --git a/packages/core/schematics/migrations/abstract-control-parent/README.md b/packages/core/schematics/migrations/abstract-control-parent/README.md
new file mode 100644
index 0000000000000..b40ca8deda773
--- /dev/null
+++ b/packages/core/schematics/migrations/abstract-control-parent/README.md
@@ -0,0 +1,34 @@
+## `AbstractControl.parent` migration
+
+As of Angular v11, the type of `AbstractControl.parent` can be null. This migration automatically
+identifies usages and adds non-null assertions.
+
+#### Before
+```ts
+import { Component } from '@angular/core';
+import { FormControl } from '@angular/forms';
+
+@Component()
+export class MyComponent {
+  private _control = new FormControl();
+
+  getParentValue() {
+    return this._control.parent.value; // <- Compilation error in v11.
+  }
+}
+```
+
+#### After
+```ts
+import { Component } from '@angular/core';
+import { FormControl } from '@angular/forms';
+
+@Component()
+export class MyComponent {
+  private _control = new FormControl();
+
+  getParentValue() {
+    return this._control.parent!.value; // <- Non-null assertion added during the migration.
+  }
+}
+```
diff --git a/packages/core/schematics/migrations/abstract-control-parent/index.ts b/packages/core/schematics/migrations/abstract-control-parent/index.ts
new file mode 100644
index 0000000000000..9aea59128b87b
--- /dev/null
+++ b/packages/core/schematics/migrations/abstract-control-parent/index.ts
@@ -0,0 +1,57 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Rule, SchematicsException, Tree} from '@angular-devkit/schematics';
+import {relative} from 'path';
+
+import {getProjectTsConfigPaths} from '../../utils/project_tsconfig_paths';
+import {createMigrationProgram} from '../../utils/typescript/compiler_host';
+import {findParentAccesses} from './util';
+
+
+/** Migration that marks accesses of `AbstractControl.parent` as non-null. */
+export default function(): Rule {
+  return (tree: Tree) => {
+    const {buildPaths, testPaths} = getProjectTsConfigPaths(tree);
+    const basePath = process.cwd();
+    const allPaths = [...buildPaths, ...testPaths];
+
+    if (!allPaths.length) {
+      throw new SchematicsException(
+          'Could not find any tsconfig file. Cannot migrate AbstractControl.parent accesses.');
+    }
+
+    for (const tsconfigPath of allPaths) {
+      runNativeAbstractControlParentMigration(tree, tsconfigPath, basePath);
+    }
+  };
+}
+
+function runNativeAbstractControlParentMigration(
+    tree: Tree, tsconfigPath: string, basePath: string) {
+  const {program} = createMigrationProgram(tree, tsconfigPath, basePath);
+  const typeChecker = program.getTypeChecker();
+  const sourceFiles = program.getSourceFiles().filter(
+      f => !f.isDeclarationFile && !program.isSourceFileFromExternalLibrary(f));
+
+  sourceFiles.forEach(sourceFile => {
+    // We sort the nodes based on their position in the file and we offset the positions by one
+    // for each non-null assertion that we've added. We have to do it this way, rather than
+    // creating and printing a new AST node like in other migrations, because property access
+    // expressions can be nested (e.g. `control.parent.parent.value`), but the node positions
+    // aren't being updated as we're inserting new code. If we were to go through the AST,
+    // we'd have to update the `SourceFile` and start over after each operation.
+    findParentAccesses(typeChecker, sourceFile)
+        .sort((a, b) => a.getStart() - b.getStart())
+        .forEach((node, index) => {
+          const update = tree.beginUpdate(relative(basePath, sourceFile.fileName));
+          update.insertRight(node.getStart() + node.getWidth() + index, '!');
+          tree.commitUpdate(update);
+        });
+  });
+}
diff --git a/packages/core/schematics/migrations/abstract-control-parent/util.ts b/packages/core/schematics/migrations/abstract-control-parent/util.ts
new file mode 100644
index 0000000000000..f5e47c516fc29
--- /dev/null
+++ b/packages/core/schematics/migrations/abstract-control-parent/util.ts
@@ -0,0 +1,155 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {normalize} from 'path';
+import * as ts from 'typescript';
+
+/** Names of symbols from `@angular/forms` whose `parent` accesses have to be migrated. */
+const abstractControlSymbols = new Set<string>([
+  'AbstractControl',
+  'FormArray',
+  'FormControl',
+  'FormGroup',
+]);
+
+/**
+ * Finds the `PropertyAccessExpression`-s that are accessing the `parent` property in
+ * such a way that may result in a compilation error after the v11 type changes.
+ */
+export function findParentAccesses(
+    typeChecker: ts.TypeChecker, sourceFile: ts.SourceFile): ts.PropertyAccessExpression[] {
+  const results: ts.PropertyAccessExpression[] = [];
+
+  sourceFile.forEachChild(function walk(node: ts.Node) {
+    if (ts.isPropertyAccessExpression(node) && node.name.text === 'parent' && !isNullCheck(node) &&
+        !isSafeAccess(node) && results.indexOf(node) === -1 &&
+        isAbstractControlReference(typeChecker, node) && isNullableType(typeChecker, node)) {
+      results.unshift(node);
+    }
+
+    node.forEachChild(walk);
+  });
+
+  return results;
+}
+
+/** Checks whether a node's type is nullable (`null`, `undefined` or `void`). */
+function isNullableType(typeChecker: ts.TypeChecker, node: ts.Node) {
+  // Skip expressions in the form of `foo.bar!.baz` since the `TypeChecker` seems
+  // to identify them as null, even though the user indicated that it won't be.
+  if (node.parent && ts.isNonNullExpression(node.parent)) {
+    return false;
+  }
+
+  const type = typeChecker.getTypeAtLocation(node);
+  const typeNode = typeChecker.typeToTypeNode(type, undefined, ts.NodeBuilderFlags.None);
+  let hasSeenNullableType = false;
+
+  // Trace the type of the node back to a type node, walk
+  // through all of its sub-nodes and look for nullable tyes.
+  if (typeNode) {
+    (function walk(current: ts.Node) {
+      if (current.kind === ts.SyntaxKind.NullKeyword ||
+          current.kind === ts.SyntaxKind.UndefinedKeyword ||
+          current.kind === ts.SyntaxKind.VoidKeyword) {
+        hasSeenNullableType = true;
+        // Note that we don't descend into type literals, because it may cause
+        // us to mis-identify the root type as nullable, because it has a nullable
+        // property (e.g. `{ foo: string | null }`).
+      } else if (!hasSeenNullableType && !ts.isTypeLiteralNode(current)) {
+        current.forEachChild(walk);
+      }
+    })(typeNode);
+  }
+
+  return hasSeenNullableType;
+}
+
+/**
+ * Checks whether a particular node is part of a null check. E.g. given:
+ * `control.parent ? control.parent.value : null` the null check would be `control.parent`.
+ */
+function isNullCheck(node: ts.PropertyAccessExpression): boolean {
+  if (!node.parent) {
+    return false;
+  }
+
+  // `control.parent && control.parent.value` where `node` is `control.parent`.
+  if (ts.isBinaryExpression(node.parent) && node.parent.left === node) {
+    return true;
+  }
+
+  // `control.parent && control.parent.parent && control.parent.parent.value`
+  // where `node` is `control.parent`.
+  if (node.parent.parent && ts.isBinaryExpression(node.parent.parent) &&
+      node.parent.parent.left === node.parent) {
+    return true;
+  }
+
+  // `if (control.parent) {...}` where `node` is `control.parent`.
+  if (ts.isIfStatement(node.parent) && node.parent.expression === node) {
+    return true;
+  }
+
+  // `control.parent ? control.parent.value : null` where `node` is `control.parent`.
+  if (ts.isConditionalExpression(node.parent) && node.parent.condition === node) {
+    return true;
+  }
+
+  return false;
+}
+
+/** Checks whether a property access is safe (e.g. `foo.parent?.value`). */
+function isSafeAccess(node: ts.PropertyAccessExpression): boolean {
+  return node.parent != null && ts.isPropertyAccessExpression(node.parent) &&
+      node.parent.expression === node && node.parent.questionDotToken != null;
+}
+
+/** Checks whether a property access is on an `AbstractControl` coming from `@angular/forms`. */
+function isAbstractControlReference(
+    typeChecker: ts.TypeChecker, node: ts.PropertyAccessExpression): boolean {
+  let current: ts.Expression = node;
+  const formsPattern = /node_modules\/?.*\/@angular\/forms/;
+  // Walks up the property access chain and tries to find a symbol tied to a `SourceFile`.
+  // If such a node is found, we check whether the type is one of the `AbstractControl` symbols
+  // and whether it comes from the `@angular/forms` directory in the `node_modules`.
+  while (ts.isPropertyAccessExpression(current)) {
+    const type = typeChecker.getTypeAtLocation(current.expression);
+    const symbol = type.getSymbol();
+    if (symbol && type) {
+      const sourceFile = symbol.valueDeclaration?.getSourceFile();
+      return sourceFile != null &&
+          formsPattern.test(normalize(sourceFile.fileName).replace(/\\/g, '/')) &&
+          hasAbstractControlType(typeChecker, type);
+    }
+    current = current.expression;
+  }
+  return false;
+}
+
+/**
+ * Walks through the sub-types of a type, looking for a type that
+ * has the same name as one of the `AbstractControl` types.
+ */
+function hasAbstractControlType(typeChecker: ts.TypeChecker, type: ts.Type): boolean {
+  const typeNode = typeChecker.typeToTypeNode(type, undefined, ts.NodeBuilderFlags.None);
+  let hasMatch = false;
+  if (typeNode) {
+    (function walk(current: ts.Node) {
+      if (ts.isIdentifier(current) && abstractControlSymbols.has(current.text)) {
+        hasMatch = true;
+        // Note that we don't descend into type literals, because it may cause
+        // us to mis-identify the root type as nullable, because it has a nullable
+        // property (e.g. `{ foo: FormControl }`).
+      } else if (!hasMatch && !ts.isTypeLiteralNode(current)) {
+        current.forEachChild(walk);
+      }
+    })(typeNode);
+  }
+  return hasMatch;
+}
diff --git a/packages/core/schematics/migrations/google3/BUILD.bazel b/packages/core/schematics/migrations/google3/BUILD.bazel
index 1a68dcf1d0aad..0eecceb17540a 100644
--- a/packages/core/schematics/migrations/google3/BUILD.bazel
+++ b/packages/core/schematics/migrations/google3/BUILD.bazel
@@ -7,13 +7,19 @@ ts_library(
     visibility = ["//packages/core/schematics/test/google3:__pkg__"],
     deps = [
         "//packages/core/schematics/migrations/dynamic-queries",
+        "//packages/core/schematics/migrations/initial-navigation",
+        "//packages/core/schematics/migrations/initial-navigation/google3",
         "//packages/core/schematics/migrations/missing-injectable",
         "//packages/core/schematics/migrations/missing-injectable/google3",
+        "//packages/core/schematics/migrations/navigation-extras-omissions",
+        "//packages/core/schematics/migrations/relative-link-resolution",
+        "//packages/core/schematics/migrations/relative-link-resolution/google3",
         "//packages/core/schematics/migrations/renderer-to-renderer2",
         "//packages/core/schematics/migrations/static-queries",
         "//packages/core/schematics/migrations/template-var-assignment",
         "//packages/core/schematics/migrations/undecorated-classes-with-decorated-fields",
         "//packages/core/schematics/migrations/undecorated-classes-with-decorated-fields/google3",
+        "//packages/core/schematics/migrations/wait-for-async",
         "//packages/core/schematics/utils",
         "//packages/core/schematics/utils/tslint",
         "@npm//tslint",
diff --git a/packages/core/schematics/migrations/google3/initialNavigationRule.ts b/packages/core/schematics/migrations/google3/initialNavigationRule.ts
new file mode 100644
index 0000000000000..41a2750c97c77
--- /dev/null
+++ b/packages/core/schematics/migrations/google3/initialNavigationRule.ts
@@ -0,0 +1,55 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {RuleFailure, Rules} from 'tslint';
+import * as ts from 'typescript';
+
+import {InitialNavigationCollector} from '../initial-navigation/collector';
+import {TslintUpdateRecorder} from '../initial-navigation/google3/tslint_update_recorder';
+import {InitialNavigationTransform} from '../initial-navigation/transform';
+
+
+
+/**
+ * TSLint rule that updates RouterModule `forRoot` options to be in line with v10 updates.
+ */
+export class Rule extends Rules.TypedRule {
+  applyWithProgram(sourceFile: ts.SourceFile, program: ts.Program): RuleFailure[] {
+    const ruleName = this.ruleName;
+    const typeChecker = program.getTypeChecker();
+    const sourceFiles = program.getSourceFiles().filter(
+        s => !s.isDeclarationFile && !program.isSourceFileFromExternalLibrary(s));
+    const initialNavigationCollector = new InitialNavigationCollector(typeChecker);
+    const failures: RuleFailure[] = [];
+
+    // Analyze source files by detecting all ExtraOptions#InitialNavigation assignments
+    sourceFiles.forEach(sourceFile => initialNavigationCollector.visitNode(sourceFile));
+
+    const {assignments} = initialNavigationCollector;
+    const transformer = new InitialNavigationTransform(typeChecker, getUpdateRecorder);
+    const updateRecorders = new Map<ts.SourceFile, TslintUpdateRecorder>();
+
+    transformer.migrateInitialNavigationAssignments(Array.from(assignments));
+
+    if (updateRecorders.has(sourceFile)) {
+      failures.push(...updateRecorders.get(sourceFile)!.failures);
+    }
+
+    return failures;
+
+    /** Gets the update recorder for the specified source file. */
+    function getUpdateRecorder(sourceFile: ts.SourceFile): TslintUpdateRecorder {
+      if (updateRecorders.has(sourceFile)) {
+        return updateRecorders.get(sourceFile)!;
+      }
+      const recorder = new TslintUpdateRecorder(ruleName, sourceFile);
+      updateRecorders.set(sourceFile, recorder);
+      return recorder;
+    }
+  }
+}
diff --git a/packages/core/schematics/migrations/google3/navigationExtrasOmissionsRule.ts b/packages/core/schematics/migrations/google3/navigationExtrasOmissionsRule.ts
new file mode 100644
index 0000000000000..7b3492b0e7408
--- /dev/null
+++ b/packages/core/schematics/migrations/google3/navigationExtrasOmissionsRule.ts
@@ -0,0 +1,38 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Replacement, RuleFailure, Rules} from 'tslint';
+import * as ts from 'typescript';
+import {findLiteralsToMigrate, migrateLiteral} from '../../migrations/navigation-extras-omissions/util';
+
+
+/** TSLint rule that migrates `navigateByUrl` and `createUrlTree` calls to an updated signature. */
+export class Rule extends Rules.TypedRule {
+  applyWithProgram(sourceFile: ts.SourceFile, program: ts.Program): RuleFailure[] {
+    const failures: RuleFailure[] = [];
+    const typeChecker = program.getTypeChecker();
+    const printer = ts.createPrinter();
+    const literalsToMigrate = findLiteralsToMigrate(sourceFile, typeChecker);
+
+    literalsToMigrate.forEach((instances, methodName) => instances.forEach(instance => {
+      const migratedNode = migrateLiteral(methodName, instance);
+
+      if (migratedNode !== instance) {
+        failures.push(new RuleFailure(
+            sourceFile, instance.getStart(), instance.getEnd(),
+            'Object used in navigateByUrl or createUrlTree call contains unsupported properties.',
+            this.ruleName,
+            new Replacement(
+                instance.getStart(), instance.getWidth(),
+                printer.printNode(ts.EmitHint.Unspecified, migratedNode, sourceFile))));
+      }
+    }));
+
+    return failures;
+  }
+}
diff --git a/packages/core/schematics/migrations/google3/relativeLinkResolutionDefaultRule.ts b/packages/core/schematics/migrations/google3/relativeLinkResolutionDefaultRule.ts
new file mode 100644
index 0000000000000..3725981830ae7
--- /dev/null
+++ b/packages/core/schematics/migrations/google3/relativeLinkResolutionDefaultRule.ts
@@ -0,0 +1,48 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {RuleFailure, Rules} from 'tslint';
+import * as ts from 'typescript';
+
+import {RelativeLinkResolutionCollector} from '../relative-link-resolution/collector';
+import {TslintUpdateRecorder} from '../relative-link-resolution/google3/tslint_update_recorder';
+import {RelativeLinkResolutionTransform} from '../relative-link-resolution/transform';
+
+export class Rule extends Rules.TypedRule {
+  applyWithProgram(sourceFile: ts.SourceFile, program: ts.Program): RuleFailure[] {
+    const typeChecker = program.getTypeChecker();
+    const ruleName = this.ruleName;
+    const sourceFiles = program.getSourceFiles().filter(
+        s => !s.isDeclarationFile && !program.isSourceFileFromExternalLibrary(s));
+    const updateRecorders = new Map<ts.SourceFile, TslintUpdateRecorder>();
+    const relativeLinkResolutionCollector = new RelativeLinkResolutionCollector(typeChecker);
+
+    // Analyze source files by detecting all modules.
+    sourceFiles.forEach(sourceFile => relativeLinkResolutionCollector.visitNode(sourceFile));
+
+    const {forRootCalls, extraOptionsLiterals} = relativeLinkResolutionCollector;
+    const transformer = new RelativeLinkResolutionTransform(getUpdateRecorder);
+    transformer.migrateRouterModuleForRootCalls(forRootCalls);
+    transformer.migrateObjectLiterals(extraOptionsLiterals);
+
+    if (updateRecorders.has(sourceFile)) {
+      return updateRecorders.get(sourceFile)!.failures;
+    }
+    return [];
+
+    /** Gets the update recorder for the specified source file. */
+    function getUpdateRecorder(sourceFile: ts.SourceFile): TslintUpdateRecorder {
+      if (updateRecorders.has(sourceFile)) {
+        return updateRecorders.get(sourceFile)!;
+      }
+      const recorder = new TslintUpdateRecorder(ruleName, sourceFile);
+      updateRecorders.set(sourceFile, recorder);
+      return recorder;
+    }
+  }
+}
diff --git a/packages/core/schematics/migrations/google3/rendererToRenderer2Rule.ts b/packages/core/schematics/migrations/google3/rendererToRenderer2Rule.ts
index 161e251afb1e0..0155066eb79f7 100644
--- a/packages/core/schematics/migrations/google3/rendererToRenderer2Rule.ts
+++ b/packages/core/schematics/migrations/google3/rendererToRenderer2Rule.ts
@@ -9,9 +9,11 @@
 import {Replacement, RuleFailure, Rules} from 'tslint';
 import * as ts from 'typescript';
 
+import {getImportSpecifier, replaceImport} from '../../utils/typescript/imports';
+import {closestNode} from '../../utils/typescript/nodes';
 import {getHelper, HelperFunction} from '../renderer-to-renderer2/helpers';
-import {migrateExpression, replaceImport} from '../renderer-to-renderer2/migration';
-import {findCoreImport, findRendererReferences} from '../renderer-to-renderer2/util';
+import {migrateExpression} from '../renderer-to-renderer2/migration';
+import {findRendererReferences} from '../renderer-to-renderer2/util';
 
 /**
  * TSLint rule that migrates from `Renderer` to `Renderer2`. More information on how it works:
@@ -22,15 +24,18 @@ export class Rule extends Rules.TypedRule {
     const typeChecker = program.getTypeChecker();
     const printer = ts.createPrinter();
     const failures: RuleFailure[] = [];
-    const rendererImport = findCoreImport(sourceFile, 'Renderer');
+    const rendererImportSpecifier = getImportSpecifier(sourceFile, '@angular/core', 'Renderer');
+    const rendererImport = rendererImportSpecifier ?
+        closestNode<ts.NamedImports>(rendererImportSpecifier, ts.SyntaxKind.NamedImports) :
+        null;
 
     // If there are no imports for the `Renderer`, we can exit early.
-    if (!rendererImport) {
+    if (!rendererImportSpecifier || !rendererImport) {
       return failures;
     }
 
     const {typedNodes, methodCalls, forwardRefs} =
-        findRendererReferences(sourceFile, typeChecker, rendererImport);
+        findRendererReferences(sourceFile, typeChecker, rendererImportSpecifier);
     const helpersToAdd = new Set<HelperFunction>();
 
     failures.push(this._getNamedImportsFailure(rendererImport, sourceFile, printer));
diff --git a/packages/core/schematics/migrations/google3/waitForAsyncRule.ts b/packages/core/schematics/migrations/google3/waitForAsyncRule.ts
new file mode 100644
index 0000000000000..44f374d60d108
--- /dev/null
+++ b/packages/core/schematics/migrations/google3/waitForAsyncRule.ts
@@ -0,0 +1,65 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Replacement, RuleFailure, Rules} from 'tslint';
+import * as ts from 'typescript';
+
+import {findAsyncReferences} from '../../migrations/wait-for-async/util';
+import {getImportSpecifier, replaceImport} from '../../utils/typescript/imports';
+import {closestNode} from '../../utils/typescript/nodes';
+
+/** Name of the deprecated function that we're removing. */
+const deprecatedFunction = 'async';
+
+/** Name of the function that will replace the deprecated one. */
+const newFunction = 'waitForAsync';
+
+/** TSLint rule that migrates from `async` to `waitForAsync`. */
+export class Rule extends Rules.TypedRule {
+  applyWithProgram(sourceFile: ts.SourceFile, program: ts.Program): RuleFailure[] {
+    const failures: RuleFailure[] = [];
+    const asyncImportSpecifier =
+        getImportSpecifier(sourceFile, '@angular/core/testing', deprecatedFunction);
+    const asyncImport = asyncImportSpecifier ?
+        closestNode<ts.NamedImports>(asyncImportSpecifier, ts.SyntaxKind.NamedImports) :
+        null;
+
+    // If there are no imports of `async`, we can exit early.
+    if (asyncImportSpecifier && asyncImport) {
+      const typeChecker = program.getTypeChecker();
+      const printer = ts.createPrinter();
+      failures.push(this._getNamedImportsFailure(asyncImport, sourceFile, printer));
+      findAsyncReferences(sourceFile, typeChecker, asyncImportSpecifier)
+          .forEach(node => failures.push(this._getIdentifierNodeFailure(node, sourceFile)));
+    }
+
+    return failures;
+  }
+
+  /** Gets a failure for an import of the `async` function. */
+  private _getNamedImportsFailure(
+      node: ts.NamedImports, sourceFile: ts.SourceFile, printer: ts.Printer): RuleFailure {
+    const replacementText = printer.printNode(
+        ts.EmitHint.Unspecified, replaceImport(node, deprecatedFunction, newFunction), sourceFile);
+
+    return new RuleFailure(
+        sourceFile, node.getStart(), node.getEnd(),
+        `Imports of the deprecated ${deprecatedFunction} function are not allowed. Use ${
+            newFunction} instead.`,
+        this.ruleName, new Replacement(node.getStart(), node.getWidth(), replacementText));
+  }
+
+  /** Gets a failure for an identifier node. */
+  private _getIdentifierNodeFailure(node: ts.Identifier, sourceFile: ts.SourceFile): RuleFailure {
+    return new RuleFailure(
+        sourceFile, node.getStart(), node.getEnd(),
+        `References to the deprecated ${deprecatedFunction} function are not allowed. Use ${
+            newFunction} instead.`,
+        this.ruleName, new Replacement(node.getStart(), node.getWidth(), newFunction));
+  }
+}
diff --git a/packages/core/schematics/migrations/initial-navigation/BUILD.bazel b/packages/core/schematics/migrations/initial-navigation/BUILD.bazel
new file mode 100644
index 0000000000000..43326967b01ac
--- /dev/null
+++ b/packages/core/schematics/migrations/initial-navigation/BUILD.bazel
@@ -0,0 +1,19 @@
+load("//tools:defaults.bzl", "ts_library")
+
+ts_library(
+    name = "initial-navigation",
+    srcs = glob(["**/*.ts"]),
+    tsconfig = "//packages/core/schematics:tsconfig.json",
+    visibility = [
+        "//packages/core/schematics:__pkg__",
+        "//packages/core/schematics/migrations/google3:__pkg__",
+        "//packages/core/schematics/migrations/initial-navigation/google3:__pkg__",
+        "//packages/core/schematics/test:__pkg__",
+    ],
+    deps = [
+        "//packages/core/schematics/utils",
+        "@npm//@angular-devkit/schematics",
+        "@npm//@types/node",
+        "@npm//typescript",
+    ],
+)
diff --git a/packages/core/schematics/migrations/initial-navigation/README.md b/packages/core/schematics/migrations/initial-navigation/README.md
new file mode 100644
index 0000000000000..a279f273c7696
--- /dev/null
+++ b/packages/core/schematics/migrations/initial-navigation/README.md
@@ -0,0 +1,43 @@
+## initialNavigation migration
+
+Automatically migrates the `initialNavigation` property of the `RouterModule` to the newly
+available options: `enabledNonBlocking` (default), `enabledBlocking`, and `disabled`.
+
+#### Before
+```ts
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+@NgModule({
+  imports: [
+    RouterModule.forRoot(ROUTES, {initialNavigation: 'legacy_disabled'}),
+  ]
+})
+export class AppModule {
+}
+```
+
+#### After
+```ts
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+@NgModule({
+  imports: [
+    RouterModule.forRoot(ROUTES, {initialNavigation: 'disabled'}),
+  ]
+})
+export class AppModule {
+}
+```
+
+### Disclaimer
+
+The migration only covers the most common patterns where developers set the `ExtraOptions#InitialNavigation` 
+option to an outdated value. Therefore, if a user declares the option using a number of other methods, 
+e.g. shorthand notation, variable declaration, or some other crafty method, they will have to migrate 
+those options by hand. Otherwise, the compiler will error if the types are sufficiently enforced.
+
+The basic migration strategy is as follows:
+* `legacy_disabled` || `false` => `disabled`
+* `legacy_enabled` || `true` => `enabledNonBlocking` (new default)
\ No newline at end of file
diff --git a/packages/core/schematics/migrations/initial-navigation/collector.ts b/packages/core/schematics/migrations/initial-navigation/collector.ts
new file mode 100644
index 0000000000000..0c29ee7b3abb3
--- /dev/null
+++ b/packages/core/schematics/migrations/initial-navigation/collector.ts
@@ -0,0 +1,116 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {isExtraOptions, isRouterModuleForRoot} from './util';
+
+
+/** The property name for the options that need to be migrated */
+const INITIAL_NAVIGATION = 'initialNavigation';
+
+/**
+ * Visitor that walks through specified TypeScript nodes and collects all
+ * found ExtraOptions#InitialNavigation assignments.
+ */
+export class InitialNavigationCollector {
+  public assignments: Set<ts.PropertyAssignment> = new Set();
+
+  constructor(private readonly typeChecker: ts.TypeChecker) {}
+
+  visitNode(node: ts.Node) {
+    let extraOptionsLiteral: ts.ObjectLiteralExpression|null = null;
+    if (isRouterModuleForRoot(this.typeChecker, node) && node.arguments.length > 0) {
+      if (node.arguments.length === 1) {
+        return;
+      }
+
+      if (ts.isObjectLiteralExpression(node.arguments[1])) {
+        extraOptionsLiteral = node.arguments[1] as ts.ObjectLiteralExpression;
+      } else if (ts.isIdentifier(node.arguments[1])) {
+        extraOptionsLiteral =
+            this.getLiteralNeedingMigrationFromIdentifier(node.arguments[1] as ts.Identifier);
+      }
+    } else if (ts.isVariableDeclaration(node)) {
+      extraOptionsLiteral = this.getLiteralNeedingMigration(node);
+    }
+
+    if (extraOptionsLiteral !== null) {
+      this.visitExtraOptionsLiteral(extraOptionsLiteral);
+    } else {
+      // no match found, continue iteration
+      ts.forEachChild(node, n => this.visitNode(n));
+    }
+  }
+
+  visitExtraOptionsLiteral(extraOptionsLiteral: ts.ObjectLiteralExpression) {
+    for (const prop of extraOptionsLiteral.properties) {
+      if (ts.isPropertyAssignment(prop) &&
+          (ts.isIdentifier(prop.name) || ts.isStringLiteralLike(prop.name))) {
+        if (prop.name.text === INITIAL_NAVIGATION && isValidInitialNavigationValue(prop)) {
+          this.assignments.add(prop);
+        }
+      } else if (ts.isSpreadAssignment(prop) && ts.isIdentifier(prop.expression)) {
+        const literalFromSpreadAssignment =
+            this.getLiteralNeedingMigrationFromIdentifier(prop.expression);
+        if (literalFromSpreadAssignment !== null) {
+          this.visitExtraOptionsLiteral(literalFromSpreadAssignment);
+        }
+      }
+    }
+  }
+
+  private getLiteralNeedingMigrationFromIdentifier(id: ts.Identifier): ts.ObjectLiteralExpression
+      |null {
+    const symbolForIdentifier = this.typeChecker.getSymbolAtLocation(id);
+    if (symbolForIdentifier === undefined) {
+      return null;
+    }
+
+    if (symbolForIdentifier.declarations.length === 0) {
+      return null;
+    }
+
+    const declarationNode = symbolForIdentifier.declarations[0];
+    if (!ts.isVariableDeclaration(declarationNode) || declarationNode.initializer === undefined ||
+        !ts.isObjectLiteralExpression(declarationNode.initializer)) {
+      return null;
+    }
+
+    return declarationNode.initializer;
+  }
+
+  private getLiteralNeedingMigration(node: ts.VariableDeclaration): ts.ObjectLiteralExpression
+      |null {
+    if (node.initializer === undefined) {
+      return null;
+    }
+
+    // declaration could be `x: ExtraOptions = {}` or `x = {} as ExtraOptions`
+    if (ts.isAsExpression(node.initializer) &&
+        ts.isObjectLiteralExpression(node.initializer.expression) &&
+        isExtraOptions(this.typeChecker, node.initializer.type)) {
+      return node.initializer.expression;
+    } else if (
+        node.type !== undefined && ts.isObjectLiteralExpression(node.initializer) &&
+        isExtraOptions(this.typeChecker, node.type)) {
+      return node.initializer;
+    }
+
+    return null;
+  }
+}
+
+/**
+ * Check whether the value assigned to an `initialNavigation` assignment
+ * conforms to the expected types for ExtraOptions#InitialNavigation
+ * @param node the property assignment to check
+ */
+function isValidInitialNavigationValue(node: ts.PropertyAssignment): boolean {
+  return ts.isStringLiteralLike(node.initializer) ||
+      node.initializer.kind === ts.SyntaxKind.FalseKeyword ||
+      node.initializer.kind === ts.SyntaxKind.TrueKeyword;
+}
diff --git a/packages/core/schematics/migrations/initial-navigation/google3/BUILD.bazel b/packages/core/schematics/migrations/initial-navigation/google3/BUILD.bazel
new file mode 100644
index 0000000000000..28baae084ab64
--- /dev/null
+++ b/packages/core/schematics/migrations/initial-navigation/google3/BUILD.bazel
@@ -0,0 +1,13 @@
+load("//tools:defaults.bzl", "ts_library")
+
+ts_library(
+    name = "google3",
+    srcs = glob(["**/*.ts"]),
+    tsconfig = "//packages/core/schematics:tsconfig.json",
+    visibility = ["//packages/core/schematics/migrations/google3:__pkg__"],
+    deps = [
+        "//packages/core/schematics/migrations/initial-navigation",
+        "@npm//tslint",
+        "@npm//typescript",
+    ],
+)
diff --git a/packages/core/schematics/migrations/initial-navigation/google3/tslint_update_recorder.ts b/packages/core/schematics/migrations/initial-navigation/google3/tslint_update_recorder.ts
new file mode 100644
index 0000000000000..09497f6289087
--- /dev/null
+++ b/packages/core/schematics/migrations/initial-navigation/google3/tslint_update_recorder.ts
@@ -0,0 +1,26 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Replacement, RuleFailure} from 'tslint';
+import * as ts from 'typescript';
+
+import {UpdateRecorder} from '../update_recorder';
+
+export class TslintUpdateRecorder implements UpdateRecorder {
+  failures: RuleFailure[] = [];
+
+  constructor(private ruleName: string, private sourceFile: ts.SourceFile) {}
+
+  updateNode(node: ts.Node, newText: string): void {
+    this.failures.push(new RuleFailure(
+        this.sourceFile, node.getStart(), node.getEnd(), `Node needs to be updated to: ${newText}`,
+        this.ruleName, Replacement.replaceFromTo(node.getStart(), node.getEnd(), newText)));
+  }
+
+  commitUpdate() {}
+}
diff --git a/packages/core/schematics/migrations/initial-navigation/index.ts b/packages/core/schematics/migrations/initial-navigation/index.ts
new file mode 100644
index 0000000000000..1cab6ed87d5f1
--- /dev/null
+++ b/packages/core/schematics/migrations/initial-navigation/index.ts
@@ -0,0 +1,73 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Rule, SchematicsException, Tree} from '@angular-devkit/schematics';
+import {relative} from 'path';
+import * as ts from 'typescript';
+import {getProjectTsConfigPaths} from '../../utils/project_tsconfig_paths';
+import {createMigrationProgram} from '../../utils/typescript/compiler_host';
+import {InitialNavigationCollector} from './collector';
+import {InitialNavigationTransform} from './transform';
+import {UpdateRecorder} from './update_recorder';
+
+/** Entry point for the v10 "initialNavigation RouterModule options" schematic. */
+export default function(): Rule {
+  return (tree: Tree) => {
+    const {buildPaths, testPaths} = getProjectTsConfigPaths(tree);
+    const basePath = process.cwd();
+
+    if (!buildPaths.length && !testPaths.length) {
+      throw new SchematicsException(
+          'Could not find any tsconfig file. Cannot update the "initialNavigation" option for RouterModule');
+    }
+
+    for (const tsconfigPath of [...buildPaths, ...testPaths]) {
+      runInitialNavigationMigration(tree, tsconfigPath, basePath);
+    }
+  };
+}
+
+function runInitialNavigationMigration(tree: Tree, tsconfigPath: string, basePath: string) {
+  const {program} = createMigrationProgram(tree, tsconfigPath, basePath);
+  const typeChecker = program.getTypeChecker();
+  const initialNavigationCollector = new InitialNavigationCollector(typeChecker);
+  const sourceFiles = program.getSourceFiles().filter(
+      f => !f.isDeclarationFile && !program.isSourceFileFromExternalLibrary(f));
+
+  // Analyze source files by detecting all modules.
+  sourceFiles.forEach(sourceFile => initialNavigationCollector.visitNode(sourceFile));
+
+  const {assignments} = initialNavigationCollector;
+  const transformer = new InitialNavigationTransform(typeChecker, getUpdateRecorder);
+  const updateRecorders = new Map<ts.SourceFile, UpdateRecorder>();
+  transformer.migrateInitialNavigationAssignments(Array.from(assignments));
+
+  // Walk through each update recorder and commit the update. We need to commit the
+  // updates in batches per source file as there can be only one recorder per source
+  // file in order to avoid shift character offsets.
+  updateRecorders.forEach(recorder => recorder.commitUpdate());
+
+  /** Gets the update recorder for the specified source file. */
+  function getUpdateRecorder(sourceFile: ts.SourceFile): UpdateRecorder {
+    if (updateRecorders.has(sourceFile)) {
+      return updateRecorders.get(sourceFile)!;
+    }
+    const treeRecorder = tree.beginUpdate(relative(basePath, sourceFile.fileName));
+    const recorder: UpdateRecorder = {
+      updateNode(node: ts.Node, newText: string) {
+        treeRecorder.remove(node.getStart(), node.getWidth());
+        treeRecorder.insertRight(node.getStart(), newText);
+      },
+      commitUpdate() {
+        tree.commitUpdate(treeRecorder);
+      }
+    };
+    updateRecorders.set(sourceFile, recorder);
+    return recorder;
+  }
+}
diff --git a/packages/core/schematics/migrations/initial-navigation/transform.ts b/packages/core/schematics/migrations/initial-navigation/transform.ts
new file mode 100644
index 0000000000000..32b105605dbfc
--- /dev/null
+++ b/packages/core/schematics/migrations/initial-navigation/transform.ts
@@ -0,0 +1,75 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {UpdateRecorder} from './update_recorder';
+
+
+export class InitialNavigationTransform {
+  private printer = ts.createPrinter();
+
+  constructor(
+      private typeChecker: ts.TypeChecker,
+      private getUpdateRecorder: (sf: ts.SourceFile) => UpdateRecorder) {}
+
+  /** Migrate the ExtraOptions#InitialNavigation property assignments. */
+  migrateInitialNavigationAssignments(literals: ts.PropertyAssignment[]) {
+    literals.forEach(l => this.migrateAssignment(l));
+  }
+
+  /** Migrate an ExtraOptions#InitialNavigation expression to use the new options format. */
+  migrateAssignment(assignment: ts.PropertyAssignment) {
+    const newInitializer = getUpdatedInitialNavigationValue(assignment.initializer);
+    if (newInitializer) {
+      const newAssignment =
+          ts.updatePropertyAssignment(assignment, assignment.name, newInitializer);
+      this._updateNode(assignment, newAssignment);
+    }
+  }
+
+  private _updateNode(node: ts.Node, newNode: ts.Node) {
+    const newText = this.printer.printNode(ts.EmitHint.Unspecified, newNode, node.getSourceFile());
+    const recorder = this.getUpdateRecorder(node.getSourceFile());
+    recorder.updateNode(node, newText);
+  }
+}
+
+/**
+ * Updates the deprecated initialNavigation options to their v10 equivalents
+ * (or as close as we can get).
+ * @param initializer the old initializer to update
+ */
+function getUpdatedInitialNavigationValue(initializer: ts.Expression): ts.Expression|null {
+  const oldText: string|boolean = ts.isStringLiteralLike(initializer) ?
+      initializer.text :
+      initializer.kind === ts.SyntaxKind.TrueKeyword;
+  let newText: string|undefined;
+  switch (oldText) {
+    case false:
+    case 'legacy_disabled':
+      newText = 'disabled';
+      break;
+    case true:
+    case 'legacy_enabled':
+      newText = 'enabledNonBlocking';
+      break;
+  }
+
+  return !!newText ? ts.createIdentifier(`'${newText}'`) : null;
+}
+
+/**
+ * Check whether the value assigned to an `initialNavigation` assignment
+ * conforms to the expected types for ExtraOptions#InitialNavigation
+ * @param node the property assignment to check
+ */
+function isValidInitialNavigationValue(node: ts.PropertyAssignment): boolean {
+  return ts.isStringLiteralLike(node.initializer) ||
+      node.initializer.kind === ts.SyntaxKind.FalseKeyword ||
+      node.initializer.kind === ts.SyntaxKind.TrueKeyword;
+}
diff --git a/packages/core/schematics/migrations/initial-navigation/update_recorder.ts b/packages/core/schematics/migrations/initial-navigation/update_recorder.ts
new file mode 100644
index 0000000000000..82e1787968785
--- /dev/null
+++ b/packages/core/schematics/migrations/initial-navigation/update_recorder.ts
@@ -0,0 +1,19 @@
+/**
+ * @license
+ * Copyright Google LLC 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';
+
+/**
+ * Update recorder interface that is used to transform source files in a non-colliding
+ * way. Also this indirection makes it possible to re-use logic for both TSLint rules
+ * and CLI devkit schematic updates.
+ */
+export interface UpdateRecorder {
+  updateNode(node: ts.Node, newText: string): void;
+  commitUpdate(): void;
+}
diff --git a/packages/core/schematics/migrations/initial-navigation/util.ts b/packages/core/schematics/migrations/initial-navigation/util.ts
new file mode 100644
index 0000000000000..d8a7c56562479
--- /dev/null
+++ b/packages/core/schematics/migrations/initial-navigation/util.ts
@@ -0,0 +1,33 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {getImportOfIdentifier} from '../../utils/typescript/imports';
+
+/** Determine whether a node is a ModuleWithProviders type reference node without a generic type */
+export function isRouterModuleForRoot(
+    typeChecker: ts.TypeChecker, node: ts.Node): node is ts.CallExpression {
+  if (!ts.isCallExpression(node) || !ts.isPropertyAccessExpression(node.expression) ||
+      !ts.isIdentifier(node.expression.expression) || node.expression.name.text !== 'forRoot') {
+    return false;
+  }
+  const imp = getImportOfIdentifier(typeChecker, node.expression.expression);
+  return !!imp && imp.name === 'RouterModule' && imp.importModule === '@angular/router' &&
+      !node.typeArguments;
+}
+
+export function isExtraOptions(
+    typeChecker: ts.TypeChecker, node: ts.Node): node is ts.TypeReferenceNode {
+  if (!ts.isTypeReferenceNode(node) || !ts.isIdentifier(node.typeName)) {
+    return false;
+  }
+
+  const imp = getImportOfIdentifier(typeChecker, node.typeName);
+  return imp !== null && imp.name === 'ExtraOptions' && imp.importModule === '@angular/router' &&
+      !node.typeArguments;
+}
diff --git a/packages/core/schematics/migrations/module-with-providers/transform.ts b/packages/core/schematics/migrations/module-with-providers/transform.ts
index 3c5eb7e0f5f9f..2995f83a7e7d1 100644
--- a/packages/core/schematics/migrations/module-with-providers/transform.ts
+++ b/packages/core/schematics/migrations/module-with-providers/transform.ts
@@ -20,7 +20,7 @@ export interface AnalysisFailure {
   message: string;
 }
 
-const TODO_COMMENT = 'TODO: The following node requires a generic type for `ModuleWithProviders';
+const TODO_COMMENT = 'TODO: The following node requires a generic type for `ModuleWithProviders`';
 
 export class ModuleWithProvidersTransform {
   private printer = ts.createPrinter();
diff --git a/packages/core/schematics/migrations/native-view-encapsulation/BUILD.bazel b/packages/core/schematics/migrations/native-view-encapsulation/BUILD.bazel
new file mode 100644
index 0000000000000..4c08ab63bf66a
--- /dev/null
+++ b/packages/core/schematics/migrations/native-view-encapsulation/BUILD.bazel
@@ -0,0 +1,18 @@
+load("//tools:defaults.bzl", "ts_library")
+
+ts_library(
+    name = "native-view-encapsulation",
+    srcs = glob(["**/*.ts"]),
+    tsconfig = "//packages/core/schematics:tsconfig.json",
+    visibility = [
+        "//packages/core/schematics:__pkg__",
+        "//packages/core/schematics/migrations/google3:__pkg__",
+        "//packages/core/schematics/test:__pkg__",
+    ],
+    deps = [
+        "//packages/core/schematics/utils",
+        "@npm//@angular-devkit/schematics",
+        "@npm//@types/node",
+        "@npm//typescript",
+    ],
+)
diff --git a/packages/core/schematics/migrations/native-view-encapsulation/README.md b/packages/core/schematics/migrations/native-view-encapsulation/README.md
new file mode 100644
index 0000000000000..0a9ab191a0585
--- /dev/null
+++ b/packages/core/schematics/migrations/native-view-encapsulation/README.md
@@ -0,0 +1,34 @@
+## `ViewEncapsulation.Native` migration
+
+Automatically migrates usages of `ViewEncapsulation.Native` to `ViewEncapsulation.ShadowDom`.
+For most practical purposes the `Native` mode is compatible with the `ShadowDom` mode.
+
+The migration covers any reference to the `Native` value that can be traced to `@angular/core`.
+Some examples:
+* Inside the `encapsulation` property of `Component` decorators.
+* In property assignments for the `COMPILER_OPTIONS` provider.
+* In variables.
+
+#### Before
+```ts
+import { Component, ViewEncapsulation } from '@angular/core';
+
+@Component({
+  template: '...',
+  encapsulation: ViewEncapsulation.Native
+})
+export class App {
+}
+```
+
+#### After
+```ts
+import { Component, ViewEncapsulation } from '@angular/core';
+
+@Component({
+  template: '...',
+  encapsulation: ViewEncapsulation.ShadowDom
+})
+export class App {
+}
+```
diff --git a/packages/core/schematics/migrations/native-view-encapsulation/index.ts b/packages/core/schematics/migrations/native-view-encapsulation/index.ts
new file mode 100644
index 0000000000000..766e8c4ca25ca
--- /dev/null
+++ b/packages/core/schematics/migrations/native-view-encapsulation/index.ts
@@ -0,0 +1,52 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Rule, SchematicsException, Tree} from '@angular-devkit/schematics';
+import {relative} from 'path';
+
+import {getProjectTsConfigPaths} from '../../utils/project_tsconfig_paths';
+import {createMigrationProgram} from '../../utils/typescript/compiler_host';
+import {findNativeEncapsulationNodes} from './util';
+
+
+/** Migration that switches from `ViewEncapsulation.Native` to `ViewEncapsulation.ShadowDom`. */
+export default function(): Rule {
+  return (tree: Tree) => {
+    const {buildPaths, testPaths} = getProjectTsConfigPaths(tree);
+    const basePath = process.cwd();
+    const allPaths = [...buildPaths, ...testPaths];
+
+    if (!allPaths.length) {
+      throw new SchematicsException(
+          'Could not find any tsconfig file. Cannot migrate away from Native view encapsulation.');
+    }
+
+    for (const tsconfigPath of allPaths) {
+      runNativeViewEncapsulationMigration(tree, tsconfigPath, basePath);
+    }
+  };
+}
+
+function runNativeViewEncapsulationMigration(tree: Tree, tsconfigPath: string, basePath: string) {
+  const {program} = createMigrationProgram(tree, tsconfigPath, basePath);
+  const typeChecker = program.getTypeChecker();
+  const sourceFiles = program.getSourceFiles().filter(
+      f => !f.isDeclarationFile && !program.isSourceFileFromExternalLibrary(f));
+
+  sourceFiles.forEach(sourceFile => {
+    const update = tree.beginUpdate(relative(basePath, sourceFile.fileName));
+    const identifiers = findNativeEncapsulationNodes(typeChecker, sourceFile);
+
+    identifiers.forEach(node => {
+      update.remove(node.getStart(), node.getWidth());
+      update.insertRight(node.getStart(), 'ShadowDom');
+    });
+
+    tree.commitUpdate(update);
+  });
+}
diff --git a/packages/core/schematics/migrations/native-view-encapsulation/util.ts b/packages/core/schematics/migrations/native-view-encapsulation/util.ts
new file mode 100644
index 0000000000000..c7188b01d7e62
--- /dev/null
+++ b/packages/core/schematics/migrations/native-view-encapsulation/util.ts
@@ -0,0 +1,38 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {getImportOfIdentifier} from '../../utils/typescript/imports';
+
+/** Finds all the Identifier nodes in a file that refer to `Native` view encapsulation. */
+export function findNativeEncapsulationNodes(
+    typeChecker: ts.TypeChecker, sourceFile: ts.SourceFile): Set<ts.Identifier> {
+  const results = new Set<ts.Identifier>();
+
+  sourceFile.forEachChild(function walkNode(node: ts.Node) {
+    // Note that we look directly for nodes in the form of `<something>.Native`, rather than going
+    // for `Component` class decorators, because it's much simpler and it allows us to handle cases
+    // where `ViewEncapsulation.Native` might be used in a different context (e.g. a variable).
+    // Using the encapsulation outside of a decorator is an edge case, but we do have public APIs
+    // where it can be passed in (see the `defaultViewEncapsulation` property on the
+    // `COMPILER_OPTIONS` provider).
+    if (ts.isPropertyAccessExpression(node) && ts.isIdentifier(node.name) &&
+        node.name.text === 'Native' && ts.isIdentifier(node.expression)) {
+      const expressionImport = getImportOfIdentifier(typeChecker, node.expression);
+      if (expressionImport && expressionImport.name === 'ViewEncapsulation' &&
+          expressionImport.importModule === '@angular/core') {
+        results.add(node.name);
+      }
+    } else {
+      node.forEachChild(walkNode);
+    }
+  });
+
+  return results;
+}
diff --git a/packages/core/schematics/migrations/navigation-extras-omissions/BUILD.bazel b/packages/core/schematics/migrations/navigation-extras-omissions/BUILD.bazel
new file mode 100644
index 0000000000000..dc793c9702303
--- /dev/null
+++ b/packages/core/schematics/migrations/navigation-extras-omissions/BUILD.bazel
@@ -0,0 +1,18 @@
+load("//tools:defaults.bzl", "ts_library")
+
+ts_library(
+    name = "navigation-extras-omissions",
+    srcs = glob(["**/*.ts"]),
+    tsconfig = "//packages/core/schematics:tsconfig.json",
+    visibility = [
+        "//packages/core/schematics:__pkg__",
+        "//packages/core/schematics/migrations/google3:__pkg__",
+        "//packages/core/schematics/test:__pkg__",
+    ],
+    deps = [
+        "//packages/core/schematics/utils",
+        "@npm//@angular-devkit/schematics",
+        "@npm//@types/node",
+        "@npm//typescript",
+    ],
+)
diff --git a/packages/core/schematics/migrations/navigation-extras-omissions/README.md b/packages/core/schematics/migrations/navigation-extras-omissions/README.md
new file mode 100644
index 0000000000000..e8236f03adc1a
--- /dev/null
+++ b/packages/core/schematics/migrations/navigation-extras-omissions/README.md
@@ -0,0 +1,35 @@
+## Router.navigateByUrl and Router.createUrlTree extras migration
+
+Previously the `extras` parameter of `Router.navigateByUrl` and `Router.createUrlTree` accepted the
+full `NavigationExtras` object, even though only a subset of properties was supported. This
+migration removes the unsupported properties from the relevant method call sites.
+
+#### Before
+```ts
+import { Component } from '@angular/core';
+import { Router } from '@angular/router';
+
+@Component({})
+export class MyComponent {
+  constructor(private _router: Router) {}
+
+  goHome() {
+    this._router.navigateByUrl('/', {skipLocationChange: false, fragment: 'foo'});
+  }
+}
+```
+
+#### After
+```ts
+import { Component } from '@angular/core';
+import { Router } from '@angular/router';
+
+@Component({})
+export class MyComponent {
+  constructor(private _router: Router) {}
+
+  goHome() {
+    this._router.navigateByUrl('/', { /* Removed unsupported properties by Angular migration: fragment. */ skipLocationChange: false });
+  }
+}
+```
diff --git a/packages/core/schematics/migrations/navigation-extras-omissions/index.ts b/packages/core/schematics/migrations/navigation-extras-omissions/index.ts
new file mode 100644
index 0000000000000..c8e7fa8032c6c
--- /dev/null
+++ b/packages/core/schematics/migrations/navigation-extras-omissions/index.ts
@@ -0,0 +1,61 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Rule, SchematicsException, Tree} from '@angular-devkit/schematics';
+import {relative} from 'path';
+import * as ts from 'typescript';
+
+import {getProjectTsConfigPaths} from '../../utils/project_tsconfig_paths';
+import {createMigrationProgram} from '../../utils/typescript/compiler_host';
+import {findLiteralsToMigrate, migrateLiteral} from './util';
+
+
+/** Migration that switches `Router.navigateByUrl` and `Router.createUrlTree` to a new signature. */
+export default function(): Rule {
+  return (tree: Tree) => {
+    const {buildPaths, testPaths} = getProjectTsConfigPaths(tree);
+    const basePath = process.cwd();
+    const allPaths = [...buildPaths, ...testPaths];
+
+    if (!allPaths.length) {
+      throw new SchematicsException(
+          'Could not find any tsconfig file. Cannot migrate ' +
+          'Router.navigateByUrl and Router.createUrlTree calls.');
+    }
+
+    for (const tsconfigPath of allPaths) {
+      runNavigationExtrasOmissionsMigration(tree, tsconfigPath, basePath);
+    }
+  };
+}
+
+function runNavigationExtrasOmissionsMigration(tree: Tree, tsconfigPath: string, basePath: string) {
+  const {program} = createMigrationProgram(tree, tsconfigPath, basePath);
+  const typeChecker = program.getTypeChecker();
+  const printer = ts.createPrinter();
+  const sourceFiles = program.getSourceFiles().filter(
+      f => !f.isDeclarationFile && !program.isSourceFileFromExternalLibrary(f));
+
+  sourceFiles.forEach(sourceFile => {
+    const literalsToMigrate = findLiteralsToMigrate(sourceFile, typeChecker);
+    const update = tree.beginUpdate(relative(basePath, sourceFile.fileName));
+
+    literalsToMigrate.forEach((instances, methodName) => instances.forEach(instance => {
+      const migratedNode = migrateLiteral(methodName, instance);
+
+      if (migratedNode !== instance) {
+        update.remove(instance.getStart(), instance.getWidth());
+        update.insertRight(
+            instance.getStart(),
+            printer.printNode(ts.EmitHint.Unspecified, migratedNode, sourceFile));
+      }
+    }));
+
+    tree.commitUpdate(update);
+  });
+}
diff --git a/packages/core/schematics/migrations/navigation-extras-omissions/util.ts b/packages/core/schematics/migrations/navigation-extras-omissions/util.ts
new file mode 100644
index 0000000000000..cdf8c3c4c9d02
--- /dev/null
+++ b/packages/core/schematics/migrations/navigation-extras-omissions/util.ts
@@ -0,0 +1,125 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {getImportSpecifier} from '../../utils/typescript/imports';
+import {isReferenceToImport} from '../../utils/typescript/symbol';
+
+/**
+ * Configures the methods that the migration should be looking for
+ * and the properties from `NavigationExtras` that should be preserved.
+ */
+const methodConfig = new Map<string, Set<string>>([
+  ['navigateByUrl', new Set<string>(['skipLocationChange', 'replaceUrl', 'state'])],
+  [
+    'createUrlTree', new Set<string>([
+      'relativeTo', 'queryParams', 'fragment', 'preserveQueryParams', 'queryParamsHandling',
+      'preserveFragment'
+    ])
+  ]
+]);
+
+export function migrateLiteral(
+    methodName: string, node: ts.ObjectLiteralExpression): ts.ObjectLiteralExpression {
+  const allowedProperties = methodConfig.get(methodName);
+
+  if (!allowedProperties) {
+    throw Error(`Attempting to migrate unconfigured method called ${methodName}.`);
+  }
+
+  const propertiesToKeep: ts.ObjectLiteralElementLike[] = [];
+  const removedPropertyNames: string[] = [];
+
+  node.properties.forEach(property => {
+    // Only look for regular and shorthand property assignments since resolving things
+    // like spread operators becomes too complicated for this migration.
+    if ((ts.isPropertyAssignment(property) || ts.isShorthandPropertyAssignment(property)) &&
+        (ts.isStringLiteralLike(property.name) || ts.isNumericLiteral(property.name) ||
+         ts.isIdentifier(property.name))) {
+      if (allowedProperties.has(property.name.text)) {
+        propertiesToKeep.push(property);
+      } else {
+        removedPropertyNames.push(property.name.text);
+      }
+    } else {
+      propertiesToKeep.push(property);
+    }
+  });
+
+  // Don't modify the node if there's nothing to remove.
+  if (removedPropertyNames.length === 0) {
+    return node;
+  }
+
+  // Note that the trailing/leading spaces are necessary so the comment looks good.
+  const removalComment =
+      ` Removed unsupported properties by Angular migration: ${removedPropertyNames.join(', ')}. `;
+
+  if (propertiesToKeep.length > 0) {
+    propertiesToKeep[0] = addUniqueLeadingComment(propertiesToKeep[0], removalComment);
+    return ts.createObjectLiteral(propertiesToKeep);
+  } else {
+    return addUniqueLeadingComment(ts.createObjectLiteral(propertiesToKeep), removalComment);
+  }
+}
+
+export function findLiteralsToMigrate(sourceFile: ts.SourceFile, typeChecker: ts.TypeChecker) {
+  const results = new Map<string, Set<ts.ObjectLiteralExpression>>(
+      Array.from(methodConfig.keys(), key => [key, new Set()]));
+  const routerImport = getImportSpecifier(sourceFile, '@angular/router', 'Router');
+  const seenLiterals = new Map<ts.ObjectLiteralExpression, string>();
+
+  if (routerImport) {
+    sourceFile.forEachChild(function visitNode(node: ts.Node) {
+      // Look for calls that look like `foo.<method to migrate>` with more than one parameter.
+      if (ts.isCallExpression(node) && node.arguments.length > 1 &&
+          ts.isPropertyAccessExpression(node.expression) && ts.isIdentifier(node.expression.name) &&
+          methodConfig.has(node.expression.name.text)) {
+        // Check whether the type of the object on which the
+        // function is called refers to the Router import.
+        if (isReferenceToImport(typeChecker, node.expression.expression, routerImport)) {
+          const methodName = node.expression.name.text;
+          const parameterDeclaration =
+              typeChecker.getTypeAtLocation(node.arguments[1]).getSymbol()?.valueDeclaration;
+
+          // Find the source of the object literal.
+          if (parameterDeclaration && ts.isObjectLiteralExpression(parameterDeclaration)) {
+            if (!seenLiterals.has(parameterDeclaration)) {
+              results.get(methodName)!.add(parameterDeclaration);
+              seenLiterals.set(parameterDeclaration, methodName);
+              // If the same literal has been passed into multiple different methods, we can't
+              // migrate it, because the supported properties are different. When we detect such
+              // a case, we drop it from the results so that it gets ignored. If it's used multiple
+              // times for the same method, it can still be migrated.
+            } else if (seenLiterals.get(parameterDeclaration) !== methodName) {
+              results.forEach(literals => literals.delete(parameterDeclaration));
+            }
+          }
+        }
+      } else {
+        node.forEachChild(visitNode);
+      }
+    });
+  }
+
+  return results;
+}
+
+/** Adds a leading comment to a node, if the node doesn't have such a comment already. */
+function addUniqueLeadingComment<T extends ts.Node>(node: T, comment: string): T {
+  const existingComments = ts.getSyntheticLeadingComments(node);
+
+  // This logic is primarily to ensure that we don't add the same comment multiple
+  // times when tslint runs over the same file again with outdated information.
+  if (!existingComments || existingComments.every(c => c.text !== comment)) {
+    return ts.addSyntheticLeadingComment(node, ts.SyntaxKind.MultiLineCommentTrivia, comment);
+  }
+
+  return node;
+}
diff --git a/packages/core/schematics/migrations/relative-link-resolution/BUILD.bazel b/packages/core/schematics/migrations/relative-link-resolution/BUILD.bazel
new file mode 100644
index 0000000000000..baed6ddb5a087
--- /dev/null
+++ b/packages/core/schematics/migrations/relative-link-resolution/BUILD.bazel
@@ -0,0 +1,23 @@
+load("//tools:defaults.bzl", "ts_library")
+
+ts_library(
+    name = "relative-link-resolution",
+    srcs = glob(["**/*.ts"]),
+    tsconfig = "//packages/core/schematics:tsconfig.json",
+    visibility = [
+        "//packages/core/schematics:__pkg__",
+        "//packages/core/schematics/migrations/google3:__pkg__",
+        "//packages/core/schematics/migrations/relative-link-resolution/google3:__pkg__",
+        "//packages/core/schematics/test:__pkg__",
+    ],
+    deps = [
+        "//packages/compiler-cli/src/ngtsc/annotations",
+        "//packages/compiler-cli/src/ngtsc/imports",
+        "//packages/compiler-cli/src/ngtsc/partial_evaluator",
+        "//packages/compiler-cli/src/ngtsc/reflection",
+        "//packages/core/schematics/utils",
+        "@npm//@angular-devkit/schematics",
+        "@npm//@types/node",
+        "@npm//typescript",
+    ],
+)
diff --git a/packages/core/schematics/migrations/relative-link-resolution/README.md b/packages/core/schematics/migrations/relative-link-resolution/README.md
new file mode 100644
index 0000000000000..3d99628992e7a
--- /dev/null
+++ b/packages/core/schematics/migrations/relative-link-resolution/README.md
@@ -0,0 +1,33 @@
+## relativeLinkResolution migration
+
+The default value for `relativeLinkResolution` is changing from 'legacy' to 'corrected'.
+This migration updates `RouterModule` configurations that use the default value to 
+now specifically use 'legacy' to prevent breakages when updating.
+
+#### Before
+```ts
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+@NgModule({
+  imports: [
+    RouterModule.forRoot(ROUTES),
+  ]
+})
+export class AppModule {
+}
+```
+
+#### After
+```ts
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+@NgModule({
+  imports: [
+    RouterModule.forRoot(ROUTES, {relativeLinkResolution: 'legacy'}),
+  ]
+})
+export class AppModule {
+}
+```
\ No newline at end of file
diff --git a/packages/core/schematics/migrations/relative-link-resolution/collector.ts b/packages/core/schematics/migrations/relative-link-resolution/collector.ts
new file mode 100644
index 0000000000000..ee62dbc4a068b
--- /dev/null
+++ b/packages/core/schematics/migrations/relative-link-resolution/collector.ts
@@ -0,0 +1,87 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {isExtraOptions, isRouterModuleForRoot} from './util';
+
+
+/**
+ * Visitor that walks through specified TypeScript nodes and collects all
+ * found ExtraOptions#RelativeLinkResolution assignments.
+ */
+export class RelativeLinkResolutionCollector {
+  readonly forRootCalls: ts.CallExpression[] = [];
+  readonly extraOptionsLiterals: ts.ObjectLiteralExpression[] = [];
+
+  constructor(private readonly typeChecker: ts.TypeChecker) {}
+
+  visitNode(node: ts.Node) {
+    let forRootCall: ts.CallExpression|null = null;
+    let literal: ts.ObjectLiteralExpression|null = null;
+    if (isRouterModuleForRoot(this.typeChecker, node) && node.arguments.length > 0) {
+      if (node.arguments.length === 1) {
+        forRootCall = node;
+      } else if (ts.isObjectLiteralExpression(node.arguments[1])) {
+        literal = node.arguments[1] as ts.ObjectLiteralExpression;
+      } else if (ts.isIdentifier(node.arguments[1])) {
+        literal = this.getLiteralNeedingMigrationFromIdentifier(node.arguments[1] as ts.Identifier);
+      }
+    } else if (ts.isVariableDeclaration(node)) {
+      literal = this.getLiteralNeedingMigration(node);
+    }
+
+    if (literal !== null) {
+      this.extraOptionsLiterals.push(literal);
+    } else if (forRootCall !== null) {
+      this.forRootCalls.push(forRootCall);
+    } else {
+      // no match found, continue iteration
+      ts.forEachChild(node, n => this.visitNode(n));
+    }
+  }
+
+  private getLiteralNeedingMigrationFromIdentifier(id: ts.Identifier): ts.ObjectLiteralExpression
+      |null {
+    const symbolForIdentifier = this.typeChecker.getSymbolAtLocation(id);
+    if (symbolForIdentifier === undefined) {
+      return null;
+    }
+
+    if (symbolForIdentifier.declarations.length === 0) {
+      return null;
+    }
+
+    const declarationNode = symbolForIdentifier.declarations[0];
+    if (!ts.isVariableDeclaration(declarationNode) || declarationNode.initializer === undefined ||
+        !ts.isObjectLiteralExpression(declarationNode.initializer)) {
+      return null;
+    }
+
+    return declarationNode.initializer;
+  }
+
+  private getLiteralNeedingMigration(node: ts.VariableDeclaration): ts.ObjectLiteralExpression
+      |null {
+    if (node.initializer === undefined) {
+      return null;
+    }
+
+    // declaration could be `x: ExtraOptions = {}` or `x = {} as ExtraOptions`
+    if (ts.isAsExpression(node.initializer) &&
+        ts.isObjectLiteralExpression(node.initializer.expression) &&
+        isExtraOptions(this.typeChecker, node.initializer.type)) {
+      return node.initializer.expression;
+    } else if (
+        node.type !== undefined && ts.isObjectLiteralExpression(node.initializer) &&
+        isExtraOptions(this.typeChecker, node.type)) {
+      return node.initializer;
+    }
+
+    return null;
+  }
+}
diff --git a/packages/core/schematics/migrations/relative-link-resolution/google3/BUILD.bazel b/packages/core/schematics/migrations/relative-link-resolution/google3/BUILD.bazel
new file mode 100644
index 0000000000000..1a2d4e6b789f3
--- /dev/null
+++ b/packages/core/schematics/migrations/relative-link-resolution/google3/BUILD.bazel
@@ -0,0 +1,13 @@
+load("//tools:defaults.bzl", "ts_library")
+
+ts_library(
+    name = "google3",
+    srcs = glob(["**/*.ts"]),
+    tsconfig = "//packages/core/schematics:tsconfig.json",
+    visibility = ["//packages/core/schematics/migrations/google3:__pkg__"],
+    deps = [
+        "//packages/core/schematics/migrations/relative-link-resolution",
+        "@npm//tslint",
+        "@npm//typescript",
+    ],
+)
diff --git a/packages/core/schematics/migrations/relative-link-resolution/google3/tslint_update_recorder.ts b/packages/core/schematics/migrations/relative-link-resolution/google3/tslint_update_recorder.ts
new file mode 100644
index 0000000000000..f36e06d5b3427
--- /dev/null
+++ b/packages/core/schematics/migrations/relative-link-resolution/google3/tslint_update_recorder.ts
@@ -0,0 +1,28 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Replacement, RuleFailure} from 'tslint';
+import * as ts from 'typescript';
+
+import {UpdateRecorder} from '../update_recorder';
+
+export class TslintUpdateRecorder implements UpdateRecorder {
+  failures: RuleFailure[] = [];
+
+  constructor(private ruleName: string, private sourceFile: ts.SourceFile) {}
+
+  updateNode(node: ts.Node, newText: string) {
+    this.failures.unshift(new RuleFailure(
+        this.sourceFile, node.getStart(), 0,
+        'The relativeLinkResolution default is changing from `legacy` to `corrected`. To keep behavior consistent' +
+            ' when the change is merged, specify `legacy` rather than using the default.',
+        this.ruleName, Replacement.replaceFromTo(node.getStart(), node.getEnd(), `${newText}`)));
+  }
+
+  commitUpdate() {}
+}
diff --git a/packages/core/schematics/migrations/relative-link-resolution/index.ts b/packages/core/schematics/migrations/relative-link-resolution/index.ts
new file mode 100644
index 0000000000000..6c2f672c9e190
--- /dev/null
+++ b/packages/core/schematics/migrations/relative-link-resolution/index.ts
@@ -0,0 +1,74 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Rule, SchematicsException, Tree} from '@angular-devkit/schematics';
+import {relative} from 'path';
+import * as ts from 'typescript';
+import {getProjectTsConfigPaths} from '../../utils/project_tsconfig_paths';
+import {createMigrationProgram} from '../../utils/typescript/compiler_host';
+import {RelativeLinkResolutionCollector} from './collector';
+import {RelativeLinkResolutionTransform} from './transform';
+import {UpdateRecorder} from './update_recorder';
+
+/** Entry point for the v11 "relativeLinkResolution RouterModule options" schematic. */
+export default function(): Rule {
+  return (tree: Tree) => {
+    const {buildPaths, testPaths} = getProjectTsConfigPaths(tree);
+    const basePath = process.cwd();
+
+    if (!buildPaths.length && !testPaths.length) {
+      throw new SchematicsException(
+          'Could not find any tsconfig file. Cannot update the "relativeLinkResolution" option for RouterModule');
+    }
+
+    for (const tsconfigPath of [...buildPaths, ...testPaths]) {
+      runRelativeLinkResolutionMigration(tree, tsconfigPath, basePath);
+    }
+  };
+}
+
+function runRelativeLinkResolutionMigration(tree: Tree, tsconfigPath: string, basePath: string) {
+  const {program} = createMigrationProgram(tree, tsconfigPath, basePath);
+  const typeChecker = program.getTypeChecker();
+  const relativeLinkResolutionCollector = new RelativeLinkResolutionCollector(typeChecker);
+  const sourceFiles = program.getSourceFiles().filter(
+      f => !f.isDeclarationFile && !program.isSourceFileFromExternalLibrary(f));
+
+  // Analyze source files by detecting all modules.
+  sourceFiles.forEach(sourceFile => relativeLinkResolutionCollector.visitNode(sourceFile));
+
+  const {forRootCalls, extraOptionsLiterals} = relativeLinkResolutionCollector;
+  const transformer = new RelativeLinkResolutionTransform(getUpdateRecorder);
+  const updateRecorders = new Map<ts.SourceFile, UpdateRecorder>();
+  transformer.migrateRouterModuleForRootCalls(forRootCalls);
+  transformer.migrateObjectLiterals(extraOptionsLiterals);
+
+  // Walk through each update recorder and commit the update. We need to commit the
+  // updates in batches per source file as there can be only one recorder per source
+  // file in order to avoid shift character offsets.
+  updateRecorders.forEach(recorder => recorder.commitUpdate());
+
+  /** Gets the update recorder for the specified source file. */
+  function getUpdateRecorder(sourceFile: ts.SourceFile): UpdateRecorder {
+    if (updateRecorders.has(sourceFile)) {
+      return updateRecorders.get(sourceFile)!;
+    }
+    const treeRecorder = tree.beginUpdate(relative(basePath, sourceFile.fileName));
+    const recorder: UpdateRecorder = {
+      updateNode(node: ts.Node, newText: string) {
+        treeRecorder.remove(node.getStart(), node.getWidth());
+        treeRecorder.insertRight(node.getStart(), newText);
+      },
+      commitUpdate() {
+        tree.commitUpdate(treeRecorder);
+      }
+    };
+    updateRecorders.set(sourceFile, recorder);
+    return recorder;
+  }
+}
diff --git a/packages/core/schematics/migrations/relative-link-resolution/transform.ts b/packages/core/schematics/migrations/relative-link-resolution/transform.ts
new file mode 100644
index 0000000000000..91b2b4fb7df0f
--- /dev/null
+++ b/packages/core/schematics/migrations/relative-link-resolution/transform.ts
@@ -0,0 +1,64 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {UpdateRecorder} from './update_recorder';
+
+
+const RELATIVE_LINK_RESOLUTION = 'relativeLinkResolution';
+
+export class RelativeLinkResolutionTransform {
+  private printer = ts.createPrinter();
+
+  constructor(private getUpdateRecorder: (sf: ts.SourceFile) => UpdateRecorder) {}
+
+  /** Migrate the ExtraOptions#RelativeLinkResolution property assignments. */
+  migrateRouterModuleForRootCalls(calls: ts.CallExpression[]) {
+    calls.forEach(c => {
+      this._updateCallExpressionWithoutExtraOptions(c);
+    });
+  }
+
+  migrateObjectLiterals(vars: ts.ObjectLiteralExpression[]) {
+    vars.forEach(v => this._maybeUpdateLiteral(v));
+  }
+
+  private _updateCallExpressionWithoutExtraOptions(callExpression: ts.CallExpression) {
+    const args = callExpression.arguments;
+    const emptyLiteral = ts.createObjectLiteral();
+    const newNode = ts.updateCall(
+        callExpression, callExpression.expression, callExpression.typeArguments,
+        [args[0], this._getMigratedLiteralExpression(emptyLiteral)]);
+    this._updateNode(callExpression, newNode);
+  }
+
+  private _getMigratedLiteralExpression(literal: ts.ObjectLiteralExpression) {
+    if (literal.properties.some(
+            prop => ts.isPropertyAssignment(prop) &&
+                prop.name.getText() === RELATIVE_LINK_RESOLUTION)) {
+      // literal already defines a value for relativeLinkResolution. Skip it
+      return literal;
+    }
+    const legacyExpression =
+        ts.createPropertyAssignment(RELATIVE_LINK_RESOLUTION, ts.createIdentifier(`'legacy'`));
+    return ts.updateObjectLiteral(literal, [...literal.properties, legacyExpression]);
+  }
+
+  private _maybeUpdateLiteral(literal: ts.ObjectLiteralExpression) {
+    const updatedLiteral = this._getMigratedLiteralExpression(literal);
+    if (updatedLiteral !== literal) {
+      this._updateNode(literal, updatedLiteral);
+    }
+  }
+
+  private _updateNode(node: ts.Node, newNode: ts.Node) {
+    const newText = this.printer.printNode(ts.EmitHint.Unspecified, newNode, node.getSourceFile());
+    const recorder = this.getUpdateRecorder(node.getSourceFile());
+    recorder.updateNode(node, newText);
+  }
+}
diff --git a/packages/core/schematics/migrations/relative-link-resolution/update_recorder.ts b/packages/core/schematics/migrations/relative-link-resolution/update_recorder.ts
new file mode 100644
index 0000000000000..679626234643c
--- /dev/null
+++ b/packages/core/schematics/migrations/relative-link-resolution/update_recorder.ts
@@ -0,0 +1,19 @@
+/**
+ * @license
+ * Copyright Google LLC 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';
+
+/**
+ * Update recorder interface that is used to transform source files in a non-colliding
+ * way. Also this indirection makes it possible to re-use logic for both TSLint rules
+ * and CLI devkit schematic updates.
+ */
+export interface UpdateRecorder {
+  updateNode(node: ts.Node, newText: string): void;
+  commitUpdate(): void;
+}
\ No newline at end of file
diff --git a/packages/core/schematics/migrations/relative-link-resolution/util.ts b/packages/core/schematics/migrations/relative-link-resolution/util.ts
new file mode 100644
index 0000000000000..d8a7c56562479
--- /dev/null
+++ b/packages/core/schematics/migrations/relative-link-resolution/util.ts
@@ -0,0 +1,33 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {getImportOfIdentifier} from '../../utils/typescript/imports';
+
+/** Determine whether a node is a ModuleWithProviders type reference node without a generic type */
+export function isRouterModuleForRoot(
+    typeChecker: ts.TypeChecker, node: ts.Node): node is ts.CallExpression {
+  if (!ts.isCallExpression(node) || !ts.isPropertyAccessExpression(node.expression) ||
+      !ts.isIdentifier(node.expression.expression) || node.expression.name.text !== 'forRoot') {
+    return false;
+  }
+  const imp = getImportOfIdentifier(typeChecker, node.expression.expression);
+  return !!imp && imp.name === 'RouterModule' && imp.importModule === '@angular/router' &&
+      !node.typeArguments;
+}
+
+export function isExtraOptions(
+    typeChecker: ts.TypeChecker, node: ts.Node): node is ts.TypeReferenceNode {
+  if (!ts.isTypeReferenceNode(node) || !ts.isIdentifier(node.typeName)) {
+    return false;
+  }
+
+  const imp = getImportOfIdentifier(typeChecker, node.typeName);
+  return imp !== null && imp.name === 'ExtraOptions' && imp.importModule === '@angular/router' &&
+      !node.typeArguments;
+}
diff --git a/packages/core/schematics/migrations/renderer-to-renderer2/index.ts b/packages/core/schematics/migrations/renderer-to-renderer2/index.ts
index 06fee368cefb8..79bf08a4cfb61 100644
--- a/packages/core/schematics/migrations/renderer-to-renderer2/index.ts
+++ b/packages/core/schematics/migrations/renderer-to-renderer2/index.ts
@@ -12,10 +12,12 @@ import * as ts from 'typescript';
 
 import {getProjectTsConfigPaths} from '../../utils/project_tsconfig_paths';
 import {createMigrationProgram} from '../../utils/typescript/compiler_host';
+import {getImportSpecifier, replaceImport} from '../../utils/typescript/imports';
+import {closestNode} from '../../utils/typescript/nodes';
 
 import {getHelper, HelperFunction} from './helpers';
-import {migrateExpression, replaceImport} from './migration';
-import {findCoreImport, findRendererReferences} from './util';
+import {migrateExpression} from './migration';
+import {findRendererReferences} from './util';
 
 const MODULE_AUGMENTATION_FILENAME = 'ɵɵRENDERER_MIGRATION_CORE_AUGMENTATION.d.ts';
 
@@ -61,15 +63,18 @@ function runRendererToRenderer2Migration(tree: Tree, tsconfigPath: string, baseP
       f => !f.isDeclarationFile && !program.isSourceFileFromExternalLibrary(f));
 
   sourceFiles.forEach(sourceFile => {
-    const rendererImport = findCoreImport(sourceFile, 'Renderer');
+    const rendererImportSpecifier = getImportSpecifier(sourceFile, '@angular/core', 'Renderer');
+    const rendererImport = rendererImportSpecifier ?
+        closestNode<ts.NamedImports>(rendererImportSpecifier, ts.SyntaxKind.NamedImports) :
+        null;
 
     // If there are no imports for the `Renderer`, we can exit early.
-    if (!rendererImport) {
+    if (!rendererImportSpecifier || !rendererImport) {
       return;
     }
 
     const {typedNodes, methodCalls, forwardRefs} =
-        findRendererReferences(sourceFile, typeChecker, rendererImport);
+        findRendererReferences(sourceFile, typeChecker, rendererImportSpecifier);
     const update = tree.beginUpdate(relative(basePath, sourceFile.fileName));
     const helpersToAdd = new Set<HelperFunction>();
 
diff --git a/packages/core/schematics/migrations/renderer-to-renderer2/migration.ts b/packages/core/schematics/migrations/renderer-to-renderer2/migration.ts
index 2d7875c029435..2711309f4a662 100644
--- a/packages/core/schematics/migrations/renderer-to-renderer2/migration.ts
+++ b/packages/core/schematics/migrations/renderer-to-renderer2/migration.ts
@@ -9,34 +9,10 @@
 import * as ts from 'typescript';
 
 import {HelperFunction} from './helpers';
-import {findImportSpecifier} from './util';
 
 /** A call expression that is based on a property access. */
 type PropertyAccessCallExpression = ts.CallExpression&{expression: ts.PropertyAccessExpression};
 
-/** Replaces an import inside an import statement with a different one. */
-export function replaceImport(node: ts.NamedImports, oldImport: string, newImport: string) {
-  const isAlreadyImported = findImportSpecifier(node.elements, newImport);
-
-  if (isAlreadyImported) {
-    return node;
-  }
-
-  const existingImport = findImportSpecifier(node.elements, oldImport);
-
-  if (!existingImport) {
-    throw new Error(`Could not find an import to replace using ${oldImport}.`);
-  }
-
-  return ts.updateNamedImports(node, [
-    ...node.elements.filter(current => current !== existingImport),
-    // Create a new import while trying to preserve the alias of the old one.
-    ts.createImportSpecifier(
-        existingImport.propertyName ? ts.createIdentifier(newImport) : undefined,
-        existingImport.propertyName ? existingImport.name : ts.createIdentifier(newImport))
-  ]);
-}
-
 /**
  * Migrates a function call expression from `Renderer` to `Renderer2`.
  * Returns null if the expression should be dropped.
diff --git a/packages/core/schematics/migrations/renderer-to-renderer2/util.ts b/packages/core/schematics/migrations/renderer-to-renderer2/util.ts
index 347f6ef1dd0b6..3987cb64d55af 100644
--- a/packages/core/schematics/migrations/renderer-to-renderer2/util.ts
+++ b/packages/core/schematics/migrations/renderer-to-renderer2/util.ts
@@ -8,30 +8,32 @@
 
 import * as ts from 'typescript';
 
+import {getImportSpecifier} from '../../utils/typescript/imports';
+import {isReferenceToImport} from '../../utils/typescript/symbol';
+
 /**
  * Finds typed nodes (e.g. function parameters or class properties) that are referencing the old
  * `Renderer`, as well as calls to the `Renderer` methods.
  */
 export function findRendererReferences(
-    sourceFile: ts.SourceFile, typeChecker: ts.TypeChecker, rendererImport: ts.NamedImports) {
+    sourceFile: ts.SourceFile, typeChecker: ts.TypeChecker,
+    rendererImportSpecifier: ts.ImportSpecifier) {
   const typedNodes = new Set<ts.ParameterDeclaration|ts.PropertyDeclaration|ts.AsExpression>();
   const methodCalls = new Set<ts.CallExpression>();
   const forwardRefs = new Set<ts.Identifier>();
-  const importSpecifier = findImportSpecifier(rendererImport.elements, 'Renderer');
-  const forwardRefImport = findCoreImport(sourceFile, 'forwardRef');
-  const forwardRefSpecifier =
-      forwardRefImport ? findImportSpecifier(forwardRefImport.elements, 'forwardRef') : null;
+  const forwardRefSpecifier = getImportSpecifier(sourceFile, '@angular/core', 'forwardRef');
 
   ts.forEachChild(sourceFile, function visitNode(node: ts.Node) {
     if ((ts.isParameter(node) || ts.isPropertyDeclaration(node)) &&
-        isReferenceToImport(typeChecker, node.name, importSpecifier)) {
+        isReferenceToImport(typeChecker, node.name, rendererImportSpecifier)) {
       typedNodes.add(node);
     } else if (
-        ts.isAsExpression(node) && isReferenceToImport(typeChecker, node.type, importSpecifier)) {
+        ts.isAsExpression(node) &&
+        isReferenceToImport(typeChecker, node.type, rendererImportSpecifier)) {
       typedNodes.add(node);
     } else if (ts.isCallExpression(node)) {
       if (ts.isPropertyAccessExpression(node.expression) &&
-          isReferenceToImport(typeChecker, node.expression.expression, importSpecifier)) {
+          isReferenceToImport(typeChecker, node.expression.expression, rendererImportSpecifier)) {
         methodCalls.add(node);
       } else if (
           // If we're dealing with a forwardRef that's returning a Renderer.
@@ -39,7 +41,7 @@ export function findRendererReferences(
           isReferenceToImport(typeChecker, node.expression, forwardRefSpecifier) &&
           node.arguments.length) {
         const rendererIdentifier =
-            findRendererIdentifierInForwardRef(typeChecker, node, importSpecifier);
+            findRendererIdentifierInForwardRef(typeChecker, node, rendererImportSpecifier);
         if (rendererIdentifier) {
           forwardRefs.add(rendererIdentifier);
         }
@@ -52,59 +54,13 @@ export function findRendererReferences(
   return {typedNodes, methodCalls, forwardRefs};
 }
 
-/** Finds the import from @angular/core that has a symbol with a particular name. */
-export function findCoreImport(sourceFile: ts.SourceFile, symbolName: string): ts.NamedImports|
-    null {
-  // Only look through the top-level imports.
-  for (const node of sourceFile.statements) {
-    if (!ts.isImportDeclaration(node) || !ts.isStringLiteral(node.moduleSpecifier) ||
-        node.moduleSpecifier.text !== '@angular/core') {
-      continue;
-    }
-
-    const namedBindings = node.importClause && node.importClause.namedBindings;
-
-    if (!namedBindings || !ts.isNamedImports(namedBindings)) {
-      continue;
-    }
-
-    if (findImportSpecifier(namedBindings.elements, symbolName)) {
-      return namedBindings;
-    }
-  }
-
-  return null;
-}
-
-/** Finds an import specifier with a particular name, accounting for aliases. */
-export function findImportSpecifier(
-    elements: ts.NodeArray<ts.ImportSpecifier>, importName: string) {
-  return elements.find(element => {
-    const {name, propertyName} = element;
-    return propertyName ? propertyName.text === importName : name.text === importName;
-  }) ||
-      null;
-}
-
-/** Checks whether a node is referring to an import spcifier. */
-function isReferenceToImport(
-    typeChecker: ts.TypeChecker, node: ts.Node, importSpecifier: ts.ImportSpecifier|null): boolean {
-  if (importSpecifier) {
-    const nodeSymbol = typeChecker.getTypeAtLocation(node).getSymbol();
-    const importSymbol = typeChecker.getTypeAtLocation(importSpecifier).getSymbol();
-    return !!(nodeSymbol && importSymbol) &&
-        nodeSymbol.valueDeclaration === importSymbol.valueDeclaration;
-  }
-  return false;
-}
-
 /** Finds the identifier referring to the `Renderer` inside a `forwardRef` call expression. */
 function findRendererIdentifierInForwardRef(
     typeChecker: ts.TypeChecker, node: ts.CallExpression,
     rendererImport: ts.ImportSpecifier|null): ts.Identifier|null {
   const firstArg = node.arguments[0];
 
-  if (ts.isArrowFunction(firstArg)) {
+  if (ts.isArrowFunction(firstArg) && rendererImport) {
     // Check if the function is `forwardRef(() => Renderer)`.
     if (ts.isIdentifier(firstArg.body) &&
         isReferenceToImport(typeChecker, firstArg.body, rendererImport)) {
diff --git a/packages/core/schematics/migrations/router-preserve-query-params/BUILD.bazel b/packages/core/schematics/migrations/router-preserve-query-params/BUILD.bazel
new file mode 100644
index 0000000000000..58d793e1a6c52
--- /dev/null
+++ b/packages/core/schematics/migrations/router-preserve-query-params/BUILD.bazel
@@ -0,0 +1,18 @@
+load("//tools:defaults.bzl", "ts_library")
+
+ts_library(
+    name = "router-preserve-query-params",
+    srcs = glob(["**/*.ts"]),
+    tsconfig = "//packages/core/schematics:tsconfig.json",
+    visibility = [
+        "//packages/core/schematics:__pkg__",
+        "//packages/core/schematics/migrations/google3:__pkg__",
+        "//packages/core/schematics/test:__pkg__",
+    ],
+    deps = [
+        "//packages/core/schematics/utils",
+        "@npm//@angular-devkit/schematics",
+        "@npm//@types/node",
+        "@npm//typescript",
+    ],
+)
diff --git a/packages/core/schematics/migrations/router-preserve-query-params/README.md b/packages/core/schematics/migrations/router-preserve-query-params/README.md
new file mode 100644
index 0000000000000..125d39c6256bd
--- /dev/null
+++ b/packages/core/schematics/migrations/router-preserve-query-params/README.md
@@ -0,0 +1,35 @@
+## Router's NavigationExtras.preserveQueryParams migration
+
+Previously the `NatigationExtras` property of `preserveQueryParams` defined what should be done with
+query parameters on navigation.  This migration updates the usages of `preserveQueryParams` to
+instead use the `queryParamsHandler` property.
+
+#### Before
+```ts
+import { Component } from '@angular/core';
+import { Router } from '@angular/router';
+
+@Component({})
+export class MyComponent {
+  constructor(private _router: Router) {}
+
+  goHome() {
+    this._router.navigate('/', {preserveQueryParams: true, skipLocationChange: 'foo'});
+  }
+}
+```
+
+#### After
+```ts
+import { Component } from '@angular/core';
+import { Router } from '@angular/router';
+
+@Component({})
+export class MyComponent {
+  constructor(private _router: Router) {}
+
+  goHome() {
+    this._router.navigate('/', { queryParamsHandler: 'preserve', skipLocationChange: 'foo' });
+  }
+}
+```
diff --git a/packages/core/schematics/migrations/router-preserve-query-params/index.ts b/packages/core/schematics/migrations/router-preserve-query-params/index.ts
new file mode 100644
index 0000000000000..973337f72ce8d
--- /dev/null
+++ b/packages/core/schematics/migrations/router-preserve-query-params/index.ts
@@ -0,0 +1,64 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Rule, SchematicsException, Tree} from '@angular-devkit/schematics';
+import {relative} from 'path';
+import * as ts from 'typescript';
+
+import {getProjectTsConfigPaths} from '../../utils/project_tsconfig_paths';
+import {createMigrationProgram} from '../../utils/typescript/compiler_host';
+import {findLiteralsToMigrate, migrateLiteral} from './util';
+
+
+/**
+ * Migration that switches `NavigationExtras.preserveQueryParams` to set the coresponding value via
+ * `NavigationExtras`'s `queryParamsHandling` attribute.
+ */
+export default function(): Rule {
+  return (tree: Tree) => {
+    const {buildPaths, testPaths} = getProjectTsConfigPaths(tree);
+    const basePath = process.cwd();
+    const allPaths = [...buildPaths, ...testPaths];
+
+    if (!allPaths.length) {
+      throw new SchematicsException(
+          'Could not find any tsconfig file. Cannot migrate ' +
+          'NavigationExtras.preserveQueryParams usages.');
+    }
+
+    for (const tsconfigPath of allPaths) {
+      runPreserveQueryParamsMigration(tree, tsconfigPath, basePath);
+    }
+  };
+}
+
+function runPreserveQueryParamsMigration(tree: Tree, tsconfigPath: string, basePath: string) {
+  const {program} = createMigrationProgram(tree, tsconfigPath, basePath);
+  const typeChecker = program.getTypeChecker();
+  const printer = ts.createPrinter();
+  const sourceFiles = program.getSourceFiles().filter(
+      f => !f.isDeclarationFile && !program.isSourceFileFromExternalLibrary(f));
+
+  sourceFiles.forEach(sourceFile => {
+    const literalsToMigrate = findLiteralsToMigrate(sourceFile, typeChecker);
+    const update = tree.beginUpdate(relative(basePath, sourceFile.fileName));
+
+    literalsToMigrate.forEach((instances, methodName) => instances.forEach(instance => {
+      const migratedNode = migrateLiteral(methodName, instance);
+
+      if (migratedNode !== instance) {
+        update.remove(instance.getStart(), instance.getWidth());
+        update.insertRight(
+            instance.getStart(),
+            printer.printNode(ts.EmitHint.Unspecified, migratedNode, sourceFile));
+      }
+    }));
+
+    tree.commitUpdate(update);
+  });
+}
diff --git a/packages/core/schematics/migrations/router-preserve-query-params/util.ts b/packages/core/schematics/migrations/router-preserve-query-params/util.ts
new file mode 100644
index 0000000000000..3a4efc28e6102
--- /dev/null
+++ b/packages/core/schematics/migrations/router-preserve-query-params/util.ts
@@ -0,0 +1,105 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {getImportSpecifier} from '../../utils/typescript/imports';
+import {isReferenceToImport} from '../../utils/typescript/symbol';
+
+/**
+ * Configures the methods that the migration should be looking for
+ * and the properties from `NavigationExtras` that should be preserved.
+ */
+const methodConfig = new Set<string>(['navigate', 'createUrlTree']);
+
+const preserveQueryParamsKey = 'preserveQueryParams';
+
+export function migrateLiteral(
+    methodName: string, node: ts.ObjectLiteralExpression): ts.ObjectLiteralExpression {
+  const isMigratableMethod = methodConfig.has(methodName);
+
+  if (!isMigratableMethod) {
+    throw Error(`Attempting to migrate unconfigured method called ${methodName}.`);
+  }
+
+
+  const propertiesToKeep: ts.ObjectLiteralElementLike[] = [];
+  let propertyToMigrate: ts.PropertyAssignment|ts.ShorthandPropertyAssignment|undefined = undefined;
+
+  for (const property of node.properties) {
+    // Only look for regular and shorthand property assignments since resolving things
+    // like spread operators becomes too complicated for this migration.
+    if ((ts.isPropertyAssignment(property) || ts.isShorthandPropertyAssignment(property)) &&
+        (ts.isStringLiteralLike(property.name) || ts.isNumericLiteral(property.name) ||
+         ts.isIdentifier(property.name)) &&
+        (property.name.text === preserveQueryParamsKey)) {
+      propertyToMigrate = property;
+      continue;
+    }
+    propertiesToKeep.push(property);
+  }
+
+  // Don't modify the node if there's nothing to migrate.
+  if (propertyToMigrate === undefined) {
+    return node;
+  }
+
+  if ((ts.isShorthandPropertyAssignment(propertyToMigrate) &&
+       propertyToMigrate.objectAssignmentInitializer?.kind === ts.SyntaxKind.TrueKeyword) ||
+      (ts.isPropertyAssignment(propertyToMigrate) &&
+       propertyToMigrate.initializer.kind === ts.SyntaxKind.TrueKeyword)) {
+    return ts.updateObjectLiteral(
+        node,
+        propertiesToKeep.concat(
+            ts.createPropertyAssignment('queryParamsHandler', ts.createIdentifier(`'preserve'`))));
+  }
+
+  return ts.updateObjectLiteral(node, propertiesToKeep);
+}
+
+export function findLiteralsToMigrate(sourceFile: ts.SourceFile, typeChecker: ts.TypeChecker) {
+  const results = new Map<string, Set<ts.ObjectLiteralExpression>>(
+      Array.from(methodConfig.keys(), key => [key, new Set()]));
+  const routerImport = getImportSpecifier(sourceFile, '@angular/router', 'Router');
+  const seenLiterals = new Map<ts.ObjectLiteralExpression, string>();
+
+  if (routerImport) {
+    sourceFile.forEachChild(function visitNode(node: ts.Node) {
+      // Look for calls that look like `foo.<method to migrate>` with more than one parameter.
+      if (ts.isCallExpression(node) && node.arguments.length > 1 &&
+          ts.isPropertyAccessExpression(node.expression) && ts.isIdentifier(node.expression.name) &&
+          methodConfig.has(node.expression.name.text)) {
+        // Check whether the type of the object on which the
+        // function is called refers to the Router import.
+        if (isReferenceToImport(typeChecker, node.expression.expression, routerImport)) {
+          const methodName = node.expression.name.text;
+          const parameterDeclaration =
+              typeChecker.getTypeAtLocation(node.arguments[1]).getSymbol()?.valueDeclaration;
+
+          // Find the source of the object literal.
+          if (parameterDeclaration && ts.isObjectLiteralExpression(parameterDeclaration)) {
+            if (!seenLiterals.has(parameterDeclaration)) {
+              results.get(methodName)!.add(parameterDeclaration);
+              seenLiterals.set(parameterDeclaration, methodName);
+              // If the same literal has been passed into multiple different methods, we can't
+              // migrate it, because the supported properties are different. When we detect such
+              // a case, we drop it from the results so that it gets ignored. If it's used multiple
+              // times for the same method, it can still be migrated.
+            } else if (seenLiterals.get(parameterDeclaration) !== methodName) {
+              results.forEach(literals => literals.delete(parameterDeclaration));
+            }
+          }
+        }
+      } else {
+        node.forEachChild(visitNode);
+      }
+    });
+  }
+
+  return results;
+}
diff --git a/packages/core/schematics/migrations/wait-for-async/BUILD.bazel b/packages/core/schematics/migrations/wait-for-async/BUILD.bazel
new file mode 100644
index 0000000000000..18cf7800c80ef
--- /dev/null
+++ b/packages/core/schematics/migrations/wait-for-async/BUILD.bazel
@@ -0,0 +1,18 @@
+load("//tools:defaults.bzl", "ts_library")
+
+ts_library(
+    name = "wait-for-async",
+    srcs = glob(["**/*.ts"]),
+    tsconfig = "//packages/core/schematics:tsconfig.json",
+    visibility = [
+        "//packages/core/schematics:__pkg__",
+        "//packages/core/schematics/migrations/google3:__pkg__",
+        "//packages/core/schematics/test:__pkg__",
+    ],
+    deps = [
+        "//packages/core/schematics/utils",
+        "@npm//@angular-devkit/schematics",
+        "@npm//@types/node",
+        "@npm//typescript",
+    ],
+)
diff --git a/packages/core/schematics/migrations/wait-for-async/README.md b/packages/core/schematics/migrations/wait-for-async/README.md
new file mode 100644
index 0000000000000..468fb934966a6
--- /dev/null
+++ b/packages/core/schematics/migrations/wait-for-async/README.md
@@ -0,0 +1,21 @@
+## async -> waitForAsync migration
+
+Automatically migrates from `async` to `waitForAsync` by changing function calls and renaming imports.
+
+#### Before
+```ts
+import { async } from '@angular/core/testing';
+
+it('should work', async(() => {
+  // async testing logic
+}));
+```
+
+#### After
+```ts
+import { waitForAsync } from '@angular/core/testing';
+
+it('should work', waitForAsync(() => {
+  // async testing logic
+}));
+```
diff --git a/packages/core/schematics/migrations/wait-for-async/index.ts b/packages/core/schematics/migrations/wait-for-async/index.ts
new file mode 100644
index 0000000000000..28254c5f7af1e
--- /dev/null
+++ b/packages/core/schematics/migrations/wait-for-async/index.ts
@@ -0,0 +1,92 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Rule, SchematicsException, Tree} from '@angular-devkit/schematics';
+import {relative} from 'path';
+import * as ts from 'typescript';
+
+import {getProjectTsConfigPaths} from '../../utils/project_tsconfig_paths';
+import {createMigrationProgram} from '../../utils/typescript/compiler_host';
+import {getImportSpecifier, replaceImport} from '../../utils/typescript/imports';
+import {closestNode} from '../../utils/typescript/nodes';
+
+import {findAsyncReferences} from './util';
+
+const MODULE_AUGMENTATION_FILENAME = 'ɵɵASYNC_MIGRATION_CORE_AUGMENTATION.d.ts';
+
+/** Migration that switches from `async` to `waitForAsync`. */
+export default function(): Rule {
+  return (tree: Tree) => {
+    const {buildPaths, testPaths} = getProjectTsConfigPaths(tree);
+    const basePath = process.cwd();
+    const allPaths = [...buildPaths, ...testPaths];
+
+    if (!allPaths.length) {
+      throw new SchematicsException(
+          'Could not find any tsconfig file. Cannot migrate async usages to waitForAsync.');
+    }
+
+    for (const tsconfigPath of allPaths) {
+      runWaitForAsyncMigration(tree, tsconfigPath, basePath);
+    }
+  };
+}
+
+function runWaitForAsyncMigration(tree: Tree, tsconfigPath: string, basePath: string) {
+  const {program} = createMigrationProgram(tree, tsconfigPath, basePath, fileName => {
+    // In case the module augmentation file has been requested, we return a source file that
+    // augments "@angular/core/testing" to include a named export called "async". This ensures that
+    // we can rely on the type checker for this migration after `async` has been removed.
+    if (fileName === MODULE_AUGMENTATION_FILENAME) {
+      return `
+        import '@angular/core/testing';
+        declare module "@angular/core/testing" {
+          function async(fn: Function): any;
+        }
+      `;
+    }
+    return null;
+  }, [MODULE_AUGMENTATION_FILENAME]);
+  const typeChecker = program.getTypeChecker();
+  const printer = ts.createPrinter();
+  const sourceFiles = program.getSourceFiles().filter(
+      f => !f.isDeclarationFile && !program.isSourceFileFromExternalLibrary(f));
+  const deprecatedFunction = 'async';
+  const newFunction = 'waitForAsync';
+
+  sourceFiles.forEach(sourceFile => {
+    const asyncImportSpecifier =
+        getImportSpecifier(sourceFile, '@angular/core/testing', deprecatedFunction);
+    const asyncImport = asyncImportSpecifier ?
+        closestNode<ts.NamedImports>(asyncImportSpecifier, ts.SyntaxKind.NamedImports) :
+        null;
+
+    // If there are no imports for `async`, we can exit early.
+    if (!asyncImportSpecifier || !asyncImport) {
+      return;
+    }
+
+    const update = tree.beginUpdate(relative(basePath, sourceFile.fileName));
+
+    // Change the `async` import to `waitForAsync`.
+    update.remove(asyncImport.getStart(), asyncImport.getWidth());
+    update.insertRight(
+        asyncImport.getStart(),
+        printer.printNode(
+            ts.EmitHint.Unspecified, replaceImport(asyncImport, deprecatedFunction, newFunction),
+            sourceFile));
+
+    // Change `async` calls to `waitForAsync`.
+    findAsyncReferences(sourceFile, typeChecker, asyncImportSpecifier).forEach(node => {
+      update.remove(node.getStart(), node.getWidth());
+      update.insertRight(node.getStart(), newFunction);
+    });
+
+    tree.commitUpdate(update);
+  });
+}
diff --git a/packages/core/schematics/migrations/wait-for-async/util.ts b/packages/core/schematics/migrations/wait-for-async/util.ts
new file mode 100644
index 0000000000000..bea02d986315c
--- /dev/null
+++ b/packages/core/schematics/migrations/wait-for-async/util.ts
@@ -0,0 +1,30 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {isReferenceToImport} from '../../utils/typescript/symbol';
+
+/** Finds calls to the `async` function. */
+export function findAsyncReferences(
+    sourceFile: ts.SourceFile, typeChecker: ts.TypeChecker,
+    asyncImportSpecifier: ts.ImportSpecifier) {
+  const results = new Set<ts.Identifier>();
+
+  ts.forEachChild(sourceFile, function visitNode(node: ts.Node) {
+    if (ts.isCallExpression(node) && ts.isIdentifier(node.expression) &&
+        node.expression.text === 'async' &&
+        isReferenceToImport(typeChecker, node.expression, asyncImportSpecifier)) {
+      results.add(node.expression);
+    }
+
+    ts.forEachChild(node, visitNode);
+  });
+
+  return results;
+}
diff --git a/packages/core/schematics/test/BUILD.bazel b/packages/core/schematics/test/BUILD.bazel
index 1a232cd29fe74..a26b22892fa52 100644
--- a/packages/core/schematics/test/BUILD.bazel
+++ b/packages/core/schematics/test/BUILD.bazel
@@ -8,15 +8,22 @@ ts_library(
         "//packages/core/schematics:migrations.json",
     ],
     deps = [
+        "//packages/core/schematics/migrations/abstract-control-parent",
         "//packages/core/schematics/migrations/dynamic-queries",
+        "//packages/core/schematics/migrations/initial-navigation",
         "//packages/core/schematics/migrations/missing-injectable",
         "//packages/core/schematics/migrations/module-with-providers",
         "//packages/core/schematics/migrations/move-document",
+        "//packages/core/schematics/migrations/native-view-encapsulation",
+        "//packages/core/schematics/migrations/navigation-extras-omissions",
+        "//packages/core/schematics/migrations/relative-link-resolution",
         "//packages/core/schematics/migrations/renderer-to-renderer2",
+        "//packages/core/schematics/migrations/router-preserve-query-params",
         "//packages/core/schematics/migrations/static-queries",
         "//packages/core/schematics/migrations/template-var-assignment",
         "//packages/core/schematics/migrations/undecorated-classes-with-decorated-fields",
         "//packages/core/schematics/migrations/undecorated-classes-with-di",
+        "//packages/core/schematics/migrations/wait-for-async",
         "//packages/core/schematics/utils",
         "@npm//@angular-devkit/core",
         "@npm//@angular-devkit/schematics",
diff --git a/packages/core/schematics/test/abstract_control_parent_migration_spec.ts b/packages/core/schematics/test/abstract_control_parent_migration_spec.ts
new file mode 100644
index 0000000000000..cdf396734d518
--- /dev/null
+++ b/packages/core/schematics/test/abstract_control_parent_migration_spec.ts
@@ -0,0 +1,289 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {getSystemPath, normalize, virtualFs} from '@angular-devkit/core';
+import {TempScopedNodeJsSyncHost} from '@angular-devkit/core/node/testing';
+import {HostTree} from '@angular-devkit/schematics';
+import {SchematicTestRunner, UnitTestTree} from '@angular-devkit/schematics/testing';
+import * as shx from 'shelljs';
+
+describe('AbstractControl.parent migration', () => {
+  let runner: SchematicTestRunner;
+  let host: TempScopedNodeJsSyncHost;
+  let tree: UnitTestTree;
+  let tmpDirPath: string;
+  let previousWorkingDir: string;
+
+  beforeEach(() => {
+    runner = new SchematicTestRunner('test', require.resolve('../migrations.json'));
+    host = new TempScopedNodeJsSyncHost();
+    tree = new UnitTestTree(new HostTree(host));
+
+    writeFile('/tsconfig.json', JSON.stringify({
+      compilerOptions: {lib: ['es2015'], strictNullChecks: true},
+    }));
+    writeFile('/angular.json', JSON.stringify({
+      projects: {t: {architect: {build: {options: {tsConfig: './tsconfig.json'}}}}}
+    }));
+    // We need to declare the Angular symbols we're testing for, otherwise type checking won't work.
+    writeFile('/node_modules/@angular/forms/index.d.ts', `
+      export declare abstract class AbstractControl {
+        get dirty(): boolean;
+        get disabled(): boolean;
+        get parent(): FormGroup | FormArray | null;
+      }
+
+      export declare class FormArray extends AbstractControl {
+        getRawValue(): any[];
+      }
+
+      export declare class FormControl extends AbstractControl {
+        setValue(value: any): void;
+      }
+
+      export declare class FormGroup extends AbstractControl {
+        getRawValue(): any;
+      }
+    `);
+
+    // Fake non-Angular package to make sure that we don't migrate packages we don't own.
+    writeFile('/node_modules/@not-angular/forms/index.d.ts', `
+      export declare abstract class AbstractControl {
+        get dirty(): boolean;
+        get disabled(): boolean;
+        get parent(): FormGroup | FormArray | null;
+      }
+
+      export declare class FormControl extends AbstractControl {
+        setValue(value: any): void;
+      }
+    `);
+
+    previousWorkingDir = shx.pwd();
+    tmpDirPath = getSystemPath(host.root);
+
+    // Switch into the temporary directory path. This allows us to run
+    // the schematic against our custom unit test tree.
+    shx.cd(tmpDirPath);
+  });
+
+  afterEach(() => {
+    shx.cd(previousWorkingDir);
+    shx.rm('-r', tmpDirPath);
+  });
+
+  it('should add non-null assertions to accesses of AbstractControl.parent', async () => {
+    writeFile('/index.ts', `
+      import {AbstractControl} from '@angular/forms';
+
+      class App {
+        private _control: AbstractControl;
+
+        getParentValue() {
+          return this._control.parent.value;
+        }
+      }
+    `);
+
+    await runMigration();
+    expect(tree.readContent('/index.ts')).toContain(`return this._control.parent!.value;`);
+  });
+
+  it('should add non-null assertions to accesses of FormArray.parent', async () => {
+    writeFile('/index.ts', `
+      import {FormArray} from '@angular/forms';
+
+      class App {
+        getParentValueOf(control: FormArray) {
+          return control.parent.value;
+        }
+      }
+    `);
+
+    await runMigration();
+    expect(tree.readContent('/index.ts')).toContain(`return control.parent!.value;`);
+  });
+
+  it('should add non-null assertions to accesses of FormControl.parent', async () => {
+    writeFile('/index.ts', `
+      import {FormControl} from '@angular/forms';
+
+      class App {
+        getBlankControlParentValue() {
+          return this._getControl().parent.value;
+        }
+
+        private _getControl() {
+          return new FormControl();
+        }
+      }
+    `);
+
+    await runMigration();
+    expect(tree.readContent('/index.ts')).toContain(`return this._getControl().parent!.value;`);
+  });
+
+  it('should add non-null assertions to accesses of FormGroup.parent', async () => {
+    writeFile('/index.ts', `
+      import {FormGroup} from '@angular/forms';
+
+      class App {
+        getGlobalGroupParentValue() {
+          const parent = (window.foo as FormGroup).parent;
+          return parent.value;
+        }
+      }
+    `);
+
+    await runMigration();
+    expect(tree.readContent('/index.ts'))
+        .toContain(`const parent = (window.foo as FormGroup).parent!;`);
+  });
+
+  it('should add non-null assertions to nested accesses of `AbstractControl.parent`', async () => {
+    writeFile('/index.ts', `
+      import {FormControl} from '@angular/forms';
+
+      class App {
+        private _control = new FormControl();
+
+        getGreatGrandParentValue() {
+          return this._control.parent.parent.parent.value;
+        }
+      }
+    `);
+
+    await runMigration();
+    expect(tree.readContent('/index.ts'))
+        .toContain(`return this._control.parent!.parent!.parent!.value;`);
+  });
+
+  it('should not add non-null assertions if the `parent` has been null checked in an if statement',
+     async () => {
+       writeFile('/index.ts', `
+        import {FormControl} from '@angular/forms';
+
+        function getParentValue(control: FormControl) {
+          if (control.parent) {
+            return control.parent.value;
+          }
+
+          return null;
+        }
+      `);
+
+       await runMigration();
+
+       const content = tree.readContent('/index.ts');
+       expect(content).toContain(`if (control.parent) {`);
+       expect(content).toContain(`return control.parent.value;`);
+     });
+
+  it('should not add non-null assertions if the `parent` has been null checked in an else if statement',
+     async () => {
+       writeFile('/index.ts', `
+        import {FormControl} from '@angular/forms';
+
+        function getParentValue(foo: boolean, control: FormControl) {
+          if (foo) {
+            return foo;
+          } else if (control.parent) {
+            return control.parent.value;
+          }
+
+          return null;
+        }
+      `);
+
+       await runMigration();
+
+       const content = tree.readContent('/index.ts');
+       expect(content).toContain(`} else if (control.parent) {`);
+       expect(content).toContain(`return control.parent.value;`);
+     });
+
+  it('should not add non-null assertions if the `parent` has been null checked in a ternary expression',
+     async () => {
+       writeFile('/index.ts', `
+        import {FormControl} from '@angular/forms';
+
+        function getParentValue(control: FormControl) {
+          return control.parent ? control.parent.value : null;
+        }
+      `);
+
+       await runMigration();
+
+       expect(tree.readContent('/index.ts'))
+           .toContain(`return control.parent ? control.parent.value : null;`);
+     });
+
+  it('should not add non-null assertions if a nested `parent` has been null checked', async () => {
+    writeFile('/index.ts', `
+      import {FormControl} from '@angular/forms';
+
+      function getGreatGrandParentValue(control: FormControl) {
+        return control.parent && control.parent.parent && control.parent.parent.parent && control.parent.parent.parent.value;
+      }
+    `);
+
+    await runMigration();
+
+    expect(tree.readContent('/index.ts'))
+        .toContain(
+            `return control.parent && control.parent.parent && control.parent.parent.parent && control.parent.parent.parent.value;`);
+  });
+
+  it('should not add non-null assertions if there is one already', async () => {
+    writeFile('/index.ts', `
+      import {FormControl} from '@angular/forms';
+
+      function getParentValue(control: FormControl) {
+        return control.parent!.value;
+      }
+    `);
+
+    await runMigration();
+    expect(tree.readContent('/index.ts')).toContain(`return control.parent!.value;`);
+  });
+
+  it('should not add non-null assertions if there is a safe access', async () => {
+    writeFile('/index.ts', `
+      import {FormControl} from '@angular/forms';
+
+      function getParentValue(control: FormControl) {
+        return control.parent?.value;
+      }
+    `);
+
+    await runMigration();
+    expect(tree.readContent('/index.ts')).toContain(`return control.parent?.value;`);
+  });
+
+  it('should not add non-null assertions if the symbol does not come from @angular/forms',
+     async () => {
+       writeFile('/index.ts', `
+        import {FormControl} from '@not-angular/forms';
+
+        function getParentValue(control: FormControl) {
+          return control.parent.value;
+        }
+      `);
+
+       await runMigration();
+       expect(tree.readContent('/index.ts')).toContain(`return control.parent.value;`);
+     });
+
+  function writeFile(filePath: string, contents: string) {
+    host.sync.write(normalize(filePath), virtualFs.stringToFileBuffer(contents));
+  }
+
+  function runMigration() {
+    return runner.runSchematicAsync('migration-v11-abstract-control-parent', {}, tree).toPromise();
+  }
+});
diff --git a/packages/core/schematics/test/google3/initial_navigation_rule_spec.ts b/packages/core/schematics/test/google3/initial_navigation_rule_spec.ts
new file mode 100644
index 0000000000000..07cddb8fdb240
--- /dev/null
+++ b/packages/core/schematics/test/google3/initial_navigation_rule_spec.ts
@@ -0,0 +1,211 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {readFileSync, writeFileSync} from 'fs';
+import {dirname, join} from 'path';
+import * as shx from 'shelljs';
+import {Configuration, Linter} from 'tslint';
+
+describe('Google3 initial navigation tslint rule', () => {
+  const rulesDirectory = dirname(require.resolve('../../migrations/google3/initialNavigationRule'));
+
+  let tmpDir: string;
+
+  beforeEach(() => {
+    tmpDir = join(process.env['TEST_TMPDIR']!, 'google3-test');
+    shx.mkdir('-p', tmpDir);
+
+    writeFile('tsconfig.json', JSON.stringify({compilerOptions: {module: 'es2015'}}));
+  });
+
+  afterEach(() => shx.rm('-r', tmpDir));
+
+  function runTSLint(fix = true) {
+    const program = Linter.createProgram(join(tmpDir, 'tsconfig.json'));
+    const linter = new Linter({fix, rulesDirectory: [rulesDirectory]}, program);
+    const config = Configuration.parseConfigFile({rules: {'initial-navigation': true}});
+
+    program.getRootFileNames().forEach(fileName => {
+      linter.lint(fileName, program.getSourceFile(fileName)!.getFullText(), config);
+    });
+
+    return linter;
+  }
+
+  function writeFile(fileName: string, content: string) {
+    writeFileSync(join(tmpDir, fileName), content);
+  }
+
+  function getFile(fileName: string) {
+    return readFileSync(join(tmpDir, fileName), 'utf8');
+  }
+
+  it('should migrate legacy_disabled to disabled', () => {
+    writeFile('/index.ts', `
+      import { NgModule } from '@angular/core';
+      import { RouterModule } from '@angular/router';
+
+      @NgModule({
+        imports: [
+          RouterModule.forRoot([], {initialNavigation: 'legacy_disabled'}),
+        ]
+      })
+      export class AppModule {
+      }
+    `);
+
+
+    runTSLint();
+
+    expect(getFile('/index.ts')).toContain(`{initialNavigation: 'disabled'}`);
+  });
+
+  it(`should migrate false to disabled`, () => {
+    writeFile('/index.ts', `
+      import { NgModule } from '@angular/core';
+      import { RouterModule } from '@angular/router';
+
+      @NgModule({
+        imports: [
+          RouterModule.forRoot([], {initialNavigation: false}),
+        ]
+      })
+      export class AppModule {
+      }
+    `);
+
+    runTSLint();
+
+    expect(getFile('/index.ts')).toContain(`{initialNavigation: 'disabled'}`);
+  });
+
+  it('should migrate legacy_enabled to enabledNonBlocking', () => {
+    writeFile('/index.ts', `
+      import { NgModule } from '@angular/core';
+      import { RouterModule } from '@angular/router';
+
+      @NgModule({
+        imports: [
+          RouterModule.forRoot([], {initialNavigation: 'legacy_enabled'}),
+        ]
+      })
+      export class AppModule {
+      }
+    `);
+
+    runTSLint(true);
+
+    expect(getFile('/index.ts')).toContain(`{initialNavigation: 'enabledNonBlocking'}`);
+  });
+
+  it(`should migrate true to enabledNonBlocking`, () => {
+    writeFile('/index.ts', `
+      mport { NgModule } from '@angular/core';
+        import { RouterModule } from '@angular/router';
+
+        @NgModule({
+          imports: [
+            RouterModule.forRoot([], {initialNavigation: true}),
+          ]
+        })
+        export class AppModule {
+        }
+    `);
+
+    runTSLint(true);
+
+    expect(getFile('/index.ts')).toContain(`{initialNavigation: 'enabledNonBlocking'}`);
+  });
+
+  it('should migrate nested objects', () => {
+    writeFile('/index.ts', `
+        import { NgModule } from '@angular/core';
+        import { RouterModule } from '@angular/router';
+
+        const options = {initialNavigation: 'legacy_enabled'};
+
+        @NgModule({
+          imports: [
+            RouterModule.forRoot([], {initialNavigation: 'legacy_disabled', ...options}),
+          ]
+        })
+        export class AppModule {
+        }
+      `);
+
+    runTSLint(true);
+    expect(getFile('/index.ts'))
+        .toContain(`const options = {initialNavigation: 'enabledNonBlocking'};`);
+    expect(getFile('/index.ts')).toContain(`{initialNavigation: 'disabled', ...options}`);
+  });
+
+  it('should migrate nested objects mixed validity', () => {
+    writeFile('/index.ts', `
+        import { NgModule } from '@angular/core';
+        import { RouterModule } from '@angular/router';
+
+        const options = {initialNavigation: 'legacy_enabled'};
+
+        @NgModule({
+          imports: [
+            RouterModule.forRoot([], {initialNavigation: 'disabled', ...options}),
+          ]
+        })
+        export class AppModule {
+        }
+      `);
+
+    runTSLint(true);
+    expect(getFile('/index.ts'))
+        .toContain(`const options = {initialNavigation: 'enabledNonBlocking'};`);
+  });
+
+  it('should migrate nested objects opposite order', () => {
+    writeFile('/index.ts', `
+        import { NgModule } from '@angular/core';
+        import { RouterModule } from '@angular/router';
+
+        const options = {initialNavigation: 'legacy_enabled'};
+
+        @NgModule({
+          imports: [
+            RouterModule.forRoot([], {...options, initialNavigation: 'legacy_disabled'}),
+          ]
+        })
+        export class AppModule {
+        }
+      `);
+
+    runTSLint(true);
+    expect(getFile('/index.ts'))
+        .toContain(`const options = {initialNavigation: 'enabledNonBlocking'};`);
+    expect(getFile('/index.ts')).toContain(`{...options, initialNavigation: 'disabled'}`);
+  });
+
+  it('should migrate nested objects mixed validity opposite order', () => {
+    writeFile('/index.ts', `
+        import { NgModule } from '@angular/core';
+        import { RouterModule } from '@angular/router';
+
+        const options = {initialNavigation: 'legacy_enabled'};
+
+        @NgModule({
+          imports: [
+            RouterModule.forRoot([], {...options, initialNavigation: 'disabled'}),
+          ]
+        })
+        export class AppModule {
+        }
+      `);
+
+    runTSLint(true);
+    expect(getFile('/index.ts'))
+        .toContain(`const options = {initialNavigation: 'enabledNonBlocking'};`);
+    expect(getFile('/index.ts')).toContain(`{...options, initialNavigation: 'disabled'}`);
+  });
+});
diff --git a/packages/core/schematics/test/google3/navigation_extras_omissions_spec.ts b/packages/core/schematics/test/google3/navigation_extras_omissions_spec.ts
new file mode 100644
index 0000000000000..42325de7c02ec
--- /dev/null
+++ b/packages/core/schematics/test/google3/navigation_extras_omissions_spec.ts
@@ -0,0 +1,334 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {readFileSync, writeFileSync} from 'fs';
+import {dirname, join} from 'path';
+import * as shx from 'shelljs';
+import {Configuration, Linter} from 'tslint';
+
+describe('Google3 NavigationExtras omissions TSLint rule', () => {
+  const rulesDirectory =
+      dirname(require.resolve('../../migrations/google3/navigationExtrasOmissionsRule'));
+
+  let tmpDir: string;
+
+  beforeEach(() => {
+    tmpDir = join(process.env['TEST_TMPDIR']!, 'google3-test');
+    shx.mkdir('-p', tmpDir);
+
+    // We need to declare the Angular symbols we're testing for, otherwise type checking won't work.
+    writeFile('router.d.ts', `
+      export declare class Router {
+        navigateByUrl(url: string, extras?: any);
+        createUrlTree(commands: any[], extras?: any);
+      }
+    `);
+
+    writeFile('tsconfig.json', JSON.stringify({
+      compilerOptions: {
+        module: 'es2015',
+        baseUrl: './',
+        paths: {
+          '@angular/router': ['router.d.ts'],
+        }
+      },
+    }));
+  });
+
+  afterEach(() => shx.rm('-r', tmpDir));
+
+  function runTSLint(fix: boolean) {
+    const program = Linter.createProgram(join(tmpDir, 'tsconfig.json'));
+    const linter = new Linter({fix, rulesDirectory: [rulesDirectory]}, program);
+    const config = Configuration.parseConfigFile({rules: {'navigation-extras-omissions': true}});
+
+    program.getRootFileNames().forEach(fileName => {
+      linter.lint(fileName, program.getSourceFile(fileName)!.getFullText(), config);
+    });
+
+    return linter;
+  }
+
+  function writeFile(fileName: string, content: string) {
+    writeFileSync(join(tmpDir, fileName), content);
+  }
+
+  function getFile(fileName: string) {
+    return readFileSync(join(tmpDir, fileName), 'utf8');
+  }
+
+  it('should flag objects with invalid properties used inside the relevant method calls', () => {
+    writeFile('/index.ts', `
+      import {Router} from '@angular/router';
+
+      class Navigator {
+        constructor(private _router: Router) {}
+
+        goHome() {
+          this._router.navigateByUrl('/', {fragment: 'foo'});
+        }
+
+        createTree() {
+          return this._router.createUrlTree(['/'], {state: {}});
+        }
+
+        goAway() {
+          this._router.navigateByUrl('/away');
+        }
+      }
+    `);
+
+    const linter = runTSLint(false);
+    const failures = linter.getResult().failures.map(failure => failure.getFailure());
+
+    expect(failures.length).toBe(2);
+    expect(failures[0])
+        .toMatch(
+            /Object used in navigateByUrl or createUrlTree call contains unsupported properties/);
+    expect(failures[1])
+        .toMatch(
+            /Object used in navigateByUrl or createUrlTree call contains unsupported properties/);
+  });
+
+  it('should not change calls with a single argument', () => {
+    writeFile('/index.ts', `
+      import {Router} from '@angular/router';
+
+      class Navigator {
+        constructor(private _router: Router) {}
+
+        goHome() {
+          this._router.navigateByUrl('/');
+        }
+      }
+
+      function createTree(router: Router) {
+        return router.createUrlTree(['/']);
+      }
+    `);
+
+    runTSLint(true);
+
+    const content = getFile('/index.ts');
+    expect(content).toContain(`this._router.navigateByUrl('/');`);
+    expect(content).toContain(`return router.createUrlTree(['/']);`);
+  });
+
+  it('should not change calls with an empty object literal', () => {
+    writeFile('/index.ts', `
+      import {Router} from '@angular/router';
+
+      class Navigator {
+        constructor(private _router: Router) {}
+
+        goHome() {
+          this._router.navigateByUrl('/', {});
+        }
+      }
+
+      function createTree(router: Router) {
+        return router.createUrlTree(['/'], {});
+      }
+    `);
+
+    runTSLint(true);
+
+    const content = getFile('/index.ts');
+    expect(content).toContain(`this._router.navigateByUrl('/', {});`);
+    expect(content).toContain(`return router.createUrlTree(['/'], {});`);
+  });
+
+  it('should not change objects that are used in multiple different methods', () => {
+    writeFile('/index.ts', `
+      import {Router} from '@angular/router';
+
+      const config = {replaceUrl: true, fragment: 'foo', state: {}};
+
+      class Navigator {
+        constructor(private _router: Router) {}
+
+        goHome() {
+          this._router.navigateByUrl('/', config);
+          return this._router.createUrlTree(['/'], config);
+        }
+      }
+    `);
+
+    runTSLint(true);
+
+    const content = getFile('/index.ts');
+    expect(content).toContain(`const config = {replaceUrl: true, fragment: 'foo', state: {}};`);
+  });
+
+  it('should preserve calls if the router does not come from @angular/router', () => {
+    writeFile('/index.ts', `
+      import {Router} from '@custom/router';
+
+      function createTree(router: Router) {
+        return router.createUrlTree(['/'], {foo: 1, bar: 2});
+      }
+    `);
+
+    runTSLint(true);
+
+    const content = getFile('/index.ts');
+    expect(content).toContain(`return router.createUrlTree(['/'], {foo: 1, bar: 2});`);
+  });
+
+  it('should change invalid navigateByUrl calls', () => {
+    writeFile('/index.ts', `
+      import {Router} from '@angular/router';
+
+      class Navigator {
+        constructor(private _router: Router) {}
+
+        goHome() {
+          this._router.navigateByUrl('/', {preserveFragment: false, skipLocationChange: false, fragment: 'foo'});
+        }
+      }
+    `);
+
+    runTSLint(true);
+
+    const content = getFile('/index.ts');
+    expect(content).toContain(
+        `this._router.navigateByUrl('/', { /* Removed unsupported properties by Angular migration: preserveFragment, fragment. */ skipLocationChange: false });`);
+  });
+
+  it('should change invalid navigateByUrl calls', () => {
+    writeFile('/index.ts', `
+      import {Router} from '@angular/router';
+
+      function createTree(router: Router) {
+        return router.createUrlTree(['/'], {replaceUrl: true, preserveFragment: true, state: {}});
+      }
+    `);
+
+    runTSLint(true);
+
+    const content = getFile('/index.ts');
+    expect(content).toContain(
+        `return router.createUrlTree(['/'], { /* Removed unsupported properties by Angular migration: replaceUrl, state. */ preserveFragment: true });`);
+  });
+
+  it('should set the comment outside the object if all properties were removed', () => {
+    writeFile('/index.ts', `
+      import {Router} from '@angular/router';
+
+      function navigate(router: Router) {
+        router.navigateByUrl('/', {fragment: 'foo'});
+      }
+    `);
+
+    runTSLint(true);
+
+    const content = getFile('/index.ts');
+    expect(content).toContain(
+        `router.navigateByUrl('/', /* Removed unsupported properties by Angular migration: fragment. */ {});`);
+  });
+
+  it('should migrate object literals defined as variables', () => {
+    writeFile('/index.ts', `
+      import {Router} from '@angular/router';
+
+      const config = {skipLocationChange: false, fragment: 'foo'};
+      const proxy = config;
+
+      function navigate(router: Router) {
+        router.navigateByUrl('/', proxy);
+      }
+    `);
+
+    runTSLint(true);
+
+    const content = getFile('/index.ts');
+    expect(content).toContain(
+        `const config = { /* Removed unsupported properties by Angular migration: fragment. */ skipLocationChange: false };`);
+    expect(content).toContain(`const proxy = config;`);
+    expect(content).toContain(`router.navigateByUrl('/', proxy);`);
+  });
+
+  it('should pick up calls where the router is returned by a function', () => {
+    writeFile('/index.ts', `
+      import {Router} from '@angular/router';
+
+      function navigate(router: Router) {
+        getRouter().navigateByUrl('/', {fragment: 'foo'});
+      }
+
+      function getRouter() {
+        return {} as Router;
+      }
+    `);
+
+    runTSLint(true);
+
+    const content = getFile('/index.ts');
+    expect(content).toContain(
+        `getRouter().navigateByUrl('/', /* Removed unsupported properties by Angular migration: fragment. */ {});`);
+  });
+
+  it('should pick up calls where the router is aliased', () => {
+    writeFile('/index.ts', `
+      import {Router as AliasedRouter} from '@angular/router';
+
+      function navigate(router: AliasedRouter) {
+        router.navigateByUrl('/', {fragment: 'foo'});
+      }
+    `);
+
+    runTSLint(true);
+
+    const content = getFile('/index.ts');
+    expect(content).toContain(
+        `router.navigateByUrl('/', /* Removed unsupported properties by Angular migration: fragment. */ {});`);
+  });
+
+  it('should preserve object spread assignments', () => {
+    writeFile('/index.ts', `
+      import {Router} from '@angular/router';
+
+      function navigate(router: Router) {
+        const overrides = {foo: 1};
+        router.navigateByUrl('/', {replaceUrl: true, fragment: 'foo', ...overrides});
+      }
+    `);
+
+    runTSLint(true);
+
+    const content = getFile('/index.ts');
+    expect(content).toContain(
+        `router.navigateByUrl('/', { /* Removed unsupported properties by Angular migration: fragment. */ replaceUrl: true, ...overrides });`);
+  });
+
+  it('should migrate objects that are used in multiple calls of the same method', () => {
+    writeFile('/index.ts', `
+      import {Router} from '@angular/router';
+
+      const config = {skipLocationChange: false, fragment: 'foo'};
+
+      class Navigator {
+        constructor(private _router: Router) {}
+
+        goHome() {
+          this._router.navigateByUrl('/', config);
+        }
+
+        goFish() {
+          this._router.navigateByUrl('/fish', config);
+        }
+      }
+    `);
+
+    runTSLint(true);
+
+    const content = getFile('/index.ts');
+    expect(content).toContain(
+        `const config = { /* Removed unsupported properties by Angular migration: fragment. */ skipLocationChange: false };`);
+  });
+});
diff --git a/packages/core/schematics/test/google3/relative_link_resolution_default_spec.ts b/packages/core/schematics/test/google3/relative_link_resolution_default_spec.ts
new file mode 100644
index 0000000000000..700e291983a2c
--- /dev/null
+++ b/packages/core/schematics/test/google3/relative_link_resolution_default_spec.ts
@@ -0,0 +1,202 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {readFileSync, writeFileSync} from 'fs';
+import {dirname, join} from 'path';
+import * as shx from 'shelljs';
+import {Configuration, Linter} from 'tslint';
+
+describe('Google3 relativeLinkResolution TSLint rule', () => {
+  const rulesDirectory =
+      dirname(require.resolve('../../migrations/google3/relativeLinkResolutionDefaultRule'));
+
+  let tmpDir: string;
+
+  beforeEach(() => {
+    tmpDir = join(process.env['TEST_TMPDIR']!, 'google3-test');
+    shx.mkdir('-p', tmpDir);
+    writeFile('tsconfig.json', JSON.stringify({compilerOptions: {module: 'es2015'}}));
+  });
+
+  afterEach(() => shx.rm('-r', tmpDir));
+
+  function runTSLint(fix: boolean) {
+    const program = Linter.createProgram(join(tmpDir, 'tsconfig.json'));
+    const linter = new Linter({fix, rulesDirectory: [rulesDirectory]}, program);
+    const config = Configuration.parseConfigFile({
+      rules: {'relative-link-resolution-default': true},
+    });
+
+    program.getRootFileNames().forEach(fileName => {
+      linter.lint(fileName, program.getSourceFile(fileName)!.getFullText(), config);
+    });
+
+    return linter;
+  }
+
+  function writeFile(fileName: string, content: string) {
+    writeFileSync(join(tmpDir, fileName), content);
+  }
+
+  function getFile(fileName: string) {
+    return readFileSync(join(tmpDir, fileName), 'utf8');
+  }
+
+  it('should flag forRoot with no options', () => {
+    writeFile('/index.ts', `
+        import { NgModule } from '@angular/core';
+        import { RouterModule } from '@angular/router';
+        @NgModule({
+          imports: [
+            RouterModule.forRoot([]),
+          ]
+        })
+        export class AppModule {
+        }
+    `);
+
+    const linter = runTSLint(false);
+    const failures = linter.getResult().failures.map(failure => failure.getFailure());
+
+    expect(failures.length).toBe(1);
+    expect(failures[0])
+        .toBe(
+            'The relativeLinkResolution default is changing from `legacy` to `corrected`. To keep' +
+            ' behavior consistent when the change is merged, specify `legacy` rather than using the default.');
+  });
+
+  it('should migrate forRoot with no options', () => {
+    writeFile('/index.ts', `
+        import { NgModule } from '@angular/core';
+        import { RouterModule } from '@angular/router';
+        @NgModule({
+          imports: [
+            RouterModule.forRoot([]),
+          ]
+        })
+        export class AppModule {
+        }
+      `);
+
+    runTSLint(true);
+    expect(getFile('/index.ts'))
+        .toContain(`RouterModule.forRoot([], { relativeLinkResolution: 'legacy' })`);
+  });
+
+  it('should migrate options without relativeLinkResolution', () => {
+    writeFile('/index.ts', `
+        import { NgModule } from '@angular/core';
+        import { RouterModule } from '@angular/router';
+        @NgModule({
+          imports: [
+            RouterModule.forRoot([], {useHash: true}),
+          ]
+        })
+        export class AppModule {
+        }
+      `);
+
+    runTSLint(true);
+    expect(getFile('/index.ts'))
+        .toContain(`RouterModule.forRoot([], { useHash: true, relativeLinkResolution: 'legacy' })`);
+  });
+
+  it('should not migrate options containing relativeLinkResolution', () => {
+    writeFile('/index.ts', `
+        import { NgModule } from '@angular/core';
+        import { RouterModule } from '@angular/router';
+        @NgModule({
+          imports: [
+            RouterModule.forRoot([], {relativeLinkResolution: 'corrected'}),
+          ]
+        })
+        export class AppModule {
+        }
+      `);
+
+    runTSLint(true);
+    expect(getFile('/index.ts'))
+        .toContain(`RouterModule.forRoot([], {relativeLinkResolution: 'corrected'})`);
+  });
+
+  it('should migrate when options is a variable with AsExpression', () => {
+    writeFile('/index.ts', `
+        import { ExtraOptions } from '@angular/router';
+        const options = {useHash: true} as ExtraOptions;
+      `);
+
+    runTSLint(true);
+    expect(getFile('/index.ts'))
+        .toContain(
+            `const options = { useHash: true, relativeLinkResolution: 'legacy' } as ExtraOptions;`);
+  });
+
+  it('should migrate when options is a variable', () => {
+    writeFile('/index.ts', `
+        import { ExtraOptions } from '@angular/router';
+        const options: ExtraOptions = {useHash: true};
+      `);
+
+    runTSLint(true);
+    expect(getFile('/index.ts'))
+        .toContain(
+            `const options: ExtraOptions = { useHash: true, relativeLinkResolution: 'legacy' };`);
+  });
+
+  it('should migrate when options is a variable with no type', () => {
+    writeFile('/index.ts', `
+        import { NgModule } from '@angular/core';
+        import { ExtraOptions, RouterModule } from '@angular/router';
+
+        const options = {useHash: true};
+
+        @NgModule({
+          imports: [
+            RouterModule.forRoot([], options),
+          ]
+        })
+        export class AppModule {
+        }
+      `);
+
+    runTSLint(true);
+    expect(getFile('/index.ts'))
+        .toContain(`const options = { useHash: true, relativeLinkResolution: 'legacy' };`);
+    expect(getFile('/index.ts')).toContain(`RouterModule.forRoot([], options)`);
+  });
+
+  it('should migrate when aliased options is a variable', () => {
+    writeFile('/index.ts', `
+        import { ExtraOptions as RouterExtraOptions } from '@angular/router';
+        const options: RouterExtraOptions = {useHash: true};
+      `);
+
+    runTSLint(true);
+    expect(getFile('/index.ts'))
+        .toContain(
+            `const options: RouterExtraOptions = { useHash: true, relativeLinkResolution: 'legacy' };`);
+  });
+
+  it('should migrate aliased RouterModule.forRoot', () => {
+    writeFile('/index.ts', `
+        import { NgModule } from '@angular/core';
+        import { RouterModule as AngularRouterModule} from '@angular/router';
+        @NgModule({
+          imports: [
+            AngularRouterModule.forRoot([]),
+          ]
+        })
+        export class AppModule {
+        }
+      `);
+
+    runTSLint(true);
+    expect(getFile('/index.ts'))
+        .toContain(`AngularRouterModule.forRoot([], { relativeLinkResolution: 'legacy' }),`);
+  });
+});
diff --git a/packages/core/schematics/test/google3/renderer_to_renderer2_spec.ts b/packages/core/schematics/test/google3/renderer_to_renderer2_spec.ts
index 8810fe587109c..c71620cf5f415 100644
--- a/packages/core/schematics/test/google3/renderer_to_renderer2_spec.ts
+++ b/packages/core/schematics/test/google3/renderer_to_renderer2_spec.ts
@@ -105,6 +105,26 @@ describe('Google3 Renderer to Renderer2 TSLint rule', () => {
     expect(content).toContain('(renderer: Renderer2)');
   });
 
+  it('should not change Renderer imports if Renderer2 is already imported', () => {
+    writeFile('/index.ts', `
+        import { Renderer, Component, Renderer2 } from '@angular/core';
+
+        @Component({template: ''})
+        export class MyComp {
+          public renderer: Renderer;
+
+          constructor(renderer: Renderer) {
+            this.renderer = renderer;
+          }
+        }
+      `);
+
+    runTSLint(true);
+    const content = getFile('index.ts');
+
+    expect(content).toContain(`import { Renderer, Component, Renderer2 } from '@angular/core';`);
+  });
+
   it('should change Renderer inside single-line forwardRefs to Renderer2', () => {
     writeFile('/index.ts', `
       import { Renderer, Component, forwardRef, Inject } from '@angular/core';
diff --git a/packages/core/schematics/test/google3/wait_for_async_spec.ts b/packages/core/schematics/test/google3/wait_for_async_spec.ts
new file mode 100644
index 0000000000000..d68f202988402
--- /dev/null
+++ b/packages/core/schematics/test/google3/wait_for_async_spec.ts
@@ -0,0 +1,181 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {readFileSync, writeFileSync} from 'fs';
+import {dirname, join} from 'path';
+import * as shx from 'shelljs';
+import {Configuration, Linter} from 'tslint';
+
+describe('Google3 waitForAsync TSLint rule', () => {
+  const rulesDirectory = dirname(require.resolve('../../migrations/google3/waitForAsyncRule'));
+
+  let tmpDir: string;
+
+  beforeEach(() => {
+    tmpDir = join(process.env['TEST_TMPDIR']!, 'google3-test');
+    shx.mkdir('-p', tmpDir);
+
+    // We need to declare the Angular symbols we're testing for, otherwise type checking won't work.
+    writeFile('testing.d.ts', `
+      export declare function async(fn: Function): any;
+    `);
+
+    writeFile('tsconfig.json', JSON.stringify({
+      compilerOptions: {
+        module: 'es2015',
+        baseUrl: './',
+        paths: {
+          '@angular/core/testing': ['testing.d.ts'],
+        }
+      },
+    }));
+  });
+
+  afterEach(() => shx.rm('-r', tmpDir));
+
+  function runTSLint(fix: boolean) {
+    const program = Linter.createProgram(join(tmpDir, 'tsconfig.json'));
+    const linter = new Linter({fix, rulesDirectory: [rulesDirectory]}, program);
+    const config = Configuration.parseConfigFile({rules: {'wait-for-async': true}});
+
+    program.getRootFileNames().forEach(fileName => {
+      linter.lint(fileName, program.getSourceFile(fileName)!.getFullText(), config);
+    });
+
+    return linter;
+  }
+
+  function writeFile(fileName: string, content: string) {
+    writeFileSync(join(tmpDir, fileName), content);
+  }
+
+  function getFile(fileName: string) {
+    return readFileSync(join(tmpDir, fileName), 'utf8');
+  }
+
+  it('should flag async imports and usages', () => {
+    writeFile('/index.ts', `
+      import { async, inject } from '@angular/core/testing';
+
+      it('should work', async(() => {
+        expect(inject('foo')).toBe('foo');
+      }));
+
+      it('should also work', async(() => {
+        expect(inject('bar')).toBe('bar');
+      }));
+    `);
+
+    const linter = runTSLint(false);
+    const failures = linter.getResult().failures.map(failure => failure.getFailure());
+    expect(failures.length).toBe(3);
+    expect(failures[0]).toMatch(/Imports of the deprecated async function are not allowed/);
+    expect(failures[1]).toMatch(/References to the deprecated async function are not allowed/);
+    expect(failures[2]).toMatch(/References to the deprecated async function are not allowed/);
+  });
+
+  it('should change async imports to waitForAsync', () => {
+    writeFile('/index.ts', `
+      import { async, inject } from '@angular/core/testing';
+
+      it('should work', async(() => {
+        expect(inject('foo')).toBe('foo');
+      }));
+    `);
+
+    runTSLint(true);
+    expect(getFile('/index.ts'))
+        .toContain(`import { inject, waitForAsync } from '@angular/core/testing';`);
+  });
+
+  it('should change aliased async imports to waitForAsync', () => {
+    writeFile('/index.ts', `
+      import { async as renamedAsync, inject } from '@angular/core/testing';
+
+      it('should work', renamedAsync(() => {
+        expect(inject('foo')).toBe('foo');
+      }));
+    `);
+
+    runTSLint(true);
+    expect(getFile('/index.ts'))
+        .toContain(`import { inject, waitForAsync as renamedAsync } from '@angular/core/testing';`);
+  });
+
+  it('should not change async imports if they are not from @angular/core/testing', () => {
+    writeFile('/index.ts', `
+      import { inject } from '@angular/core/testing';
+      import { async } from './my-test-library';
+
+      it('should work', async(() => {
+        expect(inject('foo')).toBe('foo');
+      }));
+    `);
+
+    runTSLint(true);
+    const content = getFile('/index.ts');
+    expect(content).toContain(`import { inject } from '@angular/core/testing';`);
+    expect(content).toContain(`import { async } from './my-test-library';`);
+  });
+
+  it('should not change imports if waitForAsync was already imported', () => {
+    writeFile('/index.ts', `
+      import { async, inject, waitForAsync } from '@angular/core/testing';
+
+      it('should work', async(() => {
+        expect(inject('foo')).toBe('foo');
+      }));
+
+      it('should also work', waitForAsync(() => {
+        expect(inject('bar')).toBe('bar');
+      }));
+    `);
+
+    runTSLint(true);
+    expect(getFile('/index.ts'))
+        .toContain(`import { async, inject, waitForAsync } from '@angular/core/testing';`);
+  });
+
+  it('should change calls from `async` to `waitForAsync`', () => {
+    writeFile('/index.ts', `
+      import { async, inject } from '@angular/core/testing';
+
+      it('should work', async(() => {
+        expect(inject('foo')).toBe('foo');
+      }));
+
+      it('should also work', async(() => {
+        expect(inject('bar')).toBe('bar');
+      }));
+    `);
+
+    runTSLint(true);
+
+    const content = getFile('/index.ts');
+    expect(content).toContain(`import { inject, waitForAsync } from '@angular/core/testing';`);
+    expect(content).toContain(`it('should work', waitForAsync(() => {`);
+    expect(content).toContain(`it('should also work', waitForAsync(() => {`);
+  });
+
+  it('should not change aliased calls', () => {
+    writeFile('/index.ts', `
+      import { async as renamedAsync, inject } from '@angular/core/testing';
+
+      it('should work', renamedAsync(() => {
+        expect(inject('foo')).toBe('foo');
+      }));
+    `);
+
+    runTSLint(true);
+
+    const content = getFile('/index.ts');
+    expect(content).toContain(
+        `import { inject, waitForAsync as renamedAsync } from '@angular/core/testing';`);
+    expect(content).toContain(`it('should work', renamedAsync(() => {`);
+  });
+});
diff --git a/packages/core/schematics/test/initial_navigation_migration_spec.ts b/packages/core/schematics/test/initial_navigation_migration_spec.ts
new file mode 100644
index 0000000000000..22d9c0c26ff3f
--- /dev/null
+++ b/packages/core/schematics/test/initial_navigation_migration_spec.ts
@@ -0,0 +1,239 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {getSystemPath, normalize, virtualFs} from '@angular-devkit/core';
+import {TempScopedNodeJsSyncHost} from '@angular-devkit/core/node/testing';
+import {HostTree} from '@angular-devkit/schematics';
+import {SchematicTestRunner, UnitTestTree} from '@angular-devkit/schematics/testing';
+import * as shx from 'shelljs';
+
+describe('initial navigation migration', () => {
+  let runner: SchematicTestRunner;
+  let host: TempScopedNodeJsSyncHost;
+  let tree: UnitTestTree;
+  let tmpDirPath: string;
+  let previousWorkingDir: string;
+
+  beforeEach(() => {
+    runner = new SchematicTestRunner('test', require.resolve('../migrations.json'));
+    host = new TempScopedNodeJsSyncHost();
+    tree = new UnitTestTree(new HostTree(host));
+
+    writeFile('/tsconfig.json', JSON.stringify({
+      compilerOptions: {
+        lib: ['es2015'],
+      }
+    }));
+    writeFile('/angular.json', JSON.stringify({
+      projects: {t: {architect: {build: {options: {tsConfig: './tsconfig.json'}}}}}
+    }));
+
+    previousWorkingDir = shx.pwd();
+    tmpDirPath = getSystemPath(host.root);
+
+    // Switch into the temporary directory path. This allows us to run
+    // the schematic against our custom unit test tree.
+    shx.cd(tmpDirPath);
+  });
+
+  afterEach(() => {
+    shx.cd(previousWorkingDir);
+    shx.rm('-r', tmpDirPath);
+  });
+
+  it('should migrate legacy_disabled to disabled', async () => {
+    writeFile('/index.ts', `
+        import { NgModule } from '@angular/core';
+        import { RouterModule } from '@angular/router';
+
+        @NgModule({
+          imports: [
+            RouterModule.forRoot([], {initialNavigation: 'legacy_disabled'}),
+          ]
+        })
+        export class AppModule {
+        }
+      `);
+
+    await runMigration();
+    expect(tree.readContent('/index.ts')).toContain(`{initialNavigation: 'disabled'}`);
+  });
+
+  it('should migrate false to disabled', async () => {
+    writeFile('/index.ts', `
+        import { NgModule } from '@angular/core';
+        import { RouterModule } from '@angular/router';
+
+        @NgModule({
+          imports: [
+            RouterModule.forRoot([], {initialNavigation: false}),
+          ]
+        })
+        export class AppModule {
+        }
+      `);
+
+    await runMigration();
+    expect(tree.readContent('/index.ts')).toContain(`{initialNavigation: 'disabled'}`);
+  });
+
+  it('should migrate legacy_enabled to enabledNonBlocking', async () => {
+    writeFile('/index.ts', `
+        import { NgModule } from '@angular/core';
+        import { RouterModule } from '@angular/router';
+
+        @NgModule({
+          imports: [
+            RouterModule.forRoot([], {initialNavigation: 'legacy_enabled'}),
+          ]
+        })
+        export class AppModule {
+        }
+      `);
+
+    await runMigration();
+    expect(tree.readContent('/index.ts')).toContain(`{initialNavigation: 'enabledNonBlocking'}`);
+  });
+
+  it('should migrate true to enabledNonBlocking', async () => {
+    writeFile('/index.ts', `
+        import { NgModule } from '@angular/core';
+        import { RouterModule } from '@angular/router';
+
+        @NgModule({
+          imports: [
+            RouterModule.forRoot([], {initialNavigation: true}),
+          ]
+        })
+        export class AppModule {
+        }
+      `);
+
+    await runMigration();
+    expect(tree.readContent('/index.ts')).toContain(`{initialNavigation: 'enabledNonBlocking'}`);
+  });
+
+  it('should migrate nested objects', async () => {
+    writeFile('/index.ts', `
+        import { NgModule } from '@angular/core';
+        import { RouterModule } from '@angular/router';
+
+        const options = {initialNavigation: 'legacy_enabled'};
+
+        @NgModule({
+          imports: [
+            RouterModule.forRoot([], {initialNavigation: 'legacy_disabled', ...options}),
+          ]
+        })
+        export class AppModule {
+        }
+      `);
+
+    await runMigration();
+    expect(tree.readContent('/index.ts'))
+        .toContain(`const options = {initialNavigation: 'enabledNonBlocking'};`);
+    expect(tree.readContent('/index.ts')).toContain(`{initialNavigation: 'disabled', ...options}`);
+  });
+
+  it('should migrate nested objects mixed validity', async () => {
+    writeFile('/index.ts', `
+        import { NgModule } from '@angular/core';
+        import { RouterModule } from '@angular/router';
+
+        const options = {initialNavigation: 'legacy_enabled'};
+
+        @NgModule({
+          imports: [
+            RouterModule.forRoot([], {initialNavigation: 'disabled', ...options}),
+          ]
+        })
+        export class AppModule {
+        }
+      `);
+
+    await runMigration();
+    expect(tree.readContent('/index.ts'))
+        .toContain(`const options = {initialNavigation: 'enabledNonBlocking'};`);
+  });
+
+
+  it('should migrate nested objects opposite order', async () => {
+    writeFile('/index.ts', `
+        import { NgModule } from '@angular/core';
+        import { RouterModule } from '@angular/router';
+
+        const options = {initialNavigation: 'legacy_enabled'};
+
+        @NgModule({
+          imports: [
+            RouterModule.forRoot([], {...options, initialNavigation: 'legacy_disabled'}),
+          ]
+        })
+        export class AppModule {
+        }
+      `);
+
+    await runMigration();
+    expect(tree.readContent('/index.ts'))
+        .toContain(`const options = {initialNavigation: 'enabledNonBlocking'};`);
+    expect(tree.readContent('/index.ts')).toContain(`{...options, initialNavigation: 'disabled'}`);
+  });
+
+  it('should migrate nested objects mixed validity opposite order', async () => {
+    writeFile('/index.ts', `
+        import { NgModule } from '@angular/core';
+        import { RouterModule } from '@angular/router';
+
+        const options = {initialNavigation: 'legacy_enabled'};
+
+        @NgModule({
+          imports: [
+            RouterModule.forRoot([], {...options, initialNavigation: 'disabled'}),
+          ]
+        })
+        export class AppModule {
+        }
+      `);
+
+    await runMigration();
+    expect(tree.readContent('/index.ts'))
+        .toContain(`const options = {initialNavigation: 'enabledNonBlocking'};`);
+    expect(tree.readContent('/index.ts')).toContain(`disabled`);
+  });
+
+  it('should not migrate variable not used in forRoot', async () => {
+    writeFile('/index.ts', `
+        import { NgModule } from '@angular/core';
+        import { RouterModule } from '@angular/router';
+
+        const options = {initialNavigation: 'legacy_enabled'};
+
+        @NgModule({
+          imports: [
+            RouterModule.forRoot([]),
+          ]
+        })
+        export class AppModule {
+        }
+      `);
+
+    await runMigration();
+    expect(tree.readContent('/index.ts'))
+        .toContain(`const options = {initialNavigation: 'legacy_enabled'};`);
+    expect(tree.readContent('/index.ts')).toContain(`RouterModule.forRoot([])`);
+  });
+
+  function writeFile(filePath: string, contents: string) {
+    host.sync.write(normalize(filePath), virtualFs.stringToFileBuffer(contents));
+  }
+
+  function runMigration() {
+    return runner.runSchematicAsync('migration-v11-router-initial-navigation-options', {}, tree)
+        .toPromise();
+  }
+});
diff --git a/packages/core/schematics/test/native_view_encapsulation_migration_spec.ts b/packages/core/schematics/test/native_view_encapsulation_migration_spec.ts
new file mode 100644
index 0000000000000..e3cdd6a24e2d0
--- /dev/null
+++ b/packages/core/schematics/test/native_view_encapsulation_migration_spec.ts
@@ -0,0 +1,169 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {getSystemPath, normalize, virtualFs} from '@angular-devkit/core';
+import {TempScopedNodeJsSyncHost} from '@angular-devkit/core/node/testing';
+import {HostTree} from '@angular-devkit/schematics';
+import {SchematicTestRunner, UnitTestTree} from '@angular-devkit/schematics/testing';
+import * as shx from 'shelljs';
+
+describe('ViewEncapsulation.Native migration', () => {
+  let runner: SchematicTestRunner;
+  let host: TempScopedNodeJsSyncHost;
+  let tree: UnitTestTree;
+  let tmpDirPath: string;
+  let previousWorkingDir: string;
+
+  beforeEach(() => {
+    runner = new SchematicTestRunner('test', require.resolve('../migrations.json'));
+    host = new TempScopedNodeJsSyncHost();
+    tree = new UnitTestTree(new HostTree(host));
+
+    writeFile('/tsconfig.json', JSON.stringify({
+      compilerOptions: {
+        lib: ['es2015'],
+        strictNullChecks: true,
+      },
+    }));
+    writeFile('/angular.json', JSON.stringify({
+      projects: {t: {architect: {build: {options: {tsConfig: './tsconfig.json'}}}}}
+    }));
+
+    previousWorkingDir = shx.pwd();
+    tmpDirPath = getSystemPath(host.root);
+
+    // Switch into the temporary directory path. This allows us to run
+    // the schematic against our custom unit test tree.
+    shx.cd(tmpDirPath);
+  });
+
+  afterEach(() => {
+    shx.cd(previousWorkingDir);
+    shx.rm('-r', tmpDirPath);
+  });
+
+  it('should change Native view encapsulation usages to ShadowDom', async () => {
+    writeFile('/index.ts', `
+      import {Component, ViewEncapsulation} from '@angular/core';
+
+      @Component({
+        template: 'hello',
+        encapsulation: ViewEncapsulation.Native
+      })
+      class App {}
+    `);
+
+    await runMigration();
+
+    const content = tree.readContent('/index.ts');
+    expect(content).toContain('encapsulation: ViewEncapsulation.ShadowDom');
+  });
+
+  it('should change Native view encapsulation usages if the enum is aliased', async () => {
+    writeFile('/index.ts', `
+      import {Component, ViewEncapsulation as Encapsulation} from '@angular/core';
+
+      @Component({
+        template: 'hello',
+        encapsulation: Encapsulation.Native
+      })
+      class App {}
+    `);
+
+    await runMigration();
+
+    const content = tree.readContent('/index.ts');
+    expect(content).toContain('encapsulation: Encapsulation.ShadowDom');
+  });
+
+  it('should change Native view encapsulation usages inside a variable', async () => {
+    writeFile('/index.ts', `
+      import {Component, ViewEncapsulation} from '@angular/core';
+
+      const encapsulation = ViewEncapsulation.Native;
+
+      @Component({template: 'hello', encapsulation})
+      class App {}
+
+      @Component({template: 'click me', encapsulation})
+      class Button {}
+    `);
+
+    await runMigration();
+
+    const content = tree.readContent('/index.ts');
+    expect(content).toContain('const encapsulation = ViewEncapsulation.ShadowDom;');
+  });
+
+  it('should not change components that do not set an encapsulation', async () => {
+    const source = `
+      import {Component} from '@angular/core';
+
+      @Component({
+        template: 'hello'
+      })
+      class App {}
+    `;
+
+    writeFile('/index.ts', source);
+
+    await runMigration();
+
+    const content = tree.readContent('/index.ts');
+    expect(content).toBe(source);
+  });
+
+  it('should not change components that use an encapsulation different from Native', async () => {
+    const source = `
+      import {Component, ViewEncapsulation} from '@angular/core';
+
+      @Component({
+        template: 'hello',
+        encapsulation: ViewEncapsulation.None
+      })
+      class App {}
+    `;
+
+    writeFile('/index.ts', source);
+
+    await runMigration();
+
+    const content = tree.readContent('/index.ts');
+    expect(content).toBe(source);
+  });
+
+  it('should not change cases where ViewEncapsulation does not come from @angular/core',
+     async () => {
+       const source = `
+        import {Component} from '@angular/core';
+        import {ViewEncapsulation} from '@not-angular/core';
+
+        @Component({
+          template: 'hello',
+          encapsulation: ViewEncapsulation.Native
+        })
+        class App {}
+      `;
+
+       writeFile('/index.ts', source);
+
+       await runMigration();
+
+       const content = tree.readContent('/index.ts');
+       expect(content).toBe(source);
+     });
+
+  function writeFile(filePath: string, contents: string) {
+    host.sync.write(normalize(filePath), virtualFs.stringToFileBuffer(contents));
+  }
+
+  function runMigration() {
+    return runner.runSchematicAsync('migration-v11-native-view-encapsulation', {}, tree)
+        .toPromise();
+  }
+});
diff --git a/packages/core/schematics/test/navigation_extras_omissions_migration_spec.ts b/packages/core/schematics/test/navigation_extras_omissions_migration_spec.ts
new file mode 100644
index 0000000000000..3133a8cf6812d
--- /dev/null
+++ b/packages/core/schematics/test/navigation_extras_omissions_migration_spec.ts
@@ -0,0 +1,302 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {getSystemPath, normalize, virtualFs} from '@angular-devkit/core';
+import {TempScopedNodeJsSyncHost} from '@angular-devkit/core/node/testing';
+import {HostTree} from '@angular-devkit/schematics';
+import {SchematicTestRunner, UnitTestTree} from '@angular-devkit/schematics/testing';
+import * as shx from 'shelljs';
+
+describe('NavigationExtras omissions migration', () => {
+  let runner: SchematicTestRunner;
+  let host: TempScopedNodeJsSyncHost;
+  let tree: UnitTestTree;
+  let tmpDirPath: string;
+  let previousWorkingDir: string;
+
+  beforeEach(() => {
+    runner = new SchematicTestRunner('test', require.resolve('../migrations.json'));
+    host = new TempScopedNodeJsSyncHost();
+    tree = new UnitTestTree(new HostTree(host));
+
+    writeFile('/tsconfig.json', JSON.stringify({
+      compilerOptions: {
+        lib: ['es2015'],
+        strictNullChecks: true,
+      },
+    }));
+    writeFile('/angular.json', JSON.stringify({
+      projects: {t: {architect: {build: {options: {tsConfig: './tsconfig.json'}}}}}
+    }));
+    // We need to declare the Angular symbols we're testing for, otherwise type checking won't work.
+    writeFile('/node_modules/@angular/router/index.d.ts', `
+      export declare class Router {
+        navigateByUrl(url: string, extras?: any);
+        createUrlTree(commands: any[], extras?: any);
+      }
+    `);
+
+    previousWorkingDir = shx.pwd();
+    tmpDirPath = getSystemPath(host.root);
+
+    // Switch into the temporary directory path. This allows us to run
+    // the schematic against our custom unit test tree.
+    shx.cd(tmpDirPath);
+  });
+
+  afterEach(() => {
+    shx.cd(previousWorkingDir);
+    shx.rm('-r', tmpDirPath);
+  });
+
+  it('should not change calls with a single argument', async () => {
+    writeFile('/index.ts', `
+      import {Router} from '@angular/router';
+
+      class Navigator {
+        constructor(private _router: Router) {}
+
+        goHome() {
+          this._router.navigateByUrl('/');
+        }
+      }
+
+      function createTree(router: Router) {
+        return router.createUrlTree(['/']);
+      }
+    `);
+
+    await runMigration();
+
+    const content = tree.readContent('/index.ts');
+    expect(content).toContain(`this._router.navigateByUrl('/');`);
+    expect(content).toContain(`return router.createUrlTree(['/']);`);
+  });
+
+  it('should not change calls with an empty object literal', async () => {
+    writeFile('/index.ts', `
+      import {Router} from '@angular/router';
+
+      class Navigator {
+        constructor(private _router: Router) {}
+
+        goHome() {
+          this._router.navigateByUrl('/', {});
+        }
+      }
+
+      function createTree(router: Router) {
+        return router.createUrlTree(['/'], {});
+      }
+    `);
+
+    await runMigration();
+
+    const content = tree.readContent('/index.ts');
+    expect(content).toContain(`this._router.navigateByUrl('/', {});`);
+    expect(content).toContain(`return router.createUrlTree(['/'], {});`);
+  });
+
+  it('should not change objects that are used in multiple different methods', async () => {
+    writeFile('/index.ts', `
+      import {Router} from '@angular/router';
+
+      const config = {replaceUrl: true, fragment: 'foo', state: {}};
+
+      class Navigator {
+        constructor(private _router: Router) {}
+
+        goHome() {
+          this._router.navigateByUrl('/', config);
+          return this._router.createUrlTree(['/'], config);
+        }
+      }
+    `);
+
+    await runMigration();
+
+    const content = tree.readContent('/index.ts');
+    expect(content).toContain(`const config = {replaceUrl: true, fragment: 'foo', state: {}};`);
+  });
+
+  it('should preserve calls if the router does not come from @angular/router', async () => {
+    writeFile('/index.ts', `
+      import {Router} from '@custom/router';
+
+      function createTree(router: Router) {
+        return router.createUrlTree(['/'], {foo: 1, bar: 2});
+      }
+    `);
+
+    await runMigration();
+
+    const content = tree.readContent('/index.ts');
+    expect(content).toContain(`return router.createUrlTree(['/'], {foo: 1, bar: 2});`);
+  });
+
+  it('should change invalid navigateByUrl calls', async () => {
+    writeFile('/index.ts', `
+      import {Router} from '@angular/router';
+
+      class Navigator {
+        constructor(private _router: Router) {}
+
+        goHome() {
+          this._router.navigateByUrl('/', {preserveFragment: false, skipLocationChange: false, fragment: 'foo'});
+        }
+      }
+    `);
+
+    await runMigration();
+
+    const content = tree.readContent('/index.ts');
+    expect(content).toContain(
+        `this._router.navigateByUrl('/', { /* Removed unsupported properties by Angular migration: preserveFragment, fragment. */ skipLocationChange: false });`);
+  });
+
+  it('should change invalid navigateByUrl calls', async () => {
+    writeFile('/index.ts', `
+      import {Router} from '@angular/router';
+
+      function createTree(router: Router) {
+        return router.createUrlTree(['/'], {replaceUrl: true, preserveFragment: true, state: {}});
+      }
+    `);
+
+    await runMigration();
+
+    const content = tree.readContent('/index.ts');
+    expect(content).toContain(
+        `return router.createUrlTree(['/'], { /* Removed unsupported properties by Angular migration: replaceUrl, state. */ preserveFragment: true });`);
+  });
+
+  it('should set the comment outside the object if all properties were removed', async () => {
+    writeFile('/index.ts', `
+      import {Router} from '@angular/router';
+
+      function navigate(router: Router) {
+        router.navigateByUrl('/', {fragment: 'foo'});
+      }
+    `);
+
+    await runMigration();
+
+    const content = tree.readContent('/index.ts');
+    expect(content).toContain(
+        `router.navigateByUrl('/', /* Removed unsupported properties by Angular migration: fragment. */ {});`);
+  });
+
+  it('should migrate object literals defined as variables', async () => {
+    writeFile('/index.ts', `
+      import {Router} from '@angular/router';
+
+      const config = {skipLocationChange: false, fragment: 'foo'};
+      const proxy = config;
+
+      function navigate(router: Router) {
+        router.navigateByUrl('/', proxy);
+      }
+    `);
+
+    await runMigration();
+
+    const content = tree.readContent('/index.ts');
+    expect(content).toContain(
+        `const config = { /* Removed unsupported properties by Angular migration: fragment. */ skipLocationChange: false };`);
+    expect(content).toContain(`const proxy = config;`);
+    expect(content).toContain(`router.navigateByUrl('/', proxy);`);
+  });
+
+  it('should pick up calls where the router is returned by a function', async () => {
+    writeFile('/index.ts', `
+      import {Router} from '@angular/router';
+
+      function navigate(router: Router) {
+        getRouter().navigateByUrl('/', {fragment: 'foo'});
+      }
+
+      function getRouter() {
+        return {} as Router;
+      }
+    `);
+
+    await runMigration();
+
+    const content = tree.readContent('/index.ts');
+    expect(content).toContain(
+        `getRouter().navigateByUrl('/', /* Removed unsupported properties by Angular migration: fragment. */ {});`);
+  });
+
+  it('should pick up calls where the router is aliased', async () => {
+    writeFile('/index.ts', `
+      import {Router as AliasedRouter} from '@angular/router';
+
+      function navigate(router: AliasedRouter) {
+        router.navigateByUrl('/', {fragment: 'foo'});
+      }
+    `);
+
+    await runMigration();
+
+    const content = tree.readContent('/index.ts');
+    expect(content).toContain(
+        `router.navigateByUrl('/', /* Removed unsupported properties by Angular migration: fragment. */ {});`);
+  });
+
+  it('should preserve object spread assignments', async () => {
+    writeFile('/index.ts', `
+      import {Router} from '@angular/router';
+
+      function navigate(router: Router) {
+        const overrides = {foo: 1};
+        router.navigateByUrl('/', {replaceUrl: true, fragment: 'foo', ...overrides});
+      }
+    `);
+
+    await runMigration();
+
+    const content = tree.readContent('/index.ts');
+    expect(content).toContain(
+        `router.navigateByUrl('/', { /* Removed unsupported properties by Angular migration: fragment. */ replaceUrl: true, ...overrides });`);
+  });
+
+  it('should migrate objects that are used in multiple calls of the same method', async () => {
+    writeFile('/index.ts', `
+      import {Router} from '@angular/router';
+
+      const config = {skipLocationChange: false, fragment: 'foo'};
+
+      class Navigator {
+        constructor(private _router: Router) {}
+
+        goHome() {
+          this._router.navigateByUrl('/', config);
+        }
+
+        goFish() {
+          this._router.navigateByUrl('/fish', config);
+        }
+      }
+    `);
+
+    await runMigration();
+
+    const content = tree.readContent('/index.ts');
+    expect(content).toContain(
+        `const config = { /* Removed unsupported properties by Angular migration: fragment. */ skipLocationChange: false };`);
+  });
+
+  function writeFile(filePath: string, contents: string) {
+    host.sync.write(normalize(filePath), virtualFs.stringToFileBuffer(contents));
+  }
+
+  function runMigration() {
+    return runner.runSchematicAsync('migration-v11-navigation-extras-omissions', {}, tree)
+        .toPromise();
+  }
+});
diff --git a/packages/core/schematics/test/preserve_query_params_migration_spec.ts b/packages/core/schematics/test/preserve_query_params_migration_spec.ts
new file mode 100644
index 0000000000000..264fa4aa4b469
--- /dev/null
+++ b/packages/core/schematics/test/preserve_query_params_migration_spec.ts
@@ -0,0 +1,232 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {getSystemPath, normalize, virtualFs} from '@angular-devkit/core';
+import {TempScopedNodeJsSyncHost} from '@angular-devkit/core/node/testing';
+import {HostTree} from '@angular-devkit/schematics';
+import {SchematicTestRunner, UnitTestTree} from '@angular-devkit/schematics/testing';
+import * as shx from 'shelljs';
+
+describe('NavigationExtras preserveQueryParams migration', () => {
+  let runner: SchematicTestRunner;
+  let host: TempScopedNodeJsSyncHost;
+  let tree: UnitTestTree;
+  let tmpDirPath: string;
+  let previousWorkingDir: string;
+
+  beforeEach(() => {
+    runner = new SchematicTestRunner('test', require.resolve('../migrations.json'));
+    host = new TempScopedNodeJsSyncHost();
+    tree = new UnitTestTree(new HostTree(host));
+
+    writeFile('/tsconfig.json', JSON.stringify({
+      compilerOptions: {
+        lib: ['es2015'],
+        strictNullChecks: true,
+      },
+    }));
+    writeFile('/angular.json', JSON.stringify({
+      projects: {t: {architect: {build: {options: {tsConfig: './tsconfig.json'}}}}}
+    }));
+    // We need to declare the Angular symbols we're testing for, otherwise type checking won't work.
+    writeFile('/node_modules/@angular/router/index.d.ts', `
+      export declare class Router {
+        navigate(url: string, extras?: any);
+        createUrlTree(commands: any[], extras?: any);
+      }
+    `);
+
+    previousWorkingDir = shx.pwd();
+    tmpDirPath = getSystemPath(host.root);
+
+    // Switch into the temporary directory path. This allows us to run
+    // the schematic against our custom unit test tree.
+    shx.cd(tmpDirPath);
+  });
+
+  afterEach(() => {
+    shx.cd(previousWorkingDir);
+    shx.rm('-r', tmpDirPath);
+  });
+
+  describe('updates the', () => {
+    it('`navigate` function', async () => {
+      writeFile('/index.ts', `
+      import {Router} from '@angular/router';
+
+      class Navigator {
+        constructor(private _router: Router) {}
+
+        goHome() {
+          this._router.navigate('/', {preserveQueryParams: true});
+        }
+      }
+    `);
+
+      await runMigration();
+
+      const content = tree.readContent('/index.ts');
+      expect(content).toContain(`this._router.navigate('/', { queryParamsHandler: 'preserve' });`);
+    });
+
+    it('`createUrlTree` function', async () => {
+      writeFile('/index.ts', `
+      import {Router} from '@angular/router';
+
+      class Navigator {
+        constructor(private _router: Router) {}
+
+        goHome() {
+          this._router.createUrlTree('/', {preserveQueryParams: false});
+        }
+      }
+    `);
+
+      await runMigration();
+
+      const content = tree.readContent('/index.ts');
+      expect(content).toContain(`this._router.createUrlTree('/', {});`);
+    });
+  });
+
+  describe('updates an object which is used for the parameter', () => {
+    it('should migrate when the value is `true`', async () => {
+      writeFile('/index.ts', `
+        import {Router} from '@angular/router';
+
+        const config = {preserveQueryParams: true, replaceUrl: true, fragment: 'foo', state: {}};
+
+        class Navigator {
+          constructor(private _router: Router) {}
+
+          goHome() {
+            this._router.createUrlTree(['/'], config);
+          }
+        }
+      `);
+
+      await runMigration();
+
+      const content = tree.readContent('/index.ts');
+      expect(content).toContain(
+          `const config = { replaceUrl: true, fragment: 'foo', state: {}, queryParamsHandler: 'preserve' };`);
+    });
+
+    it('should remove when the value is `false`', async () => {
+      writeFile('/index.ts', `
+        import {Router} from '@angular/router';
+
+        const config = {preserveQueryParams: false, replaceUrl: true, fragment: 'foo', state: {}};
+
+        class Navigator {
+          constructor(private _router: Router) {}
+
+          goHome() {
+            this._router.createUrlTree(['/'], config);
+          }
+        }
+      `);
+
+      await runMigration();
+
+      const content = tree.readContent('/index.ts');
+      expect(content).toContain(`const config = { replaceUrl: true, fragment: 'foo', state: {} };`);
+    });
+
+    it('should not modify when the property is no present', async () => {
+      writeFile('/index.ts', `
+        import {Router} from '@angular/router';
+
+        const config = {replaceUrl: true, fragment: 'foo', state: {}};
+
+        class Navigator {
+          constructor(private _router: Router) {}
+
+          goHome() {
+            this._router.navigate('/', config);
+          }
+        }
+      `);
+
+      await runMigration();
+
+      const content = tree.readContent('/index.ts');
+      expect(content).toContain(`const config = {replaceUrl: true, fragment: 'foo', state: {}};`);
+    });
+  });
+
+  describe('updates an the locally defined parameter in the method', () => {
+    it('should migrate when the value is `true`', async () => {
+      writeFile('/index.ts', `
+        import {Router} from '@angular/router';
+
+        class Navigator {
+          constructor(private _router: Router) {}
+
+          goHome() {
+            this._router.navigate('/', {preserveQueryParams: true, replaceUrl: true, fragment: 'foo', state: {}});
+          }
+        }
+      `);
+
+      await runMigration();
+
+      const content = tree.readContent('/index.ts');
+      expect(content).toContain(
+          `this._router.navigate('/', { replaceUrl: true, fragment: 'foo', state: {}, queryParamsHandler: 'preserve' });`);
+    });
+
+    it('should remove when the value is `false`', async () => {
+      writeFile('/index.ts', `
+        import {Router} from '@angular/router';
+
+        class Navigator {
+          constructor(private _router: Router) {}
+
+          goHome() {
+            this._router.createUrlTree(['/'], {preserveQueryParams: false, replaceUrl: true, fragment: 'foo', state: {}};);
+          }
+        }
+      `);
+
+      await runMigration();
+
+      const content = tree.readContent('/index.ts');
+      expect(content).toContain(
+          `this._router.createUrlTree(['/'], { replaceUrl: true, fragment: 'foo', state: {} };`);
+    });
+
+    it('should not modify when the property is not present', async () => {
+      writeFile('/index.ts', `
+        import {Router} from '@angular/router';
+
+        class Navigator {
+          constructor(private _router: Router) {}
+
+          goHome() {
+            this._router.navigate('/', {replaceUrl: true, fragment: 'foo', state: {}});
+          }
+        }
+      `);
+
+      await runMigration();
+
+      const content = tree.readContent('/index.ts');
+      expect(content).toContain(
+          `this._router.navigate('/', {replaceUrl: true, fragment: 'foo', state: {}});`);
+    });
+  });
+  function writeFile(filePath: string, contents: string) {
+    host.sync.write(normalize(filePath), virtualFs.stringToFileBuffer(contents));
+  }
+
+  function runMigration() {
+    return runner.runSchematicAsync('migration-v11-router-preserve-query-params', {}, tree)
+        .toPromise();
+  }
+});
diff --git a/packages/core/schematics/test/relative_link_resolution_spec.ts b/packages/core/schematics/test/relative_link_resolution_spec.ts
new file mode 100644
index 0000000000000..7c4a3628a617e
--- /dev/null
+++ b/packages/core/schematics/test/relative_link_resolution_spec.ts
@@ -0,0 +1,188 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {getSystemPath, normalize, virtualFs} from '@angular-devkit/core';
+import {TempScopedNodeJsSyncHost} from '@angular-devkit/core/node/testing';
+import {HostTree} from '@angular-devkit/schematics';
+import {SchematicTestRunner, UnitTestTree} from '@angular-devkit/schematics/testing';
+import * as shx from 'shelljs';
+
+describe('initial navigation migration', () => {
+  let runner: SchematicTestRunner;
+  let host: TempScopedNodeJsSyncHost;
+  let tree: UnitTestTree;
+  let tmpDirPath: string;
+  let previousWorkingDir: string;
+
+  beforeEach(() => {
+    runner = new SchematicTestRunner('test', require.resolve('../migrations.json'));
+    host = new TempScopedNodeJsSyncHost();
+    tree = new UnitTestTree(new HostTree(host));
+
+    writeFile('/tsconfig.json', JSON.stringify({
+      compilerOptions: {
+        lib: ['es2015'],
+      }
+    }));
+    writeFile('/angular.json', JSON.stringify({
+      projects: {t: {architect: {build: {options: {tsConfig: './tsconfig.json'}}}}}
+    }));
+
+    previousWorkingDir = shx.pwd();
+    tmpDirPath = getSystemPath(host.root);
+
+    // Switch into the temporary directory path. This allows us to run
+    // the schematic against our custom unit test tree.
+    shx.cd(tmpDirPath);
+  });
+
+  afterEach(() => {
+    shx.cd(previousWorkingDir);
+    shx.rm('-r', tmpDirPath);
+  });
+
+  it('should migrate forRoot with no options', async () => {
+    writeFile('/index.ts', `
+        import { NgModule } from '@angular/core';
+        import { RouterModule } from '@angular/router';
+        @NgModule({
+          imports: [
+            RouterModule.forRoot([]),
+          ]
+        })
+        export class AppModule {
+        }
+      `);
+
+    await runMigration();
+    expect(tree.readContent('/index.ts'))
+        .toContain(`RouterModule.forRoot([], { relativeLinkResolution: 'legacy' })`);
+  });
+
+  it('should migrate options without relativeLinkResolution', async () => {
+    writeFile('/index.ts', `
+        import { NgModule } from '@angular/core';
+        import { RouterModule } from '@angular/router';
+        @NgModule({
+          imports: [
+            RouterModule.forRoot([], {useHash: true}),
+          ]
+        })
+        export class AppModule {
+        }
+      `);
+
+    await runMigration();
+    expect(tree.readContent('/index.ts'))
+        .toContain(`RouterModule.forRoot([], { useHash: true, relativeLinkResolution: 'legacy' })`);
+  });
+
+  it('should not migrate options containing relativeLinkResolution', async () => {
+    writeFile('/index.ts', `
+        import { NgModule } from '@angular/core';
+        import { RouterModule } from '@angular/router';
+        @NgModule({
+          imports: [
+            RouterModule.forRoot([], {relativeLinkResolution: 'corrected'}),
+          ]
+        })
+        export class AppModule {
+        }
+      `);
+
+    await runMigration();
+    expect(tree.readContent('/index.ts'))
+        .toContain(`RouterModule.forRoot([], {relativeLinkResolution: 'corrected'})`);
+  });
+
+  it('should migrate when options is a variable with AsExpression', async () => {
+    writeFile('/index.ts', `
+        import { ExtraOptions } from '@angular/router';
+        const options = {useHash: true} as ExtraOptions;
+      `);
+
+    await runMigration();
+    expect(tree.readContent('/index.ts'))
+        .toContain(
+            `const options = { useHash: true, relativeLinkResolution: 'legacy' } as ExtraOptions;`);
+  });
+
+  it('should migrate when options is a variable', async () => {
+    writeFile('/index.ts', `
+        import { ExtraOptions } from '@angular/router';
+        const options: ExtraOptions = {useHash: true};
+      `);
+
+    await runMigration();
+    expect(tree.readContent('/index.ts'))
+        .toContain(
+            `const options: ExtraOptions = { useHash: true, relativeLinkResolution: 'legacy' };`);
+  });
+
+  it('should migrate when options is a variable with no type', async () => {
+    writeFile('/index.ts', `
+        import { NgModule } from '@angular/core';
+        import { ExtraOptions, RouterModule } from '@angular/router';
+
+        const options = {useHash: true};
+
+        @NgModule({
+          imports: [
+            RouterModule.forRoot([], options),
+          ]
+        })
+        export class AppModule {
+        }
+      `);
+
+    await runMigration();
+    expect(tree.readContent('/index.ts'))
+        .toContain(`const options = { useHash: true, relativeLinkResolution: 'legacy' };`);
+    expect(tree.readContent('/index.ts')).toContain(`RouterModule.forRoot([], options)`);
+  });
+
+  it('should migrate when aliased options is a variable', async () => {
+    writeFile('/index.ts', `
+        import { ExtraOptions as RouterExtraOptions } from '@angular/router';
+        const options: RouterExtraOptions = {useHash: true};
+      `);
+
+    await runMigration();
+    expect(tree.readContent('/index.ts'))
+        .toContain(
+            `const options: RouterExtraOptions = { useHash: true, relativeLinkResolution: 'legacy' };`);
+  });
+
+  it('should migrate aliased RouterModule.forRoot', async () => {
+    writeFile('/index.ts', `
+        import { NgModule } from '@angular/core';
+        import { RouterModule as AngularRouterModule} from '@angular/router';
+        @NgModule({
+          imports: [
+            AngularRouterModule.forRoot([]),
+          ]
+        })
+        export class AppModule {
+        }
+      `);
+
+    await runMigration();
+    expect(tree.readContent('/index.ts'))
+        .toContain(`AngularRouterModule.forRoot([], { relativeLinkResolution: 'legacy' }),`);
+  });
+
+  function writeFile(filePath: string, contents: string) {
+    host.sync.write(normalize(filePath), virtualFs.stringToFileBuffer(contents));
+  }
+
+  function runMigration() {
+    return runner
+        .runSchematicAsync('migration-v11-router-relative-link-resolution-default', {}, tree)
+        .toPromise();
+  }
+});
diff --git a/packages/core/schematics/test/renderer_to_renderer2_migration_spec.ts b/packages/core/schematics/test/renderer_to_renderer2_migration_spec.ts
index e335a6ecdb364..6312105868206 100644
--- a/packages/core/schematics/test/renderer_to_renderer2_migration_spec.ts
+++ b/packages/core/schematics/test/renderer_to_renderer2_migration_spec.ts
@@ -99,6 +99,21 @@ describe('Renderer to Renderer2 migration', () => {
       expect(content).toContain(`import { Component } from '@angular/core';`);
       expect(content).toContain(`import { Renderer } from './my-renderer';`);
     });
+
+    it('should not change imports if Renderer2 was already imported', async () => {
+      writeFile('/index.ts', `
+          import { Renderer, Component, Renderer2 } from '@angular/core';
+
+          @Component({template: ''})
+          export class MyComp {
+            constructor(renderer: Renderer) {}
+          }
+        `);
+
+      await runMigration();
+      expect(tree.readContent('/index.ts'))
+          .toContain(`import { Renderer, Component, Renderer2 } from '@angular/core';`);
+    });
   });
 
   describe('type renaming', () => {
diff --git a/packages/core/schematics/test/wait_for_async_migration_spec.ts b/packages/core/schematics/test/wait_for_async_migration_spec.ts
new file mode 100644
index 0000000000000..ef0a47fc68a4b
--- /dev/null
+++ b/packages/core/schematics/test/wait_for_async_migration_spec.ts
@@ -0,0 +1,161 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {getSystemPath, normalize, virtualFs} from '@angular-devkit/core';
+import {TempScopedNodeJsSyncHost} from '@angular-devkit/core/node/testing';
+import {HostTree} from '@angular-devkit/schematics';
+import {SchematicTestRunner, UnitTestTree} from '@angular-devkit/schematics/testing';
+import * as shx from 'shelljs';
+
+describe('waitForAsync migration', () => {
+  let runner: SchematicTestRunner;
+  let host: TempScopedNodeJsSyncHost;
+  let tree: UnitTestTree;
+  let tmpDirPath: string;
+  let previousWorkingDir: string;
+
+  beforeEach(() => {
+    runner = new SchematicTestRunner('test', require.resolve('../migrations.json'));
+    host = new TempScopedNodeJsSyncHost();
+    tree = new UnitTestTree(new HostTree(host));
+
+    writeFile('/tsconfig.json', JSON.stringify({
+      compilerOptions: {
+        lib: ['es2015'],
+        strictNullChecks: true,
+      },
+    }));
+    writeFile('/angular.json', JSON.stringify({
+      projects: {t: {architect: {build: {options: {tsConfig: './tsconfig.json'}}}}}
+    }));
+    // We need to declare the Angular symbols we're testing for, otherwise type checking won't work.
+    writeFile('/node_modules/@angular/core/testing/index.d.ts', `
+      export declare function async(fn: Function): any;
+    `);
+
+    previousWorkingDir = shx.pwd();
+    tmpDirPath = getSystemPath(host.root);
+
+    // Switch into the temporary directory path. This allows us to run
+    // the schematic against our custom unit test tree.
+    shx.cd(tmpDirPath);
+  });
+
+  afterEach(() => {
+    shx.cd(previousWorkingDir);
+    shx.rm('-r', tmpDirPath);
+  });
+
+  it('should change async imports to waitForAsync', async () => {
+    writeFile('/index.ts', `
+      import { async, inject } from '@angular/core/testing';
+
+      it('should work', async(() => {
+        expect(inject('foo')).toBe('foo');
+      }));
+    `);
+
+    await runMigration();
+    expect(tree.readContent('/index.ts'))
+        .toContain(`import { inject, waitForAsync } from '@angular/core/testing';`);
+  });
+
+  it('should change aliased async imports to waitForAsync', async () => {
+    writeFile('/index.ts', `
+      import { async as renamedAsync, inject } from '@angular/core/testing';
+
+      it('should work', renamedAsync(() => {
+        expect(inject('foo')).toBe('foo');
+      }));
+    `);
+
+    await runMigration();
+    expect(tree.readContent('/index.ts'))
+        .toContain(`import { inject, waitForAsync as renamedAsync } from '@angular/core/testing';`);
+  });
+
+  it('should not change async imports if they are not from @angular/core/testing', async () => {
+    writeFile('/index.ts', `
+      import { inject } from '@angular/core/testing';
+      import { async } from './my-test-library';
+
+      it('should work', async(() => {
+        expect(inject('foo')).toBe('foo');
+      }));
+    `);
+
+    await runMigration();
+    const content = tree.readContent('/index.ts');
+    expect(content).toContain(`import { inject } from '@angular/core/testing';`);
+    expect(content).toContain(`import { async } from './my-test-library';`);
+  });
+
+  it('should not change imports if waitForAsync was already imported', async () => {
+    writeFile('/index.ts', `
+      import { async, inject, waitForAsync } from '@angular/core/testing';
+
+      it('should work', async(() => {
+        expect(inject('foo')).toBe('foo');
+      }));
+
+      it('should also work', waitForAsync(() => {
+        expect(inject('bar')).toBe('bar');
+      }));
+    `);
+
+    await runMigration();
+    expect(tree.readContent('/index.ts'))
+        .toContain(`import { async, inject, waitForAsync } from '@angular/core/testing';`);
+  });
+
+  it('should change calls from `async` to `waitForAsync`', async () => {
+    writeFile('/index.ts', `
+      import { async, inject } from '@angular/core/testing';
+
+      it('should work', async(() => {
+        expect(inject('foo')).toBe('foo');
+      }));
+
+      it('should also work', async(() => {
+        expect(inject('bar')).toBe('bar');
+      }));
+    `);
+
+    await runMigration();
+
+    const content = tree.readContent('/index.ts');
+    expect(content).toContain(`import { inject, waitForAsync } from '@angular/core/testing';`);
+    expect(content).toContain(`it('should work', waitForAsync(() => {`);
+    expect(content).toContain(`it('should also work', waitForAsync(() => {`);
+  });
+
+  it('should not change aliased calls', async () => {
+    writeFile('/index.ts', `
+      import { async as renamedAsync, inject } from '@angular/core/testing';
+
+      it('should work', renamedAsync(() => {
+        expect(inject('foo')).toBe('foo');
+      }));
+    `);
+
+    await runMigration();
+
+    const content = tree.readContent('/index.ts');
+    expect(content).toContain(
+        `import { inject, waitForAsync as renamedAsync } from '@angular/core/testing';`);
+    expect(content).toContain(`it('should work', renamedAsync(() => {`);
+  });
+
+  function writeFile(filePath: string, contents: string) {
+    host.sync.write(normalize(filePath), virtualFs.stringToFileBuffer(contents));
+  }
+
+  function runMigration() {
+    return runner.runSchematicAsync('migration-v11-wait-for-async', {}, tree).toPromise();
+  }
+});
diff --git a/packages/core/schematics/tsconfig.json b/packages/core/schematics/tsconfig.json
index 39011671983e4..ba11c35a3d76d 100644
--- a/packages/core/schematics/tsconfig.json
+++ b/packages/core/schematics/tsconfig.json
@@ -4,7 +4,7 @@
     "noFallthroughCasesInSwitch": true,
     "strict": true,
     "lib": ["es2015"],
-    "types": [],
+    "types": ["jasmine"],
     "baseUrl": ".",
     "paths": {
       "@angular/core": ["../"],
diff --git a/packages/core/schematics/utils/tslint/tslint_html_source_file.ts b/packages/core/schematics/utils/tslint/tslint_html_source_file.ts
index a900a435ae8b0..bf4ad3bf80c2a 100644
--- a/packages/core/schematics/utils/tslint/tslint_html_source_file.ts
+++ b/packages/core/schematics/utils/tslint/tslint_html_source_file.ts
@@ -17,7 +17,7 @@ export function createHtmlSourceFile(filePath: string, content: string): ts.Sour
 
   // Subtract two characters because the string literal quotes are only needed for parsing
   // and are not part of the actual source file.
-  sourceFile.end = sourceFile.end - 2;
+  (sourceFile.end as number) = sourceFile.end - 2;
 
   // Note: This does not affect the way TSLint applies replacements for external resource files.
   // At the time of writing, TSLint loads files manually if the actual rule source file is not
diff --git a/packages/core/schematics/utils/typescript/imports.ts b/packages/core/schematics/utils/typescript/imports.ts
index 1bfe7a85ce97b..ccfe75aadd90c 100644
--- a/packages/core/schematics/utils/typescript/imports.ts
+++ b/packages/core/schematics/utils/typescript/imports.ts
@@ -42,3 +42,78 @@ export function getImportOfIdentifier(typeChecker: ts.TypeChecker, node: ts.Iden
     node: importDecl
   };
 }
+
+
+/**
+ * Gets a top-level import specifier with a specific name that is imported from a particular module.
+ * E.g. given a file that looks like:
+ *
+ * ```
+ * import { Component, Directive } from '@angular/core';
+ * import { Foo } from './foo';
+ * ```
+ *
+ * Calling `getImportSpecifier(sourceFile, '@angular/core', 'Directive')` will yield the node
+ * referring to `Directive` in the top import.
+ *
+ * @param sourceFile File in which to look for imports.
+ * @param moduleName Name of the import's module.
+ * @param specifierName Original name of the specifier to look for. Aliases will be resolved to
+ *    their original name.
+ */
+export function getImportSpecifier(
+    sourceFile: ts.SourceFile, moduleName: string, specifierName: string): ts.ImportSpecifier|null {
+  for (const node of sourceFile.statements) {
+    if (ts.isImportDeclaration(node) && ts.isStringLiteral(node.moduleSpecifier) &&
+        node.moduleSpecifier.text === moduleName) {
+      const namedBindings = node.importClause && node.importClause.namedBindings;
+      if (namedBindings && ts.isNamedImports(namedBindings)) {
+        const match = findImportSpecifier(namedBindings.elements, specifierName);
+        if (match) {
+          return match;
+        }
+      }
+    }
+  }
+
+  return null;
+}
+
+
+/**
+ * Replaces an import inside a named imports node with a different one.
+ * @param node Node that contains the imports.
+ * @param existingImport Import that should be replaced.
+ * @param newImportName Import that should be inserted.
+ */
+export function replaceImport(
+    node: ts.NamedImports, existingImport: string, newImportName: string) {
+  const isAlreadyImported = findImportSpecifier(node.elements, newImportName);
+  if (isAlreadyImported) {
+    return node;
+  }
+
+  const existingImportNode = findImportSpecifier(node.elements, existingImport);
+  if (!existingImportNode) {
+    return node;
+  }
+
+  return ts.updateNamedImports(node, [
+    ...node.elements.filter(current => current !== existingImportNode),
+    // Create a new import while trying to preserve the alias of the old one.
+    ts.createImportSpecifier(
+        existingImportNode.propertyName ? ts.createIdentifier(newImportName) : undefined,
+        existingImportNode.propertyName ? existingImportNode.name :
+                                          ts.createIdentifier(newImportName))
+  ]);
+}
+
+
+/** Finds an import specifier with a particular name. */
+function findImportSpecifier(
+    nodes: ts.NodeArray<ts.ImportSpecifier>, specifierName: string): ts.ImportSpecifier|undefined {
+  return nodes.find(element => {
+    const {name, propertyName} = element;
+    return propertyName ? propertyName.text === specifierName : name.text === specifierName;
+  });
+}
diff --git a/packages/core/schematics/utils/typescript/nodes.ts b/packages/core/schematics/utils/typescript/nodes.ts
index 69695345a3028..f6b5a3eb0a2fc 100644
--- a/packages/core/schematics/utils/typescript/nodes.ts
+++ b/packages/core/schematics/utils/typescript/nodes.ts
@@ -12,3 +12,17 @@ import * as ts from 'typescript';
 export function hasModifier(node: ts.Node, modifierKind: ts.SyntaxKind) {
   return !!node.modifiers && node.modifiers.some(m => m.kind === modifierKind);
 }
+
+/** Find the closest parent node of a particular kind. */
+export function closestNode<T extends ts.Node>(node: ts.Node, kind: ts.SyntaxKind): T|null {
+  let current: ts.Node = node;
+
+  while (current && !ts.isSourceFile(current)) {
+    if (current.kind === kind) {
+      return current as T;
+    }
+    current = current.parent;
+  }
+
+  return null;
+}
diff --git a/packages/core/schematics/utils/typescript/symbol.ts b/packages/core/schematics/utils/typescript/symbol.ts
index 5585c51e16720..9d4bbffd1fdcc 100644
--- a/packages/core/schematics/utils/typescript/symbol.ts
+++ b/packages/core/schematics/utils/typescript/symbol.ts
@@ -18,3 +18,12 @@ export function getValueSymbolOfDeclaration(node: ts.Node, typeChecker: ts.TypeC
 
   return symbol;
 }
+
+/** Checks whether a node is referring to a specific import specifier. */
+export function isReferenceToImport(
+    typeChecker: ts.TypeChecker, node: ts.Node, importSpecifier: ts.ImportSpecifier): boolean {
+  const nodeSymbol = typeChecker.getTypeAtLocation(node).getSymbol();
+  const importSymbol = typeChecker.getTypeAtLocation(importSpecifier).getSymbol();
+  return !!(nodeSymbol && importSymbol) &&
+      nodeSymbol.valueDeclaration === importSymbol.valueDeclaration;
+}
diff --git a/packages/core/src/application_module.ts b/packages/core/src/application_module.ts
index 7db809abedc96..b5eedcede56f8 100644
--- a/packages/core/src/application_module.ts
+++ b/packages/core/src/application_module.ts
@@ -21,7 +21,7 @@ import {ComponentFactoryResolver} from './linker';
 import {Compiler} from './linker/compiler';
 import {NgModule} from './metadata';
 import {SCHEDULER} from './render3/component_ref';
-import {setLocaleId} from './render3/i18n';
+import {setLocaleId} from './render3/i18n/i18n_locale_id';
 import {NgZone} from './zone';
 
 declare const $localize: {locale?: string};
diff --git a/packages/core/src/application_ref.ts b/packages/core/src/application_ref.ts
index a701f7518e5c2..bc4e605f8f230 100644
--- a/packages/core/src/application_ref.ts
+++ b/packages/core/src/application_ref.ts
@@ -15,7 +15,10 @@ import {ApplicationInitStatus} from './application_init';
 import {APP_BOOTSTRAP_LISTENER, PLATFORM_INITIALIZER} from './application_tokens';
 import {getCompilerFacade} from './compiler/compiler_facade';
 import {Console} from './console';
-import {Injectable, InjectionToken, Injector, StaticProvider} from './di';
+import {Injectable} from './di/injectable';
+import {InjectionToken} from './di/injection_token';
+import {Injector} from './di/injector';
+import {StaticProvider} from './di/interface/provider';
 import {INJECTOR_SCOPE} from './di/scope';
 import {ErrorHandler} from './error_handler';
 import {DEFAULT_LOCALE_ID} from './i18n/localization';
@@ -30,7 +33,7 @@ import {InternalViewRef, ViewRef} from './linker/view_ref';
 import {isComponentResourceResolutionQueueEmpty, resolveComponentResources} from './metadata/resource_loading';
 import {assertNgModuleType} from './render3/assert';
 import {ComponentFactory as R3ComponentFactory} from './render3/component_ref';
-import {setLocaleId} from './render3/i18n';
+import {setLocaleId} from './render3/i18n/i18n_locale_id';
 import {setJitOptions} from './render3/jit/jit_options';
 import {NgModuleFactory as R3NgModuleFactory} from './render3/ng_module_ref';
 import {publishDefaultGlobalUtils as _publishDefaultGlobalUtils} from './render3/util/global_utils';
diff --git a/packages/core/src/change_detection.ts b/packages/core/src/change_detection.ts
index aa10e0821cad9..e5b2bb1b9fa8d 100644
--- a/packages/core/src/change_detection.ts
+++ b/packages/core/src/change_detection.ts
@@ -12,4 +12,4 @@
  * Change detection enables data binding in Angular.
  */
 
-export {ChangeDetectionStrategy, ChangeDetectorRef, CollectionChangeRecord, DefaultIterableDiffer, IterableChangeRecord, IterableChanges, IterableDiffer, IterableDifferFactory, IterableDiffers, KeyValueChangeRecord, KeyValueChanges, KeyValueDiffer, KeyValueDifferFactory, KeyValueDiffers, NgIterable, PipeTransform, SimpleChange, SimpleChanges, TrackByFunction, WrappedValue} from './change_detection/change_detection';
+export {ChangeDetectionStrategy, ChangeDetectorRef, DefaultIterableDiffer, IterableChangeRecord, IterableChanges, IterableDiffer, IterableDifferFactory, IterableDiffers, KeyValueChangeRecord, KeyValueChanges, KeyValueDiffer, KeyValueDifferFactory, KeyValueDiffers, NgIterable, PipeTransform, SimpleChange, SimpleChanges, TrackByFunction, WrappedValue} from './change_detection/change_detection';
diff --git a/packages/core/src/change_detection/change_detection.ts b/packages/core/src/change_detection/change_detection.ts
index 100ca159a1a06..547b5e67a5d58 100644
--- a/packages/core/src/change_detection/change_detection.ts
+++ b/packages/core/src/change_detection/change_detection.ts
@@ -18,7 +18,7 @@ export {ChangeDetectionStrategy, ChangeDetectorStatus, isDefaultChangeDetectionS
 export {DefaultIterableDifferFactory} from './differs/default_iterable_differ';
 export {DefaultIterableDiffer} from './differs/default_iterable_differ';
 export {DefaultKeyValueDifferFactory} from './differs/default_keyvalue_differ';
-export {CollectionChangeRecord, IterableChangeRecord, IterableChanges, IterableDiffer, IterableDifferFactory, IterableDiffers, NgIterable, TrackByFunction} from './differs/iterable_differs';
+export {IterableChangeRecord, IterableChanges, IterableDiffer, IterableDifferFactory, IterableDiffers, NgIterable, TrackByFunction} from './differs/iterable_differs';
 export {KeyValueChangeRecord, KeyValueChanges, KeyValueDiffer, KeyValueDifferFactory, KeyValueDiffers} from './differs/keyvalue_differs';
 export {PipeTransform} from './pipe_transform';
 
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 736d7b1234246..91717994cc028 100644
--- a/packages/core/src/change_detection/differs/default_iterable_differ.ts
+++ b/packages/core/src/change_detection/differs/default_iterable_differ.ts
@@ -236,7 +236,6 @@ export class DefaultIterableDiffer<V> implements IterableDiffer<V>, IterableChan
   _reset() {
     if (this.isDirty) {
       let record: IterableChangeRecord_<V>|null;
-      let nextRecord: IterableChangeRecord_<V>|null;
 
       for (record = this._previousItHead = this._itHead; record !== null; record = record._next) {
         record._nextPrevious = record._next;
@@ -247,9 +246,8 @@ export class DefaultIterableDiffer<V> implements IterableDiffer<V>, IterableChan
       }
       this._additionsHead = this._additionsTail = null;
 
-      for (record = this._movesHead; record !== null; record = nextRecord) {
+      for (record = this._movesHead; record !== null; record = record._nextMoved) {
         record.previousIndex = record.currentIndex;
-        nextRecord = record._nextMoved;
       }
       this._movesHead = this._movesTail = null;
       this._removalsHead = this._removalsTail = null;
@@ -593,7 +591,7 @@ export class IterableChangeRecord_<V> implements IterableChangeRecord<V> {
   constructor(public item: V, public trackById: any) {}
 }
 
-// A linked list of CollectionChangeRecords with the same IterableChangeRecord_.item
+// A linked list of IterableChangeRecords with the same IterableChangeRecord_.item
 class _DuplicateItemRecordList<V> {
   /** @internal */
   _head: IterableChangeRecord_<V>|null = null;
diff --git a/packages/core/src/change_detection/differs/iterable_differs.ts b/packages/core/src/change_detection/differs/iterable_differs.ts
index 1de180683f3e5..b9192746be0ea 100644
--- a/packages/core/src/change_detection/differs/iterable_differs.ts
+++ b/packages/core/src/change_detection/differs/iterable_differs.ts
@@ -112,12 +112,6 @@ export interface IterableChangeRecord<V> {
   readonly trackById: any;
 }
 
-/**
- * @deprecated v4.0.0 - Use IterableChangeRecord instead.
- * @publicApi
- */
-export interface CollectionChangeRecord<V> extends IterableChangeRecord<V> {}
-
 /**
  * An optional function passed into the `NgForOf` directive that defines how to track
  * changes for items in an iterable.
diff --git a/packages/core/src/compiler/compiler_facade_interface.ts b/packages/core/src/compiler/compiler_facade_interface.ts
index 94e9a87fe9203..dc0253771c654 100644
--- a/packages/core/src/compiler/compiler_facade_interface.ts
+++ b/packages/core/src/compiler/compiler_facade_interface.ts
@@ -173,7 +173,7 @@ export interface R3FactoryDefMetadataFacade {
 
 export enum ViewEncapsulation {
   Emulated = 0,
-  Native = 1,
+  // Historically the 1 value was for `Native` encapsulation which has been removed as of v11.
   None = 2,
   ShadowDom = 3
 }
diff --git a/packages/core/src/core_render3_private_export.ts b/packages/core/src/core_render3_private_export.ts
index ee09ad9f7a1ea..07ccc60cf2fed 100644
--- a/packages/core/src/core_render3_private_export.ts
+++ b/packages/core/src/core_render3_private_export.ts
@@ -201,7 +201,6 @@ export {
   ɵɵresolveWindow,
   ɵɵrestoreView,
 
-  ɵɵselect,
   ɵɵsetComponentScope,
   ɵɵsetNgModuleScope,
   ɵɵstaticContentQuery,
@@ -291,6 +290,9 @@ export {
   ɵɵsanitizeStyle,
   ɵɵsanitizeUrl,
   ɵɵsanitizeUrlOrResourceUrl,
+  ɵɵtrustConstantHtml,
+  ɵɵtrustConstantResourceUrl,
+  ɵɵtrustConstantScript,
 } from './sanitization/sanitization';
 export {
   noSideEffects as ɵnoSideEffects,
diff --git a/packages/core/src/debug/debug_node.ts b/packages/core/src/debug/debug_node.ts
index 0081185acbd28..6497402c5428d 100644
--- a/packages/core/src/debug/debug_node.ts
+++ b/packages/core/src/debug/debug_node.ts
@@ -6,7 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Injector} from '../di';
+import {Injector} from '../di/injector';
+import {assertTNodeForLView} from '../render3/assert';
 import {CONTAINER_HEADER_OFFSET, LContainer, NATIVE} from '../render3/interfaces/container';
 import {TElementNode, TNode, TNodeFlags, TNodeType} from '../render3/interfaces/node';
 import {isComponentHost, isLContainer} from '../render3/interfaces/type_checks';
@@ -265,7 +266,7 @@ class DebugElement__POST_R3__ extends DebugNode__POST_R3__ implements DebugEleme
       const lView = context.lView;
       const tData = lView[TVIEW].data;
       const tNode = tData[context.nodeIndex] as TNode;
-      return tNode.tagName!;
+      return tNode.value!;
     } catch (e) {
       return this.nativeNode.nodeName;
     }
@@ -525,9 +526,10 @@ function _queryAllR3(
 function _queryNodeChildrenR3(
     tNode: TNode, lView: LView, predicate: Predicate<DebugElement>|Predicate<DebugNode>,
     matches: DebugElement[]|DebugNode[], elementsOnly: boolean, rootNativeNode: any) {
+  ngDevMode && assertTNodeForLView(tNode, lView);
   const nativeNode = getNativeByTNodeOrNull(tNode, lView);
   // For each type of TNode, specific logic is executed.
-  if (tNode.type === TNodeType.Element || tNode.type === TNodeType.ElementContainer) {
+  if (tNode.type & (TNodeType.AnyRNode | TNodeType.ElementContainer)) {
     // Case 1: the TNode is an element
     // The native node has to be checked.
     _addQueryMatchR3(nativeNode, predicate, matches, elementsOnly, rootNativeNode);
@@ -563,14 +565,14 @@ function _queryNodeChildrenR3(
       _queryNodeChildrenInContainerR3(
           nodeOrContainer, predicate, matches, elementsOnly, rootNativeNode);
     }
-  } else if (tNode.type === TNodeType.Container) {
+  } else if (tNode.type & TNodeType.Container) {
     // Case 2: the TNode is a container
     // The native node has to be checked.
     const lContainer = lView[tNode.index];
     _addQueryMatchR3(lContainer[NATIVE], predicate, matches, elementsOnly, rootNativeNode);
     // Each view inside the container has to be processed.
     _queryNodeChildrenInContainerR3(lContainer, predicate, matches, elementsOnly, rootNativeNode);
-  } else if (tNode.type === TNodeType.Projection) {
+  } else if (tNode.type & TNodeType.Projection) {
     // Case 3: the TNode is a projection insertion point (i.e. a <ng-content>).
     // The nodes projected at this location all need to be processed.
     const componentView = lView![DECLARATION_COMPONENT_VIEW];
@@ -616,9 +618,11 @@ function _queryNodeChildrenInContainerR3(
     lContainer: LContainer, predicate: Predicate<DebugElement>|Predicate<DebugNode>,
     matches: DebugElement[]|DebugNode[], elementsOnly: boolean, rootNativeNode: any) {
   for (let i = CONTAINER_HEADER_OFFSET; i < lContainer.length; i++) {
-    const childView = lContainer[i];
-    _queryNodeChildrenR3(
-        childView[TVIEW].node!, childView, predicate, matches, elementsOnly, rootNativeNode);
+    const childView = lContainer[i] as LView;
+    const firstChild = childView[TVIEW].firstChild;
+    if (firstChild) {
+      _queryNodeChildrenR3(firstChild, childView, predicate, matches, elementsOnly, rootNativeNode);
+    }
   }
 }
 
@@ -658,7 +662,7 @@ function _addQueryMatchR3(
  *
  * @param nativeNode the current native node
  * @param predicate the predicate to match
- * @param matches the list of positive matches
+ * @param matches the list where matches are stored
  * @param elementsOnly whether only elements should be searched
  */
 function _queryNativeNodeDescendants(
diff --git a/packages/core/src/di/injector_compatibility.ts b/packages/core/src/di/injector_compatibility.ts
index fc30a8647af39..fde76e1801a1c 100644
--- a/packages/core/src/di/injector_compatibility.ts
+++ b/packages/core/src/di/injector_compatibility.ts
@@ -9,6 +9,7 @@
 import '../util/ng_dev_mode';
 
 import {Type} from '../interface/type';
+import {assertNotEqual} from '../util/assert';
 import {getClosureSafeProperty} from '../util/property';
 import {stringify} from '../util/stringify';
 
@@ -84,6 +85,19 @@ export function setInjectImplementation(
   return previous;
 }
 
+/**
+ * Assert that `_injectImplementation` is not `fn`.
+ *
+ * This is useful, to prevent infinite recursion.
+ *
+ * @param fn Function which it should not equal to
+ */
+export function assertInjectImplementationNot(
+    fn: (<T>(token: Type<T>|InjectionToken<T>, flags?: InjectFlags) => T | null)) {
+  ngDevMode &&
+      assertNotEqual(_injectImplementation, fn, 'Calling ɵɵinject would cause infinite recursion');
+}
+
 export function injectInjectorOnly<T>(token: Type<T>|InjectionToken<T>): T;
 export function injectInjectorOnly<T>(token: Type<T>|InjectionToken<T>, flags?: InjectFlags): T|
     null;
diff --git a/packages/core/src/di/interface/defs.ts b/packages/core/src/di/interface/defs.ts
index 56865380f35a4..c532b72f987e2 100644
--- a/packages/core/src/di/interface/defs.ts
+++ b/packages/core/src/di/interface/defs.ts
@@ -195,23 +195,15 @@ export function ɵɵdefineInjector(options: {factory: () => any, providers?: any
  * @param type A type which may have its own (non-inherited) `ɵprov`.
  */
 export function getInjectableDef<T>(type: any): ɵɵInjectableDef<T>|null {
-  return getOwnDefinition(type, type[NG_PROV_DEF]) ||
-      getOwnDefinition(type, type[NG_INJECTABLE_DEF]);
+  return getOwnDefinition(type, NG_PROV_DEF) || getOwnDefinition(type, NG_INJECTABLE_DEF);
 }
 
 /**
- * Return `def` only if it is defined directly on `type` and is not inherited from a base
+ * Return definition only if it is defined directly on `type` and is not inherited from a base
  * class of `type`.
- *
- * The function `Object.hasOwnProperty` is not sufficient to distinguish this case because in older
- * browsers (e.g. IE10) static property inheritance is implemented by copying the properties.
- *
- * Instead, the definition's `token` is compared to the `type`, and if they don't match then the
- * property was not defined directly on the type itself, and was likely inherited. The definition
- * is only returned if the `type` matches the `def.token`.
  */
-function getOwnDefinition<T>(type: any, def: ɵɵInjectableDef<T>): ɵɵInjectableDef<T>|null {
-  return def && def.token === type ? def : null;
+function getOwnDefinition<T>(type: any, field: string): ɵɵInjectableDef<T>|null {
+  return type.hasOwnProperty(field) ? type[field] : null;
 }
 
 /**
@@ -223,10 +215,7 @@ function getOwnDefinition<T>(type: any, def: ɵɵInjectableDef<T>): ɵɵInjectab
  *     scenario if we find the `ɵprov` on an ancestor only.
  */
 export function getInheritedInjectableDef<T>(type: any): ɵɵInjectableDef<T>|null {
-  // See `jit/injectable.ts#compileInjectable` for context on NG_PROV_DEF_FALLBACK.
-  const def = type &&
-      (type[NG_PROV_DEF] || type[NG_INJECTABLE_DEF] ||
-       (type[NG_PROV_DEF_FALLBACK] && type[NG_PROV_DEF_FALLBACK]()));
+  const def = type && (type[NG_PROV_DEF] || type[NG_INJECTABLE_DEF]);
 
   if (def) {
     const typeName = getTypeName(type);
@@ -273,14 +262,6 @@ export function getInjectorDef<T>(type: any): ɵɵInjectorDef<T>|null {
 export const NG_PROV_DEF = getClosureSafeProperty({ɵprov: getClosureSafeProperty});
 export const NG_INJ_DEF = getClosureSafeProperty({ɵinj: getClosureSafeProperty});
 
-// On IE10 properties defined via `defineProperty` won't be inherited by child classes,
-// which will break inheriting the injectable definition from a grandparent through an
-// undecorated parent class. We work around it by defining a fallback method which will be
-// used to retrieve the definition. This should only be a problem in JIT mode, because in
-// AOT TypeScript seems to have a workaround for static properties. When inheriting from an
-// undecorated parent is no longer supported in v10, this can safely be removed.
-export const NG_PROV_DEF_FALLBACK = getClosureSafeProperty({ɵprovFallback: getClosureSafeProperty});
-
 // We need to keep these around so we can read off old defs if new defs are unavailable
 export const NG_INJECTABLE_DEF = getClosureSafeProperty({ngInjectableDef: getClosureSafeProperty});
 export const NG_INJECTOR_DEF = getClosureSafeProperty({ngInjectorDef: getClosureSafeProperty});
diff --git a/packages/core/src/di/jit/injectable.ts b/packages/core/src/di/jit/injectable.ts
index 231f2090ecee9..702560897cbbf 100644
--- a/packages/core/src/di/jit/injectable.ts
+++ b/packages/core/src/di/jit/injectable.ts
@@ -12,7 +12,7 @@ import {NG_FACTORY_DEF} from '../../render3/fields';
 import {getClosureSafeProperty} from '../../util/property';
 import {resolveForwardRef} from '../forward_ref';
 import {Injectable} from '../injectable';
-import {NG_PROV_DEF, NG_PROV_DEF_FALLBACK} from '../interface/defs';
+import {NG_PROV_DEF} from '../interface/defs';
 import {ClassSansProvider, ExistingSansProvider, FactorySansProvider, ValueProvider, ValueSansProvider} from '../interface/provider';
 
 import {angularCoreDiEnv} from './environment';
@@ -40,16 +40,6 @@ export function compileInjectable(type: Type<any>, srcMeta?: Injectable): void {
         return ngInjectableDef;
       },
     });
-
-    // On IE10 properties defined via `defineProperty` won't be inherited by child classes,
-    // which will break inheriting the injectable definition from a grandparent through an
-    // undecorated parent class. We work around it by defining a method which should be used
-    // as a fallback. This should only be a problem in JIT mode, because in AOT TypeScript
-    // seems to have a workaround for static properties. When inheriting from an undecorated
-    // parent is no longer supported (v11 or later), this can safely be removed.
-    if (!type.hasOwnProperty(NG_PROV_DEF_FALLBACK)) {
-      (type as any)[NG_PROV_DEF_FALLBACK] = () => (type as any)[NG_PROV_DEF];
-    }
   }
 
   // if NG_FACTORY_DEF is already defined on this class then don't overwrite it
diff --git a/packages/core/src/di/r3_injector.ts b/packages/core/src/di/r3_injector.ts
index ad9dd00b1cd41..449f88f15daa7 100644
--- a/packages/core/src/di/r3_injector.ts
+++ b/packages/core/src/di/r3_injector.ts
@@ -384,7 +384,7 @@ export class R3Injector {
       let multiRecord = this.records.get(token);
       if (multiRecord) {
         // It has. Throw a nice error if
-        if (multiRecord.multi === undefined) {
+        if (ngDevMode && multiRecord.multi === undefined) {
           throwMixedMultiProviderError();
         }
       } else {
@@ -396,7 +396,7 @@ export class R3Injector {
       multiRecord.multi!.push(provider);
     } else {
       const existing = this.records.get(token);
-      if (existing && existing.multi !== undefined) {
+      if (ngDevMode && existing && existing.multi !== undefined) {
         throwMixedMultiProviderError();
       }
     }
@@ -404,7 +404,7 @@ export class R3Injector {
   }
 
   private hydrate<T>(token: Type<T>|InjectionToken<T>, record: Record<T>): T {
-    if (record.value === CIRCULAR) {
+    if (ngDevMode && record.value === CIRCULAR) {
       throwCyclicDependencyError(stringify(token));
     } else if (record.value === NOT_YET) {
       record.value = CIRCULAR;
@@ -511,7 +511,7 @@ export function providerToFactory(
       const classRef = resolveForwardRef(
           provider &&
           ((provider as StaticClassProvider | ClassProvider).useClass || provider.provide));
-      if (!classRef) {
+      if (ngDevMode && !classRef) {
         throwInvalidProviderError(ngModuleType, providers, provider);
       }
       if (hasDeps(provider)) {
diff --git a/packages/core/src/errors.ts b/packages/core/src/errors.ts
index 12bc69dc6b79f..502a7f8ceeff3 100644
--- a/packages/core/src/errors.ts
+++ b/packages/core/src/errors.ts
@@ -7,7 +7,7 @@
  */
 
 import {ERROR_DEBUG_CONTEXT, ERROR_LOGGER, ERROR_ORIGINAL_ERROR, ERROR_TYPE} from './util/errors';
-import {DebugContext} from './view';
+import {DebugContext} from './view/types';
 
 export function getType(error: Error): Function {
   return (error as any)[ERROR_TYPE];
diff --git a/packages/core/src/interface/type.ts b/packages/core/src/interface/type.ts
index 8c538cb30897a..cbacc039ed4af 100644
--- a/packages/core/src/interface/type.ts
+++ b/packages/core/src/interface/type.ts
@@ -26,7 +26,7 @@ export function isType(v: any): v is Type<any> {
  * @description
  *
  * Represents an abstract class `T`, if applied to a concrete class it would stop being
- * instantiatable.
+ * instantiable.
  *
  * @publicApi
  */
diff --git a/packages/core/src/metadata/directives.ts b/packages/core/src/metadata/directives.ts
index 66abfee3f4541..147a20e453ba9 100644
--- a/packages/core/src/metadata/directives.ts
+++ b/packages/core/src/metadata/directives.ts
@@ -518,7 +518,6 @@ export interface Component extends Directive {
 
   /**
    * An encapsulation policy for the template and CSS styles. One of:
-   * - `ViewEncapsulation.Native`: Deprecated. Use `ViewEncapsulation.ShadowDom` instead.
    * - `ViewEncapsulation.Emulated`: Use shimmed CSS that
    * emulates the native behavior.
    * - `ViewEncapsulation.None`: Use global CSS without any
diff --git a/packages/core/src/metadata/view.ts b/packages/core/src/metadata/view.ts
index fbc5f492cd002..d8295d2b1637a 100644
--- a/packages/core/src/metadata/view.ts
+++ b/packages/core/src/metadata/view.ts
@@ -28,15 +28,9 @@ export enum ViewEncapsulation {
    * This is the default option.
    */
   Emulated = 0,
-  /**
-   * @deprecated v6.1.0 - use {ViewEncapsulation.ShadowDom} instead.
-   * Use the native encapsulation mechanism of the renderer.
-   *
-   * 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,
+
+  // Historically the 1 value was for `Native` encapsulation which has been removed as of v11.
+
   /**
    * Don't provide any template or style encapsulation.
    */
diff --git a/packages/core/src/reflection/reflection_capabilities.ts b/packages/core/src/reflection/reflection_capabilities.ts
index cd5a155c40efc..75575ebb135f7 100644
--- a/packages/core/src/reflection/reflection_capabilities.ts
+++ b/packages/core/src/reflection/reflection_capabilities.ts
@@ -17,14 +17,45 @@ import {GetterFn, MethodFn, SetterFn} from './types';
 
 
 
+/*
+ * #########################
+ * Attention: These Regular expressions have to hold even if the code is minified!
+ * ##########################
+ */
+
 /**
- * Attention: These regex has to hold even if the code is minified!
+ * Regular expression that detects pass-through constructors for ES5 output. This Regex
+ * intends to capture the common delegation pattern emitted by TypeScript and Babel. Also
+ * it intends to capture the pattern where existing constructors have been downleveled from
+ * ES2015 to ES5 using TypeScript w/ downlevel iteration. e.g.
+ *
+ * ```
+ *   function MyClass() {
+ *     var _this = _super.apply(this, arguments) || this;
+ * ```
+ *
+ * ```
+ *   function MyClass() {
+ *     var _this = _super.apply(this, __spread(arguments)) || this;
+ * ```
+ *
+ * More details can be found in: https://github.com/angular/angular/issues/38453.
  */
-export const DELEGATE_CTOR = /^function\s+\S+\(\)\s*{[\s\S]+\.apply\(this,\s*arguments\)/;
-export const INHERITED_CLASS = /^class\s+[A-Za-z\d$_]*\s*extends\s+[^{]+{/;
-export const INHERITED_CLASS_WITH_CTOR =
+export const ES5_DELEGATE_CTOR =
+    /^function\s+\S+\(\)\s*{[\s\S]+\.apply\(this,\s*(arguments|[^()]+\(arguments\))\)/;
+/** Regular expression that detects ES2015 classes which extend from other classes. */
+export const ES2015_INHERITED_CLASS = /^class\s+[A-Za-z\d$_]*\s*extends\s+[^{]+{/;
+/**
+ * Regular expression that detects ES2015 classes which extend from other classes and
+ * have an explicit constructor defined.
+ */
+export const ES2015_INHERITED_CLASS_WITH_CTOR =
     /^class\s+[A-Za-z\d$_]*\s*extends\s+[^{]+{[\s\S]*constructor\s*\(/;
-export const INHERITED_CLASS_WITH_DELEGATE_CTOR =
+/**
+ * Regular expression that detects ES2015 classes which extend from other classes
+ * and inherit a constructor.
+ */
+export const ES2015_INHERITED_CLASS_WITH_DELEGATE_CTOR =
     /^class\s+[A-Za-z\d$_]*\s*extends\s+[^{]+{[\s\S]*constructor\s*\(\)\s*{\s*super\(\.\.\.arguments\)/;
 
 /**
@@ -36,8 +67,9 @@ export const INHERITED_CLASS_WITH_DELEGATE_CTOR =
  * an initialized instance property.
  */
 export function isDelegateCtor(typeStr: string): boolean {
-  return DELEGATE_CTOR.test(typeStr) || INHERITED_CLASS_WITH_DELEGATE_CTOR.test(typeStr) ||
-      (INHERITED_CLASS.test(typeStr) && !INHERITED_CLASS_WITH_CTOR.test(typeStr));
+  return ES5_DELEGATE_CTOR.test(typeStr) ||
+      ES2015_INHERITED_CLASS_WITH_DELEGATE_CTOR.test(typeStr) ||
+      (ES2015_INHERITED_CLASS.test(typeStr) && !ES2015_INHERITED_CLASS_WITH_CTOR.test(typeStr));
 }
 
 export class ReflectionCapabilities implements PlatformReflectionCapabilities {
diff --git a/packages/core/src/render/api.ts b/packages/core/src/render/api.ts
index 4a745a05c907c..1aeb38b2fc3a1 100644
--- a/packages/core/src/render/api.ts
+++ b/packages/core/src/render/api.ts
@@ -158,8 +158,13 @@ export abstract class Renderer2 {
    * @param parent The parent node.
    * @param newChild The new child nodes.
    * @param refChild The existing child node before which `newChild` is inserted.
+   * @param isMove Optional argument which signifies if the current `insertBefore` is a result of a
+   *     move. Animation uses this information to trigger move animations. In the past the Animation
+   *     would always assume that any `insertBefore` is a move. This is not strictly true because
+   *     with runtime i18n it is possible to invoke `insertBefore` as a result of i18n and it should
+   *     not trigger an animation move.
    */
-  abstract insertBefore(parent: any, newChild: any, refChild: any): void;
+  abstract insertBefore(parent: any, newChild: any, refChild: any, isMove?: boolean): void;
   /**
    * Implement this callback to remove a child node from the host element's DOM.
    * @param parent The parent node.
diff --git a/packages/core/src/render3/VIEW_DATA.md b/packages/core/src/render3/VIEW_DATA.md
index 0cb427b51588d..f93362b25d02a 100644
--- a/packages/core/src/render3/VIEW_DATA.md
+++ b/packages/core/src/render3/VIEW_DATA.md
@@ -60,7 +60,7 @@ The above will create following layout:
 | Index | `LView`         | `TView.data`
 | ----: | -----------         | ------------
 | `HEADER`
-| `CONSTS`
+| `DECLS`
 | 10    | `<div>`             | `{type: Element, index: 10, parent: null}`
 | 11    | `#text(Hello )`     | `{type: Element, index: 11, parent: tView.data[10]}`
 | 12    | `<b>`               | `{type: Element, index: 12, parent: tView.data[10]}`
@@ -113,7 +113,7 @@ The above will create following layout:
 | Index | `LView`         | `TView.data`
 | ----: | -----------         | ------------
 | `HEADER`
-| `CONSTS`
+| `DECLS`
 | 10    | `<div>`             | `{type: Element, index: 10, parent: null}`
 | 11    | `#text()`           | `{type: Element, index: 11, parent: tView.data[10]}`
 | `VARS`
@@ -186,7 +186,7 @@ The above will create the following layout:
 | Index | `LView`         | `TView.data`
 | ----: | -----------         | ------------
 | `HEADER`
-| `CONSTS`
+| `DECLS`
 | 10    | `[<child>, ...]`    | `{type: Element, index: 10, parent: null}`
 | `VARS`
 | `EXPANDO`
@@ -325,7 +325,7 @@ The above will create the following layout:
 | Index | `LView`                                  | `TView.data`
 | ----: | ------------                                 | -------------
 | `HEADER`
-| `CONSTS`
+| `DECLS`
 | 10    | `[<child>, ...]`                             | `{type: Element, index: 10, parent: null, expandoIndex: 11, directivesIndex: 19, providersIndex: 20, viewProvidersIndex: 22, expandoEnd: 23}`
 | `VARS`
 | `EXPANDO`
diff --git a/packages/core/src/render3/assert.ts b/packages/core/src/render3/assert.ts
index ab82f9a85a233..3e14a28016f4a 100644
--- a/packages/core/src/render3/assert.ts
+++ b/packages/core/src/render3/assert.ts
@@ -6,24 +6,46 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {assertDefined, assertEqual, throwError} from '../util/assert';
-
+import {assertDefined, assertEqual, assertNumber, throwError} from '../util/assert';
 import {getComponentDef, getNgModuleDef} from './definition';
 import {LContainer} from './interfaces/container';
 import {DirectiveDef} from './interfaces/definition';
+import {TIcu} from './interfaces/i18n';
+import {NodeInjectorOffset} from './interfaces/injector';
 import {TNode} from './interfaces/node';
 import {isLContainer, isLView} from './interfaces/type_checks';
-import {LView, TVIEW, TView} from './interfaces/view';
+import {HEADER_OFFSET, LView, TVIEW, TView} from './interfaces/view';
+
 
 // [Assert functions do not constraint type when they are guarded by a truthy
 // expression.](https://github.com/microsoft/TypeScript/issues/37295)
 
 
 export function assertTNodeForLView(tNode: TNode, lView: LView) {
+  assertTNodeForTView(tNode, lView[TVIEW]);
+}
+
+export function assertTNodeForTView(tNode: TNode, tView: TView) {
+  assertTNode(tNode);
   tNode.hasOwnProperty('tView_') &&
       assertEqual(
-          (tNode as any as {tView_: TView}).tView_, lView[TVIEW],
-          'This TNode does not belong to this LView.');
+          (tNode as any as {tView_: TView}).tView_, tView,
+          'This TNode does not belong to this TView.');
+}
+
+export function assertTNode(tNode: TNode) {
+  assertDefined(tNode, 'TNode must be defined');
+  if (!(tNode && typeof tNode === 'object' && tNode.hasOwnProperty('directiveStylingLast'))) {
+    throwError('Not of type TNode, got: ' + tNode);
+  }
+}
+
+
+export function assertTIcu(tIcu: TIcu) {
+  assertDefined(tIcu, 'Expected TIcu to be defined');
+  if (!(typeof tIcu.currentCaseLViewIndex === 'number')) {
+    throwError('Object is not of TIcu type.');
+  }
 }
 
 export function assertComponentType(
@@ -42,13 +64,13 @@ export function assertNgModuleType(
   }
 }
 
-export function assertPreviousIsParent(isParent: boolean) {
-  assertEqual(isParent, true, 'previousOrParentTNode should be a parent');
+export function assertCurrentTNodeIsParent(isParent: boolean) {
+  assertEqual(isParent, true, 'currentTNode should be a parent');
 }
 
 export function assertHasParent(tNode: TNode|null) {
-  assertDefined(tNode, 'previousOrParentTNode should exist!');
-  assertDefined(tNode!.parent, 'previousOrParentTNode should have a parent');
+  assertDefined(tNode, 'currentTNode should exist!');
+  assertDefined(tNode!.parent, 'currentTNode should have a parent');
 }
 
 export function assertDataNext(lView: LView, index: number, arr?: any[]) {
@@ -91,3 +113,52 @@ export function assertDirectiveDef<T>(obj: any): asserts obj is DirectiveDef<T>
         `Expected a DirectiveDef/ComponentDef and this object does not seem to have the expected shape.`);
   }
 }
+
+export function assertIndexInDeclRange(lView: LView, index: number) {
+  const tView = lView[1];
+  assertBetween(HEADER_OFFSET, tView.bindingStartIndex, index);
+}
+
+export function assertIndexInVarsRange(lView: LView, index: number) {
+  const tView = lView[1];
+  assertBetween(
+      tView.bindingStartIndex,
+      (tView as any as {originalExpandoStartIndex: number}).originalExpandoStartIndex, index);
+}
+
+export function assertIndexInExpandoRange(lView: LView, index: number) {
+  const tView = lView[1];
+  assertBetween(
+      (tView as any as {originalExpandoStartIndex: number}).originalExpandoStartIndex, lView.length,
+      index);
+}
+
+export function assertBetween(lower: number, upper: number, index: number) {
+  if (!(lower <= index && index < upper)) {
+    throwError(`Index out of range (expecting ${lower} <= ${index} < ${upper})`);
+  }
+}
+
+
+/**
+ * This is a basic sanity check that the `injectorIndex` seems to point to what looks like a
+ * NodeInjector data structure.
+ *
+ * @param lView `LView` which should be checked.
+ * @param injectorIndex index into the `LView` where the `NodeInjector` is expected.
+ */
+export function assertNodeInjector(lView: LView, injectorIndex: number) {
+  assertIndexInExpandoRange(lView, injectorIndex);
+  assertIndexInExpandoRange(lView, injectorIndex + NodeInjectorOffset.PARENT);
+  assertNumber(lView[injectorIndex + 0], 'injectorIndex should point to a bloom filter');
+  assertNumber(lView[injectorIndex + 1], 'injectorIndex should point to a bloom filter');
+  assertNumber(lView[injectorIndex + 2], 'injectorIndex should point to a bloom filter');
+  assertNumber(lView[injectorIndex + 3], 'injectorIndex should point to a bloom filter');
+  assertNumber(lView[injectorIndex + 4], 'injectorIndex should point to a bloom filter');
+  assertNumber(lView[injectorIndex + 5], 'injectorIndex should point to a bloom filter');
+  assertNumber(lView[injectorIndex + 6], 'injectorIndex should point to a bloom filter');
+  assertNumber(lView[injectorIndex + 7], 'injectorIndex should point to a bloom filter');
+  assertNumber(
+      lView[injectorIndex + NodeInjectorOffset.PARENT],
+      'injectorIndex should point to parent injector');
+}
diff --git a/packages/core/src/render3/bindings.ts b/packages/core/src/render3/bindings.ts
index 333bff96d652a..b81e2daf23e14 100644
--- a/packages/core/src/render3/bindings.ts
+++ b/packages/core/src/render3/bindings.ts
@@ -7,11 +7,11 @@
  */
 
 import {devModeEqual} from '../change_detection/change_detection_util';
-import {assertDataInRange, assertLessThan, assertNotSame} from '../util/assert';
+import {assertIndexInRange, assertLessThan, assertNotSame} from '../util/assert';
 
 import {getExpressionChangedErrorDetails, throwErrorIfNoChangesMode} from './errors';
 import {LView} from './interfaces/view';
-import {getCheckNoChangesMode} from './state';
+import {isInCheckNoChangesMode} from './state';
 import {NO_CHANGE} from './tokens';
 
 
@@ -24,7 +24,7 @@ export function updateBinding(lView: LView, bindingIndex: number, value: any): a
 
 /** Gets the current binding value. */
 export function getBinding(lView: LView, bindingIndex: number): any {
-  ngDevMode && assertDataInRange(lView, bindingIndex);
+  ngDevMode && assertIndexInRange(lView, bindingIndex);
   ngDevMode &&
       assertNotSame(lView[bindingIndex], NO_CHANGE, 'Stored value should never be NO_CHANGE.');
   return lView[bindingIndex];
@@ -52,7 +52,7 @@ export function bindingUpdated(lView: LView, bindingIndex: number, value: any):
   if (Object.is(oldValue, value)) {
     return false;
   } else {
-    if (ngDevMode && getCheckNoChangesMode()) {
+    if (ngDevMode && isInCheckNoChangesMode()) {
       // View engine didn't report undefined values as changed on the first checkNoChanges pass
       // (before the change detection was run).
       const oldValueToCompare = oldValue !== NO_CHANGE ? oldValue : undefined;
diff --git a/packages/core/src/render3/component.ts b/packages/core/src/render3/component.ts
index 3bd154914fbd9..177bdae614566 100644
--- a/packages/core/src/render3/component.ts
+++ b/packages/core/src/render3/component.ts
@@ -11,8 +11,7 @@
 import {Type} from '../core';
 import {Injector} from '../di/injector';
 import {Sanitizer} from '../sanitization/sanitizer';
-import {assertDataInRange} from '../util/assert';
-
+import {assertDefined, assertIndexInRange} from '../util/assert';
 import {assertComponentType} from './assert';
 import {getComponentDef} from './definition';
 import {diPublicInInjector, getOrCreateNodeInjectorForNode} from './di';
@@ -24,7 +23,7 @@ import {PlayerHandler} from './interfaces/player';
 import {domRendererFactory3, RElement, Renderer3, RendererFactory3} from './interfaces/renderer';
 import {CONTEXT, HEADER_OFFSET, LView, LViewFlags, RootContext, RootContextFlags, TVIEW, TViewType} from './interfaces/view';
 import {writeDirectClass, writeDirectStyle} from './node_manipulation';
-import {enterView, getPreviousOrParentTNode, leaveView, setSelectedIndex} from './state';
+import {enterView, getCurrentTNode, leaveView, setSelectedIndex} from './state';
 import {computeStaticStyling} from './styling/static_styling';
 import {setUpAttributes} from './util/attrs_utils';
 import {publishDefaultGlobalUtils} from './util/global_utils';
@@ -129,12 +128,12 @@ export function renderComponent<T>(
   const rootContext = createRootContext(opts.scheduler, opts.playerHandler);
 
   const renderer = rendererFactory.createRenderer(hostRNode, componentDef);
-  const rootTView = createTView(TViewType.Root, -1, null, 1, 0, null, null, null, null, null);
+  const rootTView = createTView(TViewType.Root, null, null, 1, 0, null, null, null, null, null);
   const rootView: LView = createLView(
-      null, rootTView, rootContext, rootFlags, null, null, rendererFactory, renderer, undefined,
+      null, rootTView, rootContext, rootFlags, null, null, rendererFactory, renderer, null,
       opts.injector || null);
 
-  enterView(rootView, null);
+  enterView(rootView);
   let component: T;
 
   try {
@@ -163,6 +162,7 @@ export function renderComponent<T>(
  * @param rNode Render host element.
  * @param def ComponentDef
  * @param rootView The parent view where the host node is stored
+ * @param rendererFactory Factory to be used for creating child renderers.
  * @param hostRenderer The current renderer
  * @param sanitizer The sanitizer, if provided
  *
@@ -172,9 +172,13 @@ export function createRootComponentView(
     rNode: RElement|null, def: ComponentDef<any>, rootView: LView,
     rendererFactory: RendererFactory3, hostRenderer: Renderer3, sanitizer?: Sanitizer|null): LView {
   const tView = rootView[TVIEW];
-  ngDevMode && assertDataInRange(rootView, 0 + HEADER_OFFSET);
-  rootView[0 + HEADER_OFFSET] = rNode;
-  const tNode: TElementNode = getOrCreateTNode(tView, null, 0, TNodeType.Element, null, null);
+  const index = HEADER_OFFSET;
+  ngDevMode && assertIndexInRange(rootView, index);
+  rootView[index] = rNode;
+  // '#host' is added here as we don't know the real host DOM name (we don't want to read it) and at
+  // the same time we want to communicate the the debug `TNode` that this is a special `TNode`
+  // representing a host element.
+  const tNode: TElementNode = getOrCreateTNode(tView, index, TNodeType.Element, '#host', null);
   const mergedAttrs = tNode.mergedAttrs = def.hostAttrs;
   if (mergedAttrs !== null) {
     computeStaticStyling(tNode, mergedAttrs, true);
@@ -192,8 +196,8 @@ export function createRootComponentView(
   const viewRenderer = rendererFactory.createRenderer(rNode, def);
   const componentView = createLView(
       rootView, getOrCreateTComponentView(def), null,
-      def.onPush ? LViewFlags.Dirty : LViewFlags.CheckAlways, rootView[HEADER_OFFSET], tNode,
-      rendererFactory, viewRenderer, sanitizer);
+      def.onPush ? LViewFlags.Dirty : LViewFlags.CheckAlways, rootView[index], tNode,
+      rendererFactory, viewRenderer, sanitizer || null, null);
 
   if (tView.firstCreatePass) {
     diPublicInInjector(getOrCreateNodeInjectorForNode(tNode, rootView), tView, def.type);
@@ -204,7 +208,7 @@ export function createRootComponentView(
   addToViewTree(rootView, componentView);
 
   // Store component view at node index, with node as the HOST
-  return rootView[HEADER_OFFSET] = componentView;
+  return rootView[index] = componentView;
 }
 
 /**
@@ -229,11 +233,11 @@ export function createRootComponent<T>(
     componentDef.contentQueries(RenderFlags.Create, component, rootLView.length - 1);
   }
 
-  const rootTNode = getPreviousOrParentTNode();
+  const rootTNode = getCurrentTNode()!;
+  ngDevMode && assertDefined(rootTNode, 'tNode should have been already created');
   if (tView.firstCreatePass &&
       (componentDef.hostBindings !== null || componentDef.hostAttrs !== null)) {
-    const elementIndex = rootTNode.index - HEADER_OFFSET;
-    setSelectedIndex(elementIndex);
+    setSelectedIndex(rootTNode.index);
 
     const rootTView = rootLView[TVIEW];
     addHostBindingsToExpandoInstructions(rootTView, componentDef);
diff --git a/packages/core/src/render3/component_ref.ts b/packages/core/src/render3/component_ref.ts
index eed3fb24d680e..b9980d01767e4 100644
--- a/packages/core/src/render3/component_ref.ts
+++ b/packages/core/src/render3/component_ref.ts
@@ -19,19 +19,17 @@ import {RendererFactory2} from '../render/api';
 import {Sanitizer} from '../sanitization/sanitizer';
 import {VERSION} from '../version';
 import {NOT_FOUND_CHECK_ONLY_ELEMENT_INJECTOR} from '../view/provider';
-
 import {assertComponentType} from './assert';
 import {createRootComponent, createRootComponentView, createRootContext, LifecycleHooksFeature} from './component';
 import {getComponentDef} from './definition';
 import {NodeInjector} from './di';
-import {assignTViewNodeToLView, createLView, createTView, elementCreate, locateHostElement, renderView} from './instructions/shared';
+import {createLView, createTView, locateHostElement, renderView} from './instructions/shared';
 import {ComponentDef} from './interfaces/definition';
-import {TContainerNode, TElementContainerNode, TElementNode, TNode, TNodeType} from './interfaces/node';
+import {TContainerNode, TElementContainerNode, TElementNode, TNode} from './interfaces/node';
 import {domRendererFactory3, RendererFactory3, RNode} from './interfaces/renderer';
-import {LView, LViewFlags, TVIEW, TViewType} from './interfaces/view';
+import {HEADER_OFFSET, LView, LViewFlags, TViewType} from './interfaces/view';
 import {MATH_ML_NAMESPACE, SVG_NAMESPACE} from './namespaces';
-import {assertNodeOfPossibleTypes} from './node_assert';
-import {writeDirectClass} from './node_manipulation';
+import {createElementNode, writeDirectClass} from './node_manipulation';
 import {extractAttrsAndClassesFromSelector, stringifyCSSSelectorList} from './node_selector_matcher';
 import {enterView, leaveView} from './state';
 import {setUpAttributes} from './util/attrs_utils';
@@ -149,8 +147,8 @@ export class ComponentFactory<T> extends viewEngine_ComponentFactory<T> {
     const elementName = this.componentDef.selectors[0][0] as string || 'div';
     const hostRNode = rootSelectorOrNode ?
         locateHostElement(hostRenderer, rootSelectorOrNode, this.componentDef.encapsulation) :
-        elementCreate(
-            elementName, rendererFactory.createRenderer(null, this.componentDef),
+        createElementNode(
+            rendererFactory.createRenderer(null, this.componentDef), elementName,
             getNamespace(elementName));
 
     const rootFlags = this.componentDef.onPush ? LViewFlags.Dirty | LViewFlags.IsRoot :
@@ -158,7 +156,7 @@ export class ComponentFactory<T> extends viewEngine_ComponentFactory<T> {
     const rootContext = createRootContext();
 
     // Create the root view. Uses empty TView and ContentTemplate.
-    const rootTView = createTView(TViewType.Root, -1, null, 1, 0, null, null, null, null, null);
+    const rootTView = createTView(TViewType.Root, null, null, 1, 0, null, null, null, null, null);
     const rootLView = createLView(
         null, rootTView, rootContext, rootFlags, null, null, rendererFactory, hostRenderer,
         sanitizer, rootViewInjector);
@@ -168,7 +166,7 @@ export class ComponentFactory<T> extends viewEngine_ComponentFactory<T> {
     // `renderView` does that. However as the code is written it is needed because
     // `createRootComponentView` and `createRootComponent` both read global state. Fixing those
     // issues would allow us to drop this.
-    enterView(rootLView, null);
+    enterView(rootLView);
 
     let component: T;
     let tElementNode: TElementNode;
@@ -194,7 +192,7 @@ export class ComponentFactory<T> extends viewEngine_ComponentFactory<T> {
         }
       }
 
-      tElementNode = getTNode(rootTView, 0) as TElementNode;
+      tElementNode = getTNode(rootTView, HEADER_OFFSET) as TElementNode;
 
       if (projectableNodes !== undefined) {
         const projection: (TNode|RNode[]|null)[] = tElementNode.projection = [];
@@ -220,15 +218,9 @@ export class ComponentFactory<T> extends viewEngine_ComponentFactory<T> {
       leaveView();
     }
 
-    const componentRef = new ComponentRef(
+    return new ComponentRef(
         this.componentType, component,
         createElementRef(viewEngine_ElementRef, tElementNode, rootLView), rootLView, tElementNode);
-
-    // The host element of the internal root view is attached to the component's host view node.
-    ngDevMode && assertNodeOfPossibleTypes(rootTView.node, [TNodeType.View]);
-    rootTView.node!.child = tElementNode;
-
-    return componentRef;
   }
 }
 
@@ -267,7 +259,6 @@ export class ComponentRef<T> extends viewEngine_ComponentRef<T> {
     super();
     this.instance = instance;
     this.hostView = this.changeDetectorRef = new RootViewRef<T>(_rootLView);
-    assignTViewNodeToLView(_rootLView[TVIEW], null, -1, _rootLView);
     this.componentType = componentType;
   }
 
diff --git a/packages/core/src/render3/context_discovery.ts b/packages/core/src/render3/context_discovery.ts
index bbd6a62c9290b..f16dd7e48e091 100644
--- a/packages/core/src/render3/context_discovery.ts
+++ b/packages/core/src/render3/context_discovery.ts
@@ -14,7 +14,7 @@ import {LContext, MONKEY_PATCH_KEY_NAME} from './interfaces/context';
 import {TNode, TNodeFlags} from './interfaces/node';
 import {RElement, RNode} from './interfaces/renderer';
 import {CONTEXT, HEADER_OFFSET, HOST, LView, TVIEW} from './interfaces/view';
-import {getComponentLViewByIndex, getNativeByTNodeOrNull, readPatchedData, unwrapRNode} from './util/view_utils';
+import {getComponentLViewByIndex, readPatchedData, unwrapRNode} from './util/view_utils';
 
 
 
@@ -190,13 +190,11 @@ export function isDirectiveInstance(instance: any): boolean {
  * Locates the element within the given LView and returns the matching index
  */
 function findViaNativeElement(lView: LView, target: RElement): number {
-  let tNode = lView[TVIEW].firstChild;
-  while (tNode) {
-    const native = getNativeByTNodeOrNull(tNode, lView)!;
-    if (native === target) {
-      return tNode.index;
+  const tView = lView[TVIEW];
+  for (let i = HEADER_OFFSET; i < tView.bindingStartIndex; i++) {
+    if (unwrapRNode(lView[i]) === target) {
+      return i;
     }
-    tNode = traverseNextElement(tNode);
   }
 
   return -1;
diff --git a/packages/core/src/render3/definition.ts b/packages/core/src/render3/definition.ts
index 74fa4237b6e91..5b528ded1c906 100644
--- a/packages/core/src/render3/definition.ts
+++ b/packages/core/src/render3/definition.ts
@@ -18,7 +18,7 @@ import {stringify} from '../util/stringify';
 import {EMPTY_ARRAY, EMPTY_OBJ} from './empty';
 import {NG_COMP_DEF, NG_DIR_DEF, NG_FACTORY_DEF, NG_LOC_ID_DEF, NG_MOD_DEF, NG_PIPE_DEF} from './fields';
 import {ComponentDef, ComponentDefFeature, ComponentTemplate, ComponentType, ContentQueriesFunction, DirectiveDef, DirectiveDefFeature, DirectiveTypesOrFactory, FactoryFn, HostBindingsFunction, PipeDef, PipeType, PipeTypesOrFactory, ViewQueriesFunction} from './interfaces/definition';
-import {AttributeMarker, TAttributes, TConstants} from './interfaces/node';
+import {AttributeMarker, TAttributes, TConstantsOrFactory} from './interfaces/node';
 import {CssSelectorList, SelectorFlags} from './interfaces/projection';
 import {NgModuleType} from './ng_module_ref';
 
@@ -220,7 +220,7 @@ export function ɵɵdefineComponent<T>(componentDefinition: {
    * Constants for the nodes in the component's view.
    * Includes attribute arrays, local definition arrays etc.
    */
-  consts?: TConstants;
+  consts?: TConstantsOrFactory;
 
   /**
    * An array of `ngContent[selector]` values that were found in the template.
diff --git a/packages/core/src/render3/di.ts b/packages/core/src/render3/di.ts
index 5aee59cdd6a5e..e278b1112b3d6 100644
--- a/packages/core/src/render3/di.ts
+++ b/packages/core/src/render3/di.ts
@@ -13,19 +13,19 @@ import {injectRootLimpMode, setInjectImplementation} from '../di/injector_compat
 import {getInjectorDef} from '../di/interface/defs';
 import {InjectFlags} from '../di/interface/injector';
 import {Type} from '../interface/type';
-import {assertDefined, assertEqual} from '../util/assert';
+import {assertDefined, assertEqual, assertIndexInRange} from '../util/assert';
 import {noSideEffects} from '../util/closure';
 
-import {assertDirectiveDef} from './assert';
+import {assertDirectiveDef, assertNodeInjector, assertTNodeForLView} from './assert';
 import {getFactoryDef} from './definition';
 import {NG_ELEMENT_ID, NG_FACTORY_DEF} from './fields';
 import {registerPreOrderHooks} from './hooks';
 import {DirectiveDef, FactoryFn} from './interfaces/definition';
-import {isFactory, NO_PARENT_INJECTOR, NodeInjectorFactory, PARENT_INJECTOR, RelativeInjectorLocation, RelativeInjectorLocationFlags, TNODE} from './interfaces/injector';
+import {isFactory, NO_PARENT_INJECTOR, NodeInjectorFactory, NodeInjectorOffset, RelativeInjectorLocation, RelativeInjectorLocationFlags} from './interfaces/injector';
 import {AttributeMarker, TContainerNode, TDirectiveHostNode, TElementContainerNode, TElementNode, TNode, TNodeProviderIndexes, TNodeType} from './interfaces/node';
 import {isComponentDef, isComponentHost} from './interfaces/type_checks';
-import {DECLARATION_COMPONENT_VIEW, DECLARATION_VIEW, INJECTOR, LView, T_HOST, TData, TVIEW, TView} from './interfaces/view';
-import {assertNodeOfPossibleTypes} from './node_assert';
+import {DECLARATION_COMPONENT_VIEW, DECLARATION_VIEW, INJECTOR, LView, T_HOST, TData, TVIEW, TView, TViewType} from './interfaces/view';
+import {assertTNodeType} from './node_assert';
 import {enterDI, leaveDI} from './state';
 import {isNameOnlyAttributeMarker} from './util/attrs_utils';
 import {getParentInjectorIndex, getParentInjectorView, hasParentInjector} from './util/injector_utils';
@@ -141,41 +141,41 @@ export function bloomAdd(
  * Creates (or gets an existing) injector for a given element or container.
  *
  * @param tNode for which an injector should be retrieved / created.
- * @param hostView View where the node is stored
+ * @param lView View where the node is stored
  * @returns Node injector
  */
 export function getOrCreateNodeInjectorForNode(
-    tNode: TElementNode|TContainerNode|TElementContainerNode, hostView: LView): number {
-  const existingInjectorIndex = getInjectorIndex(tNode, hostView);
+    tNode: TElementNode|TContainerNode|TElementContainerNode, lView: LView): number {
+  const existingInjectorIndex = getInjectorIndex(tNode, lView);
   if (existingInjectorIndex !== -1) {
     return existingInjectorIndex;
   }
 
-  const tView = hostView[TVIEW];
+  const tView = lView[TVIEW];
   if (tView.firstCreatePass) {
-    tNode.injectorIndex = hostView.length;
+    tNode.injectorIndex = lView.length;
     insertBloom(tView.data, tNode);  // foundation for node bloom
-    insertBloom(hostView, null);     // foundation for cumulative bloom
+    insertBloom(lView, null);        // foundation for cumulative bloom
     insertBloom(tView.blueprint, null);
   }
 
-  const parentLoc = getParentInjectorLocation(tNode, hostView);
+  const parentLoc = getParentInjectorLocation(tNode, lView);
   const injectorIndex = tNode.injectorIndex;
 
   // If a parent injector can't be found, its location is set to -1.
   // In that case, we don't need to set up a cumulative bloom
   if (hasParentInjector(parentLoc)) {
     const parentIndex = getParentInjectorIndex(parentLoc);
-    const parentLView = getParentInjectorView(parentLoc, hostView);
+    const parentLView = getParentInjectorView(parentLoc, lView);
     const parentData = parentLView[TVIEW].data as any;
     // Creates a cumulative bloom filter that merges the parent's bloom filter
     // and its own cumulative bloom (which contains tokens for all ancestors)
-    for (let i = 0; i < 8; i++) {
-      hostView[injectorIndex + i] = parentLView[parentIndex + i] | parentData[parentIndex + i];
+    for (let i = 0; i < NodeInjectorOffset.BLOOM_SIZE; i++) {
+      lView[injectorIndex + i] = parentLView[parentIndex + i] | parentData[parentIndex + i];
     }
   }
 
-  hostView[injectorIndex + PARENT_INJECTOR] = parentLoc;
+  lView[injectorIndex + NodeInjectorOffset.PARENT] = parentLoc;
   return injectorIndex;
 }
 
@@ -184,16 +184,17 @@ function insertBloom(arr: any[], footer: TNode|null): void {
 }
 
 
-export function getInjectorIndex(tNode: TNode, hostView: LView): number {
+export function getInjectorIndex(tNode: TNode, lView: LView): number {
   if (tNode.injectorIndex === -1 ||
       // If the injector index is the same as its parent's injector index, then the index has been
       // copied down from the parent node. No injector has been created yet on this node.
       (tNode.parent && tNode.parent.injectorIndex === tNode.injectorIndex) ||
       // After the first template pass, the injector index might exist but the parent values
       // might not have been calculated yet for this instance
-      hostView[tNode.injectorIndex + PARENT_INJECTOR] == null) {
+      lView[tNode.injectorIndex + NodeInjectorOffset.PARENT] === null) {
     return -1;
   } else {
+    ngDevMode && assertIndexInRange(lView, tNode.injectorIndex);
     return tNode.injectorIndex;
   }
 }
@@ -202,29 +203,60 @@ export function getInjectorIndex(tNode: TNode, hostView: LView): number {
  * Finds the index of the parent injector, with a view offset if applicable. Used to set the
  * parent injector initially.
  *
- * Returns a combination of number of `ViewData` we have to go up and index in that `Viewdata`
+ * @returns Returns a number that is the combination of the number of LViews that we have to go up
+ * to find the LView containing the parent inject AND the index of the injector within that LView.
  */
-export function getParentInjectorLocation(tNode: TNode, view: LView): RelativeInjectorLocation {
+export function getParentInjectorLocation(tNode: TNode, lView: LView): RelativeInjectorLocation {
   if (tNode.parent && tNode.parent.injectorIndex !== -1) {
+    // If we have a parent `TNode` and there is an injector associated with it we are done, because
+    // the parent injector is within the current `LView`.
     return tNode.parent.injectorIndex as any;  // ViewOffset is 0
   }
 
-  // For most cases, the parent injector index can be found on the host node (e.g. for component
-  // or container), so this loop will be skipped, but we must keep the loop here to support
-  // the rarer case of deeply nested <ng-template> tags or inline views.
-  let hostTNode = view[T_HOST];
-  let viewOffset = 1;
-  while (hostTNode && hostTNode.injectorIndex === -1) {
-    view = view[DECLARATION_VIEW]!;
-    hostTNode = view ? view[T_HOST] : null;
-    viewOffset++;
-  }
+  // When parent injector location is computed it may be outside of the current view. (ie it could
+  // be pointing to a declared parent location). This variable stores number of declaration parents
+  // we need to walk up in order to find the parent injector location.
+  let declarationViewOffset = 0;
+  let parentTNode: TNode|null = null;
+  let lViewCursor: LView|null = lView;
+
+  // The parent injector is not in the current `LView`. We will have to walk the declared parent
+  // `LView` hierarchy and look for it. If we walk of the top, that means that there is no parent
+  // `NodeInjector`.
+  while (lViewCursor !== null) {
+    // First determine the `parentTNode` location. The parent pointer differs based on `TView.type`.
+    const tView = lViewCursor[TVIEW];
+    const tViewType = tView.type;
+    if (tViewType === TViewType.Embedded) {
+      ngDevMode &&
+          assertDefined(tView.declTNode, 'Embedded TNodes should have declaration parents.');
+      parentTNode = tView.declTNode;
+    } else if (tViewType === TViewType.Component) {
+      // Components don't have `TView.declTNode` because each instance of component could be
+      // inserted in different location, hence `TView.declTNode` is meaningless.
+      parentTNode = lViewCursor[T_HOST];
+    } else {
+      ngDevMode && assertEqual(tView.type, TViewType.Root, 'Root type expected');
+      parentTNode = null;
+    }
+    if (parentTNode === null) {
+      // If we have no parent, than we are done.
+      return NO_PARENT_INJECTOR;
+    }
 
-  return hostTNode ?
-      hostTNode.injectorIndex | (viewOffset << RelativeInjectorLocationFlags.ViewOffsetShift) :
-      -1 as any;
-}
+    ngDevMode && parentTNode && assertTNodeForLView(parentTNode!, lViewCursor[DECLARATION_VIEW]!);
+    // Every iteration of the loop requires that we go to the declared parent.
+    declarationViewOffset++;
+    lViewCursor = lViewCursor[DECLARATION_VIEW];
 
+    if (parentTNode.injectorIndex !== -1) {
+      // We found a NodeInjector which points to something.
+      return (parentTNode.injectorIndex |
+              (declarationViewOffset << RelativeInjectorLocationFlags.ViewOffsetShift)) as any;
+    }
+  }
+  return NO_PARENT_INJECTOR;
+}
 /**
  * Makes a type or an injection token public to the DI system by adding it to an
  * injector's bloom filter.
@@ -269,9 +301,7 @@ export function diPublicInInjector(
  * @publicApi
  */
 export function injectAttributeImpl(tNode: TNode, attrNameToInject: string): string|null {
-  ngDevMode &&
-      assertNodeOfPossibleTypes(
-          tNode, [TNodeType.Container, TNodeType.Element, TNodeType.ElementContainer]);
+  ngDevMode && assertTNodeType(tNode, TNodeType.AnyContainer | TNodeType.AnyRNode);
   ngDevMode && assertDefined(tNode, 'expecting tNode');
   if (attrNameToInject === 'class') {
     return tNode.classes;
@@ -367,13 +397,12 @@ export function getOrCreateInjectable<T>(
           flags & InjectFlags.Host ? lView[DECLARATION_COMPONENT_VIEW][T_HOST] : null;
 
       // If we should skip this injector, or if there is no injector on this node, start by
-      // searching
-      // the parent injector.
+      // searching the parent injector.
       if (injectorIndex === -1 || flags & InjectFlags.SkipSelf) {
         parentLocation = injectorIndex === -1 ? getParentInjectorLocation(tNode, lView) :
-                                                lView[injectorIndex + PARENT_INJECTOR];
+                                                lView[injectorIndex + NodeInjectorOffset.PARENT];
 
-        if (!shouldSearchParent(flags, false)) {
+        if (parentLocation === NO_PARENT_INJECTOR || !shouldSearchParent(flags, false)) {
           injectorIndex = -1;
         } else {
           previousTView = lView[TVIEW];
@@ -385,10 +414,13 @@ export function getOrCreateInjectable<T>(
       // Traverse up the injector tree until we find a potential match or until we know there
       // *isn't* a match.
       while (injectorIndex !== -1) {
-        parentLocation = lView[injectorIndex + PARENT_INJECTOR];
+        ngDevMode && assertNodeInjector(lView, injectorIndex);
 
         // Check the current injector. If it matches, see if it contains token.
         const tView = lView[TVIEW];
+        ngDevMode &&
+            assertTNodeForLView(
+                tView.data[injectorIndex + NodeInjectorOffset.TNODE] as TNode, lView);
         if (bloomHasToken(bloomHash, injectorIndex, tView.data)) {
           // At this point, we have an injector which *may* contain the token, so we step through
           // the providers and directives associated with the injector's corresponding node to get
@@ -399,8 +431,11 @@ export function getOrCreateInjectable<T>(
             return instance;
           }
         }
-        if (shouldSearchParent(
-                flags, lView[TVIEW].data[injectorIndex + TNODE] === hostTElementNode) &&
+        parentLocation = lView[injectorIndex + NodeInjectorOffset.PARENT];
+        if (parentLocation !== NO_PARENT_INJECTOR &&
+            shouldSearchParent(
+                flags,
+                lView[TVIEW].data[injectorIndex + NodeInjectorOffset.TNODE] === hostTElementNode) &&
             bloomHasToken(bloomHash, injectorIndex, lView)) {
           // The def wasn't found anywhere on this node, so it was a false positive.
           // Traverse up the tree and continue searching.
@@ -451,9 +486,9 @@ function searchTokensOnInjector<T>(
     injectorIndex: number, lView: LView, token: Type<T>|InjectionToken<T>,
     previousTView: TView|null, flags: InjectFlags, hostTElementNode: TNode|null) {
   const currentTView = lView[TVIEW];
-  const tNode = currentTView.data[injectorIndex + TNODE] as TNode;
+  const tNode = currentTView.data[injectorIndex + NodeInjectorOffset.TNODE] as TNode;
   // First, we need to determine if view providers can be accessed by the starting element.
-  // There are two possibities
+  // There are two possibilities
   const canAccessViewProviders = previousTView == null ?
       // 1) This is the first invocation `previousTView == null` which means that we are at the
       // `TNode` of where injector is starting to look. In such a case the only time we are allowed
@@ -469,7 +504,7 @@ function searchTokensOnInjector<T>(
       // - AND the parent TNode is an Element.
       // This means that we just came from the Component's View and therefore are allowed to see
       // into the ViewProviders.
-      (previousTView != currentTView && (tNode.type === TNodeType.Element));
+      (previousTView != currentTView && ((tNode.type & TNodeType.AnyRNode) !== 0));
 
   // This special case happens when there is a @host on the inject and when we are searching
   // on the host element node.
@@ -495,8 +530,8 @@ function searchTokensOnInjector<T>(
  * @returns Index of a found directive or provider, or null when none found.
  */
 export function locateDirectiveOrProvider<T>(
-    tNode: TNode, tView: TView, token: Type<T>|InjectionToken<T>, canAccessViewProviders: boolean,
-    isHostSpecialCase: boolean|number): number|null {
+    tNode: TNode, tView: TView, token: Type<T>|InjectionToken<T>|string,
+    canAccessViewProviders: boolean, isHostSpecialCase: boolean|number): number|null {
   const nodeProviderIndexes = tNode.providerIndexes;
   const tInjectables = tView.data;
 
@@ -510,7 +545,8 @@ export function locateDirectiveOrProvider<T>(
   // When the host special case applies, only the viewProviders and the component are visible
   const endIndex = isHostSpecialCase ? injectablesStart + cptViewProvidersCount : directiveEnd;
   for (let i = startingIndex; i < endIndex; i++) {
-    const providerTokenOrDef = tInjectables[i] as InjectionToken<any>| Type<any>| DirectiveDef<any>;
+    const providerTokenOrDef =
+        tInjectables[i] as InjectionToken<any>| Type<any>| DirectiveDef<any>| string;
     if (i < directivesStart && token === providerTokenOrDef ||
         i >= directivesStart && (providerTokenOrDef as DirectiveDef<any>).type === token) {
       return i;
@@ -543,10 +579,8 @@ export function getNodeInjectable(
     }
     const previousIncludeViewProviders = setIncludeViewProviders(factory.canSeeViewProviders);
     factory.resolving = true;
-    let previousInjectImplementation;
-    if (factory.injectImpl) {
-      previousInjectImplementation = setInjectImplementation(factory.injectImpl);
-    }
+    const previousInjectImplementation =
+        factory.injectImpl ? setInjectImplementation(factory.injectImpl) : null;
     enterDI(lView, tNode);
     try {
       value = lView[index] = factory.factory(undefined, tData, lView, tNode);
@@ -561,7 +595,8 @@ export function getNodeInjectable(
         registerPreOrderHooks(index, tData[index] as DirectiveDef<any>, tView);
       }
     } finally {
-      if (factory.injectImpl) setInjectImplementation(previousInjectImplementation);
+      previousInjectImplementation !== null &&
+          setInjectImplementation(previousInjectImplementation);
       setIncludeViewProviders(previousIncludeViewProviders);
       factory.resolving = false;
       leaveDI();
diff --git a/packages/core/src/render3/di_setup.ts b/packages/core/src/render3/di_setup.ts
index 1fe5c98b44391..0791a67c55803 100644
--- a/packages/core/src/render3/di_setup.ts
+++ b/packages/core/src/render3/di_setup.ts
@@ -19,7 +19,7 @@ import {NodeInjectorFactory} from './interfaces/injector';
 import {TContainerNode, TDirectiveHostNode, TElementContainerNode, TElementNode, TNodeProviderIndexes} from './interfaces/node';
 import {isComponentDef} from './interfaces/type_checks';
 import {DestroyHookData, LView, TData, TVIEW, TView} from './interfaces/view';
-import {getLView, getPreviousOrParentTNode, getTView} from './state';
+import {getCurrentTNode, getLView, getTView} from './state';
 
 
 
@@ -76,7 +76,7 @@ function resolveProvider(
     let token: any = isTypeProvider(provider) ? provider : resolveForwardRef(provider.provide);
     let providerFactory: () => any = providerToFactory(provider);
 
-    const tNode = getPreviousOrParentTNode();
+    const tNode = getCurrentTNode()!;
     const beginIndex = tNode.providerIndexes & TNodeProviderIndexes.ProvidersStartIndexMask;
     const endIndex = tNode.directiveStart;
     const cptViewProvidersCount =
diff --git a/packages/core/src/render3/errors.ts b/packages/core/src/render3/errors.ts
index 6373c70dade98..ad163b5447f77 100644
--- a/packages/core/src/render3/errors.ts
+++ b/packages/core/src/render3/errors.ts
@@ -22,7 +22,7 @@ export function throwCyclicDependencyError(token: any): never {
 
 /** Called when there are multiple component selectors that match a given node */
 export function throwMultipleComponentError(tNode: TNode): never {
-  throw new Error(`Multiple components match node with tagname ${tNode.tagName}`);
+  throw new Error(`Multiple components match node with tagname ${tNode.value}`);
 }
 
 export function throwMixedMultiProviderError() {
diff --git a/packages/core/src/render3/features/providers_feature.ts b/packages/core/src/render3/features/providers_feature.ts
index 4554ab8d800ef..3c75066753898 100644
--- a/packages/core/src/render3/features/providers_feature.ts
+++ b/packages/core/src/render3/features/providers_feature.ts
@@ -32,7 +32,7 @@ import {DirectiveDef} from '../interfaces/definition';
  *        ɵɵtextInterpolate(ctx.greeter.greet());
  *      }
  *    },
- *    features: [ProvidersFeature([GreeterDE])]
+ *    features: [ɵɵProvidersFeature([GreeterDE])]
  *  });
  * }
  * ```
diff --git a/packages/core/src/render3/hooks.ts b/packages/core/src/render3/hooks.ts
index 5bcf1bacc6b35..bd08fdcaabbec 100644
--- a/packages/core/src/render3/hooks.ts
+++ b/packages/core/src/render3/hooks.ts
@@ -13,7 +13,7 @@ import {NgOnChangesFeatureImpl} from './features/ng_onchanges_feature';
 import {DirectiveDef} from './interfaces/definition';
 import {TNode} from './interfaces/node';
 import {FLAGS, HookData, InitPhaseState, LView, LViewFlags, PREORDER_HOOK_FLAGS, PreOrderHookFlags, TView} from './interfaces/view';
-import {getCheckNoChangesMode} from './state';
+import {isInCheckNoChangesMode} from './state';
 
 
 
@@ -205,8 +205,8 @@ function callHooks(
     currentNodeIndex: number|null|undefined): void {
   ngDevMode &&
       assertEqual(
-          getCheckNoChangesMode(), false,
-          'Hooks should never be run in the check no changes mode.');
+          isInCheckNoChangesMode(), false,
+          'Hooks should never be run when in check no changes mode.');
   const startIndex = currentNodeIndex !== undefined ?
       (currentView[PREORDER_HOOK_FLAGS] & PreOrderHookFlags.IndexOfTheNextPreOrderHookMaskMask) :
       0;
diff --git a/packages/core/src/render3/i18n.ts b/packages/core/src/render3/i18n.ts
deleted file mode 100644
index ab8e7b4dfc7e2..0000000000000
--- a/packages/core/src/render3/i18n.ts
+++ /dev/null
@@ -1,1456 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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 '../util/ng_i18n_closure_mode';
-import '../util/ng_dev_mode';
-
-import {DEFAULT_LOCALE_ID, getPluralCase} from '../i18n/localization';
-import {getTemplateContent, SRCSET_ATTRS, URI_ATTRS, VALID_ATTRS, VALID_ELEMENTS} from '../sanitization/html_sanitizer';
-import {getInertBodyHelper} from '../sanitization/inert_body';
-import {_sanitizeUrl, sanitizeSrcset} from '../sanitization/url_sanitizer';
-import {addAllToArray} from '../util/array_utils';
-import {assertDataInRange, assertDefined, assertEqual} from '../util/assert';
-
-import {bindingUpdated} from './bindings';
-import {attachPatchData} from './context_discovery';
-import {i18nMutateOpCodesToString, i18nUpdateOpCodesToString} from './i18n_debug';
-import {setDelayProjection} from './instructions/all';
-import {allocExpando, elementAttributeInternal, elementPropertyInternal, getOrCreateTNode, setInputsForProperty, setNgReflectProperties, textBindingInternal} from './instructions/shared';
-import {LContainer, NATIVE} from './interfaces/container';
-import {getDocument} from './interfaces/document';
-import {COMMENT_MARKER, ELEMENT_MARKER, I18nMutateOpCode, I18nMutateOpCodes, I18nUpdateOpCode, I18nUpdateOpCodes, IcuType, TI18n, TIcu} from './interfaces/i18n';
-import {TElementNode, TIcuContainerNode, TNode, TNodeFlags, TNodeType, TProjectionNode} from './interfaces/node';
-import {RComment, RElement, RText} from './interfaces/renderer';
-import {SanitizerFn} from './interfaces/sanitization';
-import {isLContainer} from './interfaces/type_checks';
-import {HEADER_OFFSET, LView, RENDERER, T_HOST, TVIEW, TView} from './interfaces/view';
-import {appendChild, applyProjection, createTextNode, nativeRemoveNode} from './node_manipulation';
-import {getBindingIndex, getIsParent, getLView, getPreviousOrParentTNode, getTView, nextBindingIndex, setIsNotParent, setPreviousOrParentTNode} from './state';
-import {attachDebugGetter} from './util/debug_utils';
-import {renderStringify} from './util/misc_utils';
-import {getNativeByIndex, getNativeByTNode, getTNode, load} from './util/view_utils';
-
-
-const MARKER = `�`;
-const ICU_BLOCK_REGEXP = /^\s*(�\d+:?\d*�)\s*,\s*(select|plural)\s*,/;
-const SUBTEMPLATE_REGEXP = /�\/?\*(\d+:\d+)�/gi;
-const PH_REGEXP = /�(\/?[#*!]\d+):?\d*�/gi;
-const BINDING_REGEXP = /�(\d+):?\d*�/gi;
-const ICU_REGEXP = /({\s*�\d+:?\d*�\s*,\s*\S{6}\s*,[\s\S]*})/gi;
-const enum TagType {
-  ELEMENT = '#',
-  TEMPLATE = '*',
-  PROJECTION = '!',
-}
-
-// i18nPostprocess consts
-const ROOT_TEMPLATE_ID = 0;
-const PP_MULTI_VALUE_PLACEHOLDERS_REGEXP = /\[(�.+?�?)\]/;
-const PP_PLACEHOLDERS_REGEXP = /\[(�.+?�?)\]|(�\/?\*\d+:\d+�)/g;
-const PP_ICU_VARS_REGEXP = /({\s*)(VAR_(PLURAL|SELECT)(_\d+)?)(\s*,)/g;
-const PP_ICU_PLACEHOLDERS_REGEXP = /{([A-Z0-9_]+)}/g;
-const PP_ICUS_REGEXP = /�I18N_EXP_(ICU(_\d+)?)�/g;
-const PP_CLOSE_TEMPLATE_REGEXP = /\/\*/;
-const PP_TEMPLATE_ID_REGEXP = /\d+\:(\d+)/;
-
-// Parsed placeholder structure used in postprocessing (within `i18nPostprocess` function)
-// Contains the following fields: [templateId, isCloseTemplateTag, placeholder]
-type PostprocessPlaceholder = [number, boolean, string];
-
-interface IcuExpression {
-  type: IcuType;
-  mainBinding: number;
-  cases: string[];
-  values: (string|IcuExpression)[][];
-}
-
-interface IcuCase {
-  /**
-   * Number of slots to allocate in expando for this case.
-   *
-   * This is the max number of DOM elements which will be created by this i18n + ICU blocks. When
-   * the DOM elements are being created they are stored in the EXPANDO, so that update OpCodes can
-   * write into them.
-   */
-  vars: number;
-
-  /**
-   * An optional array of child/sub ICUs.
-   */
-  childIcus: number[];
-
-  /**
-   * A set of OpCodes to apply in order to build up the DOM render tree for the ICU
-   */
-  create: I18nMutateOpCodes;
-
-  /**
-   * A set of OpCodes to apply in order to destroy the DOM render tree for the ICU.
-   */
-  remove: I18nMutateOpCodes;
-
-  /**
-   * A set of OpCodes to apply in order to update the DOM render tree for the ICU bindings.
-   */
-  update: I18nUpdateOpCodes;
-}
-
-/**
- * Breaks pattern into strings and top level {...} blocks.
- * Can be used to break a message into text and ICU expressions, or to break an ICU expression into
- * keys and cases.
- * Original code from closure library, modified for Angular.
- *
- * @param pattern (sub)Pattern to be broken.
- *
- */
-function extractParts(pattern: string): (string|IcuExpression)[] {
-  if (!pattern) {
-    return [];
-  }
-
-  let prevPos = 0;
-  const braceStack = [];
-  const results: (string|IcuExpression)[] = [];
-  const braces = /[{}]/g;
-  // lastIndex doesn't get set to 0 so we have to.
-  braces.lastIndex = 0;
-
-  let match;
-  while (match = braces.exec(pattern)) {
-    const pos = match.index;
-    if (match[0] == '}') {
-      braceStack.pop();
-
-      if (braceStack.length == 0) {
-        // End of the block.
-        const block = pattern.substring(prevPos, pos);
-        if (ICU_BLOCK_REGEXP.test(block)) {
-          results.push(parseICUBlock(block));
-        } else {
-          results.push(block);
-        }
-
-        prevPos = pos + 1;
-      }
-    } else {
-      if (braceStack.length == 0) {
-        const substring = pattern.substring(prevPos, pos);
-        results.push(substring);
-        prevPos = pos + 1;
-      }
-      braceStack.push('{');
-    }
-  }
-
-  const substring = pattern.substring(prevPos);
-  results.push(substring);
-  return results;
-}
-
-/**
- * Parses text containing an ICU expression and produces a JSON object for it.
- * Original code from closure library, modified for Angular.
- *
- * @param pattern Text containing an ICU expression that needs to be parsed.
- *
- */
-function parseICUBlock(pattern: string): IcuExpression {
-  const cases = [];
-  const values: (string|IcuExpression)[][] = [];
-  let icuType = IcuType.plural;
-  let mainBinding = 0;
-  pattern = pattern.replace(ICU_BLOCK_REGEXP, function(str: string, binding: string, type: string) {
-    if (type === 'select') {
-      icuType = IcuType.select;
-    } else {
-      icuType = IcuType.plural;
-    }
-    mainBinding = parseInt(binding.substr(1), 10);
-    return '';
-  });
-
-  const parts = extractParts(pattern) as string[];
-  // Looking for (key block)+ sequence. One of the keys has to be "other".
-  for (let pos = 0; pos < parts.length;) {
-    let key = parts[pos++].trim();
-    if (icuType === IcuType.plural) {
-      // Key can be "=x", we just want "x"
-      key = key.replace(/\s*(?:=)?(\w+)\s*/, '$1');
-    }
-    if (key.length) {
-      cases.push(key);
-    }
-
-    const blocks = extractParts(parts[pos++]) as string[];
-    if (cases.length > values.length) {
-      values.push(blocks);
-    }
-  }
-
-  // TODO(ocombe): support ICU expressions in attributes, see #21615
-  return {type: icuType, mainBinding: mainBinding, cases, values};
-}
-
-/**
- * Removes everything inside the sub-templates of a message.
- */
-function removeInnerTemplateTranslation(message: string): string {
-  let match;
-  let res = '';
-  let index = 0;
-  let inTemplate = false;
-  let tagMatched;
-
-  while ((match = SUBTEMPLATE_REGEXP.exec(message)) !== null) {
-    if (!inTemplate) {
-      res += message.substring(index, match.index + match[0].length);
-      tagMatched = match[1];
-      inTemplate = true;
-    } else {
-      if (match[0] === `${MARKER}/*${tagMatched}${MARKER}`) {
-        index = match.index;
-        inTemplate = false;
-      }
-    }
-  }
-
-  ngDevMode &&
-      assertEqual(
-          inTemplate, false,
-          `Tag mismatch: unable to find the end of the sub-template in the translation "${
-              message}"`);
-
-  res += message.substr(index);
-  return res;
-}
-
-/**
- * Extracts a part of a message and removes the rest.
- *
- * This method is used for extracting a part of the message associated with a template. A translated
- * message can span multiple templates.
- *
- * Example:
- * ```
- * <div i18n>Translate <span *ngIf>me</span>!</div>
- * ```
- *
- * @param message The message to crop
- * @param subTemplateIndex Index of the sub-template to extract. If undefined it returns the
- * external template and removes all sub-templates.
- */
-export function getTranslationForTemplate(message: string, subTemplateIndex?: number) {
-  if (isRootTemplateMessage(subTemplateIndex)) {
-    // We want the root template message, ignore all sub-templates
-    return removeInnerTemplateTranslation(message);
-  } else {
-    // We want a specific sub-template
-    const start =
-        message.indexOf(`:${subTemplateIndex}${MARKER}`) + 2 + subTemplateIndex.toString().length;
-    const end = message.search(new RegExp(`${MARKER}\\/\\*\\d+:${subTemplateIndex}${MARKER}`));
-    return removeInnerTemplateTranslation(message.substring(start, end));
-  }
-}
-
-/**
- * Generate the OpCodes to update the bindings of a string.
- *
- * @param str The string containing the bindings.
- * @param destinationNode Index of the destination node which will receive the binding.
- * @param attrName Name of the attribute, if the string belongs to an attribute.
- * @param sanitizeFn Sanitization function used to sanitize the string after update, if necessary.
- */
-function generateBindingUpdateOpCodes(
-    str: string, destinationNode: number, attrName?: string,
-    sanitizeFn: SanitizerFn|null = null): I18nUpdateOpCodes {
-  const updateOpCodes: I18nUpdateOpCodes = [null, null];  // Alloc space for mask and size
-  if (ngDevMode) {
-    attachDebugGetter(updateOpCodes, i18nUpdateOpCodesToString);
-  }
-  const textParts = str.split(BINDING_REGEXP);
-  let mask = 0;
-
-  for (let j = 0; j < textParts.length; j++) {
-    const textValue = textParts[j];
-
-    if (j & 1) {
-      // Odd indexes are bindings
-      const bindingIndex = parseInt(textValue, 10);
-      updateOpCodes.push(-1 - bindingIndex);
-      mask = mask | toMaskBit(bindingIndex);
-    } else if (textValue !== '') {
-      // Even indexes are text
-      updateOpCodes.push(textValue);
-    }
-  }
-
-  updateOpCodes.push(
-      destinationNode << I18nUpdateOpCode.SHIFT_REF |
-      (attrName ? I18nUpdateOpCode.Attr : I18nUpdateOpCode.Text));
-  if (attrName) {
-    updateOpCodes.push(attrName, sanitizeFn);
-  }
-  updateOpCodes[0] = mask;
-  updateOpCodes[1] = updateOpCodes.length - 2;
-  return updateOpCodes;
-}
-
-function getBindingMask(icuExpression: IcuExpression, mask = 0): number {
-  mask = mask | toMaskBit(icuExpression.mainBinding);
-  let match;
-  for (let i = 0; i < icuExpression.values.length; i++) {
-    const valueArr = icuExpression.values[i];
-    for (let j = 0; j < valueArr.length; j++) {
-      const value = valueArr[j];
-      if (typeof value === 'string') {
-        while (match = BINDING_REGEXP.exec(value)) {
-          mask = mask | toMaskBit(parseInt(match[1], 10));
-        }
-      } else {
-        mask = getBindingMask(value as IcuExpression, mask);
-      }
-    }
-  }
-  return mask;
-}
-
-const i18nIndexStack: number[] = [];
-let i18nIndexStackPointer = -1;
-
-/**
- * Convert binding index to mask bit.
- *
- * Each index represents a single bit on the bit-mask. Because bit-mask only has 32 bits, we make
- * the 32nd bit share all masks for all bindings higher than 32. Since it is extremely rare to have
- * more than 32 bindings this will be hit very rarely. The downside of hitting this corner case is
- * that we will execute binding code more often than necessary. (penalty of performance)
- */
-function toMaskBit(bindingIndex: number): number {
-  return 1 << Math.min(bindingIndex, 31);
-}
-
-const parentIndexStack: number[] = [];
-
-/**
- * Marks a block of text as translatable.
- *
- * The instructions `i18nStart` and `i18nEnd` mark the translation block in the template.
- * The translation `message` is the value which is locale specific. The translation string may
- * contain placeholders which associate inner elements and sub-templates within the translation.
- *
- * The translation `message` placeholders are:
- * - `�{index}(:{block})�`: *Binding Placeholder*: Marks a location where an expression will be
- *   interpolated into. The placeholder `index` points to the expression binding index. An optional
- *   `block` that matches the sub-template in which it was declared.
- * - `�#{index}(:{block})�`/`�/#{index}(:{block})�`: *Element Placeholder*:  Marks the beginning
- *   and end of DOM element that were embedded in the original translation block. The placeholder
- *   `index` points to the element index in the template instructions set. An optional `block` that
- *   matches the sub-template in which it was declared.
- * - `�!{index}(:{block})�`/`�/!{index}(:{block})�`: *Projection Placeholder*:  Marks the
- *   beginning and end of <ng-content> that was embedded in the original translation block.
- *   The placeholder `index` points to the element index in the template instructions set.
- *   An optional `block` that matches the sub-template in which it was declared.
- * - `�*{index}:{block}�`/`�/*{index}:{block}�`: *Sub-template Placeholder*: Sub-templates must be
- *   split up and translated separately in each angular template function. The `index` points to the
- *   `template` instruction index. A `block` that matches the sub-template in which it was declared.
- *
- * @param index A unique index of the translation in the static block.
- * @param message The translation message.
- * @param subTemplateIndex Optional sub-template index in the `message`.
- *
- * @codeGenApi
- */
-export function ɵɵi18nStart(index: number, message: string, subTemplateIndex?: number): void {
-  const tView = getTView();
-  ngDevMode && assertDefined(tView, `tView should be defined`);
-  i18nIndexStack[++i18nIndexStackPointer] = index;
-  // We need to delay projections until `i18nEnd`
-  setDelayProjection(true);
-  if (tView.firstCreatePass && tView.data[index + HEADER_OFFSET] === null) {
-    i18nStartFirstPass(getLView(), tView, index, message, subTemplateIndex);
-  }
-}
-
-// Count for the number of vars that will be allocated for each i18n block.
-// It is global because this is used in multiple functions that include loops and recursive calls.
-// This is reset to 0 when `i18nStartFirstPass` is called.
-let i18nVarsCount: number;
-
-function allocNodeIndex(startIndex: number): number {
-  return startIndex + i18nVarsCount++;
-}
-
-/**
- * See `i18nStart` above.
- */
-function i18nStartFirstPass(
-    lView: LView, tView: TView, index: number, message: string, subTemplateIndex?: number) {
-  const startIndex = tView.blueprint.length - HEADER_OFFSET;
-  i18nVarsCount = 0;
-  const previousOrParentTNode = getPreviousOrParentTNode();
-  const parentTNode =
-      getIsParent() ? previousOrParentTNode : previousOrParentTNode && previousOrParentTNode.parent;
-  let parentIndex =
-      parentTNode && parentTNode !== lView[T_HOST] ? parentTNode.index - HEADER_OFFSET : index;
-  let parentIndexPointer = 0;
-  parentIndexStack[parentIndexPointer] = parentIndex;
-  const createOpCodes: I18nMutateOpCodes = [];
-  if (ngDevMode) {
-    attachDebugGetter(createOpCodes, i18nMutateOpCodesToString);
-  }
-  // If the previous node wasn't the direct parent then we have a translation without top level
-  // element and we need to keep a reference of the previous element if there is one. We should also
-  // keep track whether an element was a parent node or not, so that the logic that consumes
-  // the generated `I18nMutateOpCode`s can leverage this information to properly set TNode state
-  // (whether it's a parent or sibling).
-  if (index > 0 && previousOrParentTNode !== parentTNode) {
-    let previousTNodeIndex = previousOrParentTNode.index - HEADER_OFFSET;
-    // If current TNode is a sibling node, encode it using a negative index. This information is
-    // required when the `Select` action is processed (see the `readCreateOpCodes` function).
-    if (!getIsParent()) {
-      previousTNodeIndex = ~previousTNodeIndex;
-    }
-    // Create an OpCode to select the previous TNode
-    createOpCodes.push(previousTNodeIndex << I18nMutateOpCode.SHIFT_REF | I18nMutateOpCode.Select);
-  }
-  const updateOpCodes: I18nUpdateOpCodes = [];
-  if (ngDevMode) {
-    attachDebugGetter(updateOpCodes, i18nUpdateOpCodesToString);
-  }
-  const icuExpressions: TIcu[] = [];
-
-  if (message === '' && isRootTemplateMessage(subTemplateIndex)) {
-    // If top level translation is an empty string, do not invoke additional processing
-    // and just create op codes for empty text node instead.
-    createOpCodes.push(
-        message, allocNodeIndex(startIndex),
-        parentIndex << I18nMutateOpCode.SHIFT_PARENT | I18nMutateOpCode.AppendChild);
-  } else {
-    const templateTranslation = getTranslationForTemplate(message, subTemplateIndex);
-    const msgParts = replaceNgsp(templateTranslation).split(PH_REGEXP);
-    for (let i = 0; i < msgParts.length; i++) {
-      let value = msgParts[i];
-      if (i & 1) {
-        // Odd indexes are placeholders (elements and sub-templates)
-        if (value.charAt(0) === '/') {
-          // It is a closing tag
-          if (value.charAt(1) === TagType.ELEMENT) {
-            const phIndex = parseInt(value.substr(2), 10);
-            parentIndex = parentIndexStack[--parentIndexPointer];
-            createOpCodes.push(phIndex << I18nMutateOpCode.SHIFT_REF | I18nMutateOpCode.ElementEnd);
-          }
-        } else {
-          const phIndex = parseInt(value.substr(1), 10);
-          const isElement = value.charAt(0) === TagType.ELEMENT;
-          // The value represents a placeholder that we move to the designated index.
-          // Note: positive indicies indicate that a TNode with a given index should also be marked
-          // as parent while executing `Select` instruction.
-          createOpCodes.push(
-              (isElement ? phIndex : ~phIndex) << I18nMutateOpCode.SHIFT_REF |
-                  I18nMutateOpCode.Select,
-              parentIndex << I18nMutateOpCode.SHIFT_PARENT | I18nMutateOpCode.AppendChild);
-
-          if (isElement) {
-            parentIndexStack[++parentIndexPointer] = parentIndex = phIndex;
-          }
-        }
-      } else {
-        // Even indexes are text (including bindings & ICU expressions)
-        const parts = extractParts(value);
-        for (let j = 0; j < parts.length; j++) {
-          if (j & 1) {
-            // Odd indexes are ICU expressions
-            const icuExpression = parts[j] as IcuExpression;
-
-            // Verify that ICU expression has the right shape. Translations might contain invalid
-            // constructions (while original messages were correct), so ICU parsing at runtime may
-            // not succeed (thus `icuExpression` remains a string).
-            if (typeof icuExpression !== 'object') {
-              throw new Error(
-                  `Unable to parse ICU expression in "${templateTranslation}" message.`);
-            }
-
-            // Create the comment node that will anchor the ICU expression
-            const icuNodeIndex = allocNodeIndex(startIndex);
-            createOpCodes.push(
-                COMMENT_MARKER, ngDevMode ? `ICU ${icuNodeIndex}` : '', icuNodeIndex,
-                parentIndex << I18nMutateOpCode.SHIFT_PARENT | I18nMutateOpCode.AppendChild);
-
-            // Update codes for the ICU expression
-            const mask = getBindingMask(icuExpression);
-            icuStart(icuExpressions, icuExpression, icuNodeIndex, icuNodeIndex);
-            // Since this is recursive, the last TIcu that was pushed is the one we want
-            const tIcuIndex = icuExpressions.length - 1;
-            updateOpCodes.push(
-                toMaskBit(icuExpression.mainBinding),  // mask of the main binding
-                3,                                     // skip 3 opCodes if not changed
-                -1 - icuExpression.mainBinding,
-                icuNodeIndex << I18nUpdateOpCode.SHIFT_REF | I18nUpdateOpCode.IcuSwitch, tIcuIndex,
-                mask,  // mask of all the bindings of this ICU expression
-                2,     // skip 2 opCodes if not changed
-                icuNodeIndex << I18nUpdateOpCode.SHIFT_REF | I18nUpdateOpCode.IcuUpdate, tIcuIndex);
-          } else if (parts[j] !== '') {
-            const text = parts[j] as string;
-            // Even indexes are text (including bindings)
-            const hasBinding = text.match(BINDING_REGEXP);
-            // Create text nodes
-            const textNodeIndex = allocNodeIndex(startIndex);
-            createOpCodes.push(
-                // If there is a binding, the value will be set during update
-                hasBinding ? '' : text, textNodeIndex,
-                parentIndex << I18nMutateOpCode.SHIFT_PARENT | I18nMutateOpCode.AppendChild);
-
-            if (hasBinding) {
-              addAllToArray(generateBindingUpdateOpCodes(text, textNodeIndex), updateOpCodes);
-            }
-          }
-        }
-      }
-    }
-  }
-
-  if (i18nVarsCount > 0) {
-    allocExpando(tView, lView, i18nVarsCount);
-  }
-
-  // NOTE: local var needed to properly assert the type of `TI18n`.
-  const tI18n: TI18n = {
-    vars: i18nVarsCount,
-    create: createOpCodes,
-    update: updateOpCodes,
-    icus: icuExpressions.length ? icuExpressions : null,
-  };
-
-  tView.data[index + HEADER_OFFSET] = tI18n;
-}
-
-function appendI18nNode(
-    tView: TView, tNode: TNode, parentTNode: TNode, previousTNode: TNode|null,
-    lView: LView): TNode {
-  ngDevMode && ngDevMode.rendererMoveNode++;
-  const nextNode = tNode.next;
-  if (!previousTNode) {
-    previousTNode = parentTNode;
-  }
-
-  // Re-organize node tree to put this node in the correct position.
-  if (previousTNode === parentTNode && tNode !== parentTNode.child) {
-    tNode.next = parentTNode.child;
-    parentTNode.child = tNode;
-  } else if (previousTNode !== parentTNode && tNode !== previousTNode.next) {
-    tNode.next = previousTNode.next;
-    previousTNode.next = tNode;
-  } else {
-    tNode.next = null;
-  }
-
-  if (parentTNode !== lView[T_HOST]) {
-    tNode.parent = parentTNode as TElementNode;
-  }
-
-  // If tNode was moved around, we might need to fix a broken link.
-  let cursor: TNode|null = tNode.next;
-  while (cursor) {
-    if (cursor.next === tNode) {
-      cursor.next = nextNode;
-    }
-    cursor = cursor.next;
-  }
-
-  // If the placeholder to append is a projection, we need to move the projected nodes instead
-  if (tNode.type === TNodeType.Projection) {
-    applyProjection(tView, lView, tNode as TProjectionNode);
-    return tNode;
-  }
-
-  appendChild(tView, lView, getNativeByTNode(tNode, lView), tNode);
-
-  const slotValue = lView[tNode.index];
-  if (tNode.type !== TNodeType.Container && isLContainer(slotValue)) {
-    // Nodes that inject ViewContainerRef also have a comment node that should be moved
-    appendChild(tView, lView, slotValue[NATIVE], tNode);
-  }
-  return tNode;
-}
-
-function isRootTemplateMessage(subTemplateIndex: number|undefined): subTemplateIndex is undefined {
-  return subTemplateIndex === undefined;
-}
-
-/**
- * Handles message string post-processing for internationalization.
- *
- * Handles message string post-processing by transforming it from intermediate
- * format (that might contain some markers that we need to replace) to the final
- * form, consumable by i18nStart instruction. Post processing steps include:
- *
- * 1. Resolve all multi-value cases (like [�*1:1��#2:1�|�#4:1�|�5�])
- * 2. Replace all ICU vars (like "VAR_PLURAL")
- * 3. Replace all placeholders used inside ICUs in a form of {PLACEHOLDER}
- * 4. Replace all ICU references with corresponding values (like �ICU_EXP_ICU_1�)
- *    in case multiple ICUs have the same placeholder name
- *
- * @param message Raw translation string for post processing
- * @param replacements Set of replacements that should be applied
- *
- * @returns Transformed string that can be consumed by i18nStart instruction
- *
- * @codeGenApi
- */
-export function ɵɵi18nPostprocess(
-    message: string, replacements: {[key: string]: (string|string[])} = {}): string {
-  /**
-   * Step 1: resolve all multi-value placeholders like [�#5�|�*1:1��#2:1�|�#4:1�]
-   *
-   * Note: due to the way we process nested templates (BFS), multi-value placeholders are typically
-   * grouped by templates, for example: [�#5�|�#6�|�#1:1�|�#3:2�] where �#5� and �#6� belong to root
-   * template, �#1:1� belong to nested template with index 1 and �#1:2� - nested template with index
-   * 3. However in real templates the order might be different: i.e. �#1:1� and/or �#3:2� may go in
-   * front of �#6�. The post processing step restores the right order by keeping track of the
-   * template id stack and looks for placeholders that belong to the currently active template.
-   */
-  let result: string = message;
-  if (PP_MULTI_VALUE_PLACEHOLDERS_REGEXP.test(message)) {
-    const matches: {[key: string]: PostprocessPlaceholder[]} = {};
-    const templateIdsStack: number[] = [ROOT_TEMPLATE_ID];
-    result = result.replace(PP_PLACEHOLDERS_REGEXP, (m: any, phs: string, tmpl: string): string => {
-      const content = phs || tmpl;
-      const placeholders: PostprocessPlaceholder[] = matches[content] || [];
-      if (!placeholders.length) {
-        content.split('|').forEach((placeholder: string) => {
-          const match = placeholder.match(PP_TEMPLATE_ID_REGEXP);
-          const templateId = match ? parseInt(match[1], 10) : ROOT_TEMPLATE_ID;
-          const isCloseTemplateTag = PP_CLOSE_TEMPLATE_REGEXP.test(placeholder);
-          placeholders.push([templateId, isCloseTemplateTag, placeholder]);
-        });
-        matches[content] = placeholders;
-      }
-
-      if (!placeholders.length) {
-        throw new Error(`i18n postprocess: unmatched placeholder - ${content}`);
-      }
-
-      const currentTemplateId = templateIdsStack[templateIdsStack.length - 1];
-      let idx = 0;
-      // find placeholder index that matches current template id
-      for (let i = 0; i < placeholders.length; i++) {
-        if (placeholders[i][0] === currentTemplateId) {
-          idx = i;
-          break;
-        }
-      }
-      // update template id stack based on the current tag extracted
-      const [templateId, isCloseTemplateTag, placeholder] = placeholders[idx];
-      if (isCloseTemplateTag) {
-        templateIdsStack.pop();
-      } else if (currentTemplateId !== templateId) {
-        templateIdsStack.push(templateId);
-      }
-      // remove processed tag from the list
-      placeholders.splice(idx, 1);
-      return placeholder;
-    });
-  }
-
-  // return current result if no replacements specified
-  if (!Object.keys(replacements).length) {
-    return result;
-  }
-
-  /**
-   * Step 2: replace all ICU vars (like "VAR_PLURAL")
-   */
-  result = result.replace(PP_ICU_VARS_REGEXP, (match, start, key, _type, _idx, end): string => {
-    return replacements.hasOwnProperty(key) ? `${start}${replacements[key]}${end}` : match;
-  });
-
-  /**
-   * Step 3: replace all placeholders used inside ICUs in a form of {PLACEHOLDER}
-   */
-  result = result.replace(PP_ICU_PLACEHOLDERS_REGEXP, (match, key): string => {
-    return replacements.hasOwnProperty(key) ? replacements[key] as string : match;
-  });
-
-  /**
-   * Step 4: replace all ICU references with corresponding values (like �ICU_EXP_ICU_1�) in case
-   * multiple ICUs have the same placeholder name
-   */
-  result = result.replace(PP_ICUS_REGEXP, (match, key): string => {
-    if (replacements.hasOwnProperty(key)) {
-      const list = replacements[key] as string[];
-      if (!list.length) {
-        throw new Error(`i18n postprocess: unmatched ICU - ${match} with key: ${key}`);
-      }
-      return list.shift()!;
-    }
-    return match;
-  });
-
-  return result;
-}
-
-/**
- * Translates a translation block marked by `i18nStart` and `i18nEnd`. It inserts the text/ICU nodes
- * into the render tree, moves the placeholder nodes and removes the deleted nodes.
- *
- * @codeGenApi
- */
-export function ɵɵi18nEnd(): void {
-  const lView = getLView();
-  const tView = getTView();
-  ngDevMode && assertDefined(tView, `tView should be defined`);
-  i18nEndFirstPass(tView, lView);
-  // Stop delaying projections
-  setDelayProjection(false);
-}
-
-/**
- * See `i18nEnd` above.
- */
-function i18nEndFirstPass(tView: TView, lView: LView) {
-  ngDevMode &&
-      assertEqual(
-          getBindingIndex(), tView.bindingStartIndex,
-          'i18nEnd should be called before any binding');
-
-  const rootIndex = i18nIndexStack[i18nIndexStackPointer--];
-  const tI18n = tView.data[rootIndex + HEADER_OFFSET] as TI18n;
-  ngDevMode && assertDefined(tI18n, `You should call i18nStart before i18nEnd`);
-
-  // Find the last node that was added before `i18nEnd`
-  const lastCreatedNode = getPreviousOrParentTNode();
-
-  // Read the instructions to insert/move/remove DOM elements
-  const visitedNodes = readCreateOpCodes(rootIndex, tI18n.create, tView, lView);
-
-  // Remove deleted nodes
-  let index = rootIndex + 1;
-  while (index <= lastCreatedNode.index - HEADER_OFFSET) {
-    if (visitedNodes.indexOf(index) === -1) {
-      removeNode(tView, lView, index, /* markAsDetached */ true);
-    }
-    // Check if an element has any local refs and skip them
-    const tNode = getTNode(tView, index);
-    if (tNode &&
-        (tNode.type === TNodeType.Container || tNode.type === TNodeType.Element ||
-         tNode.type === TNodeType.ElementContainer) &&
-        tNode.localNames !== null) {
-      // Divide by 2 to get the number of local refs,
-      // since they are stored as an array that also includes directive indexes,
-      // i.e. ["localRef", directiveIndex, ...]
-      index += tNode.localNames.length >> 1;
-    }
-    index++;
-  }
-}
-
-/**
- * Creates and stores the dynamic TNode, and unhooks it from the tree for now.
- */
-function createDynamicNodeAtIndex(
-    tView: TView, lView: LView, index: number, type: TNodeType, native: RElement|RText|null,
-    name: string|null): TElementNode|TIcuContainerNode {
-  const previousOrParentTNode = getPreviousOrParentTNode();
-  ngDevMode && assertDataInRange(lView, index + HEADER_OFFSET);
-  lView[index + HEADER_OFFSET] = native;
-  // FIXME(misko): Why does this create A TNode??? I would not expect this to be here.
-  const tNode = getOrCreateTNode(tView, lView[T_HOST], index, type as any, name, null);
-
-  // We are creating a dynamic node, the previous tNode might not be pointing at this node.
-  // We will link ourselves into the tree later with `appendI18nNode`.
-  if (previousOrParentTNode && previousOrParentTNode.next === tNode) {
-    previousOrParentTNode.next = null;
-  }
-
-  return tNode;
-}
-
-function readCreateOpCodes(
-    index: number, createOpCodes: I18nMutateOpCodes, tView: TView, lView: LView): number[] {
-  const renderer = lView[RENDERER];
-  let currentTNode: TNode|null = null;
-  let previousTNode: TNode|null = null;
-  const visitedNodes: number[] = [];
-  for (let i = 0; i < createOpCodes.length; i++) {
-    const opCode = createOpCodes[i];
-    if (typeof opCode == 'string') {
-      const textRNode = createTextNode(opCode, renderer);
-      const textNodeIndex = createOpCodes[++i] as number;
-      ngDevMode && ngDevMode.rendererCreateTextNode++;
-      previousTNode = currentTNode;
-      currentTNode =
-          createDynamicNodeAtIndex(tView, lView, textNodeIndex, TNodeType.Element, textRNode, null);
-      visitedNodes.push(textNodeIndex);
-      setIsNotParent();
-    } else if (typeof opCode == 'number') {
-      switch (opCode & I18nMutateOpCode.MASK_INSTRUCTION) {
-        case I18nMutateOpCode.AppendChild:
-          const destinationNodeIndex = opCode >>> I18nMutateOpCode.SHIFT_PARENT;
-          let destinationTNode: TNode;
-          if (destinationNodeIndex === index) {
-            // If the destination node is `i18nStart`, we don't have a
-            // top-level node and we should use the host node instead
-            destinationTNode = lView[T_HOST]!;
-          } else {
-            destinationTNode = getTNode(tView, destinationNodeIndex);
-          }
-          ngDevMode &&
-              assertDefined(
-                  currentTNode!,
-                  `You need to create or select a node before you can insert it into the DOM`);
-          previousTNode =
-              appendI18nNode(tView, currentTNode!, destinationTNode, previousTNode, lView);
-          break;
-        case I18nMutateOpCode.Select:
-          // Negative indices indicate that a given TNode is a sibling node, not a parent node
-          // (see `i18nStartFirstPass` for additional information).
-          const isParent = opCode >= 0;
-          // FIXME(misko): This SHIFT_REF looks suspect as it does not have mask.
-          const nodeIndex = (isParent ? opCode : ~opCode) >>> I18nMutateOpCode.SHIFT_REF;
-          visitedNodes.push(nodeIndex);
-          previousTNode = currentTNode;
-          currentTNode = getTNode(tView, nodeIndex);
-          if (currentTNode) {
-            setPreviousOrParentTNode(currentTNode, isParent);
-          }
-          break;
-        case I18nMutateOpCode.ElementEnd:
-          const elementIndex = opCode >>> I18nMutateOpCode.SHIFT_REF;
-          previousTNode = currentTNode = getTNode(tView, elementIndex);
-          setPreviousOrParentTNode(currentTNode, false);
-          break;
-        case I18nMutateOpCode.Attr:
-          const elementNodeIndex = opCode >>> I18nMutateOpCode.SHIFT_REF;
-          const attrName = createOpCodes[++i] as string;
-          const attrValue = createOpCodes[++i] as string;
-          // This code is used for ICU expressions only, since we don't support
-          // directives/components in ICUs, we don't need to worry about inputs here
-          elementAttributeInternal(
-              getTNode(tView, elementNodeIndex), lView, attrName, attrValue, null, null);
-          break;
-        default:
-          throw new Error(`Unable to determine the type of mutate operation for "${opCode}"`);
-      }
-    } else {
-      switch (opCode) {
-        case COMMENT_MARKER:
-          const commentValue = createOpCodes[++i] as string;
-          const commentNodeIndex = createOpCodes[++i] as number;
-          ngDevMode &&
-              assertEqual(
-                  typeof commentValue, 'string',
-                  `Expected "${commentValue}" to be a comment node value`);
-          const commentRNode = renderer.createComment(commentValue);
-          ngDevMode && ngDevMode.rendererCreateComment++;
-          previousTNode = currentTNode;
-          currentTNode = createDynamicNodeAtIndex(
-              tView, lView, commentNodeIndex, TNodeType.IcuContainer, commentRNode, null);
-          visitedNodes.push(commentNodeIndex);
-          attachPatchData(commentRNode, lView);
-          (currentTNode as TIcuContainerNode).activeCaseIndex = null;
-          // We will add the case nodes later, during the update phase
-          setIsNotParent();
-          break;
-        case ELEMENT_MARKER:
-          const tagNameValue = createOpCodes[++i] as string;
-          const elementNodeIndex = createOpCodes[++i] as number;
-          ngDevMode &&
-              assertEqual(
-                  typeof tagNameValue, 'string',
-                  `Expected "${tagNameValue}" to be an element node tag name`);
-          const elementRNode = renderer.createElement(tagNameValue);
-          ngDevMode && ngDevMode.rendererCreateElement++;
-          previousTNode = currentTNode;
-          currentTNode = createDynamicNodeAtIndex(
-              tView, lView, elementNodeIndex, TNodeType.Element, elementRNode, tagNameValue);
-          visitedNodes.push(elementNodeIndex);
-          break;
-        default:
-          throw new Error(`Unable to determine the type of mutate operation for "${opCode}"`);
-      }
-    }
-  }
-
-  setIsNotParent();
-
-  return visitedNodes;
-}
-
-function readUpdateOpCodes(
-    updateOpCodes: I18nUpdateOpCodes, icus: TIcu[]|null, bindingsStartIndex: number,
-    changeMask: number, tView: TView, lView: LView, bypassCheckBit: boolean) {
-  let caseCreated = false;
-  for (let i = 0; i < updateOpCodes.length; i++) {
-    // bit code to check if we should apply the next update
-    const checkBit = updateOpCodes[i] as number;
-    // Number of opCodes to skip until next set of update codes
-    const skipCodes = updateOpCodes[++i] as number;
-    if (bypassCheckBit || (checkBit & changeMask)) {
-      // The value has been updated since last checked
-      let value = '';
-      for (let j = i + 1; j <= (i + skipCodes); j++) {
-        const opCode = updateOpCodes[j];
-        if (typeof opCode == 'string') {
-          value += opCode;
-        } else if (typeof opCode == 'number') {
-          if (opCode < 0) {
-            // Negative opCode represent `i18nExp` values offset.
-            value += renderStringify(lView[bindingsStartIndex - opCode]);
-          } else {
-            const nodeIndex = opCode >>> I18nUpdateOpCode.SHIFT_REF;
-            switch (opCode & I18nUpdateOpCode.MASK_OPCODE) {
-              case I18nUpdateOpCode.Attr:
-                const propName = updateOpCodes[++j] as string;
-                const sanitizeFn = updateOpCodes[++j] as SanitizerFn | null;
-                elementPropertyInternal(
-                    tView, getTNode(tView, nodeIndex), lView, propName, value, lView[RENDERER],
-                    sanitizeFn, false);
-                break;
-              case I18nUpdateOpCode.Text:
-                textBindingInternal(lView, nodeIndex, value);
-                break;
-              case I18nUpdateOpCode.IcuSwitch:
-                caseCreated = icuSwitchCase(
-                    tView, updateOpCodes[++j] as number, nodeIndex, icus!, lView, value);
-                break;
-              case I18nUpdateOpCode.IcuUpdate:
-                icuUpdateCase(
-                    tView, lView, updateOpCodes[++j] as number, nodeIndex, bindingsStartIndex,
-                    icus!, caseCreated);
-                break;
-            }
-          }
-        }
-      }
-    }
-    i += skipCodes;
-  }
-}
-
-function icuUpdateCase(
-    tView: TView, lView: LView, tIcuIndex: number, nodeIndex: number, bindingsStartIndex: number,
-    tIcus: TIcu[], caseCreated: boolean) {
-  const tIcu = tIcus[tIcuIndex];
-  const icuTNode = getTNode(tView, nodeIndex) as TIcuContainerNode;
-  if (icuTNode.activeCaseIndex !== null) {
-    readUpdateOpCodes(
-        tIcu.update[icuTNode.activeCaseIndex], tIcus, bindingsStartIndex, changeMask, tView, lView,
-        caseCreated);
-  }
-}
-
-function icuSwitchCase(
-    tView: TView, tIcuIndex: number, nodeIndex: number, tIcus: TIcu[], lView: LView,
-    value: string): boolean {
-  const tIcu = tIcus[tIcuIndex];
-  const icuTNode = getTNode(tView, nodeIndex) as TIcuContainerNode;
-  let caseCreated = false;
-  // If there is an active case, delete the old nodes
-  if (icuTNode.activeCaseIndex !== null) {
-    const removeCodes = tIcu.remove[icuTNode.activeCaseIndex];
-    for (let k = 0; k < removeCodes.length; k++) {
-      const removeOpCode = removeCodes[k] as number;
-      const nodeOrIcuIndex = removeOpCode >>> I18nMutateOpCode.SHIFT_REF;
-      switch (removeOpCode & I18nMutateOpCode.MASK_INSTRUCTION) {
-        case I18nMutateOpCode.Remove:
-          // Remove DOM element, but do *not* mark TNode as detached, since we are
-          // just switching ICU cases (while keeping the same TNode), so a DOM element
-          // representing a new ICU case will be re-created.
-          removeNode(tView, lView, nodeOrIcuIndex, /* markAsDetached */ false);
-          break;
-        case I18nMutateOpCode.RemoveNestedIcu:
-          removeNestedIcu(
-              tView, tIcus, removeCodes, nodeOrIcuIndex,
-              removeCodes[k + 1] as number >>> I18nMutateOpCode.SHIFT_REF);
-          break;
-      }
-    }
-  }
-
-  // Update the active caseIndex
-  const caseIndex = getCaseIndex(tIcu, value);
-  icuTNode.activeCaseIndex = caseIndex !== -1 ? caseIndex : null;
-  if (caseIndex > -1) {
-    // Add the nodes for the new case
-    readCreateOpCodes(
-        -1 /* -1 means we don't have parent node */, tIcu.create[caseIndex], tView, lView);
-    caseCreated = true;
-  }
-  return caseCreated;
-}
-
-function removeNestedIcu(
-    tView: TView, tIcus: TIcu[], removeCodes: I18nMutateOpCodes, nodeIndex: number,
-    nestedIcuNodeIndex: number) {
-  const nestedIcuTNode = getTNode(tView, nestedIcuNodeIndex) as TIcuContainerNode;
-  const activeIndex = nestedIcuTNode.activeCaseIndex;
-  if (activeIndex !== null) {
-    const nestedTIcu = tIcus[nodeIndex];
-    // FIXME(misko): the fact that we are adding items to parent list looks very suspect!
-    addAllToArray(nestedTIcu.remove[activeIndex], removeCodes);
-  }
-}
-
-function removeNode(tView: TView, lView: LView, index: number, markAsDetached: boolean) {
-  const removedPhTNode = getTNode(tView, index);
-  const removedPhRNode = getNativeByIndex(index, lView);
-  if (removedPhRNode) {
-    nativeRemoveNode(lView[RENDERER], removedPhRNode);
-  }
-
-  const slotValue = load(lView, index) as RElement | RComment | LContainer;
-  if (isLContainer(slotValue)) {
-    const lContainer = slotValue as LContainer;
-    if (removedPhTNode.type !== TNodeType.Container) {
-      nativeRemoveNode(lView[RENDERER], lContainer[NATIVE]);
-    }
-  }
-
-  if (markAsDetached) {
-    // Define this node as detached to avoid projecting it later
-    removedPhTNode.flags |= TNodeFlags.isDetached;
-  }
-  ngDevMode && ngDevMode.rendererRemoveNode++;
-}
-
-/**
- *
- * Use this instruction to create a translation block that doesn't contain any placeholder.
- * It calls both {@link i18nStart} and {@link i18nEnd} in one instruction.
- *
- * The translation `message` is the value which is locale specific. The translation string may
- * contain placeholders which associate inner elements and sub-templates within the translation.
- *
- * The translation `message` placeholders are:
- * - `�{index}(:{block})�`: *Binding Placeholder*: Marks a location where an expression will be
- *   interpolated into. The placeholder `index` points to the expression binding index. An optional
- *   `block` that matches the sub-template in which it was declared.
- * - `�#{index}(:{block})�`/`�/#{index}(:{block})�`: *Element Placeholder*:  Marks the beginning
- *   and end of DOM element that were embedded in the original translation block. The placeholder
- *   `index` points to the element index in the template instructions set. An optional `block` that
- *   matches the sub-template in which it was declared.
- * - `�*{index}:{block}�`/`�/*{index}:{block}�`: *Sub-template Placeholder*: Sub-templates must be
- *   split up and translated separately in each angular template function. The `index` points to the
- *   `template` instruction index. A `block` that matches the sub-template in which it was declared.
- *
- * @param index A unique index of the translation in the static block.
- * @param message The translation message.
- * @param subTemplateIndex Optional sub-template index in the `message`.
- *
- * @codeGenApi
- */
-export function ɵɵi18n(index: number, message: string, subTemplateIndex?: number): void {
-  ɵɵi18nStart(index, message, subTemplateIndex);
-  ɵɵi18nEnd();
-}
-
-/**
- * Marks a list of attributes as translatable.
- *
- * @param index A unique index in the static block
- * @param values
- *
- * @codeGenApi
- */
-export function ɵɵi18nAttributes(index: number, values: string[]): void {
-  const lView = getLView();
-  const tView = getTView();
-  ngDevMode && assertDefined(tView, `tView should be defined`);
-  i18nAttributesFirstPass(lView, tView, index, values);
-}
-
-/**
- * See `i18nAttributes` above.
- */
-function i18nAttributesFirstPass(lView: LView, tView: TView, index: number, values: string[]) {
-  const previousElement = getPreviousOrParentTNode();
-  const previousElementIndex = previousElement.index - HEADER_OFFSET;
-  const updateOpCodes: I18nUpdateOpCodes = [];
-  if (ngDevMode) {
-    attachDebugGetter(updateOpCodes, i18nUpdateOpCodesToString);
-  }
-  for (let i = 0; i < values.length; i += 2) {
-    const attrName = values[i];
-    const message = values[i + 1];
-    const parts = message.split(ICU_REGEXP);
-    for (let j = 0; j < parts.length; j++) {
-      const value = parts[j];
-
-      if (j & 1) {
-        // Odd indexes are ICU expressions
-        // TODO(ocombe): support ICU expressions in attributes
-        throw new Error('ICU expressions are not yet supported in attributes');
-      } else if (value !== '') {
-        // Even indexes are text (including bindings)
-        const hasBinding = !!value.match(BINDING_REGEXP);
-        if (hasBinding) {
-          if (tView.firstCreatePass && tView.data[index + HEADER_OFFSET] === null) {
-            addAllToArray(
-                generateBindingUpdateOpCodes(value, previousElementIndex, attrName), updateOpCodes);
-          }
-        } else {
-          const tNode = getTNode(tView, previousElementIndex);
-          // Set attributes for Elements only, for other types (like ElementContainer),
-          // only set inputs below
-          if (tNode.type === TNodeType.Element) {
-            elementAttributeInternal(tNode, lView, attrName, value, null, null);
-          }
-          // Check if that attribute is a directive input
-          const dataValue = tNode.inputs !== null && tNode.inputs[attrName];
-          if (dataValue) {
-            setInputsForProperty(tView, lView, dataValue, attrName, value);
-            if (ngDevMode) {
-              const element = getNativeByIndex(previousElementIndex, lView) as RElement | RComment;
-              setNgReflectProperties(lView, element, tNode.type, dataValue, value);
-            }
-          }
-        }
-      }
-    }
-  }
-
-  if (tView.firstCreatePass && tView.data[index + HEADER_OFFSET] === null) {
-    tView.data[index + HEADER_OFFSET] = updateOpCodes;
-  }
-}
-
-let changeMask = 0b0;
-let shiftsCounter = 0;
-
-/**
- * Stores the values of the bindings during each update cycle in order to determine if we need to
- * update the translated nodes.
- *
- * @param value The binding's value
- * @returns This function returns itself so that it may be chained
- * (e.g. `i18nExp(ctx.name)(ctx.title)`)
- *
- * @codeGenApi
- */
-export function ɵɵi18nExp<T>(value: T): typeof ɵɵi18nExp {
-  const lView = getLView();
-  if (bindingUpdated(lView, nextBindingIndex(), value)) {
-    changeMask = changeMask | (1 << shiftsCounter);
-  }
-  shiftsCounter++;
-  return ɵɵi18nExp;
-}
-
-/**
- * Updates a translation block or an i18n attribute when the bindings have changed.
- *
- * @param index Index of either {@link i18nStart} (translation block) or {@link i18nAttributes}
- * (i18n attribute) on which it should update the content.
- *
- * @codeGenApi
- */
-export function ɵɵi18nApply(index: number) {
-  if (shiftsCounter) {
-    const tView = getTView();
-    ngDevMode && assertDefined(tView, `tView should be defined`);
-    const tI18n = tView.data[index + HEADER_OFFSET];
-    let updateOpCodes: I18nUpdateOpCodes;
-    let icus: TIcu[]|null = null;
-    if (Array.isArray(tI18n)) {
-      updateOpCodes = tI18n as I18nUpdateOpCodes;
-    } else {
-      updateOpCodes = (tI18n as TI18n).update;
-      icus = (tI18n as TI18n).icus;
-    }
-    const bindingsStartIndex = getBindingIndex() - shiftsCounter - 1;
-    const lView = getLView();
-    readUpdateOpCodes(updateOpCodes, icus, bindingsStartIndex, changeMask, tView, lView, false);
-
-    // Reset changeMask & maskBit to default for the next update cycle
-    changeMask = 0b0;
-    shiftsCounter = 0;
-  }
-}
-
-/**
- * Returns the index of the current case of an ICU expression depending on the main binding value
- *
- * @param icuExpression
- * @param bindingValue The value of the main binding used by this ICU expression
- */
-function getCaseIndex(icuExpression: TIcu, bindingValue: string): number {
-  let index = icuExpression.cases.indexOf(bindingValue);
-  if (index === -1) {
-    switch (icuExpression.type) {
-      case IcuType.plural: {
-        const resolvedCase = getPluralCase(bindingValue, getLocaleId());
-        index = icuExpression.cases.indexOf(resolvedCase);
-        if (index === -1 && resolvedCase !== 'other') {
-          index = icuExpression.cases.indexOf('other');
-        }
-        break;
-      }
-      case IcuType.select: {
-        index = icuExpression.cases.indexOf('other');
-        break;
-      }
-    }
-  }
-  return index;
-}
-
-/**
- * Generate the OpCodes for ICU expressions.
- *
- * @param tIcus
- * @param icuExpression
- * @param startIndex
- * @param expandoStartIndex
- */
-function icuStart(
-    tIcus: TIcu[], icuExpression: IcuExpression, startIndex: number,
-    expandoStartIndex: number): void {
-  const createCodes: I18nMutateOpCodes[] = [];
-  const removeCodes: I18nMutateOpCodes[] = [];
-  const updateCodes: I18nUpdateOpCodes[] = [];
-  const vars = [];
-  const childIcus: number[][] = [];
-  for (let i = 0; i < icuExpression.values.length; i++) {
-    // Each value is an array of strings & other ICU expressions
-    const valueArr = icuExpression.values[i];
-    const nestedIcus: IcuExpression[] = [];
-    for (let j = 0; j < valueArr.length; j++) {
-      const value = valueArr[j];
-      if (typeof value !== 'string') {
-        // It is an nested ICU expression
-        const icuIndex = nestedIcus.push(value as IcuExpression) - 1;
-        // Replace nested ICU expression by a comment node
-        valueArr[j] = `<!--�${icuIndex}�-->`;
-      }
-    }
-    const icuCase: IcuCase =
-        parseIcuCase(valueArr.join(''), startIndex, nestedIcus, tIcus, expandoStartIndex);
-    createCodes.push(icuCase.create);
-    removeCodes.push(icuCase.remove);
-    updateCodes.push(icuCase.update);
-    vars.push(icuCase.vars);
-    childIcus.push(icuCase.childIcus);
-  }
-  const tIcu: TIcu = {
-    type: icuExpression.type,
-    vars,
-    childIcus,
-    cases: icuExpression.cases,
-    create: createCodes,
-    remove: removeCodes,
-    update: updateCodes
-  };
-  tIcus.push(tIcu);
-  // Adding the maximum possible of vars needed (based on the cases with the most vars)
-  i18nVarsCount += Math.max(...vars);
-}
-
-/**
- * Transforms a string template into an HTML template and a list of instructions used to update
- * attributes or nodes that contain bindings.
- *
- * @param unsafeHtml The string to parse
- * @param parentIndex
- * @param nestedIcus
- * @param tIcus
- * @param expandoStartIndex
- */
-function parseIcuCase(
-    unsafeHtml: string, parentIndex: number, nestedIcus: IcuExpression[], tIcus: TIcu[],
-    expandoStartIndex: number): IcuCase {
-  const inertBodyHelper = getInertBodyHelper(getDocument());
-  const inertBodyElement = inertBodyHelper.getInertBodyElement(unsafeHtml);
-  if (!inertBodyElement) {
-    throw new Error('Unable to generate inert body element');
-  }
-  const wrapper = getTemplateContent(inertBodyElement!) as Element || inertBodyElement;
-  const opCodes: IcuCase = {vars: 0, childIcus: [], create: [], remove: [], update: []};
-  if (ngDevMode) {
-    attachDebugGetter(opCodes.create, i18nMutateOpCodesToString);
-    attachDebugGetter(opCodes.remove, i18nMutateOpCodesToString);
-    attachDebugGetter(opCodes.update, i18nUpdateOpCodesToString);
-  }
-  parseNodes(wrapper.firstChild, opCodes, parentIndex, nestedIcus, tIcus, expandoStartIndex);
-  return opCodes;
-}
-
-const NESTED_ICU = /�(\d+)�/;
-
-/**
- * Parses a node, its children and its siblings, and generates the mutate & update OpCodes.
- *
- * @param currentNode The first node to parse
- * @param icuCase The data for the ICU expression case that contains those nodes
- * @param parentIndex Index of the current node's parent
- * @param nestedIcus Data for the nested ICU expressions that this case contains
- * @param tIcus Data for all ICU expressions of the current message
- * @param expandoStartIndex Expando start index for the current ICU expression
- */
-function parseNodes(
-    currentNode: Node|null, icuCase: IcuCase, parentIndex: number, nestedIcus: IcuExpression[],
-    tIcus: TIcu[], expandoStartIndex: number) {
-  if (currentNode) {
-    const nestedIcusToCreate: [IcuExpression, number][] = [];
-    while (currentNode) {
-      const nextNode: Node|null = currentNode.nextSibling;
-      const newIndex = expandoStartIndex + ++icuCase.vars;
-      switch (currentNode.nodeType) {
-        case Node.ELEMENT_NODE:
-          const element = currentNode as Element;
-          const tagName = element.tagName.toLowerCase();
-          if (!VALID_ELEMENTS.hasOwnProperty(tagName)) {
-            // This isn't a valid element, we won't create an element for it
-            icuCase.vars--;
-          } else {
-            icuCase.create.push(
-                ELEMENT_MARKER, tagName, newIndex,
-                parentIndex << I18nMutateOpCode.SHIFT_PARENT | I18nMutateOpCode.AppendChild);
-            const elAttrs = element.attributes;
-            for (let i = 0; i < elAttrs.length; i++) {
-              const attr = elAttrs.item(i)!;
-              const lowerAttrName = attr.name.toLowerCase();
-              const hasBinding = !!attr.value.match(BINDING_REGEXP);
-              // we assume the input string is safe, unless it's using a binding
-              if (hasBinding) {
-                if (VALID_ATTRS.hasOwnProperty(lowerAttrName)) {
-                  if (URI_ATTRS[lowerAttrName]) {
-                    addAllToArray(
-                        generateBindingUpdateOpCodes(attr.value, newIndex, attr.name, _sanitizeUrl),
-                        icuCase.update);
-                  } else if (SRCSET_ATTRS[lowerAttrName]) {
-                    addAllToArray(
-                        generateBindingUpdateOpCodes(
-                            attr.value, newIndex, attr.name, sanitizeSrcset),
-                        icuCase.update);
-                  } else {
-                    addAllToArray(
-                        generateBindingUpdateOpCodes(attr.value, newIndex, attr.name),
-                        icuCase.update);
-                  }
-                } else {
-                  ngDevMode &&
-                      console.warn(`WARNING: ignoring unsafe attribute value ${
-                          lowerAttrName} on element ${tagName} (see http://g.co/ng/security#xss)`);
-                }
-              } else {
-                icuCase.create.push(
-                    newIndex << I18nMutateOpCode.SHIFT_REF | I18nMutateOpCode.Attr, attr.name,
-                    attr.value);
-              }
-            }
-            // Parse the children of this node (if any)
-            parseNodes(
-                currentNode.firstChild, icuCase, newIndex, nestedIcus, tIcus, expandoStartIndex);
-            // Remove the parent node after the children
-            icuCase.remove.push(newIndex << I18nMutateOpCode.SHIFT_REF | I18nMutateOpCode.Remove);
-          }
-          break;
-        case Node.TEXT_NODE:
-          const value = currentNode.textContent || '';
-          const hasBinding = value.match(BINDING_REGEXP);
-          icuCase.create.push(
-              hasBinding ? '' : value, newIndex,
-              parentIndex << I18nMutateOpCode.SHIFT_PARENT | I18nMutateOpCode.AppendChild);
-          icuCase.remove.push(newIndex << I18nMutateOpCode.SHIFT_REF | I18nMutateOpCode.Remove);
-          if (hasBinding) {
-            addAllToArray(generateBindingUpdateOpCodes(value, newIndex), icuCase.update);
-          }
-          break;
-        case Node.COMMENT_NODE:
-          // Check if the comment node is a placeholder for a nested ICU
-          const match = NESTED_ICU.exec(currentNode.textContent || '');
-          if (match) {
-            const nestedIcuIndex = parseInt(match[1], 10);
-            const newLocal = ngDevMode ? `nested ICU ${nestedIcuIndex}` : '';
-            // Create the comment node that will anchor the ICU expression
-            icuCase.create.push(
-                COMMENT_MARKER, newLocal, newIndex,
-                parentIndex << I18nMutateOpCode.SHIFT_PARENT | I18nMutateOpCode.AppendChild);
-            const nestedIcu = nestedIcus[nestedIcuIndex];
-            nestedIcusToCreate.push([nestedIcu, newIndex]);
-          } else {
-            // We do not handle any other type of comment
-            icuCase.vars--;
-          }
-          break;
-        default:
-          // We do not handle any other type of element
-          icuCase.vars--;
-      }
-      currentNode = nextNode!;
-    }
-
-    for (let i = 0; i < nestedIcusToCreate.length; i++) {
-      const nestedIcu = nestedIcusToCreate[i][0];
-      const nestedIcuNodeIndex = nestedIcusToCreate[i][1];
-      icuStart(tIcus, nestedIcu, nestedIcuNodeIndex, expandoStartIndex + icuCase.vars);
-      // Since this is recursive, the last TIcu that was pushed is the one we want
-      const nestTIcuIndex = tIcus.length - 1;
-      icuCase.vars += Math.max(...tIcus[nestTIcuIndex].vars);
-      icuCase.childIcus.push(nestTIcuIndex);
-      const mask = getBindingMask(nestedIcu);
-      icuCase.update.push(
-          toMaskBit(nestedIcu.mainBinding),  // mask of the main binding
-          3,                                 // skip 3 opCodes if not changed
-          -1 - nestedIcu.mainBinding,
-          nestedIcuNodeIndex << I18nUpdateOpCode.SHIFT_REF | I18nUpdateOpCode.IcuSwitch,
-          // FIXME(misko): Index should be part of the opcode
-          nestTIcuIndex,
-          mask,  // mask of all the bindings of this ICU expression
-          2,     // skip 2 opCodes if not changed
-          nestedIcuNodeIndex << I18nUpdateOpCode.SHIFT_REF | I18nUpdateOpCode.IcuUpdate,
-          nestTIcuIndex);
-      icuCase.remove.push(
-          nestTIcuIndex << I18nMutateOpCode.SHIFT_REF | I18nMutateOpCode.RemoveNestedIcu,
-          // FIXME(misko): Index should be part of the opcode
-          nestedIcuNodeIndex << I18nMutateOpCode.SHIFT_REF | I18nMutateOpCode.Remove);
-    }
-  }
-}
-
-/**
- * Angular Dart introduced &ngsp; as a placeholder for non-removable space, see:
- * https://github.com/dart-lang/angular/blob/0bb611387d29d65b5af7f9d2515ab571fd3fbee4/_tests/test/compiler/preserve_whitespace_test.dart#L25-L32
- * In Angular Dart &ngsp; is converted to the 0xE500 PUA (Private Use Areas) unicode character
- * and later on replaced by a space. We are re-implementing the same idea here, since translations
- * might contain this special character.
- */
-const NGSP_UNICODE_REGEXP = /\uE500/g;
-function replaceNgsp(value: string): string {
-  return value.replace(NGSP_UNICODE_REGEXP, ' ');
-}
-
-/**
- * The locale id that the application is currently using (for translations and ICU expressions).
- * This is the ivy version of `LOCALE_ID` that was defined as an injection token for the view engine
- * but is now defined as a global value.
- */
-let LOCALE_ID = DEFAULT_LOCALE_ID;
-
-/**
- * Sets the locale id that will be used for translations and ICU expressions.
- * This is the ivy version of `LOCALE_ID` that was defined as an injection token for the view engine
- * but is now defined as a global value.
- *
- * @param localeId
- */
-export function setLocaleId(localeId: string) {
-  assertDefined(localeId, `Expected localeId to be defined`);
-  if (typeof localeId === 'string') {
-    LOCALE_ID = localeId.toLowerCase().replace(/_/g, '-');
-  }
-}
-
-/**
- * Gets the locale id that will be used for translations and ICU expressions.
- * This is the ivy version of `LOCALE_ID` that was defined as an injection token for the view engine
- * but is now defined as a global value.
- */
-export function getLocaleId(): string {
-  return LOCALE_ID;
-}
diff --git a/packages/core/src/render3/i18n.md b/packages/core/src/render3/i18n/i18n.md
similarity index 98%
rename from packages/core/src/render3/i18n.md
rename to packages/core/src/render3/i18n/i18n.md
index f58e4587d6db0..e476df408db33 100644
--- a/packages/core/src/render3/i18n.md
+++ b/packages/core/src/render3/i18n/i18n.md
@@ -115,10 +115,6 @@ The i18n markers are:
   - `index`: the index of the `template` instruction, as defined in the template instructions (e.g. `template(index, ...)`).
   - `block`: the index of the parent sub-template block, in which this child sub-template block was declared.
 
-- `�!{index}:{block}�/�/!{index}:{block}�`: *Projection block*: Marks the beginning and end of <ng-content> that was embedded in the original translation block.
-  - `index`: the index of the projection, as defined in the template instructions (e.g. `projection(index, ...)`).
-  - `block` (*optional*): the index of the parent sub-template block, in which this child sub-template block was declared.
-
 No other i18n marker format is supported.
 
 The i18n markers in the example above can be interpreted as follows:
@@ -438,7 +434,7 @@ const tI18n = <TI18n>{
     //   // Assume expandoIndex = 200;
     //   const node = lView[expandoIndex++] = document.createComment('');
     //   lView[1].appendChild(node);
-    COMMENT_MARKER, '', 1 << SHIFT_PARENT | AppendChild,
+    ICU_MARKER, '', 1 << SHIFT_PARENT | AppendChild,
   ],
   update: <I18nUpdateOpCodes>[
     // The following OpCodes represent: `<b>{count, plural, ... }</b>">`
@@ -972,7 +968,7 @@ const tI18n = <TI18n>{
         ],
         <I18nMutateOpCodes>[                         // Case: `other`: `{�0� <!--subICU-->}`
           '', 1 << SHIFT_PARENT | AppendChild,       // Expando location: 100
-          COMMENT_MARKER, '', 0 << SHIFT_PARENT | AppendChild,    // Expando location: 101
+          ICU_MARKER, '', 0 << SHIFT_PARENT | AppendChild,    // Expando location: 101
         ],
       ],
       remove: [
diff --git a/packages/core/src/render3/i18n/i18n_apply.ts b/packages/core/src/render3/i18n/i18n_apply.ts
new file mode 100644
index 0000000000000..7df72e9933256
--- /dev/null
+++ b/packages/core/src/render3/i18n/i18n_apply.ts
@@ -0,0 +1,435 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {getPluralCase} from '../../i18n/localization';
+import {assertDefined, assertDomNode, assertEqual, assertGreaterThan, assertIndexInRange, throwError} from '../../util/assert';
+import {assertIndexInExpandoRange, assertTIcu} from '../assert';
+import {attachPatchData} from '../context_discovery';
+import {elementPropertyInternal, setElementAttribute} from '../instructions/shared';
+import {ELEMENT_MARKER, I18nCreateOpCode, I18nCreateOpCodes, I18nUpdateOpCode, I18nUpdateOpCodes, ICU_MARKER, IcuCreateOpCode, IcuCreateOpCodes, IcuType, TI18n, TIcu} from '../interfaces/i18n';
+import {TNode} from '../interfaces/node';
+import {RElement, RNode, RText} from '../interfaces/renderer';
+import {SanitizerFn} from '../interfaces/sanitization';
+import {HEADER_OFFSET, LView, RENDERER, TView} from '../interfaces/view';
+import {createCommentNode, createElementNode, createTextNode, nativeInsertBefore, nativeParentNode, nativeRemoveNode, updateTextNode} from '../node_manipulation';
+import {getBindingIndex} from '../state';
+import {renderStringify} from '../util/misc_utils';
+import {getNativeByIndex, unwrapRNode} from '../util/view_utils';
+import {getLocaleId} from './i18n_locale_id';
+import {getCurrentICUCaseIndex, getParentFromIcuCreateOpCode, getRefFromIcuCreateOpCode, getTIcu} from './i18n_util';
+
+
+
+/**
+ * Keep track of which input bindings in `ɵɵi18nExp` have changed.
+ *
+ * This is used to efficiently update expressions in i18n only when the corresponding input has
+ * changed.
+ *
+ * 1) Each bit represents which of the `ɵɵi18nExp` has changed.
+ * 2) There are 32 bits allowed in JS.
+ * 3) Bit 32 is special as it is shared for all changes past 32. (In other words if you have more
+ * than 32 `ɵɵi18nExp` then all changes past 32nd `ɵɵi18nExp` will be mapped to same bit. This means
+ * that we may end up changing more than we need to. But i18n expressions with 32 bindings is rare
+ * so in practice it should not be an issue.)
+ */
+let changeMask = 0b0;
+
+/**
+ * Keeps track of which bit needs to be updated in `changeMask`
+ *
+ * This value gets incremented on every call to `ɵɵi18nExp`
+ */
+let changeMaskCounter = 0;
+
+/**
+ * Keep track of which input bindings in `ɵɵi18nExp` have changed.
+ *
+ * `setMaskBit` gets invoked by each call to `ɵɵi18nExp`.
+ *
+ * @param hasChange did `ɵɵi18nExp` detect a change.
+ */
+export function setMaskBit(hasChange: boolean) {
+  if (hasChange) {
+    changeMask = changeMask | (1 << Math.min(changeMaskCounter, 31));
+  }
+  changeMaskCounter++;
+}
+
+export function applyI18n(tView: TView, lView: LView, index: number) {
+  if (changeMaskCounter > 0) {
+    ngDevMode && assertDefined(tView, `tView should be defined`);
+    const tI18n = tView.data[index] as TI18n | I18nUpdateOpCodes;
+    // When `index` points to an `ɵɵi18nAttributes` then we have an array otherwise `TI18n`
+    const updateOpCodes: I18nUpdateOpCodes =
+        Array.isArray(tI18n) ? tI18n as I18nUpdateOpCodes : (tI18n as TI18n).update;
+    const bindingsStartIndex = getBindingIndex() - changeMaskCounter - 1;
+    applyUpdateOpCodes(tView, lView, updateOpCodes, bindingsStartIndex, changeMask);
+  }
+  // Reset changeMask & maskBit to default for the next update cycle
+  changeMask = 0b0;
+  changeMaskCounter = 0;
+}
+
+
+/**
+ * Apply `I18nCreateOpCodes` op-codes as stored in `TI18n.create`.
+ *
+ * Creates text (and comment) nodes which are internationalized.
+ *
+ * @param lView Current lView
+ * @param createOpCodes Set of op-codes to apply
+ * @param parentRNode Parent node (so that direct children can be added eagerly) or `null` if it is
+ *     a root node.
+ * @param insertInFrontOf DOM node that should be used as an anchor.
+ */
+export function applyCreateOpCodes(
+    lView: LView, createOpCodes: I18nCreateOpCodes, parentRNode: RElement|null,
+    insertInFrontOf: RElement|null): void {
+  const renderer = lView[RENDERER];
+  for (let i = 0; i < createOpCodes.length; i++) {
+    const opCode = createOpCodes[i++] as any;
+    const text = createOpCodes[i] as string;
+    const isComment = (opCode & I18nCreateOpCode.COMMENT) === I18nCreateOpCode.COMMENT;
+    const appendNow =
+        (opCode & I18nCreateOpCode.APPEND_EAGERLY) === I18nCreateOpCode.APPEND_EAGERLY;
+    const index = opCode >>> I18nCreateOpCode.SHIFT;
+    let rNode = lView[index];
+    if (rNode === null) {
+      // We only create new DOM nodes if they don't already exist: If ICU switches case back to a
+      // case which was already instantiated, no need to create new DOM nodes.
+      rNode = lView[index] =
+          isComment ? renderer.createComment(text) : createTextNode(renderer, text);
+    }
+    if (appendNow && parentRNode !== null) {
+      nativeInsertBefore(renderer, parentRNode, rNode, insertInFrontOf, false);
+    }
+  }
+}
+
+/**
+ * Apply `I18nMutateOpCodes` OpCodes.
+ *
+ * @param tView Current `TView`
+ * @param mutableOpCodes Mutable OpCodes to process
+ * @param lView Current `LView`
+ * @param anchorRNode place where the i18n node should be inserted.
+ */
+export function applyMutableOpCodes(
+    tView: TView, mutableOpCodes: IcuCreateOpCodes, lView: LView, anchorRNode: RNode): void {
+  ngDevMode && assertDomNode(anchorRNode);
+  const renderer = lView[RENDERER];
+  // `rootIdx` represents the node into which all inserts happen.
+  let rootIdx: number|null = null;
+  // `rootRNode` represents the real node into which we insert. This can be different from
+  // `lView[rootIdx]` if we have projection.
+  //  - null we don't have a parent (as can be the case in when we are inserting into a root of
+  //    LView which has no parent.)
+  //  - `RElement` The element representing the root after taking projection into account.
+  let rootRNode!: RElement|null;
+  for (let i = 0; i < mutableOpCodes.length; i++) {
+    const opCode = mutableOpCodes[i];
+    if (typeof opCode == 'string') {
+      const textNodeIndex = mutableOpCodes[++i] as number;
+      if (lView[textNodeIndex] === null) {
+        ngDevMode && ngDevMode.rendererCreateTextNode++;
+        ngDevMode && assertIndexInRange(lView, textNodeIndex);
+        lView[textNodeIndex] = createTextNode(renderer, opCode);
+      }
+    } else if (typeof opCode == 'number') {
+      switch (opCode & IcuCreateOpCode.MASK_INSTRUCTION) {
+        case IcuCreateOpCode.AppendChild:
+          const parentIdx = getParentFromIcuCreateOpCode(opCode);
+          if (rootIdx === null) {
+            // The first operation should save the `rootIdx` because the first operation
+            // must insert into the root. (Only subsequent operations can insert into a dynamic
+            // parent)
+            rootIdx = parentIdx;
+            rootRNode = nativeParentNode(renderer, anchorRNode);
+          }
+          let insertInFrontOf: RNode|null;
+          let parentRNode: RElement|null;
+          if (parentIdx === rootIdx) {
+            insertInFrontOf = anchorRNode;
+            parentRNode = rootRNode;
+          } else {
+            insertInFrontOf = null;
+            parentRNode = unwrapRNode(lView[parentIdx]) as RElement;
+          }
+          // FIXME(misko): Refactor with `processI18nText`
+          if (parentRNode !== null) {
+            // This can happen if the `LView` we are adding to is not attached to a parent `LView`.
+            // In such a case there is no "root" we can attach to. This is fine, as we still need to
+            // create the elements. When the `LView` gets later added to a parent these "root" nodes
+            // get picked up and added.
+            ngDevMode && assertDomNode(parentRNode);
+            const refIdx = getRefFromIcuCreateOpCode(opCode);
+            ngDevMode && assertGreaterThan(refIdx, HEADER_OFFSET, 'Missing ref');
+            // `unwrapRNode` is not needed here as all of these point to RNodes as part of the i18n
+            // which can't have components.
+            const child = lView[refIdx] as RElement;
+            ngDevMode && assertDomNode(child);
+            nativeInsertBefore(renderer, parentRNode, child, insertInFrontOf, false);
+            const tIcu = getTIcu(tView, refIdx);
+            if (tIcu !== null && typeof tIcu === 'object') {
+              // If we just added a comment node which has ICU then that ICU may have already been
+              // rendered and therefore we need to re-add it here.
+              ngDevMode && assertTIcu(tIcu);
+              const caseIndex = getCurrentICUCaseIndex(tIcu, lView);
+              if (caseIndex !== null) {
+                applyMutableOpCodes(tView, tIcu.create[caseIndex], lView, lView[tIcu.anchorIdx]);
+              }
+            }
+          }
+          break;
+        case IcuCreateOpCode.Attr:
+          const elementNodeIndex = opCode >>> IcuCreateOpCode.SHIFT_REF;
+          const attrName = mutableOpCodes[++i] as string;
+          const attrValue = mutableOpCodes[++i] as string;
+          // This code is used for ICU expressions only, since we don't support
+          // directives/components in ICUs, we don't need to worry about inputs here
+          setElementAttribute(
+              renderer, getNativeByIndex(elementNodeIndex, lView) as RElement, null, null, attrName,
+              attrValue, null);
+          break;
+        default:
+          throw new Error(`Unable to determine the type of mutate operation for "${opCode}"`);
+      }
+    } else {
+      switch (opCode) {
+        case ICU_MARKER:
+          const commentValue = mutableOpCodes[++i] as string;
+          const commentNodeIndex = mutableOpCodes[++i] as number;
+          if (lView[commentNodeIndex] === null) {
+            ngDevMode &&
+                assertEqual(
+                    typeof commentValue, 'string',
+                    `Expected "${commentValue}" to be a comment node value`);
+            ngDevMode && ngDevMode.rendererCreateComment++;
+            ngDevMode && assertIndexInExpandoRange(lView, commentNodeIndex);
+            const commentRNode = lView[commentNodeIndex] =
+                createCommentNode(renderer, commentValue);
+            // FIXME(misko): Attaching patch data is only needed for the root (Also add tests)
+            attachPatchData(commentRNode, lView);
+          }
+          break;
+        case ELEMENT_MARKER:
+          const tagName = mutableOpCodes[++i] as string;
+          const elementNodeIndex = mutableOpCodes[++i] as number;
+          if (lView[elementNodeIndex] === null) {
+            ngDevMode &&
+                assertEqual(
+                    typeof tagName, 'string',
+                    `Expected "${tagName}" to be an element node tag name`);
+
+            ngDevMode && ngDevMode.rendererCreateElement++;
+            ngDevMode && assertIndexInExpandoRange(lView, elementNodeIndex);
+            const elementRNode = lView[elementNodeIndex] =
+                createElementNode(renderer, tagName, null);
+            // FIXME(misko): Attaching patch data is only needed for the root (Also add tests)
+            attachPatchData(elementRNode, lView);
+          }
+          break;
+        default:
+          ngDevMode &&
+              throwError(`Unable to determine the type of mutate operation for "${opCode}"`);
+      }
+    }
+  }
+}
+
+
+/**
+ * Apply `I18nUpdateOpCodes` OpCodes
+ *
+ * @param tView Current `TView`
+ * @param lView Current `LView`
+ * @param updateOpCodes OpCodes to process
+ * @param bindingsStartIndex Location of the first `ɵɵi18nApply`
+ * @param changeMask Each bit corresponds to a `ɵɵi18nExp` (Counting backwards from
+ *     `bindingsStartIndex`)
+ */
+export function applyUpdateOpCodes(
+    tView: TView, lView: LView, updateOpCodes: I18nUpdateOpCodes, bindingsStartIndex: number,
+    changeMask: number) {
+  for (let i = 0; i < updateOpCodes.length; i++) {
+    // bit code to check if we should apply the next update
+    const checkBit = updateOpCodes[i] as number;
+    // Number of opCodes to skip until next set of update codes
+    const skipCodes = updateOpCodes[++i] as number;
+    if (checkBit & changeMask) {
+      // The value has been updated since last checked
+      let value = '';
+      for (let j = i + 1; j <= (i + skipCodes); j++) {
+        const opCode = updateOpCodes[j];
+        if (typeof opCode == 'string') {
+          value += opCode;
+        } else if (typeof opCode == 'number') {
+          if (opCode < 0) {
+            // Negative opCode represent `i18nExp` values offset.
+            value += renderStringify(lView[bindingsStartIndex - opCode]);
+          } else {
+            const nodeIndex = (opCode >>> I18nUpdateOpCode.SHIFT_REF);
+            switch (opCode & I18nUpdateOpCode.MASK_OPCODE) {
+              case I18nUpdateOpCode.Attr:
+                const propName = updateOpCodes[++j] as string;
+                const sanitizeFn = updateOpCodes[++j] as SanitizerFn | null;
+                const tNodeOrTagName = tView.data[nodeIndex] as TNode | string;
+                ngDevMode && assertDefined(tNodeOrTagName, 'Experting TNode or string');
+                if (typeof tNodeOrTagName === 'string') {
+                  // IF we don't have a `TNode`, then we are an element in ICU (as ICU content does
+                  // not have TNode), in which case we know that there are no directives, and hence
+                  // we use attribute setting.
+                  setElementAttribute(
+                      lView[RENDERER], lView[nodeIndex], null, tNodeOrTagName, propName, value,
+                      sanitizeFn);
+                } else {
+                  elementPropertyInternal(
+                      tView, tNodeOrTagName, lView, propName, value, lView[RENDERER], sanitizeFn,
+                      false);
+                }
+                break;
+              case I18nUpdateOpCode.Text:
+                const rText = lView[nodeIndex] as RText | null;
+                rText !== null && updateTextNode(lView[RENDERER], rText, value);
+                break;
+              case I18nUpdateOpCode.IcuSwitch:
+                applyIcuSwitchCase(tView, getTIcu(tView, nodeIndex)!, lView, value);
+                break;
+              case I18nUpdateOpCode.IcuUpdate:
+                applyIcuUpdateCase(tView, getTIcu(tView, nodeIndex)!, bindingsStartIndex, lView);
+                break;
+            }
+          }
+        }
+      }
+    } else {
+      const opCode = updateOpCodes[i + 1] as number;
+      if (opCode > 0 && (opCode & I18nUpdateOpCode.MASK_OPCODE) === I18nUpdateOpCode.IcuUpdate) {
+        // Special case for the `icuUpdateCase`. It could be that the mask did not match, but
+        // we still need to execute `icuUpdateCase` because the case has changed recently due to
+        // previous `icuSwitchCase` instruction. (`icuSwitchCase` and `icuUpdateCase` always come in
+        // pairs.)
+        const nodeIndex = (opCode >>> I18nUpdateOpCode.SHIFT_REF);
+        const tIcu = getTIcu(tView, nodeIndex)!;
+        const currentIndex = lView[tIcu.currentCaseLViewIndex];
+        if (currentIndex < 0) {
+          applyIcuUpdateCase(tView, tIcu, bindingsStartIndex, lView);
+        }
+      }
+    }
+    i += skipCodes;
+  }
+}
+
+/**
+ * Apply OpCodes associated with updating an existing ICU.
+ *
+ * @param tView Current `TView`
+ * @param tIcu Current `TIcu`
+ * @param bindingsStartIndex Location of the first `ɵɵi18nApply`
+ * @param lView Current `LView`
+ */
+function applyIcuUpdateCase(tView: TView, tIcu: TIcu, bindingsStartIndex: number, lView: LView) {
+  ngDevMode && assertIndexInRange(lView, tIcu.currentCaseLViewIndex);
+  let activeCaseIndex = lView[tIcu.currentCaseLViewIndex];
+  if (activeCaseIndex !== null) {
+    let mask = changeMask;
+    if (activeCaseIndex < 0) {
+      // Clear the flag.
+      // Negative number means that the ICU was freshly created and we need to force the update.
+      activeCaseIndex = lView[tIcu.currentCaseLViewIndex] = ~activeCaseIndex;
+      // -1 is same as all bits on, which simulates creation since it marks all bits dirty
+      mask = -1;
+    }
+    applyUpdateOpCodes(tView, lView, tIcu.update[activeCaseIndex], bindingsStartIndex, mask);
+  }
+}
+
+/**
+ * Apply OpCodes associated with switching a case on ICU.
+ *
+ * This involves tearing down existing case and than building up a new case.
+ *
+ * @param tView Current `TView`
+ * @param tIcu Current `TIcu`
+ * @param lView Current `LView`
+ * @param value Value of the case to update to.
+ */
+function applyIcuSwitchCase(tView: TView, tIcu: TIcu, lView: LView, value: string) {
+  // Rebuild a new case for this ICU
+  const caseIndex = getCaseIndex(tIcu, value);
+  let activeCaseIndex = getCurrentICUCaseIndex(tIcu, lView);
+  if (activeCaseIndex !== caseIndex) {
+    applyIcuSwitchCaseRemove(tView, tIcu, lView);
+    lView[tIcu.currentCaseLViewIndex] = caseIndex === null ? null : ~caseIndex;
+    if (caseIndex !== null) {
+      // Add the nodes for the new case
+      const anchorRNode = lView[tIcu.anchorIdx];
+      if (anchorRNode) {
+        ngDevMode && assertDomNode(anchorRNode);
+        applyMutableOpCodes(tView, tIcu.create[caseIndex], lView, anchorRNode);
+      }
+    }
+  }
+}
+
+/**
+ * Apply OpCodes associated with tearing ICU case.
+ *
+ * This involves tearing down existing case and than building up a new case.
+ *
+ * @param tView Current `TView`
+ * @param tIcu Current `TIcu`
+ * @param lView Current `LView`
+ */
+function applyIcuSwitchCaseRemove(tView: TView, tIcu: TIcu, lView: LView) {
+  let activeCaseIndex = getCurrentICUCaseIndex(tIcu, lView);
+  if (activeCaseIndex !== null) {
+    const removeCodes = tIcu.remove[activeCaseIndex];
+    for (let i = 0; i < removeCodes.length; i++) {
+      const nodeOrIcuIndex = removeCodes[i] as number;
+      if (nodeOrIcuIndex > 0) {
+        // Positive numbers are `RNode`s.
+        const rNode = getNativeByIndex(nodeOrIcuIndex, lView);
+        rNode !== null && nativeRemoveNode(lView[RENDERER], rNode);
+      } else {
+        // Negative numbers are ICUs
+        applyIcuSwitchCaseRemove(tView, getTIcu(tView, ~nodeOrIcuIndex)!, lView);
+      }
+    }
+  }
+}
+
+
+/**
+ * Returns the index of the current case of an ICU expression depending on the main binding value
+ *
+ * @param icuExpression
+ * @param bindingValue The value of the main binding used by this ICU expression
+ */
+function getCaseIndex(icuExpression: TIcu, bindingValue: string): number|null {
+  let index = icuExpression.cases.indexOf(bindingValue);
+  if (index === -1) {
+    switch (icuExpression.type) {
+      case IcuType.plural: {
+        const resolvedCase = getPluralCase(bindingValue, getLocaleId());
+        index = icuExpression.cases.indexOf(resolvedCase);
+        if (index === -1 && resolvedCase !== 'other') {
+          index = icuExpression.cases.indexOf('other');
+        }
+        break;
+      }
+      case IcuType.select: {
+        index = icuExpression.cases.indexOf('other');
+        break;
+      }
+    }
+  }
+  return index === -1 ? null : index;
+}
diff --git a/packages/core/src/render3/i18n_debug.ts b/packages/core/src/render3/i18n/i18n_debug.ts
similarity index 55%
rename from packages/core/src/render3/i18n_debug.ts
rename to packages/core/src/render3/i18n/i18n_debug.ts
index 930f810428fcc..cd3c8a6bbf17d 100644
--- a/packages/core/src/render3/i18n_debug.ts
+++ b/packages/core/src/render3/i18n/i18n_debug.ts
@@ -6,9 +6,41 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {assertNumber, assertString} from '../util/assert';
+import {assertNumber, assertString} from '../../util/assert';
+import {ELEMENT_MARKER, I18nCreateOpCode, I18nCreateOpCodes, I18nRemoveOpCodes, I18nUpdateOpCode, I18nUpdateOpCodes, ICU_MARKER, IcuCreateOpCode, IcuCreateOpCodes} from '../interfaces/i18n';
 
-import {COMMENT_MARKER, ELEMENT_MARKER, getInstructionFromI18nMutateOpCode, getParentFromI18nMutateOpCode, getRefFromI18nMutateOpCode, I18nMutateOpCode, I18nMutateOpCodes, I18nUpdateOpCode, I18nUpdateOpCodes} from './interfaces/i18n';
+import {getInstructionFromIcuCreateOpCode, getParentFromIcuCreateOpCode, getRefFromIcuCreateOpCode} from './i18n_util';
+
+
+/**
+ * Converts `I18nCreateOpCodes` array into a human readable format.
+ *
+ * This function is attached to the `I18nCreateOpCodes.debug` property if `ngDevMode` is enabled.
+ * This function provides a human readable view of the opcodes. This is useful when debugging the
+ * application as well as writing more readable tests.
+ *
+ * @param this `I18nCreateOpCodes` if attached as a method.
+ * @param opcodes `I18nCreateOpCodes` if invoked as a function.
+ */
+export function i18nCreateOpCodesToString(
+    this: I18nCreateOpCodes|void, opcodes?: I18nCreateOpCodes): string[] {
+  const createOpCodes: I18nCreateOpCodes = opcodes || (Array.isArray(this) ? this : [] as any);
+  let lines: string[] = [];
+  for (let i = 0; i < createOpCodes.length; i++) {
+    const opCode = createOpCodes[i++] as any;
+    const text = createOpCodes[i] as string;
+    const isComment = (opCode & I18nCreateOpCode.COMMENT) === I18nCreateOpCode.COMMENT;
+    const appendNow =
+        (opCode & I18nCreateOpCode.APPEND_EAGERLY) === I18nCreateOpCode.APPEND_EAGERLY;
+    const index = opCode >>> I18nCreateOpCode.SHIFT;
+    lines.push(`lView[${index}] = document.${isComment ? 'createComment' : 'createText'}(${
+        JSON.stringify(text)});`);
+    if (appendNow) {
+      lines.push(`parent.appendChild(lView[${index}]);`);
+    }
+  }
+  return lines;
+}
 
 /**
  * Converts `I18nUpdateOpCodes` array into a human readable format.
@@ -37,9 +69,9 @@ export function i18nUpdateOpCodesToString(
         const value = sanitizationFn ? `(${sanitizationFn})($$$)` : '$$$';
         return `(lView[${ref}] as Element).setAttribute('${attrName}', ${value})`;
       case I18nUpdateOpCode.IcuSwitch:
-        return `icuSwitchCase(lView[${ref}] as Comment, ${parser.consumeNumber()}, $$$)`;
+        return `icuSwitchCase(${ref}, $$$)`;
       case I18nUpdateOpCode.IcuUpdate:
-        return `icuUpdateCase(lView[${ref}] as Comment, ${parser.consumeNumber()})`;
+        return `icuUpdateCase(${ref})`;
     }
     throw new Error('unexpected OpCode');
   }
@@ -57,7 +89,9 @@ export function i18nUpdateOpCodesToString(
         statement += value;
       } else if (value < 0) {
         // Negative numbers are ref indexes
-        statement += '${lView[' + (0 - value) + ']}';
+        // Here `i` refers to current binding index. It is to signify that the value is relative,
+        // rather than absolute.
+        statement += '${lView[i' + value + ']}';
       } else {
         // Positive numbers are operations.
         const opCodeText = consumeOpCode(value);
@@ -71,46 +105,37 @@ export function i18nUpdateOpCodesToString(
 }
 
 /**
- * Converts `I18nMutableOpCodes` array into a human readable format.
+ * Converts `I18nCreateOpCodes` array into a human readable format.
  *
- * This function is attached to the `I18nMutableOpCodes.debug` if `ngDevMode` is enabled. This
+ * This function is attached to the `I18nCreateOpCodes.debug` if `ngDevMode` is enabled. This
  * function provides a human readable view of the opcodes. This is useful when debugging the
  * application as well as writing more readable tests.
  *
- * @param this `I18nMutableOpCodes` if attached as a method.
- * @param opcodes `I18nMutableOpCodes` if invoked as a function.
+ * @param this `I18nCreateOpCodes` if attached as a method.
+ * @param opcodes `I18nCreateOpCodes` if invoked as a function.
  */
-export function i18nMutateOpCodesToString(
-    this: I18nMutateOpCodes|void, opcodes?: I18nMutateOpCodes): string[] {
+export function icuCreateOpCodesToString(
+    this: IcuCreateOpCodes|void, opcodes?: IcuCreateOpCodes): string[] {
   const parser = new OpCodeParser(opcodes || (Array.isArray(this) ? this : []));
   let lines: string[] = [];
 
   function consumeOpCode(opCode: number): string {
-    const parent = getParentFromI18nMutateOpCode(opCode);
-    const ref = getRefFromI18nMutateOpCode(opCode);
-    switch (getInstructionFromI18nMutateOpCode(opCode)) {
-      case I18nMutateOpCode.Select:
-        lastRef = ref;
-        return '';
-      case I18nMutateOpCode.AppendChild:
+    const parent = getParentFromIcuCreateOpCode(opCode);
+    const ref = getRefFromIcuCreateOpCode(opCode);
+    switch (getInstructionFromIcuCreateOpCode(opCode)) {
+      case IcuCreateOpCode.AppendChild:
         return `(lView[${parent}] as Element).appendChild(lView[${lastRef}])`;
-      case I18nMutateOpCode.Remove:
-        return `(lView[${parent}] as Element).remove(lView[${ref}])`;
-      case I18nMutateOpCode.Attr:
+      case IcuCreateOpCode.Attr:
         return `(lView[${ref}] as Element).setAttribute("${parser.consumeString()}", "${
             parser.consumeString()}")`;
-      case I18nMutateOpCode.ElementEnd:
-        return `setPreviousOrParentTNode(tView.data[${ref}] as TNode)`;
-      case I18nMutateOpCode.RemoveNestedIcu:
-        return `removeNestedICU(${ref})`;
     }
-    throw new Error('Unexpected OpCode');
+    throw new Error('Unexpected OpCode: ' + getInstructionFromIcuCreateOpCode(opCode));
   }
 
   let lastRef = -1;
   while (parser.hasMore()) {
     let value = parser.consumeNumberStringOrMarker();
-    if (value === COMMENT_MARKER) {
+    if (value === ICU_MARKER) {
       const text = parser.consumeString();
       lastRef = parser.consumeNumber();
       lines.push(`lView[${lastRef}] = document.createComment("${text}")`);
@@ -132,6 +157,35 @@ export function i18nMutateOpCodesToString(
   return lines;
 }
 
+/**
+ * Converts `I18nRemoveOpCodes` array into a human readable format.
+ *
+ * This function is attached to the `I18nRemoveOpCodes.debug` if `ngDevMode` is enabled. This
+ * function provides a human readable view of the opcodes. This is useful when debugging the
+ * application as well as writing more readable tests.
+ *
+ * @param this `I18nRemoveOpCodes` if attached as a method.
+ * @param opcodes `I18nRemoveOpCodes` if invoked as a function.
+ */
+export function i18nRemoveOpCodesToString(
+    this: I18nRemoveOpCodes|void, opcodes?: I18nRemoveOpCodes): string[] {
+  const removeCodes = opcodes || (Array.isArray(this) ? this : []);
+  let lines: string[] = [];
+
+  for (let i = 0; i < removeCodes.length; i++) {
+    const nodeOrIcuIndex = removeCodes[i] as number;
+    if (nodeOrIcuIndex > 0) {
+      // Positive numbers are `RNode`s.
+      lines.push(`remove(lView[${nodeOrIcuIndex}])`);
+    } else {
+      // Negative numbers are ICUs
+      lines.push(`removeNestedICU(${~nodeOrIcuIndex})`);
+    }
+  }
+
+  return lines;
+}
+
 
 class OpCodeParser {
   i: number = 0;
@@ -174,13 +228,13 @@ class OpCodeParser {
     return value;
   }
 
-  consumeNumberStringOrMarker(): number|string|COMMENT_MARKER|ELEMENT_MARKER {
+  consumeNumberStringOrMarker(): number|string|ICU_MARKER|ELEMENT_MARKER {
     let value = this.codes[this.i++];
-    if (typeof value === 'string' || typeof value === 'number' || value == COMMENT_MARKER ||
+    if (typeof value === 'string' || typeof value === 'number' || value == ICU_MARKER ||
         value == ELEMENT_MARKER) {
       return value;
     }
-    assertNumber(value, 'expecting number, string, COMMENT_MARKER or ELEMENT_MARKER in OpCode');
+    assertNumber(value, 'expecting number, string, ICU_MARKER or ELEMENT_MARKER in OpCode');
     return value;
   }
 }
diff --git a/packages/core/src/render3/i18n/i18n_insert_before_index.ts b/packages/core/src/render3/i18n/i18n_insert_before_index.ts
new file mode 100644
index 0000000000000..f1b419945f344
--- /dev/null
+++ b/packages/core/src/render3/i18n/i18n_insert_before_index.ts
@@ -0,0 +1,86 @@
+/**
+ * @license
+ * Copyright Google LLC 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} from '../../util/assert';
+import {TNode, TNodeType} from '../interfaces/node';
+
+/**
+ * Add `tNode` to `previousTNodes` list and update relevant `TNode`s in `previousTNodes` list
+ * `tNode.insertBeforeIndex`.
+ *
+ * Things to keep in mind:
+ * 1. All i18n text nodes are encoded as `TNodeType.Element` and are created eagerly by the
+ *    `ɵɵi18nStart` instruction.
+ * 2. All `TNodeType.Placeholder` `TNodes` are elements which will be created later by
+ *    `ɵɵelementStart` instruction.
+ * 3. `ɵɵelementStart` instruction will create `TNode`s in the ascending `TNode.index` order. (So a
+ *    smaller index `TNode` is guaranteed to be created before a larger one)
+ *
+ * We use the above three invariants to determine `TNode.insertBeforeIndex`.
+ *
+ * In an ideal world `TNode.insertBeforeIndex` would always be `TNode.next.index`. However,
+ * this will not work because `TNode.next.index` may be larger than `TNode.index` which means that
+ * the next node is not yet created and therefore we can't insert in front of it.
+ *
+ * Rule1: `TNode.insertBeforeIndex = null` if `TNode.next === null` (Initial condition, as we don't
+ *        know if there will be further `TNode`s inserted after.)
+ * Rule2: If `previousTNode` is created after the `tNode` being inserted, then
+ *        `previousTNode.insertBeforeNode = tNode.index` (So when a new `tNode` is added we check
+ *        previous to see if we can update its `insertBeforeTNode`)
+ *
+ * See `TNode.insertBeforeIndex` for more context.
+ *
+ * @param previousTNodes A list of previous TNodes so that we can easily traverse `TNode`s in
+ *     reverse order. (If `TNode` would have `previous` this would not be necessary.)
+ * @param newTNode A TNode to add to the `previousTNodes` list.
+ */
+export function addTNodeAndUpdateInsertBeforeIndex(previousTNodes: TNode[], newTNode: TNode) {
+  // Start with Rule1
+  ngDevMode &&
+      assertEqual(newTNode.insertBeforeIndex, null, 'We expect that insertBeforeIndex is not set');
+
+  previousTNodes.push(newTNode);
+  if (previousTNodes.length > 1) {
+    for (let i = previousTNodes.length - 2; i >= 0; i--) {
+      const existingTNode = previousTNodes[i];
+      // Text nodes are created eagerly and so they don't need their `indexBeforeIndex` updated.
+      // It is safe to ignore them.
+      if (!isI18nText(existingTNode)) {
+        if (isNewTNodeCreatedBefore(existingTNode, newTNode) &&
+            getInsertBeforeIndex(existingTNode) === null) {
+          // If it was created before us in time, (and it does not yet have `insertBeforeIndex`)
+          // then add the `insertBeforeIndex`.
+          setInsertBeforeIndex(existingTNode, newTNode.index);
+        }
+      }
+    }
+  }
+}
+
+function isI18nText(tNode: TNode): boolean {
+  return !(tNode.type & TNodeType.Placeholder);
+}
+
+function isNewTNodeCreatedBefore(existingTNode: TNode, newTNode: TNode): boolean {
+  return isI18nText(newTNode) || existingTNode.index > newTNode.index;
+}
+
+function getInsertBeforeIndex(tNode: TNode): number|null {
+  const index = tNode.insertBeforeIndex;
+  return Array.isArray(index) ? index[0] : index;
+}
+
+function setInsertBeforeIndex(tNode: TNode, value: number): void {
+  const index = tNode.insertBeforeIndex;
+  if (Array.isArray(index)) {
+    // Array is stored if we have to insert child nodes. See `TNode.insertBeforeIndex`
+    index[0] = value;
+  } else {
+    tNode.insertBeforeIndex = value;
+  }
+}
diff --git a/packages/core/src/render3/i18n/i18n_locale_id.ts b/packages/core/src/render3/i18n/i18n_locale_id.ts
new file mode 100644
index 0000000000000..66d9074854256
--- /dev/null
+++ b/packages/core/src/render3/i18n/i18n_locale_id.ts
@@ -0,0 +1,41 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {DEFAULT_LOCALE_ID} from '../../i18n/localization';
+import {assertDefined} from '../../util/assert';
+
+
+/**
+ * The locale id that the application is currently using (for translations and ICU expressions).
+ * This is the ivy version of `LOCALE_ID` that was defined as an injection token for the view engine
+ * but is now defined as a global value.
+ */
+let LOCALE_ID = DEFAULT_LOCALE_ID;
+
+/**
+ * Sets the locale id that will be used for translations and ICU expressions.
+ * This is the ivy version of `LOCALE_ID` that was defined as an injection token for the view engine
+ * but is now defined as a global value.
+ *
+ * @param localeId
+ */
+export function setLocaleId(localeId: string) {
+  assertDefined(localeId, `Expected localeId to be defined`);
+  if (typeof localeId === 'string') {
+    LOCALE_ID = localeId.toLowerCase().replace(/_/g, '-');
+  }
+}
+
+/**
+ * Gets the locale id that will be used for translations and ICU expressions.
+ * This is the ivy version of `LOCALE_ID` that was defined as an injection token for the view engine
+ * but is now defined as a global value.
+ */
+export function getLocaleId(): string {
+  return LOCALE_ID;
+}
diff --git a/packages/core/src/render3/i18n/i18n_parse.ts b/packages/core/src/render3/i18n/i18n_parse.ts
new file mode 100644
index 0000000000000..2e4de13f35d29
--- /dev/null
+++ b/packages/core/src/render3/i18n/i18n_parse.ts
@@ -0,0 +1,708 @@
+/**
+ * @license
+ * Copyright Google LLC 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 '../../util/ng_dev_mode';
+import '../../util/ng_i18n_closure_mode';
+
+import {getTemplateContent, SRCSET_ATTRS, URI_ATTRS, VALID_ATTRS, VALID_ELEMENTS} from '../../sanitization/html_sanitizer';
+import {getInertBodyHelper} from '../../sanitization/inert_body';
+import {_sanitizeUrl, sanitizeSrcset} from '../../sanitization/url_sanitizer';
+import {assertDefined, assertEqual, assertGreaterThanOrEqual, assertOneOf, assertString} from '../../util/assert';
+import {CharCode} from '../../util/char_code';
+import {loadIcuContainerVisitor} from '../instructions/i18n_icu_container_visitor';
+import {allocExpando, createTNodeAtIndex, elementAttributeInternal, setInputsForProperty, setNgReflectProperties} from '../instructions/shared';
+import {getDocument} from '../interfaces/document';
+import {ELEMENT_MARKER, I18nCreateOpCode, I18nCreateOpCodes, I18nRemoveOpCodes, I18nUpdateOpCode, I18nUpdateOpCodes, ICU_MARKER, IcuCreateOpCode, IcuCreateOpCodes, IcuExpression, IcuType, TI18n, TIcu} from '../interfaces/i18n';
+import {TNode, TNodeType} from '../interfaces/node';
+import {RComment, RElement} from '../interfaces/renderer';
+import {SanitizerFn} from '../interfaces/sanitization';
+import {HEADER_OFFSET, LView, TView} from '../interfaces/view';
+import {getCurrentParentTNode, getCurrentTNode, setCurrentTNode} from '../state';
+import {attachDebugGetter} from '../util/debug_utils';
+import {getNativeByIndex, getTNode} from '../util/view_utils';
+
+import {i18nCreateOpCodesToString, i18nRemoveOpCodesToString, i18nUpdateOpCodesToString, icuCreateOpCodesToString} from './i18n_debug';
+import {addTNodeAndUpdateInsertBeforeIndex} from './i18n_insert_before_index';
+import {ensureIcuContainerVisitorLoaded} from './i18n_tree_shaking';
+import {createTNodePlaceholder, icuCreateOpCode, setTIcu, setTNodeInsertBeforeIndex} from './i18n_util';
+
+
+
+const BINDING_REGEXP = /�(\d+):?\d*�/gi;
+const ICU_REGEXP = /({\s*�\d+:?\d*�\s*,\s*\S{6}\s*,[\s\S]*})/gi;
+const NESTED_ICU = /�(\d+)�/;
+const ICU_BLOCK_REGEXP = /^\s*(�\d+:?\d*�)\s*,\s*(select|plural)\s*,/;
+
+const MARKER = `�`;
+const SUBTEMPLATE_REGEXP = /�\/?\*(\d+:\d+)�/gi;
+const PH_REGEXP = /�(\/?[#*!]\d+):?\d*�/gi;
+
+/**
+ * Angular Dart introduced &ngsp; as a placeholder for non-removable space, see:
+ * https://github.com/dart-lang/angular/blob/0bb611387d29d65b5af7f9d2515ab571fd3fbee4/_tests/test/compiler/preserve_whitespace_test.dart#L25-L32
+ * In Angular Dart &ngsp; is converted to the 0xE500 PUA (Private Use Areas) unicode character
+ * and later on replaced by a space. We are re-implementing the same idea here, since translations
+ * might contain this special character.
+ */
+const NGSP_UNICODE_REGEXP = /\uE500/g;
+function replaceNgsp(value: string): string {
+  return value.replace(NGSP_UNICODE_REGEXP, ' ');
+}
+
+/**
+ * Create dynamic nodes from i18n translation block.
+ *
+ * - Text nodes are created synchronously
+ * - TNodes are linked into tree lazily
+ *
+ * @param tView Current `TView`
+ * @parentTNodeIndex index to the parent TNode of this i18n block
+ * @param lView Current `LView`
+ * @param index Index of `ɵɵi18nStart` instruction.
+ * @param message Message to translate.
+ * @param subTemplateIndex Index into the sub template of message translation. (ie in case of
+ *     `ngIf`) (-1 otherwise)
+ */
+export function i18nStartFirstCreatePass(
+    tView: TView, parentTNodeIndex: number, lView: LView, index: number, message: string,
+    subTemplateIndex: number) {
+  const rootTNode = getCurrentParentTNode();
+  const createOpCodes: I18nCreateOpCodes = [] as any;
+  const updateOpCodes: I18nUpdateOpCodes = [] as any;
+  const existingTNodeStack: TNode[][] = [[]];
+  if (ngDevMode) {
+    attachDebugGetter(createOpCodes, i18nCreateOpCodesToString);
+    attachDebugGetter(updateOpCodes, i18nUpdateOpCodesToString);
+  }
+
+  message = getTranslationForTemplate(message, subTemplateIndex);
+  const msgParts = replaceNgsp(message).split(PH_REGEXP);
+  for (let i = 0; i < msgParts.length; i++) {
+    let value = msgParts[i];
+    if ((i & 1) === 0) {
+      // Even indexes are text (including bindings & ICU expressions)
+      const parts = i18nParseTextIntoPartsAndICU(value);
+      for (let j = 0; j < parts.length; j++) {
+        let part = parts[j];
+        if ((j & 1) === 0) {
+          // `j` is odd therefore `part` is string
+          const text = part as string;
+          ngDevMode && assertString(text, 'Parsed ICU part should be string');
+          if (text !== '') {
+            i18nStartFirstCreatePassProcessTextNode(
+                tView, rootTNode, existingTNodeStack[0], createOpCodes, updateOpCodes, lView, text);
+          }
+        } else {
+          // `j` is Even therefor `part` is an `ICUExpression`
+          const icuExpression: IcuExpression = part as IcuExpression;
+          // Verify that ICU expression has the right shape. Translations might contain invalid
+          // constructions (while original messages were correct), so ICU parsing at runtime may
+          // not succeed (thus `icuExpression` remains a string).
+          if (ngDevMode && typeof icuExpression !== 'object') {
+            throw new Error(`Unable to parse ICU expression in "${message}" message.`);
+          }
+          const icuContainerTNode = createTNodeAndAddOpCode(
+              tView, rootTNode, existingTNodeStack[0], lView, createOpCodes,
+              ngDevMode ? `ICU ${index}:${icuExpression.mainBinding}` : '', true);
+          const icuNodeIndex = icuContainerTNode.index;
+          ngDevMode &&
+              assertGreaterThanOrEqual(
+                  icuNodeIndex, HEADER_OFFSET, 'Index must be in absolute LView offset');
+          icuStart(tView, lView, updateOpCodes, parentTNodeIndex, icuExpression, icuNodeIndex);
+        }
+      }
+    } else {
+      // Odd indexes are placeholders (elements and sub-templates)
+      // At this point value is something like: '/#1:2' (orginally coming from '�/#1:2�')
+      const isClosing = value.charCodeAt(0) === CharCode.SLASH;
+      const type = value.charCodeAt(isClosing ? 1 : 0);
+      ngDevMode && assertOneOf(type, CharCode.STAR, CharCode.HASH, CharCode.EXCLAMATION);
+      const index = HEADER_OFFSET + Number.parseInt(value.substring((isClosing ? 2 : 1)));
+      if (isClosing) {
+        existingTNodeStack.shift();
+        setCurrentTNode(getCurrentParentTNode()!, false);
+      } else {
+        const tNode = createTNodePlaceholder(tView, existingTNodeStack[0], index);
+        existingTNodeStack.unshift([]);
+        setCurrentTNode(tNode, true);
+      }
+    }
+  }
+
+  tView.data[index] = <TI18n>{
+    create: createOpCodes,
+    update: updateOpCodes,
+  };
+}
+
+/**
+ * Allocate space in i18n Range add create OpCode instruction to crete a text or comment node.
+ *
+ * @param tView Current `TView` needed to allocate space in i18n range.
+ * @param rootTNode Root `TNode` of the i18n block. This node determines if the new TNode will be
+ *     added as part of the `i18nStart` instruction or as part of the `TNode.insertBeforeIndex`.
+ * @param existingTNodes internal state for `addTNodeAndUpdateInsertBeforeIndex`.
+ * @param lView Current `LView` needed to allocate space in i18n range.
+ * @param createOpCodes Array storing `I18nCreateOpCodes` where new opCodes will be added.
+ * @param text Text to be added when the `Text` or `Comment` node will be created.
+ * @param isICU true if a `Comment` node for ICU (instead of `Text`) node should be created.
+ */
+function createTNodeAndAddOpCode(
+    tView: TView, rootTNode: TNode|null, existingTNodes: TNode[], lView: LView,
+    createOpCodes: I18nCreateOpCodes, text: string|null, isICU: boolean): TNode {
+  const i18nNodeIdx = allocExpando(tView, lView, 1);
+  let opCode = i18nNodeIdx << I18nCreateOpCode.SHIFT;
+  let parentTNode = getCurrentParentTNode();
+
+  if (rootTNode === parentTNode) {
+    // FIXME(misko): A null `parentTNode` should represent when we fall of the `LView` boundary.
+    // (there is no parent), but in some circumstances (because we are inconsistent about how we set
+    // `previousOrParentTNode`) it could point to `rootTNode` So this is a work around.
+    parentTNode = null;
+  }
+  if (parentTNode === null) {
+    // If we don't have a parent that means that we can eagerly add nodes.
+    // If we have a parent than these nodes can't be added now (as the parent has not been created
+    // yet) and instead the `parentTNode` is responsible for adding it. See
+    // `TNode.insertBeforeIndex`
+    opCode |= I18nCreateOpCode.APPEND_EAGERLY;
+  }
+  if (isICU) {
+    opCode |= I18nCreateOpCode.COMMENT;
+    ensureIcuContainerVisitorLoaded(loadIcuContainerVisitor);
+  }
+  createOpCodes.push(opCode, text === null ? '' : text);
+  // We store `{{?}}` so that when looking at debug `TNodeType.template` we can see where the
+  // bindings are.
+  const tNode = createTNodeAtIndex(
+      tView, i18nNodeIdx, isICU ? TNodeType.Icu : TNodeType.Text,
+      text === null ? (ngDevMode ? '{{?}}' : '') : text, null);
+  addTNodeAndUpdateInsertBeforeIndex(existingTNodes, tNode);
+  const tNodeIdx = tNode.index;
+  setCurrentTNode(tNode, false /* Text nodes are self closing */);
+  if (parentTNode !== null && rootTNode !== parentTNode) {
+    // We are a child of deeper node (rather than a direct child of `i18nStart` instruction.)
+    // We have to make sure to add ourselves to the parent.
+    setTNodeInsertBeforeIndex(parentTNode, tNodeIdx);
+  }
+  return tNode;
+}
+
+/**
+ * Processes text node in i18n block.
+ *
+ * Text nodes can have:
+ * - Create instruction in `createOpCodes` for creating the text node.
+ * - Allocate spec for text node in i18n range of `LView`
+ * - If contains binding:
+ *    - bindings => allocate space in i18n range of `LView` to store the binding value.
+ *    - populate `updateOpCodes` with update instructions.
+ *
+ * @param tView Current `TView`
+ * @param rootTNode Root `TNode` of the i18n block. This node determines if the new TNode will
+ *     be added as part of the `i18nStart` instruction or as part of the
+ *     `TNode.insertBeforeIndex`.
+ * @param existingTNodes internal state for `addTNodeAndUpdateInsertBeforeIndex`.
+ * @param createOpCodes Location where the creation OpCodes will be stored.
+ * @param lView Current `LView`
+ * @param text The translated text (which may contain binding)
+ */
+function i18nStartFirstCreatePassProcessTextNode(
+    tView: TView, rootTNode: TNode|null, existingTNodes: TNode[], createOpCodes: I18nCreateOpCodes,
+    updateOpCodes: I18nUpdateOpCodes, lView: LView, text: string): void {
+  const hasBinding = text.match(BINDING_REGEXP);
+  const tNode = createTNodeAndAddOpCode(
+      tView, rootTNode, existingTNodes, lView, createOpCodes, hasBinding ? null : text, false);
+  if (hasBinding) {
+    generateBindingUpdateOpCodes(updateOpCodes, text, tNode.index);
+  }
+}
+
+/**
+ * See `i18nAttributes` above.
+ */
+export function i18nAttributesFirstPass(
+    lView: LView, tView: TView, index: number, values: string[]) {
+  const previousElement = getCurrentTNode()!;
+  const previousElementIndex = previousElement.index;
+  const updateOpCodes: I18nUpdateOpCodes = [] as any;
+  if (ngDevMode) {
+    attachDebugGetter(updateOpCodes, i18nUpdateOpCodesToString);
+  }
+  for (let i = 0; i < values.length; i += 2) {
+    const attrName = values[i];
+    const message = values[i + 1];
+    const parts = message.split(ICU_REGEXP);
+    for (let j = 0; j < parts.length; j++) {
+      const value = parts[j];
+
+      if (j & 1) {
+        // Odd indexes are ICU expressions
+        // TODO(ocombe): support ICU expressions in attributes
+        throw new Error('ICU expressions are not yet supported in attributes');
+      } else if (value !== '') {
+        // Even indexes are text (including bindings)
+        const hasBinding = !!value.match(BINDING_REGEXP);
+        if (hasBinding) {
+          if (tView.firstCreatePass && tView.data[index] === null) {
+            generateBindingUpdateOpCodes(updateOpCodes, value, previousElementIndex, attrName);
+          }
+        } else {
+          const tNode = getTNode(tView, previousElementIndex);
+          // Set attributes for Elements only, for other types (like ElementContainer),
+          // only set inputs below
+          if (tNode.type & TNodeType.AnyRNode) {
+            elementAttributeInternal(tNode, lView, attrName, value, null, null);
+          }
+          // Check if that attribute is a directive input
+          const dataValue = tNode.inputs !== null && tNode.inputs[attrName];
+          if (dataValue) {
+            setInputsForProperty(tView, lView, dataValue, attrName, value);
+            if (ngDevMode) {
+              const element = getNativeByIndex(previousElementIndex, lView) as RElement | RComment;
+              setNgReflectProperties(lView, element, tNode.type, dataValue, value);
+            }
+          }
+        }
+      }
+    }
+  }
+
+  if (tView.firstCreatePass && tView.data[index] === null) {
+    tView.data[index] = updateOpCodes;
+  }
+}
+
+
+/**
+ * Generate the OpCodes to update the bindings of a string.
+ *
+ * @param updateOpCodes Place where the update opcodes will be stored.
+ * @param str The string containing the bindings.
+ * @param destinationNode Index of the destination node which will receive the binding.
+ * @param attrName Name of the attribute, if the string belongs to an attribute.
+ * @param sanitizeFn Sanitization function used to sanitize the string after update, if necessary.
+ */
+export function generateBindingUpdateOpCodes(
+    updateOpCodes: I18nUpdateOpCodes, str: string, destinationNode: number, attrName?: string,
+    sanitizeFn: SanitizerFn|null = null): number {
+  ngDevMode &&
+      assertGreaterThanOrEqual(
+          destinationNode, HEADER_OFFSET, 'Index must be in absolute LView offset');
+  const maskIndex = updateOpCodes.length;  // Location of mask
+  const sizeIndex = maskIndex + 1;         // location of size for skipping
+  updateOpCodes.push(null, null);          // Alloc space for mask and size
+  const startIndex = maskIndex + 2;        // location of first allocation.
+  if (ngDevMode) {
+    attachDebugGetter(updateOpCodes, i18nUpdateOpCodesToString);
+  }
+  const textParts = str.split(BINDING_REGEXP);
+  let mask = 0;
+
+  for (let j = 0; j < textParts.length; j++) {
+    const textValue = textParts[j];
+
+    if (j & 1) {
+      // Odd indexes are bindings
+      const bindingIndex = parseInt(textValue, 10);
+      updateOpCodes.push(-1 - bindingIndex);
+      mask = mask | toMaskBit(bindingIndex);
+    } else if (textValue !== '') {
+      // Even indexes are text
+      updateOpCodes.push(textValue);
+    }
+  }
+
+  updateOpCodes.push(
+      destinationNode << I18nUpdateOpCode.SHIFT_REF |
+      (attrName ? I18nUpdateOpCode.Attr : I18nUpdateOpCode.Text));
+  if (attrName) {
+    updateOpCodes.push(attrName, sanitizeFn);
+  }
+  updateOpCodes[maskIndex] = mask;
+  updateOpCodes[sizeIndex] = updateOpCodes.length - startIndex;
+  return mask;
+}
+
+
+/**
+ * Convert binding index to mask bit.
+ *
+ * Each index represents a single bit on the bit-mask. Because bit-mask only has 32 bits, we make
+ * the 32nd bit share all masks for all bindings higher than 32. Since it is extremely rare to
+ * have more than 32 bindings this will be hit very rarely. The downside of hitting this corner
+ * case is that we will execute binding code more often than necessary. (penalty of performance)
+ */
+function toMaskBit(bindingIndex: number): number {
+  return 1 << Math.min(bindingIndex, 31);
+}
+
+export function isRootTemplateMessage(subTemplateIndex: number): subTemplateIndex is - 1 {
+  return subTemplateIndex === -1;
+}
+
+
+/**
+ * Removes everything inside the sub-templates of a message.
+ */
+function removeInnerTemplateTranslation(message: string): string {
+  let match;
+  let res = '';
+  let index = 0;
+  let inTemplate = false;
+  let tagMatched;
+
+  while ((match = SUBTEMPLATE_REGEXP.exec(message)) !== null) {
+    if (!inTemplate) {
+      res += message.substring(index, match.index + match[0].length);
+      tagMatched = match[1];
+      inTemplate = true;
+    } else {
+      if (match[0] === `${MARKER}/*${tagMatched}${MARKER}`) {
+        index = match.index;
+        inTemplate = false;
+      }
+    }
+  }
+
+  ngDevMode &&
+      assertEqual(
+          inTemplate, false,
+          `Tag mismatch: unable to find the end of the sub-template in the translation "${
+              message}"`);
+
+  res += message.substr(index);
+  return res;
+}
+
+
+/**
+ * Extracts a part of a message and removes the rest.
+ *
+ * This method is used for extracting a part of the message associated with a template. A
+ * translated message can span multiple templates.
+ *
+ * Example:
+ * ```
+ * <div i18n>Translate <span *ngIf>me</span>!</div>
+ * ```
+ *
+ * @param message The message to crop
+ * @param subTemplateIndex Index of the sub-template to extract. If undefined it returns the
+ * external template and removes all sub-templates.
+ */
+export function getTranslationForTemplate(message: string, subTemplateIndex: number) {
+  if (isRootTemplateMessage(subTemplateIndex)) {
+    // We want the root template message, ignore all sub-templates
+    return removeInnerTemplateTranslation(message);
+  } else {
+    // We want a specific sub-template
+    const start =
+        message.indexOf(`:${subTemplateIndex}${MARKER}`) + 2 + subTemplateIndex.toString().length;
+    const end = message.search(new RegExp(`${MARKER}\\/\\*\\d+:${subTemplateIndex}${MARKER}`));
+    return removeInnerTemplateTranslation(message.substring(start, end));
+  }
+}
+
+/**
+ * Generate the OpCodes for ICU expressions.
+ *
+ * @param icuExpression
+ * @param index Index where the anchor is stored and an optional `TIcuContainerNode`
+ *   - `lView[anchorIdx]` points to a `Comment` node representing the anchor for the ICU.
+ *   - `tView.data[anchorIdx]` points to the `TIcuContainerNode` if ICU is root (`null` otherwise)
+ */
+export function icuStart(
+    tView: TView, lView: LView, updateOpCodes: I18nUpdateOpCodes, parentIdx: number,
+    icuExpression: IcuExpression, anchorIdx: number) {
+  ngDevMode && assertDefined(icuExpression, 'ICU expression must be defined');
+  let bindingMask = 0;
+  const tIcu: TIcu = {
+    type: icuExpression.type,
+    currentCaseLViewIndex: allocExpando(tView, lView, 1),
+    anchorIdx,
+    cases: [],
+    create: [],
+    remove: [],
+    update: []
+  };
+  addUpdateIcuSwitch(updateOpCodes, icuExpression, anchorIdx);
+  setTIcu(tView, anchorIdx, tIcu);
+  const values = icuExpression.values;
+  for (let i = 0; i < values.length; i++) {
+    // Each value is an array of strings & other ICU expressions
+    const valueArr = values[i];
+    const nestedIcus: IcuExpression[] = [];
+    for (let j = 0; j < valueArr.length; j++) {
+      const value = valueArr[j];
+      if (typeof value !== 'string') {
+        // It is an nested ICU expression
+        const icuIndex = nestedIcus.push(value as IcuExpression) - 1;
+        // Replace nested ICU expression by a comment node
+        valueArr[j] = `<!--�${icuIndex}�-->`;
+      }
+    }
+    bindingMask = parseIcuCase(
+                      tView, tIcu, lView, updateOpCodes, parentIdx, icuExpression.cases[i],
+                      valueArr.join(''), nestedIcus) |
+        bindingMask;
+  }
+  if (bindingMask) {
+    addUpdateIcuUpdate(updateOpCodes, bindingMask, anchorIdx);
+  }
+}
+
+/**
+ * Parses text containing an ICU expression and produces a JSON object for it.
+ * Original code from closure library, modified for Angular.
+ *
+ * @param pattern Text containing an ICU expression that needs to be parsed.
+ *
+ */
+export function parseICUBlock(pattern: string): IcuExpression {
+  const cases = [];
+  const values: (string|IcuExpression)[][] = [];
+  let icuType = IcuType.plural;
+  let mainBinding = 0;
+  pattern = pattern.replace(ICU_BLOCK_REGEXP, function(str: string, binding: string, type: string) {
+    if (type === 'select') {
+      icuType = IcuType.select;
+    } else {
+      icuType = IcuType.plural;
+    }
+    mainBinding = parseInt(binding.substr(1), 10);
+    return '';
+  });
+
+  const parts = i18nParseTextIntoPartsAndICU(pattern) as string[];
+  // Looking for (key block)+ sequence. One of the keys has to be "other".
+  for (let pos = 0; pos < parts.length;) {
+    let key = parts[pos++].trim();
+    if (icuType === IcuType.plural) {
+      // Key can be "=x", we just want "x"
+      key = key.replace(/\s*(?:=)?(\w+)\s*/, '$1');
+    }
+    if (key.length) {
+      cases.push(key);
+    }
+
+    const blocks = i18nParseTextIntoPartsAndICU(parts[pos++]) as string[];
+    if (cases.length > values.length) {
+      values.push(blocks);
+    }
+  }
+
+  // TODO(ocombe): support ICU expressions in attributes, see #21615
+  return {type: icuType, mainBinding: mainBinding, cases, values};
+}
+
+
+/**
+ * Breaks pattern into strings and top level {...} blocks.
+ * Can be used to break a message into text and ICU expressions, or to break an ICU expression
+ * into keys and cases. Original code from closure library, modified for Angular.
+ *
+ * @param pattern (sub)Pattern to be broken.
+ * @returns An `Array<string|IcuExpression>` where:
+ *   - odd positions: `string` => text between ICU expressions
+ *   - even positions: `ICUExpression` => ICU expression parsed into `ICUExpression` record.
+ */
+export function i18nParseTextIntoPartsAndICU(pattern: string): (string|IcuExpression)[] {
+  if (!pattern) {
+    return [];
+  }
+
+  let prevPos = 0;
+  const braceStack = [];
+  const results: (string|IcuExpression)[] = [];
+  const braces = /[{}]/g;
+  // lastIndex doesn't get set to 0 so we have to.
+  braces.lastIndex = 0;
+
+  let match;
+  while (match = braces.exec(pattern)) {
+    const pos = match.index;
+    if (match[0] == '}') {
+      braceStack.pop();
+
+      if (braceStack.length == 0) {
+        // End of the block.
+        const block = pattern.substring(prevPos, pos);
+        if (ICU_BLOCK_REGEXP.test(block)) {
+          results.push(parseICUBlock(block));
+        } else {
+          results.push(block);
+        }
+
+        prevPos = pos + 1;
+      }
+    } else {
+      if (braceStack.length == 0) {
+        const substring = pattern.substring(prevPos, pos);
+        results.push(substring);
+        prevPos = pos + 1;
+      }
+      braceStack.push('{');
+    }
+  }
+
+  const substring = pattern.substring(prevPos);
+  results.push(substring);
+  return results;
+}
+
+
+/**
+ * Parses a node, its children and its siblings, and generates the mutate & update OpCodes.
+ *
+ */
+export function parseIcuCase(
+    tView: TView, tIcu: TIcu, lView: LView, updateOpCodes: I18nUpdateOpCodes, parentIdx: number,
+    caseName: string, unsafeCaseHtml: string, nestedIcus: IcuExpression[]): number {
+  const create: IcuCreateOpCodes = [] as any;
+  const remove: I18nRemoveOpCodes = [] as any;
+  const update: I18nUpdateOpCodes = [] as any;
+  if (ngDevMode) {
+    attachDebugGetter(create, icuCreateOpCodesToString);
+    attachDebugGetter(remove, i18nRemoveOpCodesToString);
+    attachDebugGetter(update, i18nUpdateOpCodesToString);
+  }
+  tIcu.cases.push(caseName);
+  tIcu.create.push(create);
+  tIcu.remove.push(remove);
+  tIcu.update.push(update);
+
+  const inertBodyHelper = getInertBodyHelper(getDocument());
+  const inertBodyElement = inertBodyHelper.getInertBodyElement(unsafeCaseHtml);
+  ngDevMode && assertDefined(inertBodyElement, 'Unable to generate inert body element');
+  const inertRootNode = getTemplateContent(inertBodyElement!) as Element || inertBodyElement;
+  if (inertRootNode) {
+    return walkIcuTree(
+        tView, tIcu, lView, updateOpCodes, create, remove, update, inertRootNode, parentIdx,
+        nestedIcus, 0);
+  } else {
+    return 0;
+  }
+}
+
+function walkIcuTree(
+    tView: TView, tIcu: TIcu, lView: LView, sharedUpdateOpCodes: I18nUpdateOpCodes,
+    create: IcuCreateOpCodes, remove: I18nRemoveOpCodes, update: I18nUpdateOpCodes,
+    parentNode: Element, parentIdx: number, nestedIcus: IcuExpression[], depth: number): number {
+  let bindingMask = 0;
+  let currentNode = parentNode.firstChild;
+  while (currentNode) {
+    const newIndex = allocExpando(tView, lView, 1);
+    switch (currentNode.nodeType) {
+      case Node.ELEMENT_NODE:
+        const element = currentNode as Element;
+        const tagName = element.tagName.toLowerCase();
+        if (VALID_ELEMENTS.hasOwnProperty(tagName)) {
+          addCreateNodeAndAppend(create, ELEMENT_MARKER, tagName, parentIdx, newIndex);
+          tView.data[newIndex] = tagName;
+          const elAttrs = element.attributes;
+          for (let i = 0; i < elAttrs.length; i++) {
+            const attr = elAttrs.item(i)!;
+            const lowerAttrName = attr.name.toLowerCase();
+            const hasBinding = !!attr.value.match(BINDING_REGEXP);
+            // we assume the input string is safe, unless it's using a binding
+            if (hasBinding) {
+              if (VALID_ATTRS.hasOwnProperty(lowerAttrName)) {
+                if (URI_ATTRS[lowerAttrName]) {
+                  generateBindingUpdateOpCodes(
+                      update, attr.value, newIndex, attr.name, _sanitizeUrl);
+                } else if (SRCSET_ATTRS[lowerAttrName]) {
+                  generateBindingUpdateOpCodes(
+                      update, attr.value, newIndex, attr.name, sanitizeSrcset);
+                } else {
+                  generateBindingUpdateOpCodes(update, attr.value, newIndex, attr.name);
+                }
+              } else {
+                ngDevMode && console.warn(` WARNING:
+      ignoring unsafe attribute value ${lowerAttrName} on element $ {
+    tagName
+  } (see http://g.co/ng/security#xss)`);
+              }
+            } else {
+              addCreateAttribute(create, newIndex, attr);
+            }
+          }
+          // Parse the children of this node (if any)
+          bindingMask = walkIcuTree(
+                            tView, tIcu, lView, sharedUpdateOpCodes, create, remove, update,
+                            currentNode as Element, newIndex, nestedIcus, depth + 1) |
+              bindingMask;
+          addRemoveNode(remove, newIndex, depth);
+        }
+        break;
+      case Node.TEXT_NODE:
+        const value = currentNode.textContent || '';
+        const hasBinding = value.match(BINDING_REGEXP);
+        addCreateNodeAndAppend(create, null, hasBinding ? '' : value, parentIdx, newIndex);
+        addRemoveNode(remove, newIndex, depth);
+        if (hasBinding) {
+          bindingMask = generateBindingUpdateOpCodes(update, value, newIndex) | bindingMask;
+        }
+        break;
+      case Node.COMMENT_NODE:
+        // Check if the comment node is a placeholder for a nested ICU
+        const isNestedIcu = NESTED_ICU.exec(currentNode.textContent || '');
+        if (isNestedIcu) {
+          const nestedIcuIndex = parseInt(isNestedIcu[1], 10);
+          const icuExpression: IcuExpression = nestedIcus[nestedIcuIndex];
+          // Create the comment node that will anchor the ICU expression
+          addCreateNodeAndAppend(
+              create, ICU_MARKER, ngDevMode ? `nested ICU ${nestedIcuIndex}` : '', parentIdx,
+              newIndex);
+          icuStart(tView, lView, sharedUpdateOpCodes, parentIdx, icuExpression, newIndex);
+          addRemoveNestedIcu(remove, newIndex, depth);
+        }
+        break;
+    }
+    currentNode = currentNode.nextSibling;
+  }
+  return bindingMask;
+}
+
+function addRemoveNode(remove: I18nRemoveOpCodes, index: number, depth: number) {
+  if (depth === 0) {
+    remove.push(index);
+  }
+}
+
+function addRemoveNestedIcu(remove: I18nRemoveOpCodes, index: number, depth: number) {
+  if (depth === 0) {
+    remove.push(~index);  // remove ICU at `index`
+    remove.push(index);   // remove ICU comment at `index`
+  }
+}
+
+function addUpdateIcuSwitch(
+    update: I18nUpdateOpCodes, icuExpression: IcuExpression, index: number) {
+  update.push(
+      toMaskBit(icuExpression.mainBinding), 2, -1 - icuExpression.mainBinding,
+      index << I18nUpdateOpCode.SHIFT_REF | I18nUpdateOpCode.IcuSwitch);
+}
+
+function addUpdateIcuUpdate(update: I18nUpdateOpCodes, bindingMask: number, index: number) {
+  update.push(bindingMask, 1, index << I18nUpdateOpCode.SHIFT_REF | I18nUpdateOpCode.IcuUpdate);
+}
+
+function addCreateNodeAndAppend(
+    create: IcuCreateOpCodes, marker: null|ICU_MARKER|ELEMENT_MARKER, text: string,
+    appendToParentIdx: number, createAtIdx: number) {
+  if (marker !== null) {
+    create.push(marker);
+  }
+  create.push(
+      text, createAtIdx,
+      icuCreateOpCode(IcuCreateOpCode.AppendChild, appendToParentIdx, createAtIdx));
+}
+
+function addCreateAttribute(create: IcuCreateOpCodes, newIndex: number, attr: Attr) {
+  create.push(newIndex << IcuCreateOpCode.SHIFT_REF | IcuCreateOpCode.Attr, attr.name, attr.value);
+}
\ No newline at end of file
diff --git a/packages/core/src/render3/i18n/i18n_postprocess.ts b/packages/core/src/render3/i18n/i18n_postprocess.ts
new file mode 100644
index 0000000000000..10ecf87f092dc
--- /dev/null
+++ b/packages/core/src/render3/i18n/i18n_postprocess.ts
@@ -0,0 +1,134 @@
+/**
+ * @license
+ * Copyright Google LLC 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
+ */
+
+// i18nPostprocess consts
+const ROOT_TEMPLATE_ID = 0;
+const PP_MULTI_VALUE_PLACEHOLDERS_REGEXP = /\[(�.+?�?)\]/;
+const PP_PLACEHOLDERS_REGEXP = /\[(�.+?�?)\]|(�\/?\*\d+:\d+�)/g;
+const PP_ICU_VARS_REGEXP = /({\s*)(VAR_(PLURAL|SELECT)(_\d+)?)(\s*,)/g;
+const PP_ICU_PLACEHOLDERS_REGEXP = /{([A-Z0-9_]+)}/g;
+const PP_ICUS_REGEXP = /�I18N_EXP_(ICU(_\d+)?)�/g;
+const PP_CLOSE_TEMPLATE_REGEXP = /\/\*/;
+const PP_TEMPLATE_ID_REGEXP = /\d+\:(\d+)/;
+
+// Parsed placeholder structure used in postprocessing (within `i18nPostprocess` function)
+// Contains the following fields: [templateId, isCloseTemplateTag, placeholder]
+type PostprocessPlaceholder = [number, boolean, string];
+
+
+/**
+ * Handles message string post-processing for internationalization.
+ *
+ * Handles message string post-processing by transforming it from intermediate
+ * format (that might contain some markers that we need to replace) to the final
+ * form, consumable by i18nStart instruction. Post processing steps include:
+ *
+ * 1. Resolve all multi-value cases (like [�*1:1��#2:1�|�#4:1�|�5�])
+ * 2. Replace all ICU vars (like "VAR_PLURAL")
+ * 3. Replace all placeholders used inside ICUs in a form of {PLACEHOLDER}
+ * 4. Replace all ICU references with corresponding values (like �ICU_EXP_ICU_1�)
+ *    in case multiple ICUs have the same placeholder name
+ *
+ * @param message Raw translation string for post processing
+ * @param replacements Set of replacements that should be applied
+ *
+ * @returns Transformed string that can be consumed by i18nStart instruction
+ *
+ * @codeGenApi
+ */
+export function i18nPostprocess(
+    message: string, replacements: {[key: string]: (string|string[])} = {}): string {
+  /**
+   * Step 1: resolve all multi-value placeholders like [�#5�|�*1:1��#2:1�|�#4:1�]
+   *
+   * Note: due to the way we process nested templates (BFS), multi-value placeholders are typically
+   * grouped by templates, for example: [�#5�|�#6�|�#1:1�|�#3:2�] where �#5� and �#6� belong to root
+   * template, �#1:1� belong to nested template with index 1 and �#1:2� - nested template with index
+   * 3. However in real templates the order might be different: i.e. �#1:1� and/or �#3:2� may go in
+   * front of �#6�. The post processing step restores the right order by keeping track of the
+   * template id stack and looks for placeholders that belong to the currently active template.
+   */
+  let result: string = message;
+  if (PP_MULTI_VALUE_PLACEHOLDERS_REGEXP.test(message)) {
+    const matches: {[key: string]: PostprocessPlaceholder[]} = {};
+    const templateIdsStack: number[] = [ROOT_TEMPLATE_ID];
+    result = result.replace(PP_PLACEHOLDERS_REGEXP, (m: any, phs: string, tmpl: string): string => {
+      const content = phs || tmpl;
+      const placeholders: PostprocessPlaceholder[] = matches[content] || [];
+      if (!placeholders.length) {
+        content.split('|').forEach((placeholder: string) => {
+          const match = placeholder.match(PP_TEMPLATE_ID_REGEXP);
+          const templateId = match ? parseInt(match[1], 10) : ROOT_TEMPLATE_ID;
+          const isCloseTemplateTag = PP_CLOSE_TEMPLATE_REGEXP.test(placeholder);
+          placeholders.push([templateId, isCloseTemplateTag, placeholder]);
+        });
+        matches[content] = placeholders;
+      }
+
+      if (!placeholders.length) {
+        throw new Error(`i18n postprocess: unmatched placeholder - ${content}`);
+      }
+
+      const currentTemplateId = templateIdsStack[templateIdsStack.length - 1];
+      let idx = 0;
+      // find placeholder index that matches current template id
+      for (let i = 0; i < placeholders.length; i++) {
+        if (placeholders[i][0] === currentTemplateId) {
+          idx = i;
+          break;
+        }
+      }
+      // update template id stack based on the current tag extracted
+      const [templateId, isCloseTemplateTag, placeholder] = placeholders[idx];
+      if (isCloseTemplateTag) {
+        templateIdsStack.pop();
+      } else if (currentTemplateId !== templateId) {
+        templateIdsStack.push(templateId);
+      }
+      // remove processed tag from the list
+      placeholders.splice(idx, 1);
+      return placeholder;
+    });
+  }
+
+  // return current result if no replacements specified
+  if (!Object.keys(replacements).length) {
+    return result;
+  }
+
+  /**
+   * Step 2: replace all ICU vars (like "VAR_PLURAL")
+   */
+  result = result.replace(PP_ICU_VARS_REGEXP, (match, start, key, _type, _idx, end): string => {
+    return replacements.hasOwnProperty(key) ? `${start}${replacements[key]}${end}` : match;
+  });
+
+  /**
+   * Step 3: replace all placeholders used inside ICUs in a form of {PLACEHOLDER}
+   */
+  result = result.replace(PP_ICU_PLACEHOLDERS_REGEXP, (match, key): string => {
+    return replacements.hasOwnProperty(key) ? replacements[key] as string : match;
+  });
+
+  /**
+   * Step 4: replace all ICU references with corresponding values (like �ICU_EXP_ICU_1�) in case
+   * multiple ICUs have the same placeholder name
+   */
+  result = result.replace(PP_ICUS_REGEXP, (match, key): string => {
+    if (replacements.hasOwnProperty(key)) {
+      const list = replacements[key] as string[];
+      if (!list.length) {
+        throw new Error(`i18n postprocess: unmatched ICU - ${match} with key: ${key}`);
+      }
+      return list.shift()!;
+    }
+    return match;
+  });
+
+  return result;
+}
diff --git a/packages/core/src/render3/i18n/i18n_tree_shaking.ts b/packages/core/src/render3/i18n/i18n_tree_shaking.ts
new file mode 100644
index 0000000000000..c1b5ee253703e
--- /dev/null
+++ b/packages/core/src/render3/i18n/i18n_tree_shaking.ts
@@ -0,0 +1,45 @@
+/**
+ * @license
+ * Copyright Google LLC 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
+ *
+ * This file provides mechanism by which code relevant to the `TIcuContainerNode` is only loaded if
+ * ICU is present in the template.
+ */
+
+import {TIcuContainerNode} from '../interfaces/node';
+import {RNode} from '../interfaces/renderer';
+import {LView} from '../interfaces/view';
+
+
+let _icuContainerIterate: (tIcuContainerNode: TIcuContainerNode, lView: LView) =>
+    (() => RNode | null);
+
+/**
+ * Iterator which provides ability to visit all of the `TIcuContainerNode` root `RNode`s.
+ */
+export function icuContainerIterate(tIcuContainerNode: TIcuContainerNode, lView: LView): () =>
+    RNode | null {
+  return _icuContainerIterate(tIcuContainerNode, lView);
+}
+
+/**
+ * Ensures that `IcuContainerVisitor`'s implementation is present.
+ *
+ * This function is invoked when i18n instruction comes across an ICU. The purpose is to allow the
+ * bundler to tree shake ICU logic and only load it if ICU instruction is executed.
+ */
+export function ensureIcuContainerVisitorLoaded(
+    loader: () => ((tIcuContainerNode: TIcuContainerNode, lView: LView) => (() => RNode | null))) {
+  if (_icuContainerIterate === undefined) {
+    // Do not inline this function. We want to keep `ensureIcuContainerVisitorLoaded` light, so it
+    // can be inlined into call-site.
+    _icuContainerIterate = loader();
+  }
+}
diff --git a/packages/core/src/render3/i18n/i18n_util.ts b/packages/core/src/render3/i18n/i18n_util.ts
new file mode 100644
index 0000000000000..db4d7d6e70e12
--- /dev/null
+++ b/packages/core/src/render3/i18n/i18n_util.ts
@@ -0,0 +1,136 @@
+/**
+ * @license
+ * Copyright Google LLC 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, assertGreaterThan, assertGreaterThanOrEqual, throwError} from '../../util/assert';
+import {assertTIcu, assertTNode} from '../assert';
+import {createTNodeAtIndex} from '../instructions/shared';
+import {IcuCreateOpCode, TIcu} from '../interfaces/i18n';
+import {TIcuContainerNode, TNode, TNodeType} from '../interfaces/node';
+import {LView, TView} from '../interfaces/view';
+import {assertTNodeType} from '../node_assert';
+import {addTNodeAndUpdateInsertBeforeIndex} from './i18n_insert_before_index';
+
+
+/**
+ * Retrieve `TIcu` at a given `index`.
+ *
+ * The `TIcu` can be stored either directly (if it is nested ICU) OR
+ * it is stored inside tho `TIcuContainer` if it is top level ICU.
+ *
+ * The reason for this is that the top level ICU need a `TNode` so that they are part of the render
+ * tree, but nested ICU's have no TNode, because we don't know ahead of time if the nested ICU is
+ * expressed (parent ICU may have selected a case which does not contain it.)
+ *
+ * @param tView Current `TView`.
+ * @param index Index where the value should be read from.
+ */
+export function getTIcu(tView: TView, index: number): TIcu|null {
+  const value = tView.data[index] as null | TIcu | TIcuContainerNode | string;
+  if (value === null || typeof value === 'string') return null;
+  if (ngDevMode &&
+      !(value.hasOwnProperty('tViews') || value.hasOwnProperty('currentCaseLViewIndex'))) {
+    throwError('We expect to get \'null\'|\'TIcu\'|\'TIcuContainer\', but got: ' + value);
+  }
+  // Here the `value.hasOwnProperty('currentCaseLViewIndex')` is a polymorphic read as it can be
+  // either TIcu or TIcuContainerNode. This is not ideal, but we still think it is OK because it
+  // will be just two cases which fits into the browser inline cache (inline cache can take up to
+  // 4)
+  const tIcu = value.hasOwnProperty('currentCaseLViewIndex') ? value as TIcu :
+                                                               (value as TIcuContainerNode).value;
+  ngDevMode && assertTIcu(tIcu);
+  return tIcu;
+}
+
+/**
+ * Store `TIcu` at a give `index`.
+ *
+ * The `TIcu` can be stored either directly (if it is nested ICU) OR
+ * it is stored inside tho `TIcuContainer` if it is top level ICU.
+ *
+ * The reason for this is that the top level ICU need a `TNode` so that they are part of the render
+ * tree, but nested ICU's have no TNode, because we don't know ahead of time if the nested ICU is
+ * expressed (parent ICU may have selected a case which does not contain it.)
+ *
+ * @param tView Current `TView`.
+ * @param index Index where the value should be stored at in `Tview.data`
+ * @param tIcu The TIcu to store.
+ */
+export function setTIcu(tView: TView, index: number, tIcu: TIcu): void {
+  const tNode = tView.data[index] as null | TIcuContainerNode;
+  ngDevMode &&
+      assertEqual(
+          tNode === null || tNode.hasOwnProperty('tViews'), true,
+          'We expect to get \'null\'|\'TIcuContainer\'');
+  if (tNode === null) {
+    tView.data[index] = tIcu;
+  } else {
+    ngDevMode && assertTNodeType(tNode, TNodeType.Icu);
+    tNode.value = tIcu;
+  }
+}
+
+/**
+ * Set `TNode.insertBeforeIndex` taking the `Array` into account.
+ *
+ * See `TNode.insertBeforeIndex`
+ */
+export function setTNodeInsertBeforeIndex(tNode: TNode, index: number) {
+  ngDevMode && assertTNode(tNode);
+  let insertBeforeIndex = tNode.insertBeforeIndex;
+  if (insertBeforeIndex === null) {
+    insertBeforeIndex = tNode.insertBeforeIndex =
+        [null!/* may be updated to number later */, index];
+  } else {
+    assertEqual(Array.isArray(insertBeforeIndex), true, 'Expecting array here');
+    (insertBeforeIndex as number[]).push(index);
+  }
+}
+
+/**
+ * Create `TNode.type=TNodeType.Placeholder` node.
+ *
+ * See `TNodeType.Placeholder` for more information.
+ */
+export function createTNodePlaceholder(
+    tView: TView, previousTNodes: TNode[], index: number): TNode {
+  const tNode = createTNodeAtIndex(tView, index, TNodeType.Placeholder, null, null);
+  addTNodeAndUpdateInsertBeforeIndex(previousTNodes, tNode);
+  return tNode;
+}
+
+
+/**
+ * Returns current ICU case.
+ *
+ * ICU cases are stored as index into the `TIcu.cases`.
+ * At times it is necessary to communicate that the ICU case just switched and that next ICU update
+ * should update all bindings regardless of the mask. In such a case the we store negative numbers
+ * for cases which have just been switched. This function removes the negative flag.
+ */
+export function getCurrentICUCaseIndex(tIcu: TIcu, lView: LView) {
+  const currentCase: number|null = lView[tIcu.currentCaseLViewIndex];
+  return currentCase === null ? currentCase : (currentCase < 0 ? ~currentCase : currentCase);
+}
+
+export function getParentFromIcuCreateOpCode(mergedCode: number): number {
+  return mergedCode >>> IcuCreateOpCode.SHIFT_PARENT;
+}
+
+export function getRefFromIcuCreateOpCode(mergedCode: number): number {
+  return (mergedCode & IcuCreateOpCode.MASK_REF) >>> IcuCreateOpCode.SHIFT_REF;
+}
+
+export function getInstructionFromIcuCreateOpCode(mergedCode: number): number {
+  return mergedCode & IcuCreateOpCode.MASK_INSTRUCTION;
+}
+
+export function icuCreateOpCode(opCode: IcuCreateOpCode, parentIdx: number, refIdx: number) {
+  ngDevMode && assertGreaterThanOrEqual(parentIdx, 0, 'Missing parent index');
+  ngDevMode && assertGreaterThan(refIdx, 0, 'Missing ref index');
+  return opCode | parentIdx << IcuCreateOpCode.SHIFT_PARENT | refIdx << IcuCreateOpCode.SHIFT_REF;
+}
diff --git a/packages/core/src/render3/index.ts b/packages/core/src/render3/index.ts
index 85764cece7989..f6c8aafd5eed7 100644
--- a/packages/core/src/render3/index.ts
+++ b/packages/core/src/render3/index.ts
@@ -16,7 +16,7 @@ import {getComponent, getDirectives, getHostElement, getRenderedText} from './ut
 
 export {ComponentFactory, ComponentFactoryResolver, ComponentRef, injectComponentFactoryResolver} from './component_ref';
 export {ɵɵgetFactoryOf, ɵɵgetInheritedFactory} from './di';
-export {getLocaleId, setLocaleId, ɵɵi18n, ɵɵi18nApply, ɵɵi18nAttributes, ɵɵi18nEnd, ɵɵi18nExp, ɵɵi18nPostprocess, ɵɵi18nStart,} from './i18n';
+export {getLocaleId, setLocaleId} from './i18n/i18n_locale_id';
 // clang-format off
 export {
   detectChanges,
@@ -88,8 +88,6 @@ export {
 
   ɵɵreference,
 
-  // TODO: remove `select` once we've refactored all of the tests not to use it.
-  ɵɵselect,
   ɵɵstyleMap,
   ɵɵstyleMapInterpolate1,
   ɵɵstyleMapInterpolate2,
@@ -129,6 +127,7 @@ export {
   ɵɵtextInterpolate8,
   ɵɵtextInterpolateV,
 } from './instructions/all';
+export {ɵɵi18n, ɵɵi18nApply, ɵɵi18nAttributes, ɵɵi18nEnd, ɵɵi18nExp,ɵɵi18nPostprocess, ɵɵi18nStart} from './instructions/i18n';
 export {RenderFlags} from './interfaces/definition';
 export {
   AttributeMarker
diff --git a/packages/core/src/render3/instructions/advance.ts b/packages/core/src/render3/instructions/advance.ts
index 0abc8528509b0..fd06bdfbb7a12 100644
--- a/packages/core/src/render3/instructions/advance.ts
+++ b/packages/core/src/render3/instructions/advance.ts
@@ -5,10 +5,11 @@
  * 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 {assertDataInRange, assertGreaterThan} from '../../util/assert';
+import {assertGreaterThan} from '../../util/assert';
+import {assertIndexInDeclRange} from '../assert';
 import {executeCheckHooks, executeInitAndCheckHooks} from '../hooks';
-import {FLAGS, HEADER_OFFSET, InitPhaseState, LView, LViewFlags, TView} from '../interfaces/view';
-import {getCheckNoChangesMode, getLView, getSelectedIndex, getTView, setSelectedIndex} from '../state';
+import {FLAGS, InitPhaseState, LView, LViewFlags, TView} from '../interfaces/view';
+import {getLView, getSelectedIndex, getTView, isInCheckNoChangesMode, setSelectedIndex} from '../state';
 
 
 /**
@@ -36,23 +37,12 @@ import {getCheckNoChangesMode, getLView, getSelectedIndex, getTView, setSelected
  */
 export function ɵɵadvance(delta: number): void {
   ngDevMode && assertGreaterThan(delta, 0, 'Can only advance forward');
-  selectIndexInternal(getTView(), getLView(), getSelectedIndex() + delta, getCheckNoChangesMode());
-}
-
-/**
- * Selects an element for later binding instructions.
- * @deprecated No longer being generated, but still used in unit tests.
- * @codeGenApi
- */
-export function ɵɵselect(index: number): void {
-  // TODO(misko): Remove this function as it is no longer being used.
-  selectIndexInternal(getTView(), getLView(), index, getCheckNoChangesMode());
+  selectIndexInternal(getTView(), getLView(), getSelectedIndex() + delta, isInCheckNoChangesMode());
 }
 
 export function selectIndexInternal(
     tView: TView, lView: LView, index: number, checkNoChangesMode: boolean) {
-  ngDevMode && assertGreaterThan(index, -1, 'Invalid index');
-  ngDevMode && assertDataInRange(lView, index + HEADER_OFFSET);
+  ngDevMode && assertIndexInDeclRange(lView, index);
 
   // Flush the initial hooks for elements in the view that have been added up to this point.
   // PERF WARNING: do NOT extract this to a separate function without running benchmarks
diff --git a/packages/core/src/render3/instructions/all.ts b/packages/core/src/render3/instructions/all.ts
index 98fec4d2ea8f9..182c1541e039e 100644
--- a/packages/core/src/render3/instructions/all.ts
+++ b/packages/core/src/render3/instructions/all.ts
@@ -48,3 +48,4 @@ export * from './class_map_interpolation';
 export * from './style_map_interpolation';
 export * from './style_prop_interpolation';
 export * from './host_property';
+export * from './i18n';
diff --git a/packages/core/src/render3/instructions/di.ts b/packages/core/src/render3/instructions/di.ts
index 075ed38037e41..1868e1868c56a 100644
--- a/packages/core/src/render3/instructions/di.ts
+++ b/packages/core/src/render3/instructions/di.ts
@@ -6,11 +6,11 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import {InjectFlags, InjectionToken, resolveForwardRef} from '../../di';
-import {ɵɵinject} from '../../di/injector_compatibility';
+import {assertInjectImplementationNot, ɵɵinject} from '../../di/injector_compatibility';
 import {Type} from '../../interface/type';
 import {getOrCreateInjectable, injectAttributeImpl} from '../di';
 import {TDirectiveHostNode} from '../interfaces/node';
-import {getLView, getPreviousOrParentTNode} from '../state';
+import {getCurrentTNode, getLView} from '../state';
 
 /**
  * Returns the value associated to the given token from the injectors.
@@ -43,8 +43,12 @@ export function ɵɵdirectiveInject<T>(
   const lView = getLView();
   // Fall back to inject() if view hasn't been created. This situation can happen in tests
   // if inject utilities are used before bootstrapping.
-  if (lView == null) return ɵɵinject(token, flags);
-  const tNode = getPreviousOrParentTNode();
+  if (lView === null) {
+    // Verify that we will not get into infinite loop.
+    ngDevMode && assertInjectImplementationNot(ɵɵdirectiveInject);
+    return ɵɵinject(token, flags);
+  }
+  const tNode = getCurrentTNode();
   return getOrCreateInjectable<T>(
       tNode as TDirectiveHostNode, lView, resolveForwardRef(token), flags);
 }
@@ -55,7 +59,7 @@ export function ɵɵdirectiveInject<T>(
  * @codeGenApi
  */
 export function ɵɵinjectAttribute(attrNameToInject: string): string|null {
-  return injectAttributeImpl(getPreviousOrParentTNode(), attrNameToInject);
+  return injectAttributeImpl(getCurrentTNode()!, attrNameToInject);
 }
 
 /**
diff --git a/packages/core/src/render3/instructions/element.ts b/packages/core/src/render3/instructions/element.ts
index 2b9b82c73fe89..b03b4fdbf8f05 100644
--- a/packages/core/src/render3/instructions/element.ts
+++ b/packages/core/src/render3/instructions/element.ts
@@ -6,23 +6,23 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {assertDataInRange, assertDefined, assertEqual} from '../../util/assert';
+import {assertDefined, assertEqual, assertIndexInRange} from '../../util/assert';
 import {assertFirstCreatePass, assertHasParent} from '../assert';
 import {attachPatchData} from '../context_discovery';
 import {registerPostOrderHooks} from '../hooks';
-import {hasClassInput, hasStyleInput, TAttributes, TElementNode, TNode, TNodeType} from '../interfaces/node';
+import {hasClassInput, hasStyleInput, TAttributes, TElementNode, TNode, TNodeFlags, TNodeType} from '../interfaces/node';
 import {RElement} from '../interfaces/renderer';
 import {isContentQueryHost, isDirectiveHost} from '../interfaces/type_checks';
-import {HEADER_OFFSET, LView, RENDERER, T_HOST, TVIEW, TView} from '../interfaces/view';
-import {assertNodeType} from '../node_assert';
-import {appendChild, writeDirectClass, writeDirectStyle} from '../node_manipulation';
-import {decreaseElementDepthCount, getBindingIndex, getElementDepthCount, getIsParent, getLView, getNamespace, getPreviousOrParentTNode, getTView, increaseElementDepthCount, setIsNotParent, setPreviousOrParentTNode} from '../state';
+import {HEADER_OFFSET, LView, RENDERER, TView} from '../interfaces/view';
+import {assertTNodeType} from '../node_assert';
+import {appendChild, createElementNode, writeDirectClass, writeDirectStyle} from '../node_manipulation';
+import {decreaseElementDepthCount, getBindingIndex, getCurrentTNode, getElementDepthCount, getLView, getNamespace, getTView, increaseElementDepthCount, isCurrentTNodeParent, setCurrentTNode, setCurrentTNodeAsNotParent} from '../state';
 import {computeStaticStyling} from '../styling/static_styling';
 import {setUpAttributes} from '../util/attrs_utils';
 import {getConstant} from '../util/view_utils';
-
 import {setDirectiveInputsWhichShadowsStyling} from './property';
-import {createDirectivesInstances, elementCreate, executeContentQueries, getOrCreateTNode, matchingSchemas, resolveDirectives, saveResolvedLocalsInData} from './shared';
+import {createDirectivesInstances, executeContentQueries, getOrCreateTNode, matchingSchemas, resolveDirectives, saveResolvedLocalsInData} from './shared';
+
 
 
 function elementStartFirstCreatePass(
@@ -33,7 +33,7 @@ function elementStartFirstCreatePass(
 
   const tViewConsts = tView.consts;
   const attrs = getConstant<TAttributes>(tViewConsts, attrsIndex);
-  const tNode = getOrCreateTNode(tView, lView[T_HOST], index, TNodeType.Element, name, attrs);
+  const tNode = getOrCreateTNode(tView, index, TNodeType.Element, name, attrs);
 
   const hasDirectives =
       resolveDirectives(tView, lView, tNode, getConstant<string[]>(tViewConsts, localRefsIndex));
@@ -78,16 +78,15 @@ export function ɵɵelementStart(
       assertEqual(
           getBindingIndex(), tView.bindingStartIndex,
           'elements should be created before any bindings');
-  ngDevMode && ngDevMode.rendererCreateElement++;
-  ngDevMode && assertDataInRange(lView, adjustedIndex);
+  ngDevMode && assertIndexInRange(lView, adjustedIndex);
 
   const renderer = lView[RENDERER];
-  const native = lView[adjustedIndex] = elementCreate(name, renderer, getNamespace());
-
+  const native = lView[adjustedIndex] = createElementNode(renderer, name, getNamespace());
   const tNode = tView.firstCreatePass ?
-      elementStartFirstCreatePass(index, tView, lView, native, name, attrsIndex, localRefsIndex) :
+      elementStartFirstCreatePass(
+          adjustedIndex, tView, lView, native, name, attrsIndex, localRefsIndex) :
       tView.data[adjustedIndex] as TElementNode;
-  setPreviousOrParentTNode(tNode, true);
+  setCurrentTNode(tNode, true);
 
   const mergedAttrs = tNode.mergedAttrs;
   if (mergedAttrs !== null) {
@@ -102,7 +101,11 @@ export function ɵɵelementStart(
     writeDirectStyle(renderer, native, styles);
   }
 
-  appendChild(tView, lView, native, tNode);
+  if ((tNode.flags & TNodeFlags.isDetached) !== TNodeFlags.isDetached) {
+    // In the i18n case, the translation may have removed this element, so only add it if it is not
+    // detached. See `TNodeType.Placeholder` and `LFrame.inI18n` for more context.
+    appendChild(tView, lView, native, tNode);
+  }
 
   // any immediate children of a component or template container must be pre-emptively
   // monkey-patched with the component view data so that the element can be inspected
@@ -128,27 +131,27 @@ export function ɵɵelementStart(
  * @codeGenApi
  */
 export function ɵɵelementEnd(): void {
-  let previousOrParentTNode = getPreviousOrParentTNode();
-  ngDevMode && assertDefined(previousOrParentTNode, 'No parent node to close.');
-  if (getIsParent()) {
-    setIsNotParent();
+  let currentTNode = getCurrentTNode()!;
+  ngDevMode && assertDefined(currentTNode, 'No parent node to close.');
+  if (isCurrentTNodeParent()) {
+    setCurrentTNodeAsNotParent();
   } else {
-    ngDevMode && assertHasParent(getPreviousOrParentTNode());
-    previousOrParentTNode = previousOrParentTNode.parent!;
-    setPreviousOrParentTNode(previousOrParentTNode, false);
+    ngDevMode && assertHasParent(getCurrentTNode());
+    currentTNode = currentTNode.parent!;
+    setCurrentTNode(currentTNode, false);
   }
 
-  const tNode = previousOrParentTNode;
-  ngDevMode && assertNodeType(tNode, TNodeType.Element);
+  const tNode = currentTNode;
+  ngDevMode && assertTNodeType(tNode, TNodeType.AnyRNode);
 
 
   decreaseElementDepthCount();
 
   const tView = getTView();
   if (tView.firstCreatePass) {
-    registerPostOrderHooks(tView, previousOrParentTNode);
-    if (isContentQueryHost(previousOrParentTNode)) {
-      tView.queries!.elementEnd(previousOrParentTNode);
+    registerPostOrderHooks(tView, currentTNode);
+    if (isContentQueryHost(currentTNode)) {
+      tView.queries!.elementEnd(currentTNode);
     }
   }
 
@@ -187,7 +190,7 @@ function logUnknownElementError(
   // execute the check below.
   if (schemas === null) return;
 
-  const tagName = tNode.tagName;
+  const tagName = tNode.value;
 
   // If the element matches any directive, it's considered as valid.
   if (!hasDirectives && tagName !== null) {
diff --git a/packages/core/src/render3/instructions/element_container.ts b/packages/core/src/render3/instructions/element_container.ts
index 05d5b570527d2..cc550ae659c06 100644
--- a/packages/core/src/render3/instructions/element_container.ts
+++ b/packages/core/src/render3/instructions/element_container.ts
@@ -5,16 +5,16 @@
  * 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 {assertDataInRange, assertEqual} from '../../util/assert';
+import {assertEqual, assertIndexInRange} from '../../util/assert';
 import {assertHasParent} from '../assert';
 import {attachPatchData} from '../context_discovery';
 import {registerPostOrderHooks} from '../hooks';
 import {TAttributes, TElementContainerNode, TNodeType} from '../interfaces/node';
 import {isContentQueryHost, isDirectiveHost} from '../interfaces/type_checks';
 import {HEADER_OFFSET, LView, RENDERER, T_HOST, TView} from '../interfaces/view';
-import {assertNodeType} from '../node_assert';
+import {assertTNodeType} from '../node_assert';
 import {appendChild} from '../node_manipulation';
-import {getBindingIndex, getIsParent, getLView, getPreviousOrParentTNode, getTView, setIsNotParent, setPreviousOrParentTNode} from '../state';
+import {getBindingIndex, getCurrentTNode, getLView, getTView, isCurrentTNodeParent, setCurrentTNode, setCurrentTNodeAsNotParent} from '../state';
 import {computeStaticStyling} from '../styling/static_styling';
 import {getConstant} from '../util/view_utils';
 
@@ -27,8 +27,7 @@ function elementContainerStartFirstCreatePass(
 
   const tViewConsts = tView.consts;
   const attrs = getConstant<TAttributes>(tViewConsts, attrsIndex);
-  const tNode = getOrCreateTNode(
-      tView, lView[T_HOST], index, TNodeType.ElementContainer, 'ng-container', attrs);
+  const tNode = getOrCreateTNode(tView, index, TNodeType.ElementContainer, 'ng-container', attrs);
 
   // While ng-container doesn't necessarily support styling, we use the style context to identify
   // and execute directives on the ng-container.
@@ -66,16 +65,17 @@ export function ɵɵelementContainerStart(
   const tView = getTView();
   const adjustedIndex = index + HEADER_OFFSET;
 
-  ngDevMode && assertDataInRange(lView, adjustedIndex);
+  ngDevMode && assertIndexInRange(lView, adjustedIndex);
   ngDevMode &&
       assertEqual(
           getBindingIndex(), tView.bindingStartIndex,
           'element containers should be created before any bindings');
 
   const tNode = tView.firstCreatePass ?
-      elementContainerStartFirstCreatePass(index, tView, lView, attrsIndex, localRefsIndex) :
+      elementContainerStartFirstCreatePass(
+          adjustedIndex, tView, lView, attrsIndex, localRefsIndex) :
       tView.data[adjustedIndex] as TElementContainerNode;
-  setPreviousOrParentTNode(tNode, true);
+  setCurrentTNode(tNode, true);
 
   ngDevMode && ngDevMode.rendererCreateComment++;
   const native = lView[adjustedIndex] =
@@ -99,22 +99,22 @@ export function ɵɵelementContainerStart(
  * @codeGenApi
  */
 export function ɵɵelementContainerEnd(): void {
-  let previousOrParentTNode = getPreviousOrParentTNode();
+  let currentTNode = getCurrentTNode()!;
   const tView = getTView();
-  if (getIsParent()) {
-    setIsNotParent();
+  if (isCurrentTNodeParent()) {
+    setCurrentTNodeAsNotParent();
   } else {
-    ngDevMode && assertHasParent(previousOrParentTNode);
-    previousOrParentTNode = previousOrParentTNode.parent!;
-    setPreviousOrParentTNode(previousOrParentTNode, false);
+    ngDevMode && assertHasParent(currentTNode);
+    currentTNode = currentTNode.parent!;
+    setCurrentTNode(currentTNode, false);
   }
 
-  ngDevMode && assertNodeType(previousOrParentTNode, TNodeType.ElementContainer);
+  ngDevMode && assertTNodeType(currentTNode, TNodeType.ElementContainer);
 
   if (tView.firstCreatePass) {
-    registerPostOrderHooks(tView, previousOrParentTNode);
-    if (isContentQueryHost(previousOrParentTNode)) {
-      tView.queries!.elementEnd(previousOrParentTNode);
+    registerPostOrderHooks(tView, currentTNode);
+    if (isContentQueryHost(currentTNode)) {
+      tView.queries!.elementEnd(currentTNode);
     }
   }
 }
diff --git a/packages/core/src/render3/instructions/i18n.ts b/packages/core/src/render3/instructions/i18n.ts
new file mode 100644
index 0000000000000..8557470809bd6
--- /dev/null
+++ b/packages/core/src/render3/instructions/i18n.ts
@@ -0,0 +1,184 @@
+/**
+ * @license
+ * Copyright Google LLC 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 '../../util/ng_dev_mode';
+import '../../util/ng_i18n_closure_mode';
+
+import {assertDefined} from '../../util/assert';
+import {bindingUpdated} from '../bindings';
+import {applyCreateOpCodes, applyI18n, setMaskBit} from '../i18n/i18n_apply';
+import {i18nAttributesFirstPass, i18nStartFirstCreatePass} from '../i18n/i18n_parse';
+import {i18nPostprocess} from '../i18n/i18n_postprocess';
+import {TI18n} from '../interfaces/i18n';
+import {TElementNode, TNodeType} from '../interfaces/node';
+import {HEADER_OFFSET, T_HOST} from '../interfaces/view';
+import {getClosestRElement} from '../node_manipulation';
+import {getCurrentParentTNode, getLView, getTView, nextBindingIndex, setInI18nBlock} from '../state';
+import {getConstant} from '../util/view_utils';
+
+/**
+ * Marks a block of text as translatable.
+ *
+ * The instructions `i18nStart` and `i18nEnd` mark the translation block in the template.
+ * The translation `message` is the value which is locale specific. The translation string may
+ * contain placeholders which associate inner elements and sub-templates within the translation.
+ *
+ * The translation `message` placeholders are:
+ * - `�{index}(:{block})�`: *Binding Placeholder*: Marks a location where an expression will be
+ *   interpolated into. The placeholder `index` points to the expression binding index. An optional
+ *   `block` that matches the sub-template in which it was declared.
+ * - `�#{index}(:{block})�`/`�/#{index}(:{block})�`: *Element Placeholder*:  Marks the beginning
+ *   and end of DOM element that were embedded in the original translation block. The placeholder
+ *   `index` points to the element index in the template instructions set. An optional `block` that
+ *   matches the sub-template in which it was declared.
+ * - `�*{index}:{block}�`/`�/*{index}:{block}�`: *Sub-template Placeholder*: Sub-templates must be
+ *   split up and translated separately in each angular template function. The `index` points to the
+ *   `template` instruction index. A `block` that matches the sub-template in which it was declared.
+ *
+ * @param index A unique index of the translation in the static block.
+ * @param messageIndex An index of the translation message from the `def.consts` array.
+ * @param subTemplateIndex Optional sub-template index in the `message`.
+ *
+ * @codeGenApi
+ */
+export function ɵɵi18nStart(
+    index: number, messageIndex: number, subTemplateIndex: number = -1): void {
+  const tView = getTView();
+  const lView = getLView();
+  const adjustedIndex = HEADER_OFFSET + index;
+  ngDevMode && assertDefined(tView, `tView should be defined`);
+  const message = getConstant<string>(tView.consts, messageIndex)!;
+  const parentTNode = getCurrentParentTNode() as TElementNode | null;
+  if (tView.firstCreatePass) {
+    i18nStartFirstCreatePass(
+        tView, parentTNode === null ? 0 : parentTNode.index, lView, adjustedIndex, message,
+        subTemplateIndex);
+  }
+  const tI18n = tView.data[adjustedIndex] as TI18n;
+  const sameViewParentTNode = parentTNode === lView[T_HOST] ? null : parentTNode;
+  const parentRNode = getClosestRElement(tView, sameViewParentTNode, lView);
+  // If `parentTNode` is an `ElementContainer` than it has `<!--ng-container--->`.
+  // When we do inserts we have to make sure to insert in front of `<!--ng-container--->`.
+  const insertInFrontOf = parentTNode && (parentTNode.type & TNodeType.ElementContainer) ?
+      lView[parentTNode.index] :
+      null;
+  applyCreateOpCodes(lView, tI18n.create, parentRNode, insertInFrontOf);
+  setInI18nBlock(true);
+}
+
+
+
+/**
+ * Translates a translation block marked by `i18nStart` and `i18nEnd`. It inserts the text/ICU nodes
+ * into the render tree, moves the placeholder nodes and removes the deleted nodes.
+ *
+ * @codeGenApi
+ */
+export function ɵɵi18nEnd(): void {
+  setInI18nBlock(false);
+}
+
+/**
+ *
+ * Use this instruction to create a translation block that doesn't contain any placeholder.
+ * It calls both {@link i18nStart} and {@link i18nEnd} in one instruction.
+ *
+ * The translation `message` is the value which is locale specific. The translation string may
+ * contain placeholders which associate inner elements and sub-templates within the translation.
+ *
+ * The translation `message` placeholders are:
+ * - `�{index}(:{block})�`: *Binding Placeholder*: Marks a location where an expression will be
+ *   interpolated into. The placeholder `index` points to the expression binding index. An optional
+ *   `block` that matches the sub-template in which it was declared.
+ * - `�#{index}(:{block})�`/`�/#{index}(:{block})�`: *Element Placeholder*:  Marks the beginning
+ *   and end of DOM element that were embedded in the original translation block. The placeholder
+ *   `index` points to the element index in the template instructions set. An optional `block` that
+ *   matches the sub-template in which it was declared.
+ * - `�*{index}:{block}�`/`�/*{index}:{block}�`: *Sub-template Placeholder*: Sub-templates must be
+ *   split up and translated separately in each angular template function. The `index` points to the
+ *   `template` instruction index. A `block` that matches the sub-template in which it was declared.
+ *
+ * @param index A unique index of the translation in the static block.
+ * @param messageIndex An index of the translation message from the `def.consts` array.
+ * @param subTemplateIndex Optional sub-template index in the `message`.
+ *
+ * @codeGenApi
+ */
+export function ɵɵi18n(index: number, messageIndex: number, subTemplateIndex?: number): void {
+  ɵɵi18nStart(index, messageIndex, subTemplateIndex);
+  ɵɵi18nEnd();
+}
+
+/**
+ * Marks a list of attributes as translatable.
+ *
+ * @param index A unique index in the static block
+ * @param values
+ *
+ * @codeGenApi
+ */
+export function ɵɵi18nAttributes(index: number, attrsIndex: number): void {
+  const lView = getLView();
+  const tView = getTView();
+  ngDevMode && assertDefined(tView, `tView should be defined`);
+  const attrs = getConstant<string[]>(tView.consts, attrsIndex)!;
+  i18nAttributesFirstPass(lView, tView, index + HEADER_OFFSET, attrs);
+}
+
+
+/**
+ * Stores the values of the bindings during each update cycle in order to determine if we need to
+ * update the translated nodes.
+ *
+ * @param value The binding's value
+ * @returns This function returns itself so that it may be chained
+ * (e.g. `i18nExp(ctx.name)(ctx.title)`)
+ *
+ * @codeGenApi
+ */
+export function ɵɵi18nExp<T>(value: T): typeof ɵɵi18nExp {
+  const lView = getLView();
+  setMaskBit(bindingUpdated(lView, nextBindingIndex(), value));
+  return ɵɵi18nExp;
+}
+
+/**
+ * Updates a translation block or an i18n attribute when the bindings have changed.
+ *
+ * @param index Index of either {@link i18nStart} (translation block) or {@link i18nAttributes}
+ * (i18n attribute) on which it should update the content.
+ *
+ * @codeGenApi
+ */
+export function ɵɵi18nApply(index: number) {
+  applyI18n(getTView(), getLView(), index + HEADER_OFFSET);
+}
+
+/**
+ * Handles message string post-processing for internationalization.
+ *
+ * Handles message string post-processing by transforming it from intermediate
+ * format (that might contain some markers that we need to replace) to the final
+ * form, consumable by i18nStart instruction. Post processing steps include:
+ *
+ * 1. Resolve all multi-value cases (like [�*1:1��#2:1�|�#4:1�|�5�])
+ * 2. Replace all ICU vars (like "VAR_PLURAL")
+ * 3. Replace all placeholders used inside ICUs in a form of {PLACEHOLDER}
+ * 4. Replace all ICU references with corresponding values (like �ICU_EXP_ICU_1�)
+ *    in case multiple ICUs have the same placeholder name
+ *
+ * @param message Raw translation string for post processing
+ * @param replacements Set of replacements that should be applied
+ *
+ * @returns Transformed string that can be consumed by i18nStart instruction
+ *
+ * @codeGenApi
+ */
+export function ɵɵi18nPostprocess(
+    message: string, replacements: {[key: string]: (string|string[])} = {}): string {
+  return i18nPostprocess(message, replacements);
+}
\ No newline at end of file
diff --git a/packages/core/src/render3/instructions/i18n_icu_container_visitor.ts b/packages/core/src/render3/instructions/i18n_icu_container_visitor.ts
new file mode 100644
index 0000000000000..e408ab5ce7b7b
--- /dev/null
+++ b/packages/core/src/render3/instructions/i18n_icu_container_visitor.ts
@@ -0,0 +1,90 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {assertDomNode, assertNumber, assertNumberInRange} from '../../util/assert';
+import {assertTIcu, assertTNodeForLView} from '../assert';
+import {EMPTY_ARRAY} from '../empty';
+import {getCurrentICUCaseIndex} from '../i18n/i18n_util';
+import {I18nRemoveOpCodes, TIcu} from '../interfaces/i18n';
+import {TIcuContainerNode} from '../interfaces/node';
+import {RNode} from '../interfaces/renderer';
+import {LView, TVIEW} from '../interfaces/view';
+
+export function loadIcuContainerVisitor() {
+  const _stack: any[] = [];
+  let _index: number = -1;
+  let _lView: LView;
+  let _removes: I18nRemoveOpCodes;
+
+  /**
+   * Retrieves a set of root nodes from `TIcu.remove`. Used by `TNodeType.ICUContainer`
+   * to determine which root belong to the ICU.
+   *
+   * Example of usage.
+   * ```
+   * const nextRNode = icuContainerIteratorStart(tIcuContainerNode, lView);
+   * let rNode: RNode|null;
+   * while(rNode = nextRNode()) {
+   *   console.log(rNode);
+   * }
+   * ```
+   *
+   * @param tIcuContainerNode Current `TIcuContainerNode`
+   * @param lView `LView` where the `RNode`s should be looked up.
+   */
+  function icuContainerIteratorStart(tIcuContainerNode: TIcuContainerNode, lView: LView): () =>
+      RNode | null {
+    _lView = lView;
+    while (_stack.length) _stack.pop();
+    ngDevMode && assertTNodeForLView(tIcuContainerNode, lView);
+    enterIcu(tIcuContainerNode.value, lView);
+    return icuContainerIteratorNext;
+  }
+
+  function enterIcu(tIcu: TIcu, lView: LView) {
+    _index = 0;
+    const currentCase = getCurrentICUCaseIndex(tIcu, lView);
+    if (currentCase !== null) {
+      ngDevMode && assertNumberInRange(currentCase, 0, tIcu.cases.length - 1);
+      _removes = tIcu.remove[currentCase];
+    } else {
+      _removes = EMPTY_ARRAY as any;
+    }
+  }
+
+
+  function icuContainerIteratorNext(): RNode|null {
+    if (_index < _removes.length) {
+      const removeOpCode = _removes[_index++] as number;
+      ngDevMode && assertNumber(removeOpCode, 'Expecting OpCode number');
+      if (removeOpCode > 0) {
+        const rNode = _lView[removeOpCode];
+        ngDevMode && assertDomNode(rNode);
+        return rNode;
+      } else {
+        _stack.push(_index, _removes);
+        // ICUs are represented by negative indices
+        const tIcuIndex = ~removeOpCode;
+        const tIcu = _lView[TVIEW].data[tIcuIndex] as TIcu;
+        ngDevMode && assertTIcu(tIcu);
+        enterIcu(tIcu, _lView);
+        return icuContainerIteratorNext();
+      }
+    } else {
+      if (_stack.length === 0) {
+        return null;
+      } else {
+        _removes = _stack.pop();
+        _index = _stack.pop();
+        return icuContainerIteratorNext();
+      }
+    }
+  }
+
+  return icuContainerIteratorStart;
+}
diff --git a/packages/core/src/render3/instructions/listener.ts b/packages/core/src/render3/instructions/listener.ts
index 4caf2af8e18bc..9176a72c25527 100644
--- a/packages/core/src/render3/instructions/listener.ts
+++ b/packages/core/src/render3/instructions/listener.ts
@@ -7,15 +7,15 @@
  */
 
 
-import {assertDataInRange} from '../../util/assert';
+import {assertIndexInRange} from '../../util/assert';
 import {isObservable} from '../../util/lang';
 import {EMPTY_OBJ} from '../empty';
 import {PropertyAliasValue, TNode, TNodeFlags, TNodeType} from '../interfaces/node';
 import {GlobalTargetResolver, isProceduralRenderer, RElement, Renderer3} from '../interfaces/renderer';
 import {isDirectiveHost} from '../interfaces/type_checks';
 import {CLEANUP, FLAGS, LView, LViewFlags, RENDERER, TView} from '../interfaces/view';
-import {assertNodeOfPossibleTypes} from '../node_assert';
-import {getCurrentDirectiveDef, getLView, getPreviousOrParentTNode, getTView} from '../state';
+import {assertTNodeType} from '../node_assert';
+import {getCurrentDirectiveDef, getCurrentTNode, getLView, getTView} from '../state';
 import {getComponentLViewByIndex, getNativeByTNode, unwrapRNode} from '../util/view_utils';
 
 import {getLCleanup, handleError, loadComponentRenderer, markViewDirty} from './shared';
@@ -41,7 +41,7 @@ export function ɵɵlistener(
     eventTargetResolver?: GlobalTargetResolver): typeof ɵɵlistener {
   const lView = getLView();
   const tView = getTView();
-  const tNode = getPreviousOrParentTNode();
+  const tNode = getCurrentTNode()!;
   listenerInternal(
       tView, lView, lView[RENDERER], tNode, eventName, listenerFn, useCapture, eventTargetResolver);
   return ɵɵlistener;
@@ -71,7 +71,7 @@ export function ɵɵlistener(
 export function ɵɵsyntheticHostListener(
     eventName: string, listenerFn: (e?: any) => any, useCapture = false,
     eventTargetResolver?: GlobalTargetResolver): typeof ɵɵsyntheticHostListener {
-  const tNode = getPreviousOrParentTNode();
+  const tNode = getCurrentTNode()!;
   const lView = getLView();
   const tView = getTView();
   const currentDef = getCurrentDirectiveDef(tView.data);
@@ -126,14 +126,12 @@ function listenerInternal(
   // register a listener and store its cleanup function on LView.
   const lCleanup = getLCleanup(lView);
 
-  ngDevMode &&
-      assertNodeOfPossibleTypes(
-          tNode, [TNodeType.Element, TNodeType.Container, TNodeType.ElementContainer]);
+  ngDevMode && assertTNodeType(tNode, TNodeType.AnyRNode | TNodeType.AnyContainer);
 
   let processOutputs = true;
 
   // add native event listener - applicable to elements only
-  if (tNode.type === TNodeType.Element) {
+  if (tNode.type & TNodeType.AnyRNode) {
     const native = getNativeByTNode(tNode, lView) as RElement;
     const resolved = eventTargetResolver ? eventTargetResolver(native) : EMPTY_OBJ as any;
     const target = resolved.target || native;
@@ -204,7 +202,7 @@ function listenerInternal(
     if (propsLength) {
       for (let i = 0; i < propsLength; i += 2) {
         const index = props[i] as number;
-        ngDevMode && assertDataInRange(lView, index);
+        ngDevMode && assertIndexInRange(lView, index);
         const minifiedName = props[i + 1];
         const directiveInstance = lView[index];
         const output = directiveInstance[minifiedName];
diff --git a/packages/core/src/render3/instructions/lview_debug.ts b/packages/core/src/render3/instructions/lview_debug.ts
index 7ea4307567475..ed2ed319876f1 100644
--- a/packages/core/src/render3/instructions/lview_debug.ts
+++ b/packages/core/src/render3/instructions/lview_debug.ts
@@ -6,22 +6,25 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {AttributeMarker, ComponentTemplate} from '..';
-import {Injector, SchemaMetadata} from '../../core';
+import {Injector, SchemaMetadata, Type} from '../../core';
 import {Sanitizer} from '../../sanitization/sanitizer';
 import {KeyValueArray} from '../../util/array_utils';
 import {assertDefined} from '../../util/assert';
 import {createNamedArrayType} from '../../util/named_array_type';
 import {initNgDevMode} from '../../util/ng_dev_mode';
+import {assertNodeInjector} from '../assert';
+import {getInjectorIndex} from '../di';
 import {CONTAINER_HEADER_OFFSET, HAS_TRANSPLANTED_VIEWS, LContainer, MOVED_VIEWS, NATIVE} from '../interfaces/container';
-import {DirectiveDefList, PipeDefList, ViewQueriesFunction} from '../interfaces/definition';
-import {PropertyAliases, TConstants, TContainerNode, TElementNode, TNode as ITNode, TNodeFlags, TNodeProviderIndexes, TNodeType, TNodeTypeAsString, TViewNode} from '../interfaces/node';
+import {ComponentTemplate, DirectiveDef, DirectiveDefList, PipeDefList, ViewQueriesFunction} from '../interfaces/definition';
+import {NO_PARENT_INJECTOR, NodeInjectorOffset} from '../interfaces/injector';
+import {AttributeMarker, InsertBeforeIndex, PropertyAliases, TConstants, TContainerNode, TElementNode, TNode as ITNode, TNodeFlags, TNodeProviderIndexes, TNodeType, toTNodeTypeAsString} from '../interfaces/node';
 import {SelectorFlags} from '../interfaces/projection';
 import {LQueries, TQueries} from '../interfaces/query';
 import {RComment, RElement, Renderer3, RendererFactory3, RNode} from '../interfaces/renderer';
 import {getTStylingRangeNext, getTStylingRangeNextDuplicate, getTStylingRangePrev, getTStylingRangePrevDuplicate, TStylingKey, TStylingRange} from '../interfaces/styling';
-import {CHILD_HEAD, CHILD_TAIL, CLEANUP, CONTEXT, DebugNode, DECLARATION_VIEW, DestroyHookData, ExpandoInstructions, FLAGS, HEADER_OFFSET, HookData, HOST, INJECTOR, LContainerDebug as ILContainerDebug, LView, LViewDebug as ILViewDebug, LViewDebugRange, LViewDebugRangeContent, LViewFlags, NEXT, PARENT, QUERIES, RENDERER, RENDERER_FACTORY, SANITIZER, T_HOST, TData, TView as ITView, TVIEW, TView, TViewType} from '../interfaces/view';
+import {CHILD_HEAD, CHILD_TAIL, CLEANUP, CONTEXT, DebugNode, DECLARATION_VIEW, DestroyHookData, ExpandoInstructions, FLAGS, HEADER_OFFSET, HookData, HOST, INJECTOR, LContainerDebug as ILContainerDebug, LView, LViewDebug as ILViewDebug, LViewDebugRange, LViewDebugRangeContent, LViewFlags, NEXT, PARENT, QUERIES, RENDERER, RENDERER_FACTORY, SANITIZER, T_HOST, TData, TView as ITView, TVIEW, TView, TViewType, TViewTypeAsString} from '../interfaces/view';
 import {attachDebugObject} from '../util/debug_utils';
+import {getParentInjectorIndex, getParentInjectorView} from '../util/injector_utils';
 import {unwrapRNode} from '../util/view_utils';
 
 const NG_DEV_MODE = ((typeof ngDevMode === 'undefined' || !!ngDevMode) && initNgDevMode());
@@ -113,12 +116,11 @@ function nameSuffix(text: string|null|undefined): string {
 export const TViewConstructor = class TView implements ITView {
   constructor(
       public type: TViewType,                                //
-      public id: number,                                     //
       public blueprint: LView,                               //
       public template: ComponentTemplate<{}>|null,           //
       public queries: TQueries|null,                         //
       public viewQuery: ViewQueriesFunction<{}>|null,        //
-      public node: TViewNode|TElementNode|null,              //
+      public declTNode: ITNode|null,                         //
       public data: TData,                                    //
       public bindingStartIndex: number,                      //
       public expandoStartIndex: number,                      //
@@ -153,6 +155,20 @@ export const TViewConstructor = class TView implements ITView {
     processTNodeChildren(this.firstChild, buf);
     return buf.join('');
   }
+
+  get type_(): string {
+    return TViewTypeAsString[this.type] || `TViewType.?${this.type}?`;
+  }
+
+  /**
+   * Returns initial value of `expandoStartIndex`.
+   */
+  // FIXME(misko): `originalExpandoStartIndex` should not be needed because it should be the same as
+  // `expandoStartIndex`. However `expandoStartIndex` is misnamed as it changes as more items get
+  // allocated in expando.
+  get originalExpandoStartIndex(): number {
+    return HEADER_OFFSET + this._decls + this._vars;
+  }
 };
 
 class TNode implements ITNode {
@@ -160,6 +176,7 @@ class TNode implements ITNode {
       public tView_: TView,                                                          //
       public type: TNodeType,                                                        //
       public index: number,                                                          //
+      public insertBeforeIndex: InsertBeforeIndex,                                   //
       public injectorIndex: number,                                                  //
       public directiveStart: number,                                                 //
       public directiveEnd: number,                                                   //
@@ -167,7 +184,7 @@ class TNode implements ITNode {
       public propertyBindings: number[]|null,                                        //
       public flags: TNodeFlags,                                                      //
       public providerIndexes: TNodeProviderIndexes,                                  //
-      public tagName: string|null,                                                   //
+      public value: string|null,                                                     //
       public attrs: (string|AttributeMarker|(string|SelectorFlags)[])[]|null,        //
       public mergedAttrs: (string|AttributeMarker|(string|SelectorFlags)[])[]|null,  //
       public localNames: (string|number)[]|null,                                     //
@@ -190,23 +207,39 @@ class TNode implements ITNode {
       public styleBindings: TStylingRange,                                           //
   ) {}
 
-  get type_(): string {
-    switch (this.type) {
-      case TNodeType.Container:
-        return 'TNodeType.Container';
-      case TNodeType.Element:
-        return 'TNodeType.Element';
-      case TNodeType.ElementContainer:
-        return 'TNodeType.ElementContainer';
-      case TNodeType.IcuContainer:
-        return 'TNodeType.IcuContainer';
-      case TNodeType.Projection:
-        return 'TNodeType.Projection';
-      case TNodeType.View:
-        return 'TNodeType.View';
-      default:
-        return 'TNodeType.???';
+  /**
+   * Return a human debug version of the set of `NodeInjector`s which will be consulted when
+   * resolving tokens from this `TNode`.
+   *
+   * When debugging applications, it is often difficult to determine which `NodeInjector`s will be
+   * consulted. This method shows a list of `DebugNode`s representing the `TNode`s which will be
+   * consulted in order when resolving a token starting at this `TNode`.
+   *
+   * The original data is stored in `LView` and `TView` with a lot of offset indexes, and so it is
+   * difficult to reason about.
+   *
+   * @param lView The `LView` instance for this `TNode`.
+   */
+  debugNodeInjectorPath(lView: LView): DebugNode[] {
+    const path: DebugNode[] = [];
+    let injectorIndex = getInjectorIndex(this, lView);
+    ngDevMode && assertNodeInjector(lView, injectorIndex);
+    while (injectorIndex !== -1) {
+      const tNode = lView[TVIEW].data[injectorIndex + NodeInjectorOffset.TNODE] as TNode;
+      path.push(buildDebugNode(tNode, lView));
+      const parentLocation = lView[injectorIndex + NodeInjectorOffset.PARENT];
+      if (parentLocation === NO_PARENT_INJECTOR) {
+        injectorIndex = -1;
+      } else {
+        injectorIndex = getParentInjectorIndex(parentLocation);
+        lView = getParentInjectorView(parentLocation, lView);
+      }
     }
+    return path;
+  }
+
+  get type_(): string {
+    return toTNodeTypeAsString(this.type) || `TNodeType.?${this.type}?`;
   }
 
   get flags_(): string {
@@ -223,8 +256,13 @@ class TNode implements ITNode {
   }
 
   get template_(): string {
+    if (this.type & TNodeType.Text) return this.value!;
     const buf: string[] = [];
-    buf.push('<', this.tagName || this.type_);
+    const tagName = typeof this.value === 'string' && this.value || this.type_;
+    buf.push('<', tagName);
+    if (this.flags) {
+      buf.push(' ', this.flags_);
+    }
     if (this.attrs) {
       for (let i = 0; i < this.attrs.length;) {
         const attrName = this.attrs[i++];
@@ -237,7 +275,7 @@ class TNode implements ITNode {
     }
     buf.push('>');
     processTNodeChildren(this.child, buf);
-    buf.push('</', this.tagName || this.type_, '>');
+    buf.push('</', tagName, '>');
     return buf.join('');
   }
 
@@ -247,6 +285,14 @@ class TNode implements ITNode {
   get classBindings_(): DebugStyleBindings {
     return toDebugStyleBinding(this, true);
   }
+
+  get providerIndexStart_(): number {
+    return this.providerIndexes & TNodeProviderIndexes.ProvidersStartIndexMask;
+  }
+  get providerIndexEnd_(): number {
+    return this.providerIndexStart_ +
+        (this.providerIndexes >>> TNodeProviderIndexes.CptViewProvidersCountShift);
+  }
 }
 export const TNodeDebug = TNode;
 export type TNodeDebug = TNode;
@@ -362,19 +408,24 @@ export function toDebug(obj: any): any {
  * (will not serialize child elements).
  */
 function toHtml(value: any, includeChildren: boolean = false): string|null {
-  const node: HTMLElement|null = unwrapRNode(value) as any;
+  const node: Node|null = unwrapRNode(value) as any;
   if (node) {
-    const isTextNode = node.nodeType === Node.TEXT_NODE;
-    const outerHTML = (isTextNode ? node.textContent : node.outerHTML) || '';
-    if (includeChildren || isTextNode) {
-      return outerHTML;
-    } else {
-      const innerHTML = '>' + node.innerHTML + '<';
-      return (outerHTML.split(innerHTML)[0]) + '>';
+    switch (node.nodeType) {
+      case Node.TEXT_NODE:
+        return node.textContent;
+      case Node.COMMENT_NODE:
+        return `<!--${(node as Comment).textContent}-->`;
+      case Node.ELEMENT_NODE:
+        const outerHTML = (node as Element).outerHTML;
+        if (includeChildren) {
+          return outerHTML;
+        } else {
+          const innerHTML = '>' + (node as Element).innerHTML + '<';
+          return (outerHTML.split(innerHTML)[0]) + '>';
+        }
     }
-  } else {
-    return null;
   }
+  return null;
 }
 
 export class LViewDebug implements ILViewDebug {
@@ -405,7 +456,7 @@ export class LViewDebug implements ILViewDebug {
     return toHtml(this._raw_lView[HOST], true);
   }
   get html(): string {
-    return (this.nodes || []).map(node => toHtml(node.native, true)).join('');
+    return (this.nodes || []).map(mapToHTML).join('');
   }
   get context(): {}|null {
     return this._raw_lView[CONTEXT];
@@ -419,7 +470,9 @@ export class LViewDebug implements ILViewDebug {
     const tNode = lView[TVIEW].firstChild;
     return toDebugNodes(tNode, lView);
   }
-
+  get template(): string {
+    return (this.tView as any as {template_: string}).template_;
+  }
   get tView(): ITView {
     return this._raw_lView[TVIEW];
   }
@@ -453,32 +506,27 @@ export class LViewDebug implements ILViewDebug {
   get queries(): LQueries|null {
     return this._raw_lView[QUERIES];
   }
-  get tHost(): TViewNode|TElementNode|null {
+  get tHost(): ITNode|null {
     return this._raw_lView[T_HOST];
   }
 
   get decls(): LViewDebugRange {
-    const tView = this.tView as any as {_decls: number, _vars: number};
-    const start = HEADER_OFFSET;
-    return toLViewRange(this.tView, this._raw_lView, start, start + tView._decls);
+    return toLViewRange(this.tView, this._raw_lView, HEADER_OFFSET, this.tView.bindingStartIndex);
   }
 
   get vars(): LViewDebugRange {
-    const tView = this.tView as any as {_decls: number, _vars: number};
-    const start = HEADER_OFFSET + tView._decls;
-    return toLViewRange(this.tView, this._raw_lView, start, start + tView._vars);
-  }
-
-  get i18n(): LViewDebugRange {
-    const tView = this.tView as any as {_decls: number, _vars: number};
-    const start = HEADER_OFFSET + tView._decls + tView._vars;
-    return toLViewRange(this.tView, this._raw_lView, start, this.tView.expandoStartIndex);
+    const tView = this.tView;
+    return toLViewRange(
+        tView, this._raw_lView, tView.bindingStartIndex,
+        (tView as any as {originalExpandoStartIndex: number}).originalExpandoStartIndex);
   }
 
   get expando(): LViewDebugRange {
     const tView = this.tView as any as {_decls: number, _vars: number};
     return toLViewRange(
-        this.tView, this._raw_lView, this.tView.expandoStartIndex, this._raw_lView.length);
+        this.tView, this._raw_lView,
+        (tView as any as {originalExpandoStartIndex: number}).originalExpandoStartIndex,
+        this._raw_lView.length);
   }
 
   /**
@@ -495,6 +543,16 @@ export class LViewDebug implements ILViewDebug {
   }
 }
 
+function mapToHTML(node: DebugNode): string {
+  if (node.type === 'ElementContainer') {
+    return (node.children || []).map(mapToHTML).join('');
+  } else if (node.type === 'IcuContainer') {
+    throw new Error('Not implemented');
+  } else {
+    return toHtml(node.native, true) || '';
+  }
+}
+
 function toLViewRange(tView: TView, lView: LView, start: number, end: number): LViewDebugRange {
   let content: LViewDebugRangeContent[] = [];
   for (let index = start; index < end; index++) {
@@ -514,7 +572,7 @@ export function toDebugNodes(tNode: ITNode|null, lView: LView): DebugNode[] {
     const debugNodes: DebugNode[] = [];
     let tNodeCursor: ITNode|null = tNode;
     while (tNodeCursor) {
-      debugNodes.push(buildDebugNode(tNodeCursor, lView, tNodeCursor.index));
+      debugNodes.push(buildDebugNode(tNodeCursor, lView));
       tNodeCursor = tNodeCursor.next;
     }
     return debugNodes;
@@ -523,17 +581,75 @@ export function toDebugNodes(tNode: ITNode|null, lView: LView): DebugNode[] {
   }
 }
 
-export function buildDebugNode(tNode: ITNode, lView: LView, nodeIndex: number): DebugNode {
-  const rawValue = lView[nodeIndex];
+export function buildDebugNode(tNode: ITNode, lView: LView): DebugNode {
+  const rawValue = lView[tNode.index];
   const native = unwrapRNode(rawValue);
+  const factories: Type<any>[] = [];
+  const instances: any[] = [];
+  const tView = lView[TVIEW];
+  for (let i = tNode.directiveStart; i < tNode.directiveEnd; i++) {
+    const def = tView.data[i] as DirectiveDef<any>;
+    factories.push(def.type);
+    instances.push(lView[i]);
+  }
   return {
     html: toHtml(native),
-    type: TNodeTypeAsString[tNode.type],
+    type: toTNodeTypeAsString(tNode.type),
     native: native as any,
     children: toDebugNodes(tNode.child, lView),
+    factories,
+    instances,
+    injector: buildNodeInjectorDebug(tNode, tView, lView)
   };
 }
 
+function buildNodeInjectorDebug(tNode: ITNode, tView: ITView, lView: LView) {
+  const viewProviders: Type<any>[] = [];
+  for (let i = (tNode as TNode).providerIndexStart_; i < (tNode as TNode).providerIndexEnd_; i++) {
+    viewProviders.push(tView.data[i] as Type<any>);
+  }
+  const providers: Type<any>[] = [];
+  for (let i = (tNode as TNode).providerIndexEnd_; i < (tNode as TNode).directiveEnd; i++) {
+    providers.push(tView.data[i] as Type<any>);
+  }
+  const nodeInjectorDebug = {
+    bloom: toBloom(lView, tNode.injectorIndex),
+    cumulativeBloom: toBloom(tView.data, tNode.injectorIndex),
+    providers,
+    viewProviders,
+    parentInjectorIndex: lView[(tNode as TNode).providerIndexStart_ - 1],
+  };
+  return nodeInjectorDebug;
+}
+
+/**
+ * Convert a number at `idx` location in `array` into binary representation.
+ *
+ * @param array
+ * @param idx
+ */
+function binary(array: any[], idx: number): string {
+  const value = array[idx];
+  // If not a number we print 8 `?` to retain alignment but let user know that it was called on
+  // wrong type.
+  if (typeof value !== 'number') return '????????';
+  // We prefix 0s so that we have constant length number
+  const text = '00000000' + value.toString(2);
+  return text.substring(text.length - 8);
+}
+
+/**
+ * Convert a bloom filter at location `idx` in `array` into binary representation.
+ *
+ * @param array
+ * @param idx
+ */
+function toBloom(array: any[], idx: number): string {
+  return `${binary(array, idx + 7)}_${binary(array, idx + 6)}_${binary(array, idx + 5)}_${
+      binary(array, idx + 4)}_${binary(array, idx + 3)}_${binary(array, idx + 2)}_${
+      binary(array, idx + 1)}_${binary(array, idx + 0)}`;
+}
+
 export class LContainerDebug implements ILContainerDebug {
   constructor(private readonly _raw_lContainer: LContainer) {}
 
@@ -560,18 +676,3 @@ export class LContainerDebug implements ILContainerDebug {
     return toDebug(this._raw_lContainer[NEXT]);
   }
 }
-
-/**
- * Return an `LView` value if found.
- *
- * @param value `LView` if any
- */
-export function readLViewValue(value: any): LView|null {
-  while (Array.isArray(value)) {
-    // This check is not quite right, as it does not take into account `StylingContext`
-    // This is why it is in debug, not in util.ts
-    if (value.length >= HEADER_OFFSET - 1) return value as LView;
-    value = value[HOST];
-  }
-  return null;
-}
diff --git a/packages/core/src/render3/instructions/projection.ts b/packages/core/src/render3/instructions/projection.ts
index 24219ba92bc99..612534414bdc1 100644
--- a/packages/core/src/render3/instructions/projection.ts
+++ b/packages/core/src/render3/instructions/projection.ts
@@ -6,12 +6,12 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import {newArray} from '../../util/array_utils';
-import {TAttributes, TElementNode, TNode, TNodeType} from '../interfaces/node';
+import {TAttributes, TElementNode, TNode, TNodeFlags, TNodeType} from '../interfaces/node';
 import {ProjectionSlots} from '../interfaces/projection';
-import {DECLARATION_COMPONENT_VIEW, T_HOST} from '../interfaces/view';
+import {DECLARATION_COMPONENT_VIEW, HEADER_OFFSET, T_HOST} from '../interfaces/view';
 import {applyProjection} from '../node_manipulation';
 import {getProjectAsAttrValue, isNodeMatchingSelectorList, isSelectorInSelectorList} from '../node_selector_matcher';
-import {getLView, getTView, setIsNotParent} from '../state';
+import {getLView, getTView, setCurrentTNodeAsNotParent} from '../state';
 import {getOrCreateTNode} from './shared';
 
 
@@ -103,11 +103,6 @@ export function ɵɵprojectionDef(projectionSlots?: ProjectionSlots): void {
   }
 }
 
-let delayProjection = false;
-export function setDelayProjection(value: boolean) {
-  delayProjection = value;
-}
-
 
 /**
  * Inserts previously re-distributed projected nodes. This instruction must be preceded by a call
@@ -125,16 +120,15 @@ export function ɵɵprojection(
   const lView = getLView();
   const tView = getTView();
   const tProjectionNode =
-      getOrCreateTNode(tView, lView[T_HOST], nodeIndex, TNodeType.Projection, null, attrs || null);
+      getOrCreateTNode(tView, HEADER_OFFSET + nodeIndex, TNodeType.Projection, null, attrs || null);
 
   // We can't use viewData[HOST_NODE] because projection nodes can be nested in embedded views.
   if (tProjectionNode.projection === null) tProjectionNode.projection = selectorIndex;
 
   // `<ng-content>` has no content
-  setIsNotParent();
+  setCurrentTNodeAsNotParent();
 
-  // We might need to delay the projection of nodes if they are in the middle of an i18n block
-  if (!delayProjection) {
+  if ((tProjectionNode.flags & TNodeFlags.isDetached) !== TNodeFlags.isDetached) {
     // re-distribution of projectable nodes is stored on a component's view level
     applyProjection(tView, lView, tProjectionNode);
   }
diff --git a/packages/core/src/render3/instructions/shared.ts b/packages/core/src/render3/instructions/shared.ts
index 929a5fa78c6d8..9a3d22a6804bb 100644
--- a/packages/core/src/render3/instructions/shared.ts
+++ b/packages/core/src/render3/instructions/shared.ts
@@ -12,12 +12,12 @@ import {CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA, SchemaMetadata} from '../../me
 import {ViewEncapsulation} from '../../metadata/view';
 import {validateAgainstEventAttributes, validateAgainstEventProperties} from '../../sanitization/sanitization';
 import {Sanitizer} from '../../sanitization/sanitizer';
-import {assertDataInRange, assertDefined, assertDomNode, assertEqual, assertGreaterThan, assertLessThan, assertNotEqual, assertNotSame, assertSame} from '../../util/assert';
+import {assertDefined, assertDomNode, assertEqual, assertGreaterThan, assertGreaterThanOrEqual, assertIndexInRange, assertLessThan, assertNotEqual, assertNotSame, assertSame, assertString} from '../../util/assert';
 import {createNamedArrayType} from '../../util/named_array_type';
 import {initNgDevMode} from '../../util/ng_dev_mode';
 import {normalizeDebugBindingName, normalizeDebugBindingValue} from '../../util/ng_reflect';
 import {stringify} from '../../util/stringify';
-import {assertFirstCreatePass, assertLContainer, assertLView} from '../assert';
+import {assertFirstCreatePass, assertFirstUpdatePass, assertLContainer, assertLView, assertTNodeForLView, assertTNodeForTView} from '../assert';
 import {attachPatchData} from '../context_discovery';
 import {getFactoryDef} from '../definition';
 import {diPublicInInjector, getNodeInjectable, getOrCreateNodeInjectorForNode} from '../di';
@@ -25,15 +25,16 @@ import {throwMultipleComponentError} from '../errors';
 import {executeCheckHooks, executeInitAndCheckHooks, incrementInitPhaseFlags} from '../hooks';
 import {CONTAINER_HEADER_OFFSET, HAS_TRANSPLANTED_VIEWS, LContainer, MOVED_VIEWS} from '../interfaces/container';
 import {ComponentDef, ComponentTemplate, DirectiveDef, DirectiveDefListOrFactory, PipeDefListOrFactory, RenderFlags, ViewQueriesFunction} from '../interfaces/definition';
-import {INJECTOR_BLOOM_PARENT_SIZE, NodeInjectorFactory} from '../interfaces/injector';
-import {AttributeMarker, InitialInputData, InitialInputs, LocalRefExtractor, PropertyAliases, PropertyAliasValue, TAttributes, TConstants, TContainerNode, TDirectiveHostNode, TElementContainerNode, TElementNode, TIcuContainerNode, TNode, TNodeFlags, TNodeProviderIndexes, TNodeType, TProjectionNode, TViewNode} from '../interfaces/node';
+import {NodeInjectorFactory, NodeInjectorOffset} from '../interfaces/injector';
+import {AttributeMarker, InitialInputData, InitialInputs, LocalRefExtractor, PropertyAliases, PropertyAliasValue, TAttributes, TConstantsOrFactory, TContainerNode, TDirectiveHostNode, TElementContainerNode, TElementNode, TIcuContainerNode, TNode, TNodeFlags, TNodeProviderIndexes, TNodeType, TProjectionNode} from '../interfaces/node';
 import {isProceduralRenderer, RComment, RElement, Renderer3, RendererFactory3, RNode, RText} from '../interfaces/renderer';
 import {SanitizerFn} from '../interfaces/sanitization';
-import {isComponentDef, isComponentHost, isContentQueryHost, isLContainer, isRootView} from '../interfaces/type_checks';
+import {isComponentDef, isComponentHost, isContentQueryHost, isRootView} from '../interfaces/type_checks';
 import {CHILD_HEAD, CHILD_TAIL, CLEANUP, CONTEXT, DECLARATION_COMPONENT_VIEW, DECLARATION_VIEW, FLAGS, HEADER_OFFSET, HOST, InitPhaseState, INJECTOR, LView, LViewFlags, NEXT, PARENT, RENDERER, RENDERER_FACTORY, RootContext, RootContextFlags, SANITIZER, T_HOST, TData, TRANSPLANTED_VIEWS_TO_REFRESH, TVIEW, TView, TViewType} from '../interfaces/view';
-import {assertNodeNotOfTypes, assertNodeOfPossibleTypes} from '../node_assert';
+import {assertPureTNodeType, assertTNodeType} from '../node_assert';
+import {updateTextNode} from '../node_manipulation';
 import {isInlineTemplate, isNodeMatchingSelectorList} from '../node_selector_matcher';
-import {enterView, getBindingsEnabled, getCheckNoChangesMode, getCurrentDirectiveIndex, getIsParent, getPreviousOrParentTNode, getSelectedIndex, leaveView, setBindingIndex, setBindingRootForHostBindings, setCheckNoChangesMode, setCurrentDirectiveIndex, setCurrentQueryIndex, setPreviousOrParentTNode, setSelectedIndex} from '../state';
+import {enterView, getBindingsEnabled, getCurrentDirectiveIndex, getCurrentParentTNode, getCurrentTNode, getCurrentTNodePlaceholderOk, getSelectedIndex, isCurrentTNodeParent, isInCheckNoChangesMode, isInI18nBlock, leaveView, setBindingIndex, setBindingRootForHostBindings, setCurrentDirectiveIndex, setCurrentQueryIndex, setCurrentTNode, setIsInCheckNoChangesMode, setSelectedIndex} from '../state';
 import {NO_CHANGE} from '../tokens';
 import {isAnimationProp, mergeHostAttrs} from '../util/attrs_utils';
 import {INTERPOLATION_DELIMITER, renderStringify, stringifyForError} from '../util/misc_utils';
@@ -78,17 +79,12 @@ export function setHostBindingsByExecutingExpandoInstructions(tView: TView, lVie
           if (instruction <= 0) {
             // Negative numbers mean that we are starting new EXPANDO block and need to update
             // the current element and directive index.
-            // Important: In JS `-x` and `0-x` is not the same! If `x===0` then `-x` will produce
-            // `-0` which requires non standard math arithmetic and it can prevent VM optimizations.
-            // `0-0` will always produce `0` and will not cause a potential deoptimization in VM.
-            // TODO(misko): PERF This should be refactored to use `~instruction` as that does not
-            // suffer from `-0` and it is faster/more compact.
-            currentElementIndex = 0 - instruction;
+            currentElementIndex = ~instruction;
             setSelectedIndex(currentElementIndex);
 
             // Injector block and providers are taken into account.
             const providerCount = (expandoInstructions[++i] as number);
-            bindingRootIndex += INJECTOR_BLOOM_PARENT_SIZE + providerCount;
+            bindingRootIndex += NodeInjectorOffset.SIZE + providerCount;
 
             currentDirectiveIndex = bindingRootIndex;
           } else {
@@ -155,30 +151,16 @@ function renderChildComponents(hostLView: LView, components: number[]): void {
   }
 }
 
-/**
- * Creates a native element from a tag name, using a renderer.
- * @param name the tag name
- * @param renderer A renderer to use
- * @returns the element created
- */
-export function elementCreate(name: string, renderer: Renderer3, namespace: string|null): RElement {
-  if (isProceduralRenderer(renderer)) {
-    return renderer.createElement(name, namespace);
-  } else {
-    return namespace === null ? renderer.createElement(name) :
-                                renderer.createElementNS(namespace, name);
-  }
-}
-
 export function createLView<T>(
     parentLView: LView|null, tView: TView, context: T|null, flags: LViewFlags, host: RElement|null,
-    tHostNode: TViewNode|TElementNode|null, rendererFactory?: RendererFactory3|null,
-    renderer?: Renderer3|null, sanitizer?: Sanitizer|null, injector?: Injector|null): LView {
+    tHostNode: TNode|null, rendererFactory: RendererFactory3|null, renderer: Renderer3|null,
+    sanitizer: Sanitizer|null, injector: Injector|null): LView {
   const lView =
       ngDevMode ? cloneToLViewFromTViewBlueprint(tView) : tView.blueprint.slice() as LView;
   lView[HOST] = host;
   lView[FLAGS] = flags | LViewFlags.CreationMode | LViewFlags.Attached | LViewFlags.FirstLViewPass;
   resetPreOrderHookFlags(lView);
+  ngDevMode && tView.declTNode && parentLView && assertTNodeForLView(tView.declTNode, parentLView);
   lView[PARENT] = lView[DECLARATION_VIEW] = parentLView;
   lView[CONTEXT] = context;
   lView[RENDERER_FACTORY] = (rendererFactory || parentLView && parentLView[RENDERER_FACTORY])!;
@@ -202,9 +184,6 @@ export function createLView<T>(
  * Create and stores the TNode, and hooks it up to the tree.
  *
  * @param tView The current `TView`.
- * @param tHostNode This is a hack and we should not have to pass this value in. It is only used to
- * determine if the parent belongs to a different tView. Instead we should not have parentTView
- * point to TView other the current one.
  * @param index The index at which the TNode should be saved (null if view, since they are not
  * saved).
  * @param type The type of TNode to create
@@ -213,121 +192,121 @@ export function createLView<T>(
  * @param attrs Any attrs for the native element, if applicable
  */
 export function getOrCreateTNode(
-    tView: TView, tHostNode: TNode|null, index: number, type: TNodeType.Element, name: string|null,
+    tView: TView, index: number, type: TNodeType.Element|TNodeType.Text, name: string|null,
     attrs: TAttributes|null): TElementNode;
 export function getOrCreateTNode(
-    tView: TView, tHostNode: TNode|null, index: number, type: TNodeType.Container,
-    name: string|null, attrs: TAttributes|null): TContainerNode;
+    tView: TView, index: number, type: TNodeType.Container, name: string|null,
+    attrs: TAttributes|null): TContainerNode;
 export function getOrCreateTNode(
-    tView: TView, tHostNode: TNode|null, index: number, type: TNodeType.Projection, name: null,
+    tView: TView, index: number, type: TNodeType.Projection, name: null,
     attrs: TAttributes|null): TProjectionNode;
 export function getOrCreateTNode(
-    tView: TView, tHostNode: TNode|null, index: number, type: TNodeType.ElementContainer,
-    name: string|null, attrs: TAttributes|null): TElementContainerNode;
+    tView: TView, index: number, type: TNodeType.ElementContainer, name: string|null,
+    attrs: TAttributes|null): TElementContainerNode;
 export function getOrCreateTNode(
-    tView: TView, tHostNode: TNode|null, index: number, type: TNodeType.IcuContainer, name: null,
+    tView: TView, index: number, type: TNodeType.Icu, name: null,
     attrs: TAttributes|null): TElementContainerNode;
 export function getOrCreateTNode(
-    tView: TView, tHostNode: TNode|null, index: number, type: TNodeType, name: string|null,
-    attrs: TAttributes|null): TElementNode&TContainerNode&TElementContainerNode&TProjectionNode&
-    TIcuContainerNode {
+    tView: TView, index: number, type: TNodeType, name: string|null, attrs: TAttributes|null):
+    TElementNode&TContainerNode&TElementContainerNode&TProjectionNode&TIcuContainerNode {
+  ngDevMode && index !== 0 &&  // 0 are bogus nodes and they are OK. See `createContainerRef` in
+                               // `view_engine_compatibility` for additional context.
+      assertGreaterThanOrEqual(index, HEADER_OFFSET, 'TNodes can\'t be in the LView header.');
   // Keep this function short, so that the VM will inline it.
-  const adjustedIndex = index + HEADER_OFFSET;
-  const tNode = tView.data[adjustedIndex] as TNode ||
-      createTNodeAtIndex(tView, tHostNode, adjustedIndex, type, name, attrs);
-  setPreviousOrParentTNode(tNode, true);
-  if (ngDevMode) {
-    // For performance reasons it is important that the tNode retains the same shape during runtime.
-    // (To make sure that all of the code is monomorphic.) For this reason we seal the object to
-    // prevent class transitions.
-    // FIXME(misko): re-enable this once i18n code is compliant with this.
-    // Object.seal(tNode);
-  }
-  return tNode as TElementNode & TViewNode & TContainerNode & TElementContainerNode &
-      TProjectionNode & TIcuContainerNode;
-}
-
-function createTNodeAtIndex(
-    tView: TView, tHostNode: TNode|null, adjustedIndex: number, type: TNodeType, name: string|null,
-    attrs: TAttributes|null) {
-  const previousOrParentTNode = getPreviousOrParentTNode();
-  const isParent = getIsParent();
-  const parent =
-      isParent ? previousOrParentTNode : previousOrParentTNode && previousOrParentTNode.parent;
-  // 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 parentInSameView = parent && parent !== tHostNode;
-  const tParentNode = parentInSameView ? parent as TElementNode | TContainerNode : null;
-  const tNode = tView.data[adjustedIndex] =
-      createTNode(tView, tParentNode, type, adjustedIndex, name, attrs);
+  ngDevMode && assertPureTNodeType(type);
+  let tNode = tView.data[index] as TNode;
+  if (tNode === null) {
+    tNode = createTNodeAtIndex(tView, index, type, name, attrs);
+    if (isInI18nBlock()) {
+      // If we are in i18n block then all elements should be pre declared through `Placeholder`
+      // See `TNodeType.Placeholder` and `LFrame.inI18n` for more context.
+      // If the `TNode` was not pre-declared than it means it was not mentioned which means it was
+      // removed, so we mark it as detached.
+      tNode.flags |= TNodeFlags.isDetached;
+    }
+  } else if (tNode.type & TNodeType.Placeholder) {
+    tNode.type = type;
+    tNode.value = name;
+    tNode.attrs = attrs;
+    const parent = getCurrentParentTNode();
+    tNode.injectorIndex = parent === null ? -1 : parent.injectorIndex;
+    ngDevMode && assertTNodeForTView(tNode, tView);
+    ngDevMode && assertEqual(index, tNode.index, 'Expecting same index');
+  }
+  setCurrentTNode(tNode, true);
+  return tNode as TElementNode & TContainerNode & TElementContainerNode & TProjectionNode &
+      TIcuContainerNode;
+}
+
+export function createTNodeAtIndex(
+    tView: TView, index: number, type: TNodeType, name: string|null, attrs: TAttributes|null) {
+  const currentTNode = getCurrentTNodePlaceholderOk();
+  const isParent = isCurrentTNodeParent();
+  const parent = isParent ? currentTNode : currentTNode && currentTNode.parent;
+  // Parents cannot cross component boundaries because components will be used in multiple places.
+  const tNode = tView.data[index] =
+      createTNode(tView, parent as TElementNode | TContainerNode, type, index, name, attrs);
   // Assign a pointer to the first child node of a given view. The first node is not always the one
   // at index 0, in case of i18n, index 0 can be the instruction `i18nStart` and the first node has
   // the index 1 or more, so we can't just check node index.
   if (tView.firstChild === null) {
     tView.firstChild = tNode;
   }
-  if (previousOrParentTNode) {
-    if (isParent && previousOrParentTNode.child == null &&
-        (tNode.parent !== null || previousOrParentTNode.type === TNodeType.View)) {
-      // We are in the same view, which means we are adding content node to the parent view.
-      previousOrParentTNode.child = tNode;
-    } else if (!isParent) {
-      previousOrParentTNode.next = tNode;
+  if (currentTNode !== null) {
+    if (isParent) {
+      // FIXME(misko): This logic looks unnecessarily complicated. Could we simplify?
+      if (currentTNode.child == null && tNode.parent !== null) {
+        // We are in the same view, which means we are adding content node to the parent view.
+        currentTNode.child = tNode;
+      }
+    } else {
+      if (currentTNode.next === null) {
+        // In the case of i18n the `currentTNode` may already be linked, in which case we don't want
+        // to break the links which i18n created.
+        currentTNode.next = tNode;
+      }
     }
   }
   return tNode;
 }
 
-export function assignTViewNodeToLView(
-    tView: TView, tParentNode: TNode|null, index: number, lView: LView): void {
-  // 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.
-  let tNode = tView.node;
-  if (tNode == null) {
-    ngDevMode && tParentNode &&
-        assertNodeOfPossibleTypes(tParentNode, [TNodeType.Element, TNodeType.Container]);
-    tView.node = tNode = createTNode(
-                             tView,
-                             tParentNode as TElementNode | TContainerNode | null,  //
-                             TNodeType.View, index, null, null) as TViewNode;
-  }
-
-  lView[T_HOST] = tNode as TViewNode;
-}
-
 
 /**
  * When elements are created dynamically after a view blueprint is created (e.g. through
- * i18nApply() or ComponentFactory.create), we need to adjust the blueprint for future
+ * i18nApply()), we need to adjust the blueprint for future
  * template passes.
  *
  * @param tView `TView` associated with `LView`
- * @param view The `LView` containing the blueprint to adjust
+ * @param lView The `LView` containing the blueprint to adjust
  * @param numSlotsToAlloc The number of slots to alloc in the LView, should be >0
  */
-export function allocExpando(tView: TView, lView: LView, numSlotsToAlloc: number) {
-  ngDevMode &&
-      assertGreaterThan(
-          numSlotsToAlloc, 0, 'The number of slots to alloc should be greater than 0');
-  if (numSlotsToAlloc > 0) {
-    if (tView.firstCreatePass) {
-      for (let i = 0; i < numSlotsToAlloc; i++) {
-        tView.blueprint.push(null);
-        tView.data.push(null);
-        lView.push(null);
-      }
+export function allocExpando(tView: TView, lView: LView, numSlotsToAlloc: number): number {
+  if (ngDevMode) {
+    assertGreaterThan(numSlotsToAlloc, 0, 'The number of slots to alloc should be greater than 0');
+    assertEqual(tView.data.length, lView.length, 'Expecting LView to be same size as TView');
+    assertEqual(
+        tView.data.length, tView.blueprint.length, 'Expecting Blueprint to be same size as TView');
+    assertFirstUpdatePass(tView);
+  }
+  const allocIdx = lView.length;
+  for (let i = 0; i < numSlotsToAlloc; i++) {
+    tView.blueprint.push(null);
+    tView.data.push(null);
+    lView.push(null);
+  }
 
-      // We should only increment the expando start index if there aren't already directives
-      // and injectors saved in the "expando" section
-      if (!tView.expandoInstructions) {
-        tView.expandoStartIndex += numSlotsToAlloc;
-      } else {
-        // Since we're adding the dynamic nodes into the expando section, we need to let the host
-        // bindings know that they should skip x slots
-        tView.expandoInstructions.push(numSlotsToAlloc);
-      }
-    }
+  // We should only increment the expando start index if there aren't already directives
+  // and injectors saved in the "expando" section
+  if (!tView.expandoInstructions) {
+    tView.expandoStartIndex += numSlotsToAlloc;
+  } else {
+    // Since we're adding the dynamic nodes into the expando section, we need to let the host
+    // bindings know that they should skip x slots
+    // FIXME(misko): Refactor `expandoInstructions` so that it does not rely on relative binding
+    // offsets, but absolute values which Means we would not have to store it here.
+    tView.expandoInstructions.push(numSlotsToAlloc);
   }
+  return allocIdx;
 }
 
 
@@ -344,7 +323,7 @@ export function allocExpando(tView: TView, lView: LView, numSlotsToAlloc: number
  */
 export function renderView<T>(tView: TView, lView: LView, context: T): void {
   ngDevMode && assertEqual(isCreationMode(lView), true, 'Should be run in creation mode');
-  enterView(lView, lView[T_HOST]);
+  enterView(lView);
   try {
     const viewQuery = tView.viewQuery;
     if (viewQuery !== null) {
@@ -414,8 +393,10 @@ export function refreshView<T>(
   ngDevMode && assertEqual(isCreationMode(lView), false, 'Should be run in update mode');
   const flags = lView[FLAGS];
   if ((flags & LViewFlags.Destroyed) === LViewFlags.Destroyed) return;
-  enterView(lView, lView[T_HOST]);
-  const checkNoChangesMode = getCheckNoChangesMode();
+  enterView(lView);
+  // Check no changes mode is a dev only mode used to verify that bindings have not changed
+  // since they were assigned. We do not want to execute lifecycle hooks in that mode.
+  const isInCheckNoChangesPass = isInCheckNoChangesMode();
   try {
     resetPreOrderHookFlags(lView);
 
@@ -429,7 +410,7 @@ export function refreshView<T>(
 
     // execute pre-order hooks (OnInit, OnChanges, DoCheck)
     // PERF WARNING: do NOT extract this to a separate function without running benchmarks
-    if (!checkNoChangesMode) {
+    if (!isInCheckNoChangesPass) {
       if (hooksInitPhaseCompleted) {
         const preOrderCheckHooks = tView.preOrderCheckHooks;
         if (preOrderCheckHooks !== null) {
@@ -457,7 +438,7 @@ export function refreshView<T>(
 
     // execute content hooks (AfterContentInit, AfterContentChecked)
     // PERF WARNING: do NOT extract this to a separate function without running benchmarks
-    if (!checkNoChangesMode) {
+    if (!isInCheckNoChangesPass) {
       if (hooksInitPhaseCompleted) {
         const contentCheckHooks = tView.contentCheckHooks;
         if (contentCheckHooks !== null) {
@@ -491,7 +472,7 @@ export function refreshView<T>(
 
     // execute view hooks (AfterViewInit, AfterViewChecked)
     // PERF WARNING: do NOT extract this to a separate function without running benchmarks
-    if (!checkNoChangesMode) {
+    if (!isInCheckNoChangesPass) {
       if (hooksInitPhaseCompleted) {
         const viewCheckHooks = tView.viewCheckHooks;
         if (viewCheckHooks !== null) {
@@ -521,7 +502,7 @@ export function refreshView<T>(
     // refresh a `NgClass` binding should work. If we would reset the dirty state in the check
     // no changes cycle, the component would be not be dirty for the next update pass. This would
     // be different in production mode where the component dirty state is not reset.
-    if (!checkNoChangesMode) {
+    if (!isInCheckNoChangesPass) {
       lView[FLAGS] &= ~(LViewFlags.Dirty | LViewFlags.FirstLViewPass);
     }
     if (lView[FLAGS] & LViewFlags.RefreshTransplantedView) {
@@ -536,7 +517,7 @@ export function refreshView<T>(
 export function renderComponentOrTemplate<T>(
     tView: TView, lView: LView, templateFn: ComponentTemplate<{}>|null, context: T) {
   const rendererFactory = lView[RENDERER_FACTORY];
-  const normalExecutionPath = !getCheckNoChangesMode();
+  const normalExecutionPath = !isInCheckNoChangesMode();
   const creationModeIsActive = isCreationMode(lView);
   try {
     if (normalExecutionPath && !creationModeIsActive && rendererFactory.begin) {
@@ -561,7 +542,7 @@ function executeTemplate<T>(
     if (rf & RenderFlags.Update && lView.length > HEADER_OFFSET) {
       // When we're updating, inherently select 0 so we don't
       // have to generate that instruction for most update blocks.
-      selectIndexInternal(tView, lView, 0, getCheckNoChangesMode());
+      selectIndexInternal(tView, lView, HEADER_OFFSET, isInCheckNoChangesMode());
     }
     templateFn(rf, context);
   } finally {
@@ -630,10 +611,13 @@ export function getOrCreateTComponentView(def: ComponentDef<any>): TView {
   const tView = def.tView;
 
   // Create a TView if there isn't one, or recreate it if the first create pass didn't
-  // complete successfuly since we can't know for sure whether it's in a usable shape.
+  // complete successfully since we can't know for sure whether it's in a usable shape.
   if (tView === null || tView.incompleteFirstPass) {
+    // Declaration node here is null since this function is called when we dynamically create a
+    // component and hence there is no declaration.
+    const declTNode = null;
     return def.tView = createTView(
-               TViewType.Component, -1, def.template, def.decls, def.vars, def.directiveDefs,
+               TViewType.Component, declTNode, def.template, def.decls, def.vars, def.directiveDefs,
                def.pipeDefs, def.viewQuery, def.schemas, def.consts);
   }
 
@@ -644,7 +628,8 @@ export function getOrCreateTComponentView(def: ComponentDef<any>): TView {
 /**
  * Creates a TView instance
  *
- * @param viewIndex The viewBlockId for inline views, or -1 if it's a component/dynamic
+ * @param type Type of `TView`.
+ * @param declTNode Declaration location of this `TView`.
  * @param templateFn Template function
  * @param decls The number of nodes, local refs, and pipes in this template
  * @param directives Registry of directives for this view
@@ -654,10 +639,10 @@ export function getOrCreateTComponentView(def: ComponentDef<any>): TView {
  * @param consts Constants for this view
  */
 export function createTView(
-    type: TViewType, viewIndex: number, templateFn: ComponentTemplate<any>|null, decls: number,
+    type: TViewType, declTNode: TNode|null, templateFn: ComponentTemplate<any>|null, decls: number,
     vars: number, directives: DirectiveDefListOrFactory|null, pipes: PipeDefListOrFactory|null,
     viewQuery: ViewQueriesFunction<any>|null, schemas: SchemaMetadata[]|null,
-    consts: TConstants|null): TView {
+    constsOrFactory: TConstantsOrFactory|null): TView {
   ngDevMode && ngDevMode.tView++;
   const bindingStartIndex = HEADER_OFFSET + decls;
   // This length does not yet contain host bindings from child directives because at this point,
@@ -665,52 +650,51 @@ export function createTView(
   // that has a host binding, we will update the blueprint with that def's hostVars count.
   const initialViewLength = bindingStartIndex + vars;
   const blueprint = createViewBlueprint(bindingStartIndex, initialViewLength);
-  return blueprint[TVIEW as any] = ngDevMode ?
+  const consts = typeof constsOrFactory === 'function' ? constsOrFactory() : constsOrFactory;
+  const tView = blueprint[TVIEW as any] = ngDevMode ?
       new TViewConstructor(
-             type,
-             viewIndex,   // id: number,
-             blueprint,   // blueprint: LView,
-             templateFn,  // template: ComponentTemplate<{}>|null,
-             null,        // queries: TQueries|null
-             viewQuery,   // viewQuery: ViewQueriesFunction<{}>|null,
-             null!,       // node: TViewNode|TElementNode|null,
-             cloneToTViewData(blueprint).fill(null, bindingStartIndex),  // data: TData,
-             bindingStartIndex,  // bindingStartIndex: number,
-             initialViewLength,  // expandoStartIndex: number,
-             null,               // expandoInstructions: ExpandoInstructions|null,
-             true,               // firstCreatePass: boolean,
-             true,               // firstUpdatePass: boolean,
-             false,              // staticViewQueries: boolean,
-             false,              // staticContentQueries: boolean,
-             null,               // preOrderHooks: HookData|null,
-             null,               // preOrderCheckHooks: HookData|null,
-             null,               // contentHooks: HookData|null,
-             null,               // contentCheckHooks: HookData|null,
-             null,               // viewHooks: HookData|null,
-             null,               // viewCheckHooks: HookData|null,
-             null,               // destroyHooks: DestroyHookData|null,
-             null,               // cleanup: any[]|null,
-             null,               // contentQueries: number[]|null,
-             null,               // components: number[]|null,
-             typeof directives === 'function' ?
-                 directives() :
-                 directives,  // directiveRegistry: DirectiveDefList|null,
-             typeof pipes === 'function' ? pipes() : pipes,  // pipeRegistry: PipeDefList|null,
-             null,                                           // firstChild: TNode|null,
-             schemas,                                        // schemas: SchemaMetadata[]|null,
-             consts,                                         // consts: TConstants|null
-             false,                                          // incompleteFirstPass: boolean
-             decls,                                          // ngDevMode only: decls
-             vars,                                           // ngDevMode only: vars
-             ) :
+          type,
+          blueprint,   // blueprint: LView,
+          templateFn,  // template: ComponentTemplate<{}>|null,
+          null,        // queries: TQueries|null
+          viewQuery,   // viewQuery: ViewQueriesFunction<{}>|null,
+          declTNode,   // declTNode: TNode|null,
+          cloneToTViewData(blueprint).fill(null, bindingStartIndex),  // data: TData,
+          bindingStartIndex,                                          // bindingStartIndex: number,
+          initialViewLength,                                          // expandoStartIndex: number,
+          null,   // expandoInstructions: ExpandoInstructions|null,
+          true,   // firstCreatePass: boolean,
+          true,   // firstUpdatePass: boolean,
+          false,  // staticViewQueries: boolean,
+          false,  // staticContentQueries: boolean,
+          null,   // preOrderHooks: HookData|null,
+          null,   // preOrderCheckHooks: HookData|null,
+          null,   // contentHooks: HookData|null,
+          null,   // contentCheckHooks: HookData|null,
+          null,   // viewHooks: HookData|null,
+          null,   // viewCheckHooks: HookData|null,
+          null,   // destroyHooks: DestroyHookData|null,
+          null,   // cleanup: any[]|null,
+          null,   // contentQueries: number[]|null,
+          null,   // components: number[]|null,
+          typeof directives === 'function' ?
+              directives() :
+              directives,  // directiveRegistry: DirectiveDefList|null,
+          typeof pipes === 'function' ? pipes() : pipes,  // pipeRegistry: PipeDefList|null,
+          null,                                           // firstChild: TNode|null,
+          schemas,                                        // schemas: SchemaMetadata[]|null,
+          consts,                                         // consts: TConstants|null
+          false,                                          // incompleteFirstPass: boolean
+          decls,                                          // ngDevMode only: decls
+          vars,                                           // ngDevMode only: vars
+          ) :
       {
         type: type,
-        id: viewIndex,
         blueprint: blueprint,
         template: templateFn,
         queries: null,
         viewQuery: viewQuery,
-        node: null!,
+        declTNode: declTNode,
         data: blueprint.slice().fill(null, bindingStartIndex),
         bindingStartIndex: bindingStartIndex,
         expandoStartIndex: initialViewLength,
@@ -736,6 +720,13 @@ export function createTView(
         consts: consts,
         incompleteFirstPass: false
       };
+  if (ngDevMode) {
+    // For performance reasons it is important that the tView retains the same shape during runtime.
+    // (To make sure that all of the code is monomorphic.) For this reason we seal the object to
+    // prevent class transitions.
+    Object.seal(tView);
+  }
+  return tView;
 }
 
 function createViewBlueprint(bindingStartIndex: number, initialViewLength: number): LView {
@@ -813,83 +804,117 @@ export function storeCleanupWithContext(
  * Constructs a TNode object from the arguments.
  *
  * @param tView `TView` to which this `TNode` belongs (used only in `ngDevMode`)
+ * @param tParent Parent `TNode`
  * @param type The type of the node
- * @param adjustedIndex The index of the TNode in TView.data, adjusted for HEADER_OFFSET
+ * @param index 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 tViews Any TViews attached to this node
  * @returns the TNode object
  */
 export function createTNode(
-    tView: TView, tParent: TElementNode|TContainerNode|null, type: TNodeType, adjustedIndex: number,
-    tagName: string|null, attrs: TAttributes|null): TNode {
+    tView: TView, tParent: TElementNode|TContainerNode|null, type: TNodeType.Container,
+    index: number, tagName: string|null, attrs: TAttributes|null): TContainerNode;
+export function createTNode(
+    tView: TView, tParent: TElementNode|TContainerNode|null, type: TNodeType.Element|TNodeType.Text,
+    index: number, tagName: string|null, attrs: TAttributes|null): TElementNode;
+export function createTNode(
+    tView: TView, tParent: TElementNode|TContainerNode|null, type: TNodeType.ElementContainer,
+    index: number, tagName: string|null, attrs: TAttributes|null): TElementContainerNode;
+export function createTNode(
+    tView: TView, tParent: TElementNode|TContainerNode|null, type: TNodeType.Icu, index: number,
+    tagName: string|null, attrs: TAttributes|null): TIcuContainerNode;
+export function createTNode(
+    tView: TView, tParent: TElementNode|TContainerNode|null, type: TNodeType.Projection,
+    index: number, tagName: string|null, attrs: TAttributes|null): TProjectionNode;
+export function createTNode(
+    tView: TView, tParent: TElementNode|TContainerNode|null, type: TNodeType, index: number,
+    tagName: string|null, attrs: TAttributes|null): TNode;
+export function createTNode(
+    tView: TView, tParent: TElementNode|TContainerNode|null, type: TNodeType, index: number,
+    value: string|null, attrs: TAttributes|null): TNode {
+  ngDevMode && index !== 0 &&  // 0 are bogus nodes and they are OK. See `createContainerRef` in
+                               // `view_engine_compatibility` for additional context.
+      assertGreaterThanOrEqual(index, HEADER_OFFSET, 'TNodes can\'t be in the LView header.');
+  ngDevMode && assertNotSame(attrs, undefined, '\'undefined\' is not valid value for \'attrs\'');
   ngDevMode && ngDevMode.tNode++;
+  ngDevMode && tParent && assertTNodeForTView(tParent, tView);
   let injectorIndex = tParent ? tParent.injectorIndex : -1;
-  return ngDevMode ? new TNodeDebug(
-                         tView,          // tView_: TView
-                         type,           // type: TNodeType
-                         adjustedIndex,  // index: number
-                         injectorIndex,  // injectorIndex: number
-                         -1,             // directiveStart: number
-                         -1,             // directiveEnd: number
-                         -1,             // directiveStylingLast: number
-                         null,           // propertyBindings: number[]|null
-                         0,              // flags: TNodeFlags
-                         0,              // providerIndexes: TNodeProviderIndexes
-                         tagName,        // tagName: string|null
-                         attrs,  // attrs: (string|AttributeMarker|(string|SelectorFlags)[])[]|null
-                         null,   // mergedAttrs
-                         null,   // localNames: (string|number)[]|null
-                         undefined,  // initialInputs: (string[]|null)[]|null|undefined
-                         null,       // inputs: PropertyAliases|null
-                         null,       // outputs: PropertyAliases|null
-                         null,       // tViews: ITView|ITView[]|null
-                         null,       // next: ITNode|null
-                         null,       // projectionNext: ITNode|null
-                         null,       // child: ITNode|null
-                         tParent,    // parent: TElementNode|TContainerNode|null
-                         null,       // projection: number|(ITNode|RNode[])[]|null
-                         null,       // styles: string|null
-                         null,       // stylesWithoutHost: string|null
-                         undefined,  // residualStyles: string|null
-                         null,       // classes: string|null
-                         null,       // classesWithoutHost: string|null
-                         undefined,  // residualClasses: string|null
-                         0 as any,   // classBindings: TStylingRange;
-                         0 as any,   // styleBindings: TStylingRange;
-                         ) :
-                     {
-                       type: type,
-                       index: adjustedIndex,
-                       injectorIndex: injectorIndex,
-                       directiveStart: -1,
-                       directiveEnd: -1,
-                       directiveStylingLast: -1,
-                       propertyBindings: null,
-                       flags: 0,
-                       providerIndexes: 0,
-                       tagName: tagName,
-                       attrs: attrs,
-                       mergedAttrs: null,
-                       localNames: null,
-                       initialInputs: undefined,
-                       inputs: null,
-                       outputs: null,
-                       tViews: null,
-                       next: null,
-                       projectionNext: null,
-                       child: null,
-                       parent: tParent,
-                       projection: null,
-                       styles: null,
-                       stylesWithoutHost: null,
-                       residualStyles: undefined,
-                       classes: null,
-                       classesWithoutHost: null,
-                       residualClasses: undefined,
-                       classBindings: 0 as any,
-                       styleBindings: 0 as any,
-                     };
+  const tNode = ngDevMode ?
+      new TNodeDebug(
+          tView,          // tView_: TView
+          type,           // type: TNodeType
+          index,          // index: number
+          null,           // insertBeforeIndex: null|-1|number|number[]
+          injectorIndex,  // injectorIndex: number
+          -1,             // directiveStart: number
+          -1,             // directiveEnd: number
+          -1,             // directiveStylingLast: number
+          null,           // propertyBindings: number[]|null
+          0,              // flags: TNodeFlags
+          0,              // providerIndexes: TNodeProviderIndexes
+          value,          // value: string|null
+          attrs,          // attrs: (string|AttributeMarker|(string|SelectorFlags)[])[]|null
+          null,           // mergedAttrs
+          null,           // localNames: (string|number)[]|null
+          undefined,      // initialInputs: (string[]|null)[]|null|undefined
+          null,           // inputs: PropertyAliases|null
+          null,           // outputs: PropertyAliases|null
+          null,           // tViews: ITView|ITView[]|null
+          null,           // next: ITNode|null
+          null,           // projectionNext: ITNode|null
+          null,           // child: ITNode|null
+          tParent,        // parent: TElementNode|TContainerNode|null
+          null,           // projection: number|(ITNode|RNode[])[]|null
+          null,           // styles: string|null
+          null,           // stylesWithoutHost: string|null
+          undefined,      // residualStyles: string|null
+          null,           // classes: string|null
+          null,           // classesWithoutHost: string|null
+          undefined,      // residualClasses: string|null
+          0 as any,       // classBindings: TStylingRange;
+          0 as any,       // styleBindings: TStylingRange;
+          ) :
+      {
+        type,
+        index,
+        insertBeforeIndex: null,
+        injectorIndex,
+        directiveStart: -1,
+        directiveEnd: -1,
+        directiveStylingLast: -1,
+        propertyBindings: null,
+        flags: 0,
+        providerIndexes: 0,
+        value: value,
+        attrs: attrs,
+        mergedAttrs: null,
+        localNames: null,
+        initialInputs: undefined,
+        inputs: null,
+        outputs: null,
+        tViews: null,
+        next: null,
+        projectionNext: null,
+        child: null,
+        parent: tParent,
+        projection: null,
+        styles: null,
+        stylesWithoutHost: null,
+        residualStyles: undefined,
+        classes: null,
+        classesWithoutHost: null,
+        residualClasses: undefined,
+        classBindings: 0 as any,
+        styleBindings: 0 as any,
+      };
+  if (ngDevMode) {
+    // For performance reasons it is important that the tNode retains the same shape during runtime.
+    // (To make sure that all of the code is monomorphic.) For this reason we seal the object to
+    // prevent class transitions.
+    Object.seal(tNode);
+  }
+  return tNode;
 }
 
 
@@ -988,7 +1013,7 @@ export function elementPropertyInternal<T>(
     if (ngDevMode) {
       setNgReflectProperties(lView, element, tNode.type, dataValue, value);
     }
-  } else if (tNode.type === TNodeType.Element) {
+  } else if (tNode.type & TNodeType.AnyRNode) {
     propName = mapPropName(propName);
 
     if (ngDevMode) {
@@ -1003,17 +1028,17 @@ export function elementPropertyInternal<T>(
 
     // It is assumed that the sanitizer is only added when the compiler determines that the
     // property is risky, so sanitization can be done without further checks.
-    value = sanitizer != null ? (sanitizer(value, tNode.tagName || '', propName) as any) : value;
+    value = sanitizer != null ? (sanitizer(value, tNode.value || '', propName) as any) : value;
     if (isProceduralRenderer(renderer)) {
       renderer.setProperty(element as RElement, propName, value);
     } else if (!isAnimationProp(propName)) {
       (element as RElement).setProperty ? (element as any).setProperty(propName, value) :
                                           (element as any)[propName] = value;
     }
-  } else if (tNode.type === TNodeType.Container || tNode.type === TNodeType.ElementContainer) {
+  } else if (tNode.type & TNodeType.AnyContainer) {
     // If the node is a container and the property didn't
     // match any of the inputs or schemas we should throw.
-    if (ngDevMode && !matchingSchemas(tView, tNode.tagName)) {
+    if (ngDevMode && !matchingSchemas(tView, tNode.value)) {
       logUnknownPropertyError(propName, tNode);
     }
   }
@@ -1033,7 +1058,7 @@ function setNgReflectProperty(
   const renderer = lView[RENDERER];
   attrName = normalizeDebugBindingName(attrName);
   const debugValue = normalizeDebugBindingValue(value);
-  if (type === TNodeType.Element) {
+  if (type & TNodeType.AnyRNode) {
     if (value == null) {
       isProceduralRenderer(renderer) ? renderer.removeAttribute((element as RElement), attrName) :
                                        (element as RElement).removeAttribute(attrName);
@@ -1055,7 +1080,7 @@ function setNgReflectProperty(
 export function setNgReflectProperties(
     lView: LView, element: RElement|RComment, type: TNodeType, dataValue: PropertyAliasValue,
     value: any) {
-  if (type === TNodeType.Element || type === TNodeType.Container) {
+  if (type & (TNodeType.AnyRNode | TNodeType.Container)) {
     /**
      * dataValue is an array containing runtime input or output names for the directives:
      * i+0: directive instance index
@@ -1080,7 +1105,7 @@ function validateProperty(
 
   // The property is considered valid if the element matches the schema, it exists on the element
   // or it is synthetic, and we are in a browser context (web worker nodes should be skipped).
-  if (matchingSchemas(tView, tNode.tagName) || propName in element || isAnimationProp(propName)) {
+  if (matchingSchemas(tView, tNode.value) || propName in element || isAnimationProp(propName)) {
     return true;
   }
 
@@ -1111,15 +1136,14 @@ export function matchingSchemas(tView: TView, tagName: string|null): boolean {
  * @param tNode Node on which we encountered the property.
  */
 function logUnknownPropertyError(propName: string, tNode: TNode): void {
-  console.error(
-      `Can't bind to '${propName}' since it isn't a known property of '${tNode.tagName}'.`);
+  console.error(`Can't bind to '${propName}' since it isn't a known property of '${tNode.value}'.`);
 }
 
 /**
  * Instantiate a root component.
  */
 export function instantiateRootComponent<T>(tView: TView, lView: LView, def: ComponentDef<T>): T {
-  const rootTNode = getPreviousOrParentTNode();
+  const rootTNode = getCurrentTNode()!;
   if (tView.firstCreatePass) {
     if (def.providersResolver) def.providersResolver(def);
     generateExpandoInstructionBlock(tView, rootTNode, 1);
@@ -1188,13 +1212,12 @@ export function resolveDirectives(
           // We will push the actual hook function into this array later during dir instantiation.
           // We cannot do it now because we must ensure hooks are registered in the same
           // order that directives are created (i.e. injection order).
-          (tView.preOrderHooks || (tView.preOrderHooks = [])).push(tNode.index - HEADER_OFFSET);
+          (tView.preOrderHooks || (tView.preOrderHooks = [])).push(tNode.index);
           preOrderHooksFound = true;
         }
 
         if (!preOrderCheckHooksFound && (lifeCycleHooks.ngOnChanges || lifeCycleHooks.ngDoCheck)) {
-          (tView.preOrderCheckHooks || (tView.preOrderCheckHooks = []))
-              .push(tNode.index - HEADER_OFFSET);
+          (tView.preOrderCheckHooks || (tView.preOrderCheckHooks = [])).push(tNode.index);
           preOrderCheckHooksFound = true;
         }
 
@@ -1277,7 +1300,7 @@ function instantiateAllDirectives(
     const isComponent = isComponentDef(def);
 
     if (isComponent) {
-      ngDevMode && assertNodeOfPossibleTypes(tNode, [TNodeType.Element]);
+      ngDevMode && assertTNodeType(tNode, TNodeType.AnyRNode);
       addComponentLogic(lView, tNode as TElementNode, def as ComponentDef<any>);
     }
 
@@ -1300,7 +1323,7 @@ function invokeDirectivesHostBindings(tView: TView, lView: LView, tNode: TNode)
   const end = tNode.directiveEnd;
   const expando = tView.expandoInstructions!;
   const firstCreatePass = tView.firstCreatePass;
-  const elementIndex = tNode.index - HEADER_OFFSET;
+  const elementIndex = tNode.index;
   const currentDirectiveIndex = getCurrentDirectiveIndex();
   try {
     setSelectedIndex(elementIndex);
@@ -1345,10 +1368,7 @@ export function generateExpandoInstructionBlock(
           tView.firstCreatePass, true,
           'Expando block should only be generated on first create pass.');
 
-  // Important: In JS `-x` and `0-x` is not the same! If `x===0` then `-x` will produce `-0` which
-  // requires non standard math arithmetic and it can prevent VM optimizations.
-  // `0-0` will always produce `0` and will not cause a potential deoptimization in VM.
-  const elementIndex = HEADER_OFFSET - tNode.index;
+  const elementIndex = ~tNode.index;
   const providerStartIndex = tNode.providerIndexes & TNodeProviderIndexes.ProvidersStartIndexMask;
   const providerCount = tView.data.length - providerStartIndex;
   (tView.expandoInstructions || (tView.expandoInstructions = []))
@@ -1363,9 +1383,8 @@ function findDirectiveDefMatches(
     tView: TView, viewData: LView,
     tNode: TElementNode|TContainerNode|TElementContainerNode): DirectiveDef<any>[]|null {
   ngDevMode && assertFirstCreatePass(tView);
-  ngDevMode &&
-      assertNodeOfPossibleTypes(
-          tNode, [TNodeType.Element, TNodeType.ElementContainer, TNodeType.Container]);
+  ngDevMode && assertTNodeType(tNode, TNodeType.AnyRNode | TNodeType.AnyContainer);
+
   const registry = tView.directiveRegistry;
   let matches: any[]|null = null;
   if (registry) {
@@ -1376,13 +1395,14 @@ function findDirectiveDefMatches(
         diPublicInInjector(getOrCreateNodeInjectorForNode(tNode, viewData), tView, def.type);
 
         if (isComponentDef(def)) {
-          ngDevMode &&
-              assertNodeOfPossibleTypes(
-                  tNode, [TNodeType.Element],
-                  `"${tNode.tagName}" tags cannot be used as component hosts. ` +
-                      `Please use a different tag to activate the ${
-                          stringify(def.type)} component.`);
-          if (tNode.flags & TNodeFlags.isComponentHost) throwMultipleComponentError(tNode);
+          if (ngDevMode) {
+            assertTNodeType(
+                tNode, TNodeType.Element,
+                `"${tNode.value}" tags cannot be used as component hosts. ` +
+                    `Please use a different tag to activate the ${stringify(def.type)} component.`);
+
+            if (tNode.flags & TNodeFlags.isComponentHost) throwMultipleComponentError(tNode);
+          }
           markAsComponentHost(tView, tNode);
           // The component is always stored first with directives after.
           matches.unshift(def);
@@ -1479,7 +1499,8 @@ function addComponentLogic<T>(lView: LView, hostTNode: TElementNode, def: Compon
       lView,
       createLView(
           lView, tView, null, def.onPush ? LViewFlags.Dirty : LViewFlags.CheckAlways, native,
-          hostTNode as TElementNode, rendererFactory, rendererFactory.createRenderer(native, def)));
+          hostTNode as TElementNode, rendererFactory, rendererFactory.createRenderer(native, def),
+          null, null));
 
   // Component view will always be created before any injected LContainers,
   // so this is a regular element, wrap it with the component view
@@ -1492,13 +1513,18 @@ export function elementAttributeInternal(
   if (ngDevMode) {
     assertNotSame(value, NO_CHANGE as any, 'Incoming value should never be NO_CHANGE.');
     validateAgainstEventAttributes(name);
-    assertNodeNotOfTypes(
-        tNode, [TNodeType.Container, TNodeType.ElementContainer],
+    assertTNodeType(
+        tNode, TNodeType.Element,
         `Attempted to set attribute \`${name}\` on a container node. ` +
             `Host bindings are not valid on ng-container or ng-template.`);
   }
   const element = getNativeByTNode(tNode, lView) as RElement;
-  const renderer = lView[RENDERER];
+  setElementAttribute(lView[RENDERER], element, namespace, tNode.value, name, value, sanitizer);
+}
+
+export function setElementAttribute(
+    renderer: Renderer3, element: RElement, namespace: string|null|undefined, tagName: string|null,
+    name: string, value: any, sanitizer: SanitizerFn|null|undefined) {
   if (value == null) {
     ngDevMode && ngDevMode.rendererRemoveAttribute++;
     isProceduralRenderer(renderer) ? renderer.removeAttribute(element, name, namespace) :
@@ -1506,7 +1532,7 @@ export function elementAttributeInternal(
   } else {
     ngDevMode && ngDevMode.rendererSetAttribute++;
     const strValue =
-        sanitizer == null ? renderStringify(value) : sanitizer(value, tNode.tagName || '', name);
+        sanitizer == null ? renderStringify(value) : sanitizer(value, tagName || '', name);
 
 
     if (isProceduralRenderer(renderer)) {
@@ -1910,11 +1936,11 @@ export function detectChangesInRootView(lView: LView): void {
 }
 
 export function checkNoChangesInternal<T>(tView: TView, view: LView, context: T) {
-  setCheckNoChangesMode(true);
+  setIsInCheckNoChangesMode(true);
   try {
     detectChangesInternal(tView, view, context);
   } finally {
-    setCheckNoChangesMode(false);
+    setIsInCheckNoChangesMode(false);
   }
 }
 
@@ -1928,11 +1954,11 @@ export function checkNoChangesInternal<T>(tView: TView, view: LView, context: T)
  * @param lView The view which the change detection should be checked on.
  */
 export function checkNoChangesInRootView(lView: LView): void {
-  setCheckNoChangesMode(true);
+  setIsInCheckNoChangesMode(true);
   try {
     detectChangesInRootView(lView);
   } finally {
-    setCheckNoChangesMode(false);
+    setIsInCheckNoChangesMode(false);
   }
 }
 
@@ -2040,7 +2066,7 @@ export function setInputsForProperty(
     const index = inputs[i++] as number;
     const privateName = inputs[i++] as string;
     const instance = lView[index];
-    ngDevMode && assertDataInRange(lView, index);
+    ngDevMode && assertIndexInRange(lView, index);
     const def = tView.data[index] as DirectiveDef<any>;
     if (def.setInput !== null) {
       def.setInput!(instance, value, publicName, privateName);
@@ -2054,11 +2080,10 @@ export function setInputsForProperty(
  * Updates a text binding at a given index in a given LView.
  */
 export function textBindingInternal(lView: LView, index: number, value: string): void {
+  ngDevMode && assertString(value, 'Value should be a string');
   ngDevMode && assertNotSame(value, NO_CHANGE as any, 'value should not be NO_CHANGE');
-  ngDevMode && assertDataInRange(lView, index + HEADER_OFFSET);
+  ngDevMode && assertIndexInRange(lView, index);
   const element = getNativeByIndex(index, lView) as any as RText;
   ngDevMode && assertDefined(element, 'native element should exist');
-  ngDevMode && ngDevMode.rendererSetText++;
-  const renderer = lView[RENDERER];
-  isProceduralRenderer(renderer) ? renderer.setValue(element, value) : element.textContent = value;
+  updateTextNode(lView[RENDERER], element, value);
 }
diff --git a/packages/core/src/render3/instructions/storage.ts b/packages/core/src/render3/instructions/storage.ts
index ea1cf2fd7a184..676ee4d92824c 100644
--- a/packages/core/src/render3/instructions/storage.ts
+++ b/packages/core/src/render3/instructions/storage.ts
@@ -14,12 +14,11 @@ import {load} from '../util/view_utils';
 export function store<T>(tView: TView, lView: LView, 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
-  const adjustedIndex = index + HEADER_OFFSET;
-  if (adjustedIndex >= tView.data.length) {
-    tView.data[adjustedIndex] = null;
-    tView.blueprint[adjustedIndex] = null;
+  if (index >= tView.data.length) {
+    tView.data[index] = null;
+    tView.blueprint[index] = null;
   }
-  lView[adjustedIndex] = value;
+  lView[index] = value;
 }
 
 /**
@@ -34,5 +33,5 @@ export function store<T>(tView: TView, lView: LView, index: number, value: T): v
  */
 export function ɵɵreference<T>(index: number) {
   const contextLView = getContextLView();
-  return load<T>(contextLView, index);
+  return load<T>(contextLView, HEADER_OFFSET + index);
 }
diff --git a/packages/core/src/render3/instructions/styling.ts b/packages/core/src/render3/instructions/styling.ts
index e5daab9dc64d3..16ac4d3d7a80a 100644
--- a/packages/core/src/render3/instructions/styling.ts
+++ b/packages/core/src/render3/instructions/styling.ts
@@ -17,14 +17,13 @@ import {DirectiveDef} from '../interfaces/definition';
 import {AttributeMarker, TAttributes, TNode, TNodeFlags, TNodeType} from '../interfaces/node';
 import {RElement, Renderer3} from '../interfaces/renderer';
 import {getTStylingRangeNext, getTStylingRangeNextDuplicate, getTStylingRangePrev, getTStylingRangePrevDuplicate, TStylingKey, TStylingRange} from '../interfaces/styling';
-import {HEADER_OFFSET, LView, RENDERER, TData, TView} from '../interfaces/view';
+import {LView, RENDERER, TData, TView} from '../interfaces/view';
 import {applyStyling} from '../node_manipulation';
 import {getCurrentDirectiveDef, getLView, getSelectedIndex, getTView, incrementBindingIndex} from '../state';
 import {insertTStylingBinding} from '../styling/style_binding_list';
 import {getLastParsedKey, getLastParsedValue, parseClassName, parseClassNameNext, parseStyle, parseStyleNext} from '../styling/styling_parser';
 import {NO_CHANGE} from '../tokens';
 import {getNativeByIndex} from '../util/view_utils';
-
 import {setDirectiveInputsWhichShadowsStyling} from './property';
 
 
@@ -174,7 +173,7 @@ export function checkStylingProperty(
     stylingFirstUpdatePass(tView, prop, bindingIndex, isClassBased);
   }
   if (value !== NO_CHANGE && bindingUpdated(lView, bindingIndex, value)) {
-    const tNode = tView.data[getSelectedIndex() + HEADER_OFFSET] as TNode;
+    const tNode = tView.data[getSelectedIndex()] as TNode;
     updateStyling(
         tView, tNode, lView, lView[RENDERER], prop,
         lView[bindingIndex + 1] = normalizeSuffix(value, suffix), isClassBased, bindingIndex);
@@ -204,7 +203,7 @@ export function checkStylingMap(
   if (value !== NO_CHANGE && bindingUpdated(lView, bindingIndex, value)) {
     // `getSelectedIndex()` should be here (rather than in instruction) so that it is guarded by the
     // if so as not to read unnecessarily.
-    const tNode = tView.data[getSelectedIndex() + HEADER_OFFSET] as TNode;
+    const tNode = tView.data[getSelectedIndex()] as TNode;
     if (hasStylingInputShadow(tNode, isClassBased) && !isInHostBindings(tView, bindingIndex)) {
       if (ngDevMode) {
         // verify that if we are shadowing then `TData` is appropriately marked so that we skip
@@ -271,7 +270,8 @@ function stylingFirstUpdatePass(
     // itself to the list.
     // `getSelectedIndex()` should be here (rather than in instruction) so that it is guarded by the
     // if so as not to read unnecessarily.
-    const tNode = tData[getSelectedIndex() + HEADER_OFFSET] as TNode;
+    const tNode = tData[getSelectedIndex()] as TNode;
+    ngDevMode && assertDefined(tNode, 'TNode expected');
     const isHostBindings = isInHostBindings(tView, bindingIndex);
     if (hasStylingInputShadow(tNode, isClassBased) && tStylingKey === null && !isHostBindings) {
       // `tStylingKey === null` implies that we are either `[style]` or `[class]` binding.
@@ -705,7 +705,7 @@ function updateStylingMap(
 function updateStyling(
     tView: TView, tNode: TNode, lView: LView, renderer: Renderer3, prop: string,
     value: string|undefined|null|boolean, isClassBased: boolean, bindingIndex: number) {
-  if (tNode.type !== TNodeType.Element) {
+  if (!(tNode.type & TNodeType.AnyRNode)) {
     // It is possible to have styling on non-elements (such as ng-container).
     // This is rare, but it does happen. In such a case, just ignore the binding.
     return;
diff --git a/packages/core/src/render3/instructions/template.ts b/packages/core/src/render3/instructions/template.ts
index a21594ae6204d..43e476ca6126c 100644
--- a/packages/core/src/render3/instructions/template.ts
+++ b/packages/core/src/render3/instructions/template.ts
@@ -9,14 +9,14 @@ import {assertFirstCreatePass} from '../assert';
 import {attachPatchData} from '../context_discovery';
 import {registerPostOrderHooks} from '../hooks';
 import {ComponentTemplate} from '../interfaces/definition';
-import {LocalRefExtractor, TAttributes, TContainerNode, TNodeType, TViewNode} from '../interfaces/node';
+import {LocalRefExtractor, TAttributes, TContainerNode, TNodeType} from '../interfaces/node';
 import {isDirectiveHost} from '../interfaces/type_checks';
-import {HEADER_OFFSET, LView, RENDERER, T_HOST, TView, TViewType} from '../interfaces/view';
+import {HEADER_OFFSET, LView, RENDERER, TView, TViewType} from '../interfaces/view';
 import {appendChild} from '../node_manipulation';
-import {getLView, getTView, setPreviousOrParentTNode} from '../state';
+import {getLView, getTView, setCurrentTNode} from '../state';
 import {getConstant} from '../util/view_utils';
+import {addToViewTree, createDirectivesInstances, createLContainer, createTView, getOrCreateTNode, resolveDirectives, saveResolvedLocalsInData} from './shared';
 
-import {addToViewTree, createDirectivesInstances, createLContainer, createTNode, createTView, getOrCreateTNode, resolveDirectives, saveResolvedLocalsInData} from './shared';
 
 
 function templateFirstCreatePass(
@@ -28,18 +28,15 @@ function templateFirstCreatePass(
   const tViewConsts = tView.consts;
   // TODO(pk): refactor getOrCreateTNode to have the "create" only version
   const tNode = getOrCreateTNode(
-      tView, lView[T_HOST], index, TNodeType.Container, tagName || null,
+      tView, index, TNodeType.Container, tagName || null,
       getConstant<TAttributes>(tViewConsts, attrsIndex));
 
   resolveDirectives(tView, lView, tNode, getConstant<string[]>(tViewConsts, localRefsIndex));
   registerPostOrderHooks(tView, tNode);
 
   const embeddedTView = tNode.tViews = createTView(
-      TViewType.Embedded, -1, templateFn, decls, vars, tView.directiveRegistry, tView.pipeRegistry,
-      null, tView.schemas, tViewConsts);
-  const embeddedTViewNode = createTNode(tView, null, TNodeType.View, -1, null, null) as TViewNode;
-  embeddedTViewNode.injectorIndex = tNode.injectorIndex;
-  embeddedTView.node = embeddedTViewNode;
+      TViewType.Embedded, tNode, templateFn, decls, vars, tView.directiveRegistry,
+      tView.pipeRegistry, null, tView.schemas, tViewConsts);
 
   if (tView.queries !== null) {
     tView.queries.template(tView, tNode);
@@ -76,11 +73,11 @@ export function ɵɵtemplate(
   const tView = getTView();
   const adjustedIndex = index + HEADER_OFFSET;
 
-  const tNode = tView.firstCreatePass ?
-      templateFirstCreatePass(
-          index, tView, lView, templateFn, decls, vars, tagName, attrsIndex, localRefsIndex) :
-      tView.data[adjustedIndex] as TContainerNode;
-  setPreviousOrParentTNode(tNode, false);
+  const tNode = tView.firstCreatePass ? templateFirstCreatePass(
+                                            adjustedIndex, tView, lView, templateFn, decls, vars,
+                                            tagName, attrsIndex, localRefsIndex) :
+                                        tView.data[adjustedIndex] as TContainerNode;
+  setCurrentTNode(tNode, false);
 
   const comment = lView[RENDERER].createComment(ngDevMode ? 'container' : '');
   appendChild(tView, lView, comment, tNode);
diff --git a/packages/core/src/render3/instructions/text.ts b/packages/core/src/render3/instructions/text.ts
index a98d9df165c91..0c9fad222ae97 100644
--- a/packages/core/src/render3/instructions/text.ts
+++ b/packages/core/src/render3/instructions/text.ts
@@ -5,11 +5,12 @@
  * 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 {assertDataInRange, assertEqual} from '../../util/assert';
+import {assertEqual, assertIndexInRange} from '../../util/assert';
 import {TElementNode, TNodeType} from '../interfaces/node';
 import {HEADER_OFFSET, RENDERER, T_HOST} from '../interfaces/view';
 import {appendChild, createTextNode} from '../node_manipulation';
-import {getBindingIndex, getLView, getTView, setPreviousOrParentTNode} from '../state';
+import {getBindingIndex, getLView, getTView, setCurrentTNode} from '../state';
+
 import {getOrCreateTNode} from './shared';
 
 
@@ -31,15 +32,15 @@ export function ɵɵtext(index: number, value: string = ''): void {
       assertEqual(
           getBindingIndex(), tView.bindingStartIndex,
           'text nodes should be created before any bindings');
-  ngDevMode && assertDataInRange(lView, adjustedIndex);
+  ngDevMode && assertIndexInRange(lView, adjustedIndex);
 
   const tNode = tView.firstCreatePass ?
-      getOrCreateTNode(tView, lView[T_HOST], index, TNodeType.Element, null, null) :
+      getOrCreateTNode(tView, adjustedIndex, TNodeType.Text, value, null) :
       tView.data[adjustedIndex] as TElementNode;
 
-  const textNative = lView[adjustedIndex] = createTextNode(value, lView[RENDERER]);
+  const textNative = lView[adjustedIndex] = createTextNode(lView[RENDERER], value);
   appendChild(tView, lView, textNative, tNode);
 
   // Text nodes are self closing.
-  setPreviousOrParentTNode(tNode, false);
+  setCurrentTNode(tNode, false);
 }
diff --git a/packages/core/src/render3/interfaces/definition.ts b/packages/core/src/render3/interfaces/definition.ts
index a48cb77732bd7..c8de2c50e4eea 100644
--- a/packages/core/src/render3/interfaces/definition.ts
+++ b/packages/core/src/render3/interfaces/definition.ts
@@ -10,7 +10,7 @@ import {SchemaMetadata, ViewEncapsulation} from '../../core';
 import {ProcessProvidersFunction} from '../../di/interface/provider';
 import {Type} from '../../interface/type';
 
-import {TAttributes, TConstants} from './node';
+import {TAttributes, TConstantsOrFactory} from './node';
 import {CssSelectorList} from './projection';
 import {TView} from './view';
 
@@ -299,7 +299,7 @@ export interface ComponentDef<T> extends DirectiveDef<T> {
   readonly template: ComponentTemplate<T>;
 
   /** Constants associated with the component's view. */
-  readonly consts: TConstants|null;
+  readonly consts: TConstantsOrFactory|null;
 
   /**
    * An array of `ngContent[selector]` values that were found in the template.
diff --git a/packages/core/src/render3/interfaces/i18n.ts b/packages/core/src/render3/interfaces/i18n.ts
index f379ed9125ae7..80164d0aab8d2 100644
--- a/packages/core/src/render3/interfaces/i18n.ts
+++ b/packages/core/src/render3/interfaces/i18n.ts
@@ -8,6 +8,18 @@
 
 import {SanitizerFn} from './sanitization';
 
+
+/**
+ * Stores a list of nodes which need to be removed.
+ *
+ * Numbers are indexes into the `LView`
+ * - index > 0: `removeRNode(lView[0])`
+ * - index < 0: `removeICU(~lView[0])`
+ */
+export interface I18nRemoveOpCodes extends Array<number> {
+  __brand__: 'I18nRemoveOpCodes';
+}
+
 /**
  * `I18nMutateOpCode` defines OpCodes for `I18nMutateOpCodes` array.
  *
@@ -31,11 +43,11 @@ import {SanitizerFn} from './sanitization';
  *
  * See: `I18nCreateOpCodes` for example of usage.
  */
-export const enum I18nMutateOpCode {
+export const enum IcuCreateOpCode {
   /**
    * Stores shift amount for bits 17-3 that contain reference index.
    */
-  SHIFT_REF = 3,
+  SHIFT_REF = 1,
   /**
    * Stores shift amount for bits 31-17 that contain parent index.
    */
@@ -43,93 +55,24 @@ export const enum I18nMutateOpCode {
   /**
    * Mask for OpCode
    */
-  MASK_INSTRUCTION = 0b111,
+  MASK_INSTRUCTION = 0b1,
 
   /**
    * Mask for the Reference node (bits 16-3)
    */
-  // FIXME(misko): Why is this not used?
-  MASK_REF = 0b11111111111111000,
+  MASK_REF = 0b11111111111111110,
   //           11111110000000000
   //           65432109876543210
 
-  /**
-   * Instruction to select a node. (next OpCode will contain the operation.)
-   */
-  Select = 0b000,
-
   /**
    * Instruction to append the current node to `PARENT`.
    */
-  AppendChild = 0b001,
-
-  /**
-   * Instruction to remove the `REF` node from `PARENT`.
-   */
-  Remove = 0b011,
+  AppendChild = 0b0,
 
   /**
    * Instruction to set the attribute of a node.
    */
-  Attr = 0b100,
-
-  /**
-   * Instruction to simulate elementEnd()
-   */
-  ElementEnd = 0b101,
-
-  /**
-   * Instruction to removed the nested ICU.
-   */
-  RemoveNestedIcu = 0b110,
-}
-
-export function getParentFromI18nMutateOpCode(mergedCode: number): number {
-  return mergedCode >>> I18nMutateOpCode.SHIFT_PARENT;
-}
-
-export function getRefFromI18nMutateOpCode(mergedCode: number): number {
-  return (mergedCode & I18nMutateOpCode.MASK_REF) >>> I18nMutateOpCode.SHIFT_REF;
-}
-
-export function getInstructionFromI18nMutateOpCode(mergedCode: number): number {
-  return mergedCode & I18nMutateOpCode.MASK_INSTRUCTION;
-}
-
-/**
- * Marks that the next string is an element name.
- *
- * See `I18nMutateOpCodes` documentation.
- */
-export const ELEMENT_MARKER: ELEMENT_MARKER = {
-  marker: 'element'
-};
-export interface ELEMENT_MARKER {
-  marker: 'element';
-}
-
-/**
- * Marks that the next string is comment text.
- *
- * See `I18nMutateOpCodes` documentation.
- */
-export const COMMENT_MARKER: COMMENT_MARKER = {
-  marker: 'comment'
-};
-
-export interface COMMENT_MARKER {
-  marker: 'comment';
-}
-
-export interface I18nDebug {
-  /**
-   * Human readable representation of the OpCode arrays.
-   *
-   * NOTE: This property only exists if `ngDevMode` is set to `true` and it is not present in
-   * production. Its presence is purely to help debug issue in development, and should not be relied
-   * on in production application.
-   */
-  debug?: string[];
+  Attr = 0b1,
 }
 
 
@@ -155,7 +98,7 @@ export interface I18nDebug {
  *   // ---------------------
  *   // Equivalent to:
  *   //   lView[1].appendChild(lView[0] = document.createComment(''));
- *   COMMENT_MARKER, '', 0, 1 << SHIFT_PARENT | 0 << SHIFT_REF | AppendChild,
+ *   ICU_MARKER, '', 0, 1 << SHIFT_PARENT | 0 << SHIFT_REF | AppendChild,
  *
  *   // For moving existing nodes to a different location
  *   // --------------------------------------------------
@@ -177,11 +120,11 @@ export interface I18nDebug {
  *   1 << SHIFT_REF | Attr, 'attr', 'value'
  * ];
  * ```
- *
- * See: `applyI18nCreateOpCodes`;
  */
-export interface I18nMutateOpCodes extends Array<number|string|ELEMENT_MARKER|COMMENT_MARKER|null>,
-                                           I18nDebug {}
+export interface IcuCreateOpCodes extends Array<number|string|ELEMENT_MARKER|ICU_MARKER|null>,
+                                          I18nDebug {
+  __brand__: 'I18nCreateOpCodes';
+}
 
 export const enum I18nUpdateOpCode {
   /**
@@ -211,6 +154,101 @@ export const enum I18nUpdateOpCode {
   IcuUpdate = 0b11,
 }
 
+/**
+ * Marks that the next string is an element name.
+ *
+ * See `I18nMutateOpCodes` documentation.
+ */
+export const ELEMENT_MARKER: ELEMENT_MARKER = {
+  marker: 'element'
+};
+export interface ELEMENT_MARKER {
+  marker: 'element';
+}
+
+/**
+ * Marks that the next string is comment text need for ICU.
+ *
+ * See `I18nMutateOpCodes` documentation.
+ */
+export const ICU_MARKER: ICU_MARKER = {
+  marker: 'ICU'
+};
+
+export interface ICU_MARKER {
+  marker: 'ICU';
+}
+
+export interface I18nDebug {
+  /**
+   * Human readable representation of the OpCode arrays.
+   *
+   * NOTE: This property only exists if `ngDevMode` is set to `true` and it is not present in
+   * production. Its presence is purely to help debug issue in development, and should not be relied
+   * on in production application.
+   */
+  debug?: string[];
+}
+
+/**
+ * Array storing OpCode for dynamically creating `i18n` translation DOM elements.
+ *
+ * This array creates a sequence of `Text` and `Comment` (as ICU anchor) DOM elements. It consists
+ * of a pair of `number` and `string` pairs which encode the operations for the creation of the
+ * translated block.
+ *
+ * The number is shifted and encoded according to `I18nCreateOpCode`
+ *
+ * Pseudocode:
+ * ```
+ * const i18nCreateOpCodes = [
+ *   10 << I18nCreateOpCode.SHIFT, "Text Node add to DOM",
+ *   11 << I18nCreateOpCode.SHIFT | I18nCreateOpCode.COMMENT, "Comment Node add to DOM",
+ *   12 << I18nCreateOpCode.SHIFT | I18nCreateOpCode.APPEND_LATER, "Text Node added later"
+ * ];
+ *
+ * for(var i=0; i<i18nCreateOpCodes.length; i++) {
+ *   const opcode = i18NCreateOpCodes[i++];
+ *   const index = opcode >> I18nCreateOpCode.SHIFT;
+ *   const text = i18NCreateOpCodes[i];
+ *   let node: Text|Comment;
+ *   if (opcode & I18nCreateOpCode.COMMENT === I18nCreateOpCode.COMMENT) {
+ *     node = lView[~index] = document.createComment(text);
+ *   } else {
+ *     node = lView[index] = document.createText(text);
+ *   }
+ *   if (opcode & I18nCreateOpCode.APPEND_EAGERLY !== I18nCreateOpCode.APPEND_EAGERLY) {
+ *     parentNode.appendChild(node);
+ *   }
+ * }
+ * ```
+ */
+export interface I18nCreateOpCodes extends Array<number|string>, I18nDebug {
+  __brand__: 'I18nCreateOpCodes';
+}
+
+/**
+ * See `I18nCreateOpCodes`
+ */
+export enum I18nCreateOpCode {
+  /**
+   * Number of bits to shift index so that it can be combined with the `APPEND_EAGERLY` and
+   * `COMMENT`.
+   */
+  SHIFT = 2,
+
+  /**
+   * Should the node be appended to parent imedditatly after creation.
+   */
+  APPEND_EAGERLY = 0b01,
+
+  /**
+   * If set the node should be comment (rather than a text) node.
+   */
+  COMMENT = 0b10,
+}
+
+
 /**
  * Stores DOM operations which need to be applied to update DOM render tree due to changes in
  * expressions.
@@ -283,44 +321,26 @@ export const enum I18nUpdateOpCode {
  * ```
  *
  */
-export interface I18nUpdateOpCodes extends Array<string|number|SanitizerFn|null>, I18nDebug {}
+export interface I18nUpdateOpCodes extends Array<string|number|SanitizerFn|null>, I18nDebug {
+  __brand__: 'I18nUpdateOpCodes';
+}
 
 /**
  * Store information for the i18n translation block.
  */
 export interface TI18n {
-  /**
-   * Number of slots to allocate in expando.
-   *
-   * This is the max number of DOM elements which will be created by this i18n + ICU blocks. When
-   * the DOM elements are being created they are stored in the EXPANDO, so that update OpCodes can
-   * write into them.
-   */
-  vars: number;
-
   /**
    * A set of OpCodes which will create the Text Nodes and ICU anchors for the translation blocks.
    *
    * NOTE: The ICU anchors are filled in with ICU Update OpCode.
    */
-  create: I18nMutateOpCodes;
+  create: I18nCreateOpCodes;
 
   /**
    * A set of OpCodes which will be executed on each change detection to determine if any changes to
    * DOM are required.
    */
   update: I18nUpdateOpCodes;
-
-  /**
-   * A list of ICUs in a translation block (or `null` if block has no ICUs).
-   *
-   * Example:
-   * Given: `<div i18n>You have {count, plural, ...} and {state, switch, ...}</div>`
-   * There would be 2 ICUs in this array.
-   *   1. `{count, plural, ...}`
-   *   2. `{state, switch, ...}`
-   */
-  icus: TIcu[]|null;
 }
 
 /**
@@ -338,44 +358,23 @@ export interface TIcu {
   type: IcuType;
 
   /**
-   * Number of slots to allocate in expando for each case.
-   *
-   * This is the max number of DOM elements which will be created by this i18n + ICU blocks. When
-   * the DOM elements are being created they are stored in the EXPANDO, so that update OpCodes can
-   * write into them.
+   * Index in `LView` where the anchor node is stored. `<!-- ICU 0:0 -->`
    */
-  vars: number[];
+  anchorIdx: number;
 
   /**
-   * An optional array of child/sub ICUs.
+   * Currently selected ICU case pointer.
    *
-   * In case of nested ICUs such as:
-   * ```
-   * {�0�, plural,
-   *   =0 {zero}
-   *   other {�0� {�1�, select,
-   *                     cat {cats}
-   *                     dog {dogs}
-   *                     other {animals}
-   *                   }!
-   *   }
-   * }
-   * ```
-   * When the parent ICU is changing it must clean up child ICUs as well. For this reason it needs
-   * to know which child ICUs to run clean up for as well.
+   * `lView[currentCaseLViewIndex]` stores the currently selected case. This is needed to know how
+   * to clean up the current case when transitioning no the new case.
    *
-   * In the above example this would be:
-   * ```ts
-   * [
-   *   [],   // `=0` has no sub ICUs
-   *   [1],  // `other` has one subICU at `1`st index.
-   * ]
-   * ```
-   *
-   * The reason why it is Array of Arrays is because first array represents the case, and second
-   * represents the child ICUs to clean up. There may be more than one child ICUs per case.
+   * If the value stored is:
+   * `null`: No current case selected.
+   *   `<0`: A flag which means that the ICU just switched and that `icuUpdate` must be executed
+   *         regardless of the `mask`. (After the execution the flag is cleared)
+   *   `>=0` A currently selected case index.
    */
-  childIcus: number[][];
+  currentCaseLViewIndex: number;
 
   /**
    * A list of case values which the current ICU will try to match.
@@ -387,12 +386,12 @@ export interface TIcu {
   /**
    * A set of OpCodes to apply in order to build up the DOM render tree for the ICU
    */
-  create: I18nMutateOpCodes[];
+  create: IcuCreateOpCodes[];
 
   /**
    * A set of OpCodes to apply in order to destroy the DOM render tree for the ICU.
    */
-  remove: I18nMutateOpCodes[];
+  remove: I18nRemoveOpCodes[];
 
   /**
    * A set of OpCodes to apply in order to update the DOM render tree for the ICU bindings.
@@ -403,3 +402,13 @@ export interface TIcu {
 // Note: This hack is necessary so we don't erroneously get a circular dependency
 // failure based on types.
 export const unusedValueExportToPlacateAjd = 1;
+
+/**
+ * Parsed ICU expression
+ */
+export interface IcuExpression {
+  type: IcuType;
+  mainBinding: number;
+  cases: string[];
+  values: (string|IcuExpression)[][];
+}
diff --git a/packages/core/src/render3/interfaces/injector.ts b/packages/core/src/render3/interfaces/injector.ts
index 4ec1f234d5f27..6762562651803 100644
--- a/packages/core/src/render3/interfaces/injector.ts
+++ b/packages/core/src/render3/interfaces/injector.ts
@@ -9,13 +9,55 @@
 import {InjectionToken} from '../../di/injection_token';
 import {InjectFlags} from '../../di/interface/injector';
 import {Type} from '../../interface/type';
+import {assertDefined, assertEqual} from '../../util/assert';
 
 import {TDirectiveHostNode} from './node';
 import {LView, TData} from './view';
 
-export const TNODE = 8;
-export const PARENT_INJECTOR = 8;
-export const INJECTOR_BLOOM_PARENT_SIZE = 9;
+/**
+ * Offsets of the `NodeInjector` data structure in the expando.
+ *
+ * `NodeInjector` is stored in both `LView` as well as `TView.data`. All storage requires 9 words.
+ * First 8 are reserved for bloom filter and the 9th is reserved for the associated `TNode` as well
+ * as parent `NodeInjector` pointer. All indexes are starting with `index` and have an offset as
+ * shown.
+ *
+ * `LView` layout:
+ * ```
+ * index + 0: cumulative bloom filter
+ * index + 1: cumulative bloom filter
+ * index + 2: cumulative bloom filter
+ * index + 3: cumulative bloom filter
+ * index + 4: cumulative bloom filter
+ * index + 5: cumulative bloom filter
+ * index + 6: cumulative bloom filter
+ * index + 7: cumulative bloom filter
+ * index + 8: cumulative bloom filter
+ * index + PARENT: Index to the parent injector. See `RelativeInjectorLocation`
+ *                 `const parent = lView[index + NodeInjectorOffset.PARENT]`
+ * ```
+ *
+ * `TViewData` layout:
+ * ```
+ * index + 0: cumulative bloom filter
+ * index + 1: cumulative bloom filter
+ * index + 2: cumulative bloom filter
+ * index + 3: cumulative bloom filter
+ * index + 4: cumulative bloom filter
+ * index + 5: cumulative bloom filter
+ * index + 6: cumulative bloom filter
+ * index + 7: cumulative bloom filter
+ * index + 8: cumulative bloom filter
+ * index + TNODE: TNode associated with this `NodeInjector`
+ *                `canst tNode = tView.data[index + NodeInjectorOffset.TNODE]`
+ * ```
+ */
+export const enum NodeInjectorOffset {
+  TNODE = 8,
+  PARENT = 8,
+  BLOOM_SIZE = 8,
+  SIZE = 9,
+}
 
 /**
  * Represents a relative location of parent injector.
@@ -239,6 +281,8 @@ export class NodeInjectorFactory {
       isViewProvider: boolean,
       injectImplementation: null|
       (<T>(token: Type<T>|InjectionToken<T>, flags?: InjectFlags) => T)) {
+    ngDevMode && assertDefined(factory, 'Factory not specified');
+    ngDevMode && assertEqual(typeof factory, 'function', 'Expected factory function.');
     this.canSeeViewProviders = isViewProvider;
     this.injectImpl = injectImplementation;
   }
diff --git a/packages/core/src/render3/interfaces/node.ts b/packages/core/src/render3/interfaces/node.ts
index 468423206537b..f01f9d37a46ad 100644
--- a/packages/core/src/render3/interfaces/node.ts
+++ b/packages/core/src/render3/interfaces/node.ts
@@ -7,6 +7,7 @@
  */
 import {KeyValueArray} from '../../util/array_utils';
 import {TStylingRange} from '../interfaces/styling';
+import {TIcu} from './i18n';
 import {CssSelector} from './projection';
 import {RNode} from './renderer';
 import {LView, TView} from './view';
@@ -14,47 +15,85 @@ import {LView, TView} from './view';
 
 /**
  * TNodeType corresponds to the {@link TNode} `type` property.
+ *
+ * NOTE: type IDs are such that we use each bit to denote a type. This is done so that we can easily
+ * check if the `TNode` is of more than one type.
+ *
+ * `if (tNode.type === TNodeType.Text || tNode.type === TNode.Element)`
+ * can be written as:
+ * `if (tNode.type & (TNodeType.Text | TNodeType.Element))`
+ *
+ * However any given `TNode` can only be of one type.
  */
 export const enum TNodeType {
   /**
-   * The TNode contains information about an {@link LContainer} for embedded views.
+   * The TNode contains information about a DOM element aka {@link RText}.
    */
-  Container = 0,
+  Text = 0b1,
+
   /**
-   * The TNode contains information about an `<ng-content>` projection
+   * The TNode contains information about a DOM element aka {@link RElement}.
    */
-  Projection = 1,
+  Element = 0b10,
+
   /**
-   * The TNode contains information about an {@link LView}
+   * The TNode contains information about an {@link LContainer} for embedded views.
    */
-  View = 2,
+  Container = 0b100,
+
   /**
-   * The TNode contains information about a DOM element aka {@link RNode}.
+   * The TNode contains information about an `<ng-container>` element {@link RNode}.
    */
-  Element = 3,
+  ElementContainer = 0b1000,
+
   /**
-   * The TNode contains information about an `<ng-container>` element {@link RNode}.
+   * The TNode contains information about an `<ng-content>` projection
    */
-  ElementContainer = 4,
+  Projection = 0b10000,
+
   /**
    * The TNode contains information about an ICU comment used in `i18n`.
    */
-  IcuContainer = 5,
+  Icu = 0b100000,
+
+  /**
+   * Special node type representing a placeholder for future `TNode` at this location.
+   *
+   * I18n translation blocks are created before the element nodes which they contain. (I18n blocks
+   * can span over many elements.) Because i18n `TNode`s (representing text) are created first they
+   * often may need to point to element `TNode`s which are not yet created. In such a case we create
+   * a `Placeholder` `TNode`. This allows the i18n to structurally link the `TNode`s together
+   * without knowing any information about the future nodes which will be at that location.
+   *
+   * On `firstCreatePass` When element instruction executes it will try to create a `TNode` at that
+   * location. Seeing a `Placeholder` `TNode` already there tells the system that it should reuse
+   * existing `TNode` (rather than create a new one) and just update the missing information.
+   */
+  Placeholder = 0b1000000,
+
+  // Combined Types These should never be used for `TNode.type` only as a useful way to check
+  // if `TNode.type` is one of several choices.
+
+  // See: https://github.com/microsoft/TypeScript/issues/35875 why we can't refer to existing enum.
+  AnyRNode = 0b11,        // Text | Element,
+  AnyContainer = 0b1100,  // Container | ElementContainer, // See:
 }
 
 /**
  * Converts `TNodeType` into human readable text.
  * Make sure this matches with `TNodeType`
  */
-export const TNodeTypeAsString = [
-  'Container',         // 0
-  'Projection',        // 1
-  'View',              // 2
-  'Element',           // 3
-  'ElementContainer',  // 4
-  'IcuContainer'       // 5
-] as const;
-
+export function toTNodeTypeAsString(tNodeType: TNodeType): string {
+  let text = '';
+  (tNodeType & TNodeType.Text) && (text += '|Text');
+  (tNodeType & TNodeType.Element) && (text += '|Element');
+  (tNodeType & TNodeType.Container) && (text += '|Container');
+  (tNodeType & TNodeType.ElementContainer) && (text += '|ElementContainer');
+  (tNodeType & TNodeType.Projection) && (text += '|Projection');
+  (tNodeType & TNodeType.Icu) && (text += '|IcuContainer');
+  (tNodeType & TNodeType.Placeholder) && (text += '|Placeholder');
+  return text.length > 0 ? text.substring(1) : text;
+}
 
 /**
  * Corresponds to the TNode.flags property.
@@ -210,7 +249,8 @@ export const enum AttributeMarker {
   Template = 4,
 
   /**
-   * Signals that the following attribute is `ngProjectAs` and its value is a parsed `CssSelector`.
+   * Signals that the following attribute is `ngProjectAs` and its value is a parsed
+   * `CssSelector`.
    *
    * For example, given the following HTML:
    *
@@ -255,9 +295,24 @@ export type TAttributes = (string|AttributeMarker|CssSelector)[];
  * Constants that are associated with a view. Includes:
  * - Attribute arrays.
  * - Local definition arrays.
+ * - Translated messages (i18n).
  */
 export type TConstants = (TAttributes|string)[];
 
+/**
+ * Factory function that returns an array of consts. Consts can be represented as a function in
+ * case any additional statements are required to define consts in the list. An example is i18n
+ * where additional i18n calls are generated, which should be executed when consts are requested
+ * for the first time.
+ */
+export type TConstantsFactory = () => TConstants;
+
+/**
+ * TConstants type that describes how the `consts` field is generated on ComponentDef: it can be
+ * either an array or a factory function that returns that array.
+ */
+export type TConstantsOrFactory = TConstants|TConstantsFactory;
+
 /**
  * Binding data (flyweight) for a particular node that is shared between all templates
  * of a specific type.
@@ -283,15 +338,69 @@ export interface TNode {
    */
   index: number;
 
+  /**
+   * Insert before existing DOM node index.
+   *
+   * When DOM nodes are being inserted, normally they are being appended as they are created.
+   * Under i18n case, the translated text nodes are created ahead of time as part of the
+   * `ɵɵi18nStart` instruction which means that this `TNode` can't just be appended and instead
+   * needs to be inserted using `insertBeforeIndex` semantics.
+   *
+   * Additionally sometimes it is necessary to insert new text nodes as a child of this `TNode`. In
+   * such a case the value stores an array of text nodes to insert.
+   *
+   * Example:
+   * ```
+   * <div i18n>
+   *   Hello <span>World</span>!
+   * </div>
+   * ```
+   * In the above example the `ɵɵi18nStart` instruction can create `Hello `, `World` and `!` text
+   * nodes. It can also insert `Hello ` and `!` text node as a child of `<div>`, but it can't
+   * insert `World` because the `<span>` node has not yet been created. In such a case the
+   * `<span>` `TNode` will have an array which will direct the `<span>` to not only insert
+   * itself in front of `!` but also to insert the `World` (created by `ɵɵi18nStart`) into
+   * `<span>` itself.
+   *
+   * Pseudo code:
+   * ```
+   *   if (insertBeforeIndex === null) {
+   *     // append as normal
+   *   } else if (Array.isArray(insertBeforeIndex)) {
+   *     // First insert current `TNode` at correct location
+   *     const currentNode = lView[this.index];
+   *     parentNode.insertBefore(currentNode, lView[this.insertBeforeIndex[0]]);
+   *     // Now append all of the children
+   *     for(let i=1; i<this.insertBeforeIndex; i++) {
+   *       currentNode.appendChild(lView[this.insertBeforeIndex[i]]);
+   *     }
+   *   } else {
+   *     parentNode.insertBefore(lView[this.index], lView[this.insertBeforeIndex])
+   *   }
+   * ```
+   * - null: Append as normal using `parentNode.appendChild`
+   * - `number`: Append using
+   *      `parentNode.insertBefore(lView[this.index], lView[this.insertBeforeIndex])`
+   *
+   * *Initialization*
+   *
+   * Because `ɵɵi18nStart` executes before nodes are created, on `TView.firstCreatePass` it is not
+   * possible for `ɵɵi18nStart` to set the `insertBeforeIndex` value as the corresponding `TNode`
+   * has not yet been created. For this reason the `ɵɵi18nStart` creates a `TNodeType.Placeholder`
+   * `TNode` at that location. See `TNodeType.Placeholder` for more information.
+   */
+  insertBeforeIndex: InsertBeforeIndex;
+
   /**
    * The index of the closest injector in this node's LView.
    *
    * If the index === -1, there is no injector on this node or any ancestor node in this view.
    *
-   * If the index !== -1, it is the index of this node's injector OR the index of a parent injector
-   * in the same view. We pass the parent injector index down the node tree of a view so it's
-   * possible to find the parent injector without walking a potentially deep node tree. Injector
-   * indices are not set across view boundaries because there could be multiple component hosts.
+   * If the index !== -1, it is the index of this node's injector OR the index of a parent
+   * injector in the same view. We pass the parent injector index down the node tree of a view so
+   * it's possible to find the parent injector without walking a potentially deep node tree.
+   * Injector indices are not set across view boundaries because there could be multiple component
+   * hosts.
    *
    * If tNode.injectorIndex === tNode.parent.injectorIndex, then the index belongs to a parent
    * injector.
@@ -317,8 +426,8 @@ export interface TNode {
    *
    * Valid values are:
    * - `-1` No `hostBindings` instruction has executed.
-   * - `directiveStart <= directiveStylingLast < directiveEnd`: Points to the `DirectiveDef` of the
-   *   last styling instruction which executed in the `hostBindings`.
+   * - `directiveStart <= directiveStylingLast < directiveEnd`: Points to the `DirectiveDef` of
+   * the last styling instruction which executed in the `hostBindings`.
    *
    * This data is needed so that styling instructions know which static styling data needs to be
    * collected from the `DirectiveDef.hostAttrs`. A styling instruction needs to collect all data
@@ -327,13 +436,14 @@ export interface TNode {
   directiveStylingLast: number;
 
   /**
-   * Stores indexes of property bindings. This field is only set in the ngDevMode and holds indexes
-   * of property bindings so TestBed can get bound property metadata for a given node.
+   * Stores indexes of property bindings. This field is only set in the ngDevMode and holds
+   * indexes of property bindings so TestBed can get bound property metadata for a given node.
    */
   propertyBindings: number[]|null;
 
   /**
-   * Stores if Node isComponent, isProjected, hasContentQuery, hasClassInput and hasStyleInput etc.
+   * Stores if Node isComponent, isProjected, hasContentQuery, hasClassInput and hasStyleInput
+   * etc.
    */
   flags: TNodeFlags;
 
@@ -346,12 +456,18 @@ export interface TNode {
   // TODO(misko): break this into actual vars.
   providerIndexes: TNodeProviderIndexes;
 
-  /** The tag name associated with this node. */
-  tagName: string|null;
+  /**
+   * The value name associated with this node.
+   * if type:
+   *   `TNodeType.Text`: text value
+   *   `TNodeType.Element`: tag name
+   *   `TNodeType.ICUContainer`: `TIcu`
+   */
+  value: any;
 
   /**
-   * Attributes associated with an element. We need to store attributes to support various use-cases
-   * (attribute injection, content projection with selectors, directives matching).
+   * 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.
    *
@@ -441,10 +557,10 @@ export interface TNode {
   next: TNode|null;
 
   /**
-   * The next projected sibling. Since in Angular content projection works on the node-by-node basis
-   * the act of projecting nodes might change nodes relationship at the insertion point (target
-   * view). At the same time we need to keep initial relationship between nodes as expressed in
-   * content view.
+   * The next projected sibling. Since in Angular content projection works on the node-by-node
+   * basis the act of projecting nodes might change nodes relationship at the insertion point
+   * (target view). At the same time we need to keep initial relationship between nodes as
+   * expressed in content view.
    */
   projectionNext: TNode|null;
 
@@ -497,8 +613,8 @@ export interface TNode {
    *    - `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.
+   *   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:
@@ -532,9 +648,9 @@ export interface TNode {
    * (e.g. `<div style="width:200px;">`)
    * Must be stored separately from `tNode.styles` to facilitate setting directive
    * inputs that shadow the `style` property. If we used `tNode.styles` as is for shadowed inputs,
-   * we would feed host styles back into directives as "inputs". If we used `tNode.attrs`, we would
-   * have to concatenate the attributes on every template pass. Instead, we process once on first
-   * create pass and store here.
+   * we would feed host styles back into directives as "inputs". If we used `tNode.attrs`, we
+   * would have to concatenate the attributes on every template pass. Instead, we process once on
+   * first create pass and store here.
    */
   stylesWithoutHost: string|null;
 
@@ -542,8 +658,8 @@ export interface TNode {
    * A `KeyValueArray` version of residual `styles`.
    *
    * When there are styling instructions than each instruction stores the static styling
-   * which is of lower priority than itself. This means that there may be a higher priority styling
-   * than the instruction.
+   * which is of lower priority than itself. This means that there may be a higher priority
+   * styling than the instruction.
    *
    * Imagine:
    * ```
@@ -584,10 +700,10 @@ export interface TNode {
    * Populated when there are one or more initial classes on an element
    * (e.g. `<div class="SOME_CLASS">`)
    * Must be stored separately from `tNode.classes` to facilitate setting directive
-   * inputs that shadow the `class` property. If we used `tNode.classes` as is for shadowed inputs,
-   * we would feed host classes back into directives as "inputs". If we used `tNode.attrs`, we would
-   * have to concatenate the attributes on every template pass. Instead, we process once on first
-   * create pass and store here.
+   * inputs that shadow the `class` property. If we used `tNode.classes` as is for shadowed
+   * inputs, we would feed host classes back into directives as "inputs". If we used
+   * `tNode.attrs`, we would have to concatenate the attributes on every template pass. Instead,
+   * we process once on first create pass and store here.
    */
   classesWithoutHost: string|null;
 
@@ -633,6 +749,11 @@ export interface TNode {
   styleBindings: TStylingRange;
 }
 
+/**
+ * See `TNode.insertBeforeIndex`
+ */
+export type InsertBeforeIndex = null|number|number[];
+
 /** Static data for an element  */
 export interface TElementNode extends TNode {
   /** Index in the data[] array */
@@ -648,10 +769,15 @@ export interface TElementNode extends TNode {
 
   /**
    * If this is a component TNode with projection, this will be an array of projected
-   * TNodes or native nodes (see TNode.projection for more info). If it's a regular element node or
-   * a component without projection, it will be null.
+   * TNodes or native nodes (see TNode.projection for more info). If it's a regular element node
+   * or a component without projection, it will be null.
    */
   projection: (TNode|RNode[])[]|null;
+
+  /**
+   * Stores TagName
+   */
+  value: string;
 }
 
 /** Static data for a text node */
@@ -689,6 +815,7 @@ export interface TContainerNode extends TNode {
   parent: TElementNode|TElementContainerNode|null;
   tViews: TView|TView[]|null;
   projection: null;
+  value: null;
 }
 
 /** Static data for an <ng-container> */
@@ -705,27 +832,11 @@ export interface TElementContainerNode extends TNode {
 export interface TIcuContainerNode extends TNode {
   /** Index in the LView[] array. */
   index: number;
-  child: TElementNode|TTextNode|null;
+  child: null;
   parent: TElementNode|TElementContainerNode|null;
   tViews: null;
   projection: null;
-  /**
-   * Indicates the current active case for an ICU expression.
-   * It is null when there is no active case.
-   *
-   */
-  // FIXME(misko): This is at a wrong location as activeCase is `LView` (not `TView`) concern
-  activeCaseIndex: number|null;
-}
-
-/** Static data for a view  */
-export interface TViewNode extends TNode {
-  /** If -1, it's a dynamically created view. Otherwise, it is the view block ID. */
-  index: number;
-  child: TElementNode|TTextNode|TElementContainerNode|TContainerNode|TProjectionNode|null;
-  parent: TContainerNode|null;
-  tViews: null;
-  projection: null;
+  value: TIcu;
 }
 
 /** Static data for an LProjectionNode  */
@@ -742,6 +853,7 @@ export interface TProjectionNode extends TNode {
 
   /** Index of the projection node. (See TNode.projection for more info.) */
   projection: number;
+  value: null;
 }
 
 /**
diff --git a/packages/core/src/render3/interfaces/renderer.ts b/packages/core/src/render3/interfaces/renderer.ts
index f2cd45492eed1..83ce29fbaf2e8 100644
--- a/packages/core/src/render3/interfaces/renderer.ts
+++ b/packages/core/src/render3/interfaces/renderer.ts
@@ -16,6 +16,7 @@
  */
 
 import {RendererStyleFlags2, RendererType2} from '../../render/api';
+import {TrustedHTML, TrustedScript, TrustedScriptURL} from '../../util/security/trusted_type_defs';
 import {getDocument} from './document';
 
 // TODO: cleanup once the code is merged in angular/angular
@@ -73,14 +74,16 @@ export interface ProceduralRenderer3 {
    */
   destroyNode?: ((node: RNode) => void)|null;
   appendChild(parent: RElement, newChild: RNode): void;
-  insertBefore(parent: RNode, newChild: RNode, refChild: RNode|null): void;
+  insertBefore(parent: RNode, newChild: RNode, refChild: RNode|null, isMove?: boolean): void;
   removeChild(parent: RElement, oldChild: RNode, isHostElement?: boolean): void;
   selectRootElement(selectorOrNode: string|any, preserveContent?: boolean): RElement;
 
   parentNode(node: RNode): RElement|null;
   nextSibling(node: RNode): RNode|null;
 
-  setAttribute(el: RElement, name: string, value: string, namespace?: string|null): void;
+  setAttribute(
+      el: RElement, name: string, value: string|TrustedHTML|TrustedScript|TrustedScriptURL,
+      namespace?: string|null): void;
   removeAttribute(el: RElement, name: string, namespace?: string|null): void;
   addClass(el: RElement, name: string): void;
   removeClass(el: RElement, name: string): void;
@@ -157,9 +160,11 @@ export interface RElement extends RNode {
   classList: RDomTokenList;
   className: string;
   textContent: string|null;
-  setAttribute(name: string, value: string): void;
+  setAttribute(name: string, value: string|TrustedHTML|TrustedScript|TrustedScriptURL): void;
   removeAttribute(name: string): void;
-  setAttributeNS(namespaceURI: string, qualifiedName: string, value: string): void;
+  setAttributeNS(
+      namespaceURI: string, qualifiedName: string,
+      value: string|TrustedHTML|TrustedScript|TrustedScriptURL): void;
   addEventListener(type: string, listener: EventListener, useCapture?: boolean): void;
   removeEventListener(type: string, listener?: EventListener, options?: boolean): void;
 
diff --git a/packages/core/src/render3/interfaces/sanitization.ts b/packages/core/src/render3/interfaces/sanitization.ts
index 886ff809c956d..3ebbb7c35affd 100644
--- a/packages/core/src/render3/interfaces/sanitization.ts
+++ b/packages/core/src/render3/interfaces/sanitization.ts
@@ -6,7 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {TrustedHTML, TrustedScript, TrustedScriptURL} from '../../util/security/trusted_type_defs';
+
 /**
  * Function used to sanitize the value before writing it into the renderer.
  */
-export type SanitizerFn = (value: any, tagName?: string, propName?: string) => string;
+export type SanitizerFn = (value: any, tagName?: string, propName?: string) =>
+    string|TrustedHTML|TrustedScript|TrustedScriptURL;
diff --git a/packages/core/src/render3/interfaces/type_checks.ts b/packages/core/src/render3/interfaces/type_checks.ts
index a00e47bd55ca0..755dfdc6db59a 100644
--- a/packages/core/src/render3/interfaces/type_checks.ts
+++ b/packages/core/src/render3/interfaces/type_checks.ts
@@ -6,9 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ComponentDef, DirectiveDef} from '..';
-
 import {LContainer, TYPE} from './container';
+import {ComponentDef, DirectiveDef} from './definition';
 import {TNode, TNodeFlags} from './node';
 import {RNode} from './renderer';
 import {FLAGS, LView, LViewFlags} from './view';
diff --git a/packages/core/src/render3/interfaces/view.ts b/packages/core/src/render3/interfaces/view.ts
index 0aec9344b340d..5d2d667a6f455 100644
--- a/packages/core/src/render3/interfaces/view.ts
+++ b/packages/core/src/render3/interfaces/view.ts
@@ -14,8 +14,8 @@ import {Sanitizer} from '../../sanitization/sanitizer';
 
 import {LContainer} from './container';
 import {ComponentDef, ComponentTemplate, DirectiveDef, DirectiveDefList, HostBindingsFunction, PipeDef, PipeDefList, ViewQueriesFunction} from './definition';
-import {I18nUpdateOpCodes, TI18n} from './i18n';
-import {TConstants, TElementNode, TNode, TNodeTypeAsString, TViewNode} from './node';
+import {I18nUpdateOpCodes, TI18n, TIcu} from './i18n';
+import {TConstants, TNode} from './node';
 import {PlayerHandler} from './player';
 import {LQueries, TQueries} from './query';
 import {RComment, RElement, Renderer3, RendererFactory3} from './renderer';
@@ -41,12 +41,19 @@ export const RENDERER = 11;
 export const SANITIZER = 12;
 export const CHILD_HEAD = 13;
 export const CHILD_TAIL = 14;
+// FIXME(misko): Investigate if the three declarations aren't all same thing.
 export const DECLARATION_VIEW = 15;
 export const DECLARATION_COMPONENT_VIEW = 16;
 export const DECLARATION_LCONTAINER = 17;
 export const PREORDER_HOOK_FLAGS = 18;
 export const QUERIES = 19;
-/** Size of LView's header. Necessary to adjust for it when setting slots.  */
+/**
+ * Size of LView's header. Necessary to adjust for it when setting slots.
+ *
+ * IMPORTANT: `HEADER_OFFSET` should only be referred to the in the `ɵɵ*` instructions to translate
+ * instruction index into `LView` index. All other indexes should be in the `LView` index space and
+ * there should be no need to refer to `HEADER_OFFSET` anywhere else.
+ */
 export const HEADER_OFFSET = 20;
 
 
@@ -79,8 +86,7 @@ export interface LView extends Array<any> {
   debug?: LViewDebug;
 
   /**
-   * The host node for this LView instance, if this is a component view.
-   * If this is an embedded view, HOST will be null.
+   * The node into which this `LView` is inserted.
    */
   [HOST]: RElement|null;
 
@@ -120,16 +126,35 @@ export interface LView extends Array<any> {
   [QUERIES]: LQueries|null;
 
   /**
-   * Pointer to the `TViewNode` or `TElementNode` which represents the root of the view.
+   * Store the `TNode` of the location where the current `LView` is inserted into.
+   *
+   * Given:
+   * ```
+   * <div>
+   *   <ng-template><span></span></ng-template>
+   * </div>
+   * ```
    *
-   * If `TViewNode`, this is an embedded view of a container. We need this to be able to
-   * efficiently find the `LViewNode` when inserting the view into an anchor.
+   * We end up with two `TView`s.
+   * - `parent` `TView` which contains `<div><!-- anchor --></div>`
+   * - `child` `TView` which contains `<span></span>`
    *
-   * If `TElementNode`, this is the LView of a component.
+   * Typically the `child` is inserted into the declaration location of the `parent`, but it can be
+   * inserted anywhere. Because it can be inserted anywhere it is not possible to store the
+   * insertion information in the `TView` and instead we must store it in the `LView[T_HOST]`.
    *
-   * If null, this is the root view of an application (root component is in this view).
+   * So to determine where is our insertion parent we would execute:
+   * ```
+   * const parentLView = lView[PARENT];
+   * const parentTNode = lView[T_HOST];
+   * const insertionParent = parentLView[parentTNode.index];
+   * ```
+   *
+   *
+   * If `null`, this is the root view of an application (root component is in this view) and it has
+   * no parents.
    */
-  [T_HOST]: TViewNode|TElementNode|null;
+  [T_HOST]: TNode|null;
 
   /**
    * When a view is destroyed, listeners need to be released and outputs need to be
@@ -183,8 +208,6 @@ export interface LView extends Array<any> {
   /**
    * View where this view's template was declared.
    *
-   * Only applicable for dynamically created views. Will be null for inline/component views.
-   *
    * The template for a dynamically created view may be declared in a different view than
    * it is inserted. We already track the "insertion view" (view where the template was
    * inserted) in LView[PARENT], but we also need access to the "declaration view"
@@ -439,6 +462,17 @@ export const enum TViewType {
   Embedded = 2,
 }
 
+/**
+ * Converts `TViewType` into human readable text.
+ * Make sure this matches with `TViewType`
+ */
+export const TViewTypeAsString = [
+  'Root',       // 0
+  'Component',  // 1
+  'Embedded',   // 2
+] as const;
+
+
 /**
  * The static data for an LView (shared between all templates of a
  * given type).
@@ -451,15 +485,6 @@ export interface TView {
    */
   type: TViewType;
 
-  /**
-   * 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;
-
   /**
    * This is a blueprint used to generate LView instances for this TView. Copying this
    * blueprint is faster than creating a new LView from scratch.
@@ -478,21 +503,11 @@ export interface TView {
   viewQuery: ViewQueriesFunction<{}>|null;
 
   /**
-   * Pointer to the host `TNode` (not part of this TView).
-   *
-   * If this is a `TViewNode` 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 `TElementNode`, this is the view of a root component. It has exactly one
-   * root TNode.
-   *
-   * If this is null, this is the view of a component that is not at root. We do not store
-   * the host TNodes for child component views because they can potentially have several
-   * different host TNodes, depending on where the component is being used. These host
-   * TNodes cannot be shared (due to different indices, etc).
+   * A `TNode` representing the declaration location of this `TView` (not part of this TView).
    */
-  node: TViewNode|TElementNode|null;
+  declTNode: TNode|null;
+
+  // FIXME(misko): Why does `TView` not have `declarationTView` property?
 
   /** Whether or not this template has been processed in creation mode. */
   firstCreatePass: boolean;
@@ -830,7 +845,7 @@ export type DestroyHookData = (HookEntry|HookData)[];
  */
 export type TData =
     (TNode|PipeDef<any>|DirectiveDef<any>|ComponentDef<any>|number|TStylingRange|TStylingKey|
-     Type<any>|InjectionToken<any>|TI18n|I18nUpdateOpCodes|null|string)[];
+     Type<any>|InjectionToken<any>|TI18n|I18nUpdateOpCodes|TIcu|null|string)[];
 
 // Note: This hack is necessary so we don't erroneously get a circular dependency
 // failure based on types.
@@ -863,6 +878,11 @@ export interface LViewDebug {
     indexWithinInitPhase: number,
   };
 
+  /**
+   * Associated TView
+   */
+  readonly tView: TView;
+
   /**
    * Parent view (or container)
    */
@@ -885,6 +905,12 @@ export interface LViewDebug {
    */
   readonly nodes: DebugNode[];
 
+  /**
+   * Template structure (no instance data).
+   * (Shows how TNodes are connected)
+   */
+  readonly template: string;
+
   /**
    * HTML representation of the `LView`.
    *
@@ -912,11 +938,6 @@ export interface LViewDebug {
    */
   readonly vars: LViewDebugRange;
 
-  /**
-   * Sub range of `LView` containing i18n (translated DOM elements).
-   */
-  readonly i18n: LViewDebugRange;
-
   /**
    * Sub range of `LView` containing expando (used by DI).
    */
@@ -1010,7 +1031,7 @@ export interface DebugNode {
   /**
    * Human readable node type.
    */
-  type: typeof TNodeTypeAsString[number];
+  type: string;
 
   /**
    * DOM native node.
@@ -1021,4 +1042,48 @@ export interface DebugNode {
    * Child nodes
    */
   children: DebugNode[];
+
+  /**
+   * A list of Component/Directive types which need to be instantiated an this location.
+   */
+  factories: Type<unknown>[];
+
+  /**
+   * A list of Component/Directive instances which were instantiated an this location.
+   */
+  instances: unknown[];
+
+  /**
+   * NodeInjector information.
+   */
+  injector: NodeInjectorDebug;
+}
+
+export interface NodeInjectorDebug {
+  /**
+   * Instance bloom. Does the current injector have a provider with a given bloom mask.
+   */
+  bloom: string;
+
+
+  /**
+   * Cumulative bloom. Do any of the above injectors have a provider with a given bloom mask.
+   */
+  cumulativeBloom: string;
+
+  /**
+   * A list of providers associated with this injector.
+   */
+  providers: (Type<unknown>|DirectiveDef<unknown>|ComponentDef<unknown>)[];
+
+  /**
+   * A list of providers associated with this injector visible to the view of the component only.
+   */
+  viewProviders: Type<unknown>[];
+
+
+  /**
+   * Location of the parent `TNode`.
+   */
+  parentInjectorIndex: number;
 }
\ 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 1b214edd79b34..6da8acbbe9800 100644
--- a/packages/core/src/render3/jit/directive.ts
+++ b/packages/core/src/render3/jit/directive.ts
@@ -26,7 +26,20 @@ import {angularCoreEnv} from './environment';
 import {getJitOptions} from './jit_options';
 import {flushModuleScopingQueueAsMuchAsPossible, patchComponentDefWithScope, transitiveScopesFor} from './module';
 
-
+/**
+ * Keep track of the compilation depth to avoid reentrancy issues during JIT compilation. This
+ * matters in the following scenario:
+ *
+ * Consider a component 'A' that extends component 'B', both declared in module 'M'. During
+ * the compilation of 'A' the definition of 'B' is requested to capture the inheritance chain,
+ * potentially triggering compilation of 'B'. If this nested compilation were to trigger
+ * `flushModuleScopingQueueAsMuchAsPossible` it may happen that module 'M' is still pending in the
+ * queue, resulting in 'A' and 'B' to be patched with the NgModule scope. As the compilation of
+ * 'A' is still in progress, this would introduce a circular dependency on its compilation. To avoid
+ * this issue, the module scope queue is only flushed for compilations at the depth 0, to ensure
+ * all compilations have finished.
+ */
+let compilationDepth = 0;
 
 /**
  * Compile an Angular component according to its decorator metadata, and patch the resulting
@@ -106,18 +119,26 @@ export function compileComponent(type: Type<any>, metadata: Component): void {
           interpolation: metadata.interpolation,
           viewProviders: metadata.viewProviders || null,
         };
-        if (meta.usesInheritance) {
-          addDirectiveDefToUndecoratedParents(type);
-        }
 
-        ngComponentDef = compiler.compileComponent(angularCoreEnv, templateUrl, meta);
+        compilationDepth++;
+        try {
+          if (meta.usesInheritance) {
+            addDirectiveDefToUndecoratedParents(type);
+          }
+          ngComponentDef = compiler.compileComponent(angularCoreEnv, templateUrl, meta);
+        } finally {
+          // Ensure that the compilation depth is decremented even when the compilation failed.
+          compilationDepth--;
+        }
 
-        // When NgModule decorator executed, we enqueued the module definition such that
-        // it would only dequeue and add itself as module scope to all of its declarations,
-        // but only if  if all of its declarations had resolved. This call runs the check
-        // to see if any modules that are in the queue can be dequeued and add scope to
-        // their declarations.
-        flushModuleScopingQueueAsMuchAsPossible();
+        if (compilationDepth === 0) {
+          // When NgModule decorator executed, we enqueued the module definition such that
+          // it would only dequeue and add itself as module scope to all of its declarations,
+          // but only if  if all of its declarations had resolved. This call runs the check
+          // to see if any modules that are in the queue can be dequeued and add scope to
+          // their declarations.
+          flushModuleScopingQueueAsMuchAsPossible();
+        }
 
         // 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
diff --git a/packages/core/src/render3/jit/environment.ts b/packages/core/src/render3/jit/environment.ts
index 00f3286f18d11..9f028b1d43eb4 100644
--- a/packages/core/src/render3/jit/environment.ts
+++ b/packages/core/src/render3/jit/environment.ts
@@ -134,7 +134,6 @@ export const angularCoreEnv: {[name: string]: Function} =
        'ɵɵstylePropInterpolate8': r3.ɵɵstylePropInterpolate8,
        'ɵɵstylePropInterpolateV': r3.ɵɵstylePropInterpolateV,
        'ɵɵclassProp': r3.ɵɵclassProp,
-       'ɵɵselect': r3.ɵɵselect,
        'ɵɵadvance': r3.ɵɵadvance,
        'ɵɵtemplate': r3.ɵɵtemplate,
        'ɵɵtext': r3.ɵɵtext,
@@ -167,4 +166,7 @@ export const angularCoreEnv: {[name: string]: Function} =
        'ɵɵsanitizeScript': sanitization.ɵɵsanitizeScript,
        'ɵɵsanitizeUrl': sanitization.ɵɵsanitizeUrl,
        'ɵɵsanitizeUrlOrResourceUrl': sanitization.ɵɵsanitizeUrlOrResourceUrl,
+       'ɵɵtrustConstantHtml': sanitization.ɵɵtrustConstantHtml,
+       'ɵɵtrustConstantScript': sanitization.ɵɵtrustConstantScript,
+       'ɵɵtrustConstantResourceUrl': sanitization.ɵɵtrustConstantResourceUrl,
      }))();
diff --git a/packages/core/src/render3/jit/module.ts b/packages/core/src/render3/jit/module.ts
index be8864bfc32fc..409e062055649 100644
--- a/packages/core/src/render3/jit/module.ts
+++ b/packages/core/src/render3/jit/module.ts
@@ -11,7 +11,7 @@ import {resolveForwardRef} from '../../di/forward_ref';
 import {NG_INJ_DEF} from '../../di/interface/defs';
 import {reflectDependencies} from '../../di/jit/util';
 import {Type} from '../../interface/type';
-import {Component} from '../../metadata';
+import {Component} from '../../metadata/directives';
 import {ModuleWithProviders, NgModule, NgModuleDef, NgModuleTransitiveScopes} from '../../metadata/ng_module';
 import {deepForEach, flatten} from '../../util/array_utils';
 import {assertDefined} from '../../util/assert';
diff --git a/packages/core/src/render3/metadata.ts b/packages/core/src/render3/metadata.ts
index 4ae9c92fda778..317e265c0f27f 100644
--- a/packages/core/src/render3/metadata.ts
+++ b/packages/core/src/render3/metadata.ts
@@ -30,18 +30,8 @@ export function setClassMetadata(
   return noSideEffects(() => {
            const clazz = type as TypeWithMetadata;
 
-           // We determine whether a class has its own metadata by taking the metadata from the
-           // parent constructor and checking whether it's the same as the subclass metadata below.
-           // We can't use `hasOwnProperty` here because it doesn't work correctly in IE10 for
-           // static fields that are defined by TS. See
-           // https://github.com/angular/angular/pull/28439#issuecomment-459349218.
-           const parentPrototype = clazz.prototype ? Object.getPrototypeOf(clazz.prototype) : null;
-           const parentConstructor: TypeWithMetadata|null =
-               parentPrototype && parentPrototype.constructor;
-
            if (decorators !== null) {
-             if (clazz.decorators !== undefined &&
-                 (!parentConstructor || parentConstructor.decorators !== clazz.decorators)) {
+             if (clazz.hasOwnProperty('decorators') && clazz.decorators !== undefined) {
                clazz.decorators.push(...decorators);
              } else {
                clazz.decorators = decorators;
@@ -58,9 +48,7 @@ export function setClassMetadata(
              // different decorator types. Decorators on individual fields are not merged, as it's
              // also incredibly unlikely that a field will be decorated both with an Angular
              // decorator and a non-Angular decorator that's also been downleveled.
-             if (clazz.propDecorators !== undefined &&
-                 (!parentConstructor ||
-                  parentConstructor.propDecorators !== clazz.propDecorators)) {
+             if (clazz.hasOwnProperty('propDecorators') && clazz.propDecorators !== undefined) {
                clazz.propDecorators = {...clazz.propDecorators, ...propDecorators};
              } else {
                clazz.propDecorators = propDecorators;
diff --git a/packages/core/src/render3/ng_module_ref.ts b/packages/core/src/render3/ng_module_ref.ts
index 29d19e2b62160..4cb7227c6fb4a 100644
--- a/packages/core/src/render3/ng_module_ref.ts
+++ b/packages/core/src/render3/ng_module_ref.ts
@@ -20,7 +20,7 @@ import {stringify} from '../util/stringify';
 
 import {ComponentFactoryResolver} from './component_ref';
 import {getNgLocaleIdDef, getNgModuleDef} from './definition';
-import {setLocaleId} from './i18n';
+import {setLocaleId} from './i18n/i18n_locale_id';
 import {maybeUnwrapFn} from './util/misc_utils';
 
 export interface NgModuleType<T = any> extends Type<T> {
diff --git a/packages/core/src/render3/node_assert.ts b/packages/core/src/render3/node_assert.ts
index 59714e88dfd5e..5305c90a26c84 100644
--- a/packages/core/src/render3/node_assert.ts
+++ b/packages/core/src/render3/node_assert.ts
@@ -6,51 +6,29 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {assertDefined, assertEqual} from '../util/assert';
+import {assertDefined, throwError} from '../util/assert';
+import {TNode, TNodeType, toTNodeTypeAsString} from './interfaces/node';
 
-import {TContainerNode, TElementContainerNode, TElementNode, TIcuContainerNode, TNode, TNodeType, TProjectionNode} from './interfaces/node';
-
-export function assertNodeType(
-    tNode: TNode, type: TNodeType.Container): asserts tNode is TContainerNode;
-export function assertNodeType(
-    tNode: TNode, type: TNodeType.Element): asserts tNode is TElementNode;
-export function assertNodeType(
-    tNode: TNode, type: TNodeType.ElementContainer): asserts tNode is TElementContainerNode;
-export function assertNodeType(
-    tNode: TNode, type: TNodeType.IcuContainer): asserts tNode is TIcuContainerNode;
-export function assertNodeType(
-    tNode: TNode, type: TNodeType.Projection): asserts tNode is TProjectionNode;
-export function assertNodeType(tNode: TNode, type: TNodeType.View): asserts tNode is TContainerNode;
-export function assertNodeType(tNode: TNode, type: TNodeType): asserts tNode is TNode {
-  assertDefined(tNode, 'should be called with a TNode');
-  assertEqual(tNode.type, type, `should be a ${typeName(type)}`);
-}
-
-export function assertNodeOfPossibleTypes(
-    tNode: TNode|null, types: TNodeType[], message?: string): void {
+export function assertTNodeType(
+    tNode: TNode|null, expectedTypes: TNodeType, message?: string): void {
   assertDefined(tNode, 'should be called with a TNode');
-  const found = types.some(type => tNode.type === type);
-  assertEqual(
-      found, true,
-      message ??
-          `Should be one of ${types.map(typeName).join(', ')} but got ${typeName(tNode.type)}`);
+  if ((tNode.type & expectedTypes) === 0) {
+    throwError(
+        message ||
+        `Expected [${toTNodeTypeAsString(expectedTypes)}] but got ${
+            toTNodeTypeAsString(tNode.type)}.`);
+  }
 }
 
-export function assertNodeNotOfTypes(tNode: TNode, types: TNodeType[], message?: string): void {
-  assertDefined(tNode, 'should be called with a TNode');
-  const found = types.some(type => tNode.type === type);
-  assertEqual(
-      found, false,
-      message ??
-          `Should not be one of ${types.map(typeName).join(', ')} but got ${typeName(tNode.type)}`);
-}
-
-function typeName(type: TNodeType): string {
-  if (type == TNodeType.Projection) return 'Projection';
-  if (type == TNodeType.Container) return 'Container';
-  if (type == TNodeType.IcuContainer) return 'IcuContainer';
-  if (type == TNodeType.View) return 'View';
-  if (type == TNodeType.Element) return 'Element';
-  if (type == TNodeType.ElementContainer) return 'ElementContainer';
-  return '<unknown>';
-}
+export function assertPureTNodeType(type: TNodeType) {
+  if (!(type === TNodeType.Element ||           //
+        type === TNodeType.Text ||              //
+        type === TNodeType.Container ||         //
+        type === TNodeType.ElementContainer ||  //
+        type === TNodeType.Icu ||               //
+        type === TNodeType.Projection ||        //
+        type === TNodeType.Placeholder)) {
+    throwError(`Expected TNodeType to have only a single type selected, but got ${
+        toTNodeTypeAsString(type)}.`);
+  }
+}
\ No newline at end of file
diff --git a/packages/core/src/render3/node_manipulation.ts b/packages/core/src/render3/node_manipulation.ts
index c7ce0d2542baf..275c16f8110ee 100644
--- a/packages/core/src/render3/node_manipulation.ts
+++ b/packages/core/src/render3/node_manipulation.ts
@@ -6,50 +6,29 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Renderer2} from '../core';
 import {ViewEncapsulation} from '../metadata/view';
+import {Renderer2} from '../render/api';
 import {addToArray, removeFromArray} from '../util/array_utils';
-import {assertDefined, assertDomNode, assertEqual, assertString} from '../util/assert';
+import {assertDefined, assertDomNode, assertEqual, assertIndexInRange, assertString} from '../util/assert';
 
 import {assertLContainer, assertLView, assertTNodeForLView} from './assert';
 import {attachPatchData} from './context_discovery';
+import {icuContainerIterate} from './i18n/i18n_tree_shaking';
 import {CONTAINER_HEADER_OFFSET, HAS_TRANSPLANTED_VIEWS, LContainer, MOVED_VIEWS, NATIVE, unusedValueExportToPlacateAjd as unused1} from './interfaces/container';
 import {ComponentDef} from './interfaces/definition';
 import {NodeInjectorFactory} from './interfaces/injector';
-import {TElementNode, TNode, TNodeFlags, TNodeType, TProjectionNode, TViewNode, unusedValueExportToPlacateAjd as unused2} from './interfaces/node';
+import {TElementNode, TIcuContainerNode, TNode, TNodeFlags, TNodeType, TProjectionNode, unusedValueExportToPlacateAjd as unused2} from './interfaces/node';
 import {unusedValueExportToPlacateAjd as unused3} from './interfaces/projection';
-import {isProceduralRenderer, ProceduralRenderer3, RElement, Renderer3, RNode, RText, unusedValueExportToPlacateAjd as unused4} from './interfaces/renderer';
+import {isProceduralRenderer, ProceduralRenderer3, RComment, RElement, Renderer3, RNode, RText, unusedValueExportToPlacateAjd as unused4} from './interfaces/renderer';
 import {isLContainer, isLView} from './interfaces/type_checks';
-import {CHILD_HEAD, CLEANUP, DECLARATION_COMPONENT_VIEW, DECLARATION_LCONTAINER, DestroyHookData, FLAGS, HookData, HookFn, HOST, LView, LViewFlags, NEXT, PARENT, QUERIES, RENDERER, T_HOST, TVIEW, TView, unusedValueExportToPlacateAjd as unused5} from './interfaces/view';
-import {assertNodeOfPossibleTypes, assertNodeType} from './node_assert';
+import {CHILD_HEAD, CLEANUP, DECLARATION_COMPONENT_VIEW, DECLARATION_LCONTAINER, DestroyHookData, FLAGS, HookData, HookFn, HOST, LView, LViewFlags, NEXT, PARENT, QUERIES, RENDERER, T_HOST, TVIEW, TView, TViewType, unusedValueExportToPlacateAjd as unused5} from './interfaces/view';
+import {assertTNodeType} from './node_assert';
 import {getLViewParent} from './util/view_traversal_utils';
 import {getNativeByTNode, unwrapRNode, updateTransplantedViewCount} from './util/view_utils';
 
-const unusedValueToPlacateAjd = unused1 + unused2 + unused3 + unused4 + unused5;
-
-export function getLContainer(tNode: TViewNode, embeddedView: LView): LContainer|null {
-  ngDevMode && assertLView(embeddedView);
-  const container = embeddedView[PARENT] as LContainer;
-  if (tNode.index === -1) {
-    // This is a dynamically created view inside a dynamic container.
-    // The parent isn't an LContainer if the embedded view hasn't been attached yet.
-    return isLContainer(container) ? container : null;
-  } else {
-    ngDevMode && assertLContainer(container);
-    // This is a inline view node (e.g. embeddedViewStart)
-    return container;
-  }
-}
 
 
-/**
- * Retrieves render parent for a given view.
- * Might be null if a view is not yet attached to any container.
- */
-export function getContainerRenderParent(tViewNode: TViewNode, view: LView): RElement|null {
-  const container = getLContainer(tViewNode, view);
-  return container ? nativeParentNode(view[RENDERER], container[NATIVE]) : null;
-}
+const unusedValueToPlacateAjd = unused1 + unused2 + unused3 + unused4 + unused5;
 
 const enum WalkTNodeTreeAction {
   /** node create in the native environment. Run on initial creation. */
@@ -101,10 +80,10 @@ function applyToElementOrContainer(
       if (beforeNode == null) {
         nativeAppendChild(renderer, parent, rNode);
       } else {
-        nativeInsertBefore(renderer, parent, rNode, beforeNode || null);
+        nativeInsertBefore(renderer, parent, rNode, beforeNode || null, true);
       }
     } else if (action === WalkTNodeTreeAction.Insert && parent !== null) {
-      nativeInsertBefore(renderer, parent, rNode, beforeNode || null);
+      nativeInsertBefore(renderer, parent, rNode, beforeNode || null, true);
     } else if (action === WalkTNodeTreeAction.Detach) {
       nativeRemoveNode(renderer, rNode, isComponent);
     } else if (action === WalkTNodeTreeAction.Destroy) {
@@ -117,15 +96,46 @@ function applyToElementOrContainer(
   }
 }
 
-export function createTextNode(value: string, renderer: Renderer3): RText {
+export function createTextNode(renderer: Renderer3, value: string): RText {
   ngDevMode && ngDevMode.rendererCreateTextNode++;
   ngDevMode && ngDevMode.rendererSetText++;
   return isProceduralRenderer(renderer) ? renderer.createText(value) :
                                           renderer.createTextNode(value);
 }
 
+export function updateTextNode(renderer: Renderer3, rNode: RText, value: string): void {
+  ngDevMode && ngDevMode.rendererSetText++;
+  isProceduralRenderer(renderer) ? renderer.setValue(rNode, value) : rNode.textContent = value;
+}
+
+export function createCommentNode(renderer: Renderer3, value: string): RComment {
+  ngDevMode && ngDevMode.rendererCreateComment++;
+  // isProceduralRenderer check is not needed because both `Renderer2` and `Renderer3` have the same
+  // method name.
+  return renderer.createComment(value);
+}
+
 /**
- * Adds or removes all DOM elements associated with a view.
+ * Creates a native element from a tag name, using a renderer.
+ * @param renderer A renderer to use
+ * @param name the tag name
+ * @param namespace Optional namespace for element.
+ * @returns the element created
+ */
+export function createElementNode(
+    renderer: Renderer3, name: string, namespace: string|null): RElement {
+  ngDevMode && ngDevMode.rendererCreateElement++;
+  if (isProceduralRenderer(renderer)) {
+    return renderer.createElement(name, namespace);
+  } else {
+    return namespace === null ? renderer.createElement(name) :
+                                renderer.createElementNS(namespace, name);
+  }
+}
+
+
+/**
+ * Removes all DOM elements associated with a view.
  *
  * Because some root nodes of the view may be containers, we sometimes need
  * to propagate deeply into the nested containers to remove all elements in the
@@ -133,24 +143,37 @@ export function createTextNode(value: string, renderer: Renderer3): RText {
  *
  * @param tView The `TView' of the `LView` from which elements should be added or removed
  * @param lView The view from which elements should be added or removed
- * @param insertMode Whether or not elements should be added (if false, removing)
+ */
+export function removeViewFromContainer(tView: TView, lView: LView): void {
+  const renderer = lView[RENDERER];
+  applyView(tView, lView, renderer, WalkTNodeTreeAction.Detach, null, null);
+  lView[HOST] = null;
+  lView[T_HOST] = null;
+}
+
+/**
+ * Adds all DOM elements associated with a view.
+ *
+ * Because some root nodes of the view may be containers, we sometimes need
+ * to propagate deeply into the nested containers to add all elements in the
+ * views beneath it.
+ *
+ * @param tView The `TView' of the `LView` from which elements should be added or removed
+ * @param parentTNode The `TNode` where the `LView` should be attached to.
+ * @param renderer Current renderer to use for DOM manipulations.
+ * @param lView The view from which elements should be added or removed
+ * @param parentNativeNode The parent `RElement` where it should be inserted into.
  * @param beforeNode The node before which elements should be added, if insert mode
  */
-export function addRemoveViewFromContainer(
-    tView: TView, lView: LView, insertMode: true, beforeNode: RNode|null): void;
-export function addRemoveViewFromContainer(
-    tView: TView, lView: LView, insertMode: false, beforeNode: null): void;
-export function addRemoveViewFromContainer(
-    tView: TView, lView: LView, insertMode: boolean, beforeNode: RNode|null): void {
-  const renderParent = getContainerRenderParent(tView.node as TViewNode, lView);
-  ngDevMode && assertNodeType(tView.node as TNode, TNodeType.View);
-  if (renderParent) {
-    const renderer = lView[RENDERER];
-    const action = insertMode ? WalkTNodeTreeAction.Insert : WalkTNodeTreeAction.Detach;
-    applyView(tView, lView, renderer, action, renderParent, beforeNode);
-  }
+export function addViewToContainer(
+    tView: TView, parentTNode: TNode, renderer: Renderer3, lView: LView, parentNativeNode: RElement,
+    beforeNode: RNode|null): void {
+  lView[HOST] = parentNativeNode;
+  lView[T_HOST] = parentTNode;
+  applyView(tView, lView, renderer, WalkTNodeTreeAction.Insert, parentNativeNode, beforeNode);
 }
 
+
 /**
  * Detach a `LView` from the DOM by detaching its nodes.
  *
@@ -198,11 +221,15 @@ export function destroyViewTree(rootView: LView): void {
       // Only clean up view when moving to the side or up, as destroy hooks
       // should be called in order from the bottom up.
       while (lViewOrLContainer && !lViewOrLContainer![NEXT] && lViewOrLContainer !== rootView) {
-        isLView(lViewOrLContainer) && cleanUpView(lViewOrLContainer[TVIEW], lViewOrLContainer);
-        lViewOrLContainer = getParentState(lViewOrLContainer, rootView);
+        if (isLView(lViewOrLContainer)) {
+          cleanUpView(lViewOrLContainer[TVIEW], lViewOrLContainer);
+        }
+        lViewOrLContainer = lViewOrLContainer[PARENT];
       }
       if (lViewOrLContainer === null) lViewOrLContainer = rootView;
-      isLView(lViewOrLContainer) && cleanUpView(lViewOrLContainer[TVIEW], lViewOrLContainer);
+      if (isLView(lViewOrLContainer)) {
+        cleanUpView(lViewOrLContainer[TVIEW], lViewOrLContainer);
+      }
       next = lViewOrLContainer && lViewOrLContainer![NEXT];
     }
     lViewOrLContainer = next;
@@ -300,6 +327,7 @@ function detachMovedView(declarationContainer: LContainer, lView: LView) {
   // would be cleared and the counter decremented), we need to decrement the view counter here
   // instead.
   if (lView[FLAGS] & LViewFlags.RefreshTransplantedView) {
+    lView[FLAGS] &= ~LViewFlags.RefreshTransplantedView;
     updateTransplantedViewCount(insertionLContainer, -1);
   }
 
@@ -333,7 +361,7 @@ export function detachView(lContainer: LContainer, removeIndex: number): LView|u
       lContainer[indexInContainer - 1][NEXT] = viewToDetach[NEXT] as LView;
     }
     const removedLView = removeFromArray(lContainer, CONTAINER_HEADER_OFFSET + removeIndex);
-    addRemoveViewFromContainer(viewToDetach[TVIEW], viewToDetach, false, null);
+    removeViewFromContainer(viewToDetach[TVIEW], viewToDetach);
 
     // notify query that a view has been removed
     const lQueries = removedLView[QUERIES];
@@ -349,17 +377,6 @@ export function detachView(lContainer: LContainer, removeIndex: number): LView|u
   return viewToDetach;
 }
 
-/**
- * Removes a view from a container, i.e. detaches it and then destroys the underlying LView.
- *
- * @param lContainer The container from which to remove a view
- * @param removeIndex The index of the view to remove
- */
-export function removeView(lContainer: LContainer, removeIndex: number) {
-  const detachedView = detachView(lContainer, removeIndex);
-  detachedView && destroyLView(detachedView[TVIEW], detachedView);
-}
-
 /**
  * A standalone function which destroys an LView,
  * conducting clean up (e.g. removing listeners, calling onDestroys).
@@ -378,32 +395,6 @@ export function destroyLView(tView: TView, lView: LView) {
   }
 }
 
-/**
- * Determines which LViewOrLContainer to jump to when traversing back up the
- * tree in destroyViewTree.
- *
- * Normally, the view's parent LView should be checked, but in the case of
- * embedded views, the container (which is the view node's parent, but not the
- * LView's parent) needs to be checked for a possible next property.
- *
- * @param lViewOrLContainer The LViewOrLContainer for which we need a parent state
- * @param rootView The rootView, so we don't propagate too far up the view tree
- * @returns The correct parent LViewOrLContainer
- */
-export function getParentState(lViewOrLContainer: LView|LContainer, rootView: LView): LView|
-    LContainer|null {
-  let tNode;
-  if (isLView(lViewOrLContainer) && (tNode = lViewOrLContainer[T_HOST]) &&
-      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 getLContainer(tNode as TViewNode, lViewOrLContainer);
-  } else {
-    // otherwise, use parent view for containers or component views
-    return lViewOrLContainer[PARENT] === rootView ? null : lViewOrLContainer[PARENT];
-  }
-}
-
 /**
  * Calls onDestroys hooks for all directives and pipes in a given view and then removes all
  * listeners. Listeners are removed as the last step so events delivered in the onDestroys hooks
@@ -427,10 +418,8 @@ function cleanUpView(tView: TView, lView: LView): void {
 
     executeOnDestroys(tView, lView);
     removeListeners(tView, lView);
-    const hostTNode = lView[T_HOST];
-    // For component views only, the local renderer is destroyed as clean up time.
-    if (hostTNode && hostTNode.type === TNodeType.Element &&
-        isProceduralRenderer(lView[RENDERER])) {
+    // For component views only, the local renderer is destroyed at clean up time.
+    if (lView[TVIEW].type === TViewType.Component && isProceduralRenderer(lView[RENDERER])) {
       ngDevMode && ngDevMode.rendererDestroy++;
       (lView[RENDERER] as ProceduralRenderer3).destroy();
     }
@@ -524,64 +513,66 @@ function executeOnDestroys(tView: TView, lView: LView): void {
  *   parent container, which itself is disconnected. For example the parent container is part
  *   of a View which has not be inserted or is made for projection but has not been inserted
  *   into destination.
+ *
+ * @param tView: Current `TView`.
+ * @param tNode: `TNode` for which we wish to retrieve render parent.
+ * @param lView: Current `LView`.
+ */
+export function getParentRElement(tView: TView, tNode: TNode, lView: LView): RElement|null {
+  return getClosestRElement(tView, tNode.parent, lView);
+}
+
+/**
+ * Get closest `RElement` or `null` if it can't be found.
+ *
+ * If `TNode` is `TNodeType.Element` => return `RElement` at `LView[tNode.index]` location.
+ * If `TNode` is `TNodeType.ElementContainer|IcuContain` => return the parent (recursively).
+ * If `TNode` is `null` then return host `RElement`:
+ *   - return `null` if projection
+ *   - return `null` if parent container is disconnected (we have no parent.)
+ *
+ * @param tView: Current `TView`.
+ * @param tNode: `TNode` for which we wish to retrieve `RElement` (or `null` if host element is
+ *     needed).
+ * @param lView: Current `LView`.
+ * @returns `null` if the `RElement` can't be determined at this time (no parent / projection)
  */
-function getRenderParent(tView: TView, tNode: TNode, currentView: LView): RElement|null {
+export function getClosestRElement(tView: TView, tNode: TNode|null, lView: LView): RElement|null {
+  let parentTNode: TNode|null = tNode;
   // Skip over element and ICU containers as those are represented by a comment node and
   // can't be used as a render parent.
-  let parentTNode = tNode.parent;
-  while (parentTNode != null &&
-         (parentTNode.type === TNodeType.ElementContainer ||
-          parentTNode.type === TNodeType.IcuContainer)) {
+  while (parentTNode !== null &&
+         (parentTNode.type & (TNodeType.ElementContainer | TNodeType.Icu))) {
     tNode = parentTNode;
     parentTNode = tNode.parent;
   }
 
   // If the parent tNode is null, then we are inserting across views: either into an embedded view
   // or a component view.
-  if (parentTNode == null) {
-    const hostTNode = currentView[T_HOST]!;
-    if (hostTNode.type === TNodeType.View) {
-      // We are inserting a root element of an embedded view We might delay insertion of children
-      // for a given view if it is disconnected. This might happen for 2 main reasons:
-      // - view is not inserted into any container(view was created but not inserted yet)
-      // - view is inserted into a container but the container itself is not inserted into the DOM
-      // (container might be part of projection or child of a view that is not inserted yet).
-      // In other words we can insert children of a given view if this view was inserted into a
-      // container and the container itself has its render parent determined.
-      return getContainerRenderParent(hostTNode as TViewNode, currentView);
-    } else {
-      // We are inserting a root element of the component view into the component host element and
-      // it should always be eager.
-      ngDevMode && assertNodeOfPossibleTypes(hostTNode, [TNodeType.Element]);
-      return currentView[HOST];
-    }
+  if (parentTNode === null) {
+    // We are inserting a root element of the component view into the component host element and
+    // it should always be eager.
+    return lView[HOST];
   } else {
-    const isIcuCase = tNode && tNode.type === TNodeType.IcuContainer;
-    // If the parent of this node is an ICU container, then it is represented by comment node and we
-    // need to use it as an anchor. If it is projected then it's direct parent node is the renderer.
-    if (isIcuCase && tNode.flags & TNodeFlags.isProjected) {
-      return getNativeByTNode(tNode, currentView).parentNode as RElement;
-    }
-
-    ngDevMode && assertNodeType(parentTNode, TNodeType.Element);
+    ngDevMode && assertTNodeType(parentTNode, TNodeType.AnyRNode | TNodeType.Container);
     if (parentTNode.flags & TNodeFlags.isComponentHost) {
+      ngDevMode && assertTNodeForLView(parentTNode, lView);
       const tData = tView.data;
       const tNode = tData[parentTNode.index] as TNode;
       const encapsulation = (tData[tNode.directiveStart] as ComponentDef<any>).encapsulation;
-
       // We've got a parent which is an element in the current view. We just need to verify if the
       // parent element is not 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 then move it to its final destination. Note that we can't
       // make this assumption when using the Shadow DOM, because the native projection placeholders
       // (<content> or <slot>) have to be in place as elements are being inserted.
-      if (encapsulation !== ViewEncapsulation.ShadowDom &&
-          encapsulation !== ViewEncapsulation.Native) {
+      if (encapsulation === ViewEncapsulation.None ||
+          encapsulation === ViewEncapsulation.Emulated) {
         return null;
       }
     }
 
-    return getNativeByTNode(parentTNode, currentView) as RElement;
+    return getNativeByTNode(parentTNode, lView) as RElement;
   }
 }
 
@@ -591,12 +582,13 @@ function getRenderParent(tView: TView, tNode: TNode, currentView: LView): REleme
  * actual renderer being used.
  */
 export function nativeInsertBefore(
-    renderer: Renderer3, parent: RElement, child: RNode, beforeNode: RNode|null): void {
+    renderer: Renderer3, parent: RElement, child: RNode, beforeNode: RNode|null,
+    isMove: boolean): void {
   ngDevMode && ngDevMode.rendererInsertBefore++;
   if (isProceduralRenderer(renderer)) {
-    renderer.insertBefore(parent, child, beforeNode);
+    renderer.insertBefore(parent, child, beforeNode, isMove);
   } else {
-    parent.insertBefore(child, beforeNode, true);
+    parent.insertBefore(child, beforeNode, isMove);
   }
 }
 
@@ -611,9 +603,9 @@ function nativeAppendChild(renderer: Renderer3, parent: RElement, child: RNode):
 }
 
 function nativeAppendOrInsertBefore(
-    renderer: Renderer3, parent: RElement, child: RNode, beforeNode: RNode|null) {
+    renderer: Renderer3, parent: RElement, child: RNode, beforeNode: RNode|null, isMove: boolean) {
   if (beforeNode !== null) {
-    nativeInsertBefore(renderer, parent, child, beforeNode);
+    nativeInsertBefore(renderer, parent, child, beforeNode, isMove);
   } else {
     nativeAppendChild(renderer, parent, child);
   }
@@ -644,21 +636,27 @@ export function nativeNextSibling(renderer: Renderer3, node: RNode): RNode|null
 }
 
 /**
- * Finds a native "anchor" node for cases where we can't append a native child directly
- * (`appendChild`) and need to use a reference (anchor) node for the `insertBefore` operation.
- * @param parentTNode
- * @param lView
+ * Find a node in front of which `currentTNode` should be inserted.
+ *
+ * This method determines the `RNode` in front of which we should insert the `currentRNode`. This
+ * takes `TNode.insertBeforeIndex` into account.
+ *
+ * @param parentTNode parent `TNode`
+ * @param currentTNode current `TNode` (The node which we would like to insert into the DOM)
+ * @param lView current `LView`
  */
-function getNativeAnchorNode(parentTNode: TNode, lView: LView): RNode|null {
-  if (parentTNode.type === TNodeType.View) {
-    const lContainer = getLContainer(parentTNode as TViewNode, lView);
-    if (lContainer === null) return null;
-    const index = lContainer.indexOf(lView, CONTAINER_HEADER_OFFSET) - CONTAINER_HEADER_OFFSET;
-    return getBeforeNodeForView(index, lContainer);
-  } else if (
-      parentTNode.type === TNodeType.ElementContainer ||
-      parentTNode.type === TNodeType.IcuContainer) {
-    return getNativeByTNode(parentTNode, lView);
+function getInsertInFrontOfRNode(parentTNode: TNode, currentTNode: TNode, lView: LView): RNode|
+    null {
+  const tNodeInsertBeforeIndex = currentTNode.insertBeforeIndex;
+  const insertBeforeIndex =
+      Array.isArray(tNodeInsertBeforeIndex) ? tNodeInsertBeforeIndex[0] : tNodeInsertBeforeIndex;
+  if (insertBeforeIndex === null) {
+    if (parentTNode.type & (TNodeType.ElementContainer | TNodeType.Icu)) {
+      return getNativeByTNode(parentTNode, lView);
+    }
+  } else {
+    ngDevMode && assertIndexInRange(lView, insertBeforeIndex);
+    return unwrapRNode(lView[insertBeforeIndex]);
   }
   return null;
 }
@@ -666,27 +664,69 @@ function getNativeAnchorNode(parentTNode: TNode, lView: LView): RNode|null {
 /**
  * Appends the `child` native node (or a collection of nodes) to the `parent`.
  *
- * The element insertion might be delayed {@link canInsertNativeNode}.
- *
  * @param tView The `TView' to be appended
  * @param lView The current LView
- * @param childEl The native child (or children) that should be appended
+ * @param childRNode The native child (or children) that should be appended
  * @param childTNode The TNode of the child element
- * @returns Whether or not the child was appended
  */
 export function appendChild(
-    tView: TView, lView: LView, childEl: RNode|RNode[], childTNode: TNode): void {
-  const renderParent = getRenderParent(tView, childTNode, lView);
-  if (renderParent != null) {
-    const renderer = lView[RENDERER];
-    const parentTNode: TNode = childTNode.parent || lView[T_HOST]!;
-    const anchorNode = getNativeAnchorNode(parentTNode, lView);
-    if (Array.isArray(childEl)) {
-      for (let i = 0; i < childEl.length; i++) {
-        nativeAppendOrInsertBefore(renderer, renderParent, childEl[i], anchorNode);
+    tView: TView, lView: LView, childRNode: RNode|RNode[], childTNode: TNode): void {
+  const parentRNode = getParentRElement(tView, childTNode, lView);
+  const renderer = lView[RENDERER];
+  const parentTNode: TNode = childTNode.parent || lView[T_HOST]!;
+  const anchorNode = getInsertInFrontOfRNode(parentTNode, childTNode, lView);
+  if (parentRNode != null) {
+    if (Array.isArray(childRNode)) {
+      for (let i = 0; i < childRNode.length; i++) {
+        nativeAppendOrInsertBefore(renderer, parentRNode, childRNode[i], anchorNode, false);
       }
     } else {
-      nativeAppendOrInsertBefore(renderer, renderParent, childEl, anchorNode);
+      nativeAppendOrInsertBefore(renderer, parentRNode, childRNode, anchorNode, false);
+    }
+  }
+
+  const tNodeInsertBeforeIndex = childTNode.insertBeforeIndex;
+  if (Array.isArray(tNodeInsertBeforeIndex) &&
+      (childTNode.flags & TNodeFlags.isComponentHost) === 0) {
+    // An array indicates that there are i18n nodes that need to be added as children of this
+    // `rChildNode`. These i18n nodes were created before this `rChildNode` was available and so
+    // only now can be added. The first element of the array is the normal index where we should
+    // insert the `rChildNode`. Additional elements are the extra nodes to be added as children of
+    // `rChildNode`.
+    processI18nText(renderer, childTNode, lView, childRNode, parentRNode, tNodeInsertBeforeIndex);
+  }
+}
+
+/**
+ * Process `TNode.insertBeforeIndex` by adding i18n text nodes.
+ *
+ * See `TNode.insertBeforeIndex`
+ *
+ * @param renderer
+ * @param childTNode
+ * @param lView
+ * @param childRNode
+ * @param parentRElement
+ * @param i18nChildren
+ */
+function processI18nText(
+    renderer: Renderer3, childTNode: TNode, lView: LView, childRNode: RNode|RNode[],
+    parentRElement: RElement|null, i18nChildren: number[]): void {
+  ngDevMode && assertDomNode(childRNode);
+  const isProcedural = isProceduralRenderer(renderer);
+  let i18nParent: RElement|null = childRNode as RElement;
+  let anchorRNode: RNode|null = null;
+  if (!(childTNode.type & TNodeType.AnyRNode)) {
+    anchorRNode = i18nParent;
+    i18nParent = parentRElement;
+  }
+  const isViewRoot = childTNode.parent === null;
+  if (i18nParent !== null) {
+    for (let i = 1; i < i18nChildren.length; i++) {
+      // No need to `unwrapRNode` because all of the indexes point to i18n text nodes.
+      // see `assertDomNode` below.
+      const i18nChild = lView[i18nChildren[i]];
+      nativeInsertBefore(renderer, i18nParent, i18nChild, anchorRNode, false);
     }
   }
 }
@@ -698,17 +738,17 @@ export function appendChild(
  */
 function getFirstNativeNode(lView: LView, tNode: TNode|null): RNode|null {
   if (tNode !== null) {
-    ngDevMode && assertNodeOfPossibleTypes(tNode, [
-      TNodeType.Element, TNodeType.Container, TNodeType.ElementContainer, TNodeType.IcuContainer,
-      TNodeType.Projection
-    ]);
+    ngDevMode &&
+        assertTNodeType(
+            tNode,
+            TNodeType.AnyRNode | TNodeType.AnyContainer | TNodeType.Icu | TNodeType.Projection);
 
     const tNodeType = tNode.type;
-    if (tNodeType === TNodeType.Element) {
+    if (tNodeType & TNodeType.AnyRNode) {
       return getNativeByTNode(tNode, lView);
-    } else if (tNodeType === TNodeType.Container) {
+    } else if (tNodeType & TNodeType.Container) {
       return getBeforeNodeForView(-1, lView[tNode.index]);
-    } else if (tNodeType === TNodeType.ElementContainer || tNodeType === TNodeType.IcuContainer) {
+    } else if (tNodeType & TNodeType.ElementContainer) {
       const elIcuContainerChild = tNode.child;
       if (elIcuContainerChild !== null) {
         return getFirstNativeNode(lView, elIcuContainerChild);
@@ -720,6 +760,11 @@ function getFirstNativeNode(lView: LView, tNode: TNode|null): RNode|null {
           return unwrapRNode(rNodeOrLContainer);
         }
       }
+    } else if (tNodeType & TNodeType.Icu) {
+      let nextRNode = icuContainerIterate(tNode as TIcuContainerNode, lView);
+      let rNode: RNode|null = nextRNode();
+      // If the ICU container has no nodes, than we use the ICU anchor as the node.
+      return rNode || unwrapRNode(lView[tNode.index]);
     } else {
       const componentView = lView[DECLARATION_COMPONENT_VIEW];
       const componentHost = componentView[T_HOST] as TElementNode;
@@ -762,6 +807,7 @@ export function getBeforeNodeForView(viewIndexInContainer: number, lContainer: L
  * @param isHostElement A flag indicating if a node to be removed is a host of a component.
  */
 export function nativeRemoveNode(renderer: Renderer3, rNode: RNode, isHostElement?: boolean): void {
+  ngDevMode && ngDevMode.rendererRemoveNode++;
   const nativeParent = nativeParentNode(renderer, rNode);
   if (nativeParent) {
     nativeRemoveChild(renderer, nativeParent, rNode, isHostElement);
@@ -775,13 +821,13 @@ export function nativeRemoveNode(renderer: Renderer3, rNode: RNode, isHostElemen
  */
 function applyNodes(
     renderer: Renderer3, action: WalkTNodeTreeAction, tNode: TNode|null, lView: LView,
-    renderParent: RElement|null, beforeNode: RNode|null, isProjection: boolean) {
+    parentRElement: RElement|null, beforeNode: RNode|null, isProjection: boolean) {
   while (tNode != null) {
     ngDevMode && assertTNodeForLView(tNode, lView);
-    ngDevMode && assertNodeOfPossibleTypes(tNode, [
-      TNodeType.Container, TNodeType.Element, TNodeType.ElementContainer, TNodeType.Projection,
-      TNodeType.IcuContainer
-    ]);
+    ngDevMode &&
+        assertTNodeType(
+            tNode,
+            TNodeType.AnyRNode | TNodeType.AnyContainer | TNodeType.Projection | TNodeType.Icu);
     const rawSlotValue = lView[tNode.index];
     const tNodeType = tNode.type;
     if (isProjection) {
@@ -791,15 +837,22 @@ function applyNodes(
       }
     }
     if ((tNode.flags & TNodeFlags.isDetached) !== TNodeFlags.isDetached) {
-      if (tNodeType === TNodeType.ElementContainer || tNodeType === TNodeType.IcuContainer) {
-        applyNodes(renderer, action, tNode.child, lView, renderParent, beforeNode, false);
-        applyToElementOrContainer(action, renderer, renderParent, rawSlotValue, beforeNode);
-      } else if (tNodeType === TNodeType.Projection) {
+      if (tNodeType & TNodeType.ElementContainer) {
+        applyNodes(renderer, action, tNode.child, lView, parentRElement, beforeNode, false);
+        applyToElementOrContainer(action, renderer, parentRElement, rawSlotValue, beforeNode);
+      } else if (tNodeType & TNodeType.Icu) {
+        const nextRNode = icuContainerIterate(tNode as TIcuContainerNode, lView);
+        let rNode: RNode|null;
+        while (rNode = nextRNode()) {
+          applyToElementOrContainer(action, renderer, parentRElement, rNode, beforeNode);
+        }
+        applyToElementOrContainer(action, renderer, parentRElement, rawSlotValue, beforeNode);
+      } else if (tNodeType & TNodeType.Projection) {
         applyProjectionRecursive(
-            renderer, action, lView, tNode as TProjectionNode, renderParent, beforeNode);
+            renderer, action, lView, tNode as TProjectionNode, parentRElement, beforeNode);
       } else {
-        ngDevMode && assertNodeOfPossibleTypes(tNode, [TNodeType.Element, TNodeType.Container]);
-        applyToElementOrContainer(action, renderer, renderParent, rawSlotValue, beforeNode);
+        ngDevMode && assertTNodeType(tNode, TNodeType.AnyRNode | TNodeType.Container);
+        applyToElementOrContainer(action, renderer, parentRElement, rawSlotValue, beforeNode);
       }
     }
     tNode = isProjection ? tNode.projectionNext : tNode.next;
@@ -827,15 +880,19 @@ function applyNodes(
  * @param lView The LView which needs to be inserted, detached, destroyed.
  * @param renderer Renderer to use
  * @param action action to perform (insert, detach, destroy)
- * @param renderParent parent DOM element for insertion/removal.
+ * @param parentRElement parent DOM element for insertion (Removal does not need it).
  * @param beforeNode Before which node the insertions should happen.
  */
+function applyView(
+    tView: TView, lView: LView, renderer: Renderer3, action: WalkTNodeTreeAction.Destroy,
+    parentRElement: null, beforeNode: null): void;
+function applyView(
+    tView: TView, lView: LView, renderer: Renderer3, action: WalkTNodeTreeAction,
+    parentRElement: RElement|null, beforeNode: RNode|null): void;
 function applyView(
     tView: TView, lView: LView, renderer: Renderer3, action: WalkTNodeTreeAction,
-    renderParent: RElement|null, beforeNode: RNode|null) {
-  ngDevMode && assertNodeType(tView.node!, TNodeType.View);
-  const viewRootTNode: TNode|null = tView.node!.child;
-  applyNodes(renderer, action, viewRootTNode, lView, renderParent, beforeNode, false);
+    parentRElement: RElement|null, beforeNode: RNode|null): void {
+  applyNodes(renderer, action, tView.firstChild, lView, parentRElement, beforeNode, false);
 }
 
 /**
@@ -850,11 +907,11 @@ function applyView(
  */
 export function applyProjection(tView: TView, lView: LView, tProjectionNode: TProjectionNode) {
   const renderer = lView[RENDERER];
-  const renderParent = getRenderParent(tView, tProjectionNode, lView);
+  const parentRNode = getParentRElement(tView, tProjectionNode, lView);
   const parentTNode = tProjectionNode.parent || lView[T_HOST]!;
-  let beforeNode = getNativeAnchorNode(parentTNode, lView);
+  let beforeNode = getInsertInFrontOfRNode(parentTNode, tProjectionNode, lView);
   applyProjectionRecursive(
-      renderer, WalkTNodeTreeAction.Create, lView, tProjectionNode, renderParent, beforeNode);
+      renderer, WalkTNodeTreeAction.Create, lView, tProjectionNode, parentRNode, beforeNode);
 }
 
 /**
@@ -868,12 +925,12 @@ export function applyProjection(tView: TView, lView: LView, tProjectionNode: TPr
  * @param action action to perform (insert, detach, destroy)
  * @param lView The LView which needs to be inserted, detached, destroyed.
  * @param tProjectionNode node to project
- * @param renderParent parent DOM element for insertion/removal.
+ * @param parentRElement parent DOM element for insertion/removal.
  * @param beforeNode Before which node the insertions should happen.
  */
 function applyProjectionRecursive(
     renderer: Renderer3, action: WalkTNodeTreeAction, lView: LView,
-    tProjectionNode: TProjectionNode, renderParent: RElement|null, beforeNode: RNode|null) {
+    tProjectionNode: TProjectionNode, parentRElement: RElement|null, beforeNode: RNode|null) {
   const componentLView = lView[DECLARATION_COMPONENT_VIEW];
   const componentNode = componentLView[T_HOST] as TElementNode;
   ngDevMode &&
@@ -887,13 +944,13 @@ function applyProjectionRecursive(
     // This should be refactored and cleaned up.
     for (let i = 0; i < nodeToProjectOrRNodes.length; i++) {
       const rNode = nodeToProjectOrRNodes[i];
-      applyToElementOrContainer(action, renderer, renderParent, rNode, beforeNode);
+      applyToElementOrContainer(action, renderer, parentRElement, rNode, beforeNode);
     }
   } else {
     let nodeToProject: TNode|null = nodeToProjectOrRNodes;
     const projectedComponentLView = componentLView[PARENT] as LView;
     applyNodes(
-        renderer, action, nodeToProject, projectedComponentLView, renderParent, beforeNode, true);
+        renderer, action, nodeToProject, projectedComponentLView, parentRElement, beforeNode, true);
   }
 }
 
@@ -908,31 +965,31 @@ function applyProjectionRecursive(
  * @param renderer Renderer to use
  * @param action action to perform (insert, detach, destroy)
  * @param lContainer The LContainer which needs to be inserted, detached, destroyed.
- * @param renderParent parent DOM element for insertion/removal.
+ * @param parentRElement parent DOM element for insertion/removal.
  * @param beforeNode Before which node the insertions should happen.
  */
 function applyContainer(
     renderer: Renderer3, action: WalkTNodeTreeAction, lContainer: LContainer,
-    renderParent: RElement|null, beforeNode: RNode|null|undefined) {
+    parentRElement: RElement|null, beforeNode: RNode|null|undefined) {
   ngDevMode && assertLContainer(lContainer);
   const anchor = lContainer[NATIVE];  // LContainer has its own before node.
   const native = unwrapRNode(lContainer);
   // An LContainer can be created dynamically on any node by injecting ViewContainerRef.
-  // Asking for a ViewContainerRef on an element will result in a creation of a separate anchor node
-  // (comment in the DOM) that will be different from the LContainer's host node. In this particular
-  // case we need to execute action on 2 nodes:
+  // Asking for a ViewContainerRef on an element will result in a creation of a separate anchor
+  // node (comment in the DOM) that will be different from the LContainer's host node. In this
+  // particular case we need to execute action on 2 nodes:
   // - container's host node (this is done in the executeActionOnElementOrContainer)
   // - container's host node (this is done here)
   if (anchor !== native) {
-    // This is very strange to me (Misko). I would expect that the native is same as anchor. I don't
-    // see a reason why they should be different, but they are.
+    // This is very strange to me (Misko). I would expect that the native is same as anchor. I
+    // don't see a reason why they should be different, but they are.
     //
     // If they are we need to process the second anchor as well.
-    applyToElementOrContainer(action, renderer, renderParent, anchor, beforeNode);
+    applyToElementOrContainer(action, renderer, parentRElement, anchor, beforeNode);
   }
   for (let i = CONTAINER_HEADER_OFFSET; i < lContainer.length; i++) {
     const lView = lContainer[i] as LView;
-    applyView(lView[TVIEW], lView, renderer, action, renderParent, anchor);
+    applyView(lView[TVIEW], lView, renderer, action, parentRElement, anchor);
   }
 }
 
@@ -968,8 +1025,8 @@ export function applyStyling(
       }
     }
   } else {
-    // TODO(misko): Can't import RendererStyleFlags2.DashCase as it causes imports to be resolved in
-    // different order which causes failures. Using direct constant as workaround for now.
+    // TODO(misko): Can't import RendererStyleFlags2.DashCase as it causes imports to be resolved
+    // in different order which causes failures. Using direct constant as workaround for now.
     const flags = prop.indexOf('-') == -1 ? undefined : 2 /* RendererStyleFlags2.DashCase */;
     if (value == null /** || value === undefined */) {
       ngDevMode && ngDevMode.rendererRemoveStyle++;
diff --git a/packages/core/src/render3/node_selector_matcher.ts b/packages/core/src/render3/node_selector_matcher.ts
index 8e1bebef8a00b..9730a741d0b20 100644
--- a/packages/core/src/render3/node_selector_matcher.ts
+++ b/packages/core/src/render3/node_selector_matcher.ts
@@ -62,7 +62,7 @@ function isCssClassMatching(
  * @param tNode current TNode
  */
 export function isInlineTemplate(tNode: TNode): boolean {
-  return tNode.type === TNodeType.Container && tNode.tagName !== NG_TEMPLATE_SELECTOR;
+  return tNode.type === TNodeType.Container && tNode.value !== NG_TEMPLATE_SELECTOR;
 }
 
 /**
@@ -78,9 +78,8 @@ export function isInlineTemplate(tNode: TNode): boolean {
  */
 function hasTagAndTypeMatch(
     tNode: TNode, currentSelector: string, isProjectionMode: boolean): boolean {
-  const tagNameToCompare = tNode.type === TNodeType.Container && !isProjectionMode ?
-      NG_TEMPLATE_SELECTOR :
-      tNode.tagName;
+  const tagNameToCompare =
+      tNode.type === TNodeType.Container && !isProjectionMode ? NG_TEMPLATE_SELECTOR : tNode.value;
   return currentSelector === tagNameToCompare;
 }
 
diff --git a/packages/core/src/render3/node_util.ts b/packages/core/src/render3/node_util.ts
deleted file mode 100644
index ab98bbacea014..0000000000000
--- a/packages/core/src/render3/node_util.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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 {RelativeInjectorLocation} from './interfaces/injector';
-import {TContainerNode, TElementNode, TNode} from './interfaces/node';
-import {DECLARATION_VIEW, LView, T_HOST} from './interfaces/view';
-import {getParentInjectorViewOffset} from './util/injector_utils';
-
-/**
- * If `startTNode.parent` exists and has an injector, returns TNode for that injector.
- * Otherwise, unwraps a parent injector location number to find the view offset from the current
- * injector, then walks up the declaration view tree until the TNode of the parent injector is
- * found.
- *
- * @param location The location of the parent injector, which contains the view offset
- * @param startView The LView instance from which to start walking up the view tree
- * @param startTNode The TNode instance of the starting element
- * @returns The TNode of the parent injector
- */
-export function getParentInjectorTNode(
-    location: RelativeInjectorLocation, startView: LView, startTNode: TNode): TElementNode|
-    TContainerNode|null {
-  // If there is an injector on the parent TNode, retrieve the TNode for that injector.
-  if (startTNode.parent && startTNode.parent.injectorIndex !== -1) {
-    // view offset is 0
-    const injectorIndex = startTNode.parent.injectorIndex;
-    let tNode = startTNode.parent;
-    // If tNode.injectorIndex === tNode.parent.injectorIndex, then the index belongs to a parent
-    // injector.
-    while (tNode.parent != null && injectorIndex == tNode.parent.injectorIndex) {
-      tNode = tNode.parent;
-    }
-    return tNode;
-  }
-  let viewOffset = getParentInjectorViewOffset(location);
-  // view offset is 1
-  let parentView = startView;
-  let parentTNode = startView[T_HOST] as TElementNode;
-  // view offset is superior to 1
-  while (viewOffset > 1) {
-    parentView = parentView[DECLARATION_VIEW]!;
-    parentTNode = parentView[T_HOST] as TElementNode;
-    viewOffset--;
-  }
-  return parentTNode;
-}
diff --git a/packages/core/src/render3/pipe.ts b/packages/core/src/render3/pipe.ts
index 277268fa04c14..0d33ad41f1a46 100644
--- a/packages/core/src/render3/pipe.ts
+++ b/packages/core/src/render3/pipe.ts
@@ -48,15 +48,19 @@ export function ɵɵpipe(index: number, pipeName: string): any {
 
   const pipeFactory = pipeDef.factory || (pipeDef.factory = getFactoryDef(pipeDef.type, true));
   const previousInjectImplementation = setInjectImplementation(ɵɵdirectiveInject);
-
-  // DI for pipes is supposed to behave like directives when placed on a component
-  // host node, which means that we have to disable access to `viewProviders`.
-  const previousIncludeViewProviders = setIncludeViewProviders(false);
-  const pipeInstance = pipeFactory();
-  setIncludeViewProviders(previousIncludeViewProviders);
-  setInjectImplementation(previousInjectImplementation);
-  store(tView, getLView(), index, pipeInstance);
-  return pipeInstance;
+  try {
+    // DI for pipes is supposed to behave like directives when placed on a component
+    // host node, which means that we have to disable access to `viewProviders`.
+    const previousIncludeViewProviders = setIncludeViewProviders(false);
+    const pipeInstance = pipeFactory();
+    setIncludeViewProviders(previousIncludeViewProviders);
+    store(tView, getLView(), adjustedIndex, pipeInstance);
+    return pipeInstance;
+  } finally {
+    // we have to restore the injector implementation in finally, just in case the creation of the
+    // pipe throws an error.
+    setInjectImplementation(previousInjectImplementation);
+  }
 }
 
 /**
@@ -92,11 +96,12 @@ function getPipeDef(name: string, registry: PipeDefList|null): PipeDef<any> {
  * @codeGenApi
  */
 export function ɵɵpipeBind1(index: number, slotOffset: number, v1: any): any {
+  const adjustedIndex = index + HEADER_OFFSET;
   const lView = getLView();
-  const pipeInstance = load<PipeTransform>(lView, index);
+  const pipeInstance = load<PipeTransform>(lView, adjustedIndex);
   return unwrapValue(
       lView,
-      isPure(lView, index) ?
+      isPure(lView, adjustedIndex) ?
           pureFunction1Internal(
               lView, getBindingRoot(), slotOffset, pipeInstance.transform, v1, pipeInstance) :
           pipeInstance.transform(v1));
@@ -116,11 +121,12 @@ export function ɵɵpipeBind1(index: number, slotOffset: number, v1: any): any {
  * @codeGenApi
  */
 export function ɵɵpipeBind2(index: number, slotOffset: number, v1: any, v2: any): any {
+  const adjustedIndex = index + HEADER_OFFSET;
   const lView = getLView();
-  const pipeInstance = load<PipeTransform>(lView, index);
+  const pipeInstance = load<PipeTransform>(lView, adjustedIndex);
   return unwrapValue(
       lView,
-      isPure(lView, index) ?
+      isPure(lView, adjustedIndex) ?
           pureFunction2Internal(
               lView, getBindingRoot(), slotOffset, pipeInstance.transform, v1, v2, pipeInstance) :
           pipeInstance.transform(v1, v2));
@@ -141,14 +147,15 @@ export function ɵɵpipeBind2(index: number, slotOffset: number, v1: any, v2: an
  * @codeGenApi
  */
 export function ɵɵpipeBind3(index: number, slotOffset: number, v1: any, v2: any, v3: any): any {
+  const adjustedIndex = index + HEADER_OFFSET;
   const lView = getLView();
-  const pipeInstance = load<PipeTransform>(lView, index);
+  const pipeInstance = load<PipeTransform>(lView, adjustedIndex);
   return unwrapValue(
       lView,
-      isPure(lView, index) ? pureFunction3Internal(
-                                 lView, getBindingRoot(), slotOffset, pipeInstance.transform, v1,
-                                 v2, v3, pipeInstance) :
-                             pipeInstance.transform(v1, v2, v3));
+      isPure(lView, adjustedIndex) ? pureFunction3Internal(
+                                         lView, getBindingRoot(), slotOffset,
+                                         pipeInstance.transform, v1, v2, v3, pipeInstance) :
+                                     pipeInstance.transform(v1, v2, v3));
 }
 
 /**
@@ -168,14 +175,15 @@ export function ɵɵpipeBind3(index: number, slotOffset: number, v1: any, v2: an
  */
 export function ɵɵpipeBind4(
     index: number, slotOffset: number, v1: any, v2: any, v3: any, v4: any): any {
+  const adjustedIndex = index + HEADER_OFFSET;
   const lView = getLView();
-  const pipeInstance = load<PipeTransform>(lView, index);
+  const pipeInstance = load<PipeTransform>(lView, adjustedIndex);
   return unwrapValue(
       lView,
-      isPure(lView, index) ? pureFunction4Internal(
-                                 lView, getBindingRoot(), slotOffset, pipeInstance.transform, v1,
-                                 v2, v3, v4, pipeInstance) :
-                             pipeInstance.transform(v1, v2, v3, v4));
+      isPure(lView, adjustedIndex) ? pureFunction4Internal(
+                                         lView, getBindingRoot(), slotOffset,
+                                         pipeInstance.transform, v1, v2, v3, v4, pipeInstance) :
+                                     pipeInstance.transform(v1, v2, v3, v4));
 }
 
 /**
@@ -191,18 +199,19 @@ export function ɵɵpipeBind4(
  * @codeGenApi
  */
 export function ɵɵpipeBindV(index: number, slotOffset: number, values: [any, ...any[]]): any {
+  const adjustedIndex = index + HEADER_OFFSET;
   const lView = getLView();
-  const pipeInstance = load<PipeTransform>(lView, index);
+  const pipeInstance = load<PipeTransform>(lView, adjustedIndex);
   return unwrapValue(
       lView,
-      isPure(lView, index) ?
+      isPure(lView, adjustedIndex) ?
           pureFunctionVInternal(
               lView, getBindingRoot(), slotOffset, pipeInstance.transform, values, pipeInstance) :
           pipeInstance.transform.apply(pipeInstance, values));
 }
 
 function isPure(lView: LView, index: number): boolean {
-  return (<PipeDef<any>>lView[TVIEW].data[index + HEADER_OFFSET]).pure;
+  return (<PipeDef<any>>lView[TVIEW].data[index]).pure;
 }
 
 /**
diff --git a/packages/core/src/render3/pure_function.ts b/packages/core/src/render3/pure_function.ts
index 2abb42d10c208..6db19df34d4bd 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 {assertDataInRange} from '../util/assert';
+import {assertIndexInRange} from '../util/assert';
 import {bindingUpdated, bindingUpdated2, bindingUpdated3, bindingUpdated4, getBinding, updateBinding} from './bindings';
 import {LView} from './interfaces/view';
 import {getBindingRoot, getLView} from './state';
@@ -287,7 +287,7 @@ export function ɵɵpureFunctionV(
  * it to `undefined`.
  */
 function getPureFunctionReturnValue(lView: LView, returnValueIndex: number) {
-  ngDevMode && assertDataInRange(lView, returnValueIndex);
+  ngDevMode && assertIndexInRange(lView, returnValueIndex);
   const lastReturnValue = lView[returnValueIndex];
   return lastReturnValue === NO_CHANGE ? undefined : lastReturnValue;
 }
diff --git a/packages/core/src/render3/query.ts b/packages/core/src/render3/query.ts
index 63eaf2bd7d829..0252352018ae0 100644
--- a/packages/core/src/render3/query.ts
+++ b/packages/core/src/render3/query.ts
@@ -15,7 +15,7 @@ import {ElementRef as ViewEngine_ElementRef} from '../linker/element_ref';
 import {QueryList} from '../linker/query_list';
 import {TemplateRef as ViewEngine_TemplateRef} from '../linker/template_ref';
 import {ViewContainerRef} from '../linker/view_container_ref';
-import {assertDataInRange, assertDefined, throwError} from '../util/assert';
+import {assertDefined, assertIndexInRange, throwError} from '../util/assert';
 import {stringify} from '../util/stringify';
 
 import {assertFirstCreatePass, assertLContainer} from './assert';
@@ -27,8 +27,8 @@ import {unusedValueExportToPlacateAjd as unused2} from './interfaces/injector';
 import {TContainerNode, TElementContainerNode, TElementNode, TNode, TNodeType, unusedValueExportToPlacateAjd as unused3} from './interfaces/node';
 import {LQueries, LQuery, TQueries, TQuery, TQueryMetadata, unusedValueExportToPlacateAjd as unused4} from './interfaces/query';
 import {DECLARATION_LCONTAINER, LView, PARENT, QUERIES, TVIEW, TView} from './interfaces/view';
-import {assertNodeOfPossibleTypes} from './node_assert';
-import {getCurrentQueryIndex, getLView, getPreviousOrParentTNode, getTView, setCurrentQueryIndex} from './state';
+import {assertTNodeType} from './node_assert';
+import {getCurrentQueryIndex, getCurrentTNode, getLView, getTView, setCurrentQueryIndex} from './state';
 import {isCreationMode} from './util/view_utils';
 import {createContainerRef, createElementRef, createTemplateRef} from './view_engine_compatibility';
 
@@ -140,7 +140,7 @@ class TQueries_ implements TQueries {
   }
 
   getByIndex(index: number): TQuery {
-    ngDevMode && assertDataInRange(this.queries, index);
+    ngDevMode && assertIndexInRange(this.queries, index);
     return this.queries[index];
   }
 
@@ -217,7 +217,7 @@ class TQuery_ implements TQuery {
       // - <needs-target><ng-container><i #target></i></ng-container></needs-target>: here we need
       // to go past `<ng-container>` to determine <i #target> parent node (but we shouldn't traverse
       // up past the query's host node!).
-      while (parent !== null && parent.type === TNodeType.ElementContainer &&
+      while (parent !== null && (parent.type & TNodeType.ElementContainer) &&
              parent.index !== declarationNodeIdx) {
         parent = parent.parent;
       }
@@ -227,20 +227,23 @@ class TQuery_ implements TQuery {
   }
 
   private matchTNode(tView: TView, tNode: TNode): void {
-    if (Array.isArray(this.metadata.predicate)) {
-      const localNames = this.metadata.predicate;
-      for (let i = 0; i < localNames.length; i++) {
-        this.matchTNodeWithReadOption(tView, tNode, getIdxOfMatchingSelector(tNode, localNames[i]));
+    const predicate = this.metadata.predicate;
+    if (Array.isArray(predicate)) {
+      for (let i = 0; i < predicate.length; i++) {
+        const name = predicate[i];
+        this.matchTNodeWithReadOption(tView, tNode, getIdxOfMatchingSelector(tNode, name));
+        // Also try matching the name to a provider since strings can be used as DI tokens too.
+        this.matchTNodeWithReadOption(
+            tView, tNode, locateDirectiveOrProvider(tNode, tView, name, false, false));
       }
     } else {
-      const typePredicate = this.metadata.predicate as any;
-      if (typePredicate === ViewEngine_TemplateRef) {
-        if (tNode.type === TNodeType.Container) {
+      if ((predicate as any) === ViewEngine_TemplateRef) {
+        if (tNode.type & TNodeType.Container) {
           this.matchTNodeWithReadOption(tView, tNode, -1);
         }
       } else {
         this.matchTNodeWithReadOption(
-            tView, tNode, locateDirectiveOrProvider(tNode, tView, typePredicate, false, false));
+            tView, tNode, locateDirectiveOrProvider(tNode, tView, predicate, false, false));
       }
     }
   }
@@ -250,7 +253,7 @@ class TQuery_ implements TQuery {
       const read = this.metadata.read;
       if (read !== null) {
         if (read === ViewEngine_ElementRef || read === ViewContainerRef ||
-            read === ViewEngine_TemplateRef && tNode.type === TNodeType.Container) {
+            read === ViewEngine_TemplateRef && (tNode.type & TNodeType.Container)) {
           this.addMatch(tNode.index, -2);
         } else {
           const directiveOrProviderIdx =
@@ -296,9 +299,9 @@ function getIdxOfMatchingSelector(tNode: TNode, selector: string): number|null {
 
 
 function createResultByTNodeType(tNode: TNode, currentView: LView): any {
-  if (tNode.type === TNodeType.Element || tNode.type === TNodeType.ElementContainer) {
+  if (tNode.type & (TNodeType.AnyRNode | TNodeType.ElementContainer)) {
     return createElementRef(ViewEngine_ElementRef, tNode, currentView);
-  } else if (tNode.type === TNodeType.Container) {
+  } else if (tNode.type & TNodeType.Container) {
     return createTemplateRef(ViewEngine_TemplateRef, ViewEngine_ElementRef, tNode, currentView);
   }
   return null;
@@ -324,9 +327,7 @@ function createSpecialToken(lView: LView, tNode: TNode, read: any): any {
   } else if (read === ViewEngine_TemplateRef) {
     return createTemplateRef(ViewEngine_TemplateRef, ViewEngine_ElementRef, tNode, lView);
   } else if (read === ViewContainerRef) {
-    ngDevMode &&
-        assertNodeOfPossibleTypes(
-            tNode, [TNodeType.Element, TNodeType.Container, TNodeType.ElementContainer]);
+    ngDevMode && assertTNodeType(tNode, TNodeType.AnyRNode | TNodeType.AnyContainer);
     return createContainerRef(
         ViewContainerRef, ViewEngine_ElementRef,
         tNode as TElementNode | TContainerNode | TElementContainerNode, lView);
@@ -358,7 +359,7 @@ function materializeViewResults<T>(
         // null as a placeholder
         result.push(null);
       } else {
-        ngDevMode && assertDataInRange(tViewData, matchedNodeIdx);
+        ngDevMode && assertIndexInRange(tViewData, matchedNodeIdx);
         const tNode = tViewData[matchedNodeIdx] as TNode;
         result.push(createResultForNode(lView, tNode, tQueryMatches[i + 1], tQuery.metadata.read));
       }
@@ -501,8 +502,7 @@ export function ɵɵcontentQuery<T>(
     directiveIndex: number, predicate: Type<any>|InjectionToken<unknown>|string[], descend: boolean,
     read?: any): void {
   contentQueryInternal(
-      getTView(), getLView(), predicate, descend, read, false, getPreviousOrParentTNode(),
-      directiveIndex);
+      getTView(), getLView(), predicate, descend, read, false, getCurrentTNode()!, directiveIndex);
 }
 
 /**
@@ -521,8 +521,7 @@ export function ɵɵstaticContentQuery<T>(
     directiveIndex: number, predicate: Type<any>|InjectionToken<unknown>|string[], descend: boolean,
     read?: any): void {
   contentQueryInternal(
-      getTView(), getLView(), predicate, descend, read, true, getPreviousOrParentTNode(),
-      directiveIndex);
+      getTView(), getLView(), predicate, descend, read, true, getCurrentTNode()!, directiveIndex);
 }
 
 function contentQueryInternal<T>(
@@ -551,7 +550,7 @@ export function ɵɵloadQuery<T>(): QueryList<T> {
 function loadQueryInternal<T>(lView: LView, queryIndex: number): QueryList<T> {
   ngDevMode &&
       assertDefined(lView[QUERIES], 'LQueries should be defined when trying to load a query');
-  ngDevMode && assertDataInRange(lView[QUERIES]!.queries, queryIndex);
+  ngDevMode && assertIndexInRange(lView[QUERIES]!.queries, queryIndex);
   return lView[QUERIES]!.queries[queryIndex].queryList;
 }
 
diff --git a/packages/core/src/render3/state.ts b/packages/core/src/render3/state.ts
index e0e70ef7d715e..d4e971dcf62a3 100644
--- a/packages/core/src/render3/state.ts
+++ b/packages/core/src/render3/state.ts
@@ -6,12 +6,13 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {assertDefined, assertEqual} from '../util/assert';
-import {assertLViewOrUndefined} from './assert';
+import {assertDefined, assertEqual, assertGreaterThanOrEqual, assertLessThan, assertNotEqual} from '../util/assert';
+import {assertLViewOrUndefined, assertTNodeForTView} from './assert';
 import {DirectiveDef} from './interfaces/definition';
-import {TNode} from './interfaces/node';
-import {CONTEXT, DECLARATION_VIEW, LView, OpaqueViewState, TData, TVIEW, TView} from './interfaces/view';
+import {TNode, TNodeType} from './interfaces/node';
+import {CONTEXT, DECLARATION_VIEW, HEADER_OFFSET, LView, OpaqueViewState, TData, TVIEW, TView} from './interfaces/view';
 import {MATH_ML_NAMESPACE, SVG_NAMESPACE} from './namespaces';
+import {assertTNodeType} from './node_assert';
 import {getTNode} from './util/view_utils';
 
 
@@ -54,12 +55,12 @@ interface LFrame {
    *
    * This is used in conjunction with `isParent`.
    */
-  previousOrParentTNode: TNode;
+  currentTNode: TNode|null;
 
   /**
    * If `isParent` is:
-   *  - `true`: then `previousOrParentTNode` points to a parent node.
-   *  - `false`: then `previousOrParentTNode` points to previous node (sibling).
+   *  - `true`: then `currentTNode` points to a parent node.
+   *  - `false`: then `currentTNode` points to previous node (sibling).
    */
   isParent: boolean;
 
@@ -116,6 +117,22 @@ interface LFrame {
    * `LView[currentDirectiveIndex]` is directive instance.
    */
   currentDirectiveIndex: number;
+
+  /**
+   * Are we currently in i18n block as denoted by `ɵɵelementStart` and `ɵɵelementEnd`.
+   *
+   * This information is needed because while we are in i18n block all elements must be pre-declared
+   * in the translation. (i.e. `Hello �#2�World�/#2�!` pre-declares element at `�#2�` location.)
+   * This allocates `TNodeType.Placeholder` element at location `2`. If translator removes `�#2�`
+   * from translation than the runtime must also ensure tha element at `2` does not get inserted
+   * into the DOM. The translation does not carry information about deleted elements. Therefor the
+   * only way to know that an element is deleted is that it was not pre-declared in the translation.
+   *
+   * This flag works by ensuring that elements which are created without pre-declaration
+   * (`TNodeType.Placeholder`) are not inserted into the DOM render tree. (It does mean that the
+   * element still gets instantiated along with all of its behavior [directives])
+   */
+  inI18n: boolean;
 }
 
 /**
@@ -159,16 +176,28 @@ interface InstructionState {
    * In this mode, any changes in bindings will throw an ExpressionChangedAfterChecked error.
    *
    * Necessary to support ChangeDetectorRef.checkNoChanges().
+   *
+   * checkNoChanges Runs only in devmode=true and verifies that no unintended changes exist in
+   * the change detector or its children.
    */
-  checkNoChangesMode: boolean;
+  isInCheckNoChangesMode: boolean;
 }
 
-export const instructionState: InstructionState = {
+const instructionState: InstructionState = {
   lFrame: createLFrame(null),
   bindingsEnabled: true,
-  checkNoChangesMode: false,
+  isInCheckNoChangesMode: false,
 };
 
+/**
+ * Returns true if the instruction state stack is empty.
+ *
+ * Intended to be called from tests only (tree shaken otherwise).
+ */
+export function specOnlyIsInstructionStateEmpty(): boolean {
+  return instructionState.lFrame.parent === null;
+}
+
 
 export function getElementDepthCount() {
   return instructionState.lFrame.elementDepthCount;
@@ -262,23 +291,40 @@ export function ɵɵrestoreView(viewToRestore: OpaqueViewState) {
   instructionState.lFrame.contextLView = viewToRestore as any as LView;
 }
 
-export function getPreviousOrParentTNode(): TNode {
-  return instructionState.lFrame.previousOrParentTNode;
+
+export function getCurrentTNode(): TNode|null {
+  let currentTNode = getCurrentTNodePlaceholderOk();
+  while (currentTNode !== null && currentTNode.type === TNodeType.Placeholder) {
+    currentTNode = currentTNode.parent;
+  }
+  return currentTNode;
+}
+
+export function getCurrentTNodePlaceholderOk(): TNode|null {
+  return instructionState.lFrame.currentTNode;
 }
 
-export function setPreviousOrParentTNode(tNode: TNode, isParent: boolean) {
-  instructionState.lFrame.previousOrParentTNode = tNode;
-  instructionState.lFrame.isParent = isParent;
+export function getCurrentParentTNode(): TNode|null {
+  const lFrame = instructionState.lFrame;
+  const currentTNode = lFrame.currentTNode;
+  return lFrame.isParent ? currentTNode : currentTNode!.parent;
 }
 
-export function getIsParent(): boolean {
+export function setCurrentTNode(tNode: TNode|null, isParent: boolean) {
+  ngDevMode && tNode && assertTNodeForTView(tNode, instructionState.lFrame.tView);
+  const lFrame = instructionState.lFrame;
+  lFrame.currentTNode = tNode;
+  lFrame.isParent = isParent;
+}
+
+export function isCurrentTNodeParent(): boolean {
   return instructionState.lFrame.isParent;
 }
 
-export function setIsNotParent(): void {
+export function setCurrentTNodeAsNotParent(): void {
   instructionState.lFrame.isParent = false;
 }
-export function setIsParent(): void {
+export function setCurrentTNodeAsParent(): void {
   instructionState.lFrame.isParent = true;
 }
 
@@ -286,13 +332,13 @@ export function getContextLView(): LView {
   return instructionState.lFrame.contextLView;
 }
 
-export function getCheckNoChangesMode(): boolean {
+export function isInCheckNoChangesMode(): boolean {
   // TODO(misko): remove this from the LView since it is ngDevMode=true mode only.
-  return instructionState.checkNoChangesMode;
+  return instructionState.isInCheckNoChangesMode;
 }
 
-export function setCheckNoChangesMode(mode: boolean): void {
-  instructionState.checkNoChangesMode = mode;
+export function setIsInCheckNoChangesMode(mode: boolean): void {
+  instructionState.isInCheckNoChangesMode = mode;
 }
 
 // top level variables should not be exported for performance reasons (PERF_NOTES.md)
@@ -324,6 +370,14 @@ export function incrementBindingIndex(count: number): number {
   return index;
 }
 
+export function isInI18nBlock() {
+  return instructionState.lFrame.inI18n;
+}
+
+export function setInI18nBlock(isInI18nBlock: boolean): void {
+  instructionState.lFrame.inI18n = isInI18nBlock;
+}
+
 /**
  * Set a new binding root index so that host template functions can execute.
  *
@@ -388,7 +442,7 @@ export function enterDI(newView: LView, tNode: TNode) {
   ngDevMode && assertLViewOrUndefined(newView);
   const newLFrame = allocLFrame();
   instructionState.lFrame = newLFrame;
-  newLFrame.previousOrParentTNode = tNode!;
+  newLFrame.currentTNode = tNode!;
   newLFrame.lView = newView;
 }
 
@@ -401,17 +455,17 @@ export function enterDI(newView: LView, tNode: TNode) {
  * exited the state has to be restored
  *
  * @param newView New lView to become active
- * @param tNode Element to which the View is a child of
  * @returns the previously active lView;
  */
-export function enterView(newView: LView, tNode: TNode|null): void {
+export function enterView(newView: LView): void {
+  ngDevMode && assertNotEqual(newView[0], newView[1] as any, '????');
   ngDevMode && assertLViewOrUndefined(newView);
   const newLFrame = allocLFrame();
   if (ngDevMode) {
     assertEqual(newLFrame.isParent, true, 'Expected clean LFrame');
     assertEqual(newLFrame.lView, null, 'Expected clean LFrame');
     assertEqual(newLFrame.tView, null, 'Expected clean LFrame');
-    assertEqual(newLFrame.selectedIndex, 0, 'Expected clean LFrame');
+    assertEqual(newLFrame.selectedIndex, -1, 'Expected clean LFrame');
     assertEqual(newLFrame.elementDepthCount, 0, 'Expected clean LFrame');
     assertEqual(newLFrame.currentDirectiveIndex, -1, 'Expected clean LFrame');
     assertEqual(newLFrame.currentNamespace, null, 'Expected clean LFrame');
@@ -420,11 +474,13 @@ export function enterView(newView: LView, tNode: TNode|null): void {
   }
   const tView = newView[TVIEW];
   instructionState.lFrame = newLFrame;
-  newLFrame.previousOrParentTNode = tNode!;
+  ngDevMode && tView.firstChild && assertTNodeForTView(tView.firstChild, tView);
+  newLFrame.currentTNode = tView.firstChild!;
   newLFrame.lView = newView;
   newLFrame.tView = tView;
   newLFrame.contextLView = newView!;
   newLFrame.bindingIndex = tView.bindingStartIndex;
+  newLFrame.inI18n = false;
 }
 
 /**
@@ -439,20 +495,21 @@ function allocLFrame() {
 
 function createLFrame(parent: LFrame|null): LFrame {
   const lFrame: LFrame = {
-    previousOrParentTNode: null!,  //
-    isParent: true,                //
-    lView: null!,                  //
-    tView: null!,                  //
-    selectedIndex: 0,              //
-    contextLView: null!,           //
-    elementDepthCount: 0,          //
-    currentNamespace: null,        //
-    currentDirectiveIndex: -1,     //
-    bindingRootIndex: -1,          //
-    bindingIndex: -1,              //
-    currentQueryIndex: 0,          //
-    parent: parent!,               //
-    child: null,                   //
+    currentTNode: null,
+    isParent: true,
+    lView: null!,
+    tView: null!,
+    selectedIndex: -1,
+    contextLView: null!,
+    elementDepthCount: 0,
+    currentNamespace: null,
+    currentDirectiveIndex: -1,
+    bindingRootIndex: -1,
+    bindingIndex: -1,
+    currentQueryIndex: 0,
+    parent: parent!,
+    child: null,
+    inI18n: false,
   };
   parent !== null && (parent.child = lFrame);  // link the new LFrame for reuse.
   return lFrame;
@@ -461,7 +518,7 @@ function createLFrame(parent: LFrame|null): LFrame {
 /**
  * A lightweight version of leave which is used with DI.
  *
- * This function only resets `previousOrParentTNode` and `LView` as those are the only properties
+ * This function only resets `currentTNode` and `LView` as those are the only properties
  * used with DI (`enterDI()`).
  *
  * NOTE: This function is reexported as `leaveDI`. However `leaveDI` has return type of `void` where
@@ -470,7 +527,7 @@ function createLFrame(parent: LFrame|null): LFrame {
 function leaveViewLight(): LFrame {
   const oldLFrame = instructionState.lFrame;
   instructionState.lFrame = oldLFrame.parent;
-  oldLFrame.previousOrParentTNode = null!;
+  oldLFrame.currentTNode = null!;
   oldLFrame.lView = null!;
   return oldLFrame;
 }
@@ -495,7 +552,7 @@ export function leaveView() {
   const oldLFrame = leaveViewLight();
   oldLFrame.isParent = true;
   oldLFrame.tView = null!;
-  oldLFrame.selectedIndex = 0;
+  oldLFrame.selectedIndex = -1;
   oldLFrame.contextLView = null!;
   oldLFrame.elementDepthCount = 0;
   oldLFrame.currentDirectiveIndex = -1;
@@ -543,6 +600,11 @@ export function getSelectedIndex() {
  * run if and when the provided `index` value is different from the current selected index value.)
  */
 export function setSelectedIndex(index: number) {
+  ngDevMode && index !== -1 &&
+      assertGreaterThanOrEqual(index, HEADER_OFFSET, 'Index must be past HEADER_OFFSET (or -1).');
+  ngDevMode &&
+      assertLessThan(
+          index, instructionState.lFrame.lView.length, 'Can\'t set index passed end of LView');
   instructionState.lFrame.selectedIndex = index;
 }
 
diff --git a/packages/core/src/render3/styling/style_binding_list.ts b/packages/core/src/render3/styling/style_binding_list.ts
index 4fde39fcd4a6d..d00e50a760913 100644
--- a/packages/core/src/render3/styling/style_binding_list.ts
+++ b/packages/core/src/render3/styling/style_binding_list.ts
@@ -7,7 +7,7 @@
  */
 
 import {KeyValueArray, keyValueArrayIndexOf} from '../../util/array_utils';
-import {assertDataInRange, assertEqual, assertNotEqual} from '../../util/assert';
+import {assertEqual, assertIndexInRange, assertNotEqual} from '../../util/assert';
 import {assertFirstUpdatePass} from '../assert';
 import {TNode} from '../interfaces/node';
 import {getTStylingRangeNext, getTStylingRangePrev, setTStylingRangeNext, setTStylingRangeNextDuplicate, setTStylingRangePrev, setTStylingRangePrevDuplicate, toTStylingRange, TStylingKey, TStylingKeyPrimitive, TStylingRange} from '../interfaces/styling';
@@ -370,7 +370,7 @@ function markDuplicates(
   // - we are a map in which case we have to continue searching even after we find what we were
   //   looking for since we are a wild card and everything needs to be flipped to duplicate.
   while (cursor !== 0 && (foundDuplicate === false || isMap)) {
-    ngDevMode && assertDataInRange(tData, cursor);
+    ngDevMode && assertIndexInRange(tData, cursor);
     const tStylingValueAtCursor = tData[cursor] as TStylingKey;
     const tStyleRangeAtCursor = tData[cursor + 1] as TStylingRange;
     if (isStylingMatch(tStylingValueAtCursor, tStylingKey)) {
@@ -391,7 +391,7 @@ function markDuplicates(
 /**
  * Determines if two `TStylingKey`s are a match.
  *
- * When computing weather a binding contains a duplicate, we need to compare if the instruction
+ * When computing whether a binding contains a duplicate, we need to compare if the instruction
  * `TStylingKey` has a match.
  *
  * Here are examples of `TStylingKey`s which match given `tStylingKeyCursor` is:
diff --git a/packages/core/src/render3/styling/styling_parser.ts b/packages/core/src/render3/styling/styling_parser.ts
index de80259bc1c46..84074767435b4 100644
--- a/packages/core/src/render3/styling/styling_parser.ts
+++ b/packages/core/src/render3/styling/styling_parser.ts
@@ -210,7 +210,8 @@ export function consumeStyleKey(text: string, startIndex: number, endIndex: numb
   let ch: number;
   while (startIndex < endIndex &&
          ((ch = text.charCodeAt(startIndex)) === CharCode.DASH || ch === CharCode.UNDERSCORE ||
-          ((ch & CharCode.UPPER_CASE) >= CharCode.A && (ch & CharCode.UPPER_CASE) <= CharCode.Z))) {
+          ((ch & CharCode.UPPER_CASE) >= CharCode.A && (ch & CharCode.UPPER_CASE) <= CharCode.Z) ||
+          (ch >= CharCode.ZERO && ch <= CharCode.NINE))) {
     startIndex++;
   }
   return startIndex;
diff --git a/packages/core/src/render3/util/change_detection_utils.ts b/packages/core/src/render3/util/change_detection_utils.ts
index d1ef5baf762f5..3a94e058177c8 100644
--- a/packages/core/src/render3/util/change_detection_utils.ts
+++ b/packages/core/src/render3/util/change_detection_utils.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {detectChanges, markDirty} from '../instructions/all';
+import {detectChanges, markDirty} from '../instructions/change_detection';
 import {getRootComponents} from './discovery_utils';
 
 /**
diff --git a/packages/core/src/render3/util/debug_utils.ts b/packages/core/src/render3/util/debug_utils.ts
index 518b0738f6d9e..018b10916758c 100644
--- a/packages/core/src/render3/util/debug_utils.ts
+++ b/packages/core/src/render3/util/debug_utils.ts
@@ -31,7 +31,7 @@ export function attachDebugObject(obj: any, debug: any): void {
  * @param obj Object to patch
  * @param debugGetter Getter returning a value to patch
  */
-export function attachDebugGetter(obj: any, debugGetter: () => any): void {
+export function attachDebugGetter<T>(obj: T, debugGetter: (this: T) => any): void {
   if (ngDevMode) {
     Object.defineProperty(obj, 'debug', {get: debugGetter, enumerable: false});
   } else {
diff --git a/packages/core/src/render3/util/discovery_utils.ts b/packages/core/src/render3/util/discovery_utils.ts
index 94de7d03d5824..e081eb3a75067 100644
--- a/packages/core/src/render3/util/discovery_utils.ts
+++ b/packages/core/src/render3/util/discovery_utils.ts
@@ -7,6 +7,7 @@
  */
 
 import {Injector} from '../../di/injector';
+import {assertEqual} from '../../util/assert';
 import {assertLView} from '../assert';
 import {discoverLocalRefs, getComponentAtNodeIndex, getDirectivesAtNodeIndex, getLContext} from '../context_discovery';
 import {NodeInjector} from '../di';
@@ -15,7 +16,7 @@ import {LContext} from '../interfaces/context';
 import {DirectiveDef} from '../interfaces/definition';
 import {TElementNode, TNode, TNodeProviderIndexes} from '../interfaces/node';
 import {isLView} from '../interfaces/type_checks';
-import {CLEANUP, CONTEXT, DebugNode, FLAGS, HEADER_OFFSET, HOST, LView, LViewFlags, T_HOST, TVIEW} from '../interfaces/view';
+import {CLEANUP, CONTEXT, DebugNode, FLAGS, LView, LViewFlags, T_HOST, TVIEW, TViewType} from '../interfaces/view';
 
 import {stringifyForError} from './misc_utils';
 import {getLViewParent, getRootContext} from './view_traversal_utils';
@@ -101,8 +102,7 @@ export function getOwningComponent<T>(elementOrDir: Element|{}): T|null {
   let lView = context.lView;
   let parent: LView|null;
   ngDevMode && assertLView(lView);
-  while (lView[HOST] === null && (parent = getLViewParent(lView)!)) {
-    // As long as lView[HOST] is null we know we are part of sub-template such as `*ngIf`
+  while (lView[TVIEW].type === TViewType.Embedded && (parent = getLViewParent(lView)!)) {
     lView = parent;
   }
   return lView[FLAGS] & LViewFlags.IsRoot ? null : lView[CONTEXT] as T;
@@ -387,9 +387,11 @@ export function getDebugNode(element: Element): DebugNode|null {
     const valueInLView = lView[nodeIndex];
     // this means that value in the lView is a component with its own
     // data. In this situation the TNode is not accessed at the same spot.
-    const tNode = isLView(valueInLView) ? (valueInLView[T_HOST] as TNode) :
-                                          getTNode(lView[TVIEW], nodeIndex - HEADER_OFFSET);
-    debugNode = buildDebugNode(tNode, lView, nodeIndex);
+    const tNode =
+        isLView(valueInLView) ? (valueInLView[T_HOST] as TNode) : getTNode(lView[TVIEW], nodeIndex);
+    ngDevMode &&
+        assertEqual(tNode.index, nodeIndex, 'Expecting that TNode at index is same as index');
+    debugNode = buildDebugNode(tNode, lView);
   }
 
   return debugNode;
diff --git a/packages/core/src/render3/util/injector_utils.ts b/packages/core/src/render3/util/injector_utils.ts
index a9e3a94fb2411..c8b6835b14916 100644
--- a/packages/core/src/render3/util/injector_utils.ts
+++ b/packages/core/src/render3/util/injector_utils.ts
@@ -5,14 +5,26 @@
  * 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 {assertGreaterThan, assertNotEqual, assertNumber} from '../../util/assert';
 import {NO_PARENT_INJECTOR, RelativeInjectorLocation, RelativeInjectorLocationFlags} from '../interfaces/injector';
-import {DECLARATION_VIEW, LView} from '../interfaces/view';
+import {DECLARATION_VIEW, HEADER_OFFSET, LView} from '../interfaces/view';
+
+
 /// Parent Injector Utils ///////////////////////////////////////////////////////////////
 export function hasParentInjector(parentLocation: RelativeInjectorLocation): boolean {
   return parentLocation !== NO_PARENT_INJECTOR;
 }
 
 export function getParentInjectorIndex(parentLocation: RelativeInjectorLocation): number {
+  ngDevMode && assertNumber(parentLocation, 'Number expected');
+  ngDevMode && assertNotEqual(parentLocation as any, -1, 'Not a valid state.');
+  const parentInjectorIndex =
+      (parentLocation as any as number) & RelativeInjectorLocationFlags.InjectorIndexMask;
+  ngDevMode &&
+      assertGreaterThan(
+          parentInjectorIndex, HEADER_OFFSET,
+          'Parent injector must be pointing past HEADER_OFFSET.');
   return (parentLocation as any as number) & RelativeInjectorLocationFlags.InjectorIndexMask;
 }
 
diff --git a/packages/core/src/render3/util/view_utils.ts b/packages/core/src/render3/util/view_utils.ts
index 21bee1c5d69a3..75c9d23611d6c 100644
--- a/packages/core/src/render3/util/view_utils.ts
+++ b/packages/core/src/render3/util/view_utils.ts
@@ -6,8 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {assertDataInRange, assertDefined, assertDomNode, assertGreaterThan, assertLessThan} from '../../util/assert';
-import {assertTNodeForLView} from '../assert';
+import {assertDefined, assertDomNode, assertGreaterThan, assertGreaterThanOrEqual, assertIndexInRange, assertLessThan} from '../../util/assert';
+import {assertTNode, assertTNodeForLView} from '../assert';
 import {LContainer, TYPE} from '../interfaces/container';
 import {LContext, MONKEY_PATCH_KEY_NAME} from '../interfaces/context';
 import {TConstants, TNode} from '../interfaces/node';
@@ -78,7 +78,9 @@ export function unwrapLContainer(value: RNode|LView|LContainer): LContainer|null
  * from any containers, component views, or style contexts.
  */
 export function getNativeByIndex(index: number, lView: LView): RNode {
-  return unwrapRNode(lView[index + HEADER_OFFSET]);
+  ngDevMode && assertIndexInRange(lView, index);
+  ngDevMode && assertGreaterThanOrEqual(index, HEADER_OFFSET, 'Expected to be past HEADER_OFFSET');
+  return unwrapRNode(lView[index]);
 }
 
 /**
@@ -91,7 +93,7 @@ export function getNativeByIndex(index: number, lView: LView): RNode {
  */
 export function getNativeByTNode(tNode: TNode, lView: LView): RNode {
   ngDevMode && assertTNodeForLView(tNode, lView);
-  ngDevMode && assertDataInRange(lView, tNode.index);
+  ngDevMode && assertIndexInRange(lView, tNode.index);
   const node: RNode = unwrapRNode(lView[tNode.index]);
   ngDevMode && !isProceduralRenderer(lView[RENDERER]) && assertDomNode(node);
   return node;
@@ -105,10 +107,10 @@ export function getNativeByTNode(tNode: TNode, lView: LView): RNode {
  * @param tNode
  * @param lView
  */
-export function getNativeByTNodeOrNull(tNode: TNode, lView: LView): RNode|null {
-  const index = tNode.index;
+export function getNativeByTNodeOrNull(tNode: TNode|null, lView: LView): RNode|null {
+  const index = tNode === null ? -1 : tNode.index;
   if (index !== -1) {
-    ngDevMode && assertTNodeForLView(tNode, lView);
+    ngDevMode && assertTNodeForLView(tNode!, lView);
     const node: RNode|null = unwrapRNode(lView[index]);
     ngDevMode && node !== null && !isProceduralRenderer(lView[RENDERER]) && assertDomNode(node);
     return node;
@@ -117,21 +119,24 @@ export function getNativeByTNodeOrNull(tNode: TNode, lView: LView): RNode|null {
 }
 
 
+// fixme(misko): The return Type should be `TNode|null`
 export function getTNode(tView: TView, index: number): TNode {
   ngDevMode && assertGreaterThan(index, -1, 'wrong index for TNode');
   ngDevMode && assertLessThan(index, tView.data.length, 'wrong index for TNode');
-  return tView.data[index + HEADER_OFFSET] as TNode;
+  const tNode = tView.data[index] as TNode;
+  ngDevMode && tNode !== null && assertTNode(tNode);
+  return tNode;
 }
 
 /** Retrieves a value from any `LView` or `TData`. */
 export function load<T>(view: LView|TData, index: number): T {
-  ngDevMode && assertDataInRange(view, index + HEADER_OFFSET);
-  return view[index + HEADER_OFFSET];
+  ngDevMode && assertIndexInRange(view, index);
+  return view[index];
 }
 
 export function getComponentLViewByIndex(nodeIndex: number, hostView: LView): LView {
   // Could be an LView or an LContainer. If LContainer, unwrap to find LView.
-  ngDevMode && assertDataInRange(hostView, nodeIndex);
+  ngDevMode && assertIndexInRange(hostView, nodeIndex);
   const slotValue = hostView[nodeIndex];
   const lView = isLView(slotValue) ? slotValue : slotValue[HOST];
   return lView;
@@ -176,8 +181,13 @@ export function viewAttachedToContainer(view: LView): boolean {
 }
 
 /** Returns a constant from `TConstants` instance. */
+export function getConstant<T>(consts: TConstants|null, index: null|undefined): null;
+export function getConstant<T>(consts: TConstants, index: number): T|null;
+export function getConstant<T>(consts: TConstants|null, index: number|null|undefined): T|null;
 export function getConstant<T>(consts: TConstants|null, index: number|null|undefined): T|null {
-  return consts === null || index == null ? null : consts[index] as unknown as T;
+  if (index === null || index === undefined) return null;
+  ngDevMode && assertIndexInRange(consts!, index);
+  return consts![index] as unknown as T;
 }
 
 /**
diff --git a/packages/core/src/render3/view_engine_compatibility.ts b/packages/core/src/render3/view_engine_compatibility.ts
index 42e69cea5a40e..ad01f9b6169e0 100644
--- a/packages/core/src/render3/view_engine_compatibility.ts
+++ b/packages/core/src/render3/view_engine_compatibility.ts
@@ -18,19 +18,19 @@ import {Renderer2} from '../render/api';
 import {addToArray, removeFromArray} from '../util/array_utils';
 import {assertDefined, assertEqual, assertGreaterThan, assertLessThan} from '../util/assert';
 
-import {assertLContainer} from './assert';
+import {assertLContainer, assertNodeInjector} from './assert';
 import {getParentInjectorLocation, NodeInjector} from './di';
-import {addToViewTree, createLContainer, createLView, renderView} from './instructions/shared';
-import {CONTAINER_HEADER_OFFSET, LContainer, VIEW_REFS} from './interfaces/container';
-import {TContainerNode, TDirectiveHostNode, TElementContainerNode, TElementNode, TNode, TNodeType, TViewNode} from './interfaces/node';
+import {addToViewTree, createLContainer, createLView, createTNode, renderView} from './instructions/shared';
+import {CONTAINER_HEADER_OFFSET, LContainer, NATIVE, VIEW_REFS} from './interfaces/container';
+import {NodeInjectorOffset} from './interfaces/injector';
+import {TContainerNode, TDirectiveHostNode, TElementContainerNode, TElementNode, TNode, TNodeType} from './interfaces/node';
 import {isProceduralRenderer, RComment, RElement} from './interfaces/renderer';
 import {isComponentHost, isLContainer, isLView, isRootView} from './interfaces/type_checks';
 import {DECLARATION_COMPONENT_VIEW, DECLARATION_LCONTAINER, LView, LViewFlags, PARENT, QUERIES, RENDERER, T_HOST, TVIEW, TView} from './interfaces/view';
-import {assertNodeOfPossibleTypes} from './node_assert';
-import {addRemoveViewFromContainer, appendChild, detachView, getBeforeNodeForView, insertView, nativeInsertBefore, nativeNextSibling, nativeParentNode, removeView} from './node_manipulation';
-import {getParentInjectorTNode} from './node_util';
-import {getLView, getPreviousOrParentTNode} from './state';
-import {getParentInjectorView, hasParentInjector} from './util/injector_utils';
+import {assertTNodeType} from './node_assert';
+import {addViewToContainer, appendChild, destroyLView, detachView, getBeforeNodeForView, insertView, nativeInsertBefore, nativeNextSibling, nativeParentNode} from './node_manipulation';
+import {getCurrentTNode, getLView} from './state';
+import {getParentInjectorIndex, getParentInjectorView, hasParentInjector} from './util/injector_utils';
 import {getComponentLViewByIndex, getNativeByTNode, unwrapRNode, viewAttachedToContainer} from './util/view_utils';
 import {ViewRef} from './view_ref';
 
@@ -43,7 +43,7 @@ import {ViewRef} from './view_ref';
  */
 export function injectElementRef(ElementRefToken: typeof ViewEngine_ElementRef):
     ViewEngine_ElementRef {
-  return createElementRef(ElementRefToken, getPreviousOrParentTNode(), getLView());
+  return createElementRef(ElementRefToken, getCurrentTNode()!, getLView());
 }
 
 let R3ElementRef: {new (native: RElement|RComment): ViewEngine_ElementRef};
@@ -78,8 +78,7 @@ let R3TemplateRef: {
 export function injectTemplateRef<T>(
     TemplateRefToken: typeof ViewEngine_TemplateRef,
     ElementRefToken: typeof ViewEngine_ElementRef): ViewEngine_TemplateRef<T>|null {
-  return createTemplateRef<T>(
-      TemplateRefToken, ElementRefToken, getPreviousOrParentTNode(), getLView());
+  return createTemplateRef<T>(TemplateRefToken, ElementRefToken, getCurrentTNode()!, getLView());
 }
 
 /**
@@ -106,7 +105,7 @@ export function createTemplateRef<T>(
         const embeddedTView = this._declarationTContainer.tViews as TView;
         const embeddedLView = createLView(
             this._declarationView, embeddedTView, context, LViewFlags.CheckAlways, null,
-            embeddedTView.node);
+            embeddedTView.declTNode, null, null, null, null);
 
         const declarationLContainer = this._declarationView[this._declarationTContainer.index];
         ngDevMode && assertLContainer(declarationLContainer);
@@ -124,7 +123,7 @@ export function createTemplateRef<T>(
     };
   }
 
-  if (hostTNode.type === TNodeType.Container) {
+  if (hostTNode.type & TNodeType.Container) {
     ngDevMode && assertDefined(hostTNode.tViews, 'TView must be allocated');
     return new R3TemplateRef(
         hostView, hostTNode as TContainerNode,
@@ -149,8 +148,7 @@ let R3ViewContainerRef: {
 export function injectViewContainerRef(
     ViewContainerRefToken: typeof ViewEngine_ViewContainerRef,
     ElementRefToken: typeof ViewEngine_ElementRef): ViewEngine_ViewContainerRef {
-  const previousTNode =
-      getPreviousOrParentTNode() as TElementNode | TElementContainerNode | TContainerNode;
+  const previousTNode = getCurrentTNode() as TElementNode | TElementContainerNode | TContainerNode;
   return createContainerRef(ViewContainerRefToken, ElementRefToken, previousTNode, getLView());
 }
 
@@ -188,12 +186,16 @@ export function createContainerRef(
       /** @deprecated No replacement */
       get parentInjector(): Injector {
         const parentLocation = getParentInjectorLocation(this._hostTNode, this._hostView);
-        const parentView = getParentInjectorView(parentLocation, this._hostView);
-        const parentTNode = getParentInjectorTNode(parentLocation, this._hostView, this._hostTNode);
-
-        return !hasParentInjector(parentLocation) || parentTNode == null ?
-            new NodeInjector(null, this._hostView) :
-            new NodeInjector(parentTNode, parentView);
+        if (hasParentInjector(parentLocation)) {
+          const parentView = getParentInjectorView(parentLocation, this._hostView);
+          const injectorIndex = getParentInjectorIndex(parentLocation);
+          ngDevMode && assertNodeInjector(parentView, injectorIndex);
+          const parentTNode =
+              parentView[TVIEW].data[injectorIndex + NodeInjectorOffset.TNODE] as TElementNode;
+          return new NodeInjector(parentTNode, parentView);
+        } else {
+          return new NodeInjector(null, this._hostView);
+        }
       }
 
       clear(): void {
@@ -277,14 +279,21 @@ export function createContainerRef(
           }
         }
 
+        // Logical operation of adding `LView` to `LContainer`
         const adjustedIdx = this._adjustIndex(index);
-        insertView(tView, lView, this._lContainer, adjustedIdx);
-
-        const beforeNode = getBeforeNodeForView(adjustedIdx, this._lContainer);
-        addRemoveViewFromContainer(tView, lView, true, beforeNode);
+        const lContainer = this._lContainer;
+        insertView(tView, lView, lContainer, adjustedIdx);
+
+        // Physical operation of adding the DOM nodes.
+        const beforeNode = getBeforeNodeForView(adjustedIdx, lContainer);
+        const renderer = lView[RENDERER];
+        const parentRNode = nativeParentNode(renderer, lContainer[NATIVE] as RElement | RComment);
+        if (parentRNode !== null) {
+          addViewToContainer(tView, lContainer[T_HOST], renderer, lView, parentRNode, beforeNode);
+        }
 
         (viewRef as ViewRef<any>).attachToViewContainerRef(this);
-        addToArray(this._lContainer[VIEW_REFS]!, adjustedIdx, viewRef);
+        addToArray(lContainer[VIEW_REFS]!, adjustedIdx, viewRef);
 
         return viewRef;
       }
@@ -304,8 +313,18 @@ export function createContainerRef(
       remove(index?: number): void {
         this.allocateContainerIfNeeded();
         const adjustedIdx = this._adjustIndex(index, -1);
-        removeView(this._lContainer, adjustedIdx);
-        removeFromArray(this._lContainer[VIEW_REFS]!, adjustedIdx);
+        const detachedView = detachView(this._lContainer, adjustedIdx);
+
+        if (detachedView) {
+          // Before destroying the view, remove it from the container's array of `ViewRef`s.
+          // This ensures the view container length is updated before calling
+          // `destroyLView`, which could recursively call view container methods that
+          // rely on an accurate container length.
+          // (e.g. a method on this view container being called by a child directive's OnDestroy
+          // lifecycle hook)
+          removeFromArray(this._lContainer[VIEW_REFS]!, adjustedIdx);
+          destroyLView(detachedView[TVIEW], detachedView);
+        }
       }
 
       detach(index?: number): viewEngine_ViewRef|null {
@@ -338,9 +357,7 @@ export function createContainerRef(
     };
   }
 
-  ngDevMode &&
-      assertNodeOfPossibleTypes(
-          hostTNode, [TNodeType.Container, TNodeType.Element, TNodeType.ElementContainer]);
+  ngDevMode && assertTNodeType(hostTNode, TNodeType.AnyContainer | TNodeType.AnyRNode);
 
   let lContainer: LContainer;
   const slotValue = hostView[hostTNode.index];
@@ -353,7 +370,7 @@ export function createContainerRef(
     // comment and we can reuse that comment as anchor element for the new LContainer.
     // The comment node in question is already part of the DOM structure so we don't need to append
     // it again.
-    if (hostTNode.type === TNodeType.ElementContainer) {
+    if (hostTNode.type & TNodeType.ElementContainer) {
       commentNode = unwrapRNode(slotValue) as RComment;
     } else {
       ngDevMode && ngDevMode.rendererCreateComment++;
@@ -369,9 +386,14 @@ export function createContainerRef(
         const hostNative = getNativeByTNode(hostTNode, hostView)!;
         const parentOfHostNative = nativeParentNode(renderer, hostNative);
         nativeInsertBefore(
-            renderer, parentOfHostNative!, commentNode, nativeNextSibling(renderer, hostNative));
+            renderer, parentOfHostNative!, commentNode, nativeNextSibling(renderer, hostNative),
+            false);
       } else {
-        appendChild(hostView[TVIEW], hostView, commentNode, hostTNode);
+        // The TNode created here is bogus, in that it is not added to the TView. It is only created
+        // to allow us to create a dynamic Comment node.
+        const commentTNode =
+            createTNode(hostView[TVIEW], hostTNode.parent, TNodeType.Container, 0, null, null);
+        appendChild(hostView[TVIEW], hostView, commentNode, commentTNode);
       }
     }
 
@@ -387,7 +409,7 @@ export function createContainerRef(
 
 /** Returns a ChangeDetectorRef (a.k.a. a ViewRef) */
 export function injectChangeDetectorRef(isPipe = false): ViewEngine_ChangeDetectorRef {
-  return createViewRef(getPreviousOrParentTNode(), getLView(), isPipe);
+  return createViewRef(getCurrentTNode()!, getLView(), isPipe);
 }
 
 /**
@@ -407,9 +429,7 @@ function createViewRef(tNode: TNode, lView: LView, isPipe: boolean): ViewEngine_
     // Instead we want the LView for the component View and so we need to look it up.
     const componentView = getComponentLViewByIndex(tNode.index, lView);  // look down
     return new ViewRef(componentView, componentView);
-  } else if (
-      tNode.type === TNodeType.Element || tNode.type === TNodeType.Container ||
-      tNode.type === TNodeType.ElementContainer || tNode.type === TNodeType.IcuContainer) {
+  } else if (tNode.type & (TNodeType.AnyRNode | TNodeType.AnyContainer | TNodeType.Icu)) {
     // The LView represents the location where the injection is requested from.
     // We need to locate the containing LView (in case where the `lView` is an embedded view)
     const hostComponentView = lView[DECLARATION_COMPONENT_VIEW];  // look up
@@ -433,7 +453,7 @@ export function injectRenderer2(): Renderer2 {
   // We need the Renderer to be based on the component that it's being injected into, however since
   // DI happens before we've entered its view, `getLView` will return the parent view instead.
   const lView = getLView();
-  const tNode = getPreviousOrParentTNode();
+  const tNode = getCurrentTNode()!;
   const nodeAtIndex = getComponentLViewByIndex(tNode.index, lView);
   return getOrCreateRenderer2(isLView(nodeAtIndex) ? nodeAtIndex : lView);
 }
diff --git a/packages/core/src/render3/view_ref.ts b/packages/core/src/render3/view_ref.ts
index f4df71d91dc92..f7f4b916f9b59 100644
--- a/packages/core/src/render3/view_ref.ts
+++ b/packages/core/src/render3/view_ref.ts
@@ -11,12 +11,15 @@ 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 {assertDefined} from '../util/assert';
+import {icuContainerIterate} from './i18n/i18n_tree_shaking';
+
 import {checkNoChangesInRootView, checkNoChangesInternal, detectChangesInRootView, detectChangesInternal, markViewDirty, storeCleanupWithContext} from './instructions/shared';
 import {CONTAINER_HEADER_OFFSET} from './interfaces/container';
-import {TElementNode, TNode, TNodeType, TViewNode} from './interfaces/node';
+import {TElementNode, TIcuContainerNode, TNode, TNodeType} from './interfaces/node';
+import {RNode} from './interfaces/renderer';
 import {isLContainer} from './interfaces/type_checks';
-import {CONTEXT, DECLARATION_COMPONENT_VIEW, FLAGS, HOST, LView, LViewFlags, T_HOST, TVIEW, TView} from './interfaces/view';
-import {assertNodeOfPossibleTypes} from './node_assert';
+import {CONTEXT, DECLARATION_COMPONENT_VIEW, FLAGS, LView, LViewFlags, T_HOST, TVIEW, TView} from './interfaces/view';
+import {assertTNodeType} from './node_assert';
 import {destroyLView, renderDetachView} from './node_manipulation';
 import {getLViewParent} from './util/view_traversal_utils';
 import {unwrapRNode} from './util/view_utils';
@@ -35,11 +38,8 @@ export class ViewRef<T> implements viewEngine_EmbeddedViewRef<T>, viewEngine_Int
 
   get rootNodes(): any[] {
     const lView = this._lView;
-    if (lView[HOST] == null) {
-      const hostTView = lView[T_HOST] as TViewNode;
-      return collectNativeNodes(lView[TVIEW], lView, hostTView.child, []);
-    }
-    return [];
+    const tView = lView[TVIEW];
+    return collectNativeNodes(tView, lView, tView.firstChild, []);
   }
 
   constructor(
@@ -324,10 +324,10 @@ function collectNativeNodes(
     tView: TView, lView: LView, tNode: TNode|null, result: any[],
     isProjection: boolean = false): any[] {
   while (tNode !== null) {
-    ngDevMode && assertNodeOfPossibleTypes(tNode, [
-      TNodeType.Element, TNodeType.Container, TNodeType.Projection, TNodeType.ElementContainer,
-      TNodeType.IcuContainer
-    ]);
+    ngDevMode &&
+        assertTNodeType(
+            tNode,
+            TNodeType.AnyRNode | TNodeType.AnyContainer | TNodeType.Projection | TNodeType.Icu);
 
     const lNode = lView[tNode.index];
     if (lNode !== null) {
@@ -349,9 +349,15 @@ function collectNativeNodes(
     }
 
     const tNodeType = tNode.type;
-    if (tNodeType === TNodeType.ElementContainer || tNodeType === TNodeType.IcuContainer) {
+    if (tNodeType & TNodeType.ElementContainer) {
       collectNativeNodes(tView, lView, tNode.child, result);
-    } else if (tNodeType === TNodeType.Projection) {
+    } else if (tNodeType & TNodeType.Icu) {
+      const nextRNode = icuContainerIterate(tNode as TIcuContainerNode, lView);
+      let rNode: RNode|null;
+      while (rNode = nextRNode()) {
+        result.push(rNode);
+      }
+    } else if (tNodeType & TNodeType.Projection) {
       const componentView = lView[DECLARATION_COMPONENT_VIEW];
       const componentHost = componentView[T_HOST] as TElementNode;
       const slotIdx = tNode.projection as number;
diff --git a/packages/core/src/sanitization/html_sanitizer.ts b/packages/core/src/sanitization/html_sanitizer.ts
index ab7bbbe8369d7..b0b30311a041f 100644
--- a/packages/core/src/sanitization/html_sanitizer.ts
+++ b/packages/core/src/sanitization/html_sanitizer.ts
@@ -7,6 +7,8 @@
  */
 
 import {isDevMode} from '../util/is_dev_mode';
+import {TrustedHTML} from '../util/security/trusted_type_defs';
+import {trustedHTMLFromString} from '../util/security/trusted_types';
 import {getInertBodyHelper, InertBodyHelper} from './inert_body';
 import {_sanitizeUrl, sanitizeSrcset} from './url_sanitizer';
 
@@ -242,7 +244,7 @@ let inertBodyHelper: InertBodyHelper;
  * Sanitizes the given unsafe, untrusted HTML fragment, and returns HTML text that is safe to add to
  * the DOM in a browser environment.
  */
-export function _sanitizeHtml(defaultDoc: any, unsafeHtmlInput: string): string {
+export function _sanitizeHtml(defaultDoc: any, unsafeHtmlInput: string): TrustedHTML|string {
   let inertBodyElement: HTMLElement|null = null;
   try {
     inertBodyHelper = inertBodyHelper || getInertBodyHelper(defaultDoc);
@@ -274,7 +276,7 @@ export function _sanitizeHtml(defaultDoc: any, unsafeHtmlInput: string): string
           'WARNING: sanitizing HTML stripped some content, see http://g.co/ng/security#xss');
     }
 
-    return safeHtml;
+    return trustedHTMLFromString(safeHtml);
   } finally {
     // In case anything goes wrong, clear out inertElement to reset the entire DOM structure.
     if (inertBodyElement) {
diff --git a/packages/core/src/sanitization/inert_body.ts b/packages/core/src/sanitization/inert_body.ts
index 62c6598df8a70..c460c5dc65d38 100644
--- a/packages/core/src/sanitization/inert_body.ts
+++ b/packages/core/src/sanitization/inert_body.ts
@@ -6,6 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {trustedHTMLFromString} from '../util/security/trusted_types';
+
 /**
  * This helper is used to get hold of an inert tree of DOM elements containing dirty HTML
  * that needs sanitizing.
@@ -32,11 +34,13 @@ class DOMParserHelper implements InertBodyHelper {
   getInertBodyElement(html: string): HTMLElement|null {
     // We add these extra elements to ensure that the rest of the content is parsed as expected
     // e.g. leading whitespace is maintained and tags like `<meta>` do not get hoisted to the
-    // `<head>` tag.
-    html = '<body><remove></remove>' + html + '</body>';
+    // `<head>` tag. Note that the `<body>` tag is closed implicitly to prevent unclosed tags
+    // in `html` from consuming the otherwise explicit `</body>` tag.
+    html = '<body><remove></remove>' + html;
     try {
-      const body = new (window as any).DOMParser().parseFromString(html, 'text/html').body as
-          HTMLBodyElement;
+      const body = new window.DOMParser()
+                       .parseFromString(trustedHTMLFromString(html) as string, 'text/html')
+                       .body as HTMLBodyElement;
       body.removeChild(body.firstChild!);
       return body;
     } catch {
@@ -70,7 +74,7 @@ class InertDocumentHelper implements InertBodyHelper {
     // Prefer using <template> element if supported.
     const templateEl = this.inertDocument.createElement('template');
     if ('content' in templateEl) {
-      templateEl.innerHTML = html;
+      templateEl.innerHTML = trustedHTMLFromString(html) as string;
       return templateEl;
     }
 
@@ -82,9 +86,9 @@ class InertDocumentHelper implements InertBodyHelper {
     // down the line. This has been worked around by creating a new inert `body` and using it as
     // the root node in which we insert the HTML.
     const inertBody = this.inertDocument.createElement('body');
-    inertBody.innerHTML = html;
+    inertBody.innerHTML = trustedHTMLFromString(html) as string;
 
-    // Support: IE 9-11 only
+    // Support: IE 11 only
     // strip custom-namespaced attributes on IE<=11
     if ((this.defaultDoc as any).documentMode) {
       this.stripCustomNsAttrs(inertBody);
@@ -94,7 +98,7 @@ class InertDocumentHelper implements InertBodyHelper {
   }
 
   /**
-   * When IE9-11 comes across an unknown namespaced attribute e.g. 'xlink:foo' it adds 'xmlns:ns1'
+   * When IE11 comes across an unknown namespaced attribute e.g. 'xlink:foo' it adds 'xmlns:ns1'
    * attribute to declare ns1 namespace and prefixes the attribute with 'ns1' (e.g.
    * 'ns1:xlink:foo').
    *
@@ -128,7 +132,8 @@ class InertDocumentHelper implements InertBodyHelper {
  */
 export function isDOMParserAvailable() {
   try {
-    return !!new (window as any).DOMParser().parseFromString('', 'text/html');
+    return !!new window.DOMParser().parseFromString(
+        trustedHTMLFromString('') as string, 'text/html');
   } catch {
     return false;
   }
diff --git a/packages/core/src/sanitization/sanitization.ts b/packages/core/src/sanitization/sanitization.ts
index b32c1e1c3e4f7..54f4f272ad3b3 100644
--- a/packages/core/src/sanitization/sanitization.ts
+++ b/packages/core/src/sanitization/sanitization.ts
@@ -10,6 +10,9 @@ import {getDocument} from '../render3/interfaces/document';
 import {SANITIZER} from '../render3/interfaces/view';
 import {getLView} from '../render3/state';
 import {renderStringify} from '../render3/util/misc_utils';
+import {TrustedHTML, TrustedScript, TrustedScriptURL} from '../util/security/trusted_type_defs';
+import {trustedHTMLFromString, trustedScriptFromString, trustedScriptURLFromString} from '../util/security/trusted_types';
+import {trustedHTMLFromStringBypass, trustedScriptFromStringBypass, trustedScriptURLFromStringBypass} from '../util/security/trusted_types_bypass';
 
 import {allowSanitizationBypassAndThrow, BypassType, unwrapSafeValue} from './bypass';
 import {_sanitizeHtml as _sanitizeHtml} from './html_sanitizer';
@@ -34,13 +37,13 @@ import {_sanitizeUrl as _sanitizeUrl} from './url_sanitizer';
  *
  * @codeGenApi
  */
-export function ɵɵsanitizeHtml(unsafeHtml: any): string {
+export function ɵɵsanitizeHtml(unsafeHtml: any): TrustedHTML|string {
   const sanitizer = getSanitizer();
   if (sanitizer) {
-    return sanitizer.sanitize(SecurityContext.HTML, unsafeHtml) || '';
+    return trustedHTMLFromStringBypass(sanitizer.sanitize(SecurityContext.HTML, unsafeHtml) || '');
   }
   if (allowSanitizationBypassAndThrow(unsafeHtml, BypassType.Html)) {
-    return unwrapSafeValue(unsafeHtml);
+    return trustedHTMLFromStringBypass(unwrapSafeValue(unsafeHtml));
   }
   return _sanitizeHtml(getDocument(), renderStringify(unsafeHtml));
 }
@@ -105,13 +108,14 @@ export function ɵɵsanitizeUrl(unsafeUrl: any): string {
  *
  * @codeGenApi
  */
-export function ɵɵsanitizeResourceUrl(unsafeResourceUrl: any): string {
+export function ɵɵsanitizeResourceUrl(unsafeResourceUrl: any): TrustedScriptURL|string {
   const sanitizer = getSanitizer();
   if (sanitizer) {
-    return sanitizer.sanitize(SecurityContext.RESOURCE_URL, unsafeResourceUrl) || '';
+    return trustedScriptURLFromStringBypass(
+        sanitizer.sanitize(SecurityContext.RESOURCE_URL, unsafeResourceUrl) || '');
   }
   if (allowSanitizationBypassAndThrow(unsafeResourceUrl, BypassType.ResourceUrl)) {
-    return unwrapSafeValue(unsafeResourceUrl);
+    return trustedScriptURLFromStringBypass(unwrapSafeValue(unsafeResourceUrl));
   }
   throw new Error('unsafe value used in a resource URL context (see http://g.co/ng/security#xss)');
 }
@@ -128,17 +132,63 @@ export function ɵɵsanitizeResourceUrl(unsafeResourceUrl: any): string {
  *
  * @codeGenApi
  */
-export function ɵɵsanitizeScript(unsafeScript: any): string {
+export function ɵɵsanitizeScript(unsafeScript: any): TrustedScript|string {
   const sanitizer = getSanitizer();
   if (sanitizer) {
-    return sanitizer.sanitize(SecurityContext.SCRIPT, unsafeScript) || '';
+    return trustedScriptFromStringBypass(
+        sanitizer.sanitize(SecurityContext.SCRIPT, unsafeScript) || '');
   }
   if (allowSanitizationBypassAndThrow(unsafeScript, BypassType.Script)) {
-    return unwrapSafeValue(unsafeScript);
+    return trustedScriptFromStringBypass(unwrapSafeValue(unsafeScript));
   }
   throw new Error('unsafe value used in a script context');
 }
 
+/**
+ * Promotes the given constant string to a TrustedHTML.
+ * @param html constant string containing trusted HTML.
+ * @returns TrustedHTML wrapping `html`.
+ *
+ * @security This is a security-sensitive function and should only be used to
+ * convert constant values of attributes and properties found in
+ * application-provided Angular templates to TrustedHTML.
+ *
+ * @codeGenApi
+ */
+export function ɵɵtrustConstantHtml(html: string): TrustedHTML|string {
+  return trustedHTMLFromString(html);
+}
+
+/**
+ * Promotes the given constant string to a TrustedScript.
+ * @param script constant string containing a trusted script.
+ * @returns TrustedScript wrapping `script`.
+ *
+ * @security This is a security-sensitive function and should only be used to
+ * convert constant values of attributes and properties found in
+ * application-provided Angular templates to TrustedScript.
+ *
+ * @codeGenApi
+ */
+export function ɵɵtrustConstantScript(script: string): TrustedScript|string {
+  return trustedScriptFromString(script);
+}
+
+/**
+ * Promotes the given constant string to a TrustedScriptURL.
+ * @param url constant string containing a trusted script URL.
+ * @returns TrustedScriptURL wrapping `url`.
+ *
+ * @security This is a security-sensitive function and should only be used to
+ * convert constant values of attributes and properties found in
+ * application-provided Angular templates to TrustedScriptURL.
+ *
+ * @codeGenApi
+ */
+export function ɵɵtrustConstantResourceUrl(url: string): TrustedScriptURL|string {
+  return trustedScriptURLFromString(url);
+}
+
 /**
  * Detects which sanitizer to use for URL property, based on tag name and prop name.
  *
diff --git a/packages/core/src/util/assert.ts b/packages/core/src/util/assert.ts
index 1678b3bc53e79..5fdd5bf0b55e4 100644
--- a/packages/core/src/util/assert.ts
+++ b/packages/core/src/util/assert.ts
@@ -102,15 +102,25 @@ export function throwError(msg: string, actual?: any, expected?: any, comparison
 
 export function assertDomNode(node: any): asserts node is Node {
   // If we're in a worker, `Node` will not be defined.
-  assertEqual(
-      (typeof Node !== 'undefined' && node instanceof Node) ||
-          (typeof node === 'object' && node != null &&
-           node.constructor.name === 'WebWorkerRenderNode'),
-      true, `The provided value must be an instance of a DOM Node but got ${stringify(node)}`);
+  if (!(typeof Node !== 'undefined' && node instanceof Node) &&
+      !(typeof node === 'object' && node != null &&
+        node.constructor.name === 'WebWorkerRenderNode')) {
+    throwError(`The provided value must be an instance of a DOM Node but got ${stringify(node)}`);
+  }
 }
 
 
-export function assertDataInRange(arr: any[], index: number) {
-  const maxLen = arr ? arr.length : 0;
-  assertLessThan(index, maxLen, `Index expected to be less than ${maxLen} but got ${index}`);
+export function assertIndexInRange(arr: any[], index: number) {
+  assertDefined(arr, 'Array must be defined.');
+  const maxLen = arr.length;
+  if (index < 0 || index >= maxLen) {
+    throwError(`Index expected to be less than ${maxLen} but got ${index}`);
+  }
 }
+
+
+export function assertOneOf(value: any, ...validValues: any[]) {
+  if (validValues.indexOf(value) !== -1) return true;
+  throwError(`Expected value to be one of ${JSON.stringify(validValues)} but was ${
+      JSON.stringify(value)}.`);
+}
\ No newline at end of file
diff --git a/packages/core/src/util/char_code.ts b/packages/core/src/util/char_code.ts
index 7815358d741c3..0a6fe41461d0b 100644
--- a/packages/core/src/util/char_code.ts
+++ b/packages/core/src/util/char_code.ts
@@ -12,16 +12,32 @@
 export const enum CharCode {
   UPPER_CASE = ~32,   // & with this will make the char uppercase
   SPACE = 32,         // " "
+  EXCLAMATION = 33,   // "!"
   DOUBLE_QUOTE = 34,  // "\""
+  HASH = 35,          // "#"
   SINGLE_QUOTE = 39,  // "'"
   OPEN_PAREN = 40,    // "("
   CLOSE_PAREN = 41,   // ")"
+  STAR = 42,          // "*"
+  SLASH = 47,         // "/"
+  _0 = 48,            // "0"
+  _1 = 49,            // "1"
+  _2 = 50,            // "2"
+  _3 = 51,            // "3"
+  _4 = 52,            // "4"
+  _5 = 53,            // "5"
+  _6 = 54,            // "6"
+  _7 = 55,            // "7"
+  _8 = 56,            // "8"
+  _9 = 57,            // "9"
   COLON = 58,         // ":"
   DASH = 45,          // "-"
   UNDERSCORE = 95,    // "_"
   SEMI_COLON = 59,    // ";"
   BACK_SLASH = 92,    // "\\"
   AT_SIGN = 64,       // "@"
+  ZERO = 48,          // "0"
+  NINE = 57,          // "9"
   A = 65,             // "A"
   U = 85,             // "U"
   R = 82,             // "R"
diff --git a/packages/core/src/util/named_array_type.ts b/packages/core/src/util/named_array_type.ts
index b4a90c7d15983..d5f2d76421c23 100644
--- a/packages/core/src/util/named_array_type.ts
+++ b/packages/core/src/util/named_array_type.ts
@@ -8,6 +8,7 @@
  */
 
 import './ng_dev_mode';
+import {newTrustedFunctionForDev} from './security/trusted_types';
 
 /**
  * THIS FILE CONTAINS CODE WHICH SHOULD BE TREE SHAKEN AND NEVER CALLED FROM PRODUCTION CODE!!!
@@ -27,9 +28,10 @@ export function createNamedArrayType(name: string): typeof Array {
   // This should never be called in prod mode, so let's verify that is the case.
   if (ngDevMode) {
     try {
-      // We need to do it this way so that TypeScript does not down-level the below code.
-      const FunctionConstructor: any = createNamedArrayType.constructor;
-      return (new FunctionConstructor('Array', `return class ${name} extends Array{}`))(Array);
+      // If this function were compromised the following could lead to arbitrary
+      // script execution. We bless it with Trusted Types anyway since this
+      // function is stripped out of production binaries.
+      return (newTrustedFunctionForDev('Array', `return class ${name} extends Array{}`))(Array);
     } catch (e) {
       // If it does not work just give up and fall back to regular Array.
       return Array;
diff --git a/packages/core/src/util/ng_dev_mode.ts b/packages/core/src/util/ng_dev_mode.ts
index 7fb0579cb723e..a79f0af0f37c8 100644
--- a/packages/core/src/util/ng_dev_mode.ts
+++ b/packages/core/src/util/ng_dev_mode.ts
@@ -115,7 +115,7 @@ export function initNgDevMode(): boolean {
     if (typeof ngDevMode !== 'object') {
       ngDevModeResetPerfCounters();
     }
-    return !!ngDevMode;
+    return typeof ngDevMode !== 'undefined' && !!ngDevMode;
   }
   return false;
 }
diff --git a/packages/core/src/util/security/trusted_type_defs.ts b/packages/core/src/util/security/trusted_type_defs.ts
new file mode 100644
index 0000000000000..4d99d7784c370
--- /dev/null
+++ b/packages/core/src/util/security/trusted_type_defs.ts
@@ -0,0 +1,50 @@
+/**
+ * @license
+ * Copyright Google LLC 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
+ * While Angular only uses Trusted Types internally for the time being,
+ * references to Trusted Types could leak into our core.d.ts, which would force
+ * anyone compiling against @angular/core to provide the @types/trusted-types
+ * package in their compilation unit.
+ *
+ * Until https://github.com/microsoft/TypeScript/issues/30024 is resolved, we
+ * will keep Angular's public API surface free of references to Trusted Types.
+ * For internal and semi-private APIs that need to reference Trusted Types, the
+ * minimal type definitions for the Trusted Types API provided by this module
+ * should be used instead.
+ *
+ * Adapted from
+ * https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/trusted-types/index.d.ts
+ * but restricted to the API surface used within Angular.
+ */
+
+export type TrustedHTML = {
+  __brand__: 'TrustedHTML'
+};
+export type TrustedScript = {
+  __brand__: 'TrustedScript'
+};
+export type TrustedScriptURL = {
+  __brand__: 'TrustedScriptURL'
+};
+
+export interface TrustedTypePolicyFactory {
+  createPolicy(policyName: string, policyOptions: {
+    createHTML?: (input: string) => string,
+    createScript?: (input: string) => string,
+    createScriptURL?: (input: string) => string,
+  }): TrustedTypePolicy;
+  getAttributeType(tagName: string, attribute: string): string|null;
+}
+
+export interface TrustedTypePolicy {
+  createHTML(input: string): TrustedHTML;
+  createScript(input: string): TrustedScript;
+  createScriptURL(input: string): TrustedScriptURL;
+}
diff --git a/packages/core/src/util/security/trusted_types.ts b/packages/core/src/util/security/trusted_types.ts
new file mode 100644
index 0000000000000..59c45e4662beb
--- /dev/null
+++ b/packages/core/src/util/security/trusted_types.ts
@@ -0,0 +1,134 @@
+/**
+ * @license
+ * Copyright Google LLC 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 module to facilitate use of a Trusted Types policy internally within
+ * Angular. It lazily constructs the Trusted Types policy, providing helper
+ * utilities for promoting strings to Trusted Types. When Trusted Types are not
+ * available, strings are used as a fallback.
+ * @security All use of this module is security-sensitive and should go through
+ * security review.
+ */
+
+import {global} from '../global';
+import {TrustedHTML, TrustedScript, TrustedScriptURL, TrustedTypePolicy, TrustedTypePolicyFactory} from './trusted_type_defs';
+
+/**
+ * The Trusted Types policy, or null if Trusted Types are not
+ * enabled/supported, or undefined if the policy has not been created yet.
+ */
+let policy: TrustedTypePolicy|null|undefined;
+
+/**
+ * Returns the Trusted Types policy, or null if Trusted Types are not
+ * enabled/supported. The first call to this function will create the policy.
+ */
+function getPolicy(): TrustedTypePolicy|null {
+  if (policy === undefined) {
+    policy = null;
+    if (global.trustedTypes) {
+      try {
+        policy = (global.trustedTypes as TrustedTypePolicyFactory).createPolicy('angular', {
+          createHTML: (s: string) => s,
+          createScript: (s: string) => s,
+          createScriptURL: (s: string) => s,
+        });
+      } catch {
+        // trustedTypes.createPolicy throws if called with a name that is
+        // already registered, even in report-only mode. Until the API changes,
+        // catch the error not to break the applications functionally. In such
+        // cases, the code will fall back to using strings.
+      }
+    }
+  }
+  return policy;
+}
+
+/**
+ * Unsafely promote a string to a TrustedHTML, falling back to strings when
+ * Trusted Types are not available.
+ * @security This is a security-sensitive function; any use of this function
+ * must go through security review. In particular, it must be assured that the
+ * provided string will never cause an XSS vulnerability if used in a context
+ * that will be interpreted as HTML by a browser, e.g. when assigning to
+ * element.innerHTML.
+ */
+export function trustedHTMLFromString(html: string): TrustedHTML|string {
+  return getPolicy()?.createHTML(html) || html;
+}
+
+/**
+ * Unsafely promote a string to a TrustedScript, falling back to strings when
+ * Trusted Types are not available.
+ * @security In particular, it must be assured that the provided string will
+ * never cause an XSS vulnerability if used in a context that will be
+ * interpreted and executed as a script by a browser, e.g. when calling eval.
+ */
+export function trustedScriptFromString(script: string): TrustedScript|string {
+  return getPolicy()?.createScript(script) || script;
+}
+
+/**
+ * Unsafely promote a string to a TrustedScriptURL, falling back to strings
+ * when Trusted Types are not available.
+ * @security This is a security-sensitive function; any use of this function
+ * must go through security review. In particular, it must be assured that the
+ * provided string will never cause an XSS vulnerability if used in a context
+ * that will cause a browser to load and execute a resource, e.g. when
+ * assigning to script.src.
+ */
+export function trustedScriptURLFromString(url: string): TrustedScriptURL|string {
+  return getPolicy()?.createScriptURL(url) || url;
+}
+
+/**
+ * Unsafely call the Function constructor with the given string arguments. It
+ * is only available in development mode, and should be stripped out of
+ * production code.
+ * @security This is a security-sensitive function; any use of this function
+ * must go through security review. In particular, it must be assured that it
+ * is only called from development code, as use in production code can lead to
+ * XSS vulnerabilities.
+ */
+export function newTrustedFunctionForDev(...args: string[]): Function {
+  if (typeof ngDevMode === 'undefined') {
+    throw new Error('newTrustedFunctionForDev should never be called in production');
+  }
+  if (!global.trustedTypes) {
+    // In environments that don't support Trusted Types, fall back to the most
+    // straightforward implementation:
+    return new Function(...args);
+  }
+
+  // Chrome currently does not support passing TrustedScript to the Function
+  // constructor. The following implements the workaround proposed on the page
+  // below, where the Chromium bug is also referenced:
+  // https://github.com/w3c/webappsec-trusted-types/wiki/Trusted-Types-for-function-constructor
+  const fnArgs = args.slice(0, -1).join(',');
+  const fnBody = args.pop()!.toString();
+  const body = `(function anonymous(${fnArgs}
+) { ${fnBody}
+})`;
+
+  // Using eval directly confuses the compiler and prevents this module from
+  // being stripped out of JS binaries even if not used. The global['eval']
+  // indirection fixes that.
+  const fn = global['eval'](trustedScriptFromString(body) as string) as Function;
+
+  // To completely mimic the behavior of calling "new Function", two more
+  // things need to happen:
+  // 1. Stringifying the resulting function should return its source code
+  fn.toString = () => body;
+  // 2. When calling the resulting function, `this` should refer to `global`
+  return fn.bind(global);
+
+  // When Trusted Types support in Function constructors is widely available,
+  // the implementation of this function can be simplified to:
+  // return new Function(...args.map(a => trustedScriptFromString(a)));
+}
diff --git a/packages/core/src/util/security/trusted_types_bypass.ts b/packages/core/src/util/security/trusted_types_bypass.ts
new file mode 100644
index 0000000000000..3280785d08413
--- /dev/null
+++ b/packages/core/src/util/security/trusted_types_bypass.ts
@@ -0,0 +1,89 @@
+/**
+ * @license
+ * Copyright Google LLC 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 module to facilitate use of a Trusted Types policy internally within
+ * Angular specifically for bypassSecurityTrust* and custom sanitizers. It
+ * lazily constructs the Trusted Types policy, providing helper utilities for
+ * promoting strings to Trusted Types. When Trusted Types are not available,
+ * strings are used as a fallback.
+ * @security All use of this module is security-sensitive and should go through
+ * security review.
+ */
+
+import {global} from '../global';
+import {TrustedHTML, TrustedScript, TrustedScriptURL, TrustedTypePolicy, TrustedTypePolicyFactory} from './trusted_type_defs';
+
+/**
+ * The Trusted Types policy, or null if Trusted Types are not
+ * enabled/supported, or undefined if the policy has not been created yet.
+ */
+let policy: TrustedTypePolicy|null|undefined;
+
+/**
+ * Returns the Trusted Types policy, or null if Trusted Types are not
+ * enabled/supported. The first call to this function will create the policy.
+ */
+function getPolicy(): TrustedTypePolicy|null {
+  if (policy === undefined) {
+    policy = null;
+    if (global.trustedTypes) {
+      try {
+        policy = (global.trustedTypes as TrustedTypePolicyFactory)
+                     .createPolicy('angular#unsafe-bypass', {
+                       createHTML: (s: string) => s,
+                       createScript: (s: string) => s,
+                       createScriptURL: (s: string) => s,
+                     });
+      } catch {
+        // trustedTypes.createPolicy throws if called with a name that is
+        // already registered, even in report-only mode. Until the API changes,
+        // catch the error not to break the applications functionally. In such
+        // cases, the code will fall back to using strings.
+      }
+    }
+  }
+  return policy;
+}
+
+/**
+ * Unsafely promote a string to a TrustedHTML, falling back to strings when
+ * Trusted Types are not available.
+ * @security This is a security-sensitive function; any use of this function
+ * must go through security review. In particular, it must be assured that it
+ * is only passed strings that come directly from custom sanitizers or the
+ * bypassSecurityTrust* functions.
+ */
+export function trustedHTMLFromStringBypass(html: string): TrustedHTML|string {
+  return getPolicy()?.createHTML(html) || html;
+}
+
+/**
+ * Unsafely promote a string to a TrustedScript, falling back to strings when
+ * Trusted Types are not available.
+ * @security This is a security-sensitive function; any use of this function
+ * must go through security review. In particular, it must be assured that it
+ * is only passed strings that come directly from custom sanitizers or the
+ * bypassSecurityTrust* functions.
+ */
+export function trustedScriptFromStringBypass(script: string): TrustedScript|string {
+  return getPolicy()?.createScript(script) || script;
+}
+
+/**
+ * Unsafely promote a string to a TrustedScriptURL, falling back to strings
+ * when Trusted Types are not available.
+ * @security This is a security-sensitive function; any use of this function
+ * must go through security review. In particular, it must be assured that it
+ * is only passed strings that come directly from custom sanitizers or the
+ * bypassSecurityTrust* functions.
+ */
+export function trustedScriptURLFromStringBypass(url: string): TrustedScriptURL|string {
+  return getPolicy()?.createScriptURL(url) || url;
+}
diff --git a/packages/core/src/view/services.ts b/packages/core/src/view/services.ts
index 6edf41e185d49..83808ce281531 100644
--- a/packages/core/src/view/services.ts
+++ b/packages/core/src/view/services.ts
@@ -752,7 +752,7 @@ export class DebugRenderer2 implements Renderer2 {
     this.delegate.appendChild(parent, newChild);
   }
 
-  insertBefore(parent: any, newChild: any, refChild: any): void {
+  insertBefore(parent: any, newChild: any, refChild: any, isMove?: boolean): void {
     const debugEl = getDebugNode(parent);
     const debugChildEl = getDebugNode(newChild);
     const debugRefEl = getDebugNode(refChild)!;
@@ -760,7 +760,7 @@ export class DebugRenderer2 implements Renderer2 {
       debugEl.insertBefore(debugRefEl, debugChildEl);
     }
 
-    this.delegate.insertBefore(parent, newChild, refChild);
+    this.delegate.insertBefore(parent, newChild, refChild, isMove);
   }
 
   removeChild(parent: any, oldChild: any): void {
diff --git a/packages/core/src/view/util.ts b/packages/core/src/view/util.ts
index 9d5b52b5ba056..2259808c10681 100644
--- a/packages/core/src/view/util.ts
+++ b/packages/core/src/view/util.ts
@@ -230,7 +230,10 @@ export function getParentRenderElement(view: ViewData, renderHost: any, def: Nod
     if ((renderParent.flags & NodeFlags.TypeElement) === 0 ||
         (renderParent.flags & NodeFlags.ComponentView) === 0 ||
         (renderParent.element!.componentRendererType &&
-         renderParent.element!.componentRendererType!.encapsulation === ViewEncapsulation.Native)) {
+         (renderParent.element!.componentRendererType!.encapsulation ===
+              ViewEncapsulation.ShadowDom ||
+          // TODO(FW-2290): remove the `encapsulation === 1` fallback logic in v12.
+          renderParent.element!.componentRendererType!.encapsulation === 1))) {
       // only children of non components, or children of components with native encapsulation should
       // be attached.
       return asElementData(view, def.renderParent!.nodeIndex).renderElement;
diff --git a/packages/core/test/BUILD.bazel b/packages/core/test/BUILD.bazel
index d5fc99181550b..88274929366bb 100644
--- a/packages/core/test/BUILD.bazel
+++ b/packages/core/test/BUILD.bazel
@@ -15,6 +15,23 @@ circular_dependency_test(
     deps = ["//packages/core/testing"],
 )
 
+genrule(
+    name = "downleveled_es5_fixture",
+    srcs = ["reflection/es2015_inheritance_fixture.ts"],
+    outs = ["reflection/es5_downleveled_inheritance_fixture.js"],
+    cmd = """
+        es2015_out_dir="/tmp/downleveled_es5_fixture/"
+        es2015_out_file="$$es2015_out_dir/es2015_inheritance_fixture.js"
+
+        # Build the ES2015 output and then downlevel it to ES5.
+        $(execpath @npm//typescript/bin:tsc) $< --outDir $$es2015_out_dir --target ES2015 \
+            --types --module umd
+        $(execpath @npm//typescript/bin:tsc) --outFile $@ $$es2015_out_file --allowJs \
+            --types --target ES5
+    """,
+    tools = ["@npm//typescript/bin:tsc"],
+)
+
 ts_library(
     name = "test_lib",
     testonly = True,
@@ -22,6 +39,7 @@ ts_library(
         ["**/*.ts"],
         exclude = [
             "**/*_node_only_spec.ts",
+            "reflection/es2015_inheritance_fixture.ts",
         ],
     ),
     # Visible to //:saucelabs_unit_tests_poc target
@@ -73,6 +91,9 @@ ts_library(
 jasmine_node_test(
     name = "test",
     bootstrap = ["//tools/testing:node_es5"],
+    data = [
+        ":downleveled_es5_fixture",
+    ],
     shard_count = 4,
     deps = [
         ":test_lib",
@@ -87,6 +108,7 @@ jasmine_node_test(
 
 karma_web_test_suite(
     name = "test_web",
+    runtime_deps = [":downleveled_es5_fixture"],
     deps = [
         ":test_lib",
     ],
diff --git a/packages/core/test/acceptance/change_detection_transplanted_view_spec.ts b/packages/core/test/acceptance/change_detection_transplanted_view_spec.ts
index d3c8f99f4b2a7..815aebcb5cc4b 100644
--- a/packages/core/test/acceptance/change_detection_transplanted_view_spec.ts
+++ b/packages/core/test/acceptance/change_detection_transplanted_view_spec.ts
@@ -7,7 +7,7 @@
  */
 
 import {CommonModule} from '@angular/common';
-import {ChangeDetectionStrategy, ChangeDetectorRef, Component, DoCheck, Input, TemplateRef, Type, ViewChild} from '@angular/core';
+import {ChangeDetectionStrategy, ChangeDetectorRef, Component, DoCheck, Input, TemplateRef, Type, ViewChild, ViewContainerRef} from '@angular/core';
 import {AfterViewChecked} from '@angular/core/src/core';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {expect} from '@angular/platform-browser/testing/src/matchers';
@@ -594,6 +594,40 @@ describe('change detection for transplanted views', () => {
             'SheldonSheldonSheldon',
             'Expected transplanted view to be refreshed even when insertion is not dirty');
   });
+
+  it('should not fail when change detecting detached transplanted view', () => {
+    @Component({template: '<ng-template>{{incrementChecks()}}</ng-template>'})
+    class AppComponent {
+      @ViewChild(TemplateRef) templateRef!: TemplateRef<{}>;
+
+      constructor(readonly rootVref: ViewContainerRef, readonly cdr: ChangeDetectorRef) {}
+
+      checks = 0;
+      incrementChecks() {
+        this.checks++;
+      }
+    }
+
+    const fixture = TestBed.configureTestingModule({declarations: [AppComponent]})
+                        .createComponent(AppComponent);
+    const component = fixture.componentInstance;
+    fixture.detectChanges();
+
+    const viewRef = component.templateRef.createEmbeddedView({});
+    // This `ViewContainerRef` is for the root view
+    component.rootVref.insert(viewRef);
+    // `detectChanges` on this `ChangeDetectorRef` will refresh this view and children, not the root
+    // view that has the transplanted `viewRef` inserted.
+    component.cdr.detectChanges();
+    // The template should not have been refreshed because it was inserted "above" the component so
+    // `detectChanges` will not refresh it.
+    expect(component.checks).toEqual(0);
+
+    // Detach view, manually call `detectChanges`, and verify the template was refreshed
+    component.rootVref.detach();
+    viewRef.detectChanges();
+    expect(component.checks).toEqual(1);
+  });
 });
 
 function trim(text: string|null): string {
diff --git a/packages/core/test/acceptance/debug_spec.ts b/packages/core/test/acceptance/debug_spec.ts
index ef1e3d3ea39d9..436d134d8bac8 100644
--- a/packages/core/test/acceptance/debug_spec.ts
+++ b/packages/core/test/acceptance/debug_spec.ts
@@ -54,7 +54,7 @@ onlyInIvy('Ivy specific').describe('Debug Representation', () => {
           end: HEADER_OFFSET + 2,
           length: 2,
           content: [
-            {index: HEADER_OFFSET + 0, t: matchTNode({tagName: 'div'}), l: matchDomElement('div')},
+            {index: HEADER_OFFSET + 0, t: matchTNode({value: 'div'}), l: matchDomElement('div')},
             {index: HEADER_OFFSET + 1, t: matchTI18n(), l: null},
           ]
         });
@@ -64,18 +64,16 @@ onlyInIvy('Ivy specific').describe('Debug Representation', () => {
           length: 1,
           content: [{index: HEADER_OFFSET + 2, t: null, l: 'World'}]
         });
-        expect(myComponentView.i18n).toEqual({
+        expect(myComponentView.expando).toEqual({
           start: HEADER_OFFSET + 3,
           end: HEADER_OFFSET + 4,
           length: 1,
           content: [{
             index: HEADER_OFFSET + 3,
-            t: matchTNode({type: TNodeType.Element, tagName: null}),
+            t: matchTNode({type: TNodeType.Text, value: '{{?}}'}),
             l: matchDomText('Hello World')
           }]
         });
-        expect(myComponentView.expando)
-            .toEqual({start: HEADER_OFFSET + 4, end: HEADER_OFFSET + 4, length: 0, content: []});
       });
     });
   });
diff --git a/packages/core/test/acceptance/di_spec.ts b/packages/core/test/acceptance/di_spec.ts
index 4541db80cb219..4854d3f2e0912 100644
--- a/packages/core/test/acceptance/di_spec.ts
+++ b/packages/core/test/acceptance/di_spec.ts
@@ -7,7 +7,7 @@
  */
 
 import {CommonModule} from '@angular/common';
-import {Attribute, ChangeDetectorRef, Component, ComponentFactoryResolver, ComponentRef, Directive, ElementRef, EventEmitter, forwardRef, Host, HostBinding, Inject, Injectable, InjectionToken, INJECTOR, Injector, Input, LOCALE_ID, ModuleWithProviders, NgModule, NgZone, Optional, Output, Pipe, PipeTransform, Self, SkipSelf, TemplateRef, ViewChild, ViewContainerRef, ViewRef, ɵDEFAULT_LOCALE_ID as DEFAULT_LOCALE_ID} from '@angular/core';
+import {Attribute, ChangeDetectorRef, Component, ComponentFactoryResolver, ComponentRef, Directive, ElementRef, EventEmitter, forwardRef, Host, HostBinding, Inject, Injectable, InjectionToken, INJECTOR, Injector, Input, LOCALE_ID, NgModule, NgZone, Optional, Output, Pipe, PipeTransform, Self, SkipSelf, TemplateRef, ViewChild, ViewContainerRef, ViewRef, ɵDEFAULT_LOCALE_ID as DEFAULT_LOCALE_ID} from '@angular/core';
 import {ɵINJECTOR_SCOPE} from '@angular/core/src/core';
 import {ViewRef as ViewRefInternal} from '@angular/core/src/render3/view_ref';
 import {TestBed} from '@angular/core/testing';
@@ -2304,18 +2304,6 @@ describe('di', () => {
   });
 
   it('should not be able to inject ViewRef', () => {
-    // If the current browser does not support `__proto__` natively, this test will never
-    // result in an error as the `__NG_ELEMENT_ID__` from `ChangeDetectorRef` is directly
-    // assigned to the `ViewRef` instance, due to TypeScript, and `setPrototypeOf` polyfills
-    // not being able to simulate the prototype chain. This means that Angular's DI system
-    // considers `ViewRef` as injectable due to it having a `__NG_ELEMENT_ID__` directly
-    // assigned. We skip this test in such cases. This is currently the case in IE9 and
-    // IE10 as those don't support `__proto__`. Related TypeScript issue:
-    // https://github.com/microsoft/TypeScript/issues/1601#issuecomment-94892833.
-    if (!('__proto__' in {})) {
-      return;
-    }
-
     @Component({template: ''})
     class App {
       constructor(_viewRef: ViewRef) {}
diff --git a/packages/core/test/acceptance/host_binding_spec.ts b/packages/core/test/acceptance/host_binding_spec.ts
index 27726e66bf4e5..30f4166c9acdd 100644
--- a/packages/core/test/acceptance/host_binding_spec.ts
+++ b/packages/core/test/acceptance/host_binding_spec.ts
@@ -1132,9 +1132,6 @@ describe('host bindings', () => {
     fixture.componentInstance.name = 'Ned';
     fixture.detectChanges();
 
-    // Note that we assert for each binding individually, rather than checking against
-    // innerHTML, because IE10 changes the attribute order and makes it inconsistent with
-    // all other browsers.
     expect(hostElement.id).toBe('red,blue');
     expect(hostElement.title).toBe('blue');
     expect(fixture.nativeElement.innerHTML.endsWith('Ned')).toBe(true);
diff --git a/packages/core/test/acceptance/i18n_spec.ts b/packages/core/test/acceptance/i18n_spec.ts
index cbca1e1246c57..bcbce5a482c35 100644
--- a/packages/core/test/acceptance/i18n_spec.ts
+++ b/packages/core/test/acceptance/i18n_spec.ts
@@ -14,7 +14,8 @@ import localeEs from '@angular/common/locales/es';
 import localeRo from '@angular/common/locales/ro';
 import {computeMsgId} from '@angular/compiler';
 import {Component, ContentChild, ContentChildren, Directive, ElementRef, HostBinding, Input, LOCALE_ID, NO_ERRORS_SCHEMA, Pipe, PipeTransform, QueryList, RendererFactory2, TemplateRef, Type, ViewChild, ViewContainerRef, ɵsetDocument} from '@angular/core';
-import {setDelayProjection} from '@angular/core/src/render3/instructions/projection';
+import {DebugNode, HEADER_OFFSET, TVIEW} from '@angular/core/src/render3/interfaces/view';
+import {getComponentLView} from '@angular/core/src/render3/util/discovery_utils';
 import {TestBed} from '@angular/core/testing';
 import {clearTranslations, loadTranslations} from '@angular/localize';
 import {By, ɵDomRendererFactory2 as DomRendererFactory2} from '@angular/platform-browser';
@@ -23,19 +24,19 @@ import {onlyInIvy} from '@angular/private/testing';
 import {BehaviorSubject} from 'rxjs';
 
 
+
 onlyInIvy('Ivy i18n logic').describe('runtime i18n', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
       declarations: [AppComp, DirectiveWithTplRef, UppercasePipe],
-      // In some of the tests we use made-up tag names for better readability, however they'll
-      // cause validation errors. Add the `NO_ERRORS_SCHEMA` so that we don't have to declare
-      // dummy components for each one of them.
+      // In some of the tests we use made-up tag names for better readability, however
+      // they'll cause validation errors. Add the `NO_ERRORS_SCHEMA` so that we don't have
+      // to declare dummy components for each one of them.
       schemas: [NO_ERRORS_SCHEMA],
     });
   });
 
   afterEach(() => {
-    setDelayProjection(false);
     clearTranslations();
   });
 
@@ -101,7 +102,8 @@ onlyInIvy('Ivy i18n logic').describe('runtime i18n', () => {
         {{ obj?.getA()?.b }}
       </div>
     `);
-    // the `obj` field is not yet defined, so 2nd and 3rd interpolations return empty strings
+    // the `obj` field is not yet defined, so 2nd and 3rd interpolations return empty
+    // strings
     expect(fixture.nativeElement.innerHTML).toEqual(`<div> ANGULAR -  -  (fr) </div>`);
 
     fixture.componentRef.instance.obj = {
@@ -541,9 +543,9 @@ onlyInIvy('Ivy i18n logic').describe('runtime i18n', () => {
       TestBed.configureTestingModule({
         providers: [
           {provide: DOCUMENT, useFactory: _document, deps: []},
-          // TODO(FW-811): switch back to default server renderer (i.e. remove the line below)
-          // once it starts to support Ivy namespace format (URIs) correctly. For now, use
-          // `DomRenderer` that supports Ivy namespace format.
+          // TODO(FW-811): switch back to default server renderer (i.e. remove the line
+          // below) once it starts to support Ivy namespace format (URIs) correctly. For
+          // now, use `DomRenderer` that supports Ivy namespace format.
           {provide: RendererFactory2, useClass: DomRendererFactory2}
         ],
       });
@@ -599,6 +601,92 @@ onlyInIvy('Ivy i18n logic').describe('runtime i18n', () => {
     });
   });
 
+  describe('dynamic TNodes', () => {
+    // When translation occurs the i18n system needs to create dynamic TNodes for the text
+    // nodes so that they can be correctly processed by the `addRemoveViewFromContainer`.
+
+    function toTypeContent(n: DebugNode): string {
+      return `${n.type}(${n.html})`;
+    }
+
+    it('should not create dynamic TNode when no i18n', () => {
+      const fixture = initWithTemplate(AppComp, `Hello <b>World</b>!`);
+      const lView = getComponentLView(fixture.componentInstance);
+      const hello_ = (fixture.nativeElement as Element).firstChild!;
+      const b = hello_.nextSibling!;
+      const world = b.firstChild!;
+      const exclamation = b.nextSibling!;
+      const lViewDebug = lView.debug!;
+      expect(lViewDebug.nodes.map(toTypeContent)).toEqual([
+        'Text(Hello )', 'Element(<b>)', 'Text(!)'
+      ]);
+      expect(lViewDebug.decls).toEqual({
+        start: HEADER_OFFSET,
+        end: HEADER_OFFSET + 4,
+        length: 4,
+        content: [
+          jasmine.objectContaining({index: HEADER_OFFSET + 0, l: hello_}),
+          jasmine.objectContaining({index: HEADER_OFFSET + 1, l: b}),
+          jasmine.objectContaining({index: HEADER_OFFSET + 2, l: world}),
+          jasmine.objectContaining({index: HEADER_OFFSET + 3, l: exclamation}),
+        ]
+      });
+      expect(lViewDebug.expando)
+          .toEqual(
+              {start: lViewDebug.vars.end, end: lViewDebug.expando.start, length: 0, content: []});
+    });
+
+    describe('ICU', () => {
+      // In the case of ICUs we can't create TNodes for each ICU part, as different ICU
+      // instances may have different selections active and hence have different shape. In
+      // such a case a single `TIcuContainerNode` should be generated only.
+      it('should create a single dynamic TNode for ICU', () => {
+        const fixture = initWithTemplate(AppComp, `
+          {count, plural, 
+            =0 {just now} 
+            =1 {one minute ago} 
+            other {{{count}} minutes ago}
+          }
+        `.trim());
+        const lView = getComponentLView(fixture.componentInstance);
+        const lViewDebug = lView.debug!;
+        fixture.detectChanges();
+        expect((fixture.nativeElement as Element).textContent).toEqual('just now');
+        expect(lViewDebug.nodes.map(toTypeContent)).toEqual(['IcuContainer(<!--ICU 20:0-->)']);
+        // We want to ensure that the ICU container does not have any content!
+        // This is because the content is instance dependent and therefore can't be shared
+        // across `TNode`s.
+        expect(lViewDebug.nodes[0].children.map(toTypeContent)).toEqual([]);
+        expect(fixture.nativeElement.innerHTML).toEqual('just now<!--ICU 20:0-->');
+      });
+
+      it('should support multiple ICUs', () => {
+        const fixture = initWithTemplate(AppComp, `
+          {count, plural, 
+            =0 {just now} 
+            =1 {one minute ago} 
+            other {{{count}} minutes ago}
+          }
+          {name, select, 
+            Angular {Mr. Angular} 
+            other {Sir}
+          }
+        `);
+        const lView = getComponentLView(fixture.componentInstance);
+        expect(lView.debug!.nodes.map(toTypeContent)).toEqual([
+          'IcuContainer(<!--ICU 20:0-->)',
+          'IcuContainer(<!--ICU 21:0-->)',
+        ]);
+        // We want to ensure that the ICU container does not have any content!
+        // This is because the content is instance dependent and therefore can't be shared
+        // across `TNode`s.
+        expect(lView.debug!.nodes[0].children.map(toTypeContent)).toEqual([]);
+        expect(fixture.nativeElement.innerHTML)
+            .toEqual('just now<!--ICU 20:0-->Mr. Angular<!--ICU 21:0-->');
+      });
+    });
+  });
+
   describe('should support ICU expressions', () => {
     it('with no root node', () => {
       loadTranslations({
@@ -690,19 +778,19 @@ onlyInIvy('Ivy i18n logic').describe('runtime i18n', () => {
         other {({{name}})}
       }</div>`);
       expect(fixture.nativeElement.innerHTML)
-          .toEqual(`<div>aucun <b>email</b>!<!--ICU 7--> - (Angular)<!--ICU 13--></div>`);
+          .toEqual(`<div>aucun <b>email</b>!<!--ICU 21:0--> - (Angular)<!--ICU 21:3--></div>`);
 
       fixture.componentRef.instance.count = 4;
       fixture.detectChanges();
       expect(fixture.nativeElement.innerHTML)
           .toEqual(
-              `<div>4 <span title="Angular">emails</span><!--ICU 7--> - (Angular)<!--ICU 13--></div>`);
+              `<div>4 <span title="Angular">emails</span><!--ICU 21:0--> - (Angular)<!--ICU 21:3--></div>`);
 
       fixture.componentRef.instance.count = 0;
       fixture.componentRef.instance.name = 'John';
       fixture.detectChanges();
       expect(fixture.nativeElement.innerHTML)
-          .toEqual(`<div>aucun <b>email</b>!<!--ICU 7--> - (John)<!--ICU 13--></div>`);
+          .toEqual(`<div>aucun <b>email</b>!<!--ICU 21:0--> - (John)<!--ICU 21:3--></div>`);
     });
 
     it('with custom interpolation config', () => {
@@ -740,20 +828,32 @@ onlyInIvy('Ivy i18n logic').describe('runtime i18n', () => {
       }</span></div>`);
       expect(fixture.nativeElement.innerHTML)
           .toEqual(
-              `<div><span>aucun <b>email</b>!<!--ICU 9--></span> - <span>(Angular)<!--ICU 15--></span></div>`);
+              `<div>` +
+              `<span>aucun <b>email</b>!<!--ICU 21:0--></span>` +
+              ` - ` +
+              `<span>(Angular)<!--ICU 21:3--></span>` +
+              `</div>`);
 
       fixture.componentRef.instance.count = 4;
       fixture.detectChanges();
       expect(fixture.nativeElement.innerHTML)
           .toEqual(
-              `<div><span>4 <span title="Angular">emails</span><!--ICU 9--></span> - <span>(Angular)<!--ICU 15--></span></div>`);
+              `<div>` +
+              `<span>4 <span title="Angular">emails</span><!--ICU 21:0--></span>` +
+              ` - ` +
+              `<span>(Angular)<!--ICU 21:3--></span>` +
+              `</div>`);
 
       fixture.componentRef.instance.count = 0;
       fixture.componentRef.instance.name = 'John';
       fixture.detectChanges();
       expect(fixture.nativeElement.innerHTML)
           .toEqual(
-              `<div><span>aucun <b>email</b>!<!--ICU 9--></span> - <span>(John)<!--ICU 15--></span></div>`);
+              `<div>` +
+              `<span>aucun <b>email</b>!<!--ICU 21:0--></span>` +
+              ` - ` +
+              `<span>(John)<!--ICU 21:3--></span>` +
+              `</div>`);
     });
 
     it('inside template directives', () => {
@@ -767,7 +867,7 @@ onlyInIvy('Ivy i18n logic').describe('runtime i18n', () => {
         other {({{name}})}
       }</span></div>`);
       expect(fixture.nativeElement.innerHTML)
-          .toEqual(`<div><span>(Angular)<!--ICU 4--></span><!--bindings={
+          .toEqual(`<div><span>(Angular)<!--ICU 20:0--></span><!--bindings={
   "ng-reflect-ng-if": "true"
 }--></div>`);
 
@@ -786,7 +886,8 @@ onlyInIvy('Ivy i18n logic').describe('runtime i18n', () => {
       const fixture = initWithTemplate(AppComp, `<ng-container i18n>{name, select,
         other {({{name}})}
       }</ng-container>`);
-      expect(fixture.nativeElement.innerHTML).toEqual(`(Angular)<!--ICU 4--><!--ng-container-->`);
+      expect(fixture.nativeElement.innerHTML)
+          .toEqual(`(Angular)<!--ICU 21:0--><!--ng-container-->`);
     });
 
     it('inside <ng-template>', () => {
@@ -821,12 +922,12 @@ onlyInIvy('Ivy i18n logic').describe('runtime i18n', () => {
                        other {animals}
                      }!}
       }</div>`);
-      expect(fixture.nativeElement.innerHTML).toEqual(`<div>zero<!--ICU 5--></div>`);
+      expect(fixture.nativeElement.innerHTML).toEqual(`<div>zero<!--ICU 21:1--></div>`);
 
       fixture.componentRef.instance.count = 4;
       fixture.detectChanges();
       expect(fixture.nativeElement.innerHTML)
-          .toEqual(`<div>4 animaux<!--nested ICU 0-->!<!--ICU 5--></div>`);
+          .toEqual(`<div>4 animaux<!--nested ICU 0-->!<!--ICU 21:1--></div>`);
     });
 
     it('nested with interpolations in "other" blocks', () => {
@@ -846,16 +947,16 @@ onlyInIvy('Ivy i18n logic').describe('runtime i18n', () => {
                      }!}
         other {other - {{count}}}
       }</div>`);
-      expect(fixture.nativeElement.innerHTML).toEqual(`<div>zero<!--ICU 5--></div>`);
+      expect(fixture.nativeElement.innerHTML).toEqual(`<div>zero<!--ICU 21:1--></div>`);
 
       fixture.componentRef.instance.count = 2;
       fixture.detectChanges();
       expect(fixture.nativeElement.innerHTML)
-          .toEqual(`<div>2 animaux<!--nested ICU 0-->!<!--ICU 5--></div>`);
+          .toEqual(`<div>2 animaux<!--nested ICU 0-->!<!--ICU 21:1--></div>`);
 
       fixture.componentRef.instance.count = 4;
       fixture.detectChanges();
-      expect(fixture.nativeElement.innerHTML).toEqual(`<div>autre - 4<!--ICU 5--></div>`);
+      expect(fixture.nativeElement.innerHTML).toEqual(`<div>autre - 4<!--ICU 21:1--></div>`);
     });
 
     it('should return the correct plural form for ICU expressions when using "ro" locale', () => {
@@ -888,31 +989,31 @@ onlyInIvy('Ivy i18n logic').describe('runtime i18n', () => {
             =other {lots of emails}
           }`);
 
-      expect(fixture.nativeElement.innerHTML).toEqual('no email<!--ICU 2-->');
+      expect(fixture.nativeElement.innerHTML).toEqual('no email<!--ICU 20:0-->');
 
       // Change detection cycle, no model changes
       fixture.detectChanges();
-      expect(fixture.nativeElement.innerHTML).toEqual('no email<!--ICU 2-->');
+      expect(fixture.nativeElement.innerHTML).toEqual('no email<!--ICU 20:0-->');
 
       fixture.componentInstance.count = 3;
       fixture.detectChanges();
-      expect(fixture.nativeElement.innerHTML).toEqual('a few emails<!--ICU 2-->');
+      expect(fixture.nativeElement.innerHTML).toEqual('a few emails<!--ICU 20:0-->');
 
       fixture.componentInstance.count = 1;
       fixture.detectChanges();
-      expect(fixture.nativeElement.innerHTML).toEqual('one email<!--ICU 2-->');
+      expect(fixture.nativeElement.innerHTML).toEqual('one email<!--ICU 20:0-->');
 
       fixture.componentInstance.count = 10;
       fixture.detectChanges();
-      expect(fixture.nativeElement.innerHTML).toEqual('a few emails<!--ICU 2-->');
+      expect(fixture.nativeElement.innerHTML).toEqual('a few emails<!--ICU 20:0-->');
 
       fixture.componentInstance.count = 20;
       fixture.detectChanges();
-      expect(fixture.nativeElement.innerHTML).toEqual('lots of emails<!--ICU 2-->');
+      expect(fixture.nativeElement.innerHTML).toEqual('lots of emails<!--ICU 20:0-->');
 
       fixture.componentInstance.count = 0;
       fixture.detectChanges();
-      expect(fixture.nativeElement.innerHTML).toEqual('no email<!--ICU 2-->');
+      expect(fixture.nativeElement.innerHTML).toEqual('no email<!--ICU 20:0-->');
     });
 
     it(`should return the correct plural form for ICU expressions when using "es" locale`, () => {
@@ -939,31 +1040,31 @@ onlyInIvy('Ivy i18n logic').describe('runtime i18n', () => {
             =other {lots of emails}
           }`);
 
-      expect(fixture.nativeElement.innerHTML).toEqual('no email<!--ICU 2-->');
+      expect(fixture.nativeElement.innerHTML).toEqual('no email<!--ICU 20:0-->');
 
       // Change detection cycle, no model changes
       fixture.detectChanges();
-      expect(fixture.nativeElement.innerHTML).toEqual('no email<!--ICU 2-->');
+      expect(fixture.nativeElement.innerHTML).toEqual('no email<!--ICU 20:0-->');
 
       fixture.componentInstance.count = 3;
       fixture.detectChanges();
-      expect(fixture.nativeElement.innerHTML).toEqual('lots of emails<!--ICU 2-->');
+      expect(fixture.nativeElement.innerHTML).toEqual('lots of emails<!--ICU 20:0-->');
 
       fixture.componentInstance.count = 1;
       fixture.detectChanges();
-      expect(fixture.nativeElement.innerHTML).toEqual('one email<!--ICU 2-->');
+      expect(fixture.nativeElement.innerHTML).toEqual('one email<!--ICU 20:0-->');
 
       fixture.componentInstance.count = 10;
       fixture.detectChanges();
-      expect(fixture.nativeElement.innerHTML).toEqual('lots of emails<!--ICU 2-->');
+      expect(fixture.nativeElement.innerHTML).toEqual('lots of emails<!--ICU 20:0-->');
 
       fixture.componentInstance.count = 20;
       fixture.detectChanges();
-      expect(fixture.nativeElement.innerHTML).toEqual('lots of emails<!--ICU 2-->');
+      expect(fixture.nativeElement.innerHTML).toEqual('lots of emails<!--ICU 20:0-->');
 
       fixture.componentInstance.count = 0;
       fixture.detectChanges();
-      expect(fixture.nativeElement.innerHTML).toEqual('no email<!--ICU 2-->');
+      expect(fixture.nativeElement.innerHTML).toEqual('no email<!--ICU 20:0-->');
     });
 
     it('projection', () => {
@@ -1058,12 +1159,12 @@ onlyInIvy('Ivy i18n logic').describe('runtime i18n', () => {
       const fixture = TestBed.createComponent(App);
       fixture.detectChanges();
       expect(fixture.debugElement.nativeElement.innerHTML)
-          .toContain('<my-cmp><div>ONE<!--ICU 13--></div><!--container--></my-cmp>');
+          .toContain('<my-cmp><div>ONE<!--ICU 21:0--></div><!--container--></my-cmp>');
 
       fixture.componentRef.instance.count = 2;
       fixture.detectChanges();
       expect(fixture.debugElement.nativeElement.innerHTML)
-          .toContain('<my-cmp><div>OTHER<!--ICU 13--></div><!--container--></my-cmp>');
+          .toContain('<my-cmp><div>OTHER<!--ICU 21:0--></div><!--container--></my-cmp>');
 
       // destroy component
       fixture.componentInstance.condition = false;
@@ -1075,7 +1176,7 @@ onlyInIvy('Ivy i18n logic').describe('runtime i18n', () => {
       fixture.componentInstance.count = 1;
       fixture.detectChanges();
       expect(fixture.debugElement.nativeElement.innerHTML)
-          .toContain('<my-cmp><div>ONE<!--ICU 13--></div><!--container--></my-cmp>');
+          .toContain('<my-cmp><div>ONE<!--ICU 21:0--></div><!--container--></my-cmp>');
     });
 
     it('with nested ICU expression and inside a container when creating a view via vcr.createEmbeddedView',
@@ -1147,12 +1248,12 @@ onlyInIvy('Ivy i18n logic').describe('runtime i18n', () => {
          fixture.detectChanges();
          expect(fixture.debugElement.nativeElement.innerHTML)
              .toBe(
-                 '<my-cmp><div>2 animals<!--nested ICU 0-->!<!--ICU 15--></div><!--container--></my-cmp>');
+                 '<my-cmp><div>2 animals<!--nested ICU 0-->!<!--ICU 21:1--></div><!--container--></my-cmp>');
 
          fixture.componentRef.instance.count = 1;
          fixture.detectChanges();
          expect(fixture.debugElement.nativeElement.innerHTML)
-             .toBe('<my-cmp><div>ONE<!--ICU 15--></div><!--container--></my-cmp>');
+             .toBe('<my-cmp><div>ONE<!--ICU 21:1--></div><!--container--></my-cmp>');
        });
 
     it('with nested containers', () => {
@@ -1387,7 +1488,8 @@ onlyInIvy('Ivy i18n logic').describe('runtime i18n', () => {
 
       fixture.componentInstance.count = 2;
       fixture.detectChanges();
-      // check switching to an existing case after processing nested ICU without matching case
+      // check switching to an existing case after processing nested ICU without matching
+      // case
       expect(fixture.nativeElement.textContent.trim()).toBe('deux (select) - deux (plural)');
 
       fixture.componentInstance.count = 1;
@@ -1435,6 +1537,45 @@ onlyInIvy('Ivy i18n logic').describe('runtime i18n', () => {
       // checking the second ICU case
       expect(fixture.nativeElement.textContent.trim()).toBe('deux articles');
     });
+
+    it('should handle select expressions without an `other` parameter inside a template', () => {
+      const fixture = initWithTemplate(AppComp, `
+        <ng-container *ngFor="let item of items">{item.value, select, 0 {A} 1 {B} 2 {C}}</ng-container>
+      `);
+      fixture.componentInstance.items = [{value: 0}, {value: 1}, {value: 1337}];
+      fixture.detectChanges();
+      expect(fixture.nativeElement.textContent.trim()).toBe('AB');
+
+      fixture.componentInstance.items[0].value = 2;
+      fixture.detectChanges();
+      expect(fixture.nativeElement.textContent.trim()).toBe('CB');
+    });
+
+    it('should render an element whose case did not match initially', () => {
+      const fixture = initWithTemplate(AppComp, `
+        <p *ngFor="let item of items">{item.value, select, 0 {A} 1 {B} 2 {C}}</p>
+      `);
+      fixture.componentInstance.items = [{value: 0}, {value: 1}, {value: 1337}];
+      fixture.detectChanges();
+      expect(fixture.nativeElement.textContent.trim()).toBe('AB');
+
+      fixture.componentInstance.items[2].value = 2;
+      fixture.detectChanges();
+      expect(fixture.nativeElement.textContent.trim()).toBe('ABC');
+    });
+
+    it('should remove an element whose case matched initially, but does not anymore', () => {
+      const fixture = initWithTemplate(AppComp, `
+        <p *ngFor="let item of items">{item.value, select, 0 {A} 1 {B} 2 {C}}</p>
+      `);
+      fixture.componentInstance.items = [{value: 0}, {value: 1}];
+      fixture.detectChanges();
+      expect(fixture.nativeElement.textContent.trim()).toBe('AB');
+
+      fixture.componentInstance.items[0].value = 1337;
+      fixture.detectChanges();
+      expect(fixture.nativeElement.textContent.trim()).toBe('B');
+    });
   });
 
   describe('should support attributes', () => {
@@ -1690,7 +1831,8 @@ onlyInIvy('Ivy i18n logic').describe('runtime i18n', () => {
       const fixture = initWithTemplate(AppComp, `
         <div i18n-title title="{{ name | uppercase }} - {{ obj?.a?.b }} - {{ obj?.getA()?.b }}"></div>
       `);
-      // the `obj` field is not yet defined, so 2nd and 3rd interpolations return empty strings
+      // the `obj` field is not yet defined, so 2nd and 3rd interpolations return empty
+      // strings
       expect(fixture.nativeElement.firstChild.title).toEqual(`ANGULAR -  -  (fr)`);
 
       fixture.componentRef.instance.obj = {
@@ -1843,8 +1985,8 @@ onlyInIvy('Ivy i18n logic').describe('runtime i18n', () => {
     const innerDiv: HTMLElement = fixture.nativeElement.querySelector('div[inner]');
 
     // Note that ideally we'd just compare the innerHTML here, but different browsers return
-    // the order of attributes differently. E.g. most browsers preserve the declaration order,
-    // but IE does not.
+    // the order of attributes differently. E.g. most browsers preserve the declaration
+    // order, but IE does not.
     expect(outerDiv.getAttribute('title')).toBe('début 2 milieu 1 fin');
     expect(outerDiv.getAttribute('class')).toBe('foo');
     expect(outerDiv.textContent!.trim()).toBe('traduction: un email');
@@ -2228,13 +2370,13 @@ onlyInIvy('Ivy i18n logic').describe('runtime i18n', () => {
       fixture.detectChanges();
       expect(fixture.nativeElement.innerHTML)
           .toEqual(
-              `<child><div>Contenu enfant et projection depuis Parent<!--ICU 15--></div></child>`);
+              `<child><div>Contenu enfant et projection depuis Parent<!--ICU 21:0--></div></child>`);
 
       fixture.componentRef.instance.name = 'angular';
       fixture.detectChanges();
       expect(fixture.nativeElement.innerHTML)
           .toEqual(
-              `<child><div>Contenu enfant et projection depuis Angular<!--ICU 15--></div></child>`);
+              `<child><div>Contenu enfant et projection depuis Angular<!--ICU 21:0--></div></child>`);
     });
 
     it(`shouldn't project deleted projections in i18n blocks`, () => {
@@ -2587,6 +2729,301 @@ onlyInIvy('Ivy i18n logic').describe('runtime i18n', () => {
       expect(fixture.nativeElement.textContent).toContain('a b');
     });
   });
+
+  describe('viewContainerRef with i18n', () => {
+    it('should create ViewContainerRef with i18n', () => {
+      // This test demonstrates an issue with creating a `ViewContainerRef` and having i18n at the
+      // parent element. The reason this broke is that in this case the `ViewContainerRef` creates
+      // an dynamic anchor comment but uses `HostTNode` for it which is incorrect. `appendChild`
+      // then tries to add internationalization to the comment node and fails.
+      @Component({
+        template: `
+            <div i18n>before|<div myDir>inside</div>|after</div>
+          `
+      })
+      class MyApp {
+      }
+
+      @Directive({selector: '[myDir]'})
+      class MyDir {
+        constructor(vcRef: ViewContainerRef) {
+          myDir = this;
+        }
+      }
+      let myDir!: MyDir;
+
+
+      TestBed.configureTestingModule({declarations: [MyApp, MyDir]});
+      const fixture = TestBed.createComponent(MyApp);
+      fixture.detectChanges();
+      expect(myDir).toBeDefined();
+      expect(fixture.nativeElement.textContent).toEqual(`before|inside|after`);
+    });
+  });
+
+  it('should create ICU with attributes', () => {
+    // This test demonstrates an issue with setting attributes on ICU elements.
+    // NOTE: This test is extracted from g3.
+    @Component({
+      template: `
+            <h1 class="num-cart-items" i18n *ngIf="true">{
+              registerItemCount, plural,
+              =0 {Your cart}
+              =1 {Your cart <span class="item-count">(1 item)</span>}
+              other {
+                Your cart <span class="item-count">({{
+                  registerItemCount
+                }} items)</span>
+              }
+          }</h1>`
+    })
+    class MyApp {
+      registerItemCount = 1;
+    }
+
+    TestBed.configureTestingModule({declarations: [MyApp]});
+    const fixture = TestBed.createComponent(MyApp);
+    fixture.detectChanges();
+    expect(fixture.nativeElement.textContent).toEqual(`Your cart (1 item)`);
+  });
+
+  it('should not insertBeforeIndex non-projected content text', () => {
+    // This test demonstrates an issue with setting attributes on ICU elements.
+    // NOTE: This test is extracted from g3.
+    @Component({template: `<div i18n>before|<child>TextNotProjected</child>|after</div>`})
+    class MyApp {
+    }
+
+    @Component({
+      selector: 'child',
+      template: 'CHILD',
+    })
+    class Child {
+    }
+
+    TestBed.configureTestingModule({declarations: [MyApp, Child]});
+    const fixture = TestBed.createComponent(MyApp);
+    fixture.detectChanges();
+    expect(fixture.nativeElement.textContent).toEqual(`before|CHILD|after`);
+  });
+
+  it('should create a pipe inside i18n block', () => {
+    // This test demonstrates an issue with i18n messing up `getCurrentTNode` which subsequently
+    // breaks the DI. The issue is that the `i18nStartFirstCreatePass` would create placeholder
+    // NODES, and than leave `getCurrentTNode` in undetermined state which would then break DI.
+    // NOTE: This test is extracted from g3.
+    @Component({
+      template: `
+      <div i18n [title]="null | async"><div>A</div></div>
+      <div i18n>{{(null | async)||'B'}}<div></div></div>`
+    })
+    class MyApp {
+    }
+
+    TestBed.configureTestingModule({declarations: [MyApp]});
+    const fixture = TestBed.createComponent(MyApp);
+    fixture.detectChanges();
+    expect(fixture.nativeElement.textContent).toEqual(`AB`);
+  });
+
+
+  it('should copy injector information unto placeholder', () => {
+    // This test demonstrates an issue with i18n Placeholders loosing `injectorIndex` information.
+    // NOTE: This test is extracted from g3.
+    @Component({
+      template: `
+        <parent i18n>
+          <middle>
+            <child>Text</child>
+          </middle>
+        </parent>`
+    })
+    class MyApp {
+    }
+
+    @Component({selector: 'parent'})
+    class Parent {
+    }
+
+    @Component({selector: 'middle'})
+    class Middle {
+    }
+    @Component({selector: 'child'})
+    class Child {
+      constructor(public middle: Middle) {
+        child = this;
+      }
+    }
+    let child!: Child;
+
+
+    TestBed.configureTestingModule({declarations: [MyApp, Parent, Middle, Child]});
+    const fixture = TestBed.createComponent(MyApp);
+    fixture.detectChanges();
+    expect(child.middle).toBeInstanceOf(Middle);
+  });
+
+  it('should allow container in gotClosestRElement', () => {
+    // A second iteration of the loop will have `Container` `TNode`s pass through the system.
+    // NOTE: This test is extracted from g3.
+    @Component({
+      template: `
+      <div *ngFor="let i of [1,2]">
+        <ng-template #tmpl i18n><span *ngIf="true">X</span></ng-template>
+        <span [ngTemplateOutlet]="tmpl"></span>
+      </div>`
+    })
+    class MyApp {
+    }
+
+    TestBed.configureTestingModule({declarations: [MyApp]});
+    const fixture = TestBed.createComponent(MyApp);
+    fixture.detectChanges();
+    expect(fixture.nativeElement.textContent).toEqual(`XX`);
+  });
+
+
+  it('should link text after ICU', () => {
+    // i18n block must restore the current `currentTNode` so that trailing text node can link to it.
+    // NOTE: This test is extracted from g3.
+    @Component({
+      template: `
+        <ng-container *ngFor="let index of [1, 2]">
+          {{'['}}
+          {index, plural, =1 {1} other {*}}
+          {index, plural, =1 {one} other {many}}
+          {{'-'}}
+          <span>+</span>
+          {{'-'}}
+          {index, plural, =1 {first} other {rest}}
+          {{']'}}
+        </ng-container>
+        /
+        <ng-container *ngFor="let index of [1, 2]" i18n>
+          {{'['}}
+          {index, plural, =1 {1} other {*}}
+          {index, plural, =1 {one} other {many}}
+          {{'-'}}
+          <span>+</span>
+          {{'-'}}
+          {index, plural, =1 {first} other {rest}}
+          {{']'}}
+        </ng-container>
+      `
+    })
+    class MyApp {
+    }
+
+    TestBed.configureTestingModule({declarations: [MyApp]});
+    const fixture = TestBed.createComponent(MyApp);
+    fixture.detectChanges();
+    const textContent = fixture.nativeElement.textContent as string;
+    expect(textContent.split('/').map(s => s.trim())).toEqual([
+      '[ 1 one - + - first ]  [ * many - + - rest ]',
+      '[ 1 one - + - first ]  [ * many - + - rest ]',
+    ]);
+  });
+
+  it('should ignore non-instantiated ICUs on update', () => {
+    // Demonstrates an issue of same selector expression used in nested ICUs, causes non
+    // instantiated nested ICUs to be updated.
+    // NOTE: This test is extracted from g3.
+    @Component({
+      template: `
+        before|
+        { retention.unit, select,
+          SECONDS {
+              {retention.durationInUnits, plural,
+                  =1 {1 second}
+                  other {{{retention.durationInUnits}} seconds}
+                  }
+              }
+          DAYS {
+              {retention.durationInUnits, plural,
+                  =1 {1 day}
+                  other {{{retention.durationInUnits}} days}
+                  }
+              }
+          MONTHS {
+              {retention.durationInUnits, plural,
+                  =1 {1 month}
+                  other {{{retention.durationInUnits}} months}
+                  }
+              }
+          YEARS {
+              {retention.durationInUnits, plural,
+                  =1 {1 year}
+                  other {{{retention.durationInUnits}} years}
+                  }
+              }
+          other {}
+          }
+        |after.
+      `
+    })
+    class MyApp {
+      retention = {
+        durationInUnits: 10,
+        unit: 'SECONDS',
+      };
+    }
+
+    TestBed.configureTestingModule({declarations: [MyApp]});
+    const fixture = TestBed.createComponent(MyApp);
+    fixture.detectChanges();
+    const textContent = fixture.nativeElement.textContent as string;
+    expect(textContent.replace(/\s+/g, ' ').trim()).toEqual(`before| 10 seconds |after.`);
+  });
+
+  it('should render attributes defined in ICUs', () => {
+    // NOTE: This test is extracted from g3.
+    @Component({
+      template: `
+        <div i18n>{
+          parameters.length,
+          plural,
+          =1 {Affects parameter <span class="parameter-name" attr="should_be_present">{{parameters[0].name}}</span>}
+          other {Affects {{parameters.length}} parameters, including <span
+              class="parameter-name">{{parameters[0].name}}</span>}
+          }</div>
+        `
+    })
+    class MyApp {
+      parameters = [{name: 'void_abt_param'}];
+    }
+
+    TestBed.configureTestingModule({declarations: [MyApp]});
+    const fixture = TestBed.createComponent(MyApp);
+    fixture.detectChanges();
+    const span = (fixture.nativeElement as HTMLElement).querySelector('span')!;
+    expect(span.getAttribute('attr')).toEqual('should_be_present');
+    expect(span.getAttribute('class')).toEqual('parameter-name');
+  });
+
+  it('should support different ICUs cases for each *ngFor iteration', () => {
+    @Component({
+      template: `
+      <ul i18n>
+        <li *ngFor="let item of items">{
+          item, plural,
+          =1 {<b>one</b>}
+          =2 {<i>two</i>}
+      },</li>
+      </ul>`
+    })
+    class MyApp {
+      items = [1, 2];
+    }
+
+    TestBed.configureTestingModule({declarations: [MyApp]});
+    const fixture = TestBed.createComponent(MyApp);
+    fixture.detectChanges();
+    expect(fixture.nativeElement.textContent).toEqual(`one,two,`);
+
+    fixture.componentInstance.items = [2, 1];
+    fixture.detectChanges();
+    expect(fixture.nativeElement.textContent).toEqual(`two,one,`);
+  });
 });
 
 function initWithTemplate(compType: Type<any>, template: string) {
diff --git a/packages/core/test/acceptance/integration_spec.ts b/packages/core/test/acceptance/integration_spec.ts
index 9cef7b2cf6b89..5d07cbcefa4d8 100644
--- a/packages/core/test/acceptance/integration_spec.ts
+++ b/packages/core/test/acceptance/integration_spec.ts
@@ -53,7 +53,7 @@ describe('acceptance integration tests', () => {
       expect(fixture.nativeElement.innerHTML).toEqual('<h1>Hello, World!</h1>');
       onlyInIvy('perf counters').expectPerfCounters({
         tView: 2,  // Host view + App
-        tNode: 4,  // Host Node + App Node + <span> + #text
+        tNode: 3,  // Host Node + <h1> + #text
       });
 
       fixture.componentInstance.name = 'New World';
@@ -63,7 +63,7 @@ describe('acceptance integration tests', () => {
       // Assert that the tView/tNode count does not increase (they are correctly cached)
       onlyInIvy('perf counters').expectPerfCounters({
         tView: 2,
-        tNode: 4,
+        tNode: 3,
       });
     });
   });
diff --git a/packages/core/test/acceptance/ngmodule_scope_spec.ts b/packages/core/test/acceptance/ngmodule_scope_spec.ts
new file mode 100644
index 0000000000000..3f6e167b9a7ee
--- /dev/null
+++ b/packages/core/test/acceptance/ngmodule_scope_spec.ts
@@ -0,0 +1,58 @@
+/**
+ * @license
+ * Copyright Google LLC 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, destroyPlatform, NgModule, Pipe, PipeTransform} from '@angular/core';
+import {BrowserModule} from '@angular/platform-browser';
+import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
+import {withBody} from '@angular/private/testing';
+
+describe('NgModule scopes', () => {
+  beforeEach(destroyPlatform);
+  afterEach(destroyPlatform);
+
+  it('should apply NgModule scope to a component that extends another component class',
+     withBody('<my-app></my-app>', async () => {
+       // Regression test for https://github.com/angular/angular/issues/37105
+       //
+       // This test reproduces a scenario that used to fail due to a reentrancy issue in Ivy's JIT
+       // compiler. Extending a component from a decorated baseclass would inadvertently compile
+       // the subclass twice. NgModule scope information would only be present on the initial
+       // compilation, but then overwritten during the second compilation. This meant that the
+       // baseclass did not have a NgModule scope, such that declarations are not available.
+       //
+       // The scenario cannot be tested using TestBed as it influences how NgModule
+       // scopes are applied, preventing the issue from occurring.
+
+       @Pipe({name: 'multiply'})
+       class MultiplyPipe implements PipeTransform {
+         transform(value: number, factor: number): number {
+           return value * factor;
+         }
+       }
+
+       @Component({template: '...'})
+       class BaseComponent {
+       }
+
+       @Component({selector: 'my-app', template: 'App - {{ 3 | multiply:2 }}'})
+       class App extends BaseComponent {
+       }
+
+       @NgModule({
+         imports: [BrowserModule],
+         declarations: [App, BaseComponent, MultiplyPipe],
+         bootstrap: [App],
+       })
+       class Mod {
+       }
+
+       const ngModuleRef = await platformBrowserDynamic().bootstrapModule(Mod);
+       expect(document.body.textContent).toContain('App - 6');
+       ngModuleRef.destroy();
+     }));
+});
diff --git a/packages/core/test/acceptance/pipe_spec.ts b/packages/core/test/acceptance/pipe_spec.ts
index 2befc8e240881..22a38f77298c3 100644
--- a/packages/core/test/acceptance/pipe_spec.ts
+++ b/packages/core/test/acceptance/pipe_spec.ts
@@ -6,9 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ChangeDetectionStrategy, ChangeDetectorRef, Component, Directive, Inject, Injectable, InjectionToken, Input, NgModule, OnDestroy, Pipe, PipeTransform, ViewChild} from '@angular/core';
+import {ChangeDetectionStrategy, ChangeDetectorRef, Component, Directive, Inject, Injectable, InjectionToken, Input, NgModule, OnChanges, OnDestroy, Pipe, PipeTransform, SimpleChanges, ViewChild, WrappedValue} from '@angular/core';
 import {TestBed} from '@angular/core/testing';
 import {expect} from '@angular/platform-browser/testing/src/matchers';
+import {ivyEnabled} from '@angular/private/testing';
 
 describe('pipe', () => {
   @Pipe({name: 'countingPipe'})
@@ -285,6 +286,133 @@ describe('pipe', () => {
     expect(fixture.nativeElement).toHaveText('a');
   });
 
+  describe('pipes within an optional chain', () => {
+    it('should not dirty unrelated inputs', () => {
+      // https://github.com/angular/angular/issues/37194
+      // https://github.com/angular/angular/issues/37591
+      // Using a pipe in the LHS of safe navigation operators would clobber unrelated bindings
+      // iff the pipe returns WrappedValue, incorrectly causing the unrelated binding
+      // to be considered changed.
+      const log: string[] = [];
+
+      @Component({template: `<my-cmp [value1]="1" [value2]="(value2 | pipe)?.id"></my-cmp>`})
+      class App {
+        value2 = {id: 2};
+      }
+
+      @Component({selector: 'my-cmp', template: ''})
+      class MyCmp {
+        @Input()
+        set value1(value1: number) {
+          log.push(`set value1=${value1}`);
+        }
+
+        @Input()
+        set value2(value2: number) {
+          log.push(`set value2=${value2}`);
+        }
+      }
+
+      @Pipe({name: 'pipe'})
+      class MyPipe implements PipeTransform {
+        transform(value: any): any {
+          log.push('pipe');
+          return WrappedValue.wrap(value);
+        }
+      }
+
+      TestBed.configureTestingModule({declarations: [App, MyCmp, MyPipe]});
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges(/* checkNoChanges */ false);
+
+      // Both bindings should have been set. Note: ViewEngine evaluates the pipe out-of-order,
+      // before setting inputs.
+      expect(log).toEqual(
+          ivyEnabled ?
+              [
+                'set value1=1',
+                'pipe',
+                'set value2=2',
+              ] :
+              [
+                'pipe',
+                'set value1=1',
+                'set value2=2',
+              ]);
+      log.length = 0;
+
+      fixture.componentInstance.value2 = {id: 3};
+      fixture.detectChanges(/* checkNoChanges */ false);
+
+      // value1 did not change, so it should not have been set.
+      expect(log).toEqual([
+        'pipe',
+        'set value2=3',
+      ]);
+    });
+
+    it('should not include unrelated inputs in ngOnChanges', () => {
+      // https://github.com/angular/angular/issues/37194
+      // https://github.com/angular/angular/issues/37591
+      // Using a pipe in the LHS of safe navigation operators would clobber unrelated bindings
+      // iff the pipe returns WrappedValue, incorrectly causing the unrelated binding
+      // to be considered changed.
+      const log: string[] = [];
+
+      @Component({template: `<my-cmp [value1]="1" [value2]="(value2 | pipe)?.id"></my-cmp>`})
+      class App {
+        value2 = {id: 2};
+      }
+
+      @Component({selector: 'my-cmp', template: ''})
+      class MyCmp implements OnChanges {
+        @Input() value1!: number;
+
+        @Input() value2!: number;
+
+        ngOnChanges(changes: SimpleChanges): void {
+          if (changes.value1) {
+            const {previousValue, currentValue, firstChange} = changes.value1;
+            log.push(`change value1: ${previousValue} -> ${currentValue} (${firstChange})`);
+          }
+          if (changes.value2) {
+            const {previousValue, currentValue, firstChange} = changes.value2;
+            log.push(`change value2: ${previousValue} -> ${currentValue} (${firstChange})`);
+          }
+        }
+      }
+
+      @Pipe({name: 'pipe'})
+      class MyPipe implements PipeTransform {
+        transform(value: any): any {
+          log.push('pipe');
+          return WrappedValue.wrap(value);
+        }
+      }
+
+      TestBed.configureTestingModule({declarations: [App, MyCmp, MyPipe]});
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges(/* checkNoChanges */ false);
+
+      // Both bindings should have been included in ngOnChanges.
+      expect(log).toEqual([
+        'pipe',
+        'change value1: undefined -> 1 (true)',
+        'change value2: undefined -> 2 (true)',
+      ]);
+      log.length = 0;
+
+      fixture.componentInstance.value2 = {id: 3};
+      fixture.detectChanges(/* checkNoChanges */ false);
+
+      // value1 did not change, so it should not have been included in ngOnChanges
+      expect(log).toEqual([
+        'pipe',
+        'change value2: 2 -> 3 (false)',
+      ]);
+    });
+  });
+
   describe('pure', () => {
     it('should call pure pipes only if the arguments change', () => {
       @Component({
diff --git a/packages/core/test/acceptance/query_spec.ts b/packages/core/test/acceptance/query_spec.ts
index 3ee127eed362c..341f4f45c9600 100644
--- a/packages/core/test/acceptance/query_spec.ts
+++ b/packages/core/test/acceptance/query_spec.ts
@@ -1631,6 +1631,179 @@ describe('query logic', () => {
       expect(groups[2]).toBeUndefined();
     });
   });
+
+  describe('querying for string token providers', () => {
+    @Directive({
+      selector: '[text-token]',
+      providers: [{provide: 'Token', useExisting: TextTokenDirective}],
+    })
+    class TextTokenDirective {
+    }
+
+    it('should match string injection token in a ViewChild query', () => {
+      @Component({template: '<div text-token></div>'})
+      class App {
+        @ViewChild('Token') token: any;
+      }
+
+      TestBed.configureTestingModule({declarations: [App, TextTokenDirective]});
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+      expect(fixture.componentInstance.token).toBeAnInstanceOf(TextTokenDirective);
+    });
+
+    it('should give precedence to local reference if both a reference and a string injection token provider match a ViewChild query',
+       () => {
+         @Component({template: '<div text-token #Token></div>'})
+         class App {
+           @ViewChild('Token') token: any;
+         }
+
+         TestBed.configureTestingModule({declarations: [App, TextTokenDirective]});
+         const fixture = TestBed.createComponent(App);
+         fixture.detectChanges();
+         expect(fixture.componentInstance.token).toBeAnInstanceOf(ElementRef);
+       });
+
+    it('should match string injection token in a ViewChildren query', () => {
+      @Component({template: '<div text-token></div>'})
+      class App {
+        @ViewChildren('Token') tokens!: QueryList<any>;
+      }
+
+      TestBed.configureTestingModule({declarations: [App, TextTokenDirective]});
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+
+      const tokens = fixture.componentInstance.tokens;
+      expect(tokens.length).toBe(1);
+      expect(tokens.first).toBeAnInstanceOf(TextTokenDirective);
+    });
+
+    it('should match both string injection token and local reference inside a ViewChildren query',
+       () => {
+         @Component({template: '<div text-token #Token></div>'})
+         class App {
+           @ViewChildren('Token') tokens!: QueryList<any>;
+         }
+
+         TestBed.configureTestingModule({declarations: [App, TextTokenDirective]});
+         const fixture = TestBed.createComponent(App);
+         fixture.detectChanges();
+
+         expect(fixture.componentInstance.tokens.toArray()).toEqual([
+           jasmine.any(ElementRef), jasmine.any(TextTokenDirective)
+         ]);
+       });
+
+    it('should match string injection token in a ContentChild query', () => {
+      @Component({selector: 'has-query', template: '<ng-content></ng-content>'})
+      class HasQuery {
+        @ContentChild('Token') token: any;
+      }
+
+      @Component({template: '<has-query><div text-token></div></has-query>'})
+      class App {
+        @ViewChild(HasQuery) queryComp!: HasQuery;
+      }
+
+      TestBed.configureTestingModule({declarations: [App, HasQuery, TextTokenDirective]});
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+
+      expect(fixture.componentInstance.queryComp.token).toBeAnInstanceOf(TextTokenDirective);
+    });
+
+    it('should give precedence to local reference if both a reference and a string injection token provider match a ContentChild query',
+       () => {
+         @Component({selector: 'has-query', template: '<ng-content></ng-content>'})
+         class HasQuery {
+           @ContentChild('Token') token: any;
+         }
+
+         @Component({template: '<has-query><div text-token #Token></div></has-query>'})
+         class App {
+           @ViewChild(HasQuery) queryComp!: HasQuery;
+         }
+
+         TestBed.configureTestingModule({declarations: [App, HasQuery, TextTokenDirective]});
+         const fixture = TestBed.createComponent(App);
+         fixture.detectChanges();
+
+         expect(fixture.componentInstance.queryComp.token).toBeAnInstanceOf(ElementRef);
+       });
+
+    it('should match string injection token in a ContentChildren query', () => {
+      @Component({selector: 'has-query', template: '<ng-content></ng-content>'})
+      class HasQuery {
+        @ContentChildren('Token') tokens!: QueryList<any>;
+      }
+
+      @Component({template: '<has-query><div text-token></div></has-query>'})
+      class App {
+        @ViewChild(HasQuery) queryComp!: HasQuery;
+      }
+
+      TestBed.configureTestingModule({declarations: [App, HasQuery, TextTokenDirective]});
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+
+      const tokens = fixture.componentInstance.queryComp.tokens;
+      expect(tokens.length).toBe(1);
+      expect(tokens.first).toBeAnInstanceOf(TextTokenDirective);
+    });
+
+    it('should match both string injection token and local reference inside a ContentChildren query',
+       () => {
+         @Component({selector: 'has-query', template: '<ng-content></ng-content>'})
+         class HasQuery {
+           @ContentChildren('Token') tokens!: QueryList<any>;
+         }
+
+         @Component({template: '<has-query><div text-token #Token></div></has-query>'})
+         class App {
+           @ViewChild(HasQuery) queryComp!: HasQuery;
+         }
+
+         TestBed.configureTestingModule({declarations: [App, HasQuery, TextTokenDirective]});
+         const fixture = TestBed.createComponent(App);
+         fixture.detectChanges();
+
+         expect(fixture.componentInstance.queryComp.tokens.toArray()).toEqual([
+           jasmine.any(ElementRef), jasmine.any(TextTokenDirective)
+         ]);
+       });
+
+    it('should match string token specified through the `read` option of a view query', () => {
+      @Component({template: '<div text-token #Token></div>'})
+      class App {
+        @ViewChild('Token', {read: 'Token'}) token: any;
+      }
+
+      TestBed.configureTestingModule({declarations: [App, TextTokenDirective]});
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+      expect(fixture.componentInstance.token).toBeAnInstanceOf(TextTokenDirective);
+    });
+
+    it('should match string token specified through the `read` option of a content query', () => {
+      @Component({selector: 'has-query', template: '<ng-content></ng-content>'})
+      class HasQuery {
+        @ContentChild('Token', {read: 'Token'}) token: any;
+      }
+
+      @Component({template: '<has-query><div text-token #Token></div></has-query>'})
+      class App {
+        @ViewChild(HasQuery) queryComp!: HasQuery;
+      }
+
+      TestBed.configureTestingModule({declarations: [App, HasQuery, TextTokenDirective]});
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+
+      expect(fixture.componentInstance.queryComp.token).toBeAnInstanceOf(TextTokenDirective);
+    });
+  });
 });
 
 function initWithTemplate(compType: Type<any>, template: string) {
diff --git a/packages/core/test/acceptance/styling_spec.ts b/packages/core/test/acceptance/styling_spec.ts
index 8431c9b79e06e..df12c82c9b7a6 100644
--- a/packages/core/test/acceptance/styling_spec.ts
+++ b/packages/core/test/acceptance/styling_spec.ts
@@ -214,28 +214,51 @@ describe('styling', () => {
     });
   });
 
-  describe('css variables', () => {
-    onlyInIvy('css variables').it('should support css variables', () => {
+  onlyInIvy('CSS variables are only supported in Ivy').describe('css variables', () => {
+    const supportsCssVariables = typeof getComputedStyle !== 'undefined' &&
+        typeof CSS !== 'undefined' && typeof CSS.supports !== 'undefined' &&
+        CSS.supports('color', 'var(--fake-var)');
+
+    it('should support css variables', () => {
       // This test only works in browsers which support CSS variables.
-      if (!(typeof getComputedStyle !== 'undefined' && typeof CSS !== 'undefined' &&
-            typeof CSS.supports !== 'undefined' && CSS.supports('color', 'var(--fake-var)')))
+      if (!supportsCssVariables) {
         return;
+      }
+
       @Component({
         template: `
-            <div [style.--my-var]=" '100px' ">
-              <span style="width: var(--my-var)">CONTENT</span>
-            </div>`
+          <div [style.--my-var]="'100px'">
+            <span style="width: var(--my-var)">CONTENT</span>
+          </div>
+        `
       })
       class Cmp {
       }
       TestBed.configureTestingModule({declarations: [Cmp]});
       const fixture = TestBed.createComponent(Cmp);
-      // document.body.appendChild(fixture.nativeElement);
       fixture.detectChanges();
 
       const span = fixture.nativeElement.querySelector('span') as HTMLElement;
       expect(getComputedStyle(span).getPropertyValue('width')).toEqual('100px');
     });
+
+    it('should support css variables with numbers in their name inside a host binding', () => {
+      // This test only works in browsers which support CSS variables.
+      if (!supportsCssVariables) {
+        return;
+      }
+
+      @Component({template: `<h1 style="width: var(--my-1337-var)">Hello</h1>`})
+      class Cmp {
+        @HostBinding('style') style = '--my-1337-var: 100px;';
+      }
+      TestBed.configureTestingModule({declarations: [Cmp]});
+      const fixture = TestBed.createComponent(Cmp);
+      fixture.detectChanges();
+
+      const header = fixture.nativeElement.querySelector('h1') as HTMLElement;
+      expect(getComputedStyle(header).getPropertyValue('width')).toEqual('100px');
+    });
   });
 
   modifiedInIvy('shadow bindings include static portion')
@@ -774,7 +797,7 @@ describe('styling', () => {
 
     onlyInIvy('perf counters').expectPerfCounters({
       rendererSetStyle: 1,
-      tNode: 3,
+      tNode: 2,
     });
   });
 
@@ -3437,8 +3460,8 @@ describe('styling', () => {
       if (!ivyEnabled && !supportsWritingStringsToStyleProperty()) {
         // VE does not treat `[style]` as anything special, instead it simply writes to the
         // `style` property on the element like so `element.style=value`. This seems to work fine
-        // every where except ie10, where it throws an error and as a consequence this test fails in
-        // VE on ie10.
+        // every where except IE11, where it throws an error and as a consequence this test fails in
+        // VE on IE11.
         return;
       }
       @Component({template: `<div [style]="style"></div>`})
@@ -3456,7 +3479,7 @@ describe('styling', () => {
     /**
      * Tests to see if the current browser supports non standard way of writing into styles.
      *
-     * This is not the correct way to write to style and is not supported in ie10.
+     * This is not the correct way to write to style and is not supported in IE11.
      * ```
      * div.style = 'color: white';
      * ```
@@ -3467,7 +3490,7 @@ describe('styling', () => {
      * ```
      *
      * Even though writing to `div.style` is not officially supported, it works in all
-     * browsers except ie10.
+     * browsers except IE11.
      *
      * This function detects this condition and allows us to skip the test.
      */
diff --git a/packages/core/test/acceptance/view_container_ref_spec.ts b/packages/core/test/acceptance/view_container_ref_spec.ts
index 002028a1069f4..bc97b91aa2495 100644
--- a/packages/core/test/acceptance/view_container_ref_spec.ts
+++ b/packages/core/test/acceptance/view_container_ref_spec.ts
@@ -8,7 +8,7 @@
 
 import {CommonModule, DOCUMENT} from '@angular/common';
 import {computeMsgId} from '@angular/compiler';
-import {Compiler, Component, ComponentFactoryResolver, Directive, DoCheck, ElementRef, EmbeddedViewRef, ErrorHandler, Injector, NgModule, NO_ERRORS_SCHEMA, OnInit, Pipe, PipeTransform, QueryList, RendererFactory2, RendererType2, Sanitizer, TemplateRef, ViewChild, ViewChildren, ViewContainerRef, ɵsetDocument} from '@angular/core';
+import {Compiler, Component, ComponentFactoryResolver, Directive, DoCheck, ElementRef, EmbeddedViewRef, ErrorHandler, Injector, NgModule, NO_ERRORS_SCHEMA, OnDestroy, OnInit, Pipe, PipeTransform, QueryList, RendererFactory2, RendererType2, Sanitizer, TemplateRef, ViewChild, ViewChildren, ViewContainerRef, ɵsetDocument} from '@angular/core';
 import {Input} from '@angular/core/src/metadata';
 import {ngDevModeResetPerfCounters} from '@angular/core/src/util/ng_dev_mode';
 import {TestBed, TestComponentRenderer} from '@angular/core/testing';
@@ -936,6 +936,62 @@ describe('ViewContainerRef', () => {
     });
   });
 
+  describe('dependant views', () => {
+    it('should not throw when view removes another view upon removal', () => {
+      @Component({
+        template: `
+          <div *ngIf="visible" [template]="parent">I host a template</div>
+          <ng-template #parent>
+              <div [template]="child">I host a child template</div>
+          </ng-template>
+          <ng-template #child>
+              I am child template
+          </ng-template>
+        `
+      })
+      class AppComponent {
+        visible = true;
+
+        constructor(private readonly vcr: ViewContainerRef) {}
+
+        add<C>(template: TemplateRef<C>): EmbeddedViewRef<C> {
+          return this.vcr.createEmbeddedView(template);
+        }
+
+        remove<C>(viewRef: EmbeddedViewRef<C>) {
+          this.vcr.remove(this.vcr.indexOf(viewRef));
+        }
+      }
+
+      @Directive({selector: '[template]'})
+      class TemplateDirective<C> implements OnInit, OnDestroy {
+        @Input() template !: TemplateRef<C>;
+        ref!: EmbeddedViewRef<C>;
+
+        constructor(private readonly host: AppComponent) {}
+
+        ngOnInit() {
+          this.ref = this.host.add(this.template);
+          this.ref.detectChanges();
+        }
+
+        ngOnDestroy() {
+          this.host.remove(this.ref);
+        }
+      }
+
+      TestBed.configureTestingModule({
+        imports: [CommonModule],
+        declarations: [AppComponent, TemplateDirective],
+      });
+
+      const fixture = TestBed.createComponent(AppComponent);
+      fixture.detectChanges();
+      fixture.componentRef.instance.visible = false;
+      fixture.detectChanges();
+    });
+  });
+
   describe('createEmbeddedView (incl. insert)', () => {
     it('should work on elements', () => {
       @Component({
diff --git a/packages/core/test/animation/animation_integration_spec.ts b/packages/core/test/animation/animation_integration_spec.ts
index 648c4967aff07..02f5704682701 100644
--- a/packages/core/test/animation/animation_integration_spec.ts
+++ b/packages/core/test/animation/animation_integration_spec.ts
@@ -2510,6 +2510,33 @@ describe('animation tests', function() {
     });
   });
 
+  it('should not animate i18n insertBefore', () => {
+    // I18n uses `insertBefore` API to insert nodes in correct order. Animation assumes that
+    // any `insertBefore` is a move and tries to animate it.
+    // NOTE: This test was extracted from `g3`
+    @Component({
+      template: `<div i18n>Hello <span>World</span>!</div>`,
+      animations: [
+        trigger(
+            'myAnimation',
+            [
+              transition('* => *', [animate(1000)]),
+            ]),
+      ]
+    })
+    class Cmp {
+    }
+
+    TestBed.configureTestingModule({declarations: [Cmp]});
+    const fixture = TestBed.createComponent(Cmp);
+    fixture.detectChanges();
+    const players = getLog();
+    const span = fixture.debugElement.nativeElement.querySelector('span');
+    expect(span.innerText).toEqual('World');
+    // We should not insert `ng-star-inserted` into the span class.
+    expect(span.className).not.toContain('ng-star-inserted');
+  });
+
   describe('animation listeners', () => {
     it('should trigger a `start` state change listener for when the animation changes state from void => state',
        fakeAsync(() => {
diff --git a/packages/core/test/bundling/README.md b/packages/core/test/bundling/README.md
index 9eb215b81ecda..80ea46be31362 100644
--- a/packages/core/test/bundling/README.md
+++ b/packages/core/test/bundling/README.md
@@ -1,13 +1,23 @@
 # Bundle
 
 ## `js_expected_symbol_test`
-This folder contains tests which assert that most of the code is tree shaken away. 
-This is asserted by keeping gold files of all symbols which are expected to be retained. 
+This folder contains tests which assert that most of the code is tree shaken away.
+This is asserted by keeping gold files of all symbols which are expected to be retained.
 When doing renaming it is often necessary to update the gold files, to do so use these commands:
 
 ```
+yarn bazel run --config=ivy //packages/core/test/bundling/injection:symbol_test.accept
 yarn bazel run --config=ivy //packages/core/test/bundling/cyclic_import:symbol_test.accept
+yarn bazel run --config=ivy //packages/core/test/bundling/forms:symbol_test.accept
 yarn bazel run --config=ivy //packages/core/test/bundling/hello_world:symbol_test.accept
-yarn bazel run --config=ivy //packages/core/test/bundling/injection:symbol_test.accept
+yarn bazel run --config=ivy //packages/core/test/bundling/router:symbol_test.accept
 yarn bazel run --config=ivy //packages/core/test/bundling/todo:symbol_test.accept
-```
\ No newline at end of file
+```
+
+## Running all symbol tests
+To run all symbol tests with one command, you can use the following scripts:
+
+```
+yarn run symbol-extractor:check
+yarn run symbol-extractor:update
+```
diff --git a/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json b/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json
index c2ba0e34b1824..96d90bb28b104 100644
--- a/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json
@@ -155,9 +155,6 @@
   {
     "name": "generatePropertyAliases"
   },
-  {
-    "name": "getCheckNoChangesMode"
-  },
   {
     "name": "getClosureSafeProperty"
   },
@@ -171,13 +168,13 @@
     "name": "getConstant"
   },
   {
-    "name": "getFirstLContainer"
+    "name": "getCurrentTNode"
   },
   {
-    "name": "getIsParent"
+    "name": "getCurrentTNodePlaceholderOk"
   },
   {
-    "name": "getLContainer"
+    "name": "getFirstLContainer"
   },
   {
     "name": "getLView"
@@ -203,9 +200,6 @@
   {
     "name": "getOrCreateTNode"
   },
-  {
-    "name": "getPreviousOrParentTNode"
-  },
   {
     "name": "getSimpleChangesStore"
   },
@@ -249,10 +243,13 @@
     "name": "isCssClassMatching"
   },
   {
-    "name": "isInlineTemplate"
+    "name": "isCurrentTNodeParent"
+  },
+  {
+    "name": "isInCheckNoChangesMode"
   },
   {
-    "name": "isLContainer"
+    "name": "isInlineTemplate"
   },
   {
     "name": "isNodeMatchingSelector"
@@ -287,6 +284,9 @@
   {
     "name": "nativeAppendOrInsertBefore"
   },
+  {
+    "name": "nativeInsertBefore"
+  },
   {
     "name": "nextNgElementId"
   },
@@ -329,6 +329,9 @@
   {
     "name": "setCurrentQueryIndex"
   },
+  {
+    "name": "setCurrentTNode"
+  },
   {
     "name": "setDirectiveInputsWhichShadowsStyling"
   },
@@ -341,18 +344,12 @@
   {
     "name": "setInputsFromAttrs"
   },
-  {
-    "name": "setPreviousOrParentTNode"
-  },
   {
     "name": "setSelectedIndex"
   },
   {
     "name": "setUpAttributes"
   },
-  {
-    "name": "throwMultipleComponentError"
-  },
   {
     "name": "unwrapRNode"
   },
diff --git a/packages/core/test/bundling/forms/bundle.golden_symbols.json b/packages/core/test/bundling/forms/bundle.golden_symbols.json
index 53a49c913c30b..30129f0e8b5d7 100644
--- a/packages/core/test/bundling/forms/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/forms/bundle.golden_symbols.json
@@ -221,15 +221,6 @@
   {
     "name": "FormControlName"
   },
-  {
-    "name": "FormErrorExamples_formControlName"
-  },
-  {
-    "name": "FormErrorExamples_formGroupName"
-  },
-  {
-    "name": "FormErrorExamples_ngModelGroup"
-  },
   {
     "name": "FormGroup"
   },
@@ -365,9 +356,6 @@
   {
     "name": "NG_PROV_DEF"
   },
-  {
-    "name": "NG_PROV_DEF_FALLBACK"
-  },
   {
     "name": "NG_VALIDATORS"
   },
@@ -497,9 +485,6 @@
   {
     "name": "RangeValueAccessor"
   },
-  {
-    "name": "ReactiveErrors"
-  },
   {
     "name": "ReactiveFormsComponent"
   },
@@ -608,9 +593,6 @@
   {
     "name": "TRANSITION_ID"
   },
-  {
-    "name": "TemplateDrivenErrors"
-  },
   {
     "name": "TemplateFormsComponent"
   },
@@ -701,9 +683,6 @@
   {
     "name": "_keyMap"
   },
-  {
-    "name": "_noControlError"
-  },
   {
     "name": "_randomChar"
   },
@@ -716,18 +695,12 @@
   {
     "name": "_testabilityGetter"
   },
-  {
-    "name": "_throwError"
-  },
   {
     "name": "addComponentLogic"
   },
   {
     "name": "addHostBindingsToExpandoInstructions"
   },
-  {
-    "name": "addRemoveViewFromContainer"
-  },
   {
     "name": "addToArray"
   },
@@ -824,6 +797,9 @@
   {
     "name": "createDirectivesInstances"
   },
+  {
+    "name": "createElementNode"
+  },
   {
     "name": "createElementRef"
   },
@@ -887,9 +863,6 @@
   {
     "name": "domRendererFactory3"
   },
-  {
-    "name": "elementCreate"
-  },
   {
     "name": "empty"
   },
@@ -977,12 +950,6 @@
   {
     "name": "generatePropertyAliases"
   },
-  {
-    "name": "getBeforeNodeForView"
-  },
-  {
-    "name": "getCheckNoChangesMode"
-  },
   {
     "name": "getClosureSafeProperty"
   },
@@ -996,7 +963,10 @@
     "name": "getConstant"
   },
   {
-    "name": "getContainerRenderParent"
+    "name": "getCurrentTNode"
+  },
+  {
+    "name": "getCurrentTNodePlaceholderOk"
   },
   {
     "name": "getDOM"
@@ -1019,15 +989,9 @@
   {
     "name": "getInjectorIndex"
   },
-  {
-    "name": "getIsParent"
-  },
   {
     "name": "getLCleanup"
   },
-  {
-    "name": "getLContainer"
-  },
   {
     "name": "getLView"
   },
@@ -1082,21 +1046,12 @@
   {
     "name": "getParentInjectorView"
   },
-  {
-    "name": "getParentInjectorViewOffset"
-  },
-  {
-    "name": "getParentState"
-  },
   {
     "name": "getPlatform"
   },
   {
     "name": "getPreviousIndex"
   },
-  {
-    "name": "getPreviousOrParentTNode"
-  },
   {
     "name": "getPromiseCtor"
   },
@@ -1145,6 +1100,9 @@
   {
     "name": "hostReportError"
   },
+  {
+    "name": "icuContainerIterate"
+  },
   {
     "name": "identity"
   },
@@ -1214,6 +1172,9 @@
   {
     "name": "isCssClassMatching"
   },
+  {
+    "name": "isCurrentTNodeParent"
+  },
   {
     "name": "isDirectiveHost"
   },
@@ -1226,6 +1187,9 @@
   {
     "name": "isFunction"
   },
+  {
+    "name": "isInCheckNoChangesMode"
+  },
   {
     "name": "isInlineTemplate"
   },
@@ -1529,9 +1493,6 @@
   {
     "name": "setBindingRootForHostBindings"
   },
-  {
-    "name": "setCheckNoChangesMode"
-  },
   {
     "name": "setCurrentDirectiveIndex"
   },
@@ -1541,6 +1502,9 @@
   {
     "name": "setCurrentQueryIndex"
   },
+  {
+    "name": "setCurrentTNode"
+  },
   {
     "name": "setDirectiveInputsWhichShadowsStyling"
   },
@@ -1557,10 +1521,10 @@
     "name": "setInputsFromAttrs"
   },
   {
-    "name": "setLocaleId"
+    "name": "setIsInCheckNoChangesMode"
   },
   {
-    "name": "setPreviousOrParentTNode"
+    "name": "setLocaleId"
   },
   {
     "name": "setSelectedIndex"
@@ -1607,12 +1571,6 @@
   {
     "name": "syncPendingControls"
   },
-  {
-    "name": "throwMixedMultiProviderError"
-  },
-  {
-    "name": "throwMultipleComponentError"
-  },
   {
     "name": "toObservable"
   },
@@ -1628,9 +1586,6 @@
   {
     "name": "u"
   },
-  {
-    "name": "unimplemented"
-  },
   {
     "name": "unwrapRNode"
   },
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 0777fe91e6eb4..d39dda1a439fb 100644
--- a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
@@ -59,9 +59,6 @@
   {
     "name": "allocLFrame"
   },
-  {
-    "name": "appendChild"
-  },
   {
     "name": "attachPatchData"
   },
@@ -110,9 +107,6 @@
   {
     "name": "extractPipeDef"
   },
-  {
-    "name": "getCheckNoChangesMode"
-  },
   {
     "name": "getClosureSafeProperty"
   },
@@ -123,10 +117,13 @@
     "name": "getComponentLViewByIndex"
   },
   {
-    "name": "getFirstLContainer"
+    "name": "getCurrentTNode"
   },
   {
-    "name": "getLContainer"
+    "name": "getCurrentTNodePlaceholderOk"
+  },
+  {
+    "name": "getFirstLContainer"
   },
   {
     "name": "getNativeByTNode"
@@ -140,9 +137,6 @@
   {
     "name": "getOrCreateTNode"
   },
-  {
-    "name": "getPreviousOrParentTNode"
-  },
   {
     "name": "getSimpleChangesStore"
   },
@@ -165,7 +159,7 @@
     "name": "invertObject"
   },
   {
-    "name": "isLContainer"
+    "name": "isInCheckNoChangesMode"
   },
   {
     "name": "isProceduralRenderer"
@@ -182,6 +176,9 @@
   {
     "name": "nativeAppendOrInsertBefore"
   },
+  {
+    "name": "nativeInsertBefore"
+  },
   {
     "name": "nextNgElementId"
   },
@@ -216,13 +213,13 @@
     "name": "setCurrentQueryIndex"
   },
   {
-    "name": "setIncludeViewProviders"
+    "name": "setCurrentTNode"
   },
   {
-    "name": "setInjectImplementation"
+    "name": "setIncludeViewProviders"
   },
   {
-    "name": "setPreviousOrParentTNode"
+    "name": "setInjectImplementation"
   },
   {
     "name": "setSelectedIndex"
@@ -235,5 +232,8 @@
   },
   {
     "name": "viewAttachedToChangeDetector"
+  },
+  {
+    "name": "ɵɵtext"
   }
 ]
\ No newline at end of file
diff --git a/packages/core/test/bundling/injection/bundle.golden_symbols.json b/packages/core/test/bundling/injection/bundle.golden_symbols.json
index 4dd6420bd205f..eee96403a7218 100644
--- a/packages/core/test/bundling/injection/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/injection/bundle.golden_symbols.json
@@ -38,9 +38,6 @@
   {
     "name": "NG_PROV_DEF"
   },
-  {
-    "name": "NG_PROV_DEF_FALLBACK"
-  },
   {
     "name": "NOT_YET"
   },
@@ -128,9 +125,6 @@
   {
     "name": "stringify"
   },
-  {
-    "name": "throwMixedMultiProviderError"
-  },
   {
     "name": "ɵɵdefineInjectable"
   },
diff --git a/packages/core/test/bundling/router/BUILD.bazel b/packages/core/test/bundling/router/BUILD.bazel
new file mode 100644
index 0000000000000..249d2e8af806f
--- /dev/null
+++ b/packages/core/test/bundling/router/BUILD.bazel
@@ -0,0 +1,118 @@
+package(default_visibility = ["//visibility:public"])
+
+load("//tools:defaults.bzl", "jasmine_node_test", "ng_module", "ng_rollup_bundle", "ts_devserver", "ts_library")
+load("//tools/symbol-extractor:index.bzl", "js_expected_symbol_test")
+load("@npm//http-server:index.bzl", "http_server")
+
+ng_module(
+    name = "router",
+    srcs = [
+        "index.ts",
+    ],
+    tags = [
+        "ivy-only",
+    ],
+    deps = [
+        "//packages/core",
+        "//packages/platform-browser",
+        "//packages/router",
+    ],
+)
+
+ng_rollup_bundle(
+    name = "bundle",
+    entry_point = ":index.ts",
+    tags = [
+        "ivy-only",
+    ],
+    deps = [
+        ":router",
+        "//packages/core",
+        "//packages/platform-browser",
+        "//packages/router",
+        "@npm//rxjs",
+    ],
+)
+
+ts_library(
+    name = "test_lib",
+    testonly = True,
+    srcs = glob(["*_spec.ts"]),
+    tags = [
+        "ivy-only",
+    ],
+    deps = [
+        "//packages:types",
+        "//packages/compiler",
+        "//packages/core",
+        "//packages/core/testing",
+        "//packages/private/testing",
+    ],
+)
+
+jasmine_node_test(
+    name = "test",
+    data = [
+        ":bundle",
+        ":bundle.js",
+        ":bundle.min.js",
+        ":bundle.min_debug.js",
+    ],
+    tags = [
+        "ivy-only",
+    ],
+    deps = [":test_lib"],
+)
+
+js_expected_symbol_test(
+    name = "symbol_test",
+    src = ":bundle.min_debug.js",
+    golden = ":bundle.golden_symbols.json",
+    tags = [
+        "ivy-aot",
+        "ivy-only",
+    ],
+)
+
+genrule(
+    name = "tslib",
+    srcs = [
+        "@npm//:node_modules/tslib/tslib.js",
+    ],
+    outs = [
+        "tslib.js",
+    ],
+    cmd = "cp $< $@",
+    tags = [
+        "ivy-only",
+    ],
+)
+
+ts_devserver(
+    name = "devserver",
+    entry_module = "@angular/core/test/bundling/router",
+    scripts = [
+        "//tools/rxjs:rxjs_umd_modules",
+    ],
+    serving_path = "/bundle.min.js",
+    static_files = [
+        "index.html",
+        ":tslib",
+    ],
+    tags = [
+        "ivy-only",
+    ],
+    deps = [":router"],
+)
+
+http_server(
+    name = "prodserver",
+    data = [
+        "index.html",
+        ":bundle.min.js",
+        ":bundle.min_debug.js",
+    ],
+    tags = [
+        "ivy-only",
+    ],
+)
diff --git a/packages/core/test/bundling/router/bundle.golden_symbols.json b/packages/core/test/bundling/router/bundle.golden_symbols.json
new file mode 100644
index 0000000000000..01b94b278ad6e
--- /dev/null
+++ b/packages/core/test/bundling/router/bundle.golden_symbols.json
@@ -0,0 +1,2054 @@
+[
+  {
+    "name": "ALLOW_MULTIPLE_PLATFORMS"
+  },
+  {
+    "name": "ANALYZE_FOR_ENTRY_COMPONENTS"
+  },
+  {
+    "name": "APPLICATION_MODULE_PROVIDERS"
+  },
+  {
+    "name": "APP_BASE_HREF"
+  },
+  {
+    "name": "APP_BOOTSTRAP_LISTENER"
+  },
+  {
+    "name": "APP_ID"
+  },
+  {
+    "name": "APP_ID_RANDOM_PROVIDER"
+  },
+  {
+    "name": "APP_INITIALIZER"
+  },
+  {
+    "name": "AbsoluteRedirect"
+  },
+  {
+    "name": "ActivateRoutes"
+  },
+  {
+    "name": "ActivatedRoute"
+  },
+  {
+    "name": "ActivatedRouteSnapshot"
+  },
+  {
+    "name": "ActivationEnd"
+  },
+  {
+    "name": "ActivationStart"
+  },
+  {
+    "name": "AnonymousSubject"
+  },
+  {
+    "name": "ApplicationInitStatus"
+  },
+  {
+    "name": "ApplicationModule"
+  },
+  {
+    "name": "ApplicationRef"
+  },
+  {
+    "name": "ApplyRedirects"
+  },
+  {
+    "name": "ArgumentOutOfRangeError"
+  },
+  {
+    "name": "BROWSER_MODULE_PROVIDERS"
+  },
+  {
+    "name": "BehaviorSubject"
+  },
+  {
+    "name": "BrowserDomAdapter"
+  },
+  {
+    "name": "BrowserGetTestability"
+  },
+  {
+    "name": "BrowserModule"
+  },
+  {
+    "name": "BrowserPlatformLocation"
+  },
+  {
+    "name": "BrowserViewportScroller"
+  },
+  {
+    "name": "CIRCULAR"
+  },
+  {
+    "name": "CLEAN_PROMISE"
+  },
+  {
+    "name": "COMPONENT_REGEX"
+  },
+  {
+    "name": "CanActivate"
+  },
+  {
+    "name": "CanDeactivate"
+  },
+  {
+    "name": "CatchOperator"
+  },
+  {
+    "name": "CatchSubscriber"
+  },
+  {
+    "name": "ChangeDetectionStrategy"
+  },
+  {
+    "name": "ChangeDetectorRef"
+  },
+  {
+    "name": "ChildActivationEnd"
+  },
+  {
+    "name": "ChildActivationStart"
+  },
+  {
+    "name": "ChildrenOutletContexts"
+  },
+  {
+    "name": "CombineLatestOperator"
+  },
+  {
+    "name": "CombineLatestSubscriber"
+  },
+  {
+    "name": "CommonModule"
+  },
+  {
+    "name": "Compiler"
+  },
+  {
+    "name": "Compiler_compileModuleAndAllComponentsAsync"
+  },
+  {
+    "name": "Compiler_compileModuleAndAllComponentsSync"
+  },
+  {
+    "name": "Compiler_compileModuleAndAllComponentsSync__POST_R3__"
+  },
+  {
+    "name": "Compiler_compileModuleAsync"
+  },
+  {
+    "name": "Compiler_compileModuleSync"
+  },
+  {
+    "name": "Compiler_compileModuleSync__POST_R3__"
+  },
+  {
+    "name": "ComponentFactory"
+  },
+  {
+    "name": "ComponentFactory"
+  },
+  {
+    "name": "ComponentFactoryResolver"
+  },
+  {
+    "name": "ComponentFactoryResolver"
+  },
+  {
+    "name": "ComponentRef"
+  },
+  {
+    "name": "ConnectableObservable"
+  },
+  {
+    "name": "ConnectableSubscriber"
+  },
+  {
+    "name": "Console"
+  },
+  {
+    "name": "DATA_URL_PATTERN"
+  },
+  {
+    "name": "DEFAULT_CONFIG"
+  },
+  {
+    "name": "DEFAULT_CURRENCY_CODE"
+  },
+  {
+    "name": "DEFAULT_SERIALIZER"
+  },
+  {
+    "name": "DOCUMENT"
+  },
+  {
+    "name": "DOCUMENT"
+  },
+  {
+    "name": "DefaultDomRenderer2"
+  },
+  {
+    "name": "DefaultIfEmptyOperator"
+  },
+  {
+    "name": "DefaultIfEmptySubscriber"
+  },
+  {
+    "name": "DefaultIterableDiffer"
+  },
+  {
+    "name": "DefaultIterableDifferFactory"
+  },
+  {
+    "name": "DefaultKeyValueDiffer"
+  },
+  {
+    "name": "DefaultKeyValueDifferFactory"
+  },
+  {
+    "name": "DefaultRouteReuseStrategy"
+  },
+  {
+    "name": "DefaultUrlHandlingStrategy"
+  },
+  {
+    "name": "DefaultUrlSerializer"
+  },
+  {
+    "name": "DoOperator"
+  },
+  {
+    "name": "DomEventsPlugin"
+  },
+  {
+    "name": "DomRendererFactory2"
+  },
+  {
+    "name": "DomSharedStylesHost"
+  },
+  {
+    "name": "EMPTY"
+  },
+  {
+    "name": "EMPTY_ARRAY"
+  },
+  {
+    "name": "EMPTY_ARRAY"
+  },
+  {
+    "name": "EMPTY_OBJ"
+  },
+  {
+    "name": "EMPTY_PAYLOAD"
+  },
+  {
+    "name": "EVENT_MANAGER_PLUGINS"
+  },
+  {
+    "name": "ElementRef"
+  },
+  {
+    "name": "EmptyError"
+  },
+  {
+    "name": "EmulatedEncapsulationDomRenderer2"
+  },
+  {
+    "name": "ErrorHandler"
+  },
+  {
+    "name": "EventEmitter"
+  },
+  {
+    "name": "EventManager"
+  },
+  {
+    "name": "EventManagerPlugin"
+  },
+  {
+    "name": "FilterOperator"
+  },
+  {
+    "name": "FilterSubscriber"
+  },
+  {
+    "name": "FinallyOperator"
+  },
+  {
+    "name": "FinallySubscriber"
+  },
+  {
+    "name": "GuardsCheckEnd"
+  },
+  {
+    "name": "GuardsCheckStart"
+  },
+  {
+    "name": "HashLocationStrategy"
+  },
+  {
+    "name": "INITIAL_VALUE"
+  },
+  {
+    "name": "INJECTOR"
+  },
+  {
+    "name": "INJECTOR_IMPL"
+  },
+  {
+    "name": "INJECTOR_SCOPE"
+  },
+  {
+    "name": "Inject"
+  },
+  {
+    "name": "InjectFlags"
+  },
+  {
+    "name": "InjectionToken"
+  },
+  {
+    "name": "Injector"
+  },
+  {
+    "name": "InnerSubscriber"
+  },
+  {
+    "name": "ItemComponent"
+  },
+  {
+    "name": "IterableChangeRecord_"
+  },
+  {
+    "name": "IterableDiffers"
+  },
+  {
+    "name": "KeyEventsPlugin"
+  },
+  {
+    "name": "KeyValueChangeRecord_"
+  },
+  {
+    "name": "KeyValueDiffers"
+  },
+  {
+    "name": "LOCALE_DATA"
+  },
+  {
+    "name": "LOCALE_ID"
+  },
+  {
+    "name": "LOCALE_ID"
+  },
+  {
+    "name": "LOCATION_INITIALIZED"
+  },
+  {
+    "name": "LQueries_"
+  },
+  {
+    "name": "LQuery_"
+  },
+  {
+    "name": "LifecycleHooksFeature"
+  },
+  {
+    "name": "ListComponent"
+  },
+  {
+    "name": "LoadedRouterConfig"
+  },
+  {
+    "name": "LocaleDataIndex"
+  },
+  {
+    "name": "Location"
+  },
+  {
+    "name": "LocationStrategy"
+  },
+  {
+    "name": "MODIFIER_KEYS"
+  },
+  {
+    "name": "MODIFIER_KEY_GETTERS"
+  },
+  {
+    "name": "MapOperator"
+  },
+  {
+    "name": "MapSubscriber"
+  },
+  {
+    "name": "MergeMapOperator"
+  },
+  {
+    "name": "MergeMapSubscriber"
+  },
+  {
+    "name": "ModuleWithComponentFactories"
+  },
+  {
+    "name": "NAMESPACE_URIS"
+  },
+  {
+    "name": "NEW_LINE"
+  },
+  {
+    "name": "NG_COMP_DEF"
+  },
+  {
+    "name": "NG_DIR_DEF"
+  },
+  {
+    "name": "NG_ELEMENT_ID"
+  },
+  {
+    "name": "NG_FACTORY_DEF"
+  },
+  {
+    "name": "NG_INJECTABLE_DEF"
+  },
+  {
+    "name": "NG_INJECTOR_DEF"
+  },
+  {
+    "name": "NG_INJ_DEF"
+  },
+  {
+    "name": "NG_LOC_ID_DEF"
+  },
+  {
+    "name": "NG_MOD_DEF"
+  },
+  {
+    "name": "NG_PIPE_DEF"
+  },
+  {
+    "name": "NG_PROV_DEF"
+  },
+  {
+    "name": "NONE"
+  },
+  {
+    "name": "NOT_FOUND"
+  },
+  {
+    "name": "NOT_FOUND_CHECK_ONLY_ELEMENT_INJECTOR"
+  },
+  {
+    "name": "NOT_YET"
+  },
+  {
+    "name": "NO_CHANGE"
+  },
+  {
+    "name": "NULL_INJECTOR"
+  },
+  {
+    "name": "Navigation"
+  },
+  {
+    "name": "NavigationCancel"
+  },
+  {
+    "name": "NavigationEnd"
+  },
+  {
+    "name": "NavigationError"
+  },
+  {
+    "name": "NavigationStart"
+  },
+  {
+    "name": "NgLocaleLocalization"
+  },
+  {
+    "name": "NgLocalization"
+  },
+  {
+    "name": "NgModuleFactory"
+  },
+  {
+    "name": "NgModuleFactory"
+  },
+  {
+    "name": "NgModuleFactoryLoader"
+  },
+  {
+    "name": "NgModuleRef"
+  },
+  {
+    "name": "NgModuleRef"
+  },
+  {
+    "name": "NgOnChangesFeatureImpl"
+  },
+  {
+    "name": "NgProbeToken"
+  },
+  {
+    "name": "NgZone"
+  },
+  {
+    "name": "NoMatch"
+  },
+  {
+    "name": "NoMatch"
+  },
+  {
+    "name": "NoPreloading"
+  },
+  {
+    "name": "NodeInjector"
+  },
+  {
+    "name": "NodeInjectorFactory"
+  },
+  {
+    "name": "NoopNgZone"
+  },
+  {
+    "name": "NullInjector"
+  },
+  {
+    "name": "ObjectUnsubscribedError"
+  },
+  {
+    "name": "Observable"
+  },
+  {
+    "name": "Optional"
+  },
+  {
+    "name": "OuterSubscriber"
+  },
+  {
+    "name": "OutletContext"
+  },
+  {
+    "name": "OutletInjector"
+  },
+  {
+    "name": "PLATFORM_ID"
+  },
+  {
+    "name": "PLATFORM_INITIALIZER"
+  },
+  {
+    "name": "ParamsAsMap"
+  },
+  {
+    "name": "PathLocationStrategy"
+  },
+  {
+    "name": "PlatformLocation"
+  },
+  {
+    "name": "PlatformRef"
+  },
+  {
+    "name": "Plural"
+  },
+  {
+    "name": "Position"
+  },
+  {
+    "name": "PreloadingStrategy"
+  },
+  {
+    "name": "QUERY_PARAM_RE"
+  },
+  {
+    "name": "QUERY_PARAM_VALUE_RE"
+  },
+  {
+    "name": "QueryList"
+  },
+  {
+    "name": "R3Injector"
+  },
+  {
+    "name": "ROUTER_CONFIGURATION"
+  },
+  {
+    "name": "ROUTER_FORROOT_GUARD"
+  },
+  {
+    "name": "ROUTER_INITIALIZER"
+  },
+  {
+    "name": "ROUTER_PROVIDERS"
+  },
+  {
+    "name": "ROUTES"
+  },
+  {
+    "name": "ROUTES"
+  },
+  {
+    "name": "Recognizer"
+  },
+  {
+    "name": "RefCountOperator"
+  },
+  {
+    "name": "RefCountSubscriber"
+  },
+  {
+    "name": "Renderer2"
+  },
+  {
+    "name": "RendererFactory2"
+  },
+  {
+    "name": "RendererStyleFlags2"
+  },
+  {
+    "name": "ResolveEnd"
+  },
+  {
+    "name": "ResolveStart"
+  },
+  {
+    "name": "RootComponent"
+  },
+  {
+    "name": "RootViewRef"
+  },
+  {
+    "name": "RouteConfigLoadEnd"
+  },
+  {
+    "name": "RouteConfigLoadStart"
+  },
+  {
+    "name": "RouteExampleModule"
+  },
+  {
+    "name": "Router"
+  },
+  {
+    "name": "RouterConfigLoader"
+  },
+  {
+    "name": "RouterEvent"
+  },
+  {
+    "name": "RouterInitializer"
+  },
+  {
+    "name": "RouterLink"
+  },
+  {
+    "name": "RouterLinkActive"
+  },
+  {
+    "name": "RouterLinkWithHref"
+  },
+  {
+    "name": "RouterModule"
+  },
+  {
+    "name": "RouterOutlet"
+  },
+  {
+    "name": "RouterPreloader"
+  },
+  {
+    "name": "RouterScroller"
+  },
+  {
+    "name": "RouterState"
+  },
+  {
+    "name": "RouterStateSnapshot"
+  },
+  {
+    "name": "RoutesRecognized"
+  },
+  {
+    "name": "SAFE_URL_PATTERN"
+  },
+  {
+    "name": "SCHEDULER"
+  },
+  {
+    "name": "SEGMENT_RE"
+  },
+  {
+    "name": "SERVER_TRANSITION_PROVIDERS"
+  },
+  {
+    "name": "SWITCH_CHANGE_DETECTOR_REF_FACTORY"
+  },
+  {
+    "name": "SWITCH_ELEMENT_REF_FACTORY"
+  },
+  {
+    "name": "SWITCH_RENDERER2_FACTORY"
+  },
+  {
+    "name": "SWITCH_TEMPLATE_REF_FACTORY"
+  },
+  {
+    "name": "SWITCH_VIEW_CONTAINER_REF_FACTORY"
+  },
+  {
+    "name": "SafeSubscriber"
+  },
+  {
+    "name": "SafeValueImpl"
+  },
+  {
+    "name": "Sanitizer"
+  },
+  {
+    "name": "ScanOperator"
+  },
+  {
+    "name": "ScanSubscriber"
+  },
+  {
+    "name": "Scroll"
+  },
+  {
+    "name": "SecurityContext"
+  },
+  {
+    "name": "Self"
+  },
+  {
+    "name": "ShadowDomRenderer"
+  },
+  {
+    "name": "SharedStylesHost"
+  },
+  {
+    "name": "SimpleChange"
+  },
+  {
+    "name": "SkipSelf"
+  },
+  {
+    "name": "Subject"
+  },
+  {
+    "name": "SubjectSubscriber"
+  },
+  {
+    "name": "SubjectSubscription"
+  },
+  {
+    "name": "Subscriber"
+  },
+  {
+    "name": "Subscription"
+  },
+  {
+    "name": "SwitchMapOperator"
+  },
+  {
+    "name": "SwitchMapSubscriber"
+  },
+  {
+    "name": "SystemJsNgModuleLoader"
+  },
+  {
+    "name": "SystemJsNgModuleLoaderConfig"
+  },
+  {
+    "name": "THROW_IF_NOT_FOUND"
+  },
+  {
+    "name": "TQueries_"
+  },
+  {
+    "name": "TQueryMetadata_"
+  },
+  {
+    "name": "TQuery_"
+  },
+  {
+    "name": "TRANSITION_ID"
+  },
+  {
+    "name": "TakeLastOperator"
+  },
+  {
+    "name": "TakeLastSubscriber"
+  },
+  {
+    "name": "TakeOperator"
+  },
+  {
+    "name": "TakeSubscriber"
+  },
+  {
+    "name": "TapSubscriber"
+  },
+  {
+    "name": "TemplateRef"
+  },
+  {
+    "name": "Testability"
+  },
+  {
+    "name": "TestabilityRegistry"
+  },
+  {
+    "name": "ThrowIfEmptyOperator"
+  },
+  {
+    "name": "ThrowIfEmptySubscriber"
+  },
+  {
+    "name": "Tree"
+  },
+  {
+    "name": "TreeNode"
+  },
+  {
+    "name": "USE_VALUE"
+  },
+  {
+    "name": "UnsubscriptionError"
+  },
+  {
+    "name": "UrlParser"
+  },
+  {
+    "name": "UrlSegment"
+  },
+  {
+    "name": "UrlSegmentGroup"
+  },
+  {
+    "name": "UrlSerializer"
+  },
+  {
+    "name": "UrlTree"
+  },
+  {
+    "name": "VERSION"
+  },
+  {
+    "name": "Version"
+  },
+  {
+    "name": "ViewContainerRef"
+  },
+  {
+    "name": "ViewEncapsulation"
+  },
+  {
+    "name": "ViewRef"
+  },
+  {
+    "name": "ViewportScroller"
+  },
+  {
+    "name": "_DOM"
+  },
+  {
+    "name": "_DuplicateItemRecordList"
+  },
+  {
+    "name": "_DuplicateMap"
+  },
+  {
+    "name": "_NoopGetTestability"
+  },
+  {
+    "name": "_NullComponentFactoryResolver"
+  },
+  {
+    "name": "__extends"
+  },
+  {
+    "name": "__forward_ref__"
+  },
+  {
+    "name": "__global"
+  },
+  {
+    "name": "__globalThis"
+  },
+  {
+    "name": "__self"
+  },
+  {
+    "name": "__window"
+  },
+  {
+    "name": "_chromeNumKeyPadMap"
+  },
+  {
+    "name": "_currentInjector"
+  },
+  {
+    "name": "_enable_super_gross_mode_that_will_cause_bad_things"
+  },
+  {
+    "name": "_global"
+  },
+  {
+    "name": "_keyMap"
+  },
+  {
+    "name": "_randomChar"
+  },
+  {
+    "name": "_renderCompCount"
+  },
+  {
+    "name": "_stripIndexHtml"
+  },
+  {
+    "name": "_symbolIterator"
+  },
+  {
+    "name": "_testabilityGetter"
+  },
+  {
+    "name": "absoluteRedirect"
+  },
+  {
+    "name": "addComponentLogic"
+  },
+  {
+    "name": "addHostBindingsToExpandoInstructions"
+  },
+  {
+    "name": "addToArray"
+  },
+  {
+    "name": "addToViewTree"
+  },
+  {
+    "name": "advanceActivatedRoute"
+  },
+  {
+    "name": "advanceActivatedRouteNodeAndItsChildren"
+  },
+  {
+    "name": "allocLFrame"
+  },
+  {
+    "name": "appendChild"
+  },
+  {
+    "name": "applyNodes"
+  },
+  {
+    "name": "applyProjectionRecursive"
+  },
+  {
+    "name": "applyToElementOrContainer"
+  },
+  {
+    "name": "applyView"
+  },
+  {
+    "name": "attachPatchData"
+  },
+  {
+    "name": "attrBoolValue"
+  },
+  {
+    "name": "autoRegisterModuleById"
+  },
+  {
+    "name": "baseElement"
+  },
+  {
+    "name": "baseResolveDirective"
+  },
+  {
+    "name": "bindingUpdated"
+  },
+  {
+    "name": "bloomHasToken"
+  },
+  {
+    "name": "callHook"
+  },
+  {
+    "name": "callHooks"
+  },
+  {
+    "name": "catchError"
+  },
+  {
+    "name": "checkNotEmpty"
+  },
+  {
+    "name": "checkStable"
+  },
+  {
+    "name": "classIndexOf"
+  },
+  {
+    "name": "cleanUpView"
+  },
+  {
+    "name": "compare"
+  },
+  {
+    "name": "computeStaticStyling"
+  },
+  {
+    "name": "concat"
+  },
+  {
+    "name": "concatAll"
+  },
+  {
+    "name": "concatMap"
+  },
+  {
+    "name": "concatStringsWithSpace"
+  },
+  {
+    "name": "config"
+  },
+  {
+    "name": "connectableObservableDescriptor"
+  },
+  {
+    "name": "containsTree"
+  },
+  {
+    "name": "convertToParamMap"
+  },
+  {
+    "name": "createBrowserPlatformLocation"
+  },
+  {
+    "name": "createContainerRef"
+  },
+  {
+    "name": "createElementNode"
+  },
+  {
+    "name": "createElementRef"
+  },
+  {
+    "name": "createEmptyState"
+  },
+  {
+    "name": "createInjectorWithoutInjectorInstances"
+  },
+  {
+    "name": "createLFrame"
+  },
+  {
+    "name": "createLView"
+  },
+  {
+    "name": "createLocation"
+  },
+  {
+    "name": "createNewSegmentChildren"
+  },
+  {
+    "name": "createNewSegmentGroup"
+  },
+  {
+    "name": "createPlatformFactory"
+  },
+  {
+    "name": "createResultForNode"
+  },
+  {
+    "name": "createRouterScroller"
+  },
+  {
+    "name": "createTNode"
+  },
+  {
+    "name": "createTView"
+  },
+  {
+    "name": "createTemplateRef"
+  },
+  {
+    "name": "deactivateRouteAndItsChildren"
+  },
+  {
+    "name": "decode"
+  },
+  {
+    "name": "decodeQuery"
+  },
+  {
+    "name": "decoratePreventDefault"
+  },
+  {
+    "name": "deepForEach"
+  },
+  {
+    "name": "defaultErrorFactory"
+  },
+  {
+    "name": "defaultErrorHandler"
+  },
+  {
+    "name": "defaultErrorLogger"
+  },
+  {
+    "name": "defaultIfEmpty"
+  },
+  {
+    "name": "defaultIterableDiffers"
+  },
+  {
+    "name": "defaultKeyValueDiffers"
+  },
+  {
+    "name": "defaultMalformedUriErrorHandler"
+  },
+  {
+    "name": "defaultRouterHook"
+  },
+  {
+    "name": "defaultScheduler"
+  },
+  {
+    "name": "defaultUrlMatcher"
+  },
+  {
+    "name": "defer"
+  },
+  {
+    "name": "destroyLView"
+  },
+  {
+    "name": "detachMovedView"
+  },
+  {
+    "name": "detachView"
+  },
+  {
+    "name": "detectChangesInRootView"
+  },
+  {
+    "name": "detectChangesInternal"
+  },
+  {
+    "name": "diPublicInInjector"
+  },
+  {
+    "name": "domRendererFactory3"
+  },
+  {
+    "name": "empty"
+  },
+  {
+    "name": "empty"
+  },
+  {
+    "name": "emptyPathMatch"
+  },
+  {
+    "name": "encodeUriQuery"
+  },
+  {
+    "name": "encodeUriSegment"
+  },
+  {
+    "name": "encodeUriString"
+  },
+  {
+    "name": "enterDI"
+  },
+  {
+    "name": "enterView"
+  },
+  {
+    "name": "equalArraysOrString"
+  },
+  {
+    "name": "equalParamsAndUrlSegments"
+  },
+  {
+    "name": "equalPath"
+  },
+  {
+    "name": "executeCheckHooks"
+  },
+  {
+    "name": "executeInitAndCheckHooks"
+  },
+  {
+    "name": "executeListenerWithErrorHandling"
+  },
+  {
+    "name": "executeTemplate"
+  },
+  {
+    "name": "executeViewQueryFn"
+  },
+  {
+    "name": "extendStatics"
+  },
+  {
+    "name": "extractDirectiveDef"
+  },
+  {
+    "name": "extractPipeDef"
+  },
+  {
+    "name": "filter"
+  },
+  {
+    "name": "findAttrIndexInNode"
+  },
+  {
+    "name": "findNode"
+  },
+  {
+    "name": "findPath"
+  },
+  {
+    "name": "fireActivationStart"
+  },
+  {
+    "name": "fireChildActivationStart"
+  },
+  {
+    "name": "first"
+  },
+  {
+    "name": "flatten"
+  },
+  {
+    "name": "flattenStyles"
+  },
+  {
+    "name": "flattenUnsubscriptionErrors"
+  },
+  {
+    "name": "forEach"
+  },
+  {
+    "name": "forwardRef"
+  },
+  {
+    "name": "from"
+  },
+  {
+    "name": "fromArray"
+  },
+  {
+    "name": "generateExpandoInstructionBlock"
+  },
+  {
+    "name": "generateInitialInputs"
+  },
+  {
+    "name": "generatePropertyAliases"
+  },
+  {
+    "name": "getAllRouteGuards"
+  },
+  {
+    "name": "getAppInitializer"
+  },
+  {
+    "name": "getBootstrapListener"
+  },
+  {
+    "name": "getClosureSafeProperty"
+  },
+  {
+    "name": "getComponentDef"
+  },
+  {
+    "name": "getComponentLViewByIndex"
+  },
+  {
+    "name": "getConstant"
+  },
+  {
+    "name": "getCurrentQueryIndex"
+  },
+  {
+    "name": "getCurrentTNode"
+  },
+  {
+    "name": "getCurrentTNodePlaceholderOk"
+  },
+  {
+    "name": "getDOM"
+  },
+  {
+    "name": "getData"
+  },
+  {
+    "name": "getDebugContext"
+  },
+  {
+    "name": "getFactoryDef"
+  },
+  {
+    "name": "getFirstLContainer"
+  },
+  {
+    "name": "getFullPath"
+  },
+  {
+    "name": "getIdxOfMatchingSelector"
+  },
+  {
+    "name": "getInjectableDef"
+  },
+  {
+    "name": "getInjectorDef"
+  },
+  {
+    "name": "getInjectorIndex"
+  },
+  {
+    "name": "getLCleanup"
+  },
+  {
+    "name": "getLView"
+  },
+  {
+    "name": "getLViewParent"
+  },
+  {
+    "name": "getLocaleData"
+  },
+  {
+    "name": "getNativeByTNode"
+  },
+  {
+    "name": "getNearestLContainer"
+  },
+  {
+    "name": "getNextLContainer"
+  },
+  {
+    "name": "getNgModuleDef"
+  },
+  {
+    "name": "getNodeInjectable"
+  },
+  {
+    "name": "getNullInjector"
+  },
+  {
+    "name": "getOrCreateInjectable"
+  },
+  {
+    "name": "getOrCreateNodeInjectorForNode"
+  },
+  {
+    "name": "getOrCreateTComponentView"
+  },
+  {
+    "name": "getOrCreateTNode"
+  },
+  {
+    "name": "getOriginalError"
+  },
+  {
+    "name": "getOutlet"
+  },
+  {
+    "name": "getOutlet"
+  },
+  {
+    "name": "getOwnDefinition"
+  },
+  {
+    "name": "getParentInjectorIndex"
+  },
+  {
+    "name": "getParentInjectorLocation"
+  },
+  {
+    "name": "getParentInjectorView"
+  },
+  {
+    "name": "getPath"
+  },
+  {
+    "name": "getPathIndexShift"
+  },
+  {
+    "name": "getPlatform"
+  },
+  {
+    "name": "getPreviousIndex"
+  },
+  {
+    "name": "getPromiseCtor"
+  },
+  {
+    "name": "getResolve"
+  },
+  {
+    "name": "getScrollRestorationProperty"
+  },
+  {
+    "name": "getSelectedIndex"
+  },
+  {
+    "name": "getSelectedTNode"
+  },
+  {
+    "name": "getSimpleChangesStore"
+  },
+  {
+    "name": "getSourceSegmentGroup"
+  },
+  {
+    "name": "getSymbolIterator"
+  },
+  {
+    "name": "getSymbolIterator"
+  },
+  {
+    "name": "getTNode"
+  },
+  {
+    "name": "getTQuery"
+  },
+  {
+    "name": "getTView"
+  },
+  {
+    "name": "getToken"
+  },
+  {
+    "name": "growHostVarsSpace"
+  },
+  {
+    "name": "handleError"
+  },
+  {
+    "name": "hasParentInjector"
+  },
+  {
+    "name": "hasTagAndTypeMatch"
+  },
+  {
+    "name": "hostReportError"
+  },
+  {
+    "name": "icuContainerIterate"
+  },
+  {
+    "name": "identity"
+  },
+  {
+    "name": "includeViewProviders"
+  },
+  {
+    "name": "incrementInitPhaseFlags"
+  },
+  {
+    "name": "inheritedParamsDataResolve"
+  },
+  {
+    "name": "initTNodeFlags"
+  },
+  {
+    "name": "injectArgs"
+  },
+  {
+    "name": "injectInjectorOnly"
+  },
+  {
+    "name": "injectRootLimpMode"
+  },
+  {
+    "name": "injectableDefOrInjectorDefFactory"
+  },
+  {
+    "name": "insertBloom"
+  },
+  {
+    "name": "instructionState"
+  },
+  {
+    "name": "invertObject"
+  },
+  {
+    "name": "invokeHostBindingsInCreationMode"
+  },
+  {
+    "name": "isAnimationProp"
+  },
+  {
+    "name": "isArray"
+  },
+  {
+    "name": "isArrayLike"
+  },
+  {
+    "name": "isComponentDef"
+  },
+  {
+    "name": "isComponentHost"
+  },
+  {
+    "name": "isContentQueryHost"
+  },
+  {
+    "name": "isCreationMode"
+  },
+  {
+    "name": "isCssClassMatching"
+  },
+  {
+    "name": "isCurrentTNodeParent"
+  },
+  {
+    "name": "isDirectiveHost"
+  },
+  {
+    "name": "isEmptyPathRedirect"
+  },
+  {
+    "name": "isFunction"
+  },
+  {
+    "name": "isFunction"
+  },
+  {
+    "name": "isInCheckNoChangesMode"
+  },
+  {
+    "name": "isInlineTemplate"
+  },
+  {
+    "name": "isJsObject"
+  },
+  {
+    "name": "isLContainer"
+  },
+  {
+    "name": "isLView"
+  },
+  {
+    "name": "isListLikeIterable"
+  },
+  {
+    "name": "isMatrixParams"
+  },
+  {
+    "name": "isNameOnlyAttributeMarker"
+  },
+  {
+    "name": "isNodeMatchingSelector"
+  },
+  {
+    "name": "isNodeMatchingSelectorList"
+  },
+  {
+    "name": "isObject"
+  },
+  {
+    "name": "isPositive"
+  },
+  {
+    "name": "isProceduralRenderer"
+  },
+  {
+    "name": "isPromise"
+  },
+  {
+    "name": "isPromise"
+  },
+  {
+    "name": "isRootView"
+  },
+  {
+    "name": "isScheduler"
+  },
+  {
+    "name": "isTypeProvider"
+  },
+  {
+    "name": "isUrlTree"
+  },
+  {
+    "name": "isValueProvider"
+  },
+  {
+    "name": "iterator"
+  },
+  {
+    "name": "joinWithSlash"
+  },
+  {
+    "name": "keyValDiff"
+  },
+  {
+    "name": "last"
+  },
+  {
+    "name": "leaveDI"
+  },
+  {
+    "name": "leaveView"
+  },
+  {
+    "name": "leaveViewLight"
+  },
+  {
+    "name": "localeEn"
+  },
+  {
+    "name": "locateDirectiveOrProvider"
+  },
+  {
+    "name": "makeParamDecorator"
+  },
+  {
+    "name": "makeRecord"
+  },
+  {
+    "name": "map"
+  },
+  {
+    "name": "mapChildrenIntoArray"
+  },
+  {
+    "name": "markAsComponentHost"
+  },
+  {
+    "name": "markViewDirty"
+  },
+  {
+    "name": "match"
+  },
+  {
+    "name": "matchSegments"
+  },
+  {
+    "name": "materializeViewResults"
+  },
+  {
+    "name": "maybeUnwrapFn"
+  },
+  {
+    "name": "maybeWrapInNotSelector"
+  },
+  {
+    "name": "mergeAll"
+  },
+  {
+    "name": "mergeHostAttribute"
+  },
+  {
+    "name": "mergeHostAttrs"
+  },
+  {
+    "name": "mergeMap"
+  },
+  {
+    "name": "mergeTrivialChildren"
+  },
+  {
+    "name": "modules"
+  },
+  {
+    "name": "namedOutletsRedirect"
+  },
+  {
+    "name": "nativeAppendChild"
+  },
+  {
+    "name": "nativeAppendOrInsertBefore"
+  },
+  {
+    "name": "nativeInsertBefore"
+  },
+  {
+    "name": "nativeParentNode"
+  },
+  {
+    "name": "navigationCancelingError"
+  },
+  {
+    "name": "nextBindingIndex"
+  },
+  {
+    "name": "nextNgElementId"
+  },
+  {
+    "name": "ngOnChangesSetInput"
+  },
+  {
+    "name": "noMatch"
+  },
+  {
+    "name": "noSideEffects"
+  },
+  {
+    "name": "nodeChildrenAsMap"
+  },
+  {
+    "name": "noop"
+  },
+  {
+    "name": "noop"
+  },
+  {
+    "name": "normalizeQueryParams"
+  },
+  {
+    "name": "observable"
+  },
+  {
+    "name": "of"
+  },
+  {
+    "name": "onEnter"
+  },
+  {
+    "name": "onLeave"
+  },
+  {
+    "name": "optionsReducer"
+  },
+  {
+    "name": "pipeFromArray"
+  },
+  {
+    "name": "platformBrowser"
+  },
+  {
+    "name": "platformCore"
+  },
+  {
+    "name": "prioritizedGuardValue"
+  },
+  {
+    "name": "promise"
+  },
+  {
+    "name": "provideForRootGuard"
+  },
+  {
+    "name": "provideLocationStrategy"
+  },
+  {
+    "name": "provideRoutes"
+  },
+  {
+    "name": "readPatchedLView"
+  },
+  {
+    "name": "refCount"
+  },
+  {
+    "name": "refreshComponent"
+  },
+  {
+    "name": "refreshContentQueries"
+  },
+  {
+    "name": "refreshView"
+  },
+  {
+    "name": "registerPostOrderHooks"
+  },
+  {
+    "name": "rememberChangeHistoryAndInvokeOnChangesHook"
+  },
+  {
+    "name": "remove"
+  },
+  {
+    "name": "removeFromArray"
+  },
+  {
+    "name": "renderComponent"
+  },
+  {
+    "name": "renderComponentOrTemplate"
+  },
+  {
+    "name": "renderStringify"
+  },
+  {
+    "name": "renderView"
+  },
+  {
+    "name": "resetPreOrderHookFlags"
+  },
+  {
+    "name": "resolveForwardRef"
+  },
+  {
+    "name": "routerNgProbeToken"
+  },
+  {
+    "name": "runCanActivate"
+  },
+  {
+    "name": "runCanActivateChild"
+  },
+  {
+    "name": "rxSubscriber"
+  },
+  {
+    "name": "saveNameToExportMap"
+  },
+  {
+    "name": "scheduleArray"
+  },
+  {
+    "name": "scheduleMicroTask"
+  },
+  {
+    "name": "searchTokensOnInjector"
+  },
+  {
+    "name": "serializeNode"
+  },
+  {
+    "name": "serializePath"
+  },
+  {
+    "name": "serializePaths"
+  },
+  {
+    "name": "setBindingRootForHostBindings"
+  },
+  {
+    "name": "setCurrentDirectiveIndex"
+  },
+  {
+    "name": "setCurrentInjector"
+  },
+  {
+    "name": "setCurrentQueryIndex"
+  },
+  {
+    "name": "setCurrentTNode"
+  },
+  {
+    "name": "setDirectiveInputsWhichShadowsStyling"
+  },
+  {
+    "name": "setIncludeViewProviders"
+  },
+  {
+    "name": "setInjectImplementation"
+  },
+  {
+    "name": "setInputsForProperty"
+  },
+  {
+    "name": "setInputsFromAttrs"
+  },
+  {
+    "name": "setIsInCheckNoChangesMode"
+  },
+  {
+    "name": "setLocaleId"
+  },
+  {
+    "name": "setRouterState"
+  },
+  {
+    "name": "setSelectedIndex"
+  },
+  {
+    "name": "setUpAttributes"
+  },
+  {
+    "name": "shallowEqual"
+  },
+  {
+    "name": "shareSubjectFactory"
+  },
+  {
+    "name": "shouldSearchParent"
+  },
+  {
+    "name": "split"
+  },
+  {
+    "name": "standardizeConfig"
+  },
+  {
+    "name": "storeCleanupWithContext"
+  },
+  {
+    "name": "stringify"
+  },
+  {
+    "name": "stringify"
+  },
+  {
+    "name": "stringifyCSSSelector"
+  },
+  {
+    "name": "stringifyForError"
+  },
+  {
+    "name": "stripTrailingSlash"
+  },
+  {
+    "name": "subscribeTo"
+  },
+  {
+    "name": "subscribeToArray"
+  },
+  {
+    "name": "subscribeToResult"
+  },
+  {
+    "name": "supportsState"
+  },
+  {
+    "name": "switchMap"
+  },
+  {
+    "name": "switchTap"
+  },
+  {
+    "name": "symbolIterator"
+  },
+  {
+    "name": "take"
+  },
+  {
+    "name": "takeLast"
+  },
+  {
+    "name": "tap"
+  },
+  {
+    "name": "throwIfEmpty"
+  },
+  {
+    "name": "toRefArray"
+  },
+  {
+    "name": "trackByIdentity"
+  },
+  {
+    "name": "tree"
+  },
+  {
+    "name": "u"
+  },
+  {
+    "name": "unwrapRNode"
+  },
+  {
+    "name": "updateMicroTaskStatus"
+  },
+  {
+    "name": "updateSegmentGroup"
+  },
+  {
+    "name": "updateSegmentGroupChildren"
+  },
+  {
+    "name": "updateTransplantedViewCount"
+  },
+  {
+    "name": "validateConfig"
+  },
+  {
+    "name": "validateNode"
+  },
+  {
+    "name": "viewAttachedToChangeDetector"
+  },
+  {
+    "name": "wrapIntoObservable"
+  },
+  {
+    "name": "wrapListener"
+  },
+  {
+    "name": "writeDirectClass"
+  },
+  {
+    "name": "writeDirectStyle"
+  },
+  {
+    "name": "ɵEmptyOutletComponent"
+  },
+  {
+    "name": "ɵɵNgOnChangesFeature"
+  },
+  {
+    "name": "ɵɵattribute"
+  },
+  {
+    "name": "ɵɵcontentQuery"
+  },
+  {
+    "name": "ɵɵdefineComponent"
+  },
+  {
+    "name": "ɵɵdefineDirective"
+  },
+  {
+    "name": "ɵɵdefineInjectable"
+  },
+  {
+    "name": "ɵɵdefineInjector"
+  },
+  {
+    "name": "ɵɵdefineNgModule"
+  },
+  {
+    "name": "ɵɵdirectiveInject"
+  },
+  {
+    "name": "ɵɵelement"
+  },
+  {
+    "name": "ɵɵelementEnd"
+  },
+  {
+    "name": "ɵɵelementStart"
+  },
+  {
+    "name": "ɵɵhostProperty"
+  },
+  {
+    "name": "ɵɵinject"
+  },
+  {
+    "name": "ɵɵinjectAttribute"
+  },
+  {
+    "name": "ɵɵinvalidFactory"
+  },
+  {
+    "name": "ɵɵlistener"
+  },
+  {
+    "name": "ɵɵloadQuery"
+  },
+  {
+    "name": "ɵɵqueryRefresh"
+  },
+  {
+    "name": "ɵɵsanitizeUrl"
+  },
+  {
+    "name": "ɵɵtext"
+  },
+  {
+    "name": "ɵɵtextInterpolate1"
+  }
+]
\ No newline at end of file
diff --git a/packages/core/test/bundling/router/index.html b/packages/core/test/bundling/router/index.html
new file mode 100644
index 0000000000000..e8942eac6f5a4
--- /dev/null
+++ b/packages/core/test/bundling/router/index.html
@@ -0,0 +1,32 @@
+<!doctype html>
+
+<html>
+  <head>
+    <title>Angular Routing Example</title>
+  </head>
+  <body>
+    <!-- The Angular application will be bootstrapped into this element. -->
+
+    <app-root></app-root>
+
+    <!--
+      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>
diff --git a/packages/core/test/bundling/router/index.ts b/packages/core/test/bundling/router/index.ts
new file mode 100644
index 0000000000000..cad06abb6cca1
--- /dev/null
+++ b/packages/core/test/bundling/router/index.ts
@@ -0,0 +1,72 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {APP_BASE_HREF} from '@angular/common';
+import {Component, NgModule, OnInit, ɵNgModuleFactory as NgModuleFactory} from '@angular/core';
+import {BrowserModule, platformBrowser} from '@angular/platform-browser';
+import {ActivatedRoute, Router, RouterModule, Routes} from '@angular/router';
+
+@Component({
+  selector: 'app-list',
+  template: `
+  <ul>
+    <li><a routerLink="/item/1" routerLinkActive="active">List Item 1</a></li>
+    <li><a routerLink="/item/2" routerLinkActive="active">List Item 2</a></li>
+    <li><a routerLink="/item/3" routerLinkActive="active">List Item 3</a></li>
+  </ul>
+  `,
+})
+class ListComponent {
+}
+
+@Component({
+  selector: 'app-item',
+  template: `
+  Item {{id}}
+  <p><button (click)="viewList()">Back to List</button></p>`,
+})
+class ItemComponent implements OnInit {
+  id = -1;
+  constructor(private activatedRoute: ActivatedRoute, private router: Router) {}
+
+  ngOnInit() {
+    this.activatedRoute.paramMap.subscribe(paramsMap => {
+      this.id = +paramsMap.get('id')!;
+    });
+  }
+
+  viewList() {
+    this.router.navigate(['/list']);
+  }
+}
+
+@Component({
+  selector: 'app-root',
+  template: `<router-outlet></router-outlet>`,
+})
+class RootComponent {
+  constructor() {}
+}
+
+const ROUTES: Routes = [
+  {path: '', redirectTo: '/list', pathMatch: 'full'}, {path: 'list', component: ListComponent},
+  {path: 'item/:id', component: ItemComponent}
+];
+
+@NgModule({
+  declarations: [RootComponent, ListComponent, ItemComponent],
+  imports: [BrowserModule, RouterModule.forRoot(ROUTES)],
+  providers: [{provide: APP_BASE_HREF, useValue: ''}]
+})
+class RouteExampleModule {
+  ngDoBootstrap(app: any) {
+    app.bootstrap(RootComponent);
+  }
+}
+
+(window as any).waitForApp = platformBrowser().bootstrapModuleFactory(
+    new NgModuleFactory(RouteExampleModule), {ngZone: 'noop'});
diff --git a/packages/core/test/bundling/router/treeshaking_spec.ts b/packages/core/test/bundling/router/treeshaking_spec.ts
new file mode 100644
index 0000000000000..fbc2f34d18d44
--- /dev/null
+++ b/packages/core/test/bundling/router/treeshaking_spec.ts
@@ -0,0 +1,35 @@
+/**
+ * @license
+ * Copyright Google LLC 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 '@angular/compiler';
+import * as fs from 'fs';
+import * as path from 'path';
+
+const UTF8 = {
+  encoding: 'utf-8'
+};
+const PACKAGE = 'angular/packages/core/test/bundling/router';
+
+describe('treeshaking with uglify', () => {
+  let content: string;
+  // We use the debug version as otherwise symbols/identifiers would be mangled (and the test would
+  // always pass)
+  const contentPath = require.resolve(path.join(PACKAGE, 'bundle.min_debug.js'));
+  beforeAll(() => {
+    content = fs.readFileSync(contentPath, UTF8);
+  });
+
+  it('should drop unused TypeScript helpers', () => {
+    expect(content).not.toContain('__asyncGenerator');
+  });
+
+  it('should not contain rxjs from commonjs distro', () => {
+    expect(content).not.toContain('commonjsGlobal');
+    expect(content).not.toContain('createCommonjsModule');
+  });
+});
diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json
index 621068548e7cf..a650b90fa8020 100644
--- a/packages/core/test/bundling/todo/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/todo/bundle.golden_symbols.json
@@ -179,9 +179,6 @@
   {
     "name": "addHostBindingsToExpandoInstructions"
   },
-  {
-    "name": "addRemoveViewFromContainer"
-  },
   {
     "name": "addToArray"
   },
@@ -335,12 +332,6 @@
   {
     "name": "generatePropertyAliases"
   },
-  {
-    "name": "getBeforeNodeForView"
-  },
-  {
-    "name": "getCheckNoChangesMode"
-  },
   {
     "name": "getClosureSafeProperty"
   },
@@ -354,7 +345,10 @@
     "name": "getConstant"
   },
   {
-    "name": "getContainerRenderParent"
+    "name": "getCurrentTNode"
+  },
+  {
+    "name": "getCurrentTNodePlaceholderOk"
   },
   {
     "name": "getDebugContext"
@@ -365,15 +359,9 @@
   {
     "name": "getInjectorIndex"
   },
-  {
-    "name": "getIsParent"
-  },
   {
     "name": "getLCleanup"
   },
-  {
-    "name": "getLContainer"
-  },
   {
     "name": "getLView"
   },
@@ -422,18 +410,9 @@
   {
     "name": "getParentInjectorView"
   },
-  {
-    "name": "getParentInjectorViewOffset"
-  },
-  {
-    "name": "getParentState"
-  },
   {
     "name": "getPreviousIndex"
   },
-  {
-    "name": "getPreviousOrParentTNode"
-  },
   {
     "name": "getSelectedIndex"
   },
@@ -464,6 +443,9 @@
   {
     "name": "hasTagAndTypeMatch"
   },
+  {
+    "name": "icuContainerIterate"
+  },
   {
     "name": "includeViewProviders"
   },
@@ -503,9 +485,15 @@
   {
     "name": "isCssClassMatching"
   },
+  {
+    "name": "isCurrentTNodeParent"
+  },
   {
     "name": "isDirectiveHost"
   },
+  {
+    "name": "isInCheckNoChangesMode"
+  },
   {
     "name": "isInlineTemplate"
   },
@@ -662,15 +650,15 @@
   {
     "name": "setBindingRootForHostBindings"
   },
-  {
-    "name": "setCheckNoChangesMode"
-  },
   {
     "name": "setCurrentDirectiveIndex"
   },
   {
     "name": "setCurrentQueryIndex"
   },
+  {
+    "name": "setCurrentTNode"
+  },
   {
     "name": "setDirectiveInputsWhichShadowsStyling"
   },
@@ -687,7 +675,7 @@
     "name": "setInputsFromAttrs"
   },
   {
-    "name": "setPreviousOrParentTNode"
+    "name": "setIsInCheckNoChangesMode"
   },
   {
     "name": "setSelectedIndex"
@@ -713,9 +701,6 @@
   {
     "name": "stringifyForError"
   },
-  {
-    "name": "throwMultipleComponentError"
-  },
   {
     "name": "toTStylingRange"
   },
diff --git a/packages/core/test/linker/change_detection_integration_spec.ts b/packages/core/test/linker/change_detection_integration_spec.ts
index 708e31d94e96e..2144e9e21f5f1 100644
--- a/packages/core/test/linker/change_detection_integration_spec.ts
+++ b/packages/core/test/linker/change_detection_integration_spec.ts
@@ -8,7 +8,7 @@
 
 import {ResourceLoader, UrlResolver} from '@angular/compiler';
 import {MockResourceLoader} from '@angular/compiler/testing';
-import {AfterContentChecked, AfterContentInit, AfterViewChecked, AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, ContentChild, DebugElement, Directive, DoCheck, EventEmitter, HostBinding, Inject, Injectable, Input, OnChanges, OnDestroy, OnInit, Output, Pipe, PipeTransform, Provider, RendererFactory2, RendererType2, SimpleChange, SimpleChanges, TemplateRef, Type, ViewChild, ViewContainerRef, WrappedValue} from '@angular/core';
+import {AfterContentChecked, AfterContentInit, AfterViewChecked, AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, ContentChild, DebugElement, Directive, DoCheck, EventEmitter, HostBinding, Injectable, Input, OnChanges, OnDestroy, OnInit, Output, Pipe, PipeTransform, Provider, RendererFactory2, RendererType2, SimpleChange, SimpleChanges, TemplateRef, Type, ViewChild, ViewContainerRef, WrappedValue} from '@angular/core';
 import {ComponentFixture, fakeAsync, TestBed} from '@angular/core/testing';
 import {By} from '@angular/platform-browser/src/dom/debug/by';
 import {isTextNode} from '@angular/platform-browser/testing/src/browser_util';
diff --git a/packages/core/test/linker/ng_module_integration_spec.ts b/packages/core/test/linker/ng_module_integration_spec.ts
index dceb37c94462b..93ca3d28794b3 100644
--- a/packages/core/test/linker/ng_module_integration_spec.ts
+++ b/packages/core/test/linker/ng_module_integration_spec.ts
@@ -6,8 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ANALYZE_FOR_ENTRY_COMPONENTS, ChangeDetectorRef, Compiler, Component, ComponentFactoryResolver, CUSTOM_ELEMENTS_SCHEMA, Directive, forwardRef, getModuleFactory, HostBinding, Inject, Injectable, InjectionToken, Injector, Input, NgModule, NgModuleRef, Optional, Pipe, Provider, Self, Type, ɵivyEnabled as ivyEnabled, ɵɵdefineNgModule as defineNgModule} from '@angular/core';
-import {Console} from '@angular/core/src/console';
+import {ANALYZE_FOR_ENTRY_COMPONENTS, Compiler, Component, ComponentFactoryResolver, CUSTOM_ELEMENTS_SCHEMA, Directive, forwardRef, getModuleFactory, HostBinding, Inject, Injectable, InjectionToken, Injector, Input, NgModule, NgModuleRef, Optional, Pipe, Provider, Self, Type, ɵivyEnabled as ivyEnabled, ɵɵdefineNgModule as defineNgModule} from '@angular/core';
 import {ɵɵdefineInjectable, ɵɵInjectableDef} from '@angular/core/src/di/interface/defs';
 import {getNgModuleDef} from '@angular/core/src/render3/definition';
 import {NgModuleData} from '@angular/core/src/view/types';
diff --git a/packages/core/test/linker/projection_integration_spec.ts b/packages/core/test/linker/projection_integration_spec.ts
index 6392969c32270..d97673918f06d 100644
--- a/packages/core/test/linker/projection_integration_spec.ts
+++ b/packages/core/test/linker/projection_integration_spec.ts
@@ -490,13 +490,13 @@ describe('projection', () => {
     expect(main.nativeElement).toHaveText('TREE(0:TREE2(1:TREE(2:)))');
   });
 
-  if (supportsNativeShadowDOM()) {
-    it('should support native content projection and isolate styles per component', () => {
-      TestBed.configureTestingModule({declarations: [SimpleNative1, SimpleNative2]});
+  if (supportsShadowDOM()) {
+    it('should support shadow dom content projection and isolate styles per component', () => {
+      TestBed.configureTestingModule({declarations: [SimpleShadowDom1, SimpleShadowDom2]});
       TestBed.overrideComponent(MainComp, {
         set: {
-          template: '<simple-native1><div>A</div></simple-native1>' +
-              '<simple-native2><div>B</div></simple-native2>'
+          template: '<simple-shadow-dom1><div>A</div></simple-shadow-dom1>' +
+              '<simple-shadow-dom2><div>B</div></simple-shadow-dom2>'
         }
       });
       const main = TestBed.createComponent(MainComp);
@@ -857,21 +857,21 @@ class Simple {
 }
 
 @Component({
-  selector: 'simple-native1',
-  template: 'SIMPLE1(<content></content>)',
-  encapsulation: ViewEncapsulation.Native,
+  selector: 'simple-shadow-dom1',
+  template: 'SIMPLE1(<slot></slot>)',
+  encapsulation: ViewEncapsulation.ShadowDom,
   styles: ['div {color: red}']
 })
-class SimpleNative1 {
+class SimpleShadowDom1 {
 }
 
 @Component({
-  selector: 'simple-native2',
-  template: 'SIMPLE2(<content></content>)',
-  encapsulation: ViewEncapsulation.Native,
+  selector: 'simple-shadow-dom2',
+  template: 'SIMPLE2(<slot></slot>)',
+  encapsulation: ViewEncapsulation.ShadowDom,
   styles: ['div {color: blue}']
 })
-class SimpleNative2 {
+class SimpleShadowDom2 {
 }
 
 @Component({selector: 'empty', template: ''})
@@ -1043,6 +1043,6 @@ class CmpA1 {
 class CmpA2 {
 }
 
-function supportsNativeShadowDOM(): boolean {
-  return typeof (<any>document.body).createShadowRoot === 'function';
+function supportsShadowDOM(): boolean {
+  return typeof (<any>document.body).attachShadow !== 'undefined';
 }
diff --git a/packages/core/test/reflection/es2015_inheritance_fixture.ts b/packages/core/test/reflection/es2015_inheritance_fixture.ts
new file mode 100644
index 0000000000000..d9ba165acefa6
--- /dev/null
+++ b/packages/core/test/reflection/es2015_inheritance_fixture.ts
@@ -0,0 +1,22 @@
+/**
+ * @license
+ * Copyright Google LLC 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
+ */
+
+// AMD module name is required so that this file can be loaded in the Karma tests.
+/// <amd-module name="angular/packages/core/test/reflection/es5_downleveled_inheritance_fixture" />
+
+class Parent {}
+
+export class ChildNoCtor extends Parent {}
+export class ChildWithCtor extends Parent {
+  constructor() {
+    super();
+  }
+}
+export class ChildNoCtorPrivateProps extends Parent {
+  x = 10;
+}
diff --git a/packages/core/test/reflection/reflector_spec.ts b/packages/core/test/reflection/reflector_spec.ts
index 43b732b3151fc..87123b708769c 100644
--- a/packages/core/test/reflection/reflector_spec.ts
+++ b/packages/core/test/reflection/reflector_spec.ts
@@ -201,6 +201,16 @@ class TestObj {
         expect(isDelegateCtor(ChildWithCtor.toString())).toBe(false);
       });
 
+      // See: https://github.com/angular/angular/issues/38453
+      it('should support ES2015 downleveled classes', () => {
+        const {ChildNoCtor, ChildNoCtorPrivateProps, ChildWithCtor} =
+            require('./es5_downleveled_inheritance_fixture');
+
+        expect(isDelegateCtor(ChildNoCtor.toString())).toBe(true);
+        expect(isDelegateCtor(ChildNoCtorPrivateProps.toString())).toBe(true);
+        expect(isDelegateCtor(ChildWithCtor.toString())).toBe(false);
+      });
+
       it('should support ES2015 classes when minified', () => {
         // These classes are ES2015 in minified form
         const ChildNoCtorMinified = 'class ChildNoCtor extends Parent{}';
diff --git a/packages/core/test/render3/di_spec.ts b/packages/core/test/render3/di_spec.ts
index be5e453158f11..bd0585da29453 100644
--- a/packages/core/test/render3/di_spec.ts
+++ b/packages/core/test/render3/di_spec.ts
@@ -9,11 +9,11 @@
 import {InjectFlags, Optional, Renderer2, Self} from '@angular/core';
 import {createLView, createTView, getOrCreateTNode} from '@angular/core/src/render3/instructions/shared';
 import {RenderFlags} from '@angular/core/src/render3/interfaces/definition';
+import {NodeInjectorOffset} from '@angular/core/src/render3/interfaces/injector';
 
 import {ɵɵdefineComponent} from '../../src/render3/definition';
 import {bloomAdd, bloomHashBitOrFactory as bloomHash, bloomHasToken, getOrCreateNodeInjectorForNode} from '../../src/render3/di';
 import {ɵɵdefineDirective, ɵɵdirectiveInject, ɵɵelement, ɵɵelementEnd, ɵɵelementStart, ɵɵtext} from '../../src/render3/index';
-import {TNODE} from '../../src/render3/interfaces/injector';
 import {TNodeType} from '../../src/render3/interfaces/node';
 import {isProceduralRenderer} from '../../src/render3/interfaces/renderer';
 import {LViewFlags, TVIEW, TViewType} from '../../src/render3/interfaces/view';
@@ -150,7 +150,7 @@ describe('di', () => {
       });
 
       function bloomState() {
-        return mockTView.data.slice(0, TNODE).reverse();
+        return mockTView.data.slice(0, NodeInjectorOffset.TNODE).reverse();
       }
 
       class Dir0 {
@@ -226,12 +226,11 @@ describe('di', () => {
   describe('getOrCreateNodeInjector', () => {
     it('should handle initial undefined state', () => {
       const contentView = createLView(
-          null, createTView(TViewType.Component, -1, null, 1, 0, null, null, null, null, null), {},
-          LViewFlags.CheckAlways, null, null, {} as any, {} as any);
-      enterView(contentView, null);
+          null, createTView(TViewType.Component, null, null, 1, 0, null, null, null, null, null),
+          {}, LViewFlags.CheckAlways, null, null, {} as any, {} as any, null, null);
+      enterView(contentView);
       try {
-        const parentTNode =
-            getOrCreateTNode(contentView[TVIEW], null, 0, TNodeType.Element, null, null);
+        const parentTNode = getOrCreateTNode(contentView[TVIEW], 0, TNodeType.Element, null, null);
         // 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.
diff --git a/packages/core/test/render3/i18n/i18n_insert_before_index_spec.ts b/packages/core/test/render3/i18n/i18n_insert_before_index_spec.ts
new file mode 100644
index 0000000000000..2921d9a2e71e0
--- /dev/null
+++ b/packages/core/test/render3/i18n/i18n_insert_before_index_spec.ts
@@ -0,0 +1,183 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {addTNodeAndUpdateInsertBeforeIndex} from '@angular/core/src/render3/i18n/i18n_insert_before_index';
+import {createTNode} from '@angular/core/src/render3/instructions/shared';
+import {TNode, TNodeType} from '@angular/core/src/render3/interfaces/node';
+import {matchTNode} from '../matchers';
+
+
+describe('addTNodeAndUpdateInsertBeforeIndex', () => {
+  function tNode(index: number, type: TNodeType, insertBeforeIndex: number|null = null): TNode {
+    const tNode = createTNode(null!, null, type, index, null, null);
+    tNode.insertBeforeIndex = insertBeforeIndex;
+    return tNode;
+  }
+
+  function tPlaceholderElementNode(index: number, insertBeforeIndex: number|null = null) {
+    return tNode(index, TNodeType.Placeholder, insertBeforeIndex);
+  }
+
+  function tI18NTextNode(index: number, insertBeforeIndex: number|null = null) {
+    return tNode(index, TNodeType.Element, insertBeforeIndex);
+  }
+
+  it('should add first node', () => {
+    const previousTNodes: TNode[] = [];
+    addTNodeAndUpdateInsertBeforeIndex(previousTNodes, tPlaceholderElementNode(20));
+    expect(previousTNodes).toEqual([
+      matchTNode({index: 20, insertBeforeIndex: null}),
+    ]);
+  });
+
+  describe('when adding a placeholder', () => {
+    describe('whose index is greater than those already there', () => {
+      it('should not update the `insertBeforeIndex` values', () => {
+        const previousTNodes: TNode[] = [
+          tPlaceholderElementNode(20),
+          tPlaceholderElementNode(21),
+        ];
+        addTNodeAndUpdateInsertBeforeIndex(previousTNodes, tPlaceholderElementNode(22));
+        expect(previousTNodes).toEqual([
+          matchTNode({index: 20, insertBeforeIndex: null}),
+          matchTNode({index: 21, insertBeforeIndex: null}),
+          matchTNode({index: 22, insertBeforeIndex: null}),
+        ]);
+      });
+    });
+
+    describe('whose index is smaller than current nodes', () => {
+      it('should update the previous insertBeforeIndex', () => {
+        const previousTNodes: TNode[] = [
+          tPlaceholderElementNode(21),
+          tPlaceholderElementNode(22),
+        ];
+        addTNodeAndUpdateInsertBeforeIndex(previousTNodes, tPlaceholderElementNode(20));
+        expect(previousTNodes).toEqual([
+          matchTNode({index: 21, insertBeforeIndex: 20}),
+          matchTNode({index: 22, insertBeforeIndex: 20}),
+          matchTNode({index: 20, insertBeforeIndex: null}),
+        ]);
+      });
+
+      it('should not update the previous insertBeforeIndex if it is already set', () => {
+        const previousTNodes: TNode[] = [
+          tPlaceholderElementNode(22, 21),
+          tPlaceholderElementNode(23, 21),
+          tPlaceholderElementNode(21),
+        ];
+        addTNodeAndUpdateInsertBeforeIndex(previousTNodes, tPlaceholderElementNode(20));
+        expect(previousTNodes).toEqual([
+          matchTNode({index: 22, insertBeforeIndex: 21}),
+          matchTNode({index: 23, insertBeforeIndex: 21}),
+          matchTNode({index: 21, insertBeforeIndex: 20}),
+          matchTNode({index: 20, insertBeforeIndex: null}),
+        ]);
+      });
+
+      it('should not update the previous insertBeforeIndex if it is created after', () => {
+        const previousTNodes: TNode[] = [
+          tPlaceholderElementNode(25, 20),
+          tPlaceholderElementNode(26, 20),
+          tPlaceholderElementNode(20),
+        ];
+        addTNodeAndUpdateInsertBeforeIndex(previousTNodes, tPlaceholderElementNode(23));
+        expect(previousTNodes).toEqual([
+          matchTNode({index: 25, insertBeforeIndex: 20}),
+          matchTNode({index: 26, insertBeforeIndex: 20}),
+          matchTNode({index: 20, insertBeforeIndex: null}),
+          matchTNode({index: 23, insertBeforeIndex: null}),
+        ]);
+      });
+    });
+  });
+
+  describe('when adding a i18nText', () => {
+    describe('whose index is greater than those already there', () => {
+      it('should not update the `insertBeforeIndex` values', () => {
+        const previousTNodes: TNode[] = [
+          tPlaceholderElementNode(20),
+          tPlaceholderElementNode(21),
+        ];
+        addTNodeAndUpdateInsertBeforeIndex(previousTNodes, tI18NTextNode(22));
+        expect(previousTNodes).toEqual([
+          matchTNode({index: 20, insertBeforeIndex: 22}),
+          matchTNode({index: 21, insertBeforeIndex: 22}),
+          matchTNode({index: 22, insertBeforeIndex: null}),
+        ]);
+      });
+    });
+
+    describe('whose index is smaller than current nodes', () => {
+      it('should update the previous insertBeforeIndex', () => {
+        const previousTNodes: TNode[] = [
+          tPlaceholderElementNode(21),
+          tPlaceholderElementNode(22),
+        ];
+        addTNodeAndUpdateInsertBeforeIndex(previousTNodes, tI18NTextNode(20));
+        expect(previousTNodes).toEqual([
+          matchTNode({index: 21, insertBeforeIndex: 20}),
+          matchTNode({index: 22, insertBeforeIndex: 20}),
+          matchTNode({index: 20, insertBeforeIndex: null}),
+        ]);
+      });
+
+      it('should not update the previous insertBeforeIndex if it is already set', () => {
+        const previousTNodes: TNode[] = [
+          tPlaceholderElementNode(22, 21),
+          tPlaceholderElementNode(23, 21),
+          tPlaceholderElementNode(21),
+        ];
+        addTNodeAndUpdateInsertBeforeIndex(previousTNodes, tI18NTextNode(20));
+        expect(previousTNodes).toEqual([
+          matchTNode({index: 22, insertBeforeIndex: 21}),
+          matchTNode({index: 23, insertBeforeIndex: 21}),
+          matchTNode({index: 21, insertBeforeIndex: 20}),
+          matchTNode({index: 20, insertBeforeIndex: null}),
+        ]);
+      });
+
+      it('should not update the previous insertBeforeIndex if it is created after', () => {
+        const previousTNodes: TNode[] = [
+          tPlaceholderElementNode(25, 20),
+          tPlaceholderElementNode(26, 20),
+          tPlaceholderElementNode(20),
+        ];
+        addTNodeAndUpdateInsertBeforeIndex(previousTNodes, tI18NTextNode(23));
+        expect(previousTNodes).toEqual([
+          matchTNode({index: 25, insertBeforeIndex: 20}),
+          matchTNode({index: 26, insertBeforeIndex: 20}),
+          matchTNode({index: 20, insertBeforeIndex: 23}),
+          matchTNode({index: 23, insertBeforeIndex: null}),
+        ]);
+      });
+    });
+  });
+
+  describe('scenario', () => {
+    it('should rearrange the nodes', () => {
+      const previousTNodes: TNode[] = [];
+      addTNodeAndUpdateInsertBeforeIndex(previousTNodes, tPlaceholderElementNode(22));
+      addTNodeAndUpdateInsertBeforeIndex(previousTNodes, tPlaceholderElementNode(28));
+      addTNodeAndUpdateInsertBeforeIndex(previousTNodes, tPlaceholderElementNode(24));
+      addTNodeAndUpdateInsertBeforeIndex(previousTNodes, tPlaceholderElementNode(25));
+      addTNodeAndUpdateInsertBeforeIndex(previousTNodes, tI18NTextNode(29));
+      addTNodeAndUpdateInsertBeforeIndex(previousTNodes, tPlaceholderElementNode(23));
+      addTNodeAndUpdateInsertBeforeIndex(previousTNodes, tPlaceholderElementNode(27));
+      expect(previousTNodes).toEqual([
+        matchTNode({index: 22, insertBeforeIndex: 29}),
+        matchTNode({index: 28, insertBeforeIndex: 24}),
+        matchTNode({index: 24, insertBeforeIndex: 29}),
+        matchTNode({index: 25, insertBeforeIndex: 29}),
+        matchTNode({index: 29, insertBeforeIndex: null}),
+        matchTNode({index: 23, insertBeforeIndex: null}),
+        matchTNode({index: 27, insertBeforeIndex: null}),
+      ]);
+    });
+  });
+});
\ No newline at end of file
diff --git a/packages/core/test/render3/i18n/i18n_parse_spec.ts b/packages/core/test/render3/i18n/i18n_parse_spec.ts
new file mode 100644
index 0000000000000..339453a1b0134
--- /dev/null
+++ b/packages/core/test/render3/i18n/i18n_parse_spec.ts
@@ -0,0 +1,290 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {ɵɵi18nApply, ɵɵi18nExp} from '@angular/core';
+import {applyCreateOpCodes} from '@angular/core/src/render3/i18n/i18n_apply';
+import {i18nStartFirstCreatePass} from '@angular/core/src/render3/i18n/i18n_parse';
+import {getTIcu} from '@angular/core/src/render3/i18n/i18n_util';
+import {I18nUpdateOpCodes, IcuType, TI18n} from '@angular/core/src/render3/interfaces/i18n';
+import {HEADER_OFFSET} from '@angular/core/src/render3/interfaces/view';
+import {expect} from '@angular/core/testing/src/testing_internal';
+import {matchTI18n, matchTIcu} from '../matchers';
+import {matchDebug} from '../utils';
+import {ViewFixture} from '../view_fixture';
+
+describe('i18n_parse', () => {
+  let fixture: ViewFixture;
+  beforeEach(() => fixture = new ViewFixture({decls: 1, vars: 1}));
+
+  describe('icu', () => {
+    it('should parse simple text', () => {
+      const tI18n = toT18n('some text');
+      expect(tI18n).toEqual(matchTI18n({
+        create: matchDebug([
+          'lView[22] = document.createText("some text");',
+          'parent.appendChild(lView[22]);',
+        ]),
+        update: [] as unknown as I18nUpdateOpCodes,
+      }));
+
+      fixture.apply(() => applyCreateOpCodes(fixture.lView, tI18n.create, fixture.host, null));
+      expect(fixture.host.innerHTML).toEqual('some text');
+    });
+
+    it('should parse simple ICU', () => {
+      //     TData                  | LView
+      // ---------------------------+-------------------------------
+      //                     ----- DECL -----
+      // 20: TI18n                  |
+      //                     ----- VARS -----
+      // 21: Binding for ICU        |
+      //                   ----- EXPANDO -----
+      // 22: null                   | #text(before|)
+      // 23: TIcu                   | <!-- ICU 20:0 -->
+      // 24: null                   | currently selected ICU case
+      // 25: null                   | #text(caseA)
+      // 26: null                   | #text(otherCase)
+      // 27: null                   | #text(|after)
+      const tI18n = toT18n(`before|{
+          �0�, select,
+            A {caseA}
+            other {otherCase}
+        }|after`);
+      expect(tI18n).toEqual(matchTI18n({
+        create: matchDebug([
+          'lView[22] = document.createText("before|");',
+          'parent.appendChild(lView[22]);',
+          'lView[23] = document.createComment("ICU 20:0");',
+          'parent.appendChild(lView[23]);',
+          'lView[27] = document.createText("|after");',
+          'parent.appendChild(lView[27]);',
+        ]),
+        update: matchDebug([
+          'if (mask & 0b1) { icuSwitchCase(23, `${lView[i-1]}`); }',
+        ])
+      }));
+      expect(getTIcu(fixture.tView, 23)).toEqual(matchTIcu({
+        type: IcuType.select,
+        anchorIdx: 23,
+        currentCaseLViewIndex: 24,
+        cases: ['A', 'other'],
+        create: [
+          matchDebug([
+            'lView[25] = document.createTextNode("caseA")',
+            '(lView[0] as Element).appendChild(lView[25])'
+          ]),
+          matchDebug([
+            'lView[26] = document.createTextNode("otherCase")',
+            '(lView[0] as Element).appendChild(lView[26])',
+          ])
+        ],
+        update: [
+          matchDebug([]),
+          matchDebug([]),
+        ],
+        remove: [
+          matchDebug(['remove(lView[25])']),
+          matchDebug(['remove(lView[26])']),
+        ],
+      }));
+
+      fixture.apply(() => {
+        applyCreateOpCodes(fixture.lView, tI18n.create, fixture.host, null);
+        expect(fixture.host.innerHTML).toEqual('before|<!--ICU 20:0-->|after');
+      });
+      fixture.apply(() => {
+        ɵɵi18nExp('A');
+        ɵɵi18nApply(0);  // index 0 + HEADER_OFFSET = 20;
+        expect(fixture.host.innerHTML).toEqual('before|caseA<!--ICU 20:0-->|after');
+      });
+      fixture.apply(() => {
+        ɵɵi18nExp('x');
+        ɵɵi18nApply(0);  // index 0 + HEADER_OFFSET = 20;
+        expect(fixture.host.innerHTML).toEqual('before|otherCase<!--ICU 20:0-->|after');
+      });
+      fixture.apply(() => {
+        ɵɵi18nExp('A');
+        ɵɵi18nApply(0);  // index 0 + HEADER_OFFSET = 20;
+        expect(fixture.host.innerHTML).toEqual('before|caseA<!--ICU 20:0-->|after');
+      });
+    });
+
+    it('should parse HTML in ICU', () => {
+      const tI18n = toT18n(`{
+        �0�, select,
+          A {Hello <b>world<i>!</i></b>}
+          other {<div>{�0�, select, 0 {nested0} other {nestedOther}}</div>}
+      }`);
+      fixture.apply(() => {
+        applyCreateOpCodes(fixture.lView, tI18n.create, fixture.host, null);
+        expect(fixture.host.innerHTML).toEqual('<!--ICU 20:0-->');
+      });
+      fixture.apply(() => {
+        ɵɵi18nExp('A');
+        ɵɵi18nApply(0);  // index 0 + HEADER_OFFSET = 20;
+        expect(fixture.host.innerHTML).toEqual('Hello <b>world<i>!</i></b><!--ICU 20:0-->');
+      });
+      fixture.apply(() => {
+        ɵɵi18nExp('x');
+        ɵɵi18nApply(0);  // index 0 + HEADER_OFFSET = 20;
+        expect(fixture.host.innerHTML)
+            .toEqual('<div>nestedOther<!--nested ICU 0--></div><!--ICU 20:0-->');
+      });
+      fixture.apply(() => {
+        ɵɵi18nExp('A');
+        ɵɵi18nApply(0);  // index 0 + HEADER_OFFSET = 20;
+        expect(fixture.host.innerHTML).toEqual('Hello <b>world<i>!</i></b><!--ICU 20:0-->');
+      });
+    });
+
+
+    it('should parse nested ICU', () => {
+      fixture = new ViewFixture({decls: 1, vars: 3});
+      //     TData                  | LView
+      // ---------------------------+-------------------------------
+      //                     ----- DECL -----
+      // 20: TI18n                  |
+      //                     ----- VARS -----
+      // 21: Binding for parent ICU |
+      // 22: Binding for child ICU  |
+      // 23: Binding for child ICU  |
+      //                   ----- EXPANDO -----
+      // 24: TIcu (parent)          | <!-- ICU 20:0 -->
+      // 25: null                   | currently selected ICU case
+      // 26: null                   | #text( parentA )
+      // 27: TIcu (child)           | <!-- nested ICU 0 -->
+      // 28:     null               |     currently selected ICU case
+      // 29:     null               |     #text(nested0)
+      // 30:     null               |     #text({{�2�}})
+      // 31: null                   | #text( )
+      // 32: null                   | #text( parentOther )
+      const tI18n = toT18n(`{
+          �0�, select,
+            A {parentA {�1�, select, 0 {nested0} other {�2�}}!}
+            other {parentOther}
+        }`);
+      expect(tI18n).toEqual(matchTI18n({
+        create: matchDebug([
+          'lView[24] = document.createComment("ICU 20:0");',
+          'parent.appendChild(lView[24]);',
+        ]),
+        update: matchDebug([
+          'if (mask & 0b1) { icuSwitchCase(24, `${lView[i-1]}`); }',
+          'if (mask & 0b10) { icuSwitchCase(27, `${lView[i-2]}`); }',
+          'if (mask & 0b100) { icuUpdateCase(27); }',
+        ]),
+      }));
+      expect(getTIcu(fixture.tView, 24)).toEqual(matchTIcu({
+        type: IcuType.select,
+        anchorIdx: 24,
+        currentCaseLViewIndex: 25,
+        cases: ['A', 'other'],
+        create: [
+          matchDebug([
+            'lView[26] = document.createTextNode("parentA ")',
+            '(lView[0] as Element).appendChild(lView[26])',
+            'lView[27] = document.createComment("nested ICU 0")',
+            '(lView[0] as Element).appendChild(lView[27])',
+            'lView[31] = document.createTextNode("!")',
+            '(lView[0] as Element).appendChild(lView[31])',
+          ]),
+          matchDebug([
+            'lView[32] = document.createTextNode("parentOther")',
+            '(lView[0] as Element).appendChild(lView[32])',
+          ])
+        ],
+        update: [
+          matchDebug([]),
+          matchDebug([]),
+        ],
+        remove: [
+          matchDebug([
+            'remove(lView[26])',
+            'removeNestedICU(27)',
+            'remove(lView[27])',
+            'remove(lView[31])',
+          ]),
+          matchDebug([
+            'remove(lView[32])',
+          ])
+        ],
+      }));
+
+      expect(getTIcu(fixture.tView, 27)).toEqual(matchTIcu({
+        type: IcuType.select,
+        anchorIdx: 27,
+        currentCaseLViewIndex: 28,
+        cases: ['0', 'other'],
+        create: [
+          matchDebug([
+            'lView[29] = document.createTextNode("nested0")',
+            '(lView[0] as Element).appendChild(lView[29])'
+          ]),
+          matchDebug([
+            'lView[30] = document.createTextNode("")',
+            '(lView[0] as Element).appendChild(lView[30])',
+          ])
+        ],
+        update: [
+          matchDebug([]),
+          matchDebug([
+            'if (mask & 0b100) { (lView[30] as Text).textContent = `${lView[i-3]}`; }',
+          ]),
+        ],
+        remove: [
+          matchDebug(['remove(lView[29])']),
+          matchDebug(['remove(lView[30])']),
+        ],
+      }));
+
+      fixture.apply(() => {
+        applyCreateOpCodes(fixture.lView, tI18n.create, fixture.host, null);
+        expect(fixture.host.innerHTML).toEqual('<!--ICU 20:0-->');
+      });
+      fixture.apply(() => {
+        ɵɵi18nExp('A');
+        ɵɵi18nExp('0');
+        ɵɵi18nExp('value1');
+        ɵɵi18nApply(0);  // index 0 + HEADER_OFFSET = 20;
+        expect(fixture.host.innerHTML)
+            .toEqual('parentA nested0<!--nested ICU 0-->!<!--ICU 20:0-->');
+      });
+      fixture.apply(() => {
+        ɵɵi18nExp('A');
+        ɵɵi18nExp('x');
+        ɵɵi18nExp('value1');
+        ɵɵi18nApply(0);  // index 0 + HEADER_OFFSET = 20;
+        expect(fixture.host.innerHTML).toEqual('parentA value1<!--nested ICU 0-->!<!--ICU 20:0-->');
+      });
+      fixture.apply(() => {
+        ɵɵi18nExp('x');
+        ɵɵi18nExp('x');
+        ɵɵi18nExp('value2');
+        ɵɵi18nApply(0);  // index 0 + HEADER_OFFSET = 20;
+        expect(fixture.host.innerHTML).toEqual('parentOther<!--ICU 20:0-->');
+      });
+      fixture.apply(() => {
+        ɵɵi18nExp('A');
+        ɵɵi18nExp('A');
+        ɵɵi18nExp('value2');
+        ɵɵi18nApply(0);  // index 0 + HEADER_OFFSET = 20;
+        expect(fixture.host.innerHTML).toEqual('parentA value2<!--nested ICU 0-->!<!--ICU 20:0-->');
+      });
+    });
+  });
+
+  function toT18n(text: string) {
+    const tNodeIndex = HEADER_OFFSET;
+    fixture.enterView();
+    i18nStartFirstCreatePass(fixture.tView, 0, fixture.lView, tNodeIndex, text, -1);
+    fixture.leaveView();
+    const tI18n = fixture.tView.data[tNodeIndex] as TI18n;
+    expect(tI18n).toEqual(matchTI18n({}));
+    return tI18n;
+  }
+});
diff --git a/packages/core/test/render3/i18n/i18n_spec.ts b/packages/core/test/render3/i18n/i18n_spec.ts
new file mode 100644
index 0000000000000..cd72a4dec26ab
--- /dev/null
+++ b/packages/core/test/render3/i18n/i18n_spec.ts
@@ -0,0 +1,754 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {ɵɵi18nAttributes, ɵɵi18nPostprocess, ɵɵi18nStart} from '@angular/core';
+import {ɵɵi18n} from '@angular/core/src/core';
+import {getTranslationForTemplate, i18nStartFirstCreatePass} from '@angular/core/src/render3/i18n/i18n_parse';
+import {getTIcu} from '@angular/core/src/render3/i18n/i18n_util';
+import {TElementNode, TNodeType} from '@angular/core/src/render3/interfaces/node';
+import {getCurrentTNode} from '@angular/core/src/render3/state';
+import {ɵɵelementEnd, ɵɵelementStart} from '../../../src/render3/instructions/all';
+import {I18nCreateOpCode, I18nUpdateOpCodes, TI18n, TIcu} from '../../../src/render3/interfaces/i18n';
+import {HEADER_OFFSET, LView, TVIEW, TView} from '../../../src/render3/interfaces/view';
+import {getNativeByIndex} from '../../../src/render3/util/view_utils';
+import {matchTNode} from '../matchers';
+import {TemplateFixture} from '../render_util';
+import {matchDebug} from '../utils';
+import {ViewFixture} from '../view_fixture';
+
+
+
+describe('Runtime i18n', () => {
+  describe('getTranslationForTemplate', () => {
+    it('should crop messages for the selected template', () => {
+      let message = `simple text`;
+      expect(getTranslationForTemplate(message, -1)).toEqual(message);
+
+      message = `Hello �0�!`;
+      expect(getTranslationForTemplate(message, -1)).toEqual(message);
+
+      message = `Hello �#2��0��/#2�!`;
+      expect(getTranslationForTemplate(message, -1)).toEqual(message);
+
+      // Embedded sub-templates
+      message = `�0� is rendered as: �*2:1�before�*1:2�middle�/*1:2�after�/*2:1�!`;
+      expect(getTranslationForTemplate(message, -1)).toEqual('�0� is rendered as: �*2:1��/*2:1�!');
+      expect(getTranslationForTemplate(message, 1)).toEqual('before�*1:2��/*1:2�after');
+      expect(getTranslationForTemplate(message, 2)).toEqual('middle');
+
+      // Embedded & sibling sub-templates
+      message =
+          `�0� is rendered as: �*2:1�before�*1:2�middle�/*1:2�after�/*2:1� and also �*4:3�before�*1:4�middle�/*1:4�after�/*4:3�!`;
+      expect(getTranslationForTemplate(message, -1))
+          .toEqual('�0� is rendered as: �*2:1��/*2:1� and also �*4:3��/*4:3�!');
+      expect(getTranslationForTemplate(message, 1)).toEqual('before�*1:2��/*1:2�after');
+      expect(getTranslationForTemplate(message, 2)).toEqual('middle');
+      expect(getTranslationForTemplate(message, 3)).toEqual('before�*1:4��/*1:4�after');
+      expect(getTranslationForTemplate(message, 4)).toEqual('middle');
+    });
+
+    it('should throw if the template is malformed', () => {
+      const message = `�*2:1�message!`;
+      expect(() => getTranslationForTemplate(message, -1)).toThrowError(/Tag mismatch/);
+    });
+  });
+
+  let tView: TView;
+
+  function getOpCodes(
+      messageOrAtrs: string|string[], createTemplate: () => void,
+      updateTemplate: (() => void)|undefined, nbDecls: number, index: number): TI18n|
+      I18nUpdateOpCodes {
+    const fixture = new TemplateFixture(
+        {create: createTemplate, update: updateTemplate, decls: nbDecls, consts: [messageOrAtrs]});
+    tView = fixture.hostView[TVIEW];
+    return tView.data[index] as TI18n | I18nUpdateOpCodes;
+  }
+
+  describe('i18nStart', () => {
+    it('for text', () => {
+      const message = 'simple text';
+      const nbConsts = 1;
+      const index = 1;
+      const opCodes = getOpCodes(message, () => {
+                        ɵɵelementStart(0, 'div');
+                        ɵɵi18nStart(index, 0);
+                        ɵɵelementEnd();
+                      }, undefined, nbConsts, HEADER_OFFSET + index) as TI18n;
+
+      expect(opCodes).toEqual({
+        create: matchDebug([
+          `lView[${HEADER_OFFSET + 1}] = document.createText("simple text");`,
+          `parent.appendChild(lView[${HEADER_OFFSET + 1}]);`,
+        ]),
+        update: [] as unknown as I18nUpdateOpCodes,
+      });
+    });
+
+    it('for elements', () => {
+      const message = `Hello �#2�world�/#2� and �#3�universe�/#3�!`;
+      // Template: `<div>Hello <div>world</div> and <span>universe</span>!`
+      // 3 consts for the 2 divs and 1 span + 1 const for `i18nStart` = 4 consts
+      const nbConsts = 4;
+      const index = 1;
+      const opCodes = getOpCodes(message, () => {
+        ɵɵelementStart(0, 'div');
+        ɵɵi18nStart(index, 0);
+        ɵɵelementEnd();
+      }, undefined, nbConsts, HEADER_OFFSET + index);
+
+      expect(opCodes).toEqual({
+        create: matchDebug([
+          `lView[${HEADER_OFFSET + 4}] = document.createText("Hello ");`,
+          `parent.appendChild(lView[${HEADER_OFFSET + 4}]);`,
+          `lView[${HEADER_OFFSET + 5}] = document.createText("world");`,
+          `lView[${HEADER_OFFSET + 6}] = document.createText(" and ");`,
+          `parent.appendChild(lView[${HEADER_OFFSET + 6}]);`,
+          `lView[${HEADER_OFFSET + 7}] = document.createText("universe");`,
+          `lView[${HEADER_OFFSET + 8}] = document.createText("!");`,
+          `parent.appendChild(lView[${HEADER_OFFSET + 8}]);`,
+        ]),
+        update: [] as unknown as I18nUpdateOpCodes,
+      });
+    });
+
+    it('for simple bindings', () => {
+      const message = `Hello �0�!`;
+      const nbConsts = 2;
+      const index = 1;
+      const opCodes = getOpCodes(message, () => {
+        ɵɵelementStart(0, 'div');
+        ɵɵi18nStart(index, 0);
+        ɵɵelementEnd();
+      }, undefined, nbConsts, HEADER_OFFSET + index);
+
+      expect((opCodes as any).update.debug).toEqual([
+        'if (mask & 0b1) { (lView[22] as Text).textContent = `Hello ${lView[i-1]}!`; }'
+      ]);
+
+      expect(opCodes).toEqual({
+        create: matchDebug([
+          `lView[${HEADER_OFFSET + 2}] = document.createText("");`,
+          `parent.appendChild(lView[${HEADER_OFFSET + 2}]);`,
+        ]),
+        update: matchDebug([
+          'if (mask & 0b1) { (lView[22] as Text).textContent = `Hello ${lView[i-1]}!`; }',
+        ]),
+      });
+    });
+
+    it('for multiple bindings', () => {
+      const message = `Hello �0� and �1�, again �0�!`;
+      const nbConsts = 2;
+      const index = 1;
+      const opCodes = getOpCodes(message, () => {
+        ɵɵelementStart(0, 'div');
+        ɵɵi18nStart(index, 0);
+        ɵɵelementEnd();
+      }, undefined, nbConsts, HEADER_OFFSET + index);
+
+      expect(opCodes).toEqual({
+        create: matchDebug([
+          `lView[${HEADER_OFFSET + 2}] = document.createText("");`,
+          `parent.appendChild(lView[${HEADER_OFFSET + 2}]);`,
+        ]),
+        update: matchDebug([
+          'if (mask & 0b11) { (lView[22] as Text).textContent = `Hello ${lView[i-1]} and ${lView[i-2]}, again ${lView[i-1]}!`; }',
+        ]),
+      });
+    });
+
+    it('for sub-templates', () => {
+      // Template:
+      // <div>
+      //   {{value}} is rendered as:
+      //   <span *ngIf>
+      //     before <b *ngIf>middle</b> after
+      //   </span>
+      //   !
+      // </div>
+      const message =
+          `�0� is rendered as: �*2:1��#1:1�before�*2:2��#1:2�middle�/#1:2��/*2:2�after�/#1:1��/*2:1�!`;
+
+      /**** Root template ****/
+      // �0� is rendered as: �*2:1��/*2:1�!
+      let nbConsts = 3;
+      let index = 1;
+      let opCodes = getOpCodes(message, () => {
+        ɵɵelementStart(0, 'div');
+        ɵɵi18nStart(index, 0);
+        ɵɵelementEnd();
+      }, undefined, nbConsts, HEADER_OFFSET + index);
+
+      expect(opCodes).toEqual({
+        create: matchDebug([
+          `lView[${HEADER_OFFSET + 3}] = document.createText("");`,
+          `parent.appendChild(lView[${HEADER_OFFSET + 3}]);`,
+          `lView[${HEADER_OFFSET + 4}] = document.createText("!");`,
+          `parent.appendChild(lView[${HEADER_OFFSET + 4}]);`,
+        ]),
+        update: matchDebug([
+          'if (mask & 0b1) { (lView[23] as Text).textContent = `${lView[i-1]} is rendered as: `; }',
+        ]),
+      });
+
+
+      /**** First sub-template ****/
+      // �#1:1�before�*2:2�middle�/*2:2�after�/#1:1�
+      nbConsts = 3;
+      index = 1;
+      opCodes = getOpCodes(message, () => {
+        ɵɵelementStart(0, 'div');
+        ɵɵi18nStart(index, 0, 1);
+      }, undefined, nbConsts, index + HEADER_OFFSET);
+
+      expect(opCodes).toEqual({
+        create: matchDebug([
+          `lView[${HEADER_OFFSET + 3}] = document.createText("before");`,
+          `lView[${HEADER_OFFSET + 4}] = document.createText("after");`,
+        ]),
+        update: [] as unknown as I18nUpdateOpCodes,
+      });
+
+
+      /**** Second sub-template ****/
+      // middle
+      nbConsts = 2;
+      index = 1;
+      opCodes = getOpCodes(message, () => {
+        ɵɵelementStart(0, 'div');
+        ɵɵi18nStart(index, 0, 2);
+      }, undefined, nbConsts, index + HEADER_OFFSET);
+
+      expect(opCodes).toEqual({
+        create: matchDebug([
+          `lView[${HEADER_OFFSET + 2}] = document.createText("middle");`,
+        ]),
+        update: [] as unknown as I18nUpdateOpCodes,
+      });
+    });
+
+    it('for ICU expressions', () => {
+      const message = `{�0�, plural,
+        =0 {no <b title="none">emails</b>!}
+        =1 {one <i>email</i>}
+        other {�0� <span title="�1�">emails</span>}
+      }`;
+      const nbConsts = 2;
+      const index = 1;
+      const opCodes = getOpCodes(message, () => {
+                        ɵɵelementStart(0, 'div');
+                        ɵɵi18nStart(index, 0);
+                        ɵɵelementEnd();
+                      }, undefined, nbConsts, HEADER_OFFSET + index) as TI18n;
+
+      expect(opCodes).toEqual({
+        create: matchDebug([
+          `lView[${HEADER_OFFSET + 2}] = document.createComment("ICU 21:0");`,
+          `parent.appendChild(lView[${HEADER_OFFSET + 2}]);`,
+        ]),
+        update: matchDebug([
+          'if (mask & 0b1) { icuSwitchCase(22, `${lView[i-1]}`); }',
+          'if (mask & 0b1) { icuUpdateCase(22); }',
+        ]),
+      });
+      expect(getTIcu(tView, 22)).toEqual(<TIcu>{
+        type: 1,
+        currentCaseLViewIndex: 23,
+        anchorIdx: 22,
+        cases: ['0', '1', 'other'],
+        create: [
+          matchDebug([
+            `lView[${HEADER_OFFSET + 4}] = document.createTextNode("no ")`,
+            `(lView[${HEADER_OFFSET + 0}] as Element).appendChild(lView[${HEADER_OFFSET + 4}])`,
+            'lView[25] = document.createElement("b")',
+            `(lView[${HEADER_OFFSET + 0}] as Element).appendChild(lView[${HEADER_OFFSET + 5}])`,
+            '(lView[25] as Element).setAttribute("title", "none")',
+            `lView[${HEADER_OFFSET + 6}] = document.createTextNode("emails")`,
+            `(lView[${HEADER_OFFSET + 5}] as Element).appendChild(lView[${HEADER_OFFSET + 6}])`,
+            `lView[${HEADER_OFFSET + 7}] = document.createTextNode("!")`,
+            `(lView[${HEADER_OFFSET + 0}] as Element).appendChild(lView[${HEADER_OFFSET + 7}])`,
+          ]),
+          matchDebug([
+            `lView[${HEADER_OFFSET + 8}] = document.createTextNode("one ")`,
+            `(lView[${HEADER_OFFSET + 0}] as Element).appendChild(lView[${HEADER_OFFSET + 8}])`,
+            'lView[29] = document.createElement("i")',
+            `(lView[${HEADER_OFFSET + 0}] as Element).appendChild(lView[${HEADER_OFFSET + 9}])`,
+            'lView[30] = document.createTextNode("email")',
+            '(lView[29] as Element).appendChild(lView[30])',
+          ]),
+          matchDebug([
+            'lView[31] = document.createTextNode("")',
+            '(lView[20] as Element).appendChild(lView[31])',
+            'lView[32] = document.createElement("span")',
+            '(lView[20] as Element).appendChild(lView[32])',
+            'lView[33] = document.createTextNode("emails")',
+            '(lView[32] as Element).appendChild(lView[33])',
+          ]),
+        ],
+        remove: [
+          matchDebug([
+            'remove(lView[24])',
+            'remove(lView[25])',
+            'remove(lView[27])',
+          ]),
+          matchDebug([
+            'remove(lView[28])',
+            'remove(lView[29])',
+          ]),
+          matchDebug([
+            'remove(lView[31])',
+            'remove(lView[32])',
+          ]),
+        ],
+        update: [
+          matchDebug([]),
+          matchDebug([]),
+          matchDebug([
+            'if (mask & 0b1) { (lView[31] as Text).textContent = `${lView[i-1]} `; }',
+            'if (mask & 0b10) { (lView[32] as Element).setAttribute(\'title\', `${lView[i-2]}`); }',
+          ]),
+        ]
+      });
+    });
+
+    it('for nested ICU expressions', () => {
+      const message = `{�0�, plural,
+        =0 {zero}
+        other {�0� {�1�, select,
+                       cat {cats}
+                       dog {dogs}
+                       other {animals}
+                     }!}
+      }`;
+      const nbConsts = 2;
+      const index = 1;
+      const opCodes = getOpCodes(message, () => {
+        ɵɵelementStart(0, 'div');
+        ɵɵi18n(index, 0);
+        ɵɵelementEnd();
+      }, undefined, nbConsts, HEADER_OFFSET + index);
+
+      expect(opCodes).toEqual({
+        create: matchDebug([
+          `lView[${HEADER_OFFSET + 2}] = document.createComment("ICU 21:0");`,
+          `parent.appendChild(lView[${HEADER_OFFSET + 2}]);`,
+        ]),
+        update: matchDebug([
+          'if (mask & 0b1) { icuSwitchCase(22, `${lView[i-1]}`); }',
+          'if (mask & 0b10) { icuSwitchCase(26, `${lView[i-2]}`); }',
+          'if (mask & 0b1) { icuUpdateCase(22); }',
+        ]),
+      });
+      expect(getTIcu(tView, 22)).toEqual({
+        type: 1,
+        anchorIdx: 22,
+        currentCaseLViewIndex: 23,
+        cases: ['0', 'other'],
+        create: [
+          matchDebug([
+            `lView[${HEADER_OFFSET + 4}] = document.createTextNode("zero")`,
+            `(lView[${HEADER_OFFSET + 0}] as Element).appendChild(lView[${HEADER_OFFSET + 4}])`,
+          ]),
+          matchDebug([
+            `lView[${HEADER_OFFSET + 5}] = document.createTextNode("")`,
+            `(lView[${HEADER_OFFSET + 0}] as Element).appendChild(lView[${HEADER_OFFSET + 5}])`,
+            'lView[26] = document.createComment("nested ICU 0")',
+            `(lView[${HEADER_OFFSET + 0}] as Element).appendChild(lView[${HEADER_OFFSET + 6}])`,
+            'lView[31] = document.createTextNode("!")',
+            '(lView[20] as Element).appendChild(lView[31])',
+          ]),
+        ],
+        update: [
+          matchDebug([]),
+          matchDebug([
+            'if (mask & 0b1) { (lView[25] as Text).textContent = `${lView[i-1]} `; }',
+          ]),
+        ],
+        remove: [
+          matchDebug([
+            'remove(lView[24])',
+          ]),
+          matchDebug([
+            'remove(lView[25])',
+            'removeNestedICU(26)',
+            'remove(lView[26])',
+            'remove(lView[31])',
+          ]),
+        ],
+      });
+      expect(tView.data[26]).toEqual({
+        type: 0,
+        anchorIdx: 26,
+        currentCaseLViewIndex: 27,
+        cases: ['cat', 'dog', 'other'],
+        create: [
+          matchDebug([
+            `lView[${HEADER_OFFSET + 8}] = document.createTextNode("cats")`,
+            `(lView[${HEADER_OFFSET + 0}] as Element).appendChild(lView[${HEADER_OFFSET + 8}])`,
+          ]),
+          matchDebug([
+            `lView[${HEADER_OFFSET + 9}] = document.createTextNode("dogs")`,
+            `(lView[${HEADER_OFFSET + 0}] as Element).appendChild(lView[${HEADER_OFFSET + 9}])`,
+          ]),
+          matchDebug([
+            'lView[30] = document.createTextNode("animals")',
+            '(lView[20] as Element).appendChild(lView[30])',
+          ]),
+        ],
+        update: [
+          matchDebug([]),
+          matchDebug([]),
+          matchDebug([]),
+        ],
+        remove: [
+          matchDebug(['remove(lView[28])']),
+          matchDebug(['remove(lView[29])']),
+          matchDebug(['remove(lView[30])']),
+        ],
+      });
+    });
+  });
+
+  describe(`i18nAttribute`, () => {
+    it('for text', () => {
+      const message = `Hello world!`;
+      const attrs = ['title', message];
+      const nbDecls = 2;
+      const index = 1;
+      const fixture = new TemplateFixture({
+        create: () => {
+          ɵɵelementStart(0, 'div');
+          ɵɵi18nAttributes(index, 0);
+          ɵɵelementEnd();
+        },
+        decls: nbDecls,
+        vars: index,
+        consts: [attrs],
+      });
+      const tView = fixture.hostView[TVIEW];
+      const opCodes = tView.data[HEADER_OFFSET + index] as I18nUpdateOpCodes;
+
+      expect(opCodes).toEqual([]);
+      expect((getNativeByIndex(HEADER_OFFSET, fixture.hostView as LView) as any as Element)
+                 .getAttribute('title'))
+          .toEqual(message);
+    });
+
+    it('for simple bindings', () => {
+      const message = `Hello �0�!`;
+      const attrs = ['title', message];
+      const nbConsts = 2;
+      const index = 1;
+      const opCodes = getOpCodes(attrs, () => {
+        ɵɵelementStart(0, 'div');
+        ɵɵi18nAttributes(index, 0);
+        ɵɵelementEnd();
+      }, undefined, nbConsts, HEADER_OFFSET + index);
+
+      expect(opCodes).toEqual(matchDebug([
+        'if (mask & 0b1) { (lView[20] as Element).setAttribute(\'title\', `Hello ${lView[i-1]}!`); }',
+      ]));
+    });
+
+    it('for multiple bindings', () => {
+      const message = `Hello �0� and �1�, again �0�!`;
+      const attrs = ['title', message];
+      const nbConsts = 2;
+      const index = 1;
+      const opCodes = getOpCodes(attrs, () => {
+        ɵɵelementStart(0, 'div');
+        ɵɵi18nAttributes(index, 0);
+        ɵɵelementEnd();
+      }, undefined, nbConsts, HEADER_OFFSET + index);
+
+      expect(opCodes).toEqual(matchDebug([
+        'if (mask & 0b11) { (lView[20] as Element).setAttribute(\'title\', `Hello ${lView[i-1]} and ${lView[i-2]}, again ${lView[i-1]}!`); }',
+      ]));
+    });
+
+    it('for multiple attributes', () => {
+      const message = `Hello �0�!`;
+      const attrs = ['title', message, 'aria-label', message];
+      const nbConsts = 2;
+      const index = 1;
+      const opCodes = getOpCodes(attrs, () => {
+        ɵɵelementStart(0, 'div');
+        ɵɵi18nAttributes(index, 0);
+        ɵɵelementEnd();
+      }, undefined, nbConsts, HEADER_OFFSET + index);
+
+      expect(opCodes).toEqual(matchDebug([
+        'if (mask & 0b1) { (lView[20] as Element).setAttribute(\'title\', `Hello ${lView[i-1]}!`); }',
+        'if (mask & 0b1) { (lView[20] as Element).setAttribute(\'aria-label\', `Hello ${lView[i-1]}!`); }',
+      ]));
+    });
+  });
+
+  describe('i18nPostprocess', () => {
+    it('should handle valid cases', () => {
+      const arr = ['�*1:1��#2:1�', '�#4:1�', '�6:1�', '�/#2:1��/*1:1�'];
+      const str = `[${arr.join('|')}]`;
+
+      const cases = [
+        // empty string
+        ['', {}, ''],
+
+        // string without any special cases
+        ['Foo [1,2,3] Bar - no ICU here', {}, 'Foo [1,2,3] Bar - no ICU here'],
+
+        // multi-value cases
+        [
+          `Start: ${str}, ${str} and ${str}, ${str} end.`, {},
+          `Start: ${arr[0]}, ${arr[1]} and ${arr[2]}, ${arr[3]} end.`
+        ],
+
+        // replace VAR_SELECT
+        [
+          'My ICU: {VAR_SELECT, select, =1 {one} other {other}}', {VAR_SELECT: '�1:2�'},
+          'My ICU: {�1:2�, select, =1 {one} other {other}}'
+        ],
+
+        [
+          'My ICU: {\n\n\tVAR_SELECT_1 \n\n, select, =1 {one} other {other}}',
+          {VAR_SELECT_1: '�1:2�'}, 'My ICU: {\n\n\t�1:2� \n\n, select, =1 {one} other {other}}'
+        ],
+
+        // replace VAR_PLURAL
+        [
+          'My ICU: {VAR_PLURAL, plural, one {1} other {other}}', {VAR_PLURAL: '�1:2�'},
+          'My ICU: {�1:2�, plural, one {1} other {other}}'
+        ],
+
+        [
+          'My ICU: {\n\n\tVAR_PLURAL_1 \n\n, select, =1 {one} other {other}}',
+          {VAR_PLURAL_1: '�1:2�'}, 'My ICU: {\n\n\t�1:2� \n\n, select, =1 {one} other {other}}'
+        ],
+
+        // do not replace VAR_* anywhere else in a string (only in ICU)
+        [
+          'My ICU: {VAR_PLURAL, plural, one {1} other {other}} VAR_PLURAL and VAR_SELECT',
+          {VAR_PLURAL: '�1:2�'},
+          'My ICU: {�1:2�, plural, one {1} other {other}} VAR_PLURAL and VAR_SELECT'
+        ],
+
+        // replace VAR_*'s in nested ICUs
+        [
+          'My ICU: {VAR_PLURAL, plural, one {1 - {VAR_SELECT, age, 50 {fifty} other {other}}} other {other}}',
+          {VAR_PLURAL: '�1:2�', VAR_SELECT: '�5�'},
+          'My ICU: {�1:2�, plural, one {1 - {�5�, age, 50 {fifty} other {other}}} other {other}}'
+        ],
+
+        [
+          'My ICU: {VAR_PLURAL, plural, one {1 - {VAR_PLURAL_1, age, 50 {fifty} other {other}}} other {other}}',
+          {VAR_PLURAL: '�1:2�', VAR_PLURAL_1: '�5�'},
+          'My ICU: {�1:2�, plural, one {1 - {�5�, age, 50 {fifty} other {other}}} other {other}}'
+        ],
+
+        // ICU replacement
+        [
+          'My ICU #1: �I18N_EXP_ICU�, My ICU #2: �I18N_EXP_ICU�',
+          {ICU: ['ICU_VALUE_1', 'ICU_VALUE_2']}, 'My ICU #1: ICU_VALUE_1, My ICU #2: ICU_VALUE_2'
+        ],
+
+        // mixed case
+        [
+          `Start: ${str}, ${str}. ICU: {VAR_SELECT, count, 10 {ten} other {other}}.
+          Another ICU: �I18N_EXP_ICU� and ${str}, ${str} and one more ICU: �I18N_EXP_ICU� and end.`,
+          {VAR_SELECT: '�1:2�', ICU: ['ICU_VALUE_1', 'ICU_VALUE_2']},
+          `Start: ${arr[0]}, ${arr[1]}. ICU: {�1:2�, count, 10 {ten} other {other}}.
+          Another ICU: ICU_VALUE_1 and ${arr[2]}, ${arr[3]} and one more ICU: ICU_VALUE_2 and end.`,
+        ],
+      ];
+      cases.forEach(([input, replacements, output]) => {
+        expect(ɵɵi18nPostprocess(input as string, replacements as any)).toEqual(output as string);
+      });
+    });
+
+    it('should handle nested template represented by multi-value placeholders', () => {
+      /**
+       * <div i18n>
+       *   <span>
+       *     Hello - 1
+       *   </span>
+       *   <span *ngIf="visible">
+       *     Hello - 2
+       *     <span *ngIf="visible">
+       *       Hello - 3
+       *       <span *ngIf="visible">
+       *         Hello - 4
+       *       </span>
+       *     </span>
+       *   </span>
+       *   <span>
+       *     Hello - 5
+       *   </span>
+       * </div>
+       */
+      const generated = `
+        [�#2�|�#4�] Bonjour - 1 [�/#2�|�/#1:3��/*2:3�|�/#1:2��/*2:2�|�/#1:1��/*3:1�|�/#4�]
+        [�*3:1��#1:1�|�*2:2��#1:2�|�*2:3��#1:3�]
+          Bonjour - 2
+          [�*3:1��#1:1�|�*2:2��#1:2�|�*2:3��#1:3�]
+            Bonjour - 3
+            [�*3:1��#1:1�|�*2:2��#1:2�|�*2:3��#1:3�] Bonjour - 4 [�/#2�|�/#1:3��/*2:3�|�/#1:2��/*2:2�|�/#1:1��/*3:1�|�/#4�]
+          [�/#2�|�/#1:3��/*2:3�|�/#1:2��/*2:2�|�/#1:1��/*3:1�|�/#4�]
+        [�/#2�|�/#1:3��/*2:3�|�/#1:2��/*2:2�|�/#1:1��/*3:1�|�/#4�]
+        [�#2�|�#4�] Bonjour - 5 [�/#2�|�/#1:3��/*2:3�|�/#1:2��/*2:2�|�/#1:1��/*3:1�|�/#4�]
+      `;
+      const final = `
+        �#2� Bonjour - 1 �/#2�
+        �*3:1�
+          �#1:1�
+            Bonjour - 2
+            �*2:2�
+              �#1:2�
+                Bonjour - 3
+                �*2:3�
+                  �#1:3� Bonjour - 4 �/#1:3�
+                �/*2:3�
+              �/#1:2�
+            �/*2:2�
+          �/#1:1�
+        �/*3:1�
+        �#4� Bonjour - 5 �/#4�
+      `;
+      expect(ɵɵi18nPostprocess(generated.replace(/\s+/g, ''))).toEqual(final.replace(/\s+/g, ''));
+    });
+
+    it('should throw in case we have invalid string', () => {
+      expect(
+          () => ɵɵi18nPostprocess(
+              'My ICU #1: �I18N_EXP_ICU�, My ICU #2: �I18N_EXP_ICU�', {ICU: ['ICU_VALUE_1']}))
+          .toThrowError();
+    });
+  });
+
+  describe('i18nStartFirstCreatePass', () => {
+    let fixture: ViewFixture;
+    const DECLS = 20;
+    const VARS = 10;
+    beforeEach(() => {
+      fixture = new ViewFixture({decls: DECLS, vars: VARS});
+      fixture.enterView();
+      ɵɵelementStart(0, 'div');
+    });
+
+    afterEach(ViewFixture.cleanUp);
+
+    function i18nRangeOffset(offset: number): number {
+      return HEADER_OFFSET + DECLS + VARS + offset;
+    }
+
+    function i18nRangeOffsetOpcode(
+        offset: number,
+        {appendLater, comment}: {appendLater?: boolean, comment?: boolean} = {}): number {
+      let index = i18nRangeOffset(offset) << I18nCreateOpCode.SHIFT;
+      if (!appendLater) {
+        index |= I18nCreateOpCode.APPEND_EAGERLY;
+      }
+      if (comment) {
+        index |= I18nCreateOpCode.COMMENT;
+      }
+      return index;
+    }
+
+    it('should process text node with no siblings and no children', () => {
+      i18nStartFirstCreatePass(
+          fixture.tView, 0, fixture.lView, HEADER_OFFSET + 1, 'Hello World!', -1);
+      const ti18n = fixture.tView.data[HEADER_OFFSET + 1] as TI18n;
+      // Expect that we only create the `Hello World!` text node and nothing else.
+      expect(ti18n.create).toEqual([
+        i18nRangeOffsetOpcode(0), 'Hello World!',  //
+      ]);
+      const lViewDebug = fixture.lView.debug!;
+      expect(lViewDebug.template).toEqual('<div>Hello World!</div>');
+    });
+
+    it('should process text with a child node', () => {
+      i18nStartFirstCreatePass(
+          fixture.tView, 0, fixture.lView, HEADER_OFFSET + 1, 'Hello �#2��/#2�!', -1);
+      const ti18n = fixture.tView.data[HEADER_OFFSET + 1] as TI18n;
+      expect(ti18n.create).toEqual([
+        i18nRangeOffsetOpcode(0), 'Hello ',  //
+        i18nRangeOffsetOpcode(1), '!',       //
+      ]);
+      // Leave behind `Placeholder` to be picked up by `TNode` creation.
+      expect(fixture.tView.data[HEADER_OFFSET + 2]).toEqual(matchTNode({
+        type: TNodeType.Placeholder,
+        // It should insert itself in front of "!"
+        insertBeforeIndex: i18nRangeOffset(1),
+      }));
+      const lViewDebug = fixture.lView.debug!;
+      expect(lViewDebug.template).toEqual('<div>Hello <Placeholder></Placeholder>!</div>');
+    });
+
+    it('should process text with a child node that has text', () => {
+      i18nStartFirstCreatePass(
+          fixture.tView, 0, fixture.lView, HEADER_OFFSET + 1, 'Hello �#2�World�/#2�!', -1);
+      const ti18n = fixture.tView.data[HEADER_OFFSET + 1] as TI18n;
+      expect(ti18n.create).toEqual([
+        i18nRangeOffsetOpcode(0), 'Hello ',                      //
+        i18nRangeOffsetOpcode(1, {appendLater: true}), 'World',  //
+        i18nRangeOffsetOpcode(2), '!',                           //
+      ]);
+      // Leave behind `Placeholder` to be picked up by `TNode` creation.
+      expect(fixture.tView.data[HEADER_OFFSET + 2]).toEqual(matchTNode({
+        type: TNodeType.Placeholder,
+        insertBeforeIndex: [
+          i18nRangeOffset(2),  // It should insert itself in front of "!"
+          i18nRangeOffset(1),  // It should append "World"
+        ]
+      }));
+    });
+
+    it('should process text with a child node that has text and with bindings', () => {
+      i18nStartFirstCreatePass(
+          fixture.tView, 0, fixture.lView, HEADER_OFFSET + 1,
+          '�0� �#2��1��/#2�!' /* {{salutation}} <b>{{name}}</b>! */, -1);
+      const ti18n = fixture.tView.data[HEADER_OFFSET + 1] as TI18n;
+      expect(ti18n.create).toEqual([
+        i18nRangeOffsetOpcode(0), '',                       // 1 is saved for binding
+        i18nRangeOffsetOpcode(1, {appendLater: true}), '',  // 3 is saved for binding
+        i18nRangeOffsetOpcode(2), '!',                      //
+      ]);
+      // Leave behind `insertBeforeIndex` to be picked up by `TNode` creation.
+      expect(fixture.tView.data[HEADER_OFFSET + 2]).toEqual(matchTNode({
+        type: TNodeType.Placeholder,
+        insertBeforeIndex: [
+          i18nRangeOffset(2),  // It should insert itself in front of "!"
+          i18nRangeOffset(1),  // It should append child text node "{{name}}"
+        ],
+      }));
+      expect(ti18n.update).toEqual(matchDebug([
+        'if (mask & 0b1) { (lView[50] as Text).textContent = `${lView[i-1]} `; }',
+        'if (mask & 0b10) { (lView[51] as Text).textContent = `${lView[i-2]}`; }'
+      ]));
+      const lViewDebug = fixture.lView.debug!;
+      expect(lViewDebug.template).toEqual('<div>{{?}}<Placeholder>{{?}}</Placeholder>!</div>');
+    });
+
+    it('should process text with a child template', () => {
+      i18nStartFirstCreatePass(
+          fixture.tView, 0, fixture.lView, HEADER_OFFSET + 1, 'Hello �*2:1�World�/*2:1�!', -1);
+      const ti18n = fixture.tView.data[HEADER_OFFSET + 1] as TI18n;
+      expect(ti18n.create.debug).toEqual([
+        'lView[50] = document.createText("Hello ");',
+        'parent.appendChild(lView[50]);',
+        'lView[51] = document.createText("!");',
+        'parent.appendChild(lView[51]);',
+      ]);
+      // Leave behind `Placeholder` to be picked up by `TNode` creation.
+      // It should insert itself in front of "!"
+      expect(fixture.tView.data[HEADER_OFFSET + 2]).toEqual(matchTNode({
+        type: TNodeType.Placeholder,
+        insertBeforeIndex: 51,
+      }));
+    });
+  });
+});
diff --git a/packages/core/test/render3/i18n_debug_spec.ts b/packages/core/test/render3/i18n_debug_spec.ts
index 50c1abd43d310..5d1f2d7766d6a 100644
--- a/packages/core/test/render3/i18n_debug_spec.ts
+++ b/packages/core/test/render3/i18n_debug_spec.ts
@@ -6,13 +6,13 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {i18nMutateOpCodesToString, i18nUpdateOpCodesToString} from '@angular/core/src/render3/i18n_debug';
-import {COMMENT_MARKER, ELEMENT_MARKER, I18nMutateOpCode, I18nUpdateOpCode} from '@angular/core/src/render3/interfaces/i18n';
+import {i18nCreateOpCodesToString, i18nRemoveOpCodesToString, i18nUpdateOpCodesToString, icuCreateOpCodesToString} from '@angular/core/src/render3/i18n/i18n_debug';
+import {ELEMENT_MARKER, I18nCreateOpCode, I18nCreateOpCodes, I18nRemoveOpCodes, I18nUpdateOpCode, I18nUpdateOpCodes, ICU_MARKER, IcuCreateOpCode} from '@angular/core/src/render3/interfaces/i18n';
 
 describe('i18n debug', () => {
   describe('i18nUpdateOpCodesToString', () => {
     it('should print nothing', () => {
-      expect(i18nUpdateOpCodesToString([])).toEqual([]);
+      expect(i18nUpdateOpCodesToString([] as unknown as I18nUpdateOpCodes)).toEqual([]);
     });
 
     it('should print text opCode', () => {
@@ -23,9 +23,9 @@ describe('i18n debug', () => {
         -4,
         ' post',
         1 << I18nUpdateOpCode.SHIFT_REF | I18nUpdateOpCode.Text,
-      ]))
+      ] as unknown as I18nUpdateOpCodes))
           .toEqual(
-              ['if (mask & 0b11) { (lView[1] as Text).textContent = `pre ${lView[4]} post`; }']);
+              ['if (mask & 0b11) { (lView[1] as Text).textContent = `pre ${lView[i-4]} post`; }']);
     });
 
     it('should print Attribute opCode', () => {
@@ -39,48 +39,40 @@ describe('i18n debug', () => {
         'pre ',  -4,
         ' in ',  -3,
         ' post', 1 << I18nUpdateOpCode.SHIFT_REF | I18nUpdateOpCode.Attr,
-        'title', (v) => v,
-      ]))
+        'title', (v: any) => v,
+      ] as unknown as I18nUpdateOpCodes))
           .toEqual([
-            'if (mask & 0b1) { (lView[1] as Element).setAttribute(\'title\', `pre ${lView[4]} in ${lView[3]} post`); }',
-            'if (mask & 0b10) { (lView[1] as Element).setAttribute(\'title\', (function (v) { return v; })(`pre ${lView[4]} in ${lView[3]} post`)); }'
+            'if (mask & 0b1) { (lView[1] as Element).setAttribute(\'title\', `pre ${lView[i-4]} in ${lView[i-3]} post`); }',
+            'if (mask & 0b10) { (lView[1] as Element).setAttribute(\'title\', (function (v) { return v; })(`pre ${lView[i-4]} in ${lView[i-3]} post`)); }'
           ]);
     });
 
     it('should print icuSwitch opCode', () => {
-      expect(i18nUpdateOpCodesToString([
-        0b100, 2, -5, 12 << I18nUpdateOpCode.SHIFT_REF | I18nUpdateOpCode.IcuSwitch,
-        2  // FIXME(misko): Should be part of IcuSwitch
-      ])).toEqual(['if (mask & 0b100) { icuSwitchCase(lView[12] as Comment, 2, `${lView[5]}`); }']);
+      expect(i18nUpdateOpCodesToString(
+                 [0b100, 2, -5, 12 << I18nUpdateOpCode.SHIFT_REF | I18nUpdateOpCode.IcuSwitch] as
+                 unknown as I18nUpdateOpCodes))
+          .toEqual(['if (mask & 0b100) { icuSwitchCase(12, `${lView[i-5]}`); }']);
     });
 
     it('should print icuUpdate opCode', () => {
-      expect(i18nUpdateOpCodesToString([
-        0b1000, 2, 13 << I18nUpdateOpCode.SHIFT_REF | I18nUpdateOpCode.IcuUpdate,
-        3  // FIXME(misko): should be part of IcuUpdate
-      ])).toEqual(['if (mask & 0b1000) { icuUpdateCase(lView[13] as Comment, 3); }']);
+      expect(i18nUpdateOpCodesToString(
+                 [0b1000, 1, 13 << I18nUpdateOpCode.SHIFT_REF | I18nUpdateOpCode.IcuUpdate] as
+                 unknown as I18nUpdateOpCodes))
+          .toEqual(['if (mask & 0b1000) { icuUpdateCase(13); }']);
     });
   });
 
   describe('i18nMutateOpCodesToString', () => {
     it('should print nothing', () => {
-      expect(i18nMutateOpCodesToString([])).toEqual([]);
-    });
-
-    it('should print Move', () => {
-      expect(i18nMutateOpCodesToString([
-        1 << I18nMutateOpCode.SHIFT_REF | I18nMutateOpCode.Select,
-        2 << I18nMutateOpCode.SHIFT_PARENT | 0 << I18nMutateOpCode.SHIFT_REF |
-            I18nMutateOpCode.AppendChild,
-      ])).toEqual(['(lView[2] as Element).appendChild(lView[1])']);
+      expect(icuCreateOpCodesToString([] as unknown as I18nCreateOpCodes)).toEqual([]);
     });
 
     it('should print text AppendChild', () => {
-      expect(i18nMutateOpCodesToString([
+      expect(icuCreateOpCodesToString([
         'xyz', 0,
-        1 << I18nMutateOpCode.SHIFT_PARENT | 0 << I18nMutateOpCode.SHIFT_REF |
-            I18nMutateOpCode.AppendChild
-      ]))
+        1 << IcuCreateOpCode.SHIFT_PARENT | 0 << IcuCreateOpCode.SHIFT_REF |
+            IcuCreateOpCode.AppendChild
+      ] as unknown as I18nCreateOpCodes))
           .toEqual([
             'lView[0] = document.createTextNode("xyz")',
             '(lView[1] as Element).appendChild(lView[0])'
@@ -89,11 +81,11 @@ describe('i18n debug', () => {
 
 
     it('should print element AppendChild', () => {
-      expect(i18nMutateOpCodesToString([
+      expect(icuCreateOpCodesToString([
         ELEMENT_MARKER, 'xyz', 0,
-        1 << I18nMutateOpCode.SHIFT_PARENT | 0 << I18nMutateOpCode.SHIFT_REF |
-            I18nMutateOpCode.AppendChild
-      ]))
+        1 << IcuCreateOpCode.SHIFT_PARENT | 0 << IcuCreateOpCode.SHIFT_REF |
+            IcuCreateOpCode.AppendChild
+      ] as unknown as I18nCreateOpCodes))
           .toEqual([
             'lView[0] = document.createElement("xyz")',
             '(lView[1] as Element).appendChild(lView[0])'
@@ -101,11 +93,11 @@ describe('i18n debug', () => {
     });
 
     it('should print comment AppendChild', () => {
-      expect(i18nMutateOpCodesToString([
-        COMMENT_MARKER, 'xyz', 0,
-        1 << I18nMutateOpCode.SHIFT_PARENT | 0 << I18nMutateOpCode.SHIFT_REF |
-            I18nMutateOpCode.AppendChild
-      ]))
+      expect(icuCreateOpCodesToString([
+        ICU_MARKER, 'xyz', 0,
+        1 << IcuCreateOpCode.SHIFT_PARENT | 0 << IcuCreateOpCode.SHIFT_REF |
+            IcuCreateOpCode.AppendChild
+      ] as unknown as I18nCreateOpCodes))
           .toEqual([
             'lView[0] = document.createComment("xyz")',
             '(lView[1] as Element).appendChild(lView[0])'
@@ -113,28 +105,46 @@ describe('i18n debug', () => {
     });
 
     it('should print Remove', () => {
-      expect(i18nMutateOpCodesToString([
-        2 << I18nMutateOpCode.SHIFT_PARENT | 0 << I18nMutateOpCode.SHIFT_REF |
-        I18nMutateOpCode.Remove
-      ])).toEqual(['(lView[2] as Element).remove(lView[0])']);
+      expect(i18nRemoveOpCodesToString([123] as unknown as I18nRemoveOpCodes)).toEqual([
+        'remove(lView[123])'
+      ]);
     });
 
     it('should print Attr', () => {
-      expect(i18nMutateOpCodesToString([
-        1 << I18nMutateOpCode.SHIFT_REF | I18nMutateOpCode.Attr, 'attr', 'value'
-      ])).toEqual(['(lView[1] as Element).setAttribute("attr", "value")']);
+      expect(icuCreateOpCodesToString(
+                 [1 << IcuCreateOpCode.SHIFT_REF | IcuCreateOpCode.Attr, 'attr', 'value'] as
+                 unknown as I18nCreateOpCodes))
+          .toEqual(['(lView[1] as Element).setAttribute("attr", "value")']);
+    });
+
+    it('should print RemoveNestedIcu', () => {
+      expect(i18nRemoveOpCodesToString([~123] as unknown as I18nRemoveOpCodes)).toEqual([
+        'removeNestedICU(123)'
+      ]);
     });
+  });
 
-    it('should print ElementEnd', () => {
-      expect(i18nMutateOpCodesToString([
-        1 << I18nMutateOpCode.SHIFT_REF | I18nMutateOpCode.ElementEnd,
-      ])).toEqual(['setPreviousOrParentTNode(tView.data[1] as TNode)']);
+  describe('i18nCreateOpCodesToString', () => {
+    it('should print nothing', () => {
+      expect(i18nCreateOpCodesToString([] as unknown as I18nCreateOpCodes)).toEqual([]);
     });
 
-    it('should print RemoveNestedIcu', () => {
-      expect(i18nMutateOpCodesToString([
-        1 << I18nMutateOpCode.SHIFT_REF | I18nMutateOpCode.RemoveNestedIcu,
-      ])).toEqual(['removeNestedICU(1)']);
+    it('should print text/comment creation', () => {
+      expect(i18nCreateOpCodesToString([
+        10 << I18nCreateOpCode.SHIFT, 'text at 10',                                            //
+        11 << I18nCreateOpCode.SHIFT | I18nCreateOpCode.APPEND_EAGERLY, 'text at 11, append',  //
+        12 << I18nCreateOpCode.SHIFT | I18nCreateOpCode.COMMENT, 'comment at 12',              //
+        13 << I18nCreateOpCode.SHIFT | I18nCreateOpCode.COMMENT | I18nCreateOpCode.APPEND_EAGERLY,
+        'comment at 13, append',  //
+      ] as unknown as I18nCreateOpCodes))
+          .toEqual([
+            'lView[10] = document.createText("text at 10");',
+            'lView[11] = document.createText("text at 11, append");',
+            'parent.appendChild(lView[11]);',
+            'lView[12] = document.createComment("comment at 12");',
+            'lView[13] = document.createComment("comment at 13, append");',
+            'parent.appendChild(lView[13]);',
+          ]);
     });
   });
 });
diff --git a/packages/core/test/render3/i18n_spec.ts b/packages/core/test/render3/i18n_spec.ts
deleted file mode 100644
index 6d46484845190..0000000000000
--- a/packages/core/test/render3/i18n_spec.ts
+++ /dev/null
@@ -1,640 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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 {noop} from '../../../compiler/src/render3/view/util';
-import {getTranslationForTemplate, ɵɵi18nAttributes, ɵɵi18nPostprocess, ɵɵi18nStart} from '../../src/render3/i18n';
-import {setDelayProjection, ɵɵelementEnd, ɵɵelementStart} from '../../src/render3/instructions/all';
-import {I18nUpdateOpCodes, TI18n, TIcu} from '../../src/render3/interfaces/i18n';
-import {HEADER_OFFSET, LView, TVIEW} from '../../src/render3/interfaces/view';
-import {getNativeByIndex} from '../../src/render3/util/view_utils';
-import {TemplateFixture} from './render_util';
-import {debugMatch} from './utils';
-
-describe('Runtime i18n', () => {
-  afterEach(() => {
-    setDelayProjection(false);
-  });
-  describe('getTranslationForTemplate', () => {
-    it('should crop messages for the selected template', () => {
-      let message = `simple text`;
-      expect(getTranslationForTemplate(message)).toEqual(message);
-
-      message = `Hello �0�!`;
-      expect(getTranslationForTemplate(message)).toEqual(message);
-
-      message = `Hello �#2��0��/#2�!`;
-      expect(getTranslationForTemplate(message)).toEqual(message);
-
-      // Embedded sub-templates
-      message = `�0� is rendered as: �*2:1�before�*1:2�middle�/*1:2�after�/*2:1�!`;
-      expect(getTranslationForTemplate(message)).toEqual('�0� is rendered as: �*2:1��/*2:1�!');
-      expect(getTranslationForTemplate(message, 1)).toEqual('before�*1:2��/*1:2�after');
-      expect(getTranslationForTemplate(message, 2)).toEqual('middle');
-
-      // Embedded & sibling sub-templates
-      message =
-          `�0� is rendered as: �*2:1�before�*1:2�middle�/*1:2�after�/*2:1� and also �*4:3�before�*1:4�middle�/*1:4�after�/*4:3�!`;
-      expect(getTranslationForTemplate(message))
-          .toEqual('�0� is rendered as: �*2:1��/*2:1� and also �*4:3��/*4:3�!');
-      expect(getTranslationForTemplate(message, 1)).toEqual('before�*1:2��/*1:2�after');
-      expect(getTranslationForTemplate(message, 2)).toEqual('middle');
-      expect(getTranslationForTemplate(message, 3)).toEqual('before�*1:4��/*1:4�after');
-      expect(getTranslationForTemplate(message, 4)).toEqual('middle');
-    });
-
-    it('should throw if the template is malformed', () => {
-      const message = `�*2:1�message!`;
-      expect(() => getTranslationForTemplate(message)).toThrowError(/Tag mismatch/);
-    });
-  });
-
-  function prepareFixture(
-      createTemplate: () => void, updateTemplate: (() => void)|null, nbConsts = 0,
-      nbVars = 0): TemplateFixture {
-    return new TemplateFixture(createTemplate, updateTemplate || noop, nbConsts, nbVars);
-  }
-
-  function getOpCodes(
-      createTemplate: () => void, updateTemplate: (() => void)|null, nbConsts: number,
-      index: number): TI18n|I18nUpdateOpCodes {
-    const fixture = prepareFixture(createTemplate, updateTemplate, nbConsts);
-    const tView = fixture.hostView[TVIEW];
-    return tView.data[index + HEADER_OFFSET] as TI18n;
-  }
-
-  describe('i18nStart', () => {
-    it('for text', () => {
-      const MSG_DIV = `simple text`;
-      const nbConsts = 1;
-      const index = 0;
-      const opCodes = getOpCodes(() => {
-                        ɵɵi18nStart(index, MSG_DIV);
-                      }, null, nbConsts, index) as TI18n;
-
-      expect(opCodes).toEqual({
-        vars: 1,
-        create: debugMatch([
-          'lView[1] = document.createTextNode("simple text")',
-          '(lView[0] as Element).appendChild(lView[1])'
-        ]),
-        update: [],
-        icus: null
-      });
-    });
-
-    it('for elements', () => {
-      const MSG_DIV = `Hello �#2�world�/#2� and �#3�universe�/#3�!`;
-      // Template: `<div>Hello <div>world</div> and <span>universe</span>!`
-      // 3 consts for the 2 divs and 1 span + 1 const for `i18nStart` = 4 consts
-      const nbConsts = 4;
-      const index = 1;
-      const opCodes = getOpCodes(() => {
-        ɵɵi18nStart(index, MSG_DIV);
-      }, null, nbConsts, index);
-
-      expect(opCodes).toEqual({
-        vars: 5,
-        create: debugMatch([
-          'lView[4] = document.createTextNode("Hello ")',
-          '(lView[1] as Element).appendChild(lView[4])',
-          '(lView[1] as Element).appendChild(lView[2])',
-          'lView[5] = document.createTextNode("world")',
-          '(lView[2] as Element).appendChild(lView[5])',
-          'setPreviousOrParentTNode(tView.data[2] as TNode)',
-          'lView[6] = document.createTextNode(" and ")',
-          '(lView[1] as Element).appendChild(lView[6])',
-          '(lView[1] as Element).appendChild(lView[3])',
-          'lView[7] = document.createTextNode("universe")',
-          '(lView[3] as Element).appendChild(lView[7])',
-          'setPreviousOrParentTNode(tView.data[3] as TNode)',
-          'lView[8] = document.createTextNode("!")',
-          '(lView[1] as Element).appendChild(lView[8])',
-        ]),
-        update: [],
-        icus: null
-      });
-    });
-
-    it('for simple bindings', () => {
-      const MSG_DIV = `Hello �0�!`;
-      const nbConsts = 2;
-      const index = 1;
-      const opCodes = getOpCodes(() => {
-        ɵɵi18nStart(index, MSG_DIV);
-      }, null, nbConsts, index);
-
-      expect((opCodes as any).update.debug).toEqual([
-        'if (mask & 0b1) { (lView[2] as Text).textContent = `Hello ${lView[1]}!`; }'
-      ]);
-
-      expect(opCodes).toEqual({
-        vars: 1,
-        create: debugMatch([
-          'lView[2] = document.createTextNode("")',
-          '(lView[1] as Element).appendChild(lView[2])',
-        ]),
-        update: debugMatch(
-            ['if (mask & 0b1) { (lView[2] as Text).textContent = `Hello ${lView[1]}!`; }']),
-        icus: null
-      });
-    });
-
-    it('for multiple bindings', () => {
-      const MSG_DIV = `Hello �0� and �1�, again �0�!`;
-      const nbConsts = 2;
-      const index = 1;
-      const opCodes = getOpCodes(() => {
-        ɵɵi18nStart(index, MSG_DIV);
-      }, null, nbConsts, index);
-
-      expect(opCodes).toEqual({
-        vars: 1,
-        create: debugMatch([
-          'lView[2] = document.createTextNode("")', '(lView[1] as Element).appendChild(lView[2])'
-        ]),
-        update: debugMatch([
-          'if (mask & 0b11) { (lView[2] as Text).textContent = `Hello ${lView[1]} and ${lView[2]}, again ${lView[1]}!`; }'
-        ]),
-        icus: null
-      });
-    });
-
-    it('for sub-templates', () => {
-      // Template:
-      // <div>
-      //   {{value}} is rendered as:
-      //   <span *ngIf>
-      //     before <b *ngIf>middle</b> after
-      //   </span>
-      //   !
-      // </div>
-      const MSG_DIV =
-          `�0� is rendered as: �*2:1��#1:1�before�*2:2��#1:2�middle�/#1:2��/*2:2�after�/#1:1��/*2:1�!`;
-
-      /**** Root template ****/
-      // �0� is rendered as: �*2:1��/*2:1�!
-      let nbConsts = 3;
-      let index = 1;
-      const firstTextNode = 3;
-      const rootTemplate = 2;
-      let opCodes = getOpCodes(() => {
-        ɵɵi18nStart(index, MSG_DIV);
-      }, null, nbConsts, index);
-
-      expect(opCodes).toEqual({
-        vars: 2,
-        create: debugMatch([
-          'lView[3] = document.createTextNode("")', '(lView[1] as Element).appendChild(lView[3])',
-          '(lView[1] as Element).appendChild(lView[16381])',
-          'lView[4] = document.createTextNode("!")', '(lView[1] as Element).appendChild(lView[4])'
-        ]),
-        update: debugMatch([
-          'if (mask & 0b1) { (lView[3] as Text).textContent = `${lView[1]} is rendered as: `; }'
-        ]),
-        icus: null
-      });
-
-
-      /**** First sub-template ****/
-      // �#1:1�before�*2:2�middle�/*2:2�after�/#1:1�
-      nbConsts = 3;
-      index = 0;
-      const spanElement = 1;
-      const bElementSubTemplate = 2;
-      opCodes = getOpCodes(() => {
-        ɵɵi18nStart(index, MSG_DIV, 1);
-      }, null, nbConsts, index);
-
-      expect(opCodes).toEqual({
-        vars: 2,
-        create: debugMatch([
-          '(lView[0] as Element).appendChild(lView[1])',
-          'lView[3] = document.createTextNode("before")',
-          '(lView[1] as Element).appendChild(lView[3])',
-          '(lView[1] as Element).appendChild(lView[16381])',
-          'lView[4] = document.createTextNode("after")',
-          '(lView[1] as Element).appendChild(lView[4])',
-          'setPreviousOrParentTNode(tView.data[1] as TNode)'
-        ]),
-        update: [],
-        icus: null
-      });
-
-
-      /**** Second sub-template ****/
-      // middle
-      nbConsts = 2;
-      index = 0;
-      const bElement = 1;
-      opCodes = getOpCodes(() => {
-        ɵɵi18nStart(index, MSG_DIV, 2);
-      }, null, nbConsts, index);
-
-      expect(opCodes).toEqual({
-        vars: 1,
-        create: debugMatch([
-          '(lView[0] as Element).appendChild(lView[1])',
-          'lView[2] = document.createTextNode("middle")',
-          '(lView[1] as Element).appendChild(lView[2])',
-          'setPreviousOrParentTNode(tView.data[1] as TNode)'
-        ]),
-        update: [],
-        icus: null
-      });
-    });
-
-    it('for ICU expressions', () => {
-      const MSG_DIV = `{�0�, plural,
-        =0 {no <b title="none">emails</b>!}
-        =1 {one <i>email</i>}
-        other {�0� <span title="�1�">emails</span>}
-      }`;
-      const nbConsts = 1;
-      const index = 0;
-      const opCodes = getOpCodes(() => {
-                        ɵɵi18nStart(index, MSG_DIV);
-                      }, null, nbConsts, index) as TI18n;
-
-      expect(opCodes).toEqual({
-        vars: 5,
-        update: debugMatch([
-          'if (mask & 0b1) { icuSwitchCase(lView[1] as Comment, 0, `${lView[1]}`); }',
-          'if (mask & 0b11) { icuUpdateCase(lView[1] as Comment, 0); }',
-        ]),
-        create: debugMatch([
-          'lView[1] = document.createComment("ICU 1")',
-          '(lView[0] as Element).appendChild(lView[1])',
-        ]),
-        icus: [<TIcu>{
-          type: 1,
-          vars: [4, 3, 3],
-          childIcus: [[], [], []],
-          cases: ['0', '1', 'other'],
-          create: [
-            debugMatch([
-              'lView[2] = document.createTextNode("no ")',
-              '(lView[1] as Element).appendChild(lView[2])',
-              'lView[3] = document.createElement("b")',
-              '(lView[1] as Element).appendChild(lView[3])',
-              '(lView[3] as Element).setAttribute("title", "none")',
-              'lView[4] = document.createTextNode("emails")',
-              '(lView[3] as Element).appendChild(lView[4])',
-              'lView[5] = document.createTextNode("!")',
-              '(lView[1] as Element).appendChild(lView[5])'
-            ]),
-            debugMatch([
-              'lView[2] = document.createTextNode("one ")',
-              '(lView[1] as Element).appendChild(lView[2])',
-              'lView[3] = document.createElement("i")',
-              '(lView[1] as Element).appendChild(lView[3])',
-              'lView[4] = document.createTextNode("email")',
-              '(lView[3] as Element).appendChild(lView[4])'
-            ]),
-            debugMatch([
-              'lView[2] = document.createTextNode("")',
-              '(lView[1] as Element).appendChild(lView[2])',
-              'lView[3] = document.createElement("span")',
-              '(lView[1] as Element).appendChild(lView[3])',
-              'lView[4] = document.createTextNode("emails")',
-              '(lView[3] as Element).appendChild(lView[4])'
-            ])
-          ],
-          remove: [
-            debugMatch([
-              '(lView[0] as Element).remove(lView[2])',
-              '(lView[0] as Element).remove(lView[4])',
-              '(lView[0] as Element).remove(lView[3])',
-              '(lView[0] as Element).remove(lView[5])',
-            ]),
-            debugMatch([
-              '(lView[0] as Element).remove(lView[2])',
-              '(lView[0] as Element).remove(lView[4])',
-              '(lView[0] as Element).remove(lView[3])',
-            ]),
-            debugMatch([
-              '(lView[0] as Element).remove(lView[2])',
-              '(lView[0] as Element).remove(lView[4])',
-              '(lView[0] as Element).remove(lView[3])',
-            ])
-          ],
-          update: [
-            debugMatch([]), debugMatch([]), debugMatch([
-              'if (mask & 0b1) { (lView[2] as Text).textContent = `${lView[1]} `; }',
-              'if (mask & 0b10) { (lView[3] as Element).setAttribute(\'title\', `${lView[2]}`); }'
-            ])
-          ]
-        }]
-      });
-    });
-
-    it('for nested ICU expressions', () => {
-      const MSG_DIV = `{�0�, plural,
-        =0 {zero}
-        other {�0� {�1�, select,
-                       cat {cats}
-                       dog {dogs}
-                       other {animals}
-                     }!}
-      }`;
-      const nbConsts = 1;
-      const index = 0;
-      const opCodes = getOpCodes(() => {
-        ɵɵi18nStart(index, MSG_DIV);
-      }, null, nbConsts, index);
-      const icuCommentNodeIndex = index + 1;
-      const firstTextNodeIndex = index + 2;
-      const nestedIcuCommentNodeIndex = index + 3;
-      const lastTextNodeIndex = index + 4;
-      const nestedTextNodeIndex = index + 5;
-      const tIcuIndex = 1;
-      const nestedTIcuIndex = 0;
-
-      expect(opCodes).toEqual({
-        vars: 6,
-        create: debugMatch([
-          'lView[1] = document.createComment("ICU 1")',
-          '(lView[0] as Element).appendChild(lView[1])'
-        ]),
-        update: debugMatch([
-          'if (mask & 0b1) { icuSwitchCase(lView[1] as Comment, 1, `${lView[1]}`); }',
-          'if (mask & 0b11) { icuUpdateCase(lView[1] as Comment, 1); }'
-        ]),
-        icus: [
-          {
-            type: 0,
-            vars: [1, 1, 1],
-            childIcus: [[], [], []],
-            cases: ['cat', 'dog', 'other'],
-            create: [
-              debugMatch([
-                'lView[5] = document.createTextNode("cats")',
-                '(lView[3] as Element).appendChild(lView[5])'
-              ]),
-              debugMatch([
-                'lView[5] = document.createTextNode("dogs")',
-                '(lView[3] as Element).appendChild(lView[5])'
-              ]),
-              debugMatch([
-                'lView[5] = document.createTextNode("animals")',
-                '(lView[3] as Element).appendChild(lView[5])'
-              ]),
-            ],
-            remove: [
-              debugMatch(['(lView[0] as Element).remove(lView[5])']),
-              debugMatch(['(lView[0] as Element).remove(lView[5])']),
-              debugMatch(['(lView[0] as Element).remove(lView[5])'])
-            ],
-            update: [
-              debugMatch([]),
-              debugMatch([]),
-              debugMatch([]),
-            ]
-          },
-          {
-            type: 1,
-            vars: [1, 4],
-            childIcus: [[], [0]],
-            cases: ['0', 'other'],
-            create: [
-              debugMatch([
-                'lView[2] = document.createTextNode("zero")',
-                '(lView[1] as Element).appendChild(lView[2])'
-              ]),
-              debugMatch([
-                'lView[2] = document.createTextNode("")',
-                '(lView[1] as Element).appendChild(lView[2])',
-                'lView[3] = document.createComment("nested ICU 0")',
-                '(lView[1] as Element).appendChild(lView[3])',
-                'lView[4] = document.createTextNode("!")',
-                '(lView[1] as Element).appendChild(lView[4])'
-              ]),
-            ],
-            remove: [
-              debugMatch(['(lView[0] as Element).remove(lView[2])']),
-              debugMatch([
-                '(lView[0] as Element).remove(lView[2])', '(lView[0] as Element).remove(lView[4])',
-                'removeNestedICU(0)', '(lView[0] as Element).remove(lView[3])'
-              ]),
-            ],
-            update: [
-              debugMatch([]),
-              debugMatch([
-                'if (mask & 0b1) { (lView[2] as Text).textContent = `${lView[1]} `; }',
-                'if (mask & 0b10) { icuSwitchCase(lView[3] as Comment, 0, `${lView[2]}`); }',
-                'if (mask & 0b10) { icuUpdateCase(lView[3] as Comment, 0); }'
-              ]),
-            ]
-          }
-        ]
-      });
-    });
-  });
-
-  describe(`i18nAttribute`, () => {
-    it('for text', () => {
-      const MSG_title = `Hello world!`;
-      const MSG_div_attr = ['title', MSG_title];
-      const nbConsts = 2;
-      const index = 1;
-      const fixture = prepareFixture(() => {
-        ɵɵelementStart(0, 'div');
-        ɵɵi18nAttributes(index, MSG_div_attr);
-        ɵɵelementEnd();
-      }, null, nbConsts, index);
-      const tView = fixture.hostView[TVIEW];
-      const opCodes = tView.data[index + HEADER_OFFSET] as I18nUpdateOpCodes;
-
-      expect(opCodes).toEqual([]);
-      expect(
-          (getNativeByIndex(0, fixture.hostView as LView) as any as Element).getAttribute('title'))
-          .toEqual(MSG_title);
-    });
-
-    it('for simple bindings', () => {
-      const MSG_title = `Hello �0�!`;
-      const MSG_div_attr = ['title', MSG_title];
-      const nbConsts = 2;
-      const index = 1;
-      const opCodes = getOpCodes(() => {
-        ɵɵi18nAttributes(index, MSG_div_attr);
-      }, null, nbConsts, index);
-
-      expect(opCodes).toEqual(debugMatch([
-        'if (mask & 0b1) { (lView[0] as Element).setAttribute(\'title\', `Hello ${lView[1]}!`); }'
-      ]));
-    });
-
-    it('for multiple bindings', () => {
-      const MSG_title = `Hello �0� and �1�, again �0�!`;
-      const MSG_div_attr = ['title', MSG_title];
-      const nbConsts = 2;
-      const index = 1;
-      const opCodes = getOpCodes(() => {
-        ɵɵi18nAttributes(index, MSG_div_attr);
-      }, null, nbConsts, index);
-
-      expect(opCodes).toEqual(debugMatch([
-        'if (mask & 0b11) { (lView[0] as Element).setAttribute(\'title\', `Hello ${lView[1]} and ${lView[2]}, again ${lView[1]}!`); }'
-      ]));
-    });
-
-    it('for multiple attributes', () => {
-      const MSG_title = `Hello �0�!`;
-      const MSG_div_attr = ['title', MSG_title, 'aria-label', MSG_title];
-      const nbConsts = 2;
-      const index = 1;
-      const opCodes = getOpCodes(() => {
-        ɵɵi18nAttributes(index, MSG_div_attr);
-      }, null, nbConsts, index);
-
-      expect(opCodes).toEqual(debugMatch([
-        'if (mask & 0b1) { (lView[0] as Element).setAttribute(\'title\', `Hello ${lView[1]}!`); }',
-        'if (mask & 0b1) { (lView[0] as Element).setAttribute(\'aria-label\', `Hello ${lView[1]}!`); }'
-      ]));
-    });
-  });
-
-  describe('i18nPostprocess', () => {
-    it('should handle valid cases', () => {
-      const arr = ['�*1:1��#2:1�', '�#4:1�', '�6:1�', '�/#2:1��/*1:1�'];
-      const str = `[${arr.join('|')}]`;
-
-      const cases = [
-        // empty string
-        ['', {}, ''],
-
-        // string without any special cases
-        ['Foo [1,2,3] Bar - no ICU here', {}, 'Foo [1,2,3] Bar - no ICU here'],
-
-        // multi-value cases
-        [
-          `Start: ${str}, ${str} and ${str}, ${str} end.`, {},
-          `Start: ${arr[0]}, ${arr[1]} and ${arr[2]}, ${arr[3]} end.`
-        ],
-
-        // replace VAR_SELECT
-        [
-          'My ICU: {VAR_SELECT, select, =1 {one} other {other}}', {VAR_SELECT: '�1:2�'},
-          'My ICU: {�1:2�, select, =1 {one} other {other}}'
-        ],
-
-        [
-          'My ICU: {\n\n\tVAR_SELECT_1 \n\n, select, =1 {one} other {other}}',
-          {VAR_SELECT_1: '�1:2�'}, 'My ICU: {\n\n\t�1:2� \n\n, select, =1 {one} other {other}}'
-        ],
-
-        // replace VAR_PLURAL
-        [
-          'My ICU: {VAR_PLURAL, plural, one {1} other {other}}', {VAR_PLURAL: '�1:2�'},
-          'My ICU: {�1:2�, plural, one {1} other {other}}'
-        ],
-
-        [
-          'My ICU: {\n\n\tVAR_PLURAL_1 \n\n, select, =1 {one} other {other}}',
-          {VAR_PLURAL_1: '�1:2�'}, 'My ICU: {\n\n\t�1:2� \n\n, select, =1 {one} other {other}}'
-        ],
-
-        // do not replace VAR_* anywhere else in a string (only in ICU)
-        [
-          'My ICU: {VAR_PLURAL, plural, one {1} other {other}} VAR_PLURAL and VAR_SELECT',
-          {VAR_PLURAL: '�1:2�'},
-          'My ICU: {�1:2�, plural, one {1} other {other}} VAR_PLURAL and VAR_SELECT'
-        ],
-
-        // replace VAR_*'s in nested ICUs
-        [
-          'My ICU: {VAR_PLURAL, plural, one {1 - {VAR_SELECT, age, 50 {fifty} other {other}}} other {other}}',
-          {VAR_PLURAL: '�1:2�', VAR_SELECT: '�5�'},
-          'My ICU: {�1:2�, plural, one {1 - {�5�, age, 50 {fifty} other {other}}} other {other}}'
-        ],
-
-        [
-          'My ICU: {VAR_PLURAL, plural, one {1 - {VAR_PLURAL_1, age, 50 {fifty} other {other}}} other {other}}',
-          {VAR_PLURAL: '�1:2�', VAR_PLURAL_1: '�5�'},
-          'My ICU: {�1:2�, plural, one {1 - {�5�, age, 50 {fifty} other {other}}} other {other}}'
-        ],
-
-        // ICU replacement
-        [
-          'My ICU #1: �I18N_EXP_ICU�, My ICU #2: �I18N_EXP_ICU�',
-          {ICU: ['ICU_VALUE_1', 'ICU_VALUE_2']}, 'My ICU #1: ICU_VALUE_1, My ICU #2: ICU_VALUE_2'
-        ],
-
-        // mixed case
-        [
-          `Start: ${str}, ${str}. ICU: {VAR_SELECT, count, 10 {ten} other {other}}.
-          Another ICU: �I18N_EXP_ICU� and ${str}, ${str} and one more ICU: �I18N_EXP_ICU� and end.`,
-          {VAR_SELECT: '�1:2�', ICU: ['ICU_VALUE_1', 'ICU_VALUE_2']},
-          `Start: ${arr[0]}, ${arr[1]}. ICU: {�1:2�, count, 10 {ten} other {other}}.
-          Another ICU: ICU_VALUE_1 and ${arr[2]}, ${arr[3]} and one more ICU: ICU_VALUE_2 and end.`,
-        ],
-      ];
-      cases.forEach(([input, replacements, output]) => {
-        expect(ɵɵi18nPostprocess(input as string, replacements as any)).toEqual(output as string);
-      });
-    });
-
-    it('should handle nested template represented by multi-value placeholders', () => {
-      /**
-       * <div i18n>
-       *   <span>
-       *     Hello - 1
-       *   </span>
-       *   <span *ngIf="visible">
-       *     Hello - 2
-       *     <span *ngIf="visible">
-       *       Hello - 3
-       *       <span *ngIf="visible">
-       *         Hello - 4
-       *       </span>
-       *     </span>
-       *   </span>
-       *   <span>
-       *     Hello - 5
-       *   </span>
-       * </div>
-       */
-      const generated = `
-        [�#2�|�#4�] Bonjour - 1 [�/#2�|�/#1:3��/*2:3�|�/#1:2��/*2:2�|�/#1:1��/*3:1�|�/#4�]
-        [�*3:1��#1:1�|�*2:2��#1:2�|�*2:3��#1:3�]
-          Bonjour - 2
-          [�*3:1��#1:1�|�*2:2��#1:2�|�*2:3��#1:3�]
-            Bonjour - 3
-            [�*3:1��#1:1�|�*2:2��#1:2�|�*2:3��#1:3�] Bonjour - 4 [�/#2�|�/#1:3��/*2:3�|�/#1:2��/*2:2�|�/#1:1��/*3:1�|�/#4�]
-          [�/#2�|�/#1:3��/*2:3�|�/#1:2��/*2:2�|�/#1:1��/*3:1�|�/#4�]
-        [�/#2�|�/#1:3��/*2:3�|�/#1:2��/*2:2�|�/#1:1��/*3:1�|�/#4�]
-        [�#2�|�#4�] Bonjour - 5 [�/#2�|�/#1:3��/*2:3�|�/#1:2��/*2:2�|�/#1:1��/*3:1�|�/#4�]
-      `;
-      const final = `
-        �#2� Bonjour - 1 �/#2�
-        �*3:1�
-          �#1:1�
-            Bonjour - 2
-            �*2:2�
-              �#1:2�
-                Bonjour - 3
-                �*2:3�
-                  �#1:3� Bonjour - 4 �/#1:3�
-                �/*2:3�
-              �/#1:2�
-            �/*2:2�
-          �/#1:1�
-        �/*3:1�
-        �#4� Bonjour - 5 �/#4�
-      `;
-      expect(ɵɵi18nPostprocess(generated.replace(/\s+/g, ''))).toEqual(final.replace(/\s+/g, ''));
-    });
-
-    it('should throw in case we have invalid string', () => {
-      expect(
-          () => ɵɵi18nPostprocess(
-              'My ICU #1: �I18N_EXP_ICU�, My ICU #2: �I18N_EXP_ICU�', {ICU: ['ICU_VALUE_1']}))
-          .toThrowError();
-    });
-  });
-});
diff --git a/packages/core/test/render3/instructions/lview_debug_spec.ts b/packages/core/test/render3/instructions/lview_debug_spec.ts
index b0b69c95746c1..3098ea35875f6 100644
--- a/packages/core/test/render3/instructions/lview_debug_spec.ts
+++ b/packages/core/test/render3/instructions/lview_debug_spec.ts
@@ -6,6 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {ɵɵdefineComponent, ɵɵdefineDirective, ɵɵdirectiveInject, ɵɵProvidersFeature} from '@angular/core/src/core';
+import {ɵɵelement, ɵɵelementEnd, ɵɵelementStart} from '@angular/core/src/render3/instructions/element';
 import {TNodeDebug} from '@angular/core/src/render3/instructions/lview_debug';
 import {createTNode, createTView} from '@angular/core/src/render3/instructions/shared';
 import {TNodeType} from '@angular/core/src/render3/interfaces/node';
@@ -13,18 +15,18 @@ import {LView, TView, TViewType} from '@angular/core/src/render3/interfaces/view
 import {enterView, leaveView} from '@angular/core/src/render3/state';
 import {insertTStylingBinding} from '@angular/core/src/render3/styling/style_binding_list';
 import {KeyValueArray} from '@angular/core/src/util/array_utils';
-
+import {TemplateFixture} from '../render_util';
 
 describe('lView_debug', () => {
   const mockFirstUpdatePassLView: LView = [null, {firstUpdatePass: true}] as any;
-  beforeEach(() => enterView(mockFirstUpdatePassLView, null));
+  beforeEach(() => enterView(mockFirstUpdatePassLView));
   afterEach(() => leaveView());
 
   describe('TNode', () => {
     let tNode!: TNodeDebug;
     let tView!: TView;
     beforeEach(() => {
-      tView = createTView(TViewType.Component, 0, null, 0, 0, null, null, null, null, null);
+      tView = createTView(TViewType.Component, null, null, 0, 0, null, null, null, null, null);
       tNode = createTNode(tView, null!, TNodeType.Element, 0, '', null) as TNodeDebug;
     });
     afterEach(() => tNode = tView = null!);
@@ -151,4 +153,90 @@ describe('lView_debug', () => {
       });
     });
   });
+
+  describe('di', () => {
+    it('should show basic information', () => {
+      class DepA {
+        static ɵfac = () => new DepA();
+      }
+      class DepB {
+        static ɵfac = () => new DepB();
+      }
+
+      const instances: any[] = [];
+      class MyComponent {
+        constructor(public depA: DepA, public depB: DepB) {
+          instances.push(this);
+        }
+        static ɵfac = () => new MyComponent(ɵɵdirectiveInject(DepA), ɵɵdirectiveInject(DepB));
+        static ɵcmp = ɵɵdefineComponent({
+          type: MyComponent,
+          selectors: [['my-comp']],
+          decls: 1,
+          vars: 0,
+          template: function() {},
+          features: [ɵɵProvidersFeature(
+              [DepA, {provide: String, useValue: 'String'}],
+              [DepB, {provide: Number, useValue: 123}])]
+        });
+      }
+
+      let myChild!: MyChild;
+      class MyChild {
+        constructor() {
+          myChild = this;
+        }
+        static ɵfac = () => new MyChild();
+        static ɵdir = ɵɵdefineDirective({
+          type: MyChild,
+          selectors: [['my-child']],
+        });
+      }
+
+
+      class MyDirective {
+        constructor(public myComp: MyComponent) {
+          instances.push(this);
+        }
+        static ɵfac = () => new MyDirective(ɵɵdirectiveInject(MyComponent));
+        static ɵdir = ɵɵdefineDirective({
+          type: MyDirective,
+          selectors: [['', 'my-dir', '']],
+        });
+      }
+
+      const fixture = new TemplateFixture({
+        create: () => {
+          ɵɵelementStart(0, 'my-comp', 0);
+          ɵɵelement(1, 'my-child');
+          ɵɵelementEnd();
+        },
+        decls: 2,
+        directives: [MyComponent, MyDirective, MyChild],
+        consts: [['my-dir', '']]
+      });
+      const lView = fixture.hostView;
+      const lViewDebug = lView.debug!;
+      const myCompNode = lViewDebug.nodes[0];
+      expect(myCompNode.factories).toEqual([MyComponent, MyDirective]);
+      expect(myCompNode.instances).toEqual(instances);
+      expect(myCompNode.injector).toEqual({
+        bloom: jasmine.anything(),
+        cumulativeBloom: jasmine.anything(),
+        providers: [DepA, String, MyComponent.ɵcmp, MyDirective.ɵdir],
+        viewProviders: [DepB, Number],
+        parentInjectorIndex: -1,
+      });
+      const myChildNode = myCompNode.children[0];
+      expect(myChildNode.factories).toEqual([MyChild]);
+      expect(myChildNode.instances).toEqual([myChild]);
+      expect(myChildNode.injector).toEqual({
+        bloom: jasmine.anything(),
+        cumulativeBloom: jasmine.anything(),
+        providers: [MyChild.ɵdir],
+        viewProviders: [],
+        parentInjectorIndex: 22,
+      });
+    });
+  });
 });
diff --git a/packages/core/test/render3/instructions/shared_spec.ts b/packages/core/test/render3/instructions/shared_spec.ts
index 8d77e5054865b..c994820acedc4 100644
--- a/packages/core/test/render3/instructions/shared_spec.ts
+++ b/packages/core/test/render3/instructions/shared_spec.ts
@@ -10,7 +10,7 @@ import {createLView, createTNode, createTView} from '@angular/core/src/render3/i
 import {TNodeType} from '@angular/core/src/render3/interfaces/node';
 import {domRendererFactory3} from '@angular/core/src/render3/interfaces/renderer';
 import {HEADER_OFFSET, LViewFlags, TVIEW, TViewType} from '@angular/core/src/render3/interfaces/view';
-import {enterView, getBindingRoot, getLView, setBindingIndex} from '@angular/core/src/render3/state';
+import {enterView, getBindingRoot, getLView, setBindingIndex, setSelectedIndex} from '@angular/core/src/render3/state';
 
 
 
@@ -36,16 +36,17 @@ export function enterViewWithOneDiv() {
   const vars = 60;  // Space for directive expando,  template, component + 3 directives if we assume
                     // that each consume 10 slots.
   const tView = createTView(
-      TViewType.Component, -1, emptyTemplate, consts, vars, null, null, null, null, null);
+      TViewType.Component, null, emptyTemplate, consts, vars, null, null, null, null, null);
   // Just assume that the expando starts after 10 initial bindings.
   tView.expandoStartIndex = HEADER_OFFSET + 10;
   const tNode = tView.firstChild = createTNode(tView, null!, TNodeType.Element, 0, 'div', null);
   const lView = createLView(
       null, tView, null, LViewFlags.CheckAlways, null, null, domRendererFactory3, renderer, null,
       null);
-  lView[0 + HEADER_OFFSET] = div;
-  tView.data[0 + HEADER_OFFSET] = tNode;
-  enterView(lView, tNode);
+  lView[HEADER_OFFSET] = div;
+  tView.data[HEADER_OFFSET] = tNode;
+  enterView(lView);
+  setSelectedIndex(HEADER_OFFSET);
 }
 
 export function clearFirstUpdatePass() {
diff --git a/packages/core/test/render3/instructions/styling_spec.ts b/packages/core/test/render3/instructions/styling_spec.ts
index e11658cf0c701..2e5abdf4ab790 100644
--- a/packages/core/test/render3/instructions/styling_spec.ts
+++ b/packages/core/test/render3/instructions/styling_spec.ts
@@ -14,8 +14,6 @@ import {getTStylingRangeNext, getTStylingRangeNextDuplicate, getTStylingRangePre
 import {HEADER_OFFSET, TVIEW} from '@angular/core/src/render3/interfaces/view';
 import {getLView, leaveView, setBindingRootForHostBindings} from '@angular/core/src/render3/state';
 import {getNativeByIndex} from '@angular/core/src/render3/util/view_utils';
-import {bypassSanitizationTrustStyle} from '@angular/core/src/sanitization/bypass';
-import {ɵɵsanitizeStyle} from '@angular/core/src/sanitization/sanitization';
 import {keyValueArraySet} from '@angular/core/src/util/array_utils';
 import {ngDevModeResetPerfCounters} from '@angular/core/src/util/ng_dev_mode';
 import {getElementClasses, getElementStyles} from '@angular/core/testing/src/styling';
@@ -28,7 +26,7 @@ describe('styling', () => {
   afterEach(leaveView);
 
   let div!: HTMLElement;
-  beforeEach(() => div = getNativeByIndex(0, getLView()) as HTMLElement);
+  beforeEach(() => div = getNativeByIndex(HEADER_OFFSET, getLView()) as HTMLElement);
 
   it('should do set basic style', () => {
     ɵɵstyleProp('color', 'red');
diff --git a/packages/core/test/render3/instructions_spec.ts b/packages/core/test/render3/instructions_spec.ts
index 5f9f5ab28aeae..4fd8a11d95360 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 {getSortedClassName} from '@angular/core/testing/src/styling';
 
 import {ɵɵdefineComponent} from '../../src/render3/definition';
-import {RenderFlags, ɵɵattribute, ɵɵclassMap, ɵɵelement, ɵɵelementEnd, ɵɵelementStart, ɵɵproperty, ɵɵselect, ɵɵstyleMap, ɵɵstyleProp, ɵɵtemplate, ɵɵtext, ɵɵtextInterpolate1} from '../../src/render3/index';
+import {RenderFlags, ɵɵadvance, ɵɵattribute, ɵɵclassMap, ɵɵelement, ɵɵelementEnd, ɵɵelementStart, ɵɵproperty, ɵɵstyleMap, ɵɵstyleProp, ɵɵtemplate, ɵɵtext, ɵɵtextInterpolate1} from '../../src/render3/index';
 import {AttributeMarker} from '../../src/render3/interfaces/node';
 import {bypassSanitizationTrustHtml, bypassSanitizationTrustResourceUrl, bypassSanitizationTrustScript, bypassSanitizationTrustStyle, bypassSanitizationTrustUrl, getSanitizationBypassType, SafeValue, unwrapSafeValue} from '../../src/sanitization/bypass';
 import {ɵɵsanitizeHtml, ɵɵsanitizeResourceUrl, ɵɵsanitizeScript, ɵɵsanitizeStyle, ɵɵsanitizeUrl} from '../../src/sanitization/sanitization';
@@ -26,25 +26,25 @@ describe('instructions', () => {
   }
 
   function createDiv() {
-    ɵɵelement(0, 'div', 0);
+    ɵɵelement(0, 'div');
   }
 
   function createScript() {
     ɵɵelement(0, 'script');
   }
 
-  describe('ɵɵselect', () => {
+  describe('ɵɵadvance', () => {
     it('should error in DevMode if index is out of range', () => {
       // Only one constant added, meaning only index `0` is valid.
-      const t = new TemplateFixture(createDiv, () => {}, 1, 0);
+      const t = new TemplateFixture({create: createDiv, decls: 1});
       expect(() => {
         t.update(() => {
-          ɵɵselect(-1);
+          ɵɵadvance(-1);
         });
       }).toThrow();
       expect(() => {
         t.update(() => {
-          ɵɵselect(1);
+          ɵɵadvance(1);
         });
       }).toThrow();
     });
@@ -52,7 +52,7 @@ describe('instructions', () => {
 
   describe('bind', () => {
     it('should update bindings when value changes with the correct perf counters', () => {
-      const t = new TemplateFixture(createAnchor, () => {}, 1, 1);
+      const t = new TemplateFixture({create: createAnchor, update: () => {}, decls: 1, vars: 1});
 
       t.update(() => {
         ɵɵproperty('title', 'Hello');
@@ -77,7 +77,8 @@ describe('instructions', () => {
          const idempotentUpdate = () => {
            ɵɵproperty('title', 'Hello');
          };
-         const t = new TemplateFixture(createAnchor, idempotentUpdate, 1, 1);
+         const t = new TemplateFixture(
+             {create: createAnchor, update: idempotentUpdate, decls: 1, vars: 1});
 
          t.update();
          expect(t.html).toEqual('<a title="Hello"></a>');
@@ -96,9 +97,14 @@ describe('instructions', () => {
 
   describe('element', () => {
     it('should create an element with the correct perf counters', () => {
-      const t = new TemplateFixture(() => {
-        ɵɵelement(0, 'div', 0);
-      }, () => {}, 1, 0, null, null, null, undefined, [['id', 'test', 'title', 'Hello']]);
+      const t = new TemplateFixture({
+        create: () => {
+          ɵɵelement(0, 'div', 0);
+        },
+        decls: 1,
+        vars: 0,
+        consts: [['id', 'test', 'title', 'Hello']]
+      });
 
       const div = (t.hostElement as HTMLElement).querySelector('div')!;
       expect(div.id).toEqual('test');
@@ -114,7 +120,7 @@ describe('instructions', () => {
 
   describe('attribute', () => {
     it('should use sanitizer function', () => {
-      const t = new TemplateFixture(createDiv, () => {}, 1, 1);
+      const t = new TemplateFixture({create: createDiv, decls: 1, vars: 1});
 
       t.update(() => {
         ɵɵattribute('title', 'javascript:true', ɵɵsanitizeUrl);
@@ -143,7 +149,7 @@ describe('instructions', () => {
      */
     it('should chain', () => {
       // <div [title]="title" [accesskey]="key"></div>
-      const t = new TemplateFixture(createDiv, () => {}, 1, 2);
+      const t = new TemplateFixture({create: createDiv, update: () => {}, decls: 1, vars: 2});
       t.update(() => {
         ɵɵproperty('title', 'one')('accessKey', 'A');
       });
@@ -165,14 +171,16 @@ describe('instructions', () => {
   describe('styleProp', () => {
     it('should allow values even if a bypass operation is applied', () => {
       let backgroundImage: string|SafeValue = 'url("http://server")';
-      const t = new TemplateFixture(
-          () => {
-            return createDiv();
-          },
-          () => {
-            ɵɵstyleProp('background-image', backgroundImage);
-          },
-          2, 2);
+      const t = new TemplateFixture({
+        create: () => {
+          return createDiv();
+        },
+        update: () => {
+          ɵɵstyleProp('background-image', backgroundImage);
+        },
+        decls: 2,
+        vars: 2
+      });
       // nothing is set because sanitizer suppresses it.
       expect((t.hostElement.firstChild as HTMLElement).style.getPropertyValue('background-image'))
           .toEqual('url("http://server")');
@@ -192,9 +200,15 @@ describe('instructions', () => {
     }
 
     it('should add style', () => {
-      const fixture = new TemplateFixture(createDivWithStyle, () => {
-        ɵɵstyleMap({'background-color': 'red'});
-      }, 1, 2, null, null, null, undefined, attrs);
+      const fixture = new TemplateFixture({
+        create: createDivWithStyle,
+        update: () => {
+          ɵɵstyleMap({'background-color': 'red'});
+        },
+        decls: 1,
+        vars: 2,
+        consts: attrs
+      });
       fixture.update();
       expect(fixture.html).toEqual('<div style="background-color: red; height: 10px;"></div>');
     });
@@ -206,9 +220,14 @@ describe('instructions', () => {
     }
 
     it('should add class', () => {
-      const fixture = new TemplateFixture(createDivWithStyling, () => {
-        ɵɵclassMap('multiple classes');
-      }, 1, 2);
+      const fixture = new TemplateFixture({
+        create: createDivWithStyling,
+        update: () => {
+          ɵɵclassMap('multiple classes');
+        },
+        decls: 1,
+        vars: 2
+      });
       const div = fixture.containerElement.querySelector('div.multiple')!;
       expect(getSortedClassName(div)).toEqual('classes multiple');
     });
@@ -225,7 +244,7 @@ describe('instructions', () => {
         }
         if (rf & RenderFlags.Update) {
           const row_r2 = ctx0.$implicit;
-          ɵɵselect(1);
+          ɵɵadvance(1);
           ɵɵproperty('ngForOf', row_r2);
         }
       }
@@ -239,7 +258,7 @@ describe('instructions', () => {
         }
         if (rf & RenderFlags.Update) {
           const col_r3 = ctx1.$implicit;
-          ɵɵselect(1);
+          ɵɵadvance(1);
           ɵɵtextInterpolate1('', col_r3, '');
         }
       }
@@ -284,7 +303,7 @@ 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, 1, 1, null, null, s);
+      const t = new TemplateFixture({create: createAnchor, decls: 1, vars: 1, sanitizer: s});
       const inputValue = 'http://foo';
       const outputValue = 'http://foo-sanitized';
 
@@ -297,7 +316,7 @@ describe('instructions', () => {
 
     it('should bypass url sanitization if marked by the service', () => {
       const s = new LocalMockSanitizer(value => '');
-      const t = new TemplateFixture(createAnchor, undefined, 1, 1, null, null, s);
+      const t = new TemplateFixture({create: createAnchor, decls: 1, vars: 1, sanitizer: s});
       const inputValue = s.bypassSecurityTrustUrl('http://foo');
       const outputValue = 'http://foo';
 
@@ -310,7 +329,7 @@ describe('instructions', () => {
 
     it('should bypass ivy-level url sanitization if a custom sanitizer is used', () => {
       const s = new LocalMockSanitizer(value => '');
-      const t = new TemplateFixture(createAnchor, undefined, 1, 1, null, null, s);
+      const t = new TemplateFixture({create: createAnchor, decls: 1, vars: 1, sanitizer: s});
       const inputValue = bypassSanitizationTrustUrl('http://foo');
       const outputValue = 'http://foo-ivy';
 
@@ -323,7 +342,7 @@ describe('instructions', () => {
 
     it('should work for style sanitization', () => {
       const s = new LocalMockSanitizer(value => `color:blue`);
-      const t = new TemplateFixture(createDiv, undefined, 1, 1, null, null, s);
+      const t = new TemplateFixture({create: createDiv, decls: 1, vars: 1, sanitizer: s});
       const inputValue = 'color:red';
       const outputValue = 'color:blue';
 
@@ -336,7 +355,7 @@ describe('instructions', () => {
 
     it('should bypass style sanitization if marked by the service', () => {
       const s = new LocalMockSanitizer(value => '');
-      const t = new TemplateFixture(createDiv, undefined, 1, 1, null, null, s);
+      const t = new TemplateFixture({create: createDiv, decls: 1, vars: 1, sanitizer: s});
       const inputValue = s.bypassSecurityTrustStyle('color:maroon');
       const outputValue = 'color:maroon';
 
@@ -349,7 +368,7 @@ describe('instructions', () => {
 
     it('should bypass ivy-level style sanitization if a custom sanitizer is used', () => {
       const s = new LocalMockSanitizer(value => '');
-      const t = new TemplateFixture(createDiv, undefined, 1, 1, null, null, s);
+      const t = new TemplateFixture({create: createDiv, decls: 1, vars: 1, sanitizer: s});
       const inputValue = bypassSanitizationTrustStyle('font-family:foo');
       const outputValue = 'font-family:foo-ivy';
 
@@ -362,7 +381,7 @@ describe('instructions', () => {
 
     it('should work for resourceUrl sanitization', () => {
       const s = new LocalMockSanitizer(value => `${value}-sanitized`);
-      const t = new TemplateFixture(createScript, undefined, 1, 1, null, null, s);
+      const t = new TemplateFixture({create: createScript, decls: 1, vars: 1, sanitizer: s});
       const inputValue = 'http://resource';
       const outputValue = 'http://resource-sanitized';
 
@@ -375,7 +394,7 @@ describe('instructions', () => {
 
     it('should bypass resourceUrl sanitization if marked by the service', () => {
       const s = new LocalMockSanitizer(value => '');
-      const t = new TemplateFixture(createScript, undefined, 1, 1, null, null, s);
+      const t = new TemplateFixture({create: createScript, decls: 1, vars: 1, sanitizer: s});
       const inputValue = s.bypassSecurityTrustResourceUrl('file://all-my-secrets.pdf');
       const outputValue = 'file://all-my-secrets.pdf';
 
@@ -388,7 +407,7 @@ describe('instructions', () => {
 
     it('should bypass ivy-level resourceUrl sanitization if a custom sanitizer is used', () => {
       const s = new LocalMockSanitizer(value => '');
-      const t = new TemplateFixture(createScript, undefined, 1, 1, null, null, s);
+      const t = new TemplateFixture({create: createScript, decls: 1, vars: 1, sanitizer: s});
       const inputValue = bypassSanitizationTrustResourceUrl('file://all-my-secrets.pdf');
       const outputValue = 'file://all-my-secrets.pdf-ivy';
 
@@ -401,7 +420,7 @@ describe('instructions', () => {
 
     it('should work for script sanitization', () => {
       const s = new LocalMockSanitizer(value => `${value} //sanitized`);
-      const t = new TemplateFixture(createScript, undefined, 1, 1, null, null, s);
+      const t = new TemplateFixture({create: createScript, decls: 1, vars: 1, sanitizer: s});
       const inputValue = 'fn();';
       const outputValue = 'fn(); //sanitized';
 
@@ -414,7 +433,7 @@ describe('instructions', () => {
 
     it('should bypass script sanitization if marked by the service', () => {
       const s = new LocalMockSanitizer(value => '');
-      const t = new TemplateFixture(createScript, undefined, 1, 1, null, null, s);
+      const t = new TemplateFixture({create: createScript, decls: 1, vars: 1, sanitizer: s});
       const inputValue = s.bypassSecurityTrustScript('alert("bar")');
       const outputValue = 'alert("bar")';
 
@@ -427,7 +446,7 @@ describe('instructions', () => {
 
     it('should bypass ivy-level script sanitization if a custom sanitizer is used', () => {
       const s = new LocalMockSanitizer(value => '');
-      const t = new TemplateFixture(createScript, undefined, 1, 1, null, null, s);
+      const t = new TemplateFixture({create: createScript, decls: 1, vars: 1, sanitizer: s});
       const inputValue = bypassSanitizationTrustScript('alert("bar")');
       const outputValue = 'alert("bar")-ivy';
 
@@ -440,7 +459,7 @@ describe('instructions', () => {
 
     it('should work for html sanitization', () => {
       const s = new LocalMockSanitizer(value => `${value} <!--sanitized-->`);
-      const t = new TemplateFixture(createDiv, undefined, 1, 1, null, null, s);
+      const t = new TemplateFixture({create: createDiv, decls: 1, vars: 1, sanitizer: s});
       const inputValue = '<header></header>';
       const outputValue = '<header></header> <!--sanitized-->';
 
@@ -453,7 +472,7 @@ describe('instructions', () => {
 
     it('should bypass html sanitization if marked by the service', () => {
       const s = new LocalMockSanitizer(value => '');
-      const t = new TemplateFixture(createDiv, undefined, 1, 1, null, null, s);
+      const t = new TemplateFixture({create: createDiv, decls: 1, vars: 1, sanitizer: s});
       const inputValue = s.bypassSecurityTrustHtml('<div onclick="alert(123)"></div>');
       const outputValue = '<div onclick="alert(123)"></div>';
 
@@ -466,7 +485,7 @@ describe('instructions', () => {
 
     it('should bypass ivy-level script sanitization if a custom sanitizer is used', () => {
       const s = new LocalMockSanitizer(value => '');
-      const t = new TemplateFixture(createDiv, undefined, 1, 1, null, null, s);
+      const t = new TemplateFixture({create: createDiv, decls: 1, vars: 1, sanitizer: s});
       const inputValue = bypassSanitizationTrustHtml('<div onclick="alert(123)"></div>');
       const outputValue = '<div onclick="alert(123)"></div>-ivy';
 
diff --git a/packages/core/test/render3/interfaces/node_spec.ts b/packages/core/test/render3/interfaces/node_spec.ts
index cd2a3a1516d3e..8107af523c21a 100644
--- a/packages/core/test/render3/interfaces/node_spec.ts
+++ b/packages/core/test/render3/interfaces/node_spec.ts
@@ -6,17 +6,23 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {TNodeType, TNodeTypeAsString} from '@angular/core/src/render3/interfaces/node';
+import {TNodeType, toTNodeTypeAsString} from '@angular/core/src/render3/interfaces/node';
 
 describe('node interfaces', () => {
   describe('TNodeType', () => {
-    it('should agree with TNodeTypeAsString', () => {
-      expect(TNodeTypeAsString[TNodeType.Container]).toEqual('Container');
-      expect(TNodeTypeAsString[TNodeType.Projection]).toEqual('Projection');
-      expect(TNodeTypeAsString[TNodeType.View]).toEqual('View');
-      expect(TNodeTypeAsString[TNodeType.Element]).toEqual('Element');
-      expect(TNodeTypeAsString[TNodeType.ElementContainer]).toEqual('ElementContainer');
-      expect(TNodeTypeAsString[TNodeType.IcuContainer]).toEqual('IcuContainer');
+    it('should agree with toTNodeTypeAsString', () => {
+      expect(toTNodeTypeAsString(TNodeType.Element)).toEqual('Element');
+      expect(toTNodeTypeAsString(TNodeType.Text)).toEqual('Text');
+      expect(toTNodeTypeAsString(TNodeType.Container)).toEqual('Container');
+      expect(toTNodeTypeAsString(TNodeType.Projection)).toEqual('Projection');
+      expect(toTNodeTypeAsString(TNodeType.ElementContainer)).toEqual('ElementContainer');
+      expect(toTNodeTypeAsString(TNodeType.Icu)).toEqual('IcuContainer');
+      expect(toTNodeTypeAsString(TNodeType.Placeholder)).toEqual('Placeholder');
+
+      expect(toTNodeTypeAsString(
+                 TNodeType.Container | TNodeType.Projection | TNodeType.Element |
+                 TNodeType.ElementContainer | TNodeType.Icu))
+          .toEqual('Element|Container|ElementContainer|Projection|IcuContainer');
     });
   });
 });
\ No newline at end of file
diff --git a/packages/core/test/render3/is_shape_of.ts b/packages/core/test/render3/is_shape_of.ts
index 86bbf66b86d17..ac72703c7ebe1 100644
--- a/packages/core/test/render3/is_shape_of.ts
+++ b/packages/core/test/render3/is_shape_of.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {TI18n} from '@angular/core/src/render3/interfaces/i18n';
+import {TI18n, TIcu} from '@angular/core/src/render3/interfaces/i18n';
 import {TNode} from '@angular/core/src/render3/interfaces/node';
 import {TView} from '@angular/core/src/render3/interfaces/view';
 
@@ -75,10 +75,26 @@ export function isTI18n(obj: any): obj is TI18n {
   return isShapeOf<TI18n>(obj, ShapeOfTI18n);
 }
 const ShapeOfTI18n: ShapeOf<TI18n> = {
-  vars: true,
   create: true,
   update: true,
-  icus: true,
+};
+
+
+/**
+ * Determines if `obj` matches the shape `TIcu`.
+ * @param obj
+ */
+export function isTIcu(obj: any): obj is TIcu {
+  return isShapeOf<TIcu>(obj, ShapeOfTIcu);
+}
+const ShapeOfTIcu: ShapeOf<TIcu> = {
+  type: true,
+  anchorIdx: true,
+  currentCaseLViewIndex: true,
+  cases: true,
+  create: true,
+  remove: true,
+  update: true
 };
 
 
@@ -91,11 +107,10 @@ export function isTView(obj: any): obj is TView {
 }
 const ShapeOfTView: ShapeOf<TView> = {
   type: true,
-  id: true,
   blueprint: true,
   template: true,
   viewQuery: true,
-  node: true,
+  declTNode: true,
   firstCreatePass: true,
   firstUpdatePass: true,
   data: true,
@@ -134,6 +149,7 @@ export function isTNode(obj: any): obj is TNode {
 const ShapeOfTNode: ShapeOf<TNode> = {
   type: true,
   index: true,
+  insertBeforeIndex: true,
   injectorIndex: true,
   directiveStart: true,
   directiveEnd: true,
@@ -141,7 +157,7 @@ const ShapeOfTNode: ShapeOf<TNode> = {
   propertyBindings: true,
   flags: true,
   providerIndexes: true,
-  tagName: true,
+  value: true,
   attrs: true,
   mergedAttrs: true,
   localNames: true,
diff --git a/packages/core/test/render3/listeners_spec.ts b/packages/core/test/render3/listeners_spec.ts
index f40e23eb57ca9..8adc97ccdce9f 100644
--- a/packages/core/test/render3/listeners_spec.ts
+++ b/packages/core/test/render3/listeners_spec.ts
@@ -6,14 +6,13 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {HEADER_OFFSET} from '@angular/core/src/render3/interfaces/view';
 import {dispatchEvent} from '@angular/platform-browser/testing/src/browser_util';
-
 import {ɵɵdefineComponent, ɵɵdefineDirective, ɵɵreference, ɵɵresolveBody, ɵɵresolveDocument} from '../../src/render3/index';
 import {ɵɵelement, ɵɵelementEnd, ɵɵelementStart, ɵɵgetCurrentView, ɵɵlistener, ɵɵtext} from '../../src/render3/instructions/all';
 import {RenderFlags} from '../../src/render3/interfaces/definition';
 import {GlobalTargetResolver} from '../../src/render3/interfaces/renderer';
 import {ɵɵrestoreView} from '../../src/render3/state';
-
 import {getRendererFactory2} from './imported_renderer2';
 import {ComponentFixture, containerEl, createComponent, getDirectiveOnNode, renderToHtml, TemplateFixture} from './render_util';
 
@@ -372,11 +371,16 @@ describe('event listeners', () => {
       });
     }
 
-    const fixture = new TemplateFixture(() => {
-      ɵɵelementStart(0, 'button', 0);
-      ɵɵtext(1, 'Click');
-      ɵɵelementEnd();
-    }, () => {}, 2, 0, [HostListenerDir], null, null, undefined, [['hostListenerDir', '']]);
+    const fixture = new TemplateFixture({
+      create: () => {
+        ɵɵelementStart(0, 'button', 0);
+        ɵɵtext(1, 'Click');
+        ɵɵelementEnd();
+      },
+      decls: 2,
+      directives: [HostListenerDir],
+      consts: [['hostListenerDir', '']]
+    });
 
     const button = fixture.hostElement.querySelector('button')!;
 
@@ -388,9 +392,14 @@ describe('event listeners', () => {
   });
 
   it('should support global host listeners on directives', () => {
-    const fixture = new TemplateFixture(() => {
-      ɵɵelement(0, 'div', 0);
-    }, () => {}, 1, 0, [GlobalHostListenerDir], null, null, undefined, [['hostListenerDir', '']]);
+    const fixture = new TemplateFixture({
+      create: () => {
+        ɵɵelement(0, 'div', 0);
+      },
+      decls: 1,
+      directives: [GlobalHostListenerDir],
+      consts: [['hostListenerDir', '']]
+    });
 
     const doc = fixture.hostElement.ownerDocument!;
 
@@ -487,7 +496,7 @@ describe('event listeners', () => {
               }
 
               // testing only
-              compInstance = getDirectiveOnNode(0);
+              compInstance = getDirectiveOnNode(HEADER_OFFSET);
             },
         directives: [Comp]
       });
diff --git a/packages/core/test/render3/matchers.ts b/packages/core/test/render3/matchers.ts
index 59826612ab023..8fefab7515605 100644
--- a/packages/core/test/render3/matchers.ts
+++ b/packages/core/test/render3/matchers.ts
@@ -6,11 +6,11 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {TI18n} from '@angular/core/src/render3/interfaces/i18n';
+import {I18nDebug, IcuCreateOpCodes, TI18n, TIcu} from '@angular/core/src/render3/interfaces/i18n';
 import {TNode} from '@angular/core/src/render3/interfaces/node';
 import {TView} from '@angular/core/src/render3/interfaces/view';
 
-import {isDOMElement, isDOMText, isTI18n, isTNode, isTView} from './is_shape_of';
+import {isDOMElement, isDOMText, isTI18n, isTIcu, isTNode, isTView} from './is_shape_of';
 
 
 /**
@@ -37,22 +37,17 @@ export function matchObjectShape<T>(
     return true;
   };
   matcher.jasmineToString = function() {
-    return `${toString(_actual, false)} != ${toString(expected, true)})`;
+    let errors: string[] = [];
+    if (!_actual || typeof _actual !== 'object') {
+      return `Expecting ${jasmine.pp(expect)} got ${jasmine.pp(_actual)}`;
+    }
+    for (const key in expected) {
+      if (expected.hasOwnProperty(key) && !jasmine.matchersUtil.equals(_actual[key], expected[key]))
+        errors.push(`\n  property obj.${key} to equal ${expected[key]} but got ${_actual[key]}`);
+    }
+    return errors.join('\n');
   };
 
-  function toString(obj: any, isExpected: boolean) {
-    if (isExpected || shapePredicate(obj)) {
-      const props =
-          Object.keys(expected).map(key => `${key}: ${JSON.stringify((obj as any)[key])}`);
-      if (isExpected === false) {
-        // Push something to let the user know that there may be other ignored properties in actual
-        props.push('...');
-      }
-      return `${name}({${props.length === 0 ? '' : '\n  ' + props.join(',\n  ') + '\n'}})`;
-    } else {
-      return JSON.stringify(obj);
-    }
-  }
   return matcher;
 }
 
@@ -116,6 +111,26 @@ export function matchTI18n(expected?: Partial<TI18n>): jasmine.AsymmetricMatcher
 }
 
 
+/**
+ * Asymmetric matcher which matches a `T1cu` of a given shape.
+ *
+ * Expected usage:
+ * ```
+ * expect(tNode).toEqual(matchTIcu({type: TIcuType.select}));
+ * expect({
+ *   type: TIcuType.select
+ * }).toEqual({
+ *   node: matchT18n({type: TIcuType.select})
+ * });
+ * ```
+ *
+ * @param expected optional properties which the `TIcu` must contain.
+ */
+export function matchTIcu(expected?: Partial<TIcu>): jasmine.AsymmetricMatcher<TIcu> {
+  return matchObjectShape('TIcu', isTIcu, expected);
+}
+
+
 
 /**
  * Asymmetric matcher which matches a DOM Element.
@@ -214,5 +229,27 @@ export function matchDomText(expectedText: string|undefined = undefined):
     return `[${actualStr} != ${expectedStr}]`;
   };
 
+  return matcher;
+}
+
+export function matchI18nMutableOpCodes(expectedMutableOpCodes: string[]):
+    jasmine.AsymmetricMatcher<IcuCreateOpCodes> {
+  const matcher = function() {};
+  let _actual: any = null;
+
+  matcher.asymmetricMatch = function(actual: any) {
+    _actual = actual;
+    if (!Array.isArray(actual)) return false;
+    const debug = (actual as I18nDebug).debug as undefined | string[];
+    if (expectedMutableOpCodes && (!jasmine.matchersUtil.equals(debug, expectedMutableOpCodes))) {
+      return false;
+    }
+    return true;
+  };
+  matcher.jasmineToString = function() {
+    const debug = (_actual as I18nDebug).debug as undefined | string[];
+    return `[${JSON.stringify(debug)} != ${expectedMutableOpCodes}]`;
+  };
+
   return matcher;
 }
\ No newline at end of file
diff --git a/packages/core/test/render3/matchers_spec.ts b/packages/core/test/render3/matchers_spec.ts
index 10170064eed5f..01964b9140154 100644
--- a/packages/core/test/render3/matchers_spec.ts
+++ b/packages/core/test/render3/matchers_spec.ts
@@ -41,18 +41,13 @@ describe('render3 matchers', () => {
     it('should produce human readable errors', () => {
       const matcher = matchMyShape({propA: 'different'});
       expect(matcher.asymmetricMatch(myShape, [])).toEqual(false);
-      expect(matcher.jasmineToString!()).toEqual(dedent`
-        MyShape({
-          propA: "value",
-          ...
-        }) != MyShape({
-          propA: "different"
-        }))`);
+      expect(matcher.jasmineToString!())
+          .toEqual('\n  property obj.propA to equal different but got value');
     });
   });
 
   describe('matchTView', () => {
-    const tView = createTView(TViewType.Root, 1, null, 2, 3, null, null, null, null, null);
+    const tView = createTView(TViewType.Root, null, null, 2, 3, null, null, null, null, null);
     it('should match', () => {
       expect(tView).toEqual(matchTView());
       expect(tView).toEqual(matchTView({type: TViewType.Root}));
@@ -60,12 +55,12 @@ describe('render3 matchers', () => {
     });
   });
   describe('matchTNode', () => {
-    const tView = createTView(TViewType.Root, 1, null, 2, 3, null, null, null, null, null);
-    const tNode = createTNode(tView, null, TNodeType.Element, 1, 'tagName', []);
+    const tView = createTView(TViewType.Root, null, null, 2, 3, null, null, null, null, null);
+    const tNode = createTNode(tView, null, TNodeType.Element, 0, 'tagName', []);
 
     it('should match', () => {
       expect(tNode).toEqual(matchTNode());
-      expect(tNode).toEqual(matchTNode({type: TNodeType.Element, tagName: 'tagName'}));
+      expect(tNode).toEqual(matchTNode({type: TNodeType.Element, value: 'tagName'}));
       expect({node: tNode}).toEqual({node: matchTNode({type: TNodeType.Element})});
     });
   });
diff --git a/packages/core/test/render3/perf/BUILD.bazel b/packages/core/test/render3/perf/BUILD.bazel
index da80ae8b9b8d3..22cd841d2d7a6 100644
--- a/packages/core/test/render3/perf/BUILD.bazel
+++ b/packages/core/test/render3/perf/BUILD.bazel
@@ -227,7 +227,20 @@ ng_rollup_bundle(
 
 ng_benchmark(
     name = "host_binding",
-    bundle = ":host_binding",
+    bundle = ":host_binding_lib",
+)
+
+ng_rollup_bundle(
+    name = "i18n_lib",
+    entry_point = ":i18n/index.ts",
+    deps = [
+        ":perf_lib",
+    ],
+)
+
+ng_benchmark(
+    name = "i18n",
+    bundle = ":i18n_lib",
 )
 
 ng_rollup_bundle(
diff --git a/packages/core/test/render3/perf/class_binding/index.ts b/packages/core/test/render3/perf/class_binding/index.ts
index ffe818ab4bb4e..397c327a84c3e 100644
--- a/packages/core/test/render3/perf/class_binding/index.ts
+++ b/packages/core/test/render3/perf/class_binding/index.ts
@@ -5,12 +5,11 @@
  * 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 {ɵɵproperty} from '@angular/core/src/core';
-import {AttributeMarker, TAttributes} from '@angular/core/src/render3/interfaces/node';
-
+import {ɵɵproperty} from '../../../../src/render3/instructions/all';
 import {ɵɵelement} from '../../../../src/render3/instructions/element';
 import {ɵɵclassMap, ɵɵclassProp} from '../../../../src/render3/instructions/styling';
 import {ComponentTemplate, RenderFlags} from '../../../../src/render3/interfaces/definition';
+import {AttributeMarker, TAttributes} from '../../../../src/render3/interfaces/node';
 import {Benchmark, createBenchmark} from '../micro_bench';
 import {setupTestHarness} from '../setup';
 
diff --git a/packages/core/test/render3/perf/directive_instantiate/index.ts b/packages/core/test/render3/perf/directive_instantiate/index.ts
index dd3bb779dc293..edbd04e4a0f49 100644
--- a/packages/core/test/render3/perf/directive_instantiate/index.ts
+++ b/packages/core/test/render3/perf/directive_instantiate/index.ts
@@ -5,12 +5,12 @@
  * 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 {LViewFlags, TViewType} from '@angular/core/src/render3/interfaces/view';
 
 import {ɵɵdefineDirective, ɵɵelementEnd, ɵɵelementStart, ɵɵtext} from '../../../../src/render3/index';
 import {createLView, createTNode, createTView} from '../../../../src/render3/instructions/shared';
 import {RenderFlags} from '../../../../src/render3/interfaces/definition';
-import {TNodeType, TViewNode} from '../../../../src/render3/interfaces/node';
+import {TNodeType} from '../../../../src/render3/interfaces/node';
+import {LViewFlags, TViewType} from '../../../../src/render3/interfaces/view';
 import {createBenchmark} from '../micro_bench';
 import {createAndRenderLView} from '../setup';
 
@@ -75,12 +75,12 @@ function testTemplate(rf: RenderFlags, ctx: any) {
 }
 
 const rootLView = createLView(
-    null, createTView(TViewType.Root, -1, null, 0, 0, null, null, null, null, null), {},
-    LViewFlags.IsRoot, null, null);
+    null, createTView(TViewType.Root, null, null, 0, 0, null, null, null, null, null), {},
+    LViewFlags.IsRoot, null, null, null, null, null, null);
 
-const viewTNode = createTNode(null!, null, TNodeType.View, -1, null, null) as TViewNode;
+const viewTNode = createTNode(null!, null, TNodeType.Element, -1, null, null);
 const embeddedTView = createTView(
-    TViewType.Embedded, -1, testTemplate, 21, 10, [Tooltip.ɵdir], null, null, null,
+    TViewType.Embedded, null, testTemplate, 21, 10, [Tooltip.ɵdir], null, null, null,
     [['position', 'top', 3, 'tooltip']]);
 
 // create view once so we don't profile the first create pass
diff --git a/packages/core/test/render3/perf/element_text_create/index.ts b/packages/core/test/render3/perf/element_text_create/index.ts
index fe77846e4cbaa..bc7d7d6b91076 100644
--- a/packages/core/test/render3/perf/element_text_create/index.ts
+++ b/packages/core/test/render3/perf/element_text_create/index.ts
@@ -9,7 +9,7 @@ import {ɵɵelementEnd, ɵɵelementStart} from '../../../../src/render3/instruct
 import {createLView, createTNode, createTView} from '../../../../src/render3/instructions/shared';
 import {ɵɵtext} from '../../../../src/render3/instructions/text';
 import {RenderFlags} from '../../../../src/render3/interfaces/definition';
-import {TNodeType, TViewNode} from '../../../../src/render3/interfaces/node';
+import {TNodeType} from '../../../../src/render3/interfaces/node';
 import {LViewFlags, TViewType} from '../../../../src/render3/interfaces/view';
 import {createBenchmark} from '../micro_bench';
 import {createAndRenderLView} from '../setup';
@@ -64,12 +64,12 @@ function testTemplate(rf: RenderFlags, ctx: any) {
 }
 
 const rootLView = createLView(
-    null, createTView(TViewType.Root, -1, null, 0, 0, null, null, null, null, null), {},
-    LViewFlags.IsRoot, null, null);
+    null, createTView(TViewType.Root, null, null, 0, 0, null, null, null, null, null), {},
+    LViewFlags.IsRoot, null, null, null, null, null, null);
 
-const viewTNode = createTNode(null!, null, TNodeType.View, -1, null, null) as TViewNode;
+const viewTNode = createTNode(null!, null, TNodeType.Element, -1, null, null);
 const embeddedTView = createTView(
-    TViewType.Embedded, -1, testTemplate, 21, 0, null, null, null, null, [[
+    TViewType.Embedded, null, testTemplate, 21, 0, null, null, null, null, [[
       'name1', 'value1', 'name2', 'value2', 'name3', 'value3', 'name4', 'value4', 'name5', 'value5'
     ]]);
 
diff --git a/packages/core/test/render3/perf/i18n/index.ts b/packages/core/test/render3/perf/i18n/index.ts
new file mode 100644
index 0000000000000..beb6ac1c1070e
--- /dev/null
+++ b/packages/core/test/render3/perf/i18n/index.ts
@@ -0,0 +1,345 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {ɵɵadvance, ɵɵelement, ɵɵelementEnd, ɵɵelementStart, ɵɵi18n, ɵɵi18nApply, ɵɵi18nAttributes, ɵɵi18nExp, ɵɵpropertyInterpolate1, ɵɵtext, ɵɵtextInterpolate1} from '../../../../src/render3/instructions/all';
+import {ComponentTemplate, RenderFlags} from '../../../../src/render3/interfaces/definition';
+import {AttributeMarker, TAttributes} from '../../../../src/render3/interfaces/node';
+import {Benchmark, createBenchmark} from '../micro_bench';
+import {MicroBenchmarkRenderNode} from '../noop_renderer';
+import {setupTestHarness} from '../setup';
+
+type ComponentDef = {
+  consts: (string|TAttributes)[],
+  vars: number,
+  decls: number,
+  template: ComponentTemplate<any>,
+  beforeCD?: Function,
+  DOMParserMockFn?: Function,
+};
+
+const enum NodeTypes {
+  ELEMENT_NODE = 1,
+  TEXT_NODE = 2,
+  COMMENT_NODE = 8
+}
+
+function createElement(nodeType: number, tagName?: string): any {
+  const element = new MicroBenchmarkRenderNode();
+  element.nodeType = nodeType;
+  element.tagName = tagName;
+  return element;
+}
+
+// Mock function that is invoked when the string should be parsed.
+function defaultDOMParserMockFn(content: string) {
+  const element = createElement(NodeTypes.TEXT_NODE);
+  element.textContent = content;
+  return element;
+}
+
+function createDOMParserMock(mockFn: Function) {
+  return {
+    parseFromString: (content: string) => {
+      const body = createElement(NodeTypes.ELEMENT_NODE, 'body');
+      content = content.replace(/<body><remove><\/remove>/, '');
+      body.firstChild = mockFn(content);
+      return {body};
+    },
+  };
+}
+
+function setupDOMParserMock(mockFn?: Function): Function {
+  const glob = global as any;
+  if (!glob.window) {
+    glob.window = {};
+  }
+  const origDOMParser = glob.window.DOMParser;
+  glob.window.DOMParser = function() {
+    return createDOMParserMock(mockFn || defaultDOMParserMockFn);
+  };
+
+  // Return a function that would restore DOMParser to its original state.
+  return () => glob.window.DOMParser = origDOMParser;
+}
+
+
+const PROFILE_CREATE = true;
+const PROFILE_UPDATE = true;
+const NUM_OF_VIEWS_PER_RUN = 1000;
+const DEFAULT_CONTEXT: any = {
+  title: 'Test title',
+  interpolation: 'Test interpolation',
+  count: 0
+};
+
+let context = DEFAULT_CONTEXT;
+const benchmarks: Benchmark[] = [];
+
+function benchmark(name: string, def: ComponentDef, baselineDef?: ComponentDef) {
+  // Reset context in case it was changed in `beforeCD` function during the previous benchmark.
+  context = DEFAULT_CONTEXT;
+
+  const teardownDOMParserMock = setupDOMParserMock(def.DOMParserMockFn);
+
+  const ivyHarness = setupTestHarness(
+      def.template, def.decls, def.vars, NUM_OF_VIEWS_PER_RUN, context,
+      def.consts as TAttributes[]);
+
+  let baseHarness;
+  if (baselineDef) {
+    baseHarness = setupTestHarness(
+        baselineDef.template, baselineDef.decls, baselineDef.vars, NUM_OF_VIEWS_PER_RUN, context,
+        baselineDef.consts as TAttributes[]);
+  }
+
+  if (PROFILE_CREATE) {
+    const benchmark = createBenchmark('i18n [create]: ' + name);
+    benchmarks.push(benchmark);
+    const ivyProfile = benchmark('(i18n)');
+    console.profile(benchmark.name + ':' + ivyProfile.name);
+    while (ivyProfile()) {
+      ivyHarness.createEmbeddedLView();
+    }
+    console.profileEnd();
+
+    if (baseHarness) {
+      const baseProfile = benchmark('(baseline)');
+      console.profile(benchmark.name + ':' + baseProfile.name);
+      while (baseProfile()) {
+        baseHarness.createEmbeddedLView();
+      }
+      console.profileEnd();
+    }
+  }
+
+  if (PROFILE_UPDATE) {
+    const benchmark = createBenchmark('i18n [update]: : ' + name);
+    benchmarks.push(benchmark);
+    const ivyProfile = benchmark('(i18n)');
+    console.profile(benchmark.name + ':' + ivyProfile.name);
+    while (ivyProfile()) {
+      if (def.beforeCD) {
+        def.beforeCD(context);
+      }
+      ivyHarness.detectChanges();
+    }
+    console.profileEnd();
+
+    if (baseHarness) {
+      const baseProfile = benchmark('(baseline)');
+      console.profile(benchmark.name + ':' + baseProfile.name);
+      while (baseProfile()) {
+        if (baselineDef && baselineDef.beforeCD) {
+          baselineDef.beforeCD(context);
+        }
+        baseHarness.detectChanges();
+      }
+      console.profileEnd();
+    }
+  }
+
+  teardownDOMParserMock();
+}
+
+benchmark(
+    `Static attributes`,
+
+    // <div i18n-title title="Test Title"></div>
+    {
+      decls: 2,
+      vars: 0,
+      consts: [[AttributeMarker.I18n, 'title'], ['title', 'Test Title']],
+      template: function(rf: RenderFlags, ctx: any) {
+        if (rf & 1) {
+          ɵɵelementStart(0, 'div', 0);
+          ɵɵi18nAttributes(1, 1);
+          ɵɵelementEnd();
+        }
+      }
+    },
+
+    // <div title="Test Title"></div>
+    {
+      decls: 2,
+      vars: 0,
+      consts: [['title', 'Test Title']],
+      template: function(rf: RenderFlags, ctx: any) {
+        if (rf & 1) {
+          ɵɵelement(0, 'div', 0);
+        }
+      }
+    });
+
+benchmark(
+    `Attributes with interpolations`,
+
+    // <div i18n-title title="Test {{ title }}"></div>
+    {
+      decls: 2,
+      vars: 1,
+      consts: [[AttributeMarker.I18n, 'title'], ['title', 'Test �0�']],
+      template: function(rf: RenderFlags, ctx: any) {
+        if (rf & 1) {
+          ɵɵelementStart(0, 'div', 0);
+          ɵɵi18nAttributes(1, 1);
+          ɵɵelementEnd();
+        }
+        if (rf & 2) {
+          ɵɵi18nExp(ctx.title);
+          ɵɵi18nApply(1);
+        }
+      }
+    },
+
+    // <div title="Test {{ title }}"></div>
+    {
+      decls: 2,
+      vars: 1,
+      consts: [[AttributeMarker.Bindings, 'title']],
+      template: function(rf: RenderFlags, ctx: any) {
+        if (rf & 1) {
+          ɵɵelement(0, 'div', 0);
+        }
+        if (rf & 2) {
+          ɵɵpropertyInterpolate1('title', 'Test ', ctx.title, '');
+        }
+      }
+    });
+
+benchmark(
+    `Block of static text`,
+
+    // <div i18n>Some text content</div>
+    {
+      decls: 2,
+      vars: 0,
+      consts: ['Some text content'],
+      template: function(rf: RenderFlags, ctx: any) {
+        if (rf & 1) {
+          ɵɵelementStart(0, 'div');
+          ɵɵi18n(1, 0);
+          ɵɵelementEnd();
+        }
+      }
+    },
+
+    // <div>Some text content</div>
+    {
+      decls: 2,
+      vars: 0,
+      consts: [],
+      template: function(rf: RenderFlags, ctx: any) {
+        if (rf & 1) {
+          ɵɵelementStart(0, 'div');
+          ɵɵtext(1, 'Some text content');
+          ɵɵelementEnd();
+        }
+      }
+    });
+
+benchmark(
+    `Block of text with interpolation`,
+
+    // <div i18n>Some text content with {{ interpolation }}</div>
+    {
+      decls: 2,
+      vars: 1,
+      consts: ['Some text content with �0�'],
+      template: function(rf: RenderFlags, ctx: any) {
+        if (rf & 1) {
+          ɵɵelementStart(0, 'div');
+          ɵɵi18n(1, 0);
+          ɵɵelementEnd();
+        }
+        if (rf & 2) {
+          ɵɵadvance(1);
+          ɵɵi18nExp(ctx.interpolation);
+          ɵɵi18nApply(1);
+        }
+      }
+    },
+
+    // <div>Some text content with {{ interpolation }}</div>
+    {
+      decls: 2,
+      vars: 1,
+      consts: [],
+      template: function(rf: RenderFlags, ctx: any) {
+        if (rf & 1) {
+          ɵɵelementStart(0, 'div');
+          ɵɵtext(1);
+          ɵɵelementEnd();
+        }
+        if (rf & 2) {
+          ɵɵadvance(1);
+          ɵɵtextInterpolate1('Some text content with ', ctx.interpolation, '');
+        }
+      }
+    });
+
+benchmark(
+    `Simple ICU`,
+
+    // {count, plural, =1 {one} =2 {two} other {other}}
+    {
+      decls: 1,
+      vars: 1,
+      consts: ['{�0�, plural, =1 {one} =2 {two} other {other}}'],
+      template: function(rf: RenderFlags, ctx: any) {
+        if (rf & 1) {
+          ɵɵi18n(0, 0);
+        }
+        if (rf & 2) {
+          ɵɵi18nExp(ctx.count);
+          ɵɵi18nApply(0);
+        }
+      },
+      beforeCD: function(ctx: any) {
+        // Switch values between [0, 1, 2] to trigger different ICU cases.
+        ctx.count = (ctx.count + 1) % 3;
+      },
+    });
+
+benchmark(
+    `Nested ICUs`,
+
+    // {count, plural,
+    //    =1 {one}
+    //    =2 {two}
+    //    other { {count, plural, =0 {zero} other {other}} }}
+    {
+      decls: 1,
+      vars: 2,
+      consts: ['{�0�, plural, =1 {one} =2 {two} other { {�0�, plural, =0 {zero} other {other}} }}'],
+      template: function(rf: RenderFlags, ctx: any) {
+        if (rf & 1) {
+          ɵɵi18n(0, 0);
+        }
+        if (rf & 2) {
+          ɵɵi18nExp(ctx.count)(ctx.count);
+          ɵɵi18nApply(0);
+        }
+      },
+      beforeCD: function(ctx: any) {
+        // Switch values between [0, 1, 2] to trigger different ICU cases.
+        ctx.count = (ctx.count + 1) % 3;
+      },
+      DOMParserMockFn: (content: string) => {
+        content = content.trim();
+        // Nested ICUs are represented as comment nodes. If we come across one - create an element
+        // with correct node type, otherwise - call default mock fn.
+        if (content.startsWith('<!--')) {
+          const element = createElement(NodeTypes.COMMENT_NODE);
+          element.textContent = content;
+          return element;
+        }
+        return defaultDOMParserMockFn(content);
+      }
+    });
+
+benchmarks.forEach(b => b.report());
diff --git a/packages/core/test/render3/perf/listeners/index.ts b/packages/core/test/render3/perf/listeners/index.ts
index 43730d6d11193..834483b2ff2c9 100644
--- a/packages/core/test/render3/perf/listeners/index.ts
+++ b/packages/core/test/render3/perf/listeners/index.ts
@@ -9,7 +9,7 @@ import {ɵɵelementEnd, ɵɵelementStart} from '../../../../src/render3/instruct
 import {ɵɵlistener} from '../../../../src/render3/instructions/listener';
 import {createLView, createTNode, createTView} from '../../../../src/render3/instructions/shared';
 import {RenderFlags} from '../../../../src/render3/interfaces/definition';
-import {TNodeType, TViewNode} from '../../../../src/render3/interfaces/node';
+import {TNodeType} from '../../../../src/render3/interfaces/node';
 import {LViewFlags, TViewType} from '../../../../src/render3/interfaces/view';
 import {createBenchmark} from '../micro_bench';
 import {createAndRenderLView} from '../setup';
@@ -66,12 +66,12 @@ function testTemplate(rf: RenderFlags, ctx: any) {
 }
 
 const rootLView = createLView(
-    null, createTView(TViewType.Root, -1, null, 0, 0, null, null, null, null, null), {},
-    LViewFlags.IsRoot, null, null);
+    null, createTView(TViewType.Root, null, null, 0, 0, null, null, null, null, null), {},
+    LViewFlags.IsRoot, null, null, null, null, null, null);
 
-const viewTNode = createTNode(null!, null, TNodeType.View, -1, null, null) as TViewNode;
+const viewTNode = createTNode(null!, null, TNodeType.Element, -1, null, null);
 const embeddedTView = createTView(
-    TViewType.Embedded, -1, testTemplate, 11, 0, null, null, null, null, [[3, 'click', 'input']]);
+    TViewType.Embedded, null, testTemplate, 11, 0, null, null, null, null, [[3, 'click', 'input']]);
 
 // create view once so we don't profile the first create pass
 createAndRenderLView(rootLView, embeddedTView, viewTNode);
diff --git a/packages/core/test/render3/perf/ng_template/index.ts b/packages/core/test/render3/perf/ng_template/index.ts
index ecc268f6e45b2..50adf84370d15 100644
--- a/packages/core/test/render3/perf/ng_template/index.ts
+++ b/packages/core/test/render3/perf/ng_template/index.ts
@@ -9,7 +9,7 @@ import {ElementRef, TemplateRef, ViewContainerRef} from '../../../../src/linker'
 import {ɵɵdefineDirective, ɵɵdirectiveInject, ɵɵtemplate} from '../../../../src/render3/index';
 import {createLView, createTNode, createTView} from '../../../../src/render3/instructions/shared';
 import {RenderFlags} from '../../../../src/render3/interfaces/definition';
-import {TNodeType, TViewNode} from '../../../../src/render3/interfaces/node';
+import {TNodeType} from '../../../../src/render3/interfaces/node';
 import {LViewFlags, TViewType} from '../../../../src/render3/interfaces/view';
 import {injectTemplateRef, injectViewContainerRef} from '../../../../src/render3/view_engine_compatibility';
 import {createBenchmark} from '../micro_bench';
@@ -59,12 +59,12 @@ function testTemplate(rf: RenderFlags, ctx: any) {
 }
 
 const rootLView = createLView(
-    null, createTView(TViewType.Root, -1, null, 0, 0, null, null, null, null, null), {},
-    LViewFlags.IsRoot, null, null);
+    null, createTView(TViewType.Root, null, null, 0, 0, null, null, null, null, null), {},
+    LViewFlags.IsRoot, null, null, null, null, null, null);
 
-const viewTNode = createTNode(null!, null, TNodeType.View, -1, null, null) as TViewNode;
+const viewTNode = createTNode(null!, null, TNodeType.Element, -1, null, null);
 const embeddedTView = createTView(
-    TViewType.Root, -1, testTemplate, 2, 0, [NgIfLike.ɵdir], null, null, null,
+    TViewType.Root, null, testTemplate, 2, 0, [NgIfLike.ɵdir], null, null, null,
     [['viewManipulation', '']]);
 
 // create view once so we don't profile first template pass
diff --git a/packages/core/test/render3/perf/noop_renderer.ts b/packages/core/test/render3/perf/noop_renderer.ts
index f8f48db116128..4d0c58d20b8f9 100644
--- a/packages/core/test/render3/perf/noop_renderer.ts
+++ b/packages/core/test/render3/perf/noop_renderer.ts
@@ -8,6 +8,8 @@
 import {ProceduralRenderer3, RComment, RElement, Renderer3, RendererFactory3, RendererStyleFlags3, RNode, RText} from '../../../src/render3/interfaces/renderer';
 
 export class MicroBenchmarkRenderNode implements RNode, RComment, RText {
+  tagName?: string;
+  nodeType?: number;
   textContent: string|null = null;
   parentNode: RNode|null = null;
   parentElement: RElement|null = null;
@@ -43,7 +45,7 @@ export class MicroBenchmarkRenderer implements ProceduralRenderer3 {
     throw new Error('Method not implemented.');
   }
   parentNode(node: RNode): RElement|null {
-    throw new Error('Method not implemented.');
+    return null;
   }
   nextSibling(node: RNode): RNode|null {
     throw new Error('Method not implemented.');
diff --git a/packages/core/test/render3/perf/profile_in_browser.html b/packages/core/test/render3/perf/profile_in_browser.html
index 70d61916fec77..58c21e9e2225a 100644
--- a/packages/core/test/render3/perf/profile_in_browser.html
+++ b/packages/core/test/render3/perf/profile_in_browser.html
@@ -1,18 +1,25 @@
 <html>
-  <script>
-   let BASE = location.toString().split('packages/core/test/render3/perf')[0]
-   let BENCHMARK = location.search.split('=')[1];
-   document.writeln('<' + 'script src="' + BASE + '/dist/bin/packages/core/test/render3/perf/' + BENCHMARK + '.min_debug.js"></' + 'script>');
-  </script>
-  <body>
-    <ol>
-      <li>Build the benchmark using <tt>yarn bazel build //packages/core/test/render3/perf:${BENCHMARK}.min_debug.js --config=ivy</tt></li>
-      <li>Open this file using the <tt>file://</tt> protocol and add <tt>?benchmark=BENCHMARK</tt> to the URL.</li>
-      <li>
-        Note: You should likely run this in an incognito browser with the "no-turbo-inlining" flag.<br />
-        On Chrome, the command would be <code>/Applications/Google\ Chrome.app/Contents/MacOS/Google\ Chrome -incognito --js-flags="--no-turbo-inlining"</code>
-      </li>
-      <li>Open debug console for details. Benchmark profiles are available in the "JavaScript Profiler" tab of Chrome DevTools.</li>
-    </ol>
-  </body>
+<script>
+  let BASE = location.toString().split('packages/core/test/render3/perf')[0]
+  let BENCHMARK = location.search.split('=')[1];
+  document.writeln('<' + 'script src="' + BASE + '/dist/bin/packages/core/test/render3/perf/' + BENCHMARK +
+    '_lib.min_debug.js"></' + 'script>');
+
+</script>
+
+<body>
+  <ol>
+    <li>Build the benchmark using <tt>yarn bazel build //packages/core/test/render3/perf:${BENCHMARK}.min_debug.js
+        --config=ivy</tt></li>
+    <li>Open this file using the <tt>file://</tt> protocol and add <tt>?benchmark=BENCHMARK</tt> to the URL.</li>
+    <li>
+      Note: You should likely run this in an incognito browser with the "no-turbo-inlining" flag.<br />
+      On Chrome, the command would be <code>/Applications/Google\ Chrome.app/Contents/MacOS/Google\ Chrome -incognito
+        --js-flags="--no-turbo-inlining"</code>
+    </li>
+    <li>Open debug console for details. Benchmark profiles are available in the "JavaScript Profiler" tab of Chrome
+      DevTools.</li>
+  </ol>
+</body>
+
 </html>
diff --git a/packages/core/test/render3/perf/setup.ts b/packages/core/test/render3/perf/setup.ts
index 3e2e88b822c1c..60043f1a2f62c 100644
--- a/packages/core/test/render3/perf/setup.ts
+++ b/packages/core/test/render3/perf/setup.ts
@@ -7,7 +7,7 @@
  */
 import {addToViewTree, createLContainer, createLView, createTNode, createTView, getOrCreateTNode, refreshView, renderView} from '../../../src/render3/instructions/shared';
 import {ComponentTemplate, DirectiveDefList} from '../../../src/render3/interfaces/definition';
-import {TAttributes, TNodeType, TViewNode} from '../../../src/render3/interfaces/node';
+import {TAttributes, TElementNode, TNodeType} from '../../../src/render3/interfaces/node';
 import {domRendererFactory3, RendererFactory3} from '../../../src/render3/interfaces/renderer';
 import {LView, LViewFlags, TVIEW, TView, TViewType} from '../../../src/render3/interfaces/view';
 import {insertView} from '../../../src/render3/node_manipulation';
@@ -20,9 +20,10 @@ const rendererFactory: RendererFactory3 =
 const renderer = rendererFactory.createRenderer(null, null);
 
 export function createAndRenderLView(
-    parentLView: LView, tView: TView, hostTNode: TViewNode): LView {
+    parentLView: LView, tView: TView, hostTNode: TElementNode): LView {
   const embeddedLView = createLView(
-      parentLView, tView, {}, LViewFlags.CheckAlways, null, hostTNode, rendererFactory, renderer);
+      parentLView, tView, {}, LViewFlags.CheckAlways, null, hostTNode, rendererFactory, renderer,
+      null, null);
   renderView(tView, embeddedLView, null);
   return embeddedLView;
 }
@@ -49,12 +50,12 @@ export function setupTestHarness(
     embeddedViewContext: any = {}, consts: TAttributes[]|null = null,
     directiveRegistry: DirectiveDefList|null = null): TestHarness {
   // Create a root view with a container
-  const hostTView = createTView(TViewType.Root, -1, null, 1, 0, null, null, null, null, consts);
-  const tContainerNode = getOrCreateTNode(hostTView, null, 0, TNodeType.Container, null, null);
+  const hostTView = createTView(TViewType.Root, null, null, 1, 0, null, null, null, null, consts);
+  const tContainerNode = getOrCreateTNode(hostTView, 0, TNodeType.Container, null, null);
   const hostNode = renderer.createElement('div');
   const hostLView = createLView(
       null, hostTView, {}, LViewFlags.CheckAlways | LViewFlags.IsRoot, hostNode, null,
-      rendererFactory, renderer);
+      rendererFactory, renderer, null, null);
   const mockRCommentNode = renderer.createComment('');
   const lContainer =
       createLContainer(mockRCommentNode, hostLView, mockRCommentNode, tContainerNode);
@@ -63,13 +64,14 @@ export function setupTestHarness(
 
   // create test embedded views
   const embeddedTView = createTView(
-      TViewType.Embedded, -1, templateFn, decls, vars, directiveRegistry, null, null, null, consts);
-  const viewTNode = createTNode(hostTView, null, TNodeType.View, -1, null, null) as TViewNode;
+      TViewType.Embedded, null, templateFn, decls, vars, directiveRegistry, null, null, null,
+      consts);
+  const viewTNode = createTNode(hostTView, null, TNodeType.Element, -1, null, null);
 
   function createEmbeddedLView(): LView {
     const embeddedLView = createLView(
         hostLView, embeddedTView, embeddedViewContext, LViewFlags.CheckAlways, null, viewTNode,
-        rendererFactory, renderer);
+        rendererFactory, renderer, null, null);
     renderView(embeddedTView, embeddedLView, embeddedViewContext);
     return embeddedLView;
   }
diff --git a/packages/core/test/render3/perf/view_destroy_hook/index.ts b/packages/core/test/render3/perf/view_destroy_hook/index.ts
index fb84ea4831a32..e96c76f9c0244 100644
--- a/packages/core/test/render3/perf/view_destroy_hook/index.ts
+++ b/packages/core/test/render3/perf/view_destroy_hook/index.ts
@@ -6,12 +6,12 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import {OnDestroy} from '@angular/core';
-import {LViewFlags, TViewType} from '@angular/core/src/render3/interfaces/view';
 
 import {ɵɵdefineDirective, ɵɵelement, ɵɵelementEnd, ɵɵelementStart} from '../../../../src/render3/index';
 import {createLView, createTNode, createTView} from '../../../../src/render3/instructions/shared';
 import {RenderFlags} from '../../../../src/render3/interfaces/definition';
-import {TNodeType, TViewNode} from '../../../../src/render3/interfaces/node';
+import {TNodeType} from '../../../../src/render3/interfaces/node';
+import {LViewFlags, TViewType} from '../../../../src/render3/interfaces/view';
 import {destroyLView} from '../../../../src/render3/node_manipulation';
 import {createBenchmark} from '../micro_bench';
 import {createAndRenderLView} from '../setup';
@@ -52,12 +52,12 @@ function testTemplate(rf: RenderFlags, ctx: any) {
 }
 
 const rootLView = createLView(
-    null, createTView(TViewType.Root, -1, null, 0, 0, null, null, null, null, null), {},
-    LViewFlags.IsRoot, null, null);
+    null, createTView(TViewType.Root, null, null, 0, 0, null, null, null, null, null), {},
+    LViewFlags.IsRoot, null, null, null, null, null, null);
 
-const viewTNode = createTNode(null!, null, TNodeType.View, -1, null, null) as TViewNode;
+const viewTNode = createTNode(null!, null, TNodeType.Element, -1, null, null);
 const embeddedTView = createTView(
-    TViewType.Embedded, -1, testTemplate, 21, 10, [ToDestroy.ɵdir], null, null, null,
+    TViewType.Embedded, null, testTemplate, 21, 10, [ToDestroy.ɵdir], null, null, null,
     [['to-destroy']]);
 
 // create view once so we don't profile the first create pass
diff --git a/packages/core/test/render3/pipe_spec.ts b/packages/core/test/render3/pipe_spec.ts
index 55c4290f362e0..4cf1f8e8417f6 100644
--- a/packages/core/test/render3/pipe_spec.ts
+++ b/packages/core/test/render3/pipe_spec.ts
@@ -52,14 +52,24 @@ describe('pipe', () => {
     }
 
     it('should unwrap', () => {
-      const fixture =
-          new TemplateFixture(createTemplate, updateTemplate, 2, 3, undefined, [WrappingPipe]);
+      const fixture = new TemplateFixture({
+        create: createTemplate,
+        update: updateTemplate,
+        decls: 2,
+        vars: 3,
+        pipes: [WrappingPipe]
+      });
       expect(fixture.html).toEqual('Bar');
     });
 
     it('should force change detection', () => {
-      const fixture =
-          new TemplateFixture(createTemplate, updateTemplate, 2, 3, undefined, [WrappingPipe]);
+      const fixture = new TemplateFixture({
+        create: createTemplate,
+        update: updateTemplate,
+        decls: 2,
+        vars: 3,
+        pipes: [WrappingPipe]
+      });
       expect(fixture.html).toEqual('Bar');
 
       fixture.hostElement.childNodes[0]!.textContent = 'Foo';
@@ -101,15 +111,18 @@ describe('pipe', () => {
       static ɵpipe = ɵɵdefinePipe({name: 'sayHello', type: SayHelloPipe, pure: true});
     }
 
-    const fixture = new TemplateFixture(
-        () => {
-          ɵɵtext(0);
-          ɵɵpipe(1, 'sayHello');
-        },
-        () => {
-          ɵɵtextInterpolate1('', ɵɵpipeBind1(1, 1, null), '');
-        },
-        2, 3, undefined, [SayHelloPipe]);
+    const fixture = new TemplateFixture({
+      create: () => {
+        ɵɵtext(0);
+        ɵɵpipe(1, 'sayHello');
+      },
+      update: () => {
+        ɵɵtextInterpolate1('', ɵɵpipeBind1(1, 1, null), '');
+      },
+      decls: 2,
+      vars: 3,
+      pipes: [SayHelloPipe]
+    });
 
     expect(fixture.html).toBe('Hello there');
   });
diff --git a/packages/core/test/render3/providers_spec.ts b/packages/core/test/render3/providers_spec.ts
index e41a689833803..b75bf504ab374 100644
--- a/packages/core/test/render3/providers_spec.ts
+++ b/packages/core/test/render3/providers_spec.ts
@@ -1290,13 +1290,6 @@ describe('providers', () => {
     function addFoo() {
       return (constructor: Type<any>): any => {
         const decoratedClass = class Extender extends constructor { foo = 'bar'; };
-
-        // On IE10 child classes don't inherit static properties by default. If we detect
-        // such a case, try to account for it so the tests are consistent between browsers.
-        if (Object.getPrototypeOf(decoratedClass) !== constructor) {
-          decoratedClass.prototype = constructor.prototype;
-        }
-
         return decoratedClass;
       };
     }
diff --git a/packages/core/test/render3/query_spec.ts b/packages/core/test/render3/query_spec.ts
index 4b8cca9ca7abe..586f29ce25ea2 100644
--- a/packages/core/test/render3/query_spec.ts
+++ b/packages/core/test/render3/query_spec.ts
@@ -7,6 +7,7 @@
  */
 
 import {ElementRef, QueryList, TemplateRef, ViewContainerRef} from '@angular/core';
+import {HEADER_OFFSET} from '@angular/core/src/render3/interfaces/view';
 
 import {AttributeMarker, ɵɵdefineComponent, ɵɵdefineDirective, ɵɵProvidersFeature} from '../../src/render3/index';
 import {ɵɵdirectiveInject, ɵɵelement, ɵɵelementContainerEnd, ɵɵelementContainerStart, ɵɵelementEnd, ɵɵelementStart, ɵɵtemplate, ɵɵtext} from '../../src/render3/instructions/all';
@@ -72,8 +73,8 @@ describe('query', () => {
             ɵɵelementEnd();
           }
           if (rf & RenderFlags.Update) {
-            child1 = getDirectiveOnNode(0);
-            child2 = getDirectiveOnNode(1);
+            child1 = getDirectiveOnNode(HEADER_OFFSET);
+            child2 = getDirectiveOnNode(HEADER_OFFSET + 1);
           }
         },
         2, 0, [Child], [],
@@ -112,7 +113,7 @@ describe('query', () => {
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
                 ɵɵelement(0, 'div', 0);
-                elToQuery = getNativeByIndex(0, getLView());
+                elToQuery = getNativeByIndex(HEADER_OFFSET, getLView());
               }
             },
             1, 0, [Child], [],
@@ -150,7 +151,7 @@ describe('query', () => {
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
                 ɵɵelementStart(0, 'div', 0);
-                { otherChildInstance = getDirectiveOnNode(0, 1); }
+                { otherChildInstance = getDirectiveOnNode(HEADER_OFFSET, 1); }
                 ɵɵelementEnd();
               }
             },
@@ -345,7 +346,7 @@ describe('query', () => {
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
                 ɵɵelement(0, 'div', null, 0);
-                elToQuery = getNativeByIndex(0, getLView());
+                elToQuery = getNativeByIndex(HEADER_OFFSET, getLView());
                 ɵɵelement(2, 'div');
               }
             },
@@ -384,7 +385,7 @@ describe('query', () => {
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
                 ɵɵelement(0, 'div', null, 0);
-                elToQuery = getNativeByIndex(0, getLView());
+                elToQuery = getNativeByIndex(HEADER_OFFSET, getLView());
                 ɵɵelement(3, 'div');
               }
             },
@@ -431,10 +432,10 @@ describe('query', () => {
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
                 ɵɵelement(0, 'div', null, 0);
-                el1ToQuery = getNativeByIndex(0, getLView());
+                el1ToQuery = getNativeByIndex(HEADER_OFFSET, getLView());
                 ɵɵelement(2, 'div');
                 ɵɵelement(3, 'div', null, 1);
-                el2ToQuery = getNativeByIndex(3, getLView());
+                el2ToQuery = getNativeByIndex(HEADER_OFFSET + 3, getLView());
               }
             },
             5, 0, [], [],
@@ -471,7 +472,7 @@ describe('query', () => {
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
                 ɵɵelement(0, 'div', null, 0);
-                elToQuery = getNativeByIndex(0, getLView());
+                elToQuery = getNativeByIndex(HEADER_OFFSET, getLView());
                 ɵɵelement(2, 'div');
               }
             },
@@ -509,7 +510,7 @@ describe('query', () => {
                function(rf: RenderFlags, ctx: any) {
                  if (rf & RenderFlags.Create) {
                    ɵɵelementContainerStart(0, null, 0);
-                   elToQuery = getNativeByIndex(0, getLView());
+                   elToQuery = getNativeByIndex(HEADER_OFFSET, getLView());
                    ɵɵelementContainerEnd();
                  }
                },
@@ -546,7 +547,7 @@ describe('query', () => {
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
                 ɵɵelementContainerStart(0, null, 0);
-                elToQuery = getNativeByIndex(0, getLView());
+                elToQuery = getNativeByIndex(HEADER_OFFSET, getLView());
                 ɵɵelementContainerEnd();
               }
             },
@@ -756,7 +757,7 @@ describe('query', () => {
                 ɵɵelement(0, 'child', null, 0);
               }
               if (rf & RenderFlags.Update) {
-                childInstance = getDirectiveOnNode(0);
+                childInstance = getDirectiveOnNode(HEADER_OFFSET);
               }
             },
             2, 0, [Child], [],
@@ -843,7 +844,7 @@ describe('query', () => {
                    ɵɵelement(0, 'div', 0, 1);
                  }
                  if (rf & RenderFlags.Update) {
-                   childInstance = getDirectiveOnNode(0);
+                   childInstance = getDirectiveOnNode(HEADER_OFFSET);
                  }
                },
                2, 0, [Child], [],
@@ -883,8 +884,8 @@ describe('query', () => {
                 ɵɵelement(0, 'div', 0, 1);
               }
               if (rf & RenderFlags.Update) {
-                child1Instance = getDirectiveOnNode(0, 0);
-                child2Instance = getDirectiveOnNode(0, 1);
+                child1Instance = getDirectiveOnNode(HEADER_OFFSET, 0);
+                child2Instance = getDirectiveOnNode(HEADER_OFFSET, 1);
               }
             },
             3, 0, [Child1, Child2], [],
@@ -925,7 +926,7 @@ describe('query', () => {
                 ɵɵelement(0, 'div', 0, 1);
               }
               if (rf & RenderFlags.Update) {
-                childInstance = getDirectiveOnNode(0);
+                childInstance = getDirectiveOnNode(HEADER_OFFSET);
               }
             },
             3, 0, [Child], [],
@@ -970,7 +971,7 @@ describe('query', () => {
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
                 ɵɵelement(0, 'div', 0, 1);
-                div = getNativeByIndex(0, getLView());
+                div = getNativeByIndex(HEADER_OFFSET, getLView());
               }
             },
             2, 0, [Child], [],
@@ -1007,10 +1008,10 @@ describe('query', () => {
             function(rf: RenderFlags, ctx: any) {
               if (rf & RenderFlags.Create) {
                 ɵɵelement(0, 'div', 0, 1);
-                div = getNativeByIndex(0, getLView());
+                div = getNativeByIndex(HEADER_OFFSET, getLView());
               }
               if (rf & RenderFlags.Update) {
-                childInstance = getDirectiveOnNode(0);
+                childInstance = getDirectiveOnNode(HEADER_OFFSET);
               }
             },
             3, 0, [Child], [],
@@ -1570,8 +1571,8 @@ describe('query', () => {
             }
             if (rf & RenderFlags.Update) {
               const lView = getLView();
-              outInstance = load<QueryDirective>(lView, 1);
-              inInstance = load<QueryDirective>(lView, 5);
+              outInstance = load<QueryDirective>(lView, HEADER_OFFSET + 1);
+              inInstance = load<QueryDirective>(lView, HEADER_OFFSET + 5);
             }
           },
           10, 0, [QueryDirective], [], null, [], [], undefined, [
@@ -1632,8 +1633,8 @@ describe('query', () => {
             }
             if (rf & RenderFlags.Update) {
               const lView = getLView();
-              outInstance = load<QueryDirective>(lView, 1);
-              inInstance = load<QueryDirective>(lView, 3);
+              outInstance = load<QueryDirective>(lView, HEADER_OFFSET + 1);
+              inInstance = load<QueryDirective>(lView, HEADER_OFFSET + 3);
             }
           },
           7, 0, [QueryDirective], [], null, [], [], undefined, [
@@ -1692,8 +1693,8 @@ describe('query', () => {
             }
             if (rf & RenderFlags.Update) {
               const lView = getLView();
-              outInstance = load<QueryDirective>(lView, 1);
-              inInstance = load<QueryDirective>(lView, 3);
+              outInstance = load<QueryDirective>(lView, HEADER_OFFSET + 1);
+              inInstance = load<QueryDirective>(lView, HEADER_OFFSET + 3);
             }
           },
           7, 0, [QueryDirective], [], null, [], [], undefined, [
@@ -1783,8 +1784,8 @@ describe('query', () => {
                }
                if (rf & RenderFlags.Update) {
                  const lView = getLView();
-                 shallowInstance = load<ShallowQueryDirective>(lView, 1);
-                 deepInstance = load<DeepQueryDirective>(lView, 2);
+                 shallowInstance = load<ShallowQueryDirective>(lView, HEADER_OFFSET + 1);
+                 deepInstance = load<DeepQueryDirective>(lView, HEADER_OFFSET + 2);
                }
              },
              8, 0, [ShallowQueryDirective, DeepQueryDirective], [], null, [], [], undefined, [
diff --git a/packages/core/test/render3/render_util.ts b/packages/core/test/render3/render_util.ts
index 5fb27646c0696..4f44afc48b2c3 100644
--- a/packages/core/test/render3/render_util.ts
+++ b/packages/core/test/render3/render_util.ts
@@ -15,8 +15,8 @@ import {Renderer2} from '@angular/core/src/render/api';
 import {createLView, createTView, getOrCreateTComponentView, getOrCreateTNode, renderComponentOrTemplate} from '@angular/core/src/render3/instructions/shared';
 import {TConstants, TNodeType} from '@angular/core/src/render3/interfaces/node';
 import {enterView, getLView} from '@angular/core/src/render3/state';
+import {EMPTY_ARRAY} from '@angular/core/src/util/empty';
 import {stringifyElement} from '@angular/platform-browser/testing/src/browser_util';
-
 import {SWITCH_CHANGE_DETECTOR_REF_FACTORY__POST_R3__ as R3_CHANGE_DETECTOR_REF_FACTORY} from '../../src/change_detection/change_detector_ref';
 import {Injector} from '../../src/di/injector';
 import {Type} from '../../src/interface/type';
@@ -32,11 +32,10 @@ import {ComponentDef, ComponentTemplate, ComponentType, DirectiveDef, DirectiveT
 import {DirectiveDefList, DirectiveDefListOrFactory, DirectiveTypesOrFactory, HostBindingsFunction, PipeDef, PipeDefList, PipeDefListOrFactory, PipeTypesOrFactory} from '../../src/render3/interfaces/definition';
 import {PlayerHandler} from '../../src/render3/interfaces/player';
 import {domRendererFactory3, ProceduralRenderer3, RComment, RElement, Renderer3, RendererFactory3, RendererStyleFlags3, RNode, RText} from '../../src/render3/interfaces/renderer';
-import {HEADER_OFFSET, LView, LViewFlags, T_HOST, TVIEW, TViewType} from '../../src/render3/interfaces/view';
+import {HEADER_OFFSET, LView, LViewFlags, TVIEW, TViewType} from '../../src/render3/interfaces/view';
 import {destroyLView} from '../../src/render3/node_manipulation';
 import {getRootView} from '../../src/render3/util/view_traversal_utils';
 import {Sanitizer} from '../../src/sanitization/sanitizer';
-
 import {getRendererFactory2} from './imported_renderer2';
 
 
@@ -97,6 +96,10 @@ export class TemplateFixture extends BaseFixture {
   private _pipeDefs: PipeDefList|null;
   private _sanitizer: Sanitizer|null;
   private _rendererFactory: RendererFactory3;
+  private _consts: TConstants;
+  private _vars: number;
+  private createBlock: () => void;
+  private updateBlock: () => void;
 
   /**
    *
@@ -105,16 +108,36 @@ export class TemplateFixture extends BaseFixture {
    * @param updateBlock Optional instructions which go into the update block:
    *          `if (rf & RenderFlags.Update) { __here__ }`.
    */
-  constructor(
-      private createBlock: () => void, private updateBlock: () => void = noop, decls: number = 0,
-      private vars: number = 0, directives?: DirectiveTypesOrFactory|null,
-      pipes?: PipeTypesOrFactory|null, sanitizer?: Sanitizer|null,
-      rendererFactory?: RendererFactory3, private _consts?: TConstants) {
+  constructor({
+    create = noop,
+    update = noop,
+    decls = 0,
+    vars = 0,
+    directives,
+    pipes,
+    sanitizer = null,
+    rendererFactory = domRendererFactory3,
+    consts = EMPTY_ARRAY
+  }: {
+    create?: (() => void),
+    update?: (() => void),
+    decls?: number,
+    vars?: number,
+    directives?: DirectiveTypesOrFactory,
+    pipes?: PipeTypesOrFactory,
+    sanitizer?: Sanitizer|null,
+    rendererFactory?: RendererFactory3,
+    consts?: TConstants
+  }) {
     super();
+    this._consts = consts;
+    this._vars = vars;
+    this.createBlock = create;
+    this.updateBlock = update;
     this._directiveDefs = toDefs(directives, extractDirectiveDef);
     this._pipeDefs = toDefs(pipes, extractPipeDef);
-    this._sanitizer = sanitizer || null;
-    this._rendererFactory = rendererFactory || domRendererFactory3;
+    this._sanitizer = sanitizer;
+    this._rendererFactory = rendererFactory;
     this.hostView = renderTemplate(
         this.hostElement,
         (rf: RenderFlags, ctx: any) => {
@@ -136,7 +159,7 @@ export class TemplateFixture extends BaseFixture {
    */
   update(updateBlock?: () => void): void {
     renderTemplate(
-        this.hostElement, updateBlock || this.updateBlock, 0, this.vars, null!,
+        this.hostElement, updateBlock || this.updateBlock, 0, this._vars, null!,
         this._rendererFactory, this.hostView, this._directiveDefs, this._pipeDefs, this._sanitizer,
         this._consts);
   }
@@ -236,7 +259,7 @@ export function resetDOM() {
   containerEl.setAttribute('host', '');
   document.body.appendChild(containerEl);
   hostView = null;
-  // TODO: assert that the global state is clean (e.g. ngData, previousOrParentNode, etc)
+  // TODO: assert that the global state is clean (e.g. ngData, currentTNode, etc)
 }
 
 
@@ -261,11 +284,11 @@ export function renderTemplate<T>(
     const renderer = providedRendererFactory.createRenderer(null, null);
 
     // We need to create a root view so it's possible to look up the host element through its index
-    const tView = createTView(TViewType.Root, -1, null, 1, 0, null, null, null, null, null);
+    const tView = createTView(TViewType.Root, null, null, 1, 0, null, null, null, null, null);
     const hostLView = createLView(
         null, tView, {}, LViewFlags.CheckAlways | LViewFlags.IsRoot, null, null,
-        providedRendererFactory, renderer);
-    enterView(hostLView, null);
+        providedRendererFactory, renderer, null, null);
+    enterView(hostLView);
 
     const def: ComponentDef<any> = ɵɵdefineComponent({
       type: Object,
@@ -278,11 +301,11 @@ export function renderTemplate<T>(
     def.pipeDefs = pipes || null;
 
     const componentTView = getOrCreateTComponentView(def);
-    const hostTNode = getOrCreateTNode(tView, hostLView[T_HOST], 0, TNodeType.Element, null, null);
+    const hostTNode = getOrCreateTNode(tView, 0, TNodeType.Element, null, null);
     hostLView[hostTNode.index] = hostNode;
     componentView = createLView(
         hostLView, componentTView, context, LViewFlags.CheckAlways, hostNode, hostTNode,
-        providedRendererFactory, renderer, sanitizer);
+        providedRendererFactory, renderer, sanitizer || null, null);
   }
   renderComponentOrTemplate(componentView[TVIEW], componentView, templateFn, context);
   return componentView;
@@ -409,7 +432,7 @@ export function createDirective(
 
 /** Gets the directive on the given node at the given index */
 export function getDirectiveOnNode(nodeIndex: number, dirIndex: number = 0) {
-  const directives = getDirectivesAtNodeIndex(nodeIndex + HEADER_OFFSET, getLView(), true);
+  const directives = getDirectivesAtNodeIndex(nodeIndex, getLView(), true);
   if (directives == null) {
     throw new Error(`No directives exist on node in slot ${nodeIndex}`);
   }
diff --git a/packages/core/test/render3/styling_next/static_styling_spec.ts b/packages/core/test/render3/styling_next/static_styling_spec.ts
index ddc0ea786cbec..1596e96db6933 100644
--- a/packages/core/test/render3/styling_next/static_styling_spec.ts
+++ b/packages/core/test/render3/styling_next/static_styling_spec.ts
@@ -16,7 +16,7 @@ describe('static styling', () => {
   const mockFirstCreatePassLView: LView = [null, {firstCreatePass: true}] as any;
   let tNode!: TNode;
   beforeEach(() => {
-    enterView(mockFirstCreatePassLView, null);
+    enterView(mockFirstCreatePassLView);
     tNode = createTNode(null!, null!, TNodeType.Element, 0, '', null);
   });
   it('should initialize when no attrs', () => {
diff --git a/packages/core/test/render3/styling_next/style_binding_list_spec.ts b/packages/core/test/render3/styling_next/style_binding_list_spec.ts
index b3f3c87033509..6454bd432c1c7 100644
--- a/packages/core/test/render3/styling_next/style_binding_list_spec.ts
+++ b/packages/core/test/render3/styling_next/style_binding_list_spec.ts
@@ -16,7 +16,7 @@ import {newArray} from '@angular/core/src/util/array_utils';
 
 describe('TNode styling linked list', () => {
   const mockFirstUpdatePassLView: LView = [null, {firstUpdatePass: true}] as any;
-  beforeEach(() => enterView(mockFirstUpdatePassLView, null));
+  beforeEach(() => enterView(mockFirstUpdatePassLView));
   afterEach(() => leaveView());
   describe('insertTStylingBinding', () => {
     it('should append template only', () => {
diff --git a/packages/core/test/render3/utils.ts b/packages/core/test/render3/utils.ts
index 988b54b1963e6..6759422c0b1b7 100644
--- a/packages/core/test/render3/utils.ts
+++ b/packages/core/test/render3/utils.ts
@@ -7,6 +7,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+
 /** Template string function that can be used to strip indentation from a given string literal. */
 export function dedent(strings: TemplateStringsArray, ...values: any[]) {
   let joinedString = '';
@@ -51,7 +52,7 @@ function numOfWhiteSpaceLeadingChars(text: string): number {
  *
  * ```
  * expect(obj).toEqual({
- *   create: debugMatch('someValue')
+ *   create: matchDebug('someValue')
  * })
  * ```
  *
@@ -59,15 +60,54 @@ function numOfWhiteSpaceLeadingChars(text: string): number {
  *
  * @param expected Expected value.
  */
-export function debugMatch<T>(expected: T): any {
+export function matchDebug<T>(expected: T): any {
   const matcher = function() {};
-  let actual: any = null;
+  let actual: any = matchDebug;
 
   matcher.asymmetricMatch = function(objectWithDebug: any) {
     return jasmine.matchersUtil.equals(actual = objectWithDebug.debug, expected);
   };
   matcher.jasmineToString = function() {
-    return `<${JSON.stringify(actual)} != ${JSON.stringify(expected)}>`;
+    if (actual === matchDebug) {
+      // `asymmetricMatch` never got called hence no error to display
+      return '';
+    }
+    return buildFailureMessage(actual, expected);
   };
   return matcher;
 }
+
+export function buildFailureMessage(actual: any, expected: any): string {
+  const diffs: string[] = [];
+  listPropertyDifferences(diffs, '', actual, expected, 5);
+  return '\n  ' + diffs.join('\n  ');
+}
+
+function listPropertyDifferences(
+    diffs: string[], path: string, actual: any, expected: any, depth: number) {
+  if (actual === expected) return;
+  if (typeof actual !== typeof expected) {
+    diffs.push(`${path}: Expected ${jasmine.pp(actual)} to be ${jasmine.pp(expected)}`);
+  } else if (depth && Array.isArray(expected)) {
+    if (!Array.isArray(actual)) {
+      diffs.push(`${path}: Expected ${jasmine.pp(expected)} but was ${jasmine.pp(actual)}`);
+    } else {
+      const maxLength = Math.max(actual.length, expected.length);
+      listPropertyDifferences(diffs, path + '.length', expected.length, actual.length, depth - 1);
+      for (let i = 0; i < maxLength; i++) {
+        const actualItem = actual[i];
+        const expectedItem = expected[i];
+        listPropertyDifferences(diffs, path + '[' + i + ']', actualItem, expectedItem, depth - 1);
+      }
+    }
+  } else if (
+      depth && expected && typeof expected === 'object' && actual && typeof actual === 'object') {
+    new Set(Object.keys(expected).concat(Object.keys(actual))).forEach((key) => {
+      const actualItem = actual[key];
+      const expectedItem = expected[key];
+      listPropertyDifferences(diffs, path + '.' + key, actualItem, expectedItem, depth - 1);
+    });
+  } else {
+    diffs.push(`${path}: Expected ${jasmine.pp(actual)} to be ${jasmine.pp(expected)}`);
+  }
+}
diff --git a/packages/core/test/render3/view_container_ref_spec.ts b/packages/core/test/render3/view_container_ref_spec.ts
index 3dc159923b5d0..96f0415814209 100644
--- a/packages/core/test/render3/view_container_ref_spec.ts
+++ b/packages/core/test/render3/view_container_ref_spec.ts
@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {HEADER_OFFSET} from '@angular/core/src/render3/interfaces/view';
 import {ChangeDetectorRef, Component as _Component, ComponentFactoryResolver, ElementRef, QueryList, TemplateRef, ViewContainerRef, ViewRef} from '../../src/core';
 import {ViewEncapsulation} from '../../src/metadata';
 import {injectComponentFactoryResolver, ɵɵdefineComponent, ɵɵdefineDirective, ɵɵlistener, ɵɵloadQuery, ɵɵqueryRefresh, ɵɵviewQuery} from '../../src/render3/index';
@@ -14,9 +15,9 @@ import {RenderFlags} from '../../src/render3/interfaces/definition';
 import {RElement} from '../../src/render3/interfaces/renderer';
 import {getLView} from '../../src/render3/state';
 import {getNativeByIndex} from '../../src/render3/util/view_utils';
-
 import {ComponentFixture, createComponent, TemplateFixture} from './render_util';
 
+
 const Component: typeof _Component = function(...args: any[]): any {
   // In test we use @Component for documentation only so it's safe to mock out the implementation.
   return () => undefined;
@@ -232,9 +233,12 @@ describe('ViewContainerRef', () => {
           ɵɵelement(1, 'footer');
         }
 
-        new TemplateFixture(
-            createTemplate, undefined, 2, 0, [DirectiveWithVCRef], null, null, undefined,
-            [['vcref', '']]);
+        new TemplateFixture({
+          create: createTemplate,
+          decls: 2,
+          directives: [DirectiveWithVCRef],
+          consts: [['vcref', '']]
+        });
 
         expect(directiveInstance!.vcref.element.nativeElement.tagName.toLowerCase())
             .toEqual('header');
@@ -253,9 +257,12 @@ describe('ViewContainerRef', () => {
           ɵɵelement(1, 'footer');
         }
 
-        new TemplateFixture(
-            createTemplate, undefined, 2, 0, [HeaderComponent, DirectiveWithVCRef], null, null,
-            undefined, [['vcref', '']]);
+        new TemplateFixture({
+          create: createTemplate,
+          decls: 2,
+          directives: [HeaderComponent, DirectiveWithVCRef],
+          consts: [['vcref', '']]
+        });
 
         expect(directiveInstance!.vcref.element.nativeElement.tagName.toLowerCase())
             .toEqual('header-cmp');
@@ -356,7 +363,7 @@ describe('ViewContainerRef', () => {
                   ɵɵelement(0, 'div', 1, 0);
                 }
                 // testing only
-                fooEl = getNativeByIndex(0, getLView()) as RElement;
+                fooEl = getNativeByIndex(HEADER_OFFSET, getLView()) as RElement;
               },
           viewQuery:
               function(rf: RenderFlags, ctx: any) {
@@ -430,10 +437,10 @@ describe('ViewContainerRef', () => {
       fixture.update();
 
       // Destroying the parent view will also destroy all of its children views and call their
-      // onDestroy hooks. Here, our child view attempts to destroy itself *again* in its onDestroy.
-      // This test exists to verify that no errors are thrown when doing this. We want the test
-      // component to destroy its own view in onDestroy because the destroy hooks happen as a
-      // *part of* view destruction. We also ensure that the test component has at least one
+      // onDestroy hooks. Here, our child view attempts to destroy itself *again* in its
+      // onDestroy. This test exists to verify that no errors are thrown when doing this. We want
+      // the test component to destroy its own view in onDestroy because the destroy hooks happen
+      // as a *part of* view destruction. We also ensure that the test component has at least one
       // listener so that it runs the event listener cleanup code path.
       fixture.destroy();
     });
diff --git a/packages/core/test/render3/view_fixture.ts b/packages/core/test/render3/view_fixture.ts
new file mode 100644
index 0000000000000..f330e3f76c828
--- /dev/null
+++ b/packages/core/test/render3/view_fixture.ts
@@ -0,0 +1,84 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {ComponentTemplate} from '@angular/core/src/render3';
+import {createLView, createTNode, createTView} from '@angular/core/src/render3/instructions/shared';
+import {TConstants, TElementNode, TNodeType} from '@angular/core/src/render3/interfaces/node';
+import {domRendererFactory3} from '@angular/core/src/render3/interfaces/renderer';
+import {LView, LViewFlags, T_HOST, TView, TViewType} from '@angular/core/src/render3/interfaces/view';
+import {enterView, leaveView, specOnlyIsInstructionStateEmpty} from '@angular/core/src/render3/state';
+import {noop} from '@angular/core/src/util/noop';
+
+/**
+ * Fixture useful for testing operations which need `LView` / `TView`
+ */
+export class ViewFixture {
+  /**
+   * Clean up the `LFrame` stack between tests.
+   */
+  static cleanUp() {
+    while (!specOnlyIsInstructionStateEmpty()) {
+      leaveView();
+    }
+  }
+
+  /**
+   * DOM element which acts as a host to the `LView`.
+   */
+  host: HTMLElement;
+
+  tView: TView;
+
+  lView: LView;
+
+  constructor({template, decls, vars, consts, context}: {
+    decls?: number,
+    vars?: number,
+    template?: ComponentTemplate<any>,
+    consts?: TConstants,
+    context?: {}
+  } = {}) {
+    const hostRenderer = domRendererFactory3.createRenderer(null, null);
+    this.host = hostRenderer.createElement('host-element') as HTMLElement;
+    const hostTView = createTView(TViewType.Root, null, null, 1, 0, null, null, null, null, null);
+    const hostLView = createLView(
+        null, hostTView, {}, LViewFlags.CheckAlways | LViewFlags.IsRoot, null, null,
+        domRendererFactory3, hostRenderer, null, null);
+
+
+    this.tView = createTView(
+        TViewType.Component, null, template || noop, decls || 0, vars || 0, null, null, null, null,
+        consts || null);
+    const hostTNode =
+        createTNode(hostTView, null, TNodeType.Element, 0, 'host-element', null) as TElementNode;
+    this.lView = createLView(
+        hostLView, this.tView, context || {}, LViewFlags.CheckAlways, this.host, hostTNode,
+        domRendererFactory3, hostRenderer, null, null);
+  }
+
+  /**
+   * If you use `ViewFixture` and `enter()`, please add `afterEach(ViewFixture.cleanup);` to ensure
+   * that he global `LFrame` stack gets cleaned up between the tests.
+   */
+  enterView() {
+    enterView(this.lView);
+  }
+
+  leaveView() {
+    leaveView();
+  }
+
+  apply(fn: () => void) {
+    this.enterView();
+    try {
+      fn();
+    } finally {
+      this.leaveView();
+    }
+  }
+}
\ No newline at end of file
diff --git a/packages/core/test/render3/view_utils_spec.ts b/packages/core/test/render3/view_utils_spec.ts
index a7abf74d7888f..f5d38a0adf04c 100644
--- a/packages/core/test/render3/view_utils_spec.ts
+++ b/packages/core/test/render3/view_utils_spec.ts
@@ -6,22 +6,21 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {createLContainer, createLView, createTNode, createTView} from '@angular/core/src/render3/instructions/shared';
+import {createLContainer, createTNode} from '@angular/core/src/render3/instructions/shared';
 import {isLContainer, isLView} from '@angular/core/src/render3/interfaces/type_checks';
-import {TViewType} from '@angular/core/src/render3/interfaces/view';
+import {ViewFixture} from './view_fixture';
 
 describe('view_utils', () => {
-  it('should verify unwrap methods', () => {
-    const div = document.createElement('div');
-    const tView = createTView(TViewType.Root, 0, null, 0, 0, null, null, null, null, null);
-    const lView = createLView(null, tView, {}, 0, div, null, {} as any, {} as any, null, null);
+  it('should verify unwrap methods (isLView and isLContainer)', () => {
+    const viewFixture = new ViewFixture();
     const tNode = createTNode(null!, null, 3, 0, 'div', []);
-    const lContainer = createLContainer(lView, lView, div, tNode);
+    const lContainer =
+        createLContainer(viewFixture.lView, viewFixture.lView, viewFixture.host, tNode);
 
-    expect(isLView(lView)).toBe(true);
+    expect(isLView(viewFixture.lView)).toBe(true);
     expect(isLView(lContainer)).toBe(false);
 
-    expect(isLContainer(lView)).toBe(false);
+    expect(isLContainer(viewFixture.lView)).toBe(false);
     expect(isLContainer(lContainer)).toBe(true);
   });
 });
diff --git a/packages/core/test/sanitization/html_sanitizer_spec.ts b/packages/core/test/sanitization/html_sanitizer_spec.ts
index dc83ca31f53d3..aae4a18421304 100644
--- a/packages/core/test/sanitization/html_sanitizer_spec.ts
+++ b/packages/core/test/sanitization/html_sanitizer_spec.ts
@@ -11,6 +11,10 @@ import {browserDetection} from '@angular/platform-browser/testing/src/browser_ut
 import {_sanitizeHtml} from '../../src/sanitization/html_sanitizer';
 import {isDOMParserAvailable} from '../../src/sanitization/inert_body';
 
+function sanitizeHtml(defaultDoc: any, unsafeHtmlInput: string): string {
+  return _sanitizeHtml(defaultDoc, unsafeHtmlInput).toString();
+}
+
 {
   describe('HTML sanitizer', () => {
     let defaultDoc: any;
@@ -29,73 +33,73 @@ import {isDOMParserAvailable} from '../../src/sanitization/inert_body';
     });
 
     it('serializes nested structures', () => {
-      expect(_sanitizeHtml(defaultDoc, '<div alt="x"><p>a</p>b<b>c<a alt="more">d</a></b>e</div>'))
+      expect(sanitizeHtml(defaultDoc, '<div alt="x"><p>a</p>b<b>c<a alt="more">d</a></b>e</div>'))
           .toEqual('<div alt="x"><p>a</p>b<b>c<a alt="more">d</a></b>e</div>');
       expect(logMsgs).toEqual([]);
     });
 
     it('serializes self closing elements', () => {
-      expect(_sanitizeHtml(defaultDoc, '<p>Hello <br> World</p>'))
+      expect(sanitizeHtml(defaultDoc, '<p>Hello <br> World</p>'))
           .toEqual('<p>Hello <br> World</p>');
     });
 
     it('supports namespaced elements', () => {
-      expect(_sanitizeHtml(defaultDoc, 'a<my:hr/><my:div>b</my:div>c')).toEqual('abc');
+      expect(sanitizeHtml(defaultDoc, 'a<my:hr/><my:div>b</my:div>c')).toEqual('abc');
     });
 
     it('supports namespaced attributes', () => {
-      expect(_sanitizeHtml(defaultDoc, '<a xlink:href="something">t</a>'))
+      expect(sanitizeHtml(defaultDoc, '<a xlink:href="something">t</a>'))
           .toEqual('<a xlink:href="something">t</a>');
-      expect(_sanitizeHtml(defaultDoc, '<a xlink:evil="something">t</a>')).toEqual('<a>t</a>');
-      expect(_sanitizeHtml(defaultDoc, '<a xlink:href="javascript:foo()">t</a>'))
+      expect(sanitizeHtml(defaultDoc, '<a xlink:evil="something">t</a>')).toEqual('<a>t</a>');
+      expect(sanitizeHtml(defaultDoc, '<a xlink:href="javascript:foo()">t</a>'))
           .toEqual('<a xlink:href="unsafe:javascript:foo()">t</a>');
     });
 
     it('supports HTML5 elements', () => {
-      expect(_sanitizeHtml(defaultDoc, '<main><summary>Works</summary></main>'))
+      expect(sanitizeHtml(defaultDoc, '<main><summary>Works</summary></main>'))
           .toEqual('<main><summary>Works</summary></main>');
     });
 
     it('supports ARIA attributes', () => {
-      expect(_sanitizeHtml(defaultDoc, '<h1 role="presentation" aria-haspopup="true">Test</h1>'))
+      expect(sanitizeHtml(defaultDoc, '<h1 role="presentation" aria-haspopup="true">Test</h1>'))
           .toEqual('<h1 role="presentation" aria-haspopup="true">Test</h1>');
-      expect(_sanitizeHtml(defaultDoc, '<i aria-label="Info">Info</i>'))
+      expect(sanitizeHtml(defaultDoc, '<i aria-label="Info">Info</i>'))
           .toEqual('<i aria-label="Info">Info</i>');
-      expect(_sanitizeHtml(defaultDoc, '<img src="pteranodon.jpg" aria-details="details">'))
+      expect(sanitizeHtml(defaultDoc, '<img src="pteranodon.jpg" aria-details="details">'))
           .toEqual('<img src="pteranodon.jpg" aria-details="details">');
     });
 
     it('sanitizes srcset attributes', () => {
-      expect(_sanitizeHtml(defaultDoc, '<img srcset="/foo.png 400px, javascript:evil() 23px">'))
+      expect(sanitizeHtml(defaultDoc, '<img srcset="/foo.png 400px, javascript:evil() 23px">'))
           .toEqual('<img srcset="/foo.png 400px, unsafe:javascript:evil() 23px">');
     });
 
     it('supports sanitizing plain text', () => {
-      expect(_sanitizeHtml(defaultDoc, 'Hello, World')).toEqual('Hello, World');
+      expect(sanitizeHtml(defaultDoc, 'Hello, World')).toEqual('Hello, World');
     });
 
     it('ignores non-element, non-attribute nodes', () => {
-      expect(_sanitizeHtml(defaultDoc, '<!-- comments? -->no.')).toEqual('no.');
-      expect(_sanitizeHtml(defaultDoc, '<?pi nodes?>no.')).toEqual('no.');
+      expect(sanitizeHtml(defaultDoc, '<!-- comments? -->no.')).toEqual('no.');
+      expect(sanitizeHtml(defaultDoc, '<?pi nodes?>no.')).toEqual('no.');
       expect(logMsgs.join('\n')).toMatch(/sanitizing HTML stripped some content/);
     });
 
     it('supports sanitizing escaped entities', () => {
-      expect(_sanitizeHtml(defaultDoc, '&#128640;')).toEqual('&#128640;');
+      expect(sanitizeHtml(defaultDoc, '&#128640;')).toEqual('&#128640;');
       expect(logMsgs).toEqual([]);
     });
 
     it('does not warn when just re-encoding text', () => {
-      expect(_sanitizeHtml(defaultDoc, '<p>Hellö Wörld</p>'))
+      expect(sanitizeHtml(defaultDoc, '<p>Hellö Wörld</p>'))
           .toEqual('<p>Hell&#246; W&#246;rld</p>');
       expect(logMsgs).toEqual([]);
     });
 
     it('escapes entities', () => {
-      expect(_sanitizeHtml(defaultDoc, '<p>Hello &lt; World</p>'))
+      expect(sanitizeHtml(defaultDoc, '<p>Hello &lt; World</p>'))
           .toEqual('<p>Hello &lt; World</p>');
-      expect(_sanitizeHtml(defaultDoc, '<p>Hello < World</p>')).toEqual('<p>Hello &lt; World</p>');
-      expect(_sanitizeHtml(defaultDoc, '<p alt="% &amp; &quot; !">Hello</p>'))
+      expect(sanitizeHtml(defaultDoc, '<p>Hello < World</p>')).toEqual('<p>Hello &lt; World</p>');
+      expect(sanitizeHtml(defaultDoc, '<p alt="% &amp; &quot; !">Hello</p>'))
           .toEqual('<p alt="% &amp; &#34; !">Hello</p>');  // NB: quote encoded as ASCII &#34;.
     });
 
@@ -110,7 +114,7 @@ import {isDOMParserAvailable} from '../../src/sanitization/inert_body';
       ];
       for (const tag of dangerousTags) {
         it(tag, () => {
-          expect(_sanitizeHtml(defaultDoc, `<${tag}>evil!</${tag}>`)).toEqual('evil!');
+          expect(sanitizeHtml(defaultDoc, `<${tag}>evil!</${tag}>`)).toEqual('evil!');
         });
       }
 
@@ -125,7 +129,7 @@ import {isDOMParserAvailable} from '../../src/sanitization/inert_body';
       ];
       for (const tag of dangerousSelfClosingTags) {
         it(tag, () => {
-          expect(_sanitizeHtml(defaultDoc, `before<${tag}>After`)).toEqual('beforeAfter');
+          expect(sanitizeHtml(defaultDoc, `before<${tag}>After`)).toEqual('beforeAfter');
         });
       }
 
@@ -136,7 +140,7 @@ import {isDOMParserAvailable} from '../../src/sanitization/inert_body';
       ];
       for (const tag of dangerousSkipContentTags) {
         it(tag, () => {
-          expect(_sanitizeHtml(defaultDoc, `<${tag}>evil!</${tag}>`)).toEqual('');
+          expect(sanitizeHtml(defaultDoc, `<${tag}>evil!</${tag}>`)).toEqual('');
         });
       }
 
@@ -144,7 +148,7 @@ import {isDOMParserAvailable} from '../../src/sanitization/inert_body';
         // `<frame>` is special, because different browsers treat it differently (e.g. remove it
         // altogether). // We just verify that (one way or another), there is no `<frame>` element
         // after sanitization.
-        expect(_sanitizeHtml(defaultDoc, `<frame>evil!</frame>`)).not.toContain('<frame>');
+        expect(sanitizeHtml(defaultDoc, `<frame>evil!</frame>`)).not.toContain('<frame>');
       });
     });
 
@@ -153,44 +157,64 @@ import {isDOMParserAvailable} from '../../src/sanitization/inert_body';
 
       for (const attr of dangerousAttrs) {
         it(`${attr}`, () => {
-          expect(_sanitizeHtml(defaultDoc, `<a ${attr}="x">evil!</a>`)).toEqual('<a>evil!</a>');
+          expect(sanitizeHtml(defaultDoc, `<a ${attr}="x">evil!</a>`)).toEqual('<a>evil!</a>');
         });
       }
     });
 
     it('ignores content of script elements', () => {
-      expect(_sanitizeHtml(defaultDoc, '<script>var foo="<p>bar</p>"</script>')).toEqual('');
-      expect(_sanitizeHtml(defaultDoc, '<script>var foo="<p>bar</p>"</script><div>hi</div>'))
+      expect(sanitizeHtml(defaultDoc, '<script>var foo="<p>bar</p>"</script>')).toEqual('');
+      expect(sanitizeHtml(defaultDoc, '<script>var foo="<p>bar</p>"</script><div>hi</div>'))
           .toEqual('<div>hi</div>');
-      expect(_sanitizeHtml(defaultDoc, '<style>\<\!-- something--\>hi</style>')).toEqual('');
+      expect(sanitizeHtml(defaultDoc, '<style>\<\!-- something--\>hi</style>')).toEqual('');
     });
 
     it('ignores content of style elements', () => {
-      expect(_sanitizeHtml(defaultDoc, '<style><!-- foobar --></style><div>hi</div>'))
+      expect(sanitizeHtml(defaultDoc, '<style><!-- foobar --></style><div>hi</div>'))
           .toEqual('<div>hi</div>');
-      expect(_sanitizeHtml(defaultDoc, '<style><!-- foobar --></style>')).toEqual('');
-      expect(_sanitizeHtml(defaultDoc, '<style>\<\!-- something--\>hi</style>')).toEqual('');
+      expect(sanitizeHtml(defaultDoc, '<style><!-- foobar --></style>')).toEqual('');
+      expect(sanitizeHtml(defaultDoc, '<style>\<\!-- something--\>hi</style>')).toEqual('');
       expect(logMsgs.join('\n')).toMatch(/sanitizing HTML stripped some content/);
     });
 
+    it('should strip unclosed iframe tag', () => {
+      expect(sanitizeHtml(defaultDoc, '<iframe>')).toEqual('');
+      expect([
+        '&lt;iframe&gt;',
+        // Double-escaped on IE
+        '&amp;lt;iframe&amp;gt;'
+      ]).toContain(sanitizeHtml(defaultDoc, '<iframe><iframe>'));
+      expect([
+        '&lt;script&gt;evil();&lt;/script&gt;',
+        // Double-escaped on IE
+        '&amp;lt;script&amp;gt;evil();&amp;lt;/script&amp;gt;'
+      ]).toContain(sanitizeHtml(defaultDoc, '<iframe><script>evil();</script>'));
+    });
+
+    it('should ignore extraneous body tags', () => {
+      expect(sanitizeHtml(defaultDoc, '</body>')).toEqual('');
+      expect(sanitizeHtml(defaultDoc, 'foo</body>bar')).toEqual('foobar');
+      expect(sanitizeHtml(defaultDoc, 'foo<body>bar')).toEqual('foobar');
+      expect(sanitizeHtml(defaultDoc, 'fo<body>ob</body>ar')).toEqual('foobar');
+    });
+
     it('should not enter an infinite loop on clobbered elements', () => {
       // Some browsers are vulnerable to clobbered elements and will throw an expected exception
       // IE and EDGE does not seems to be affected by those cases
       // Anyway what we want to test is that browsers do not enter an infinite loop which would
       // result in a timeout error for the test.
       try {
-        _sanitizeHtml(defaultDoc, '<form><input name="parentNode" /></form>');
+        sanitizeHtml(defaultDoc, '<form><input name="parentNode" /></form>');
       } catch (e) {
         // depending on the browser, we might ge an exception
       }
       try {
-        _sanitizeHtml(defaultDoc, '<form><input name="nextSibling" /></form>');
+        sanitizeHtml(defaultDoc, '<form><input name="nextSibling" /></form>');
       } catch (e) {
         // depending on the browser, we might ge an exception
       }
       try {
-        _sanitizeHtml(
-            defaultDoc, '<form><div><div><input name="nextSibling" /></div></div></form>');
+        sanitizeHtml(defaultDoc, '<form><div><div><input name="nextSibling" /></div></div></form>');
       } catch (e) {
         // depending on the browser, we might ge an exception
       }
@@ -199,7 +223,7 @@ import {isDOMParserAvailable} from '../../src/sanitization/inert_body';
     // See
     // https://github.com/cure53/DOMPurify/blob/a992d3a75031cb8bb032e5ea8399ba972bdf9a65/src/purify.js#L439-L449
     it('should not allow JavaScript execution when creating inert document', () => {
-      const output = _sanitizeHtml(defaultDoc, '<svg><g onload="window.xxx = 100"></g></svg>');
+      const output = sanitizeHtml(defaultDoc, '<svg><g onload="window.xxx = 100"></g></svg>');
       const window = defaultDoc.defaultView;
       if (window) {
         expect(window.xxx).toBe(undefined);
@@ -211,7 +235,7 @@ import {isDOMParserAvailable} from '../../src/sanitization/inert_body';
     // See https://github.com/cure53/DOMPurify/releases/tag/0.6.7
     it('should not allow JavaScript hidden in badly formed HTML to get through sanitization (Firefox bug)',
        () => {
-         expect(_sanitizeHtml(
+         expect(sanitizeHtml(
                     defaultDoc, '<svg><p><style><img src="</style><img src=x onerror=alert(1)//">'))
              .toEqual(
                  isDOMParserAvailable() ?
@@ -224,7 +248,7 @@ import {isDOMParserAvailable} from '../../src/sanitization/inert_body';
     if (browserDetection.isWebkit) {
       it('should prevent mXSS attacks', function() {
         // In Chrome Canary 62, the ideographic space character is kept as a stringified HTML entity
-        expect(_sanitizeHtml(defaultDoc, '<a href="&#x3000;javascript:alert(1)">CLICKME</a>'))
+        expect(sanitizeHtml(defaultDoc, '<a href="&#x3000;javascript:alert(1)">CLICKME</a>'))
             .toMatch(/<a href="unsafe:(&#12288;)?javascript:alert\(1\)">CLICKME<\/a>/);
       });
     }
diff --git a/packages/core/test/sanitization/sanitization_spec.ts b/packages/core/test/sanitization/sanitization_spec.ts
index 7e7dfc07e03ff..435b0514f1a31 100644
--- a/packages/core/test/sanitization/sanitization_spec.ts
+++ b/packages/core/test/sanitization/sanitization_spec.ts
@@ -20,7 +20,7 @@ function fakeLView(): LView {
 }
 
 describe('sanitization', () => {
-  beforeEach(() => enterView(fakeLView(), null));
+  beforeEach(() => enterView(fakeLView()));
   afterEach(() => leaveView());
   class Wrap {
     constructor(private value: string) {}
@@ -29,15 +29,15 @@ describe('sanitization', () => {
     }
   }
   it('should sanitize html', () => {
-    expect(ɵɵsanitizeHtml('<div></div>')).toEqual('<div></div>');
-    expect(ɵɵsanitizeHtml(new Wrap('<div></div>'))).toEqual('<div></div>');
-    expect(ɵɵsanitizeHtml('<img src="javascript:true">'))
+    expect(ɵɵsanitizeHtml('<div></div>').toString()).toEqual('<div></div>');
+    expect(ɵɵsanitizeHtml(new Wrap('<div></div>')).toString()).toEqual('<div></div>');
+    expect(ɵɵsanitizeHtml('<img src="javascript:true">').toString())
         .toEqual('<img src="unsafe:javascript:true">');
-    expect(ɵɵsanitizeHtml(new Wrap('<img src="javascript:true">')))
+    expect(ɵɵsanitizeHtml(new Wrap('<img src="javascript:true">')).toString())
         .toEqual('<img src="unsafe:javascript:true">');
     expect(() => ɵɵsanitizeHtml(bypassSanitizationTrustUrl('<img src="javascript:true">')))
         .toThrowError(/Required a safe HTML, got a URL/);
-    expect(ɵɵsanitizeHtml(bypassSanitizationTrustHtml('<img src="javascript:true">')))
+    expect(ɵɵsanitizeHtml(bypassSanitizationTrustHtml('<img src="javascript:true">')).toString())
         .toEqual('<img src="javascript:true">');
   });
 
@@ -57,7 +57,7 @@ describe('sanitization', () => {
     expect(() => ɵɵsanitizeResourceUrl('javascript:true')).toThrowError(ERROR);
     expect(() => ɵɵsanitizeResourceUrl(bypassSanitizationTrustHtml('javascript:true')))
         .toThrowError(/Required a safe ResourceURL, got a HTML/);
-    expect(ɵɵsanitizeResourceUrl(bypassSanitizationTrustResourceUrl('javascript:true')))
+    expect(ɵɵsanitizeResourceUrl(bypassSanitizationTrustResourceUrl('javascript:true')).toString())
         .toEqual('javascript:true');
   });
 
@@ -78,7 +78,7 @@ describe('sanitization', () => {
     expect(() => ɵɵsanitizeScript('true')).toThrowError(ERROR);
     expect(() => ɵɵsanitizeScript(bypassSanitizationTrustHtml('true')))
         .toThrowError(/Required a safe Script, got a HTML/);
-    expect(ɵɵsanitizeScript(bypassSanitizationTrustScript('true'))).toEqual('true');
+    expect(ɵɵsanitizeScript(bypassSanitizationTrustScript('true')).toString()).toEqual('true');
   });
 
   it('should select correct sanitizer for URL props', () => {
@@ -114,7 +114,8 @@ describe('sanitization', () => {
             bypassSanitizationTrustHtml('javascript:true'), 'iframe', 'src'))
         .toThrowError(/Required a safe ResourceURL, got a HTML/);
     expect(ɵɵsanitizeUrlOrResourceUrl(
-               bypassSanitizationTrustResourceUrl('javascript:true'), 'iframe', 'src'))
+               bypassSanitizationTrustResourceUrl('javascript:true'), 'iframe', 'src')
+               .toString())
         .toEqual('javascript:true');
   });
 
diff --git a/packages/core/test/strict_types/BUILD.bazel b/packages/core/test/strict_types/BUILD.bazel
index 3af746a341056..f18c7fbdefaec 100644
--- a/packages/core/test/strict_types/BUILD.bazel
+++ b/packages/core/test/strict_types/BUILD.bazel
@@ -1,7 +1,6 @@
 package(default_visibility = ["//visibility:private"])
 
-load("@npm_bazel_typescript//:index.bzl", "ts_config")
-load("//tools:defaults.bzl", "jasmine_node_test", "ts_library")
+load("//tools:defaults.bzl", "jasmine_node_test", "ts_config", "ts_library")
 
 ts_config(
     name = "tsconfig",
diff --git a/packages/core/test/test_bed_spec.ts b/packages/core/test/test_bed_spec.ts
index 02386f5ab1592..e1d78c0cba56b 100644
--- a/packages/core/test/test_bed_spec.ts
+++ b/packages/core/test/test_bed_spec.ts
@@ -1126,6 +1126,63 @@ describe('TestBed', () => {
              expect(SomePipe.hasOwnProperty('ɵpipe')).toBeTruthy();
            });
 
+        it('should cleanup scopes (configured via `TestBed.configureTestingModule`) between tests',
+           () => {
+             @Component({
+               selector: 'child',
+               template: 'Child comp',
+             })
+             class ChildCmp {
+             }
+
+             @Component({
+               selector: 'root',
+               template: '<child></child>',
+             })
+             class RootCmp {
+             }
+
+             // Case #1: `RootCmp` and `ChildCmp` are both included in the `declarations` field of
+             // the testing module, so `ChildCmp` is in the scope of `RootCmp`.
+             TestBed.configureTestingModule({
+               declarations: [RootCmp, ChildCmp],
+             });
+
+             let fixture = TestBed.createComponent(RootCmp);
+             fixture.detectChanges();
+
+             let childCmpInstance = fixture.debugElement.query(By.directive(ChildCmp));
+             expect(childCmpInstance.componentInstance).toBeAnInstanceOf(ChildCmp);
+             expect(fixture.nativeElement.textContent).toBe('Child comp');
+
+             TestBed.resetTestingModule();
+
+             // Case #2: the `TestBed.configureTestingModule` was not invoked, thus the `ChildCmp`
+             // should not be available in the `RootCmp` scope and no child content should be
+             // rendered.
+             fixture = TestBed.createComponent(RootCmp);
+             fixture.detectChanges();
+
+             childCmpInstance = fixture.debugElement.query(By.directive(ChildCmp));
+             expect(childCmpInstance).toBeNull();
+             expect(fixture.nativeElement.textContent).toBe('');
+
+             TestBed.resetTestingModule();
+
+             // Case #3: `ChildCmp` is included in the `declarations` field, but `RootCmp` is not,
+             // so `ChildCmp` is NOT in the scope of `RootCmp` component.
+             TestBed.configureTestingModule({
+               declarations: [ChildCmp],
+             });
+
+             fixture = TestBed.createComponent(RootCmp);
+             fixture.detectChanges();
+
+             childCmpInstance = fixture.debugElement.query(By.directive(ChildCmp));
+             expect(childCmpInstance).toBeNull();
+             expect(fixture.nativeElement.textContent).toBe('');
+           });
+
         it('should clean up overridden providers for modules that are imported more than once',
            () => {
              @Injectable()
diff --git a/packages/core/testing/src/r3_test_bed.ts b/packages/core/testing/src/r3_test_bed.ts
index 45aeae770f20b..74804de7d6851 100644
--- a/packages/core/testing/src/r3_test_bed.ts
+++ b/packages/core/testing/src/r3_test_bed.ts
@@ -327,6 +327,7 @@ export class TestBedRender3 implements TestBed {
    */
   overrideProvider(token: any, provider: {useFactory?: Function, useValue?: any, deps?: any[]}):
       void {
+    this.assertNotInstantiated('overrideProvider', 'override provider');
     this.compiler.overrideProvider(token, provider);
   }
 
diff --git a/packages/core/testing/src/r3_test_bed_compiler.ts b/packages/core/testing/src/r3_test_bed_compiler.ts
index 2fc853801a52d..6c0c1f6feffce 100644
--- a/packages/core/testing/src/r3_test_bed_compiler.ts
+++ b/packages/core/testing/src/r3_test_bed_compiler.ts
@@ -379,6 +379,11 @@ export class R3TestBedCompiler {
       const moduleScope = getScopeOfModule(moduleType);
       this.storeFieldOfDefOnType(componentType, NG_COMP_DEF, 'directiveDefs');
       this.storeFieldOfDefOnType(componentType, NG_COMP_DEF, 'pipeDefs');
+      // `tView` that is stored on component def contains information about directives and pipes
+      // that are in the scope of this component. Patching component scope will cause `tView` to be
+      // changed. Store original `tView` before patching scope, so the `tView` (including scope
+      // information) is restored back to its previous/original state before running next test.
+      this.storeFieldOfDefOnType(componentType, NG_COMP_DEF, 'tView');
       patchComponentDefWithScope((componentType as any).ɵcmp, moduleScope);
     });
 
diff --git a/packages/core/testing/src/test_bed.ts b/packages/core/testing/src/test_bed.ts
index 7811c8947f0b9..5a40de6703031 100644
--- a/packages/core/testing/src/test_bed.ts
+++ b/packages/core/testing/src/test_bed.ts
@@ -535,6 +535,7 @@ export class TestBedViewEngine implements TestBed {
   overrideProvider(token: any, provider: {useValue: any;}): void;
   overrideProvider(token: any, provider: {useFactory?: Function, useValue?: any, deps?: any[]}):
       void {
+    this._assertNotInstantiated('overrideProvider', 'override provider');
     this.overrideProviderImpl(token, provider);
   }
 
diff --git a/packages/elements/src/create-custom-element.ts b/packages/elements/src/create-custom-element.ts
index ed484c1eb3898..3198d07f79474 100644
--- a/packages/elements/src/create-custom-element.ts
+++ b/packages/elements/src/create-custom-element.ts
@@ -45,8 +45,7 @@ export abstract class NgElement extends HTMLElement {
   /**
    * The strategy that controls how a component is transformed in a custom element.
    */
-  // TODO(issue/24571): remove '!'.
-  protected ngElementStrategy!: NgElementStrategy;
+  protected abstract ngElementStrategy: NgElementStrategy;
   /**
    * A subscription to change, connect, and disconnect events in the custom element.
    */
@@ -152,27 +151,19 @@ export function createCustomElement<P>(
         const strategy = this._ngElementStrategy =
             strategyFactory.create(this.injector || config.injector);
 
-        // Collect pre-existing values on the element to re-apply through the strategy.
-        const preExistingValues =
-            inputs.filter(({propName}) => this.hasOwnProperty(propName)).map(({propName}): [
-              string, any
-            ] => [propName, (this as any)[propName]]);
-
-        // In some browsers (e.g. IE10), `Object.setPrototypeOf()` (which is required by some Custom
-        // Elements polyfills) is not defined and is thus polyfilled in a way that does not preserve
-        // the prototype chain. In such cases, `this` will not be an instance of `NgElementImpl` and
-        // thus not have the component input getters/setters defined on `NgElementImpl.prototype`.
-        if (!(this instanceof NgElementImpl)) {
-          // Add getters and setters to the instance itself for each property input.
-          defineInputGettersSetters(inputs, this);
-        } else {
-          // Delete the property from the instance, so that it can go through the getters/setters
-          // set on `NgElementImpl.prototype`.
-          preExistingValues.forEach(([propName]) => delete (this as any)[propName]);
-        }
-
-        // Re-apply pre-existing values through the strategy.
-        preExistingValues.forEach(([propName, value]) => strategy.setInputValue(propName, value));
+        // Re-apply pre-existing input values (set as properties on the element) through the
+        // strategy.
+        inputs.forEach(({propName}) => {
+          if (!this.hasOwnProperty(propName)) {
+            // No pre-existing value for `propName`.
+            return;
+          }
+
+          // Delete the property from the instance and re-apply it through the strategy.
+          const value = (this as any)[propName];
+          delete (this as any)[propName];
+          strategy.setInputValue(propName, value);
+        });
       }
 
       return this._ngElementStrategy!;
@@ -238,28 +229,9 @@ export function createCustomElement<P>(
     }
   }
 
-  // TypeScript 3.9+ defines getters/setters as configurable but non-enumerable properties (in
-  // compliance with the spec). This breaks emulated inheritance in ES5 on environments that do not
-  // natively support `Object.setPrototypeOf()` (such as IE 9-10).
-  // Update the property descriptor of `NgElementImpl#ngElementStrategy` to make it enumerable.
-  // The below 'const', shouldn't be needed but currently this breaks build-optimizer
-  // Build-optimizer currently uses TypeScript 3.6 which is unable to resolve an 'accessor'
-  // in 'getTypeOfVariableOrParameterOrPropertyWorker'.
-  const getterName = 'ngElementStrategy';
-  Object.defineProperty(NgElementImpl.prototype, getterName, {enumerable: true});
-
   // Add getters and setters to the prototype for each property input.
-  defineInputGettersSetters(inputs, NgElementImpl.prototype);
-
-  return (NgElementImpl as any) as NgElementConstructor<P>;
-}
-
-// Helpers
-function defineInputGettersSetters(
-    inputs: {propName: string, templateName: string}[], target: object): void {
-  // Add getters and setters for each property input.
   inputs.forEach(({propName}) => {
-    Object.defineProperty(target, propName, {
+    Object.defineProperty(NgElementImpl.prototype, propName, {
       get(): any {
         return this.ngElementStrategy.getInputValue(propName);
       },
@@ -270,4 +242,6 @@ function defineInputGettersSetters(
       enumerable: true,
     });
   });
+
+  return (NgElementImpl as any) as NgElementConstructor<P>;
 }
diff --git a/packages/elements/src/utils.ts b/packages/elements/src/utils.ts
index 773120fd11239..c058d1ad100c2 100644
--- a/packages/elements/src/utils.ts
+++ b/packages/elements/src/utils.ts
@@ -7,12 +7,6 @@
  */
 import {ComponentFactoryResolver, Injector, Type} from '@angular/core';
 
-const matches = (() => {
-  const elProto = Element.prototype as any;
-  return elProto.matches || elProto.matchesSelector || elProto.mozMatchesSelector ||
-      elProto.msMatchesSelector || elProto.oMatchesSelector || elProto.webkitMatchesSelector;
-})();
-
 /**
  * Provide methods for scheduling the execution of a callback.
  */
@@ -65,7 +59,7 @@ export function createCustomEvent(doc: Document, name: string, detail: any): Cus
   const bubbles = false;
   const cancelable = false;
 
-  // On IE9-11, `CustomEvent` is not a constructor.
+  // On IE11, `CustomEvent` is not a constructor.
   if (typeof CustomEvent !== 'function') {
     const event = doc.createEvent('CustomEvent');
     event.initCustomEvent(name, bubbles, cancelable, detail);
@@ -96,11 +90,20 @@ export function kebabToCamelCase(input: string): string {
   return input.replace(/-([a-z\d])/g, (_, char) => char.toUpperCase());
 }
 
+let _matches: (this: any, selector: string) => boolean;
+
 /**
  * Check whether an `Element` matches a CSS selector.
+ * NOTE: this is duplicated from @angular/upgrade, and can
+ * be consolidated in the future
  */
-export function matchesSelector(element: Element, selector: string): boolean {
-  return matches.call(element, selector);
+export function matchesSelector(el: any, selector: string): boolean {
+  if (!_matches) {
+    const elProto = <any>Element.prototype;
+    _matches = elProto.matches || elProto.matchesSelector || elProto.mozMatchesSelector ||
+        elProto.msMatchesSelector || elProto.oMatchesSelector || elProto.webkitMatchesSelector;
+  }
+  return el.nodeType === Node.ELEMENT_NODE ? _matches.call(el, selector) : false;
 }
 
 /**
diff --git a/packages/examples/common/ngIf/ts/module.ts b/packages/examples/common/ngIf/ts/module.ts
index 535d90f655c7c..fdd85e2273dfa 100644
--- a/packages/examples/common/ngIf/ts/module.ts
+++ b/packages/examples/common/ngIf/ts/module.ts
@@ -22,7 +22,7 @@ import {Subject} from 'rxjs';
 `
 })
 export class NgIfSimple {
-  show: boolean = true;
+  show = true;
 }
 // #enddocregion
 
@@ -38,7 +38,7 @@ export class NgIfSimple {
 `
 })
 export class NgIfElse {
-  show: boolean = true;
+  show = true;
 }
 // #enddocregion
 
@@ -58,7 +58,7 @@ export class NgIfElse {
 })
 export class NgIfThenElse implements OnInit {
   thenBlock: TemplateRef<any>|null = null;
-  show: boolean = true;
+  show = true;
 
   @ViewChild('primaryBlock', {static: true}) primaryBlock: TemplateRef<any>|null = null;
   @ViewChild('secondaryBlock', {static: true}) secondaryBlock: TemplateRef<any>|null = null;
diff --git a/packages/forms/src/directives/abstract_form_group_directive.ts b/packages/forms/src/directives/abstract_form_group_directive.ts
index 449cf8cbf96c7..551922190271f 100644
--- a/packages/forms/src/directives/abstract_form_group_directive.ts
+++ b/packages/forms/src/directives/abstract_form_group_directive.ts
@@ -13,7 +13,7 @@ import {FormGroup} from '../model';
 import {ControlContainer} from './control_container';
 import {Form} from './form_interface';
 import {composeAsyncValidators, composeValidators, controlPath} from './shared';
-import {AsyncValidatorFn, ValidatorFn} from './validators';
+import {AsyncValidator, AsyncValidatorFn, Validator, ValidatorFn} from './validators';
 
 
 
@@ -41,7 +41,7 @@ export class AbstractFormGroupDirective extends ControlContainer implements OnIn
    * @internal
    */
   // TODO(issue/24571): remove '!'.
-  _validators!: any[];
+  _validators!: (Validator|ValidatorFn)[];
 
   /**
    * @description
@@ -50,25 +50,19 @@ export class AbstractFormGroupDirective extends ControlContainer implements OnIn
    * @internal
    */
   // TODO(issue/24571): remove '!'.
-  _asyncValidators!: any[];
+  _asyncValidators!: (AsyncValidator|AsyncValidatorFn)[];
 
-  /**
-   * @description
-   * An internal callback method triggered on the instance after the inputs are set.
-   * Registers the group with its parent group.
-   */
+  /** @nodoc */
   ngOnInit(): void {
     this._checkParentType();
+    // Register the group with its parent group.
     this.formDirective!.addFormGroup(this);
   }
 
-  /**
-   * @description
-   * An internal callback method triggered before the instance is destroyed.
-   * Removes the group from its parent group.
-   */
+  /** @nodoc */
   ngOnDestroy(): void {
     if (this.formDirective) {
+      // Remove the group from its parent group.
       this.formDirective.removeFormGroup(this);
     }
   }
diff --git a/packages/forms/src/directives/checkbox_value_accessor.ts b/packages/forms/src/directives/checkbox_value_accessor.ts
index b7fdfa15cbf97..2ef8261a05bcf 100644
--- a/packages/forms/src/directives/checkbox_value_accessor.ts
+++ b/packages/forms/src/directives/checkbox_value_accessor.ts
@@ -47,14 +47,14 @@ export const CHECKBOX_VALUE_ACCESSOR: any = {
 })
 export class CheckboxControlValueAccessor implements ControlValueAccessor {
   /**
-   * @description
    * The registered callback function called when a change event occurs on the input element.
+   * @nodoc
    */
   onChange = (_: any) => {};
 
   /**
-   * @description
    * The registered callback function called when a blur event occurs on the input element.
+   * @nodoc
    */
   onTouched = () => {};
 
@@ -62,28 +62,23 @@ export class CheckboxControlValueAccessor implements ControlValueAccessor {
 
   /**
    * Sets the "checked" property on the input element.
-   *
-   * @param value The checked value
+   * @nodoc
    */
   writeValue(value: any): void {
     this._renderer.setProperty(this._elementRef.nativeElement, 'checked', value);
   }
 
   /**
-   * @description
    * Registers a function called when the control value changes.
-   *
-   * @param fn The callback function
+   * @nodoc
    */
   registerOnChange(fn: (_: any) => {}): void {
     this.onChange = fn;
   }
 
   /**
-   * @description
    * Registers a function called when the control is touched.
-   *
-   * @param fn The callback function
+   * @nodoc
    */
   registerOnTouched(fn: () => {}): void {
     this.onTouched = fn;
@@ -91,8 +86,7 @@ export class CheckboxControlValueAccessor implements ControlValueAccessor {
 
   /**
    * Sets the "disabled" property on the input element.
-   *
-   * @param isDisabled The disabled value
+   * @nodoc
    */
   setDisabledState(isDisabled: boolean): void {
     this._renderer.setProperty(this._elementRef.nativeElement, 'disabled', isDisabled);
diff --git a/packages/forms/src/directives/control_value_accessor.ts b/packages/forms/src/directives/control_value_accessor.ts
index 808ebe7c9ab47..5e169ca39ed21 100644
--- a/packages/forms/src/directives/control_value_accessor.ts
+++ b/packages/forms/src/directives/control_value_accessor.ts
@@ -138,4 +138,5 @@ export interface ControlValueAccessor {
  *
  * @publicApi
  */
-export const NG_VALUE_ACCESSOR = new InjectionToken<ControlValueAccessor>('NgValueAccessor');
+export const NG_VALUE_ACCESSOR =
+    new InjectionToken<ReadonlyArray<ControlValueAccessor>>('NgValueAccessor');
diff --git a/packages/forms/src/directives/default_value_accessor.ts b/packages/forms/src/directives/default_value_accessor.ts
index 8351aa634edcd..79e57aeab7294 100644
--- a/packages/forms/src/directives/default_value_accessor.ts
+++ b/packages/forms/src/directives/default_value_accessor.ts
@@ -75,14 +75,14 @@ export const COMPOSITION_BUFFER_MODE = new InjectionToken<boolean>('CompositionE
 })
 export class DefaultValueAccessor implements ControlValueAccessor {
   /**
-   * @description
    * The registered callback function called when an input event occurs on the input element.
+   * @nodoc
    */
   onChange = (_: any) => {};
 
   /**
-   * @description
    * The registered callback function called when a blur event occurs on the input element.
+   * @nodoc
    */
   onTouched = () => {};
 
@@ -99,8 +99,7 @@ export class DefaultValueAccessor implements ControlValueAccessor {
 
   /**
    * Sets the "value" property on the input element.
-   *
-   * @param value The checked value
+   * @nodoc
    */
   writeValue(value: any): void {
     const normalizedValue = value == null ? '' : value;
@@ -108,20 +107,16 @@ export class DefaultValueAccessor implements ControlValueAccessor {
   }
 
   /**
-   * @description
    * Registers a function called when the control value changes.
-   *
-   * @param fn The callback function
+   * @nodoc
    */
   registerOnChange(fn: (_: any) => void): void {
     this.onChange = fn;
   }
 
   /**
-   * @description
    * Registers a function called when the control is touched.
-   *
-   * @param fn The callback function
+   * @nodoc
    */
   registerOnTouched(fn: () => void): void {
     this.onTouched = fn;
@@ -129,8 +124,7 @@ export class DefaultValueAccessor implements ControlValueAccessor {
 
   /**
    * Sets the "disabled" property on the input element.
-   *
-   * @param isDisabled The disabled value
+   * @nodoc
    */
   setDisabledState(isDisabled: boolean): void {
     this._renderer.setProperty(this._elementRef.nativeElement, 'disabled', isDisabled);
diff --git a/packages/forms/src/directives/ng_control.ts b/packages/forms/src/directives/ng_control.ts
index 95fe13f5895a3..23cb4edfd03c2 100644
--- a/packages/forms/src/directives/ng_control.ts
+++ b/packages/forms/src/directives/ng_control.ts
@@ -13,7 +13,9 @@ import {ControlValueAccessor} from './control_value_accessor';
 import {AsyncValidator, AsyncValidatorFn, Validator, ValidatorFn} from './validators';
 
 function unimplemented(): any {
-  throw new Error('unimplemented');
+  if (typeof ngDevMode === 'undefined' || ngDevMode) {
+    throw new Error('unimplemented');
+  }
 }
 
 /**
diff --git a/packages/forms/src/directives/ng_form.ts b/packages/forms/src/directives/ng_form.ts
index d92fe88133be6..c221aae8faf23 100644
--- a/packages/forms/src/directives/ng_form.ts
+++ b/packages/forms/src/directives/ng_form.ts
@@ -17,6 +17,7 @@ import {NgControl} from './ng_control';
 import {NgModel} from './ng_model';
 import {NgModelGroup} from './ng_model_group';
 import {composeAsyncValidators, composeValidators, removeDir, setUpControl, setUpFormContainer, syncPendingControls} from './shared';
+import {AsyncValidator, AsyncValidatorFn, Validator, ValidatorFn} from './validators';
 
 export const formDirectiveProvider: any = {
   provide: ControlContainer,
@@ -130,17 +131,15 @@ export class NgForm extends ControlContainer implements Form, AfterViewInit {
   @Input('ngFormOptions') options!: {updateOn?: FormHooks};
 
   constructor(
-      @Optional() @Self() @Inject(NG_VALIDATORS) validators: any[],
-      @Optional() @Self() @Inject(NG_ASYNC_VALIDATORS) asyncValidators: any[]) {
+      @Optional() @Self() @Inject(NG_VALIDATORS) validators: (Validator|ValidatorFn)[],
+      @Optional() @Self() @Inject(NG_ASYNC_VALIDATORS) asyncValidators:
+          (AsyncValidator|AsyncValidatorFn)[]) {
     super();
     this.form =
         new FormGroup({}, composeValidators(validators), composeAsyncValidators(asyncValidators));
   }
 
-  /**
-   * @description
-   * Lifecycle method called after the view is initialized. For internal use only.
-   */
+  /** @nodoc */
   ngAfterViewInit() {
     this._setUpdateStrategy();
   }
diff --git a/packages/forms/src/directives/ng_model.ts b/packages/forms/src/directives/ng_model.ts
index cc115be32ebb6..ae7a4343329b8 100644
--- a/packages/forms/src/directives/ng_model.ts
+++ b/packages/forms/src/directives/ng_model.ts
@@ -149,8 +149,8 @@ export class NgModel extends NgControl implements OnChanges, OnDestroy {
   _registered = false;
 
   /**
-   * @description
    * Internal reference to the view model value.
+   * @nodoc
    */
   viewModel: any;
 
@@ -202,9 +202,9 @@ export class NgModel extends NgControl implements OnChanges, OnDestroy {
 
   constructor(
       @Optional() @Host() parent: ControlContainer,
-      @Optional() @Self() @Inject(NG_VALIDATORS) validators: Array<Validator|ValidatorFn>,
+      @Optional() @Self() @Inject(NG_VALIDATORS) validators: (Validator|ValidatorFn)[],
       @Optional() @Self() @Inject(NG_ASYNC_VALIDATORS) asyncValidators:
-          Array<AsyncValidator|AsyncValidatorFn>,
+          (AsyncValidator|AsyncValidatorFn)[],
       @Optional() @Self() @Inject(NG_VALUE_ACCESSOR) valueAccessors: ControlValueAccessor[]) {
     super();
     this._parent = parent;
@@ -213,13 +213,7 @@ export class NgModel extends NgControl implements OnChanges, OnDestroy {
     this.valueAccessor = selectValueAccessor(this, valueAccessors);
   }
 
-  /**
-   * @description
-   * A lifecycle method called when the directive's inputs change. For internal use
-   * only.
-   *
-   * @param changes A object of key/value pairs for the set of changed inputs.
-   */
+  /** @nodoc */
   ngOnChanges(changes: SimpleChanges) {
     this._checkForErrors();
     if (!this._registered) this._setUpControl();
@@ -233,11 +227,7 @@ export class NgModel extends NgControl implements OnChanges, OnDestroy {
     }
   }
 
-  /**
-   * @description
-   * Lifecycle method called before the directive's instance is destroyed. For internal
-   * use only.
-   */
+  /** @nodoc */
   ngOnDestroy(): void {
     this.formDirective && this.formDirective.removeControl(this);
   }
@@ -317,18 +307,20 @@ export class NgModel extends NgControl implements OnChanges, OnDestroy {
   }
 
   private _checkParentType(): void {
-    if (!(this._parent instanceof NgModelGroup) &&
-        this._parent instanceof AbstractFormGroupDirective) {
-      TemplateDrivenErrors.formGroupNameException();
-    } else if (!(this._parent instanceof NgModelGroup) && !(this._parent instanceof NgForm)) {
-      TemplateDrivenErrors.modelParentException();
+    if (typeof ngDevMode === 'undefined' || ngDevMode) {
+      if (!(this._parent instanceof NgModelGroup) &&
+          this._parent instanceof AbstractFormGroupDirective) {
+        TemplateDrivenErrors.formGroupNameException();
+      } else if (!(this._parent instanceof NgModelGroup) && !(this._parent instanceof NgForm)) {
+        TemplateDrivenErrors.modelParentException();
+      }
     }
   }
 
   private _checkName(): void {
     if (this.options && this.options.name) this.name = this.options.name;
 
-    if (!this._isStandalone() && !this.name) {
+    if (!this._isStandalone() && !this.name && (typeof ngDevMode === 'undefined' || ngDevMode)) {
       TemplateDrivenErrors.missingNameException();
     }
   }
diff --git a/packages/forms/src/directives/ng_model_group.ts b/packages/forms/src/directives/ng_model_group.ts
index d5995df8a7e61..6618cdc179fb1 100644
--- a/packages/forms/src/directives/ng_model_group.ts
+++ b/packages/forms/src/directives/ng_model_group.ts
@@ -14,6 +14,7 @@ import {AbstractFormGroupDirective} from './abstract_form_group_directive';
 import {ControlContainer} from './control_container';
 import {NgForm} from './ng_form';
 import {TemplateDrivenErrors} from './template_driven_errors';
+import {AsyncValidator, AsyncValidatorFn, Validator, ValidatorFn} from './validators';
 
 export const modelGroupProvider: any = {
   provide: ControlContainer,
@@ -58,8 +59,9 @@ export class NgModelGroup extends AbstractFormGroupDirective implements OnInit,
 
   constructor(
       @Host() @SkipSelf() parent: ControlContainer,
-      @Optional() @Self() @Inject(NG_VALIDATORS) validators: any[],
-      @Optional() @Self() @Inject(NG_ASYNC_VALIDATORS) asyncValidators: any[]) {
+      @Optional() @Self() @Inject(NG_VALIDATORS) validators: (Validator|ValidatorFn)[],
+      @Optional() @Self() @Inject(NG_ASYNC_VALIDATORS) asyncValidators:
+          (AsyncValidator|AsyncValidatorFn)[]) {
     super();
     this._parent = parent;
     this._validators = validators;
@@ -68,7 +70,8 @@ export class NgModelGroup extends AbstractFormGroupDirective implements OnInit,
 
   /** @internal */
   _checkParentType(): void {
-    if (!(this._parent instanceof NgModelGroup) && !(this._parent instanceof NgForm)) {
+    if (!(this._parent instanceof NgModelGroup) && !(this._parent instanceof NgForm) &&
+        (typeof ngDevMode === 'undefined' || ngDevMode)) {
       TemplateDrivenErrors.modelGroupParentException();
     }
   }
diff --git a/packages/forms/src/directives/number_value_accessor.ts b/packages/forms/src/directives/number_value_accessor.ts
index 675f174471141..da4a0dc5d0bff 100644
--- a/packages/forms/src/directives/number_value_accessor.ts
+++ b/packages/forms/src/directives/number_value_accessor.ts
@@ -19,7 +19,7 @@ export const NUMBER_VALUE_ACCESSOR: any = {
 /**
  * @description
  * The `ControlValueAccessor` for writing a number value and listening to number input changes.
- * The value accessor is used by the `FormControlDirective`, `FormControlName`, and  `NgModel`
+ * The value accessor is used by the `FormControlDirective`, `FormControlName`, and `NgModel`
  * directives.
  *
  * @usageNotes
@@ -48,15 +48,15 @@ export const NUMBER_VALUE_ACCESSOR: any = {
 })
 export class NumberValueAccessor implements ControlValueAccessor {
   /**
-   * @description
    * The registered callback function called when a change or input event occurs on the input
    * element.
+   * @nodoc
    */
   onChange = (_: any) => {};
 
   /**
-   * @description
    * The registered callback function called when a blur event occurs on the input element.
+   * @nodoc
    */
   onTouched = () => {};
 
@@ -64,8 +64,7 @@ export class NumberValueAccessor implements ControlValueAccessor {
 
   /**
    * Sets the "value" property on the input element.
-   *
-   * @param value The checked value
+   * @nodoc
    */
   writeValue(value: number): void {
     // The value needs to be normalized for IE9, otherwise it is set to 'null' when null
@@ -74,10 +73,8 @@ export class NumberValueAccessor implements ControlValueAccessor {
   }
 
   /**
-   * @description
    * Registers a function called when the control value changes.
-   *
-   * @param fn The callback function
+   * @nodoc
    */
   registerOnChange(fn: (_: number|null) => void): void {
     this.onChange = (value) => {
@@ -86,10 +83,8 @@ export class NumberValueAccessor implements ControlValueAccessor {
   }
 
   /**
-   * @description
    * Registers a function called when the control is touched.
-   *
-   * @param fn The callback function
+   * @nodoc
    */
   registerOnTouched(fn: () => void): void {
     this.onTouched = fn;
@@ -97,8 +92,7 @@ export class NumberValueAccessor implements ControlValueAccessor {
 
   /**
    * Sets the "disabled" property on the input element.
-   *
-   * @param isDisabled The disabled value
+   * @nodoc
    */
   setDisabledState(isDisabled: boolean): void {
     this._renderer.setProperty(this._elementRef.nativeElement, 'disabled', isDisabled);
diff --git a/packages/forms/src/directives/radio_control_value_accessor.ts b/packages/forms/src/directives/radio_control_value_accessor.ts
index 4de1274f2d671..50b92ae42349f 100644
--- a/packages/forms/src/directives/radio_control_value_accessor.ts
+++ b/packages/forms/src/directives/radio_control_value_accessor.ts
@@ -17,6 +17,13 @@ export const RADIO_VALUE_ACCESSOR: any = {
   multi: true
 };
 
+function throwNameError() {
+  throw new Error(`
+      If you define both a name and a formControlName attribute on your radio button, their values
+      must match. Ex: <input type="radio" formControlName="food" name="food">
+    `);
+}
+
 /**
  * @description
  * Class used by Angular to track radio buttons. For internal use only.
@@ -105,14 +112,14 @@ export class RadioControlValueAccessor implements ControlValueAccessor, OnDestro
   _fn!: Function;
 
   /**
-   * @description
    * The registered callback function called when a change event occurs on the input element.
+   * @nodoc
    */
   onChange = () => {};
 
   /**
-   * @description
    * The registered callback function called when a blur event occurs on the input element.
+   * @nodoc
    */
   onTouched = () => {};
 
@@ -141,29 +148,21 @@ export class RadioControlValueAccessor implements ControlValueAccessor, OnDestro
       private _renderer: Renderer2, private _elementRef: ElementRef,
       private _registry: RadioControlRegistry, private _injector: Injector) {}
 
-  /**
-   * @description
-   * A lifecycle method called when the directive is initialized. For internal use only.
-   */
+  /** @nodoc */
   ngOnInit(): void {
     this._control = this._injector.get(NgControl);
     this._checkName();
     this._registry.add(this._control, this);
   }
 
-  /**
-   * @description
-   * Lifecycle method called before the directive's instance is destroyed. For internal use only.
-   */
+  /** @nodoc */
   ngOnDestroy(): void {
     this._registry.remove(this);
   }
 
   /**
-   * @description
    * Sets the "checked" property value on the radio input element.
-   *
-   * @param value The checked value
+   * @nodoc
    */
   writeValue(value: any): void {
     this._state = value === this.value;
@@ -171,10 +170,8 @@ export class RadioControlValueAccessor implements ControlValueAccessor, OnDestro
   }
 
   /**
-   * @description
    * Registers a function called when the control value changes.
-   *
-   * @param fn The callback function
+   * @nodoc
    */
   registerOnChange(fn: (_: any) => {}): void {
     this._fn = fn;
@@ -194,10 +191,8 @@ export class RadioControlValueAccessor implements ControlValueAccessor, OnDestro
   }
 
   /**
-   * @description
    * Registers a function called when the control is touched.
-   *
-   * @param fn The callback function
+   * @nodoc
    */
   registerOnTouched(fn: () => {}): void {
     this.onTouched = fn;
@@ -205,24 +200,17 @@ export class RadioControlValueAccessor implements ControlValueAccessor, OnDestro
 
   /**
    * Sets the "disabled" property on the input element.
-   *
-   * @param isDisabled The disabled value
+   * @nodoc
    */
   setDisabledState(isDisabled: boolean): void {
     this._renderer.setProperty(this._elementRef.nativeElement, 'disabled', isDisabled);
   }
 
   private _checkName(): void {
-    if (this.name && this.formControlName && this.name !== this.formControlName) {
-      this._throwNameError();
+    if (this.name && this.formControlName && this.name !== this.formControlName &&
+        (typeof ngDevMode === 'undefined' || ngDevMode)) {
+      throwNameError();
     }
     if (!this.name && this.formControlName) this.name = this.formControlName;
   }
-
-  private _throwNameError(): void {
-    throw new Error(`
-      If you define both a name and a formControlName attribute on your radio button, their values
-      must match. Ex: <input type="radio" formControlName="food" name="food">
-    `);
-  }
 }
diff --git a/packages/forms/src/directives/range_value_accessor.ts b/packages/forms/src/directives/range_value_accessor.ts
index 0dec1920ed93b..312657361cbe5 100644
--- a/packages/forms/src/directives/range_value_accessor.ts
+++ b/packages/forms/src/directives/range_value_accessor.ts
@@ -52,15 +52,15 @@ export const RANGE_VALUE_ACCESSOR: StaticProvider = {
 })
 export class RangeValueAccessor implements ControlValueAccessor {
   /**
-   * @description
    * The registered callback function called when a change or input event occurs on the input
    * element.
+   * @nodoc
    */
   onChange = (_: any) => {};
 
   /**
-   * @description
    * The registered callback function called when a blur event occurs on the input element.
+   * @nodoc
    */
   onTouched = () => {};
 
@@ -68,18 +68,15 @@ export class RangeValueAccessor implements ControlValueAccessor {
 
   /**
    * Sets the "value" property on the input element.
-   *
-   * @param value The checked value
+   * @nodoc
    */
   writeValue(value: any): void {
     this._renderer.setProperty(this._elementRef.nativeElement, 'value', parseFloat(value));
   }
 
   /**
-   * @description
    * Registers a function called when the control value changes.
-   *
-   * @param fn The callback function
+   * @nodoc
    */
   registerOnChange(fn: (_: number|null) => void): void {
     this.onChange = (value) => {
@@ -88,10 +85,8 @@ export class RangeValueAccessor implements ControlValueAccessor {
   }
 
   /**
-   * @description
    * Registers a function called when the control is touched.
-   *
-   * @param fn The callback function
+   * @nodoc
    */
   registerOnTouched(fn: () => void): void {
     this.onTouched = fn;
@@ -99,8 +94,7 @@ export class RangeValueAccessor implements ControlValueAccessor {
 
   /**
    * Sets the "disabled" property on the range input element.
-   *
-   * @param isDisabled The disabled value
+   * @nodoc
    */
   setDisabledState(isDisabled: boolean): void {
     this._renderer.setProperty(this._elementRef.nativeElement, 'disabled', isDisabled);
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 2f288fbe3c154..05d9565d6d119 100644
--- a/packages/forms/src/directives/reactive_directives/form_control_directive.ts
+++ b/packages/forms/src/directives/reactive_directives/form_control_directive.ts
@@ -54,8 +54,8 @@ export const formControlBinding: any = {
 
 export class FormControlDirective extends NgControl implements OnChanges {
   /**
-   * @description
    * Internal reference to the view model value.
+   * @nodoc
    */
   viewModel: any;
 
@@ -68,11 +68,13 @@ export class FormControlDirective extends NgControl implements OnChanges {
 
   /**
    * @description
-   * Triggers a warning that this input should not be used with reactive forms.
+   * Triggers a warning in dev mode that this input should not be used with reactive forms.
    */
   @Input('disabled')
   set isDisabled(isDisabled: boolean) {
-    ReactiveErrors.disabledAttrWarning();
+    if (typeof ngDevMode === 'undefined' || ngDevMode) {
+      ReactiveErrors.disabledAttrWarning();
+    }
   }
 
   // TODO(kara): remove next 4 properties once deprecation period is over
@@ -102,9 +104,9 @@ export class FormControlDirective extends NgControl implements OnChanges {
   _ngModelWarningSent = false;
 
   constructor(
-      @Optional() @Self() @Inject(NG_VALIDATORS) validators: Array<Validator|ValidatorFn>,
+      @Optional() @Self() @Inject(NG_VALIDATORS) validators: (Validator|ValidatorFn)[],
       @Optional() @Self() @Inject(NG_ASYNC_VALIDATORS) asyncValidators:
-          Array<AsyncValidator|AsyncValidatorFn>,
+          (AsyncValidator|AsyncValidatorFn)[],
       @Optional() @Self() @Inject(NG_VALUE_ACCESSOR) valueAccessors: ControlValueAccessor[],
       @Optional() @Inject(NG_MODEL_WITH_FORM_CONTROL_WARNING) private _ngModelWarningConfig: string|
       null) {
@@ -114,13 +116,7 @@ export class FormControlDirective extends NgControl implements OnChanges {
     this.valueAccessor = selectValueAccessor(this, valueAccessors);
   }
 
-  /**
-   * @description
-   * A lifecycle method called when the directive's inputs change. For internal use
-   * only.
-   *
-   * @param changes A object of key/value pairs for the set of changed inputs.
-   */
+  /** @nodoc */
   ngOnChanges(changes: SimpleChanges): void {
     if (this._isControlChanged(changes)) {
       setUpControl(this.form, this);
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 0802ff2b0e92e..e2d3fc65a2e7d 100644
--- a/packages/forms/src/directives/reactive_directives/form_control_name.ts
+++ b/packages/forms/src/directives/reactive_directives/form_control_name.ts
@@ -65,7 +65,6 @@ export const controlNameBinding: any = {
 export class FormControlName extends NgControl implements OnChanges, OnDestroy {
   private _added = false;
   /**
-   * @description
    * Internal reference to the view model value.
    * @internal
    */
@@ -92,11 +91,13 @@ export class FormControlName extends NgControl implements OnChanges, OnDestroy {
 
   /**
    * @description
-   * Triggers a warning that this input should not be used with reactive forms.
+   * Triggers a warning in dev mode that this input should not be used with reactive forms.
    */
   @Input('disabled')
   set isDisabled(isDisabled: boolean) {
-    ReactiveErrors.disabledAttrWarning();
+    if (typeof ngDevMode === 'undefined' || ngDevMode) {
+      ReactiveErrors.disabledAttrWarning();
+    }
   }
 
   // TODO(kara): remove next 4 properties once deprecation period is over
@@ -127,9 +128,9 @@ export class FormControlName extends NgControl implements OnChanges, OnDestroy {
 
   constructor(
       @Optional() @Host() @SkipSelf() parent: ControlContainer,
-      @Optional() @Self() @Inject(NG_VALIDATORS) validators: Array<Validator|ValidatorFn>,
+      @Optional() @Self() @Inject(NG_VALIDATORS) validators: (Validator|ValidatorFn)[],
       @Optional() @Self() @Inject(NG_ASYNC_VALIDATORS) asyncValidators:
-          Array<AsyncValidator|AsyncValidatorFn>,
+          (AsyncValidator|AsyncValidatorFn)[],
       @Optional() @Self() @Inject(NG_VALUE_ACCESSOR) valueAccessors: ControlValueAccessor[],
       @Optional() @Inject(NG_MODEL_WITH_FORM_CONTROL_WARNING) private _ngModelWarningConfig: string|
       null) {
@@ -140,12 +141,7 @@ export class FormControlName extends NgControl implements OnChanges, OnDestroy {
     this.valueAccessor = selectValueAccessor(this, valueAccessors);
   }
 
-  /**
-   * @description
-   * A lifecycle method called when the directive's inputs change. For internal use only.
-   *
-   * @param changes A object of key/value pairs for the set of changed inputs.
-   */
+  /** @nodoc */
   ngOnChanges(changes: SimpleChanges) {
     if (!this._added) this._setUpControl();
     if (isPropertyUpdated(changes, this.viewModel)) {
@@ -155,10 +151,7 @@ export class FormControlName extends NgControl implements OnChanges, OnDestroy {
     }
   }
 
-  /**
-   * @description
-   * Lifecycle method called before the directive's instance is destroyed. For internal use only.
-   */
+  /** @nodoc */
   ngOnDestroy(): void {
     if (this.formDirective) {
       this.formDirective.removeControl(this);
@@ -212,13 +205,16 @@ export class FormControlName extends NgControl implements OnChanges, OnDestroy {
   }
 
   private _checkParentType(): void {
-    if (!(this._parent instanceof FormGroupName) &&
-        this._parent instanceof AbstractFormGroupDirective) {
-      ReactiveErrors.ngModelGroupException();
-    } else if (
-        !(this._parent instanceof FormGroupName) && !(this._parent instanceof FormGroupDirective) &&
-        !(this._parent instanceof FormArrayName)) {
-      ReactiveErrors.controlParentException();
+    if (typeof ngDevMode === 'undefined' || ngDevMode) {
+      if (!(this._parent instanceof FormGroupName) &&
+          this._parent instanceof AbstractFormGroupDirective) {
+        ReactiveErrors.ngModelGroupException();
+      } else if (
+          !(this._parent instanceof FormGroupName) &&
+          !(this._parent instanceof FormGroupDirective) &&
+          !(this._parent instanceof FormArrayName)) {
+        ReactiveErrors.controlParentException();
+      }
     }
   }
 
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 f6ef709f55e1f..babb9b091be50 100644
--- a/packages/forms/src/directives/reactive_directives/form_group_directive.ts
+++ b/packages/forms/src/directives/reactive_directives/form_group_directive.ts
@@ -14,6 +14,7 @@ import {ControlContainer} from '../control_container';
 import {Form} from '../form_interface';
 import {ReactiveErrors} from '../reactive_errors';
 import {cleanUpControl, composeAsyncValidators, composeValidators, removeDir, setUpControl, setUpFormContainer, syncPendingControls} from '../shared';
+import {AsyncValidator, AsyncValidatorFn, Validator, ValidatorFn} from '../validators';
 
 import {FormControlName} from './form_control_name';
 import {FormArrayName, FormGroupName} from './form_group_name';
@@ -81,17 +82,13 @@ export class FormGroupDirective extends ControlContainer implements Form, OnChan
   @Output() ngSubmit = new EventEmitter();
 
   constructor(
-      @Optional() @Self() @Inject(NG_VALIDATORS) private _validators: any[],
-      @Optional() @Self() @Inject(NG_ASYNC_VALIDATORS) private _asyncValidators: any[]) {
+      @Optional() @Self() @Inject(NG_VALIDATORS) private _validators: (Validator|ValidatorFn)[],
+      @Optional() @Self() @Inject(NG_ASYNC_VALIDATORS) private _asyncValidators:
+          (AsyncValidator|AsyncValidatorFn)[]) {
     super();
   }
 
-  /**
-   * @description
-   * A lifecycle method called when the directive's inputs change. For internal use only.
-   *
-   * @param changes A object of key/value pairs for the set of changed inputs.
-   */
+  /** @nodoc */
   ngOnChanges(changes: SimpleChanges): void {
     this._checkFormPresent();
     if (changes.hasOwnProperty('form')) {
@@ -291,7 +288,7 @@ export class FormGroupDirective extends ControlContainer implements Form, OnChan
   }
 
   private _checkFormPresent() {
-    if (!this.form) {
+    if (!this.form && (typeof ngDevMode === 'undefined' || ngDevMode)) {
       ReactiveErrors.missingFormException();
     }
   }
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 6a3aa99ba57ea..3cc056c3b90a1 100644
--- a/packages/forms/src/directives/reactive_directives/form_group_name.ts
+++ b/packages/forms/src/directives/reactive_directives/form_group_name.ts
@@ -14,7 +14,7 @@ import {AbstractFormGroupDirective} from '../abstract_form_group_directive';
 import {ControlContainer} from '../control_container';
 import {ReactiveErrors} from '../reactive_errors';
 import {composeAsyncValidators, composeValidators, controlPath} from '../shared';
-import {AsyncValidatorFn, ValidatorFn} from '../validators';
+import {AsyncValidator, AsyncValidatorFn, Validator, ValidatorFn} from '../validators';
 
 import {FormGroupDirective} from './form_group_directive';
 
@@ -86,8 +86,9 @@ export class FormGroupName extends AbstractFormGroupDirective implements OnInit,
 
   constructor(
       @Optional() @Host() @SkipSelf() parent: ControlContainer,
-      @Optional() @Self() @Inject(NG_VALIDATORS) validators: any[],
-      @Optional() @Self() @Inject(NG_ASYNC_VALIDATORS) asyncValidators: any[]) {
+      @Optional() @Self() @Inject(NG_VALIDATORS) validators: (Validator|ValidatorFn)[],
+      @Optional() @Self() @Inject(NG_ASYNC_VALIDATORS) asyncValidators:
+          (AsyncValidator|AsyncValidatorFn)[]) {
     super();
     this._parent = parent;
     this._validators = validators;
@@ -96,7 +97,7 @@ export class FormGroupName extends AbstractFormGroupDirective implements OnInit,
 
   /** @internal */
   _checkParentType(): void {
-    if (_hasInvalidParent(this._parent)) {
+    if (_hasInvalidParent(this._parent) && (typeof ngDevMode === 'undefined' || ngDevMode)) {
       ReactiveErrors.groupParentException();
     }
   }
@@ -137,10 +138,10 @@ export class FormArrayName extends ControlContainer implements OnInit, OnDestroy
   _parent: ControlContainer;
 
   /** @internal */
-  _validators: any[];
+  _validators: (Validator|ValidatorFn)[];
 
   /** @internal */
-  _asyncValidators: any[];
+  _asyncValidators: (AsyncValidator|AsyncValidatorFn)[];
 
   /**
    * @description
@@ -156,8 +157,9 @@ export class FormArrayName extends ControlContainer implements OnInit, OnDestroy
 
   constructor(
       @Optional() @Host() @SkipSelf() parent: ControlContainer,
-      @Optional() @Self() @Inject(NG_VALIDATORS) validators: any[],
-      @Optional() @Self() @Inject(NG_ASYNC_VALIDATORS) asyncValidators: any[]) {
+      @Optional() @Self() @Inject(NG_VALIDATORS) validators: (Validator|ValidatorFn)[],
+      @Optional() @Self() @Inject(NG_ASYNC_VALIDATORS) asyncValidators:
+          (AsyncValidator|AsyncValidatorFn)[]) {
     super();
     this._parent = parent;
     this._validators = validators;
@@ -165,10 +167,9 @@ export class FormArrayName extends ControlContainer implements OnInit, OnDestroy
   }
 
   /**
-   * @description
    * A lifecycle method called when the directive's inputs are initialized. For internal use only.
-   *
    * @throws If the directive does not have a valid parent.
+   * @nodoc
    */
   ngOnInit(): void {
     this._checkParentType();
@@ -176,8 +177,8 @@ export class FormArrayName extends ControlContainer implements OnInit, OnDestroy
   }
 
   /**
-   * @description
    * A lifecycle method called before the directive's instance is destroyed. For internal use only.
+   * @nodoc
    */
   ngOnDestroy(): void {
     if (this.formDirective) {
@@ -228,7 +229,7 @@ export class FormArrayName extends ControlContainer implements OnInit, OnDestroy
   }
 
   private _checkParentType(): void {
-    if (_hasInvalidParent(this._parent)) {
+    if (_hasInvalidParent(this._parent) && (typeof ngDevMode === 'undefined' || ngDevMode)) {
       ReactiveErrors.arrayParentException();
     }
   }
diff --git a/packages/forms/src/directives/reactive_errors.ts b/packages/forms/src/directives/reactive_errors.ts
index 835f358aa61f0..0d32b3e76e64d 100644
--- a/packages/forms/src/directives/reactive_errors.ts
+++ b/packages/forms/src/directives/reactive_errors.ts
@@ -33,6 +33,7 @@ export class ReactiveErrors {
 
         ${Examples.ngModelGroup}`);
   }
+
   static missingFormException(): void {
     throw new Error(`formGroup expects a FormGroup instance. Please pass one in.
 
diff --git a/packages/forms/src/directives/select_control_value_accessor.ts b/packages/forms/src/directives/select_control_value_accessor.ts
index 4e2832c2a5154..c1a054e34c875 100644
--- a/packages/forms/src/directives/select_control_value_accessor.ts
+++ b/packages/forms/src/directives/select_control_value_accessor.ts
@@ -90,21 +90,24 @@ function _extractId(valueString: string): string {
   providers: [SELECT_VALUE_ACCESSOR]
 })
 export class SelectControlValueAccessor implements ControlValueAccessor {
+  /** @nodoc */
   value: any;
+
   /** @internal */
   _optionMap: Map<string, any> = new Map<string, any>();
+
   /** @internal */
   _idCounter: number = 0;
 
   /**
-   * @description
    * The registered callback function called when a change event occurs on the input element.
+   * @nodoc
    */
   onChange = (_: any) => {};
 
   /**
-   * @description
    * The registered callback function called when a blur event occurs on the input element.
+   * @nodoc
    */
   onTouched = () => {};
 
@@ -115,7 +118,7 @@ export class SelectControlValueAccessor implements ControlValueAccessor {
    */
   @Input()
   set compareWith(fn: (o1: any, o2: any) => boolean) {
-    if (typeof fn !== 'function') {
+    if (typeof fn !== 'function' && (typeof ngDevMode === 'undefined' || ngDevMode)) {
       throw new Error(`compareWith must be a function, but received ${JSON.stringify(fn)}`);
     }
     this._compareWith = fn;
@@ -128,8 +131,7 @@ export class SelectControlValueAccessor implements ControlValueAccessor {
   /**
    * Sets the "value" property on the input element. The "selectedIndex"
    * property is also set if an ID is provided on the option element.
-   *
-   * @param value The checked value
+   * @nodoc
    */
   writeValue(value: any): void {
     this.value = value;
@@ -142,10 +144,8 @@ export class SelectControlValueAccessor implements ControlValueAccessor {
   }
 
   /**
-   * @description
    * Registers a function called when the control value changes.
-   *
-   * @param fn The callback function
+   * @nodoc
    */
   registerOnChange(fn: (value: any) => any): void {
     this.onChange = (valueString: string) => {
@@ -155,10 +155,8 @@ export class SelectControlValueAccessor implements ControlValueAccessor {
   }
 
   /**
-   * @description
    * Registers a function called when the control is touched.
-   *
-   * @param fn The callback function
+   * @nodoc
    */
   registerOnTouched(fn: () => any): void {
     this.onTouched = fn;
@@ -166,8 +164,7 @@ export class SelectControlValueAccessor implements ControlValueAccessor {
 
   /**
    * Sets the "disabled" property on the select input element.
-   *
-   * @param isDisabled The disabled value
+   * @nodoc
    */
   setDisabledState(isDisabled: boolean): void {
     this._renderer.setProperty(this._elementRef.nativeElement, 'disabled', isDisabled);
@@ -247,10 +244,7 @@ export class NgSelectOption implements OnDestroy {
     this._renderer.setProperty(this._element.nativeElement, 'value', value);
   }
 
-  /**
-   * @description
-   * Lifecycle method called before the directive's instance is destroyed. For internal use only.
-   */
+  /** @nodoc */
   ngOnDestroy(): void {
     if (this._select) {
       this._select._optionMap.delete(this.id);
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 ebee78150422f..5ebf8e7d6a3a6 100644
--- a/packages/forms/src/directives/select_multiple_control_value_accessor.ts
+++ b/packages/forms/src/directives/select_multiple_control_value_accessor.ts
@@ -83,25 +83,26 @@ abstract class HTMLCollection {
 })
 export class SelectMultipleControlValueAccessor implements ControlValueAccessor {
   /**
-   * @description
-   * The current value
+   * The current value.
+   * @nodoc
    */
   value: any;
 
   /** @internal */
   _optionMap: Map<string, ɵNgSelectMultipleOption> = new Map<string, ɵNgSelectMultipleOption>();
+
   /** @internal */
   _idCounter: number = 0;
 
   /**
-   * @description
    * The registered callback function called when a change event occurs on the input element.
+   * @nodoc
    */
   onChange = (_: any) => {};
 
   /**
-   * @description
    * The registered callback function called when a blur event occurs on the input element.
+   * @nodoc
    */
   onTouched = () => {};
 
@@ -112,7 +113,7 @@ export class SelectMultipleControlValueAccessor implements ControlValueAccessor
    */
   @Input()
   set compareWith(fn: (o1: any, o2: any) => boolean) {
-    if (typeof fn !== 'function') {
+    if (typeof fn !== 'function' && (typeof ngDevMode === 'undefined' || ngDevMode)) {
       throw new Error(`compareWith must be a function, but received ${JSON.stringify(fn)}`);
     }
     this._compareWith = fn;
@@ -123,11 +124,8 @@ export class SelectMultipleControlValueAccessor implements ControlValueAccessor
   constructor(private _renderer: Renderer2, private _elementRef: ElementRef) {}
 
   /**
-   * @description
-   * Sets the "value" property on one or of more
-   * of the select's options.
-   *
-   * @param value The value
+   * Sets the "value" property on one or of more of the select's options.
+   * @nodoc
    */
   writeValue(value: any): void {
     this.value = value;
@@ -147,11 +145,9 @@ export class SelectMultipleControlValueAccessor implements ControlValueAccessor
   }
 
   /**
-   * @description
    * Registers a function called when the control value changes
    * and writes an array of the selected options.
-   *
-   * @param fn The callback function
+   * @nodoc
    */
   registerOnChange(fn: (value: any) => any): void {
     this.onChange = (_: any) => {
@@ -181,10 +177,8 @@ export class SelectMultipleControlValueAccessor implements ControlValueAccessor
   }
 
   /**
-   * @description
    * Registers a function called when the control is touched.
-   *
-   * @param fn The callback function
+   * @nodoc
    */
   registerOnTouched(fn: () => any): void {
     this.onTouched = fn;
@@ -192,8 +186,7 @@ export class SelectMultipleControlValueAccessor implements ControlValueAccessor
 
   /**
    * Sets the "disabled" property on the select input element.
-   *
-   * @param isDisabled The disabled value
+   * @nodoc
    */
   setDisabledState(isDisabled: boolean): void {
     this._renderer.setProperty(this._elementRef.nativeElement, 'disabled', isDisabled);
@@ -285,10 +278,7 @@ export class ɵNgSelectMultipleOption implements OnDestroy {
     this._renderer.setProperty(this._element.nativeElement, 'selected', selected);
   }
 
-  /**
-   * @description
-   * Lifecycle method called before the directive's instance is destroyed. For internal use only.
-   */
+  /** @nodoc */
   ngOnDestroy(): void {
     if (this._select) {
       this._select._optionMap.delete(this.id);
diff --git a/packages/forms/src/directives/shared.ts b/packages/forms/src/directives/shared.ts
index 04c950aa9fb5b..a3dcce5616db3 100644
--- a/packages/forms/src/directives/shared.ts
+++ b/packages/forms/src/directives/shared.ts
@@ -33,8 +33,10 @@ export function controlPath(name: string|null, parent: ControlContainer): string
 }
 
 export function setUpControl(control: FormControl, dir: NgControl): void {
-  if (!control) _throwError(dir, 'Cannot find control with');
-  if (!dir.valueAccessor) _throwError(dir, 'No value accessor for form control with');
+  if (typeof ngDevMode === 'undefined' || ngDevMode) {
+    if (!control) _throwError(dir, 'Cannot find control with');
+    if (!dir.valueAccessor) _throwError(dir, 'No value accessor for form control with');
+  }
 
   control.validator = Validators.compose([control.validator!, dir.validator]);
   control.asyncValidator = Validators.composeAsync([control.asyncValidator!, dir.asyncValidator]);
@@ -64,8 +66,14 @@ export function setUpControl(control: FormControl, dir: NgControl): void {
 }
 
 export function cleanUpControl(control: FormControl, dir: NgControl) {
-  dir.valueAccessor!.registerOnChange(() => _noControlError(dir));
-  dir.valueAccessor!.registerOnTouched(() => _noControlError(dir));
+  const noop = () => {
+    if (typeof ngDevMode === 'undefined' || ngDevMode) {
+      _noControlError(dir);
+    }
+  };
+
+  dir.valueAccessor!.registerOnChange(noop);
+  dir.valueAccessor!.registerOnTouched(noop);
 
   dir._rawValidators.forEach((validator: any) => {
     if (validator.registerOnValidatorChange) {
@@ -120,7 +128,8 @@ function setUpModelChangePipeline(control: FormControl, dir: NgControl): void {
 
 export function setUpFormContainer(
     control: FormGroup|FormArray, dir: AbstractFormGroupDirective|FormArrayName) {
-  if (control == null) _throwError(dir, 'Cannot find control with');
+  if (control == null && (typeof ngDevMode === 'undefined' || ngDevMode))
+    _throwError(dir, 'Cannot find control with');
   control.validator = Validators.compose([control.validator, dir.validator]);
   control.asyncValidator = Validators.composeAsync([control.asyncValidator, dir.asyncValidator]);
 }
@@ -190,7 +199,7 @@ export function selectValueAccessor(
     dir: NgControl, valueAccessors: ControlValueAccessor[]): ControlValueAccessor|null {
   if (!valueAccessors) return null;
 
-  if (!Array.isArray(valueAccessors))
+  if (!Array.isArray(valueAccessors) && (typeof ngDevMode === 'undefined' || ngDevMode))
     _throwError(dir, 'Value accessor was not provided as an array for form control with');
 
   let defaultAccessor: ControlValueAccessor|undefined = undefined;
@@ -202,12 +211,12 @@ export function selectValueAccessor(
       defaultAccessor = v;
 
     } else if (isBuiltInAccessor(v)) {
-      if (builtinAccessor)
+      if (builtinAccessor && (typeof ngDevMode === 'undefined' || ngDevMode))
         _throwError(dir, 'More than one built-in value accessor matches form control with');
       builtinAccessor = v;
 
     } else {
-      if (customAccessor)
+      if (customAccessor && (typeof ngDevMode === 'undefined' || ngDevMode))
         _throwError(dir, 'More than one custom value accessor matches form control with');
       customAccessor = v;
     }
@@ -217,7 +226,9 @@ export function selectValueAccessor(
   if (builtinAccessor) return builtinAccessor;
   if (defaultAccessor) return defaultAccessor;
 
-  _throwError(dir, 'No valid value accessor for form control with');
+  if (typeof ngDevMode === 'undefined' || ngDevMode) {
+    _throwError(dir, 'No valid value accessor for form control with');
+  }
   return null;
 }
 
@@ -234,7 +245,9 @@ export function _ngModelWarning(
 
   if (((warningConfig === null || warningConfig === 'once') && !type._ngModelWarningSentOnce) ||
       (warningConfig === 'always' && !instance._ngModelWarningSent)) {
-    ReactiveErrors.ngModelWarning(name);
+    if (typeof ngDevMode === 'undefined' || ngDevMode) {
+      ReactiveErrors.ngModelWarning(name);
+    }
     type._ngModelWarningSentOnce = true;
     instance._ngModelWarningSent = true;
   }
diff --git a/packages/forms/src/directives/validators.ts b/packages/forms/src/directives/validators.ts
index 16b9183486662..cc28a38614772 100644
--- a/packages/forms/src/directives/validators.ts
+++ b/packages/forms/src/directives/validators.ts
@@ -176,19 +176,17 @@ export class RequiredValidator implements Validator {
   }
 
   /**
-   * @description
    * Method that validates whether the control is empty.
    * Returns the validation result if enabled, otherwise null.
+   * @nodoc
    */
   validate(control: AbstractControl): ValidationErrors|null {
     return this.required ? Validators.required(control) : null;
   }
 
   /**
-   * @description
    * Registers a callback function to call when the validator inputs change.
-   *
-   * @param fn The callback function
+   * @nodoc
    */
   registerOnValidatorChange(fn: () => void): void {
     this._onChange = fn;
@@ -225,9 +223,9 @@ export class RequiredValidator implements Validator {
 })
 export class CheckboxRequiredValidator extends RequiredValidator {
   /**
-   * @description
    * Method that validates whether or not the checkbox has been checked.
    * Returns the validation result if enabled, otherwise null.
+   * @nodoc
    */
   validate(control: AbstractControl): ValidationErrors|null {
     return this.required ? Validators.requiredTrue(control) : null;
@@ -286,19 +284,17 @@ export class EmailValidator implements Validator {
   }
 
   /**
-   * @description
    * Method that validates whether an email address is valid.
    * Returns the validation result if enabled, otherwise null.
+   * @nodoc
    */
   validate(control: AbstractControl): ValidationErrors|null {
     return this._enabled ? Validators.email(control) : null;
   }
 
   /**
-   * @description
    * Registers a callback function to call when the validator inputs change.
-   *
-   * @param fn The callback function
+   * @nodoc
    */
   registerOnValidatorChange(fn: () => void): void {
     this._onChange = fn;
@@ -374,13 +370,7 @@ export class MinLengthValidator implements Validator, OnChanges {
   @Input()
   minlength!: string|number;  // This input is always defined, since the name matches selector.
 
-  /**
-   * @description
-   * A lifecycle method called when the directive's inputs change. For internal use
-   * only.
-   *
-   * @param changes A object of key/value pairs for the set of changed inputs.
-   */
+  /** @nodoc */
   ngOnChanges(changes: SimpleChanges): void {
     if ('minlength' in changes) {
       this._createValidator();
@@ -389,19 +379,17 @@ export class MinLengthValidator implements Validator, OnChanges {
   }
 
   /**
-   * @description
-   * Method that validates whether the value meets a minimum length
-   * requirement. Returns the validation result if enabled, otherwise null.
+   * Method that validates whether the value meets a minimum length requirement.
+   * Returns the validation result if enabled, otherwise null.
+   * @nodoc
    */
   validate(control: AbstractControl): ValidationErrors|null {
     return this.minlength == null ? null : this._validator(control);
   }
 
   /**
-   * @description
    * Registers a callback function to call when the validator inputs change.
-   *
-   * @param fn The callback function
+   * @nodoc
    */
   registerOnValidatorChange(fn: () => void): void {
     this._onChange = fn;
@@ -460,13 +448,7 @@ export class MaxLengthValidator implements Validator, OnChanges {
   @Input()
   maxlength!: string|number;  // This input is always defined, since the name matches selector.
 
-  /**
-   * @description
-   * A lifecycle method called when the directive's inputs change. For internal use
-   * only.
-   *
-   * @param changes A object of key/value pairs for the set of changed inputs.
-   */
+  /** @nodoc */
   ngOnChanges(changes: SimpleChanges): void {
     if ('maxlength' in changes) {
       this._createValidator();
@@ -475,19 +457,16 @@ export class MaxLengthValidator implements Validator, OnChanges {
   }
 
   /**
-   * @description
-   * Method that validates whether the value exceeds
-   * the maximum length requirement.
+   * Method that validates whether the value exceeds the maximum length requirement.
+   * @nodoc
    */
   validate(control: AbstractControl): ValidationErrors|null {
     return this.maxlength != null ? this._validator(control) : null;
   }
 
   /**
-   * @description
    * Registers a callback function to call when the validator inputs change.
-   *
-   * @param fn The callback function
+   * @nodoc
    */
   registerOnValidatorChange(fn: () => void): void {
     this._onChange = fn;
@@ -549,13 +528,7 @@ export class PatternValidator implements Validator, OnChanges {
   @Input()
   pattern!: string|RegExp;  // This input is always defined, since the name matches selector.
 
-  /**
-   * @description
-   * A lifecycle method called when the directive's inputs change. For internal use
-   * only.
-   *
-   * @param changes A object of key/value pairs for the set of changed inputs.
-   */
+  /** @nodoc */
   ngOnChanges(changes: SimpleChanges): void {
     if ('pattern' in changes) {
       this._createValidator();
@@ -564,19 +537,16 @@ export class PatternValidator implements Validator, OnChanges {
   }
 
   /**
-   * @description
-   * Method that validates whether the value matches the
-   * the pattern requirement.
+   * Method that validates whether the value matches the the pattern requirement.
+   * @nodoc
    */
   validate(control: AbstractControl): ValidationErrors|null {
     return this._validator(control);
   }
 
   /**
-   * @description
    * Registers a callback function to call when the validator inputs change.
-   *
-   * @param fn The callback function
+   * @nodoc
    */
   registerOnValidatorChange(fn: () => void): void {
     this._onChange = fn;
diff --git a/packages/forms/src/model.ts b/packages/forms/src/model.ts
index 20af33769fa82..e3356e57263f2 100644
--- a/packages/forms/src/model.ts
+++ b/packages/forms/src/model.ts
@@ -173,8 +173,7 @@ export abstract class AbstractControl {
   // TODO(issue/24571): remove '!'.
   _updateOn!: FormHooks;
 
-  // TODO(issue/24571): remove '!'.
-  private _parent!: FormGroup|FormArray;
+  private _parent: FormGroup|FormArray|null = null;
   private _asyncValidationSubscription: any;
 
   /**
@@ -267,7 +266,7 @@ export abstract class AbstractControl {
   /**
    * The parent control.
    */
-  get parent(): FormGroup|FormArray {
+  get parent(): FormGroup|FormArray|null {
     return this._parent;
   }
 
@@ -1018,7 +1017,7 @@ export abstract class AbstractControl {
    */
   private _parentMarkedDirty(onlySelf?: boolean): boolean {
     const parentDirty = this._parent && this._parent.dirty;
-    return !onlySelf && parentDirty && !this._parent._anyControlsDirty();
+    return !onlySelf && !!parentDirty && !this._parent!._anyControlsDirty();
   }
 }
 
@@ -1149,8 +1148,15 @@ export class FormControl extends AbstractControl {
     super(pickValidators(validatorOrOpts), pickAsyncValidators(asyncValidator, validatorOrOpts));
     this._applyFormState(formState);
     this._setUpdateStrategy(validatorOrOpts);
-    this.updateValueAndValidity({onlySelf: true, emitEvent: false});
     this._initObservables();
+    this.updateValueAndValidity({
+      onlySelf: true,
+      // If `asyncValidator` is present, it will trigger control status change from `PENDING` to
+      // `VALID` or `INVALID`.
+      // The status should be broadcasted via the `statusChanges` observable, so we set `emitEvent`
+      // to `true` to allow that during the control creation process.
+      emitEvent: !!asyncValidator
+    });
   }
 
   /**
@@ -1403,7 +1409,13 @@ export class FormGroup extends AbstractControl {
     this._initObservables();
     this._setUpdateStrategy(validatorOrOpts);
     this._setUpControls();
-    this.updateValueAndValidity({onlySelf: true, emitEvent: false});
+    this.updateValueAndValidity({
+      onlySelf: true,
+      // If `asyncValidator` is present, it will trigger control status change from `PENDING` to
+      // `VALID` or `INVALID`. The status should be broadcasted via the `statusChanges` observable,
+      // so we set `emitEvent` to `true` to allow that during the control creation process.
+      emitEvent: !!asyncValidator
+    });
   }
 
   /**
@@ -1566,7 +1578,7 @@ export class FormGroup extends AbstractControl {
   }
 
   /**
-   * Resets the `FormGroup`, marks all descendants are marked `pristine` and `untouched`, and
+   * Resets the `FormGroup`, marks all descendants `pristine` and `untouched` and sets
    * the value of all descendants to null.
    *
    * You reset to a specific form state by passing in a map of states
@@ -1659,7 +1671,7 @@ export class FormGroup extends AbstractControl {
   _throwIfControlMissing(name: string): void {
     if (!Object.keys(this.controls).length) {
       throw new Error(`
-        There are no form controls registered with this group yet.  If you're using ngModel,
+        There are no form controls registered with this group yet. If you're using ngModel,
         you may want to check next tick (e.g. use setTimeout).
       `);
     }
@@ -1823,7 +1835,14 @@ export class FormArray extends AbstractControl {
     this._initObservables();
     this._setUpdateStrategy(validatorOrOpts);
     this._setUpControls();
-    this.updateValueAndValidity({onlySelf: true, emitEvent: false});
+    this.updateValueAndValidity({
+      onlySelf: true,
+      // If `asyncValidator` is present, it will trigger control status change from `PENDING` to
+      // `VALID` or `INVALID`.
+      // The status should be broadcasted via the `statusChanges` observable, so we set `emitEvent`
+      // to `true` to allow that during the control creation process.
+      emitEvent: !!asyncValidator
+    });
   }
 
   /**
@@ -2101,7 +2120,7 @@ export class FormArray extends AbstractControl {
   _throwIfControlMissing(index: number): void {
     if (!this.controls.length) {
       throw new Error(`
-        There are no form controls registered with this array yet.  If you're using ngModel,
+        There are no form controls registered with this array yet. If you're using ngModel,
         you may want to check next tick (e.g. use setTimeout).
       `);
     }
diff --git a/packages/forms/src/validators.ts b/packages/forms/src/validators.ts
index d2fb2bbf8620d..d45286a370abf 100644
--- a/packages/forms/src/validators.ts
+++ b/packages/forms/src/validators.ts
@@ -469,7 +469,7 @@ function isPresent(o: any): boolean {
 
 export function toObservable(r: any): Observable<any> {
   const obs = isPromise(r) ? from(r) : r;
-  if (!(isObservable(obs))) {
+  if (!(isObservable(obs)) && (typeof ngDevMode === 'undefined' || ngDevMode)) {
     throw new Error(`Expected validator to return Promise or Observable.`);
   }
   return obs;
diff --git a/packages/forms/test/directives_spec.ts b/packages/forms/test/directives_spec.ts
index dd497dc30c2ed..419ca1e413bb1 100644
--- a/packages/forms/test/directives_spec.ts
+++ b/packages/forms/test/directives_spec.ts
@@ -231,8 +231,9 @@ class CustomValidatorDirective implements Validator {
       });
 
       describe('addFormGroup', () => {
-        const matchingPasswordsValidator = (g: FormGroup) => {
-          if (g.controls['password'].value != g.controls['passwordConfirm'].value) {
+        const matchingPasswordsValidator = (g: AbstractControl) => {
+          const controls = (g as FormGroup).controls;
+          if (controls['password'].value != controls['passwordConfirm'].value) {
             return {'differentPasswords': true};
           } else {
             return null;
diff --git a/packages/forms/test/form_group_spec.ts b/packages/forms/test/form_group_spec.ts
index 316a3c86a82b7..1660611ed1b29 100644
--- a/packages/forms/test/form_group_spec.ts
+++ b/packages/forms/test/form_group_spec.ts
@@ -1825,6 +1825,391 @@ describe('FormGroup', () => {
     });
   });
 
+  describe('emit `statusChanges` and `valueChanges` with/without async/sync validators', () => {
+    const attachEventsLogger = (control: AbstractControl, log: string[], controlName?: string) => {
+      const name = controlName ? ` (${controlName})` : '';
+      control.statusChanges.subscribe(status => log.push(`status${name}: ${status}`));
+      control.valueChanges.subscribe(value => log.push(`value${name}: ${JSON.stringify(value)}`));
+    };
+
+    describe('stand alone controls', () => {
+      it('should run the async validator on stand alone controls and set status to `INVALID`',
+         fakeAsync(() => {
+           const logs: string[] = [];
+           const c =
+               new FormControl('', null, simpleAsyncValidator({timeout: 0, shouldFail: true}));
+
+           attachEventsLogger(c, logs);
+
+           expect(logs.length).toBe(0);
+
+           tick(1);
+
+           c.setValue('new!', {emitEvent: true});
+
+           tick(1);
+
+           // Note that above `simpleAsyncValidator` is called with `timeout:0`.  When the timeout
+           // is set to `0`, the function returns `of(error)`, and the function behaves in a
+           // synchronous manner. Because of this there is no `PENDING` state as seen in the
+           // `logs`.
+           expect(logs).toEqual([
+             'status: INVALID',  // status change emitted as a result of initial async validator run
+             'value: "new!"',    // value change emitted by `setValue`
+             'status: INVALID'   // async validator run after `setValue` call
+           ]);
+         }));
+
+      it('should run the async validator on stand alone controls and set status to `VALID`',
+         fakeAsync(() => {
+           const logs: string[] = [];
+           const c = new FormControl('', null, asyncValidator('new!'));
+
+           attachEventsLogger(c, logs);
+
+           expect(logs.length).toBe(0);
+
+           tick(1);
+
+           c.setValue('new!', {emitEvent: true});
+
+           tick(1);
+
+           expect(logs).toEqual([
+             'status: INVALID',  // status change emitted as a result of initial async validator run
+             'value: "new!"',    // value change emitted by `setValue`
+             'status: PENDING',  // status change emitted by `setValue`
+             'status: VALID'     // async validator run after `setValue` call
+           ]);
+         }));
+
+      it('should run the async validator on stand alone controls, include `PENDING` and set status to `INVALID`',
+         fakeAsync(() => {
+           const logs: string[] = [];
+           const c =
+               new FormControl('', null, simpleAsyncValidator({timeout: 1, shouldFail: true}));
+
+           attachEventsLogger(c, logs);
+
+           expect(logs.length).toBe(0);
+
+           tick(1);
+
+           c.setValue('new!', {emitEvent: true});
+
+           tick(1);
+
+           expect(logs).toEqual([
+             'status: INVALID',  // status change emitted as a result of initial async validator run
+             'value: "new!"',    // value change emitted by `setValue`
+             'status: PENDING',  // status change emitted by `setValue`
+             'status: INVALID'   // async validator run after `setValue` call
+           ]);
+         }));
+
+      it('should run setValue before the initial async validator and set status to `VALID`',
+         fakeAsync(() => {
+           const logs: string[] = [];
+           const c = new FormControl('', null, asyncValidator('new!'));
+
+           attachEventsLogger(c, logs);
+
+           expect(logs.length).toBe(0);
+
+           c.setValue('new!', {emitEvent: true});
+
+           tick(1);
+
+           // The `setValue` call invoked synchronously cancels the initial run of the
+           // `asyncValidator` (which would cause the control status to be changed to `INVALID`), so
+           // the log contains only events after calling `setValue`.
+           expect(logs).toEqual([
+             'value: "new!"',    // value change emitted by `setValue`
+             'status: PENDING',  // status change emitted by `setValue`
+             'status: VALID'     // async validator run after `setValue` call
+           ]);
+         }));
+
+      it('should run setValue before the initial async validator and set status to `INVALID`',
+         fakeAsync(() => {
+           const logs: string[] = [];
+           const c =
+               new FormControl('', null, simpleAsyncValidator({timeout: 1, shouldFail: true}));
+
+           attachEventsLogger(c, logs);
+
+           expect(logs.length).toBe(0);
+
+           c.setValue('new!', {emitEvent: true});
+
+           tick(1);
+
+           // The `setValue` call invoked synchronously cancels the initial run of the
+           // `asyncValidator` (which would cause the control status to be changed to `INVALID`), so
+           // the log contains only events after calling `setValue`.
+           expect(logs).toEqual([
+             'value: "new!"',    // value change emitted by `setValue`
+             'status: PENDING',  // status change emitted by `setValue`
+             'status: INVALID'   // async validator run after `setValue` call
+           ]);
+         }));
+
+      it('should cancel initial run of the async validator and not emit anything', fakeAsync(() => {
+           const logger: string[] = [];
+           const c =
+               new FormControl('', null, simpleAsyncValidator({timeout: 1, shouldFail: true}));
+
+           attachEventsLogger(c, logger);
+
+           expect(logger.length).toBe(0);
+
+           c.setValue('new!', {emitEvent: false});
+
+           tick(1);
+
+           // Because we are calling `setValue` with `emitEvent: false`, nothing is emitted
+           // and our logger remains empty
+           expect(logger).toEqual([]);
+         }));
+
+      it('should run the sync validator on stand alone controls and set status to `INVALID`',
+         fakeAsync(() => {
+           const logs: string[] = [];
+           const c = new FormControl('new!', Validators.required);
+
+           attachEventsLogger(c, logs);
+
+           expect(logs.length).toBe(0);
+
+           tick(1);
+
+           c.setValue('', {emitEvent: true});
+
+           tick(1);
+
+           expect(logs).toEqual([
+             'value: ""',       // value change emitted by `setValue`
+             'status: INVALID'  // status change emitted by `setValue`
+           ]);
+         }));
+
+      it('should run the sync validator on stand alone controls and set status to `VALID`',
+         fakeAsync(() => {
+           const logs: string[] = [];
+           const c = new FormControl('', Validators.required);
+
+           attachEventsLogger(c, logs);
+
+           expect(logs.length).toBe(0);
+
+           tick(1);
+
+           c.setValue('new!', {emitEvent: true});
+
+           tick(1);
+
+           expect(logs).toEqual([
+             'value: "new!"',  // value change emitted by `setValue`
+             'status: VALID'   // status change emitted by `setValue`
+           ]);
+         }));
+    });
+
+    describe('combination of multiple form controls', () => {
+      it('should run the async validator on the FormControl added to the FormGroup and set status to `VALID`',
+         fakeAsync(() => {
+           const logs: string[] = [];
+           const c1 = new FormControl('one');
+           const g1 = new FormGroup({'one': c1});
+
+           // Initial state of the controls
+           expect(currentStateOf([c1, g1])).toEqual([
+             {errors: null, pending: false, status: 'VALID'},  // Control 1
+             {errors: null, pending: false, status: 'VALID'},  // Group
+           ]);
+
+           attachEventsLogger(g1, logs, 'g1');
+
+           const c2 = new FormControl('new!', null, asyncValidator('new!'));
+
+           attachEventsLogger(c2, logs, 'c2');
+
+           // Initial state of the new control
+           expect(currentStateOf([c2])).toEqual([
+             {errors: null, pending: true, status: 'PENDING'},  // Control 2
+           ]);
+
+           expect(logs.length).toBe(0);
+
+           g1.setControl('one', c2);
+
+           tick(1);
+
+           expect(logs).toEqual([
+             'value (g1): {"one":"new!"}',  // value change emitted by `setControl`
+             'status (g1): PENDING',        // value change emitted by `setControl`
+             'status (c2): VALID',          // async validator run after `setControl` call
+             'status (g1): VALID'           // status changed from the `setControl` call
+           ]);
+
+           // Final state of all controls
+           expect(currentStateOf([g1, c2])).toEqual([
+             {errors: null, pending: false, status: 'VALID'},  // Group
+             {errors: null, pending: false, status: 'VALID'},  // Control 2
+           ]);
+         }));
+
+      it('should run the async validator on the FormControl added to the FormGroup and set status to `INVALID`',
+         fakeAsync(() => {
+           const logs: string[] = [];
+           const c1 = new FormControl('one');
+           const g1 = new FormGroup({'one': c1});
+
+           // Initial state of the controls
+           expect(currentStateOf([c1, g1])).toEqual([
+             {errors: null, pending: false, status: 'VALID'},  // Control 1
+             {errors: null, pending: false, status: 'VALID'},  // Group
+           ]);
+
+           attachEventsLogger(g1, logs, 'g1');
+
+           const c2 =
+               new FormControl('new!', null, simpleAsyncValidator({timeout: 1, shouldFail: true}));
+
+           attachEventsLogger(c2, logs, 'c2');
+
+           // Initial state of the new control
+           expect(currentStateOf([c2])).toEqual([
+             {errors: null, pending: true, status: 'PENDING'},  // Control 2
+           ]);
+
+           expect(logs.length).toBe(0);
+
+           g1.setControl('one', c2);
+
+           tick(1);
+
+           expect(logs).toEqual([
+             'value (g1): {"one":"new!"}',
+             'status (g1): PENDING',  // g1 async validator is invoked after `g1.setControl` call
+             'status (c2): INVALID',  // c2 async validator trigger at c2 init, completed with the
+                                      // `INVALID` status
+             'status (g1): INVALID'   // g1 validator completed with the `INVALID` status
+           ]);
+
+           // Final state of all controls
+           expect(currentStateOf([g1, c2])).toEqual([
+             {errors: null, pending: false, status: 'INVALID'},           // Group
+             {errors: {async: true}, pending: false, status: 'INVALID'},  // Control 2
+           ]);
+         }));
+
+      it('should run the async validator at `FormControl` and `FormGroup` level and set status to `INVALID`',
+         fakeAsync(() => {
+           const logs: string[] = [];
+           const c1 = new FormControl('one');
+           const g1 = new FormGroup(
+               {'one': c1}, null, simpleAsyncValidator({timeout: 1, shouldFail: true}));
+
+           // Initial state of the controls
+           expect(currentStateOf([c1, g1])).toEqual([
+             {errors: null, pending: false, status: 'VALID'},   // Control 1
+             {errors: null, pending: true, status: 'PENDING'},  // Group
+           ]);
+
+           attachEventsLogger(g1, logs, 'g1');
+
+           const c2 =
+               new FormControl('new!', null, simpleAsyncValidator({timeout: 1, shouldFail: true}));
+
+           attachEventsLogger(c2, logs, 'c2');
+
+           // Initial state of the new control
+           expect(currentStateOf([c2])).toEqual([
+             {errors: null, pending: true, status: 'PENDING'},  // Control 2
+           ]);
+
+           expect(logs.length).toBe(0);
+
+           g1.setControl('one', c2);
+
+           tick(1);
+
+           expect(logs).toEqual([
+             'value (g1): {"one":"new!"}',
+             'status (g1): PENDING',  // g1 async validator is invoked after `g1.setControl` call
+             'status (c2): INVALID',  // c2 async validator trigger at c2 init, completed with the
+                                      // `INVALID` status
+             'status (g1): PENDING',  // c2 update triggered g1 to re-run validation
+             'status (g1): INVALID'   // g1 validator completed with the `INVALID` status
+           ]);
+
+           // Final state of all controls
+           expect(currentStateOf([g1, c2])).toEqual([
+             {errors: {async: true}, pending: false, status: 'INVALID'},  // Group
+             {errors: {async: true}, pending: false, status: 'INVALID'},  // Control 2
+           ]);
+         }));
+
+      it('should run the async validator on a `FormArray` and a `FormControl` and status to `INVALID`',
+         fakeAsync(() => {
+           const logs: string[] = [];
+           const c1 = new FormControl('one');
+           const g1 = new FormGroup(
+               {'one': c1}, null, simpleAsyncValidator({timeout: 1, shouldFail: true}));
+           const fa =
+               new FormArray([g1], null!, simpleAsyncValidator({timeout: 1, shouldFail: true}));
+
+           attachEventsLogger(g1, logs, 'g1');
+
+           // Initial state of the controls
+           expect(currentStateOf([c1, g1, fa])).toEqual([
+             {errors: null, pending: false, status: 'VALID'},   // Control 1
+             {errors: null, pending: true, status: 'PENDING'},  // Group
+             {errors: null, pending: true, status: 'PENDING'},  // FormArray
+           ]);
+
+           attachEventsLogger(fa, logs, 'fa');
+
+           const c2 =
+               new FormControl('new!', null, simpleAsyncValidator({timeout: 1, shouldFail: true}));
+
+           attachEventsLogger(c2, logs, 'c2');
+
+           // Initial state of the new control
+           expect(currentStateOf([c2])).toEqual([
+             {errors: null, pending: true, status: 'PENDING'},  // Control 2
+           ]);
+
+           expect(logs.length).toBe(0);
+
+           g1.setControl('one', c2);
+
+           tick(1);
+
+           expect(logs).toEqual([
+             'value (g1): {"one":"new!"}',    // g1's call to `setControl` triggered value update
+             'status (g1): PENDING',          // g1's call to `setControl` triggered status update
+             'value (fa): [{"one":"new!"}]',  // g1 update triggers the `FormArray` value update
+             'status (fa): PENDING',          // g1 update triggers the `FormArray` status update
+             'status (c2): INVALID',          // async validator run after `setControl` call
+             'status (g1): PENDING',          // async validator run after `setControl` call
+             'status (fa): PENDING',          // async validator run after `setControl` call
+             'status (g1): INVALID',          // g1 validator completed with the `INVALID` status
+             'status (fa): PENDING',          // fa validator still running
+             'status (fa): INVALID'           // fa validator completed with the `INVALID` status
+           ]);
+
+           // Final state of all controls
+           expect(currentStateOf([g1, fa, c2])).toEqual([
+             {errors: {async: true}, pending: false, status: 'INVALID'},  // Group
+             {errors: {async: true}, pending: false, status: 'INVALID'},  // FormArray
+             {errors: {async: true}, pending: false, status: 'INVALID'},  // Control 2
+           ]);
+         }));
+    });
+  });
+
   describe('pending', () => {
     let c: FormControl;
     let g: FormGroup;
diff --git a/packages/language-service/BUILD.bazel b/packages/language-service/BUILD.bazel
index 320cc2399550d..7869219b68fba 100644
--- a/packages/language-service/BUILD.bazel
+++ b/packages/language-service/BUILD.bazel
@@ -19,6 +19,7 @@ ts_library(
         "//packages/compiler",
         "//packages/compiler-cli",
         "//packages/core",
+        "//packages/language-service/common",
         "@npm//@types/node",
         "@npm//typescript",
     ],
diff --git a/packages/language-service/common/BUILD.bazel b/packages/language-service/common/BUILD.bazel
new file mode 100644
index 0000000000000..afe8f39b56e87
--- /dev/null
+++ b/packages/language-service/common/BUILD.bazel
@@ -0,0 +1,11 @@
+load("//tools:defaults.bzl", "ts_library")
+
+package(default_visibility = ["//packages/language-service:__subpackages__"])
+
+ts_library(
+    name = "common",
+    srcs = glob(["*.ts"]),
+    deps = [
+        "@npm//typescript",
+    ],
+)
diff --git a/packages/language-service/common/definitions.ts b/packages/language-service/common/definitions.ts
new file mode 100644
index 0000000000000..7e38cd8f8f184
--- /dev/null
+++ b/packages/language-service/common/definitions.ts
@@ -0,0 +1,107 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {findTightestNode, getClassDeclFromDecoratorProp, getPropertyAssignmentFromValue} from './ts_utils';
+
+export interface ResourceResolver {
+  /**
+   * Resolve the url of a resource relative to the file that contains the reference to it.
+   *
+   * @param file The, possibly relative, url of the resource.
+   * @param basePath The path to the file that contains the URL of the resource.
+   * @returns A resolved url of resource.
+   * @throws An error if the resource cannot be resolved.
+   */
+  resolve(file: string, basePath: string): string;
+}
+
+/**
+ * Gets an Angular-specific definition in a TypeScript source file.
+ */
+export function getTsDefinitionAndBoundSpan(
+    sf: ts.SourceFile, position: number,
+    resourceResolver: ResourceResolver): ts.DefinitionInfoAndBoundSpan|undefined {
+  const node = findTightestNode(sf, position);
+  if (!node) return;
+  switch (node.kind) {
+    case ts.SyntaxKind.StringLiteral:
+    case ts.SyntaxKind.NoSubstitutionTemplateLiteral:
+      // Attempt to extract definition of a URL in a property assignment.
+      return getUrlFromProperty(node as ts.StringLiteralLike, resourceResolver);
+    default:
+      return undefined;
+  }
+}
+
+/**
+ * Attempts to get the definition of a file whose URL is specified in a property assignment in a
+ * directive decorator.
+ * Currently applies to `templateUrl` and `styleUrls` properties.
+ */
+function getUrlFromProperty(urlNode: ts.StringLiteralLike, resourceResolver: ResourceResolver):
+    ts.DefinitionInfoAndBoundSpan|undefined {
+  // Get the property assignment node corresponding to the `templateUrl` or `styleUrls` assignment.
+  // These assignments are specified differently; `templateUrl` is a string, and `styleUrls` is
+  // an array of strings:
+  //   {
+  //        templateUrl: './template.ng.html',
+  //        styleUrls: ['./style.css', './other-style.css']
+  //   }
+  // `templateUrl`'s property assignment can be found from the string literal node;
+  // `styleUrls`'s property assignment can be found from the array (parent) node.
+  //
+  // First search for `templateUrl`.
+  let asgn = getPropertyAssignmentFromValue(urlNode, 'templateUrl');
+  if (!asgn) {
+    // `templateUrl` assignment not found; search for `styleUrls` array assignment.
+    asgn = getPropertyAssignmentFromValue(urlNode.parent, 'styleUrls');
+    if (!asgn) {
+      // Nothing found, bail.
+      return;
+    }
+  }
+
+  // If the property assignment is not a property of a class decorator, don't generate definitions
+  // for it.
+  if (!getClassDeclFromDecoratorProp(asgn)) {
+    return;
+  }
+
+  const sf = urlNode.getSourceFile();
+  let url: string;
+  try {
+    url = resourceResolver.resolve(urlNode.text, sf.fileName);
+  } catch {
+    // If the file does not exist, bail.
+    return;
+  }
+
+  const templateDefinitions: ts.DefinitionInfo[] = [{
+    kind: ts.ScriptElementKind.externalModuleName,
+    name: url,
+    containerKind: ts.ScriptElementKind.unknown,
+    containerName: '',
+    // Reading the template is expensive, so don't provide a preview.
+    // TODO(ayazhafiz): Consider providing an actual span:
+    //  1. We're likely to read the template anyway
+    //  2. We could show just the first 100 chars or so
+    textSpan: {start: 0, length: 0},
+    fileName: url,
+  }];
+
+  return {
+    definitions: templateDefinitions,
+    textSpan: {
+      // Exclude opening and closing quotes in the url span.
+      start: urlNode.getStart() + 1,
+      length: urlNode.getWidth() - 2,
+    },
+  };
+}
diff --git a/packages/language-service/common/quick_info.ts b/packages/language-service/common/quick_info.ts
new file mode 100644
index 0000000000000..9f1076e98a1a9
--- /dev/null
+++ b/packages/language-service/common/quick_info.ts
@@ -0,0 +1,60 @@
+/**
+ * @license
+ * Copyright Google LLC 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';
+
+// Reverse mappings of enum would generate strings
+export const ALIAS_NAME = ts.SymbolDisplayPartKind[ts.SymbolDisplayPartKind.aliasName];
+export const SYMBOL_INTERFACE = ts.SymbolDisplayPartKind[ts.SymbolDisplayPartKind.interfaceName];
+export const SYMBOL_PUNC = ts.SymbolDisplayPartKind[ts.SymbolDisplayPartKind.punctuation];
+export const SYMBOL_SPACE = ts.SymbolDisplayPartKind[ts.SymbolDisplayPartKind.space];
+export const SYMBOL_TEXT = ts.SymbolDisplayPartKind[ts.SymbolDisplayPartKind.text];
+
+/**
+ * Construct a QuickInfo object taking into account its container and type.
+ * @param name Name of the QuickInfo target
+ * @param kind component, directive, pipe, etc.
+ * @param textSpan span of the target
+ * @param containerName either the Symbol's container or the NgModule that contains the directive
+ * @param type user-friendly name of the type
+ * @param documentation docstring or comment
+ */
+export function createQuickInfo(
+    name: string, kind: string, textSpan: ts.TextSpan, containerName?: string, type?: string,
+    documentation?: ts.SymbolDisplayPart[]): ts.QuickInfo {
+  const containerDisplayParts = containerName ?
+      [
+        {text: containerName, kind: SYMBOL_INTERFACE},
+        {text: '.', kind: SYMBOL_PUNC},
+      ] :
+      [];
+
+  const typeDisplayParts = type ?
+      [
+        {text: ':', kind: SYMBOL_PUNC},
+        {text: ' ', kind: SYMBOL_SPACE},
+        {text: type, kind: SYMBOL_INTERFACE},
+      ] :
+      [];
+
+  return {
+    kind: kind as ts.ScriptElementKind,
+    kindModifiers: ts.ScriptElementKindModifier.none,
+    textSpan: textSpan,
+    displayParts: [
+      {text: '(', kind: SYMBOL_PUNC},
+      {text: kind, kind: SYMBOL_TEXT},
+      {text: ')', kind: SYMBOL_PUNC},
+      {text: ' ', kind: SYMBOL_SPACE},
+      ...containerDisplayParts,
+      {text: name, kind: SYMBOL_INTERFACE},
+      ...typeDisplayParts,
+    ],
+    documentation,
+  };
+}
diff --git a/packages/language-service/common/ts_utils.ts b/packages/language-service/common/ts_utils.ts
new file mode 100644
index 0000000000000..3ff50242e0afc
--- /dev/null
+++ b/packages/language-service/common/ts_utils.ts
@@ -0,0 +1,87 @@
+/**
+ * @license
+ * Copyright Google LLC 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';
+
+/**
+ * Return the node that most tightly encompass the specified `position`.
+ * @param node
+ * @param position
+ */
+export function findTightestNode(node: ts.Node, position: number): ts.Node|undefined {
+  if (node.getStart() <= position && position < node.getEnd()) {
+    return node.forEachChild(c => findTightestNode(c, position)) || node;
+  }
+}
+
+/**
+ * Returns a property assignment from the assignment value if the property name
+ * matches the specified `key`, or `undefined` if there is no match.
+ */
+export function getPropertyAssignmentFromValue(value: ts.Node, key: string): ts.PropertyAssignment|
+    undefined {
+  const propAssignment = value.parent;
+  if (!propAssignment || !ts.isPropertyAssignment(propAssignment) ||
+      propAssignment.name.getText() !== key) {
+    return;
+  }
+  return propAssignment;
+}
+
+/**
+ * Given a decorator property assignment, return the ClassDeclaration node that corresponds to the
+ * directive class the property applies to.
+ * If the property assignment is not on a class decorator, no declaration is returned.
+ *
+ * For example,
+ *
+ * @Component({
+ *   template: '<div></div>'
+ *   ^^^^^^^^^^^^^^^^^^^^^^^---- property assignment
+ * })
+ * class AppComponent {}
+ *           ^---- class declaration node
+ *
+ * @param propAsgnNode property assignment
+ */
+export function getClassDeclFromDecoratorProp(propAsgnNode: ts.PropertyAssignment):
+    ts.ClassDeclaration|undefined {
+  if (!propAsgnNode.parent || !ts.isObjectLiteralExpression(propAsgnNode.parent)) {
+    return;
+  }
+  const objLitExprNode = propAsgnNode.parent;
+  if (!objLitExprNode.parent || !ts.isCallExpression(objLitExprNode.parent)) {
+    return;
+  }
+  const callExprNode = objLitExprNode.parent;
+  if (!callExprNode.parent || !ts.isDecorator(callExprNode.parent)) {
+    return;
+  }
+  const decorator = callExprNode.parent;
+  if (!decorator.parent || !ts.isClassDeclaration(decorator.parent)) {
+    return;
+  }
+  const classDeclNode = decorator.parent;
+  return classDeclNode;
+}
+
+/**
+ * Given the node which is the string of the inline template for a component, returns the
+ * `ts.ClassDeclaration` for the component.
+ */
+export function getClassDeclOfInlineTemplateNode(templateStringNode: ts.Node): ts.ClassDeclaration|
+    undefined {
+  if (!ts.isStringLiteralLike(templateStringNode)) {
+    return;
+  }
+  const tmplAsgn = getPropertyAssignmentFromValue(templateStringNode, 'template');
+  if (!tmplAsgn) {
+    return;
+  }
+  return getClassDeclFromDecoratorProp(tmplAsgn);
+}
diff --git a/packages/language-service/ivy/BUILD.bazel b/packages/language-service/ivy/BUILD.bazel
index f71c4b7141ca7..c8df602d71c99 100644
--- a/packages/language-service/ivy/BUILD.bazel
+++ b/packages/language-service/ivy/BUILD.bazel
@@ -6,8 +6,18 @@ ts_library(
     name = "ivy",
     srcs = glob(["*.ts"]),
     deps = [
+        "//packages/compiler",
         "//packages/compiler-cli",
-        "//packages/language-service/ivy/compiler",
+        "//packages/compiler-cli/src/ngtsc/core",
+        "//packages/compiler-cli/src/ngtsc/core:api",
+        "//packages/compiler-cli/src/ngtsc/file_system",
+        "//packages/compiler-cli/src/ngtsc/incremental",
+        "//packages/compiler-cli/src/ngtsc/reflection",
+        "//packages/compiler-cli/src/ngtsc/resource",
+        "//packages/compiler-cli/src/ngtsc/shims",
+        "//packages/compiler-cli/src/ngtsc/typecheck",
+        "//packages/compiler-cli/src/ngtsc/typecheck/api",
+        "//packages/language-service/common",
         "@npm//typescript",
     ],
 )
diff --git a/packages/language-service/ivy/compiler/BUILD.bazel b/packages/language-service/ivy/compiler/BUILD.bazel
deleted file mode 100644
index 22c25e3ba19b9..0000000000000
--- a/packages/language-service/ivy/compiler/BUILD.bazel
+++ /dev/null
@@ -1,17 +0,0 @@
-load("//tools:defaults.bzl", "ts_library")
-
-package(default_visibility = ["//packages/language-service/ivy:__pkg__"])
-
-ts_library(
-    name = "compiler",
-    srcs = glob(["*.ts"]),
-    deps = [
-        "//packages/compiler-cli",
-        "//packages/compiler-cli/src/ngtsc/core",
-        "//packages/compiler-cli/src/ngtsc/file_system",
-        "//packages/compiler-cli/src/ngtsc/incremental",
-        "//packages/compiler-cli/src/ngtsc/typecheck",
-        "//packages/compiler-cli/src/ngtsc/typecheck/api",
-        "@npm//typescript",
-    ],
-)
diff --git a/packages/language-service/ivy/compiler/README.md b/packages/language-service/ivy/compiler/README.md
deleted file mode 100644
index 2945bc7dac0ef..0000000000000
--- a/packages/language-service/ivy/compiler/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-All files in this directory are temporary. This is created to simulate the final
-form of the Ivy compiler that supports language service.
diff --git a/packages/language-service/ivy/compiler/compiler.ts b/packages/language-service/ivy/compiler/compiler.ts
deleted file mode 100644
index 9454666ffb201..0000000000000
--- a/packages/language-service/ivy/compiler/compiler.ts
+++ /dev/null
@@ -1,124 +0,0 @@
-
-/**
- * @license
- * Copyright Google LLC 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 {CompilerOptions} from '@angular/compiler-cli';
-import {NgCompiler, NgCompilerHost} from '@angular/compiler-cli/src/ngtsc/core';
-import {absoluteFromSourceFile, AbsoluteFsPath} from '@angular/compiler-cli/src/ngtsc/file_system';
-import {PatchedProgramIncrementalBuildStrategy} from '@angular/compiler-cli/src/ngtsc/incremental';
-import {TypeCheckShimGenerator} from '@angular/compiler-cli/src/ngtsc/typecheck';
-import {TypeCheckingProgramStrategy, UpdateMode} from '@angular/compiler-cli/src/ngtsc/typecheck/api';
-import * as ts from 'typescript/lib/tsserverlibrary';
-
-import {makeCompilerHostFromProject} from './compiler_host';
-
-interface AnalysisResult {
-  compiler: NgCompiler;
-  program: ts.Program;
-}
-
-export class Compiler {
-  private tsCompilerHost: ts.CompilerHost;
-  private lastKnownProgram: ts.Program|null = null;
-  private readonly strategy: TypeCheckingProgramStrategy;
-
-  constructor(private readonly project: ts.server.Project, private options: CompilerOptions) {
-    this.tsCompilerHost = makeCompilerHostFromProject(project);
-    this.strategy = createTypeCheckingProgramStrategy(project);
-    // Do not retrieve the program in constructor because project is still in
-    // the process of loading, and not all data members have been initialized.
-  }
-
-  setCompilerOptions(options: CompilerOptions) {
-    this.options = options;
-  }
-
-  analyze(): AnalysisResult|undefined {
-    const inputFiles = this.project.getRootFiles();
-    const ngCompilerHost =
-        NgCompilerHost.wrap(this.tsCompilerHost, inputFiles, this.options, this.lastKnownProgram);
-    const program = this.strategy.getProgram();
-    const compiler = new NgCompiler(
-        ngCompilerHost, this.options, program, this.strategy,
-        new PatchedProgramIncrementalBuildStrategy(), this.lastKnownProgram);
-    try {
-      // This is the only way to force the compiler to update the typecheck file
-      // in the program. We have to do try-catch because the compiler immediately
-      // throws if it fails to parse any template in the entire program!
-      const d = compiler.getDiagnostics();
-      if (d.length) {
-        // There could be global compilation errors. It's useful to print them
-        // out in development.
-        console.error(d.map(d => ts.flattenDiagnosticMessageText(d.messageText, '\n')));
-      }
-    } catch (e) {
-      console.error('Failed to analyze program', e.message);
-      return;
-    }
-    this.lastKnownProgram = compiler.getNextProgram();
-    return {
-      compiler,
-      program: this.lastKnownProgram,
-    };
-  }
-}
-
-function createTypeCheckingProgramStrategy(project: ts.server.Project):
-    TypeCheckingProgramStrategy {
-  return {
-    supportsInlineOperations: false,
-    shimPathForComponent(component: ts.ClassDeclaration): AbsoluteFsPath {
-      return TypeCheckShimGenerator.shimFor(absoluteFromSourceFile(component.getSourceFile()));
-    },
-    getProgram(): ts.Program {
-      const program = project.getLanguageService().getProgram();
-      if (!program) {
-        throw new Error('Language service does not have a program!');
-      }
-      return program;
-    },
-    updateFiles(contents: Map<AbsoluteFsPath, string>, updateMode: UpdateMode) {
-      if (updateMode !== UpdateMode.Complete) {
-        throw new Error(`Incremental update mode is currently not supported`);
-      }
-      for (const [fileName, newText] of contents) {
-        const scriptInfo = getOrCreateTypeCheckScriptInfo(project, fileName);
-        const snapshot = scriptInfo.getSnapshot();
-        const length = snapshot.getLength();
-        scriptInfo.editContent(0, length, newText);
-      }
-    },
-  };
-}
-
-function getOrCreateTypeCheckScriptInfo(
-    project: ts.server.Project, tcf: string): ts.server.ScriptInfo {
-  // First check if there is already a ScriptInfo for the tcf
-  const {projectService} = project;
-  let scriptInfo = projectService.getScriptInfo(tcf);
-  if (!scriptInfo) {
-    // ScriptInfo needs to be opened by client to be able to set its user-defined
-    // content. We must also provide file content, otherwise the service will
-    // attempt to fetch the content from disk and fail.
-    scriptInfo = projectService.getOrCreateScriptInfoForNormalizedPath(
-        ts.server.toNormalizedPath(tcf),
-        true,              // openedByClient
-        '',                // fileContent
-        ts.ScriptKind.TS,  // scriptKind
-    );
-    if (!scriptInfo) {
-      throw new Error(`Failed to create script info for ${tcf}`);
-    }
-  }
-  // Add ScriptInfo to project if it's missing. A ScriptInfo needs to be part of
-  // the project so that it becomes part of the program.
-  if (!project.containsScriptInfo(scriptInfo)) {
-    project.addRoot(scriptInfo);
-  }
-  return scriptInfo;
-}
diff --git a/packages/language-service/ivy/compiler/compiler_host.ts b/packages/language-service/ivy/compiler/compiler_host.ts
deleted file mode 100644
index f417ed2541436..0000000000000
--- a/packages/language-service/ivy/compiler/compiler_host.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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/lib/tsserverlibrary';
-
-export function makeCompilerHostFromProject(project: ts.server.Project): ts.CompilerHost {
-  const compilerHost: ts.CompilerHost = {
-    fileExists(fileName: string): boolean {
-      return project.fileExists(fileName);
-    },
-    readFile(fileName: string): string |
-        undefined {
-          return project.readFile(fileName);
-        },
-    directoryExists(directoryName: string): boolean {
-      return project.directoryExists(directoryName);
-    },
-    getCurrentDirectory(): string {
-      return project.getCurrentDirectory();
-    },
-    getDirectories(path: string): string[] {
-      return project.getDirectories(path);
-    },
-    getSourceFile(
-        fileName: string, languageVersion: ts.ScriptTarget, onError?: (message: string) => void,
-        shouldCreateNewSourceFile?: boolean): ts.SourceFile |
-        undefined {
-          const path = project.projectService.toPath(fileName);
-          return project.getSourceFile(path);
-        },
-    getSourceFileByPath(
-        fileName: string, path: ts.Path, languageVersion: ts.ScriptTarget,
-        onError?: (message: string) => void, shouldCreateNewSourceFile?: boolean): ts.SourceFile |
-        undefined {
-          return project.getSourceFile(path);
-        },
-    getCancellationToken(): ts.CancellationToken {
-      return {
-        isCancellationRequested() {
-          return project.getCancellationToken().isCancellationRequested();
-        },
-        throwIfCancellationRequested() {
-          if (this.isCancellationRequested()) {
-            throw new ts.OperationCanceledException();
-          }
-        },
-      };
-    },
-    getDefaultLibFileName(options: ts.CompilerOptions): string {
-      return project.getDefaultLibFileName();
-    },
-    writeFile(
-        fileName: string, data: string, writeByteOrderMark: boolean,
-        onError?: (message: string) => void, sourceFiles?: readonly ts.SourceFile[]) {
-      return project.writeFile(fileName, data);
-    },
-    getCanonicalFileName(fileName: string): string {
-      return project.projectService.toCanonicalFileName(fileName);
-    },
-    useCaseSensitiveFileNames(): boolean {
-      return project.useCaseSensitiveFileNames();
-    },
-    getNewLine(): string {
-      return project.getNewLine();
-    },
-    readDirectory(
-        rootDir: string, extensions: readonly string[], excludes: readonly string[]|undefined,
-        includes: readonly string[], depth?: number): string[] {
-      return project.readDirectory(rootDir, extensions, excludes, includes, depth);
-    },
-    resolveModuleNames(
-        moduleNames: string[], containingFile: string, reusedNames: string[]|undefined,
-        redirectedReference: ts.ResolvedProjectReference|undefined, options: ts.CompilerOptions):
-        (ts.ResolvedModule | undefined)[] {
-          return project.resolveModuleNames(
-              moduleNames, containingFile, reusedNames, redirectedReference);
-        },
-    resolveTypeReferenceDirectives(
-        typeReferenceDirectiveNames: string[], containingFile: string,
-        redirectedReference: ts.ResolvedProjectReference|undefined, options: ts.CompilerOptions):
-        (ts.ResolvedTypeReferenceDirective | undefined)[] {
-          return project.resolveTypeReferenceDirectives(
-              typeReferenceDirectiveNames, containingFile, redirectedReference);
-        },
-  };
-
-  if (project.trace) {
-    compilerHost.trace = function trace(s: string) {
-      project.trace!(s);
-    };
-  }
-  if (project.realpath) {
-    compilerHost.realpath = function realpath(path: string): string {
-      return project.realpath!(path);
-    };
-  }
-  return compilerHost;
-}
diff --git a/packages/language-service/ivy/compiler_factory.ts b/packages/language-service/ivy/compiler_factory.ts
new file mode 100644
index 0000000000000..8397044e7a30a
--- /dev/null
+++ b/packages/language-service/ivy/compiler_factory.ts
@@ -0,0 +1,76 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {NgCompiler} from '@angular/compiler-cli/src/ngtsc/core';
+import {NgCompilerOptions} from '@angular/compiler-cli/src/ngtsc/core/api';
+import {TrackedIncrementalBuildStrategy} from '@angular/compiler-cli/src/ngtsc/incremental';
+import {TypeCheckingProgramStrategy} from '@angular/compiler-cli/src/ngtsc/typecheck/api';
+import * as ts from 'typescript/lib/tsserverlibrary';
+
+import {LanguageServiceAdapter} from './language_service_adapter';
+import {isExternalTemplate} from './utils';
+
+export class CompilerFactory {
+  private readonly incrementalStrategy = new TrackedIncrementalBuildStrategy();
+  private compiler: NgCompiler|null = null;
+  private lastKnownProgram: ts.Program|null = null;
+
+  constructor(
+      private readonly adapter: LanguageServiceAdapter,
+      private readonly programStrategy: TypeCheckingProgramStrategy,
+  ) {}
+
+  /**
+   * Create a new instance of the Ivy compiler if the program has changed since
+   * the last time the compiler was instantiated. If the program has not changed,
+   * return the existing instance.
+   * @param fileName override the template if this is an external template file
+   * @param options angular compiler options
+   */
+  getOrCreateWithChangedFile(fileName: string, options: NgCompilerOptions): NgCompiler {
+    const program = this.programStrategy.getProgram();
+    if (!this.compiler || program !== this.lastKnownProgram) {
+      this.compiler = new NgCompiler(
+          this.adapter,  // like compiler host
+          options,       // angular compiler options
+          program,
+          this.programStrategy,
+          this.incrementalStrategy,
+          true,  // enableTemplateTypeChecker
+          this.lastKnownProgram,
+          undefined,  // perfRecorder (use default)
+      );
+      this.lastKnownProgram = program;
+    }
+    if (isExternalTemplate(fileName)) {
+      this.overrideTemplate(fileName, this.compiler);
+    }
+    return this.compiler;
+  }
+
+  private overrideTemplate(fileName: string, compiler: NgCompiler) {
+    if (!this.adapter.isTemplateDirty(fileName)) {
+      return;
+    }
+    // 1. Get the latest snapshot
+    const latestTemplate = this.adapter.readResource(fileName);
+    // 2. Find all components that use the template
+    const ttc = compiler.getTemplateTypeChecker();
+    const components = compiler.getComponentsWithTemplateFile(fileName);
+    // 3. Update component template
+    for (const component of components) {
+      if (ts.isClassDeclaration(component)) {
+        ttc.overrideComponentTemplate(component, latestTemplate);
+      }
+    }
+  }
+
+  registerLastKnownProgram() {
+    this.lastKnownProgram = this.programStrategy.getProgram();
+  }
+}
diff --git a/packages/language-service/ivy/definitions.ts b/packages/language-service/ivy/definitions.ts
new file mode 100644
index 0000000000000..48fb9d9715f99
--- /dev/null
+++ b/packages/language-service/ivy/definitions.ts
@@ -0,0 +1,222 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {AST, TmplAstBoundAttribute, TmplAstBoundEvent, TmplAstElement, TmplAstNode, TmplAstTemplate, TmplAstTextAttribute} from '@angular/compiler';
+import {NgCompiler} from '@angular/compiler-cli/src/ngtsc/core';
+import {DirectiveSymbol, DomBindingSymbol, ElementSymbol, ShimLocation, Symbol, SymbolKind, TemplateSymbol} from '@angular/compiler-cli/src/ngtsc/typecheck/api';
+import * as ts from 'typescript';
+
+import {getTsDefinitionAndBoundSpan, ResourceResolver} from '../common/definitions';
+
+import {getPathToNodeAtPosition} from './hybrid_visitor';
+import {flatMap, getDirectiveMatchesForAttribute, getDirectiveMatchesForElementTag, getTemplateInfoAtPosition, getTextSpanOfNode, isDollarEvent, isTypeScriptFile, TemplateInfo, toTextSpan} from './utils';
+
+interface DefinitionMeta {
+  node: AST|TmplAstNode;
+  path: Array<AST|TmplAstNode>;
+  symbol: Symbol;
+}
+
+interface HasShimLocation {
+  shimLocation: ShimLocation;
+}
+
+export class DefinitionBuilder {
+  constructor(
+      private readonly tsLS: ts.LanguageService, private readonly compiler: NgCompiler,
+      private readonly resourceResolver: ResourceResolver) {}
+
+  getDefinitionAndBoundSpan(fileName: string, position: number): ts.DefinitionInfoAndBoundSpan
+      |undefined {
+    const templateInfo = getTemplateInfoAtPosition(fileName, position, this.compiler);
+    if (templateInfo === undefined) {
+      // We were unable to get a template at the given position. If we are in a TS file, instead
+      // attempt to get an Angular definition at the location inside a TS file (examples of this
+      // would be templateUrl or a url in styleUrls).
+      if (!isTypeScriptFile(fileName)) {
+        return;
+      }
+      const sf = this.compiler.getNextProgram().getSourceFile(fileName);
+      if (!sf) {
+        return;
+      }
+      return getTsDefinitionAndBoundSpan(sf, position, this.resourceResolver);
+    }
+    const definitionMeta = this.getDefinitionMetaAtPosition(templateInfo, position);
+    // The `$event` of event handlers would point to the $event parameter in the shim file, as in
+    // `_outputHelper(_t3["x"]).subscribe(function ($event): any { $event }) ;`
+    // If we wanted to return something for this, it would be more appropriate for something like
+    // `getTypeDefinition`.
+    if (definitionMeta === undefined || isDollarEvent(definitionMeta.node)) {
+      return undefined;
+    }
+
+    const definitions = this.getDefinitionsForSymbol({...definitionMeta, ...templateInfo});
+    return {definitions, textSpan: getTextSpanOfNode(definitionMeta.node)};
+  }
+
+  private getDefinitionsForSymbol({symbol, node, path, component}: DefinitionMeta&
+                                  TemplateInfo): readonly ts.DefinitionInfo[]|undefined {
+    switch (symbol.kind) {
+      case SymbolKind.Directive:
+      case SymbolKind.Element:
+      case SymbolKind.Template:
+      case SymbolKind.DomBinding:
+        // Though it is generally more appropriate for the above symbol definitions to be
+        // associated with "type definitions" since the location in the template is the
+        // actual definition location, the better user experience would be to allow
+        // LS users to "go to definition" on an item in the template that maps to a class and be
+        // taken to the directive or HTML class.
+        return this.getTypeDefinitionsForTemplateInstance(symbol, node);
+      case SymbolKind.Output:
+      case SymbolKind.Input: {
+        const bindingDefs = this.getDefinitionsForSymbols(...symbol.bindings);
+        // Also attempt to get directive matches for the input name. If there is a directive that
+        // has the input name as part of the selector, we want to return that as well.
+        const directiveDefs = this.getDirectiveTypeDefsForBindingNode(node, path, component);
+        return [...bindingDefs, ...directiveDefs];
+      }
+      case SymbolKind.Variable:
+      case SymbolKind.Reference: {
+        const definitions: ts.DefinitionInfo[] = [];
+        if (symbol.declaration !== node) {
+          definitions.push({
+            name: symbol.declaration.name,
+            containerName: '',
+            containerKind: ts.ScriptElementKind.unknown,
+            kind: ts.ScriptElementKind.variableElement,
+            textSpan: getTextSpanOfNode(symbol.declaration),
+            contextSpan: toTextSpan(symbol.declaration.sourceSpan),
+            fileName: symbol.declaration.sourceSpan.start.file.url,
+          });
+        }
+        if (symbol.kind === SymbolKind.Variable) {
+          definitions.push(...this.getDefinitionsForSymbols(symbol));
+        }
+        return definitions;
+      }
+      case SymbolKind.Expression: {
+        return this.getDefinitionsForSymbols(symbol);
+      }
+    }
+  }
+
+  private getDefinitionsForSymbols(...symbols: HasShimLocation[]): ts.DefinitionInfo[] {
+    return flatMap(symbols, ({shimLocation}) => {
+      const {shimPath, positionInShimFile} = shimLocation;
+      return this.tsLS.getDefinitionAtPosition(shimPath, positionInShimFile) ?? [];
+    });
+  }
+
+  getTypeDefinitionsAtPosition(fileName: string, position: number):
+      readonly ts.DefinitionInfo[]|undefined {
+    const templateInfo = getTemplateInfoAtPosition(fileName, position, this.compiler);
+    if (templateInfo === undefined) {
+      return;
+    }
+    const definitionMeta = this.getDefinitionMetaAtPosition(templateInfo, position);
+    if (definitionMeta === undefined) {
+      return undefined;
+    }
+
+    const {symbol, node} = definitionMeta;
+    switch (symbol.kind) {
+      case SymbolKind.Directive:
+      case SymbolKind.DomBinding:
+      case SymbolKind.Element:
+      case SymbolKind.Template:
+        return this.getTypeDefinitionsForTemplateInstance(symbol, node);
+      case SymbolKind.Output:
+      case SymbolKind.Input: {
+        const bindingDefs = this.getTypeDefinitionsForSymbols(...symbol.bindings);
+        // Also attempt to get directive matches for the input name. If there is a directive that
+        // has the input name as part of the selector, we want to return that as well.
+        const directiveDefs = this.getDirectiveTypeDefsForBindingNode(
+            node, definitionMeta.path, templateInfo.component);
+        return [...bindingDefs, ...directiveDefs];
+      }
+      case SymbolKind.Reference:
+      case SymbolKind.Expression:
+      case SymbolKind.Variable:
+        return this.getTypeDefinitionsForSymbols(symbol);
+    }
+  }
+
+  private getTypeDefinitionsForTemplateInstance(
+      symbol: TemplateSymbol|ElementSymbol|DomBindingSymbol|DirectiveSymbol,
+      node: AST|TmplAstNode): ts.DefinitionInfo[] {
+    switch (symbol.kind) {
+      case SymbolKind.Template: {
+        const matches = getDirectiveMatchesForElementTag(symbol.templateNode, symbol.directives);
+        return this.getTypeDefinitionsForSymbols(...matches);
+      }
+      case SymbolKind.Element: {
+        const matches = getDirectiveMatchesForElementTag(symbol.templateNode, symbol.directives);
+        // If one of the directive matches is a component, we should not include the native element
+        // in the results because it is replaced by the component.
+        return Array.from(matches).some(dir => dir.isComponent) ?
+            this.getTypeDefinitionsForSymbols(...matches) :
+            this.getTypeDefinitionsForSymbols(...matches, symbol);
+      }
+      case SymbolKind.DomBinding: {
+        if (!(node instanceof TmplAstTextAttribute)) {
+          return [];
+        }
+        const dirs = getDirectiveMatchesForAttribute(
+            node.name, symbol.host.templateNode, symbol.host.directives);
+        return this.getTypeDefinitionsForSymbols(...dirs);
+      }
+      case SymbolKind.Directive:
+        return this.getTypeDefinitionsForSymbols(symbol);
+    }
+  }
+
+  private getDirectiveTypeDefsForBindingNode(
+      node: TmplAstNode|AST, pathToNode: Array<TmplAstNode|AST>, component: ts.ClassDeclaration) {
+    if (!(node instanceof TmplAstBoundAttribute) && !(node instanceof TmplAstTextAttribute) &&
+        !(node instanceof TmplAstBoundEvent)) {
+      return [];
+    }
+    const parent = pathToNode[pathToNode.length - 2];
+    if (!(parent instanceof TmplAstTemplate || parent instanceof TmplAstElement)) {
+      return [];
+    }
+    const templateOrElementSymbol =
+        this.compiler.getTemplateTypeChecker().getSymbolOfNode(parent, component);
+    if (templateOrElementSymbol === null ||
+        (templateOrElementSymbol.kind !== SymbolKind.Template &&
+         templateOrElementSymbol.kind !== SymbolKind.Element)) {
+      return [];
+    }
+    const dirs =
+        getDirectiveMatchesForAttribute(node.name, parent, templateOrElementSymbol.directives);
+    return this.getTypeDefinitionsForSymbols(...dirs);
+  }
+
+  private getTypeDefinitionsForSymbols(...symbols: HasShimLocation[]): ts.DefinitionInfo[] {
+    return flatMap(symbols, ({shimLocation}) => {
+      const {shimPath, positionInShimFile} = shimLocation;
+      return this.tsLS.getTypeDefinitionAtPosition(shimPath, positionInShimFile) ?? [];
+    });
+  }
+
+  private getDefinitionMetaAtPosition({template, component}: TemplateInfo, position: number):
+      DefinitionMeta|undefined {
+    const path = getPathToNodeAtPosition(template, position);
+    if (path === undefined) {
+      return;
+    }
+
+    const node = path[path.length - 1];
+    const symbol = this.compiler.getTemplateTypeChecker().getSymbolOfNode(node, component);
+    if (symbol === null) {
+      return;
+    }
+    return {node, path, symbol};
+  }
+}
diff --git a/packages/language-service/ivy/hybrid_visitor.ts b/packages/language-service/ivy/hybrid_visitor.ts
new file mode 100644
index 0000000000000..391809e38da41
--- /dev/null
+++ b/packages/language-service/ivy/hybrid_visitor.ts
@@ -0,0 +1,217 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {AbsoluteSourceSpan, ParseSourceSpan} from '@angular/compiler';
+import * as e from '@angular/compiler/src/expression_parser/ast';  // e for expression AST
+import * as t from '@angular/compiler/src/render3/r3_ast';         // t for template AST
+
+import {isTemplateNode, isTemplateNodeWithKeyAndValue} from './utils';
+
+/**
+ * Return the path to the template AST node or expression AST node that most accurately
+ * represents the node at the specified cursor `position`.
+ *
+ * @param ast AST tree
+ * @param position cursor position
+ */
+export function getPathToNodeAtPosition(ast: t.Node[], position: number): Array<t.Node|e.AST>|
+    undefined {
+  const visitor = new R3Visitor(position);
+  visitor.visitAll(ast);
+  const candidate = visitor.path[visitor.path.length - 1];
+  if (!candidate) {
+    return;
+  }
+  if (isTemplateNodeWithKeyAndValue(candidate)) {
+    const {keySpan, valueSpan} = candidate;
+    const isWithinKeyValue =
+        isWithin(position, keySpan) || (valueSpan && isWithin(position, valueSpan));
+    if (!isWithinKeyValue) {
+      // If cursor is within source span but not within key span or value span,
+      // do not return the node.
+      return;
+    }
+  }
+  return visitor.path;
+}
+
+/**
+ * Return the template AST node or expression AST node that most accurately
+ * represents the node at the specified cursor `position`.
+ *
+ * @param ast AST tree
+ * @param position cursor position
+ */
+export function findNodeAtPosition(ast: t.Node[], position: number): t.Node|e.AST|undefined {
+  const path = getPathToNodeAtPosition(ast, position);
+  if (!path) {
+    return;
+  }
+  return path[path.length - 1];
+}
+
+class R3Visitor implements t.Visitor {
+  // We need to keep a path instead of the last node because we might need more
+  // context for the last node, for example what is the parent node?
+  readonly path: Array<t.Node|e.AST> = [];
+
+  // Position must be absolute in the source file.
+  constructor(private readonly position: number) {}
+
+  visit(node: t.Node) {
+    const {start, end} = getSpanIncludingEndTag(node);
+    if (isWithin(this.position, {start, end})) {
+      const length = end - start;
+      const last: t.Node|e.AST|undefined = this.path[this.path.length - 1];
+      if (last) {
+        const {start, end} = isTemplateNode(last) ? getSpanIncludingEndTag(last) : last.sourceSpan;
+        const lastLength = end - start;
+        if (length > lastLength) {
+          // The current node has a span that is larger than the last node found
+          // so we do not descend into it. This typically means we have found
+          // a candidate in one of the root nodes so we do not need to visit
+          // other root nodes.
+          return;
+        }
+      }
+      this.path.push(node);
+      node.visit(this);
+    }
+  }
+
+  visitElement(element: t.Element) {
+    this.visitAll(element.attributes);
+    this.visitAll(element.inputs);
+    this.visitAll(element.outputs);
+    this.visitAll(element.references);
+    this.visitAll(element.children);
+  }
+
+  visitTemplate(template: t.Template) {
+    this.visitAll(template.attributes);
+    this.visitAll(template.inputs);
+    this.visitAll(template.outputs);
+    this.visitAll(template.templateAttrs);
+    this.visitAll(template.references);
+    this.visitAll(template.variables);
+    this.visitAll(template.children);
+  }
+
+  visitContent(content: t.Content) {
+    t.visitAll(this, content.attributes);
+  }
+
+  visitVariable(variable: t.Variable) {
+    // Variable has no template nodes or expression nodes.
+  }
+
+  visitReference(reference: t.Reference) {
+    // Reference has no template nodes or expression nodes.
+  }
+
+  visitTextAttribute(attribute: t.TextAttribute) {
+    // Text attribute has no template nodes or expression nodes.
+  }
+
+  visitBoundAttribute(attribute: t.BoundAttribute) {
+    const visitor = new ExpressionVisitor(this.position);
+    visitor.visit(attribute.value, this.path);
+  }
+
+  visitBoundEvent(event: t.BoundEvent) {
+    const isTwoWayBinding =
+        this.path.some(n => n instanceof t.BoundAttribute && event.name === n.name + 'Change');
+    if (isTwoWayBinding) {
+      // For two-way binding aka banana-in-a-box, there are two matches:
+      // BoundAttribute and BoundEvent. Both have the same spans. We choose to
+      // return BoundAttribute because it matches the identifier name verbatim.
+      // TODO: For operations like go to definition, ideally we want to return
+      // both.
+      this.path.pop();  // remove bound event from the AST path
+      return;
+    }
+    const visitor = new ExpressionVisitor(this.position);
+    visitor.visit(event.handler, this.path);
+  }
+
+  visitText(text: t.Text) {
+    // Text has no template nodes or expression nodes.
+  }
+
+  visitBoundText(text: t.BoundText) {
+    const visitor = new ExpressionVisitor(this.position);
+    visitor.visit(text.value, this.path);
+  }
+
+  visitIcu(icu: t.Icu) {
+    for (const boundText of Object.values(icu.vars)) {
+      this.visit(boundText);
+    }
+    for (const boundTextOrText of Object.values(icu.placeholders)) {
+      this.visit(boundTextOrText);
+    }
+  }
+
+  visitAll(nodes: t.Node[]) {
+    for (const node of nodes) {
+      this.visit(node);
+    }
+  }
+}
+
+class ExpressionVisitor extends e.RecursiveAstVisitor {
+  // Position must be absolute in the source file.
+  constructor(private readonly position: number) {
+    super();
+  }
+
+  visit(node: e.AST, path: Array<t.Node|e.AST>) {
+    if (node instanceof e.ASTWithSource) {
+      // In order to reduce noise, do not include `ASTWithSource` in the path.
+      // For the purpose of source spans, there is no difference between
+      // `ASTWithSource` and and underlying node that it wraps.
+      node = node.ast;
+    }
+    // The third condition is to account for the implicit receiver, which should
+    // not be visited.
+    if (isWithin(this.position, node.sourceSpan) && !(node instanceof e.ImplicitReceiver)) {
+      path.push(node);
+      node.visit(this, path);
+    }
+  }
+}
+
+function getSpanIncludingEndTag(ast: t.Node) {
+  const result = {
+    start: ast.sourceSpan.start.offset,
+    end: ast.sourceSpan.end.offset,
+  };
+  // For Element and Template node, sourceSpan.end is the end of the opening
+  // tag. For the purpose of language service, we need to actually recognize
+  // the end of the closing tag. Otherwise, for situation like
+  // <my-component></my-comp¦onent> where the cursor is in the closing tag
+  // we will not be able to return any information.
+  if ((ast instanceof t.Element || ast instanceof t.Template) && ast.endSourceSpan) {
+    result.end = ast.endSourceSpan.end.offset;
+  }
+  return result;
+}
+
+function isWithin(position: number, span: AbsoluteSourceSpan|ParseSourceSpan): boolean {
+  let start: number, end: number;
+  if (span instanceof ParseSourceSpan) {
+    start = span.start.offset;
+    end = span.end.offset;
+  } else {
+    start = span.start;
+    end = span.end;
+  }
+  // Note both start and end are inclusive because we want to match conditions
+  // like ¦start and end¦ where ¦ is the cursor.
+  return start <= position && position <= end;
+}
diff --git a/packages/language-service/ivy/language_service.ts b/packages/language-service/ivy/language_service.ts
index b0b6699784169..b8d7e5fbfec93 100644
--- a/packages/language-service/ivy/language_service.ts
+++ b/packages/language-service/ivy/language_service.ts
@@ -7,30 +7,76 @@
  */
 
 import {CompilerOptions, createNgCompilerOptions} from '@angular/compiler-cli';
+import {absoluteFromSourceFile, AbsoluteFsPath} from '@angular/compiler-cli/src/ngtsc/file_system';
+import {TypeCheckShimGenerator} from '@angular/compiler-cli/src/ngtsc/typecheck';
+import {OptimizeFor, TypeCheckingProgramStrategy} from '@angular/compiler-cli/src/ngtsc/typecheck/api';
 import * as ts from 'typescript/lib/tsserverlibrary';
-import {Compiler} from './compiler/compiler';
+
+import {CompilerFactory} from './compiler_factory';
+import {DefinitionBuilder} from './definitions';
+import {LanguageServiceAdapter} from './language_service_adapter';
+import {QuickInfoBuilder} from './quick_info';
+import {isTypeScriptFile} from './utils';
 
 export class LanguageService {
   private options: CompilerOptions;
-  private readonly compiler: Compiler;
+  private readonly compilerFactory: CompilerFactory;
+  private readonly strategy: TypeCheckingProgramStrategy;
+  private readonly adapter: LanguageServiceAdapter;
 
   constructor(project: ts.server.Project, private readonly tsLS: ts.LanguageService) {
     this.options = parseNgCompilerOptions(project);
+    this.strategy = createTypeCheckingProgramStrategy(project);
+    this.adapter = new LanguageServiceAdapter(project);
+    this.compilerFactory = new CompilerFactory(this.adapter, this.strategy);
     this.watchConfigFile(project);
-    this.compiler = new Compiler(project, this.options);
   }
 
   getSemanticDiagnostics(fileName: string): ts.Diagnostic[] {
-    const result = this.compiler.analyze();
-    if (!result) {
-      return [];
-    }
-    const {compiler, program} = result;
-    const sourceFile = program.getSourceFile(fileName);
-    if (!sourceFile) {
-      return [];
+    const compiler = this.compilerFactory.getOrCreateWithChangedFile(fileName, this.options);
+    const ttc = compiler.getTemplateTypeChecker();
+    const diagnostics: ts.Diagnostic[] = [];
+    if (isTypeScriptFile(fileName)) {
+      const program = compiler.getNextProgram();
+      const sourceFile = program.getSourceFile(fileName);
+      if (sourceFile) {
+        diagnostics.push(...ttc.getDiagnosticsForFile(sourceFile, OptimizeFor.SingleFile));
+      }
+    } else {
+      const components = compiler.getComponentsWithTemplateFile(fileName);
+      for (const component of components) {
+        if (ts.isClassDeclaration(component)) {
+          diagnostics.push(...ttc.getDiagnosticsForComponent(component));
+        }
+      }
     }
-    return compiler.getDiagnostics(sourceFile);
+    this.compilerFactory.registerLastKnownProgram();
+    return diagnostics;
+  }
+
+  getDefinitionAndBoundSpan(fileName: string, position: number): ts.DefinitionInfoAndBoundSpan
+      |undefined {
+    const compiler = this.compilerFactory.getOrCreateWithChangedFile(fileName, this.options);
+    const results = new DefinitionBuilder(this.tsLS, compiler, this.adapter)
+                        .getDefinitionAndBoundSpan(fileName, position);
+    this.compilerFactory.registerLastKnownProgram();
+    return results;
+  }
+
+  getTypeDefinitionAtPosition(fileName: string, position: number):
+      readonly ts.DefinitionInfo[]|undefined {
+    const compiler = this.compilerFactory.getOrCreateWithChangedFile(fileName, this.options);
+    const results = new DefinitionBuilder(this.tsLS, compiler, this.adapter)
+                        .getTypeDefinitionsAtPosition(fileName, position);
+    this.compilerFactory.registerLastKnownProgram();
+    return results;
+  }
+
+  getQuickInfoAtPosition(fileName: string, position: number): ts.QuickInfo|undefined {
+    const compiler = this.compilerFactory.getOrCreateWithChangedFile(fileName, this.options);
+    const results = new QuickInfoBuilder(this.tsLS, compiler).get(fileName, position);
+    this.compilerFactory.registerLastKnownProgram();
+    return results;
   }
 
   private watchConfigFile(project: ts.server.Project) {
@@ -47,7 +93,6 @@ export class LanguageService {
           project.log(`Config file changed: ${fileName}`);
           if (eventKind === ts.FileWatcherEventKind.Changed) {
             this.options = parseNgCompilerOptions(project);
-            this.compiler.setCompilerOptions(this.options);
           }
         });
   }
@@ -66,3 +111,55 @@ export function parseNgCompilerOptions(project: ts.server.Project): CompilerOpti
   const basePath = project.getCurrentDirectory();
   return createNgCompilerOptions(basePath, config, project.getCompilationSettings());
 }
+
+function createTypeCheckingProgramStrategy(project: ts.server.Project):
+    TypeCheckingProgramStrategy {
+  return {
+    supportsInlineOperations: false,
+    shimPathForComponent(component: ts.ClassDeclaration): AbsoluteFsPath {
+      return TypeCheckShimGenerator.shimFor(absoluteFromSourceFile(component.getSourceFile()));
+    },
+    getProgram(): ts.Program {
+      const program = project.getLanguageService().getProgram();
+      if (!program) {
+        throw new Error('Language service does not have a program!');
+      }
+      return program;
+    },
+    updateFiles(contents: Map<AbsoluteFsPath, string>) {
+      for (const [fileName, newText] of contents) {
+        const scriptInfo = getOrCreateTypeCheckScriptInfo(project, fileName);
+        const snapshot = scriptInfo.getSnapshot();
+        const length = snapshot.getLength();
+        scriptInfo.editContent(0, length, newText);
+      }
+    },
+  };
+}
+
+function getOrCreateTypeCheckScriptInfo(
+    project: ts.server.Project, tcf: string): ts.server.ScriptInfo {
+  // First check if there is already a ScriptInfo for the tcf
+  const {projectService} = project;
+  let scriptInfo = projectService.getScriptInfo(tcf);
+  if (!scriptInfo) {
+    // ScriptInfo needs to be opened by client to be able to set its user-defined
+    // content. We must also provide file content, otherwise the service will
+    // attempt to fetch the content from disk and fail.
+    scriptInfo = projectService.getOrCreateScriptInfoForNormalizedPath(
+        ts.server.toNormalizedPath(tcf),
+        true,              // openedByClient
+        '',                // fileContent
+        ts.ScriptKind.TS,  // scriptKind
+    );
+    if (!scriptInfo) {
+      throw new Error(`Failed to create script info for ${tcf}`);
+    }
+  }
+  // Add ScriptInfo to project if it's missing. A ScriptInfo needs to be part of
+  // the project so that it becomes part of the program.
+  if (!project.containsScriptInfo(scriptInfo)) {
+    project.addRoot(scriptInfo);
+  }
+  return scriptInfo;
+}
diff --git a/packages/language-service/ivy/language_service_adapter.ts b/packages/language-service/ivy/language_service_adapter.ts
new file mode 100644
index 0000000000000..7b2cc77395fc3
--- /dev/null
+++ b/packages/language-service/ivy/language_service_adapter.ts
@@ -0,0 +1,88 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {NgCompilerAdapter} from '@angular/compiler-cli/src/ngtsc/core/api';
+import {absoluteFrom, AbsoluteFsPath} from '@angular/compiler-cli/src/ngtsc/file_system';
+import {AdapterResourceLoader} from '@angular/compiler-cli/src/ngtsc/resource';
+import {isShim} from '@angular/compiler-cli/src/ngtsc/shims';
+import * as ts from 'typescript/lib/tsserverlibrary';
+
+import {ResourceResolver} from '../common/definitions';
+
+import {isTypeScriptFile} from './utils';
+
+export class LanguageServiceAdapter implements NgCompilerAdapter, ResourceResolver {
+  readonly entryPoint = null;
+  readonly constructionDiagnostics: ts.Diagnostic[] = [];
+  readonly ignoreForEmit: Set<ts.SourceFile> = new Set();
+  readonly factoryTracker = null;      // no .ngfactory shims
+  readonly unifiedModulesHost = null;  // only used in Bazel
+  readonly rootDirs: AbsoluteFsPath[];
+  private readonly templateVersion = new Map<string, string>();
+
+  constructor(private readonly project: ts.server.Project) {
+    this.rootDirs = project.getCompilationSettings().rootDirs?.map(absoluteFrom) || [];
+  }
+
+  isShim(sf: ts.SourceFile): boolean {
+    return isShim(sf);
+  }
+
+  fileExists(fileName: string): boolean {
+    return this.project.fileExists(fileName);
+  }
+
+  readFile(fileName: string): string|undefined {
+    return this.project.readFile(fileName);
+  }
+
+  getCurrentDirectory(): string {
+    return this.project.getCurrentDirectory();
+  }
+
+  getCanonicalFileName(fileName: string): string {
+    return this.project.projectService.toCanonicalFileName(fileName);
+  }
+
+  /**
+   * readResource() is an Angular-specific method for reading files that are not
+   * managed by the TS compiler host, namely templates and stylesheets.
+   * It is a method on ExtendedTsCompilerHost, see
+   * packages/compiler-cli/src/ngtsc/core/api/src/interfaces.ts
+   */
+  readResource(fileName: string): string {
+    if (isTypeScriptFile(fileName)) {
+      throw new Error(`readResource() should not be called on TS file: ${fileName}`);
+    }
+    // Calling getScriptSnapshot() will actually create a ScriptInfo if it does
+    // not exist! The same applies for getScriptVersion().
+    // getScriptInfo() will not create one if it does not exist.
+    // In this case, we *want* a script info to be created so that we could
+    // keep track of its version.
+    const snapshot = this.project.getScriptSnapshot(fileName);
+    if (!snapshot) {
+      // This would fail if the file does not exist, or readFile() fails for
+      // whatever reasons.
+      throw new Error(`Failed to get script snapshot while trying to read ${fileName}`);
+    }
+    const version = this.project.getScriptVersion(fileName);
+    this.templateVersion.set(fileName, version);
+    return snapshot.getText(0, snapshot.getLength());
+  }
+
+  isTemplateDirty(fileName: string): boolean {
+    const lastVersion = this.templateVersion.get(fileName);
+    const latestVersion = this.project.getScriptVersion(fileName);
+    return lastVersion !== latestVersion;
+  }
+
+  resolve(file: string, basePath: string): string {
+    const loader = new AdapterResourceLoader(this, this.project.getCompilationSettings());
+    return loader.resolve(file, basePath);
+  }
+}
diff --git a/packages/language-service/ivy/quick_info.ts b/packages/language-service/ivy/quick_info.ts
new file mode 100644
index 0000000000000..bafb2c814c669
--- /dev/null
+++ b/packages/language-service/ivy/quick_info.ts
@@ -0,0 +1,242 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {AST, BindingPipe, ImplicitReceiver, MethodCall, TmplAstBoundAttribute, TmplAstNode, TmplAstTextAttribute} from '@angular/compiler';
+import {NgCompiler} from '@angular/compiler-cli/src/ngtsc/core';
+import {DirectiveSymbol, DomBindingSymbol, ElementSymbol, ExpressionSymbol, InputBindingSymbol, OutputBindingSymbol, ReferenceSymbol, ShimLocation, Symbol, SymbolKind, VariableSymbol} from '@angular/compiler-cli/src/ngtsc/typecheck/api';
+import * as ts from 'typescript';
+
+import {createQuickInfo, SYMBOL_PUNC, SYMBOL_SPACE, SYMBOL_TEXT} from '../common/quick_info';
+
+import {findNodeAtPosition} from './hybrid_visitor';
+import {filterAliasImports, getDirectiveMatchesForAttribute, getDirectiveMatchesForElementTag, getTemplateInfoAtPosition, getTextSpanOfNode} from './utils';
+
+/**
+ * The type of Angular directive. Used for QuickInfo in template.
+ */
+export enum QuickInfoKind {
+  COMPONENT = 'component',
+  DIRECTIVE = 'directive',
+  EVENT = 'event',
+  REFERENCE = 'reference',
+  ELEMENT = 'element',
+  VARIABLE = 'variable',
+  PIPE = 'pipe',
+  PROPERTY = 'property',
+  METHOD = 'method',
+  TEMPLATE = 'template',
+}
+
+export class QuickInfoBuilder {
+  private readonly typeChecker = this.compiler.getNextProgram().getTypeChecker();
+  constructor(private readonly tsLS: ts.LanguageService, private readonly compiler: NgCompiler) {}
+
+  get(fileName: string, position: number): ts.QuickInfo|undefined {
+    const templateInfo = getTemplateInfoAtPosition(fileName, position, this.compiler);
+    if (templateInfo === undefined) {
+      return undefined;
+    }
+    const {template, component} = templateInfo;
+
+    const node = findNodeAtPosition(template, position);
+    if (node === undefined) {
+      return undefined;
+    }
+
+    const symbol = this.compiler.getTemplateTypeChecker().getSymbolOfNode(node, component);
+    if (symbol === null) {
+      return isDollarAny(node) ? createDollarAnyQuickInfo(node) : undefined;
+    }
+
+    return this.getQuickInfoForSymbol(symbol, node);
+  }
+
+  private getQuickInfoForSymbol(symbol: Symbol, node: TmplAstNode|AST): ts.QuickInfo|undefined {
+    switch (symbol.kind) {
+      case SymbolKind.Input:
+      case SymbolKind.Output:
+        return this.getQuickInfoForBindingSymbol(symbol, node);
+      case SymbolKind.Template:
+        return createNgTemplateQuickInfo(node);
+      case SymbolKind.Element:
+        return this.getQuickInfoForElementSymbol(symbol);
+      case SymbolKind.Variable:
+        return this.getQuickInfoForVariableSymbol(symbol, node);
+      case SymbolKind.Reference:
+        return this.getQuickInfoForReferenceSymbol(symbol, node);
+      case SymbolKind.DomBinding:
+        return this.getQuickInfoForDomBinding(node, symbol);
+      case SymbolKind.Directive:
+        return this.getQuickInfoAtShimLocation(symbol.shimLocation, node);
+      case SymbolKind.Expression:
+        return node instanceof BindingPipe ?
+            this.getQuickInfoForPipeSymbol(symbol, node) :
+            this.getQuickInfoAtShimLocation(symbol.shimLocation, node);
+    }
+  }
+
+  private getQuickInfoForBindingSymbol(
+      symbol: InputBindingSymbol|OutputBindingSymbol, node: TmplAstNode|AST): ts.QuickInfo
+      |undefined {
+    if (symbol.bindings.length === 0) {
+      return undefined;
+    }
+
+    const kind = symbol.kind === SymbolKind.Input ? QuickInfoKind.PROPERTY : QuickInfoKind.EVENT;
+
+    const quickInfo = this.getQuickInfoAtShimLocation(symbol.bindings[0].shimLocation, node);
+    return quickInfo === undefined ? undefined : updateQuickInfoKind(quickInfo, kind);
+  }
+
+  private getQuickInfoForElementSymbol(symbol: ElementSymbol): ts.QuickInfo {
+    const {templateNode} = symbol;
+    const matches = getDirectiveMatchesForElementTag(templateNode, symbol.directives);
+    if (matches.size > 0) {
+      return this.getQuickInfoForDirectiveSymbol(matches.values().next().value, templateNode);
+    }
+
+    return createQuickInfo(
+        templateNode.name, QuickInfoKind.ELEMENT, getTextSpanOfNode(templateNode),
+        undefined /* containerName */, this.typeChecker.typeToString(symbol.tsType));
+  }
+
+  private getQuickInfoForVariableSymbol(symbol: VariableSymbol, node: TmplAstNode|AST):
+      ts.QuickInfo {
+    const documentation = this.getDocumentationFromTypeDefAtLocation(symbol.shimLocation);
+    return createQuickInfo(
+        symbol.declaration.name, QuickInfoKind.VARIABLE, getTextSpanOfNode(node),
+        undefined /* containerName */, this.typeChecker.typeToString(symbol.tsType), documentation);
+  }
+
+  private getQuickInfoForReferenceSymbol(symbol: ReferenceSymbol, node: TmplAstNode|AST):
+      ts.QuickInfo {
+    const documentation = this.getDocumentationFromTypeDefAtLocation(symbol.shimLocation);
+    return createQuickInfo(
+        symbol.declaration.name, QuickInfoKind.REFERENCE, getTextSpanOfNode(node),
+        undefined /* containerName */, this.typeChecker.typeToString(symbol.tsType), documentation);
+  }
+
+  private getQuickInfoForPipeSymbol(symbol: ExpressionSymbol, node: TmplAstNode|AST): ts.QuickInfo
+      |undefined {
+    const quickInfo = this.getQuickInfoAtShimLocation(symbol.shimLocation, node);
+    return quickInfo === undefined ? undefined : updateQuickInfoKind(quickInfo, QuickInfoKind.PIPE);
+  }
+
+  private getQuickInfoForDomBinding(node: TmplAstNode|AST, symbol: DomBindingSymbol) {
+    if (!(node instanceof TmplAstTextAttribute) && !(node instanceof TmplAstBoundAttribute)) {
+      return undefined;
+    }
+    const directives = getDirectiveMatchesForAttribute(
+        node.name, symbol.host.templateNode, symbol.host.directives);
+    if (directives.size === 0) {
+      return undefined;
+    }
+
+    return this.getQuickInfoForDirectiveSymbol(directives.values().next().value, node);
+  }
+
+  private getQuickInfoForDirectiveSymbol(dir: DirectiveSymbol, node: TmplAstNode|AST):
+      ts.QuickInfo {
+    const kind = dir.isComponent ? QuickInfoKind.COMPONENT : QuickInfoKind.DIRECTIVE;
+    const documentation = this.getDocumentationFromTypeDefAtLocation(dir.shimLocation);
+    let containerName: string|undefined;
+    if (ts.isClassDeclaration(dir.tsSymbol.valueDeclaration) && dir.ngModule !== null) {
+      containerName = dir.ngModule.name.getText();
+    }
+
+    return createQuickInfo(
+        this.typeChecker.typeToString(dir.tsType), kind, getTextSpanOfNode(node), containerName,
+        undefined, documentation);
+  }
+
+  private getDocumentationFromTypeDefAtLocation(shimLocation: ShimLocation):
+      ts.SymbolDisplayPart[]|undefined {
+    const typeDefs = this.tsLS.getTypeDefinitionAtPosition(
+        shimLocation.shimPath, shimLocation.positionInShimFile);
+    if (typeDefs === undefined || typeDefs.length === 0) {
+      return undefined;
+    }
+    return this.tsLS.getQuickInfoAtPosition(typeDefs[0].fileName, typeDefs[0].textSpan.start)
+        ?.documentation;
+  }
+
+  private getQuickInfoAtShimLocation(location: ShimLocation, node: TmplAstNode|AST): ts.QuickInfo
+      |undefined {
+    const quickInfo =
+        this.tsLS.getQuickInfoAtPosition(location.shimPath, location.positionInShimFile);
+    if (quickInfo === undefined || quickInfo.displayParts === undefined) {
+      return quickInfo;
+    }
+
+    quickInfo.displayParts = filterAliasImports(quickInfo.displayParts);
+
+    const textSpan = getTextSpanOfNode(node);
+    return {...quickInfo, textSpan};
+  }
+}
+
+function updateQuickInfoKind(quickInfo: ts.QuickInfo, kind: QuickInfoKind): ts.QuickInfo {
+  if (quickInfo.displayParts === undefined) {
+    return quickInfo;
+  }
+
+  const startsWithKind = quickInfo.displayParts.length >= 3 &&
+      displayPartsEqual(quickInfo.displayParts[0], {text: '(', kind: SYMBOL_PUNC}) &&
+      quickInfo.displayParts[1].kind === SYMBOL_TEXT &&
+      displayPartsEqual(quickInfo.displayParts[2], {text: ')', kind: SYMBOL_PUNC});
+  if (startsWithKind) {
+    quickInfo.displayParts[1].text = kind;
+  } else {
+    quickInfo.displayParts = [
+      {text: '(', kind: SYMBOL_PUNC},
+      {text: kind, kind: SYMBOL_TEXT},
+      {text: ')', kind: SYMBOL_PUNC},
+      {text: ' ', kind: SYMBOL_SPACE},
+      ...quickInfo.displayParts,
+    ];
+  }
+  return quickInfo;
+}
+
+function displayPartsEqual(a: {text: string, kind: string}, b: {text: string, kind: string}) {
+  return a.text === b.text && a.kind === b.kind;
+}
+
+function isDollarAny(node: TmplAstNode|AST): node is MethodCall {
+  return node instanceof MethodCall && node.receiver instanceof ImplicitReceiver &&
+      node.name === '$any' && node.args.length === 1;
+}
+
+function createDollarAnyQuickInfo(node: MethodCall): ts.QuickInfo {
+  return createQuickInfo(
+      '$any',
+      QuickInfoKind.METHOD,
+      getTextSpanOfNode(node),
+      /** containerName */ undefined,
+      'any',
+      [{
+        kind: SYMBOL_TEXT,
+        text: 'function to cast an expression to the `any` type',
+      }],
+  );
+}
+
+// TODO(atscott): Create special `ts.QuickInfo` for `ng-template` and `ng-container` as well.
+function createNgTemplateQuickInfo(node: TmplAstNode|AST): ts.QuickInfo {
+  return createQuickInfo(
+      'ng-template',
+      QuickInfoKind.TEMPLATE,
+      getTextSpanOfNode(node),
+      /** containerName */ undefined,
+      /** type */ undefined,
+      [{
+        kind: SYMBOL_TEXT,
+        text:
+            'The `<ng-template>` is an Angular element for rendering HTML. It is never displayed directly.',
+      }],
+  );
+}
diff --git a/packages/language-service/ivy/test/BUILD.bazel b/packages/language-service/ivy/test/BUILD.bazel
index 941062a1efae2..aaa729f2666c7 100644
--- a/packages/language-service/ivy/test/BUILD.bazel
+++ b/packages/language-service/ivy/test/BUILD.bazel
@@ -5,6 +5,7 @@ ts_library(
     testonly = True,
     srcs = glob(["*.ts"]),
     deps = [
+        "//packages/compiler",
         "//packages/language-service/ivy",
         "@npm//typescript",
     ],
@@ -25,7 +26,6 @@ jasmine_node_test(
     ],
     tags = [
         "ivy-only",
-        "manual",  # do not run this on CI since compiler APIs are not yet stable
     ],
     deps = [
         ":test_lib",
diff --git a/packages/language-service/ivy/test/compiler_factory_spec.ts b/packages/language-service/ivy/test/compiler_factory_spec.ts
new file mode 100644
index 0000000000000..b04296591e739
--- /dev/null
+++ b/packages/language-service/ivy/test/compiler_factory_spec.ts
@@ -0,0 +1,87 @@
+/**
+ * @license
+ * Copyright Google LLC 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/lib/tsserverlibrary';
+
+import {APP_COMPONENT, MockService, setup, TEST_TEMPLATE} from './mock_host';
+
+/**
+ * The following specs do not directly test the CompilerFactory class, rather
+ * it asserts our understanding of the project/program/template interaction
+ * which forms the underlying assumption used in the CompilerFactory.
+ */
+
+describe('tsserver', () => {
+  let project: ts.server.Project;
+  let service: MockService;
+
+  beforeAll(() => {
+    const {project: _project, service: _service} = setup();
+    project = _project;
+    service = _service;
+  });
+
+  beforeEach(() => {
+    service.reset();
+  });
+
+  describe('project version', () => {
+    it('is updated after TS changes', () => {
+      const v0 = project.getProjectVersion();
+      service.overwriteInlineTemplate(APP_COMPONENT, `{{ foo }}`);
+      const v1 = project.getProjectVersion();
+      expect(v1).not.toBe(v0);
+    });
+
+    it('is updated after template changes', () => {
+      const v0 = project.getProjectVersion();
+      service.overwrite(TEST_TEMPLATE, `{{ bar }}`);
+      const v1 = project.getProjectVersion();
+      expect(v1).not.toBe(v0);
+    });
+  });
+
+  describe('program', () => {
+    it('is updated after TS changes', () => {
+      const p0 = project.getLanguageService().getProgram();
+      expect(p0).toBeDefined();
+      service.overwriteInlineTemplate(APP_COMPONENT, `{{ foo }}`);
+      const p1 = project.getLanguageService().getProgram();
+      expect(p1).not.toBe(p0);
+    });
+
+    it('is not updated after template changes', () => {
+      const p0 = project.getLanguageService().getProgram();
+      expect(p0).toBeDefined();
+      service.overwrite(TEST_TEMPLATE, `{{ bar }}`);
+      const p1 = project.getLanguageService().getProgram();
+      expect(p1).toBe(p0);
+    });
+  });
+
+  describe('external template', () => {
+    it('should not be part of the project root', () => {
+      // Templates should _never_ be added to the project root, otherwise they
+      // will be parsed as TS files.
+      const scriptInfo = service.getScriptInfo(TEST_TEMPLATE);
+      expect(project.isRoot(scriptInfo)).toBeFalse();
+    });
+
+    it('should be attached to project', () => {
+      const scriptInfo = service.getScriptInfo(TEST_TEMPLATE);
+      // Script info for external template must be attached to a project because
+      // that's the primary mechanism used in the extension to locate the right
+      // language service instance. See
+      // https://github.com/angular/vscode-ng-language-service/blob/b048f5f6b9996c5cf113b764c7ffe13d9eeb4285/server/src/session.ts#L192
+      expect(scriptInfo.isAttached(project)).toBeTrue();
+      // Attaching a script info to a project does not mean that the project
+      // will contain the script info. Kinda like friendship on social media.
+      expect(project.containsScriptInfo(scriptInfo)).toBeFalse();
+    });
+  });
+});
diff --git a/packages/language-service/ivy/test/definitions_spec.ts b/packages/language-service/ivy/test/definitions_spec.ts
new file mode 100644
index 0000000000000..23b84f61d45e3
--- /dev/null
+++ b/packages/language-service/ivy/test/definitions_spec.ts
@@ -0,0 +1,514 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {LanguageService} from '../language_service';
+
+import {APP_COMPONENT, MockService, setup} from './mock_host';
+import {humanizeDefinitionInfo} from './test_utils';
+
+describe('definitions', () => {
+  let service: MockService;
+  let ngLS: LanguageService;
+
+  beforeAll(() => {
+    const {project, service: _service, tsLS} = setup();
+    service = _service;
+    ngLS = new LanguageService(project, tsLS);
+  });
+
+  beforeEach(() => {
+    service.reset();
+  });
+
+  describe('elements', () => {
+    it('should work for native elements', () => {
+      const defs = getDefinitionsAndAssertBoundSpan({
+        templateOverride: `<butt¦on></button>`,
+        expectedSpanText: `<button></button>`,
+      });
+      expect(defs.length).toEqual(2);
+      expect(defs[0].fileName).toContain('lib.dom.d.ts');
+      expect(defs[0].contextSpan).toContain('interface HTMLButtonElement extends HTMLElement');
+      expect(defs[1].contextSpan).toContain('declare var HTMLButtonElement');
+    });
+  });
+
+  describe('templates', () => {
+    it('should return no definitions for ng-templates', () => {
+      const {position} =
+          service.overwriteInlineTemplate(APP_COMPONENT, `<ng-templ¦ate></ng-template>`);
+      const definitionAndBoundSpan = ngLS.getDefinitionAndBoundSpan(APP_COMPONENT, position);
+      expect(definitionAndBoundSpan!.definitions).toEqual([]);
+    });
+  });
+
+  describe('directives', () => {
+    it('should work for directives', () => {
+      const defs = getDefinitionsAndAssertBoundSpan({
+        templateOverride: `<div string-model¦></div>`,
+        expectedSpanText: 'string-model',
+      });
+      expect(defs.length).toEqual(1);
+      expect(defs[0].contextSpan).toContain('@Directive');
+      expect(defs[0].contextSpan).toContain('export class StringModel');
+    });
+
+    it('should work for components', () => {
+      const templateOverride = `
+          <t¦est-comp>
+            <div>some stuff in the middle</div>
+          </test-comp>`;
+      const definitions = getDefinitionsAndAssertBoundSpan({
+        templateOverride,
+        expectedSpanText: templateOverride.replace('¦', '').trim(),
+      });
+      expect(definitions.length).toEqual(1);
+
+      expect(definitions.length).toEqual(1);
+      expect(definitions[0].textSpan).toEqual('TestComponent');
+      expect(definitions[0].contextSpan).toContain('@Component');
+    });
+
+    it('should work for structural directives', () => {
+      const definitions = getDefinitionsAndAssertBoundSpan({
+        templateOverride: `<div *¦ngFor="let item of heroes"></div>`,
+        expectedSpanText: 'ngFor',
+      });
+      expect(definitions.length).toEqual(1);
+      expect(definitions[0].fileName).toContain('ng_for_of.d.ts');
+      expect(definitions[0].textSpan).toEqual('NgForOf');
+      expect(definitions[0].contextSpan)
+          .toContain(
+              'export declare class NgForOf<T, U extends NgIterable<T> = NgIterable<T>> implements DoCheck');
+    });
+
+    it('should return binding for structural directive where key maps to a binding', () => {
+      const definitions = getDefinitionsAndAssertBoundSpan({
+        templateOverride: `<div *ng¦If="anyValue"></div>`,
+        expectedSpanText: 'ngIf',
+      });
+      // Because the input is also part of the selector, the directive is also returned.
+      expect(definitions!.length).toEqual(2);
+      const [inputDef, directiveDef] = definitions;
+
+      expect(inputDef.textSpan).toEqual('ngIf');
+      expect(inputDef.contextSpan).toEqual('set ngIf(condition: T);');
+      expect(directiveDef.textSpan).toEqual('NgIf');
+      expect(directiveDef.contextSpan).toContain('export declare class NgIf');
+    });
+
+    it('should work for directives with compound selectors', () => {
+      let defs = getDefinitionsAndAssertBoundSpan({
+        templateOverride: `<button com¦pound custom-button></button>`,
+        expectedSpanText: 'compound',
+      });
+      expect(defs.length).toEqual(1);
+      expect(defs[0].contextSpan).toContain('export class CompoundCustomButtonDirective');
+      defs = getDefinitionsAndAssertBoundSpan({
+        templateOverride: `<button compound cu¦stom-button></button>`,
+        expectedSpanText: 'custom-button',
+      });
+      expect(defs.length).toEqual(1);
+      expect(defs[0].contextSpan).toContain('export class CompoundCustomButtonDirective');
+    });
+  });
+
+  describe('bindings', () => {
+    describe('inputs', () => {
+      it('should work for input providers', () => {
+        const definitions = getDefinitionsAndAssertBoundSpan({
+          templateOverride: `<test-comp [tcN¦ame]="name"></test-comp>`,
+          expectedSpanText: 'tcName',
+        });
+        expect(definitions!.length).toEqual(1);
+
+        const [def] = definitions;
+        expect(def.textSpan).toEqual('name');
+        expect(def.contextSpan).toEqual(`@Input('tcName') name = 'test';`);
+      });
+
+      it('should work for text inputs', () => {
+        const definitions = getDefinitionsAndAssertBoundSpan({
+          templateOverride: `<test-comp tcN¦ame="name"></test-comp>`,
+          expectedSpanText: 'tcName="name"',
+        });
+        expect(definitions!.length).toEqual(1);
+
+        const [def] = definitions;
+        expect(def.textSpan).toEqual('name');
+        expect(def.contextSpan).toEqual(`@Input('tcName') name = 'test';`);
+      });
+
+      it('should work for structural directive inputs ngForTrackBy', () => {
+        const definitions = getDefinitionsAndAssertBoundSpan({
+          templateOverride: `<div *ngFor="let item of heroes; tr¦ackBy: test;"></div>`,
+          expectedSpanText: 'trackBy',
+        });
+        expect(definitions!.length).toEqual(2);
+
+        const [setterDef, getterDef] = definitions;
+        expect(setterDef.fileName).toContain('ng_for_of.d.ts');
+        expect(setterDef.textSpan).toEqual('ngForTrackBy');
+        expect(setterDef.contextSpan).toEqual('set ngForTrackBy(fn: TrackByFunction<T>);');
+        expect(getterDef.textSpan).toEqual('ngForTrackBy');
+        expect(getterDef.contextSpan).toEqual('get ngForTrackBy(): TrackByFunction<T>;');
+      });
+
+      it('should work for structural directive inputs ngForOf', () => {
+        const definitions = getDefinitionsAndAssertBoundSpan({
+          templateOverride: `<div *ngFor="let item o¦f heroes"></div>`,
+          expectedSpanText: 'of',
+        });
+        // Because the input is also part of the selector ([ngFor][ngForOf]), the directive is also
+        // returned.
+        expect(definitions!.length).toEqual(2);
+        const [inputDef, directiveDef] = definitions;
+
+        expect(inputDef.textSpan).toEqual('ngForOf');
+        expect(inputDef.contextSpan)
+            .toEqual('set ngForOf(ngForOf: U & NgIterable<T> | undefined | null);');
+        expect(directiveDef.textSpan).toEqual('NgForOf');
+        expect(directiveDef.contextSpan).toContain('export declare class NgForOf');
+      });
+
+      it('should work for two-way binding providers', () => {
+        const definitions = getDefinitionsAndAssertBoundSpan({
+          templateOverride: `<test-comp string-model [(mo¦del)]="title"></test-comp>`,
+          expectedSpanText: 'model',
+        });
+        // TODO(atscott): This should really return 2 definitions, 1 for the input and 1 for the
+        // output.
+        //  The TemplateTypeChecker also only returns the first match in the TCB for a given
+        //  sourceSpan so even if we also requested the TmplAstBoundEvent, we'd still get back the
+        //  symbol for the
+        //  @Input because the input appears first in the TCB and they have the same sourceSpan.
+        expect(definitions!.length).toEqual(1);
+
+        const [def] = definitions;
+        expect(def.textSpan).toEqual('model');
+        expect(def.contextSpan).toEqual(`@Input() model: string = 'model';`);
+      });
+    });
+
+    describe('outputs', () => {
+      it('should work for event providers', () => {
+        const definitions = getDefinitionsAndAssertBoundSpan({
+          templateOverride: `<test-comp (te¦st)="myClick($event)"></test-comp>`,
+          expectedSpanText: '(test)="myClick($event)"',
+        });
+        expect(definitions!.length).toEqual(1);
+
+        const [def] = definitions;
+        expect(def.textSpan).toEqual('testEvent');
+        expect(def.contextSpan).toEqual('@Output(\'test\') testEvent = new EventEmitter();');
+      });
+
+      it('should return nothing for $event from EventEmitter', () => {
+        const {position} = service.overwriteInlineTemplate(
+            APP_COMPONENT, `<div string-model (modelChange)="myClick($e¦vent)"></div>`);
+        const definitionAndBoundSpan = ngLS.getDefinitionAndBoundSpan(APP_COMPONENT, position);
+        expect(definitionAndBoundSpan).toBeUndefined();
+      });
+
+      it('should return the directive when the event is part of the selector', () => {
+        const definitions = getDefinitionsAndAssertBoundSpan({
+          templateOverride: `<div (eventSelect¦or)="title = ''"></div>`,
+          expectedSpanText: `(eventSelector)="title = ''"`,
+        });
+        expect(definitions!.length).toEqual(2);
+
+        const [inputDef, directiveDef] = definitions;
+        expect(inputDef.textSpan).toEqual('eventSelector');
+        expect(inputDef.contextSpan).toEqual('@Output() eventSelector = new EventEmitter<void>();');
+        expect(directiveDef.textSpan).toEqual('EventSelectorDirective');
+        expect(directiveDef.contextSpan).toContain('export class EventSelectorDirective');
+      });
+    });
+  });
+
+  describe('references', () => {
+    it('should work for element reference declarations', () => {
+      const definitions = getDefinitionsAndAssertBoundSpan({
+        templateOverride: `<div #cha¦rt></div>{{chart}}`,
+        expectedSpanText: '#chart',
+      });
+      // We're already at the definition, so nothing is returned
+      expect(definitions).toEqual([]);
+    });
+
+    it('should work for element reference uses', () => {
+      const definitions = getDefinitionsAndAssertBoundSpan({
+        templateOverride: `<div #chart></div>{{char¦t}}`,
+        expectedSpanText: 'chart',
+      });
+      expect(definitions!.length).toEqual(1);
+
+      const [varDef] = definitions;
+      expect(varDef.textSpan).toEqual('#chart');
+    });
+  });
+
+  describe('variables', () => {
+    it('should work for array members', () => {
+      const definitions = getDefinitionsAndAssertBoundSpan({
+        templateOverride: `<div *ngFor="let hero of heroes">{{her¦o}}</div>`,
+        expectedSpanText: 'hero',
+      });
+      expect(definitions!.length).toEqual(2);
+
+      const [templateDeclarationDef, contextDef] = definitions;
+      expect(templateDeclarationDef.textSpan).toEqual('hero');
+      // `$implicit` is from the `NgForOfContext`:
+      // https://github.com/angular/angular/blob/89c5255b8ca59eed27ede9e1fad69857ab0c6f4f/packages/common/src/directives/ng_for_of.ts#L15
+      expect(contextDef.textSpan).toEqual('$implicit');
+      expect(contextDef.contextSpan).toContain('$implicit: T;');
+    });
+  });
+
+  describe('pipes', () => {
+    it('should work for pipes', () => {
+      const templateOverride = `<p>The hero's birthday is {{birthday | da¦te: "MM/dd/yy"}}</p>`;
+      const definitions = getDefinitionsAndAssertBoundSpan({
+        templateOverride,
+        expectedSpanText: 'date',
+      });
+      expect(definitions!.length).toEqual(1);
+
+      const [def] = definitions;
+      expect(def.textSpan).toEqual('transform');
+      expect(def.contextSpan).toContain('transform(value: Date | string | number, ');
+    });
+  });
+
+  describe('expressions', () => {
+    it('should find members in a text interpolation', () => {
+      const definitions = getDefinitionsAndAssertBoundSpan({
+        templateOverride: `<div>{{ tit¦le }}</div>`,
+        expectedSpanText: 'title',
+      });
+      expect(definitions!.length).toEqual(1);
+
+      const [def] = definitions;
+      expect(def.textSpan).toEqual('title');
+      expect(def.contextSpan).toEqual(`title = 'Tour of Heroes';`);
+    });
+
+    it('should work for accessed property reads', () => {
+      const definitions = getDefinitionsAndAssertBoundSpan({
+        templateOverride: `<div>{{title.len¦gth}}</div>`,
+        expectedSpanText: 'length',
+      });
+      expect(definitions!.length).toEqual(1);
+
+      const [def] = definitions;
+      expect(def.textSpan).toEqual('length');
+      expect(def.contextSpan).toEqual('readonly length: number;');
+    });
+
+    it('should find members in an attribute interpolation', () => {
+      const definitions = getDefinitionsAndAssertBoundSpan({
+        templateOverride: `<div string-model model="{{tit¦le}}"></div>`,
+        expectedSpanText: 'title',
+      });
+      expect(definitions!.length).toEqual(1);
+
+      const [def] = definitions;
+      expect(def.textSpan).toEqual('title');
+      expect(def.contextSpan).toEqual(`title = 'Tour of Heroes';`);
+    });
+
+    it('should find members of input binding', () => {
+      const definitions = getDefinitionsAndAssertBoundSpan({
+        templateOverride: `<test-comp [tcName]="ti¦tle"></test-comp>`,
+        expectedSpanText: 'title',
+      });
+      expect(definitions!.length).toEqual(1);
+
+      const [def] = definitions;
+      expect(def.textSpan).toEqual('title');
+      expect(def.contextSpan).toEqual(`title = 'Tour of Heroes';`);
+    });
+
+    it('should find members of event binding', () => {
+      const definitions = getDefinitionsAndAssertBoundSpan({
+        templateOverride: `<test-comp (test)="ti¦tle=$event"></test-comp>`,
+        expectedSpanText: 'title',
+      });
+      expect(definitions!.length).toEqual(1);
+
+      const [def] = definitions;
+      expect(def.textSpan).toEqual('title');
+      expect(def.contextSpan).toEqual(`title = 'Tour of Heroes';`);
+    });
+
+    it('should work for method calls', () => {
+      const definitions = getDefinitionsAndAssertBoundSpan({
+        templateOverride: `<div (click)="setT¦itle('title')"></div>`,
+        expectedSpanText: 'setTitle',
+      });
+      expect(definitions!.length).toEqual(1);
+
+      const [def] = definitions;
+      expect(def.textSpan).toEqual('setTitle');
+      expect(def.contextSpan).toContain('setTitle(newTitle: string)');
+    });
+
+    it('should work for accessed properties in writes', () => {
+      const definitions = getDefinitionsAndAssertBoundSpan({
+        templateOverride: `<div (click)="hero.i¦d = 2"></div>`,
+        expectedSpanText: 'id',
+      });
+      expect(definitions!.length).toEqual(1);
+
+      const [def] = definitions;
+      expect(def.textSpan).toEqual('id');
+      expect(def.contextSpan).toEqual('id: number;');
+    });
+
+    it('should work for method call arguments', () => {
+      const definitions = getDefinitionsAndAssertBoundSpan({
+        templateOverride: `<div (click)="setTitle(hero.nam¦e)"></div>`,
+        expectedSpanText: 'name',
+      });
+      expect(definitions!.length).toEqual(1);
+
+      const [def] = definitions;
+      expect(def.textSpan).toEqual('name');
+      expect(def.contextSpan).toEqual('name: string;');
+    });
+
+    it('should find members of two-way binding', () => {
+      const definitions = getDefinitionsAndAssertBoundSpan({
+        templateOverride: `<input [(ngModel)]="ti¦tle" />`,
+        expectedSpanText: 'title',
+      });
+      expect(definitions!.length).toEqual(1);
+
+      const [def] = definitions;
+      expect(def.textSpan).toEqual('title');
+      expect(def.contextSpan).toEqual(`title = 'Tour of Heroes';`);
+    });
+
+    it('should find members in a structural directive', () => {
+      const definitions = getDefinitionsAndAssertBoundSpan({
+        templateOverride: `<div *ngIf="anyV¦alue"></div>`,
+        expectedSpanText: 'anyValue',
+      });
+      expect(definitions!.length).toEqual(1);
+
+      const [def] = definitions;
+      expect(def.textSpan).toEqual('anyValue');
+      expect(def.contextSpan).toEqual('anyValue: any;');
+    });
+
+    it('should work for variables in structural directives', () => {
+      const definitions = getDefinitionsAndAssertBoundSpan({
+        templateOverride: `<div *ngFor="let item of heroes as her¦oes2; trackBy: test;"></div>`,
+        expectedSpanText: 'heroes2',
+      });
+      expect(definitions!.length).toEqual(1);
+
+      const [def] = definitions;
+      expect(def.textSpan).toEqual('ngForOf');
+      expect(def.contextSpan).toEqual('ngForOf: U;');
+    });
+
+    it('should work for uses of members in structural directives', () => {
+      const definitions = getDefinitionsAndAssertBoundSpan({
+        templateOverride: `<div *ngFor="let item of heroes as heroes2">{{her¦oes2}}</div>`,
+        expectedSpanText: 'heroes2',
+      });
+      expect(definitions!.length).toEqual(2);
+
+      const [def, contextDef] = definitions;
+      expect(def.textSpan).toEqual('heroes2');
+      expect(def.contextSpan).toEqual('of heroes as heroes2');
+      expect(contextDef.textSpan).toEqual('ngForOf');
+      expect(contextDef.contextSpan).toEqual('ngForOf: U;');
+    });
+
+    it('should work for members in structural directives', () => {
+      const definitions = getDefinitionsAndAssertBoundSpan({
+        templateOverride: `<div *ngFor="let item of her¦oes; trackBy: test;"></div>`,
+        expectedSpanText: 'heroes',
+      });
+      expect(definitions!.length).toEqual(1);
+
+      const [def] = definitions;
+      expect(def.textSpan).toEqual('heroes');
+      expect(def.contextSpan).toEqual('heroes: Hero[] = [this.hero];');
+    });
+
+    it('should return nothing for the $any() cast function', () => {
+      const {position} =
+          service.overwriteInlineTemplate(APP_COMPONENT, `<div>{{$an¦y(title)}}</div>`);
+      const definitionAndBoundSpan = ngLS.getDefinitionAndBoundSpan(APP_COMPONENT, position);
+      expect(definitionAndBoundSpan).toBeUndefined();
+    });
+  });
+
+  describe('external resources', () => {
+    it('should be able to find a template from a url', () => {
+      const {position, text} = service.overwrite(APP_COMPONENT, `
+        import {Component} from '@angular/core';
+	      @Component({
+	        templateUrl: './tes¦t.ng',
+	      })
+	      export class MyComponent {}`);
+      const result = ngLS.getDefinitionAndBoundSpan(APP_COMPONENT, position);
+
+      expect(result).toBeDefined();
+      const {textSpan, definitions} = result!;
+
+      expect(text.substring(textSpan.start, textSpan.start + textSpan.length)).toEqual('./test.ng');
+
+      expect(definitions).toBeDefined();
+      expect(definitions!.length).toBe(1);
+      const [def] = definitions!;
+      expect(def.fileName).toContain('/app/test.ng');
+      expect(def.textSpan).toEqual({start: 0, length: 0});
+    });
+
+    it('should be able to find a stylesheet from a url', () => {
+      const {position, text} = service.overwrite(APP_COMPONENT, `
+        import {Component} from '@angular/core';
+	      @Component({
+	        template: 'empty',
+	        styleUrls: ['./te¦st.css']
+	      })
+	      export class MyComponent {}`);
+      const result = ngLS.getDefinitionAndBoundSpan(APP_COMPONENT, position);
+
+
+      expect(result).toBeDefined();
+      const {textSpan, definitions} = result!;
+
+      expect(text.substring(textSpan.start, textSpan.start + textSpan.length))
+          .toEqual('./test.css');
+
+      expect(definitions).toBeDefined();
+      expect(definitions!.length).toBe(1);
+      const [def] = definitions!;
+      expect(def.fileName).toContain('/app/test.css');
+      expect(def.textSpan).toEqual({start: 0, length: 0});
+    });
+  });
+
+  function getDefinitionsAndAssertBoundSpan(
+      {templateOverride, expectedSpanText}: {templateOverride: string, expectedSpanText: string}):
+      Array<{textSpan: string, contextSpan: string | undefined, fileName: string}> {
+    const {position, text} = service.overwriteInlineTemplate(APP_COMPONENT, templateOverride);
+    const definitionAndBoundSpan = ngLS.getDefinitionAndBoundSpan(APP_COMPONENT, position);
+    expect(definitionAndBoundSpan).toBeTruthy();
+    const {textSpan, definitions} = definitionAndBoundSpan!;
+    expect(text.substring(textSpan.start, textSpan.start + textSpan.length))
+        .toEqual(expectedSpanText);
+    expect(definitions).toBeTruthy();
+    return definitions!.map(d => humanizeDefinitionInfo(d, service));
+  }
+});
diff --git a/packages/language-service/ivy/test/diagnostic_spec.ts b/packages/language-service/ivy/test/diagnostic_spec.ts
index 5ebeb615b84e3..bb894c8c7b664 100644
--- a/packages/language-service/ivy/test/diagnostic_spec.ts
+++ b/packages/language-service/ivy/test/diagnostic_spec.ts
@@ -10,11 +10,17 @@ import * as ts from 'typescript/lib/tsserverlibrary';
 
 import {LanguageService} from '../language_service';
 
-import {APP_COMPONENT, setup} from './mock_host';
+import {APP_COMPONENT, MockService, setup, TEST_TEMPLATE} from './mock_host';
 
-describe('diagnostic', () => {
-  const {project, service, tsLS} = setup();
-  const ngLS = new LanguageService(project, tsLS);
+describe('getSemanticDiagnostics', () => {
+  let service: MockService;
+  let ngLS: LanguageService;
+
+  beforeAll(() => {
+    const {project, service: _service, tsLS} = setup();
+    service = _service;
+    ngLS = new LanguageService(project, tsLS);
+  });
 
   beforeEach(() => {
     service.reset();
@@ -26,13 +32,44 @@ describe('diagnostic', () => {
   });
 
   it('should report member does not exist', () => {
-    const content = service.overwriteInlineTemplate(APP_COMPONENT, '{{ nope }}');
+    const {text} = service.overwriteInlineTemplate(APP_COMPONENT, '{{ nope }}');
     const diags = ngLS.getSemanticDiagnostics(APP_COMPONENT);
     expect(diags.length).toBe(1);
     const {category, file, start, length, messageText} = diags[0];
     expect(category).toBe(ts.DiagnosticCategory.Error);
     expect(file?.fileName).toBe(APP_COMPONENT);
-    expect(content.substring(start!, start! + length!)).toBe('nope');
+    expect(text.substring(start!, start! + length!)).toBe('nope');
     expect(messageText).toBe(`Property 'nope' does not exist on type 'AppComponent'.`);
   });
+
+  it('should process external template', () => {
+    const diags = ngLS.getSemanticDiagnostics(TEST_TEMPLATE);
+    expect(diags).toEqual([]);
+  });
+
+  it('should report member does not exist in external template', () => {
+    const {text} = service.overwrite(TEST_TEMPLATE, `{{ nope }}`);
+    const diags = ngLS.getSemanticDiagnostics(TEST_TEMPLATE);
+    expect(diags.length).toBe(1);
+    const {category, file, start, length, messageText} = diags[0];
+    expect(category).toBe(ts.DiagnosticCategory.Error);
+    expect(file?.fileName).toBe(TEST_TEMPLATE);
+    expect(text.substring(start!, start! + length!)).toBe('nope');
+    expect(messageText).toBe(`Property 'nope' does not exist on type 'TemplateReference'.`);
+  });
+
+  it('should retrieve external template from latest snapshot', () => {
+    // This test is to make sure we are reading from snapshot instead of disk
+    // if content from snapshot is newer. It also makes sure the internal cache
+    // of the resource loader is invalidated on content change.
+    service.overwrite(TEST_TEMPLATE, `{{ foo }}`);
+    const d1 = ngLS.getSemanticDiagnostics(TEST_TEMPLATE);
+    expect(d1.length).toBe(1);
+    expect(d1[0].messageText).toBe(`Property 'foo' does not exist on type 'TemplateReference'.`);
+
+    service.overwrite(TEST_TEMPLATE, `{{ bar }}`);
+    const d2 = ngLS.getSemanticDiagnostics(TEST_TEMPLATE);
+    expect(d2.length).toBe(1);
+    expect(d2[0].messageText).toBe(`Property 'bar' does not exist on type 'TemplateReference'.`);
+  });
 });
diff --git a/packages/language-service/ivy/test/hybrid_visitor_spec.ts b/packages/language-service/ivy/test/hybrid_visitor_spec.ts
new file mode 100644
index 0000000000000..04d357823863c
--- /dev/null
+++ b/packages/language-service/ivy/test/hybrid_visitor_spec.ts
@@ -0,0 +1,638 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {ParseError, parseTemplate} from '@angular/compiler';
+import * as e from '@angular/compiler/src/expression_parser/ast';  // e for expression AST
+import * as t from '@angular/compiler/src/render3/r3_ast';         // t for template AST
+
+import {findNodeAtPosition} from '../hybrid_visitor';
+import {isExpressionNode, isTemplateNode} from '../utils';
+
+interface ParseResult {
+  nodes: t.Node[];
+  errors: ParseError[]|null;
+  position: number;
+}
+
+function parse(template: string): ParseResult {
+  const position = template.indexOf('¦');
+  if (position < 0) {
+    throw new Error(`Template "${template}" does not contain the cursor`);
+  }
+  template = template.replace('¦', '');
+  const templateUrl = '/foo';
+  return {
+    ...parseTemplate(template, templateUrl),
+    position,
+  };
+}
+
+describe('findNodeAtPosition for template AST', () => {
+  it('should locate element in opening tag', () => {
+    const {errors, nodes, position} = parse(`<di¦v></div>`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isTemplateNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(t.Element);
+  });
+
+  it('should locate element in closing tag', () => {
+    const {errors, nodes, position} = parse(`<div></di¦v>`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isTemplateNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(t.Element);
+  });
+
+  it('should locate element when cursor is at the beginning', () => {
+    const {errors, nodes, position} = parse(`<¦div></div>`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isTemplateNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(t.Element);
+  });
+
+  it('should locate element when cursor is at the end', () => {
+    const {errors, nodes, position} = parse(`<div¦></div>`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isTemplateNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(t.Element);
+  });
+
+  it('should locate attribute key', () => {
+    const {errors, nodes, position} = parse(`<div cla¦ss="foo"></div>`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isTemplateNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(t.TextAttribute);
+  });
+
+  it('should locate attribute value', () => {
+    const {errors, nodes, position} = parse(`<div class="fo¦o"></div>`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isTemplateNode(node!)).toBe(true);
+    // TODO: Note that we do not have the ability to detect the RHS (yet)
+    expect(node).toBeInstanceOf(t.TextAttribute);
+  });
+
+  it('should locate bound attribute key', () => {
+    const {errors, nodes, position} = parse(`<test-cmp [fo¦o]="bar"></test-cmp>`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isTemplateNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(t.BoundAttribute);
+  });
+
+  it('should locate bound attribute value', () => {
+    const {errors, nodes, position} = parse(`<test-cmp [foo]="b¦ar"></test-cmp>`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isExpressionNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(e.PropertyRead);
+  });
+
+  it('should not locate bound attribute if cursor is between key and value', () => {
+    const {errors, nodes, position} = parse(`<test-cmp [foo]¦="bar"></test-cmp>`);
+    expect(errors).toBeNull();
+    const node = findNodeAtPosition(nodes, position);
+    expect(node).toBeUndefined();
+  });
+
+  it('should locate bound event key', () => {
+    const {errors, nodes, position} = parse(`<test-cmp (fo¦o)="bar()"></test-cmp>`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isTemplateNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(t.BoundEvent);
+  });
+
+  it('should locate bound event value', () => {
+    const {errors, nodes, position} = parse(`<test-cmp (foo)="b¦ar()"></test-cmp>`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isExpressionNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(e.MethodCall);
+  });
+
+  it('should locate element children', () => {
+    const {errors, nodes, position} = parse(`<div><sp¦an></span></div>`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isTemplateNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(t.Element);
+    expect((node as t.Element).name).toBe('span');
+  });
+
+  it('should locate element reference', () => {
+    const {errors, nodes, position} = parse(`<div #my¦div></div>`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isTemplateNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(t.Reference);
+  });
+
+  it('should locate template text attribute', () => {
+    const {errors, nodes, position} = parse(`<ng-template ng¦If></ng-template>`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isTemplateNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(t.TextAttribute);
+  });
+
+  it('should locate template bound attribute key', () => {
+    const {errors, nodes, position} = parse(`<ng-template [ng¦If]="foo"></ng-template>`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isTemplateNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(t.BoundAttribute);
+  });
+
+  it('should locate template bound attribute value', () => {
+    const {errors, nodes, position} = parse(`<ng-template [ngIf]="f¦oo"></ng-template>`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isExpressionNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(e.PropertyRead);
+  });
+
+  it('should locate template bound attribute key in two-way binding', () => {
+    const {errors, nodes, position} = parse(`<ng-template [(f¦oo)]="bar"></ng-template>`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isTemplateNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(t.BoundAttribute);
+    expect((node as t.BoundAttribute).name).toBe('foo');
+  });
+
+  it('should locate template bound attribute value in two-way binding', () => {
+    const {errors, nodes, position} = parse(`<ng-template [(foo)]="b¦ar"></ng-template>`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isExpressionNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(e.PropertyRead);
+    expect((node as e.PropertyRead).name).toBe('bar');
+  });
+
+  it('should locate template bound event key', () => {
+    const {errors, nodes, position} = parse(`<ng-template (cl¦ick)="foo()"></ng-template>`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isTemplateNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(t.BoundEvent);
+  });
+
+  it('should locate template bound event value', () => {
+    const {errors, nodes, position} = parse(`<ng-template (click)="f¦oo()"></ng-template>`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(node).toBeInstanceOf(e.MethodCall);
+  });
+
+  it('should locate template attribute key', () => {
+    const {errors, nodes, position} = parse(`<ng-template i¦d="foo"></ng-template>`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isTemplateNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(t.TextAttribute);
+  });
+
+  it('should locate template attribute value', () => {
+    const {errors, nodes, position} = parse(`<ng-template id="f¦oo"></ng-template>`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isTemplateNode(node!)).toBe(true);
+    // TODO: Note that we do not have the ability to detect the RHS (yet)
+    expect(node).toBeInstanceOf(t.TextAttribute);
+  });
+
+  it('should locate template reference key via the # notation', () => {
+    const {errors, nodes, position} = parse(`<ng-template #f¦oo></ng-template>`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isTemplateNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(t.Reference);
+    expect((node as t.Reference).name).toBe('foo');
+  });
+
+  it('should locate template reference key via the ref- notation', () => {
+    const {errors, nodes, position} = parse(`<ng-template ref-fo¦o></ng-template>`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isTemplateNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(t.Reference);
+    expect((node as t.Reference).name).toBe('foo');
+  });
+
+  it('should locate template reference value via the # notation', () => {
+    const {errors, nodes, position} = parse(`<ng-template #foo="export¦As"></ng-template>`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isTemplateNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(t.Reference);
+    expect((node as t.Reference).value).toBe('exportAs');
+    // TODO: Note that we do not have the ability to distinguish LHS and RHS
+  });
+
+  it('should locate template reference value via the ref- notation', () => {
+    const {errors, nodes, position} = parse(`<ng-template ref-foo="export¦As"></ng-template>`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isTemplateNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(t.Reference);
+    expect((node as t.Reference).value).toBe('exportAs');
+    // TODO: Note that we do not have the ability to distinguish LHS and RHS
+  });
+
+  it('should locate template variable key', () => {
+    const {errors, nodes, position} = parse(`<ng-template let-f¦oo="bar"></ng-template>`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isTemplateNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(t.Variable);
+  });
+
+  it('should locate template variable value', () => {
+    const {errors, nodes, position} = parse(`<ng-template let-foo="b¦ar"></ng-template>`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isTemplateNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(t.Variable);
+  });
+
+  it('should locate template children', () => {
+    const {errors, nodes, position} = parse(`<ng-template><d¦iv></div></ng-template>`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isTemplateNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(t.Element);
+  });
+
+  it('should locate ng-content', () => {
+    const {errors, nodes, position} = parse(`<ng-co¦ntent></ng-content>`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isTemplateNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(t.Content);
+  });
+
+  it('should locate ng-content attribute key', () => {
+    const {errors, nodes, position} = parse('<ng-content cla¦ss="red"></ng-content>');
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isTemplateNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(t.TextAttribute);
+  });
+
+  it('should locate ng-content attribute value', () => {
+    const {errors, nodes, position} = parse('<ng-content class="r¦ed"></ng-content>');
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    // TODO: Note that we do not have the ability to detect the RHS (yet)
+    expect(isTemplateNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(t.TextAttribute);
+  });
+
+  it('should not locate implicit receiver', () => {
+    const {errors, nodes, position} = parse(`<div [foo]="¦bar"></div>`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isExpressionNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(e.PropertyRead);
+  });
+
+  it('should locate bound attribute key in two-way binding', () => {
+    const {errors, nodes, position} = parse(`<cmp [(f¦oo)]="bar"></cmp>`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isTemplateNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(t.BoundAttribute);
+    expect((node as t.BoundAttribute).name).toBe('foo');
+  });
+
+  it('should locate bound attribute value in two-way binding', () => {
+    const {errors, nodes, position} = parse(`<cmp [(foo)]="b¦ar"></cmp>`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isExpressionNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(e.PropertyRead);
+    expect((node as e.PropertyRead).name).toBe('bar');
+  });
+
+  it('should locate switch value in ICUs', () => {
+    const {errors, nodes, position} = parse(`<span i18n>{sw¦itch, plural, other {text}}"></span>`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isExpressionNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(e.PropertyRead);
+    expect((node as e.PropertyRead).name).toBe('switch');
+  });
+
+  it('should locate switch value in nested ICUs', () => {
+    const {errors, nodes, position} = parse(
+        `<span i18n>{expr, plural, other { {ne¦sted, plural, =1 { {{nestedInterpolation}} }} }}"></span>`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isExpressionNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(e.PropertyRead);
+    expect((node as e.PropertyRead).name).toBe('nested');
+  });
+
+  it('should locate interpolation expressions in ICUs', () => {
+    const {errors, nodes, position} =
+        parse(`<span i18n>{expr, plural, other { {{ i¦nterpolation }} }}"></span>`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isExpressionNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(e.PropertyRead);
+    expect((node as e.PropertyRead).name).toBe('interpolation');
+  });
+
+  it('should locate interpolation expressions in nested ICUs', () => {
+    const {errors, nodes, position} = parse(
+        `<span i18n>{expr, plural, other { {nested, plural, =1 { {{n¦estedInterpolation}} }} }}"></span>`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isExpressionNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(e.PropertyRead);
+    expect((node as e.PropertyRead).name).toBe('nestedInterpolation');
+  });
+});
+
+describe('findNodeAtPosition for expression AST', () => {
+  it('should not locate implicit receiver', () => {
+    const {errors, nodes, position} = parse(`{{ ¦title }}`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isExpressionNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(e.PropertyRead);
+    expect((node as e.PropertyRead).name).toBe('title');
+  });
+
+  it('should locate property read', () => {
+    const {errors, nodes, position} = parse(`{{ ti¦tle }}`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isExpressionNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(e.PropertyRead);
+    expect((node as e.PropertyRead).name).toBe('title');
+  });
+
+  it('should locate safe property read', () => {
+    const {errors, nodes, position} = parse(`{{ foo?¦.bar }}`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isExpressionNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(e.SafePropertyRead);
+    expect((node as e.SafePropertyRead).name).toBe('bar');
+  });
+
+  it('should locate keyed read', () => {
+    const {errors, nodes, position} = parse(`{{ foo['bar']¦ }}`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isExpressionNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(e.KeyedRead);
+  });
+
+  it('should locate property write', () => {
+    const {errors, nodes, position} = parse(`<div (foo)="b¦ar=$event"></div>`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isExpressionNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(e.PropertyWrite);
+  });
+
+  it('should locate keyed write', () => {
+    const {errors, nodes, position} = parse(`<div (foo)="bar['baz']¦=$event"></div>`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isExpressionNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(e.KeyedWrite);
+  });
+
+  it('should locate binary', () => {
+    const {errors, nodes, position} = parse(`{{ 1 +¦ 2 }}`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isExpressionNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(e.Binary);
+  });
+
+  it('should locate binding pipe with an identifier', () => {
+    const {errors, nodes, position} = parse(`{{ title | p¦ }}`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isExpressionNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(e.BindingPipe);
+  });
+
+  it('should locate binding pipe without identifier',
+     () => {
+         // TODO: We are not able to locate pipe if identifier is missing because the
+         // parser throws an error. This case is important for autocomplete.
+         // const {errors, nodes, position} = parse(`{{ title | ¦ }}`);
+         // expect(errors).toBe(null);
+         // const node = findNodeAtPosition(nodes, position);
+         // expect(isExpressionNode(node!)).toBe(true);
+         // expect(node).toBeInstanceOf(e.BindingPipe);
+     });
+
+  it('should locate method call', () => {
+    const {errors, nodes, position} = parse(`{{ title.toString(¦) }}`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isExpressionNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(e.MethodCall);
+  });
+
+  it('should locate safe method call', () => {
+    const {errors, nodes, position} = parse(`{{ title?.toString(¦) }}`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isExpressionNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(e.SafeMethodCall);
+  });
+
+  it('should locate literal primitive in interpolation', () => {
+    const {errors, nodes, position} = parse(`{{ title.indexOf('t¦') }}`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isExpressionNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(e.LiteralPrimitive);
+    expect((node as e.LiteralPrimitive).value).toBe('t');
+  });
+
+  it('should locate literal primitive in binding', () => {
+    const {errors, nodes, position} = parse(`<div [id]="'t¦'"></div>`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isExpressionNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(e.LiteralPrimitive);
+    expect((node as e.LiteralPrimitive).value).toBe('t');
+  });
+
+  it('should locate empty expression', () => {
+    const {errors, nodes, position} = parse(`<div [id]="¦"></div>`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isExpressionNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(e.EmptyExpr);
+  });
+
+  it('should locate literal array', () => {
+    const {errors, nodes, position} = parse(`{{ [1, 2,¦ 3] }}`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isExpressionNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(e.LiteralArray);
+  });
+
+  it('should locate literal map', () => {
+    const {errors, nodes, position} = parse(`{{ { hello:¦ "world" } }}`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isExpressionNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(e.LiteralMap);
+  });
+
+  it('should locate conditional', () => {
+    const {errors, nodes, position} = parse(`{{ cond ?¦ true : false }}`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isExpressionNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(e.Conditional);
+  });
+});
+
+describe('findNodeAtPosition for microsyntax expression', () => {
+  it('should locate template key', () => {
+    const {errors, nodes, position} = parse(`<div *ng¦If="foo"></div>`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isTemplateNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(t.BoundAttribute);
+  });
+
+  it('should locate template value', () => {
+    const {errors, nodes, position} = parse(`<div *ngIf="f¦oo"></div>`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isExpressionNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(e.PropertyRead);
+  });
+
+  it('should locate text attribute', () => {
+    const {errors, nodes, position} = parse(`<div *ng¦For="let item of items"></div>`);
+    // ngFor is a text attribute because the desugared form is
+    // <ng-template ngFor let-item [ngForOf]="items">
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isTemplateNode(node!)).toBeTrue();
+    expect(node).toBeInstanceOf(t.TextAttribute);
+    expect((node as t.TextAttribute).name).toBe('ngFor');
+  });
+
+  it('should locate not let keyword', () => {
+    const {errors, nodes, position} = parse(`<div *ngFor="l¦et item of items"></div>`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(node).toBeUndefined();
+  });
+
+  it('should locate let variable', () => {
+    const {errors, nodes, position} = parse(`<div *ngFor="let i¦tem of items"></div>`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isTemplateNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(t.Variable);
+    expect((node as t.Variable).name).toBe('item');
+  });
+
+  it('should locate bound attribute key', () => {
+    const {errors, nodes, position} = parse(`<div *ngFor="let item o¦f items"></div>`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isTemplateNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(t.BoundAttribute);
+    expect((node as t.BoundAttribute).name).toBe('ngForOf');
+  });
+
+  it('should locate bound attribute key for trackBy', () => {
+    const {errors, nodes, position} =
+        parse(`<div *ngFor="let item of items; trac¦kBy: trackByFn"></div>`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isTemplateNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(t.BoundAttribute);
+    expect((node as t.BoundAttribute).name).toBe('ngForTrackBy');
+  });
+
+  it('should locate first bound attribute when there are two', () => {
+    // It used to be the case that all microsyntax bindings share the same
+    // source span, so the second bound attribute would overwrite the first.
+    // This has been fixed in pr/39036, this case is added to prevent regression.
+    const {errors, nodes, position} =
+        parse(`<div *ngFor="let item o¦f items; trackBy: trackByFn"></div>`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isTemplateNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(t.BoundAttribute);
+    expect((node as t.BoundAttribute).name).toBe('ngForOf');
+  });
+
+  it('should locate bound attribute value', () => {
+    const {errors, nodes, position} = parse(`<div *ngFor="let item of it¦ems"></div>`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isExpressionNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(e.PropertyRead);
+    expect((node as e.PropertyRead).name).toBe('items');
+  });
+
+  it('should locate template children', () => {
+    const {errors, nodes, position} = parse(`<di¦v *ngIf></div>`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isTemplateNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(t.Element);
+    expect((node as t.Element).name).toBe('div');
+  });
+
+  it('should locate property read of variable declared within template', () => {
+    const {errors, nodes, position} = parse(`
+      <div *ngFor="let item of items; let i=index">
+        {{ i¦ }}
+      </div>`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isExpressionNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(e.PropertyRead);
+  });
+
+  it('should locate LHS of variable declaration', () => {
+    const {errors, nodes, position} = parse(`<div *ngFor="let item of items; let i¦=index">`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isTemplateNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(t.Variable);
+    // TODO: Currently there is no way to distinguish LHS from RHS
+    expect((node as t.Variable).name).toBe('i');
+  });
+
+  it('should locate RHS of variable declaration', () => {
+    const {errors, nodes, position} = parse(`<div *ngFor="let item of items; let i=in¦dex">`);
+    expect(errors).toBe(null);
+    const node = findNodeAtPosition(nodes, position);
+    expect(isTemplateNode(node!)).toBe(true);
+    expect(node).toBeInstanceOf(t.Variable);
+    // TODO: Currently there is no way to distinguish LHS from RHS
+    expect((node as t.Variable).value).toBe('index');
+  });
+});
diff --git a/packages/language-service/ivy/test/language_service_adapter_spec.ts b/packages/language-service/ivy/test/language_service_adapter_spec.ts
new file mode 100644
index 0000000000000..2aad2c035d8ff
--- /dev/null
+++ b/packages/language-service/ivy/test/language_service_adapter_spec.ts
@@ -0,0 +1,41 @@
+/**
+ * @license
+ * Copyright Google LLC 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/lib/tsserverlibrary';
+
+import {LanguageServiceAdapter} from '../language_service_adapter';
+
+import {MockService, setup, TEST_TEMPLATE} from './mock_host';
+
+describe('Language service adapter', () => {
+  let project: ts.server.Project;
+  let service: MockService;
+
+  beforeAll(() => {
+    const {project: _project, service: _service} = setup();
+    project = _project;
+    service = _service;
+  });
+
+  it('should mark template dirty if it has not seen the template before', () => {
+    const adapter = new LanguageServiceAdapter(project);
+    expect(adapter.isTemplateDirty(TEST_TEMPLATE)).toBeTrue();
+  });
+
+  it('should not mark template dirty if template has not changed', () => {
+    const adapter = new LanguageServiceAdapter(project);
+    adapter.readResource(TEST_TEMPLATE);
+    expect(adapter.isTemplateDirty(TEST_TEMPLATE)).toBeFalse();
+  });
+
+  it('should mark template dirty if template has changed', () => {
+    const adapter = new LanguageServiceAdapter(project);
+    service.overwrite(TEST_TEMPLATE, '<p>Hello World</p>');
+    expect(adapter.isTemplateDirty(TEST_TEMPLATE)).toBeTrue();
+  });
+});
diff --git a/packages/language-service/ivy/test/language_service_spec.ts b/packages/language-service/ivy/test/language_service_spec.ts
index 99cc6e531cc5f..aec1aa8567489 100644
--- a/packages/language-service/ivy/test/language_service_spec.ts
+++ b/packages/language-service/ivy/test/language_service_spec.ts
@@ -6,19 +6,118 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {parseNgCompilerOptions} from '../language_service';
+import * as ts from 'typescript/lib/tsserverlibrary';
 
-import {setup} from './mock_host';
+import {LanguageService, parseNgCompilerOptions} from '../language_service';
 
-const {project} = setup();
+import {MockService, setup, TEST_TEMPLATE} from './mock_host';
 
-describe('parseNgCompilerOptions', () => {
-  it('should read angularCompilerOptions in tsconfig.json', () => {
-    const options = parseNgCompilerOptions(project);
-    expect(options).toEqual(jasmine.objectContaining({
-      enableIvy: true,  // default for ivy is true
-      fullTemplateTypeCheck: true,
-      strictInjectionParameters: true,
-    }));
+describe('language service adapter', () => {
+  let project: ts.server.Project;
+  let service: MockService;
+  let ngLS: LanguageService;
+
+  beforeAll(() => {
+    const {project: _project, tsLS, service: _service} = setup();
+    project = _project;
+    service = _service;
+    ngLS = new LanguageService(project, tsLS);
+  });
+
+  describe('parseNgCompilerOptions', () => {
+    it('should read angularCompilerOptions in tsconfig.json', () => {
+      const options = parseNgCompilerOptions(project);
+      expect(options).toEqual(jasmine.objectContaining({
+        enableIvy: true,  // default for ivy is true
+        strictTemplates: true,
+        strictInjectionParameters: true,
+      }));
+    });
+  });
+
+  describe('last known program', () => {
+    beforeEach(() => {
+      service.reset();
+    });
+
+    it('should be set after getSemanticDiagnostics()', () => {
+      const d0 = ngLS.getSemanticDiagnostics(TEST_TEMPLATE);
+      expect(d0.length).toBe(0);
+      const p0 = getLastKnownProgram(ngLS);
+
+      const d1 = ngLS.getSemanticDiagnostics(TEST_TEMPLATE);
+      expect(d1.length).toBe(0);
+      const p1 = getLastKnownProgram(ngLS);
+      expect(p1).toBe(p0);  // last known program should not have changed
+
+      service.overwrite(TEST_TEMPLATE, `<test-c¦omp></test-comp>`);
+      const d2 = ngLS.getSemanticDiagnostics(TEST_TEMPLATE);
+      expect(d2.length).toBe(0);
+      const p2 = getLastKnownProgram(ngLS);
+      expect(p2).not.toBe(p1);  // last known program should have changed
+    });
+
+    it('should be set after getDefinitionAndBoundSpan()', () => {
+      const {position: pos0} = service.overwrite(TEST_TEMPLATE, `<test-c¦omp></test-comp>`);
+
+      const d0 = ngLS.getDefinitionAndBoundSpan(TEST_TEMPLATE, pos0);
+      expect(d0).toBeDefined();
+      const p0 = getLastKnownProgram(ngLS);
+
+      const d1 = ngLS.getDefinitionAndBoundSpan(TEST_TEMPLATE, pos0);
+      expect(d1).toBeDefined();
+      const p1 = getLastKnownProgram(ngLS);
+      expect(p1).toBe(p0);  // last known program should not have changed
+
+      const {position: pos1} = service.overwrite(TEST_TEMPLATE, `{{ ti¦tle }}`);
+      const d2 = ngLS.getDefinitionAndBoundSpan(TEST_TEMPLATE, pos1);
+      expect(d2).toBeDefined();
+      const p2 = getLastKnownProgram(ngLS);
+      expect(p2).not.toBe(p1);  // last known program should have changed
+    });
+
+    it('should be set after getQuickInfoAtPosition()', () => {
+      const {position: pos0} = service.overwrite(TEST_TEMPLATE, `<test-c¦omp></test-comp>`);
+
+      const q0 = ngLS.getQuickInfoAtPosition(TEST_TEMPLATE, pos0);
+      expect(q0).toBeDefined();
+      const p0 = getLastKnownProgram(ngLS);
+
+      const q1 = ngLS.getQuickInfoAtPosition(TEST_TEMPLATE, pos0);
+      expect(q1).toBeDefined();
+      const p1 = getLastKnownProgram(ngLS);
+      expect(p1).toBe(p0);  // last known program should not have changed
+
+      const {position: pos1} = service.overwrite(TEST_TEMPLATE, `{{ ti¦tle }}`);
+      const q2 = ngLS.getQuickInfoAtPosition(TEST_TEMPLATE, pos1);
+      expect(q2).toBeDefined();
+      const p2 = getLastKnownProgram(ngLS);
+      expect(p2).not.toBe(p1);  // last known program should have changed
+    });
+
+    it('should be set after getTypeDefinitionAtPosition()', () => {
+      const {position: pos0} = service.overwrite(TEST_TEMPLATE, `<test-c¦omp></test-comp>`);
+
+      const q0 = ngLS.getTypeDefinitionAtPosition(TEST_TEMPLATE, pos0);
+      expect(q0).toBeDefined();
+      const p0 = getLastKnownProgram(ngLS);
+
+      const d1 = ngLS.getTypeDefinitionAtPosition(TEST_TEMPLATE, pos0);
+      expect(d1).toBeDefined();
+      const p1 = getLastKnownProgram(ngLS);
+      expect(p1).toBe(p0);  // last known program should not have changed
+
+      const {position: pos1} = service.overwrite(TEST_TEMPLATE, `{{ ti¦tle }}`);
+      const d2 = ngLS.getTypeDefinitionAtPosition(TEST_TEMPLATE, pos1);
+      expect(d2).toBeDefined();
+      const p2 = getLastKnownProgram(ngLS);
+      expect(p2).not.toBe(p1);  // last known program should have changed
+    });
   });
 });
+
+function getLastKnownProgram(ngLS: LanguageService): ts.Program {
+  const program = ngLS['compilerFactory']['lastKnownProgram'];
+  expect(program).toBeDefined();
+  return program!;
+}
diff --git a/packages/language-service/ivy/test/mock_host.ts b/packages/language-service/ivy/test/mock_host.ts
index 8541399306058..34a052eacff47 100644
--- a/packages/language-service/ivy/test/mock_host.ts
+++ b/packages/language-service/ivy/test/mock_host.ts
@@ -9,6 +9,8 @@
 import {join} from 'path';
 import * as ts from 'typescript/lib/tsserverlibrary';
 
+import {isTypeScriptFile} from '../utils';
+
 const logger: ts.server.Logger = {
   close(): void{},
   hasLevel(level: ts.server.LogLevel): boolean {
@@ -45,14 +47,7 @@ export const host: ts.server.ServerHost = {
   ...ts.sys,
   readFile(absPath: string, encoding?: string): string |
       undefined {
-        const content = ts.sys.readFile(absPath, encoding);
-        if (content === undefined) {
-          return undefined;
-        }
-        if (absPath === APP_COMPONENT || absPath === PARSING_CASES || absPath === TEST_TEMPLATE) {
-          return removeReferenceMarkers(removeLocationMarkers(content));
-        }
-        return content;
+        return ts.sys.readFile(absPath, encoding);
       },
   watchFile(path: string, callback: ts.FileWatcherCallback): ts.FileWatcher {
     return NOOP_FILE_WATCHER;
@@ -105,7 +100,18 @@ export function setup() {
   };
 }
 
-class MockService {
+interface OverwriteResult {
+  /**
+   * Position of the cursor, -1 if there isn't one.
+   */
+  position: number;
+  /**
+   * Overwritten content without the cursor.
+   */
+  text: string;
+}
+
+export class MockService {
   private readonly overwritten = new Set<ts.server.NormalizedPath>();
 
   constructor(
@@ -113,20 +119,32 @@ class MockService {
       private readonly ps: ts.server.ProjectService,
   ) {}
 
-  overwrite(fileName: string, newText: string): string {
+  /**
+   * Overwrite the entire content of `fileName` with `newText`. If cursor is
+   * present in `newText`, it will be removed and the position of the cursor
+   * will be returned.
+   */
+  overwrite(fileName: string, newText: string): OverwriteResult {
     const scriptInfo = this.getScriptInfo(fileName);
-    this.overwriteScriptInfo(scriptInfo, preprocess(newText));
-    return newText;
+    return this.overwriteScriptInfo(scriptInfo, newText);
   }
 
-  overwriteInlineTemplate(fileName: string, newTemplate: string): string {
+  /**
+   * Overwrite an inline template defined in `fileName` and return the entire
+   * content of the source file (not just the template). If a cursor is present
+   * in `newTemplate`, it will be removed and the position of the cursor in the
+   * source file will be returned.
+   */
+  overwriteInlineTemplate(fileName: string, newTemplate: string): OverwriteResult {
     const scriptInfo = this.getScriptInfo(fileName);
     const snapshot = scriptInfo.getSnapshot();
-    const originalContent = snapshot.getText(0, snapshot.getLength());
-    const newContent =
-        originalContent.replace(/template: `([\s\S]+)`/, `template: \`${newTemplate}\``);
-    this.overwriteScriptInfo(scriptInfo, preprocess(newContent));
-    return newContent;
+    const originalText = snapshot.getText(0, snapshot.getLength());
+    const {position, text} =
+        replaceOnce(originalText, /template: `([\s\S]+?)`/, `template: \`${newTemplate}\``);
+    if (position === -1) {
+      throw new Error(`${fileName} does not contain a component with template`);
+    }
+    return this.overwriteScriptInfo(scriptInfo, text);
   }
 
   reset() {
@@ -141,35 +159,62 @@ class MockService {
       }
     }
     this.overwritten.clear();
+    // updateGraph() will clear the internal dirty flag.
+    this.project.updateGraph();
   }
 
   getScriptInfo(fileName: string): ts.server.ScriptInfo {
     const scriptInfo = this.ps.getScriptInfo(fileName);
-    if (!scriptInfo) {
+    if (scriptInfo) {
+      return scriptInfo;
+    }
+    // There is no script info for external template, so create one.
+    // But we need to make sure it's not a TS file.
+    if (isTypeScriptFile(fileName)) {
       throw new Error(`No existing script info for ${fileName}`);
     }
-    return scriptInfo;
+    const newScriptInfo = this.ps.getOrCreateScriptInfoForNormalizedPath(
+        ts.server.toNormalizedPath(fileName),
+        true,                    // openedByClient
+        '',                      // fileContent
+        ts.ScriptKind.External,  // scriptKind
+    );
+    if (!newScriptInfo) {
+      throw new Error(`Failed to create new script info for ${fileName}`);
+    }
+    newScriptInfo.attachToProject(this.project);
+    return newScriptInfo;
   }
 
-  private overwriteScriptInfo(scriptInfo: ts.server.ScriptInfo, newText: string) {
+  /**
+   * Remove the cursor from `newText`, then replace `scriptInfo` with the new
+   * content and return the position of the cursor.
+   * @param scriptInfo
+   * @param newText Text that possibly contains a cursor
+   */
+  private overwriteScriptInfo(scriptInfo: ts.server.ScriptInfo, newText: string): OverwriteResult {
+    const result = replaceOnce(newText, /¦/, '');
     const snapshot = scriptInfo.getSnapshot();
-    scriptInfo.editContent(0, snapshot.getLength(), newText);
+    scriptInfo.editContent(0, snapshot.getLength(), result.text);
     this.overwritten.add(scriptInfo.fileName);
+    return result;
   }
 }
 
-const REGEX_CURSOR = /¦/g;
-function preprocess(text: string): string {
-  return text.replace(REGEX_CURSOR, '');
-}
-
-const REF_MARKER = /«(((\w|\-)+)|([^ᐱ]*ᐱ(\w+)ᐱ.[^»]*))»/g;
-const LOC_MARKER = /\~\{(\w+(-\w+)*)\}/g;
-
-function removeReferenceMarkers(value: string): string {
-  return value.replace(REF_MARKER, '');
-}
-
-function removeLocationMarkers(value: string): string {
-  return value.replace(LOC_MARKER, '');
+/**
+ * Replace at most one occurence that matches `regex` in the specified
+ * `searchText` with the specified `replaceText`. Throw an error if there is
+ * more than one occurrence.
+ */
+function replaceOnce(searchText: string, regex: RegExp, replaceText: string): OverwriteResult {
+  regex = new RegExp(regex.source, regex.flags + 'g' /* global */);
+  let position = -1;
+  const text = searchText.replace(regex, (...args) => {
+    if (position !== -1) {
+      throw new Error(`${regex} matches more than one occurrence in text: ${searchText}`);
+    }
+    position = args[args.length - 2];  // second last argument is always the index
+    return replaceText;
+  });
+  return {position, text};
 }
diff --git a/packages/language-service/ivy/test/mock_host_spec.ts b/packages/language-service/ivy/test/mock_host_spec.ts
index cb4b3d742799c..967cad67728b9 100644
--- a/packages/language-service/ivy/test/mock_host_spec.ts
+++ b/packages/language-service/ivy/test/mock_host_spec.ts
@@ -8,10 +8,19 @@
 
 import * as ts from 'typescript/lib/tsserverlibrary';
 
-import {APP_MAIN, setup, TEST_SRCDIR} from './mock_host';
+import {APP_COMPONENT, APP_MAIN, MockService, setup, TEST_SRCDIR} from './mock_host';
 
 describe('mock host', () => {
-  const {project, service, tsLS} = setup();
+  let service: MockService;
+  let project: ts.server.Project;
+  let tsLS: ts.LanguageService;
+
+  beforeAll(() => {
+    const {project: _project, service: _service, tsLS: _tsLS} = setup();
+    project = _project;
+    service = _service;
+    tsLS = _tsLS;
+  });
 
   beforeEach(() => {
     service.reset();
@@ -58,13 +67,93 @@ describe('mock host', () => {
     expect(getText(scriptInfo)).toBe('const x: string = 0');
   });
 
-  it('can find the cursor', () => {
-    const content = service.overwrite(APP_MAIN, `const fo¦o = 'hello world';`);
-    // content returned by overwrite() is the original content with cursor
-    expect(content).toBe(`const fo¦o = 'hello world';`);
-    const scriptInfo = service.getScriptInfo(APP_MAIN);
-    // script info content should not contain cursor
-    expect(getText(scriptInfo)).toBe(`const foo = 'hello world';`);
+  describe('overwrite()', () => {
+    it('will return the cursor position', () => {
+      const {position} = service.overwrite(APP_MAIN, `const fo¦o = 'hello world';`);
+      expect(position).toBe(8);
+    });
+
+    it('will remove the cursor in overwritten text', () => {
+      const {text} = service.overwrite(APP_MAIN, `const fo¦o = 'hello world';`);
+      expect(text).toBe(`const foo = 'hello world';`);
+    });
+
+    it('will update script info without cursor', () => {
+      const {text} = service.overwrite(APP_MAIN, `const fo¦o = 'hello world';`);
+      const scriptInfo = service.getScriptInfo(APP_MAIN);
+      const snapshot = getText(scriptInfo);
+      expect(snapshot).toBe(`const foo = 'hello world';`);
+      expect(snapshot).toBe(text);
+    });
+
+    it('will throw if there is more than one cursor', () => {
+      expect(() => service.overwrite(APP_MAIN, `const f¦oo = 'hello wo¦rld';`))
+          .toThrowError(/matches more than one occurrence in text/);
+    });
+
+    it('will return -1 if cursor is not present', () => {
+      const {position} = service.overwrite(APP_MAIN, `const foo = 'hello world';`);
+      expect(position).toBe(-1);
+    });
+  });
+
+  describe('overwriteInlineTemplate()', () => {
+    it('will return the cursor position', () => {
+      const {position, text} = service.overwriteInlineTemplate(APP_COMPONENT, `{{ fo¦o }}`);
+      // The position returned should be relative to the start of the source
+      // file, not the start of the template.
+      expect(position).not.toBe(5);
+      expect(text.substring(position, position + 4)).toBe('o }}');
+    });
+
+    it('will remove the cursor in overwritten text', () => {
+      const {text} = service.overwriteInlineTemplate(APP_COMPONENT, `{{ fo¦o }}`);
+      expect(text).toContain(`{{ foo }}`);
+    });
+
+    it('will return the entire content of the source file', () => {
+      const {text} = service.overwriteInlineTemplate(APP_COMPONENT, `{{ foo }}`);
+      expect(text).toContain(`@Component`);
+    });
+
+    it('will update script info without cursor', () => {
+      service.overwriteInlineTemplate(APP_COMPONENT, `{{ fo¦o }}`);
+      const scriptInfo = service.getScriptInfo(APP_COMPONENT);
+      expect(getText(scriptInfo)).toContain(`{{ foo }}`);
+    });
+
+    it('will throw if there is no template in file', () => {
+      expect(() => service.overwriteInlineTemplate(APP_MAIN, `{{ foo }}`))
+          .toThrowError(/does not contain a component with template/);
+    });
+
+    it('will throw if there is more than one cursor', () => {
+      expect(() => service.overwriteInlineTemplate(APP_COMPONENT, `{{ f¦o¦o }}`))
+          .toThrowError(/matches more than one occurrence in text/);
+    });
+
+    it('will return -1 if cursor is not present', () => {
+      const {position} = service.overwriteInlineTemplate(APP_COMPONENT, `{{ foo }}`);
+      expect(position).toBe(-1);
+    });
+
+    it('will throw if there is more than one component with template', () => {
+      service.overwrite(APP_COMPONENT, `
+        import {Component} from '@angular/core';
+
+        @Component({
+          template: \`<h1></h1>\`,
+        })
+        export class ComponentA {}
+
+        @Component({
+          template: \`<h2></h2>\`,
+        })
+        export class ComponentB {}
+      `);
+      expect(() => service.overwriteInlineTemplate(APP_COMPONENT, `<p></p>`))
+          .toThrowError(/matches more than one occurrence in text/);
+    });
   });
 });
 
diff --git a/packages/language-service/ivy/test/quick_info_spec.ts b/packages/language-service/ivy/test/quick_info_spec.ts
new file mode 100644
index 0000000000000..2557e3e844c84
--- /dev/null
+++ b/packages/language-service/ivy/test/quick_info_spec.ts
@@ -0,0 +1,402 @@
+/**
+ * @license
+ * Copyright Google LLC 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/lib/tsserverlibrary';
+
+import {LanguageService} from '../language_service';
+
+import {APP_COMPONENT, MockService, setup, TEST_TEMPLATE} from './mock_host';
+
+describe('quick info', () => {
+  let service: MockService;
+  let ngLS: LanguageService;
+
+  beforeAll(() => {
+    const {project, service: _service, tsLS} = setup();
+    service = _service;
+    ngLS = new LanguageService(project, tsLS);
+  });
+
+  beforeEach(() => {
+    service.reset();
+  });
+
+  describe('elements', () => {
+    it('should work for native elements', () => {
+      expectQuickInfo({
+        templateOverride: `<butt¦on></button>`,
+        expectedSpanText: '<button></button>',
+        expectedDisplayString: '(element) button: HTMLButtonElement'
+      });
+    });
+
+    it('should work for directives which match native element tags', () => {
+      expectQuickInfo({
+        templateOverride: `<butt¦on compound custom-button></button>`,
+        expectedSpanText: '<button compound custom-button></button>',
+        expectedDisplayString: '(directive) AppModule.CompoundCustomButtonDirective'
+      });
+    });
+  });
+
+  describe('templates', () => {
+    it('should return undefined for ng-templates', () => {
+      const {documentation} = expectQuickInfo({
+        templateOverride: `<ng-templ¦ate></ng-template>`,
+        expectedSpanText: '<ng-template></ng-template>',
+        expectedDisplayString: '(template) ng-template'
+      });
+      expect(toText(documentation))
+          .toContain('The `<ng-template>` is an Angular element for rendering HTML.');
+    });
+  });
+
+  describe('directives', () => {
+    it('should work for directives', () => {
+      expectQuickInfo({
+        templateOverride: `<div string-model¦></div>`,
+        expectedSpanText: 'string-model',
+        expectedDisplayString: '(directive) AppModule.StringModel'
+      });
+    });
+
+    it('should work for components', () => {
+      const {documentation} = expectQuickInfo({
+        templateOverride: `<t¦est-comp></test-comp>`,
+        expectedSpanText: '<test-comp></test-comp>',
+        expectedDisplayString: '(component) AppModule.TestComponent'
+      });
+      expect(toText(documentation)).toBe('This Component provides the `test-comp` selector.');
+    });
+
+    it('should work for structural directives', () => {
+      const {documentation} = expectQuickInfo({
+        templateOverride: `<div *¦ngFor="let item of heroes"></div>`,
+        expectedSpanText: 'ngFor',
+        expectedDisplayString: '(directive) NgForOf<Hero, Array<Hero>>'
+      });
+      expect(toText(documentation))
+          .toContain('A [structural directive](guide/structural-directives) that renders');
+    });
+
+    it('should work for directives with compound selectors, some of which are bindings', () => {
+      expectQuickInfo({
+        templateOverride: `<ng-template ngF¦or let-hero [ngForOf]="heroes">{{item}}</ng-template>`,
+        expectedSpanText: 'ngFor',
+        expectedDisplayString: '(directive) NgForOf<Hero, Array<Hero>>'
+      });
+    });
+
+    it('should work for data-let- syntax', () => {
+      expectQuickInfo({
+        templateOverride:
+            `<ng-template ngFor data-let-he¦ro [ngForOf]="heroes">{{item}}</ng-template>`,
+        expectedSpanText: 'hero',
+        expectedDisplayString: '(variable) hero: Hero'
+      });
+    });
+  });
+
+  describe('bindings', () => {
+    describe('inputs', () => {
+      it('should work for input providers', () => {
+        expectQuickInfo({
+          templateOverride: `<test-comp [tcN¦ame]="name"></test-comp>`,
+          expectedSpanText: 'tcName',
+          expectedDisplayString: '(property) TestComponent.name: string'
+        });
+      });
+
+      it('should work for bind- syntax', () => {
+        expectQuickInfo({
+          templateOverride: `<test-comp bind-tcN¦ame="name"></test-comp>`,
+          expectedSpanText: 'tcName',
+          expectedDisplayString: '(property) TestComponent.name: string'
+        });
+        expectQuickInfo({
+          templateOverride: `<test-comp data-bind-tcN¦ame="name"></test-comp>`,
+          expectedSpanText: 'tcName',
+          expectedDisplayString: '(property) TestComponent.name: string'
+        });
+      });
+
+      it('should work for structural directive inputs ngForTrackBy', () => {
+        expectQuickInfo({
+          templateOverride: `<div *ngFor="let item of heroes; tr¦ackBy: test;"></div>`,
+          expectedSpanText: 'trackBy',
+          expectedDisplayString:
+              '(property) NgForOf<Hero, Hero[]>.ngForTrackBy: TrackByFunction<Hero>'
+        });
+      });
+
+      it('should work for structural directive inputs ngForOf', () => {
+        expectQuickInfo({
+          templateOverride: `<div *ngFor="let item o¦f heroes; trackBy: test;"></div>`,
+          expectedSpanText: 'of',
+          expectedDisplayString:
+              '(property) NgForOf<Hero, Hero[]>.ngForOf: Hero[] | (Hero[] & Iterable<Hero>) | null | undefined'
+        });
+      });
+
+      it('should work for two-way binding providers', () => {
+        expectQuickInfo({
+          templateOverride: `<test-comp string-model [(mo¦del)]="title"></test-comp>`,
+          expectedSpanText: 'model',
+          expectedDisplayString: '(property) StringModel.model: string'
+        });
+      });
+    });
+
+    describe('outputs', () => {
+      it('should work for event providers', () => {
+        expectQuickInfo({
+          templateOverride: `<test-comp (te¦st)="myClick($event)"></test-comp>`,
+          expectedSpanText: '(test)="myClick($event)"',
+          expectedDisplayString: '(event) TestComponent.testEvent: EventEmitter<any>'
+        });
+      });
+
+      it('should work for on- syntax binding', () => {
+        expectQuickInfo({
+          templateOverride: `<test-comp on-te¦st="myClick($event)"></test-comp>`,
+          expectedSpanText: 'on-test="myClick($event)"',
+          expectedDisplayString: '(event) TestComponent.testEvent: EventEmitter<any>'
+        });
+        expectQuickInfo({
+          templateOverride: `<test-comp data-on-te¦st="myClick($event)"></test-comp>`,
+          expectedSpanText: 'data-on-test="myClick($event)"',
+          expectedDisplayString: '(event) TestComponent.testEvent: EventEmitter<any>'
+        });
+      });
+
+      it('should work for $event from EventEmitter', () => {
+        expectQuickInfo({
+          templateOverride: `<div string-model (modelChange)="myClick($e¦vent)"></div>`,
+          expectedSpanText: '$event',
+          expectedDisplayString: '(parameter) $event: string'
+        });
+      });
+
+      it('should work for $event from native element', () => {
+        expectQuickInfo({
+          templateOverride: `<div (click)="myClick($e¦vent)"></div>`,
+          expectedSpanText: '$event',
+          expectedDisplayString: '(parameter) $event: MouseEvent'
+        });
+      });
+    });
+  });
+
+  describe('references', () => {
+    it('should work for element reference declarations', () => {
+      const {documentation} = expectQuickInfo({
+        templateOverride: `<div #¦chart></div>`,
+        expectedSpanText: '#chart',
+        expectedDisplayString: '(reference) chart: HTMLDivElement'
+      });
+      expect(toText(documentation))
+          .toEqual(
+              'Provides special properties (beyond the regular HTMLElement ' +
+              'interface it also has available to it by inheritance) for manipulating <div> elements.');
+    });
+
+    it('should work for ref- syntax', () => {
+      expectQuickInfo({
+        templateOverride: `<div ref-ch¦art></div>`,
+        expectedSpanText: 'ref-chart',
+        expectedDisplayString: '(reference) chart: HTMLDivElement'
+      });
+      expectQuickInfo({
+        templateOverride: `<div data-ref-ch¦art></div>`,
+        expectedSpanText: 'data-ref-chart',
+        expectedDisplayString: '(reference) chart: HTMLDivElement'
+      });
+    });
+  });
+
+  describe('variables', () => {
+    it('should work for array members', () => {
+      const {documentation} = expectQuickInfo({
+        templateOverride: `<div *ngFor="let hero of heroes">{{her¦o}}</div>`,
+        expectedSpanText: 'hero',
+        expectedDisplayString: '(variable) hero: Hero'
+      });
+      expect(toText(documentation)).toEqual('The most heroic being.');
+    });
+
+    it('should work for ReadonlyArray members (#36191)', () => {
+      expectQuickInfo({
+        templateOverride: `<div *ngFor="let hero of readonlyHeroes">{{her¦o}}</div>`,
+        expectedSpanText: 'hero',
+        expectedDisplayString: '(variable) hero: Readonly<Hero>'
+      });
+    });
+
+    it('should work for const array members (#36191)', () => {
+      expectQuickInfo({
+        templateOverride: `<div *ngFor="let name of constNames">{{na¦me}}</div>`,
+        expectedSpanText: 'name',
+        expectedDisplayString: '(variable) name: { readonly name: "name"; }'
+      });
+    });
+  });
+
+  describe('pipes', () => {
+    it('should work for pipes', () => {
+      const templateOverride = `<p>The hero's birthday is {{birthday | da¦te: "MM/dd/yy"}}</p>`;
+      expectQuickInfo({
+        templateOverride,
+        expectedSpanText: 'date',
+        expectedDisplayString:
+            '(pipe) DatePipe.transform(value: string | number | Date, format?: string | undefined, timezone?: ' +
+            'string | undefined, locale?: string | undefined): string | null (+2 overloads)'
+      });
+    });
+  });
+
+  describe('expressions', () => {
+    it('should find members in a text interpolation', () => {
+      expectQuickInfo({
+        templateOverride: `<div>{{ tit¦le }}</div>`,
+        expectedSpanText: 'title',
+        expectedDisplayString: '(property) AppComponent.title: string'
+      });
+    });
+
+    it('should work for accessed property reads', () => {
+      expectQuickInfo({
+        templateOverride: `<div>{{title.len¦gth}}</div>`,
+        expectedSpanText: 'length',
+        expectedDisplayString: '(property) String.length: number'
+      });
+    });
+
+    it('should find members in an attribute interpolation', () => {
+      expectQuickInfo({
+        templateOverride: `<div string-model model="{{tit¦le}}"></div>`,
+        expectedSpanText: 'title',
+        expectedDisplayString: '(property) AppComponent.title: string'
+      });
+    });
+
+    it('should find members of input binding', () => {
+      expectQuickInfo({
+        templateOverride: `<test-comp [tcName]="ti¦tle"></test-comp>`,
+        expectedSpanText: 'title',
+        expectedDisplayString: '(property) AppComponent.title: string'
+      });
+    });
+
+    it('should find input binding on text attribute', () => {
+      expectQuickInfo({
+        templateOverride: `<test-comp tcN¦ame="title"></test-comp>`,
+        expectedSpanText: 'tcName="title"',
+        expectedDisplayString: '(property) TestComponent.name: string'
+      });
+    });
+
+    it('should find members of event binding', () => {
+      expectQuickInfo({
+        templateOverride: `<test-comp (test)="ti¦tle=$event"></test-comp>`,
+        expectedSpanText: 'title',
+        expectedDisplayString: '(property) AppComponent.title: string'
+      });
+    });
+
+    it('should work for method calls', () => {
+      expectQuickInfo({
+        templateOverride: `<div (click)="setT¦itle('title')"></div>`,
+        expectedSpanText: 'setTitle',
+        expectedDisplayString: '(method) AppComponent.setTitle(newTitle: string): void'
+      });
+    });
+
+    it('should work for accessed properties in writes', () => {
+      expectQuickInfo({
+        templateOverride: `<div (click)="hero.i¦d = 2"></div>`,
+        expectedSpanText: 'id',
+        expectedDisplayString: '(property) Hero.id: number'
+      });
+    });
+
+    it('should work for method call arguments', () => {
+      expectQuickInfo({
+        templateOverride: `<div (click)="setTitle(hero.nam¦e)"></div>`,
+        expectedSpanText: 'name',
+        expectedDisplayString: '(property) Hero.name: string'
+      });
+    });
+
+    it('should find members of two-way binding', () => {
+      expectQuickInfo({
+        templateOverride: `<input [(ngModel)]="ti¦tle" />`,
+        expectedSpanText: 'title',
+        expectedDisplayString: '(property) AppComponent.title: string'
+      });
+    });
+
+    it('should find members in a structural directive', () => {
+      expectQuickInfo({
+        templateOverride: `<div *ngIf="anyV¦alue"></div>`,
+        expectedSpanText: 'anyValue',
+        expectedDisplayString: '(property) AppComponent.anyValue: any'
+      });
+    });
+
+    it('should work for members in structural directives', () => {
+      expectQuickInfo({
+        templateOverride: `<div *ngFor="let item of her¦oes; trackBy: test;"></div>`,
+        expectedSpanText: 'heroes',
+        expectedDisplayString: '(property) AppComponent.heroes: Hero[]'
+      });
+    });
+
+    it('should work for the $any() cast function', () => {
+      expectQuickInfo({
+        templateOverride: `<div>{{$an¦y(title)}}</div>`,
+        expectedSpanText: '$any',
+        expectedDisplayString: '(method) $any: any'
+      });
+    });
+
+    it('should provide documentation', () => {
+      const {position} = service.overwriteInlineTemplate(APP_COMPONENT, `<div>{{¦title}}</div>`);
+      const quickInfo = ngLS.getQuickInfoAtPosition(APP_COMPONENT, position);
+      const documentation = toText(quickInfo!.documentation);
+      expect(documentation).toBe('This is the title of the `AppComponent` Component.');
+    });
+
+    it('works with external template', () => {
+      const {position, text} = service.overwrite(TEST_TEMPLATE, '<butt¦on></button>');
+      const quickInfo = ngLS.getQuickInfoAtPosition(TEST_TEMPLATE, position);
+      expect(quickInfo).toBeTruthy();
+      const {textSpan, displayParts} = quickInfo!;
+      expect(text.substring(textSpan.start, textSpan.start + textSpan.length))
+          .toEqual('<button></button>');
+      expect(toText(displayParts)).toEqual('(element) button: HTMLButtonElement');
+    });
+  });
+
+  function expectQuickInfo(
+      {templateOverride, expectedSpanText, expectedDisplayString}:
+          {templateOverride: string, expectedSpanText: string, expectedDisplayString: string}):
+      ts.QuickInfo {
+    const {position, text} = service.overwriteInlineTemplate(APP_COMPONENT, templateOverride);
+    const quickInfo = ngLS.getQuickInfoAtPosition(APP_COMPONENT, position);
+    expect(quickInfo).toBeTruthy();
+    const {textSpan, displayParts} = quickInfo!;
+    expect(text.substring(textSpan.start, textSpan.start + textSpan.length))
+        .toEqual(expectedSpanText);
+    expect(toText(displayParts)).toEqual(expectedDisplayString);
+    return quickInfo!;
+  }
+});
+
+function toText(displayParts?: ts.SymbolDisplayPart[]): string {
+  return (displayParts || []).map(p => p.text).join('');
+}
diff --git a/packages/language-service/ivy/test/test_utils.ts b/packages/language-service/ivy/test/test_utils.ts
new file mode 100644
index 0000000000000..e4b62f8c611f0
--- /dev/null
+++ b/packages/language-service/ivy/test/test_utils.ts
@@ -0,0 +1,27 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {MockService} from './mock_host';
+
+export interface HumanizedDefinitionInfo {
+  fileName: string;
+  textSpan: string;
+  contextSpan: string|undefined;
+}
+
+export function humanizeDefinitionInfo(
+    def: ts.DefinitionInfo, service: MockService): HumanizedDefinitionInfo {
+  const snapshot = service.getScriptInfo(def.fileName).getSnapshot();
+  return {
+    fileName: def.fileName,
+    textSpan: snapshot.getText(def.textSpan.start, def.textSpan.start + def.textSpan.length),
+    contextSpan: def.contextSpan ?
+        snapshot.getText(def.contextSpan.start, def.contextSpan.start + def.contextSpan.length) :
+        undefined,
+  };
+}
diff --git a/packages/language-service/ivy/test/type_definitions_spec.ts b/packages/language-service/ivy/test/type_definitions_spec.ts
new file mode 100644
index 0000000000000..2f2f340ea73cf
--- /dev/null
+++ b/packages/language-service/ivy/test/type_definitions_spec.ts
@@ -0,0 +1,342 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {LanguageService} from '../language_service';
+
+import {APP_COMPONENT, MockService, setup} from './mock_host';
+import {HumanizedDefinitionInfo, humanizeDefinitionInfo} from './test_utils';
+
+describe('type definitions', () => {
+  let service: MockService;
+  let ngLS: LanguageService;
+
+  beforeAll(() => {
+    const {project, service: _service, tsLS} = setup();
+    service = _service;
+    ngLS = new LanguageService(project, tsLS);
+  });
+
+  const possibleArrayDefFiles = new Set([
+    'lib.es5.d.ts', 'lib.es2015.core.d.ts', 'lib.es2015.iterable.d.ts',
+    'lib.es2015.symbol.wellknown.d.ts', 'lib.es2016.array.include.d.ts'
+  ]);
+
+  beforeEach(() => {
+    service.reset();
+  });
+
+  describe('elements', () => {
+    it('should work for native elements', () => {
+      const defs = getTypeDefinitionsAndAssertBoundSpan({
+        templateOverride: `<butt¦on></button>`,
+      });
+      expect(defs.length).toEqual(2);
+      expect(defs[0].fileName).toContain('lib.dom.d.ts');
+      expect(defs[0].contextSpan).toContain('interface HTMLButtonElement extends HTMLElement');
+      expect(defs[1].contextSpan).toContain('declare var HTMLButtonElement');
+    });
+
+    it('should return directives which match the element tag', () => {
+      const defs = getTypeDefinitionsAndAssertBoundSpan({
+        templateOverride: `<butt¦on compound custom-button></button>`,
+      });
+      expect(defs.length).toEqual(3);
+      expect(defs[0].contextSpan).toContain('export class CompoundCustomButtonDirective');
+      expect(defs[1].contextSpan).toContain('interface HTMLButtonElement extends HTMLElement');
+      expect(defs[2].contextSpan).toContain('declare var HTMLButtonElement');
+    });
+  });
+
+  describe('templates', () => {
+    it('should return no definitions for ng-templates', () => {
+      const {position} =
+          service.overwriteInlineTemplate(APP_COMPONENT, `<ng-templ¦ate></ng-template>`);
+      const defs = ngLS.getTypeDefinitionAtPosition(APP_COMPONENT, position);
+      expect(defs).toEqual([]);
+    });
+  });
+
+  describe('directives', () => {
+    it('should work for directives', () => {
+      const definitions = getTypeDefinitionsAndAssertBoundSpan({
+        templateOverride: `<div string-model¦></div>`,
+      });
+      expect(definitions.length).toEqual(1);
+      expect(definitions[0].fileName).toContain('parsing-cases.ts');
+      expect(definitions[0].textSpan).toEqual('StringModel');
+      expect(definitions[0].contextSpan).toContain('@Directive');
+    });
+
+    it('should work for components', () => {
+      const definitions = getTypeDefinitionsAndAssertBoundSpan({
+        templateOverride: `<t¦est-comp></test-comp>`,
+      });
+      expect(definitions.length).toEqual(1);
+      expect(definitions[0].textSpan).toEqual('TestComponent');
+      expect(definitions[0].contextSpan).toContain('@Component');
+    });
+
+    it('should work for structural directives', () => {
+      const definitions = getTypeDefinitionsAndAssertBoundSpan({
+        templateOverride: `<div *¦ngFor="let item of heroes"></div>`,
+      });
+      expect(definitions.length).toEqual(1);
+      expect(definitions[0].fileName).toContain('ng_for_of.d.ts');
+      expect(definitions[0].textSpan).toEqual('NgForOf');
+      expect(definitions[0].contextSpan)
+          .toContain(
+              'export declare class NgForOf<T, U extends NgIterable<T> = NgIterable<T>> implements DoCheck');
+    });
+
+    it('should work for directives with compound selectors', () => {
+      let defs = getTypeDefinitionsAndAssertBoundSpan({
+        templateOverride: `<button com¦pound custom-button></button>`,
+      });
+      expect(defs.length).toEqual(1);
+      expect(defs[0].contextSpan).toContain('export class CompoundCustomButtonDirective');
+      defs = getTypeDefinitionsAndAssertBoundSpan({
+        templateOverride: `<button compound cu¦stom-button></button>`,
+      });
+      expect(defs.length).toEqual(1);
+      expect(defs[0].contextSpan).toContain('export class CompoundCustomButtonDirective');
+    });
+  });
+
+  describe('bindings', () => {
+    describe('inputs', () => {
+      it('should return something for input providers with non-primitive types', () => {
+        const defs = getTypeDefinitionsAndAssertBoundSpan({
+          templateOverride: `<button compound custom-button [config¦]="{}"></button>`,
+        });
+        expect(defs.length).toEqual(1);
+        expect(defs[0].textSpan).toEqual('{color?: string}');
+      });
+
+      it('should work for structural directive inputs ngForTrackBy', () => {
+        const definitions = getTypeDefinitionsAndAssertBoundSpan({
+          templateOverride: `<div *ngFor="let item of heroes; tr¦ackBy: test;"></div>`,
+        });
+        expect(definitions!.length).toEqual(1);
+
+        const [def] = definitions;
+        expect(def.textSpan).toEqual('TrackByFunction');
+        expect(def.contextSpan).toContain('export interface TrackByFunction<T>');
+      });
+
+      it('should work for structural directive inputs ngForOf', () => {
+        const definitions = getTypeDefinitionsAndAssertBoundSpan({
+          templateOverride: `<div *ngFor="let item o¦f heroes"></div>`,
+        });
+        // In addition to all the array defs, this will also return the NgForOf def because the
+        // input is part of the selector ([ngFor][ngForOf]).
+        expectAllDefinitions(
+            definitions, new Set(['Array', 'NgForOf']),
+            new Set([...possibleArrayDefFiles, 'ng_for_of.d.ts']));
+      });
+
+      it('should return nothing for two-way binding providers', () => {
+        const definitions = getTypeDefinitionsAndAssertBoundSpan({
+          templateOverride: `<test-comp string-model [(mo¦del)]="title"></test-comp>`,
+        });
+        // TODO(atscott): This should actually return EventEmitter type but we only match the input
+        // at the moment.
+        expect(definitions).toEqual([]);
+      });
+    });
+
+    describe('outputs', () => {
+      it('should work for event providers', () => {
+        const definitions = getTypeDefinitionsAndAssertBoundSpan({
+          templateOverride: `<test-comp (te¦st)="myClick($event)"></test-comp>`,
+        });
+        expect(definitions!.length).toEqual(2);
+
+        const [emitterInterface, emitterConst] = definitions;
+        expect(emitterInterface.textSpan).toEqual('EventEmitter');
+        expect(emitterInterface.contextSpan)
+            .toContain('export interface EventEmitter<T> extends Subject<T>');
+        expect(emitterInterface.fileName).toContain('event_emitter.d.ts');
+        expect(emitterConst.textSpan).toEqual('EventEmitter');
+        expect(emitterConst.contextSpan).toContain('export declare const EventEmitter');
+        expect(emitterConst.fileName).toContain('event_emitter.d.ts');
+      });
+
+      it('should return the directive when the event is part of the selector', () => {
+        const definitions = getTypeDefinitionsAndAssertBoundSpan({
+          templateOverride: `<div (eventSelect¦or)="title = ''"></div>`,
+        });
+        expect(definitions!.length).toEqual(3);
+
+        // EventEmitter tested in previous test
+        const directiveDef = definitions[2];
+        expect(directiveDef.contextSpan).toContain('export class EventSelectorDirective');
+      });
+    });
+  });
+
+  describe('references', () => {
+    it('should work for element references', () => {
+      const defs = getTypeDefinitionsAndAssertBoundSpan({
+        templateOverride: `<div #chart></div>{{char¦t}}`,
+      });
+      expect(defs.length).toEqual(2);
+      expect(defs[0].contextSpan).toContain('interface HTMLDivElement extends HTMLElement');
+      expect(defs[1].contextSpan).toContain('declare var HTMLDivElement');
+    });
+
+    it('should work for directive references', () => {
+      const defs = getTypeDefinitionsAndAssertBoundSpan({
+        templateOverride: `<div #mod¦el="stringModel" string-model></div>`,
+      });
+      expect(defs.length).toEqual(1);
+      expect(defs[0].contextSpan).toContain('@Directive');
+      expect(defs[0].contextSpan).toContain('export class StringModel');
+    });
+  });
+
+  describe('variables', () => {
+    it('should work for array members', () => {
+      const definitions = getTypeDefinitionsAndAssertBoundSpan({
+        templateOverride: `<div *ngFor="let hero of heroes">{{her¦o}}</div>`,
+      });
+      expect(definitions!.length).toEqual(1);
+
+      expect(definitions[0].textSpan).toEqual('Hero');
+      expect(definitions[0].contextSpan).toContain('export interface Hero');
+    });
+  });
+
+  describe('pipes', () => {
+    it('should work for pipes', () => {
+      const templateOverride = `<p>The hero's birthday is {{birthday | da¦te: "MM/dd/yy"}}</p>`;
+      const definitions = getTypeDefinitionsAndAssertBoundSpan({
+        templateOverride,
+      });
+      expect(definitions!.length).toEqual(1);
+
+      const [def] = definitions;
+      expect(def.textSpan).toEqual('transform');
+      expect(def.contextSpan).toContain('transform(value: Date');
+    });
+  });
+
+  describe('expressions', () => {
+    it('should return nothing for primitives', () => {
+      const definitions = getTypeDefinitionsAndAssertBoundSpan({
+        templateOverride: `<div>{{ tit¦le }}</div>`,
+      });
+      expect(definitions!.length).toEqual(0);
+    });
+
+    // TODO(atscott): Investigate why this returns nothing in the test environment. This actually
+    // works in the extension.
+    xit('should work for functions on primitives', () => {
+      const definitions = getTypeDefinitionsAndAssertBoundSpan({
+        templateOverride: `<div>{{ title.toLower¦case() }}</div>`,
+      });
+      expect(definitions!.length).toEqual(1);
+      expect(definitions[0].textSpan).toEqual('toLowerCase');
+      expect(definitions[0].fileName).toContain('lib.es5.d.ts');
+    });
+
+    it('should work for accessed property reads', () => {
+      const definitions = getTypeDefinitionsAndAssertBoundSpan({
+        templateOverride: `<div>{{heroes[0].addre¦ss}}</div>`,
+      });
+      expect(definitions!.length).toEqual(1);
+
+      const [def] = definitions;
+      expect(def.textSpan).toEqual('Address');
+      expect(def.contextSpan).toContain('export interface Address');
+    });
+
+    it('should work for $event', () => {
+      const definitions = getTypeDefinitionsAndAssertBoundSpan({
+        templateOverride: `<button (click)="title=$ev¦ent"></button>`,
+      });
+      expect(definitions!.length).toEqual(2);
+
+      const [def1, def2] = definitions;
+      expect(def1.textSpan).toEqual('MouseEvent');
+      expect(def1.contextSpan).toContain(`interface MouseEvent extends UIEvent`);
+      expect(def2.textSpan).toEqual('MouseEvent');
+      expect(def2.contextSpan).toContain(`declare var MouseEvent:`);
+    });
+
+    it('should work for method calls', () => {
+      const definitions = getTypeDefinitionsAndAssertBoundSpan({
+        templateOverride: `<div (click)="setT¦itle('title')"></div>`,
+      });
+      expect(definitions!.length).toEqual(1);
+
+      const [def] = definitions;
+      expect(def.textSpan).toEqual('setTitle');
+      expect(def.contextSpan).toContain('setTitle(newTitle: string)');
+    });
+
+    it('should work for accessed properties in writes', () => {
+      const definitions = getTypeDefinitionsAndAssertBoundSpan({
+        templateOverride: `<div (click)="hero.add¦ress = undefined"></div>`,
+      });
+      expect(definitions!.length).toEqual(1);
+
+      const [def] = definitions;
+      expect(def.textSpan).toEqual('Address');
+      expect(def.contextSpan).toContain('export interface Address');
+    });
+
+    it('should work for variables in structural directives', () => {
+      const definitions = getTypeDefinitionsAndAssertBoundSpan({
+        templateOverride: `<div *ngFor="let item of heroes as her¦oes2; trackBy: test;"></div>`,
+      });
+      expectAllDefinitions(definitions, new Set(['Array']), possibleArrayDefFiles);
+    });
+
+    it('should work for uses of members in structural directives', () => {
+      const definitions = getTypeDefinitionsAndAssertBoundSpan({
+        templateOverride: `<div *ngFor="let item of heroes as heroes2">{{her¦oes2}}</div>`,
+      });
+      expectAllDefinitions(definitions, new Set(['Array']), possibleArrayDefFiles);
+    });
+
+    it('should work for members in structural directives', () => {
+      const definitions = getTypeDefinitionsAndAssertBoundSpan({
+        templateOverride: `<div *ngFor="let item of her¦oes; trackBy: test;"></div>`,
+      });
+      expectAllDefinitions(definitions, new Set(['Array']), possibleArrayDefFiles);
+    });
+
+    it('should return nothing for the $any() cast function', () => {
+      const {position} =
+          service.overwriteInlineTemplate(APP_COMPONENT, `<div>{{$an¦y(title)}}</div>`);
+      const definitionAndBoundSpan = ngLS.getTypeDefinitionAtPosition(APP_COMPONENT, position);
+      expect(definitionAndBoundSpan).toBeUndefined();
+    });
+  });
+
+  function getTypeDefinitionsAndAssertBoundSpan({templateOverride}: {templateOverride: string}):
+      HumanizedDefinitionInfo[] {
+    const {position} = service.overwriteInlineTemplate(APP_COMPONENT, templateOverride);
+    const defs = ngLS.getTypeDefinitionAtPosition(APP_COMPONENT, position);
+    expect(defs).toBeTruthy();
+    return defs!.map(d => humanizeDefinitionInfo(d, service));
+  }
+
+  function expectAllDefinitions(
+      definitions: HumanizedDefinitionInfo[], textSpans: Set<string>,
+      possibleFileNames: Set<string>) {
+    expect(definitions!.length).toBeGreaterThan(0);
+    const actualTextSpans = new Set(definitions.map(d => d.textSpan));
+    expect(actualTextSpans).toEqual(textSpans);
+    for (const def of definitions) {
+      const fileName = def.fileName.split('/').slice(-1)[0];
+      expect(possibleFileNames)
+          .toContain(fileName, `Expected ${fileName} to be one of: ${possibleFileNames}`);
+    }
+  }
+});
diff --git a/packages/language-service/ivy/ts_plugin.ts b/packages/language-service/ivy/ts_plugin.ts
index d1754e9175740..f76ad6c9f8d50 100644
--- a/packages/language-service/ivy/ts_plugin.ts
+++ b/packages/language-service/ivy/ts_plugin.ts
@@ -24,8 +24,43 @@ export function create(info: ts.server.PluginCreateInfo): ts.LanguageService {
     return diagnostics;
   }
 
+  function getQuickInfoAtPosition(fileName: string, position: number): ts.QuickInfo|undefined {
+    if (angularOnly) {
+      return ngLS.getQuickInfoAtPosition(fileName, position);
+    } else {
+      // If TS could answer the query, then return that result. Otherwise, return from Angular LS.
+      return tsLS.getQuickInfoAtPosition(fileName, position) ??
+          ngLS.getQuickInfoAtPosition(fileName, position);
+    }
+  }
+
+  function getTypeDefinitionAtPosition(
+      fileName: string, position: number): readonly ts.DefinitionInfo[]|undefined {
+    if (angularOnly) {
+      return ngLS.getTypeDefinitionAtPosition(fileName, position);
+    } else {
+      // If TS could answer the query, then return that result. Otherwise, return from Angular LS.
+      return tsLS.getTypeDefinitionAtPosition(fileName, position) ??
+          ngLS.getTypeDefinitionAtPosition(fileName, position);
+    }
+  }
+
+  function getDefinitionAndBoundSpan(
+      fileName: string, position: number): ts.DefinitionInfoAndBoundSpan|undefined {
+    if (angularOnly) {
+      return ngLS.getDefinitionAndBoundSpan(fileName, position);
+    } else {
+      // If TS could answer the query, then return that result. Otherwise, return from Angular LS.
+      return tsLS.getDefinitionAndBoundSpan(fileName, position) ??
+          ngLS.getDefinitionAndBoundSpan(fileName, position);
+    }
+  }
+
   return {
     ...tsLS,
     getSemanticDiagnostics,
+    getTypeDefinitionAtPosition,
+    getQuickInfoAtPosition,
+    getDefinitionAndBoundSpan,
   };
 }
diff --git a/packages/language-service/ivy/utils.ts b/packages/language-service/ivy/utils.ts
new file mode 100644
index 0000000000000..6888f2d32da40
--- /dev/null
+++ b/packages/language-service/ivy/utils.ts
@@ -0,0 +1,303 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {AbsoluteSourceSpan, CssSelector, ParseSourceSpan, SelectorMatcher} from '@angular/compiler';
+import {NgCompiler} from '@angular/compiler-cli/src/ngtsc/core';
+import {DeclarationNode} from '@angular/compiler-cli/src/ngtsc/reflection';
+import {DirectiveSymbol} from '@angular/compiler-cli/src/ngtsc/typecheck/api';
+import * as e from '@angular/compiler/src/expression_parser/ast';  // e for expression AST
+import * as t from '@angular/compiler/src/render3/r3_ast';         // t for template AST
+import * as ts from 'typescript';
+
+import {ALIAS_NAME, SYMBOL_PUNC} from '../common/quick_info';
+import {findTightestNode, getClassDeclOfInlineTemplateNode} from '../common/ts_utils';
+
+export function getTextSpanOfNode(node: t.Node|e.AST): ts.TextSpan {
+  if (isTemplateNodeWithKeyAndValue(node)) {
+    return toTextSpan(node.keySpan);
+  } else if (
+      node instanceof e.PropertyWrite || node instanceof e.MethodCall ||
+      node instanceof e.BindingPipe || node instanceof e.PropertyRead) {
+    // The `name` part of a `PropertyWrite`, `MethodCall`, and `BindingPipe` does not
+    // have its own AST so there is no way to retrieve a `Symbol` for just the `name` via a specific
+    // node.
+    return toTextSpan(node.nameSpan);
+  } else {
+    return toTextSpan(node.sourceSpan);
+  }
+}
+
+export function toTextSpan(span: AbsoluteSourceSpan|ParseSourceSpan): ts.TextSpan {
+  let start: number, end: number;
+  if (span instanceof AbsoluteSourceSpan) {
+    start = span.start;
+    end = span.end;
+  } else {
+    start = span.start.offset;
+    end = span.end.offset;
+  }
+  return {start, length: end - start};
+}
+
+interface NodeWithKeyAndValue extends t.Node {
+  keySpan: ParseSourceSpan;
+  valueSpan?: ParseSourceSpan;
+}
+
+export function isTemplateNodeWithKeyAndValue(node: t.Node|e.AST): node is NodeWithKeyAndValue {
+  return isTemplateNode(node) && node.hasOwnProperty('keySpan');
+}
+
+export function isTemplateNode(node: t.Node|e.AST): node is t.Node {
+  // Template node implements the Node interface so we cannot use instanceof.
+  return node.sourceSpan instanceof ParseSourceSpan;
+}
+
+export function isExpressionNode(node: t.Node|e.AST): node is e.AST {
+  return node instanceof e.AST;
+}
+
+export interface TemplateInfo {
+  template: t.Node[];
+  component: ts.ClassDeclaration;
+}
+
+/**
+ * Retrieves the `ts.ClassDeclaration` at a location along with its template nodes.
+ */
+export function getTemplateInfoAtPosition(
+    fileName: string, position: number, compiler: NgCompiler): TemplateInfo|undefined {
+  if (isTypeScriptFile(fileName)) {
+    return getTemplateInfoFromClassMeta(fileName, position, compiler);
+  } else {
+    return getFirstComponentForTemplateFile(fileName, compiler);
+  }
+}
+
+
+/**
+ * First, attempt to sort component declarations by file name.
+ * If the files are the same, sort by start location of the declaration.
+ */
+function tsDeclarationSortComparator(a: DeclarationNode, b: DeclarationNode): number {
+  const aFile = a.getSourceFile().fileName;
+  const bFile = b.getSourceFile().fileName;
+  if (aFile < bFile) {
+    return -1;
+  } else if (aFile > bFile) {
+    return 1;
+  } else {
+    return b.getFullStart() - a.getFullStart();
+  }
+}
+
+function getFirstComponentForTemplateFile(fileName: string, compiler: NgCompiler): TemplateInfo|
+    undefined {
+  const templateTypeChecker = compiler.getTemplateTypeChecker();
+  const components = compiler.getComponentsWithTemplateFile(fileName);
+  const sortedComponents = Array.from(components).sort(tsDeclarationSortComparator);
+  for (const component of sortedComponents) {
+    if (!ts.isClassDeclaration(component)) {
+      continue;
+    }
+    const template = templateTypeChecker.getTemplate(component);
+    if (template === null) {
+      continue;
+    }
+    return {template, component};
+  }
+
+  return undefined;
+}
+
+/**
+ * Retrieves the `ts.ClassDeclaration` at a location along with its template nodes.
+ */
+function getTemplateInfoFromClassMeta(
+    fileName: string, position: number, compiler: NgCompiler): TemplateInfo|undefined {
+  const classDecl = getClassDeclForInlineTemplateAtPosition(fileName, position, compiler);
+  if (!classDecl || !classDecl.name) {  // Does not handle anonymous class
+    return;
+  }
+  const template = compiler.getTemplateTypeChecker().getTemplate(classDecl);
+  if (template === null) {
+    return;
+  }
+
+  return {template, component: classDecl};
+}
+
+function getClassDeclForInlineTemplateAtPosition(
+    fileName: string, position: number, compiler: NgCompiler): ts.ClassDeclaration|undefined {
+  const sourceFile = compiler.getNextProgram().getSourceFile(fileName);
+  if (!sourceFile) {
+    return undefined;
+  }
+  const node = findTightestNode(sourceFile, position);
+  if (!node) return;
+  return getClassDeclOfInlineTemplateNode(node);
+}
+
+/**
+ * Given an attribute node, converts it to string form.
+ */
+function toAttributeString(attribute: t.TextAttribute|t.BoundAttribute|t.BoundEvent): string {
+  if (attribute instanceof t.BoundEvent) {
+    return `[${attribute.name}]`;
+  } else {
+    return `[${attribute.name}=${attribute.valueSpan?.toString() ?? ''}]`;
+  }
+}
+
+function getNodeName(node: t.Template|t.Element): string {
+  return node instanceof t.Template ? node.tagName : node.name;
+}
+
+/**
+ * Given a template or element node, returns all attributes on the node.
+ */
+function getAttributes(node: t.Template|
+                       t.Element): Array<t.TextAttribute|t.BoundAttribute|t.BoundEvent> {
+  const attributes: Array<t.TextAttribute|t.BoundAttribute|t.BoundEvent> =
+      [...node.attributes, ...node.inputs, ...node.outputs];
+  if (node instanceof t.Template) {
+    attributes.push(...node.templateAttrs);
+  }
+  return attributes;
+}
+
+/**
+ * Given two `Set`s, returns all items in the `left` which do not appear in the `right`.
+ */
+function difference<T>(left: Set<T>, right: Set<T>): Set<T> {
+  const result = new Set<T>();
+  for (const dir of left) {
+    if (!right.has(dir)) {
+      result.add(dir);
+    }
+  }
+  return result;
+}
+
+/**
+ * Given an element or template, determines which directives match because the tag is present. For
+ * example, if a directive selector is `div[myAttr]`, this would match div elements but would not if
+ * the selector were just `[myAttr]`. We find which directives are applied because of this tag by
+ * elimination: compare the directive matches with the tag present against the directive matches
+ * without it. The difference would be the directives which match because the tag is present.
+ *
+ * @param element The element or template node that the attribute/tag is part of.
+ * @param directives The list of directives to match against.
+ * @returns The list of directives matching the tag name via the strategy described above.
+ */
+// TODO(atscott): Add unit tests for this and the one for attributes
+export function getDirectiveMatchesForElementTag(
+    element: t.Template|t.Element, directives: DirectiveSymbol[]): Set<DirectiveSymbol> {
+  const attributes = getAttributes(element);
+  const allAttrs = attributes.map(toAttributeString);
+  const allDirectiveMatches =
+      getDirectiveMatchesForSelector(directives, getNodeName(element) + allAttrs.join(''));
+  const matchesWithoutElement = getDirectiveMatchesForSelector(directives, allAttrs.join(''));
+  return difference(allDirectiveMatches, matchesWithoutElement);
+}
+
+/**
+ * Given an attribute name, determines which directives match because the attribute is present. We
+ * find which directives are applied because of this attribute by elimination: compare the directive
+ * matches with the attribute present against the directive matches without it. The difference would
+ * be the directives which match because the attribute is present.
+ *
+ * @param name The name of the attribute
+ * @param hostNode The node which the attribute appears on
+ * @param directives The list of directives to match against.
+ * @returns The list of directives matching the tag name via the strategy described above.
+ */
+export function getDirectiveMatchesForAttribute(
+    name: string, hostNode: t.Template|t.Element,
+    directives: DirectiveSymbol[]): Set<DirectiveSymbol> {
+  const attributes = getAttributes(hostNode);
+  const allAttrs = attributes.map(toAttributeString);
+  const allDirectiveMatches =
+      getDirectiveMatchesForSelector(directives, getNodeName(hostNode) + allAttrs.join(''));
+  const attrsExcludingName = attributes.filter(a => a.name !== name).map(toAttributeString);
+  const matchesWithoutAttr = getDirectiveMatchesForSelector(
+      directives, getNodeName(hostNode) + attrsExcludingName.join(''));
+  return difference(allDirectiveMatches, matchesWithoutAttr);
+}
+
+/**
+ * Given a list of directives and a text to use as a selector, returns the directives which match
+ * for the selector.
+ */
+function getDirectiveMatchesForSelector(
+    directives: DirectiveSymbol[], selector: string): Set<DirectiveSymbol> {
+  const selectors = CssSelector.parse(selector);
+  if (selectors.length === 0) {
+    return new Set();
+  }
+  return new Set(directives.filter((dir: DirectiveSymbol) => {
+    if (dir.selector === null) {
+      return false;
+    }
+
+    const matcher = new SelectorMatcher();
+    matcher.addSelectables(CssSelector.parse(dir.selector));
+
+    return selectors.some(selector => matcher.match(selector, null));
+  }));
+}
+
+/**
+ * Returns a new `ts.SymbolDisplayPart` array which has the alias imports from the tcb filtered
+ * out, i.e. `i0.NgForOf`.
+ */
+export function filterAliasImports(displayParts: ts.SymbolDisplayPart[]): ts.SymbolDisplayPart[] {
+  const tcbAliasImportRegex = /i\d+/;
+  function isImportAlias(part: {kind: string, text: string}) {
+    return part.kind === ALIAS_NAME && tcbAliasImportRegex.test(part.text);
+  }
+  function isDotPunctuation(part: {kind: string, text: string}) {
+    return part.kind === SYMBOL_PUNC && part.text === '.';
+  }
+
+  return displayParts.filter((part, i) => {
+    const previousPart = displayParts[i - 1];
+    const nextPart = displayParts[i + 1];
+
+    const aliasNameFollowedByDot =
+        isImportAlias(part) && nextPart !== undefined && isDotPunctuation(nextPart);
+    const dotPrecededByAlias =
+        isDotPunctuation(part) && previousPart !== undefined && isImportAlias(previousPart);
+
+    return !aliasNameFollowedByDot && !dotPrecededByAlias;
+  });
+}
+
+export function isDollarEvent(n: t.Node|e.AST): n is e.PropertyRead {
+  return n instanceof e.PropertyRead && n.name === '$event' &&
+      n.receiver instanceof e.ImplicitReceiver;
+}
+
+/**
+ * Returns a new array formed by applying a given callback function to each element of the array,
+ * and then flattening the result by one level.
+ */
+export function flatMap<T, R>(items: T[]|readonly T[], f: (item: T) => R[] | readonly R[]): R[] {
+  const results: R[] = [];
+  for (const x of items) {
+    results.push(...f(x));
+  }
+  return results;
+}
+
+export function isTypeScriptFile(fileName: string): boolean {
+  return fileName.endsWith('.ts');
+}
+
+export function isExternalTemplate(fileName: string): boolean {
+  return !isTypeScriptFile(fileName);
+}
diff --git a/packages/language-service/src/completions.ts b/packages/language-service/src/completions.ts
index b4cf641aff06a..6025848b9d182 100644
--- a/packages/language-service/src/completions.ts
+++ b/packages/language-service/src/completions.ts
@@ -65,7 +65,7 @@ function getBoundedWordSpan(
     // The HTML tag may include `-` (e.g. `app-root`),
     // so use the HtmlAst to get the span before ayazhafiz refactor the code.
     return {
-      start: templateInfo.template.span.start + ast.startSourceSpan!.start.offset + 1,
+      start: templateInfo.template.span.start + ast.startSourceSpan.start.offset + 1,
       length: ast.name.length
     };
   }
diff --git a/packages/language-service/src/definitions.ts b/packages/language-service/src/definitions.ts
index f986ac1eb2343..6539895d68abb 100644
--- a/packages/language-service/src/definitions.ts
+++ b/packages/language-service/src/definitions.ts
@@ -6,11 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import * as path from 'path';
 import * as ts from 'typescript';  // used as value and is provided at runtime
 
 import {locateSymbols} from './locate_symbol';
-import {findTightestNode, getClassDeclFromDecoratorProp, getPropertyAssignmentFromValue} from './ts_utils';
 import {AstResult, Span} from './types';
 
 /**
@@ -82,85 +80,3 @@ export function getDefinitionAndBoundSpan(
     textSpan: symbols[0].span,
   };
 }
-
-/**
- * Gets an Angular-specific definition in a TypeScript source file.
- */
-export function getTsDefinitionAndBoundSpan(
-    sf: ts.SourceFile, position: number,
-    tsLsHost: Readonly<ts.LanguageServiceHost>): ts.DefinitionInfoAndBoundSpan|undefined {
-  const node = findTightestNode(sf, position);
-  if (!node) return;
-  switch (node.kind) {
-    case ts.SyntaxKind.StringLiteral:
-    case ts.SyntaxKind.NoSubstitutionTemplateLiteral:
-      // Attempt to extract definition of a URL in a property assignment.
-      return getUrlFromProperty(node as ts.StringLiteralLike, tsLsHost);
-    default:
-      return undefined;
-  }
-}
-
-/**
- * Attempts to get the definition of a file whose URL is specified in a property assignment in a
- * directive decorator.
- * Currently applies to `templateUrl` and `styleUrls` properties.
- */
-function getUrlFromProperty(
-    urlNode: ts.StringLiteralLike,
-    tsLsHost: Readonly<ts.LanguageServiceHost>): ts.DefinitionInfoAndBoundSpan|undefined {
-  // Get the property assignment node corresponding to the `templateUrl` or `styleUrls` assignment.
-  // These assignments are specified differently; `templateUrl` is a string, and `styleUrls` is
-  // an array of strings:
-  //   {
-  //        templateUrl: './template.ng.html',
-  //        styleUrls: ['./style.css', './other-style.css']
-  //   }
-  // `templateUrl`'s property assignment can be found from the string literal node;
-  // `styleUrls`'s property assignment can be found from the array (parent) node.
-  //
-  // First search for `templateUrl`.
-  let asgn = getPropertyAssignmentFromValue(urlNode, 'templateUrl');
-  if (!asgn) {
-    // `templateUrl` assignment not found; search for `styleUrls` array assignment.
-    asgn = getPropertyAssignmentFromValue(urlNode.parent, 'styleUrls');
-    if (!asgn) {
-      // Nothing found, bail.
-      return;
-    }
-  }
-
-  // If the property assignment is not a property of a class decorator, don't generate definitions
-  // for it.
-  if (!getClassDeclFromDecoratorProp(asgn)) {
-    return;
-  }
-
-  const sf = urlNode.getSourceFile();
-  // Extract url path specified by the url node, which is relative to the TypeScript source file
-  // the url node is defined in.
-  const url = path.join(path.dirname(sf.fileName), urlNode.text);
-
-  // If the file does not exist, bail. It is possible that the TypeScript language service host
-  // does not have a `fileExists` method, in which case optimistically assume the file exists.
-  if (tsLsHost.fileExists && !tsLsHost.fileExists(url)) return;
-
-  const templateDefinitions: ts.DefinitionInfo[] = [{
-    kind: ts.ScriptElementKind.externalModuleName,
-    name: url,
-    containerKind: ts.ScriptElementKind.unknown,
-    containerName: '',
-    // Reading the template is expensive, so don't provide a preview.
-    textSpan: {start: 0, length: 0},
-    fileName: url,
-  }];
-
-  return {
-    definitions: templateDefinitions,
-    textSpan: {
-      // Exclude opening and closing quotes in the url span.
-      start: urlNode.getStart() + 1,
-      length: urlNode.getWidth() - 2,
-    },
-  };
-}
diff --git a/packages/language-service/src/diagnostics.ts b/packages/language-service/src/diagnostics.ts
index adbf824a045e1..184815651641b 100644
--- a/packages/language-service/src/diagnostics.ts
+++ b/packages/language-service/src/diagnostics.ts
@@ -10,9 +10,11 @@ import {NgAnalyzedModules} from '@angular/compiler';
 import * as path from 'path';
 import * as ts from 'typescript';
 
+import {findTightestNode} from '../common/ts_utils';
+
 import {createDiagnostic, Diagnostic} from './diagnostic_messages';
 import {getTemplateExpressionDiagnostics} from './expression_diagnostics';
-import {findPropertyValueOfType, findTightestNode} from './ts_utils';
+import {findPropertyValueOfType} from './ts_utils';
 import * as ng from './types';
 import {TypeScriptServiceHost} from './typescript_host';
 import {offsetSpan, spanOf} from './utils';
diff --git a/packages/language-service/src/expression_type.ts b/packages/language-service/src/expression_type.ts
index 50b179d2af15e..099ff99fccd08 100644
--- a/packages/language-service/src/expression_type.ts
+++ b/packages/language-service/src/expression_type.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {AST, AstVisitor, ASTWithName, Binary, BindingPipe, Chain, Conditional, FunctionCall, ImplicitReceiver, Interpolation, KeyedRead, KeyedWrite, LiteralArray, LiteralMap, LiteralPrimitive, MethodCall, NonNullAssert, PrefixNot, PropertyRead, PropertyWrite, Quote, SafeMethodCall, SafePropertyRead} from '@angular/compiler';
+import {AST, AstVisitor, ASTWithName, Binary, BindingPipe, Chain, Conditional, FunctionCall, ImplicitReceiver, Interpolation, KeyedRead, KeyedWrite, LiteralArray, LiteralMap, LiteralPrimitive, MethodCall, NonNullAssert, PrefixNot, PropertyRead, PropertyWrite, Quote, SafeMethodCall, SafePropertyRead, Unary} from '@angular/compiler';
 
 import {createDiagnostic, Diagnostic} from './diagnostic_messages';
 import {BuiltinType, Signature, Symbol, SymbolQuery, SymbolTable} from './symbols';
@@ -38,6 +38,23 @@ export class AstType implements AstVisitor {
     return this.diagnostics;
   }
 
+  visitUnary(ast: Unary): Symbol {
+    // Visit the child to produce diagnostics.
+    ast.expr.visit(this);
+
+    // The unary plus and minus operator are always of type number.
+    // https://github.com/Microsoft/TypeScript/blob/v1.8.10/doc/spec.md#4.18
+    switch (ast.operator) {
+      case '-':
+      case '+':
+        return this.query.getBuiltinType(BuiltinType.Number);
+    }
+
+    this.diagnostics.push(
+        createDiagnostic(refinedSpan(ast), Diagnostic.unrecognized_operator, ast.operator));
+    return this.anyType;
+  }
+
   visitBinary(ast: Binary): Symbol {
     const getType = (ast: AST, operation: string): Symbol => {
       const type = this.getType(ast);
diff --git a/packages/language-service/src/expressions.ts b/packages/language-service/src/expressions.ts
index f6cebc40d4b46..ac0eb18ab472d 100644
--- a/packages/language-service/src/expressions.ts
+++ b/packages/language-service/src/expressions.ts
@@ -63,6 +63,7 @@ export function getExpressionCompletions(
   // (that is the scope of the implicit receiver) is the right scope as the user is typing the
   // beginning of an expression.
   tail.visit({
+    visitUnary(_ast) {},
     visitBinary(_ast) {},
     visitChain(_ast) {},
     visitConditional(_ast) {},
@@ -157,6 +158,7 @@ export function getExpressionSymbol(
   // (that is the scope of the implicit receiver) is the right scope as the user is typing the
   // beginning of an expression.
   tail.visit({
+    visitUnary(_ast) {},
     visitBinary(_ast) {},
     visitChain(_ast) {},
     visitConditional(_ast) {},
diff --git a/packages/language-service/src/hover.ts b/packages/language-service/src/hover.ts
index 8940d2db09d06..9bc98a3f86f6f 100644
--- a/packages/language-service/src/hover.ts
+++ b/packages/language-service/src/hover.ts
@@ -8,16 +8,13 @@
 
 import {NgAnalyzedModules} from '@angular/compiler';
 import * as ts from 'typescript';
+
+import {createQuickInfo} from '../common/quick_info';
+
 import {locateSymbols} from './locate_symbol';
 import * as ng from './types';
 import {inSpan} from './utils';
 
-// Reverse mappings of enum would generate strings
-const SYMBOL_SPACE = ts.SymbolDisplayPartKind[ts.SymbolDisplayPartKind.space];
-const SYMBOL_PUNC = ts.SymbolDisplayPartKind[ts.SymbolDisplayPartKind.punctuation];
-const SYMBOL_TEXT = ts.SymbolDisplayPartKind[ts.SymbolDisplayPartKind.text];
-const SYMBOL_INTERFACE = ts.SymbolDisplayPartKind[ts.SymbolDisplayPartKind.interfaceName];
-
 /**
  * Traverse the template AST and look for the symbol located at `position`, then
  * return the corresponding quick info.
@@ -70,47 +67,3 @@ export function getTsHover(
     }
   }
 }
-
-/**
- * Construct a QuickInfo object taking into account its container and type.
- * @param name Name of the QuickInfo target
- * @param kind component, directive, pipe, etc.
- * @param textSpan span of the target
- * @param containerName either the Symbol's container or the NgModule that contains the directive
- * @param type user-friendly name of the type
- * @param documentation docstring or comment
- */
-function createQuickInfo(
-    name: string, kind: string, textSpan: ts.TextSpan, containerName?: string, type?: string,
-    documentation?: ts.SymbolDisplayPart[]): ts.QuickInfo {
-  const containerDisplayParts = containerName ?
-      [
-        {text: containerName, kind: SYMBOL_INTERFACE},
-        {text: '.', kind: SYMBOL_PUNC},
-      ] :
-      [];
-
-  const typeDisplayParts = type ?
-      [
-        {text: ':', kind: SYMBOL_PUNC},
-        {text: ' ', kind: SYMBOL_SPACE},
-        {text: type, kind: SYMBOL_INTERFACE},
-      ] :
-      [];
-
-  return {
-    kind: kind as ts.ScriptElementKind,
-    kindModifiers: ts.ScriptElementKindModifier.none,
-    textSpan: textSpan,
-    displayParts: [
-      {text: '(', kind: SYMBOL_PUNC},
-      {text: kind, kind: SYMBOL_TEXT},
-      {text: ')', kind: SYMBOL_PUNC},
-      {text: ' ', kind: SYMBOL_SPACE},
-      ...containerDisplayParts,
-      {text: name, kind: SYMBOL_INTERFACE},
-      ...typeDisplayParts,
-    ],
-    documentation,
-  };
-}
diff --git a/packages/language-service/src/language_service.ts b/packages/language-service/src/language_service.ts
index da40fb7cb8e41..e9eeac68fef3d 100644
--- a/packages/language-service/src/language_service.ts
+++ b/packages/language-service/src/language_service.ts
@@ -6,10 +6,13 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import * as path from 'path';
 import * as tss from 'typescript/lib/tsserverlibrary';
 
+import {getTsDefinitionAndBoundSpan, ResourceResolver} from '../common/definitions';
+
 import {getTemplateCompletions} from './completions';
-import {getDefinitionAndBoundSpan, getTsDefinitionAndBoundSpan} from './definitions';
+import {getDefinitionAndBoundSpan} from './definitions';
 import {getDeclarationDiagnostics, getTemplateDiagnostics, ngDiagnosticToTsDiagnostic} from './diagnostics';
 import {getTemplateHover, getTsHover} from './hover';
 import * as ng from './types';
@@ -75,13 +78,13 @@ class LanguageServiceImpl implements ng.LanguageService {
     if (templateInfo) {
       return getDefinitionAndBoundSpan(templateInfo, position);
     }
-
     // Attempt to get Angular-specific definitions in a TypeScript file, like templates defined
     // in a `templateUrl` property.
     if (fileName.endsWith('.ts')) {
       const sf = this.host.getSourceFile(fileName);
       if (sf) {
-        return getTsDefinitionAndBoundSpan(sf, position, this.host.tsLsHost);
+        return getTsDefinitionAndBoundSpan(
+            sf, position, new ViewEngineLSResourceResolver(this.host.tsLsHost));
       }
     }
   }
@@ -112,3 +115,20 @@ class LanguageServiceImpl implements ng.LanguageService {
     return this.host.tsLS.getReferencesAtPosition(tsDef.fileName, tsDef.textSpan.start);
   }
 }
+
+class ViewEngineLSResourceResolver implements ResourceResolver {
+  constructor(private host: ts.LanguageServiceHost) {}
+
+  resolve(file: string, basePath: string): string {
+    // Extract url path specified by the url node, which is relative to the TypeScript source file
+    // the url node is defined in.
+    const url = path.join(path.dirname(basePath), file);
+
+    // If the file does not exist, bail. It is possible that the TypeScript language service host
+    // does not have a `fileExists` method, in which case optimistically assume the file exists.
+    if (this.host.fileExists && !this.host.fileExists(url)) {
+      throw new Error(`ResourceResolver: could not resolve ${url} in context of ${basePath})`);
+    }
+    return url;
+  }
+}
diff --git a/packages/language-service/src/ts_plugin.ts b/packages/language-service/src/ts_plugin.ts
index 05ad3c79c1936..5f67d491b0d2a 100644
--- a/packages/language-service/src/ts_plugin.ts
+++ b/packages/language-service/src/ts_plugin.ts
@@ -110,16 +110,20 @@ export function create(info: tss.server.PluginCreateInfo): tss.LanguageService {
     return ngLS.getDefinitionAndBoundSpan(fileName, position);
   }
 
-  const proxy: tss.LanguageService = Object.assign(
-      // First clone the original TS language service
-      {}, tsLS,
-      // Then override the methods supported by Angular language service
-      {
-        getCompletionsAtPosition,
-        getQuickInfoAtPosition,
-        getSemanticDiagnostics,
-        getDefinitionAtPosition,
-        getDefinitionAndBoundSpan,
-      });
-  return proxy;
+  function getTypeDefinitionAtPosition(fileName: string, position: number) {
+    // Not implemented in VE Language Service
+    return undefined;
+  }
+
+  return {
+    // First clone the original TS language service
+    ...tsLS,
+    // Then override the methods supported by Angular language service
+    getCompletionsAtPosition,
+    getQuickInfoAtPosition,
+    getSemanticDiagnostics,
+    getDefinitionAtPosition,
+    getDefinitionAndBoundSpan,
+    getTypeDefinitionAtPosition,
+  };
 }
diff --git a/packages/language-service/src/ts_utils.ts b/packages/language-service/src/ts_utils.ts
index 741201765c455..11c756007bff9 100644
--- a/packages/language-service/src/ts_utils.ts
+++ b/packages/language-service/src/ts_utils.ts
@@ -8,68 +8,6 @@
 
 import * as ts from 'typescript/lib/tsserverlibrary';
 
-/**
- * Return the node that most tightly encompass the specified `position`.
- * @param node
- * @param position
- */
-export function findTightestNode(node: ts.Node, position: number): ts.Node|undefined {
-  if (node.getStart() <= position && position < node.getEnd()) {
-    return node.forEachChild(c => findTightestNode(c, position)) || node;
-  }
-}
-
-/**
- * Returns a property assignment from the assignment value if the property name
- * matches the specified `key`, or `undefined` if there is no match.
- */
-export function getPropertyAssignmentFromValue(value: ts.Node, key: string): ts.PropertyAssignment|
-    undefined {
-  const propAssignment = value.parent;
-  if (!propAssignment || !ts.isPropertyAssignment(propAssignment) ||
-      propAssignment.name.getText() !== key) {
-    return;
-  }
-  return propAssignment;
-}
-
-/**
- * Given a decorator property assignment, return the ClassDeclaration node that corresponds to the
- * directive class the property applies to.
- * If the property assignment is not on a class decorator, no declaration is returned.
- *
- * For example,
- *
- * @Component({
- *   template: '<div></div>'
- *   ^^^^^^^^^^^^^^^^^^^^^^^---- property assignment
- * })
- * class AppComponent {}
- *           ^---- class declaration node
- *
- * @param propAsgn property assignment
- */
-export function getClassDeclFromDecoratorProp(propAsgnNode: ts.PropertyAssignment):
-    ts.ClassDeclaration|undefined {
-  if (!propAsgnNode.parent || !ts.isObjectLiteralExpression(propAsgnNode.parent)) {
-    return;
-  }
-  const objLitExprNode = propAsgnNode.parent;
-  if (!objLitExprNode.parent || !ts.isCallExpression(objLitExprNode.parent)) {
-    return;
-  }
-  const callExprNode = objLitExprNode.parent;
-  if (!callExprNode.parent || !ts.isDecorator(callExprNode.parent)) {
-    return;
-  }
-  const decorator = callExprNode.parent;
-  if (!decorator.parent || !ts.isClassDeclaration(decorator.parent)) {
-    return;
-  }
-  const classDeclNode = decorator.parent;
-  return classDeclNode;
-}
-
 interface DirectiveClassLike {
   decoratorId: ts.Identifier;  // decorator identifier, like @Component
   classId: ts.Identifier;
@@ -86,7 +24,7 @@ interface DirectiveClassLike {
  * For example,
  *     v---------- `decoratorId`
  * @NgModule({           <
- *   declarations: [],   < classDecl
+ *   declarations: [],   < classDecln-al
  * })                    <
  * class AppModule {}    <
  *          ^----- `classId`
diff --git a/packages/language-service/src/typescript_host.ts b/packages/language-service/src/typescript_host.ts
index ae927fd77d66e..0921f50400437 100644
--- a/packages/language-service/src/typescript_host.ts
+++ b/packages/language-service/src/typescript_host.ts
@@ -10,10 +10,12 @@ import {analyzeNgModules, AotSummaryResolver, CompileDirectiveSummary, CompileMe
 import {SchemaMetadata, ViewEncapsulation, ɵConsole as Console} from '@angular/core';
 import * as tss from 'typescript/lib/tsserverlibrary';
 
+import {findTightestNode, getClassDeclOfInlineTemplateNode} from '../common/ts_utils';
+
 import {createLanguageService} from './language_service';
 import {ReflectorHost} from './reflector_host';
 import {ExternalTemplate, InlineTemplate} from './template';
-import {findTightestNode, getClassDeclFromDecoratorProp, getDirectiveClassLike, getPropertyAssignmentFromValue} from './ts_utils';
+import {getDirectiveClassLike} from './ts_utils';
 import {AstResult, Declaration, DeclarationError, DiagnosticMessageChain, LanguageService, LanguageServiceHost, Span, TemplateSource} from './types';
 
 /**
@@ -382,11 +384,7 @@ export class TypeScriptServiceHost implements LanguageServiceHost {
     if (!tss.isStringLiteralLike(node)) {
       return;
     }
-    const tmplAsgn = getPropertyAssignmentFromValue(node, 'template');
-    if (!tmplAsgn) {
-      return;
-    }
-    const classDecl = getClassDeclFromDecoratorProp(tmplAsgn);
+    const classDecl = getClassDeclOfInlineTemplateNode(node);
     if (!classDecl || !classDecl.name) {  // Does not handle anonymous class
       return;
     }
diff --git a/packages/language-service/src/typescript_symbols.ts b/packages/language-service/src/typescript_symbols.ts
index 408adff8c5b50..4412a1e5ac0cc 100644
--- a/packages/language-service/src/typescript_symbols.ts
+++ b/packages/language-service/src/typescript_symbols.ts
@@ -849,7 +849,7 @@ function getTsTypeFromBuiltinType(builtinType: BuiltinType, ctx: TypeContext): t
           `Internal error, unhandled literal kind ${builtinType}:${BuiltinType[builtinType]}`);
   }
   const node = ts.createNode(syntaxKind);
-  node.parent = ts.createEmptyStatement();
+  (node.parent as ts.Node) = ts.createEmptyStatement();
   return ctx.checker.getTypeAtLocation(node);
 }
 
diff --git a/packages/language-service/test/BUILD.bazel b/packages/language-service/test/BUILD.bazel
index 553002ddfe709..a3d512a6c3086 100644
--- a/packages/language-service/test/BUILD.bazel
+++ b/packages/language-service/test/BUILD.bazel
@@ -13,6 +13,7 @@ ts_library(
     srcs = [
         "test_utils.ts",
     ],
+    visibility = ["//packages/language-service:__subpackages__"],
     deps = [
         "//packages/compiler",
         "//packages/compiler-cli/test:test_utils",
@@ -58,6 +59,7 @@ ts_library(
         "//packages/compiler",
         "//packages/language-service",
         "//packages/language-service:ts_utils",
+        "//packages/language-service/common",
         "@npm//typescript",
     ],
 )
diff --git a/packages/language-service/test/definitions_spec.ts b/packages/language-service/test/definitions_spec.ts
index 0a3bed10e8f19..2bb0dcd5f89e5 100644
--- a/packages/language-service/test/definitions_spec.ts
+++ b/packages/language-service/test/definitions_spec.ts
@@ -251,7 +251,7 @@ describe('definitions', () => {
     expect(textSpan).toEqual(marker);
 
     expect(definitions).toBeDefined();
-    expect(definitions!.length).toBe(4);
+    expect(definitions!.length).toBe(3);
 
     const refFileName = '/node_modules/@angular/common/common.d.ts';
     for (const def of definitions!) {
@@ -274,7 +274,7 @@ describe('definitions', () => {
     expect(textSpan).toEqual(marker);
 
     expect(definitions).toBeDefined();
-    expect(definitions!.length).toBe(1);
+    expect(definitions!.length).toBe(3);
 
     const refFileName = '/node_modules/@angular/common/common.d.ts';
     for (const def of definitions!) {
diff --git a/packages/language-service/test/expression_diagnostics_spec.ts b/packages/language-service/test/expression_diagnostics_spec.ts
index 31eedf8608ea3..cab7a9a6901d4 100644
--- a/packages/language-service/test/expression_diagnostics_spec.ts
+++ b/packages/language-service/test/expression_diagnostics_spec.ts
@@ -102,6 +102,8 @@ describe('expression diagnostics', () => {
   it('should reject *ngIf of misspelled identifier in PrefixNot node',
      () =>
          reject('<div *ngIf="people && !persson"></div>', 'Identifier \'persson\' is not defined'));
+  it('should reject misspelled field in unary operator expression',
+     () => reject('{{ +persson }}', `Identifier 'persson' is not defined`));
   it('should accept an *ngFor', () => accept(`
       <div *ngFor="let p of people">
         {{p.name.first}} {{p.name.last}}
diff --git a/packages/language-service/test/hover_spec.ts b/packages/language-service/test/hover_spec.ts
index ce2147c924e10..5116c42f09acc 100644
--- a/packages/language-service/test/hover_spec.ts
+++ b/packages/language-service/test/hover_spec.ts
@@ -211,7 +211,7 @@ describe('hover', () => {
       expect(textSpan).toEqual(marker);
       expect(toText(displayParts))
           .toBe(
-              '(pipe) date: (value: any, format?: string | undefined, timezone?: string | undefined, locale?: string | undefined) => string | null');
+              '(pipe) date: { (value: string | number | Date, format?: string | undefined, timezone?: string | undefined, locale?: string | undefined): string | null; (value: null | undefined, format?: string | undefined, timezone?: string | undefined, locale?: string | undefined): null; (value: string | ... 3 more ... | undefined, format?: st...');
     });
 
     it('should work for the $any() cast function', () => {
diff --git a/packages/language-service/test/project/app/app.component.ts b/packages/language-service/test/project/app/app.component.ts
index e1ac8cd409f21..1bcbbe95eb4aa 100644
--- a/packages/language-service/test/project/app/app.component.ts
+++ b/packages/language-service/test/project/app/app.component.ts
@@ -8,9 +8,15 @@
 
 import {Component} from '@angular/core';
 
+export interface Address {
+  streetName: string;
+}
+
+/** The most heroic being. */
 export interface Hero {
   id: number;
   name: string;
+  address?: Address;
 }
 
 @Component({
@@ -21,9 +27,27 @@ export interface Hero {
   `
 })
 export class AppComponent {
+  /** This is the title of the `AppComponent` Component. */
   title = 'Tour of Heroes';
   hero: Hero = {id: 1, name: 'Windstorm'};
   private internal: string = 'internal';
+  heroP = Promise.resolve(this.hero);
+  heroes: Hero[] = [this.hero];
+  heroesP = Promise.resolve(this.heroes);
+  tupleArray: [string, Hero] = ['test', this.hero];
+  league: Hero[][] = [this.heroes];
+  heroesByName: {[name: string]: Hero} = {};
+  primitiveIndexType: {[name: string]: string} = {};
+  anyValue: any;
+  optional?: string;
+  // Use to test the `index` variable conflict between the `ngFor` and component context.
+  index = null;
+  myClick(event: any) {}
+  birthday = new Date();
+  readonlyHeroes: ReadonlyArray<Readonly<Hero>> = this.heroes;
+  constNames = [{name: 'name'}] as const;
+  private myField = 'My Field';
+  strOrNumber: string|number = '';
   setTitle(newTitle: string) {
     this.title = newTitle;
   }
diff --git a/packages/language-service/test/project/app/main.ts b/packages/language-service/test/project/app/main.ts
index 3206ad2be627c..4860cc3930c91 100644
--- a/packages/language-service/test/project/app/main.ts
+++ b/packages/language-service/test/project/app/main.ts
@@ -24,6 +24,8 @@ import * as ParsingCases from './parsing-cases';
     ParsingCases.TestComponent,
     ParsingCases.TestPipe,
     ParsingCases.WithContextDirective,
+    ParsingCases.CompoundCustomButtonDirective,
+    ParsingCases.EventSelectorDirective,
   ]
 })
 export class AppModule {
diff --git a/packages/language-service/test/project/app/parsing-cases.ts b/packages/language-service/test/project/app/parsing-cases.ts
index 0d478db136af9..5f9bec3e7cd4d 100644
--- a/packages/language-service/test/project/app/parsing-cases.ts
+++ b/packages/language-service/test/project/app/parsing-cases.ts
@@ -12,6 +12,7 @@ import {Hero} from './app.component';
 
 @Directive({
   selector: '[string-model]',
+  exportAs: 'stringModel',
 })
 export class StringModel {
   @Input() model: string = 'model';
@@ -69,6 +70,16 @@ export class WithContextDirective {
   }
 }
 
+@Directive({selector: 'button[custom-button][compound]'})
+export class CompoundCustomButtonDirective {
+  @Input() config?: {color?: string};
+}
+
+@Directive({selector: '[eventSelector]'})
+export class EventSelectorDirective {
+  @Output() eventSelector = new EventEmitter<void>();
+}
+
 @Pipe({
   name: 'prefixPipe',
 })
diff --git a/packages/language-service/test/project/tsconfig.json b/packages/language-service/test/project/tsconfig.json
index d2a130c87a464..be758449b5e6d 100644
--- a/packages/language-service/test/project/tsconfig.json
+++ b/packages/language-service/test/project/tsconfig.json
@@ -12,7 +12,7 @@
     }
   },
   "angularCompilerOptions": {
-    "fullTemplateTypeCheck": true,
+    "strictTemplates": true,
     "strictInjectionParameters": true
   }
 }
diff --git a/packages/language-service/test/test_utils.ts b/packages/language-service/test/test_utils.ts
index ee3c3d7eeed2c..0be4ff12cfa4c 100644
--- a/packages/language-service/test/test_utils.ts
+++ b/packages/language-service/test/test_utils.ts
@@ -134,7 +134,8 @@ export class MockTypescriptHost implements ts.LanguageServiceHost {
    */
   overrideInlineTemplate(fileName: string, content: string): string {
     const originalContent = this.getRawFileContent(fileName)!;
-    const newContent = originalContent.replace(/template: `([\s\S]+)`/, `template: \`${content}\``);
+    const newContent =
+        originalContent.replace(/template: `([\s\S]+?)`/, `template: \`${content}\``);
     return this.override(fileName, newContent);
   }
 
diff --git a/packages/language-service/test/ts_plugin_spec.ts b/packages/language-service/test/ts_plugin_spec.ts
index dc82a9cf58523..a57b9af930924 100644
--- a/packages/language-service/test/ts_plugin_spec.ts
+++ b/packages/language-service/test/ts_plugin_spec.ts
@@ -50,7 +50,7 @@ describe('plugin', () => {
     const diags = plugin.getSemanticDiagnostics(fileName);
     expect(diags.length).toBe(1);
     expect(diags[0].messageText)
-        .toBe(`Argument of type '"hello"' is not assignable to parameter of type 'number'.`);
+        .toBe(`Argument of type 'string' is not assignable to parameter of type 'number'.`);
   });
 
   it('should not report TypeScript errors on tour of heroes', () => {
diff --git a/packages/language-service/test/utils_spec.ts b/packages/language-service/test/utils_spec.ts
index b29b7cccb02f4..24001eafff0f8 100644
--- a/packages/language-service/test/utils_spec.ts
+++ b/packages/language-service/test/utils_spec.ts
@@ -9,7 +9,8 @@
 import * as ng from '@angular/compiler';
 import * as ts from 'typescript';
 
-import {getClassDeclFromDecoratorProp, getDirectiveClassLike} from '../src/ts_utils';
+import {getClassDeclFromDecoratorProp} from '../common/ts_utils';
+import {getDirectiveClassLike} from '../src/ts_utils';
 import {getPathToNodeAtPosition} from '../src/utils';
 import {MockTypescriptHost} from './test_utils';
 
diff --git a/packages/localize/package.json b/packages/localize/package.json
index 37a802f06c5af..318f3b51a32da 100644
--- a/packages/localize/package.json
+++ b/packages/localize/package.json
@@ -16,6 +16,9 @@
   "ng-update": {
     "packageGroup": "NG_UPDATE_PACKAGE_GROUP"
   },
+  "ng-add": {
+    "save": "devDependencies"
+  },
   "sideEffects": [
     "**/init/index.js",
     "**/init.js",
@@ -36,4 +39,4 @@
   "publishConfig": {
     "registry": "https://wombat-dressing-room.appspot.com"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/localize/schematics/ng-add/BUILD.bazel b/packages/localize/schematics/ng-add/BUILD.bazel
index 280203d617374..020ea85db6576 100644
--- a/packages/localize/schematics/ng-add/BUILD.bazel
+++ b/packages/localize/schematics/ng-add/BUILD.bazel
@@ -1,7 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("//tools:defaults.bzl", "jasmine_node_test", "ts_library")
-load("@npm_bazel_typescript//:index.bzl", "ts_config")
+load("//tools:defaults.bzl", "jasmine_node_test", "ts_config", "ts_library")
 
 ts_config(
     name = "tsconfig",
diff --git a/packages/localize/schematics/ng-add/README.md b/packages/localize/schematics/ng-add/README.md
index e6078ad36ae3c..394ff4ef8a59d 100644
--- a/packages/localize/schematics/ng-add/README.md
+++ b/packages/localize/schematics/ng-add/README.md
@@ -3,4 +3,8 @@
 This schematic will be executed when an Angular CLI user runs `ng add @angular/localize`.
 
 It will search their `angular.json` file, and find polyfills and main files for server builders.
-Then it will add the `@angular/localize/init` polyfill that `@angular/localize` needs to work.
\ No newline at end of file
+Then it will add the `@angular/localize/init` polyfill that `@angular/localize` needs to work.
+
+If the user specifies that they want to use `$localize` at runtime then the dependency will be
+added to the `depdendencies` section of `package.json` rather than in the `devDependencies` which
+is the default.
\ No newline at end of file
diff --git a/packages/localize/schematics/ng-add/index.ts b/packages/localize/schematics/ng-add/index.ts
index 823c68b0ca8d3..91c14dea2dd4e 100644
--- a/packages/localize/schematics/ng-add/index.ts
+++ b/packages/localize/schematics/ng-add/index.ts
@@ -9,7 +9,9 @@
  */
 
 import {virtualFs, workspaces} from '@angular-devkit/core';
-import {chain, Rule, SchematicsException, Tree} from '@angular-devkit/schematics';
+import {chain, noop, Rule, SchematicContext, SchematicsException, Tree} from '@angular-devkit/schematics';
+import {NodePackageInstallTask} from '@angular-devkit/schematics/tasks';
+import {addPackageJsonDependency, NodeDependencyType, removePackageJsonDependency} from '@schematics/angular/utility/dependencies';
 import {getWorkspace} from '@schematics/angular/utility/workspace';
 import {Builders} from '@schematics/angular/utility/workspace-models';
 
@@ -95,6 +97,22 @@ function prependToTargetFiles(
   };
 }
 
+function moveToDependencies(host: Tree, context: SchematicContext) {
+  if (host.exists('package.json')) {
+    // Remove the previous dependency and add in a new one under the desired type.
+    removePackageJsonDependency(host, '@angular/localize');
+    addPackageJsonDependency(host, {
+      name: '@angular/localize',
+      type: NodeDependencyType.Default,
+      version: `~0.0.0-PLACEHOLDER`
+    });
+
+    // Add a task to run the package manager. This is necessary because we updated
+    // "package.json" and we want lock files to reflect this.
+    context.addTask(new NodePackageInstallTask());
+  }
+}
+
 export default function(options: Schema): Rule {
   return async (host: Tree) => {
     if (!options.name) {
@@ -117,6 +135,9 @@ ${localizePolyfill}
     return chain([
       prependToTargetFiles(project, Builders.Browser, 'polyfills', localizeStr),
       prependToTargetFiles(project, Builders.Server, 'main', localizeStr),
+      // If `$localize` will be used at runtime then must install `@angular/localize`
+      // into `dependencies`, rather than the default of `devDependencies`.
+      options.useAtRuntime ? moveToDependencies : noop()
     ]);
   };
 }
diff --git a/packages/localize/schematics/ng-add/index_spec.ts b/packages/localize/schematics/ng-add/index_spec.ts
index 5f5690f4ffd25..fabd645919a8c 100644
--- a/packages/localize/schematics/ng-add/index_spec.ts
+++ b/packages/localize/schematics/ng-add/index_spec.ts
@@ -33,6 +33,13 @@ export { renderModule, renderModuleFactory } from '@angular/platform-server';`;
 
   beforeEach(() => {
     host = new UnitTestTree(new HostTree());
+    host.create('package.json', JSON.stringify({
+      'devDependencies': {
+        // The default (according to `ng-add` in its package.json) is for `@angular/localize` to be
+        // saved to `devDependencies`.
+        '@angular/localize': '~0.0.0-PLACEHOLDER',
+      }
+    }));
     host.create('src/polyfills.ts', polyfillsContent);
     host.create('src/another-polyfills.ts', polyfillsContent);
     host.create('src/unrelated-polyfills.ts', polyfillsContent);
@@ -166,4 +173,22 @@ export { renderModule, renderModuleFactory } from '@angular/platform-server';`;
     }));
     await schematicRunner.runSchematicAsync('ng-add', defaultOptions, host).toPromise();
   });
+
+  it('should add package to `devDependencies` by default', async () => {
+    host = await schematicRunner.runSchematicAsync('ng-add', defaultOptions, host).toPromise();
+    const packageJsonText = host.readContent('/package.json');
+    expect(JSON.parse(packageJsonText).devDependencies?.['@angular/localize'])
+        .toBe('~0.0.0-PLACEHOLDER');
+    expect(JSON.parse(packageJsonText).dependencies?.['@angular/localize']).toBeUndefined();
+  });
+
+  it('should add package to `dependencies` if `useAtRuntime` is `true`', async () => {
+    host = await schematicRunner
+               .runSchematicAsync('ng-add', {...defaultOptions, useAtRuntime: true}, host)
+               .toPromise();
+    const packageJsonText = host.readContent('/package.json');
+    expect(JSON.parse(packageJsonText).dependencies?.['@angular/localize'])
+        .toBe('~0.0.0-PLACEHOLDER');
+    expect(JSON.parse(packageJsonText).devDependencies?.['@angular/localize']).toBeUndefined();
+  });
 });
diff --git a/packages/localize/schematics/ng-add/schema.d.ts b/packages/localize/schematics/ng-add/schema.d.ts
index d7bb6dc32610f..a96090d97e1e5 100644
--- a/packages/localize/schematics/ng-add/schema.d.ts
+++ b/packages/localize/schematics/ng-add/schema.d.ts
@@ -11,4 +11,11 @@ export interface Schema {
    * The name of the project.
    */
   name?: string;
+  /**
+   * Will this project use $localize at runtime?
+   *
+   * If true then the dependency is included in the `dependencies` section of packge.json, rather
+   * than `devDependencies`.
+   */
+  useAtRuntime?: boolean;
 }
diff --git a/packages/localize/schematics/ng-add/schema.json b/packages/localize/schematics/ng-add/schema.json
index 775cbfcb51999..1c255911ce87b 100644
--- a/packages/localize/schematics/ng-add/schema.json
+++ b/packages/localize/schematics/ng-add/schema.json
@@ -10,8 +10,12 @@
       "$default": {
         "$source": "projectName"
       }
+    },
+    "useAtRuntime": {
+      "type": "boolean",
+      "description": "If set then `@angular/localize` is included in the `dependencies` section of `package.json`, rather than `devDependencies`, which is the default.",
+      "default": false
     }
   },
-  "required": [
-  ]
+  "required": []
 }
diff --git a/packages/localize/src/tools/BUILD.bazel b/packages/localize/src/tools/BUILD.bazel
index c13422f9d8dbb..19fd9c6e92cae 100644
--- a/packages/localize/src/tools/BUILD.bazel
+++ b/packages/localize/src/tools/BUILD.bazel
@@ -1,7 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("//tools:defaults.bzl", "pkg_npm", "ts_library")
-load("@npm_bazel_typescript//:index.bzl", "ts_config")
+load("//tools:defaults.bzl", "pkg_npm", "ts_config", "ts_library")
 
 ts_config(
     name = "tsconfig",
diff --git a/packages/localize/src/tools/src/diagnostics.ts b/packages/localize/src/tools/src/diagnostics.ts
index 9e2152853b0c0..6861ca7311e94 100644
--- a/packages/localize/src/tools/src/diagnostics.ts
+++ b/packages/localize/src/tools/src/diagnostics.ts
@@ -14,6 +14,8 @@ export type DiagnosticHandlingStrategy = 'error'|'warning'|'ignore';
 /**
  * This class is used to collect and then report warnings and errors that occur during the execution
  * of the tools.
+ *
+ * @publicApi used by CLI
  */
 export class Diagnostics {
   readonly messages: {type: 'warning'|'error', message: string}[] = [];
diff --git a/packages/localize/src/tools/src/extract/extraction.ts b/packages/localize/src/tools/src/extract/extraction.ts
index 242e88df9eb05..ae1644e31a5a6 100644
--- a/packages/localize/src/tools/src/extract/extraction.ts
+++ b/packages/localize/src/tools/src/extract/extraction.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 {AbsoluteFsPath, FileSystem, PathSegment} from '@angular/compiler-cli/src/ngtsc/file_system';
+import {AbsoluteFsPath, FileSystem} from '@angular/compiler-cli/src/ngtsc/file_system';
 import {Logger} from '@angular/compiler-cli/src/ngtsc/logging';
 import {SourceFile, SourceFileLoader} from '@angular/compiler-cli/src/ngtsc/sourcemaps';
 import {ɵParsedMessage, ɵSourceLocation} from '@angular/localize';
@@ -23,6 +23,8 @@ export interface ExtractionOptions {
 /**
  * Extracts parsed messages from file contents, by parsing the contents as JavaScript
  * and looking for occurrences of `$localize` in the source code.
+ *
+ * @publicApi used by CLI
  */
 export class MessageExtractor {
   private basePath: AbsoluteFsPath;
@@ -50,8 +52,8 @@ export class MessageExtractor {
         sourceRoot: this.basePath,
         filename,
         plugins: [
-          makeEs2015ExtractPlugin(messages, this.localizeName),
-          makeEs5ExtractPlugin(messages, this.localizeName),
+          makeEs2015ExtractPlugin(this.fs, messages, this.localizeName),
+          makeEs5ExtractPlugin(this.fs, messages, this.localizeName),
         ],
         code: false,
         ast: false
@@ -77,6 +79,20 @@ export class MessageExtractor {
     for (const message of messages) {
       if (message.location !== undefined) {
         message.location = this.getOriginalLocation(sourceFile, message.location);
+
+        if (message.messagePartLocations) {
+          message.messagePartLocations = message.messagePartLocations.map(
+              location => location && this.getOriginalLocation(sourceFile, location));
+        }
+
+        if (message.substitutionLocations) {
+          const placeholderNames = Object.keys(message.substitutionLocations);
+          for (const placeholderName of placeholderNames) {
+            const location = message.substitutionLocations[placeholderName];
+            message.substitutionLocations[placeholderName] =
+                location && this.getOriginalLocation(sourceFile, location);
+          }
+        }
       }
     }
   }
@@ -103,6 +119,11 @@ export class MessageExtractor {
     const end = (originalEnd !== null && originalEnd.file === originalStart.file) ?
         {line: originalEnd.line, column: originalEnd.column} :
         start;
-    return {file: originalStart.file, start, end};
+    const originalSourceFile =
+        sourceFile.sources.find(sf => sf?.sourcePath === originalStart.file)!;
+    const startPos = originalSourceFile.startOfLinePositions[start.line] + start.column;
+    const endPos = originalSourceFile.startOfLinePositions[end.line] + end.column;
+    const text = originalSourceFile.contents.substring(startPos, endPos);
+    return {file: originalStart.file, start, end, text};
   }
 }
diff --git a/packages/localize/src/tools/src/extract/main.ts b/packages/localize/src/tools/src/extract/main.ts
index e0a41f05280ce..899a994a42ce7 100644
--- a/packages/localize/src/tools/src/extract/main.ts
+++ b/packages/localize/src/tools/src/extract/main.ts
@@ -6,13 +6,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
  */
-import {getFileSystem, setFileSystem, NodeJSFileSystem, AbsoluteFsPath} from '@angular/compiler-cli/src/ngtsc/file_system';
+import {setFileSystem, NodeJSFileSystem, AbsoluteFsPath, FileSystem} from '@angular/compiler-cli/src/ngtsc/file_system';
 import {ConsoleLogger, Logger, LogLevel} from '@angular/compiler-cli/src/ngtsc/logging';
 import {ɵParsedMessage} from '@angular/localize';
 import * as glob from 'glob';
 import * as yargs from 'yargs';
 
-import {DiagnosticHandlingStrategy, Diagnostics} from '../diagnostics';
+import {DiagnosticHandlingStrategy} from '../diagnostics';
 
 import {checkDuplicateMessages} from './duplicates';
 import {MessageExtractor} from './extraction';
@@ -21,6 +21,7 @@ import {SimpleJsonTranslationSerializer} from './translation_files/json_translat
 import {Xliff1TranslationSerializer} from './translation_files/xliff1_translation_serializer';
 import {Xliff2TranslationSerializer} from './translation_files/xliff2_translation_serializer';
 import {XmbTranslationSerializer} from './translation_files/xmb_translation_serializer';
+import {FormatOptions, parseFormatOptions} from './translation_files/format_options';
 
 if (require.main === module) {
   const args = process.argv.slice(2);
@@ -30,12 +31,14 @@ if (require.main === module) {
             alias: 'locale',
             describe: 'The locale of the source being processed',
             default: 'en',
+            type: 'string',
           })
           .option('r', {
             alias: 'root',
             default: '.',
             describe: 'The root path for other paths provided in these options.\n' +
-                'This should either be absolute or relative to the current working directory.'
+                'This should either be absolute or relative to the current working directory.',
+            type: 'string',
           })
           .option('s', {
             alias: 'source',
@@ -43,65 +46,80 @@ if (require.main === module) {
             describe:
                 'A glob pattern indicating what files to search for translations, e.g. `./dist/**/*.js`.\n' +
                 'This should be relative to the root path.',
+            type: 'string',
           })
           .option('f', {
             alias: 'format',
             required: true,
             choices: ['xmb', 'xlf', 'xlif', 'xliff', 'xlf2', 'xlif2', 'xliff2', 'json'],
             describe: 'The format of the translation file.',
+            type: 'string',
+          })
+          .option('formatOptions', {
+            describe:
+                'Additional options to pass to the translation file serializer, in the form of JSON formatted key-value string pairs:\n' +
+                'For example: `--formatOptions {"xml:space":"preserve"}.\n' +
+                'The meaning of the options is specific to the format being serialized.',
+            type: 'string'
           })
           .option('o', {
             alias: 'outputPath',
             required: true,
             describe:
-                'A path to where the translation file will be written. This should be relative to the root path.'
+                'A path to where the translation file will be written. This should be relative to the root path.',
+            type: 'string',
           })
           .option('loglevel', {
             describe: 'The lowest severity logging message that should be output.',
             choices: ['debug', 'info', 'warn', 'error'],
+            type: 'string',
           })
           .option('useSourceMaps', {
             type: 'boolean',
             default: true,
             describe:
-                'Whether to generate source information in the output files by following source-map mappings found in the source files'
+                'Whether to generate source information in the output files by following source-map mappings found in the source files',
           })
           .option('useLegacyIds', {
             type: 'boolean',
             default: true,
             describe:
-                'Whether to use the legacy id format for messages that were extracted from Angular templates.'
+                'Whether to use the legacy id format for messages that were extracted from Angular templates.',
           })
           .option('d', {
             alias: 'duplicateMessageHandling',
             describe: 'How to handle messages with the same id but different text.',
             choices: ['error', 'warning', 'ignore'],
             default: 'warning',
+            type: 'string',
           })
           .strict()
           .help()
           .parse(args);
 
-  const fs = new NodeJSFileSystem();
-  setFileSystem(fs);
+  const fileSystem = new NodeJSFileSystem();
+  setFileSystem(fileSystem);
 
-  const rootPath = options['root'];
-  const sourceFilePaths = glob.sync(options['source'], {cwd: rootPath, nodir: true});
-  const logLevel = options['loglevel'] as (keyof typeof LogLevel) | undefined;
+  const rootPath = options.r;
+  const sourceFilePaths = glob.sync(options.s, {cwd: rootPath, nodir: true});
+  const logLevel = options.loglevel as (keyof typeof LogLevel) | undefined;
   const logger = new ConsoleLogger(logLevel ? LogLevel[logLevel] : LogLevel.warn);
-  const duplicateMessageHandling: DiagnosticHandlingStrategy = options['d'];
+  const duplicateMessageHandling = options.d as DiagnosticHandlingStrategy;
+  const formatOptions = parseFormatOptions(options.formatOptions);
 
 
   extractTranslations({
     rootPath,
     sourceFilePaths,
-    sourceLocale: options['locale'],
-    format: options['format'],
-    outputPath: options['outputPath'],
+    sourceLocale: options.l,
+    format: options.f,
+    outputPath: options.o,
     logger,
-    useSourceMaps: options['useSourceMaps'],
-    useLegacyIds: options['useLegacyIds'],
+    useSourceMaps: options.useSourceMaps,
+    useLegacyIds: options.useLegacyIds,
     duplicateMessageHandling,
+    formatOptions,
+    fileSystem,
   });
 }
 
@@ -145,6 +163,14 @@ export interface ExtractTranslationsOptions {
    * How to handle messages with the same id but not the same text.
    */
   duplicateMessageHandling: DiagnosticHandlingStrategy;
+  /**
+   * A collection of formatting options to pass to the translation file serializer.
+   */
+  formatOptions?: FormatOptions;
+  /**
+   * The file-system abstraction to use.
+   */
+  fileSystem: FileSystem;
 }
 
 export function extractTranslations({
@@ -157,8 +183,9 @@ export function extractTranslations({
   useSourceMaps,
   useLegacyIds,
   duplicateMessageHandling,
+  formatOptions = {},
+  fileSystem: fs,
 }: ExtractTranslationsOptions) {
-  const fs = getFileSystem();
   const basePath = fs.resolve(rootPath);
   const extractor = new MessageExtractor(fs, logger, {basePath, useSourceMaps});
 
@@ -173,7 +200,8 @@ export function extractTranslations({
   }
 
   const outputPath = fs.resolve(rootPath, output);
-  const serializer = getSerializer(format, sourceLocale, fs.dirname(outputPath), useLegacyIds);
+  const serializer =
+      getSerializer(format, sourceLocale, fs.dirname(outputPath), useLegacyIds, formatOptions, fs);
   const translationFile = serializer.serialize(messages);
   fs.ensureDir(fs.dirname(outputPath));
   fs.writeFile(outputPath, translationFile);
@@ -184,19 +212,21 @@ export function extractTranslations({
 }
 
 export function getSerializer(
-    format: string, sourceLocale: string, rootPath: AbsoluteFsPath,
-    useLegacyIds: boolean): TranslationSerializer {
+    format: string, sourceLocale: string, rootPath: AbsoluteFsPath, useLegacyIds: boolean,
+    formatOptions: FormatOptions = {}, fs: FileSystem): TranslationSerializer {
   switch (format) {
     case 'xlf':
     case 'xlif':
     case 'xliff':
-      return new Xliff1TranslationSerializer(sourceLocale, rootPath, useLegacyIds);
+      return new Xliff1TranslationSerializer(
+          sourceLocale, rootPath, useLegacyIds, formatOptions, fs);
     case 'xlf2':
     case 'xlif2':
     case 'xliff2':
-      return new Xliff2TranslationSerializer(sourceLocale, rootPath, useLegacyIds);
+      return new Xliff2TranslationSerializer(
+          sourceLocale, rootPath, useLegacyIds, formatOptions, fs);
     case 'xmb':
-      return new XmbTranslationSerializer(rootPath, useLegacyIds);
+      return new XmbTranslationSerializer(rootPath, useLegacyIds, fs);
     case 'json':
       return new SimpleJsonTranslationSerializer(sourceLocale);
   }
diff --git a/packages/localize/src/tools/src/extract/source_files/es2015_extract_plugin.ts b/packages/localize/src/tools/src/extract/source_files/es2015_extract_plugin.ts
index cada054ef4c08..646a77b285a77 100644
--- a/packages/localize/src/tools/src/extract/source_files/es2015_extract_plugin.ts
+++ b/packages/localize/src/tools/src/extract/source_files/es2015_extract_plugin.ts
@@ -5,22 +5,28 @@
  * 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 {FileSystem} from '@angular/compiler-cli/src/ngtsc/file_system';
 import {ɵParsedMessage, ɵparseMessage} from '@angular/localize';
 import {NodePath, PluginObj} from '@babel/core';
 import {TaggedTemplateExpression} from '@babel/types';
 
-import {getLocation, isGlobalIdentifier, isNamedIdentifier, unwrapMessagePartsFromTemplateLiteral} from '../../source_file_utils';
+import {getLocation, isGlobalIdentifier, isNamedIdentifier, unwrapExpressionsFromTemplateLiteral, unwrapMessagePartsFromTemplateLiteral} from '../../source_file_utils';
 
 export function makeEs2015ExtractPlugin(
-    messages: ɵParsedMessage[], localizeName = '$localize'): PluginObj {
+    fs: FileSystem, messages: ɵParsedMessage[], localizeName = '$localize'): PluginObj {
   return {
     visitor: {
       TaggedTemplateExpression(path: NodePath<TaggedTemplateExpression>) {
         const tag = path.get('tag');
         if (isNamedIdentifier(tag, localizeName) && isGlobalIdentifier(tag)) {
-          const messageParts = unwrapMessagePartsFromTemplateLiteral(path.node.quasi.quasis);
-          const location = getLocation(path.get('quasi'));
-          const message = ɵparseMessage(messageParts, path.node.quasi.expressions, location);
+          const quasiPath = path.get('quasi');
+          const [messageParts, messagePartLocations] =
+              unwrapMessagePartsFromTemplateLiteral(quasiPath.get('quasis'), fs);
+          const [expressions, expressionLocations] =
+              unwrapExpressionsFromTemplateLiteral(quasiPath, fs);
+          const location = getLocation(fs, quasiPath);
+          const message = ɵparseMessage(
+              messageParts, expressions, location, messagePartLocations, expressionLocations);
           messages.push(message);
         }
       }
diff --git a/packages/localize/src/tools/src/extract/source_files/es5_extract_plugin.ts b/packages/localize/src/tools/src/extract/source_files/es5_extract_plugin.ts
index 4312f1e3c3837..fc83d4ca40400 100644
--- a/packages/localize/src/tools/src/extract/source_files/es5_extract_plugin.ts
+++ b/packages/localize/src/tools/src/extract/source_files/es5_extract_plugin.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 {FileSystem} from '@angular/compiler-cli/src/ngtsc/file_system';
 import {ɵParsedMessage, ɵparseMessage} from '@angular/localize';
 import {NodePath, PluginObj} from '@babel/core';
 import {CallExpression} from '@babel/types';
@@ -12,16 +13,20 @@ import {CallExpression} from '@babel/types';
 import {getLocation, isGlobalIdentifier, isNamedIdentifier, unwrapMessagePartsFromLocalizeCall, unwrapSubstitutionsFromLocalizeCall} from '../../source_file_utils';
 
 export function makeEs5ExtractPlugin(
-    messages: ɵParsedMessage[], localizeName = '$localize'): PluginObj {
+    fs: FileSystem, messages: ɵParsedMessage[], localizeName = '$localize'): PluginObj {
   return {
     visitor: {
       CallExpression(callPath: NodePath<CallExpression>) {
         const calleePath = callPath.get('callee');
         if (isNamedIdentifier(calleePath, localizeName) && isGlobalIdentifier(calleePath)) {
-          const messageParts = unwrapMessagePartsFromLocalizeCall(callPath);
-          const expressions = unwrapSubstitutionsFromLocalizeCall(callPath.node);
-          const location = getLocation(callPath);
-          const message = ɵparseMessage(messageParts, expressions, location);
+          const [messageParts, messagePartLocations] =
+              unwrapMessagePartsFromLocalizeCall(callPath, fs);
+          const [expressions, expressionLocations] =
+              unwrapSubstitutionsFromLocalizeCall(callPath, fs);
+          const [messagePartsArg, expressionsArg] = callPath.get('arguments');
+          const location = getLocation(fs, messagePartsArg, expressionsArg);
+          const message = ɵparseMessage(
+              messageParts, expressions, location, messagePartLocations, expressionLocations);
           messages.push(message);
         }
       }
diff --git a/packages/localize/src/tools/src/extract/translation_files/format_options.ts b/packages/localize/src/tools/src/extract/translation_files/format_options.ts
new file mode 100644
index 0000000000000..43113678bb2da
--- /dev/null
+++ b/packages/localize/src/tools/src/extract/translation_files/format_options.ts
@@ -0,0 +1,44 @@
+/**
+ * @license
+ * Copyright Google LLC 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 type FormatOptions = Record<string, string>;
+export type ValidOption = [key: string, values: string[]];
+export type ValidOptions = ValidOption[];
+
+/**
+ * Check that the given `options` are allowed based on the given `validOptions`.
+ * @param name The name of the serializer that is receiving the options.
+ * @param validOptions An array of valid options and their allowed values.
+ * @param options The options to be validated.
+ */
+export function validateOptions(name: string, validOptions: ValidOptions, options: FormatOptions) {
+  const validOptionsMap = new Map<ValidOption[0], ValidOption[1]>(validOptions);
+  for (const option in options) {
+    if (!validOptionsMap.has(option)) {
+      throw new Error(
+          `Invalid format option for ${name}: "${option}".\n` +
+          `Allowed options are ${JSON.stringify(Array.from(validOptionsMap.keys()))}.`);
+    }
+    const validOptionValues = validOptionsMap.get(option)!;
+    const optionValue = options[option];
+    if (!validOptionValues.includes(optionValue)) {
+      throw new Error(
+          `Invalid format option value for ${name}: "${option}".\n` +
+          `Allowed option values are ${JSON.stringify(validOptionValues)} but received "${
+              optionValue}".`);
+    }
+  }
+}
+
+/**
+ * Parse the given `optionString` into a collection of `FormatOptions`.
+ * @param optionString The string to parse.
+ */
+export function parseFormatOptions(optionString: string = '{}'): FormatOptions {
+  return JSON.parse(optionString);
+}
\ No newline at end of file
diff --git a/packages/localize/src/tools/src/extract/translation_files/icu_parsing.ts b/packages/localize/src/tools/src/extract/translation_files/icu_parsing.ts
new file mode 100644
index 0000000000000..b2e00f85f524a
--- /dev/null
+++ b/packages/localize/src/tools/src/extract/translation_files/icu_parsing.ts
@@ -0,0 +1,216 @@
+/**
+ * @license
+ * Copyright Google LLC 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
+ */
+
+/**
+ * Split the given `text` into an array of "static strings" and ICU "placeholder names".
+ *
+ * This is required because ICU expressions in `$localize` tagged messages may contain "dynamic"
+ * piece (e.g. interpolations or element markers). These markers need to be translated to
+ * placeholders in extracted translation files. So we must parse ICUs to identify them and separate
+ * them out so that the translation serializers can render them appropriately.
+ *
+ * An example of an ICU with interpolations:
+ *
+ * ```
+ * {VAR_PLURAL, plural, one {{INTERPOLATION}} other {{INTERPOLATION_1} post}}
+ * ```
+ *
+ * In this ICU, `INTERPOLATION` and `INTERPOLATION_1` are actually placeholders that will be
+ * replaced with dynamic content at runtime.
+ *
+ * Such placeholders are identifiable as text wrapped in curly braces, within an ICU case
+ * expression.
+ *
+ * To complicate matters, it is possible for ICUs to be nested indefinitely within each other. In
+ * such cases, the nested ICU expression appears enclosed in a set of curly braces in the same way
+ * as a placeholder. The nested ICU expressions can be differentiated from placeholders as they
+ * contain a comma `,`, which separates the ICU value from the ICU type.
+ *
+ * Furthermore, nested ICUs can have placeholders of their own, which need to be extracted.
+ *
+ * An example of a nested ICU containing its own placeholders:
+ *
+ * ```
+ * {VAR_SELECT_1, select,
+ *   invoice {Invoice for {INTERPOLATION}}
+ *   payment {{VAR_SELECT, select,
+ *     processor {Payment gateway}
+ *     other {{INTERPOLATION_1}}
+ *   }}
+ * ```
+ *
+ * @param text Text to be broken.
+ * @returns an array of strings, where
+ *  - even values are static strings (e.g. 0, 2, 4, etc)
+ *  - odd values are placeholder names (e.g. 1, 3, 5, etc)
+ */
+export function extractIcuPlaceholders(text: string): string[] {
+  const state = new StateStack();
+  const pieces = new IcuPieces();
+  const braces = /[{}]/g;
+
+  let lastPos = 0;
+  let match: RegExpMatchArray|null;
+  while (match = braces.exec(text)) {
+    if (match[0] == '{') {
+      state.enterBlock();
+    } else {
+      // We must have hit a `}`
+      state.leaveBlock();
+    }
+
+    if (state.getCurrent() === 'placeholder') {
+      const name = tryParsePlaceholder(text, braces.lastIndex);
+      if (name) {
+        // We found a placeholder so store it in the pieces;
+        // store the current static text (minus the opening curly brace);
+        // skip the closing brace and leave the placeholder block.
+        pieces.addText(text.substring(lastPos, braces.lastIndex - 1));
+        pieces.addPlaceholder(name);
+        braces.lastIndex += name.length + 1;
+        state.leaveBlock();
+      } else {
+        // This is not a placeholder, so it must be a nested ICU;
+        // store the current static text (including the opening curly brace).
+        pieces.addText(text.substring(lastPos, braces.lastIndex));
+        state.nestedIcu();
+      }
+    } else {
+      pieces.addText(text.substring(lastPos, braces.lastIndex));
+    }
+    lastPos = braces.lastIndex;
+  }
+
+  // Capture the last piece of text after the ICUs (if any).
+  pieces.addText(text.substring(lastPos));
+  return pieces.toArray();
+}
+
+/**
+ * A helper class to store the pieces ("static text" or "placeholder name") in an ICU.
+ */
+class IcuPieces {
+  private pieces: string[] = [''];
+
+  /**
+   * Add the given `text` to the current "static text" piece.
+   *
+   * Sequential calls to `addText()` will append to the current text piece.
+   */
+  addText(text: string): void {
+    this.pieces[this.pieces.length - 1] += text;
+  }
+
+  /**
+   * Add the given placeholder `name` to the stored pieces.
+   */
+  addPlaceholder(name: string): void {
+    this.pieces.push(name);
+    this.pieces.push('');
+  }
+
+  /**
+   * Return the stored pieces as an array of strings.
+   *
+   * Even values are static strings (e.g. 0, 2, 4, etc)
+   * Odd values are placeholder names (e.g. 1, 3, 5, etc)
+   */
+  toArray(): string[] {
+    return this.pieces;
+  }
+}
+
+/**
+ * A helper class to track the current state of parsing the strings for ICU placeholders.
+ *
+ * State changes happen when we enter or leave a curly brace block.
+ * Since ICUs can be nested the state is stored as a stack.
+ */
+class StateStack {
+  private stack: ParserState[] = [];
+
+  /**
+   * Update the state upon entering a block.
+   *
+   * The new state is computed from the current state and added to the stack.
+   */
+  enterBlock(): void {
+    const current = this.getCurrent();
+    switch (current) {
+      case 'icu':
+        this.stack.push('case');
+        break;
+      case 'case':
+        this.stack.push('placeholder');
+        break;
+      case 'placeholder':
+        this.stack.push('case');
+        break;
+      default:
+        this.stack.push('icu');
+        break;
+    }
+  }
+
+  /**
+   * Update the state upon leaving a block.
+   *
+   * The previous state is popped off the stack.
+   */
+  leaveBlock(): ParserState {
+    return this.stack.pop();
+  }
+
+  /**
+   * Update the state upon arriving at a nested ICU.
+   *
+   * In this case, the current state of "placeholder" is incorrect, so this is popped off and the
+   * correct "icu" state is stored.
+   */
+  nestedIcu(): void {
+    const current = this.stack.pop();
+    assert(current === 'placeholder', 'A nested ICU must replace a placeholder but got ' + current);
+    this.stack.push('icu');
+  }
+
+  /**
+   * Get the current (most recent) state from the stack.
+   */
+  getCurrent() {
+    return this.stack[this.stack.length - 1];
+  }
+}
+type ParserState = 'icu'|'case'|'placeholder'|undefined;
+
+/**
+ * Attempt to parse a simple placeholder name from a curly braced block.
+ *
+ * If the block contains a comma `,` then it cannot be a placeholder - and is probably a nest ICU
+ * instead.
+ *
+ * @param text the whole string that is being parsed.
+ * @param start the index of the character in the `text` string where this placeholder may start.
+ * @returns the placeholder name or `null` if it is not a placeholder.
+ */
+function tryParsePlaceholder(text: string, start: number): string|null {
+  for (let i = start; i < text.length; i++) {
+    if (text[i] === ',') {
+      break;
+    }
+    if (text[i] === '}') {
+      return text.substring(start, i);
+    }
+  }
+  return null;
+}
+
+function assert(test: boolean, message: string): void {
+  if (!test) {
+    throw new Error('Assertion failure: ' + message);
+  }
+}
diff --git a/packages/localize/src/tools/src/extract/translation_files/xliff1_translation_serializer.ts b/packages/localize/src/tools/src/extract/translation_files/xliff1_translation_serializer.ts
index 8c1afb69f2b22..363000a557e59 100644
--- a/packages/localize/src/tools/src/extract/translation_files/xliff1_translation_serializer.ts
+++ b/packages/localize/src/tools/src/extract/translation_files/xliff1_translation_serializer.ts
@@ -5,9 +5,11 @@
  * 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 {AbsoluteFsPath, relative} from '@angular/compiler-cli/src/ngtsc/file_system';
+import {AbsoluteFsPath, FileSystem, getFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system';
 import {ɵParsedMessage, ɵSourceLocation} from '@angular/localize';
 
+import {FormatOptions, validateOptions} from './format_options';
+import {extractIcuPlaceholders} from './icu_parsing';
 import {TranslationSerializer} from './translation_serializer';
 import {XmlFile} from './xml_file';
 
@@ -21,17 +23,32 @@ const LEGACY_XLIFF_MESSAGE_LENGTH = 40;
  * http://docs.oasis-open.org/xliff/v1.2/xliff-profile-html/xliff-profile-html-1.2.html
  *
  * @see Xliff1TranslationParser
+ * @publicApi used by CLI
  */
 export class Xliff1TranslationSerializer implements TranslationSerializer {
   constructor(
-      private sourceLocale: string, private basePath: AbsoluteFsPath,
-      private useLegacyIds: boolean) {}
+      private sourceLocale: string, private basePath: AbsoluteFsPath, private useLegacyIds: boolean,
+      private formatOptions: FormatOptions = {}, private fs: FileSystem = getFileSystem()) {
+    validateOptions('Xliff1TranslationSerializer', [['xml:space', ['preserve']]], formatOptions);
+  }
 
   serialize(messages: ɵParsedMessage[]): string {
     const ids = new Set<string>();
     const xml = new XmlFile();
     xml.startTag('xliff', {'version': '1.2', 'xmlns': 'urn:oasis:names:tc:xliff:document:1.2'});
-    xml.startTag('file', {'source-language': this.sourceLocale, 'datatype': 'plaintext'});
+    // NOTE: the `original` property is set to the legacy `ng2.template` value for backward
+    // compatibility.
+    // We could compute the file from the `message.location` property, but there could
+    // be multiple values for this in the collection of `messages`. In that case we would probably
+    // need to change the serializer to output a new `<file>` element for each collection of
+    // messages that come from a particular original file, and the translation file parsers may not
+    // be able to cope with this.
+    xml.startTag('file', {
+      'source-language': this.sourceLocale,
+      'datatype': 'plaintext',
+      'original': 'ng2.template',
+      ...this.formatOptions,
+    });
     xml.startTag('body');
     for (const message of messages) {
       const id = this.getMessageId(message);
@@ -63,11 +80,31 @@ export class Xliff1TranslationSerializer implements TranslationSerializer {
   }
 
   private serializeMessage(xml: XmlFile, message: ɵParsedMessage): void {
-    xml.text(message.messageParts[0]);
-    for (let i = 1; i < message.messageParts.length; i++) {
-      xml.startTag('x', {id: message.placeholderNames[i - 1]}, {selfClosing: true});
-      xml.text(message.messageParts[i]);
+    const length = message.messageParts.length - 1;
+    for (let i = 0; i < length; i++) {
+      this.serializeTextPart(xml, message.messageParts[i]);
+      const location = message.substitutionLocations?.[message.placeholderNames[i]];
+      this.serializePlaceholder(xml, message.placeholderNames[i], location?.text);
+    }
+    this.serializeTextPart(xml, message.messageParts[length]);
+  }
+
+  private serializeTextPart(xml: XmlFile, text: string): void {
+    const pieces = extractIcuPlaceholders(text);
+    const length = pieces.length - 1;
+    for (let i = 0; i < length; i += 2) {
+      xml.text(pieces[i]);
+      this.serializePlaceholder(xml, pieces[i + 1], undefined);
     }
+    xml.text(pieces[length]);
+  }
+
+  private serializePlaceholder(xml: XmlFile, id: string, text: string|undefined): void {
+    const attrs: Record<string, string> = {id};
+    if (text !== undefined) {
+      attrs['equiv-text'] = text;
+    }
+    xml.startTag('x', attrs, {selfClosing: true});
   }
 
   private serializeNote(xml: XmlFile, name: string, value: string): void {
@@ -78,7 +115,7 @@ export class Xliff1TranslationSerializer implements TranslationSerializer {
 
   private serializeLocation(xml: XmlFile, location: ɵSourceLocation): void {
     xml.startTag('context-group', {purpose: 'location'});
-    this.renderContext(xml, 'sourcefile', relative(this.basePath, location.file));
+    this.renderContext(xml, 'sourcefile', this.fs.relative(this.basePath, location.file));
     const endLineString = location.end !== undefined && location.end.line !== location.start.line ?
         `,${location.end.line + 1}` :
         '';
@@ -95,6 +132,8 @@ export class Xliff1TranslationSerializer implements TranslationSerializer {
   /**
    * Get the id for the given `message`.
    *
+   * If there was a custom id provided, use that.
+   *
    * If we have requested legacy message ids, then try to return the appropriate id
    * from the list of legacy ids that were extracted.
    *
@@ -104,7 +143,8 @@ export class Xliff1TranslationSerializer implements TranslationSerializer {
    * https://csrc.nist.gov/csrc/media/publications/fips/180/4/final/documents/fips180-4-draft-aug2014.pdf
    */
   private getMessageId(message: ɵParsedMessage): string {
-    return this.useLegacyIds && message.legacyIds !== undefined &&
+    return message.customId ||
+        this.useLegacyIds && message.legacyIds !== undefined &&
         message.legacyIds.find(id => id.length === LEGACY_XLIFF_MESSAGE_LENGTH) ||
         message.id;
   }
diff --git a/packages/localize/src/tools/src/extract/translation_files/xliff2_translation_serializer.ts b/packages/localize/src/tools/src/extract/translation_files/xliff2_translation_serializer.ts
index 31f2a42eeb84a..177ea75e69f4c 100644
--- a/packages/localize/src/tools/src/extract/translation_files/xliff2_translation_serializer.ts
+++ b/packages/localize/src/tools/src/extract/translation_files/xliff2_translation_serializer.ts
@@ -5,9 +5,11 @@
  * 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 {AbsoluteFsPath, relative} from '@angular/compiler-cli/src/ngtsc/file_system';
-import {ɵParsedMessage} from '@angular/localize';
+import {AbsoluteFsPath, FileSystem, getFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system';
+import {ɵParsedMessage, ɵSourceLocation} from '@angular/localize';
 
+import {FormatOptions, validateOptions} from './format_options';
+import {extractIcuPlaceholders} from './icu_parsing';
 import {TranslationSerializer} from './translation_serializer';
 import {XmlFile} from './xml_file';
 
@@ -20,11 +22,15 @@ const MAX_LEGACY_XLIFF_2_MESSAGE_LENGTH = 20;
  * http://docs.oasis-open.org/xliff/xliff-core/v2.0/os/xliff-core-v2.0-os.html
  *
  * @see Xliff2TranslationParser
+ * @publicApi used by CLI
  */
 export class Xliff2TranslationSerializer implements TranslationSerializer {
+  private currentPlaceholderId = 0;
   constructor(
-      private sourceLocale: string, private basePath: AbsoluteFsPath,
-      private useLegacyIds: boolean) {}
+      private sourceLocale: string, private basePath: AbsoluteFsPath, private useLegacyIds: boolean,
+      private formatOptions: FormatOptions = {}, private fs: FileSystem = getFileSystem()) {
+    validateOptions('Xliff1TranslationSerializer', [['xml:space', ['preserve']]], formatOptions);
+  }
 
   serialize(messages: ɵParsedMessage[]): string {
     const ids = new Set<string>();
@@ -34,7 +40,14 @@ export class Xliff2TranslationSerializer implements TranslationSerializer {
       'xmlns': 'urn:oasis:names:tc:xliff:document:2.0',
       'srcLang': this.sourceLocale
     });
-    xml.startTag('file');
+    // NOTE: the `original` property is set to the legacy `ng.template` value for backward
+    // compatibility.
+    // We could compute the file from the `message.location` property, but there could
+    // be multiple values for this in the collection of `messages`. In that case we would probably
+    // need to change the serializer to output a new `<file>` element for each collection of
+    // messages that come from a particular original file, and the translation file parsers may
+    // not
+    xml.startTag('file', {'id': 'ngi18n', 'original': 'ng.template', ...this.formatOptions});
     for (const message of messages) {
       const id = this.getMessageId(message);
       if (ids.has(id)) {
@@ -43,7 +56,7 @@ export class Xliff2TranslationSerializer implements TranslationSerializer {
       }
       ids.add(id);
       xml.startTag('unit', {id});
-      if (message.meaning || message.description) {
+      if (message.meaning || message.description || message.location) {
         xml.startTag('notes');
         if (message.location) {
           const {file, start, end} = message.location;
@@ -51,7 +64,7 @@ export class Xliff2TranslationSerializer implements TranslationSerializer {
               end !== undefined && end.line !== start.line ? `,${end.line + 1}` : '';
           this.serializeNote(
               xml, 'location',
-              `${relative(this.basePath, file)}:${start.line + 1}${endLineString}`);
+              `${this.fs.relative(this.basePath, file)}:${start.line + 1}${endLineString}`);
         }
         if (message.description) {
           this.serializeNote(xml, 'description', message.description);
@@ -74,21 +87,54 @@ export class Xliff2TranslationSerializer implements TranslationSerializer {
   }
 
   private serializeMessage(xml: XmlFile, message: ɵParsedMessage): void {
-    xml.text(message.messageParts[0]);
-    for (let i = 1; i < message.messageParts.length; i++) {
-      const placeholderName = message.placeholderNames[i - 1];
-      if (placeholderName.startsWith('START_')) {
-        xml.startTag('pc', {
-          id: `${i}`,
-          equivStart: placeholderName,
-          equivEnd: placeholderName.replace(/^START/, 'CLOSE')
-        });
-      } else if (placeholderName.startsWith('CLOSE_')) {
-        xml.endTag('pc');
-      } else {
-        xml.startTag('ph', {id: `${i}`, equiv: placeholderName}, {selfClosing: true});
+    this.currentPlaceholderId = 0;
+    const length = message.messageParts.length - 1;
+    for (let i = 0; i < length; i++) {
+      this.serializeTextPart(xml, message.messageParts[i]);
+      this.serializePlaceholder(xml, message.placeholderNames[i], message.substitutionLocations);
+    }
+    this.serializeTextPart(xml, message.messageParts[length]);
+  }
+
+  private serializeTextPart(xml: XmlFile, text: string): void {
+    const pieces = extractIcuPlaceholders(text);
+    const length = pieces.length - 1;
+    for (let i = 0; i < length; i += 2) {
+      xml.text(pieces[i]);
+      this.serializePlaceholder(xml, pieces[i + 1], undefined);
+    }
+    xml.text(pieces[length]);
+  }
+
+  private serializePlaceholder(
+      xml: XmlFile, placeholderName: string,
+      substitutionLocations: Record<string, ɵSourceLocation|undefined>|undefined): void {
+    const text = substitutionLocations?.[placeholderName]?.text;
+
+    if (placeholderName.startsWith('START_')) {
+      const closingPlaceholderName = placeholderName.replace(/^START/, 'CLOSE');
+      const closingText = substitutionLocations?.[closingPlaceholderName]?.text;
+      const attrs: Record<string, string> = {
+        id: `${this.currentPlaceholderId++}`,
+        equivStart: placeholderName,
+        equivEnd: closingPlaceholderName,
+      };
+      if (text !== undefined) {
+        attrs.dispStart = text;
+      }
+      if (closingText !== undefined) {
+        attrs.dispEnd = closingText;
       }
-      xml.text(message.messageParts[i]);
+      xml.startTag('pc', attrs);
+    } else if (placeholderName.startsWith('CLOSE_')) {
+      xml.endTag('pc');
+    } else {
+      const attrs:
+          Record<string, string> = {id: `${this.currentPlaceholderId++}`, equiv: placeholderName};
+      if (text !== undefined) {
+        attrs.disp = text;
+      }
+      xml.startTag('ph', attrs, {selfClosing: true});
     }
   }
 
@@ -101,6 +147,8 @@ export class Xliff2TranslationSerializer implements TranslationSerializer {
   /**
    * Get the id for the given `message`.
    *
+   * If there was a custom id provided, use that.
+   *
    * If we have requested legacy message ids, then try to return the appropriate id
    * from the list of legacy ids that were extracted.
    *
@@ -111,7 +159,8 @@ export class Xliff2TranslationSerializer implements TranslationSerializer {
    * https://github.com/google/closure-compiler/blob/master/src/com/google/javascript/jscomp/GoogleJsMessageIdGenerator.java
    */
   private getMessageId(message: ɵParsedMessage): string {
-    return this.useLegacyIds && message.legacyIds !== undefined &&
+    return message.customId ||
+        this.useLegacyIds && message.legacyIds !== undefined &&
         message.legacyIds.find(
             id => id.length <= MAX_LEGACY_XLIFF_2_MESSAGE_LENGTH && !/[^0-9]/.test(id)) ||
         message.id;
diff --git a/packages/localize/src/tools/src/extract/translation_files/xmb_translation_serializer.ts b/packages/localize/src/tools/src/extract/translation_files/xmb_translation_serializer.ts
index ffb43834098d4..04d2d6556c643 100644
--- a/packages/localize/src/tools/src/extract/translation_files/xmb_translation_serializer.ts
+++ b/packages/localize/src/tools/src/extract/translation_files/xmb_translation_serializer.ts
@@ -5,9 +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 {AbsoluteFsPath, relative} from '@angular/compiler-cli/src/ngtsc/file_system';
+import {AbsoluteFsPath, FileSystem, getFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system';
 import {ɵParsedMessage, ɵSourceLocation} from '@angular/localize';
 
+import {extractIcuPlaceholders} from './icu_parsing';
 import {TranslationSerializer} from './translation_serializer';
 import {XmlFile} from './xml_file';
 
@@ -17,9 +18,12 @@ import {XmlFile} from './xml_file';
  * http://cldr.unicode.org/development/development-process/design-proposals/xmb
  *
  * @see XmbTranslationParser
+ * @publicApi used by CLI
  */
 export class XmbTranslationSerializer implements TranslationSerializer {
-  constructor(private basePath: AbsoluteFsPath, private useLegacyIds: boolean) {}
+  constructor(
+      private basePath: AbsoluteFsPath, private useLegacyIds: boolean,
+      private fs: FileSystem = getFileSystem()) {}
 
   serialize(messages: ɵParsedMessage[]): string {
     const ids = new Set<string>();
@@ -72,21 +76,35 @@ export class XmbTranslationSerializer implements TranslationSerializer {
     const endLineString = location.end !== undefined && location.end.line !== location.start.line ?
         `,${location.end.line + 1}` :
         '';
-    xml.text(`${relative(this.basePath, location.file)}:${location.start.line}${endLineString}`);
+    xml.text(
+        `${this.fs.relative(this.basePath, location.file)}:${location.start.line}${endLineString}`);
     xml.endTag('source');
   }
 
   private serializeMessage(xml: XmlFile, message: ɵParsedMessage): void {
-    xml.text(message.messageParts[0]);
-    for (let i = 1; i < message.messageParts.length; i++) {
-      xml.startTag('ph', {name: message.placeholderNames[i - 1]}, {selfClosing: true});
-      xml.text(message.messageParts[i]);
+    const length = message.messageParts.length - 1;
+    for (let i = 0; i < length; i++) {
+      this.serializeTextPart(xml, message.messageParts[i]);
+      xml.startTag('ph', {name: message.placeholderNames[i]}, {selfClosing: true});
     }
+    this.serializeTextPart(xml, message.messageParts[length]);
+  }
+
+  private serializeTextPart(xml: XmlFile, text: string): void {
+    const pieces = extractIcuPlaceholders(text);
+    const length = pieces.length - 1;
+    for (let i = 0; i < length; i += 2) {
+      xml.text(pieces[i]);
+      xml.startTag('ph', {name: pieces[i + 1]}, {selfClosing: true});
+    }
+    xml.text(pieces[length]);
   }
 
   /**
    * Get the id for the given `message`.
    *
+   * If there was a custom id provided, use that.
+   *
    * If we have requested legacy message ids, then try to return the appropriate id
    * from the list of legacy ids that were extracted.
    *
@@ -97,7 +115,8 @@ export class XmbTranslationSerializer implements TranslationSerializer {
    * https://github.com/google/closure-compiler/blob/master/src/com/google/javascript/jscomp/GoogleJsMessageIdGenerator.java
    */
   private getMessageId(message: ɵParsedMessage): string {
-    return this.useLegacyIds && message.legacyIds !== undefined &&
+    return message.customId ||
+        this.useLegacyIds && message.legacyIds !== undefined &&
         message.legacyIds.find(id => id.length <= 20 && !/[^0-9]/.test(id)) ||
         message.id;
   }
diff --git a/packages/localize/src/tools/src/source_file_utils.ts b/packages/localize/src/tools/src/source_file_utils.ts
index ed20ac156ae72..9ba2b85837d12 100644
--- a/packages/localize/src/tools/src/source_file_utils.ts
+++ b/packages/localize/src/tools/src/source_file_utils.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 {AbsoluteFsPath, relative, resolve} from '@angular/compiler-cli/src/ngtsc/file_system';
+import {AbsoluteFsPath, FileSystem, getFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system';
 import {ɵisMissingTranslationError, ɵmakeTemplateObject, ɵParsedTranslation, ɵSourceLocation, ɵtranslate} from '@angular/localize';
 import {NodePath} from '@babel/traverse';
 import * as t from '@babel/types';
@@ -36,7 +36,9 @@ export function isNamedIdentifier(
 
 /**
  * Is the given `identifier` declared globally.
+ *
  * @param identifier The identifier to check.
+ * @publicApi used by CLI
  */
 export function isGlobalIdentifier(identifier: NodePath<t.Identifier>) {
   return !identifier.scope || !identifier.scope.hasBinding(identifier.node.name);
@@ -46,6 +48,7 @@ export function isGlobalIdentifier(identifier: NodePath<t.Identifier>) {
  * Build a translated expression to replace the call to `$localize`.
  * @param messageParts The static parts of the message.
  * @param substitutions The expressions to substitute into the message.
+ * @publicApi used by CLI
  */
 export function buildLocalizeReplacement(
     messageParts: TemplateStringsArray, substitutions: readonly t.Expression[]): t.Expression {
@@ -65,9 +68,14 @@ export function buildLocalizeReplacement(
  * to a helper function like `__makeTemplateObject`.
  *
  * @param call The AST node of the call to process.
+ * @param fs The file system to use when computing source-map paths. If not provided then it uses
+ *     the "current" FileSystem.
+ * @publicApi used by CLI
  */
-export function unwrapMessagePartsFromLocalizeCall(call: NodePath<t.CallExpression>):
-    TemplateStringsArray {
+export function unwrapMessagePartsFromLocalizeCall(
+    call: NodePath<t.CallExpression>,
+    fs: FileSystem = getFileSystem(),
+    ): [TemplateStringsArray, (ɵSourceLocation | undefined)[]] {
   let cooked = call.get('arguments')[0];
 
   if (cooked === undefined) {
@@ -137,34 +145,70 @@ export function unwrapMessagePartsFromLocalizeCall(call: NodePath<t.CallExpressi
     raw = arg2 !== undefined ? arg2 : cooked;
   }
 
-  const cookedStrings = unwrapStringLiteralArray(cooked.node);
-  const rawStrings = unwrapStringLiteralArray(raw.node);
-  return ɵmakeTemplateObject(cookedStrings, rawStrings);
+  const [cookedStrings] = unwrapStringLiteralArray(cooked, fs);
+  const [rawStrings, rawLocations] = unwrapStringLiteralArray(raw, fs);
+  return [ɵmakeTemplateObject(cookedStrings, rawStrings), rawLocations];
 }
 
-
-export function unwrapSubstitutionsFromLocalizeCall(call: t.CallExpression): t.Expression[] {
-  const expressions = call.arguments.splice(1);
+/**
+ * Parse the localize call expression to extract the arguments that hold the substition expressions.
+ *
+ * @param call The AST node of the call to process.
+ * @param fs The file system to use when computing source-map paths. If not provided then it uses
+ *     the "current" FileSystem.
+ * @publicApi used by CLI
+ */
+export function unwrapSubstitutionsFromLocalizeCall(
+    call: NodePath<t.CallExpression>,
+    fs: FileSystem = getFileSystem()): [t.Expression[], (ɵSourceLocation | undefined)[]] {
+  const expressions = call.get('arguments').splice(1);
   if (!isArrayOfExpressions(expressions)) {
-    const badExpression = expressions.find(expression => !t.isExpression(expression))!;
+    const badExpression = expressions.find(expression => !expression.isExpression())!;
     throw new BabelParseError(
-        badExpression,
+        badExpression.node,
         'Invalid substitutions for `$localize` (expected all substitution arguments to be expressions).');
   }
-  return expressions;
+  return [
+    expressions.map(path => path.node), expressions.map(expression => getLocation(fs, expression))
+  ];
 }
 
-export function unwrapMessagePartsFromTemplateLiteral(elements: t.TemplateElement[]):
-    TemplateStringsArray {
+/**
+ * Parse the tagged template literal to extract the message parts.
+ *
+ * @param elements The elements of the template literal to process.
+ * @param fs The file system to use when computing source-map paths. If not provided then it uses
+ *     the "current" FileSystem.
+ * @publicApi used by CLI
+ */
+export function unwrapMessagePartsFromTemplateLiteral(
+    elements: NodePath<t.TemplateElement>[],
+    fs: FileSystem = getFileSystem()): [TemplateStringsArray, (ɵSourceLocation | undefined)[]] {
   const cooked = elements.map(q => {
-    if (q.value.cooked === undefined) {
+    if (q.node.value.cooked === undefined) {
       throw new BabelParseError(
-          q, `Unexpected undefined message part in "${elements.map(q => q.value.cooked)}"`);
+          q.node,
+          `Unexpected undefined message part in "${elements.map(q => q.node.value.cooked)}"`);
     }
-    return q.value.cooked;
+    return q.node.value.cooked;
   });
-  const raw = elements.map(q => q.value.raw);
-  return ɵmakeTemplateObject(cooked, raw);
+  const raw = elements.map(q => q.node.value.raw);
+  const locations = elements.map(q => getLocation(fs, q));
+  return [ɵmakeTemplateObject(cooked, raw), locations];
+}
+
+/**
+ * Parse the tagged template literal to extract the interpolation expressions.
+ *
+ * @param quasi The AST node of the template literal to process.
+ * @param fs The file system to use when computing source-map paths. If not provided then it uses
+ *     the "current" FileSystem.
+ * @publicApi used by CLI
+ */
+export function unwrapExpressionsFromTemplateLiteral(
+    quasi: NodePath<t.TemplateLiteral>,
+    fs: FileSystem = getFileSystem()): [t.Expression[], (ɵSourceLocation | undefined)[]] {
+  return [quasi.node.expressions, quasi.get('expressions').map(e => getLocation(fs, e))];
 }
 
 /**
@@ -184,14 +228,20 @@ export function wrapInParensIfNecessary(expression: t.Expression): t.Expression
 
 /**
  * Extract the string values from an `array` of string literals.
+ *
  * @param array The array to unwrap.
+ * @param fs The file system to use when computing source-map paths. If not provided then it uses
+ *     the "current" FileSystem.
  */
-export function unwrapStringLiteralArray(array: t.Expression): string[] {
-  if (!isStringLiteralArray(array)) {
+export function unwrapStringLiteralArray(
+    array: NodePath<t.Expression>,
+    fs: FileSystem = getFileSystem()): [string[], (ɵSourceLocation | undefined)[]] {
+  if (!isStringLiteralArray(array.node)) {
     throw new BabelParseError(
-        array, 'Unexpected messageParts for `$localize` (expected an array of strings).');
+        array.node, 'Unexpected messageParts for `$localize` (expected an array of strings).');
   }
-  return array.elements.map((str: t.StringLiteral) => str.value);
+  const elements = array.get('elements') as NodePath<t.StringLiteral>[];
+  return [elements.map(str => str.node.value), elements.map(str => getLocation(fs, str))];
 }
 
 /**
@@ -295,8 +345,8 @@ export function isStringLiteralArray(node: t.Node): node is t.Expression&
  * Are all the given `nodes` expressions?
  * @param nodes The nodes to test.
  */
-export function isArrayOfExpressions(nodes: t.Node[]): nodes is t.Expression[] {
-  return nodes.every(element => t.isExpression(element));
+export function isArrayOfExpressions(paths: NodePath<t.Node>[]): paths is NodePath<t.Expression>[] {
+  return paths.every(element => element.isExpression());
 }
 
 /** Options that affect how the `makeEsXXXTranslatePlugin()` functions work. */
@@ -309,6 +359,7 @@ export interface TranslatePluginOptions {
  * Translate the text of the given message, using the given translations.
  *
  * Logs as warning if the translation is not available
+ * @publicApi used by CLI
  */
 export function translate(
     diagnostics: Diagnostics, translations: Record<string, ɵParsedTranslation>,
@@ -348,20 +399,22 @@ export function buildCodeFrameError(path: NodePath, e: BabelParseError): string
   return `${filename}: ${message}`;
 }
 
-export function getLocation(startPath: NodePath, endPath?: NodePath): ɵSourceLocation|undefined {
+export function getLocation(
+    fs: FileSystem, startPath: NodePath, endPath?: NodePath): ɵSourceLocation|undefined {
   const startLocation = startPath.node.loc;
-  const file = getFileFromPath(startPath);
+  const file = getFileFromPath(fs, startPath);
   if (!startLocation || !file) {
     return undefined;
   }
 
   const endLocation =
-      endPath && getFileFromPath(endPath) === file && endPath.node.loc || startLocation;
+      endPath && getFileFromPath(fs, endPath) === file && endPath.node.loc || startLocation;
 
   return {
     start: getLineAndColumn(startLocation.start),
     end: getLineAndColumn(endLocation.end),
-    file
+    file,
+    text: getText(startPath),
   };
 }
 
@@ -372,10 +425,10 @@ export function serializeLocationPosition(location: ɵSourceLocation): string {
   return `${location.start.line + 1}${endLineString}`;
 }
 
-function getFileFromPath(path: NodePath|undefined): AbsoluteFsPath|null {
+function getFileFromPath(fs: FileSystem, path: NodePath|undefined): AbsoluteFsPath|null {
   const opts = path?.hub.file.opts;
   return opts?.filename ?
-      resolve(opts.generatorOpts.sourceRoot, relative(opts.cwd, opts.filename)) :
+      fs.resolve(opts.generatorOpts.sourceRoot ?? opts.cwd, fs.relative(opts.cwd, opts.filename)) :
       null;
 }
 
@@ -383,3 +436,10 @@ function getLineAndColumn(loc: {line: number, column: number}): {line: number, c
   // Note we want 0-based line numbers but Babel returns 1-based.
   return {line: loc.line - 1, column: loc.column};
 }
+
+function getText(path: NodePath): string|undefined {
+  if (path.node.start === null || path.node.end === null) {
+    return undefined;
+  }
+  return path.hub.file.code.substring(path.node.start, path.node.end);
+}
diff --git a/packages/localize/src/tools/src/translate/asset_files/asset_translation_handler.ts b/packages/localize/src/tools/src/translate/asset_files/asset_translation_handler.ts
index 97ae7ba8a6e2c..3b0ddeec70a08 100644
--- a/packages/localize/src/tools/src/translate/asset_files/asset_translation_handler.ts
+++ b/packages/localize/src/tools/src/translate/asset_files/asset_translation_handler.ts
@@ -17,14 +17,14 @@ import {TranslationBundle, TranslationHandler} from '../translator';
 export class AssetTranslationHandler implements TranslationHandler {
   constructor(private fs: FileSystem) {}
 
-  canTranslate(_relativeFilePath: PathSegment|AbsoluteFsPath, _contents: Buffer): boolean {
+  canTranslate(_relativeFilePath: PathSegment|AbsoluteFsPath, _contents: Uint8Array): boolean {
     return true;
   }
 
   translate(
       diagnostics: Diagnostics, _sourceRoot: AbsoluteFsPath,
-      relativeFilePath: PathSegment|AbsoluteFsPath, contents: Buffer, outputPathFn: OutputPathFn,
-      translations: TranslationBundle[], sourceLocale?: string): void {
+      relativeFilePath: PathSegment|AbsoluteFsPath, contents: Uint8Array,
+      outputPathFn: OutputPathFn, translations: TranslationBundle[], sourceLocale?: string): void {
     for (const translation of translations) {
       this.writeAssetFile(
           diagnostics, outputPathFn, translation.locale, relativeFilePath, contents);
@@ -36,7 +36,7 @@ export class AssetTranslationHandler implements TranslationHandler {
 
   private writeAssetFile(
       diagnostics: Diagnostics, outputPathFn: OutputPathFn, locale: string,
-      relativeFilePath: PathSegment|AbsoluteFsPath, contents: Buffer): void {
+      relativeFilePath: PathSegment|AbsoluteFsPath, contents: Uint8Array): void {
     try {
       const outputPath = absoluteFrom(outputPathFn(locale, relativeFilePath));
       this.fs.ensureDir(this.fs.dirname(outputPath));
diff --git a/packages/localize/src/tools/src/translate/main.ts b/packages/localize/src/tools/src/translate/main.ts
index 8db12dc24f66e..590d00822f726 100644
--- a/packages/localize/src/tools/src/translate/main.ts
+++ b/packages/localize/src/tools/src/translate/main.ts
@@ -30,18 +30,21 @@ if (require.main === module) {
             required: true,
             describe:
                 'The root path of the files to translate, either absolute or relative to the current working directory. E.g. `dist/en`.',
+            type: 'string',
           })
           .option('s', {
             alias: 'source',
             required: true,
             describe:
                 'A glob pattern indicating what files to translate, relative to the `root` path. E.g. `bundles/**/*`.',
+            type: 'string',
           })
 
           .option('l', {
             alias: 'source-locale',
             describe:
                 'The source locale of the application. If this is provided then a copy of the application will be created with no translation but just the `$localize` calls stripped out.',
+            type: 'string',
           })
 
           .option('t', {
@@ -54,6 +57,7 @@ if (require.main === module) {
                 'If you want to merge multiple translation files for each locale, then provide the list of files in an array.\n' +
                 'Note that the arrays must be in double quotes if you include any whitespace within the array.\n' +
                 'E.g. `-t "[src/locale/messages.en.xlf, src/locale/messages-2.en.xlf]" [src/locale/messages.fr.xlf,src/locale/messages-2.fr.xlf]`',
+            type: 'string',
           })
 
           .option('target-locales', {
@@ -61,6 +65,7 @@ if (require.main === module) {
             describe:
                 'A list of target locales for the translation files, which will override any target locale parsed from the translation file.\n' +
                 'E.g. "-t en fr de".',
+            type: 'string',
           })
 
           .option('o', {
@@ -68,7 +73,8 @@ if (require.main === module) {
             required: true,
             describe: 'A output path pattern to where the translated files will be written.\n' +
                 'The path must be either absolute or relative to the current working directory.\n' +
-                'The marker `{{LOCALE}}` will be replaced with the target locale. E.g. `dist/{{LOCALE}}`.'
+                'The marker `{{LOCALE}}` will be replaced with the target locale. E.g. `dist/{{LOCALE}}`.',
+            type: 'string',
           })
 
           .option('m', {
@@ -76,6 +82,7 @@ if (require.main === module) {
             describe: 'How to handle missing translations.',
             choices: ['error', 'warning', 'ignore'],
             default: 'warning',
+            type: 'string',
           })
 
           .option('d', {
@@ -83,6 +90,7 @@ if (require.main === module) {
             describe: 'How to handle duplicate translations.',
             choices: ['error', 'warning', 'ignore'],
             default: 'warning',
+            type: 'string',
           })
 
           .strict()
@@ -92,14 +100,14 @@ if (require.main === module) {
   const fs = new NodeJSFileSystem();
   setFileSystem(fs);
 
-  const sourceRootPath = options['r'];
-  const sourceFilePaths = glob.sync(options['s'], {cwd: sourceRootPath, nodir: true});
-  const translationFilePaths: (string|string[])[] = convertArraysFromArgs(options['t']);
-  const outputPathFn = getOutputPathFn(fs.resolve(options['o']));
+  const sourceRootPath = options.r;
+  const sourceFilePaths = glob.sync(options.s, {cwd: sourceRootPath, nodir: true});
+  const translationFilePaths: (string|string[])[] = convertArraysFromArgs(options.t);
+  const outputPathFn = getOutputPathFn(fs.resolve(options.o));
   const diagnostics = new Diagnostics();
-  const missingTranslation: DiagnosticHandlingStrategy = options['m'];
-  const duplicateTranslation: DiagnosticHandlingStrategy = options['d'];
-  const sourceLocale: string|undefined = options['l'];
+  const missingTranslation = options.m as DiagnosticHandlingStrategy;
+  const duplicateTranslation = options.d as DiagnosticHandlingStrategy;
+  const sourceLocale: string|undefined = options.l;
   const translationFileLocales: string[] = options['target-locales'] || [];
 
   translateFiles({
diff --git a/packages/localize/src/tools/src/translate/source_files/es2015_translate_plugin.ts b/packages/localize/src/tools/src/translate/source_files/es2015_translate_plugin.ts
index 5b643fceb59fe..f2b351f88c8de 100644
--- a/packages/localize/src/tools/src/translate/source_files/es2015_translate_plugin.ts
+++ b/packages/localize/src/tools/src/translate/source_files/es2015_translate_plugin.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 {FileSystem, getFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system';
 import {ɵParsedTranslation} from '@angular/localize';
 import {NodePath, PluginObj} from '@babel/core';
 import {TaggedTemplateExpression} from '@babel/types';
@@ -13,17 +14,24 @@ import {Diagnostics} from '../../diagnostics';
 
 import {buildCodeFrameError, buildLocalizeReplacement, isBabelParseError, isLocalize, translate, TranslatePluginOptions, unwrapMessagePartsFromTemplateLiteral} from '../../source_file_utils';
 
+/**
+ * Create a Babel plugin that can be used to do compile-time translation of `$localize` tagged
+ * messages.
+ *
+ * @publicApi used by CLI
+ */
 export function makeEs2015TranslatePlugin(
     diagnostics: Diagnostics, translations: Record<string, ɵParsedTranslation>,
-    {missingTranslation = 'error', localizeName = '$localize'}: TranslatePluginOptions = {}):
-    PluginObj {
+    {missingTranslation = 'error', localizeName = '$localize'}: TranslatePluginOptions = {},
+    fs: FileSystem = getFileSystem()): PluginObj {
   return {
     visitor: {
       TaggedTemplateExpression(path: NodePath<TaggedTemplateExpression>) {
         try {
           const tag = path.get('tag');
           if (isLocalize(tag, localizeName)) {
-            const messageParts = unwrapMessagePartsFromTemplateLiteral(path.node.quasi.quasis);
+            const [messageParts] =
+                unwrapMessagePartsFromTemplateLiteral(path.get('quasi').get('quasis'), fs);
             const translated = translate(
                 diagnostics, translations, messageParts, path.node.quasi.expressions,
                 missingTranslation);
@@ -35,6 +43,8 @@ export function makeEs2015TranslatePlugin(
             // since there must be something wrong with the structure of the AST generated
             // by Babel parsing a TaggedTemplateExpression.
             throw buildCodeFrameError(path, e);
+          } else {
+            throw e;
           }
         }
       }
diff --git a/packages/localize/src/tools/src/translate/source_files/es5_translate_plugin.ts b/packages/localize/src/tools/src/translate/source_files/es5_translate_plugin.ts
index e73aa40b437de..33a7066192fc5 100644
--- a/packages/localize/src/tools/src/translate/source_files/es5_translate_plugin.ts
+++ b/packages/localize/src/tools/src/translate/source_files/es5_translate_plugin.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 {FileSystem, getFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system';
 import {ɵParsedTranslation} from '@angular/localize';
 import {NodePath, PluginObj} from '@babel/core';
 import {CallExpression} from '@babel/types';
@@ -13,18 +14,24 @@ import {Diagnostics} from '../../diagnostics';
 
 import {buildCodeFrameError, buildLocalizeReplacement, isBabelParseError, isLocalize, translate, TranslatePluginOptions, unwrapMessagePartsFromLocalizeCall, unwrapSubstitutionsFromLocalizeCall} from '../../source_file_utils';
 
+/**
+ * Create a Babel plugin that can be used to do compile-time translation of `$localize` tagged
+ * messages.
+ *
+ * @publicApi used by CLI
+ */
 export function makeEs5TranslatePlugin(
     diagnostics: Diagnostics, translations: Record<string, ɵParsedTranslation>,
-    {missingTranslation = 'error', localizeName = '$localize'}: TranslatePluginOptions = {}):
-    PluginObj {
+    {missingTranslation = 'error', localizeName = '$localize'}: TranslatePluginOptions = {},
+    fs: FileSystem = getFileSystem()): PluginObj {
   return {
     visitor: {
       CallExpression(callPath: NodePath<CallExpression>) {
         try {
           const calleePath = callPath.get('callee');
           if (isLocalize(calleePath, localizeName)) {
-            const messageParts = unwrapMessagePartsFromLocalizeCall(callPath);
-            const expressions = unwrapSubstitutionsFromLocalizeCall(callPath.node);
+            const [messageParts] = unwrapMessagePartsFromLocalizeCall(callPath, fs);
+            const [expressions] = unwrapSubstitutionsFromLocalizeCall(callPath, fs);
             const translated =
                 translate(diagnostics, translations, messageParts, expressions, missingTranslation);
             callPath.replaceWith(buildLocalizeReplacement(translated[0], translated[1]));
@@ -32,6 +39,8 @@ export function makeEs5TranslatePlugin(
         } catch (e) {
           if (isBabelParseError(e)) {
             diagnostics.error(buildCodeFrameError(callPath, e));
+          } else {
+            throw e;
           }
         }
       }
diff --git a/packages/localize/src/tools/src/translate/source_files/locale_plugin.ts b/packages/localize/src/tools/src/translate/source_files/locale_plugin.ts
index 096e4a5b09774..ed695837a9f94 100644
--- a/packages/localize/src/tools/src/translate/source_files/locale_plugin.ts
+++ b/packages/localize/src/tools/src/translate/source_files/locale_plugin.ts
@@ -21,6 +21,7 @@ import {isLocalize, TranslatePluginOptions} from '../../source_file_utils';
  *
  * @param locale The name of the locale to inline into the code.
  * @param options Additional options including the name of the `$localize` function.
+ * @publicApi used by CLI
  */
 export function makeLocalePlugin(
     locale: string, {localizeName = '$localize'}: TranslatePluginOptions = {}): PluginObj {
diff --git a/packages/localize/src/tools/src/translate/source_files/source_file_translation_handler.ts b/packages/localize/src/tools/src/translate/source_files/source_file_translation_handler.ts
index 4d1e6cc763fb3..c3d69b420673f 100644
--- a/packages/localize/src/tools/src/translate/source_files/source_file_translation_handler.ts
+++ b/packages/localize/src/tools/src/translate/source_files/source_file_translation_handler.ts
@@ -27,15 +27,15 @@ export class SourceFileTranslationHandler implements TranslationHandler {
       TranslatePluginOptions = {...this.translationOptions, missingTranslation: 'ignore'};
   constructor(private fs: FileSystem, private translationOptions: TranslatePluginOptions = {}) {}
 
-  canTranslate(relativeFilePath: PathSegment|AbsoluteFsPath, _contents: Buffer): boolean {
+  canTranslate(relativeFilePath: PathSegment|AbsoluteFsPath, _contents: Uint8Array): boolean {
     return this.fs.extname(relativeFilePath) === '.js';
   }
 
   translate(
       diagnostics: Diagnostics, sourceRoot: AbsoluteFsPath, relativeFilePath: PathSegment,
-      contents: Buffer, outputPathFn: OutputPathFn, translations: TranslationBundle[],
+      contents: Uint8Array, outputPathFn: OutputPathFn, translations: TranslationBundle[],
       sourceLocale?: string): void {
-    const sourceCode = contents.toString('utf8');
+    const sourceCode = Buffer.from(contents).toString('utf8');
     // A short-circuit check to avoid parsing the file into an AST if it does not contain any
     // `$localize` identifiers.
     if (!sourceCode.includes('$localize')) {
@@ -78,8 +78,8 @@ export class SourceFileTranslationHandler implements TranslationHandler {
       generatorOpts: {minified: true},
       plugins: [
         makeLocalePlugin(translationBundle.locale),
-        makeEs2015TranslatePlugin(diagnostics, translationBundle.translations, options),
-        makeEs5TranslatePlugin(diagnostics, translationBundle.translations, options),
+        makeEs2015TranslatePlugin(diagnostics, translationBundle.translations, options, this.fs),
+        makeEs5TranslatePlugin(diagnostics, translationBundle.translations, options, this.fs),
       ],
       filename,
     });
@@ -97,7 +97,7 @@ export class SourceFileTranslationHandler implements TranslationHandler {
 
   private writeSourceFile(
       diagnostics: Diagnostics, outputPathFn: OutputPathFn, locale: string,
-      relativeFilePath: PathSegment, contents: string|Buffer): void {
+      relativeFilePath: PathSegment, contents: string|Uint8Array): void {
     try {
       const outputPath = absoluteFrom(outputPathFn(locale, relativeFilePath));
       this.fs.ensureDir(this.fs.dirname(outputPath));
diff --git a/packages/localize/src/tools/src/translate/translation_files/message_serialization/message_serializer.ts b/packages/localize/src/tools/src/translate/translation_files/message_serialization/message_serializer.ts
index ea9cdefacc48e..af0fd9c3a75e9 100644
--- a/packages/localize/src/tools/src/translate/translation_files/message_serialization/message_serializer.ts
+++ b/packages/localize/src/tools/src/translate/translation_files/message_serialization/message_serializer.ts
@@ -13,7 +13,7 @@ import {getAttribute, getAttrOrThrow} from '../translation_parsers/translation_u
 
 import {MessageRenderer} from './message_renderer';
 
-interface MessageSerializerConfig {
+export interface MessageSerializerConfig {
   inlineElements: string[];
   placeholder?: {elementName: string; nameAttribute: string; bodyAttribute?: string;};
   placeholderContainer?: {elementName: string; startAttribute: string; endAttribute: string;};
@@ -75,29 +75,9 @@ export class MessageSerializer<T> extends BaseVisitor {
   }
 
   visitContainedNodes(nodes: Node[]): void {
-    const length = nodes.length;
-    let index = 0;
-    while (index < length) {
-      if (!this.isPlaceholderContainer(nodes[index])) {
-        const startOfContainedNodes = index;
-        while (index < length - 1) {
-          index++;
-          if (this.isPlaceholderContainer(nodes[index])) {
-            break;
-          }
-        }
-        if (index - startOfContainedNodes > 1) {
-          // Only create a container if there are two or more contained Nodes in a row
-          this.renderer.startContainer();
-          visitAll(this, nodes.slice(startOfContainedNodes, index - 1));
-          this.renderer.closeContainer();
-        }
-      }
-      if (index < length) {
-        nodes[index].visit(this, undefined);
-      }
-      index++;
-    }
+    this.renderer.startContainer();
+    visitAll(this, nodes);
+    this.renderer.closeContainer();
   }
 
   visitPlaceholder(name: string, body: string|undefined): void {
diff --git a/packages/localize/src/tools/src/translate/translation_files/translation_parsers/serialize_translation_message.ts b/packages/localize/src/tools/src/translate/translation_files/translation_parsers/serialize_translation_message.ts
new file mode 100644
index 0000000000000..df247b1801fd2
--- /dev/null
+++ b/packages/localize/src/tools/src/translate/translation_files/translation_parsers/serialize_translation_message.ts
@@ -0,0 +1,32 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Element, ParseError} from '@angular/compiler';
+import {ɵParsedTranslation} from '@angular/localize';
+
+import {MessageSerializer, MessageSerializerConfig} from '../message_serialization/message_serializer';
+import {TargetMessageRenderer} from '../message_serialization/target_message_renderer';
+
+import {parseInnerRange} from './translation_utils';
+
+/**
+ * Serialize the given `element` into a parsed translation using the given `serializer`.
+ */
+export function serializeTranslationMessage(element: Element, config: MessageSerializerConfig): {
+  translation: ɵParsedTranslation|null,
+  parseErrors: ParseError[],
+  serializeErrors: ParseError[]
+} {
+  const {rootNodes, errors: parseErrors} = parseInnerRange(element);
+  try {
+    const serializer = new MessageSerializer(new TargetMessageRenderer(), config);
+    const translation = serializer.serialize(rootNodes);
+    return {translation, parseErrors, serializeErrors: []};
+  } catch (e) {
+    return {translation: null, parseErrors, serializeErrors: [e]};
+  }
+}
diff --git a/packages/localize/src/tools/src/translate/translation_files/translation_parsers/simple_json_translation_parser.ts b/packages/localize/src/tools/src/translate/translation_files/translation_parsers/simple_json_translation_parser.ts
index 2ee09b5fac23d..92cd6f1072559 100644
--- a/packages/localize/src/tools/src/translate/translation_files/translation_parsers/simple_json_translation_parser.ts
+++ b/packages/localize/src/tools/src/translate/translation_files/translation_parsers/simple_json_translation_parser.ts
@@ -25,6 +25,7 @@ import {ParseAnalysis, ParsedTranslationBundle, TranslationParser} from './trans
  * ```
  *
  * @see SimpleJsonTranslationSerializer
+ * @publicApi used by CLI
  */
 export class SimpleJsonTranslationParser implements TranslationParser<Object> {
   /**
diff --git a/packages/localize/src/tools/src/translate/translation_files/translation_parsers/translation_parse_error.ts b/packages/localize/src/tools/src/translate/translation_files/translation_parsers/translation_parse_error.ts
index 5074335dabfdc..7fc6adfc67d22 100644
--- a/packages/localize/src/tools/src/translate/translation_files/translation_parsers/translation_parse_error.ts
+++ b/packages/localize/src/tools/src/translate/translation_files/translation_parsers/translation_parse_error.ts
@@ -14,17 +14,15 @@ export class TranslationParseError extends Error {
   constructor(
       public span: ParseSourceSpan, public msg: string,
       public level: ParseErrorLevel = ParseErrorLevel.ERROR) {
-    super(msg);
-  }
-
-  contextualMessage(): string {
-    const ctx = this.span.start.getContext(100, 3);
-    return ctx ? `${this.msg} ("${ctx.before}[${ParseErrorLevel[this.level]} ->]${ctx.after}")` :
-                 this.msg;
+    super(contextualMessage(span, msg, level));
   }
+}
 
-  toString(): string {
-    const details = this.span.details ? `, ${this.span.details}` : '';
-    return `${this.contextualMessage()}: ${this.span.start}${details}`;
+function contextualMessage(span: ParseSourceSpan, msg: string, level: ParseErrorLevel): string {
+  const ctx = span.start.getContext(100, 2);
+  msg += `\nAt ${span.start}${span.details ? `, ${span.details}` : ''}:\n`;
+  if (ctx) {
+    msg += `...${ctx.before}[${ParseErrorLevel[level]} ->]${ctx.after}...\n`;
   }
+  return msg;
 }
diff --git a/packages/localize/src/tools/src/translate/translation_files/translation_parsers/translation_utils.ts b/packages/localize/src/tools/src/translate/translation_files/translation_parsers/translation_utils.ts
index e45738740fc13..c310da8459a7d 100644
--- a/packages/localize/src/tools/src/translate/translation_files/translation_parsers/translation_utils.ts
+++ b/packages/localize/src/tools/src/translate/translation_files/translation_parsers/translation_utils.ts
@@ -5,10 +5,12 @@
  * 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 {Element, LexerRange, Node, ParseError, ParseErrorLevel, ParseSourceSpan, XmlParser} from '@angular/compiler';
+import {Element, LexerRange, Node, ParseError, ParseErrorLevel, ParseSourceSpan, ParseTreeResult, XmlParser} from '@angular/compiler';
+
 import {Diagnostics} from '../../../diagnostics';
+
 import {TranslationParseError} from './translation_parse_error';
-import {ParseAnalysis} from './translation_parser';
+import {ParseAnalysis, ParsedTranslationBundle} from './translation_parser';
 
 export function getAttrOrThrow(element: Element, attrName: string): string {
   const attrValue = getAttribute(element, attrName);
@@ -30,17 +32,15 @@ export function getAttribute(element: Element, attrName: string): string|undefin
  * This would be equivalent to parsing the `innerHTML` string of an HTML document.
  *
  * @param element The element whose inner range we want to parse.
- * @returns a collection of XML `Node` objects that were parsed from the element's contents.
+ * @returns a collection of XML `Node` objects and any errors that were parsed from the element's
+ *     contents.
  */
-export function parseInnerRange(element: Element): Node[] {
+export function parseInnerRange(element: Element): ParseTreeResult {
   const xmlParser = new XmlParser();
   const xml = xmlParser.parse(
       element.sourceSpan.start.file.content, element.sourceSpan.start.file.url,
       {tokenizeExpansionForms: true, range: getInnerRange(element)});
-  if (xml.errors.length) {
-    throw xml.errors.map(e => new TranslationParseError(e.span, e.msg).toString()).join('\n');
-  }
-  return xml.rootNodes;
+  return xml;
 }
 
 /**
@@ -48,7 +48,7 @@ export function parseInnerRange(element: Element): Node[] {
  * @param element The element whose inner range we want to compute.
  */
 function getInnerRange(element: Element): LexerRange {
-  const start = element.startSourceSpan!.end;
+  const start = element.startSourceSpan.end;
   const end = element.endSourceSpan!.start;
   return {
     startPos: start.offset,
@@ -155,3 +155,12 @@ export function addParseError(diagnostics: Diagnostics, parseError: ParseError):
     diagnostics.warn(parseError.toString());
   }
 }
+
+/**
+ * Add the provided `errors` to the `bundle` diagnostics.
+ */
+export function addErrorsToBundle(bundle: ParsedTranslationBundle, errors: ParseError[]): void {
+  for (const error of errors) {
+    addParseError(bundle.diagnostics, error);
+  }
+}
diff --git a/packages/localize/src/tools/src/translate/translation_files/translation_parsers/xliff1_translation_parser.ts b/packages/localize/src/tools/src/translate/translation_files/translation_parsers/xliff1_translation_parser.ts
index 0f0636b10e1ed..53ba0f2f25e51 100644
--- a/packages/localize/src/tools/src/translate/translation_files/translation_parsers/xliff1_translation_parser.ts
+++ b/packages/localize/src/tools/src/translate/translation_files/translation_parsers/xliff1_translation_parser.ts
@@ -6,15 +6,13 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import {Element, ParseErrorLevel, visitAll} from '@angular/compiler';
-import {ɵParsedTranslation} from '@angular/localize';
 
 import {Diagnostics} from '../../../diagnostics';
 import {BaseVisitor} from '../base_visitor';
-import {MessageSerializer} from '../message_serialization/message_serializer';
-import {TargetMessageRenderer} from '../message_serialization/target_message_renderer';
 
+import {serializeTranslationMessage} from './serialize_translation_message';
 import {ParseAnalysis, ParsedTranslationBundle, TranslationParser} from './translation_parser';
-import {addParseDiagnostic, addParseError, canParseXml, getAttribute, isNamedElement, parseInnerRange, XmlTranslationParserHint} from './translation_utils';
+import {addErrorsToBundle, addParseDiagnostic, addParseError, canParseXml, getAttribute, isNamedElement, XmlTranslationParserHint} from './translation_utils';
 
 /**
  * A translation parser that can load XLIFF 1.2 files.
@@ -23,6 +21,7 @@ import {addParseDiagnostic, addParseError, canParseXml, getAttribute, isNamedEle
  * http://docs.oasis-open.org/xliff/v1.2/xliff-profile-html/xliff-profile-html-1.2.html
  *
  * @see Xliff1TranslationSerializer
+ * @publicApi used by CLI
  */
 export class Xliff1TranslationParser implements TranslationParser<XmlTranslationParserHint> {
   /**
@@ -150,23 +149,14 @@ class XliffTranslationVisitor extends BaseVisitor {
       return;
     }
 
-    try {
-      bundle.translations[id] = serializeTargetMessage(targetMessage);
-    } catch (e) {
-      // Capture any errors from serialize the target message
-      if (e.span && e.msg && e.level) {
-        addParseDiagnostic(bundle.diagnostics, e.span, e.msg, e.level);
-      } else {
-        throw e;
-      }
+    const {translation, parseErrors, serializeErrors} = serializeTranslationMessage(targetMessage, {
+      inlineElements: ['g', 'bx', 'ex', 'bpt', 'ept', 'ph', 'it', 'mrk'],
+      placeholder: {elementName: 'x', nameAttribute: 'id'}
+    });
+    if (translation !== null) {
+      bundle.translations[id] = translation;
     }
+    addErrorsToBundle(bundle, parseErrors);
+    addErrorsToBundle(bundle, serializeErrors);
   }
 }
-
-function serializeTargetMessage(source: Element): ɵParsedTranslation {
-  const serializer = new MessageSerializer(new TargetMessageRenderer(), {
-    inlineElements: ['g', 'bx', 'ex', 'bpt', 'ept', 'ph', 'it', 'mrk'],
-    placeholder: {elementName: 'x', nameAttribute: 'id'}
-  });
-  return serializer.serialize(parseInnerRange(source));
-}
diff --git a/packages/localize/src/tools/src/translate/translation_files/translation_parsers/xliff2_translation_parser.ts b/packages/localize/src/tools/src/translate/translation_files/translation_parsers/xliff2_translation_parser.ts
index 5304665cde804..3880c8e57c13a 100644
--- a/packages/localize/src/tools/src/translate/translation_files/translation_parsers/xliff2_translation_parser.ts
+++ b/packages/localize/src/tools/src/translate/translation_files/translation_parsers/xliff2_translation_parser.ts
@@ -6,15 +6,13 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import {Element, Node, ParseErrorLevel, visitAll} from '@angular/compiler';
-import {ɵParsedTranslation} from '@angular/localize';
 
 import {Diagnostics} from '../../../diagnostics';
 import {BaseVisitor} from '../base_visitor';
-import {MessageSerializer} from '../message_serialization/message_serializer';
-import {TargetMessageRenderer} from '../message_serialization/target_message_renderer';
 
+import {serializeTranslationMessage} from './serialize_translation_message';
 import {ParseAnalysis, ParsedTranslationBundle, TranslationParser} from './translation_parser';
-import {addParseDiagnostic, addParseError, canParseXml, getAttribute, isNamedElement, parseInnerRange, XmlTranslationParserHint} from './translation_utils';
+import {addErrorsToBundle, addParseDiagnostic, addParseError, canParseXml, getAttribute, isNamedElement, XmlTranslationParserHint} from './translation_utils';
 
 /**
  * A translation parser that can load translations from XLIFF 2 files.
@@ -22,6 +20,7 @@ import {addParseDiagnostic, addParseError, canParseXml, getAttribute, isNamedEle
  * http://docs.oasis-open.org/xliff/xliff-core/v2.0/os/xliff-core-v2.0-os.html
  *
  * @see Xliff2TranslationSerializer
+ * @publicApi used by CLI
  */
 export class Xliff2TranslationParser implements TranslationParser<XmlTranslationParserHint> {
   /**
@@ -141,29 +140,20 @@ class Xliff2TranslationVisitor extends BaseVisitor {
       return;
     }
 
-    try {
-      bundle.translations[unit] = serializeTargetMessage(targetMessage);
-    } catch (e) {
-      // Capture any errors from serialize the target message
-      if (e.span && e.msg && e.level) {
-        addParseDiagnostic(bundle.diagnostics, e.span, e.msg, e.level);
-      } else {
-        throw e;
-      }
+    const {translation, parseErrors, serializeErrors} = serializeTranslationMessage(targetMessage, {
+      inlineElements: ['cp', 'sc', 'ec', 'mrk', 'sm', 'em'],
+      placeholder: {elementName: 'ph', nameAttribute: 'equiv', bodyAttribute: 'disp'},
+      placeholderContainer:
+          {elementName: 'pc', startAttribute: 'equivStart', endAttribute: 'equivEnd'}
+    });
+    if (translation !== null) {
+      bundle.translations[unit] = translation;
     }
+    addErrorsToBundle(bundle, parseErrors);
+    addErrorsToBundle(bundle, serializeErrors);
   }
 }
 
-function serializeTargetMessage(source: Element): ɵParsedTranslation {
-  const serializer = new MessageSerializer(new TargetMessageRenderer(), {
-    inlineElements: ['cp', 'sc', 'ec', 'mrk', 'sm', 'em'],
-    placeholder: {elementName: 'ph', nameAttribute: 'equiv', bodyAttribute: 'disp'},
-    placeholderContainer:
-        {elementName: 'pc', startAttribute: 'equivStart', endAttribute: 'equivEnd'}
-  });
-  return serializer.serialize(parseInnerRange(source));
-}
-
 function isFileElement(node: Node): node is Element {
   return node instanceof Element && node.name === 'file';
 }
diff --git a/packages/localize/src/tools/src/translate/translation_files/translation_parsers/xtb_translation_parser.ts b/packages/localize/src/tools/src/translate/translation_files/translation_parsers/xtb_translation_parser.ts
index e20260896eb8c..bb1370b62a5f1 100644
--- a/packages/localize/src/tools/src/translate/translation_files/translation_parsers/xtb_translation_parser.ts
+++ b/packages/localize/src/tools/src/translate/translation_files/translation_parsers/xtb_translation_parser.ts
@@ -5,17 +5,15 @@
  * 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 {Element, ParseErrorLevel, visitAll} from '@angular/compiler';
-import {ɵParsedTranslation} from '@angular/localize';
+import {Element, ParseError, ParseErrorLevel, visitAll} from '@angular/compiler';
 import {extname} from 'path';
 
 import {Diagnostics} from '../../../diagnostics';
 import {BaseVisitor} from '../base_visitor';
-import {MessageSerializer} from '../message_serialization/message_serializer';
-import {TargetMessageRenderer} from '../message_serialization/target_message_renderer';
 
+import {serializeTranslationMessage} from './serialize_translation_message';
 import {ParseAnalysis, ParsedTranslationBundle, TranslationParser} from './translation_parser';
-import {addParseDiagnostic, addParseError, canParseXml, getAttribute, parseInnerRange, XmlTranslationParserHint} from './translation_utils';
+import {addErrorsToBundle, addParseDiagnostic, addParseError, canParseXml, getAttribute, XmlTranslationParserHint} from './translation_utils';
 
 
 /**
@@ -24,6 +22,7 @@ import {addParseDiagnostic, addParseError, canParseXml, getAttribute, parseInner
  * http://cldr.unicode.org/development/development-process/design-proposals/xmb
  *
  * @see XmbTranslationSerializer
+ * @publicApi used by CLI
  */
 export class XtbTranslationParser implements TranslationParser<XmlTranslationParserHint> {
   /**
@@ -103,20 +102,17 @@ class XtbVisitor extends BaseVisitor {
           return;
         }
 
-        try {
-          bundle.translations[id] = serializeTargetMessage(element);
-        } catch (error) {
-          if (typeof error === 'string') {
-            bundle.diagnostics.warn(
-                `Could not parse message with id "${
-                    id}" - perhaps it has an unrecognised ICU format?\n` +
-                error);
-          } else if (error.span && error.msg && error.level) {
-            addParseDiagnostic(bundle.diagnostics, error.span, error.msg, error.level);
-          } else {
-            throw error;
-          }
+        const {translation, parseErrors, serializeErrors} = serializeTranslationMessage(
+            element, {inlineElements: [], placeholder: {elementName: 'ph', nameAttribute: 'name'}});
+        if (parseErrors.length) {
+          // We only want to warn (not error) if there were problems parsing the translation for
+          // XTB formatted files. See https://github.com/angular/angular/issues/14046.
+          bundle.diagnostics.warn(computeParseWarning(id, parseErrors));
+        } else if (translation !== null) {
+          // Only store the translation if there were no parse errors
+          bundle.translations[id] = translation;
         }
+        addErrorsToBundle(bundle, serializeErrors);
         break;
 
       default:
@@ -127,9 +123,8 @@ class XtbVisitor extends BaseVisitor {
   }
 }
 
-function serializeTargetMessage(source: Element): ɵParsedTranslation {
-  const serializer = new MessageSerializer(
-      new TargetMessageRenderer(),
-      {inlineElements: [], placeholder: {elementName: 'ph', nameAttribute: 'name'}});
-  return serializer.serialize(parseInnerRange(source));
+function computeParseWarning(id: string, errors: ParseError[]): string {
+  const msg = errors.map(e => e.toString()).join('\n');
+  return `Could not parse message with id "${id}" - perhaps it has an unrecognised ICU format?\n` +
+      msg;
 }
diff --git a/packages/localize/src/tools/src/translate/translator.ts b/packages/localize/src/tools/src/translate/translator.ts
index a72e1d87bbc5c..6c1d1eb3d6107 100644
--- a/packages/localize/src/tools/src/translate/translator.ts
+++ b/packages/localize/src/tools/src/translate/translator.ts
@@ -35,7 +35,7 @@ export interface TranslationHandler {
    * @param relativeFilePath A relative path from the sourceRoot to the resource file to handle.
    * @param contents The contents of the file to handle.
    */
-  canTranslate(relativeFilePath: PathSegment|AbsoluteFsPath, contents: Buffer): boolean;
+  canTranslate(relativeFilePath: PathSegment|AbsoluteFsPath, contents: Uint8Array): boolean;
 
   /**
    * Translate the file at `relativeFilePath` containing `contents`, using the given `translations`,
@@ -54,8 +54,8 @@ export interface TranslationHandler {
    */
   translate(
       diagnostics: Diagnostics, sourceRoot: AbsoluteFsPath,
-      relativeFilePath: PathSegment|AbsoluteFsPath, contents: Buffer, outputPathFn: OutputPathFn,
-      translations: TranslationBundle[], sourceLocale?: string): void;
+      relativeFilePath: PathSegment|AbsoluteFsPath, contents: Uint8Array,
+      outputPathFn: OutputPathFn, translations: TranslationBundle[], sourceLocale?: string): void;
 }
 
 /**
diff --git a/packages/localize/src/tools/test/BUILD.bazel b/packages/localize/src/tools/test/BUILD.bazel
index c441be3b2ecb9..705826ea14bc8 100644
--- a/packages/localize/src/tools/test/BUILD.bazel
+++ b/packages/localize/src/tools/test/BUILD.bazel
@@ -6,6 +6,7 @@ ts_library(
     srcs = glob(
         ["**/*.ts"],
     ),
+    visibility = ["//packages/localize/src/tools/test:__subpackages__"],
     deps = [
         "//packages:types",
         "//packages/compiler",
diff --git a/packages/localize/src/tools/test/extract/extractor_spec.ts b/packages/localize/src/tools/test/extract/extractor_spec.ts
index 7c4c4d4f36d38..48d380915c24c 100644
--- a/packages/localize/src/tools/test/extract/extractor_spec.ts
+++ b/packages/localize/src/tools/test/extract/extractor_spec.ts
@@ -23,34 +23,168 @@ runInEachFileSystem(() => {
       fs.ensureDir(absoluteFrom('/root/path/relative'));
       fs.writeFile(file, [
         '$localize`:meaning|description:a${1}b${2}c`;',
-        '$localize(__makeTemplateObject(["a", ":custom-placeholder:b", "c"], ["a", ":custom-placeholder:b", "c"]), 1, 2);'
+        '$localize(__makeTemplateObject(["a", ":custom-placeholder:b", "c"], ["a", ":custom-placeholder:b", "c"]), 1, 2);',
+        '$localize`:@@custom-id:a${1}b${2}c`;',
       ].join('\n'));
       const messages = extractor.extractMessages(filename);
 
-      expect(messages.length).toEqual(2);
+      expect(messages.length).toEqual(3);
 
       expect(messages[0]).toEqual({
         id: '2714330828844000684',
+        customId: undefined,
         description: 'description',
         meaning: 'meaning',
         messageParts: ['a', 'b', 'c'],
+        messagePartLocations: [
+          {
+            start: {line: 0, column: 10},
+            end: {line: 0, column: 32},
+            file: absoluteFrom('/root/path/relative/path.js'),
+            text: ':meaning|description:a',
+          },
+          {
+            start: {line: 0, column: 36},
+            end: {line: 0, column: 37},
+            file: absoluteFrom('/root/path/relative/path.js'),
+            text: 'b',
+          },
+          {
+            start: {line: 0, column: 41},
+            end: {line: 0, column: 42},
+            file: absoluteFrom('/root/path/relative/path.js'),
+            text: 'c',
+          }
+        ],
         text: 'a{$PH}b{$PH_1}c',
         placeholderNames: ['PH', 'PH_1'],
         substitutions: jasmine.any(Object),
+        substitutionLocations: {
+          PH: {
+            start: {line: 0, column: 34},
+            end: {line: 0, column: 35},
+            file: absoluteFrom('/root/path/relative/path.js'),
+            text: '1'
+          },
+          PH_1: {
+            start: {line: 0, column: 39},
+            end: {line: 0, column: 40},
+            file: absoluteFrom('/root/path/relative/path.js'),
+            text: '2'
+          }
+        },
         legacyIds: [],
-        location: {start: {line: 0, column: 9}, end: {line: 0, column: 43}, file},
+        location: {
+          start: {line: 0, column: 9},
+          end: {line: 0, column: 43},
+          file,
+          text: '`:meaning|description:a${1}b${2}c`',
+        },
       });
 
       expect(messages[1]).toEqual({
         id: '5692770902395945649',
+        customId: undefined,
         description: '',
         meaning: '',
         messageParts: ['a', 'b', 'c'],
+        messagePartLocations: [
+          {
+            start: {line: 1, column: 69},
+            end: {line: 1, column: 72},
+            file: absoluteFrom('/root/path/relative/path.js'),
+            text: '"a"',
+          },
+          {
+            start: {line: 1, column: 74},
+            end: {line: 1, column: 97},
+            file: absoluteFrom('/root/path/relative/path.js'),
+            text: '":custom-placeholder:b"',
+          },
+          {
+            start: {line: 1, column: 99},
+            end: {line: 1, column: 102},
+            file: absoluteFrom('/root/path/relative/path.js'),
+            text: '"c"',
+          }
+        ],
         text: 'a{$custom-placeholder}b{$PH_1}c',
         placeholderNames: ['custom-placeholder', 'PH_1'],
         substitutions: jasmine.any(Object),
+        substitutionLocations: {
+          'custom-placeholder': {
+            start: {line: 1, column: 106},
+            end: {line: 1, column: 107},
+            file: absoluteFrom('/root/path/relative/path.js'),
+            text: '1'
+          },
+          PH_1: {
+            start: {line: 1, column: 109},
+            end: {line: 1, column: 110},
+            file: absoluteFrom('/root/path/relative/path.js'),
+            text: '2'
+          }
+        },
         legacyIds: [],
-        location: {start: {line: 1, column: 0}, end: {line: 1, column: 111}, file},
+        location: {
+          start: {line: 1, column: 10},
+          end: {line: 1, column: 107},
+          file,
+          text:
+              '__makeTemplateObject(["a", ":custom-placeholder:b", "c"], ["a", ":custom-placeholder:b", "c"])',
+        },
+      });
+
+      expect(messages[2]).toEqual({
+        id: 'custom-id',
+        customId: 'custom-id',
+        description: '',
+        meaning: '',
+        messageParts: ['a', 'b', 'c'],
+        text: 'a{$PH}b{$PH_1}c',
+        placeholderNames: ['PH', 'PH_1'],
+        substitutions: jasmine.any(Object),
+        substitutionLocations: {
+          PH: {
+            start: {line: 2, column: 26},
+            end: {line: 2, column: 27},
+            file: absoluteFrom('/root/path/relative/path.js'),
+            text: '1'
+          },
+          PH_1: {
+            start: {line: 2, column: 31},
+            end: {line: 2, column: 32},
+            file: absoluteFrom('/root/path/relative/path.js'),
+            text: '2'
+          }
+        },
+        messagePartLocations: [
+          {
+            start: {line: 2, column: 10},
+            end: {line: 2, column: 24},
+            file: absoluteFrom('/root/path/relative/path.js'),
+            text: ':@@custom-id:a'
+          },
+          {
+            start: {line: 2, column: 28},
+            end: {line: 2, column: 29},
+            file: absoluteFrom('/root/path/relative/path.js'),
+            text: 'b'
+          },
+          {
+            start: {line: 2, column: 33},
+            end: {line: 2, column: 34},
+            file: absoluteFrom('/root/path/relative/path.js'),
+            text: 'c'
+          }
+        ],
+        legacyIds: [],
+        location: {
+          start: {line: 2, column: 9},
+          end: {line: 2, column: 35},
+          file,
+          text: '`:@@custom-id:a${1}b${2}c`'
+        },
       });
     });
   });
diff --git a/packages/localize/src/tools/test/extract/integration/BUILD.bazel b/packages/localize/src/tools/test/extract/integration/BUILD.bazel
index bad294d09dacd..37d9fdc252412 100644
--- a/packages/localize/src/tools/test/extract/integration/BUILD.bazel
+++ b/packages/localize/src/tools/test/extract/integration/BUILD.bazel
@@ -14,6 +14,7 @@ ts_library(
         "//packages/compiler-cli/src/ngtsc/logging/testing",
         "//packages/compiler-cli/test/helpers",
         "//packages/localize/src/tools",
+        "//packages/localize/src/tools/test:test_lib",
     ],
 )
 
diff --git a/packages/localize/src/tools/test/extract/integration/main_spec.ts b/packages/localize/src/tools/test/extract/integration/main_spec.ts
index 7e5fd37fc6d06..797b455818102 100644
--- a/packages/localize/src/tools/test/extract/integration/main_spec.ts
+++ b/packages/localize/src/tools/test/extract/integration/main_spec.ts
@@ -5,12 +5,15 @@
  * 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 {absoluteFrom, AbsoluteFsPath, FileSystem, getFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system';
+import {absoluteFrom, AbsoluteFsPath, FileSystem, getFileSystem, setFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system';
+import {InvalidFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system/src/invalid_file_system';
 import {runInEachFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system/testing';
 import {MockLogger} from '@angular/compiler-cli/src/ngtsc/logging/testing';
 import {loadTestDirectory} from '@angular/compiler-cli/test/helpers';
 
 import {extractTranslations} from '../../../src/extract/main';
+import {FormatOptions} from '../../../src/extract/translation_files/format_options';
+import {toAttributes} from '../translation_files/utils';
 
 runInEachFileSystem(() => {
   let fs: FileSystem;
@@ -32,6 +35,7 @@ runInEachFileSystem(() => {
 
     fs.ensureDir(fs.dirname(sourceFilePath));
     loadTestDirectory(fs, __dirname + '/test_files', absoluteFrom('/project/test_files'));
+    setFileSystem(new InvalidFileSystem());
   });
 
   describe('extractTranslations()', () => {
@@ -46,6 +50,7 @@ runInEachFileSystem(() => {
         useSourceMaps: false,
         useLegacyIds: false,
         duplicateMessageHandling: 'ignore',
+        fileSystem: fs,
       });
       expect(fs.readFile(outputPath)).toEqual([
         `{`,
@@ -55,138 +60,237 @@ runInEachFileSystem(() => {
       ].join('\n'));
     });
 
-    it('should extract translations from source code, and write as JSON format', () => {
-      extractTranslations({
-        rootPath,
-        sourceLocale: 'en-GB',
-        sourceFilePaths: [sourceFilePath],
-        format: 'json',
-        outputPath,
-        logger,
-        useSourceMaps: false,
-        useLegacyIds: false,
-        duplicateMessageHandling: 'ignore',
-      });
-      expect(fs.readFile(outputPath)).toEqual([
-        `{`,
-        `  "locale": "en-GB",`,
-        `  "translations": {`,
-        `    "3291030485717846467": "Hello, {$PH}!",`,
-        `    "8669027859022295761": "try{$PH}me"`,
-        `  }`,
-        `}`,
-      ].join('\n'));
-    });
+    for (const useLegacyIds of [true, false]) {
+      describe(useLegacyIds ? '[using legacy ids]' : '', () => {
+        it('should extract translations from source code, and write as JSON format', () => {
+          extractTranslations({
+            rootPath,
+            sourceLocale: 'en-GB',
+            sourceFilePaths: [sourceFilePath],
+            format: 'json',
+            outputPath,
+            logger,
+            useSourceMaps: false,
+            useLegacyIds,
+            duplicateMessageHandling: 'ignore',
+            fileSystem: fs,
+          });
+          expect(fs.readFile(outputPath)).toEqual([
+            `{`,
+            `  "locale": "en-GB",`,
+            `  "translations": {`,
+            `    "3291030485717846467": "Hello, {$PH}!",`,
+            `    "8669027859022295761": "try{$PH}me",`,
+            `    "custom-id": "Custom id message",`,
+            `    "273296103957933077": "Legacy id message",`,
+            `    "custom-id-2": "Custom and legacy message",`,
+            `    "2932901491976224757": "pre{$START_TAG_SPAN}inner-pre{$START_BOLD_TEXT}bold{$CLOSE_BOLD_TEXT}inner-post{$CLOSE_TAG_SPAN}post"`,
+            `  }`,
+            `}`,
+          ].join('\n'));
+        });
 
-    it('should extract translations from source code, and write as xmb format', () => {
-      extractTranslations({
-        rootPath,
-        sourceLocale: 'en',
-        sourceFilePaths: [sourceFilePath],
-        format: 'xmb',
-        outputPath,
-        logger,
-        useSourceMaps: false,
-        useLegacyIds: false,
-        duplicateMessageHandling: 'ignore',
-      });
-      expect(fs.readFile(outputPath)).toEqual([
-        `<?xml version="1.0" encoding="UTF-8" ?>`,
-        `<!DOCTYPE messagebundle [`,
-        `<!ELEMENT messagebundle (msg)*>`,
-        `<!ATTLIST messagebundle class CDATA #IMPLIED>`,
-        ``,
-        `<!ELEMENT msg (#PCDATA|ph|source)*>`,
-        `<!ATTLIST msg id CDATA #IMPLIED>`,
-        `<!ATTLIST msg seq CDATA #IMPLIED>`,
-        `<!ATTLIST msg name CDATA #IMPLIED>`,
-        `<!ATTLIST msg desc CDATA #IMPLIED>`,
-        `<!ATTLIST msg meaning CDATA #IMPLIED>`,
-        `<!ATTLIST msg obsolete (obsolete) #IMPLIED>`,
-        `<!ATTLIST msg xml:space (default|preserve) "default">`,
-        `<!ATTLIST msg is_hidden CDATA #IMPLIED>`,
-        ``,
-        `<!ELEMENT source (#PCDATA)>`,
-        ``,
-        `<!ELEMENT ph (#PCDATA|ex)*>`,
-        `<!ATTLIST ph name CDATA #REQUIRED>`,
-        ``,
-        `<!ELEMENT ex (#PCDATA)>`,
-        `]>`,
-        `<messagebundle>`,
-        `  <msg id="3291030485717846467"><source>test_files/test.js:1</source>Hello, <ph name="PH"/>!</msg>`,
-        `  <msg id="8669027859022295761"><source>test_files/test.js:2</source>try<ph name="PH"/>me</msg>`,
-        `</messagebundle>\n`,
-      ].join('\n'));
-    });
+        it('should extract translations from source code, and write as xmb format', () => {
+          extractTranslations({
+            rootPath,
+            sourceLocale: 'en',
+            sourceFilePaths: [sourceFilePath],
+            format: 'xmb',
+            outputPath,
+            logger,
+            useSourceMaps: false,
+            useLegacyIds,
+            duplicateMessageHandling: 'ignore',
+            fileSystem: fs,
+          });
+          expect(fs.readFile(outputPath)).toEqual([
+            `<?xml version="1.0" encoding="UTF-8" ?>`,
+            `<!DOCTYPE messagebundle [`,
+            `<!ELEMENT messagebundle (msg)*>`,
+            `<!ATTLIST messagebundle class CDATA #IMPLIED>`,
+            ``,
+            `<!ELEMENT msg (#PCDATA|ph|source)*>`,
+            `<!ATTLIST msg id CDATA #IMPLIED>`,
+            `<!ATTLIST msg seq CDATA #IMPLIED>`,
+            `<!ATTLIST msg name CDATA #IMPLIED>`,
+            `<!ATTLIST msg desc CDATA #IMPLIED>`,
+            `<!ATTLIST msg meaning CDATA #IMPLIED>`,
+            `<!ATTLIST msg obsolete (obsolete) #IMPLIED>`,
+            `<!ATTLIST msg xml:space (default|preserve) "default">`,
+            `<!ATTLIST msg is_hidden CDATA #IMPLIED>`,
+            ``,
+            `<!ELEMENT source (#PCDATA)>`,
+            ``,
+            `<!ELEMENT ph (#PCDATA|ex)*>`,
+            `<!ATTLIST ph name CDATA #REQUIRED>`,
+            ``,
+            `<!ELEMENT ex (#PCDATA)>`,
+            `]>`,
+            `<messagebundle>`,
+            `  <msg id="3291030485717846467"><source>test_files/test.js:1</source>Hello, <ph name="PH"/>!</msg>`,
+            `  <msg id="8669027859022295761"><source>test_files/test.js:2</source>try<ph name="PH"/>me</msg>`,
+            `  <msg id="custom-id"><source>test_files/test.js:3</source>Custom id message</msg>`,
+            `  <msg id="${
+                useLegacyIds ?
+                    '12345678901234567890' :
+                    '273296103957933077'}"><source>test_files/test.js:5</source>Legacy id message</msg>`,
+            `  <msg id="custom-id-2"><source>test_files/test.js:7</source>Custom and legacy message</msg>`,
+            `  <msg id="2932901491976224757"><source>test_files/test.js:8,10</source>pre<ph name="START_TAG_SPAN"/>` +
+                `inner-pre<ph name="START_BOLD_TEXT"/>bold<ph name="CLOSE_BOLD_TEXT"/>inner-post<ph name="CLOSE_TAG_SPAN"/>post</msg>`,
+            `</messagebundle>\n`,
+          ].join('\n'));
+        });
 
-    it('should extract translations from source code, and write as XLIFF 1.2 format', () => {
-      extractTranslations({
-        rootPath,
-        sourceLocale: 'en-CA',
-        sourceFilePaths: [sourceFilePath],
-        format: 'xliff',
-        outputPath,
-        logger,
-        useSourceMaps: false,
-        useLegacyIds: false,
-        duplicateMessageHandling: 'ignore',
-      });
-      expect(fs.readFile(outputPath)).toEqual([
-        `<?xml version="1.0" encoding="UTF-8" ?>`,
-        `<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">`,
-        `  <file source-language="en-CA" datatype="plaintext">`,
-        `    <body>`,
-        `      <trans-unit id="3291030485717846467" datatype="html">`,
-        `        <source>Hello, <x id="PH"/>!</source>`,
-        `        <context-group purpose="location">`,
-        `          <context context-type="sourcefile">test_files/test.js</context>`,
-        `          <context context-type="linenumber">2</context>`,
-        `        </context-group>`,
-        `      </trans-unit>`,
-        `      <trans-unit id="8669027859022295761" datatype="html">`,
-        `        <source>try<x id="PH"/>me</source>`,
-        `        <context-group purpose="location">`,
-        `          <context context-type="sourcefile">test_files/test.js</context>`,
-        `          <context context-type="linenumber">3</context>`,
-        `        </context-group>`,
-        `      </trans-unit>`,
-        `    </body>`,
-        `  </file>`,
-        `</xliff>\n`,
-      ].join('\n'));
-    });
+        for (const formatOptions of [{}, {'xml:space': 'preserve'}] as FormatOptions[]) {
+          it(`should extract translations from source code, and write as XLIFF 1.2 format${
+                 formatOptions['xml:space'] ? '[with xml:space attribute]' : ''}`,
+             () => {
+               extractTranslations({
+                 rootPath,
+                 sourceLocale: 'en-CA',
+                 sourceFilePaths: [sourceFilePath],
+                 format: 'xliff',
+                 outputPath,
+                 logger,
+                 useSourceMaps: false,
+                 useLegacyIds,
+                 duplicateMessageHandling: 'ignore',
+                 formatOptions,
+                 fileSystem: fs,
+               });
+               expect(fs.readFile(outputPath)).toEqual([
+                 `<?xml version="1.0" encoding="UTF-8" ?>`,
+                 `<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">`,
+                 `  <file source-language="en-CA" datatype="plaintext" original="ng2.template"${
+                     toAttributes(formatOptions)}>`,
+                 `    <body>`,
+                 `      <trans-unit id="3291030485717846467" datatype="html">`,
+                 `        <source>Hello, <x id="PH" equiv-text="name"/>!</source>`,
+                 `        <context-group purpose="location">`,
+                 `          <context context-type="sourcefile">test_files/test.js</context>`,
+                 `          <context context-type="linenumber">2</context>`,
+                 `        </context-group>`,
+                 `      </trans-unit>`,
+                 `      <trans-unit id="8669027859022295761" datatype="html">`,
+                 `        <source>try<x id="PH" equiv-text="40 + 2"/>me</source>`,
+                 `        <context-group purpose="location">`,
+                 `          <context context-type="sourcefile">test_files/test.js</context>`,
+                 `          <context context-type="linenumber">3</context>`,
+                 `        </context-group>`,
+                 `      </trans-unit>`,
+                 `      <trans-unit id="custom-id" datatype="html">`,
+                 `        <source>Custom id message</source>`,
+                 `        <context-group purpose="location">`,
+                 `          <context context-type="sourcefile">test_files/test.js</context>`,
+                 `          <context context-type="linenumber">4</context>`,
+                 `        </context-group>`,
+                 `      </trans-unit>`,
+                 `      <trans-unit id="${
+                     useLegacyIds ? '1234567890123456789012345678901234567890' :
+                                    '273296103957933077'}" datatype="html">`,
+                 `        <source>Legacy id message</source>`,
+                 `        <context-group purpose="location">`,
+                 `          <context context-type="sourcefile">test_files/test.js</context>`,
+                 `          <context context-type="linenumber">6</context>`,
+                 `        </context-group>`,
+                 `      </trans-unit>`,
+                 `      <trans-unit id="custom-id-2" datatype="html">`,
+                 `        <source>Custom and legacy message</source>`,
+                 `        <context-group purpose="location">`,
+                 `          <context context-type="sourcefile">test_files/test.js</context>`,
+                 `          <context context-type="linenumber">8</context>`,
+                 `        </context-group>`,
+                 `      </trans-unit>`,
+                 `      <trans-unit id="2932901491976224757" datatype="html">`,
+                 `        <source>pre<x id="START_TAG_SPAN" equiv-text="&apos;&lt;span&gt;&apos;"/>` +
+                     `inner-pre<x id="START_BOLD_TEXT" equiv-text="&apos;&lt;b&gt;&apos;"/>bold<x id="CLOSE_BOLD_TEXT" equiv-text="&apos;&lt;/b&gt;&apos;"/>` +
+                     `inner-post<x id="CLOSE_TAG_SPAN" equiv-text="&apos;&lt;/span&gt;&apos;"/>post</source>`,
+                 `        <context-group purpose="location">`,
+                 `          <context context-type="sourcefile">test_files/test.js</context>`,
+                 `          <context context-type="linenumber">9,10</context>`,
+                 `        </context-group>`,
+                 `      </trans-unit>`,
+                 `    </body>`,
+                 `  </file>`,
+                 `</xliff>\n`,
+               ].join('\n'));
+             });
 
-    it('should extract translations from source code, and write as XLIFF 2 format', () => {
-      extractTranslations({
-        rootPath,
-        sourceLocale: 'en-AU',
-        sourceFilePaths: [sourceFilePath],
-        format: 'xliff2',
-        outputPath,
-        logger,
-        useSourceMaps: false,
-        useLegacyIds: false,
-        duplicateMessageHandling: 'ignore',
+          it('should extract translations from source code, and write as XLIFF 2 format', () => {
+            extractTranslations({
+              rootPath,
+              sourceLocale: 'en-AU',
+              sourceFilePaths: [sourceFilePath],
+              format: 'xliff2',
+              outputPath,
+              logger,
+              useSourceMaps: false,
+              useLegacyIds,
+              duplicateMessageHandling: 'ignore',
+              formatOptions,
+              fileSystem: fs,
+            });
+            expect(fs.readFile(outputPath)).toEqual([
+              `<?xml version="1.0" encoding="UTF-8" ?>`,
+              `<xliff version="2.0" xmlns="urn:oasis:names:tc:xliff:document:2.0" srcLang="en-AU">`,
+              `  <file id="ngi18n" original="ng.template"${toAttributes(formatOptions)}>`,
+              `    <unit id="3291030485717846467">`,
+              `      <notes>`,
+              `        <note category="location">test_files/test.js:2</note>`,
+              `      </notes>`,
+              `      <segment>`,
+              `        <source>Hello, <ph id="0" equiv="PH" disp="name"/>!</source>`,
+              `      </segment>`,
+              `    </unit>`,
+              `    <unit id="8669027859022295761">`,
+              `      <notes>`,
+              `        <note category="location">test_files/test.js:3</note>`,
+              `      </notes>`,
+              `      <segment>`,
+              `        <source>try<ph id="0" equiv="PH" disp="40 + 2"/>me</source>`,
+              `      </segment>`,
+              `    </unit>`,
+              `    <unit id="custom-id">`,
+              `      <notes>`,
+              `        <note category="location">test_files/test.js:4</note>`,
+              `      </notes>`,
+              `      <segment>`,
+              `        <source>Custom id message</source>`,
+              `      </segment>`,
+              `    </unit>`,
+              `    <unit id="${useLegacyIds ? '12345678901234567890' : '273296103957933077'}">`,
+              `      <notes>`,
+              `        <note category="location">test_files/test.js:6</note>`,
+              `      </notes>`,
+              `      <segment>`,
+              `        <source>Legacy id message</source>`,
+              `      </segment>`,
+              `    </unit>`,
+              `    <unit id="custom-id-2">`,
+              `      <notes>`,
+              `        <note category="location">test_files/test.js:8</note>`,
+              `      </notes>`,
+              `      <segment>`,
+              `        <source>Custom and legacy message</source>`,
+              `      </segment>`,
+              `    </unit>`,
+              `    <unit id="2932901491976224757">`,
+              `      <notes>`,
+              `        <note category="location">test_files/test.js:9,10</note>`,
+              `      </notes>`,
+              `      <segment>`,
+              `        <source>pre<pc id="0" equivStart="START_TAG_SPAN" equivEnd="CLOSE_TAG_SPAN" dispStart="&apos;&lt;span&gt;&apos;" dispEnd="&apos;&lt;/span&gt;&apos;">` +
+                  `inner-pre<pc id="1" equivStart="START_BOLD_TEXT" equivEnd="CLOSE_BOLD_TEXT" dispStart="&apos;&lt;b&gt;&apos;" dispEnd="&apos;&lt;/b&gt;&apos;">bold</pc>` +
+                  `inner-post</pc>post</source>`,
+              `      </segment>`,
+              `    </unit>`,
+              `  </file>`,
+              `</xliff>\n`,
+            ].join('\n'));
+          });
+        }
       });
-      expect(fs.readFile(outputPath)).toEqual([
-        `<?xml version="1.0" encoding="UTF-8" ?>`,
-        `<xliff version="2.0" xmlns="urn:oasis:names:tc:xliff:document:2.0" srcLang="en-AU">`,
-        `  <file>`,
-        `    <unit id="3291030485717846467">`,
-        `      <segment>`,
-        `        <source>Hello, <ph id="1" equiv="PH"/>!</source>`,
-        `      </segment>`,
-        `    </unit>`,
-        `    <unit id="8669027859022295761">`,
-        `      <segment>`,
-        `        <source>try<ph id="1" equiv="PH"/>me</source>`,
-        `      </segment>`,
-        `    </unit>`,
-        `  </file>`,
-        `</xliff>\n`,
-      ].join('\n'));
-    });
+    }
 
     for (const target of ['es2015', 'es5']) {
       it(`should render the original location of translations, when processing an ${
@@ -202,22 +306,24 @@ runInEachFileSystem(() => {
              useSourceMaps: true,
              useLegacyIds: false,
              duplicateMessageHandling: 'ignore',
+             fileSystem: fs,
            });
            expect(fs.readFile(outputPath)).toEqual([
              `<?xml version="1.0" encoding="UTF-8" ?>`,
              `<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">`,
-             `  <file source-language="en-CA" datatype="plaintext">`,
+             `  <file source-language="en-CA" datatype="plaintext" original="ng2.template">`,
              `    <body>`,
              `      <trans-unit id="157258427077572998" datatype="html">`,
-             `        <source>Message in <x id="a-file"/>!</source>`,
+             `        <source>Message in <x id="a-file" equiv-text="file"/>!</source>`,
              `        <context-group purpose="location">`,
-             // These source file paths are due to how Bazel TypeScript compilation source-maps work
+             // These source file paths are due to how Bazel TypeScript compilation source-maps
+             // work
              `          <context context-type="sourcefile">../packages/localize/src/tools/test/extract/integration/test_files/src/a.ts</context>`,
              `          <context context-type="linenumber">3</context>`,
              `        </context-group>`,
              `      </trans-unit>`,
              `      <trans-unit id="7829869508202074508" datatype="html">`,
-             `        <source>Message in <x id="b-file"/>!</source>`,
+             `        <source>Message in <x id="b-file" equiv-text="file"/>!</source>`,
              `        <context-group purpose="location">`,
              `          <context context-type="sourcefile">../packages/localize/src/tools/test/extract/integration/test_files/src/b.ts</context>`,
              `          <context context-type="linenumber">3</context>`,
@@ -242,6 +348,7 @@ runInEachFileSystem(() => {
                  useSourceMaps: false,
                  useLegacyIds: false,
                  duplicateMessageHandling: 'error',
+                 fileSystem: fs,
                }))
             .toThrowError(
                 `Failed to extract messages\n` +
@@ -263,6 +370,7 @@ runInEachFileSystem(() => {
           useSourceMaps: false,
           useLegacyIds: false,
           duplicateMessageHandling: 'warning',
+          fileSystem: fs,
         });
         expect(logger.logs.warn).toEqual([
           ['Messages extracted with warnings\n' +
@@ -293,6 +401,7 @@ runInEachFileSystem(() => {
           useSourceMaps: false,
           useLegacyIds: false,
           duplicateMessageHandling: 'ignore',
+          fileSystem: fs,
         });
         expect(logger.logs.warn).toEqual([]);
         expect(fs.readFile(outputPath)).toEqual([
diff --git a/packages/localize/src/tools/test/extract/integration/test_files/test.js b/packages/localize/src/tools/test/extract/integration/test_files/test.js
index cef3d9603220c..66d58b0ee2776 100644
--- a/packages/localize/src/tools/test/extract/integration/test_files/test.js
+++ b/packages/localize/src/tools/test/extract/integration/test_files/test.js
@@ -1,3 +1,10 @@
 var name = 'World';
 var message = $localize`Hello, ${name}!`;
-var other = $localize(__makeTemplateObject(['try', 'me'], ['try', 'me']), 40 + 2);
\ No newline at end of file
+var other = $localize(__makeTemplateObject(['try', 'me'], ['try', 'me']), 40 + 2);
+var customMessage = $localize`:@@custom-id:Custom id message`;
+var legacyMessage =
+    $localize`:␟1234567890123456789012345678901234567890␟12345678901234567890:Legacy id message`;
+var customAndLegacyMessage =
+    $localize`:@@custom-id-2␟1234567890123456789012345678901234567890␟12345678901234567890:Custom and legacy message`;
+var containers = $localize`pre${'<span>'}:START_TAG_SPAN:inner-pre${'<b>'}:START_BOLD_TEXT:bold${
+                          '</b>'}:CLOSE_BOLD_TEXT:inner-post${'</span>'}:CLOSE_TAG_SPAN:post`;
diff --git a/packages/localize/src/tools/test/extract/translation_files/format_options_spec.ts b/packages/localize/src/tools/test/extract/translation_files/format_options_spec.ts
new file mode 100644
index 0000000000000..452e0d6250d8f
--- /dev/null
+++ b/packages/localize/src/tools/test/extract/translation_files/format_options_spec.ts
@@ -0,0 +1,49 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {parseFormatOptions, validateOptions} from '../../../src/extract/translation_files/format_options';
+
+describe('format_options', () => {
+  describe('validateOptions()', () => {
+    it('should do nothing if there are no options', () => {
+      expect(() => validateOptions('TestSerializer', [['key', ['value1', 'value2']]], {}))
+          .not.toThrow();
+    });
+
+    it('should do nothing if the options are valid', () => {
+      expect(
+          () => validateOptions('TestSerializer', [['key', ['value1', 'value2']]], {key: 'value1'}))
+          .not.toThrow();
+    });
+
+    it('should error if there is an unexpected option', () => {
+      expect(
+          () => validateOptions('TestSerializer', [['key', ['value1', 'value2']]], {wrong: 'xxx'}))
+          .toThrowError(
+              'Invalid format option for TestSerializer: "wrong".\n' +
+              'Allowed options are ["key"].');
+    });
+
+    it('should error if there is an unexpected option value', () => {
+      expect(
+          () => validateOptions('TestSerializer', [['key', ['value1', 'value2']]], {key: 'other'}))
+          .toThrowError(
+              'Invalid format option value for TestSerializer: "key".\n' +
+              'Allowed option values are ["value1","value2"] but received "other".');
+    });
+  });
+
+  describe('parseFormatOptions()', () => {
+    it('should parse the string as JSON', () => {
+      expect(parseFormatOptions('{"a": "1", "b": "2"}')).toEqual({a: '1', b: '2'});
+    });
+
+    it('should parse undefined into an empty object', () => {
+      expect(parseFormatOptions(undefined)).toEqual({});
+    });
+  });
+});
diff --git a/packages/localize/src/tools/test/extract/translation_files/icu_parsing_spec.ts b/packages/localize/src/tools/test/extract/translation_files/icu_parsing_spec.ts
new file mode 100644
index 0000000000000..092cdf6bc5711
--- /dev/null
+++ b/packages/localize/src/tools/test/extract/translation_files/icu_parsing_spec.ts
@@ -0,0 +1,76 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {extractIcuPlaceholders} from '../../../src/extract/translation_files/icu_parsing';
+
+describe('extractIcuPlaceholders()', () => {
+  it('should return a single string if there is no ICU', () => {
+    expect(extractIcuPlaceholders('')).toEqual(['']);
+    expect(extractIcuPlaceholders('some text')).toEqual(['some text']);
+    expect(extractIcuPlaceholders('some } text')).toEqual(['some } text']);
+    expect(extractIcuPlaceholders('this is {not an ICU}')).toEqual(['this is {not an ICU}']);
+  });
+
+  it('should return a single string if there are no ICU placeholders', () => {
+    expect(extractIcuPlaceholders('{VAR_PLURAL, plural, one {SOME} few {FEW} other {OTHER}}'))
+        .toEqual(['{VAR_PLURAL, plural, one {SOME} few {FEW} other {OTHER}}']);
+    expect(extractIcuPlaceholders('{VAR_SELECT, select, male {HE} female {SHE} other {XE}}'))
+        .toEqual(['{VAR_SELECT, select, male {HE} female {SHE} other {XE}}']);
+  });
+
+  it('should split out simple interpolation placeholders', () => {
+    expect(
+        extractIcuPlaceholders(
+            '{VAR_PLURAL, plural, one {{INTERPOLATION}} few {pre {INTERPOLATION_1}} other {{INTERPOLATION_2} post}}'))
+        .toEqual([
+          '{VAR_PLURAL, plural, one {',
+          'INTERPOLATION',
+          '} few {pre ',
+          'INTERPOLATION_1',
+          '} other {',
+          'INTERPOLATION_2',
+          ' post}}',
+        ]);
+  });
+
+  it('should split out element placeholders', () => {
+    expect(
+        extractIcuPlaceholders(
+            '{VAR_PLURAL, plural, one {{START_BOLD_TEXT}something bold{CLOSE_BOLD_TEXT}} other {pre {START_TAG_SPAN}middle{CLOSE_TAG_SPAN} post}}'))
+        .toEqual([
+          '{VAR_PLURAL, plural, one {',
+          'START_BOLD_TEXT',
+          'something bold',
+          'CLOSE_BOLD_TEXT',
+          '} other {pre ',
+          'START_TAG_SPAN',
+          'middle',
+          'CLOSE_TAG_SPAN',
+          ' post}}',
+        ]);
+  });
+
+  it('should handle nested ICUs', () => {
+    expect(extractIcuPlaceholders([
+      '{VAR_SELECT_1, select,',
+      '  invoice {Invoice for {INTERPOLATION}}',
+      '  payment {{VAR_SELECT, select,',
+      '    processor {Payment gateway}',
+      '    other {{INTERPOLATION_1}}',
+      '  }}',
+      '}',
+    ].join('\n')))
+        .toEqual([
+          '{VAR_SELECT_1, select,\n  invoice {Invoice for ',
+          'INTERPOLATION',
+          '}\n  payment {{VAR_SELECT, select,\n    processor {Payment gateway}\n    other {',
+          'INTERPOLATION_1',
+          '}\n  }}\n}',
+        ]);
+  });
+});
\ No newline at end of file
diff --git a/packages/localize/src/tools/test/extract/translation_files/json_translation_serializer_spec.ts b/packages/localize/src/tools/test/extract/translation_files/json_translation_serializer_spec.ts
index bcfa7bd36e7fc..2816ca2600f7c 100644
--- a/packages/localize/src/tools/test/extract/translation_files/json_translation_serializer_spec.ts
+++ b/packages/localize/src/tools/test/extract/translation_files/json_translation_serializer_spec.ts
@@ -16,12 +16,28 @@ describe('JsonTranslationSerializer', () => {
     it('should convert a set of parsed messages into a JSON string', () => {
       const messages: ɵParsedMessage[] = [
         mockMessage('12345', ['a', 'b', 'c'], ['PH', 'PH_1'], {meaning: 'some meaning'}),
+        mockMessage('54321', ['a', 'b', 'c'], ['PH', 'PH_1'], {
+          customId: 'someId',
+        }),
         mockMessage(
             '67890', ['a', '', 'c'], ['START_TAG_SPAN', 'CLOSE_TAG_SPAN'],
             {description: 'some description'}),
         mockMessage('13579', ['', 'b', ''], ['START_BOLD_TEXT', 'CLOSE_BOLD_TEXT'], {}),
         mockMessage('24680', ['a'], [], {meaning: 'meaning', description: 'and description'}),
         mockMessage('80808', ['multi\nlines'], [], {}),
+        mockMessage('90000', ['<escape', 'me>'], ['double-quotes-"'], {}),
+        mockMessage(
+            '100000',
+            [
+              'pre-ICU {VAR_SELECT, select, a {a} b {{INTERPOLATION}} c {pre {INTERPOLATION_1} post}} post-ICU'
+            ],
+            [], {}),
+        mockMessage(
+            '100001',
+            [
+              '{VAR_PLURAL, plural, one {{START_BOLD_TEXT}something bold{CLOSE_BOLD_TEXT}} other {pre {START_TAG_SPAN}middle{CLOSE_TAG_SPAN} post}}'
+            ],
+            [], {}),
       ];
       const serializer = new SimpleJsonTranslationSerializer('xx');
       const output = serializer.serialize(messages);
@@ -33,7 +49,11 @@ describe('JsonTranslationSerializer', () => {
         `    "13579": "{$START_BOLD_TEXT}b{$CLOSE_BOLD_TEXT}",`,
         `    "24680": "a",`,
         `    "67890": "a{$START_TAG_SPAN}{$CLOSE_TAG_SPAN}c",`,
-        `    "80808": "multi\\nlines"`,
+        `    "80808": "multi\\nlines",`,
+        `    "90000": "<escape{$double-quotes-\\"}me>",`,
+        `    "100000": "pre-ICU {VAR_SELECT, select, a {a} b {{INTERPOLATION}} c {pre {INTERPOLATION_1} post}} post-ICU",`,
+        `    "100001": "{VAR_PLURAL, plural, one {{START_BOLD_TEXT}something bold{CLOSE_BOLD_TEXT}} other {pre {START_TAG_SPAN}middle{CLOSE_TAG_SPAN} post}}",`,
+        `    "someId": "a{$PH}b{$PH_1}c"`,
         `  }`,
         `}`,
       ].join('\n'));
diff --git a/packages/localize/src/tools/test/extract/translation_files/mock_message.ts b/packages/localize/src/tools/test/extract/translation_files/mock_message.ts
index ec8a74717387a..b05b16e51078d 100644
--- a/packages/localize/src/tools/test/extract/translation_files/mock_message.ts
+++ b/packages/localize/src/tools/test/extract/translation_files/mock_message.ts
@@ -6,35 +6,35 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import {ɵParsedMessage} from '@angular/localize';
-import {SourceLocation} from '@angular/localize/src/utils';
+import {MessageId, SourceLocation} from '@angular/localize/src/utils';
 
 export interface MockMessageOptions {
+  customId?: string;
   meaning?: string;
   description?: string;
   location?: SourceLocation;
   legacyIds?: string[];
+  messagePartLocations?: (SourceLocation|undefined)[];
+  substitutionLocations?: Record<string, SourceLocation|undefined>;
 }
+
 /**
  * This helper is used to create `ParsedMessage` objects to be rendered in the
  * `TranslationSerializer` tests.
  */
 export function mockMessage(
-    id: string, messageParts: string[], placeholderNames: string[],
-    {meaning = '', description = '', location, legacyIds = []}: MockMessageOptions):
-    ɵParsedMessage {
+    id: MessageId, messageParts: string[], placeholderNames: string[],
+    options: MockMessageOptions): ɵParsedMessage {
   let text = messageParts[0];
   for (let i = 1; i < messageParts.length; i++) {
     text += `{$${placeholderNames[i - 1]}}${messageParts[i]}`;
   }
   return {
-    id,
+    substitutions: [],
+    ...options,
+    id: options.customId || id,  // customId trumps id
     text,
     messageParts,
     placeholderNames,
-    description,
-    meaning,
-    substitutions: [],
-    legacyIds,
-    location,
   };
 }
diff --git a/packages/localize/src/tools/test/extract/translation_files/utils.ts b/packages/localize/src/tools/test/extract/translation_files/utils.ts
new file mode 100644
index 0000000000000..2fe55a6eb3580
--- /dev/null
+++ b/packages/localize/src/tools/test/extract/translation_files/utils.ts
@@ -0,0 +1,17 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {FormatOptions} from '../../../src/extract/translation_files/format_options';
+
+export function toAttributes(options: FormatOptions) {
+  let result = '';
+  for (const option in options) {
+    result += ` ${option}="${options[option]}"`;
+  }
+  return result;
+}
diff --git a/packages/localize/src/tools/test/extract/translation_files/xliff1_translation_serializer_spec.ts b/packages/localize/src/tools/test/extract/translation_files/xliff1_translation_serializer_spec.ts
index 2b89404fe22d1..0ed91d10b33d6 100644
--- a/packages/localize/src/tools/test/extract/translation_files/xliff1_translation_serializer_spec.ts
+++ b/packages/localize/src/tools/test/extract/translation_files/xliff1_translation_serializer_spec.ts
@@ -7,76 +7,134 @@
  */
 import {absoluteFrom} from '@angular/compiler-cli/src/ngtsc/file_system';
 import {runInEachFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system/testing';
-import {ɵParsedMessage} from '@angular/localize';
+import {ɵParsedMessage, ɵSourceLocation} from '@angular/localize';
 
+import {FormatOptions} from '../../../src/extract/translation_files/format_options';
 import {Xliff1TranslationSerializer} from '../../../src/extract/translation_files/xliff1_translation_serializer';
 
 import {mockMessage} from './mock_message';
+import {toAttributes} from './utils';
 
 runInEachFileSystem(() => {
   describe('Xliff1TranslationSerializer', () => {
-    [false, true].forEach(useLegacyIds => {
-      describe(`renderFile() [using ${useLegacyIds ? 'legacy' : 'canonical'} ids]`, () => {
-        it('should convert a set of parsed messages into an XML string', () => {
-          const messages: ɵParsedMessage[] = [
-            mockMessage('12345', ['a', 'b', 'c'], ['PH', 'PH_1'], {
-              meaning: 'some meaning',
-              location: {
-                file: absoluteFrom('/project/file.ts'),
-                start: {line: 5, column: 10},
-                end: {line: 5, column: 12}
-              },
-              legacyIds: ['1234567890ABCDEF1234567890ABCDEF12345678', '615790887472569365'],
-            }),
-            mockMessage(
-                '67890', ['a', '', 'c'], ['START_TAG_SPAN', 'CLOSE_TAG_SPAN'],
-                {description: 'some description'}),
-            mockMessage('13579', ['', 'b', ''], ['START_BOLD_TEXT', 'CLOSE_BOLD_TEXT'], {}),
-            mockMessage('24680', ['a'], [], {meaning: 'meaning', description: 'and description'}),
-            mockMessage('80808', ['multi\nlines'], [], {}),
-            mockMessage('90000', ['<escape', 'me>'], ['double-quotes-"'], {})
-          ];
-          const serializer =
-              new Xliff1TranslationSerializer('xx', absoluteFrom('/project'), useLegacyIds);
-          const output = serializer.serialize(messages);
-          expect(output).toEqual([
-            `<?xml version="1.0" encoding="UTF-8" ?>`,
-            `<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">`,
-            `  <file source-language="xx" datatype="plaintext">`,
-            `    <body>`,
-            `      <trans-unit id="${
-                useLegacyIds ? '1234567890ABCDEF1234567890ABCDEF12345678' :
-                               '12345'}" datatype="html">`,
-            `        <source>a<x id="PH"/>b<x id="PH_1"/>c</source>`,
-            `        <context-group purpose="location">`,
-            `          <context context-type="sourcefile">file.ts</context>`,
-            `          <context context-type="linenumber">6</context>`,
-            `        </context-group>`,
-            `        <note priority="1" from="meaning">some meaning</note>`,
-            `      </trans-unit>`,
-            `      <trans-unit id="67890" datatype="html">`,
-            `        <source>a<x id="START_TAG_SPAN"/><x id="CLOSE_TAG_SPAN"/>c</source>`,
-            `        <note priority="1" from="description">some description</note>`,
-            `      </trans-unit>`,
-            `      <trans-unit id="13579" datatype="html">`,
-            `        <source><x id="START_BOLD_TEXT"/>b<x id="CLOSE_BOLD_TEXT"/></source>`,
-            `      </trans-unit>`,
-            `      <trans-unit id="24680" datatype="html">`,
-            `        <source>a</source>`,
-            `        <note priority="1" from="description">and description</note>`,
-            `        <note priority="1" from="meaning">meaning</note>`,
-            `      </trans-unit>`,
-            `      <trans-unit id="80808" datatype="html">`,
-            `        <source>multi`,
-            `lines</source>`,
-            `      </trans-unit>`,
-            `      <trans-unit id="90000" datatype="html">`,
-            `        <source>&lt;escape<x id="double-quotes-&quot;"/>me&gt;</source>`,
-            `      </trans-unit>`,
-            `    </body>`,
-            `  </file>`,
-            `</xliff>\n`,
-          ].join('\n'));
+    ([{}, {'xml:space': 'preserve'}] as FormatOptions[]).forEach(options => {
+      [false, true].forEach(useLegacyIds => {
+        describe(`renderFile() [using ${useLegacyIds ? 'legacy' : 'canonical'} ids]`, () => {
+          it('should convert a set of parsed messages into an XML string', () => {
+            const phLocation: ɵSourceLocation = {
+              start: {line: 0, column: 10},
+              end: {line: 1, column: 15},
+              file: absoluteFrom('/project/file.ts'),
+              text: 'placeholder + 1'
+            };
+            const messagePartLocation: ɵSourceLocation = {
+              start: {line: 0, column: 5},
+              end: {line: 0, column: 10},
+              file: absoluteFrom('/project/file.ts'),
+              text: 'message part'
+            };
+            const messages: ɵParsedMessage[] = [
+              mockMessage('12345', ['a', 'b', 'c'], ['PH', 'PH_1'], {
+                meaning: 'some meaning',
+                location: {
+                  file: absoluteFrom('/project/file.ts'),
+                  start: {line: 5, column: 10},
+                  end: {line: 5, column: 12}
+                },
+                legacyIds: ['1234567890ABCDEF1234567890ABCDEF12345678', '615790887472569365'],
+              }),
+              mockMessage('54321', ['a', 'b', 'c'], ['PH', 'PH_1'], {
+                customId: 'someId',
+                legacyIds: ['87654321FEDCBA0987654321FEDCBA0987654321', '563965274788097516'],
+                messagePartLocations: [undefined, messagePartLocation, undefined],
+                substitutionLocations: {'PH': phLocation, 'PH_1': undefined},
+              }),
+              mockMessage(
+                  '67890', ['a', '', 'c'], ['START_TAG_SPAN', 'CLOSE_TAG_SPAN'],
+                  {description: 'some description'}),
+              mockMessage('38705', ['a', '', 'c'], ['START_TAG_SPAN', 'CLOSE_TAG_SPAN'], {
+                location: {
+                  file: absoluteFrom('/project/file.ts'),
+                  start: {line: 2, column: 7},
+                  end: {line: 3, column: 2}
+                }
+              }),
+              mockMessage('13579', ['', 'b', ''], ['START_BOLD_TEXT', 'CLOSE_BOLD_TEXT'], {}),
+              mockMessage('24680', ['a'], [], {meaning: 'meaning', description: 'and description'}),
+              mockMessage('80808', ['multi\nlines'], [], {}),
+              mockMessage('90000', ['<escape', 'me>'], ['double-quotes-"'], {}),
+              mockMessage(
+                  '100000',
+                  [
+                    'pre-ICU {VAR_SELECT, select, a {a} b {{INTERPOLATION}} c {pre {INTERPOLATION_1} post}} post-ICU'
+                  ],
+                  [], {}),
+              mockMessage(
+                  '100001',
+                  [
+                    '{VAR_PLURAL, plural, one {{START_BOLD_TEXT}something bold{CLOSE_BOLD_TEXT}} other {pre {START_TAG_SPAN}middle{CLOSE_TAG_SPAN} post}}'
+                  ],
+                  [], {}),
+            ];
+            const serializer = new Xliff1TranslationSerializer(
+                'xx', absoluteFrom('/project'), useLegacyIds, options);
+            const output = serializer.serialize(messages);
+            expect(output).toEqual([
+              `<?xml version="1.0" encoding="UTF-8" ?>`,
+              `<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">`,
+              `  <file source-language="xx" datatype="plaintext" original="ng2.template"${
+                  toAttributes(options)}>`,
+              `    <body>`,
+              `      <trans-unit id="${
+                  useLegacyIds ? '1234567890ABCDEF1234567890ABCDEF12345678' :
+                                 '12345'}" datatype="html">`,
+              `        <source>a<x id="PH"/>b<x id="PH_1"/>c</source>`,
+              `        <context-group purpose="location">`,
+              `          <context context-type="sourcefile">file.ts</context>`,
+              `          <context context-type="linenumber">6</context>`,
+              `        </context-group>`,
+              `        <note priority="1" from="meaning">some meaning</note>`,
+              `      </trans-unit>`,
+              `      <trans-unit id="someId" datatype="html">`,
+              `        <source>a<x id="PH" equiv-text="placeholder + 1"/>b<x id="PH_1"/>c</source>`,
+              `      </trans-unit>`,
+              `      <trans-unit id="67890" datatype="html">`,
+              `        <source>a<x id="START_TAG_SPAN"/><x id="CLOSE_TAG_SPAN"/>c</source>`,
+              `        <note priority="1" from="description">some description</note>`,
+              `      </trans-unit>`,
+              `      <trans-unit id="38705" datatype="html">`,
+              `        <source>a<x id="START_TAG_SPAN"/><x id="CLOSE_TAG_SPAN"/>c</source>`,
+              `        <context-group purpose="location">`,
+              `          <context context-type="sourcefile">file.ts</context>`,
+              `          <context context-type="linenumber">3,4</context>`,
+              `        </context-group>`,
+              `      </trans-unit>`,
+              `      <trans-unit id="13579" datatype="html">`,
+              `        <source><x id="START_BOLD_TEXT"/>b<x id="CLOSE_BOLD_TEXT"/></source>`,
+              `      </trans-unit>`,
+              `      <trans-unit id="24680" datatype="html">`,
+              `        <source>a</source>`,
+              `        <note priority="1" from="description">and description</note>`,
+              `        <note priority="1" from="meaning">meaning</note>`,
+              `      </trans-unit>`,
+              `      <trans-unit id="80808" datatype="html">`,
+              `        <source>multi`,
+              `lines</source>`,
+              `      </trans-unit>`,
+              `      <trans-unit id="90000" datatype="html">`,
+              `        <source>&lt;escape<x id="double-quotes-&quot;"/>me&gt;</source>`,
+              `      </trans-unit>`,
+              `      <trans-unit id="100000" datatype="html">`,
+              `        <source>pre-ICU {VAR_SELECT, select, a {a} b {<x id="INTERPOLATION"/>} c {pre <x id="INTERPOLATION_1"/> post}} post-ICU</source>`,
+              `      </trans-unit>`,
+              `      <trans-unit id="100001" datatype="html">`,
+              `        <source>{VAR_PLURAL, plural, one {<x id="START_BOLD_TEXT"/>something bold<x id="CLOSE_BOLD_TEXT"/>} other {pre <x id="START_TAG_SPAN"/>middle<x id="CLOSE_TAG_SPAN"/> post}}</source>`,
+              `      </trans-unit>`,
+              `    </body>`,
+              `  </file>`,
+              `</xliff>\n`,
+            ].join('\n'));
+          });
         });
       });
     });
diff --git a/packages/localize/src/tools/test/extract/translation_files/xliff2_translation_serializer_spec.ts b/packages/localize/src/tools/test/extract/translation_files/xliff2_translation_serializer_spec.ts
index dbbf0fe84d724..5d424ef4a7edd 100644
--- a/packages/localize/src/tools/test/extract/translation_files/xliff2_translation_serializer_spec.ts
+++ b/packages/localize/src/tools/test/extract/translation_files/xliff2_translation_serializer_spec.ts
@@ -5,96 +5,159 @@
  * 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 {computeMsgId} from '@angular/compiler';
 import {absoluteFrom} from '@angular/compiler-cli/src/ngtsc/file_system';
 import {runInEachFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system/testing';
-import {ɵParsedMessage} from '@angular/localize';
+import {ɵParsedMessage, ɵSourceLocation} from '@angular/localize';
 
+import {FormatOptions} from '../../../src/extract/translation_files/format_options';
 import {Xliff2TranslationSerializer} from '../../../src/extract/translation_files/xliff2_translation_serializer';
 
 import {mockMessage} from './mock_message';
+import {toAttributes} from './utils';
 
 runInEachFileSystem(() => {
   describe('Xliff2TranslationSerializer', () => {
-    [false, true].forEach(useLegacyIds => {
-      describe(`renderFile() [using ${useLegacyIds ? 'legacy' : 'canonical'} ids]`, () => {
-        it('should convert a set of parsed messages into an XML string', () => {
-          const messages: ɵParsedMessage[] = [
-            mockMessage('12345', ['a', 'b', 'c'], ['PH', 'PH_1'], {
-              meaning: 'some meaning',
-              location: {
-                file: absoluteFrom('/project/file.ts'),
-                start: {line: 5, column: 0},
-                end: {line: 5, column: 3}
-              },
-              legacyIds: ['1234567890ABCDEF1234567890ABCDEF12345678', '615790887472569365'],
-            }),
-            mockMessage('67890', ['a', '', 'c'], ['START_TAG_SPAN', 'CLOSE_TAG_SPAN'], {
-              description: 'some description',
-              location: {
-                file: absoluteFrom('/project/file.ts'),
-                start: {line: 2, column: 7},
-                end: {line: 3, column: 2}
-              }
-            }),
-            mockMessage('13579', ['', 'b', ''], ['START_BOLD_TEXT', 'CLOSE_BOLD_TEXT'], {}),
-            mockMessage('24680', ['a'], [], {meaning: 'meaning', description: 'and description'}),
-            mockMessage('80808', ['multi\nlines'], [], {}),
-            mockMessage('90000', ['<escape', 'me>'], ['double-quotes-"'], {})
-          ];
-          const serializer =
-              new Xliff2TranslationSerializer('xx', absoluteFrom('/project'), useLegacyIds);
-          const output = serializer.serialize(messages);
-          expect(output).toEqual([
-            `<?xml version="1.0" encoding="UTF-8" ?>`,
-            `<xliff version="2.0" xmlns="urn:oasis:names:tc:xliff:document:2.0" srcLang="xx">`,
-            `  <file>`,
-            `    <unit id="${useLegacyIds ? '615790887472569365' : '12345'}">`,
-            `      <notes>`,
-            `        <note category="location">file.ts:6</note>`,
-            `        <note category="meaning">some meaning</note>`,
-            `      </notes>`,
-            `      <segment>`,
-            `        <source>a<ph id="1" equiv="PH"/>b<ph id="2" equiv="PH_1"/>c</source>`,
-            `      </segment>`,
-            `    </unit>`,
-            `    <unit id="67890">`,
-            `      <notes>`,
-            `        <note category="location">file.ts:3,4</note>`,
-            `        <note category="description">some description</note>`,
-            `      </notes>`,
-            `      <segment>`,
-            `        <source>a<pc id="1" equivStart="START_TAG_SPAN" equivEnd="CLOSE_TAG_SPAN"></pc>c</source>`,
-            `      </segment>`,
-            `    </unit>`,
-            `    <unit id="13579">`,
-            `      <segment>`,
-            `        <source><pc id="1" equivStart="START_BOLD_TEXT" equivEnd="CLOSE_BOLD_TEXT">b</pc></source>`,
-            `      </segment>`,
-            `    </unit>`,
-            `    <unit id="24680">`,
-            `      <notes>`,
-            `        <note category="description">and description</note>`,
-            `        <note category="meaning">meaning</note>`,
-            `      </notes>`,
-            `      <segment>`,
-            `        <source>a</source>`,
-            `      </segment>`,
-            `    </unit>`,
-            `    <unit id="80808">`,
-            `      <segment>`,
-            `        <source>multi`,
-            `lines</source>`,
-            `      </segment>`,
-            `    </unit>`,
-            `    <unit id="90000">`,
-            `      <segment>`,
-            `        <source>&lt;escape<ph id="1" equiv="double-quotes-&quot;"/>me&gt;</source>`,
-            `      </segment>`,
-            `    </unit>`,
-            `  </file>`,
-            `</xliff>\n`,
-          ].join('\n'));
+    ([{}, {'xml:space': 'preserve'}] as FormatOptions[]).forEach(options => {
+      [false, true].forEach(useLegacyIds => {
+        describe(`renderFile() [using ${useLegacyIds ? 'legacy' : 'canonical'} ids]`, () => {
+          it('should convert a set of parsed messages into an XML string', () => {
+            const phLocation: ɵSourceLocation = {
+              start: {line: 0, column: 10},
+              end: {line: 1, column: 15},
+              file: absoluteFrom('/project/file.ts'),
+              text: 'placeholder + 1'
+            };
+            const messagePartLocation: ɵSourceLocation = {
+              start: {line: 0, column: 5},
+              end: {line: 0, column: 10},
+              file: absoluteFrom('/project/file.ts'),
+              text: 'message part'
+            };
+            const messages: ɵParsedMessage[] = [
+              mockMessage('12345', ['a', 'b', 'c'], ['PH', 'PH_1'], {
+                meaning: 'some meaning',
+                location: {
+                  file: absoluteFrom('/project/file.ts'),
+                  start: {line: 5, column: 0},
+                  end: {line: 5, column: 3}
+                },
+                legacyIds: ['1234567890ABCDEF1234567890ABCDEF12345678', '615790887472569365'],
+              }),
+              mockMessage('54321', ['a', 'b', 'c'], ['PH', 'PH_1'], {
+                customId: 'someId',
+                legacyIds: ['87654321FEDCBA0987654321FEDCBA0987654321', '563965274788097516'],
+                messagePartLocations: [undefined, messagePartLocation, undefined],
+                substitutionLocations: {'PH': phLocation, 'PH_1': undefined},
+              }),
+              mockMessage('67890', ['a', '', 'c'], ['START_TAG_SPAN', 'CLOSE_TAG_SPAN'], {
+                description: 'some description',
+                location: {
+                  file: absoluteFrom('/project/file.ts'),
+                  start: {line: 2, column: 7},
+                  end: {line: 3, column: 2}
+                }
+              }),
+              mockMessage('location-only', ['a', '', 'c'], ['START_TAG_SPAN', 'CLOSE_TAG_SPAN'], {
+                location: {
+                  file: absoluteFrom('/project/file.ts'),
+                  start: {line: 2, column: 7},
+                  end: {line: 3, column: 2}
+                }
+              }),
+              mockMessage('13579', ['', 'b', ''], ['START_BOLD_TEXT', 'CLOSE_BOLD_TEXT'], {}),
+              mockMessage('24680', ['a'], [], {meaning: 'meaning', description: 'and description'}),
+              mockMessage('80808', ['multi\nlines'], [], {}),
+              mockMessage('90000', ['<escape', 'me>'], ['double-quotes-"'], {}),
+              mockMessage(
+                  '100000',
+                  [
+                    'pre-ICU {VAR_SELECT, select, a {a} b {{INTERPOLATION}} c {pre {INTERPOLATION_1} post}} post-ICU'
+                  ],
+                  [], {}),
+              mockMessage(
+                  '100001',
+                  [
+                    '{VAR_PLURAL, plural, one {{START_BOLD_TEXT}something bold{CLOSE_BOLD_TEXT}} other {pre {START_TAG_SPAN}middle{CLOSE_TAG_SPAN} post}}'
+                  ],
+                  [], {}),
+            ];
+            const serializer = new Xliff2TranslationSerializer(
+                'xx', absoluteFrom('/project'), useLegacyIds, options);
+            const output = serializer.serialize(messages);
+            expect(output).toEqual([
+              `<?xml version="1.0" encoding="UTF-8" ?>`,
+              `<xliff version="2.0" xmlns="urn:oasis:names:tc:xliff:document:2.0" srcLang="xx">`,
+              `  <file id="ngi18n" original="ng.template"${toAttributes(options)}>`,
+              `    <unit id="${useLegacyIds ? '615790887472569365' : '12345'}">`,
+              `      <notes>`,
+              `        <note category="location">file.ts:6</note>`,
+              `        <note category="meaning">some meaning</note>`,
+              `      </notes>`,
+              `      <segment>`,
+              `        <source>a<ph id="0" equiv="PH"/>b<ph id="1" equiv="PH_1"/>c</source>`,
+              `      </segment>`,
+              `    </unit>`,
+              `    <unit id="someId">`,
+              `      <segment>`,
+              `        <source>a<ph id="0" equiv="PH" disp="placeholder + 1"/>b<ph id="1" equiv="PH_1"/>c</source>`,
+              `      </segment>`,
+              `    </unit>`,
+              `    <unit id="67890">`,
+              `      <notes>`,
+              `        <note category="location">file.ts:3,4</note>`,
+              `        <note category="description">some description</note>`,
+              `      </notes>`,
+              `      <segment>`,
+              `        <source>a<pc id="0" equivStart="START_TAG_SPAN" equivEnd="CLOSE_TAG_SPAN"></pc>c</source>`,
+              `      </segment>`,
+              `    </unit>`,
+              `    <unit id="location-only">`,
+              `      <notes>`,
+              `        <note category="location">file.ts:3,4</note>`,
+              `      </notes>`,
+              `      <segment>`,
+              `        <source>a<pc id="0" equivStart="START_TAG_SPAN" equivEnd="CLOSE_TAG_SPAN"></pc>c</source>`,
+              `      </segment>`,
+              `    </unit>`,
+              `    <unit id="13579">`,
+              `      <segment>`,
+              `        <source><pc id="0" equivStart="START_BOLD_TEXT" equivEnd="CLOSE_BOLD_TEXT">b</pc></source>`,
+              `      </segment>`,
+              `    </unit>`,
+              `    <unit id="24680">`,
+              `      <notes>`,
+              `        <note category="description">and description</note>`,
+              `        <note category="meaning">meaning</note>`,
+              `      </notes>`,
+              `      <segment>`,
+              `        <source>a</source>`,
+              `      </segment>`,
+              `    </unit>`,
+              `    <unit id="80808">`,
+              `      <segment>`,
+              `        <source>multi`,
+              `lines</source>`,
+              `      </segment>`,
+              `    </unit>`,
+              `    <unit id="90000">`,
+              `      <segment>`,
+              `        <source>&lt;escape<ph id="0" equiv="double-quotes-&quot;"/>me&gt;</source>`,
+              `      </segment>`,
+              `    </unit>`,
+              `    <unit id="100000">`,
+              `      <segment>`,
+              `        <source>pre-ICU {VAR_SELECT, select, a {a} b {<ph id="0" equiv="INTERPOLATION"/>} c {pre <ph id="1" equiv="INTERPOLATION_1"/> post}} post-ICU</source>`,
+              `      </segment>`,
+              `    </unit>`,
+              `    <unit id="100001">`,
+              `      <segment>`,
+              `        <source>{VAR_PLURAL, plural, one {<pc id="0" equivStart="START_BOLD_TEXT" equivEnd="CLOSE_BOLD_TEXT">something bold</pc>} other {pre <pc id="1" equivStart="START_TAG_SPAN" equivEnd="CLOSE_TAG_SPAN">middle</pc> post}}</source>`,
+              `      </segment>`,
+              `    </unit>`,
+              `  </file>`,
+              `</xliff>\n`,
+            ].join('\n'));
+          });
         });
       });
     });
diff --git a/packages/localize/src/tools/test/extract/translation_files/xmb_translation_serializer_spec.ts b/packages/localize/src/tools/test/extract/translation_files/xmb_translation_serializer_spec.ts
index 45a1608334913..89907aa0943ae 100644
--- a/packages/localize/src/tools/test/extract/translation_files/xmb_translation_serializer_spec.ts
+++ b/packages/localize/src/tools/test/extract/translation_files/xmb_translation_serializer_spec.ts
@@ -5,24 +5,44 @@
  * 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 {absoluteFrom} from '@angular/compiler-cli/src/ngtsc/file_system';
+import {absoluteFrom, FileSystem, getFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system';
 import {runInEachFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system/testing';
-import {ɵParsedMessage} from '@angular/localize';
+import {ɵParsedMessage, ɵSourceLocation} from '@angular/localize';
 
 import {XmbTranslationSerializer} from '../../../src/extract/translation_files/xmb_translation_serializer';
 
 import {mockMessage} from './mock_message';
 
 runInEachFileSystem(() => {
+  let fs: FileSystem;
+  beforeEach(() => fs = getFileSystem());
   describe('XmbTranslationSerializer', () => {
     [false, true].forEach(useLegacyIds => {
       describe(`renderFile() [using ${useLegacyIds ? 'legacy' : 'canonical'} ids]`, () => {
         it('should convert a set of parsed messages into an XML string', () => {
+          const phLocation: ɵSourceLocation = {
+            start: {line: 0, column: 10},
+            end: {line: 1, column: 15},
+            file: absoluteFrom('/project/file.ts'),
+            text: 'placeholder + 1'
+          };
+          const messagePartLocation: ɵSourceLocation = {
+            start: {line: 0, column: 5},
+            end: {line: 0, column: 10},
+            file: absoluteFrom('/project/file.ts'),
+            text: 'message part'
+          };
           const messages: ɵParsedMessage[] = [
             mockMessage('12345', ['a', 'b', 'c'], ['PH', 'PH_1'], {
               meaning: 'some meaning',
               legacyIds: ['1234567890ABCDEF1234567890ABCDEF12345678', '615790887472569365'],
             }),
+            mockMessage('54321', ['a', 'b', 'c'], ['PH', 'PH_1'], {
+              customId: 'someId',
+              legacyIds: ['87654321FEDCBA0987654321FEDCBA0987654321', '563965274788097516'],
+              messagePartLocations: [undefined, messagePartLocation, undefined],
+              substitutionLocations: {'PH': phLocation, 'PH_1': undefined},
+            }),
             mockMessage(
                 '67890', ['a', '', 'c'], ['START_TAG_SPAN', 'CLOSE_TAG_SPAN'],
                 {description: 'some description'}),
@@ -30,8 +50,21 @@ runInEachFileSystem(() => {
             mockMessage('24680', ['a'], [], {meaning: 'meaning', description: 'and description'}),
             mockMessage('80808', ['multi\nlines'], [], {}),
             mockMessage('90000', ['<escape', 'me>'], ['double-quotes-"'], {}),
+            mockMessage(
+                '100000',
+                [
+                  'pre-ICU {VAR_SELECT, select, a {a} b {{INTERPOLATION}} c {pre {INTERPOLATION_1} post}} post-ICU'
+                ],
+                [], {}),
+            mockMessage(
+                '100001',
+                [
+                  '{VAR_PLURAL, plural, one {{START_BOLD_TEXT}something bold{CLOSE_BOLD_TEXT}} other {pre {START_TAG_SPAN}middle{CLOSE_TAG_SPAN} post}}'
+                ],
+                [], {}),
           ];
-          const serializer = new XmbTranslationSerializer(absoluteFrom('/project'), useLegacyIds);
+          const serializer =
+              new XmbTranslationSerializer(absoluteFrom('/project'), useLegacyIds, fs);
           const output = serializer.serialize(messages);
           expect(output).toContain([
             `<messagebundle>`,
@@ -39,11 +72,14 @@ runInEachFileSystem(() => {
                 useLegacyIds ?
                     '615790887472569365' :
                     '12345'}" meaning="some meaning">a<ph name="PH"/>b<ph name="PH_1"/>c</msg>`,
+            `  <msg id="someId">a<ph name="PH"/>b<ph name="PH_1"/>c</msg>`,
             `  <msg id="67890" desc="some description">a<ph name="START_TAG_SPAN"/><ph name="CLOSE_TAG_SPAN"/>c</msg>`,
             `  <msg id="13579"><ph name="START_BOLD_TEXT"/>b<ph name="CLOSE_BOLD_TEXT"/></msg>`,
             `  <msg id="24680" desc="and description" meaning="meaning">a</msg>`,
             `  <msg id="80808">multi`, `lines</msg>`,
             `  <msg id="90000">&lt;escape<ph name="double-quotes-&quot;"/>me&gt;</msg>`,
+            `  <msg id="100000">pre-ICU {VAR_SELECT, select, a {a} b {<ph name="INTERPOLATION"/>} c {pre <ph name="INTERPOLATION_1"/> post}} post-ICU</msg>`,
+            `  <msg id="100001">{VAR_PLURAL, plural, one {<ph name="START_BOLD_TEXT"/>something bold<ph name="CLOSE_BOLD_TEXT"/>} other {pre <ph name="START_TAG_SPAN"/>middle<ph name="CLOSE_TAG_SPAN"/> post}}</msg>`,
             `</messagebundle>\n`
           ].join('\n'));
         });
diff --git a/packages/localize/src/tools/test/source_file_utils_spec.ts b/packages/localize/src/tools/test/source_file_utils_spec.ts
index b245d8c8cd5d8..df3db7ede3bc9 100644
--- a/packages/localize/src/tools/test/source_file_utils_spec.ts
+++ b/packages/localize/src/tools/test/source_file_utils_spec.ts
@@ -5,206 +5,320 @@
  * 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 {absoluteFrom} from '@angular/compiler-cli/src/ngtsc/file_system';
+import {absoluteFrom, FileSystem, getFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system';
 import {runInEachFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system/testing';
 import {ɵmakeTemplateObject} from '@angular/localize';
 import {NodePath, TransformOptions, transformSync} from '@babel/core';
 import generate from '@babel/generator';
 
 import template from '@babel/template';
-import {Expression, Identifier, TaggedTemplateExpression, ExpressionStatement, FunctionDeclaration, CallExpression, isParenthesizedExpression, numericLiteral, binaryExpression, NumericLiteral} from '@babel/types';
+import {Expression, Identifier, TaggedTemplateExpression, ExpressionStatement, CallExpression, isParenthesizedExpression, numericLiteral, binaryExpression, NumericLiteral} from '@babel/types';
 import {isGlobalIdentifier, isNamedIdentifier, isStringLiteralArray, isArrayOfExpressions, unwrapStringLiteralArray, unwrapMessagePartsFromLocalizeCall, wrapInParensIfNecessary, buildLocalizeReplacement, unwrapSubstitutionsFromLocalizeCall, unwrapMessagePartsFromTemplateLiteral, getLocation} from '../src/source_file_utils';
 
-describe('utils', () => {
-  describe('isNamedIdentifier()', () => {
-    it('should return true if the expression is an identifier with name `$localize`', () => {
-      const taggedTemplate = getTaggedTemplate('$localize ``;');
-      expect(isNamedIdentifier(taggedTemplate.get('tag'), '$localize')).toBe(true);
-    });
+runInEachFileSystem(() => {
+  let fs: FileSystem;
+  beforeEach(() => fs = getFileSystem());
+  describe('utils', () => {
+    describe('isNamedIdentifier()', () => {
+      it('should return true if the expression is an identifier with name `$localize`', () => {
+        const taggedTemplate = getTaggedTemplate('$localize ``;');
+        expect(isNamedIdentifier(taggedTemplate.get('tag'), '$localize')).toBe(true);
+      });
 
-    it('should return false if the expression is an identifier without the name `$localize`',
-       () => {
-         const taggedTemplate = getTaggedTemplate('other ``;');
-         expect(isNamedIdentifier(taggedTemplate.get('tag'), '$localize')).toBe(false);
-       });
+      it('should return false if the expression is an identifier without the name `$localize`',
+         () => {
+           const taggedTemplate = getTaggedTemplate('other ``;');
+           expect(isNamedIdentifier(taggedTemplate.get('tag'), '$localize')).toBe(false);
+         });
 
-    it('should return false if the expression is not an identifier', () => {
-      const taggedTemplate = getTaggedTemplate('$localize() ``;');
-      expect(isNamedIdentifier(taggedTemplate.get('tag'), '$localize')).toBe(false);
+      it('should return false if the expression is not an identifier', () => {
+        const taggedTemplate = getTaggedTemplate('$localize() ``;');
+        expect(isNamedIdentifier(taggedTemplate.get('tag'), '$localize')).toBe(false);
+      });
     });
-  });
 
-  describe('isGlobalIdentifier()', () => {
-    it('should return true if the identifier is at the top level and not declared', () => {
-      const taggedTemplate = getTaggedTemplate('$localize ``;');
-      expect(isGlobalIdentifier(taggedTemplate.get('tag') as NodePath<Identifier>)).toBe(true);
-    });
+    describe('isGlobalIdentifier()', () => {
+      it('should return true if the identifier is at the top level and not declared', () => {
+        const taggedTemplate = getTaggedTemplate('$localize ``;');
+        expect(isGlobalIdentifier(taggedTemplate.get('tag') as NodePath<Identifier>)).toBe(true);
+      });
 
-    it('should return true if the identifier is in a block scope and not declared', () => {
-      const taggedTemplate = getTaggedTemplate('function foo() { $localize ``; } foo();');
-      expect(isGlobalIdentifier(taggedTemplate.get('tag') as NodePath<Identifier>)).toBe(true);
-    });
+      it('should return true if the identifier is in a block scope and not declared', () => {
+        const taggedTemplate = getTaggedTemplate('function foo() { $localize ``; } foo();');
+        expect(isGlobalIdentifier(taggedTemplate.get('tag') as NodePath<Identifier>)).toBe(true);
+      });
 
-    it('should return false if the identifier is declared locally', () => {
-      const taggedTemplate = getTaggedTemplate('function $localize() {} $localize ``;');
-      expect(isGlobalIdentifier(taggedTemplate.get('tag') as NodePath<Identifier>)).toBe(false);
-    });
+      it('should return false if the identifier is declared locally', () => {
+        const taggedTemplate = getTaggedTemplate('function $localize() {} $localize ``;');
+        expect(isGlobalIdentifier(taggedTemplate.get('tag') as NodePath<Identifier>)).toBe(false);
+      });
 
-    it('should return false if the identifier is a function parameter', () => {
-      const taggedTemplate = getTaggedTemplate('function foo($localize) { $localize ``; }');
-      expect(isGlobalIdentifier(taggedTemplate.get('tag') as NodePath<Identifier>)).toBe(false);
+      it('should return false if the identifier is a function parameter', () => {
+        const taggedTemplate = getTaggedTemplate('function foo($localize) { $localize ``; }');
+        expect(isGlobalIdentifier(taggedTemplate.get('tag') as NodePath<Identifier>)).toBe(false);
+      });
     });
-  });
 
-  describe('buildLocalizeReplacement', () => {
-    it('should interleave the `messageParts` with the `substitutions`', () => {
-      const messageParts = ɵmakeTemplateObject(['a', 'b', 'c'], ['a', 'b', 'c']);
-      const substitutions = [numericLiteral(1), numericLiteral(2)];
-      const expression = buildLocalizeReplacement(messageParts, substitutions);
-      expect(generate(expression).code).toEqual('"a" + 1 + "b" + 2 + "c"');
-    });
+    describe('buildLocalizeReplacement', () => {
+      it('should interleave the `messageParts` with the `substitutions`', () => {
+        const messageParts = ɵmakeTemplateObject(['a', 'b', 'c'], ['a', 'b', 'c']);
+        const substitutions = [numericLiteral(1), numericLiteral(2)];
+        const expression = buildLocalizeReplacement(messageParts, substitutions);
+        expect(generate(expression).code).toEqual('"a" + 1 + "b" + 2 + "c"');
+      });
 
-    it('should wrap "binary expression" substitutions in parentheses', () => {
-      const messageParts = ɵmakeTemplateObject(['a', 'b'], ['a', 'b']);
-      const binary = binaryExpression('+', numericLiteral(1), numericLiteral(2));
-      const expression = buildLocalizeReplacement(messageParts, [binary]);
-      expect(generate(expression).code).toEqual('"a" + (1 + 2) + "b"');
+      it('should wrap "binary expression" substitutions in parentheses', () => {
+        const messageParts = ɵmakeTemplateObject(['a', 'b'], ['a', 'b']);
+        const binary = binaryExpression('+', numericLiteral(1), numericLiteral(2));
+        const expression = buildLocalizeReplacement(messageParts, [binary]);
+        expect(generate(expression).code).toEqual('"a" + (1 + 2) + "b"');
+      });
     });
-  });
 
-  describe('unwrapMessagePartsFromLocalizeCall', () => {
-    it('should return an array of string literals from a direct call to a tag function', () => {
-      const localizeCall = getLocalizeCall(`$localize(['a', 'b\\t', 'c'], 1, 2)`);
-      const parts = unwrapMessagePartsFromLocalizeCall(localizeCall);
-      expect(parts).toEqual(['a', 'b\t', 'c']);
-    });
+    describe('unwrapMessagePartsFromLocalizeCall', () => {
+      it('should return an array of string literals and locations from a direct call to a tag function',
+         () => {
+           const localizeCall = getLocalizeCall(`$localize(['a', 'b\\t', 'c'], 1, 2)`);
+           const [parts, locations] = unwrapMessagePartsFromLocalizeCall(localizeCall, fs);
+           expect(parts).toEqual(['a', 'b\t', 'c']);
+           expect(locations).toEqual([
+             {
+               start: {line: 0, column: 11},
+               end: {line: 0, column: 14},
+               file: absoluteFrom('/test/file.js'),
+               text: `'a'`,
+             },
+             {
+               start: {line: 0, column: 16},
+               end: {line: 0, column: 21},
+               file: absoluteFrom('/test/file.js'),
+               text: `'b\\t'`,
+             },
+             {
+               start: {line: 0, column: 23},
+               end: {line: 0, column: 26},
+               file: absoluteFrom('/test/file.js'),
+               text: `'c'`,
+             },
+           ]);
+         });
 
-    it('should return an array of string literals from a downleveled tagged template', () => {
-      let localizeCall = getLocalizeCall(
-          `$localize(__makeTemplateObject(['a', 'b\\t', 'c'], ['a', 'b\\\\t', 'c']), 1, 2)`);
-      const parts = unwrapMessagePartsFromLocalizeCall(localizeCall);
-      expect(parts).toEqual(['a', 'b\t', 'c']);
-      expect(parts.raw).toEqual(['a', 'b\\t', 'c']);
-    });
+      it('should return an array of string literals and locations from a downleveled tagged template',
+         () => {
+           let localizeCall = getLocalizeCall(
+               `$localize(__makeTemplateObject(['a', 'b\\t', 'c'], ['a', 'b\\\\t', 'c']), 1, 2)`);
+           const [parts, locations] = unwrapMessagePartsFromLocalizeCall(localizeCall, fs);
+           expect(parts).toEqual(['a', 'b\t', 'c']);
+           expect(parts.raw).toEqual(['a', 'b\\t', 'c']);
+           expect(locations).toEqual([
+             {
+               start: {line: 0, column: 51},
+               end: {line: 0, column: 54},
+               file: absoluteFrom('/test/file.js'),
+               text: `'a'`,
+             },
+             {
+               start: {line: 0, column: 56},
+               end: {line: 0, column: 62},
+               file: absoluteFrom('/test/file.js'),
+               text: `'b\\\\t'`,
+             },
+             {
+               start: {line: 0, column: 64},
+               end: {line: 0, column: 67},
+               file: absoluteFrom('/test/file.js'),
+               text: `'c'`,
+             },
+           ]);
+         });
 
-    it('should return an array of string literals from a lazy load template helper', () => {
-      let localizeCall = getLocalizeCall(`
+      it('should return an array of string literals and locations from a lazy load template helper',
+         () => {
+           let localizeCall = getLocalizeCall(`
         function _templateObject() {
-          var e = _taggedTemplateLiteral(['a', 'b', 'c'], ['a', 'b', 'c']);
+          var e = _taggedTemplateLiteral(['a', 'b\\t', 'c'], ['a', 'b\\\\t', 'c']);
           return _templateObject = function() { return e }, e
         }
         $localize(_templateObject(), 1, 2)`);
-      const parts = unwrapMessagePartsFromLocalizeCall(localizeCall);
-      expect(parts).toEqual(['a', 'b', 'c']);
-      expect(parts.raw).toEqual(['a', 'b', 'c']);
-    });
+           const [parts, locations] = unwrapMessagePartsFromLocalizeCall(localizeCall, fs);
+           expect(parts).toEqual(['a', 'b\t', 'c']);
+           expect(parts.raw).toEqual(['a', 'b\\t', 'c']);
+           expect(locations).toEqual([
+             {
+               start: {line: 2, column: 61},
+               end: {line: 2, column: 64},
+               file: absoluteFrom('/test/file.js'),
+               text: `'a'`,
+             },
+             {
+               start: {line: 2, column: 66},
+               end: {line: 2, column: 72},
+               file: absoluteFrom('/test/file.js'),
+               text: `'b\\\\t'`,
+             },
+             {
+               start: {line: 2, column: 74},
+               end: {line: 2, column: 77},
+               file: absoluteFrom('/test/file.js'),
+               text: `'c'`,
+             },
+           ]);
+         });
 
-    it('should remove a lazy load template helper', () => {
-      let localizeCall = getLocalizeCall(`
+      it('should remove a lazy load template helper', () => {
+        let localizeCall = getLocalizeCall(`
         function _templateObject() {
           var e = _taggedTemplateLiteral(['a', 'b', 'c'], ['a', 'b', 'c']);
           return _templateObject = function() { return e }, e
         }
         $localize(_templateObject(), 1, 2)`);
-      const localizeStatement = localizeCall.parentPath as NodePath<ExpressionStatement>;
-      const statements = localizeStatement.container as object[];
-      expect(statements.length).toEqual(2);
-      unwrapMessagePartsFromLocalizeCall(localizeCall);
-      expect(statements.length).toEqual(1);
-      expect(statements[0]).toBe(localizeStatement.node);
+        const localizeStatement = localizeCall.parentPath as NodePath<ExpressionStatement>;
+        const statements = localizeStatement.container as object[];
+        expect(statements.length).toEqual(2);
+        unwrapMessagePartsFromLocalizeCall(localizeCall, fs);
+        expect(statements.length).toEqual(1);
+        expect(statements[0]).toBe(localizeStatement.node);
+      });
     });
-  });
 
-  describe('unwrapSubstitutionsFromLocalizeCall', () => {
-    it('should return the substitutions from a direct call to a tag function', () => {
-      const ast = template.ast`$localize(['a', 'b\t', 'c'], 1, 2)` as ExpressionStatement;
-      const call = ast.expression as CallExpression;
-      const substitutions = unwrapSubstitutionsFromLocalizeCall(call);
-      expect(substitutions.map(s => (s as NumericLiteral).value)).toEqual([1, 2]);
-    });
+    describe('unwrapSubstitutionsFromLocalizeCall', () => {
+      it('should return the substitutions and locations from a direct call to a tag function',
+         () => {
+           const call = getLocalizeCall(`$localize(['a', 'b\t', 'c'], 1, 2)`);
+           const [substitutions, locations] = unwrapSubstitutionsFromLocalizeCall(call, fs);
+           expect((substitutions as NumericLiteral[]).map(s => s.value)).toEqual([1, 2]);
+           expect(locations).toEqual([
+             {
+               start: {line: 0, column: 28},
+               end: {line: 0, column: 29},
+               file: absoluteFrom('/test/file.js'),
+               text: '1'
+             },
+             {
+               start: {line: 0, column: 31},
+               end: {line: 0, column: 32},
+               file: absoluteFrom('/test/file.js'),
+               text: '2'
+             },
+           ]);
+         });
 
-    it('should return the substitutions from a downleveled tagged template', () => {
-      const ast = template.ast
-      `$localize(__makeTemplateObject(['a', 'b', 'c'], ['a', 'b', 'c']), 1, 2)` as
-          ExpressionStatement;
-      const call = ast.expression as CallExpression;
-      const substitutions = unwrapSubstitutionsFromLocalizeCall(call);
-      expect(substitutions.map(s => (s as NumericLiteral).value)).toEqual([1, 2]);
+      it('should return the substitutions and locations from a downleveled tagged template', () => {
+        const call = getLocalizeCall(
+            `$localize(__makeTemplateObject(['a', 'b', 'c'], ['a', 'b', 'c']), 1, 2)`);
+        const [substitutions, locations] = unwrapSubstitutionsFromLocalizeCall(call, fs);
+        expect((substitutions as NumericLiteral[]).map(s => s.value)).toEqual([1, 2]);
+        expect(locations).toEqual([
+          {
+            start: {line: 0, column: 66},
+            end: {line: 0, column: 67},
+            file: absoluteFrom('/test/file.js'),
+            text: '1'
+          },
+          {
+            start: {line: 0, column: 69},
+            end: {line: 0, column: 70},
+            file: absoluteFrom('/test/file.js'),
+            text: '2'
+          },
+        ]);
+      });
     });
-  });
 
-  describe('unwrapMessagePartsFromTemplateLiteral', () => {
-    it('should return a TemplateStringsArray built from the template literal elements', () => {
-      const taggedTemplate = getTaggedTemplate('$localize `a${1}b\\t${2}c`;');
-      expect(unwrapMessagePartsFromTemplateLiteral(taggedTemplate.node.quasi.quasis))
-          .toEqual(ɵmakeTemplateObject(['a', 'b\t', 'c'], ['a', 'b\\t', 'c']));
+    describe('unwrapMessagePartsFromTemplateLiteral', () => {
+      it('should return a TemplateStringsArray built from the template literal elements', () => {
+        const taggedTemplate = getTaggedTemplate('$localize `a${1}b\\t${2}c`;');
+        expect(
+            unwrapMessagePartsFromTemplateLiteral(taggedTemplate.get('quasi').get('quasis'), fs)[0])
+            .toEqual(ɵmakeTemplateObject(['a', 'b\t', 'c'], ['a', 'b\\t', 'c']));
+      });
     });
-  });
 
-  describe('wrapInParensIfNecessary', () => {
-    it('should wrap the expression in parentheses if it is binary', () => {
-      const ast = template.ast`a + b` as ExpressionStatement;
-      const wrapped = wrapInParensIfNecessary(ast.expression);
-      expect(isParenthesizedExpression(wrapped)).toBe(true);
-    });
+    describe('wrapInParensIfNecessary', () => {
+      it('should wrap the expression in parentheses if it is binary', () => {
+        const ast = template.ast`a + b` as ExpressionStatement;
+        const wrapped = wrapInParensIfNecessary(ast.expression);
+        expect(isParenthesizedExpression(wrapped)).toBe(true);
+      });
 
-    it('should return the expression untouched if it is not binary', () => {
-      const ast = template.ast`a` as ExpressionStatement;
-      const wrapped = wrapInParensIfNecessary(ast.expression);
-      expect(isParenthesizedExpression(wrapped)).toBe(false);
+      it('should return the expression untouched if it is not binary', () => {
+        const ast = template.ast`a` as ExpressionStatement;
+        const wrapped = wrapInParensIfNecessary(ast.expression);
+        expect(isParenthesizedExpression(wrapped)).toBe(false);
+      });
     });
-  });
 
-  describe('unwrapStringLiteralArray', () => {
-    it('should return an array of string from an array expression', () => {
-      const ast = template.ast`['a', 'b', 'c']` as ExpressionStatement;
-      expect(unwrapStringLiteralArray(ast.expression)).toEqual(['a', 'b', 'c']);
-    });
+    describe('unwrapStringLiteralArray', () => {
+      it('should return an array of string from an array expression', () => {
+        const array = getFirstExpression(`['a', 'b', 'c']`);
+        const [expressions, locations] = unwrapStringLiteralArray(array, fs);
+        expect(expressions).toEqual(['a', 'b', 'c']);
+        expect(locations).toEqual([
+          {
+            start: {line: 0, column: 1},
+            end: {line: 0, column: 4},
+            file: absoluteFrom('/test/file.js'),
+            text: `'a'`,
+          },
+          {
+            start: {line: 0, column: 6},
+            end: {line: 0, column: 9},
+            file: absoluteFrom('/test/file.js'),
+            text: `'b'`,
+          },
+          {
+            start: {line: 0, column: 11},
+            end: {line: 0, column: 14},
+            file: absoluteFrom('/test/file.js'),
+            text: `'c'`,
+          },
+        ]);
+      });
 
-    it('should throw an error if any elements of the array are not literal strings', () => {
-      const ast = template.ast`['a', 2, 'c']` as ExpressionStatement;
-      expect(() => unwrapStringLiteralArray(ast.expression))
-          .toThrowError('Unexpected messageParts for `$localize` (expected an array of strings).');
+      it('should throw an error if any elements of the array are not literal strings', () => {
+        const array = getFirstExpression(`['a', 2, 'c']`);
+        expect(() => unwrapStringLiteralArray(array, fs))
+            .toThrowError(
+                'Unexpected messageParts for `$localize` (expected an array of strings).');
+      });
     });
-  });
 
-  describe('isStringLiteralArray()', () => {
-    it('should return true if the ast is an array of strings', () => {
-      const ast = template.ast`['a', 'b', 'c']` as ExpressionStatement;
-      expect(isStringLiteralArray(ast.expression)).toBe(true);
-    });
+    describe('isStringLiteralArray()', () => {
+      it('should return true if the ast is an array of strings', () => {
+        const ast = template.ast`['a', 'b', 'c']` as ExpressionStatement;
+        expect(isStringLiteralArray(ast.expression)).toBe(true);
+      });
 
-    it('should return false if the ast is not an array', () => {
-      const ast = template.ast`'a'` as ExpressionStatement;
-      expect(isStringLiteralArray(ast.expression)).toBe(false);
-    });
+      it('should return false if the ast is not an array', () => {
+        const ast = template.ast`'a'` as ExpressionStatement;
+        expect(isStringLiteralArray(ast.expression)).toBe(false);
+      });
 
-    it('should return false if at least on of the array elements is not a string', () => {
-      const ast = template.ast`['a', 1, 'b']` as ExpressionStatement;
-      expect(isStringLiteralArray(ast.expression)).toBe(false);
+      it('should return false if at least on of the array elements is not a string', () => {
+        const ast = template.ast`['a', 1, 'b']` as ExpressionStatement;
+        expect(isStringLiteralArray(ast.expression)).toBe(false);
+      });
     });
-  });
 
-  describe('isArrayOfExpressions()', () => {
-    it('should return true if all the nodes are expressions', () => {
-      const ast = template.ast`function foo(a, b, c) {}` as FunctionDeclaration;
-      expect(isArrayOfExpressions(ast.params)).toBe(true);
-    });
+    describe('isArrayOfExpressions()', () => {
+      it('should return true if all the nodes are expressions', () => {
+        const call = getFirstExpression<CallExpression>('foo(a, b, c);');
+        expect(isArrayOfExpressions(call.get('arguments'))).toBe(true);
+      });
 
-    it('should return false if any of the nodes is not an expression', () => {
-      const ast = template.ast`function foo(a, b, ...c) {}` as FunctionDeclaration;
-      expect(isArrayOfExpressions(ast.params)).toBe(false);
+      it('should return false if any of the nodes is not an expression', () => {
+        const call = getFirstExpression<CallExpression>('foo(a, b, ...c);');
+        expect(isArrayOfExpressions(call.get('arguments'))).toBe(false);
+      });
     });
-  });
 
-  runInEachFileSystem(() => {
     describe('getLocation()', () => {
       it('should return a plain object containing the start, end and file of a NodePath', () => {
         const taggedTemplate = getTaggedTemplate('const x = $localize `message`;', {
           filename: 'src/test.js',
           sourceRoot: '/root',
         });
-        const location = getLocation(taggedTemplate)!;
+        const location = getLocation(fs, taggedTemplate)!;
         expect(location).toBeDefined();
         expect(location.start).toEqual({line: 0, column: 10});
         expect(location.start.constructor.name).toEqual('Object');
@@ -214,8 +328,9 @@ describe('utils', () => {
       });
 
       it('should return `undefined` if the NodePath has no filename', () => {
-        const taggedTemplate = getTaggedTemplate('const x = $localize ``;', {sourceRoot: '/root'});
-        const location = getLocation(taggedTemplate);
+        const taggedTemplate = getTaggedTemplate(
+            'const x = $localize ``;', {sourceRoot: '/root', filename: undefined});
+        const location = getLocation(fs, taggedTemplate);
         expect(location).toBeUndefined();
       });
     });
@@ -224,24 +339,38 @@ describe('utils', () => {
 
 function getTaggedTemplate(
     code: string, options?: TransformOptions): NodePath<TaggedTemplateExpression> {
-  const {expressions, plugin} = collectExpressionsPlugin();
-  transformSync(code, {...options, plugins: [plugin]});
-  return expressions.find(e => e.isTaggedTemplateExpression()) as any;
+  return getExpressions<TaggedTemplateExpression>(code, options)
+      .find(e => e.isTaggedTemplateExpression())!;
+}
+
+function getFirstExpression<T extends Expression>(
+    code: string, options?: TransformOptions): NodePath<T> {
+  return getExpressions<T>(code, options)[0];
 }
 
-function collectExpressionsPlugin() {
+function getExpressions<T extends Expression>(
+    code: string, options?: TransformOptions): NodePath<T>[] {
   const expressions: NodePath<Expression>[] = [];
-  const visitor = {
-    Expression: (path: NodePath<Expression>) => {
-      expressions.push(path);
-    }
-  };
-  return {expressions, plugin: {visitor}};
+  transformSync(code, {
+    code: false,
+    filename: '/test/file.js',
+    plugins: [{
+      visitor: {
+        Expression: (path: NodePath<Expression>) => {
+          expressions.push(path);
+        }
+      }
+    }],
+    ...options
+  });
+  return expressions as NodePath<T>[];
 }
 
 function getLocalizeCall(code: string): NodePath<CallExpression> {
   let callPaths: NodePath<CallExpression>[] = [];
   transformSync(code, {
+    code: false,
+    filename: '/test/file.js',
     plugins: [{
       visitor: {
         CallExpression(path) {
diff --git a/packages/localize/src/tools/test/translate/source_files/es2015_translate_plugin_spec.ts b/packages/localize/src/tools/test/translate/source_files/es2015_translate_plugin_spec.ts
index 95c9ed2274f9e..23a5ed343b72a 100644
--- a/packages/localize/src/tools/test/translate/source_files/es2015_translate_plugin_spec.ts
+++ b/packages/localize/src/tools/test/translate/source_files/es2015_translate_plugin_spec.ts
@@ -5,188 +5,179 @@
  * 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 {FileSystem, getFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system';
+import {runInEachFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system/testing';
 import {ɵcomputeMsgId, ɵparseTranslation} from '@angular/localize';
+import {ɵParsedTranslation} from '@angular/localize/private';
 import {transformSync} from '@babel/core';
 
 import {Diagnostics} from '../../../src/diagnostics';
+import {TranslatePluginOptions} from '../../../src/source_file_utils';
 import {makeEs2015TranslatePlugin} from '../../../src/translate/source_files/es2015_translate_plugin';
 
-describe('makeEs2015Plugin', () => {
-  describe('(no translations)', () => {
-    it('should transform `$localize` tags with binary expression', () => {
-      const diagnostics = new Diagnostics();
-      const input = 'const b = 10;\n$localize`try\\n${40 + b}\\n  me`;';
-      const output = transformSync(input, {plugins: [makeEs2015TranslatePlugin(diagnostics, {})]})!;
-      expect(output.code).toEqual('const b = 10;\n"try\\n" + (40 + b) + "\\n  me";');
-    });
-
-    it('should strip meta blocks', () => {
-      const diagnostics = new Diagnostics();
-      const input = 'const b = 10;\n$localize `:description:try\\n${40 + b}\\n  me`;';
-      const output = transformSync(input, {plugins: [makeEs2015TranslatePlugin(diagnostics, {})]})!;
-      expect(output.code).toEqual('const b = 10;\n"try\\n" + (40 + b) + "\\n  me";');
-    });
-
-    it('should not strip escaped meta blocks', () => {
-      const diagnostics = new Diagnostics();
-      const input = 'const b = 10;\n$localize `\\:description:try\\n${40 + b}\\n  me`;';
-      const output = transformSync(input, {plugins: [makeEs2015TranslatePlugin(diagnostics, {})]})!;
-      expect(output.code).toEqual('const b = 10;\n":description:try\\n" + (40 + b) + "\\n  me";');
-    });
-
-
-    it('should transform nested `$localize` tags', () => {
-      const diagnostics = new Diagnostics();
-      const input = '$localize`a${1}b${$localize`x${5}y${6}z`}c`;';
-      const output = transformSync(input, {plugins: [makeEs2015TranslatePlugin(diagnostics, {})]})!;
-      expect(output.code).toEqual('"a" + 1 + "b" + ("x" + 5 + "y" + 6 + "z") + "c";');
-    });
-
-    it('should transform tags inside functions', () => {
-      const diagnostics = new Diagnostics();
-      const input = 'function foo() { $localize`a${1}b${2}c`; }';
-      const output = transformSync(input, {plugins: [makeEs2015TranslatePlugin(diagnostics, {})]})!;
-      expect(output.code).toEqual('function foo() {\n  "a" + 1 + "b" + 2 + "c";\n}');
-    });
-
-    it('should ignore tags with the wrong name', () => {
-      const diagnostics = new Diagnostics();
-      const input = 'other`a${1}b${2}c`;';
-      const output = transformSync(input, {plugins: [makeEs2015TranslatePlugin(diagnostics, {})]})!;
-      expect(output.code).toEqual('other`a${1}b${2}c`;');
-    });
-
-    it('should transform tags with different tag name configured', () => {
-      const diagnostics = new Diagnostics();
-      const input = 'other`a${1}b${2}c`;';
-      const output = transformSync(
-          input, {plugins: [makeEs2015TranslatePlugin(diagnostics, {}, {localizeName: 'other'})]})!;
-      expect(output.code).toEqual('"a" + 1 + "b" + 2 + "c";');
-    });
-
-    it('should ignore tags if the identifier is not global', () => {
-      const diagnostics = new Diagnostics();
-      const input = 'function foo($localize) { $localize`a${1}b${2}c`; }';
-      const output = transformSync(input, {plugins: [makeEs2015TranslatePlugin(diagnostics, {})]})!;
-      expect(output.code).toEqual('function foo($localize) {\n  $localize`a${1}b${2}c`;\n}');
-    });
-
-    it('should add missing translation to diagnostic errors if missingTranslation is set to "error"',
-       () => {
-         const diagnostics = new Diagnostics();
-         const input = 'const b = 10;\n$localize `try\\n${40 + b}\\n  me`;';
-         transformSync(input, {
-           plugins: [makeEs2015TranslatePlugin(diagnostics, {}, {missingTranslation: 'error'})]
-         })!;
-         expect(diagnostics.hasErrors).toBe(true);
-         expect(diagnostics.messages[0]).toEqual({
-           type: 'error',
-           message: `No translation found for "${
-               ɵcomputeMsgId('try\n{$PH}\n  me')}" ("try\n{$PH}\n  me").`
-         });
-       });
-
-    it('should add missing translation to diagnostic errors if missingTranslation is set to "warning"',
-       () => {
-         const diagnostics = new Diagnostics();
-         const input = 'const b = 10;\n$localize `try\\n${40 + b}\\n  me`;';
-         transformSync(input, {
-           plugins: [makeEs2015TranslatePlugin(diagnostics, {}, {missingTranslation: 'warning'})]
-         })!;
-         expect(diagnostics.hasErrors).toBe(false);
-         expect(diagnostics.messages[0]).toEqual({
-           type: 'warning',
-           message: `No translation found for "${
-               ɵcomputeMsgId('try\n{$PH}\n  me')}" ("try\n{$PH}\n  me").`
+runInEachFileSystem(() => {
+  let fs: FileSystem;
+  beforeEach(() => fs = getFileSystem());
+  describe('makeEs2015Plugin', () => {
+    describe('(no translations)', () => {
+      it('should transform `$localize` tags with binary expression', () => {
+        const input = 'const b = 10;\n$localize`try\\n${40 + b}\\n  me`;';
+        const output = transformCode(input);
+        expect(output).toEqual('const b = 10;\n"try\\n" + (40 + b) + "\\n  me";');
+      });
+
+      it('should strip meta blocks', () => {
+        const input = 'const b = 10;\n$localize `:description:try\\n${40 + b}\\n  me`;';
+        const output = transformCode(input);
+        expect(output).toEqual('const b = 10;\n"try\\n" + (40 + b) + "\\n  me";');
+      });
+
+      it('should not strip escaped meta blocks', () => {
+        const input = 'const b = 10;\n$localize `\\:description:try\\n${40 + b}\\n  me`;';
+        const output = transformCode(input);
+        expect(output).toEqual('const b = 10;\n":description:try\\n" + (40 + b) + "\\n  me";');
+      });
+
+      it('should transform nested `$localize` tags', () => {
+        const input = '$localize`a${1}b${$localize`x${5}y${6}z`}c`;';
+        const output = transformCode(input);
+        expect(output).toEqual('"a" + 1 + "b" + ("x" + 5 + "y" + 6 + "z") + "c";');
+      });
+
+      it('should transform tags inside functions', () => {
+        const input = 'function foo() { $localize`a${1}b${2}c`; }';
+        const output = transformCode(input);
+        expect(output).toEqual('function foo() {\n  "a" + 1 + "b" + 2 + "c";\n}');
+      });
+
+      it('should ignore tags with the wrong name', () => {
+        const input = 'other`a${1}b${2}c`;';
+        const output = transformCode(input);
+        expect(output).toEqual('other`a${1}b${2}c`;');
+      });
+
+      it('should transform tags with different tag name configured', () => {
+        const input = 'other`a${1}b${2}c`;';
+        const output = transformCode(input, {}, {localizeName: 'other'});
+        expect(output).toEqual('"a" + 1 + "b" + 2 + "c";');
+      });
+
+      it('should ignore tags if the identifier is not global', () => {
+        const input = 'function foo($localize) { $localize`a${1}b${2}c`; }';
+        const output = transformCode(input);
+        expect(output).toEqual('function foo($localize) {\n  $localize`a${1}b${2}c`;\n}');
+      });
+
+      it('should add missing translation to diagnostic errors if missingTranslation is set to "error"',
+         () => {
+           const input = 'const b = 10;\n$localize `try\\n${40 + b}\\n  me`;';
+           const diagnostics = new Diagnostics();
+           transformCode(input, {}, {missingTranslation: 'error'}, diagnostics);
+           expect(diagnostics.hasErrors).toBe(true);
+           expect(diagnostics.messages[0]).toEqual({
+             type: 'error',
+             message: `No translation found for "${
+                 ɵcomputeMsgId('try\n{$PH}\n  me')}" ("try\n{$PH}\n  me").`
+           });
          });
-       });
-
-    it('should add missing translation to diagnostic errors if missingTranslation is set to "ignore"',
-       () => {
-         const diagnostics = new Diagnostics();
-         const input = 'const b = 10;\n$localize `try\\n${40 + b}\\n  me`;';
-         transformSync(input, {
-           plugins: [makeEs2015TranslatePlugin(diagnostics, {}, {missingTranslation: 'ignore'})]
-         })!;
-         expect(diagnostics.hasErrors).toBe(false);
-         expect(diagnostics.messages).toEqual([]);
-       });
-  });
 
-  describe('(with translations)', () => {
-    it('should translate message parts (identity translations)', () => {
-      const diagnostics = new Diagnostics();
-      const translations = {
-        [ɵcomputeMsgId('abc')]: ɵparseTranslation('abc'),
-        [ɵcomputeMsgId('abc{$PH}')]: ɵparseTranslation('abc{$PH}'),
-        [ɵcomputeMsgId('abc{$PH}def')]: ɵparseTranslation('abc{$PH}def'),
-        [ɵcomputeMsgId('abc{$PH}def{$PH_1}')]: ɵparseTranslation('abc{$PH}def{$PH_1}'),
-        [ɵcomputeMsgId('Hello, {$PH}!')]: ɵparseTranslation('Hello, {$PH}!'),
-      };
-      const input = '$localize `abc`;\n' +
-          '$localize `abc${1 + 2 + 3}`;\n' +
-          '$localize `abc${1 + 2 + 3}def`;\n' +
-          '$localize `abc${1 + 2 + 3}def${4 + 5 + 6}`;\n' +
-          '$localize `Hello, ${getName()}!`;';
-      const output =
-          transformSync(input, {plugins: [makeEs2015TranslatePlugin(diagnostics, translations)]})!;
-      expect(output.code)
-          .toEqual(
-              '"abc";\n' +
-              '"abc" + (1 + 2 + 3) + "";\n' +
-              '"abc" + (1 + 2 + 3) + "def";\n' +
-              '"abc" + (1 + 2 + 3) + "def" + (4 + 5 + 6) + "";\n' +
-              '"Hello, " + getName() + "!";');
-    });
-
-    it('should translate message parts (uppercase translations)', () => {
-      const diagnostics = new Diagnostics();
-      const translations = {
-        [ɵcomputeMsgId('abc')]: ɵparseTranslation('ABC'),
-        [ɵcomputeMsgId('abc{$PH}')]: ɵparseTranslation('ABC{$PH}'),
-        [ɵcomputeMsgId('abc{$PH}def')]: ɵparseTranslation('ABC{$PH}DEF'),
-        [ɵcomputeMsgId('abc{$PH}def{$PH_1}')]: ɵparseTranslation('ABC{$PH}DEF{$PH_1}'),
-        [ɵcomputeMsgId('Hello, {$PH}!')]: ɵparseTranslation('HELLO, {$PH}!'),
-      };
-      const input = '$localize `abc`;\n' +
-          '$localize `abc${1 + 2 + 3}`;\n' +
-          '$localize `abc${1 + 2 + 3}def`;\n' +
-          '$localize `abc${1 + 2 + 3}def${4 + 5 + 6}`;\n' +
-          '$localize `Hello, ${getName()}!`;';
-      const output =
-          transformSync(input, {plugins: [makeEs2015TranslatePlugin(diagnostics, translations)]})!;
-      expect(output.code)
-          .toEqual(
-              '"ABC";\n' +
-              '"ABC" + (1 + 2 + 3) + "";\n' +
-              '"ABC" + (1 + 2 + 3) + "DEF";\n' +
-              '"ABC" + (1 + 2 + 3) + "DEF" + (4 + 5 + 6) + "";\n' +
-              '"HELLO, " + getName() + "!";');
-    });
+      it('should add missing translation to diagnostic errors if missingTranslation is set to "warning"',
+         () => {
+           const input = 'const b = 10;\n$localize `try\\n${40 + b}\\n  me`;';
+           const diagnostics = new Diagnostics();
+           transformCode(input, {}, {missingTranslation: 'warning'}, diagnostics);
+           expect(diagnostics.hasErrors).toBe(false);
+           expect(diagnostics.messages[0]).toEqual({
+             type: 'warning',
+             message: `No translation found for "${
+                 ɵcomputeMsgId('try\n{$PH}\n  me')}" ("try\n{$PH}\n  me").`
+           });
+         });
 
-    it('should translate message parts (reversing placeholders)', () => {
-      const diagnostics = new Diagnostics();
-      const translations = {
-        [ɵcomputeMsgId('abc{$PH}def{$PH_1} - Hello, {$PH_2}!')]:
-            ɵparseTranslation('abc{$PH_2}def{$PH_1} - Hello, {$PH}!'),
-      };
-      const input = '$localize `abc${1 + 2 + 3}def${4 + 5 + 6} - Hello, ${getName()}!`;';
-      const output =
-          transformSync(input, {plugins: [makeEs2015TranslatePlugin(diagnostics, translations)]})!;
-      expect(output.code)
-          .toEqual('"abc" + getName() + "def" + (4 + 5 + 6) + " - Hello, " + (1 + 2 + 3) + "!";');
+      it('should add missing translation to diagnostic errors if missingTranslation is set to "ignore"',
+         () => {
+           const input = 'const b = 10;\n$localize `try\\n${40 + b}\\n  me`;';
+           const diagnostics = new Diagnostics();
+           transformCode(input, {}, {missingTranslation: 'ignore'}, diagnostics);
+           expect(diagnostics.hasErrors).toBe(false);
+           expect(diagnostics.messages).toEqual([]);
+         });
     });
 
-    it('should translate message parts (removing placeholders)', () => {
-      const diagnostics = new Diagnostics();
-      const translations = {
-        [ɵcomputeMsgId('abc{$PH}def{$PH_1} - Hello, {$PH_2}!')]:
-            ɵparseTranslation('abc{$PH} - Hello, {$PH_2}!'),
-      };
-      const input = '$localize `abc${1 + 2 + 3}def${4 + 5 + 6} - Hello, ${getName()}!`;';
-      const output =
-          transformSync(input, {plugins: [makeEs2015TranslatePlugin(diagnostics, translations)]})!;
-      expect(output.code).toEqual('"abc" + (1 + 2 + 3) + " - Hello, " + getName() + "!";');
+    describe('(with translations)', () => {
+      it('should translate message parts (identity translations)', () => {
+        const translations = {
+          [ɵcomputeMsgId('abc')]: ɵparseTranslation('abc'),
+          [ɵcomputeMsgId('abc{$PH}')]: ɵparseTranslation('abc{$PH}'),
+          [ɵcomputeMsgId('abc{$PH}def')]: ɵparseTranslation('abc{$PH}def'),
+          [ɵcomputeMsgId('abc{$PH}def{$PH_1}')]: ɵparseTranslation('abc{$PH}def{$PH_1}'),
+          [ɵcomputeMsgId('Hello, {$PH}!')]: ɵparseTranslation('Hello, {$PH}!'),
+        };
+        const input = '$localize `abc`;\n' +
+            '$localize `abc${1 + 2 + 3}`;\n' +
+            '$localize `abc${1 + 2 + 3}def`;\n' +
+            '$localize `abc${1 + 2 + 3}def${4 + 5 + 6}`;\n' +
+            '$localize `Hello, ${getName()}!`;';
+        const output = transformCode(input, translations);
+        expect(output).toEqual(
+            '"abc";\n' +
+            '"abc" + (1 + 2 + 3) + "";\n' +
+            '"abc" + (1 + 2 + 3) + "def";\n' +
+            '"abc" + (1 + 2 + 3) + "def" + (4 + 5 + 6) + "";\n' +
+            '"Hello, " + getName() + "!";');
+      });
+
+      it('should translate message parts (uppercase translations)', () => {
+        const translations = {
+          [ɵcomputeMsgId('abc')]: ɵparseTranslation('ABC'),
+          [ɵcomputeMsgId('abc{$PH}')]: ɵparseTranslation('ABC{$PH}'),
+          [ɵcomputeMsgId('abc{$PH}def')]: ɵparseTranslation('ABC{$PH}DEF'),
+          [ɵcomputeMsgId('abc{$PH}def{$PH_1}')]: ɵparseTranslation('ABC{$PH}DEF{$PH_1}'),
+          [ɵcomputeMsgId('Hello, {$PH}!')]: ɵparseTranslation('HELLO, {$PH}!'),
+        };
+        const input = '$localize `abc`;\n' +
+            '$localize `abc${1 + 2 + 3}`;\n' +
+            '$localize `abc${1 + 2 + 3}def`;\n' +
+            '$localize `abc${1 + 2 + 3}def${4 + 5 + 6}`;\n' +
+            '$localize `Hello, ${getName()}!`;';
+        const output = transformCode(input, translations);
+        expect(output).toEqual(
+            '"ABC";\n' +
+            '"ABC" + (1 + 2 + 3) + "";\n' +
+            '"ABC" + (1 + 2 + 3) + "DEF";\n' +
+            '"ABC" + (1 + 2 + 3) + "DEF" + (4 + 5 + 6) + "";\n' +
+            '"HELLO, " + getName() + "!";');
+      });
+
+      it('should translate message parts (reversing placeholders)', () => {
+        const translations = {
+          [ɵcomputeMsgId('abc{$PH}def{$PH_1} - Hello, {$PH_2}!')]:
+              ɵparseTranslation('abc{$PH_2}def{$PH_1} - Hello, {$PH}!'),
+        };
+        const input = '$localize `abc${1 + 2 + 3}def${4 + 5 + 6} - Hello, ${getName()}!`;';
+        const output = transformCode(input, translations);
+        expect(output).toEqual(
+            '"abc" + getName() + "def" + (4 + 5 + 6) + " - Hello, " + (1 + 2 + 3) + "!";');
+      });
+
+      it('should translate message parts (removing placeholders)', () => {
+        const translations = {
+          [ɵcomputeMsgId('abc{$PH}def{$PH_1} - Hello, {$PH_2}!')]:
+              ɵparseTranslation('abc{$PH} - Hello, {$PH_2}!'),
+        };
+        const input = '$localize `abc${1 + 2 + 3}def${4 + 5 + 6} - Hello, ${getName()}!`;';
+        const output = transformCode(input, translations);
+        expect(output).toEqual('"abc" + (1 + 2 + 3) + " - Hello, " + getName() + "!";');
+      });
     });
   });
+
+  function transformCode(
+      input: string, translations: Record<string, ɵParsedTranslation> = {},
+      pluginOptions?: TranslatePluginOptions, diagnostics = new Diagnostics()): string {
+    return transformSync(input, {
+             plugins: [makeEs2015TranslatePlugin(diagnostics, translations, pluginOptions)],
+             filename: '/app/dist/test.js'
+           })!.code!;
+  }
 });
diff --git a/packages/localize/src/tools/test/translate/source_files/es5_translate_plugin_spec.ts b/packages/localize/src/tools/test/translate/source_files/es5_translate_plugin_spec.ts
index 82af15cfa5346..088113f405e4f 100644
--- a/packages/localize/src/tools/test/translate/source_files/es5_translate_plugin_spec.ts
+++ b/packages/localize/src/tools/test/translate/source_files/es5_translate_plugin_spec.ts
@@ -5,107 +5,99 @@
  * 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 {FileSystem, getFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system';
+import {runInEachFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system/testing';
 import {ɵcomputeMsgId, ɵparseTranslation} from '@angular/localize';
+import {ɵParsedTranslation} from '@angular/localize/private';
 import {transformSync} from '@babel/core';
 
 import {Diagnostics} from '../../../src/diagnostics';
+import {TranslatePluginOptions} from '../../../src/source_file_utils';
 import {makeEs5TranslatePlugin} from '../../../src/translate/source_files/es5_translate_plugin';
 
-describe('makeEs5Plugin', () => {
-  describe('(no translations)', () => {
-    it('should transform `$localize` calls with binary expression', () => {
-      const diagnostics = new Diagnostics();
-      const input = 'const b = 10;\n$localize(["try\\n", "\\n  me"], 40 + b);';
-      const output = transformSync(input, {plugins: [makeEs5TranslatePlugin(diagnostics, {})]})!;
-      expect(output.code).toEqual('const b = 10;\n"try\\n" + (40 + b) + "\\n  me";');
-    });
+runInEachFileSystem(() => {
+  let fs: FileSystem;
+  beforeEach(() => fs = getFileSystem());
+  describe('makeEs5Plugin', () => {
+    describe('(no translations)', () => {
+      it('should transform `$localize` calls with binary expression', () => {
+        const input = 'const b = 10;\n$localize(["try\\n", "\\n  me"], 40 + b);';
+        const output = transformCode(input);
+        expect(output).toEqual('const b = 10;\n"try\\n" + (40 + b) + "\\n  me";');
+      });
 
-    it('should strip meta blocks', () => {
-      const diagnostics = new Diagnostics();
-      const input =
-          'const b = 10;\n$localize([":description:try\\n", ":placeholder:\\n  me"], 40 + b);';
-      const output = transformSync(input, {plugins: [makeEs5TranslatePlugin(diagnostics, {})]})!;
-      expect(output.code).toEqual('const b = 10;\n"try\\n" + (40 + b) + "\\n  me";');
-    });
+      it('should strip meta blocks', () => {
+        const input =
+            'const b = 10;\n$localize([":description:try\\n", ":placeholder:\\n  me"], 40 + b);';
+        const output = transformCode(input);
+        expect(output).toEqual('const b = 10;\n"try\\n" + (40 + b) + "\\n  me";');
+      });
 
-    it('should not strip escaped meta blocks', () => {
-      const diagnostics = new Diagnostics();
-      const input =
-          `$localize(__makeTemplateObject([':desc:try', 'me'], ['\\\\\\:desc:try', 'me']), 40 + 2);`;
-      const output = transformSync(input, {plugins: [makeEs5TranslatePlugin(diagnostics, {})]})!;
-      expect(output.code).toEqual('":desc:try" + (40 + 2) + "me";');
-    });
+      it('should not strip escaped meta blocks', () => {
+        const input =
+            `$localize(__makeTemplateObject([':desc:try', 'me'], ['\\\\\\:desc:try', 'me']), 40 + 2);`;
+        const output = transformCode(input);
+        expect(output).toEqual('":desc:try" + (40 + 2) + "me";');
+      });
 
-    it('should transform nested `$localize` calls', () => {
-      const diagnostics = new Diagnostics();
-      const input = '$localize(["a", "b", "c"], 1, $localize(["x", "y", "z"], 5, 6));';
-      const output = transformSync(input, {plugins: [makeEs5TranslatePlugin(diagnostics, {})]})!;
-      expect(output.code).toEqual('"a" + 1 + "b" + ("x" + 5 + "y" + 6 + "z") + "c";');
-    });
+      it('should transform nested `$localize` calls', () => {
+        const input = '$localize(["a", "b", "c"], 1, $localize(["x", "y", "z"], 5, 6));';
+        const output = transformCode(input);
+        expect(output).toEqual('"a" + 1 + "b" + ("x" + 5 + "y" + 6 + "z") + "c";');
+      });
 
-    it('should transform calls inside functions', () => {
-      const diagnostics = new Diagnostics();
-      const input = 'function foo() { $localize(["a", "b", "c"], 1, 2); }';
-      const output = transformSync(input, {plugins: [makeEs5TranslatePlugin(diagnostics, {})]})!;
-      expect(output.code).toEqual('function foo() {\n  "a" + 1 + "b" + 2 + "c";\n}');
-    });
+      it('should transform calls inside functions', () => {
+        const input = 'function foo() { $localize(["a", "b", "c"], 1, 2); }';
+        const output = transformCode(input);
+        expect(output).toEqual('function foo() {\n  "a" + 1 + "b" + 2 + "c";\n}');
+      });
 
-    it('should ignore tags with the wrong name', () => {
-      const diagnostics = new Diagnostics();
-      const input = 'other(["a", "b", "c"], 1, 2);';
-      const output = transformSync(input, {plugins: [makeEs5TranslatePlugin(diagnostics, {})]})!;
-      expect(output.code).toEqual('other(["a", "b", "c"], 1, 2);');
-    });
+      it('should ignore tags with the wrong name', () => {
+        const input = 'other(["a", "b", "c"], 1, 2);';
+        const output = transformCode(input);
+        expect(output).toEqual('other(["a", "b", "c"], 1, 2);');
+      });
 
-    it('should transform calls with different function name configured', () => {
-      const diagnostics = new Diagnostics();
-      const input = 'other(["a", "b", "c"], 1, 2);';
-      const output = transformSync(
-          input, {plugins: [makeEs5TranslatePlugin(diagnostics, {}, {localizeName: 'other'})]})!;
-      expect(output.code).toEqual('"a" + 1 + "b" + 2 + "c";');
-    });
+      it('should transform calls with different function name configured', () => {
+        const input = 'other(["a", "b", "c"], 1, 2);';
+        const output = transformCode(input, {}, {localizeName: 'other'});
+        expect(output).toEqual('"a" + 1 + "b" + 2 + "c";');
+      });
 
-    it('should ignore tags if the identifier is not global', () => {
-      const diagnostics = new Diagnostics();
-      const input = 'function foo($localize) { $localize(["a", "b", "c"], 1, 2); }';
-      const output = transformSync(input, {plugins: [makeEs5TranslatePlugin(diagnostics, {})]})!;
-      expect(output.code)
-          .toEqual('function foo($localize) {\n  $localize(["a", "b", "c"], 1, 2);\n}');
-    });
+      it('should ignore tags if the identifier is not global', () => {
+        const input = 'function foo($localize) { $localize(["a", "b", "c"], 1, 2); }';
+        const output = transformCode(input);
+        expect(output).toEqual('function foo($localize) {\n  $localize(["a", "b", "c"], 1, 2);\n}');
+      });
 
-    it('should handle template object helper calls', () => {
-      const diagnostics = new Diagnostics();
-      const input = `$localize(__makeTemplateObject(['try', 'me'], ['try', 'me']), 40 + 2);`;
-      const output = transformSync(input, {plugins: [makeEs5TranslatePlugin(diagnostics, {})]})!;
-      expect(output.code).toEqual('"try" + (40 + 2) + "me";');
-    });
+      it('should handle template object helper calls', () => {
+        const input = `$localize(__makeTemplateObject(['try', 'me'], ['try', 'me']), 40 + 2);`;
+        const output = transformCode(input);
+        expect(output).toEqual('"try" + (40 + 2) + "me";');
+      });
 
-    it('should handle template object aliased helper calls', () => {
-      const diagnostics = new Diagnostics();
-      const input = `$localize(m(['try', 'me'], ['try', 'me']), 40 + 2);`;
-      const output = transformSync(input, {plugins: [makeEs5TranslatePlugin(diagnostics, {})]})!;
-      expect(output.code).toEqual('"try" + (40 + 2) + "me";');
-    });
+      it('should handle template object aliased helper calls', () => {
+        const input = `$localize(m(['try', 'me'], ['try', 'me']), 40 + 2);`;
+        const output = transformCode(input);
+        expect(output).toEqual('"try" + (40 + 2) + "me";');
+      });
 
-    it('should handle template object inline helper calls', () => {
-      const diagnostics = new Diagnostics();
-      const input =
-          `$localize((this&&this.__makeTemplateObject||function(e,t){return Object.defineProperty?Object.defineProperty(e,"raw",{value:t}):e.raw=t,e})(['try', 'me'], ['try', 'me']), 40 + 2);`;
-      const output = transformSync(input, {plugins: [makeEs5TranslatePlugin(diagnostics, {})]})!;
-      expect(output.code).toEqual('"try" + (40 + 2) + "me";');
-    });
+      it('should handle template object inline helper calls', () => {
+        const input =
+            `$localize((this&&this.__makeTemplateObject||function(e,t){return Object.defineProperty?Object.defineProperty(e,"raw",{value:t}):e.raw=t,e})(['try', 'me'], ['try', 'me']), 40 + 2);`;
+        const output = transformCode(input);
+        expect(output).toEqual('"try" + (40 + 2) + "me";');
+      });
 
-    it('should handle cached helper calls', () => {
-      const diagnostics = new Diagnostics();
-      const input =
-          `$localize(cachedObj||(cachedObj=__makeTemplateObject(['try', 'me'],['try', 'me'])),40 + 2)`;
-      const output = transformSync(input, {plugins: [makeEs5TranslatePlugin(diagnostics, {})]})!;
-      expect(output.code).toEqual('"try" + (40 + 2) + "me";');
-    });
+      it('should handle cached helper calls', () => {
+        const input =
+            `$localize(cachedObj||(cachedObj=__makeTemplateObject(['try', 'me'],['try', 'me'])),40 + 2)`;
+        const output = transformCode(input);
+        expect(output).toEqual('"try" + (40 + 2) + "me";');
+      });
 
-    it('should handle minified code', () => {
-      const diagnostics = new Diagnostics();
-      const input = `$localize(
+      it('should handle minified code', () => {
+        const input = `$localize(
         cachedObj||
         (
           cookedParts=['try', 'me'],
@@ -115,13 +107,12 @@ describe('makeEs5Plugin', () => {
             cookedParts.raw=rawParts,
           cachedObj=cookedParts
         ),40 + 2)`;
-      const output = transformSync(input, {plugins: [makeEs5TranslatePlugin(diagnostics, {})]})!;
-      expect(output.code).toEqual('"try" + (40 + 2) + "me";');
-    });
+        const output = transformCode(input);
+        expect(output).toEqual('"try" + (40 + 2) + "me";');
+      });
 
-    it('should handle lazy-load helper calls', () => {
-      const diagnostics = new Diagnostics();
-      const input = `
+      it('should handle lazy-load helper calls', () => {
+        const input = `
       function _templateObject2() {
         var e = _taggedTemplateLiteral([':escaped-colons:Welcome to the i18n app.'], ['\\\\\\:escaped-colons:Welcome to the i18n app.']);
         return _templateObject2 = function() { return e }, e
@@ -139,262 +130,243 @@ describe('makeEs5Plugin', () => {
         console.log($localize(_templateObject(), '\ufffd0\ufffd'));
       }
       `;
-      const output = transformSync(input, {plugins: [makeEs5TranslatePlugin(diagnostics, {})]})!;
-      expect(output.code).toContain('const message = ":escaped-colons:Welcome to the i18n app."');
-      expect(output.code).toContain('console.log(" Hello " + \'\ufffd0\ufffd\' + "! ");');
-      expect(output.code).not.toContain('templateObject');
-      expect(output.code).not.toContain('templateObject2');
-    });
+        const output = transformCode(input);
+        expect(output).toContain('const message = ":escaped-colons:Welcome to the i18n app."');
+        expect(output).toContain('console.log(" Hello " + \'\ufffd0\ufffd\' + "! ");');
+        expect(output).not.toContain('templateObject');
+        expect(output).not.toContain('templateObject2');
+      });
 
-    it('should add diagnostic error with code-frame information if the arguments to `$localize` are missing',
-       () => {
-         const diagnostics = new Diagnostics();
-         const input = '$localize()';
-         transformSync(
-             input,
-             {plugins: [makeEs5TranslatePlugin(diagnostics, {})], filename: '/app/dist/test.js'});
-         expect(diagnostics.hasErrors).toBe(true);
-         expect(diagnostics.messages[0]).toEqual({
-           type: 'error',
-           message: '/app/dist/test.js: `$localize` called without any arguments.\n' +
-               '> 1 | $localize()\n' +
-               '    | ^^^^^^^^^^^',
+      it('should add diagnostic error with code-frame information if the arguments to `$localize` are missing',
+         () => {
+           const input = '$localize()';
+           const diagnostics = new Diagnostics();
+           transformCode(input, {}, {}, diagnostics);
+           expect(diagnostics.hasErrors).toBe(true);
+           expect(diagnostics.messages[0]).toEqual({
+             type: 'error',
+             message: '/app/dist/test.js: `$localize` called without any arguments.\n' +
+                 '> 1 | $localize()\n' +
+                 '    | ^^^^^^^^^^^',
+           });
          });
-       });
 
-    it('should add diagnostic error with code-frame information if the arguments to `$localize` are invalid',
-       () => {
-         const diagnostics = new Diagnostics();
-         const input = '$localize(...x)';
-         transformSync(
-             input,
-             {plugins: [makeEs5TranslatePlugin(diagnostics, {})], filename: '/app/dist/test.js'});
-         expect(diagnostics.hasErrors).toBe(true);
-         expect(diagnostics.messages[0]).toEqual({
-           type: 'error',
-           message: '/app/dist/test.js: Unexpected argument to `$localize` (expected an array).\n' +
-               '> 1 | $localize(...x)\n' +
-               '    |           ^^^^',
+      it('should add diagnostic error with code-frame information if the arguments to `$localize` are invalid',
+         () => {
+           const input = '$localize(...x)';
+           const diagnostics = new Diagnostics();
+           transformCode(input, {}, {}, diagnostics);
+           expect(diagnostics.hasErrors).toBe(true);
+           expect(diagnostics.messages[0]).toEqual({
+             type: 'error',
+             message:
+                 '/app/dist/test.js: Unexpected argument to `$localize` (expected an array).\n' +
+                 '> 1 | $localize(...x)\n' +
+                 '    |           ^^^^',
+           });
          });
-       });
 
-    it('should add diagnostic error with code-frame information if the first argument to `$localize` is not an array',
-       () => {
-         const diagnostics = new Diagnostics();
-         const input = '$localize(null, [])';
-         transformSync(
-             input,
-             {plugins: [makeEs5TranslatePlugin(diagnostics, {})], filename: '/app/dist/test.js'});
-         expect(diagnostics.hasErrors).toBe(true);
-         expect(diagnostics.messages[0]).toEqual({
-           type: 'error',
-           message:
-               '/app/dist/test.js: Unexpected messageParts for `$localize` (expected an array of strings).\n' +
-               '> 1 | $localize(null, [])\n' +
-               '    |           ^^^^',
+      it('should add diagnostic error with code-frame information if the first argument to `$localize` is not an array',
+         () => {
+           const input = '$localize(null, [])';
+           const diagnostics = new Diagnostics();
+           transformCode(input, {}, {}, diagnostics);
+           expect(diagnostics.hasErrors).toBe(true);
+           expect(diagnostics.messages[0]).toEqual({
+             type: 'error',
+             message:
+                 '/app/dist/test.js: Unexpected messageParts for `$localize` (expected an array of strings).\n' +
+                 '> 1 | $localize(null, [])\n' +
+                 '    |           ^^^^',
+           });
          });
-       });
 
-    it('should add diagnostic error with code-frame information if raw message parts are not an expression',
-       () => {
-         const diagnostics = new Diagnostics();
-         const input = '$localize(__makeTemplateObject([], ...[]))';
-         transformSync(
-             input,
-             {plugins: [makeEs5TranslatePlugin(diagnostics, {})], filename: '/app/dist/test.js'});
-         expect(diagnostics.hasErrors).toBe(true);
-         expect(diagnostics.messages[0]).toEqual({
-           type: 'error',
-           message:
-               '/app/dist/test.js: Unexpected `raw` argument to the "makeTemplateObject()" function (expected an expression).\n' +
-               '> 1 | $localize(__makeTemplateObject([], ...[]))\n' +
-               '    |                                    ^^^^^',
+      it('should add diagnostic error with code-frame information if raw message parts are not an expression',
+         () => {
+           const input = '$localize(__makeTemplateObject([], ...[]))';
+           const diagnostics = new Diagnostics();
+           transformCode(input, {}, {}, diagnostics);
+           expect(diagnostics.hasErrors).toBe(true);
+           expect(diagnostics.messages[0]).toEqual({
+             type: 'error',
+             message:
+                 '/app/dist/test.js: Unexpected `raw` argument to the "makeTemplateObject()" function (expected an expression).\n' +
+                 '> 1 | $localize(__makeTemplateObject([], ...[]))\n' +
+                 '    |                                    ^^^^^',
+           });
          });
-       });
 
-    it('should add diagnostic error with code-frame information if cooked message parts are not an expression',
-       () => {
-         const diagnostics = new Diagnostics();
-         const input = '$localize(__makeTemplateObject(...[], []))';
-         transformSync(
-             input,
-             {plugins: [makeEs5TranslatePlugin(diagnostics, {})], filename: '/app/dist/test.js'});
-         expect(diagnostics.hasErrors).toBe(true);
-         expect(diagnostics.messages[0]).toEqual({
-           type: 'error',
-           message:
-               '/app/dist/test.js: Unexpected `cooked` argument to the "makeTemplateObject()" function (expected an expression).\n' +
-               '> 1 | $localize(__makeTemplateObject(...[], []))\n' +
-               '    |                                ^^^^^',
+      it('should add diagnostic error with code-frame information if cooked message parts are not an expression',
+         () => {
+           const input = '$localize(__makeTemplateObject(...[], []))';
+           const diagnostics = new Diagnostics();
+           transformCode(input, {}, {}, diagnostics);
+           expect(diagnostics.hasErrors).toBe(true);
+           expect(diagnostics.messages[0]).toEqual({
+             type: 'error',
+             message:
+                 '/app/dist/test.js: Unexpected `cooked` argument to the "makeTemplateObject()" function (expected an expression).\n' +
+                 '> 1 | $localize(__makeTemplateObject(...[], []))\n' +
+                 '    |                                ^^^^^',
+           });
          });
-       });
 
-    it('should add diagnostic error with code-frame information if not all cooked message parts are strings',
-       () => {
-         const diagnostics = new Diagnostics();
-         const input = '$localize(__makeTemplateObject(["a", 12, "b"], ["a", "12", "b"]))';
-         transformSync(
-             input,
-             {plugins: [makeEs5TranslatePlugin(diagnostics, {})], filename: '/app/dist/test.js'});
-         expect(diagnostics.hasErrors).toBe(true);
-         expect(diagnostics.messages[0]).toEqual({
-           type: 'error',
-           message:
-               '/app/dist/test.js: Unexpected messageParts for `$localize` (expected an array of strings).\n' +
-               '> 1 | $localize(__makeTemplateObject(["a", 12, "b"], ["a", "12", "b"]))\n' +
-               '    |                                ^^^^^^^^^^^^^^',
+      it('should add diagnostic error with code-frame information if not all cooked message parts are strings',
+         () => {
+           const input = '$localize(__makeTemplateObject(["a", 12, "b"], ["a", "12", "b"]))';
+           const diagnostics = new Diagnostics();
+           transformCode(input, {}, {}, diagnostics);
+           expect(diagnostics.hasErrors).toBe(true);
+           expect(diagnostics.messages[0]).toEqual({
+             type: 'error',
+             message:
+                 '/app/dist/test.js: Unexpected messageParts for `$localize` (expected an array of strings).\n' +
+                 '> 1 | $localize(__makeTemplateObject(["a", 12, "b"], ["a", "12", "b"]))\n' +
+                 '    |                                ^^^^^^^^^^^^^^',
+           });
          });
-       });
 
-    it('should add diagnostic error with code-frame information if not all raw message parts are strings',
-       () => {
-         const diagnostics = new Diagnostics();
-         const input = '$localize(__makeTemplateObject(["a", "12", "b"], ["a", 12, "b"]))';
-         transformSync(
-             input,
-             {plugins: [makeEs5TranslatePlugin(diagnostics, {})], filename: '/app/dist/test.js'});
-         expect(diagnostics.hasErrors).toBe(true);
-         expect(diagnostics.messages[0]).toEqual({
-           type: 'error',
-           message:
-               '/app/dist/test.js: Unexpected messageParts for `$localize` (expected an array of strings).\n' +
-               '> 1 | $localize(__makeTemplateObject(["a", "12", "b"], ["a", 12, "b"]))\n' +
-               '    |                                                  ^^^^^^^^^^^^^^',
+      it('should add diagnostic error with code-frame information if not all raw message parts are strings',
+         () => {
+           const input = '$localize(__makeTemplateObject(["a", "12", "b"], ["a", 12, "b"]))';
+           const diagnostics = new Diagnostics();
+           transformCode(input, {}, {}, diagnostics);
+           expect(diagnostics.hasErrors).toBe(true);
+           expect(diagnostics.messages[0]).toEqual({
+             type: 'error',
+             message:
+                 '/app/dist/test.js: Unexpected messageParts for `$localize` (expected an array of strings).\n' +
+                 '> 1 | $localize(__makeTemplateObject(["a", "12", "b"], ["a", 12, "b"]))\n' +
+                 '    |                                                  ^^^^^^^^^^^^^^',
+           });
          });
-       });
 
-    it('should add diagnostic error with code-frame information if not all substitutions are expressions',
-       () => {
-         const diagnostics = new Diagnostics();
-         const input = '$localize(__makeTemplateObject(["a", "b"], ["a", "b"]), ...[])';
-         transformSync(
-             input,
-             {plugins: [makeEs5TranslatePlugin(diagnostics, {})], filename: '/app/dist/test.js'});
-         expect(diagnostics.hasErrors).toBe(true);
-         expect(diagnostics.messages[0]).toEqual({
-           type: 'error',
-           message:
-               '/app/dist/test.js: Invalid substitutions for `$localize` (expected all substitution arguments to be expressions).\n' +
-               '> 1 | $localize(__makeTemplateObject(["a", "b"], ["a", "b"]), ...[])\n' +
-               '    |                                                         ^^^^^',
+      it('should add diagnostic error with code-frame information if not all substitutions are expressions',
+         () => {
+           const input = '$localize(__makeTemplateObject(["a", "b"], ["a", "b"]), ...[])';
+           const diagnostics = new Diagnostics();
+           transformCode(input, {}, {}, diagnostics);
+           expect(diagnostics.hasErrors).toBe(true);
+           expect(diagnostics.messages[0]).toEqual({
+             type: 'error',
+             message:
+                 '/app/dist/test.js: Invalid substitutions for `$localize` (expected all substitution arguments to be expressions).\n' +
+                 '> 1 | $localize(__makeTemplateObject(["a", "b"], ["a", "b"]), ...[])\n' +
+                 '    |                                                         ^^^^^',
+           });
          });
-       });
 
-    it('should add missing translation to diagnostic errors if missingTranslation is set to "error"',
-       () => {
-         const diagnostics = new Diagnostics();
-         const input = 'const b = 10;\n$localize(["try\\n", "\\n  me"], 40 + b);';
-         transformSync(
-             input,
-             {plugins: [makeEs5TranslatePlugin(diagnostics, {}, {missingTranslation: 'error'})]});
-         expect(diagnostics.hasErrors).toBe(true);
-         expect(diagnostics.messages[0]).toEqual({
-           type: 'error',
-           message: `No translation found for "${
-               ɵcomputeMsgId('try\n{$PH}\n  me')}" ("try\n{$PH}\n  me").`
+      it('should add missing translation to diagnostic errors if missingTranslation is set to "error"',
+         () => {
+           const input = 'const b = 10;\n$localize(["try\\n", "\\n  me"], 40 + b);';
+           const diagnostics = new Diagnostics();
+           transformCode(input, {}, {missingTranslation: 'error'}, diagnostics);
+           expect(diagnostics.hasErrors).toBe(true);
+           expect(diagnostics.messages[0]).toEqual({
+             type: 'error',
+             message: `No translation found for "${
+                 ɵcomputeMsgId('try\n{$PH}\n  me')}" ("try\n{$PH}\n  me").`
+           });
          });
-       });
 
-    it('should add missing translation to diagnostic warnings if missingTranslation is set to "warning"',
-       () => {
-         const diagnostics = new Diagnostics();
-         const input = 'const b = 10;\n$localize(["try\\n", "\\n  me"], 40 + b);';
-         transformSync(
-             input,
-             {plugins: [makeEs5TranslatePlugin(diagnostics, {}, {missingTranslation: 'warning'})]});
-         expect(diagnostics.hasErrors).toBe(false);
-         expect(diagnostics.messages[0]).toEqual({
-           type: 'warning',
-           message: `No translation found for "${
-               ɵcomputeMsgId('try\n{$PH}\n  me')}" ("try\n{$PH}\n  me").`
+      it('should add missing translation to diagnostic warnings if missingTranslation is set to "warning"',
+         () => {
+           const input = 'const b = 10;\n$localize(["try\\n", "\\n  me"], 40 + b);';
+           const diagnostics = new Diagnostics();
+           transformCode(input, {}, {missingTranslation: 'warning'}, diagnostics);
+           expect(diagnostics.hasErrors).toBe(false);
+           expect(diagnostics.messages[0]).toEqual({
+             type: 'warning',
+             message: `No translation found for "${
+                 ɵcomputeMsgId('try\n{$PH}\n  me')}" ("try\n{$PH}\n  me").`
+           });
          });
-       });
 
-    it('should ignore missing translations if missingTranslation is set to "ignore"', () => {
-      const diagnostics = new Diagnostics();
-      const input = 'const b = 10;\n$localize(["try\\n", "\\n  me"], 40 + b);';
-      transformSync(
-          input,
-          {plugins: [makeEs5TranslatePlugin(diagnostics, {}, {missingTranslation: 'ignore'})]});
-      expect(diagnostics.hasErrors).toBe(false);
-      expect(diagnostics.messages).toEqual([]);
+      it('should ignore missing translations if missingTranslation is set to "ignore"', () => {
+        const input = 'const b = 10;\n$localize(["try\\n", "\\n  me"], 40 + b);';
+        const diagnostics = new Diagnostics();
+        transformCode(input, {}, {missingTranslation: 'ignore'}, diagnostics);
+        expect(diagnostics.hasErrors).toBe(false);
+        expect(diagnostics.messages).toEqual([]);
+      });
     });
   });
-});
 
-describe('(with translations)', () => {
-  it('should translate message parts (identity translations)', () => {
-    const diagnostics = new Diagnostics();
-    const translations = {
-      [ɵcomputeMsgId('abc')]: ɵparseTranslation('abc'),
-      [ɵcomputeMsgId('abc{$PH}')]: ɵparseTranslation('abc{$PH}'),
-      [ɵcomputeMsgId('abc{$PH}def')]: ɵparseTranslation('abc{$PH}def'),
-      [ɵcomputeMsgId('abc{$PH}def{$PH_1}')]: ɵparseTranslation('abc{$PH}def{$PH_1}'),
-      [ɵcomputeMsgId('Hello, {$PH}!')]: ɵparseTranslation('Hello, {$PH}!'),
-    };
-    const input = '$localize(["abc"]);\n' +
-        '$localize(["abc", ""], 1 + 2 + 3);\n' +
-        '$localize(["abc", "def"], 1 + 2 + 3);\n' +
-        '$localize(["abc", "def", ""], 1 + 2 + 3, 4 + 5 + 6);\n' +
-        '$localize(["Hello, ", "!"], getName());';
-    const output =
-        transformSync(input, {plugins: [makeEs5TranslatePlugin(diagnostics, translations)]})!;
-    expect(output.code)
-        .toEqual(
-            '"abc";\n' +
-            '"abc" + (1 + 2 + 3) + "";\n' +
-            '"abc" + (1 + 2 + 3) + "def";\n' +
-            '"abc" + (1 + 2 + 3) + "def" + (4 + 5 + 6) + "";\n' +
-            '"Hello, " + getName() + "!";');
-  });
+  describe('(with translations)', () => {
+    it('should translate message parts (identity translations)', () => {
+      const translations = {
+        [ɵcomputeMsgId('abc')]: ɵparseTranslation('abc'),
+        [ɵcomputeMsgId('abc{$PH}')]: ɵparseTranslation('abc{$PH}'),
+        [ɵcomputeMsgId('abc{$PH}def')]: ɵparseTranslation('abc{$PH}def'),
+        [ɵcomputeMsgId('abc{$PH}def{$PH_1}')]: ɵparseTranslation('abc{$PH}def{$PH_1}'),
+        [ɵcomputeMsgId('Hello, {$PH}!')]: ɵparseTranslation('Hello, {$PH}!'),
+      };
+      const input = '$localize(["abc"]);\n' +
+          '$localize(["abc", ""], 1 + 2 + 3);\n' +
+          '$localize(["abc", "def"], 1 + 2 + 3);\n' +
+          '$localize(["abc", "def", ""], 1 + 2 + 3, 4 + 5 + 6);\n' +
+          '$localize(["Hello, ", "!"], getName());';
+      const output = transformCode(input, translations);
+      expect(output).toEqual(
+          '"abc";\n' +
+          '"abc" + (1 + 2 + 3) + "";\n' +
+          '"abc" + (1 + 2 + 3) + "def";\n' +
+          '"abc" + (1 + 2 + 3) + "def" + (4 + 5 + 6) + "";\n' +
+          '"Hello, " + getName() + "!";');
+    });
 
-  it('should translate message parts (uppercase translations)', () => {
-    const diagnostics = new Diagnostics();
-    const translations = {
-      [ɵcomputeMsgId('abc')]: ɵparseTranslation('ABC'),
-      [ɵcomputeMsgId('abc{$PH}')]: ɵparseTranslation('ABC{$PH}'),
-      [ɵcomputeMsgId('abc{$PH}def')]: ɵparseTranslation('ABC{$PH}DEF'),
-      [ɵcomputeMsgId('abc{$PH}def{$PH_1}')]: ɵparseTranslation('ABC{$PH}DEF{$PH_1}'),
-      [ɵcomputeMsgId('Hello, {$PH}!')]: ɵparseTranslation('HELLO, {$PH}!'),
-    };
-    const input = '$localize(["abc"]);\n' +
-        '$localize(["abc", ""], 1 + 2 + 3);\n' +
-        '$localize(["abc", "def"], 1 + 2 + 3);\n' +
-        '$localize(["abc", "def", ""], 1 + 2 + 3, 4 + 5 + 6);\n' +
-        '$localize(["Hello, ", "!"], getName());';
-    const output =
-        transformSync(input, {plugins: [makeEs5TranslatePlugin(diagnostics, translations)]})!;
-    expect(output.code)
-        .toEqual(
-            '"ABC";\n' +
-            '"ABC" + (1 + 2 + 3) + "";\n' +
-            '"ABC" + (1 + 2 + 3) + "DEF";\n' +
-            '"ABC" + (1 + 2 + 3) + "DEF" + (4 + 5 + 6) + "";\n' +
-            '"HELLO, " + getName() + "!";');
-  });
+    it('should translate message parts (uppercase translations)', () => {
+      const translations = {
+        [ɵcomputeMsgId('abc')]: ɵparseTranslation('ABC'),
+        [ɵcomputeMsgId('abc{$PH}')]: ɵparseTranslation('ABC{$PH}'),
+        [ɵcomputeMsgId('abc{$PH}def')]: ɵparseTranslation('ABC{$PH}DEF'),
+        [ɵcomputeMsgId('abc{$PH}def{$PH_1}')]: ɵparseTranslation('ABC{$PH}DEF{$PH_1}'),
+        [ɵcomputeMsgId('Hello, {$PH}!')]: ɵparseTranslation('HELLO, {$PH}!'),
+      };
+      const input = '$localize(["abc"]);\n' +
+          '$localize(["abc", ""], 1 + 2 + 3);\n' +
+          '$localize(["abc", "def"], 1 + 2 + 3);\n' +
+          '$localize(["abc", "def", ""], 1 + 2 + 3, 4 + 5 + 6);\n' +
+          '$localize(["Hello, ", "!"], getName());';
+      const output = transformCode(input, translations);
+      expect(output).toEqual(
+          '"ABC";\n' +
+          '"ABC" + (1 + 2 + 3) + "";\n' +
+          '"ABC" + (1 + 2 + 3) + "DEF";\n' +
+          '"ABC" + (1 + 2 + 3) + "DEF" + (4 + 5 + 6) + "";\n' +
+          '"HELLO, " + getName() + "!";');
+    });
 
-  it('should translate message parts (reversing placeholders)', () => {
-    const diagnostics = new Diagnostics();
-    const translations = {
-      [ɵcomputeMsgId('abc{$PH}def{$PH_1} - Hello, {$PH_2}!')]:
-          ɵparseTranslation('abc{$PH_2}def{$PH_1} - Hello, {$PH}!'),
-    };
-    const input = '$localize(["abc", "def", " - Hello, ", "!"], 1 + 2 + 3, 4 + 5 + 6, getName());';
-    const output =
-        transformSync(input, {plugins: [makeEs5TranslatePlugin(diagnostics, translations)]})!;
-    expect(output.code)
-        .toEqual('"abc" + getName() + "def" + (4 + 5 + 6) + " - Hello, " + (1 + 2 + 3) + "!";');
-  });
+    it('should translate message parts (reversing placeholders)', () => {
+      const translations = {
+        [ɵcomputeMsgId('abc{$PH}def{$PH_1} - Hello, {$PH_2}!')]:
+            ɵparseTranslation('abc{$PH_2}def{$PH_1} - Hello, {$PH}!'),
+      };
+      const input =
+          '$localize(["abc", "def", " - Hello, ", "!"], 1 + 2 + 3, 4 + 5 + 6, getName());';
+      const output = transformCode(input, translations);
+      expect(output).toEqual(
+          '"abc" + getName() + "def" + (4 + 5 + 6) + " - Hello, " + (1 + 2 + 3) + "!";');
+    });
 
-  it('should translate message parts (removing placeholders)', () => {
-    const diagnostics = new Diagnostics();
-    const translations = {
-      [ɵcomputeMsgId('abc{$PH}def{$PH_1} - Hello, {$PH_2}!')]:
-          ɵparseTranslation('abc{$PH} - Hello, {$PH_2}!'),
-    };
-    const input = '$localize(["abc", "def", " - Hello, ", "!"], 1 + 2 + 3, 4 + 5 + 6, getName());';
-    const output =
-        transformSync(input, {plugins: [makeEs5TranslatePlugin(diagnostics, translations)]})!;
-    expect(output.code).toEqual('"abc" + (1 + 2 + 3) + " - Hello, " + getName() + "!";');
+    it('should translate message parts (removing placeholders)', () => {
+      const translations = {
+        [ɵcomputeMsgId('abc{$PH}def{$PH_1} - Hello, {$PH_2}!')]:
+            ɵparseTranslation('abc{$PH} - Hello, {$PH_2}!'),
+      };
+      const input =
+          '$localize(["abc", "def", " - Hello, ", "!"], 1 + 2 + 3, 4 + 5 + 6, getName());';
+      const output = transformCode(input, translations);
+      expect(output).toEqual('"abc" + (1 + 2 + 3) + " - Hello, " + getName() + "!";');
+    });
   });
+
+  function transformCode(
+      input: string, translations: Record<string, ɵParsedTranslation> = {},
+      pluginOptions?: TranslatePluginOptions, diagnostics = new Diagnostics()): string {
+    return transformSync(input, {
+             plugins: [makeEs5TranslatePlugin(diagnostics, translations, pluginOptions)],
+             filename: '/app/dist/test.js'
+           })!.code!;
+  }
 });
diff --git a/packages/localize/src/tools/test/translate/translation_files/translation_parsers/xliff1_translation_parser_spec.ts b/packages/localize/src/tools/test/translate/translation_files/translation_parsers/xliff1_translation_parser_spec.ts
index de347c5de8cd7..9f475e54e8f69 100644
--- a/packages/localize/src/tools/test/translate/translation_files/translation_parsers/xliff1_translation_parser_spec.ts
+++ b/packages/localize/src/tools/test/translate/translation_files/translation_parsers/xliff1_translation_parser_spec.ts
@@ -212,6 +212,46 @@ describe('Xliff1TranslationParser', () => {
                 ['INTERPOLATION', 'START_BOLD_TEXT', 'CLOSE_BOLD_TEXT']));
       });
 
+      it('should extract nested placeholder containers (i.e. nested HTML elements)', () => {
+        /**
+         * Source HTML:
+         *
+         * ```
+         * <div i18n>
+         *   translatable <span>element <b>with placeholders</b></span> {{ interpolation}}
+         * </div>
+         * ```
+         */
+        const XLIFF = [
+          `<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">`,
+          `  <file source-language="en" target-language="fr" datatype="plaintext" original="ng2.template">`,
+          `    <body>`,
+          `      <trans-unit id="9051630253697141670" datatype="html">`,
+          `        <source>translatable <x id="START_TAG_SPAN"/>element <x id="START_BOLD_TEXT"/>with placeholders<x id="CLOSE_BOLD_TEXT"/><x id="CLOSE_TAG_SPAN"/> <x id="INTERPOLATION"/></source>`,
+          `        <target><x id="START_TAG_SPAN"/><x id="INTERPOLATION"/> tnemele<x id="CLOSE_TAG_SPAN"/> elbatalsnart <x id="START_BOLD_TEXT"/>sredlohecalp htiw<x id="CLOSE_BOLD_TEXT"/></target>`,
+          `        <context-group purpose="location">`,
+          `          <context context-type="sourcefile">file.ts</context>`,
+          `          <context context-type="linenumber">3</context>`,
+          `        </context-group>`,
+          `      </trans-unit>`,
+          `    </body>`,
+          `  </file>`,
+          `</xliff>`,
+        ].join('\n');
+        const result = doParse('/some/file.xlf', XLIFF);
+        expect(result.translations[ɵcomputeMsgId(
+                   'translatable {$START_TAG_SPAN}element {$START_BOLD_TEXT}with placeholders' +
+                   '{$CLOSE_BOLD_TEXT}{$CLOSE_TAG_SPAN} {$INTERPOLATION}')])
+            .toEqual(ɵmakeParsedTranslation(
+                ['', '', ' tnemele', ' elbatalsnart ', 'sredlohecalp htiw', ''], [
+                  'START_TAG_SPAN',
+                  'INTERPOLATION',
+                  'CLOSE_TAG_SPAN',
+                  'START_BOLD_TEXT',
+                  'CLOSE_BOLD_TEXT',
+                ]));
+      });
+
       it('should extract translations with placeholders containing hyphens', () => {
         /**
          * Source HTML:
@@ -581,7 +621,7 @@ describe('Xliff1TranslationParser', () => {
       });
 
       describe('[structure errors]', () => {
-        it('should throw when a trans-unit has no translation', () => {
+        it('should fail when a trans-unit has no translation', () => {
           const XLIFF = [
             `<?xml version="1.0" encoding="UTF-8" ?>`,
             `<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">`,
@@ -606,7 +646,7 @@ describe('Xliff1TranslationParser', () => {
         });
 
 
-        it('should throw when a trans-unit has no id attribute', () => {
+        it('should fail when a trans-unit has no id attribute', () => {
           const XLIFF = [
             `<?xml version="1.0" encoding="UTF-8" ?>`,
             `<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">`,
@@ -631,7 +671,7 @@ describe('Xliff1TranslationParser', () => {
           ].join('\n'));
         });
 
-        it('should throw on duplicate trans-unit id', () => {
+        it('should fail on duplicate trans-unit id', () => {
           const XLIFF = [
             `<?xml version="1.0" encoding="UTF-8" ?>`,
             `<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">`,
@@ -663,7 +703,7 @@ describe('Xliff1TranslationParser', () => {
       });
 
       describe('[message errors]', () => {
-        it('should throw on unknown message tags', () => {
+        it('should fail on unknown message tags', () => {
           const XLIFF = [
             `<?xml version="1.0" encoding="UTF-8" ?>`,
             `<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">`,
@@ -679,17 +719,18 @@ describe('Xliff1TranslationParser', () => {
           ].join('\n');
 
           expectToFail('/some/file.xlf', XLIFF, /Invalid element found in message/, [
-            `Invalid element found in message. ("`,
-            `      <trans-unit id="deadbeef" datatype="html">`,
+            `Error: Invalid element found in message.`,
+            `At /some/file.xlf@6:16:`,
+            `...`,
             `        <source/>`,
             `        <target>[ERROR ->]<b>msg should contain only ph tags</b></target>`,
             `      </trans-unit>`,
-            `    </body>`,
-            `"): /some/file.xlf@6:16`,
+            `...`,
+            ``,
           ].join('\n'));
         });
 
-        it('should throw when a placeholder misses an id attribute', () => {
+        it('should fail when a placeholder misses an id attribute', () => {
           const XLIFF = [
             `<?xml version="1.0" encoding="UTF-8" ?>`,
             `<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">`,
@@ -705,13 +746,14 @@ describe('Xliff1TranslationParser', () => {
           ].join('\n');
 
           expectToFail('/some/file.xlf', XLIFF, /required "id" attribute/gi, [
-            `Missing required "id" attribute: ("`,
-            `      <trans-unit id="deadbeef" datatype="html">`,
+            `Error: Missing required "id" attribute:`,
+            `At /some/file.xlf@6:16:`,
+            `...`,
             `        <source/>`,
             `        <target>[ERROR ->]<x/></target>`,
             `      </trans-unit>`,
-            `    </body>`,
-            `"): /some/file.xlf@6:16`,
+            `...`,
+            ``,
           ].join('\n'));
         });
       });
diff --git a/packages/localize/src/tools/test/translate/translation_files/translation_parsers/xliff2_translation_parser_spec.ts b/packages/localize/src/tools/test/translate/translation_files/translation_parsers/xliff2_translation_parser_spec.ts
index 82ef7484adbb6..d9b412c8bc486 100644
--- a/packages/localize/src/tools/test/translate/translation_files/translation_parsers/xliff2_translation_parser_spec.ts
+++ b/packages/localize/src/tools/test/translate/translation_files/translation_parsers/xliff2_translation_parser_spec.ts
@@ -172,13 +172,13 @@ describe(
                  * Source HTML:
                  *
                  * ```
-                 * <div i18n>translatable element <b>>with placeholders</b> {{ interpolation}}</div>
+                 * <div i18n>translatable element <b>with placeholders</b> {{ interpolation}}</div>
                  * ```
                  */
                 const XLIFF = [
                   `<xliff version="2.0" xmlns="urn:oasis:names:tc:xliff:document:2.0" srcLang="en" trgLang="fr">`,
                   `  <file original="ng.template" id="ngi18n">`,
-                  `    <unit id="5057824347511785081">`,
+                  `    <unit id="6949438802869886378">`,
                   `      <notes>`,
                   `        <note category="location">file.ts:3</note>`,
                   `      </notes>`,
@@ -193,12 +193,58 @@ describe(
                 const result = doParse('/some/file.xlf', XLIFF);
                 expect(
                     result.translations[ɵcomputeMsgId(
-                        'translatable element {$START_BOLD_TEXT}with placeholders{$LOSE_BOLD_TEXT} {$INTERPOLATION}')])
+                        'translatable element {$START_BOLD_TEXT}with placeholders{$CLOSE_BOLD_TEXT} {$INTERPOLATION}')])
                     .toEqual(ɵmakeParsedTranslation(
                         ['', ' tnemele elbatalsnart ', 'sredlohecalp htiw', ''],
                         ['INTERPOLATION', 'START_BOLD_TEXT', 'CLOSE_BOLD_TEXT']));
               });
 
+              it('should extract nested placeholder containers (i.e. nested HTML elements)', () => {
+                /**
+                 * Source HTML:
+                 *
+                 * ```
+                 * <div i18n>
+                 *   translatable <span>element <b>with placeholders</b></span> {{ interpolation}}
+                 * </div>
+                 * ```
+                 */
+                const XLIFF = [
+                  `<xliff version="2.0" xmlns="urn:oasis:names:tc:xliff:document:2.0" srcLang="en" trgLang="fr">`,
+                  `  <file original="ng.template" id="ngi18n">`,
+                  `    <unit id="9051630253697141670">`,
+                  `      <notes>`,
+                  `        <note category="location">file.ts:3</note>`,
+                  `      </notes>`,
+                  `      <segment>`,
+                  `        <source>translatable <pc id="0" equivStart="START_TAG_SPAN" equivEnd="CLOSE_TAG_SPAN" type="other"` +
+                      ` dispStart="&lt;span&gt;" dispEnd="&lt;/span&gt;">element <pc id="1" equivStart="START_BOLD_TEXT" equivEnd=` +
+                      `"CLOSE_BOLD_TEXT" type="fmt" dispStart="&lt;b&gt;" dispEnd="&lt;/b&gt;">with placeholders</pc></pc>` +
+                      ` <ph id="2" equiv="INTERPOLATION" disp="{{ interpolation}}"/></source>`,
+                  `        <target><pc id="0" equivStart="START_TAG_SPAN" equivEnd="CLOSE_TAG_SPAN" type="fmt" dispStart="&lt;` +
+                      `span&gt;" dispEnd="&lt;/span&gt;"><ph id="2" equiv="INTERPOLATION" disp="{{ interpolation}}"/> tnemele</pc>` +
+                      ` elbatalsnart <pc id="1" equivStart="START_BOLD_TEXT" equivEnd="CLOSE_BOLD_TEXT" type="fmt" dispStart=` +
+                      `"&lt;b&gt;" dispEnd="&lt;/b&gt;">sredlohecalp htiw</pc></target>`,
+                  `      </segment>`,
+                  `    </unit>`,
+                  `  </file>`,
+                  `</xliff>`,
+                ].join('\n');
+                const result = doParse('/some/file.xlf', XLIFF);
+                expect(
+                    result.translations[ɵcomputeMsgId(
+                        'translatable {$START_TAG_SPAN}element {$START_BOLD_TEXT}with placeholders' +
+                        '{$CLOSE_BOLD_TEXT}{$CLOSE_TAG_SPAN} {$INTERPOLATION}')])
+                    .toEqual(ɵmakeParsedTranslation(
+                        ['', '', ' tnemele', ' elbatalsnart ', 'sredlohecalp htiw', ''], [
+                          'START_TAG_SPAN',
+                          'INTERPOLATION',
+                          'CLOSE_TAG_SPAN',
+                          'START_BOLD_TEXT',
+                          'CLOSE_BOLD_TEXT',
+                        ]));
+              });
+
               it('should extract translations with simple ICU expressions', () => {
                 /**
                  * Source HTML:
@@ -604,13 +650,14 @@ describe(
                   ].join('\n');
 
                   expectToFail('/some/file.xlf', XLIFF, /Invalid element found in message/, [
-                    `Invalid element found in message. ("`,
-                    `      <segment>`,
+                    `Error: Invalid element found in message.`,
+                    `At /some/file.xlf@6:16:`,
+                    `...`,
                     `        <source/>`,
                     `        <target>[ERROR ->]<b>msg should contain only ph and pc tags</b></target>`,
                     `      </segment>`,
-                    `    </unit>`,
-                    `"): /some/file.xlf@6:16`,
+                    `...`,
+                    ``,
                   ].join('\n'));
                 });
 
@@ -631,13 +678,14 @@ describe(
                      ].join('\n');
 
                      expectToFail('/some/file.xlf', XLIFF, /Missing required "equiv" attribute/, [
-                       `Missing required "equiv" attribute: ("`,
-                       `      <segment>`,
+                       `Error: Missing required "equiv" attribute:`,
+                       `At /some/file.xlf@6:16:`,
+                       `...`,
                        `        <source/>`,
                        `        <target>[ERROR ->]<ph/></target>`,
                        `      </segment>`,
-                       `    </unit>`,
-                       `"): /some/file.xlf@6:16`,
+                       `...`,
+                       ``,
                      ].join('\n'));
                    });
               });
diff --git a/packages/localize/src/tools/test/translate/translation_files/translation_parsers/xtb_translation_parser_spec.ts b/packages/localize/src/tools/test/translate/translation_files/translation_parsers/xtb_translation_parser_spec.ts
index 77a568044d1c9..bc91e87d8e80b 100644
--- a/packages/localize/src/tools/test/translate/translation_files/translation_parsers/xtb_translation_parser_spec.ts
+++ b/packages/localize/src/tools/test/translate/translation_files/translation_parsers/xtb_translation_parser_spec.ts
@@ -140,6 +140,38 @@ describe('XtbTranslationParser', () => {
                 ɵmakeParsedTranslation(['', 'rab', ''], ['START_PARAGRAPH', 'CLOSE_PARAGRAPH']));
       });
 
+      it('should extract nested placeholder containers (i.e. nested HTML elements)', () => {
+        /**
+         * Source HTML:
+         *
+         * ```
+         * <div i18n>
+         *   translatable <span>element <b>with placeholders</b></span> {{ interpolation}}
+         * </div>
+         * ```
+         */
+        const XLIFF = [
+          `<?xml version="1.0" encoding="UTF-8"?>`,
+          `<translationbundle>`,
+          `  <translation id="9051630253697141670">` +
+              `<ph name="START_TAG_SPAN"/><ph name="INTERPOLATION"/> tnemele<ph name="CLOSE_TAG_SPAN"/> elbatalsnart <ph name="START_BOLD_TEXT"/>sredlohecalp htiw<ph name="CLOSE_BOLD_TEXT"/>` +
+              `</translation>`,
+          `</translationbundle>`,
+        ].join('\n');
+        const result = doParse('/some/file.xtb', XLIFF);
+        expect(result.translations[ɵcomputeMsgId(
+                   'translatable {$START_TAG_SPAN}element {$START_BOLD_TEXT}with placeholders' +
+                   '{$CLOSE_BOLD_TEXT}{$CLOSE_TAG_SPAN} {$INTERPOLATION}')])
+            .toEqual(ɵmakeParsedTranslation(
+                ['', '', ' tnemele', ' elbatalsnart ', 'sredlohecalp htiw', ''], [
+                  'START_TAG_SPAN',
+                  'INTERPOLATION',
+                  'CLOSE_TAG_SPAN',
+                  'START_BOLD_TEXT',
+                  'CLOSE_BOLD_TEXT',
+                ]));
+      });
+
       it('should extract translations with simple ICU expressions', () => {
         const XTB = [
           `<?xml version="1.0" encoding="UTF-8" ?>`,
@@ -280,10 +312,14 @@ describe('XtbTranslationParser', () => {
         expect(result.translations['invalid']).toBeUndefined();
         expect(result.diagnostics.messages).toContain({
           type: 'warning',
-          message:
-              `Could not parse message with id "invalid" - perhaps it has an unrecognised ICU format?\n` +
-              `Error: Unexpected character "EOF" (Do you have an unescaped "{" in your template? Use "{{ '{' }}") to escape it.)\n` +
-              `Error: Invalid ICU message. Missing '}'.`
+          message: [
+            `Could not parse message with id "invalid" - perhaps it has an unrecognised ICU format?`,
+            `Unexpected character "EOF" (Do you have an unescaped "{" in your template? Use "{{ '{' }}") to escape it.) ("id">{REGION_COUNT_1, plural, =0 {unused plural form} =1 {1 region} other {{REGION_COUNT_2} regions}}[ERROR ->]</translation>`,
+            `</translationbundle>"): /some/file.xtb@2:124`,
+            `Invalid ICU message. Missing '}'. ("n>`,
+            `  <translation id="invalid">{REGION_COUNT_1, plural, =0 {unused plural form} =1 {1 region} other [ERROR ->]{{REGION_COUNT_2} regions}}</translation>`,
+            `</translationbundle>"): /some/file.xtb@2:97`,
+          ].join('\n')
         });
       });
 
@@ -339,11 +375,14 @@ describe('XtbTranslationParser', () => {
           ].join('\n');
 
           expectToFail('/some/file.xtb', XTB, /Invalid element found in message/, [
-            `Invalid element found in message. ("<translationbundle>`,
+            `Error: Invalid element found in message.`,
+            `At /some/file.xtb@2:4:`,
+            `...`,
             `  <translation id="deadbeef">`,
             `    [ERROR ->]<source/>`,
             `  </translation>`,
-            `</translationbundle>"): /some/file.xtb@2:4`,
+            `...`,
+            ``,
           ].join('\n'));
         });
 
@@ -355,9 +394,12 @@ describe('XtbTranslationParser', () => {
           ].join('\n');
 
           expectToFail('/some/file.xtb', XTB, /required "name" attribute/gi, [
-            `Missing required "name" attribute: ("<translationbundle>`,
+            `Error: Missing required "name" attribute:`,
+            `At /some/file.xtb@1:29:`,
+            `...<translationbundle>`,
             `  <translation id="deadbeef">[ERROR ->]<ph/></translation>`,
-            `</translationbundle>"): /some/file.xtb@1:29`,
+            `</translationbundle>...`,
+            ``,
           ].join('\n'));
         });
       });
diff --git a/packages/localize/src/tools/test/translate/translator_spec.ts b/packages/localize/src/tools/test/translate/translator_spec.ts
index 0d2353a1658d6..ea42c7e515480 100644
--- a/packages/localize/src/tools/test/translate/translator_spec.ts
+++ b/packages/localize/src/tools/test/translate/translator_spec.ts
@@ -109,13 +109,13 @@ runInEachFileSystem(() => {
     log: string[] = [];
     constructor(private _canTranslate: boolean = true) {}
 
-    canTranslate(relativePath: string, contents: Buffer) {
-      this.log.push(`canTranslate(${relativePath}, ${contents.toString('utf8')})`);
+    canTranslate(relativePath: string, contents: Uint8Array) {
+      this.log.push(`canTranslate(${relativePath}, ${contents})`);
       return this._canTranslate;
     }
 
     translate(
-        _diagnostics: Diagnostics, rootPath: string, relativePath: string, contents: Buffer,
+        _diagnostics: Diagnostics, rootPath: string, relativePath: string, contents: Uint8Array,
         _outputPathFn: OutputPathFn, _translations: TranslationBundle[], sourceLocale?: string) {
       this.log.push(
           `translate(${rootPath}, ${relativePath}, ${contents}, ...` +
diff --git a/packages/localize/src/utils/src/messages.ts b/packages/localize/src/utils/src/messages.ts
index 46663cf90f6b1..e19593ccdfcfc 100644
--- a/packages/localize/src/utils/src/messages.ts
+++ b/packages/localize/src/utils/src/messages.ts
@@ -48,6 +48,7 @@ export interface SourceLocation {
   start: {line: number, column: number};
   end: {line: number, column: number};
   file: AbsoluteFsPath;
+  text?: string;
 }
 
 /**
@@ -58,10 +59,6 @@ export interface MessageMetadata {
    * A human readable rendering of the message
    */
   text: string;
-  /**
-   * A unique identifier for this message.
-   */
-  id?: MessageId;
   /**
    * Legacy message ids, if provided.
    *
@@ -73,6 +70,12 @@ export interface MessageMetadata {
    * of translation if the translations are encoded using the legacy message id.
    */
   legacyIds?: string[];
+  /**
+   * The id of the `message` if a custom one was specified explicitly.
+   *
+   * This id overrides any computed or legacy ids.
+   */
+  customId?: string;
   /**
    * The meaning of the `message`, used to distinguish identical `messageString`s.
    */
@@ -110,18 +113,24 @@ export interface MessageMetadata {
 export interface ParsedMessage extends MessageMetadata {
   /**
    * The key used to look up the appropriate translation target.
-   *
-   * In `ParsedMessage` this is a required field, whereas it is optional in `MessageMetadata`.
    */
   id: MessageId;
   /**
    * A mapping of placeholder names to substitution values.
    */
   substitutions: Record<string, any>;
+  /**
+   * An optional mapping of placeholder names to source locations
+   */
+  substitutionLocations?: Record<string, SourceLocation|undefined>;
   /**
    * The static parts of the message.
    */
   messageParts: string[];
+  /**
+   * An optional mapping of message parts to source locations
+   */
+  messagePartLocations?: (SourceLocation|undefined)[];
   /**
    * The names of the placeholders that will be replaced with substitutions.
    */
@@ -129,14 +138,17 @@ export interface ParsedMessage extends MessageMetadata {
 }
 
 /**
- * Parse a `$localize` tagged string into a structure that can be used for translation.
+ * Parse a `$localize` tagged string into a structure that can be used for translation or
+ * extraction.
  *
  * See `ParsedMessage` for an example.
  */
 export function parseMessage(
-    messageParts: TemplateStringsArray, expressions?: readonly any[],
-    location?: SourceLocation): ParsedMessage {
+    messageParts: TemplateStringsArray, expressions?: readonly any[], location?: SourceLocation,
+    messagePartLocations?: (SourceLocation|undefined)[],
+    expressionLocations: (SourceLocation|undefined)[] = []): ParsedMessage {
   const substitutions: {[placeholderName: string]: any} = {};
+  const substitutionLocations: {[placeholderName: string]: SourceLocation|undefined} = {};
   const metadata = parseMetadata(messageParts[0], messageParts.raw[0]);
   const cleanedMessageParts: string[] = [metadata.text];
   const placeholderNames: string[] = [];
@@ -147,20 +159,24 @@ export function parseMessage(
     messageString += `{$${placeholderName}}${messagePart}`;
     if (expressions !== undefined) {
       substitutions[placeholderName] = expressions[i - 1];
+      substitutionLocations[placeholderName] = expressionLocations[i - 1];
     }
     placeholderNames.push(placeholderName);
     cleanedMessageParts.push(messagePart);
   }
-  const messageId = metadata.id || computeMsgId(messageString, metadata.meaning || '');
+  const messageId = metadata.customId || computeMsgId(messageString, metadata.meaning || '');
   const legacyIds = metadata.legacyIds ? metadata.legacyIds.filter(id => id !== messageId) : [];
   return {
     id: messageId,
     legacyIds,
     substitutions,
+    substitutionLocations,
     text: messageString,
+    customId: metadata.customId,
     meaning: metadata.meaning || '',
     description: metadata.description || '',
     messageParts: cleanedMessageParts,
+    messagePartLocations,
     placeholderNames,
     location,
   };
@@ -198,7 +214,7 @@ export function parseMetadata(cooked: string, raw: string): MessageMetadata {
     return {text: messageString};
   } else {
     const [meaningDescAndId, ...legacyIds] = block.split(LEGACY_ID_INDICATOR);
-    const [meaningAndDesc, id] = meaningDescAndId.split(ID_SEPARATOR, 2);
+    const [meaningAndDesc, customId] = meaningDescAndId.split(ID_SEPARATOR, 2);
     let [meaning, description]: (string|undefined)[] = meaningAndDesc.split(MEANING_SEPARATOR, 2);
     if (description === undefined) {
       description = meaning;
@@ -207,7 +223,7 @@ export function parseMetadata(cooked: string, raw: string): MessageMetadata {
     if (description === '') {
       description = undefined;
     }
-    return {text: messageString, meaning, description, id, legacyIds};
+    return {text: messageString, meaning, description, customId, legacyIds};
   }
 }
 
diff --git a/packages/localize/src/utils/src/translations.ts b/packages/localize/src/utils/src/translations.ts
index 8e5094b71fe12..fb0e7aeaaec8a 100644
--- a/packages/localize/src/utils/src/translations.ts
+++ b/packages/localize/src/utils/src/translations.ts
@@ -113,7 +113,7 @@ export function parseTranslation(messageString: TargetMessage): ParsedTranslatio
 export function makeParsedTranslation(
     messageParts: string[], placeholderNames: string[] = []): ParsedTranslation {
   let messageString = messageParts[0];
-  for (let i = 0; i < placeholderNames.length - 1; i++) {
+  for (let i = 0; i < placeholderNames.length; i++) {
     messageString += `{$${placeholderNames[i]}}${messageParts[i + 1]}`;
   }
   return {
diff --git a/packages/localize/src/utils/test/messages_spec.ts b/packages/localize/src/utils/test/messages_spec.ts
index 3530b632dfe9a..4bcd12cd1d625 100644
--- a/packages/localize/src/utils/test/messages_spec.ts
+++ b/packages/localize/src/utils/test/messages_spec.ts
@@ -9,13 +9,14 @@ import {findEndOfBlock, makeTemplateObject, parseMessage, parseMetadata, splitBl
 
 describe('messages utils', () => {
   describe('parseMessage', () => {
-    it('should use the custom id parsed from the metadata if available', () => {
+    it('should use the custom id parsed from the metadata for the message id, if available', () => {
       const message = parseMessage(
           makeTemplateObject(
               [':@@custom-message-id:a', ':one:b', ':two:c'],
               [':@@custom-message-id:a', ':one:b', ':two:c']),
           [1, 2]);
-      expect(message.id).toEqual('custom-message-id');
+      expect(message.customId).toEqual('custom-message-id');
+      expect(message.id).toEqual(message.customId!);
     });
 
     it('should compute the translation key if no metadata', () => {
@@ -24,7 +25,7 @@ describe('messages utils', () => {
       expect(message.id).toEqual('8865273085679272414');
     });
 
-    it('should compute the translation key if no id in the metadata', () => {
+    it('should compute the translation key if no custom id in the metadata', () => {
       const message = parseMessage(
           makeTemplateObject(
               [':description:a', ':one:b', ':two:c'], [':description:a', ':one:b', ':two:c']),
@@ -181,21 +182,21 @@ describe('messages utils', () => {
         text: 'abc def',
         description: 'description',
         meaning: undefined,
-        id: undefined,
+        customId: undefined,
         legacyIds: []
       });
       expect(parseMetadata(':meaning|:abc def', ':meaning|:abc def')).toEqual({
         text: 'abc def',
         description: undefined,
         meaning: 'meaning',
-        id: undefined,
+        customId: undefined,
         legacyIds: []
       });
       expect(parseMetadata(':@@message-id:abc def', ':@@message-id:abc def')).toEqual({
         text: 'abc def',
         description: undefined,
         meaning: undefined,
-        id: 'message-id',
+        customId: 'message-id',
         legacyIds: []
       });
       expect(parseMetadata(':meaning|description:abc def', ':meaning|description:abc def'))
@@ -203,7 +204,7 @@ describe('messages utils', () => {
             text: 'abc def',
             description: 'description',
             meaning: 'meaning',
-            id: undefined,
+            customId: undefined,
             legacyIds: []
           });
       expect(parseMetadata(':description@@message-id:abc def', ':description@@message-id:abc def'))
@@ -211,7 +212,7 @@ describe('messages utils', () => {
             text: 'abc def',
             description: 'description',
             meaning: undefined,
-            id: 'message-id',
+            customId: 'message-id',
             legacyIds: []
           });
       expect(parseMetadata(':meaning|@@message-id:abc def', ':meaning|@@message-id:abc def'))
@@ -219,7 +220,7 @@ describe('messages utils', () => {
             text: 'abc def',
             description: undefined,
             meaning: 'meaning',
-            id: 'message-id',
+            customId: 'message-id',
             legacyIds: []
           });
       expect(parseMetadata(
@@ -229,7 +230,7 @@ describe('messages utils', () => {
             text: 'abc def',
             description: 'description',
             meaning: undefined,
-            id: 'message-id',
+            customId: 'message-id',
             legacyIds: ['legacy-1', 'legacy-2', 'legacy-3']
           });
       expect(parseMetadata(
@@ -239,7 +240,7 @@ describe('messages utils', () => {
             text: 'abc def',
             description: undefined,
             meaning: 'meaning',
-            id: 'message-id',
+            customId: 'message-id',
             legacyIds: ['legacy-message-id']
           });
       expect(parseMetadata(
@@ -248,7 +249,7 @@ describe('messages utils', () => {
             text: 'abc def',
             description: undefined,
             meaning: 'meaning',
-            id: undefined,
+            customId: undefined,
             legacyIds: ['legacy-message-id']
           });
 
@@ -256,7 +257,7 @@ describe('messages utils', () => {
         text: 'abc def',
         description: undefined,
         meaning: undefined,
-        id: undefined,
+        customId: undefined,
         legacyIds: ['legacy-message-id']
       });
     });
@@ -266,7 +267,7 @@ describe('messages utils', () => {
         text: 'abc def',
         meaning: undefined,
         description: undefined,
-        id: undefined,
+        customId: undefined,
         legacyIds: []
       });
     });
diff --git a/packages/localize/src/utils/test/translations_spec.ts b/packages/localize/src/utils/test/translations_spec.ts
index 8ccc10cb04f5a..3ec4a5da01ca0 100644
--- a/packages/localize/src/utils/test/translations_spec.ts
+++ b/packages/localize/src/utils/test/translations_spec.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 {computeMsgId, makeTemplateObject, ParsedTranslation, parseTranslation, TargetMessage, translate} from '..';
+import {computeMsgId, makeParsedTranslation, makeTemplateObject, ParsedTranslation, parseTranslation, TargetMessage, translate} from '..';
 
 describe('utils', () => {
   describe('makeTemplateObject', () => {
@@ -22,6 +22,24 @@ describe('utils', () => {
     });
   });
 
+  describe('makeParsedTranslation()', () => {
+    it('should compute a template object from the parts', () => {
+      expect(makeParsedTranslation(['a', 'b', 'c'], ['ph1', 'ph2']).messageParts)
+          .toEqual(makeTemplateObject(['a', 'b', 'c'], ['a', 'b', 'c']));
+    });
+
+    it('should include the placeholder names', () => {
+      expect(makeParsedTranslation(['a', 'b', 'c'], ['ph1', 'ph2']).placeholderNames).toEqual([
+        'ph1', 'ph2'
+      ]);
+    });
+
+    it('should compute the message string from the parts and placeholder names', () => {
+      expect(makeParsedTranslation(['a', 'b', 'c'], ['ph1', 'ph2']).text)
+          .toEqual('a{$ph1}b{$ph2}c');
+    });
+  });
+
   describe('parseTranslation', () => {
     it('should extract the messageParts as a TemplateStringsArray', () => {
       const translation = parseTranslation('a{$one}b{$two}c');
diff --git a/packages/platform-browser/animations/src/animation_renderer.ts b/packages/platform-browser/animations/src/animation_renderer.ts
index fa80ef6330827..a7f6adffa6bb5 100644
--- a/packages/platform-browser/animations/src/animation_renderer.ts
+++ b/packages/platform-browser/animations/src/animation_renderer.ts
@@ -166,9 +166,10 @@ export class BaseAnimationRenderer implements Renderer2 {
     this.engine.onInsert(this.namespaceId, newChild, parent, false);
   }
 
-  insertBefore(parent: any, newChild: any, refChild: any): void {
+  insertBefore(parent: any, newChild: any, refChild: any, isMove: boolean = true): void {
     this.delegate.insertBefore(parent, newChild, refChild);
-    this.engine.onInsert(this.namespaceId, newChild, parent, true);
+    // If `isMove` true than we should animate this insert.
+    this.engine.onInsert(this.namespaceId, newChild, parent, isMove);
   }
 
   removeChild(parent: any, oldChild: any, isHostElement: boolean): void {
diff --git a/packages/platform-browser/animations/test/BUILD.bazel b/packages/platform-browser/animations/test/BUILD.bazel
index d183608e453ba..f14e31e55a1da 100644
--- a/packages/platform-browser/animations/test/BUILD.bazel
+++ b/packages/platform-browser/animations/test/BUILD.bazel
@@ -39,37 +39,6 @@ jasmine_node_test(
 
 karma_web_test_suite(
     name = "test_web",
-    tags = [
-        # FIXME: fix on saucelabs
-        # IE 10.0.0 (Windows 8.0.0) AnimationRenderer should support nested animation triggers FAILED
-        #     TypeError: Unable to get property 'length' of undefined or null reference
-        #     error properties: Object({ number: -2146823281 })
-        #         at <Jasmine>
-        # IE 10.0.0 (Windows 8.0.0) AnimationRenderer should hook into the engine's setProperty call if the property begins with `@` FAILED
-        #     TypeError: Unable to get property 'setProperty' of undefined or null reference
-        #     error properties: Object({ number: -2146823281 })
-        #         at <Jasmine>
-        # IE 10.0.0 (Windows 8.0.0) AnimationRenderer should hook into the engine's insert operations when removing children FAILED
-        #     TypeError: Unable to get property 'onRemove' of undefined or null reference
-        #     error properties: Object({ number: -2146823281 })
-        #         at <Jasmine>
-        # IE 10.0.0 (Windows 8.0.0) AnimationRenderer should hook into the engine's insert operations when inserting a child before another FAILED
-        #     TypeError: Unable to get property 'onInsert' of undefined or null reference
-        #     error properties: Object({ number: -2146823281 })
-        #         at <Jasmine>
-        # IE 10.0.0 (Windows 8.0.0) AnimationRenderer should hook into the engine's insert operations when appending children FAILED
-        #     TypeError: Unable to get property 'onInsert' of undefined or null reference
-        #     error properties: Object({ number: -2146823281 })
-        #         at <Jasmine>
-        # IE 10.0.0 (Windows 8.0.0) AnimationRenderer listen should hook into the engine's listen call if the property begins with `@` FAILED
-        #     TypeError: Unable to get property 'listen' of undefined or null reference
-        #     error properties: Object({ number: -2146823281 })
-        #         at <Jasmine>
-        # IE 10.0.0 (Windows 8.0.0) AnimationRenderer listen should resolve the body|document|window nodes given their values as strings as input FAILED
-        #     Error: Unable to listen on the animation trigger event "event" because the animation trigger "" doesn't exist!
-        #         at <Jasmine>
-        "fixme-saucelabs-ivy",
-    ],
     deps = [
         ":test_lib",
     ],
diff --git a/packages/platform-browser/src/browser/tools/common_tools.ts b/packages/platform-browser/src/browser/tools/common_tools.ts
index 46d8eb842e2f2..3136bcbfdef57 100644
--- a/packages/platform-browser/src/browser/tools/common_tools.ts
+++ b/packages/platform-browser/src/browser/tools/common_tools.ts
@@ -45,7 +45,7 @@ export class AngularProfiler {
   timeChangeDetection(config: any): ChangeDetectionPerfRecord {
     const record = config && config['record'];
     const profileName = 'Change Detection';
-    // Profiler is not available in Android browsers, nor in IE 9 without dev tools opened
+    // Profiler is not available in Android browsers without dev tools opened
     const isProfilerAvailable = window.console.profile != null;
     if (record && isProfilerAvailable) {
       window.console.profile(profileName);
diff --git a/packages/platform-browser/src/dom/dom_renderer.ts b/packages/platform-browser/src/dom/dom_renderer.ts
index 6925873d2980a..33d0bc67bcff8 100644
--- a/packages/platform-browser/src/dom/dom_renderer.ts
+++ b/packages/platform-browser/src/dom/dom_renderer.ts
@@ -74,6 +74,8 @@ function decoratePreventDefault(eventHandler: Function): Function {
   };
 }
 
+let hasLoggedNativeEncapsulationWarning = false;
+
 @Injectable()
 export class DomRendererFactory2 implements RendererFactory2 {
   private rendererByCompId = new Map<string, Renderer2>();
@@ -100,8 +102,16 @@ export class DomRendererFactory2 implements RendererFactory2 {
         (<EmulatedEncapsulationDomRenderer2>renderer).applyToHost(element);
         return renderer;
       }
-      case ViewEncapsulation.Native:
+      case 1:
       case ViewEncapsulation.ShadowDom:
+        // TODO(FW-2290): remove the `case 1:` fallback logic and the warning in v12.
+        if ((typeof ngDevMode === 'undefined' || ngDevMode) &&
+            !hasLoggedNativeEncapsulationWarning && type.encapsulation === 1) {
+          hasLoggedNativeEncapsulationWarning = true;
+          console.warn(
+              'ViewEncapsulation.Native is no longer supported. Falling back to ViewEncapsulation.ShadowDom. The fallback will be removed in v12.');
+        }
+
         return new ShadowDomRenderer(this.eventManager, this.sharedStylesHost, element, type);
       default: {
         if (!this.rendererByCompId.has(type.id)) {
@@ -302,13 +312,9 @@ class ShadowDomRenderer extends DefaultDomRenderer2 {
 
   constructor(
       eventManager: EventManager, private sharedStylesHost: DomSharedStylesHost,
-      private hostEl: any, private component: RendererType2) {
+      private hostEl: any, component: RendererType2) {
     super(eventManager);
-    if (component.encapsulation === ViewEncapsulation.ShadowDom) {
-      this.shadowRoot = (hostEl as any).attachShadow({mode: 'open'});
-    } else {
-      this.shadowRoot = (hostEl as any).createShadowRoot();
-    }
+    this.shadowRoot = (hostEl as any).attachShadow({mode: 'open'});
     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/src/security/dom_sanitization_service.ts b/packages/platform-browser/src/security/dom_sanitization_service.ts
index 69c08cb2019cf..1521a93f39b78 100644
--- a/packages/platform-browser/src/security/dom_sanitization_service.ts
+++ b/packages/platform-browser/src/security/dom_sanitization_service.ts
@@ -162,7 +162,7 @@ export class DomSanitizerImpl extends DomSanitizer {
         if (allowSanitizationBypassOrThrow(value, BypassType.Html)) {
           return unwrapSafeValue(value);
         }
-        return _sanitizeHtml(this._doc, String(value));
+        return _sanitizeHtml(this._doc, String(value)).toString();
       case SecurityContext.STYLE:
         if (allowSanitizationBypassOrThrow(value, BypassType.Style)) {
           return unwrapSafeValue(value);
diff --git a/packages/platform-browser/test/browser_util_spec.ts b/packages/platform-browser/test/browser_util_spec.ts
index 279d6369ebb99..438b00c97377c 100644
--- a/packages/platform-browser/test/browser_util_spec.ts
+++ b/packages/platform-browser/test/browser_util_spec.ts
@@ -51,32 +51,6 @@ import {BrowserDetection} from '../testing/src/browser_util';
         isChromeDesktop: false,
         isOldChrome: false
       },
-      {
-        name: 'IE9',
-        ua: 'Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0; SLCC2; .NET CLR 2.0.50727)',
-        isFirefox: false,
-        isAndroid: false,
-        isEdge: false,
-        isIE: true,
-        isWebkit: false,
-        isIOS7: false,
-        isSlow: true,
-        isChromeDesktop: false,
-        isOldChrome: false
-      },
-      {
-        name: 'IE10',
-        ua: 'Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.2; WOW64; Trident/6.0; .NET4.0E; .NET4.0C)',
-        isFirefox: false,
-        isAndroid: false,
-        isEdge: false,
-        isIE: true,
-        isWebkit: false,
-        isIOS7: false,
-        isSlow: true,
-        isChromeDesktop: false,
-        isOldChrome: false
-      },
       {
         name: 'IE11',
         ua: 'Mozilla/5.0 (Windows NT 6.3; WOW64; Trident/7.0; .NET4.0E; .NET4.0C; rv:11.0) like Gecko',
diff --git a/packages/platform-browser/test/dom/dom_renderer_spec.ts b/packages/platform-browser/test/dom/dom_renderer_spec.ts
index 8ee0cf550e661..1dfb5deeafaa3 100644
--- a/packages/platform-browser/test/dom/dom_renderer_spec.ts
+++ b/packages/platform-browser/test/dom/dom_renderer_spec.ts
@@ -20,8 +20,8 @@ import {expect} from '@angular/platform-browser/testing/src/matchers';
     beforeEach(() => {
       TestBed.configureTestingModule({
         declarations: [
-          TestCmp, SomeApp, CmpEncapsulationEmulated, CmpEncapsulationNative, CmpEncapsulationNone,
-          CmpEncapsulationNative
+          TestCmp, SomeApp, CmpEncapsulationEmulated, CmpEncapsulationShadow, CmpEncapsulationNone,
+          CmpEncapsulationShadow
         ]
       });
       renderer = TestBed.createComponent(TestCmp).componentInstance.renderer;
@@ -98,16 +98,14 @@ import {expect} from '@angular/platform-browser/testing/src/matchers';
       });
     });
 
-    if (browserDetection.supportsDeprecatedShadowDomV0) {
+    if (browserDetection.supportsShadowDom) {
       it('should allow to style components with emulated encapsulation and no encapsulation inside of components with shadow DOM',
          () => {
            const fixture = TestBed.createComponent(SomeApp);
+           const cmp = fixture.debugElement.query(By.css('cmp-shadow')).nativeElement;
+           const shadow = cmp.shadowRoot.querySelector('.shadow');
 
-           const cmp = fixture.debugElement.query(By.css('cmp-native')).nativeElement;
-
-
-           const native = cmp.shadowRoot.querySelector('.native');
-           expect(window.getComputedStyle(native).color).toEqual('rgb(255, 0, 0)');
+           expect(window.getComputedStyle(shadow).color).toEqual('rgb(255, 0, 0)');
 
            const emulated = cmp.shadowRoot.querySelector('.emulated');
            expect(window.getComputedStyle(emulated).color).toEqual('rgb(0, 0, 255)');
@@ -119,15 +117,6 @@ import {expect} from '@angular/platform-browser/testing/src/matchers';
   });
 }
 
-@Component({
-  selector: 'cmp-native',
-  template: `<div class="native"></div><cmp-emulated></cmp-emulated><cmp-none></cmp-none>`,
-  styles: [`.native { color: red; }`],
-  encapsulation: ViewEncapsulation.Native
-})
-class CmpEncapsulationNative {
-}
-
 @Component({
   selector: 'cmp-emulated',
   template: `<div class="emulated"></div>`,
@@ -149,7 +138,7 @@ class CmpEncapsulationNone {
 @Component({
   selector: 'cmp-shadow',
   template: `<div class="shadow"></div><cmp-emulated></cmp-emulated><cmp-none></cmp-none>`,
-  styles: [`.native { color: red; }`],
+  styles: [`.shadow { color: red; }`],
   encapsulation: ViewEncapsulation.ShadowDom
 })
 class CmpEncapsulationShadow {
@@ -158,7 +147,7 @@ class CmpEncapsulationShadow {
 @Component({
   selector: 'some-app',
   template: `
-	  <cmp-native></cmp-native>
+	  <cmp-shadow></cmp-shadow>
 	  <cmp-emulated></cmp-emulated>
 	  <cmp-none></cmp-none>
   `,
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 f434e6b322292..c4be06190a520 100644
--- a/packages/platform-browser/test/dom/events/event_manager_spec.ts
+++ b/packages/platform-browser/test/dom/events/event_manager_spec.ts
@@ -311,7 +311,7 @@ describe('EventManager', () => {
     expect(receivedEvents).toEqual([]);
   });
 
-  it('should run blackListedEvents handler outside of ngZone', () => {
+  it('should run unpatchedEvents handler outside of ngZone', () => {
     const Zone = (window as any)['Zone'];
     const element = el('<div><div></div></div>');
     doc.body.appendChild(element);
diff --git a/packages/platform-browser/test/dom/shadow_dom_spec.ts b/packages/platform-browser/test/dom/shadow_dom_spec.ts
index 9a4abab09da8f..afb6d1f462385 100644
--- a/packages/platform-browser/test/dom/shadow_dom_spec.ts
+++ b/packages/platform-browser/test/dom/shadow_dom_spec.ts
@@ -15,13 +15,11 @@ import {expect} from '@angular/platform-browser/testing/src/matchers';
 
 if (browserDetection.supportsShadowDom) {
   describe('ShadowDOM Support', () => {
-    let testContainer: HTMLDivElement;
-
     beforeEach(() => {
       TestBed.configureTestingModule({imports: [TestModule]});
     });
 
-    it('should attach and use a shadowRoot when ViewEncapsulation.Native is set', () => {
+    it('should attach and use a shadowRoot when ViewEncapsulation.ShadowDom is set', () => {
       const compEl = TestBed.createComponent(ShadowComponent).nativeElement;
       expect(compEl.shadowRoot!.textContent).toEqual('Hello World');
     });
diff --git a/packages/platform-browser/test/testing_public_spec.ts b/packages/platform-browser/test/testing_public_spec.ts
index 073592ac46ca3..bb6fa0e575ed6 100644
--- a/packages/platform-browser/test/testing_public_spec.ts
+++ b/packages/platform-browser/test/testing_public_spec.ts
@@ -774,18 +774,6 @@ const bTok = new InjectionToken<string>('b');
           expect(testDir!.test).toBe('some prop');
         });
 
-        it('should throw if the TestBed is already created', () => {
-          @Component({selector: 'comp', template: 'a'})
-          class MyComponent {
-          }
-
-          TestBed.inject(Injector);
-
-          expect(() => TestBed.overrideTemplateUsingTestingModule(MyComponent, 'b'))
-              .toThrowError(
-                  /Cannot override template when the test module has already been instantiated/);
-        });
-
         it('should reset overrides when the testing module is resetted', () => {
           @Component({selector: 'comp', template: 'a'})
           class MyComponent {
@@ -1071,5 +1059,69 @@ Did you run and wait for 'resolveComponentResources()'?` :
            expect(componentFixture.nativeElement).toHaveText('Parent(Mock)');
          }));
     });
+
+    describe('calling override methods after TestBed initialization', () => {
+      const getExpectedErrorMessage = (methodName: string, methodDescription: string) => `Cannot ${
+          methodDescription} when the test module has already been instantiated. Make sure you are not using \`inject\` before \`${
+          methodName}\`.`;
+
+      it('should throw if TestBed.overrideProvider is called after TestBed initialization', () => {
+        TestBed.inject(Injector);
+
+        expect(() => TestBed.overrideProvider(aTok, {
+          useValue: 'mockValue'
+        })).toThrowError(getExpectedErrorMessage('overrideProvider', 'override provider'));
+      });
+
+      it('should throw if TestBed.overrideModule is called after TestBed initialization', () => {
+        @NgModule()
+        class MyModule {
+        }
+
+        TestBed.inject(Injector);
+
+        expect(() => TestBed.overrideModule(MyModule, {}))
+            .toThrowError(getExpectedErrorMessage('overrideModule', 'override module metadata'));
+      });
+
+      it('should throw if TestBed.overridePipe is called after TestBed initialization', () => {
+        @Pipe({name: 'myPipe'})
+        class MyPipe {
+          transform(value: any) {
+            return value;
+          }
+        }
+
+        TestBed.inject(Injector);
+
+        expect(() => TestBed.overridePipe(MyPipe, {}))
+            .toThrowError(getExpectedErrorMessage('overridePipe', 'override pipe metadata'));
+      });
+
+      it('should throw if TestBed.overrideDirective is called after TestBed initialization', () => {
+        @Directive()
+        class MyDirective {
+        }
+
+        TestBed.inject(Injector);
+
+        expect(() => TestBed.overrideDirective(MyDirective, {}))
+            .toThrowError(
+                getExpectedErrorMessage('overrideDirective', 'override directive metadata'));
+      });
+
+      it('should throw if TestBed.overrideTemplateUsingTestingModule is called after TestBed initialization',
+         () => {
+           @Component({selector: 'comp', template: 'a'})
+           class MyComponent {
+           }
+
+           TestBed.inject(Injector);
+
+           expect(() => TestBed.overrideTemplateUsingTestingModule(MyComponent, 'b'))
+               .toThrowError(
+                   /Cannot override template when the test module has already been instantiated/);
+         });
+    });
   });
 }
diff --git a/packages/platform-browser/testing/src/matchers.ts b/packages/platform-browser/testing/src/matchers.ts
index cd3bbec46b4ff..ffdac71739909 100644
--- a/packages/platform-browser/testing/src/matchers.ts
+++ b/packages/platform-browser/testing/src/matchers.ts
@@ -305,8 +305,14 @@ function elementText(n: any): string {
     return '';
   }
 
-  if (getDOM().isElementNode(n) && (n as Element).tagName == 'CONTENT') {
-    return elementText(Array.prototype.slice.apply((<any>n).getDistributedNodes()));
+  if (getDOM().isElementNode(n)) {
+    const tagName = (n as Element).tagName;
+
+    if (tagName === 'CONTENT') {
+      return elementText(Array.prototype.slice.apply((<any>n).getDistributedNodes()));
+    } else if (tagName === 'SLOT') {
+      return elementText(Array.prototype.slice.apply((<any>n).assignedNodes()));
+    }
   }
 
   if (hasShadowRoot(n)) {
diff --git a/packages/platform-server/src/location.ts b/packages/platform-server/src/location.ts
index 60f42c793b1a1..054e4f85ba855 100644
--- a/packages/platform-server/src/location.ts
+++ b/packages/platform-server/src/location.ts
@@ -12,7 +12,6 @@ import {Subject} from 'rxjs';
 import * as url from 'url';
 import {INITIAL_CONFIG, PlatformConfig} from './tokens';
 
-
 function parseUrl(urlStr: string) {
   const parsedUrl = url.parse(urlStr);
   return {
@@ -43,16 +42,28 @@ export class ServerPlatformLocation implements PlatformLocation {
   constructor(
       @Inject(DOCUMENT) private _doc: any, @Optional() @Inject(INITIAL_CONFIG) _config: any) {
     const config = _config as PlatformConfig | null;
-    if (!!config && !!config.url) {
-      const parsedUrl = parseUrl(config.url);
-      this.hostname = parsedUrl.hostname;
-      this.protocol = parsedUrl.protocol;
-      this.port = parsedUrl.port;
-      this.pathname = parsedUrl.pathname;
-      this.search = parsedUrl.search;
-      this.hash = parsedUrl.hash;
+    if (!config) {
+      return;
+    }
+    if (config.url) {
+      const url = parseUrl(config.url);
+      this.protocol = url.protocol;
+      this.hostname = url.hostname;
+      this.port = url.port;
+      this.pathname = url.pathname;
+      this.search = url.search;
+      this.hash = url.hash;
       this.href = _doc.location.href;
     }
+    if (config.useAbsoluteUrl) {
+      if (!config.baseUrl) {
+        throw new Error(`"PlatformConfig.baseUrl" must be set if "useAbsoluteUrl" is true`);
+      }
+      const url = parseUrl(config.baseUrl);
+      this.protocol = url.protocol;
+      this.hostname = url.hostname;
+      this.port = url.port;
+    }
   }
 
   getBaseHrefFromDOM(): string {
diff --git a/packages/platform-server/src/server_renderer.ts b/packages/platform-server/src/server_renderer.ts
index d4198825e1366..fb6334ad67274 100644
--- a/packages/platform-server/src/server_renderer.ts
+++ b/packages/platform-server/src/server_renderer.ts
@@ -32,7 +32,6 @@ export class ServerRendererFactory2 implements RendererFactory2 {
       return this.defaultRenderer;
     }
     switch (type.encapsulation) {
-      case ViewEncapsulation.Native:
       case ViewEncapsulation.Emulated: {
         let renderer = this.rendererByCompId.get(type.id);
         if (!renderer) {
diff --git a/packages/platform-server/src/styles_host.ts b/packages/platform-server/src/styles_host.ts
index 47aeba45d2bcf..e8364cb1833cb 100644
--- a/packages/platform-server/src/styles_host.ts
+++ b/packages/platform-server/src/styles_host.ts
@@ -13,6 +13,7 @@ import {ɵSharedStylesHost as SharedStylesHost, ɵTRANSITION_ID} from '@angular/
 @Injectable()
 export class ServerStylesHost extends SharedStylesHost {
   private head: any = null;
+  private _styleNodes = new Set<HTMLElement>();
 
   constructor(
       @Inject(DOCUMENT) private doc: any,
@@ -29,9 +30,14 @@ export class ServerStylesHost extends SharedStylesHost {
       el.setAttribute('ng-transition', this.transitionId);
     }
     this.head.appendChild(el);
+    this._styleNodes.add(el);
   }
 
   onStylesAdded(additions: Set<string>) {
     additions.forEach(style => this._addStyle(style));
   }
+
+  ngOnDestroy() {
+    this._styleNodes.forEach(styleNode => styleNode.remove());
+  }
 }
diff --git a/packages/platform-server/src/tokens.ts b/packages/platform-server/src/tokens.ts
index b5942985d142e..7a937bc5647fc 100644
--- a/packages/platform-server/src/tokens.ts
+++ b/packages/platform-server/src/tokens.ts
@@ -20,19 +20,26 @@ export interface PlatformConfig {
    */
   document?: string;
   /**
-   * The URL for the current application state. This is
-   * used for initializing the platform's location and
-   * for setting absolute URL resolution for HTTP requests.
+   * The URL for the current application state. This is used for initializing
+   * the platform's location. `protocol`, `hostname`, and `port` will be
+   * overridden if `baseUrl` is set.
    * @default none
    */
   url?: string;
   /**
-   * Whether to append the absolute URL to any relative HTTP
-   * requests. If set to true, this logic executes prior to
-   * any HTTP interceptors that may run later on in the request.
+   * Whether to append the absolute URL to any relative HTTP requests. If set to
+   * true, this logic executes prior to any HTTP interceptors that may run later
+   * on in the request. `baseUrl` must be supplied if this flag is enabled.
    * @default false
    */
   useAbsoluteUrl?: boolean;
+  /**
+   * The base URL for resolving absolute URL for HTTP requests. It must be set
+   * if `useAbsoluteUrl` is true, and must consist of protocol, hostname,
+   * and optional port. This option has no effect if `useAbsoluteUrl` is not
+   * enabled.
+   */
+  baseUrl?: string;
 }
 
 /**
diff --git a/packages/platform-server/test/integration_spec.ts b/packages/platform-server/test/integration_spec.ts
index 8fc8c91325e88..34740d10acba3 100644
--- a/packages/platform-server/test/integration_spec.ts
+++ b/packages/platform-server/test/integration_spec.ts
@@ -272,19 +272,19 @@ class ImageExampleModule {
 
 @Component({
   selector: 'app',
-  template: 'Native works',
-  encapsulation: ViewEncapsulation.Native,
+  template: 'Shadow DOM works',
+  encapsulation: ViewEncapsulation.ShadowDom,
   styles: [':host { color: red; }']
 })
-class NativeEncapsulationApp {
+class ShadowDomEncapsulationApp {
 }
 
 @NgModule({
-  declarations: [NativeEncapsulationApp],
+  declarations: [ShadowDomEncapsulationApp],
   imports: [BrowserModule.withServerTransition({appId: 'test'}), ServerModule],
-  bootstrap: [NativeEncapsulationApp]
+  bootstrap: [ShadowDomEncapsulationApp]
 })
-class NativeExampleModule {
+class ShadowDomExampleModule {
 }
 
 @Component({selector: 'my-child', template: 'Works!'})
@@ -666,8 +666,8 @@ describe('platform-server integration', () => {
          });
        }));
 
-    it('should handle ViewEncapsulation.Native', waitForAsync(() => {
-         renderModule(NativeExampleModule, {document: doc}).then(output => {
+    it('should handle ViewEncapsulation.ShadowDom', waitForAsync(() => {
+         renderModule(ShadowDomExampleModule, {document: doc}).then(output => {
            expect(output).not.toBe('');
            expect(output).toContain('color: red');
            called = true;
@@ -794,10 +794,62 @@ describe('platform-server integration', () => {
        }));
 
     describe('relative requests', () => {
+      it('will throw if "useAbsoluteUrl" is true but "baseUrl" is not provided', async () => {
+        const platform = platformDynamicServer([{
+          provide: INITIAL_CONFIG,
+          useValue: {
+            document: '<app></app>',
+            url: 'http://localhost',
+            useAbsoluteUrl: true,
+          },
+        }]);
+        const appRef = await platform.bootstrapModule(HttpClientExampleModule);
+        expect(() => appRef.injector.get(PlatformLocation))
+            .toThrowError(/"PlatformConfig\.baseUrl" must be set if "useAbsoluteUrl" is true/);
+      });
+
+      it('will resolve absolute url using "baseUrl"', async () => {
+        const platform = platformDynamicServer([{
+          provide: INITIAL_CONFIG,
+          useValue: {
+            document: '<app></app>',
+            url: 'http://localhost',
+            useAbsoluteUrl: true,
+            baseUrl: 'https://angular.io:8080',
+          },
+        }]);
+        const appRef = await platform.bootstrapModule(HttpClientExampleModule);
+        const location = appRef.injector.get(PlatformLocation);
+        expect(location.protocol).toBe('https:');
+        expect(location.hostname).toBe('angular.io');
+        expect(location.port).toBe('8080');
+      });
+
+      it('"baseUrl" has no effect if "useAbsoluteUrl" is not enabled', async () => {
+        const platform = platformDynamicServer([{
+          provide: INITIAL_CONFIG,
+          useValue: {
+            document: '<app></app>',
+            url: 'http://localhost',
+            baseUrl: 'https://angular.io:8080',
+          },
+        }]);
+        const appRef = await platform.bootstrapModule(HttpClientExampleModule);
+        const location = appRef.injector.get(PlatformLocation);
+        expect(location.protocol).toBe('http:');
+        expect(location.hostname).toBe('localhost');
+        expect(location.port).toBe('');
+      });
+
       it('correctly maps to absolute URL request with base config', async () => {
         const platform = platformDynamicServer([{
           provide: INITIAL_CONFIG,
-          useValue: {document: '<app></app>', url: 'http://localhost', useAbsoluteUrl: true}
+          useValue: {
+            document: '<app></app>',
+            url: 'http://localhost',
+            baseUrl: 'http://localhost',
+            useAbsoluteUrl: true,
+          }
         }]);
         const ref = await platform.bootstrapModule(HttpClientExampleModule);
         const mock = ref.injector.get(HttpTestingController) as HttpTestingController;
@@ -831,7 +883,12 @@ describe('platform-server integration', () => {
       it('correctly maps to absolute URL request with port', async () => {
         const platform = platformDynamicServer([{
           provide: INITIAL_CONFIG,
-          useValue: {document: '<app></app>', url: 'http://localhost:5000', useAbsoluteUrl: true}
+          useValue: {
+            document: '<app></app>',
+            url: 'http://localhost:5000',
+            baseUrl: 'http://localhost',
+            useAbsoluteUrl: true,
+          }
         }]);
         const ref = await platform.bootstrapModule(HttpClientExampleModule);
         const mock = ref.injector.get(HttpTestingController) as HttpTestingController;
@@ -848,7 +905,12 @@ describe('platform-server integration', () => {
       it('correctly maps to absolute URL request with two slashes', async () => {
         const platform = platformDynamicServer([{
           provide: INITIAL_CONFIG,
-          useValue: {document: '<app></app>', url: 'http://localhost/', useAbsoluteUrl: true}
+          useValue: {
+            document: '<app></app>',
+            url: 'http://localhost/',
+            baseUrl: 'http://localhost',
+            useAbsoluteUrl: true,
+          }
         }]);
         const ref = await platform.bootstrapModule(HttpClientExampleModule);
         const mock = ref.injector.get(HttpTestingController) as HttpTestingController;
@@ -865,7 +927,12 @@ describe('platform-server integration', () => {
       it('correctly maps to absolute URL request with no slashes', async () => {
         const platform = platformDynamicServer([{
           provide: INITIAL_CONFIG,
-          useValue: {document: '<app></app>', url: 'http://localhost', useAbsoluteUrl: true}
+          useValue: {
+            document: '<app></app>',
+            url: 'http://localhost',
+            baseUrl: 'http://localhost',
+            useAbsoluteUrl: true,
+          }
         }]);
         const ref = await platform.bootstrapModule(HttpClientExampleModule);
         const mock = ref.injector.get(HttpTestingController) as HttpTestingController;
@@ -882,8 +949,12 @@ describe('platform-server integration', () => {
       it('correctly maps to absolute URL request with longer url and no slashes', async () => {
         const platform = platformDynamicServer([{
           provide: INITIAL_CONFIG,
-          useValue:
-              {document: '<app></app>', url: 'http://localhost/path/page', useAbsoluteUrl: true}
+          useValue: {
+            document: '<app></app>',
+            url: 'http://localhost/path/page',
+            baseUrl: 'http://localhost',
+            useAbsoluteUrl: true,
+          }
         }]);
         const ref = await platform.bootstrapModule(HttpClientExampleModule);
         const mock = ref.injector.get(HttpTestingController) as HttpTestingController;
@@ -900,8 +971,12 @@ describe('platform-server integration', () => {
       it('correctly maps to absolute URL request with longer url and slashes', async () => {
         const platform = platformDynamicServer([{
           provide: INITIAL_CONFIG,
-          useValue:
-              {document: '<app></app>', url: 'http://localhost/path/page', useAbsoluteUrl: true}
+          useValue: {
+            document: '<app></app>',
+            url: 'http://localhost/path/page',
+            baseUrl: 'http://localhost',
+            useAbsoluteUrl: true,
+          }
         }]);
         const ref = await platform.bootstrapModule(HttpClientExampleModule);
         const mock = ref.injector.get(HttpTestingController) as HttpTestingController;
@@ -922,7 +997,8 @@ describe('platform-server integration', () => {
              useValue: {
                document: '<base href="http://other"><app></app>',
                url: 'http://localhost/path/page',
-               useAbsoluteUrl: true
+               baseUrl: 'http://localhost',
+               useAbsoluteUrl: true,
              }
            }]);
            const ref = await platform.bootstrapModule(HttpClientExampleModule);
diff --git a/packages/platform-server/test/server_styles_host_spec.ts b/packages/platform-server/test/server_styles_host_spec.ts
new file mode 100644
index 0000000000000..5a0056fb13c6a
--- /dev/null
+++ b/packages/platform-server/test/server_styles_host_spec.ts
@@ -0,0 +1,50 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {ɵgetDOM as getDOM} from '@angular/common';
+import {ServerStylesHost} from '@angular/platform-server/src/styles_host';
+
+
+(function() {
+if (getDOM().supportsDOMEvents()) return;  // NODE only
+
+describe('ServerStylesHost', () => {
+  let ssh: ServerStylesHost;
+  let documentHead: Element;
+  beforeEach(() => {
+    const doc = getDOM().createHtmlDocument();
+    ssh = new ServerStylesHost(doc, '');
+    documentHead = doc.head;
+    doc.querySelector('title')?.remove();
+  });
+
+  it('should add existing styles', () => {
+    ssh.addStyles(['a {};']);
+    expect(documentHead.innerHTML).toEqual('<style>a {};</style>');
+  });
+
+  it('should add new styles to hosts', () => {
+    ssh.addStyles(['a {};']);
+    expect(documentHead.innerHTML).toEqual('<style>a {};</style>');
+  });
+
+  it('should add styles only once to hosts', () => {
+    ssh.addStyles(['a {};']);
+    ssh.addStyles(['a {};']);
+    expect(documentHead.innerHTML).toEqual('<style>a {};</style>');
+  });
+
+  it('should remove style nodes on destroy', () => {
+    ssh.addStyles(['a {};']);
+    expect(documentHead.innerHTML).toEqual('<style>a {};</style>');
+
+    ssh.ngOnDestroy();
+    expect(documentHead.innerHTML).toEqual('');
+  });
+});
+})();
diff --git a/packages/platform-webworker-dynamic/BUILD.bazel b/packages/platform-webworker-dynamic/BUILD.bazel
deleted file mode 100644
index 1103cdf08b006..0000000000000
--- a/packages/platform-webworker-dynamic/BUILD.bazel
+++ /dev/null
@@ -1,43 +0,0 @@
-load("//tools:defaults.bzl", "ng_module", "ng_package", "ts_api_guardian_test_npm_package")
-
-package(default_visibility = ["//visibility:public"])
-
-ng_module(
-    name = "platform-webworker-dynamic",
-    srcs = glob(
-        [
-            "*.ts",
-            "src/**/*.ts",
-        ],
-    ),
-    deps = [
-        "//packages:types",
-        "//packages/common",
-        "//packages/compiler",
-        "//packages/core",
-        "//packages/platform-browser-dynamic",
-    ],
-)
-
-ng_package(
-    name = "npm_package",
-    srcs = ["package.json"],
-    entry_point = ":index.ts",
-    tags = [
-        "release-with-framework",
-    ],
-    # Do not add more to this list.
-    # Dependencies on the full npm_package cause long re-builds.
-    visibility = ["//integration:__pkg__"],
-    deps = [":platform-webworker-dynamic"],
-)
-
-ts_api_guardian_test_npm_package(
-    name = "platform-webworker-dynamic_api",
-    actualDir = "angular/packages/platform-webworker-dynamic/npm_package",
-    data = [
-        ":npm_package",
-        "//goldens:public-api",
-    ],
-    goldenDir = "angular/goldens/public-api/platform-webworker-dynamic",
-)
diff --git a/packages/platform-webworker-dynamic/index.ts b/packages/platform-webworker-dynamic/index.ts
deleted file mode 100644
index 7ef6571cd5883..0000000000000
--- a/packages/platform-webworker-dynamic/index.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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 not used to build this module. It is only used during editing
-// by the TypeScript language service and during build for verification. `ngc`
-// replaces this file with production index.ts when it rewrites private symbol
-// names.
-
-export * from './public_api';
diff --git a/packages/platform-webworker-dynamic/package.json b/packages/platform-webworker-dynamic/package.json
deleted file mode 100644
index 5c7baced1a68c..0000000000000
--- a/packages/platform-webworker-dynamic/package.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "name": "@angular/platform-webworker-dynamic",
-  "version": "0.0.0-PLACEHOLDER",
-  "description": "Angular - library for using Angular in a web browser with web workers",
-  "author": "angular",
-  "license": "MIT",
-  "dependencies": {
-    "tslib": "^2.0.0"
-  },
-  "peerDependencies": {
-    "@angular/common": "0.0.0-PLACEHOLDER",
-    "@angular/core": "0.0.0-PLACEHOLDER",
-    "@angular/compiler": "0.0.0-PLACEHOLDER",
-    "@angular/platform-browser": "0.0.0-PLACEHOLDER",
-    "@angular/platform-webworker": "0.0.0-PLACEHOLDER"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/angular/angular.git",
-    "directory": "packages/platform-webworker-dynamic"
-  },
-  "ng-update": {
-    "packageGroup": "NG_UPDATE_PACKAGE_GROUP"
-  },
-  "sideEffects": false,
-  "publishConfig":{
-    "registry":"https://wombat-dressing-room.appspot.com"
-  }
-}
diff --git a/packages/platform-webworker-dynamic/src/platform-webworker-dynamic.ts b/packages/platform-webworker-dynamic/src/platform-webworker-dynamic.ts
deleted file mode 100644
index f82a60f2b6072..0000000000000
--- a/packages/platform-webworker-dynamic/src/platform-webworker-dynamic.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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 {ɵPLATFORM_WORKER_UI_ID as PLATFORM_WORKER_UI_ID} from '@angular/common';
-import {ResourceLoader} from '@angular/compiler';
-import {COMPILER_OPTIONS, createPlatformFactory, PLATFORM_ID, PlatformRef, StaticProvider} from '@angular/core';
-import {ɵplatformCoreDynamic as platformCoreDynamic, ɵResourceLoaderImpl as ResourceLoaderImpl} from '@angular/platform-browser-dynamic';
-
-export {VERSION} from './version';
-
-
-/**
- * @publicApi
- * @deprecated platform-webworker is deprecated in Angular and will be removed in a future version
- *     of Angular
- */
-export const platformWorkerAppDynamic =
-    createPlatformFactory(platformCoreDynamic, 'workerAppDynamic', [
-      {
-        provide: COMPILER_OPTIONS,
-        useValue: {providers: [{provide: ResourceLoader, useClass: ResourceLoaderImpl, deps: []}]},
-        multi: true
-      },
-      {provide: PLATFORM_ID, useValue: PLATFORM_WORKER_UI_ID}
-    ]);
diff --git a/packages/platform-webworker-dynamic/src/version.ts b/packages/platform-webworker-dynamic/src/version.ts
deleted file mode 100644
index 59d0e9ac6695d..0000000000000
--- a/packages/platform-webworker-dynamic/src/version.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @license
- * Copyright Google LLC All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-/**
- * @module
- * @description
- * Entry point for all public APIs of the common package.
- */
-
-import {Version} from '@angular/core';
-
-/**
- * @publicApi
- * @deprecated platform-webworker is deprecated in Angular and will be removed in a future version
- *     of Angular
- */
-export const VERSION = new Version('0.0.0-PLACEHOLDER');
diff --git a/packages/platform-webworker/BUILD.bazel b/packages/platform-webworker/BUILD.bazel
deleted file mode 100644
index 1237f7af7b70e..0000000000000
--- a/packages/platform-webworker/BUILD.bazel
+++ /dev/null
@@ -1,49 +0,0 @@
-load("//tools:defaults.bzl", "ng_module", "ng_package", "ts_api_guardian_test_npm_package")
-
-package(default_visibility = ["//visibility:public"])
-
-ng_module(
-    name = "platform-webworker",
-    srcs = glob(
-        [
-            "*.ts",
-            "src/**/*.ts",
-        ],
-    ),
-    # Disable building with strict compatibility as the platform-webworker package is
-    # deprecated and therefore it is not needed to make it compatible with --strict.
-    tsconfig = "//packages:tsconfig-build-no-strict",
-    deps = [
-        "//packages:types",
-        "//packages/common",
-        "//packages/compiler",
-        "//packages/core",
-        "//packages/platform-browser",
-        "@npm//rxjs",
-    ],
-)
-
-ng_package(
-    name = "npm_package",
-    srcs = ["package.json"],
-    entry_point = ":index.ts",
-    tags = [
-        "release-with-framework",
-    ],
-    # Do not add more to this list.
-    # Dependencies on the full npm_package cause long re-builds.
-    visibility = ["//integration:__pkg__"],
-    deps = [
-        ":platform-webworker",
-    ],
-)
-
-ts_api_guardian_test_npm_package(
-    name = "platform-webworker_api",
-    actualDir = "angular/packages/platform-webworker/npm_package",
-    data = [
-        ":npm_package",
-        "//goldens:public-api",
-    ],
-    goldenDir = "angular/goldens/public-api/platform-webworker",
-)
diff --git a/packages/platform-webworker/PACKAGE.md b/packages/platform-webworker/PACKAGE.md
deleted file mode 100644
index 7d52fca35778a..0000000000000
--- a/packages/platform-webworker/PACKAGE.md
+++ /dev/null
@@ -1,2 +0,0 @@
-**Deprecated** This package is deprecated and will be removed in a future version of Angular.
-See [Angular deprecations policy](guide/deprecations).
\ No newline at end of file
diff --git a/packages/platform-webworker/index.ts b/packages/platform-webworker/index.ts
deleted file mode 100644
index 7ef6571cd5883..0000000000000
--- a/packages/platform-webworker/index.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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 not used to build this module. It is only used during editing
-// by the TypeScript language service and during build for verification. `ngc`
-// replaces this file with production index.ts when it rewrites private symbol
-// names.
-
-export * from './public_api';
diff --git a/packages/platform-webworker/package.json b/packages/platform-webworker/package.json
deleted file mode 100644
index ac0cd34e20a75..0000000000000
--- a/packages/platform-webworker/package.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "name": "@angular/platform-webworker",
-  "version": "0.0.0-PLACEHOLDER",
-  "description": "Angular - library for using Angular in a web browser with web workers",
-  "author": "angular",
-  "license": "MIT",
-  "dependencies": {
-    "tslib": "^2.0.0"
-  },
-  "peerDependencies": {
-    "@angular/common": "0.0.0-PLACEHOLDER",
-    "@angular/core": "0.0.0-PLACEHOLDER",
-    "@angular/platform-browser": "0.0.0-PLACEHOLDER"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/angular/angular.git",
-    "directory": "packages/platform-webworker"
-  },
-  "ng-update": {
-    "packageGroup": "NG_UPDATE_PACKAGE_GROUP"
-  },
-  "sideEffects": false,
-  "publishConfig":{
-    "registry":"https://wombat-dressing-room.appspot.com"
-  }
-}
diff --git a/packages/platform-webworker/public_api.ts b/packages/platform-webworker/public_api.ts
deleted file mode 100644
index 8146e52b46a7d..0000000000000
--- a/packages/platform-webworker/public_api.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * @license
- * Copyright Google LLC All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-/**
- * @module
- * @description
- * Entry point for all public APIs of this package.
- */
-export * from './src/platform-webworker';
-// This file only reexports content of the `src` folder. Keep it that way.
diff --git a/packages/platform-webworker/src/platform-webworker.ts b/packages/platform-webworker/src/platform-webworker.ts
deleted file mode 100644
index 9846e80d3164f..0000000000000
--- a/packages/platform-webworker/src/platform-webworker.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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 {PlatformRef, StaticProvider} from '@angular/core';
-
-import {platformWorkerUi, WORKER_SCRIPT} from './worker_render';
-
-export {VERSION} from './version';
-export {ClientMessageBroker, ClientMessageBrokerFactory, FnArg, UiArguments} from './web_workers/shared/client_message_broker';
-export {MessageBus, MessageBusSink, MessageBusSource} from './web_workers/shared/message_bus';
-export {SerializerTypes} from './web_workers/shared/serializer';
-export {ReceivedMessage, ServiceMessageBroker, ServiceMessageBrokerFactory} from './web_workers/shared/service_message_broker';
-export {WORKER_UI_LOCATION_PROVIDERS} from './web_workers/ui/location_providers';
-export {WORKER_APP_LOCATION_PROVIDERS} from './web_workers/worker/location_providers';
-export {platformWorkerApp, WorkerAppModule} from './worker_app';
-export {platformWorkerUi} from './worker_render';
-
-/**
- * Bootstraps the worker ui.
- *
- * @publicApi
- * @deprecated platform-webworker is deprecated in Angular and will be removed in a future version
- *     of Angular
- */
-export function bootstrapWorkerUi(
-    workerScriptUri: string, customProviders: StaticProvider[] = []): Promise<PlatformRef> {
-  // For now, just creates the worker ui platform...
-  const platform = platformWorkerUi([
-    {provide: WORKER_SCRIPT, useValue: workerScriptUri},
-    ...customProviders,
-  ]);
-
-  return Promise.resolve(platform);
-}
diff --git a/packages/platform-webworker/src/version.ts b/packages/platform-webworker/src/version.ts
deleted file mode 100644
index 59d0e9ac6695d..0000000000000
--- a/packages/platform-webworker/src/version.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @license
- * Copyright Google LLC All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-/**
- * @module
- * @description
- * Entry point for all public APIs of the common package.
- */
-
-import {Version} from '@angular/core';
-
-/**
- * @publicApi
- * @deprecated platform-webworker is deprecated in Angular and will be removed in a future version
- *     of Angular
- */
-export const VERSION = new Version('0.0.0-PLACEHOLDER');
diff --git a/packages/platform-webworker/src/web_workers/shared/api.ts b/packages/platform-webworker/src/web_workers/shared/api.ts
deleted file mode 100644
index 5becf7e1cad69..0000000000000
--- a/packages/platform-webworker/src/web_workers/shared/api.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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 {InjectionToken} from '@angular/core';
-
-export const ON_WEB_WORKER = new InjectionToken<boolean>('WebWorker.onWebWorker');
diff --git a/packages/platform-webworker/src/web_workers/shared/client_message_broker.ts b/packages/platform-webworker/src/web_workers/shared/client_message_broker.ts
deleted file mode 100644
index fdd321cda1883..0000000000000
--- a/packages/platform-webworker/src/web_workers/shared/client_message_broker.ts
+++ /dev/null
@@ -1,166 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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 {EventEmitter, Injectable, Type, ɵstringify as stringify} from '@angular/core';
-import {MessageBus} from './message_bus';
-import {Serializer, SerializerTypes} from './serializer';
-
-/**
- * @publicApi
- * @deprecated platform-webworker is deprecated in Angular and will be removed in a future version
- *     of Angular
- */
-@Injectable()
-export class ClientMessageBrokerFactory {
-  /** @internal */
-  _serializer: Serializer;
-
-  /** @internal */
-  constructor(private _messageBus: MessageBus, _serializer: Serializer) {
-    this._serializer = _serializer;
-  }
-
-  /**
-   * Initializes the given channel and attaches a new {@link ClientMessageBroker} to it.
-   */
-  createMessageBroker(channel: string, runInZone: boolean = true): ClientMessageBroker {
-    this._messageBus.initChannel(channel, runInZone);
-    return new ClientMessageBroker(this._messageBus, this._serializer, channel);
-  }
-}
-
-interface PromiseCompleter {
-  resolve: (result: any) => void;
-  reject: (err: any) => void;
-}
-
-/**
- * @publicApi
- * @deprecated platform-webworker is deprecated in Angular and will be removed in a future version
- *     of Angular
- */
-export class ClientMessageBroker {
-  private _pending = new Map<string, PromiseCompleter>();
-  private _sink: EventEmitter<any>;
-  /** @internal */
-  public _serializer: Serializer;
-
-  /** @internal */
-  constructor(messageBus: MessageBus, _serializer: Serializer, private channel: any) {
-    this._sink = messageBus.to(channel);
-    this._serializer = _serializer;
-    const source = messageBus.from(channel);
-
-    source.subscribe({next: (message: ResponseMessageData) => this._handleMessage(message)});
-  }
-
-  private _generateMessageId(name: string): string {
-    const time: string = stringify(new Date().getTime());
-    let iteration: number = 0;
-    let id: string = name + time + stringify(iteration);
-    while (this._pending.has(id)) {
-      id = `${name}${time}${iteration}`;
-      iteration++;
-    }
-    return id;
-  }
-
-  runOnService(args: UiArguments, returnType: Type<any>|SerializerTypes|null): Promise<any>|null {
-    const fnArgs: any[] = [];
-    if (args.args) {
-      args.args.forEach(argument => {
-        if (argument.type != null) {
-          fnArgs.push(this._serializer.serialize(argument.value, argument.type));
-        } else {
-          fnArgs.push(argument.value);
-        }
-      });
-    }
-
-    let promise: Promise<any>|null;
-    let id: string|null = null;
-    if (returnType != null) {
-      let completer: PromiseCompleter = undefined!;
-      promise = new Promise((resolve, reject) => {
-        completer = {resolve, reject};
-      });
-      id = this._generateMessageId(args.method);
-      this._pending.set(id, completer);
-
-      promise.catch((err) => {
-        if (console && console.error) {
-          // tslint:disable-next-line:no-console
-          console.error(err);
-        }
-
-        completer.reject(err);
-      });
-
-      promise = promise.then(
-          (v: any) => this._serializer ? this._serializer.deserialize(v, returnType) : v);
-    } else {
-      promise = null;
-    }
-
-    const message: RequestMessageData = {
-      'method': args.method,
-      'args': fnArgs,
-    };
-    if (id != null) {
-      message['id'] = id;
-    }
-    this._sink.emit(message);
-
-    return promise;
-  }
-
-  private _handleMessage(message: ResponseMessageData): void {
-    if (message.type === 'result' || message.type === 'error') {
-      const id = message.id!;
-      if (this._pending.has(id)) {
-        if (message.type === 'result') {
-          this._pending.get(id)!.resolve(message.value);
-        } else {
-          this._pending.get(id)!.reject(message.value);
-        }
-        this._pending.delete(id);
-      }
-    }
-  }
-}
-
-interface RequestMessageData {
-  method: string;
-  args?: any[];
-  id?: string;
-}
-
-interface ResponseMessageData {
-  type: 'result'|'error';
-  value?: any;
-  id?: string;
-}
-
-/**
- * @publicApi
- * @deprecated platform-webworker is deprecated in Angular and will be removed in a future version
- *     of Angular
- */
-export class FnArg {
-  constructor(
-      public value: any, public type: Type<any>|SerializerTypes = SerializerTypes.PRIMITIVE) {}
-}
-
-/**
- * @publicApi
- * @deprecated platform-webworker is deprecated in Angular and will be removed in a future version
- *     of Angular
- */
-export class UiArguments {
-  constructor(public method: string, public args?: FnArg[]) {}
-}
diff --git a/packages/platform-webworker/src/web_workers/shared/message_bus.ts b/packages/platform-webworker/src/web_workers/shared/message_bus.ts
deleted file mode 100644
index 4b864cceacbfb..0000000000000
--- a/packages/platform-webworker/src/web_workers/shared/message_bus.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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 {EventEmitter, NgZone} from '@angular/core';
-
-
-
-/**
- * Message Bus is a low level API used to communicate between the UI and the background.
- * Communication is based on a channel abstraction. Messages published in a
- * given channel to one MessageBusSink are received on the same channel
- * by the corresponding MessageBusSource.
- *
- * @publicApi
- * @deprecated platform-webworker is deprecated in Angular and will be removed in a future version
- *     of Angular
- */
-export abstract class MessageBus implements MessageBusSource, MessageBusSink {
-  /**
-   * Sets up a new channel on the MessageBus.
-   * MUST be called before calling from or to on the channel.
-   * If runInZone is true then the source will emit events inside the angular zone
-   * and the sink will buffer messages and send only once the zone exits.
-   * if runInZone is false then the source will emit events inside the global zone
-   * and the sink will send messages immediately.
-   */
-  abstract initChannel(channel: string, runInZone?: boolean): void;
-
-  /**
-   * Assigns this bus to the given zone.
-   * Any callbacks attached to channels where runInZone was set to true on initialization
-   * will be executed in the given zone.
-   */
-  abstract attachToZone(zone: NgZone): void;
-
-  /**
-   * Returns an {@link EventEmitter} that emits every time a message
-   * is received on the given channel.
-   */
-  abstract from(channel: string): EventEmitter<any>;
-
-
-  /**
-   * Returns an {@link EventEmitter} for the given channel
-   * To publish methods to that channel just call next on the returned emitter
-   */
-  abstract to(channel: string): EventEmitter<any>;
-}
-
-/**
- * @publicApi
- * @deprecated platform-webworker is deprecated in Angular and will be removed in a future version
- *     of Angular
- */
-export interface MessageBusSource {
-  /**
-   * Sets up a new channel on the MessageBusSource.
-   * MUST be called before calling from on the channel.
-   * If runInZone is true then the source will emit events inside the angular zone.
-   * if runInZone is false then the source will emit events inside the global zone.
-   */
-  initChannel(channel: string, runInZone: boolean): void;
-
-  /**
-   * Assigns this source to the given zone.
-   * Any channels which are initialized with runInZone set to true will emit events that will be
-   * executed within the given zone.
-   */
-  attachToZone(zone: NgZone): void;
-
-  /**
-   * Returns an {@link EventEmitter} that emits every time a message
-   * is received on the given channel.
-   */
-  from(channel: string): EventEmitter<any>;
-}
-
-/**
- * @publicApi
- * @deprecated platform-webworker is deprecated in Angular and will be removed in a future version
- *     of Angular
- */
-export interface MessageBusSink {
-  /**
-   * Sets up a new channel on the MessageBusSink.
-   * MUST be called before calling to on the channel.
-   * If runInZone is true the sink will buffer messages and send only once the zone exits.
-   * if runInZone is false the sink will send messages immediately.
-   */
-  initChannel(channel: string, runInZone: boolean): void;
-
-  /**
-   * Assigns this sink to the given zone.
-   * Any channels which are initialized with runInZone set to true will wait for the given zone
-   * to exit before sending messages.
-   */
-  attachToZone(zone: NgZone): void;
-
-  /**
-   * Returns an {@link EventEmitter} for the given channel
-   * To publish methods to that channel just call next on the returned emitter
-   */
-  to(channel: string): EventEmitter<any>;
-}
diff --git a/packages/platform-webworker/src/web_workers/shared/messaging_api.ts b/packages/platform-webworker/src/web_workers/shared/messaging_api.ts
deleted file mode 100644
index 7449657fc937e..0000000000000
--- a/packages/platform-webworker/src/web_workers/shared/messaging_api.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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
- */
-
-/**
- * All channels used by angular's WebWorker components are listed here.
- * You should not use these channels in your application code.
- */
-export const RENDERER_2_CHANNEL = 'v2.ng-Renderer';
-export const EVENT_2_CHANNEL = 'v2.ng-Events';
-
-export const ROUTER_CHANNEL = 'ng-Router';
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
deleted file mode 100644
index f8465db492593..0000000000000
--- a/packages/platform-webworker/src/web_workers/shared/post_message_bus.ts
+++ /dev/null
@@ -1,169 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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 {EventEmitter, Injectable, NgZone} from '@angular/core';
-
-import {MessageBus, MessageBusSink, MessageBusSource} from './message_bus';
-
-
-
-// TODO(jteplitz602): Replace this with the definition in lib.webworker.d.ts(#3492)
-export interface PostMessageTarget {
-  postMessage: (message: any, transfer?: [Transferable]) => void;
-}
-
-export class PostMessageBusSink implements MessageBusSink {
-  // TODO(issue/24571): remove '!'.
-  private _zone!: NgZone;
-  private _channels: {[key: string]: _Channel} = {};
-  private _messageBuffer: Array<Object> = [];
-
-  constructor(private _postMessageTarget: PostMessageTarget) {}
-
-  attachToZone(zone: NgZone): void {
-    this._zone = zone;
-    this._zone.runOutsideAngular(() => {
-      this._zone.onStable.subscribe({
-        next: () => {
-          this._handleOnEventDone();
-        }
-      });
-    });
-  }
-
-  initChannel(channel: string, runInZone: boolean = true): void {
-    if (this._channels.hasOwnProperty(channel)) {
-      throw new Error(`${channel} has already been initialized`);
-    }
-
-    const emitter = new EventEmitter(false);
-    const channelInfo = new _Channel(emitter, runInZone);
-    this._channels[channel] = channelInfo;
-    emitter.subscribe((data: Object) => {
-      const message = {channel: channel, message: data};
-      if (runInZone) {
-        this._messageBuffer.push(message);
-      } else {
-        this._sendMessages([message]);
-      }
-    });
-  }
-
-  to(channel: string): EventEmitter<any> {
-    if (this._channels.hasOwnProperty(channel)) {
-      return this._channels[channel].emitter;
-    } else {
-      throw new Error(`${channel} is not set up. Did you forget to call initChannel?`);
-    }
-  }
-
-  private _handleOnEventDone() {
-    if (this._messageBuffer.length > 0) {
-      this._sendMessages(this._messageBuffer);
-      this._messageBuffer = [];
-    }
-  }
-
-  private _sendMessages(messages: Array<Object>) {
-    this._postMessageTarget.postMessage(messages);
-  }
-}
-
-export class PostMessageBusSource implements MessageBusSource {
-  // TODO(issue/24571): remove '!'.
-  private _zone!: NgZone;
-  private _channels: {[key: string]: _Channel} = {};
-
-  constructor(eventTarget?: EventTarget) {
-    if (eventTarget) {
-      eventTarget.addEventListener('message', (ev: MessageEvent) => this._handleMessages(ev));
-    } else {
-      // if no eventTarget is given we assume we're in a WebWorker and listen on the global scope
-      const workerScope = <EventTarget>self;
-      workerScope.addEventListener('message', (ev: MessageEvent) => this._handleMessages(ev));
-    }
-  }
-
-  attachToZone(zone: NgZone) {
-    this._zone = zone;
-  }
-
-  initChannel(channel: string, runInZone: boolean = true) {
-    if (this._channels.hasOwnProperty(channel)) {
-      throw new Error(`${channel} has already been initialized`);
-    }
-
-    const emitter = new EventEmitter(false);
-    const channelInfo = new _Channel(emitter, runInZone);
-    this._channels[channel] = channelInfo;
-  }
-
-  from(channel: string): EventEmitter<any> {
-    if (this._channels.hasOwnProperty(channel)) {
-      return this._channels[channel].emitter;
-    } else {
-      throw new Error(`${channel} is not set up. Did you forget to call initChannel?`);
-    }
-  }
-
-  private _handleMessages(ev: MessageEvent): void {
-    const messages = ev.data;
-    for (let i = 0; i < messages.length; i++) {
-      this._handleMessage(messages[i]);
-    }
-  }
-
-  private _handleMessage(data: any): void {
-    const channel = data.channel;
-    if (this._channels.hasOwnProperty(channel)) {
-      const channelInfo = this._channels[channel];
-      if (channelInfo.runInZone) {
-        this._zone.run(() => {
-          channelInfo.emitter.emit(data.message);
-        });
-      } else {
-        channelInfo.emitter.emit(data.message);
-      }
-    }
-  }
-}
-
-/**
- * A TypeScript implementation of {@link MessageBus} for communicating via JavaScript's
- * postMessage API.
- */
-@Injectable()
-export class PostMessageBus implements MessageBus {
-  constructor(public sink: PostMessageBusSink, public source: PostMessageBusSource) {}
-
-  attachToZone(zone: NgZone): void {
-    this.source.attachToZone(zone);
-    this.sink.attachToZone(zone);
-  }
-
-  initChannel(channel: string, runInZone: boolean = true): void {
-    this.source.initChannel(channel, runInZone);
-    this.sink.initChannel(channel, runInZone);
-  }
-
-  from(channel: string): EventEmitter<any> {
-    return this.source.from(channel);
-  }
-
-  to(channel: string): EventEmitter<any> {
-    return this.sink.to(channel);
-  }
-}
-
-/**
- * Helper class that wraps a channel's {@link EventEmitter} and
- * keeps track of if it should run in the zone.
- */
-class _Channel {
-  constructor(public emitter: EventEmitter<any>, public runInZone: boolean) {}
-}
diff --git a/packages/platform-webworker/src/web_workers/shared/render_store.ts b/packages/platform-webworker/src/web_workers/shared/render_store.ts
deleted file mode 100644
index b4d77105f599e..0000000000000
--- a/packages/platform-webworker/src/web_workers/shared/render_store.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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';
-
-@Injectable()
-export class RenderStore {
-  private _nextIndex = 0;
-  private _lookupById = new Map<number, any>();
-  private _lookupByObject = new Map<any, number>();
-
-  allocateId(): number {
-    return this._nextIndex++;
-  }
-
-  store(obj: any, id: number): void {
-    if (id == null) return;
-    this._lookupById.set(id, obj);
-    this._lookupByObject.set(obj, id);
-  }
-
-  remove(obj: any): void {
-    const index = this._lookupByObject.get(obj);
-    if (index != null) {
-      this._lookupByObject.delete(obj);
-      this._lookupById.delete(index);
-    }
-  }
-
-  deserialize(id: number): any {
-    return this._lookupById.has(id) ? this._lookupById.get(id) : null;
-  }
-
-  serialize(obj: any): number|null|undefined {
-    return obj == null ? null : this._lookupByObject.get(obj);
-  }
-}
diff --git a/packages/platform-webworker/src/web_workers/shared/serializer.ts b/packages/platform-webworker/src/web_workers/shared/serializer.ts
deleted file mode 100644
index d460db3266011..0000000000000
--- a/packages/platform-webworker/src/web_workers/shared/serializer.ts
+++ /dev/null
@@ -1,114 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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, RendererType2, Type, ɵstringify as stringify} from '@angular/core';
-import {RenderStore} from './render_store';
-
-
-/**
- * @publicApi
- * @deprecated platform-webworker is deprecated in Angular and will be removed in a future version
- *     of Angular
- */
-export const enum SerializerTypes {
-  // RendererType2
-  RENDERER_TYPE_2,
-  // Primitive types
-  PRIMITIVE,
-  // An object stored in a RenderStore
-  RENDER_STORE_OBJECT,
-}
-
-export class LocationType {
-  constructor(
-      public href: string, public protocol: string, public host: string, public hostname: string,
-      public port: string, public pathname: string|null, public search: string, public hash: string,
-      public origin: string) {}
-}
-
-@Injectable()
-export class Serializer {
-  constructor(private _renderStore: RenderStore) {}
-
-  serialize(obj: any, type: Type<any>|SerializerTypes = SerializerTypes.PRIMITIVE): Object {
-    if (obj == null || type === SerializerTypes.PRIMITIVE) {
-      return obj;
-    }
-    if (Array.isArray(obj)) {
-      return obj.map(v => this.serialize(v, type));
-    }
-    if (type === SerializerTypes.RENDER_STORE_OBJECT) {
-      return this._renderStore.serialize(obj)!;
-    }
-    if (type === SerializerTypes.RENDERER_TYPE_2) {
-      return this._serializeRendererType2(obj);
-    }
-    if (type === LocationType) {
-      return this._serializeLocation(obj);
-    }
-    throw new Error(`No serializer for type ${stringify(type)}`);
-  }
-
-  deserialize(map: any, type: Type<any>|SerializerTypes = SerializerTypes.PRIMITIVE, data?: any):
-      any {
-    if (map == null || type === SerializerTypes.PRIMITIVE) {
-      return map;
-    }
-    if (Array.isArray(map)) {
-      return map.map(val => this.deserialize(val, type, data));
-    }
-    if (type === SerializerTypes.RENDER_STORE_OBJECT) {
-      return this._renderStore.deserialize(map);
-    }
-    if (type === SerializerTypes.RENDERER_TYPE_2) {
-      return this._deserializeRendererType2(map);
-    }
-    if (type === LocationType) {
-      return this._deserializeLocation(map);
-    }
-    throw new Error(`No deserializer for type ${stringify(type)}`);
-  }
-
-  private _serializeLocation(loc: LocationType): Object {
-    return {
-      'href': loc.href,
-      'protocol': loc.protocol,
-      'host': loc.host,
-      'hostname': loc.hostname,
-      'port': loc.port,
-      'pathname': loc.pathname,
-      'search': loc.search,
-      'hash': loc.hash,
-      'origin': loc.origin,
-    };
-  }
-
-  private _deserializeLocation(loc: {[key: string]: any}): LocationType {
-    return new LocationType(
-        loc['href'], loc['protocol'], loc['host'], loc['hostname'], loc['port'], loc['pathname'],
-        loc['search'], loc['hash'], loc['origin']);
-  }
-
-  private _serializeRendererType2(type: RendererType2): {[key: string]: any} {
-    return {
-      'id': type.id,
-      'encapsulation': this.serialize(type.encapsulation),
-      'styles': this.serialize(type.styles),
-      'data': this.serialize(type.data),
-    };
-  }
-
-  private _deserializeRendererType2(props: {[key: string]: any}): RendererType2 {
-    return {
-      id: props['id'],
-      encapsulation: props['encapsulation'],
-      styles: this.deserialize(props['styles']),
-      data: this.deserialize(props['data'])
-    };
-  }
-}
diff --git a/packages/platform-webworker/src/web_workers/shared/service_message_broker.ts b/packages/platform-webworker/src/web_workers/shared/service_message_broker.ts
deleted file mode 100644
index 2eafcf4e07848..0000000000000
--- a/packages/platform-webworker/src/web_workers/shared/service_message_broker.ts
+++ /dev/null
@@ -1,106 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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 {EventEmitter, Injectable, Type} from '@angular/core';
-import {MessageBus} from '../shared/message_bus';
-import {Serializer, SerializerTypes} from '../shared/serializer';
-
-
-/**
- * @publicApi
- * @deprecated platform-webworker is deprecated in Angular and will be removed in a future version
- *     of Angular
- */
-@Injectable()
-export class ServiceMessageBrokerFactory {
-  /** @internal */
-  _serializer: Serializer;
-
-  /** @internal */
-  constructor(private _messageBus: MessageBus, _serializer: Serializer) {
-    this._serializer = _serializer;
-  }
-
-  /**
-   * Initializes the given channel and attaches a new {@link ServiceMessageBroker} to it.
-   */
-  createMessageBroker(channel: string, runInZone: boolean = true): ServiceMessageBroker {
-    this._messageBus.initChannel(channel, runInZone);
-    return new ServiceMessageBroker(this._messageBus, this._serializer, channel);
-  }
-}
-
-/**
- * Helper class for UIComponents that allows components to register methods.
- * If a registered method message is received from the broker on the worker,
- * the UIMessageBroker deserializes its arguments and calls the registered method.
- * If that method returns a promise, the UIMessageBroker returns the result to the worker.
- *
- * @publicApi
- * @deprecated platform-webworker is deprecated in Angular and will be removed in a future version
- *     of Angular
- */
-export class ServiceMessageBroker {
-  private _sink: EventEmitter<any>;
-  private _methods = new Map<string, Function>();
-
-  /** @internal */
-  constructor(messageBus: MessageBus, private _serializer: Serializer, private channel: string) {
-    this._sink = messageBus.to(channel);
-    const source = messageBus.from(channel);
-    source.subscribe({next: (message: any) => this._handleMessage(message)});
-  }
-
-  registerMethod(
-      methodName: string, signature: Array<Type<any>|SerializerTypes>|null,
-      method: (..._: any[]) => Promise<any>| void, returnType?: Type<any>|SerializerTypes): void {
-    this._methods.set(methodName, (message: ReceivedMessage) => {
-      const serializedArgs = message.args;
-      const numArgs = signature ? signature.length : 0;
-      const deserializedArgs = [];
-      for (let i = 0; i < numArgs; i++) {
-        const serializedArg = serializedArgs[i];
-        deserializedArgs[i] = this._serializer.deserialize(serializedArg, signature![i]);
-      }
-
-      const promise = method(...deserializedArgs);
-      if (returnType && promise) {
-        this._wrapWebWorkerPromise(message.id, promise, returnType);
-      }
-    });
-  }
-
-  private _handleMessage(message: ReceivedMessage): void {
-    if (this._methods.has(message.method)) {
-      this._methods.get(message.method)!(message);
-    }
-  }
-
-  private _wrapWebWorkerPromise(id: string, promise: Promise<any>, type: Type<any>|SerializerTypes):
-      void {
-    promise.then((result: any) => {
-      this._sink.emit({
-        'type': 'result',
-        'value': this._serializer.serialize(result, type),
-        'id': id,
-      });
-    });
-  }
-}
-
-/**
- * @publicApi
- * @deprecated platform-webworker is deprecated in Angular and will be removed in a future version
- *     of Angular
- */
-export interface ReceivedMessage {
-  method: string;
-  args: any[];
-  id: string;
-  type: string;
-}
diff --git a/packages/platform-webworker/src/web_workers/ui/event_dispatcher.ts b/packages/platform-webworker/src/web_workers/ui/event_dispatcher.ts
deleted file mode 100644
index 7e68a8ae9253d..0000000000000
--- a/packages/platform-webworker/src/web_workers/ui/event_dispatcher.ts
+++ /dev/null
@@ -1,120 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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 {EventEmitter} from '@angular/core';
-import {Serializer, SerializerTypes} from '../shared/serializer';
-
-import {serializeEventWithTarget, serializeGenericEvent, serializeKeyboardEvent, serializeMouseEvent, serializeTransitionEvent} from './event_serializer';
-
-export class EventDispatcher {
-  constructor(private _sink: EventEmitter<any>, private _serializer: Serializer) {}
-
-  dispatchAnimationEvent(player: any, phaseName: string, element: any): boolean {
-    this._sink.emit({
-      'element': this._serializer.serialize(element, SerializerTypes.RENDER_STORE_OBJECT),
-      'animationPlayer': this._serializer.serialize(player, SerializerTypes.RENDER_STORE_OBJECT),
-      'phaseName': phaseName,
-    });
-    return true;
-  }
-
-  dispatchRenderEvent(element: any, eventTarget: string, eventName: string, event: any): boolean {
-    let serializedEvent: any;
-    // TODO (jteplitz602): support custom events #3350
-    switch (event.type) {
-      case 'click':
-      case 'mouseup':
-      case 'mousedown':
-      case 'dblclick':
-      case 'contextmenu':
-      case 'mouseenter':
-      case 'mouseleave':
-      case 'mousemove':
-      case 'mouseout':
-      case 'mouseover':
-      case 'show':
-        serializedEvent = serializeMouseEvent(event);
-        break;
-      case 'keydown':
-      case 'keypress':
-      case 'keyup':
-        serializedEvent = serializeKeyboardEvent(event);
-        break;
-      case 'input':
-      case 'change':
-      case 'blur':
-        serializedEvent = serializeEventWithTarget(event);
-        break;
-      case 'abort':
-      case 'afterprint':
-      case 'beforeprint':
-      case 'cached':
-      case 'canplay':
-      case 'canplaythrough':
-      case 'chargingchange':
-      case 'chargingtimechange':
-      case 'close':
-      case 'dischargingtimechange':
-      case 'DOMContentLoaded':
-      case 'downloading':
-      case 'durationchange':
-      case 'emptied':
-      case 'ended':
-      case 'error':
-      case 'fullscreenchange':
-      case 'fullscreenerror':
-      case 'invalid':
-      case 'languagechange':
-      case 'levelfchange':
-      case 'loadeddata':
-      case 'loadedmetadata':
-      case 'obsolete':
-      case 'offline':
-      case 'online':
-      case 'open':
-      case 'orientatoinchange':
-      case 'pause':
-      case 'pointerlockchange':
-      case 'pointerlockerror':
-      case 'play':
-      case 'playing':
-      case 'ratechange':
-      case 'readystatechange':
-      case 'reset':
-      case 'scroll':
-      case 'seeked':
-      case 'seeking':
-      case 'stalled':
-      case 'submit':
-      case 'success':
-      case 'suspend':
-      case 'timeupdate':
-      case 'updateready':
-      case 'visibilitychange':
-      case 'volumechange':
-      case 'waiting':
-        serializedEvent = serializeGenericEvent(event);
-        break;
-      case 'transitionend':
-        serializedEvent = serializeTransitionEvent(event);
-        break;
-      default:
-        throw new Error(eventName + ' not supported on WebWorkers');
-    }
-
-    this._sink.emit({
-      'element': this._serializer.serialize(element, SerializerTypes.RENDER_STORE_OBJECT),
-      'eventName': eventName,
-      'eventTarget': eventTarget,
-      'event': serializedEvent,
-    });
-
-    // TODO(kegluneq): Eventually, we want the user to indicate from the UI side whether the event
-    // should be canceled, but for now just call `preventDefault` on the original DOM event.
-    return false;
-  }
-}
diff --git a/packages/platform-webworker/src/web_workers/ui/event_serializer.ts b/packages/platform-webworker/src/web_workers/ui/event_serializer.ts
deleted file mode 100644
index 74bb03944d97b..0000000000000
--- a/packages/platform-webworker/src/web_workers/ui/event_serializer.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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 MOUSE_EVENT_PROPERTIES = [
-  'altKey', 'button', 'clientX', 'clientY', 'metaKey', 'movementX', 'movementY', 'offsetX',
-  'offsetY', 'region', 'screenX', 'screenY', 'shiftKey'
-];
-
-const KEYBOARD_EVENT_PROPERTIES = [
-  'altkey', 'charCode', 'code', 'ctrlKey', 'isComposing', 'key', 'keyCode', 'location', 'metaKey',
-  'repeat', 'shiftKey', 'which'
-];
-
-const TRANSITION_EVENT_PROPERTIES = ['propertyName', 'elapsedTime', 'pseudoElement'];
-
-const EVENT_PROPERTIES = ['type', 'bubbles', 'cancelable'];
-
-const NODES_WITH_VALUE = new Set(
-    ['input', 'select', 'option', 'button', 'li', 'meter', 'progress', 'param', 'textarea']);
-
-export function serializeGenericEvent(e: Event): {[key: string]: any} {
-  return serializeEvent(e, EVENT_PROPERTIES);
-}
-
-// TODO(jteplitz602): Allow users to specify the properties they need rather than always
-// adding value and files #3374
-export function serializeEventWithTarget(e: Event): {[key: string]: any} {
-  const serializedEvent = serializeEvent(e, EVENT_PROPERTIES);
-  return addTarget(e, serializedEvent);
-}
-
-export function serializeMouseEvent(e: MouseEvent): {[key: string]: any} {
-  return serializeEvent(e, MOUSE_EVENT_PROPERTIES);
-}
-
-export function serializeKeyboardEvent(e: KeyboardEvent): {[key: string]: any} {
-  const serializedEvent = serializeEvent(e, KEYBOARD_EVENT_PROPERTIES);
-  return addTarget(e, serializedEvent);
-}
-
-export function serializeTransitionEvent(e: TransitionEvent): {[key: string]: any} {
-  const serializedEvent = serializeEvent(e, TRANSITION_EVENT_PROPERTIES);
-  return addTarget(e, serializedEvent);
-}
-
-// TODO(jteplitz602): #3374. See above.
-function addTarget(e: Event, serializedEvent: {[key: string]: any}): {[key: string]: any} {
-  if (NODES_WITH_VALUE.has((<HTMLElement>e.target).tagName.toLowerCase())) {
-    const target = <HTMLInputElement>e.target;
-    serializedEvent['target'] = {'value': target.value};
-    if (target.files) {
-      serializedEvent['target']['files'] = target.files;
-    }
-  }
-  return serializedEvent;
-}
-
-function serializeEvent(e: any, properties: string[]): {[key: string]: any} {
-  const serialized: {[k: string]: any} = {};
-  for (let i = 0; i < properties.length; i++) {
-    const prop = properties[i];
-    serialized[prop] = e[prop];
-  }
-  return serialized;
-}
diff --git a/packages/platform-webworker/src/web_workers/ui/location_providers.ts b/packages/platform-webworker/src/web_workers/ui/location_providers.ts
deleted file mode 100644
index f3e41e1dd5e2b..0000000000000
--- a/packages/platform-webworker/src/web_workers/ui/location_providers.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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 {DOCUMENT, ɵBrowserPlatformLocation as BrowserPlatformLocation} from '@angular/common';
-import {Injector, NgZone, PLATFORM_INITIALIZER, StaticProvider} from '@angular/core';
-
-import {MessageBus} from '../shared/message_bus';
-import {Serializer} from '../shared/serializer';
-import {ServiceMessageBrokerFactory} from '../shared/service_message_broker';
-
-import {MessageBasedPlatformLocation} from './platform_location';
-
-
-
-/**
- * A list of {@link Provider}s. To use the router in a Worker enabled application you must
- * include these providers when setting up the render thread.
- * @publicApi
- * @deprecated platform-webworker is deprecated in Angular and will be removed in a future version
- *     of Angular
- */
-export const WORKER_UI_LOCATION_PROVIDERS = <StaticProvider[]>[
-  {
-    provide: MessageBasedPlatformLocation,
-    deps: [ServiceMessageBrokerFactory, BrowserPlatformLocation, MessageBus, Serializer]
-  },
-  {provide: BrowserPlatformLocation, deps: [DOCUMENT]},
-  {provide: PLATFORM_INITIALIZER, useFactory: initUiLocation, multi: true, deps: [Injector]}
-];
-
-function initUiLocation(injector: Injector): () => void {
-  return () => {
-    const zone = injector.get<NgZone>(NgZone);
-
-    zone.runGuarded(() => injector.get(MessageBasedPlatformLocation).start());
-  };
-}
diff --git a/packages/platform-webworker/src/web_workers/ui/platform_location.ts b/packages/platform-webworker/src/web_workers/ui/platform_location.ts
deleted file mode 100644
index 07d9eb6041a21..0000000000000
--- a/packages/platform-webworker/src/web_workers/ui/platform_location.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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 {LocationChangeListener, ɵBrowserPlatformLocation as BrowserPlatformLocation} from '@angular/common';
-import {EventEmitter, Injectable} from '@angular/core';
-import {MessageBus} from '../shared/message_bus';
-import {ROUTER_CHANNEL} from '../shared/messaging_api';
-import {LocationType, Serializer, SerializerTypes} from '../shared/serializer';
-import {ServiceMessageBroker, ServiceMessageBrokerFactory} from '../shared/service_message_broker';
-
-@Injectable()
-export class MessageBasedPlatformLocation {
-  private _channelSink: EventEmitter<Object>;
-  private _broker: ServiceMessageBroker;
-
-  constructor(
-      private _brokerFactory: ServiceMessageBrokerFactory,
-      private _platformLocation: BrowserPlatformLocation, bus: MessageBus,
-      private _serializer: Serializer) {
-    this._platformLocation.onPopState(<LocationChangeListener>this._sendUrlChangeEvent.bind(this));
-    this._platformLocation.onHashChange(
-        <LocationChangeListener>this._sendUrlChangeEvent.bind(this));
-    this._broker = this._brokerFactory.createMessageBroker(ROUTER_CHANNEL);
-    this._channelSink = bus.to(ROUTER_CHANNEL);
-  }
-
-  start(): void {
-    const P = SerializerTypes.PRIMITIVE;
-
-    this._broker.registerMethod('getLocation', null, this._getLocation.bind(this), LocationType);
-    this._broker.registerMethod('setPathname', [P], this._setPathname.bind(this));
-    this._broker.registerMethod(
-        'pushState', [P, P, P], this._platformLocation.pushState.bind(this._platformLocation));
-    this._broker.registerMethod(
-        'replaceState', [P, P, P],
-        this._platformLocation.replaceState.bind(this._platformLocation));
-    this._broker.registerMethod(
-        'forward', null, this._platformLocation.forward.bind(this._platformLocation));
-    this._broker.registerMethod(
-        'back', null, this._platformLocation.back.bind(this._platformLocation));
-  }
-
-  private _getLocation(): Promise<Location> {
-    return Promise.resolve(this._platformLocation.location);
-  }
-
-  private _sendUrlChangeEvent(e: Event): void {
-    this._channelSink.emit({
-      'event': {'type': e.type},
-      'location': this._serializer.serialize(this._platformLocation.location, LocationType),
-    });
-  }
-
-  private _setPathname(pathname: string): void {
-    this._platformLocation.pathname = pathname;
-  }
-}
diff --git a/packages/platform-webworker/src/web_workers/ui/renderer.ts b/packages/platform-webworker/src/web_workers/ui/renderer.ts
deleted file mode 100644
index 9dd7870e054ce..0000000000000
--- a/packages/platform-webworker/src/web_workers/ui/renderer.ts
+++ /dev/null
@@ -1,166 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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, Renderer2, RendererFactory2, RendererStyleFlags2, RendererType2} from '@angular/core';
-
-import {MessageBus} from '../shared/message_bus';
-import {EVENT_2_CHANNEL, RENDERER_2_CHANNEL} from '../shared/messaging_api';
-import {RenderStore} from '../shared/render_store';
-import {Serializer, SerializerTypes} from '../shared/serializer';
-import {ServiceMessageBroker, ServiceMessageBrokerFactory} from '../shared/service_message_broker';
-import {EventDispatcher} from '../ui/event_dispatcher';
-
-@Injectable()
-export class MessageBasedRenderer2 {
-  // TODO(issue/24571): remove '!'.
-  private _eventDispatcher!: EventDispatcher;
-
-  constructor(
-      private _brokerFactory: ServiceMessageBrokerFactory, private _bus: MessageBus,
-      private _serializer: Serializer, private _renderStore: RenderStore,
-      private _rendererFactory: RendererFactory2) {}
-
-  start(): void {
-    const broker = this._brokerFactory.createMessageBroker(RENDERER_2_CHANNEL);
-
-    this._bus.initChannel(EVENT_2_CHANNEL);
-    this._eventDispatcher = new EventDispatcher(this._bus.to(EVENT_2_CHANNEL), this._serializer);
-
-    const [RSO, P, CRT] = [
-      SerializerTypes.RENDER_STORE_OBJECT,
-      SerializerTypes.PRIMITIVE,
-      SerializerTypes.RENDERER_TYPE_2,
-    ];
-
-    const methods: any[][] = [
-      ['createRenderer', this.createRenderer, RSO, CRT, P],
-      ['createElement', this.createElement, RSO, P, P, P],
-      ['createComment', this.createComment, RSO, P, P],
-      ['createText', this.createText, RSO, P, P],
-      ['appendChild', this.appendChild, RSO, RSO, RSO],
-      ['insertBefore', this.insertBefore, RSO, RSO, RSO, RSO],
-      ['removeChild', this.removeChild, RSO, RSO, RSO],
-      ['selectRootElement', this.selectRootElement, RSO, P, P],
-      ['parentNode', this.parentNode, RSO, RSO, P],
-      ['nextSibling', this.nextSibling, RSO, RSO, P],
-      ['setAttribute', this.setAttribute, RSO, RSO, P, P, P],
-      ['removeAttribute', this.removeAttribute, RSO, RSO, P, P],
-      ['addClass', this.addClass, RSO, RSO, P],
-      ['removeClass', this.removeClass, RSO, RSO, P],
-      ['setStyle', this.setStyle, RSO, RSO, P, P, P],
-      ['removeStyle', this.removeStyle, RSO, RSO, P, P],
-      ['setProperty', this.setProperty, RSO, RSO, P, P],
-      ['setValue', this.setValue, RSO, RSO, P],
-      ['listen', this.listen, RSO, RSO, P, P, P],
-      ['unlisten', this.unlisten, RSO, RSO],
-      ['destroy', this.destroy, RSO],
-      ['destroyNode', this.destroyNode, RSO, P]
-
-    ];
-
-    methods.forEach(([name, method, ...argTypes]: any[]) => {
-      broker.registerMethod(name, argTypes, method.bind(this));
-    });
-  }
-
-  private destroy(r: Renderer2) {
-    r.destroy();
-  }
-
-  private destroyNode(r: Renderer2, node: any) {
-    if (r.destroyNode) {
-      r.destroyNode(node);
-    }
-    this._renderStore.remove(node);
-  }
-
-  private createRenderer(el: any, type: RendererType2, id: number) {
-    this._renderStore.store(this._rendererFactory.createRenderer(el, type), id);
-  }
-
-  private createElement(r: Renderer2, name: string, namespace: string, id: number) {
-    this._renderStore.store(r.createElement(name, namespace), id);
-  }
-
-  private createComment(r: Renderer2, value: string, id: number) {
-    this._renderStore.store(r.createComment(value), id);
-  }
-
-  private createText(r: Renderer2, value: string, id: number) {
-    this._renderStore.store(r.createText(value), id);
-  }
-
-  private appendChild(r: Renderer2, parent: any, child: any) {
-    r.appendChild(parent, child);
-  }
-
-  private insertBefore(r: Renderer2, parent: any, child: any, ref: any) {
-    r.insertBefore(parent, child, ref);
-  }
-
-  private removeChild(r: Renderer2, parent: any, child: any) {
-    r.removeChild(parent, child);
-  }
-
-  private selectRootElement(r: Renderer2, selector: string, id: number) {
-    this._renderStore.store(r.selectRootElement(selector), id);
-  }
-
-  private parentNode(r: Renderer2, node: any, id: number) {
-    this._renderStore.store(r.parentNode(node), id);
-  }
-
-  private nextSibling(r: Renderer2, node: any, id: number) {
-    this._renderStore.store(r.nextSibling(node), id);
-  }
-
-  private setAttribute(r: Renderer2, el: any, name: string, value: string, namespace: string) {
-    r.setAttribute(el, name, value, namespace);
-  }
-
-  private removeAttribute(r: Renderer2, el: any, name: string, namespace: string) {
-    r.removeAttribute(el, name, namespace);
-  }
-
-  private addClass(r: Renderer2, el: any, name: string) {
-    r.addClass(el, name);
-  }
-
-  private removeClass(r: Renderer2, el: any, name: string) {
-    r.removeClass(el, name);
-  }
-
-  private setStyle(r: Renderer2, el: any, style: string, value: any, flags: RendererStyleFlags2) {
-    r.setStyle(el, style, value, flags);
-  }
-
-  private removeStyle(r: Renderer2, el: any, style: string, flags: RendererStyleFlags2) {
-    r.removeStyle(el, style, flags);
-  }
-
-  private setProperty(r: Renderer2, el: any, name: string, value: any) {
-    r.setProperty(el, name, value);
-  }
-
-  private setValue(r: Renderer2, node: any, value: string) {
-    r.setValue(node, value);
-  }
-
-  private listen(r: Renderer2, el: any, elName: string, eventName: string, unlistenId: number) {
-    const listener = (event: any) => {
-      return this._eventDispatcher.dispatchRenderEvent(el, elName, eventName, event);
-    };
-
-    const unlisten = r.listen(el || elName, eventName, listener);
-    this._renderStore.store(unlisten, unlistenId);
-  }
-
-  private unlisten(r: Renderer2, unlisten: () => boolean) {
-    unlisten();
-  }
-}
diff --git a/packages/platform-webworker/src/web_workers/worker/location_providers.ts b/packages/platform-webworker/src/web_workers/worker/location_providers.ts
deleted file mode 100644
index 0002fe067a81f..0000000000000
--- a/packages/platform-webworker/src/web_workers/worker/location_providers.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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 {LOCATION_INITIALIZED, PlatformLocation} from '@angular/common';
-import {APP_INITIALIZER, NgZone, StaticProvider} from '@angular/core';
-
-import {WebWorkerPlatformLocation} from './platform_location';
-
-
-/**
- * The {@link PlatformLocation} providers that should be added when the {@link Location} is used in
- * a worker context.
- *
- * @publicApi
- * @deprecated platform-webworker is deprecated in Angular and will be removed in a future version
- *     of Angular
- */
-export const WORKER_APP_LOCATION_PROVIDERS: StaticProvider[] = [
-  {provide: PlatformLocation, useClass: WebWorkerPlatformLocation} as any as StaticProvider, {
-    provide: APP_INITIALIZER,
-    useFactory: appInitFnFactory,
-    multi: true,
-    deps: [PlatformLocation, NgZone]
-  },
-  {provide: LOCATION_INITIALIZED, useFactory: locationInitialized, deps: [PlatformLocation]}
-];
-
-export function locationInitialized(platformLocation: WebWorkerPlatformLocation) {
-  return platformLocation.initialized;
-}
-
-export function appInitFnFactory(platformLocation: WebWorkerPlatformLocation, zone: NgZone): () =>
-    Promise<boolean> {
-  return () => zone.runGuarded(() => platformLocation.init());
-}
diff --git a/packages/platform-webworker/src/web_workers/worker/platform_location.ts b/packages/platform-webworker/src/web_workers/worker/platform_location.ts
deleted file mode 100644
index 89ea3efceacb2..0000000000000
--- a/packages/platform-webworker/src/web_workers/worker/platform_location.ts
+++ /dev/null
@@ -1,153 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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 {LocationChangeListener, PlatformLocation} from '@angular/common';
-import {EventEmitter, Injectable} from '@angular/core';
-import {ClientMessageBroker, ClientMessageBrokerFactory, FnArg, UiArguments} from '../shared/client_message_broker';
-import {MessageBus} from '../shared/message_bus';
-import {ROUTER_CHANNEL} from '../shared/messaging_api';
-import {LocationType, Serializer, SerializerTypes} from '../shared/serializer';
-
-@Injectable()
-export class WebWorkerPlatformLocation extends PlatformLocation {
-  private _broker: ClientMessageBroker;
-  private _popStateListeners: Array<Function> = [];
-  private _hashChangeListeners: Array<Function> = [];
-  private _location: LocationType = null!;
-  private _channelSource: EventEmitter<Object>;
-  public initialized: Promise<any>;
-  // TODO(issue/24571): remove '!'.
-  private initializedResolve!: () => void;
-
-  constructor(
-      brokerFactory: ClientMessageBrokerFactory, bus: MessageBus, private _serializer: Serializer) {
-    super();
-    this._broker = brokerFactory.createMessageBroker(ROUTER_CHANNEL);
-    this._channelSource = bus.from(ROUTER_CHANNEL);
-
-    this._channelSource.subscribe({
-      next: (msg: {[key: string]: any}) => {
-        let listeners: Array<Function>|null = null;
-        if (msg.hasOwnProperty('event')) {
-          const type: string = msg['event']['type'];
-          if (type === 'popstate') {
-            listeners = this._popStateListeners;
-          } else if (type === 'hashchange') {
-            listeners = this._hashChangeListeners;
-          }
-
-          if (listeners) {
-            // There was a popState or hashChange event, so the location object thas been updated
-            this._location = this._serializer.deserialize(msg['location'], LocationType);
-            listeners.forEach((fn: Function) => fn(msg['event']));
-          }
-        }
-      }
-    });
-    this.initialized = new Promise(res => this.initializedResolve = res);
-  }
-
-  /** @internal **/
-  init(): Promise<boolean> {
-    const args: UiArguments = new UiArguments('getLocation');
-
-    return this._broker.runOnService(args, LocationType)!.then(
-        (val: LocationType) => {
-          this._location = val;
-          this.initializedResolve();
-          return true;
-        },
-        err => {
-          throw new Error(err);
-        });
-  }
-
-  getBaseHrefFromDOM(): string {
-    throw new Error(
-        'Attempt to get base href from DOM from WebWorker. You must either provide a value for the APP_BASE_HREF token through DI or use the hash location strategy.');
-  }
-
-  onPopState(fn: LocationChangeListener): void {
-    this._popStateListeners.push(fn);
-  }
-
-  onHashChange(fn: LocationChangeListener): void {
-    this._hashChangeListeners.push(fn);
-  }
-
-  get href(): string {
-    return this._location ? this._location.href! : '<unknown>';
-  }
-
-  get hostname(): string {
-    return this._location ? this._location.host! : '<unknown>';
-  }
-
-  get port(): string {
-    return this._location ? this._location.port! : '<unknown>';
-  }
-
-  get protocol(): string {
-    return this._location ? this._location.protocol! : '<unknown>';
-  }
-
-  get search(): string {
-    return this._location ? this._location.search : '<unknown>';
-  }
-
-  get hash(): string {
-    return this._location ? this._location.hash : '<unknown>';
-  }
-
-  set pathname(newPath: string) {
-    if (this._location === null) {
-      throw new Error('Attempt to set pathname before value is obtained from UI');
-    }
-
-    this._location.pathname = newPath;
-
-    const fnArgs = [new FnArg(newPath, SerializerTypes.PRIMITIVE)];
-    const args = new UiArguments('setPathname', fnArgs);
-    this._broker.runOnService(args, null);
-  }
-
-  pushState(state: any, title: string, url: string): void {
-    const fnArgs = [
-      new FnArg(state, SerializerTypes.PRIMITIVE),
-      new FnArg(title, SerializerTypes.PRIMITIVE),
-      new FnArg(url, SerializerTypes.PRIMITIVE),
-    ];
-    const args = new UiArguments('pushState', fnArgs);
-    this._broker.runOnService(args, null);
-  }
-
-  replaceState(state: any, title: string, url: string): void {
-    const fnArgs = [
-      new FnArg(state, SerializerTypes.PRIMITIVE),
-      new FnArg(title, SerializerTypes.PRIMITIVE),
-      new FnArg(url, SerializerTypes.PRIMITIVE),
-    ];
-    const args = new UiArguments('replaceState', fnArgs);
-    this._broker.runOnService(args, null);
-  }
-
-  forward(): void {
-    const args = new UiArguments('forward');
-    this._broker.runOnService(args, null);
-  }
-
-  back(): void {
-    const args = new UiArguments('back');
-    this._broker.runOnService(args, null);
-  }
-
-  // History API isn't available on WebWorkers, therefore return undefined
-  getState(): unknown {
-    return undefined;
-  }
-}
diff --git a/packages/platform-webworker/src/web_workers/worker/renderer.ts b/packages/platform-webworker/src/web_workers/worker/renderer.ts
deleted file mode 100644
index e95ae573041cc..0000000000000
--- a/packages/platform-webworker/src/web_workers/worker/renderer.ts
+++ /dev/null
@@ -1,327 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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, Renderer2, RendererFactory2, RendererStyleFlags2, RendererType2} from '@angular/core';
-
-import {ClientMessageBroker, ClientMessageBrokerFactory, FnArg, UiArguments} from '../shared/client_message_broker';
-import {MessageBus} from '../shared/message_bus';
-import {EVENT_2_CHANNEL, RENDERER_2_CHANNEL} from '../shared/messaging_api';
-import {RenderStore} from '../shared/render_store';
-import {Serializer, SerializerTypes} from '../shared/serializer';
-
-export class NamedEventEmitter {
-  // TODO(issue/24571): remove '!'.
-  private _listeners!: Map<string, Function[]>;
-
-  listen(eventName: string, callback: Function) {
-    this._getListeners(eventName).push(callback);
-  }
-
-  unlisten(eventName: string, listener: Function) {
-    const listeners = this._getListeners(eventName);
-    const index = listeners.indexOf(listener);
-    if (index > -1) {
-      listeners.splice(index, 1);
-    }
-  }
-
-  dispatchEvent(eventName: string, event: any) {
-    const listeners = this._getListeners(eventName);
-    for (let i = 0; i < listeners.length; i++) {
-      listeners[i](event);
-    }
-  }
-
-  private _getListeners(eventName: string): Function[] {
-    if (!this._listeners) {
-      this._listeners = new Map<string, Function[]>();
-    }
-    let listeners = this._listeners.get(eventName);
-    if (!listeners) {
-      listeners = [];
-      this._listeners.set(eventName, listeners);
-    }
-    return listeners;
-  }
-}
-
-
-function eventNameWithTarget(target: string, eventName: string): string {
-  return `${target}:${eventName}`;
-}
-
-@Injectable()
-export class WebWorkerRendererFactory2 implements RendererFactory2 {
-  globalEvents = new NamedEventEmitter();
-
-  private _messageBroker: ClientMessageBroker;
-
-  constructor(
-      messageBrokerFactory: ClientMessageBrokerFactory, bus: MessageBus,
-      private _serializer: Serializer, public renderStore: RenderStore) {
-    this._messageBroker = messageBrokerFactory.createMessageBroker(RENDERER_2_CHANNEL);
-    bus.initChannel(EVENT_2_CHANNEL);
-    const source = bus.from(EVENT_2_CHANNEL);
-    source.subscribe({next: (message: any) => this._dispatchEvent(message)});
-  }
-
-  createRenderer(element: any, type: RendererType2|null): Renderer2 {
-    const renderer = new WebWorkerRenderer2(this);
-
-    const id = this.renderStore.allocateId();
-    this.renderStore.store(renderer, id);
-    this.callUI('createRenderer', [
-      new FnArg(element, SerializerTypes.RENDER_STORE_OBJECT),
-      new FnArg(type, SerializerTypes.RENDERER_TYPE_2),
-      new FnArg(renderer, SerializerTypes.RENDER_STORE_OBJECT),
-    ]);
-
-    return renderer;
-  }
-
-  begin() {}
-  end() {}
-
-  callUI(fnName: string, fnArgs: FnArg[]) {
-    const args = new UiArguments(fnName, fnArgs);
-    this._messageBroker.runOnService(args, null);
-  }
-
-  allocateNode(): WebWorkerRenderNode {
-    const result = new WebWorkerRenderNode();
-    const id = this.renderStore.allocateId();
-    this.renderStore.store(result, id);
-    return result;
-  }
-
-  freeNode(node: any) {
-    this.renderStore.remove(node);
-  }
-
-  allocateId(): number {
-    return this.renderStore.allocateId();
-  }
-
-  private _dispatchEvent(message: {[key: string]: any}): void {
-    const element: WebWorkerRenderNode =
-        this._serializer.deserialize(message['element'], SerializerTypes.RENDER_STORE_OBJECT);
-
-    const eventName = message['eventName'];
-    const target = message['eventTarget'];
-    const event = message['event'];
-
-    if (target) {
-      this.globalEvents.dispatchEvent(eventNameWithTarget(target, eventName), event);
-    } else {
-      element.events.dispatchEvent(eventName, event);
-    }
-  }
-}
-
-
-export class WebWorkerRenderer2 implements Renderer2 {
-  data: {[key: string]: any} = Object.create(null);
-
-  constructor(private _rendererFactory: WebWorkerRendererFactory2) {}
-
-  private asFnArg = new FnArg(this, SerializerTypes.RENDER_STORE_OBJECT);
-
-  destroy(): void {
-    this.callUIWithRenderer('destroy');
-  }
-
-  destroyNode(node: any) {
-    this.callUIWithRenderer('destroyNode', [new FnArg(node, SerializerTypes.RENDER_STORE_OBJECT)]);
-    this._rendererFactory.freeNode(node);
-  }
-
-  createElement(name: string, namespace?: string): any {
-    const node = this._rendererFactory.allocateNode();
-    this.callUIWithRenderer('createElement', [
-      new FnArg(name),
-      new FnArg(namespace),
-      new FnArg(node, SerializerTypes.RENDER_STORE_OBJECT),
-    ]);
-    return node;
-  }
-
-  createComment(value: string): any {
-    const node = this._rendererFactory.allocateNode();
-    this.callUIWithRenderer('createComment', [
-      new FnArg(value),
-      new FnArg(node, SerializerTypes.RENDER_STORE_OBJECT),
-    ]);
-    return node;
-  }
-
-  createText(value: string): any {
-    const node = this._rendererFactory.allocateNode();
-    this.callUIWithRenderer('createText', [
-      new FnArg(value),
-      new FnArg(node, SerializerTypes.RENDER_STORE_OBJECT),
-    ]);
-    return node;
-  }
-
-  appendChild(parent: any, newChild: any): void {
-    this.callUIWithRenderer('appendChild', [
-      new FnArg(parent, SerializerTypes.RENDER_STORE_OBJECT),
-      new FnArg(newChild, SerializerTypes.RENDER_STORE_OBJECT),
-    ]);
-  }
-
-  insertBefore(parent: any, newChild: any, refChild: any): void {
-    if (!parent) {
-      return;
-    }
-
-    this.callUIWithRenderer('insertBefore', [
-      new FnArg(parent, SerializerTypes.RENDER_STORE_OBJECT),
-      new FnArg(newChild, SerializerTypes.RENDER_STORE_OBJECT),
-      new FnArg(refChild, SerializerTypes.RENDER_STORE_OBJECT),
-    ]);
-  }
-
-  removeChild(parent: any, oldChild: any): void {
-    this.callUIWithRenderer('removeChild', [
-      new FnArg(parent, SerializerTypes.RENDER_STORE_OBJECT),
-      new FnArg(oldChild, SerializerTypes.RENDER_STORE_OBJECT),
-    ]);
-  }
-
-  selectRootElement(selectorOrNode: string|any): any {
-    const node = this._rendererFactory.allocateNode();
-    this.callUIWithRenderer('selectRootElement', [
-      new FnArg(selectorOrNode),
-      new FnArg(node, SerializerTypes.RENDER_STORE_OBJECT),
-    ]);
-    return node;
-  }
-
-  parentNode(node: any): any {
-    const res = this._rendererFactory.allocateNode();
-    this.callUIWithRenderer('parentNode', [
-      new FnArg(node, SerializerTypes.RENDER_STORE_OBJECT),
-      new FnArg(res, SerializerTypes.RENDER_STORE_OBJECT),
-    ]);
-    return res;
-  }
-
-  nextSibling(node: any): any {
-    const res = this._rendererFactory.allocateNode();
-    this.callUIWithRenderer('nextSibling', [
-      new FnArg(node, SerializerTypes.RENDER_STORE_OBJECT),
-      new FnArg(res, SerializerTypes.RENDER_STORE_OBJECT),
-    ]);
-    return res;
-  }
-
-  setAttribute(el: any, name: string, value: string, namespace?: string): void {
-    this.callUIWithRenderer('setAttribute', [
-      new FnArg(el, SerializerTypes.RENDER_STORE_OBJECT),
-      new FnArg(name),
-      new FnArg(value),
-      new FnArg(namespace),
-    ]);
-  }
-
-  removeAttribute(el: any, name: string, namespace?: string): void {
-    this.callUIWithRenderer('removeAttribute', [
-      new FnArg(el, SerializerTypes.RENDER_STORE_OBJECT),
-      new FnArg(name),
-      new FnArg(namespace),
-    ]);
-  }
-
-  addClass(el: any, name: string): void {
-    this.callUIWithRenderer('addClass', [
-      new FnArg(el, SerializerTypes.RENDER_STORE_OBJECT),
-      new FnArg(name),
-    ]);
-  }
-
-  removeClass(el: any, name: string): void {
-    this.callUIWithRenderer('removeClass', [
-      new FnArg(el, SerializerTypes.RENDER_STORE_OBJECT),
-      new FnArg(name),
-    ]);
-  }
-
-  setStyle(el: any, style: string, value: any, flags: RendererStyleFlags2): void {
-    this.callUIWithRenderer('setStyle', [
-      new FnArg(el, SerializerTypes.RENDER_STORE_OBJECT),
-      new FnArg(style),
-      new FnArg(value),
-      new FnArg(flags),
-    ]);
-  }
-
-  removeStyle(el: any, style: string, flags: RendererStyleFlags2): void {
-    this.callUIWithRenderer('removeStyle', [
-      new FnArg(el, SerializerTypes.RENDER_STORE_OBJECT),
-      new FnArg(style),
-      new FnArg(flags),
-    ]);
-  }
-
-  setProperty(el: any, name: string, value: any): void {
-    this.callUIWithRenderer('setProperty', [
-      new FnArg(el, SerializerTypes.RENDER_STORE_OBJECT),
-      new FnArg(name),
-      new FnArg(value),
-    ]);
-  }
-
-  setValue(node: any, value: string): void {
-    this.callUIWithRenderer('setValue', [
-      new FnArg(node, SerializerTypes.RENDER_STORE_OBJECT),
-      new FnArg(value),
-    ]);
-  }
-
-  listen(
-      target: 'window'|'document'|'body'|any, eventName: string,
-      listener: (event: any) => boolean): () => void {
-    const unlistenId = this._rendererFactory.allocateId();
-
-    const [targetEl, targetName, fullName]: [any, string|null, string|null] =
-        typeof target === 'string' ? [null, target, `${target}:${eventName}`] :
-                                     [target, null, null];
-
-    if (fullName) {
-      this._rendererFactory.globalEvents.listen(fullName, listener);
-    } else {
-      targetEl.events.listen(eventName, listener);
-    }
-
-    this.callUIWithRenderer('listen', [
-      new FnArg(targetEl, SerializerTypes.RENDER_STORE_OBJECT),
-      new FnArg(targetName),
-      new FnArg(eventName),
-      new FnArg(unlistenId),
-    ]);
-
-    return () => {
-      if (fullName) {
-        this._rendererFactory.globalEvents.unlisten(fullName, listener);
-      } else {
-        targetEl.events.unlisten(eventName, listener);
-      }
-      this.callUIWithRenderer('unlisten', [new FnArg(unlistenId)]);
-    };
-  }
-
-  private callUIWithRenderer(fnName: string, fnArgs: FnArg[] = []) {
-    // always pass the renderer as the first arg
-    this._rendererFactory.callUI(fnName, [this.asFnArg, ...fnArgs]);
-  }
-}
-
-export class WebWorkerRenderNode {
-  events = new NamedEventEmitter();
-}
diff --git a/packages/platform-webworker/src/web_workers/worker/worker_adapter.ts b/packages/platform-webworker/src/web_workers/worker/worker_adapter.ts
deleted file mode 100644
index f864110dc5da6..0000000000000
--- a/packages/platform-webworker/src/web_workers/worker/worker_adapter.ts
+++ /dev/null
@@ -1,106 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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 {ɵDomAdapter as DomAdapter, ɵsetRootDomAdapter as setRootDomAdapter} from '@angular/common';
-
-/**
- * This adapter is required to log error messages.
- *
- * Note: other methods all throw as the DOM is not accessible directly in web worker context.
- */
-export class WorkerDomAdapter extends DomAdapter {
-  static makeCurrent() {
-    setRootDomAdapter(new WorkerDomAdapter());
-  }
-
-  log(error: any) {
-    // tslint:disable-next-line:no-console
-    console.log(error);
-  }
-
-  logGroup(error: any) {
-    if (console.group) {
-      console.group(error);
-      if (console.error) {
-        console.error(error);
-      } else {
-        // tslint:disable-next-line:no-console
-        console.log(error);
-      }
-    } else {
-      // tslint:disable-next-line:no-console
-      console.log(error);
-    }
-  }
-
-  logGroupEnd() {
-    if (console.groupEnd) {
-      console.groupEnd();
-    }
-  }
-
-  getProperty(el: Element, name: string): any {
-    throw 'not implemented';
-  }
-
-  onAndCancel(el: any, evt: any, listener: any): Function {
-    throw 'not implemented';
-  }
-  dispatchEvent(el: any, evt: any) {
-    throw 'not implemented';
-  }
-  remove(el: any): Node {
-    throw 'not implemented';
-  }
-  createElement(tagName: any, doc?: any): HTMLElement {
-    throw 'not implemented';
-  }
-  createHtmlDocument(): HTMLDocument {
-    throw 'not implemented';
-  }
-  getDefaultDocument(): Document {
-    throw 'not implemented';
-  }
-  isElementNode(node: any): boolean {
-    throw 'not implemented';
-  }
-  isShadowRoot(node: any): boolean {
-    throw 'not implemented';
-  }
-  supportsDOMEvents(): boolean {
-    throw 'not implemented';
-  }
-  getGlobalEventTarget(doc: Document, target: string): any {
-    throw 'not implemented';
-  }
-  getHistory(): History {
-    throw 'not implemented';
-  }
-  getLocation(): Location {
-    throw 'not implemented';
-  }
-  getBaseHref(doc: Document): string {
-    throw 'not implemented';
-  }
-  resetBaseElement(): void {
-    throw 'not implemented';
-  }
-  getUserAgent(): string {
-    return 'Fake user agent';
-  }
-  performanceNow(): number {
-    throw 'not implemented';
-  }
-
-  supportsCookies(): boolean {
-    return false;
-  }
-  getCookie(name: string): string {
-    throw 'not implemented';
-  }
-}
diff --git a/packages/platform-webworker/src/worker_app.ts b/packages/platform-webworker/src/worker_app.ts
deleted file mode 100644
index b913c915d260a..0000000000000
--- a/packages/platform-webworker/src/worker_app.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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 {CommonModule, DOCUMENT, ViewportScroller, ɵNullViewportScroller as NullViewportScroller, ɵPLATFORM_WORKER_APP_ID as PLATFORM_WORKER_APP_ID} from '@angular/common';
-import {APP_INITIALIZER, ApplicationModule, createPlatformFactory, ErrorHandler, NgModule, NgZone, PLATFORM_ID, platformCore, PlatformRef, RendererFactory2, StaticProvider, ɵINJECTOR_SCOPE as INJECTOR_SCOPE} from '@angular/core';
-import {ɵBROWSER_SANITIZATION_PROVIDERS as BROWSER_SANITIZATION_PROVIDERS} from '@angular/platform-browser';
-
-import {ON_WEB_WORKER} from './web_workers/shared/api';
-import {ClientMessageBrokerFactory} from './web_workers/shared/client_message_broker';
-import {MessageBus} from './web_workers/shared/message_bus';
-import {PostMessageBus, PostMessageBusSink, PostMessageBusSource} from './web_workers/shared/post_message_bus';
-import {RenderStore} from './web_workers/shared/render_store';
-import {Serializer} from './web_workers/shared/serializer';
-import {ServiceMessageBrokerFactory} from './web_workers/shared/service_message_broker';
-import {WebWorkerRendererFactory2} from './web_workers/worker/renderer';
-import {WorkerDomAdapter} from './web_workers/worker/worker_adapter';
-
-/**
- * @publicApi
- * @deprecated platform-webworker is deprecated in Angular and will be removed in a future version
- *     of Angular
- */
-export const platformWorkerApp: (extraProviders?: StaticProvider[]|undefined) => PlatformRef =
-    createPlatformFactory(
-        platformCore, 'workerApp', [{provide: PLATFORM_ID, useValue: PLATFORM_WORKER_APP_ID}]);
-
-export function errorHandler(): ErrorHandler {
-  return new ErrorHandler();
-}
-
-
-// TODO(jteplitz602): remove this and compile with lib.webworker.d.ts (#3492)
-const _postMessage = {
-  postMessage: (message: any, transferrables: [Transferable]) => {
-    (<any>postMessage)(message, transferrables);
-  }
-};
-
-export function createMessageBus(zone: NgZone): MessageBus {
-  const sink = new PostMessageBusSink(_postMessage);
-  const source = new PostMessageBusSource();
-  const bus = new PostMessageBus(sink, source);
-  bus.attachToZone(zone);
-  return bus;
-}
-
-export function setupWebWorker(): void {
-  WorkerDomAdapter.makeCurrent();
-}
-
-/**
- * The ng module for the worker app side.
- *
- * @publicApi
- * @deprecated platform-webworker is deprecated in Angular and will be removed in a future version
- *     of Angular
- */
-@NgModule({
-  providers: [
-    BROWSER_SANITIZATION_PROVIDERS,
-    {provide: INJECTOR_SCOPE, useValue: 'root'},
-    Serializer,
-    {provide: DOCUMENT, useValue: null},
-    ClientMessageBrokerFactory,
-    ServiceMessageBrokerFactory,
-    WebWorkerRendererFactory2,
-    {provide: RendererFactory2, useExisting: WebWorkerRendererFactory2},
-    {provide: ON_WEB_WORKER, useValue: true},
-    RenderStore,
-    {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,
-    ApplicationModule,
-  ]
-})
-export class WorkerAppModule {
-}
diff --git a/packages/platform-webworker/src/worker_render.ts b/packages/platform-webworker/src/worker_render.ts
deleted file mode 100644
index fe69043ebfd99..0000000000000
--- a/packages/platform-webworker/src/worker_render.ts
+++ /dev/null
@@ -1,193 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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 {DOCUMENT, ɵPLATFORM_WORKER_UI_ID as PLATFORM_WORKER_UI_ID} from '@angular/common';
-import {createPlatformFactory, ErrorHandler, Injectable, InjectionToken, Injector, isDevMode, NgZone, PLATFORM_ID, PLATFORM_INITIALIZER, platformCore, RendererFactory2, StaticProvider, Testability, ɵAPP_ID_RANDOM_PROVIDER as APP_ID_RANDOM_PROVIDER, ɵsetDocument} from '@angular/core';
-import {EVENT_MANAGER_PLUGINS, EventManager, HAMMER_GESTURE_CONFIG, HammerGestureConfig, ɵBROWSER_SANITIZATION_PROVIDERS as BROWSER_SANITIZATION_PROVIDERS, ɵBrowserDomAdapter as BrowserDomAdapter, ɵBrowserGetTestability as BrowserGetTestability, ɵDomEventsPlugin as DomEventsPlugin, ɵDomRendererFactory2 as DomRendererFactory2, ɵDomSharedStylesHost as DomSharedStylesHost, ɵHammerGesturesPlugin as HammerGesturesPlugin, ɵKeyEventsPlugin as KeyEventsPlugin, ɵSharedStylesHost as SharedStylesHost} from '@angular/platform-browser';
-
-import {ON_WEB_WORKER} from './web_workers/shared/api';
-import {ClientMessageBrokerFactory} from './web_workers/shared/client_message_broker';
-import {MessageBus} from './web_workers/shared/message_bus';
-import {PostMessageBus, PostMessageBusSink, PostMessageBusSource} from './web_workers/shared/post_message_bus';
-import {RenderStore} from './web_workers/shared/render_store';
-import {Serializer} from './web_workers/shared/serializer';
-import {ServiceMessageBrokerFactory} from './web_workers/shared/service_message_broker';
-import {MessageBasedRenderer2} from './web_workers/ui/renderer';
-
-
-
-/**
- * Wrapper class that exposes the Worker
- * and underlying {@link MessageBus} for lower level message passing.
- *
- * @publicApi
- * @deprecated platform-webworker is deprecated in Angular and will be removed in a future version
- *     of Angular
- */
-@Injectable()
-export class WebWorkerInstance {
-  // TODO(issue/24571): remove '!'.
-  public worker!: Worker;
-  // TODO(issue/24571): remove '!'.
-  public bus!: MessageBus;
-
-  /** @internal */
-  public init(worker: Worker, bus: MessageBus) {
-    this.worker = worker;
-    this.bus = bus;
-  }
-}
-
-/**
- * @publicApi
- * @deprecated platform-webworker is deprecated in Angular and will be removed in a future version
- *     of Angular
- */
-export const WORKER_SCRIPT = new InjectionToken<string>('WebWorkerScript');
-
-/**
- * A multi-provider used to automatically call the `start()` method after the service is
- * created.
- *
- * @publicApi
- * @deprecated platform-webworker is deprecated in Angular and will be removed in a future version
- *     of Angular
- */
-export const WORKER_UI_STARTABLE_MESSAGING_SERVICE =
-    new InjectionToken<({start: () => void})[]>('WorkerRenderStartableMsgService');
-
-export const _WORKER_UI_PLATFORM_PROVIDERS: StaticProvider[] = [
-  {provide: NgZone, useFactory: createNgZone, deps: []},
-  {
-    provide: MessageBasedRenderer2,
-    deps: [ServiceMessageBrokerFactory, MessageBus, Serializer, RenderStore, RendererFactory2]
-  },
-  {provide: WORKER_UI_STARTABLE_MESSAGING_SERVICE, useExisting: MessageBasedRenderer2, multi: true},
-  BROWSER_SANITIZATION_PROVIDERS,
-  {provide: ErrorHandler, useFactory: _exceptionHandler, deps: []},
-  {provide: DOCUMENT, useFactory: _document, deps: []},
-  // TODO(jteplitz602): Investigate if we definitely need EVENT_MANAGER on the render thread
-  // #5298
-  {
-    provide: EVENT_MANAGER_PLUGINS,
-    useClass: DomEventsPlugin,
-    deps: [DOCUMENT, NgZone],
-    multi: true
-  },
-  {provide: EVENT_MANAGER_PLUGINS, useClass: KeyEventsPlugin, deps: [DOCUMENT], multi: true},
-  {
-    provide: EVENT_MANAGER_PLUGINS,
-    useClass: HammerGesturesPlugin,
-    deps: [DOCUMENT, HAMMER_GESTURE_CONFIG],
-    multi: true
-  },
-  {provide: HAMMER_GESTURE_CONFIG, useClass: HammerGestureConfig, deps: []},
-  APP_ID_RANDOM_PROVIDER,
-  {provide: DomRendererFactory2, deps: [EventManager, DomSharedStylesHost]},
-  {provide: RendererFactory2, useExisting: DomRendererFactory2},
-  {provide: SharedStylesHost, useExisting: DomSharedStylesHost},
-  {
-    provide: ServiceMessageBrokerFactory,
-    useClass: ServiceMessageBrokerFactory,
-    deps: [MessageBus, Serializer]
-  },
-  {
-    provide: ClientMessageBrokerFactory,
-    useClass: ClientMessageBrokerFactory,
-    deps: [MessageBus, Serializer]
-  },
-  {provide: Serializer, deps: [RenderStore]},
-  {provide: ON_WEB_WORKER, useValue: false},
-  {provide: RenderStore, deps: []},
-  {provide: DomSharedStylesHost, deps: [DOCUMENT]},
-  {provide: Testability, deps: [NgZone]},
-  {provide: EventManager, deps: [EVENT_MANAGER_PLUGINS, NgZone]},
-  {provide: WebWorkerInstance, deps: []},
-  {
-    provide: PLATFORM_INITIALIZER,
-    useFactory: initWebWorkerRenderPlatform,
-    multi: true,
-    deps: [Injector]
-  },
-  {provide: PLATFORM_ID, useValue: PLATFORM_WORKER_UI_ID},
-  {provide: MessageBus, useFactory: messageBusFactory, deps: [WebWorkerInstance]},
-];
-
-function initializeGenericWorkerRenderer(injector: Injector) {
-  const bus = injector.get(MessageBus);
-  const zone = injector.get<NgZone>(NgZone);
-  bus.attachToZone(zone);
-
-  // initialize message services after the bus has been created
-  const services = injector.get(WORKER_UI_STARTABLE_MESSAGING_SERVICE);
-  zone.runGuarded(() => {
-    services.forEach((svc: any) => {
-      svc.start();
-    });
-  });
-}
-
-function messageBusFactory(instance: WebWorkerInstance): MessageBus {
-  return instance.bus;
-}
-
-function initWebWorkerRenderPlatform(injector: Injector): () => void {
-  return () => {
-    BrowserDomAdapter.makeCurrent();
-    BrowserGetTestability.init();
-    let scriptUri: string;
-    try {
-      scriptUri = injector.get(WORKER_SCRIPT);
-    } catch {
-      throw new Error(
-          'You must provide your WebWorker\'s initialization script with the WORKER_SCRIPT token');
-    }
-
-    const instance = injector.get(WebWorkerInstance);
-    spawnWebWorker(scriptUri, instance);
-
-    initializeGenericWorkerRenderer(injector);
-  };
-}
-
-/**
- * @publicApi
- * @deprecated platform-webworker is deprecated in Angular and will be removed in a future version
- *     of Angular
- */
-export const platformWorkerUi =
-    createPlatformFactory(platformCore, 'workerUi', _WORKER_UI_PLATFORM_PROVIDERS);
-
-function _exceptionHandler(): ErrorHandler {
-  return new ErrorHandler();
-}
-
-function _document(): any {
-  // Tell ivy about the global document
-  ɵsetDocument(document);
-  return document;
-}
-
-function createNgZone(): NgZone {
-  return new NgZone({enableLongStackTrace: isDevMode()});
-}
-
-/**
- * Spawns a new class and initializes the WebWorkerInstance
- */
-function spawnWebWorker(uri: string, instance: WebWorkerInstance): void {
-  const webWorker: Worker = new Worker(uri);
-  // webWorker is casted to any because the lib.d.ts signature changed in TS3.5 to require the
-  // transfer argument in postMessage method.
-  // this seems wrong but since all of this code is deprecated it shouldn't matter that much.
-  const sink = new PostMessageBusSink(webWorker as any);
-  const source = new PostMessageBusSource(webWorker);
-  const bus = new PostMessageBus(sink, source);
-
-  instance.init(webWorker, bus);
-}
diff --git a/packages/platform-webworker/test/BUILD.bazel b/packages/platform-webworker/test/BUILD.bazel
deleted file mode 100644
index 21b87b2f082bc..0000000000000
--- a/packages/platform-webworker/test/BUILD.bazel
+++ /dev/null
@@ -1,35 +0,0 @@
-load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite", "ts_library")
-
-ts_library(
-    name = "test_lib",
-    testonly = True,
-    srcs = glob(["**/*.ts"]),
-    deps = [
-        "//packages:types",
-        "//packages/common",
-        "//packages/compiler",
-        "//packages/core",
-        "//packages/core/testing",
-        "//packages/platform-browser",
-        "//packages/platform-browser-dynamic",
-        "//packages/platform-browser-dynamic/testing",
-        "//packages/platform-browser/testing",
-        "//packages/platform-webworker",
-        "//packages/private/testing",
-    ],
-)
-
-jasmine_node_test(
-    name = "test",
-    bootstrap = ["//tools/testing:node_es5"],
-    deps = [
-        ":test_lib",
-    ],
-)
-
-karma_web_test_suite(
-    name = "test_web",
-    deps = [
-        ":test_lib",
-    ],
-)
diff --git a/packages/platform-webworker/test/web_workers/shared/message_bus_spec.ts b/packages/platform-webworker/test/web_workers/shared/message_bus_spec.ts
deleted file mode 100644
index c101661182296..0000000000000
--- a/packages/platform-webworker/test/web_workers/shared/message_bus_spec.ts
+++ /dev/null
@@ -1,172 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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 {NgZone} from '@angular/core';
-import {withModule} from '@angular/core/testing/src/test_bed';
-import {AsyncTestCompleter, beforeEach, describe, expect, inject, it, MockNgZone} from '@angular/core/testing/src/testing_internal';
-import {MessageBus} from '@angular/platform-webworker/src/web_workers/shared/message_bus';
-
-import {createConnectedMessageBus} from './message_bus_util';
-
-{
-  /**
-   * Tests the PostMessageBus
-   */
-  describe('MessageBus', () => {
-    let bus: MessageBus;
-
-    beforeEach(() => {
-      bus = createConnectedMessageBus();
-    });
-
-    it('should pass messages in the same channel from sink to source',
-       inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
-         const CHANNEL = 'CHANNEL 1';
-         const MESSAGE = 'Test message';
-         bus.initChannel(CHANNEL, false);
-
-         const fromEmitter = bus.from(CHANNEL);
-         fromEmitter.subscribe({
-           next: (message: any) => {
-             expect(message).toEqual(MESSAGE);
-             async.done();
-           }
-         });
-         const toEmitter = bus.to(CHANNEL);
-         toEmitter.emit(MESSAGE);
-       }));
-
-    it('should broadcast', inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
-         const CHANNEL = 'CHANNEL 1';
-         const MESSAGE = 'TESTING';
-         const NUM_LISTENERS = 2;
-         bus.initChannel(CHANNEL, false);
-
-         let callCount = 0;
-         const emitHandler = (message: any) => {
-           expect(message).toEqual(MESSAGE);
-           callCount++;
-           if (callCount == NUM_LISTENERS) {
-             async.done();
-           }
-         };
-
-         for (let i = 0; i < NUM_LISTENERS; i++) {
-           const emitter = bus.from(CHANNEL);
-           emitter.subscribe({next: emitHandler});
-         }
-
-         const toEmitter = bus.to(CHANNEL);
-         toEmitter.emit(MESSAGE);
-       }));
-
-    it('should keep channels independent',
-       inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
-         const CHANNEL_ONE = 'CHANNEL 1';
-         const CHANNEL_TWO = 'CHANNEL 2';
-         const MESSAGE_ONE = 'This is a message on CHANNEL 1';
-         const MESSAGE_TWO = 'This is a message on CHANNEL 2';
-         let callCount = 0;
-         bus.initChannel(CHANNEL_ONE, false);
-         bus.initChannel(CHANNEL_TWO, false);
-
-         const firstFromEmitter = bus.from(CHANNEL_ONE);
-         firstFromEmitter.subscribe({
-           next: (message: any) => {
-             expect(message).toEqual(MESSAGE_ONE);
-             callCount++;
-             if (callCount == 2) {
-               async.done();
-             }
-           }
-         });
-         const secondFromEmitter = bus.from(CHANNEL_TWO);
-         secondFromEmitter.subscribe({
-           next: (message: any) => {
-             expect(message).toEqual(MESSAGE_TWO);
-             callCount++;
-             if (callCount == 2) {
-               async.done();
-             }
-           }
-         });
-
-         const firstToEmitter = bus.to(CHANNEL_ONE);
-         firstToEmitter.emit(MESSAGE_ONE);
-
-         const secondToEmitter = bus.to(CHANNEL_TWO);
-         secondToEmitter.emit(MESSAGE_TWO);
-       }));
-  });
-
-  describe('PostMessageBusSink', () => {
-    let bus: MessageBus;
-    const CHANNEL = 'Test Channel';
-
-    function setup(runInZone: boolean, zone: NgZone) {
-      bus.attachToZone(zone);
-      bus.initChannel(CHANNEL, runInZone);
-    }
-
-    /**
-     * Flushes pending messages and then runs the given function.
-     */
-    // TODO(mlaval): timeout is fragile, test to be rewritten
-    function flushMessages(fn: () => void) {
-      setTimeout(fn, 50);
-    }
-
-    it('should buffer messages and wait for the zone to exit before sending',
-       withModule({providers: [{provide: NgZone, useClass: MockNgZone}]})
-           .inject(
-               [AsyncTestCompleter, NgZone],
-               (async: AsyncTestCompleter, zone: MockNgZone) => {
-                 bus = createConnectedMessageBus();
-                 setup(true, zone);
-
-                 let wasCalled = false;
-                 bus.from(CHANNEL).subscribe({
-                   next: (message: any) => {
-                     wasCalled = true;
-                   }
-                 });
-                 bus.to(CHANNEL).emit('hi');
-
-
-                 flushMessages(() => {
-                   expect(wasCalled).toBeFalsy();
-
-                   zone.simulateZoneExit();
-                   flushMessages(() => {
-                     expect(wasCalled).toBeTruthy();
-                     async.done();
-                   });
-                 });
-               }),
-       500);
-
-    it('should send messages immediately when run outside the zone',
-       inject([AsyncTestCompleter, NgZone], (async: AsyncTestCompleter, zone: MockNgZone) => {
-         bus = createConnectedMessageBus();
-         setup(false, zone);
-
-         let wasCalled = false;
-         bus.from(CHANNEL).subscribe({
-           next: (message: any) => {
-             wasCalled = true;
-           }
-         });
-         bus.to(CHANNEL).emit('hi');
-
-         flushMessages(() => {
-           expect(wasCalled).toBeTruthy();
-           async.done();
-         });
-       }), 10000);
-  });
-}
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
deleted file mode 100644
index 99b886a2a5b9f..0000000000000
--- a/packages/platform-webworker/test/web_workers/shared/message_bus_util.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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 {MessageBus} from '@angular/platform-webworker/src/web_workers/shared/message_bus';
-import {PostMessageBus, PostMessageBusSink, PostMessageBusSource} from '@angular/platform-webworker/src/web_workers/shared/post_message_bus';
-
-
-/*
- * Returns a PostMessageBus that's sink is connected to its own source.
- * Useful for testing the sink and source.
- */
-export function createConnectedMessageBus(): MessageBus {
-  const mockPostMessage = new MockPostMessage();
-  const source = new PostMessageBusSource(<any>mockPostMessage);
-  const sink = new PostMessageBusSink(mockPostMessage);
-
-  return new PostMessageBus(sink, source);
-}
-
-class MockPostMessage {
-  // TODO(issue/24571): remove '!'.
-  private _listener!: EventListener;
-
-  addEventListener(type: string, listener: EventListener, useCapture?: boolean): void {
-    if (type === 'message') {
-      this._listener = listener;
-    }
-  }
-
-  postMessage(data: any, transfer?: [Transferable]): void {
-    this._listener(<any>{data: data});
-  }
-}
diff --git a/packages/platform-webworker/test/web_workers/shared/mock_event_emitter.ts b/packages/platform-webworker/test/web_workers/shared/mock_event_emitter.ts
deleted file mode 100644
index 48640d8df5e6b..0000000000000
--- a/packages/platform-webworker/test/web_workers/shared/mock_event_emitter.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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 {EventEmitter} from '@angular/core';
-
-export class MockEventEmitter<T> extends EventEmitter<T> {
-  private _nextFns: Function[] = [];
-
-  constructor() {
-    super();
-  }
-
-  subscribe(generator: any): any {
-    this._nextFns.push(generator.next);
-    return new MockDisposable();
-  }
-
-  emit(value: any) {
-    this._nextFns.forEach(fn => fn(value));
-  }
-}
-
-class MockDisposable {
-  isUnsubscribed: boolean = false;
-  unsubscribe(): void {}
-}
diff --git a/packages/platform-webworker/test/web_workers/shared/render_store_spec.ts b/packages/platform-webworker/test/web_workers/shared/render_store_spec.ts
deleted file mode 100644
index 190704a3eef72..0000000000000
--- a/packages/platform-webworker/test/web_workers/shared/render_store_spec.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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 {RenderStore} from '@angular/platform-webworker/src/web_workers/shared/render_store';
-
-{
-  describe('RenderStoreSpec', () => {
-    let store: RenderStore;
-    beforeEach(() => {
-      store = new RenderStore();
-    });
-
-    it('should allocate ids', () => {
-      expect(store.allocateId()).toBe(0);
-      expect(store.allocateId()).toBe(1);
-    });
-
-    it('should serialize objects', () => {
-      const id = store.allocateId();
-      const obj = 'testObject';
-      store.store(obj, id);
-      expect(store.serialize(obj)).toBe(id);
-    });
-
-    it('should deserialize objects', () => {
-      const id = store.allocateId();
-      const obj = 'testObject';
-      store.store(obj, id);
-      expect(store.deserialize(id)).toBe(obj);
-    });
-  });
-}
diff --git a/packages/platform-webworker/test/web_workers/shared/service_message_broker_spec.ts b/packages/platform-webworker/test/web_workers/shared/service_message_broker_spec.ts
deleted file mode 100644
index f3fcfe1970b00..0000000000000
--- a/packages/platform-webworker/test/web_workers/shared/service_message_broker_spec.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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 {beforeEach, beforeEachProviders, describe, expect, inject, it} from '@angular/core/testing/src/testing_internal';
-import {ON_WEB_WORKER} from '@angular/platform-webworker/src/web_workers/shared/api';
-import {RenderStore} from '@angular/platform-webworker/src/web_workers/shared/render_store';
-import {Serializer, SerializerTypes} from '@angular/platform-webworker/src/web_workers/shared/serializer';
-import {ServiceMessageBroker} from '@angular/platform-webworker/src/web_workers/shared/service_message_broker';
-
-import {createPairedMessageBuses} from './web_worker_test_util';
-
-{
-  const CHANNEL = 'UIMessageBroker Test Channel';
-  const TEST_METHOD = 'TEST_METHOD';
-  const PASSED_ARG_1 = 5;
-  const PASSED_ARG_2 = 'TEST';
-  const RESULT = 20;
-  const ID = 'methodId';
-
-  beforeEachProviders(() => [Serializer, {provide: ON_WEB_WORKER, useValue: true}, RenderStore]);
-
-  describe('UIMessageBroker', () => {
-    let messageBuses: any /** TODO #9100 */;
-
-    beforeEach(() => {
-      messageBuses = createPairedMessageBuses();
-      messageBuses.ui.initChannel(CHANNEL);
-      messageBuses.worker.initChannel(CHANNEL);
-    });
-    it('should call registered method with correct arguments',
-       inject([Serializer], (serializer: Serializer) => {
-         const broker = new (ServiceMessageBroker as any)(messageBuses.ui, serializer, CHANNEL);
-         broker.registerMethod(
-             TEST_METHOD, [SerializerTypes.PRIMITIVE, SerializerTypes.PRIMITIVE],
-             (arg1: any, arg2: any) => {
-               expect(arg1).toEqual(PASSED_ARG_1);
-               expect(arg2).toEqual(PASSED_ARG_2);
-             });
-         messageBuses.worker.to(CHANNEL).emit({
-           'method': TEST_METHOD,
-           'args': [PASSED_ARG_1, PASSED_ARG_2],
-         });
-       }));
-
-    it('should return promises to the worker', inject([Serializer], (serializer: Serializer) => {
-         const broker = new (ServiceMessageBroker as any)(messageBuses.ui, serializer, CHANNEL);
-         broker.registerMethod(TEST_METHOD, [SerializerTypes.PRIMITIVE], (arg1: any) => {
-           expect(arg1).toEqual(PASSED_ARG_1);
-           return new Promise((res, rej) => {
-             try {
-               res(RESULT);
-             } catch (e) {
-               rej(e);
-             }
-           });
-         });
-         messageBuses.worker.to(CHANNEL).emit(
-             {'method': TEST_METHOD, 'id': ID, 'args': [PASSED_ARG_1]});
-         messageBuses.worker.from(CHANNEL).subscribe({
-           next: (data: any) => {
-             expect(data.type).toEqual('result');
-             expect(data.id).toEqual(ID);
-             expect(data.value).toEqual(RESULT);
-           },
-         });
-       }));
-  });
-}
diff --git a/packages/platform-webworker/test/web_workers/shared/web_worker_test_util.ts b/packages/platform-webworker/test/web_workers/shared/web_worker_test_util.ts
deleted file mode 100644
index 3fd3f7f97c0c8..0000000000000
--- a/packages/platform-webworker/test/web_workers/shared/web_worker_test_util.ts
+++ /dev/null
@@ -1,150 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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 '@angular/core';
-import {NgZone} from '@angular/core/src/zone/ng_zone';
-import {ClientMessageBroker, ClientMessageBrokerFactory, UiArguments} from '@angular/platform-webworker/src/web_workers/shared/client_message_broker';
-import {MessageBus, MessageBusSink, MessageBusSource} from '@angular/platform-webworker/src/web_workers/shared/message_bus';
-import {SpyMessageBroker} from '../worker/spies';
-
-import {MockEventEmitter} from './mock_event_emitter';
-
-/**
- * Returns two MessageBus instances that are attached to each other.
- * Such that whatever goes into one's sink comes out the others source.
- */
-export function createPairedMessageBuses(): PairedMessageBuses {
-  const firstChannels: {[key: string]: MockEventEmitter<any>} = {};
-  const workerMessageBusSink = new MockMessageBusSink(firstChannels);
-  const uiMessageBusSource = new MockMessageBusSource(firstChannels);
-
-  const secondChannels: {[key: string]: MockEventEmitter<any>} = {};
-  const uiMessageBusSink = new MockMessageBusSink(secondChannels);
-  const workerMessageBusSource = new MockMessageBusSource(secondChannels);
-
-  return new PairedMessageBuses(
-      new MockMessageBus(uiMessageBusSink, uiMessageBusSource),
-      new MockMessageBus(workerMessageBusSink, workerMessageBusSource));
-}
-
-/**
- * Spies on the given {@link SpyMessageBroker} and expects a call with the given methodName
- * andvalues.
- * If a handler is provided it will be called to handle the request.
- * Only intended to be called on a given broker instance once.
- */
-export function expectBrokerCall(
-    broker: SpyMessageBroker, methodName: string, vals?: Array<any>,
-    handler?: (..._: any[]) => Promise<any>| void): void {
-  broker.spy('runOnService').and.callFake((args: UiArguments, returnType: Type<any>) => {
-    expect(args.method).toEqual(methodName);
-    if (vals != null) {
-      expect(args.args!.length).toEqual(vals.length);
-      vals.forEach((v, i) => {
-        expect(v).toEqual(args.args![i].value);
-      });
-    }
-    let promise: Promise<any>|void = null!;
-    if (handler != null) {
-      const givenValues = args.args!.map((arg) => arg.value);
-      if (givenValues.length > 0) {
-        promise = handler(givenValues);
-      } else {
-        promise = handler();
-      }
-    }
-    if (promise == null) {
-      promise = new Promise((res, rej) => {
-        try {
-          res();
-        } catch (e) {
-          rej(e);
-        }
-      });
-    }
-    return promise;
-  });
-}
-
-export class PairedMessageBuses {
-  constructor(public ui: MessageBus, public worker: MessageBus) {}
-}
-
-export class MockMessageBusSource implements MessageBusSource {
-  constructor(private _channels: {[key: string]: MockEventEmitter<any>}) {}
-
-  initChannel(channel: string, runInZone = true) {
-    if (!this._channels.hasOwnProperty(channel)) {
-      this._channels[channel] = new MockEventEmitter();
-    }
-  }
-
-  from(channel: string): MockEventEmitter<any> {
-    if (!this._channels.hasOwnProperty(channel)) {
-      throw new Error(`${channel} is not set up. Did you forget to call initChannel?`);
-    }
-    return this._channels[channel];
-  }
-
-  attachToZone(zone: NgZone) {}
-}
-
-export class MockMessageBusSink implements MessageBusSink {
-  constructor(private _channels: {[key: string]: MockEventEmitter<any>}) {}
-
-  initChannel(channel: string, runInZone = true) {
-    if (!this._channels.hasOwnProperty(channel)) {
-      this._channels[channel] = new MockEventEmitter();
-    }
-  }
-
-  to(channel: string): MockEventEmitter<any> {
-    if (!this._channels.hasOwnProperty(channel)) {
-      this._channels[channel] = new MockEventEmitter();
-    }
-    return this._channels[channel];
-  }
-
-  attachToZone(zone: NgZone) {}
-}
-
-/**
- * Mock implementation of the {@link MessageBus} for tests.
- * Runs syncronously, and does not support running within the zone.
- */
-export class MockMessageBus extends MessageBus {
-  constructor(public sink: MockMessageBusSink, public source: MockMessageBusSource) {
-    super();
-  }
-
-  initChannel(channel: string, runInZone = true) {
-    this.sink.initChannel(channel, runInZone);
-    this.source.initChannel(channel, runInZone);
-  }
-
-  to(channel: string): MockEventEmitter<any> {
-    return this.sink.to(channel);
-  }
-
-  from(channel: string): MockEventEmitter<any> {
-    return this.source.from(channel);
-  }
-
-  attachToZone(zone: NgZone) {}
-}
-
-export const _ClientMessageBrokerFactory: {new (a: any, b: any): ClientMessageBrokerFactory} =
-    ClientMessageBrokerFactory;
-export class MockMessageBrokerFactory extends _ClientMessageBrokerFactory {
-  constructor(private _messageBroker: ClientMessageBroker) {
-    super(null!, null!);
-  }
-  createMessageBroker(channel: string, runInZone = true) {
-    return this._messageBroker;
-  }
-}
diff --git a/packages/platform-webworker/test/web_workers/worker/platform_location_spec.ts b/packages/platform-webworker/test/web_workers/worker/platform_location_spec.ts
deleted file mode 100644
index 3350b909956d2..0000000000000
--- a/packages/platform-webworker/test/web_workers/worker/platform_location_spec.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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 '@angular/core';
-import {UiArguments} from '@angular/platform-webworker/src/web_workers/shared/client_message_broker';
-import {MessageBus} from '@angular/platform-webworker/src/web_workers/shared/message_bus';
-import {LocationType, SerializerTypes} from '@angular/platform-webworker/src/web_workers/shared/serializer';
-import {WebWorkerPlatformLocation} from '@angular/platform-webworker/src/web_workers/worker/platform_location';
-
-import {createPairedMessageBuses, expectBrokerCall, MockMessageBrokerFactory} from '../shared/web_worker_test_util';
-
-import {SpyMessageBroker} from './spies';
-
-{
-  describe('WebWorkerPlatformLocation', () => {
-    let uiBus: MessageBus = null!;
-    let workerBus: MessageBus = null!;
-    let broker: any = null;
-
-    const TEST_LOCATION = new LocationType(
-        'http://www.example.com', 'http', 'example.com', 'example.com', '80', '/', '', '',
-        'http://www.example.com');
-
-
-    function createWebWorkerPlatformLocation(loc: LocationType): WebWorkerPlatformLocation {
-      broker.spy('runOnService')
-          .and.callFake((args: UiArguments, returnType: Type<any>|SerializerTypes) => {
-            if (args.method === 'getLocation') {
-              return Promise.resolve(loc);
-            }
-          });
-      const factory = new MockMessageBrokerFactory(broker);
-      return new WebWorkerPlatformLocation(factory, workerBus, null!);
-    }
-
-    function testPushOrReplaceState(pushState: boolean) {
-      const platformLocation = createWebWorkerPlatformLocation(null!);
-      const TITLE = 'foo';
-      const URL = 'http://www.example.com/foo';
-      expectBrokerCall(broker, pushState ? 'pushState' : 'replaceState', [null, TITLE, URL]);
-      if (pushState) {
-        platformLocation.pushState(null, TITLE, URL);
-      } else {
-        platformLocation.replaceState(null, TITLE, URL);
-      }
-    }
-
-    beforeEach(() => {
-      const buses = createPairedMessageBuses();
-      uiBus = buses.ui;
-      workerBus = buses.worker;
-      workerBus.initChannel('ng-Router');
-      uiBus.initChannel('ng-Router');
-      broker = new SpyMessageBroker();
-    });
-
-    it('should throw if getBaseHrefFromDOM is called', () => {
-      const platformLocation = createWebWorkerPlatformLocation(null!);
-      expect(() => platformLocation.getBaseHrefFromDOM()).toThrowError();
-    });
-
-    it('should get location on init', () => {
-      const platformLocation = createWebWorkerPlatformLocation(null!);
-      expectBrokerCall(broker, 'getLocation');
-      (platformLocation as any).init();
-    });
-
-    it('should throw if set pathname is called before init finishes', () => {
-      const platformLocation = createWebWorkerPlatformLocation(null!);
-      (platformLocation as any).init();
-      expect(() => platformLocation.pathname = 'TEST').toThrowError();
-    });
-
-    it('should send pathname to render thread', done => {
-      const platformLocation = createWebWorkerPlatformLocation(TEST_LOCATION);
-      (platformLocation as any).init().then((_: any) => {
-        const PATHNAME = '/test';
-        expectBrokerCall(broker, 'setPathname', [PATHNAME]);
-        platformLocation.pathname = PATHNAME;
-        done();
-      });
-    });
-
-    it('should send pushState to render thread', () => {
-      testPushOrReplaceState(true);
-    });
-
-    it('should send replaceState to render thread', () => {
-      testPushOrReplaceState(false);
-    });
-  });
-}
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
deleted file mode 100644
index 9acb36a7877c1..0000000000000
--- a/packages/platform-webworker/test/web_workers/worker/renderer_v2_integration_spec.ts
+++ /dev/null
@@ -1,225 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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 {ɵgetDOM as getDOM} from '@angular/common';
-import {Component, ComponentRef, destroyPlatform, Renderer2, RendererFactory2, RendererType2} from '@angular/core';
-import {TestBed} from '@angular/core/testing';
-import {platformBrowserDynamicTesting} from '@angular/platform-browser-dynamic/testing';
-import {DomRendererFactory2} from '@angular/platform-browser/src/dom/dom_renderer';
-import {BrowserTestingModule} from '@angular/platform-browser/testing';
-import {browserDetection, dispatchEvent, hasClass} from '@angular/platform-browser/testing/src/browser_util';
-import {expect} from '@angular/platform-browser/testing/src/matchers';
-import {ClientMessageBrokerFactory} from '@angular/platform-webworker/src/web_workers/shared/client_message_broker';
-import {RenderStore} from '@angular/platform-webworker/src/web_workers/shared/render_store';
-import {Serializer} from '@angular/platform-webworker/src/web_workers/shared/serializer';
-import {ServiceMessageBrokerFactory} from '@angular/platform-webworker/src/web_workers/shared/service_message_broker';
-import {MessageBasedRenderer2} from '@angular/platform-webworker/src/web_workers/ui/renderer';
-import {WebWorkerRendererFactory2} from '@angular/platform-webworker/src/web_workers/worker/renderer';
-import {modifiedInIvy} from '@angular/private/testing';
-
-import {createPairedMessageBuses, PairedMessageBuses} from '../shared/web_worker_test_util';
-
-let lastCreatedRenderer: Renderer2;
-
-{
-  describe('Web Worker Renderer v2', () => {
-    // Don't run on server...
-    if (!getDOM().supportsDOMEvents()) return;
-    // TODO(tbosch): investigate why this is failing on iOS7 for unrelated reasons
-    // Note: it's hard to debug this as SauceLabs starts with iOS8. Maybe drop
-    // iOS7 altogether?
-    if (browserDetection.isIOS7) return;
-
-    let uiRenderStore: RenderStore;
-    let wwRenderStore: RenderStore;
-
-    beforeEach(() => destroyPlatform());
-    afterEach(() => destroyPlatform());
-
-    beforeEach(() => {
-      // UI side
-      uiRenderStore = new RenderStore();
-      const uiInjector = new TestBed();
-      uiInjector.initTestEnvironment(BrowserTestingModule, platformBrowserDynamicTesting());
-      uiInjector.configureTestingModule({
-        providers: [
-          Serializer,
-          {provide: RenderStore, useValue: uiRenderStore},
-          DomRendererFactory2,
-          {provide: RendererFactory2, useExisting: DomRendererFactory2},
-        ]
-      });
-      const uiSerializer = uiInjector.get(Serializer);
-      const domRendererFactory = uiInjector.get(RendererFactory2);
-
-      // Worker side
-      lastCreatedRenderer = null!;
-
-      wwRenderStore = new RenderStore();
-
-      TestBed.configureTestingModule({
-        declarations: [MyComp2],
-        providers: [
-          Serializer,
-          {provide: RenderStore, useValue: wwRenderStore},
-          {
-            provide: RendererFactory2,
-            useFactory: (wwSerializer: Serializer) => createWebWorkerRendererFactory2(
-                wwSerializer, uiSerializer, domRendererFactory, uiRenderStore, wwRenderStore),
-            deps: [Serializer],
-          },
-        ],
-      });
-    });
-
-    function getRenderElement(workerEl: any): any {
-      const id = wwRenderStore.serialize(workerEl)!;
-      return uiRenderStore.deserialize(id);
-    }
-
-    it('should update text nodes', () => {
-      const fixture =
-          TestBed.overrideTemplate(MyComp2, '<div>{{ctxProp}}</div>').createComponent(MyComp2);
-      const renderEl = getRenderElement(fixture.nativeElement);
-      expect(renderEl).toHaveText('');
-
-      fixture.componentInstance.ctxProp = 'Hello World!';
-      fixture.detectChanges();
-      expect(renderEl).toHaveText('Hello World!');
-    });
-
-    modifiedInIvy('DebugElements are not supported on web-worker')
-        .it('should update any element property/attributes/class/style(s) independent of the compilation on the root element and other elements',
-            () => {
-              const fixture =
-                  TestBed.overrideTemplate(MyComp2, '<input [title]="y" style="position:absolute">')
-                      .createComponent(MyComp2);
-
-              const checkSetters = (componentRef: ComponentRef<any>, workerEl: any) => {
-                expect(lastCreatedRenderer).not.toBeNull();
-
-                const el = getRenderElement(workerEl);
-                lastCreatedRenderer.setProperty(workerEl, 'tabIndex', 1);
-                expect(el.tabIndex).toEqual(1);
-
-                lastCreatedRenderer.addClass(workerEl, 'a');
-                expect(hasClass(el, 'a')).toBe(true);
-
-                lastCreatedRenderer.removeClass(workerEl, 'a');
-                expect(hasClass(el, 'a')).toBe(false);
-
-                lastCreatedRenderer.setStyle(workerEl, 'width', '10px');
-                expect(el.style['width']).toEqual('10px');
-
-                lastCreatedRenderer.removeStyle(workerEl, 'width');
-                expect(el.style['width']).toEqual('');
-
-                lastCreatedRenderer.setAttribute(workerEl, 'someattr', 'someValue');
-                expect(el.getAttribute('someattr')).toEqual('someValue');
-              };
-
-              // root element
-              checkSetters(fixture.componentRef, fixture.nativeElement);
-              // nested elements
-              checkSetters(fixture.componentRef, fixture.debugElement.children[0].nativeElement);
-            });
-
-    it('should update any template comment property/attributes', () => {
-      const fixture =
-          TestBed.overrideTemplate(MyComp2, '<ng-container *ngIf="ctxBoolProp"></ng-container>')
-              .createComponent(MyComp2);
-      fixture.componentInstance.ctxBoolProp = true;
-      fixture.detectChanges();
-      const el = getRenderElement(fixture.nativeElement);
-      expect(el.innerHTML).toContain('"ng-reflect-ng-if": "true"');
-    });
-
-    it('should add and remove fragments', () => {
-      const fixture =
-          TestBed
-              .overrideTemplate(MyComp2, '<ng-container *ngIf="ctxBoolProp">hello</ng-container>')
-              .createComponent(MyComp2);
-
-      const rootEl = getRenderElement(fixture.nativeElement);
-      expect(rootEl).toHaveText('');
-
-      fixture.componentInstance.ctxBoolProp = true;
-      fixture.detectChanges();
-      expect(rootEl).toHaveText('hello');
-
-      fixture.componentInstance.ctxBoolProp = false;
-      fixture.detectChanges();
-      expect(rootEl).toHaveText('');
-    });
-
-    if (getDOM().supportsDOMEvents()) {
-      modifiedInIvy('DebugElements are not supported on web-worker')
-          .it('should listen to events', () => {
-            const fixture = TestBed.overrideTemplate(MyComp2, '<input (change)="ctxNumProp = 1">')
-                                .createComponent(MyComp2);
-
-            const el = fixture.debugElement.children[0];
-            dispatchEvent(getRenderElement(el.nativeElement), 'change');
-            expect(fixture.componentInstance.ctxNumProp).toBe(1);
-
-            fixture.destroy();
-          });
-    }
-  });
-}
-
-@Component({selector: 'my-comp'})
-class MyComp2 {
-  ctxProp = 'initial value';
-  ctxNumProp = 0;
-  ctxBoolProp = false;
-}
-
-function createWebWorkerBrokerFactory(
-    messageBuses: PairedMessageBuses, wwSerializer: Serializer, uiSerializer: Serializer,
-    domRendererFactory: DomRendererFactory2,
-    uiRenderStore: RenderStore): ClientMessageBrokerFactory {
-  const uiMessageBus = messageBuses.ui;
-  const wwMessageBus = messageBuses.worker;
-
-  // set up the worker side
-  const wwBrokerFactory = new (ClientMessageBrokerFactory as any)(wwMessageBus, wwSerializer);
-
-  // set up the ui side
-  const uiBrokerFactory = new (ServiceMessageBrokerFactory as any)(uiMessageBus, uiSerializer);
-  const renderer = new MessageBasedRenderer2(
-      uiBrokerFactory, uiMessageBus, uiSerializer, uiRenderStore, domRendererFactory);
-  renderer.start();
-
-  return wwBrokerFactory;
-}
-
-function createWebWorkerRendererFactory2(
-    workerSerializer: Serializer, uiSerializer: Serializer, domRendererFactory: DomRendererFactory2,
-    uiRenderStore: RenderStore, workerRenderStore: RenderStore): RendererFactory2 {
-  const messageBuses = createPairedMessageBuses();
-  const brokerFactory = createWebWorkerBrokerFactory(
-      messageBuses, workerSerializer, uiSerializer, domRendererFactory, uiRenderStore);
-
-  const rendererFactory =
-      new RenderFactory(brokerFactory, messageBuses.worker, workerSerializer, workerRenderStore);
-
-  return rendererFactory;
-}
-
-class RenderFactory extends WebWorkerRendererFactory2 {
-  createRenderer(element: any, type: RendererType2|null): Renderer2 {
-    lastCreatedRenderer = super.createRenderer(element, type);
-    return lastCreatedRenderer;
-  }
-}
-
-function isOldIE() {
-  // note that this only applies to older IEs (not edge)
-  return (window as any).document['documentMode'] ? true : false;
-}
diff --git a/packages/platform-webworker/test/web_workers/worker/spies.ts b/packages/platform-webworker/test/web_workers/worker/spies.ts
deleted file mode 100644
index c2b6b27f51715..0000000000000
--- a/packages/platform-webworker/test/web_workers/worker/spies.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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 {SpyObject} from '@angular/core/testing/src/testing_internal';
-import {ClientMessageBroker} from '@angular/platform-webworker/src/web_workers/shared/client_message_broker';
-
-export class SpyMessageBroker extends SpyObject {
-  constructor() {
-    super(ClientMessageBroker);
-  }
-}
diff --git a/packages/router/src/apply_redirects.ts b/packages/router/src/apply_redirects.ts
index 6827c0b005cee..f984a93c07972 100644
--- a/packages/router/src/apply_redirects.ts
+++ b/packages/router/src/apply_redirects.ts
@@ -7,8 +7,8 @@
  */
 
 import {Injector, NgModuleRef} from '@angular/core';
-import {EmptyError, Observable, Observer, of} from 'rxjs';
-import {catchError, concatAll, first, map, mergeMap, tap} from 'rxjs/operators';
+import {EmptyError, from, Observable, Observer, of} from 'rxjs';
+import {catchError, combineAll, concatMap, first, map, mergeMap, tap} from 'rxjs/operators';
 
 import {LoadedRouterConfig, Route, Routes} from './config';
 import {CanLoadFn} from './interfaces';
@@ -17,6 +17,7 @@ import {RouterConfigLoader} from './router_config_loader';
 import {defaultUrlMatcher, navigationCancelingError, Params, PRIMARY_OUTLET} from './shared';
 import {UrlSegment, UrlSegmentGroup, UrlSerializer, UrlTree} from './url_tree';
 import {forEach, waitForMap, wrapIntoObservable} from './utils/collection';
+import {getOutlet, groupRoutesByOutlet} from './utils/config';
 import {isCanLoad, isFunction, isUrlTree} from './utils/type_guards';
 
 class NoMatch {
@@ -148,28 +149,52 @@ class ApplyRedirects {
       ngModule: NgModuleRef<any>, segmentGroup: UrlSegmentGroup, routes: Route[],
       segments: UrlSegment[], outlet: string,
       allowRedirects: boolean): Observable<UrlSegmentGroup> {
-    return of(...routes).pipe(
-        map((r: any) => {
-          const expanded$ = this.expandSegmentAgainstRoute(
-              ngModule, segmentGroup, routes, r, segments, outlet, allowRedirects);
-          return expanded$.pipe(catchError((e: any) => {
-            if (e instanceof NoMatch) {
-              // TODO(i): this return type doesn't match the declared Observable<UrlSegmentGroup> -
-              // talk to Jason
-              return of(null) as any;
+    // We need to expand each outlet group independently to ensure that we not only load modules
+    // for routes matching the given `outlet`, but also those which will be activated because
+    // their path is empty string. This can result in multiple outlets being activated at once.
+    const routesByOutlet: Map<string, Route[]> = groupRoutesByOutlet(routes);
+    if (!routesByOutlet.has(outlet)) {
+      routesByOutlet.set(outlet, []);
+    }
+
+    const expandRoutes = (routes: Route[]) => {
+      return from(routes).pipe(
+          concatMap((r: Route) => {
+            const expanded$ = this.expandSegmentAgainstRoute(
+                ngModule, segmentGroup, routes, r, segments, outlet, allowRedirects);
+            return expanded$.pipe(catchError(e => {
+              if (e instanceof NoMatch) {
+                return of(null);
+              }
+              throw e;
+            }));
+          }),
+          first((s: UrlSegmentGroup|null): s is UrlSegmentGroup => s !== null),
+          catchError(e => {
+            if (e instanceof EmptyError || e.name === 'EmptyError') {
+              if (this.noLeftoversInUrl(segmentGroup, segments, outlet)) {
+                return of(new UrlSegmentGroup([], {}));
+              }
+              throw new NoMatch(segmentGroup);
             }
             throw e;
-          }));
-        }),
-        concatAll(), first((s: any) => !!s), catchError((e: any, _: any) => {
-          if (e instanceof EmptyError || e.name === 'EmptyError') {
-            if (this.noLeftoversInUrl(segmentGroup, segments, outlet)) {
-              return of(new UrlSegmentGroup([], {}));
-            }
-            throw new NoMatch(segmentGroup);
-          }
-          throw e;
-        }));
+          }),
+      );
+    };
+
+    const expansions = Array.from(routesByOutlet.entries()).map(([routeOutlet, routes]) => {
+      const expanded = expandRoutes(routes);
+      // Map all results from outlets we aren't activating to `null` so they can be ignored later
+      return routeOutlet === outlet ? expanded :
+                                      expanded.pipe(map(() => null), catchError(() => of(null)));
+    });
+    return from(expansions)
+        .pipe(
+            combineAll(),
+            first(),
+            // Return only the expansion for the route outlet we are trying to activate.
+            map(results => results.find(result => result !== null)!),
+        );
   }
 
   private noLeftoversInUrl(segmentGroup: UrlSegmentGroup, segments: UrlSegment[], outlet: string):
@@ -180,7 +205,9 @@ class ApplyRedirects {
   private expandSegmentAgainstRoute(
       ngModule: NgModuleRef<any>, segmentGroup: UrlSegmentGroup, routes: Route[], route: Route,
       paths: UrlSegment[], outlet: string, allowRedirects: boolean): Observable<UrlSegmentGroup> {
-    if (getOutlet(route) !== outlet) {
+    // Empty string segments are special because multiple outlets can match a single path, i.e.
+    // `[{path: '', component: B}, {path: '', loadChildren: () => {}, outlet: "about"}]`
+    if (getOutlet(route) !== outlet && route.path !== '') {
       return noMatch(segmentGroup);
     }
 
@@ -550,7 +577,3 @@ function isEmptyPathRedirect(
 
   return r.path === '' && r.redirectTo !== undefined;
 }
-
-function getOutlet(route: Route): string {
-  return route.outlet || PRIMARY_OUTLET;
-}
diff --git a/packages/router/src/config.ts b/packages/router/src/config.ts
index 044cdcd7965e6..86af574f02b3a 100644
--- a/packages/router/src/config.ts
+++ b/packages/router/src/config.ts
@@ -140,7 +140,7 @@ export type DeprecatedLoadChildren = string;
  * - `merge` : Merge new with current parameters.
  * - `preserve` : Preserve current parameters.
  *
- * @see `NavigationExtras#queryParamsHandling`
+ * @see `UrlCreationOptions#queryParamsHandling`
  * @see `RouterLink`
  * @publicApi
  */
diff --git a/packages/router/src/create_router_state.ts b/packages/router/src/create_router_state.ts
index 17e0f8b6ad092..92ca55bdbfde4 100644
--- a/packages/router/src/create_router_state.ts
+++ b/packages/router/src/create_router_state.ts
@@ -65,7 +65,7 @@ function createOrReuseChildren(
     prevState: TreeNode<ActivatedRoute>) {
   return curr.children.map(child => {
     for (const p of prevState.children) {
-      if (routeReuseStrategy.shouldReuseRoute(p.value.snapshot, child.value)) {
+      if (routeReuseStrategy.shouldReuseRoute(child.value, p.value.snapshot)) {
         return createNode(routeReuseStrategy, child, p);
       }
     }
diff --git a/packages/router/src/directives/router_link.ts b/packages/router/src/directives/router_link.ts
index 7b041980f38e6..01f782b6af25b 100644
--- a/packages/router/src/directives/router_link.ts
+++ b/packages/router/src/directives/router_link.ts
@@ -7,13 +7,14 @@
  */
 
 import {LocationStrategy} from '@angular/common';
-import {Attribute, Directive, ElementRef, HostBinding, HostListener, Input, isDevMode, OnChanges, OnDestroy, Renderer2} from '@angular/core';
-import {Subscription} from 'rxjs';
+import {Attribute, Directive, ElementRef, HostBinding, HostListener, Input, OnChanges, OnDestroy, Renderer2, SimpleChanges} from '@angular/core';
+import {Subject, Subscription} from 'rxjs';
 
 import {QueryParamsHandling} from '../config';
 import {Event, NavigationEnd} from '../events';
 import {Router} from '../router';
 import {ActivatedRoute} from '../router_state';
+import {Params} from '../shared';
 import {UrlTree} from '../url_tree';
 
 
@@ -84,7 +85,7 @@ import {UrlTree} from '../url_tree';
  * </a>
  * ```
  *
- * See {@link NavigationExtras.queryParamsHandling NavigationExtras#queryParamsHandling}.
+ * See {@link UrlCreationOptions.queryParamsHandling UrlCreationOptions#queryParamsHandling}.
  *
  * ### Preserving navigation history
  *
@@ -115,58 +116,65 @@ import {UrlTree} from '../url_tree';
  * @publicApi
  */
 @Directive({selector: ':not(a):not(area)[routerLink]'})
-export class RouterLink {
+export class RouterLink implements OnChanges {
   /**
-   * Passed to {@link Router#createUrlTree Router#createUrlTree} as part of the `NavigationExtras`.
-   * @see {@link NavigationExtras#queryParams NavigationExtras#queryParams}
+   * Passed to {@link Router#createUrlTree Router#createUrlTree} as part of the
+   * `UrlCreationOptions`.
+   * @see {@link UrlCreationOptions#queryParams UrlCreationOptions#queryParams}
    * @see {@link Router#createUrlTree Router#createUrlTree}
    */
-  // TODO(issue/24571): remove '!'.
-  @Input() queryParams!: {[k: string]: any};
+  @Input() queryParams?: Params|null;
   /**
-   * Passed to {@link Router#createUrlTree Router#createUrlTree} as part of the `NavigationExtras`.
-   * @see {@link NavigationExtras#fragment NavigationExtras#fragment}
+   * Passed to {@link Router#createUrlTree Router#createUrlTree} as part of the
+   * `UrlCreationOptions`.
+   * @see {@link UrlCreationOptions#fragment UrlCreationOptions#fragment}
    * @see {@link Router#createUrlTree Router#createUrlTree}
    */
-  // TODO(issue/24571): remove '!'.
-  @Input() fragment!: string;
+  @Input() fragment?: string;
   /**
-   * Passed to {@link Router#createUrlTree Router#createUrlTree} as part of the `NavigationExtras`.
-   * @see {@link NavigationExtras#queryParamsHandling NavigationExtras#queryParamsHandling}
+   * Passed to {@link Router#createUrlTree Router#createUrlTree} as part of the
+   * `UrlCreationOptions`.
+   * @see {@link UrlCreationOptions#queryParamsHandling UrlCreationOptions#queryParamsHandling}
    * @see {@link Router#createUrlTree Router#createUrlTree}
    */
-  // TODO(issue/24571): remove '!'.
-  @Input() queryParamsHandling!: QueryParamsHandling;
+  @Input() queryParamsHandling?: QueryParamsHandling|null;
   /**
-   * Passed to {@link Router#createUrlTree Router#createUrlTree} as part of the `NavigationExtras`.
-   * @see {@link NavigationExtras#preserveFragment NavigationExtras#preserveFragment}
+   * Passed to {@link Router#createUrlTree Router#createUrlTree} as part of the
+   * `UrlCreationOptions`.
+   * @see {@link UrlCreationOptions#preserveFragment UrlCreationOptions#preserveFragment}
    * @see {@link Router#createUrlTree Router#createUrlTree}
    */
   // TODO(issue/24571): remove '!'.
   @Input() preserveFragment!: boolean;
   /**
-   * Passed to {@link Router#createUrlTree Router#createUrlTree} as part of the `NavigationExtras`.
-   * @see {@link NavigationExtras#skipLocationChange NavigationExtras#skipLocationChange}
-   * @see {@link Router#createUrlTree Router#createUrlTree}
+   * Passed to {@link Router#navigateByUrl Router#navigateByUrl} as part of the
+   * `NavigationBehaviorOptions`.
+   * @see {@link NavigationBehaviorOptions#skipLocationChange NavigationBehaviorOptions#skipLocationChange}
+   * @see {@link Router#navigateByUrl Router#navigateByUrl}
    */
   // TODO(issue/24571): remove '!'.
   @Input() skipLocationChange!: boolean;
   /**
-   * Passed to {@link Router#createUrlTree Router#createUrlTree} as part of the `NavigationExtras`.
-   * @see {@link NavigationExtras#replaceUrl NavigationExtras#replaceUrl}
-   * @see {@link Router#createUrlTree Router#createUrlTree}
+   * Passed to {@link Router#navigateByUrl Router#navigateByUrl} as part of the
+   * `NavigationBehaviorOptions`.
+   * @see {@link NavigationBehaviorOptions#replaceUrl NavigationBehaviorOptions#replaceUrl}
+   * @see {@link Router#navigateByUrl Router#navigateByUrl}
    */
   // TODO(issue/24571): remove '!'.
   @Input() replaceUrl!: boolean;
   /**
-   * Passed to {@link Router#createUrlTree Router#createUrlTree} as part of the `NavigationExtras`.
-   * @see {@link NavigationExtras#state NavigationExtras#state}
-   * @see {@link Router#createUrlTree Router#createUrlTree}
+   * Passed to {@link Router#navigateByUrl Router#navigateByUrl} as part of the
+   * `NavigationBehaviorOptions`.
+   * @see {@link NavigationBehaviorOptions#state NavigationBehaviorOptions#state}
+   * @see {@link Router#navigateByUrl Router#navigateByUrl}
    */
   @Input() state?: {[k: string]: any};
   private commands: any[] = [];
   private preserve!: boolean;
 
+  /** @internal */
+  onChanges = new Subject<RouterLink>();
+
   constructor(
       private router: Router, private route: ActivatedRoute,
       @Attribute('tabindex') tabIndex: string, renderer: Renderer2, el: ElementRef) {
@@ -175,6 +183,13 @@ export class RouterLink {
     }
   }
 
+  /** @nodoc */
+  ngOnChanges(changes: SimpleChanges) {
+    // This is subscribed to by `RouterLinkActive` so that it knows to update when there are changes
+    // to the RouterLinks it's tracking.
+    this.onChanges.next(this);
+  }
+
   /**
    * Commands to pass to {@link Router#createUrlTree Router#createUrlTree}.
    *   - **array**: commands to pass to {@link Router#createUrlTree Router#createUrlTree}.
@@ -191,17 +206,7 @@ export class RouterLink {
     }
   }
 
-  /**
-   * @deprecated As of Angular v4.0 use `queryParamsHandling` instead.
-   */
-  @Input()
-  set preserveQueryParams(value: boolean) {
-    if (isDevMode() && <any>console && <any>console.warn) {
-      console.warn('preserveQueryParams is deprecated!, use queryParamsHandling instead.');
-    }
-    this.preserve = value;
-  }
-
+  /** @nodoc */
   @HostListener('click')
   onClick(): boolean {
     const extras = {
@@ -218,7 +223,6 @@ export class RouterLink {
       relativeTo: this.route,
       queryParams: this.queryParams,
       fragment: this.fragment,
-      preserveQueryParams: attrBoolValue(this.preserve),
       queryParamsHandling: this.queryParamsHandling,
       preserveFragment: attrBoolValue(this.preserveFragment),
     });
@@ -241,51 +245,55 @@ export class RouterLinkWithHref implements OnChanges, OnDestroy {
   // TODO(issue/24571): remove '!'.
   @HostBinding('attr.target') @Input() target!: string;
   /**
-   * Passed to {@link Router#createUrlTree Router#createUrlTree} as part of the `NavigationExtras`.
-   * @see {@link NavigationExtras#queryParams NavigationExtras#queryParams}
+   * Passed to {@link Router#createUrlTree Router#createUrlTree} as part of the
+   * `UrlCreationOptions`.
+   * @see {@link UrlCreationOptions#queryParams UrlCreationOptions#queryParams}
    * @see {@link Router#createUrlTree Router#createUrlTree}
    */
-  // TODO(issue/24571): remove '!'.
-  @Input() queryParams!: {[k: string]: any};
+  @Input() queryParams?: Params|null;
   /**
-   * Passed to {@link Router#createUrlTree Router#createUrlTree} as part of the `NavigationExtras`.
-   * @see {@link NavigationExtras#fragment NavigationExtras#fragment}
+   * Passed to {@link Router#createUrlTree Router#createUrlTree} as part of the
+   * `UrlCreationOptions`.
+   * @see {@link UrlCreationOptions#fragment UrlCreationOptions#fragment}
    * @see {@link Router#createUrlTree Router#createUrlTree}
    */
-  // TODO(issue/24571): remove '!'.
-  @Input() fragment!: string;
+  @Input() fragment?: string;
   /**
-   * Passed to {@link Router#createUrlTree Router#createUrlTree} as part of the `NavigationExtras`.
-   * @see {@link NavigationExtras#queryParamsHandling NavigationExtras#queryParamsHandling}
+   * Passed to {@link Router#createUrlTree Router#createUrlTree} as part of the
+   * `UrlCreationOptions`.
+   * @see {@link UrlCreationOptions#queryParamsHandling UrlCreationOptions#queryParamsHandling}
    * @see {@link Router#createUrlTree Router#createUrlTree}
    */
-  // TODO(issue/24571): remove '!'.
-  @Input() queryParamsHandling!: QueryParamsHandling;
+  @Input() queryParamsHandling?: QueryParamsHandling|null;
   /**
-   * Passed to {@link Router#createUrlTree Router#createUrlTree} as part of the `NavigationExtras`.
-   * @see {@link NavigationExtras#preserveFragment NavigationExtras#preserveFragment}
+   * Passed to {@link Router#createUrlTree Router#createUrlTree} as part of the
+   * `UrlCreationOptions`.
+   * @see {@link UrlCreationOptions#preserveFragment UrlCreationOptions#preserveFragment}
    * @see {@link Router#createUrlTree Router#createUrlTree}
    */
   // TODO(issue/24571): remove '!'.
   @Input() preserveFragment!: boolean;
   /**
-   * Passed to {@link Router#createUrlTree Router#createUrlTree} as part of the `NavigationExtras`.
-   * @see {@link NavigationExtras#skipLocationChange NavigationExtras#skipLocationChange}
-   * @see {@link Router#createUrlTree Router#createUrlTree}
+   * Passed to {@link Router#navigateByUrl Router#navigateByUrl} as part of the
+   * `NavigationBehaviorOptions`.
+   * @see {@link NavigationBehaviorOptions#skipLocationChange NavigationBehaviorOptions#skipLocationChange}
+   * @see {@link Router#navigateByUrl Router#navigateByUrl}
    */
   // TODO(issue/24571): remove '!'.
   @Input() skipLocationChange!: boolean;
   /**
-   * Passed to {@link Router#createUrlTree Router#createUrlTree} as part of the `NavigationExtras`.
-   * @see {@link NavigationExtras#replaceUrl NavigationExtras#replaceUrl}
-   * @see {@link Router#createUrlTree Router#createUrlTree}
+   * Passed to {@link Router#navigateByUrl Router#navigateByUrl} as part of the
+   * `NavigationBehaviorOptions`.
+   * @see {@link NavigationBehaviorOptions#replaceUrl NavigationBehaviorOptions#replaceUrl}
+   * @see {@link Router#navigateByUrl Router#navigateByUrl}
    */
   // TODO(issue/24571): remove '!'.
   @Input() replaceUrl!: boolean;
   /**
-   * Passed to {@link Router#createUrlTree Router#createUrlTree} as part of the `NavigationExtras`.
-   * @see {@link NavigationExtras#state NavigationExtras#state}
-   * @see {@link Router#createUrlTree Router#createUrlTree}
+   * Passed to {@link Router#navigateByUrl Router#navigateByUrl} as part of the
+   * `NavigationBehaviorOptions`.
+   * @see {@link NavigationBehaviorOptions#state NavigationBehaviorOptions#state}
+   * @see {@link Router#navigateByUrl Router#navigateByUrl}
    */
   @Input() state?: {[k: string]: any};
   private commands: any[] = [];
@@ -297,6 +305,9 @@ export class RouterLinkWithHref implements OnChanges, OnDestroy {
   // TODO(issue/24571): remove '!'.
   @HostBinding() href!: string;
 
+  /** @internal */
+  onChanges = new Subject<RouterLinkWithHref>();
+
   constructor(
       private router: Router, private route: ActivatedRoute,
       private locationStrategy: LocationStrategy) {
@@ -323,27 +334,23 @@ export class RouterLinkWithHref implements OnChanges, OnDestroy {
     }
   }
 
-  /**
-   * @deprecated As of Angular v4.0 use `queryParamsHandling` instead.
-   */
-  @Input()
-  set preserveQueryParams(value: boolean) {
-    if (isDevMode() && <any>console && <any>console.warn) {
-      console.warn('preserveQueryParams is deprecated, use queryParamsHandling instead.');
-    }
-    this.preserve = value;
-  }
-
-  ngOnChanges(changes: {}): any {
+  /** @nodoc */
+  ngOnChanges(changes: SimpleChanges): any {
     this.updateTargetUrlAndHref();
+    this.onChanges.next(this);
   }
+  /** @nodoc */
   ngOnDestroy(): any {
     this.subscription.unsubscribe();
   }
 
-  @HostListener('click', ['$event.button', '$event.ctrlKey', '$event.metaKey', '$event.shiftKey'])
-  onClick(button: number, ctrlKey: boolean, metaKey: boolean, shiftKey: boolean): boolean {
-    if (button !== 0 || ctrlKey || metaKey || shiftKey) {
+  /** @nodoc */
+  @HostListener(
+      'click',
+      ['$event.button', '$event.ctrlKey', '$event.shiftKey', '$event.altKey', '$event.metaKey'])
+  onClick(button: number, ctrlKey: boolean, shiftKey: boolean, altKey: boolean, metaKey: boolean):
+      boolean {
+    if (button !== 0 || ctrlKey || shiftKey || altKey || metaKey) {
       return true;
     }
 
@@ -369,7 +376,6 @@ export class RouterLinkWithHref implements OnChanges, OnDestroy {
       relativeTo: this.route,
       queryParams: this.queryParams,
       fragment: this.fragment,
-      preserveQueryParams: attrBoolValue(this.preserve),
       queryParamsHandling: this.queryParamsHandling,
       preserveFragment: attrBoolValue(this.preserveFragment),
     });
diff --git a/packages/router/src/directives/router_link_active.ts b/packages/router/src/directives/router_link_active.ts
index 8c56ca12b49c2..4b1f69b47c365 100644
--- a/packages/router/src/directives/router_link_active.ts
+++ b/packages/router/src/directives/router_link_active.ts
@@ -7,7 +7,8 @@
  */
 
 import {AfterContentInit, ChangeDetectorRef, ContentChildren, Directive, ElementRef, Input, OnChanges, OnDestroy, Optional, QueryList, Renderer2, SimpleChanges} from '@angular/core';
-import {Subscription} from 'rxjs';
+import {from, of, Subscription} from 'rxjs';
+import {mergeAll} from 'rxjs/operators';
 
 import {Event, NavigationEnd} from '../events';
 import {Router} from '../router';
@@ -79,14 +80,13 @@ import {RouterLink, RouterLinkWithHref} from './router_link';
   exportAs: 'routerLinkActive',
 })
 export class RouterLinkActive implements OnChanges, OnDestroy, AfterContentInit {
-  // TODO(issue/24571): remove '!'.
   @ContentChildren(RouterLink, {descendants: true}) links!: QueryList<RouterLink>;
-  // TODO(issue/24571): remove '!'.
   @ContentChildren(RouterLinkWithHref, {descendants: true})
   linksWithHrefs!: QueryList<RouterLinkWithHref>;
 
   private classes: string[] = [];
-  private subscription: Subscription;
+  private routerEventsSubscription: Subscription;
+  private linkInputChangesSubscription?: Subscription;
   public readonly isActive: boolean = false;
 
   @Input() routerLinkActiveOptions: {exact: boolean} = {exact: false};
@@ -95,18 +95,35 @@ export class RouterLinkActive implements OnChanges, OnDestroy, AfterContentInit
       private router: Router, private element: ElementRef, private renderer: Renderer2,
       private readonly cdr: ChangeDetectorRef, @Optional() private link?: RouterLink,
       @Optional() private linkWithHref?: RouterLinkWithHref) {
-    this.subscription = router.events.subscribe((s: Event) => {
+    this.routerEventsSubscription = router.events.subscribe((s: Event) => {
       if (s instanceof NavigationEnd) {
         this.update();
       }
     });
   }
 
-
+  /** @nodoc */
   ngAfterContentInit(): void {
-    this.links.changes.subscribe(_ => this.update());
-    this.linksWithHrefs.changes.subscribe(_ => this.update());
-    this.update();
+    // `of(null)` is used to force subscribe body to execute once immediately (like `startWith`).
+    from([this.links.changes, this.linksWithHrefs.changes, of(null)])
+        .pipe(mergeAll())
+        .subscribe(_ => {
+          this.update();
+          this.subscribeToEachLinkOnChanges();
+        });
+  }
+
+  private subscribeToEachLinkOnChanges() {
+    this.linkInputChangesSubscription?.unsubscribe();
+    const allLinkChanges =
+        [...this.links.toArray(), ...this.linksWithHrefs.toArray(), this.link, this.linkWithHref]
+            .filter((link): link is RouterLink|RouterLinkWithHref => !!link)
+            .map(link => link.onChanges);
+    this.linkInputChangesSubscription = from(allLinkChanges).pipe(mergeAll()).subscribe(link => {
+      if (this.isActive !== this.isLinkActive(this.router)(link)) {
+        this.update();
+      }
+    });
   }
 
   @Input()
@@ -115,11 +132,14 @@ export class RouterLinkActive implements OnChanges, OnDestroy, AfterContentInit
     this.classes = classes.filter(c => !!c);
   }
 
+  /** @nodoc */
   ngOnChanges(changes: SimpleChanges): void {
     this.update();
   }
+  /** @nodoc */
   ngOnDestroy(): void {
-    this.subscription.unsubscribe();
+    this.routerEventsSubscription.unsubscribe();
+    this.linkInputChangesSubscription?.unsubscribe();
   }
 
   private update(): void {
diff --git a/packages/router/src/directives/router_outlet.ts b/packages/router/src/directives/router_outlet.ts
index 904e5e1f76c03..6e7425a4f5f21 100644
--- a/packages/router/src/directives/router_outlet.ts
+++ b/packages/router/src/directives/router_outlet.ts
@@ -76,10 +76,12 @@ export class RouterOutlet implements OnDestroy, OnInit {
     parentContexts.onChildOutletCreated(this.name, this);
   }
 
+  /** @nodoc */
   ngOnDestroy(): void {
     this.parentContexts.onChildOutletDestroyed(this.name);
   }
 
+  /** @nodoc */
   ngOnInit(): void {
     if (!this.activated) {
       // If the outlet was not instantiated at the time the route got activated we need to populate
diff --git a/packages/router/src/index.ts b/packages/router/src/index.ts
index ffd02e06c841d..e85ec0e315377 100644
--- a/packages/router/src/index.ts
+++ b/packages/router/src/index.ts
@@ -13,8 +13,8 @@ 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, Scroll} from './events';
 export {CanActivate, CanActivateChild, CanDeactivate, CanLoad, Resolve} from './interfaces';
-export {DetachedRouteHandle, RouteReuseStrategy} from './route_reuse_strategy';
-export {Navigation, NavigationExtras, Router} from './router';
+export {BaseRouteReuseStrategy, DetachedRouteHandle, RouteReuseStrategy} from './route_reuse_strategy';
+export {Navigation, NavigationBehaviorOptions, NavigationExtras, Router, UrlCreationOptions} from './router';
 export {ROUTES} from './router_config_loader';
 export {ExtraOptions, InitialNavigation, provideRoutes, ROUTER_CONFIGURATION, ROUTER_INITIALIZER, RouterModule} from './router_module';
 export {ChildrenOutletContexts, OutletContext} from './router_outlet_context';
diff --git a/packages/router/src/operators/activate_routes.ts b/packages/router/src/operators/activate_routes.ts
index d946feaa7b1fe..a045bfe4a8d76 100644
--- a/packages/router/src/operators/activate_routes.ts
+++ b/packages/router/src/operators/activate_routes.ts
@@ -6,7 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {isDevMode} from '@angular/core';
 import {MonoTypeOperatorFunction} from 'rxjs';
 import {map} from 'rxjs/operators';
 
@@ -186,10 +185,6 @@ export class ActivateRoutes {
             // Activate the outlet when it has already been instantiated
             // Otherwise it will get activated from its `ngOnInit` when instantiated
             context.outlet.activateWith(future, cmpFactoryResolver);
-          } else if (isDevMode() && console && console.warn) {
-            console.warn(
-                `A router outlet has not been instantiated during routes activation. URL Segment: '${
-                    future.snapshot._urlSegment}'`);
           }
 
           this.activateChildRoutes(futureNode, null, context.children);
diff --git a/packages/router/src/private_export.ts b/packages/router/src/private_export.ts
index fa90c45ee5c8c..8fe6e90686779 100644
--- a/packages/router/src/private_export.ts
+++ b/packages/router/src/private_export.ts
@@ -8,5 +8,5 @@
 
 
 export {ɵEmptyOutletComponent} from './components/empty_outlet';
-export {ROUTER_PROVIDERS as ɵROUTER_PROVIDERS} from './router_module';
+export {assignExtraOptionsToRouter as ɵassignExtraOptionsToRouter, ROUTER_PROVIDERS as ɵROUTER_PROVIDERS} from './router_module';
 export {flatten as ɵflatten} from './utils/collection';
diff --git a/packages/router/src/route_reuse_strategy.ts b/packages/router/src/route_reuse_strategy.ts
index 0d2a0241ac983..8af9f8d9d744b 100644
--- a/packages/router/src/route_reuse_strategy.ts
+++ b/packages/router/src/route_reuse_strategy.ts
@@ -60,20 +60,54 @@ export abstract class RouteReuseStrategy {
 }
 
 /**
- * Does not detach any subtrees. Reuses routes as long as their route config is the same.
+ * @description
+ *
+ * This base route reuse strategy only reuses routes when the matched router configs are
+ * identical. This prevents components from being destroyed and recreated
+ * when just the fragment or query parameters change
+ * (that is, the existing component is _reused_).
+ *
+ * This strategy does not store any routes for later reuse.
+ *
+ * Angular uses this strategy by default.
+ *
+ *
+ * It can be used as a base class for custom route reuse strategies, i.e. you can create your own
+ * class that extends the `BaseRouteReuseStrategy` one.
+ * @publicApi
  */
-export class DefaultRouteReuseStrategy implements RouteReuseStrategy {
+export abstract class BaseRouteReuseStrategy implements RouteReuseStrategy {
+  /**
+   * Whether the given route should detach for later reuse.
+   * Always returns false for `BaseRouteReuseStrategy`.
+   * */
   shouldDetach(route: ActivatedRouteSnapshot): boolean {
     return false;
   }
+
+  /**
+   * A no-op; the route is never stored since this strategy never detaches routes for later re-use.
+   */
   store(route: ActivatedRouteSnapshot, detachedTree: DetachedRouteHandle): void {}
+
+  /** Returns `false`, meaning the route (and its subtree) is never reattached */
   shouldAttach(route: ActivatedRouteSnapshot): boolean {
     return false;
   }
+
+  /** Returns `null` because this strategy does not store routes for later re-use. */
   retrieve(route: ActivatedRouteSnapshot): DetachedRouteHandle|null {
     return null;
   }
+
+  /**
+   * Determines if a route should be reused.
+   * This strategy returns `true` when the future route config and current route config are
+   * identical.
+   */
   shouldReuseRoute(future: ActivatedRouteSnapshot, curr: ActivatedRouteSnapshot): boolean {
     return future.routeConfig === curr.routeConfig;
   }
 }
+
+export class DefaultRouteReuseStrategy extends BaseRouteReuseStrategy {}
diff --git a/packages/router/src/router.ts b/packages/router/src/router.ts
index 83b915fa3c89c..f560d20dcf444 100644
--- a/packages/router/src/router.ts
+++ b/packages/router/src/router.ts
@@ -7,7 +7,7 @@
  */
 
 import {Location, PopStateEvent} from '@angular/common';
-import {Compiler, Injectable, Injector, isDevMode, NgModuleFactoryLoader, NgModuleRef, NgZone, Type, ɵConsole as Console} from '@angular/core';
+import {Compiler, Injectable, Injector, NgModuleFactoryLoader, NgModuleRef, NgZone, Type, ɵConsole as Console} from '@angular/core';
 import {BehaviorSubject, EMPTY, Observable, of, Subject, SubscriptionLike} from 'rxjs';
 import {catchError, filter, finalize, map, switchMap, tap} from 'rxjs/operators';
 
@@ -37,18 +37,17 @@ import {isUrlTree} from './utils/type_guards';
 /**
  * @description
  *
- * Options that modify the `Router` navigation strategy.
+ * Options that modify the `Router` URL.
  * Supply an object containing any of these properties to a `Router` navigation function to
- * control how the target URL should be constructed or interpreted.
+ * control how the target URL should be constructed.
  *
  * @see [Router.navigate() method](api/router/Router#navigate)
- * @see [Router.navigateByUrl() method](api/router/Router#navigatebyurl)
  * @see [Router.createUrlTree() method](api/router/Router#createurltree)
  * @see [Routing and Navigation guide](guide/router)
  *
  * @publicApi
  */
-export interface NavigationExtras {
+export interface UrlCreationOptions {
   /**
    * Specifies a root URI to use for relative navigation.
    *
@@ -105,14 +104,6 @@ export interface NavigationExtras {
    */
   fragment?: string;
 
-  /**
-   * **DEPRECATED**: Use `queryParamsHandling: "preserve"` instead to preserve
-   * query parameters for the next navigation.
-   *
-   * @deprecated since v4
-   */
-  preserveQueryParams?: boolean;
-
   /**
    * How to handle query parameters in the router link for the next navigation.
    * One of:
@@ -136,6 +127,7 @@ export interface NavigationExtras {
    *
    */
   queryParamsHandling?: QueryParamsHandling|null;
+
   /**
    * When true, preserves the URL fragment for the next navigation
    *
@@ -145,6 +137,22 @@ export interface NavigationExtras {
    * ```
    */
   preserveFragment?: boolean;
+}
+
+/**
+ * @description
+ *
+ * Options that modify the `Router` navigation strategy.
+ * Supply an object containing any of these properties to a `Router` navigation function to
+ * control how the navigation should be handled.
+ *
+ * @see [Router.navigate() method](api/router/Router#navigate)
+ * @see [Router.navigateByUrl() method](api/router/Router#navigatebyurl)
+ * @see [Routing and Navigation guide](guide/router)
+ *
+ * @publicApi
+ */
+export interface NavigationBehaviorOptions {
   /**
    * When true, navigates without pushing a new state into history.
    *
@@ -154,6 +162,7 @@ export interface NavigationExtras {
    * ```
    */
   skipLocationChange?: boolean;
+
   /**
    * When true, navigates while replacing the current state in history.
    *
@@ -163,6 +172,7 @@ export interface NavigationExtras {
    * ```
    */
   replaceUrl?: boolean;
+
   /**
    * Developer-defined state that can be passed to any navigation.
    * Access this value through the `Navigation.extras` object
@@ -181,6 +191,24 @@ export interface NavigationExtras {
   state?: {[k: string]: any};
 }
 
+/**
+ * @description
+ *
+ * Options that modify the `Router` navigation strategy.
+ * Supply an object containing any of these properties to a `Router` navigation function to
+ * control how the target URL should be constructed or interpreted.
+ *
+ * @see [Router.navigate() method](api/router/Router#navigate)
+ * @see [Router.navigateByUrl() method](api/router/Router#navigatebyurl)
+ * @see [Router.createUrlTree() method](api/router/Router#createurltree)
+ * @see [Routing and Navigation guide](guide/router)
+ * @see UrlCreationOptions
+ * @see NavigationBehaviorOptions
+ *
+ * @publicApi
+ */
+export interface NavigationExtras extends UrlCreationOptions, NavigationBehaviorOptions {}
+
 /**
  * Error handler that is invoked when a navigation error occurs.
  *
@@ -444,7 +472,7 @@ export class Router {
    * Enables a bug fix that corrects relative link resolution in components with empty paths.
    * @see `RouterModule`
    */
-  relativeLinkResolution: 'legacy'|'corrected' = 'legacy';
+  relativeLinkResolution: 'legacy'|'corrected' = 'corrected';
 
   /**
    * Creates the router service.
@@ -920,7 +948,15 @@ export class Router {
           // hybrid apps.
           setTimeout(() => {
             const {source, state, urlTree} = currentChange;
-            this.scheduleNavigation(urlTree, source, state, {replaceUrl: true});
+            const extras: NavigationExtras = {replaceUrl: true};
+            if (state) {
+              const stateCopy = {...state} as Partial<RestoredState>;
+              delete stateCopy.navigationId;
+              if (Object.keys(stateCopy).length !== 0) {
+                extras.state = stateCopy;
+              }
+            }
+            this.scheduleNavigation(urlTree, source, state, extras);
           }, 0);
         }
         this.lastLocationChangeInfo = currentChange;
@@ -1002,7 +1038,7 @@ export class Router {
     this.lastSuccessfulId = -1;
   }
 
-  /** @docsNotRequired */
+  /** @nodoc */
   ngOnDestroy(): void {
     this.dispose();
   }
@@ -1023,8 +1059,7 @@ export class Router {
    * segments, followed by the parameters for each segment.
    * The fragments are applied to the current URL tree or the one provided  in the `relativeTo`
    * property of the options object, if supplied.
-   * @param navigationExtras Options that control the navigation strategy. This function
-   * only uses properties in `NavigationExtras` that would change the provided URL.
+   * @param navigationExtras Options that control the navigation strategy.
    * @returns The new URL tree.
    *
    * @usageNotes
@@ -1061,34 +1096,21 @@ export class Router {
    * router.createUrlTree(['../../team/44/user/22'], {relativeTo: route});
    * ```
    */
-  createUrlTree(commands: any[], navigationExtras: NavigationExtras = {}): UrlTree {
-    const {
-      relativeTo,
-      queryParams,
-      fragment,
-      preserveQueryParams,
-      queryParamsHandling,
-      preserveFragment
-    } = navigationExtras;
-    if (isDevMode() && preserveQueryParams && <any>console && <any>console.warn) {
-      console.warn('preserveQueryParams is deprecated, use queryParamsHandling instead.');
-    }
+  createUrlTree(commands: any[], navigationExtras: UrlCreationOptions = {}): UrlTree {
+    const {relativeTo, queryParams, fragment, queryParamsHandling, preserveFragment} =
+        navigationExtras;
     const a = relativeTo || this.routerState.root;
     const f = preserveFragment ? this.currentUrlTree.fragment : fragment;
     let q: Params|null = null;
-    if (queryParamsHandling) {
-      switch (queryParamsHandling) {
-        case 'merge':
-          q = {...this.currentUrlTree.queryParams, ...queryParams};
-          break;
-        case 'preserve':
-          q = this.currentUrlTree.queryParams;
-          break;
-        default:
-          q = queryParams || null;
-      }
-    } else {
-      q = preserveQueryParams ? this.currentUrlTree.queryParams : queryParams || null;
+    switch (queryParamsHandling) {
+      case 'merge':
+        q = {...this.currentUrlTree.queryParams, ...queryParams};
+        break;
+      case 'preserve':
+        q = this.currentUrlTree.queryParams;
+        break;
+      default:
+        q = queryParams || null;
     }
     if (q !== null) {
       q = this.removeEmptyProps(q);
@@ -1102,8 +1124,6 @@ export class Router {
    * @param url An absolute path for a defined route. The function does not apply any delta to the
    *     current URL.
    * @param extras An object containing properties that modify the navigation strategy.
-   * The function ignores any properties in the `NavigationExtras` that would change the
-   * provided URL.
    *
    * @returns A Promise that resolves to 'true' when navigation succeeds,
    * to 'false' when navigation fails, or is rejected on error.
@@ -1122,9 +1142,11 @@ export class Router {
    * @see [Routing and Navigation guide](guide/router)
    *
    */
-  navigateByUrl(url: string|UrlTree, extras: NavigationExtras = {skipLocationChange: false}):
-      Promise<boolean> {
-    if (isDevMode() && this.isNgZoneEnabled && !NgZone.isInAngularZone()) {
+  navigateByUrl(url: string|UrlTree, extras: NavigationBehaviorOptions = {
+    skipLocationChange: false
+  }): Promise<boolean> {
+    if (typeof ngDevMode === 'undefined' ||
+        ngDevMode && this.isNgZoneEnabled && !NgZone.isInAngularZone()) {
       this.console.warn(
           `Navigation triggered outside Angular zone, did you forget to call 'ngZone.run()'?`);
     }
diff --git a/packages/router/src/router_module.ts b/packages/router/src/router_module.ts
index d23731ca89c28..46ad352138ab0 100644
--- a/packages/router/src/router_module.ts
+++ b/packages/router/src/router_module.ts
@@ -188,7 +188,7 @@ export function provideLocationStrategy(
 }
 
 export function provideForRootGuard(router: Router): any {
-  if (router) {
+  if ((typeof ngDevMode === 'undefined' || ngDevMode) && router) {
     throw new Error(
         `RouterModule.forRoot() called twice. Lazy loaded modules should use RouterModule.forChild() instead.`);
   }
@@ -222,7 +222,10 @@ export function provideRoutes(routes: Routes): any {
  * Allowed values in an `ExtraOptions` object that configure
  * when the router performs the initial navigation operation.
  *
- * * 'enabled' - The initial navigation starts before the root component is created.
+ * * 'enabledNonBlocking' - (default) The initial navigation starts after the
+ * root component has been created. The bootstrap is not blocked on the completion of the initial
+ * navigation.
+ * * 'enabledBlocking' - The initial navigation starts before the root component is created.
  * The bootstrap is blocked until the initial navigation is complete. This value is required
  * for [server-side rendering](guide/universal) to work.
  * * 'disabled' - The initial navigation is not performed. The location listener is set up before
@@ -230,24 +233,16 @@ export function provideRoutes(routes: Routes): any {
  * more control over when the router starts its initial navigation due to some complex
  * initialization logic.
  *
- * The following values have been [deprecated](guide/releases#deprecation-practices) since v4,
+ * The following values have been [deprecated](guide/releases#deprecation-practices) since v11,
  * and should not be used for new applications.
  *
- * * 'legacy_enabled'- (Default, for compatibility.) The initial navigation starts after the root
- * component has been created. The bootstrap is not blocked until the initial navigation is
- * complete.
- * * 'legacy_disabled'- The initial navigation is not performed. The location listener is set up
- * after the root component gets created.
- * * `true` - same as 'legacy_enabled'.
- * * `false` - same as 'legacy_disabled'.
- *
- * The 'legacy_enabled' and 'legacy_disabled' should not be used for new applications.
+ * * 'enabled' - This option is 1:1 replaceable with `enabledNonBlocking`.
  *
  * @see `forRoot()`
  *
  * @publicApi
  */
-export type InitialNavigation = true|false|'enabled'|'disabled'|'legacy_enabled'|'legacy_disabled';
+export type InitialNavigation = 'disabled'|'enabled'|'enabledBlocking'|'enabledNonBlocking';
 
 /**
  * A set of configuration options for a router module, provided in the
@@ -272,24 +267,15 @@ export interface ExtraOptions {
   useHash?: boolean;
 
   /**
-   * One of `enabled` or `disabled`.
-   * When set to `enabled`, the initial navigation starts before the root component is created.
-   * The bootstrap is blocked until the initial navigation is complete. This value is required for
-   * [server-side rendering](guide/universal) to work.
-   * When set to `disabled`, the initial navigation is not performed.
-   * The location listener is set up before the root component gets created.
-   * Use if there is a reason to have more control over when the router
+   * One of `enabled`, `enabledBlocking`, `enabledNonBlocking` or `disabled`.
+   * When set to `enabled` or `enabledBlocking`, the initial navigation starts before the root
+   * component is created. The bootstrap is blocked until the initial navigation is complete. This
+   * value is required for [server-side rendering](guide/universal) to work. When set to
+   * `enabledNonBlocking`, the initial navigation starts after the root component has been created.
+   * The bootstrap is not blocked on the completion of the initial navigation. When set to
+   * `disabled`, the initial navigation is not performed. The location listener is set up before the
+   * root component gets created. Use if there is a reason to have more control over when the router
    * starts its initial navigation due to some complex initialization logic.
-   *
-   * Legacy values are deprecated since v4 and should not be used for new applications:
-   *
-   * * `legacy_enabled` - Default for compatibility.
-   * The initial navigation starts after the root component has been created,
-   * but the bootstrap is not blocked until the initial navigation is complete.
-   * * `legacy_disabled` - The initial navigation is not performed.
-   * The location listener is set up after the root component gets created.
-   * * `true` - same as `legacy_enabled`.
-   * * `false` - same as `legacy_disabled`.
    */
   initialNavigation?: InitialNavigation;
 
@@ -425,8 +411,9 @@ export interface ExtraOptions {
    *
    * `<a [routerLink]="['../a']">Link to A</a>`
    *
-   * In other words, you're required to use `../` rather than `./`. This is currently the default
-   * behavior. Setting this option to `corrected` enables the fix.
+   * In other words, you're required to use `../` rather than `./`.
+   *
+   * The default in v11 is `corrected`.
    */
   relativeLinkResolution?: 'legacy'|'corrected';
 }
@@ -447,13 +434,7 @@ export function setupRouter(
     router.routeReuseStrategy = routeReuseStrategy;
   }
 
-  if (opts.errorHandler) {
-    router.errorHandler = opts.errorHandler;
-  }
-
-  if (opts.malformedUriErrorHandler) {
-    router.malformedUriErrorHandler = opts.malformedUriErrorHandler;
-  }
+  assignExtraOptionsToRouter(opts, router);
 
   if (opts.enableTracing) {
     const dom = getDOM();
@@ -465,6 +446,18 @@ export function setupRouter(
     });
   }
 
+  return router;
+}
+
+export function assignExtraOptionsToRouter(opts: ExtraOptions, router: Router): void {
+  if (opts.errorHandler) {
+    router.errorHandler = opts.errorHandler;
+  }
+
+  if (opts.malformedUriErrorHandler) {
+    router.malformedUriErrorHandler = opts.malformedUriErrorHandler;
+  }
+
   if (opts.onSameUrlNavigation) {
     router.onSameUrlNavigation = opts.onSameUrlNavigation;
   }
@@ -473,15 +466,13 @@ export function setupRouter(
     router.paramsInheritanceStrategy = opts.paramsInheritanceStrategy;
   }
 
-  if (opts.urlUpdateStrategy) {
-    router.urlUpdateStrategy = opts.urlUpdateStrategy;
-  }
-
   if (opts.relativeLinkResolution) {
     router.relativeLinkResolution = opts.relativeLinkResolution;
   }
 
-  return router;
+  if (opts.urlUpdateStrategy) {
+    router.urlUpdateStrategy = opts.urlUpdateStrategy;
+  }
 }
 
 export function rootRoute(router: Router): ActivatedRoute {
@@ -514,14 +505,12 @@ export class RouterInitializer {
       const router = this.injector.get(Router);
       const opts = this.injector.get(ROUTER_CONFIGURATION);
 
-      if (this.isLegacyDisabled(opts) || this.isLegacyEnabled(opts)) {
-        resolve(true);
-
-      } else if (opts.initialNavigation === 'disabled') {
+      if (opts.initialNavigation === 'disabled') {
         router.setUpLocationChangeListener();
         resolve(true);
-
-      } else if (opts.initialNavigation === 'enabled') {
+      } else if (
+          // TODO: enabled is deprecated as of v11, can be removed in v13
+          opts.initialNavigation === 'enabled' || opts.initialNavigation === 'enabledBlocking') {
         router.hooks.afterPreactivation = () => {
           // only the initial navigation should be delayed
           if (!this.initNavigation) {
@@ -535,9 +524,8 @@ export class RouterInitializer {
           }
         };
         router.initialNavigation();
-
       } else {
-        throw new Error(`Invalid initialNavigation options: '${opts.initialNavigation}'`);
+        resolve(true);
       }
 
       return res;
@@ -555,10 +543,9 @@ export class RouterInitializer {
       return;
     }
 
-    if (this.isLegacyEnabled(opts)) {
+    // Default case
+    if (opts.initialNavigation === 'enabledNonBlocking' || opts.initialNavigation === undefined) {
       router.initialNavigation();
-    } else if (this.isLegacyDisabled(opts)) {
-      router.setUpLocationChangeListener();
     }
 
     preloader.setUpPreloading();
@@ -567,15 +554,6 @@ export class RouterInitializer {
     this.resultOfPreactivationDone.next(null!);
     this.resultOfPreactivationDone.complete();
   }
-
-  private isLegacyEnabled(opts: ExtraOptions): boolean {
-    return opts.initialNavigation === 'legacy_enabled' || opts.initialNavigation === true ||
-        opts.initialNavigation === undefined;
-  }
-
-  private isLegacyDisabled(opts: ExtraOptions): boolean {
-    return opts.initialNavigation === 'legacy_disabled' || opts.initialNavigation === false;
-  }
 }
 
 export function getAppInitializer(r: RouterInitializer) {
diff --git a/packages/router/src/router_preloader.ts b/packages/router/src/router_preloader.ts
index 6b6da836bbd53..81f4e17612126 100644
--- a/packages/router/src/router_preloader.ts
+++ b/packages/router/src/router_preloader.ts
@@ -33,7 +33,7 @@ export abstract class PreloadingStrategy {
  * Provides a preloading strategy that preloads all modules as quickly as possible.
  *
  * ```
- * RouteModule.forRoot(ROUTES, {preloadingStrategy: PreloadAllModules})
+ * RouterModule.forRoot(ROUTES, {preloadingStrategy: PreloadAllModules})
  * ```
  *
  * @publicApi
@@ -97,6 +97,7 @@ export class RouterPreloader implements OnDestroy {
     return this.processRoutes(ngModule, this.router.config);
   }
 
+  /** @nodoc */
   ngOnDestroy(): void {
     if (this.subscription) {
       this.subscription.unsubscribe();
diff --git a/packages/router/src/router_scroller.ts b/packages/router/src/router_scroller.ts
index 9d0c6e8d58a49..e1569083b290a 100644
--- a/packages/router/src/router_scroller.ts
+++ b/packages/router/src/router_scroller.ts
@@ -87,6 +87,7 @@ export class RouterScroller implements OnDestroy {
         routerEvent, this.lastSource === 'popstate' ? this.store[this.restoredId] : null, anchor));
   }
 
+  /** @nodoc */
   ngOnDestroy() {
     if (this.routerEventsSubscription) {
       this.routerEventsSubscription.unsubscribe();
diff --git a/packages/router/src/utils/config.ts b/packages/router/src/utils/config.ts
index 961ee3c54fe25..f8f53c6cc6583 100644
--- a/packages/router/src/utils/config.ts
+++ b/packages/router/src/utils/config.ts
@@ -20,8 +20,9 @@ export function validateConfig(config: Routes, parentPath: string = ''): void {
 }
 
 function validateNode(route: Route, fullPath: string): void {
-  if (!route) {
-    throw new Error(`
+  if (typeof ngDevMode === 'undefined' || ngDevMode) {
+    if (!route) {
+      throw new Error(`
       Invalid configuration of route '${fullPath}': Encountered undefined route.
       The reason might be an extra comma.
 
@@ -32,55 +33,57 @@ function validateNode(route: Route, fullPath: string): void {
         { path: 'detail/:id', component: HeroDetailComponent }
       ];
     `);
-  }
-  if (Array.isArray(route)) {
-    throw new Error(`Invalid configuration of route '${fullPath}': Array cannot be specified`);
-  }
-  if (!route.component && !route.children && !route.loadChildren &&
-      (route.outlet && route.outlet !== PRIMARY_OUTLET)) {
-    throw new Error(`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(`Invalid configuration of route '${
-        fullPath}': redirectTo and children cannot be used together`);
-  }
-  if (route.redirectTo && route.loadChildren) {
-    throw new Error(`Invalid configuration of route '${
-        fullPath}': redirectTo and loadChildren cannot be used together`);
-  }
-  if (route.children && route.loadChildren) {
-    throw new Error(`Invalid configuration of route '${
-        fullPath}': children and loadChildren cannot be used together`);
-  }
-  if (route.redirectTo && route.component) {
-    throw new Error(`Invalid configuration of route '${
-        fullPath}': redirectTo and component cannot be used together`);
-  }
-  if (route.path && route.matcher) {
-    throw new Error(
-        `Invalid configuration of route '${fullPath}': path and matcher cannot be used together`);
-  }
-  if (route.redirectTo === void 0 && !route.component && !route.children && !route.loadChildren) {
-    throw new Error(`Invalid configuration of route '${
-        fullPath}'. One of the following must be provided: component, redirectTo, children or loadChildren`);
-  }
-  if (route.path === void 0 && route.matcher === void 0) {
-    throw new Error(`Invalid configuration of route '${
-        fullPath}': routes must have either a path or a matcher specified`);
-  }
-  if (typeof route.path === 'string' && route.path.charAt(0) === '/') {
-    throw new Error(`Invalid configuration of route '${fullPath}': path cannot start with a slash`);
-  }
-  if (route.path === '' && route.redirectTo !== void 0 && route.pathMatch === void 0) {
-    const exp =
-        `The default value of 'pathMatch' is 'prefix', but often the intent is to use 'full'.`;
-    throw new Error(`Invalid configuration of route '{path: "${fullPath}", redirectTo: "${
-        route.redirectTo}"}': please provide 'pathMatch'. ${exp}`);
-  }
-  if (route.pathMatch !== void 0 && route.pathMatch !== 'full' && route.pathMatch !== 'prefix') {
-    throw new Error(`Invalid configuration of route '${
-        fullPath}': pathMatch can only be set to 'prefix' or 'full'`);
+    }
+    if (Array.isArray(route)) {
+      throw new Error(`Invalid configuration of route '${fullPath}': Array cannot be specified`);
+    }
+    if (!route.component && !route.children && !route.loadChildren &&
+        (route.outlet && route.outlet !== PRIMARY_OUTLET)) {
+      throw new Error(`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(`Invalid configuration of route '${
+          fullPath}': redirectTo and children cannot be used together`);
+    }
+    if (route.redirectTo && route.loadChildren) {
+      throw new Error(`Invalid configuration of route '${
+          fullPath}': redirectTo and loadChildren cannot be used together`);
+    }
+    if (route.children && route.loadChildren) {
+      throw new Error(`Invalid configuration of route '${
+          fullPath}': children and loadChildren cannot be used together`);
+    }
+    if (route.redirectTo && route.component) {
+      throw new Error(`Invalid configuration of route '${
+          fullPath}': redirectTo and component cannot be used together`);
+    }
+    if (route.path && route.matcher) {
+      throw new Error(
+          `Invalid configuration of route '${fullPath}': path and matcher cannot be used together`);
+    }
+    if (route.redirectTo === void 0 && !route.component && !route.children && !route.loadChildren) {
+      throw new Error(`Invalid configuration of route '${
+          fullPath}'. One of the following must be provided: component, redirectTo, children or loadChildren`);
+    }
+    if (route.path === void 0 && route.matcher === void 0) {
+      throw new Error(`Invalid configuration of route '${
+          fullPath}': routes must have either a path or a matcher specified`);
+    }
+    if (typeof route.path === 'string' && route.path.charAt(0) === '/') {
+      throw new Error(
+          `Invalid configuration of route '${fullPath}': path cannot start with a slash`);
+    }
+    if (route.path === '' && route.redirectTo !== void 0 && route.pathMatch === void 0) {
+      const exp =
+          `The default value of 'pathMatch' is 'prefix', but often the intent is to use 'full'.`;
+      throw new Error(`Invalid configuration of route '{path: "${fullPath}", redirectTo: "${
+          route.redirectTo}"}': please provide 'pathMatch'. ${exp}`);
+    }
+    if (route.pathMatch !== void 0 && route.pathMatch !== 'full' && route.pathMatch !== 'prefix') {
+      throw new Error(`Invalid configuration of route '${
+          fullPath}': pathMatch can only be set to 'prefix' or 'full'`);
+    }
   }
   if (route.children) {
     validateConfig(route.children, fullPath);
@@ -113,3 +116,21 @@ export function standardizeConfig(r: Route): Route {
   }
   return c;
 }
+
+/** Returns of `Map` of outlet names to the `Route`s for that outlet. */
+export function groupRoutesByOutlet(routes: Route[]): Map<string, Route[]> {
+  return routes.reduce((map, route) => {
+    const routeOutlet = getOutlet(route);
+    if (map.has(routeOutlet)) {
+      map.get(routeOutlet)!.push(route);
+    } else {
+      map.set(routeOutlet, [route]);
+    }
+    return map;
+  }, new Map<string, Route[]>());
+}
+
+/** Returns the `route.outlet` or PRIMARY_OUTLET if none exists. */
+export function getOutlet(route: Route): string {
+  return route.outlet || PRIMARY_OUTLET;
+}
diff --git a/packages/router/src/utils/preactivation.ts b/packages/router/src/utils/preactivation.ts
index 03348107480df..09e87c8ef574e 100644
--- a/packages/router/src/utils/preactivation.ts
+++ b/packages/router/src/utils/preactivation.ts
@@ -121,9 +121,8 @@ function getRouteGuards(
       getChildRouteGuards(futureNode, currNode, parentContexts, futurePath, checks);
     }
 
-    if (shouldRun) {
-      const component = context && context.outlet && context.outlet.component || null;
-      checks.canDeactivateChecks.push(new CanDeactivate(component, curr));
+    if (shouldRun && context && context.outlet && context.outlet.isActivated) {
+      checks.canDeactivateChecks.push(new CanDeactivate(context.outlet.component, curr));
     }
   } else {
     if (curr) {
diff --git a/packages/router/test/apply_redirects.spec.ts b/packages/router/test/apply_redirects.spec.ts
index 918d259ce00e4..3b27bf1fa5b65 100644
--- a/packages/router/test/apply_redirects.spec.ts
+++ b/packages/router/test/apply_redirects.spec.ts
@@ -7,8 +7,9 @@
  */
 
 import {NgModuleRef} from '@angular/core';
-import {TestBed} from '@angular/core/testing';
+import {fakeAsync, TestBed, tick} from '@angular/core/testing';
 import {Observable, of} from 'rxjs';
+import {delay, tap} from 'rxjs/operators';
 
 import {applyRedirects} from '../src/apply_redirects';
 import {LoadedRouterConfig, Route, Routes} from '../src/config';
@@ -435,6 +436,25 @@ describe('applyRedirects', () => {
           });
     });
 
+    it('should not load the configuration of a wildcard route if there is a match', () => {
+      const loadedConfig = new LoadedRouterConfig([{path: '', component: ComponentB}], testModule);
+
+      const loader = jasmine.createSpyObj('loader', ['load']);
+      loader.load.and.returnValue(of(loadedConfig).pipe(delay(0)));
+
+      const config: Routes = [
+        {path: '', loadChildren: 'matchChildren'},
+        {path: '**', loadChildren: 'children'},
+      ];
+
+      applyRedirects(testModule.injector, <any>loader, serializer, tree(''), config).forEach(r => {
+        expect(loader.load.calls.count()).toEqual(1);
+        expect(loader.load.calls.first().args).not.toContain(jasmine.objectContaining({
+          loadChildren: 'children'
+        }));
+      });
+    });
+
     it('should load the configuration after a local redirect from a wildcard route', () => {
       const loadedConfig = new LoadedRouterConfig([{path: '', component: ComponentB}], testModule);
 
@@ -462,6 +482,88 @@ describe('applyRedirects', () => {
             expect((config[0] as any)._loadedConfig).toBe(loadedConfig);
           });
     });
+
+    it('should load all matching configurations of empty path, including an auxiliary outlets',
+       fakeAsync(() => {
+         const loadedConfig =
+             new LoadedRouterConfig([{path: '', component: ComponentA}], testModule);
+         let loadCalls = 0;
+         let loaded: string[] = [];
+         const loader = {
+           load: (injector: any, p: Route) => {
+             loadCalls++;
+             return of(loadedConfig)
+                 .pipe(
+                     delay(100 * loadCalls),
+                     tap(() => loaded.push(p.loadChildren! as string)),
+                 );
+           }
+         };
+
+         const config: Routes =
+             [{path: '', loadChildren: 'root'}, {path: '', loadChildren: 'aux', outlet: 'popup'}];
+
+         applyRedirects(testModule.injector, <any>loader, serializer, tree(''), config).subscribe();
+         expect(loadCalls).toBe(2);
+         tick(100);
+         expect(loaded).toEqual(['root']);
+         tick(100);
+         expect(loaded).toEqual(['root', 'aux']);
+       }));
+
+    it('loads only the first match when two Routes with the same outlet have the same path', () => {
+      const loadedConfig = new LoadedRouterConfig([{path: '', component: ComponentA}], testModule);
+      let loadCalls = 0;
+      let loaded: string[] = [];
+      const loader = {
+        load: (injector: any, p: Route) => {
+          loadCalls++;
+          return of(loadedConfig)
+              .pipe(
+                  tap(() => loaded.push(p.loadChildren! as string)),
+              );
+        }
+      };
+
+      const config: Routes =
+          [{path: 'a', loadChildren: 'first'}, {path: 'a', loadChildren: 'second'}];
+
+      applyRedirects(testModule.injector, <any>loader, serializer, tree('a'), config).subscribe();
+      expect(loadCalls).toBe(1);
+      expect(loaded).toEqual(['first']);
+    });
+
+    it('should load the configuration of empty root path if the entry is an aux outlet',
+       fakeAsync(() => {
+         const loadedConfig =
+             new LoadedRouterConfig([{path: '', component: ComponentA}], testModule);
+         let loaded: string[] = [];
+         const rootDelay = 100;
+         const auxDelay = 1;
+         const loader = {
+           load: (injector: any, p: Route) => {
+             const delayMs = p.loadChildren! as string === 'aux' ? auxDelay : rootDelay;
+             return of(loadedConfig)
+                 .pipe(
+                     delay(delayMs),
+                     tap(() => loaded.push(p.loadChildren! as string)),
+                 );
+           }
+         };
+
+         const config: Routes = [
+           // Define aux route first so it matches before the primary outlet
+           {path: 'modal', loadChildren: 'aux', outlet: 'popup'},
+           {path: '', loadChildren: 'root'},
+         ];
+
+         applyRedirects(testModule.injector, <any>loader, serializer, tree('(popup:modal)'), config)
+             .subscribe();
+         tick(auxDelay);
+         expect(loaded).toEqual(['aux']);
+         tick(rootDelay);
+         expect(loaded).toEqual(['aux', 'root']);
+       }));
   });
 
   describe('empty paths', () => {
@@ -734,6 +836,46 @@ describe('applyRedirects', () => {
     });
   });
 
+  describe('multiple matches with empty path named outlets', () => {
+    it('should work with redirects when other outlet comes before the one being activated', () => {
+      applyRedirects(
+          testModule.injector, null!, serializer, tree(''),
+          [
+            {
+              path: '',
+              children: [
+                {path: '', component: ComponentA, outlet: 'aux'},
+                {path: '', redirectTo: 'b', pathMatch: 'full'},
+                {path: 'b', component: ComponentB},
+              ],
+            },
+          ])
+          .subscribe(
+              (tree: UrlTree) => {
+                expect(tree.toString()).toEqual('/b');
+              },
+              () => {
+                fail('should not be reached');
+              });
+    });
+
+    it('should work when entry point is named outlet', () => {
+      applyRedirects(
+          testModule.injector, null!, serializer, tree('(popup:modal)'),
+          [
+            {path: '', component: ComponentA},
+            {path: 'modal', component: ComponentB, outlet: 'popup'},
+          ])
+          .subscribe(
+              (tree: UrlTree) => {
+                expect(tree.toString()).toEqual('/(popup:modal)');
+              },
+              (e) => {
+                fail('should not be reached' + e.message);
+              });
+    });
+  });
+
   describe('redirecting to named outlets', () => {
     it('should work when using absolute redirects', () => {
       checkRedirect(
@@ -774,6 +916,18 @@ describe('applyRedirects', () => {
               });
     });
   });
+
+  // internal failure b/165719418
+  it('does not fail with large configs', () => {
+    const config: Routes = [];
+    for (let i = 0; i < 400; i++) {
+      config.push({path: 'no_match', component: ComponentB});
+    }
+    config.push({path: 'match', component: ComponentA});
+    applyRedirects(testModule.injector, null!, serializer, tree('match'), config).forEach(r => {
+      expectTreeToBe(r, 'match');
+    });
+  });
 });
 
 function checkRedirect(config: Routes, url: string, callback: any): void {
diff --git a/packages/router/test/bootstrap.spec.ts b/packages/router/test/bootstrap.spec.ts
index 12c768e784690..f3ee2c51df20a 100644
--- a/packages/router/test/bootstrap.spec.ts
+++ b/packages/router/test/bootstrap.spec.ts
@@ -95,7 +95,44 @@ describe('bootstrap', () => {
     });
   });
 
-  it('should NOT wait for resolvers to complete when initialNavigation = legacy_enabled',
+  it('should wait for resolvers to complete when initialNavigation = enabledBlocking', (done) => {
+    @Component({selector: 'test', template: 'test'})
+    class TestCmpEnabled {
+    }
+
+    @NgModule({
+      imports: [
+        BrowserModule,
+        RouterModule.forRoot(
+            [{path: '**', component: TestCmpEnabled, resolve: {test: TestResolver}}],
+            {useHash: true, initialNavigation: 'enabledBlocking'})
+      ],
+      declarations: [RootCmp, TestCmpEnabled],
+      bootstrap: [RootCmp],
+      providers: [...testProviders, TestResolver],
+      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+    })
+    class TestModule {
+      constructor(router: Router) {
+        log.push('TestModule');
+        router.events.subscribe(e => log.push(e.constructor.name));
+      }
+    }
+
+    platformBrowserDynamic([]).bootstrapModule(TestModule).then(res => {
+      const router = res.injector.get(Router);
+      const data = router.routerState.snapshot.root.firstChild!.data;
+      expect(data['test']).toEqual('test-data');
+      expect(log).toEqual([
+        'TestModule', 'NavigationStart', 'RoutesRecognized', 'GuardsCheckStart',
+        'ChildActivationStart', 'ActivationStart', 'GuardsCheckEnd', 'ResolveStart', 'ResolveEnd',
+        'RootCmp', 'ActivationEnd', 'ChildActivationEnd', 'NavigationEnd', 'Scroll'
+      ]);
+      done();
+    });
+  });
+
+  it('should NOT wait for resolvers to complete when initialNavigation = enabledNonBlocking',
      (done) => {
        @Component({selector: 'test', template: 'test'})
        class TestCmpLegacyEnabled {
@@ -106,7 +143,7 @@ describe('bootstrap', () => {
            BrowserModule,
            RouterModule.forRoot(
                [{path: '**', component: TestCmpLegacyEnabled, resolve: {test: TestResolver}}],
-               {useHash: true, initialNavigation: 'legacy_enabled'})
+               {useHash: true, initialNavigation: 'enabledNonBlocking'})
          ],
          declarations: [RootCmp, TestCmpLegacyEnabled],
          bootstrap: [RootCmp],
@@ -137,19 +174,19 @@ describe('bootstrap', () => {
        });
      });
 
-  it('should not run navigation when initialNavigation = disabled', (done) => {
+  it('should NOT wait for resolvers to complete when initialNavigation is not set', (done) => {
     @Component({selector: 'test', template: 'test'})
-    class TestCmpDiabled {
+    class TestCmpLegacyEnabled {
     }
 
     @NgModule({
       imports: [
         BrowserModule,
         RouterModule.forRoot(
-            [{path: '**', component: TestCmpDiabled, resolve: {test: TestResolver}}],
-            {useHash: true, initialNavigation: 'disabled'})
+            [{path: '**', component: TestCmpLegacyEnabled, resolve: {test: TestResolver}}],
+            {useHash: true})
       ],
-      declarations: [RootCmp, TestCmpDiabled],
+      declarations: [RootCmp, TestCmpLegacyEnabled],
       bootstrap: [RootCmp],
       providers: [...testProviders, TestResolver],
       schemas: [CUSTOM_ELEMENTS_SCHEMA]
@@ -162,25 +199,35 @@ describe('bootstrap', () => {
     }
 
     platformBrowserDynamic([]).bootstrapModule(TestModule).then(res => {
-      const router = res.injector.get(Router);
-      expect(log).toEqual(['TestModule', 'RootCmp']);
-      done();
+      const router: Router = res.injector.get(Router);
+      expect(router.routerState.snapshot.root.firstChild).toBeNull();
+      // ResolveEnd has not been emitted yet because bootstrap returned too early
+      expect(log).toEqual([
+        'TestModule', 'RootCmp', 'NavigationStart', 'RoutesRecognized', 'GuardsCheckStart',
+        'ChildActivationStart', 'ActivationStart', 'GuardsCheckEnd', 'ResolveStart'
+      ]);
+
+      router.events.subscribe((e) => {
+        if (e instanceof NavigationEnd) {
+          done();
+        }
+      });
     });
   });
 
-  it('should not run navigation when initialNavigation = legacy_disabled', (done) => {
+  it('should not run navigation when initialNavigation = disabled', (done) => {
     @Component({selector: 'test', template: 'test'})
-    class TestCmpLegacyDisabled {
+    class TestCmpDiabled {
     }
 
     @NgModule({
       imports: [
         BrowserModule,
         RouterModule.forRoot(
-            [{path: '**', component: TestCmpLegacyDisabled, resolve: {test: TestResolver}}],
-            {useHash: true, initialNavigation: 'legacy_disabled'})
+            [{path: '**', component: TestCmpDiabled, resolve: {test: TestResolver}}],
+            {useHash: true, initialNavigation: 'disabled'})
       ],
-      declarations: [RootCmp, TestCmpLegacyDisabled],
+      declarations: [RootCmp, TestCmpDiabled],
       bootstrap: [RootCmp],
       providers: [...testProviders, TestResolver],
       schemas: [CUSTOM_ELEMENTS_SCHEMA]
@@ -301,7 +348,7 @@ describe('bootstrap', () => {
     await router.navigateByUrl('/aa');
     window.scrollTo(0, 5000);
 
-    // IE 9/10/11 use non-standard pageYOffset instead of scrollY
+    // IE 11 uses non-standard pageYOffset instead of scrollY
     const getScrollY = () => window.scrollY !== undefined ? window.scrollY : window.pageYOffset;
 
     await router.navigateByUrl('/fail');
diff --git a/packages/router/test/create_router_state.spec.ts b/packages/router/test/create_router_state.spec.ts
index 3351eb2be968c..7afb907eda444 100644
--- a/packages/router/test/create_router_state.spec.ts
+++ b/packages/router/test/create_router_state.spec.ts
@@ -16,7 +16,10 @@ import {DefaultUrlSerializer, UrlSegmentGroup, UrlTree} from '../src/url_tree';
 import {TreeNode} from '../src/utils/tree';
 
 describe('create router state', () => {
-  const reuseStrategy = new DefaultRouteReuseStrategy();
+  let reuseStrategy: DefaultRouteReuseStrategy;
+  beforeEach(() => {
+    reuseStrategy = new DefaultRouteReuseStrategy();
+  });
 
   const emptyState = () =>
       createEmptyState(new (UrlTree as any)(new UrlSegmentGroup([], {}), {}, null!), RootComponent);
@@ -109,6 +112,33 @@ describe('create router state', () => {
     // Verify the retrieve method has been called one more time
     expect(reuseStrategy.retrieve).toHaveBeenCalledTimes(3);
   });
+
+  it('should consistently represent future and current state', () => {
+    const config = [
+      {path: '', pathMatch: 'full', component: ComponentA},
+      {path: 'product/:id', component: ComponentB}
+    ];
+    spyOn(reuseStrategy, 'shouldReuseRoute').and.callThrough();
+    const previousState = createRouterState(reuseStrategy, createState(config, ''), emptyState());
+    advanceState(previousState);
+    (reuseStrategy.shouldReuseRoute as jasmine.Spy).calls.reset();
+
+    createRouterState(reuseStrategy, createState(config, 'product/30'), previousState);
+
+    // One call for the root and one call for each of the children
+    expect(reuseStrategy.shouldReuseRoute).toHaveBeenCalledTimes(2);
+    const reuseCalls = (reuseStrategy.shouldReuseRoute as jasmine.Spy).calls;
+    const future1 = reuseCalls.argsFor(0)[0];
+    const current1 = reuseCalls.argsFor(0)[1];
+    const future2 = reuseCalls.argsFor(1)[0];
+    const current2 = reuseCalls.argsFor(1)[1];
+
+    // Routing from '' to 'product/30'
+    expect(current1._routerState.url).toEqual('');
+    expect(future1._routerState.url).toEqual('product/30');
+    expect(current2._routerState.url).toEqual('');
+    expect(future2._routerState.url).toEqual('product/30');
+  });
 });
 
 function advanceState(state: RouterState): void {
diff --git a/packages/router/test/integration.spec.ts b/packages/router/test/integration.spec.ts
index ce343becea829..e7f6c7bae1695 100644
--- a/packages/router/test/integration.spec.ts
+++ b/packages/router/test/integration.spec.ts
@@ -159,6 +159,59 @@ describe('Integration', () => {
          expect(navigation.extras.state).toEqual({foo: 'bar'});
        })));
 
+    it('should set history.state when navigation with browser back and forward',
+       fakeAsync(inject([Router, Location], (router: Router, location: SpyLocation) => {
+         router.resetConfig([
+           {path: '', component: SimpleCmp},
+           {path: 'simple', component: SimpleCmp},
+         ]);
+
+         const fixture = createRoot(router, RootCmp);
+         let navigation: Navigation = null!;
+         router.events.subscribe(e => {
+           if (e instanceof NavigationStart) {
+             navigation = <Navigation>router.getCurrentNavigation()!;
+           }
+         });
+
+         const state = {foo: 'bar'};
+         router.navigateByUrl('/simple', {state});
+         tick();
+         location.back();
+         tick();
+         location.forward();
+         tick();
+
+         expect(navigation.extras.state).toBeDefined();
+         expect(navigation.extras.state).toEqual(state);
+       })));
+
+    it('should not error if state is not {[key: string]: any}',
+       fakeAsync(inject([Router, Location], (router: Router, location: SpyLocation) => {
+         router.resetConfig([
+           {path: '', component: SimpleCmp},
+           {path: 'simple', component: SimpleCmp},
+         ]);
+
+         const fixture = createRoot(router, RootCmp);
+         let navigation: Navigation = null!;
+         router.events.subscribe(e => {
+           if (e instanceof NavigationStart) {
+             navigation = <Navigation>router.getCurrentNavigation()!;
+           }
+         });
+
+         location.replaceState('', '', 42);
+         router.navigateByUrl('/simple');
+         tick();
+         location.back();
+         advance(fixture);
+
+         // Angular does not support restoring state to the primitive.
+         expect(navigation.extras.state).toEqual(undefined);
+         expect(location.getState()).toEqual({navigationId: 3});
+       })));
+
     it('should not pollute browser history when replaceUrl is set to true',
        fakeAsync(inject([Router, Location], (router: Router, location: SpyLocation) => {
          router.resetConfig([
@@ -2084,7 +2137,7 @@ describe('Integration', () => {
          @Component({
            selector: 'someRoot',
            template:
-               `<router-outlet></router-outlet><a routerLink="/home" preserveQueryParams preserveFragment>Link</a>`
+               `<router-outlet></router-outlet><a routerLink="/home" queryParamsHandling="preserve" preserveFragment>Link</a>`
          })
          class RootCmpWithLink {
          }
@@ -2974,6 +3027,13 @@ describe('Integration', () => {
                   resolve: {data: 'resolver'},
                 },
               ]
+            },
+            {
+              path: 'throwing',
+              runGuardsAndResolvers,
+              component: ThrowingCmp,
+              canActivate: ['guard'],
+              resolve: {data: 'resolver'}
             }
           ]);
 
@@ -3072,6 +3132,15 @@ describe('Integration', () => {
              advance(fixture);
              expect(guardRunCount).toEqual(5);
              expect(recordedData).toEqual([{data: 0}, {data: 1}, {data: 2}, {data: 3}, {data: 4}]);
+
+             // Issue #39030, always running guards and resolvers should not throw
+             // when navigating away from a component with a throwing constructor.
+             expect(() => {
+               router.navigateByUrl('/throwing').catch(() => {});
+               advance(fixture);
+               router.navigateByUrl('/a;p=1');
+               advance(fixture);
+             }).not.toThrow();
            })));
 
         it('should rerun rerun guards and resolvers when path params change',
@@ -4037,7 +4106,7 @@ describe('Integration', () => {
         return of(delayMs).pipe(delay(delayMs), mapTo(true));
       }
 
-      @NgModule()
+      @NgModule({imports: [RouterModule.forChild([{path: '', component: BlankCmp}])]})
       class LoadedModule {
       }
 
@@ -4066,6 +4135,15 @@ describe('Integration', () => {
                 return false;
               }
             },
+            {
+              provide: 'returnFalseAndNavigate',
+              useFactory: (router: Router) => () => {
+                log.push('returnFalseAndNavigate');
+                router.navigateByUrl('/redirected');
+                return false;
+              },
+              deps: [Router]
+            },
             {
               provide: 'returnUrlTree',
               useFactory: (router: Router) => () => {
@@ -4079,7 +4157,23 @@ describe('Integration', () => {
         });
       });
 
-      it('should wait for higher priority guards to be resolved',
+      it('should only execute canLoad guards of routes being activated', fakeAsync(() => {
+           const router = TestBed.inject(Router);
+
+           router.resetConfig([
+             {path: 'lazy', canLoad: ['guard1'], loadChildren: () => of(LoadedModule)},
+             {path: 'redirected', component: SimpleCmp},
+             // canLoad should not run for this route because 'lazy' activates first
+             {path: '', canLoad: ['returnFalseAndNavigate'], loadChildren: () => of(LoadedModule)},
+           ]);
+
+           router.navigateByUrl('/lazy');
+           tick(5);
+           expect(log.length).toEqual(1);
+           expect(log).toEqual(['guard1']);
+         }));
+
+      it('should execute canLoad guards',
          fakeAsync(inject(
              [Router, NgModuleFactoryLoader],
              (router: Router, loader: SpyNgModuleFactoryLoader) => {
@@ -4291,7 +4385,7 @@ describe('Integration', () => {
        })));
   });
 
-  describe('routerActiveLink', () => {
+  describe('routerLinkActive', () => {
     it('should set the class when the link is active (a tag)',
        fakeAsync(inject([Router, Location], (router: Router, location: Location) => {
          const fixture = createRoot(router, RootCmp);
@@ -4441,6 +4535,29 @@ describe('Integration', () => {
          advance(fixture);
          expect(paragraph.textContent).toEqual('false');
        }));
+
+    it('should not trigger change detection when active state has not changed', fakeAsync(() => {
+         @Component({
+           template: `<div id="link" routerLinkActive="active" [routerLink]="link"></div>`,
+         })
+         class LinkComponent {
+           link = 'notactive';
+         }
+
+         @Component({template: ''})
+         class SimpleComponent {
+         }
+
+         TestBed.configureTestingModule({
+           imports: [RouterTestingModule.withRoutes([{path: '', component: SimpleComponent}])],
+           declarations: [LinkComponent, SimpleComponent]
+         });
+
+         const fixture = createRoot(TestBed.inject(Router), LinkComponent);
+         fixture.componentInstance.link = 'stillnotactive';
+         fixture.detectChanges(false /** checkNoChanges */);
+         expect(TestBed.inject(NgZone).hasPendingMicrotasks).toBe(false);
+       }));
   });
 
   describe('lazy loading', () => {
@@ -5508,30 +5625,54 @@ describe('Integration', () => {
 });
 
 describe('Testing router options', () => {
-  describe('paramsInheritanceStrategy', () => {
-    beforeEach(() => {
+  describe('should configure the router', () => {
+    it('assigns errorHandler', () => {
+      function errorHandler(error: any) {
+        throw error;
+      }
       TestBed.configureTestingModule(
-          {imports: [RouterTestingModule.withRoutes([], {paramsInheritanceStrategy: 'always'})]});
+          {imports: [RouterTestingModule.withRoutes([], {errorHandler})]});
+      const router: Router = TestBed.inject(Router);
+      expect(router.errorHandler).toBe(errorHandler);
     });
 
-    it('should configure the router', fakeAsync(inject([Router], (router: Router) => {
-         expect(router.paramsInheritanceStrategy).toEqual('always');
-       })));
-  });
+    it('assigns malformedUriErrorHandler', () => {
+      function malformedUriErrorHandler(e: URIError, urlSerializer: UrlSerializer, url: string) {
+        return urlSerializer.parse('/error');
+      }
+      TestBed.configureTestingModule(
+          {imports: [RouterTestingModule.withRoutes([], {malformedUriErrorHandler})]});
+      const router: Router = TestBed.inject(Router);
+      expect(router.malformedUriErrorHandler).toBe(malformedUriErrorHandler);
+    });
 
-  describe('malformedUriErrorHandler', () => {
-    function malformedUriErrorHandler(e: URIError, urlSerializer: UrlSerializer, url: string) {
-      return urlSerializer.parse('/error');
-    }
+    it('assigns onSameUrlNavigation', () => {
+      TestBed.configureTestingModule(
+          {imports: [RouterTestingModule.withRoutes([], {onSameUrlNavigation: 'reload'})]});
+      const router: Router = TestBed.inject(Router);
+      expect(router.onSameUrlNavigation).toBe('reload');
+    });
 
-    beforeEach(() => {
+    it('assigns paramsInheritanceStrategy', () => {
       TestBed.configureTestingModule(
-          {imports: [RouterTestingModule.withRoutes([], {malformedUriErrorHandler})]});
+          {imports: [RouterTestingModule.withRoutes([], {paramsInheritanceStrategy: 'always'})]});
+      const router: Router = TestBed.inject(Router);
+      expect(router.paramsInheritanceStrategy).toBe('always');
     });
 
-    it('should configure the router', fakeAsync(inject([Router], (router: Router) => {
-         expect(router.malformedUriErrorHandler).toBe(malformedUriErrorHandler);
-       })));
+    it('assigns relativeLinkResolution', () => {
+      TestBed.configureTestingModule(
+          {imports: [RouterTestingModule.withRoutes([], {relativeLinkResolution: 'corrected'})]});
+      const router: Router = TestBed.inject(Router);
+      expect(router.relativeLinkResolution).toBe('corrected');
+    });
+
+    it('assigns urlUpdateStrategy', () => {
+      TestBed.configureTestingModule(
+          {imports: [RouterTestingModule.withRoutes([], {urlUpdateStrategy: 'eager'})]});
+      const router: Router = TestBed.inject(Router);
+      expect(router.urlUpdateStrategy).toBe('eager');
+    });
   });
 });
 
diff --git a/packages/router/test/regression_integration.spec.ts b/packages/router/test/regression_integration.spec.ts
index 3dbf4eaf68694..9dd5b8ba323b6 100644
--- a/packages/router/test/regression_integration.spec.ts
+++ b/packages/router/test/regression_integration.spec.ts
@@ -14,6 +14,54 @@ import {RouterTestingModule} from '@angular/router/testing';
 
 describe('Integration', () => {
   describe('routerLinkActive', () => {
+    it('should update when the associated routerLinks change - #18469', fakeAsync(() => {
+         @Component({
+           template: `
+          <a id="first-link" [routerLink]="[firstLink]" routerLinkActive="active">{{firstLink}}</a>
+          <div id="second-link" routerLinkActive="active">
+            <a [routerLink]="[secondLink]">{{secondLink}}</a>
+          </div>
+           `,
+         })
+         class LinkComponent {
+           firstLink = 'link-a';
+           secondLink = 'link-b';
+
+           changeLinks(): void {
+             const temp = this.secondLink;
+             this.secondLink = this.firstLink;
+             this.firstLink = temp;
+           }
+         }
+
+         @Component({template: 'simple'})
+         class SimpleCmp {
+         }
+
+         TestBed.configureTestingModule({
+           imports: [RouterTestingModule.withRoutes(
+               [{path: 'link-a', component: SimpleCmp}, {path: 'link-b', component: SimpleCmp}])],
+           declarations: [LinkComponent, SimpleCmp]
+         });
+
+         const router: Router = TestBed.inject(Router);
+         const fixture = createRoot(router, LinkComponent);
+         const firstLink = fixture.debugElement.query(p => p.nativeElement.id === 'first-link');
+         const secondLink = fixture.debugElement.query(p => p.nativeElement.id === 'second-link');
+         router.navigateByUrl('/link-a');
+         advance(fixture);
+
+         expect(firstLink.nativeElement.classList).toContain('active');
+         expect(secondLink.nativeElement.classList).not.toContain('active');
+
+         fixture.componentInstance.changeLinks();
+         fixture.detectChanges();
+         advance(fixture);
+
+         expect(firstLink.nativeElement.classList).not.toContain('active');
+         expect(secondLink.nativeElement.classList).toContain('active');
+       }));
+
     it('should not cause infinite loops in the change detection - #15825', fakeAsync(() => {
          @Component({selector: 'simple', template: 'simple'})
          class SimpleCmp {
diff --git a/packages/router/testing/src/router_testing_module.ts b/packages/router/testing/src/router_testing_module.ts
index 36db3c7a08d80..e7dc95e23ad2f 100644
--- a/packages/router/testing/src/router_testing_module.ts
+++ b/packages/router/testing/src/router_testing_module.ts
@@ -9,7 +9,7 @@
 import {Location, LocationStrategy} from '@angular/common';
 import {MockLocationStrategy, SpyLocation} from '@angular/common/testing';
 import {Compiler, Injectable, Injector, ModuleWithProviders, NgModule, NgModuleFactory, NgModuleFactoryLoader, Optional} from '@angular/core';
-import {ChildrenOutletContexts, ExtraOptions, NoPreloading, PreloadingStrategy, provideRoutes, Route, Router, ROUTER_CONFIGURATION, RouterModule, ROUTES, Routes, UrlHandlingStrategy, UrlSerializer, ɵflatten as flatten, ɵROUTER_PROVIDERS as ROUTER_PROVIDERS} from '@angular/router';
+import {ChildrenOutletContexts, ExtraOptions, NoPreloading, PreloadingStrategy, provideRoutes, Route, Router, ROUTER_CONFIGURATION, RouterModule, ROUTES, Routes, UrlHandlingStrategy, UrlSerializer, ɵassignExtraOptionsToRouter as assignExtraOptionsToRouter, ɵflatten as flatten, ɵROUTER_PROVIDERS as ROUTER_PROVIDERS} from '@angular/router';
 
 
 
@@ -124,14 +124,7 @@ export function setupTestingRouter(
       router.urlHandlingStrategy = opts;
     } else {
       // Handle ExtraOptions
-
-      if (opts.malformedUriErrorHandler) {
-        router.malformedUriErrorHandler = opts.malformedUriErrorHandler;
-      }
-
-      if (opts.paramsInheritanceStrategy) {
-        router.paramsInheritanceStrategy = opts.paramsInheritanceStrategy;
-      }
+      assignExtraOptionsToRouter(opts, router);
     }
   }
 
diff --git a/packages/service-worker/config/schema.json b/packages/service-worker/config/schema.json
index 5df950afabebc..a8cfecd218f81 100644
--- a/packages/service-worker/config/schema.json
+++ b/packages/service-worker/config/schema.json
@@ -161,6 +161,14 @@
         "type": "string"
       },
       "uniqueItems": true
+    },
+    "navigationRequestStrategy": {
+      "enum": [
+        "freshness",
+        "performance"
+      ],
+      "default": "performance",
+      "description": "The Angular service worker can use two request strategies for navigation requests. 'performance', the default, skips navigation requests. The other strategy, 'freshness', forces all navigation requests through the network."
     }
   },
   "required": [
diff --git a/packages/service-worker/config/src/generator.ts b/packages/service-worker/config/src/generator.ts
index 21127d3ade164..61f3e0e5da190 100644
--- a/packages/service-worker/config/src/generator.ts
+++ b/packages/service-worker/config/src/generator.ts
@@ -39,6 +39,7 @@ export class Generator {
       dataGroups: this.processDataGroups(config),
       hashTable: withOrderedKeys(unorderedHashTable),
       navigationUrls: processNavigationUrls(this.baseHref, config.navigationUrls),
+      navigationRequestStrategy: config.navigationRequestStrategy ?? 'performance',
     };
   }
 
diff --git a/packages/service-worker/config/src/in.ts b/packages/service-worker/config/src/in.ts
index 35a913332ed6a..09fe07563bc6e 100644
--- a/packages/service-worker/config/src/in.ts
+++ b/packages/service-worker/config/src/in.ts
@@ -27,6 +27,7 @@ export interface Config {
   assetGroups?: AssetGroup[];
   dataGroups?: DataGroup[];
   navigationUrls?: string[];
+  navigationRequestStrategy?: 'freshness'|'performance';
 }
 
 /**
diff --git a/packages/service-worker/config/test/generator_spec.ts b/packages/service-worker/config/test/generator_spec.ts
index c2600490e5b28..f94a2125d3292 100644
--- a/packages/service-worker/config/test/generator_spec.ts
+++ b/packages/service-worker/config/test/generator_spec.ts
@@ -117,6 +117,7 @@ describe('Generator', () => {
         {positive: true, regex: '^http:\\/\\/example\\.com\\/included$'},
         {positive: false, regex: '^http:\\/\\/example\\.com\\/excluded$'},
       ],
+      navigationRequestStrategy: 'performance',
       hashTable: {
         '/test/foo/test.html': '18f6f8eb7b1c23d2bb61bff028b83d867a9e4643',
         '/test/index.html': 'a54d88e06612d820bc3be72877c74f257b561b19',
@@ -149,6 +150,7 @@ describe('Generator', () => {
         {positive: false, regex: '^\\/(?:.+\\/)?[^/]*__[^/]*$'},
         {positive: false, regex: '^\\/(?:.+\\/)?[^/]*__[^/]*\\/.*$'},
       ],
+      navigationRequestStrategy: 'performance',
       hashTable: {},
     });
   });
@@ -249,6 +251,7 @@ describe('Generator', () => {
         {positive: false, regex: '^\\/(?:.+\\/)?[^/]*__[^/]*$'},
         {positive: false, regex: '^\\/(?:.+\\/)?[^/]*__[^/]*\\/.*$'},
       ],
+      navigationRequestStrategy: 'performance',
       hashTable: {
         '/index.html': 'a54d88e06612d820bc3be72877c74f257b561b19',
         '/main.js': '41347a66676cdc0516934c76d9d13010df420f2c',
diff --git a/packages/service-worker/src/index.ts b/packages/service-worker/src/index.ts
index 24b9a0ad6d895..38a540dc2bed9 100644
--- a/packages/service-worker/src/index.ts
+++ b/packages/service-worker/src/index.ts
@@ -14,7 +14,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export {UpdateActivatedEvent, UpdateAvailableEvent} from './low_level';
+export {UnrecoverableStateEvent, UpdateActivatedEvent, UpdateAvailableEvent} from './low_level';
 export {ServiceWorkerModule, SwRegistrationOptions} from './module';
 export {SwPush} from './push';
 export {SwUpdate} from './update';
diff --git a/packages/service-worker/src/low_level.ts b/packages/service-worker/src/low_level.ts
index 00c5e7cf0b39c..25d2d1fcfa1b5 100644
--- a/packages/service-worker/src/low_level.ts
+++ b/packages/service-worker/src/low_level.ts
@@ -14,6 +14,8 @@ export const ERR_SW_NOT_SUPPORTED = 'Service workers are disabled or not support
 /**
  * An event emitted when a new version of the app is available.
  *
+ * @see {@link guide/service-worker-communications Service worker communication guide}
+ *
  * @publicApi
  */
 export interface UpdateAvailableEvent {
@@ -25,6 +27,8 @@ export interface UpdateAvailableEvent {
 /**
  * An event emitted when a new version of the app has been downloaded and activated.
  *
+ * @see {@link guide/service-worker-communications Service worker communication guide}
+ *
  * @publicApi
  */
 export interface UpdateActivatedEvent {
@@ -33,6 +37,24 @@ export interface UpdateActivatedEvent {
   current: {hash: string, appData?: Object};
 }
 
+/**
+ * An event emitted when the version of the app used by the service worker to serve this client is
+ * in a broken state that cannot be recovered from and a full page reload is required.
+ *
+ * For example, the service worker may not be able to retrieve a required resource, neither from the
+ * cache nor from the server. This could happen if a new version is deployed to the server and the
+ * service worker cache has been partially cleaned by the browser, removing some files of a previous
+ * app version but not all.
+ *
+ * @see {@link guide/service-worker-communications Service worker communication guide}
+ *
+ * @publicApi
+ */
+export interface UnrecoverableStateEvent {
+  type: 'UNRECOVERABLE_STATE';
+  reason: string;
+}
+
 /**
  * An event emitted when a `PushEvent` is received by the service worker.
  */
@@ -41,7 +63,7 @@ export interface PushEvent {
   data: any;
 }
 
-export type IncomingEvent = UpdateAvailableEvent|UpdateActivatedEvent;
+export type IncomingEvent = UpdateAvailableEvent|UpdateActivatedEvent|UnrecoverableStateEvent;
 
 export interface TypedEvent {
   type: string;
diff --git a/packages/service-worker/src/update.ts b/packages/service-worker/src/update.ts
index bfd070e544a4f..59b9b0afcaa60 100644
--- a/packages/service-worker/src/update.ts
+++ b/packages/service-worker/src/update.ts
@@ -9,7 +9,7 @@
 import {Injectable} from '@angular/core';
 import {NEVER, Observable} from 'rxjs';
 
-import {ERR_SW_NOT_SUPPORTED, NgswCommChannel, UpdateActivatedEvent, UpdateAvailableEvent} from './low_level';
+import {ERR_SW_NOT_SUPPORTED, NgswCommChannel, UnrecoverableStateEvent, UpdateActivatedEvent, UpdateAvailableEvent} from './low_level';
 
 
 
@@ -17,6 +17,8 @@ import {ERR_SW_NOT_SUPPORTED, NgswCommChannel, UpdateActivatedEvent, UpdateAvail
  * Subscribe to update notifications from the Service Worker, trigger update
  * checks, and forcibly activate updates.
  *
+ * @see {@link guide/service-worker-communications Service worker communication guide}
+ *
  * @publicApi
  */
 @Injectable()
@@ -31,6 +33,13 @@ export class SwUpdate {
    */
   readonly activated: Observable<UpdateActivatedEvent>;
 
+  /**
+   * Emits an `UnrecoverableStateEvent` event whenever the version of the app used by the service
+   * worker to serve this client is in a broken state that cannot be recovered from without a full
+   * page reload.
+   */
+  readonly unrecoverable: Observable<UnrecoverableStateEvent>;
+
   /**
    * True if the Service Worker is enabled (supported by the browser and enabled via
    * `ServiceWorkerModule`).
@@ -43,10 +52,12 @@ export class SwUpdate {
     if (!sw.isEnabled) {
       this.available = NEVER;
       this.activated = NEVER;
+      this.unrecoverable = NEVER;
       return;
     }
     this.available = this.sw.eventsOfType<UpdateAvailableEvent>('UPDATE_AVAILABLE');
     this.activated = this.sw.eventsOfType<UpdateActivatedEvent>('UPDATE_ACTIVATED');
+    this.unrecoverable = this.sw.eventsOfType<UnrecoverableStateEvent>('UNRECOVERABLE_STATE');
   }
 
   checkForUpdate(): Promise<void> {
diff --git a/packages/service-worker/test/comm_spec.ts b/packages/service-worker/test/comm_spec.ts
index cc4d69a5e85fd..efbc3d55e04e4 100644
--- a/packages/service-worker/test/comm_spec.ts
+++ b/packages/service-worker/test/comm_spec.ts
@@ -435,6 +435,14 @@ import {MockPushManager, MockPushSubscription, MockServiceWorkerContainer, MockS
           },
         });
       });
+      it('processes unrecoverable notifications when sent', done => {
+        update.unrecoverable.subscribe(event => {
+          expect(event.reason).toEqual('Invalid Resource');
+          expect(event.type).toEqual('UNRECOVERABLE_STATE');
+          done();
+        });
+        mock.sendMessage({type: 'UNRECOVERABLE_STATE', reason: 'Invalid Resource'});
+      });
       it('processes update activation notifications when sent', done => {
         update.activated.subscribe(event => {
           expect(event.previous).toEqual({hash: 'A'});
@@ -500,6 +508,7 @@ import {MockPushManager, MockPushSubscription, MockServiceWorkerContainer, MockS
           update = new SwUpdate(comm);
           update.available.toPromise().catch(err => fail(err));
           update.activated.toPromise().catch(err => fail(err));
+          update.unrecoverable.toPromise().catch(err => fail(err));
         });
         it('gives an error when checking for updates', done => {
           update = new SwUpdate(comm);
diff --git a/packages/service-worker/test/integration_spec.ts b/packages/service-worker/test/integration_spec.ts
index 1eb7f01c0b804..eeee1ad2b7895 100644
--- a/packages/service-worker/test/integration_spec.ts
+++ b/packages/service-worker/test/integration_spec.ts
@@ -47,6 +47,7 @@ const manifest: Manifest = {
     cacheQueryOptions: {ignoreVary: true},
   }],
   navigationUrls: [],
+  navigationRequestStrategy: 'performance',
   hashTable: tmpHashTableForFs(dist),
 };
 
@@ -64,6 +65,7 @@ const manifestUpdate: Manifest = {
     cacheQueryOptions: {ignoreVary: true},
   }],
   navigationUrls: [],
+  navigationRequestStrategy: 'performance',
   hashTable: tmpHashTableForFs(distUpdate),
 };
 
diff --git a/packages/service-worker/worker/src/app-version.ts b/packages/service-worker/worker/src/app-version.ts
index a4c0cc9823dbb..7e1054d85c1a1 100644
--- a/packages/service-worker/worker/src/app-version.ts
+++ b/packages/service-worker/worker/src/app-version.ts
@@ -185,6 +185,18 @@ export class AppVersion implements UpdateSource {
     // Next, check if this is a navigation request for a route. Detect circular
     // navigations by checking if the request URL is the same as the index URL.
     if (this.adapter.normalizeUrl(req.url) !== this.indexUrl && this.isNavigationRequest(req)) {
+      if (this.manifest.navigationRequestStrategy === 'freshness') {
+        // For navigation requests the freshness was configured. The request will always go trough
+        // the network and fallback to default `handleFetch` behavior in case of failure.
+        try {
+          return await this.scope.fetch(req);
+        } catch {
+          // Navigation request failed - application is likely offline.
+          // Proceed forward to the default `handleFetch` behavior, where
+          // `indexUrl` will be requested and it should be available in the cache.
+        }
+      }
+
       // This was a navigation request. Re-enter `handleFetch` with a request for
       // the URL.
       return this.handleFetch(this.adapter.newRequest(this.indexUrl), context);
diff --git a/packages/service-worker/worker/src/assets.ts b/packages/service-worker/worker/src/assets.ts
index 90e639d651b1d..c2f4222bdd5c5 100644
--- a/packages/service-worker/worker/src/assets.ts
+++ b/packages/service-worker/worker/src/assets.ts
@@ -9,7 +9,7 @@
 import {Adapter, Context} from './adapter';
 import {CacheState, NormalizedUrl, UpdateCacheStatus, UpdateSource, UrlMetadata} from './api';
 import {Database, Table} from './database';
-import {errorToString, SwCriticalError} from './error';
+import {errorToString, SwCriticalError, SwUnrecoverableStateError} from './error';
 import {IdleScheduler} from './idle';
 import {AssetGroupConfig} from './manifest';
 import {sha1Binary} from './sha1';
@@ -145,6 +145,7 @@ export abstract class AssetGroup {
           return cachedResponse;
         }
       }
+
       // No already-cached response exists, so attempt a fetch/cache operation. The original request
       // may specify things like credential inclusion, but for assets these are not honored in order
       // to avoid issues with opaque responses. The SW requests the data itself.
@@ -393,8 +394,8 @@ export abstract class AssetGroup {
       // reasons: either the non-cache-busted request failed (hopefully transiently) or if the
       // hash of the content retrieved does not match the canonical hash from the manifest. It's
       // only valid to access the content of the first response if the request was successful.
-      let makeCacheBustedRequest: boolean = networkResult.ok;
-      if (makeCacheBustedRequest) {
+      let makeCacheBustedRequest: boolean = !networkResult.ok;
+      if (networkResult.ok) {
         // The request was successful. A cache-busted request is only necessary if the hashes
         // don't match. Compare them, making sure to clone the response so it can be used later
         // if it proves to be valid.
@@ -414,10 +415,16 @@ export abstract class AssetGroup {
 
         // If the response was unsuccessful, there's nothing more that can be done.
         if (!cacheBustedResult.ok) {
-          throw new SwCriticalError(
-              `Response not Ok (cacheBustedFetchFromNetwork): cache busted request for ${
-                  req.url} returned response ${cacheBustedResult.status} ${
-                  cacheBustedResult.statusText}`);
+          if (cacheBustedResult.status === 404) {
+            throw new SwUnrecoverableStateError(
+                `Failed to retrieve hashed resource from the server. (AssetGroup: ${
+                    this.config.name} | URL: ${url})`);
+          } else {
+            throw new SwCriticalError(
+                `Response not Ok (cacheBustedFetchFromNetwork): cache busted request for ${
+                    req.url} returned response ${cacheBustedResult.status} ${
+                    cacheBustedResult.statusText}`);
+          }
         }
 
         // Hash the contents.
diff --git a/packages/service-worker/worker/src/driver.ts b/packages/service-worker/worker/src/driver.ts
index c0875e0c66dc1..006cb2cce5613 100644
--- a/packages/service-worker/worker/src/driver.ts
+++ b/packages/service-worker/worker/src/driver.ts
@@ -436,6 +436,9 @@ export class Driver implements Debuggable, UpdateSource {
       // network.
       res = await appVersion.handleFetch(event.request, event);
     } catch (err) {
+      if (err.isUnrecoverableState) {
+        await this.notifyClientsAboutUnrecoverableState(appVersion, err.message);
+      }
       if (err.isCritical) {
         // Something went wrong with the activation of this version.
         await this.versionFailed(appVersion, err);
@@ -1009,6 +1012,26 @@ export class Driver implements Debuggable, UpdateSource {
     };
   }
 
+  async notifyClientsAboutUnrecoverableState(appVersion: AppVersion, reason: string):
+      Promise<void> {
+    const broken =
+        Array.from(this.versions.entries()).find(([hash, version]) => version === appVersion);
+    if (broken === undefined) {
+      // This version is no longer in use anyway, so nobody cares.
+      return;
+    }
+
+    const brokenHash = broken[0];
+    const affectedClients = Array.from(this.clientVersionMap.entries())
+                                .filter(([clientId, hash]) => hash === brokenHash)
+                                .map(([clientId]) => clientId);
+
+    affectedClients.forEach(async clientId => {
+      const client = await this.scope.clients.get(clientId);
+      client.postMessage({type: 'UNRECOVERABLE_STATE', reason});
+    });
+  }
+
   async notifyClientsAboutUpdate(next: AppVersion): Promise<void> {
     await this.initialized;
 
diff --git a/packages/service-worker/worker/src/error.ts b/packages/service-worker/worker/src/error.ts
index dc6f10cff557f..3bb7ac4276a58 100644
--- a/packages/service-worker/worker/src/error.ts
+++ b/packages/service-worker/worker/src/error.ts
@@ -17,3 +17,7 @@ export function errorToString(error: any): string {
     return `${error}`;
   }
 }
+
+export class SwUnrecoverableStateError extends SwCriticalError {
+  readonly isUnrecoverableState: boolean = true;
+}
diff --git a/packages/service-worker/worker/src/manifest.ts b/packages/service-worker/worker/src/manifest.ts
index ec68a51780c05..cb9520b13e4b2 100644
--- a/packages/service-worker/worker/src/manifest.ts
+++ b/packages/service-worker/worker/src/manifest.ts
@@ -18,6 +18,7 @@ export interface Manifest {
   assetGroups?: AssetGroupConfig[];
   dataGroups?: DataGroupConfig[];
   navigationUrls: {positive: boolean, regex: string}[];
+  navigationRequestStrategy: 'freshness'|'performance';
   hashTable: {[url: string]: string};
 }
 
diff --git a/packages/service-worker/worker/test/data_spec.ts b/packages/service-worker/worker/test/data_spec.ts
index 05bbf4c21e06c..448b95861bc63 100644
--- a/packages/service-worker/worker/test/data_spec.ts
+++ b/packages/service-worker/worker/test/data_spec.ts
@@ -93,6 +93,7 @@ const manifest: Manifest = {
     },
   ],
   navigationUrls: [],
+  navigationRequestStrategy: 'performance',
   hashTable: tmpHashTableForFs(dist),
 };
 
diff --git a/packages/service-worker/worker/test/happy_spec.ts b/packages/service-worker/worker/test/happy_spec.ts
index 7506d11ad6d6f..09c5a374d71dc 100644
--- a/packages/service-worker/worker/test/happy_spec.ts
+++ b/packages/service-worker/worker/test/happy_spec.ts
@@ -74,6 +74,7 @@ const brokenManifest: Manifest = {
   }],
   dataGroups: [],
   navigationUrls: processNavigationUrls(''),
+  navigationRequestStrategy: 'performance',
   hashTable: tmpHashTableForFs(brokenFs, {'/foo.txt': true}),
 };
 
@@ -105,6 +106,7 @@ const brokenLazyManifest: Manifest = {
   ],
   dataGroups: [],
   navigationUrls: processNavigationUrls(''),
+  navigationRequestStrategy: 'performance',
   hashTable: tmpHashTableForFs(brokenFs, {'/bar.txt': true}),
 };
 
@@ -198,6 +200,7 @@ const manifest: Manifest = {
     },
   ],
   navigationUrls: processNavigationUrls(''),
+  navigationRequestStrategy: 'performance',
   hashTable: tmpHashTableForFs(dist),
 };
 
@@ -256,6 +259,7 @@ const manifestUpdate: Manifest = {
         '!/ignored/file1',
         '!/ignored/dir/**',
       ]),
+  navigationRequestStrategy: 'performance',
   hashTable: tmpHashTableForFs(distUpdate),
 };
 
@@ -983,6 +987,7 @@ describe('Driver', () => {
         },
       ],
       navigationUrls: processNavigationUrls(baseHref),
+      navigationRequestStrategy: 'performance',
       hashTable: tmpHashTableForFs(distDir, {}, baseHref),
     });
 
@@ -1343,6 +1348,7 @@ describe('Driver', () => {
         }
       ],
       navigationUrls: processNavigationUrls('./'),
+      navigationRequestStrategy: 'performance',
       hashTable: tmpHashTableForFs(distDir, {}, './'),
     });
 
@@ -1738,6 +1744,170 @@ describe('Driver', () => {
       expect(requestUrls2).toContain(httpsRequestUrl);
     });
 
+    describe('unrecoverable state', () => {
+      const generateMockServerState = (fileSystem: MockFileSystem) => {
+        const manifest: Manifest = {
+          configVersion: 1,
+          timestamp: 1234567890123,
+          index: '/index.html',
+          assetGroups: [{
+            name: 'assets',
+            installMode: 'prefetch',
+            updateMode: 'prefetch',
+            urls: fileSystem.list(),
+            patterns: [],
+            cacheQueryOptions: {ignoreVary: true},
+          }],
+          dataGroups: [],
+          navigationUrls: processNavigationUrls(''),
+          navigationRequestStrategy: 'performance',
+          hashTable: tmpHashTableForFs(fileSystem),
+        };
+
+        return {
+          serverState: new MockServerStateBuilder()
+                           .withManifest(manifest)
+                           .withStaticFiles(fileSystem)
+                           .build(),
+          manifest,
+        };
+      };
+
+      it('notifies affected clients', async () => {
+        const {serverState: serverState1} = generateMockServerState(
+            new MockFileSystemBuilder()
+                .addFile('/index.html', '<script src="foo.hash.js"></script>')
+                .addFile('/foo.hash.js', 'console.log("FOO");')
+                .build());
+
+        const {serverState: serverState2, manifest: manifest2} = generateMockServerState(
+            new MockFileSystemBuilder()
+                .addFile('/index.html', '<script src="bar.hash.js"></script>')
+                .addFile('/bar.hash.js', 'console.log("BAR");')
+                .build());
+
+        const {serverState: serverState3} = generateMockServerState(
+            new MockFileSystemBuilder()
+                .addFile('/index.html', '<script src="baz.hash.js"></script>')
+                .addFile('/baz.hash.js', 'console.log("BAZ");')
+                .build());
+
+        // Create initial server state and initialize the SW.
+        scope = new SwTestHarnessBuilder().withServerState(serverState1).build();
+        driver = new Driver(scope, scope, new CacheDatabase(scope, scope));
+
+        // Verify that all three clients are able to make the request.
+        expect(await makeRequest(scope, '/foo.hash.js', 'client1')).toBe('console.log("FOO");');
+        expect(await makeRequest(scope, '/foo.hash.js', 'client2')).toBe('console.log("FOO");');
+        expect(await makeRequest(scope, '/foo.hash.js', 'client3')).toBe('console.log("FOO");');
+
+        await driver.initialized;
+        serverState1.clearRequests();
+
+        // Verify that the `foo.hash.js` file is cached.
+        expect(await makeRequest(scope, '/foo.hash.js')).toBe('console.log("FOO");');
+        serverState1.assertNoRequestFor('/foo.hash.js');
+
+        // Update the ServiceWorker to the second version.
+        scope.updateServerState(serverState2);
+        expect(await driver.checkForUpdate()).toEqual(true);
+
+        // Update the first two clients to the latest version, keep `client3` as is.
+        const [client1, client2] =
+            await Promise.all([scope.clients.get('client1'), scope.clients.get('client2')]);
+
+        await Promise.all([driver.updateClient(client1), driver.updateClient(client2)]);
+
+        // Update the ServiceWorker to the latest version
+        scope.updateServerState(serverState3);
+        expect(await driver.checkForUpdate()).toEqual(true);
+
+        // Remove `bar.hash.js` from the cache to emulate the browser evicting files from the cache.
+        await removeAssetFromCache(scope, manifest2, '/bar.hash.js');
+
+        // Get all clients and verify their messages
+        const mockClient1 = scope.clients.getMock('client1')!;
+        const mockClient2 = scope.clients.getMock('client2')!;
+        const mockClient3 = scope.clients.getMock('client3')!;
+
+        // Try to retrieve `bar.hash.js`, which is neither in the cache nor on the server.
+        // This should put the SW in an unrecoverable state and notify clients.
+        expect(await makeRequest(scope, '/bar.hash.js', 'client1')).toBeNull();
+        serverState2.assertSawRequestFor('/bar.hash.js');
+        const unrecoverableMessage = {
+          type: 'UNRECOVERABLE_STATE',
+          reason:
+              'Failed to retrieve hashed resource from the server. (AssetGroup: assets | URL: /bar.hash.js)'
+        };
+
+        expect(mockClient1.messages).toContain(unrecoverableMessage);
+        expect(mockClient2.messages).toContain(unrecoverableMessage);
+        expect(mockClient3.messages).not.toContain(unrecoverableMessage);
+
+        // Because `client1` failed, `client1` and `client2` have been moved to the latest version.
+        // Verify that by retrieving `baz.hash.js`.
+        expect(await makeRequest(scope, '/baz.hash.js', 'client1')).toBe('console.log("BAZ");');
+        serverState2.assertNoRequestFor('/baz.hash.js');
+        expect(await makeRequest(scope, '/baz.hash.js', 'client2')).toBe('console.log("BAZ");');
+        serverState2.assertNoRequestFor('/baz.hash.js');
+
+        // Ensure that `client3` remains on the first version and can request `foo.hash.js`.
+        expect(await makeRequest(scope, '/foo.hash.js', 'client3')).toBe('console.log("FOO");');
+        serverState2.assertNoRequestFor('/foo.hash.js');
+      });
+
+      it('enters degraded mode', async () => {
+        const originalFiles = new MockFileSystemBuilder()
+                                  .addFile('/index.html', '<script src="foo.hash.js"></script>')
+                                  .addFile('/foo.hash.js', 'console.log("FOO");')
+                                  .build();
+
+        const updatedFiles = new MockFileSystemBuilder()
+                                 .addFile('/index.html', '<script src="bar.hash.js"></script>')
+                                 .addFile('/bar.hash.js', 'console.log("BAR");')
+                                 .build();
+
+        const {serverState: originalServer, manifest} = generateMockServerState(originalFiles);
+        const {serverState: updatedServer} = generateMockServerState(updatedFiles);
+
+        // Create initial server state and initialize the SW.
+        scope = new SwTestHarnessBuilder().withServerState(originalServer).build();
+        driver = new Driver(scope, scope, new CacheDatabase(scope, scope));
+
+        expect(await makeRequest(scope, '/foo.hash.js')).toBe('console.log("FOO");');
+        await driver.initialized;
+        originalServer.clearRequests();
+
+        // Verify that the `foo.hash.js` file is cached.
+        expect(await makeRequest(scope, '/foo.hash.js')).toBe('console.log("FOO");');
+        originalServer.assertNoRequestFor('/foo.hash.js');
+
+        // Update the server state to emulate deploying a new version (where `foo.hash.js` does not
+        // exist any more). Keep the cache though.
+        scope = new SwTestHarnessBuilder()
+                    .withCacheState(scope.caches.dehydrate())
+                    .withServerState(updatedServer)
+                    .build();
+        driver = new Driver(scope, scope, new CacheDatabase(scope, scope));
+
+        // The SW is still able to serve `foo.hash.js` from the cache.
+        expect(await makeRequest(scope, '/foo.hash.js')).toBe('console.log("FOO");');
+        updatedServer.assertNoRequestFor('/foo.hash.js');
+
+        // Remove `foo.hash.js` from the cache to emulate the browser evicting files from the cache.
+        await removeAssetFromCache(scope, manifest, '/foo.hash.js');
+
+        // Try to retrieve `foo.hash.js`, which is neither in the cache nor on the server.
+        // This should put the SW in an unrecoverable state and notify clients.
+        expect(await makeRequest(scope, '/foo.hash.js')).toBeNull();
+        updatedServer.assertSawRequestFor('/foo.hash.js');
+
+        // This should also enter the `SW` into degraded mode, because the broken version was the
+        // latest one.
+        expect(driver.state).toEqual(DriverReadyState.EXISTING_CLIENTS_ONLY);
+      });
+    });
+
     describe('backwards compatibility with v5', () => {
       beforeEach(() => {
         const serverV5 = new MockServerStateBuilder()
@@ -1759,9 +1929,65 @@ describe('Driver', () => {
          });
     });
   });
+
+  describe('navigationRequestStrategy', () => {
+    it('doesn\'t create navigate request in performance mode', async () => {
+      await makeRequest(scope, '/foo.txt');
+      await driver.initialized;
+      await server.clearRequests();
+
+      // Create multiple navigation requests to prove no navigation request was made.
+      // By default the navigation request is not sent, it's replaced
+      // with the index request - thus, the `this is foo` value.
+      expect(await makeNavigationRequest(scope, '/', '')).toBe('this is foo');
+      expect(await makeNavigationRequest(scope, '/foo', '')).toBe('this is foo');
+      expect(await makeNavigationRequest(scope, '/foo/bar', '')).toBe('this is foo');
+
+      server.assertNoOtherRequests();
+    });
+
+    it('sends the request to the server in freshness mode', async () => {
+      const {server, scope, driver} = createSwForFreshnessStrategy();
+
+      await makeRequest(scope, '/foo.txt');
+      await driver.initialized;
+      await server.clearRequests();
+
+      // Create multiple navigation requests to prove the navigation request is constantly made.
+      // When enabled, the navigation request is made each time and not replaced
+      // with the index request - thus, the `null` value.
+      expect(await makeNavigationRequest(scope, '/', '')).toBe(null);
+      expect(await makeNavigationRequest(scope, '/foo', '')).toBe(null);
+      expect(await makeNavigationRequest(scope, '/foo/bar', '')).toBe(null);
+
+      server.assertSawRequestFor('/');
+      server.assertSawRequestFor('/foo');
+      server.assertSawRequestFor('/foo/bar');
+      server.assertNoOtherRequests();
+    });
+
+    function createSwForFreshnessStrategy() {
+      const freshnessManifest: Manifest = {...manifest, navigationRequestStrategy: 'freshness'};
+      const server = serverBuilderBase.withManifest(freshnessManifest).build();
+      const scope = new SwTestHarnessBuilder().withServerState(server).build();
+      const driver = new Driver(scope, scope, new CacheDatabase(scope, scope));
+
+      return {server, scope, driver};
+    }
+  });
 });
 })();
 
+async function removeAssetFromCache(
+    scope: SwTestHarness, appVersionManifest: Manifest, assetPath: string) {
+  const assetGroupName =
+      appVersionManifest.assetGroups?.find(group => group.urls.includes(assetPath))?.name;
+  const cacheName = `${scope.cacheNamePrefix}:${sha1(JSON.stringify(appVersionManifest))}:assets:${
+      assetGroupName}:cache`;
+  const cache = await scope.caches.open(cacheName);
+  return cache.delete(assetPath);
+}
+
 async function makeRequest(
     scope: SwTestHarness, url: string, clientId: string|null = 'default',
     init?: Object): Promise<string|null> {
diff --git a/packages/service-worker/worker/testing/mock.ts b/packages/service-worker/worker/testing/mock.ts
index 8b51e38ad4ae5..62bb1c84e000a 100644
--- a/packages/service-worker/worker/testing/mock.ts
+++ b/packages/service-worker/worker/testing/mock.ts
@@ -248,6 +248,7 @@ export function tmpManifestSingleAssetGroup(fs: MockFileSystem): Manifest {
       },
     ],
     navigationUrls: [],
+    navigationRequestStrategy: 'performance',
     hashTable,
   };
 }
diff --git a/packages/service-worker/worker/testing/scope.ts b/packages/service-worker/worker/testing/scope.ts
index 44df03a2edbe0..57e77055ee02d 100644
--- a/packages/service-worker/worker/testing/scope.ts
+++ b/packages/service-worker/worker/testing/scope.ts
@@ -346,6 +346,7 @@ export class ConfigBuilder {
       index: '/index.html',
       assetGroups,
       navigationUrls: [],
+      navigationRequestStrategy: 'performance',
       hashTable,
     };
   }
diff --git a/packages/tsconfig.json b/packages/tsconfig.json
index 82b7c712a7124..36e81fb949b04 100644
--- a/packages/tsconfig.json
+++ b/packages/tsconfig.json
@@ -47,10 +47,6 @@
     "http/**",
     "language-service/test/project",
     "platform-server/integrationtest",
-    // The webworker packages have deprecated and are not made compatible with the
-    // strict flag. Until these packages are removed, we exclude them here.
-    "platform-webworker/**",
-    "platform-webworker-dynamic/**",
     "router/test/aot_ngsummary_test"
   ]
 }
diff --git a/packages/upgrade/src/common/src/downgrade_injectable.ts b/packages/upgrade/src/common/src/downgrade_injectable.ts
index 35a6e113531e7..af2c7a20bd623 100644
--- a/packages/upgrade/src/common/src/downgrade_injectable.ts
+++ b/packages/upgrade/src/common/src/downgrade_injectable.ts
@@ -79,8 +79,12 @@ export function downgradeInjectable(token: any, downgradedModule: string = ''):
 
     validateInjectionKey($injector, downgradedModule, injectorKey, attemptedAction);
 
-    const injector: Injector = $injector.get(injectorKey);
-    return injector.get(token);
+    try {
+      const injector: Injector = $injector.get(injectorKey);
+      return injector.get(token);
+    } catch (err) {
+      throw new Error(`Error while ${attemptedAction}: ${err.message || err}`);
+    }
   };
   (factory as any)['$inject'] = [$INJECTOR];
 
diff --git a/packages/upgrade/src/common/test/downgrade_injectable_spec.ts b/packages/upgrade/src/common/test/downgrade_injectable_spec.ts
index 45f6ddb10e780..b2ea6a602e089 100644
--- a/packages/upgrade/src/common/test/downgrade_injectable_spec.ts
+++ b/packages/upgrade/src/common/test/downgrade_injectable_spec.ts
@@ -48,4 +48,16 @@ describe('downgradeInjectable', () => {
     expect(factory(mockNg1Injector)).toEqual('service value');
     expect(mockNg2Injector.get).toHaveBeenCalledWith('someToken');
   });
+
+  it('should mention the injectable\'s name in the error thrown when failing to retrieve injectable',
+     () => {
+       const factory = downgradeInjectable('someToken');
+       expect(factory).toEqual(jasmine.any(Function));
+       expect((factory as any).$inject).toEqual([$INJECTOR]);
+
+       const {mockNg1Injector, mockNg2Injector} = setupMockInjectors();
+       mockNg2Injector.get.and.throwError('Mock failure');
+       expect(() => factory(mockNg1Injector))
+           .toThrowError(/^Error while instantiating injectable 'someToken': Mock failure/);
+     });
 });
diff --git a/packages/upgrade/src/dynamic/test/upgrade_spec.ts b/packages/upgrade/src/dynamic/test/upgrade_spec.ts
index aee46319fcab8..9ab7ba7ff8072 100644
--- a/packages/upgrade/src/dynamic/test/upgrade_spec.ts
+++ b/packages/upgrade/src/dynamic/test/upgrade_spec.ts
@@ -2120,7 +2120,7 @@ withEachNg1Version(() => {
                }
              }
 
-             // On browsers that don't support `requestAnimationFrame` (IE 9, Android <= 4.3),
+             // On browsers that don't support `requestAnimationFrame` (Android <= 4.3),
              // `$animate` will use `setTimeout(..., 16.6)` instead. This timeout will still be
              // on
              // the queue at the end of the test, causing it to fail.
@@ -2217,7 +2217,7 @@ withEachNg1Version(() => {
                }
              }
 
-             // On browsers that don't support `requestAnimationFrame` (IE 9, Android <= 4.3),
+             // On browsers that don't support `requestAnimationFrame` (Android <= 4.3),
              // `$animate` will use `setTimeout(..., 16.6)` instead. This timeout will still be
              // on
              // the queue at the end of the test, causing it to fail.
@@ -2294,7 +2294,7 @@ withEachNg1Version(() => {
                }
              }
 
-             // On browsers that don't support `requestAnimationFrame` (IE 9, Android <= 4.3),
+             // On browsers that don't support `requestAnimationFrame` (Android <= 4.3),
              // `$animate` will use `setTimeout(..., 16.6)` instead. This timeout will still be
              // on
              // the queue at the end of the test, causing it to fail.
@@ -2342,10 +2342,9 @@ withEachNg1Version(() => {
                }
              }
 
-             // On browsers that don't support `requestAnimationFrame` (IE 9, Android <= 4.3),
+             // On browsers that don't support `requestAnimationFrame` (Android <= 4.3),
              // `$animate` will use `setTimeout(..., 16.6)` instead. This timeout will still be
-             // on
-             // the queue at the end of the test, causing it to fail.
+             // on the queue at the end of the test, causing it to fail.
              // Mocking animations (via `ngAnimateMock`) avoids the issue.
              angular.module_('ng1', ['ngAnimateMock'])
                  .component('ng1', {
diff --git a/packages/zone.js/BUILD.bazel b/packages/zone.js/BUILD.bazel
index 8e2ca289d96a1..e93eab0e555e9 100644
--- a/packages/zone.js/BUILD.bazel
+++ b/packages/zone.js/BUILD.bazel
@@ -34,32 +34,13 @@ genrule(
 
 genrule(
     name = "zone_js_d_ts",
-    srcs = ["//packages/zone.js/lib:zone_d_ts"],
-    outs = ["zone.js.d.ts"],
-    cmd = "cp $< $@",
-)
-
-genrule(
-    name = "zone_extensions_d_ts",
-    srcs = ["//packages/zone.js/lib:zone.api.extensions.ts"],
-    outs = ["zone.api.extensions.ts"],
-    cmd = "cp $< $@",
-)
-
-genrule(
-    name = "zone_configurations_d_ts",
-    srcs = ["//packages/zone.js/lib:zone.configurations.api.ts"],
-    outs = ["zone.configurations.api.ts"],
-    cmd = "cp $< $@",
-)
-
-filegroup(
-    name = "zone_d_ts",
     srcs = [
-        ":zone_configurations_d_ts",
-        ":zone_extensions_d_ts",
-        ":zone_js_d_ts",
+        "//packages/zone.js/lib:zone_d_ts",
+        "//packages/zone.js/lib:zone.api.extensions.ts",
+        "//packages/zone.js/lib:zone.configurations.api.ts",
     ],
+    outs = ["zone.d.ts"],
+    cmd = "cat $(SRCS) > $@",
 )
 
 generate_rollup_bundle(
@@ -95,5 +76,5 @@ pkg_npm(
     ] + [
         "//packages/zone.js/fesm2015:" + b + "-es2015.min.dist"
         for b in BUNDLES_ENTRY_POINTS.keys()
-    ] + [":zone_d_ts"],
+    ] + [":zone_js_d_ts"],
 )
diff --git a/packages/zone.js/CHANGELOG.md b/packages/zone.js/CHANGELOG.md
index c08fc781dfb2e..4c4fbca77c45e 100644
--- a/packages/zone.js/CHANGELOG.md
+++ b/packages/zone.js/CHANGELOG.md
@@ -1,3 +1,113 @@
+<a name="0.11.2"></a>
+## [0.11.2](https://github.com/angular/angular/compare/zone.js-0.11.0...zone.js-0.11.2) (2020-09-19)
+
+
+### Bug Fixes
+
+* **zone.js:** jest getRealSystemTime should return native time ([#39127](https://github.com/angular/angular/issues/39127)) ([ffc3332](https://github.com/angular/angular/commit/ffc3332))
+* **zone.js:** add missing types field in package.json ([#38585](https://github.com/angular/angular/issues/38585)) ([27cc56b](https://github.com/angular/angular/commit/27cc56b)), closes [#38584](https://github.com/angular/angular/issues/38584)
+* **zone.js:** defineProperty patch should not swallow error ([#37582](https://github.com/angular/angular/issues/37582)) ([45a73dd](https://github.com/angular/angular/commit/45a73dd)), closes [#37432](https://github.com/angular/angular/issues/37432)
+* **zone.js:** run tests in umd format ([#37582](https://github.com/angular/angular/issues/37582)) ([40096be](https://github.com/angular/angular/commit/40096be))
+* **zone.js:** should have better backward compatibilities ([#38797](https://github.com/angular/angular/issues/38797)) ([a33d630](https://github.com/angular/angular/commit/a33d630)), closes [#38561](https://github.com/angular/angular/issues/38561) [#38669](https://github.com/angular/angular/issues/38669)
+* **zone.js:** should invoke xhr send task when no response error occurs ([#38836](https://github.com/angular/angular/issues/38836)) ([d92a0dd](https://github.com/angular/angular/commit/d92a0dd)), closes [#38795](https://github.com/angular/angular/issues/38795)
+* **zone.js:** zone.js toString patch should check typeof Promise is function ([#38350](https://github.com/angular/angular/issues/38350)) ([18e474f](https://github.com/angular/angular/commit/18e474f)), closes [#38361](https://github.com/angular/angular/issues/38361)
+
+
+### Features
+
+* **zone.js:** add jest fakeTimers support ([#39016](https://github.com/angular/angular/issues/39016)) ([82d54fe](https://github.com/angular/angular/commit/82d54fe)), closes [#38851](https://github.com/angular/angular/issues/38851)
+
+
+### Refactor
+
+* **zone.js:** refactor(zone.js): rename several internal apis in fake async zone spec ([#39127](https://github.com/angular/angular/issues/39127)) ([8a68669](https://github.com/angular/angular/commit/8a68669))
+
+
+### Build
+
+* **zone.js:** build(zone.js): zone.js should output esm format for fesm2015 bundles ([#39203](https://github.com/angular/angular/issues/39203)) ([822b838](https://github.com/angular/angular/commit/822b838))
+
+
+### BREAKING CHANGES
+
+* **zone.js:** ZoneJS no longer swallows errors produced by `Object.defineProperty` calls.
+
+Prior to this change, ZoneJS monkey patched `Object.defineProperty` and if there is an error
+(such as the property is not configurable or not writable) the patched logic swallowed it
+and only console.log was produced. This behavior used to hide real errors,
+so the logic is now updated to trigger original errors (if any). One exception
+where the patch remains in place is `document.registerElement`
+(to allow smooth transition for code/polyfills that rely on old behavior in legacy browsers).
+If your code relies on the old behavior (where errors were not thrown before),
+you may need to update the logic to handle the errors that are no longer masked by ZoneJS patch.
+
+
+
+<a name="0.11.1"></a>
+## [0.11.1](https://github.com/angular/angular/compare/zone.js-0.11.0...zone.js-0.11.1) (2020-08-19)
+
+
+### Bug Fixes
+
+* **zone.js:** zone.js package.json should not include files/directories field ([#38528](https://github.com/angular/angular/issues/38528)) ([6b662d1](https://github.com/angular/angular/commit/6b662d1)), closes [#38526](https://github.com/angular/angular/issues/38526) [#38516](https://github.com/angular/angular/issues/38516) [#38513](https://github.com/angular/angular/issues/38513)
+
+
+# BREAKING CHANGES since Zone.js v0.11.1
+
+Prior to `v0.11.1`, Zone.js provided two distribution bundle formats in the `dist` folder.
+They were (1) `ES5` bundle distributed as `zone.js` and (2) `ES2015` bundle distributed as `zone-evergreen.js`.
+These bundles are used for Angular's differential-loading mechanism.
+
+Prior to `v0.11.11` the following code
+
+```
+import 'zone.js';
+```
+would load the `ES5` bundle from `dist/zone.js`.
+
+Starting with `v0.11.1`, Zone.js follows the [Angular Package Format](https://docs.google.com/document/d/1CZC2rcpxffTDfRDs6p1cfbmKNLA6x5O-NtkJglDaBVs), so the folder structure of the Zone.js bundles is updated to match `Angular Package Format`.
+So the same code
+
+```
+import 'zone.js';
+```
+now loads the `ES2015` bundle instead.
+
+This is a breaking change for legacy browsers such as `IE11`.
+
+For backwards compatibility `zone.js` continues to distribute the same bundles under `dist`.
+To restore the old behavior change the `polyfills.ts` generated by `Angular CLI` to import like so:
+
+```
+import 'zone.js/dist/zone';
+```
+
+<a name="0.11.0"></a>
+# [0.11.0](https://github.com/angular/angular/compare/zone.js-0.10.3...zone.js-0.11.0) (2020-08-14)
+
+
+### Bug Fixes
+
+* **zone.js:** add issue numbers of `[@types](https://github.com/types)/jasmine` to the test cases ([#34625](https://github.com/angular/angular/issues/34625)) ([41667de](https://github.com/angular/angular/commit/41667de))
+* **zone.js:** clearTimeout/clearInterval should call on object global ([#37858](https://github.com/angular/angular/issues/37858)) ([a71f114](https://github.com/angular/angular/commit/a71f114)), closes [#37333](https://github.com/angular/angular/issues/37333)
+* **zone.js:** fix 2 bluebird test cases for each/mapSeries ([#36295](https://github.com/angular/angular/issues/36295)) ([b44f7b5](https://github.com/angular/angular/commit/b44f7b5))
+* **zone.js:** patch nodejs EventEmtter.prototype.off ([#37863](https://github.com/angular/angular/issues/37863)) ([1822cbc](https://github.com/angular/angular/commit/1822cbc)), closes [#35473](https://github.com/angular/angular/issues/35473)
+* **zone.js:** remove unused Promise overwritten setter logic ([#36851](https://github.com/angular/angular/issues/36851)) ([31796e8](https://github.com/angular/angular/commit/31796e8))
+* **zone.js:** should not try to patch fetch if it is not writable ([#36311](https://github.com/angular/angular/issues/36311)) ([416c786](https://github.com/angular/angular/commit/416c786)), closes [#36142](https://github.com/angular/angular/issues/36142)
+* **zone.js:** UNPATCHED_EVENTS and PASSIVE_EVENTS should be string[] not boolean ([#36258](https://github.com/angular/angular/issues/36258)) ([36e927a](https://github.com/angular/angular/commit/36e927a))
+* **zone.js:** zone patch rxjs should return null _unsubscribe correctly. ([#37091](https://github.com/angular/angular/issues/37091)) ([96aa14d](https://github.com/angular/angular/commit/96aa14d)), closes [#31684](https://github.com/angular/angular/issues/31684)
+* **zone.js:** zone.js patch jest should handle done correctly ([#36022](https://github.com/angular/angular/issues/36022)) ([4374931](https://github.com/angular/angular/commit/4374931))
+
+
+### Features
+
+* **zone.js:** move all zone optional bundles to plugins folders ([#36540](https://github.com/angular/angular/issues/36540)) ([b199ef6](https://github.com/angular/angular/commit/b199ef6))
+* **zone.js:** move MutationObserver/FileReader to different module ([#31657](https://github.com/angular/angular/issues/31657)) ([253337d](https://github.com/angular/angular/commit/253337d))
+* **zone.js:** patch jasmine.createSpyObj to make properties enumerable to be true ([#34624](https://github.com/angular/angular/issues/34624)) ([c2b4d92](https://github.com/angular/angular/commit/c2b4d92)), closes [#33657](https://github.com/angular/angular/issues/33657)
+* **zone.js:** upgrade zone.js to angular package format(APF) ([#36540](https://github.com/angular/angular/issues/36540)) ([583a9d3](https://github.com/angular/angular/commit/583a9d3)), closes [#35157](https://github.com/angular/angular/issues/35157) [/github.com/angular/angular-cli/blob/5376a8b1392ac7bd252782d8474161ce03a4d1cb/packages/schematics/angular/application/files/src/polyfills.ts.template#L55-L58](https://github.com//github.com/angular/angular-cli/blob/5376a8b1392ac7bd252782d8474161ce03a4d1cb/packages/schematics/angular/application/files/src/polyfills.ts.template/issues/L55-L58)
+
+
+
 ## [0.10.3](https://github.com/angular/angular/compare/zone.js-0.10.2...zone.js-0.10.3) (2020-02-27)
 
 
diff --git a/packages/zone.js/DEVELOPER.md b/packages/zone.js/DEVELOPER.md
index c1a5e5df53583..0fa4298484f2b 100644
--- a/packages/zone.js/DEVELOPER.md
+++ b/packages/zone.js/DEVELOPER.md
@@ -75,7 +75,8 @@ Releasing `zone.js` is a two step process.
 #### 1. Creating a PR for release
 
 ```
-export PREVIOUS_ZONE_TAG=`git tag -l 'zone.js-0.10.*' | tail -n1`
+rm -rf node_modules && yarn install
+export PREVIOUS_ZONE_TAG=`git tag -l 'zone.js-0.11.*' | tail -n1`
 export VERSION=`(cd packages/zone.js; npm version patch --no-git-tag-version)`
 export VERSION=${VERSION#v}
 export TAG="zone.js-${VERSION}"
@@ -107,9 +108,12 @@ Check out the SHA on master which has the changelog commit of the zone.js
 
 ```
 git fetch upstream
+git checkout upstream/master
+rm -rf node_modules && yarn install
 export VERSION=`(node -e "console.log(require('./packages/zone.js/package.json').version)")`
 export TAG="zone.js-${VERSION}"
 export SHA=`git log upstream/master --oneline -n 1000 | grep "release: cut the ${TAG} release" | cut -f 1 -d " "`
+echo "Releasing '$VERSION' which will be tagged as '$TAG' from SHA '$SHA'."
 git co ${SHA}
 npm login --registry https://wombat-dressing-room.appspot.com
 yarn bazel -- run --config=release -- //packages/zone.js:npm_package.publish --access public --tag latest
diff --git a/packages/zone.js/MODULE.md b/packages/zone.js/MODULE.md
index e58fab2b7ec8b..7af365f72dde2 100644
--- a/packages/zone.js/MODULE.md
+++ b/packages/zone.js/MODULE.md
@@ -61,6 +61,7 @@ Below is the full list of currently supported modules.
 |crypto|NodeJS patch crypto function as macroTask|__Zone_disable_crypto = true|
 
 - Test Framework
+
 |Module Name|Behavior with zone.js patch|How to disable|
 |--|--|--|
 |Jasmine|Jasmine APIs patch|__Zone_disable_jasmine = true|
@@ -101,7 +102,7 @@ This package will provide following functionality.
 
      without `zone-error` patch, the example above will output `false`, with the patch, the reuslt will be `true`.
 
-  2. BlacklistZoneStackFrames: remove zone.js stack from `stackTrace`, and add `zone`  information. Without this patch, a lot of `zone.js` invocation stack will be shown
+  2. ZoneJsInternalStackFrames: remove zone.js stack from `stackTrace`, and add `zone`  information. Without this patch, a lot of `zone.js` invocation stack will be shown
      in stack frames.
 
     ```
@@ -122,18 +123,18 @@ This package will provide following functionality.
      ```
 
   The second feature will slow down the `Error` performance, so `zone.js` provide a flag to let you be able to control the behavior.
-  The flag is `__Zone_Error_BlacklistedStackFrames_policy`. And the available options is:
+  The flag is `__Zone_Error_ZoneJsInternalStackFrames_policy`. And the available options is:
 
     1. default: this is the default one, if you load `zone.js/dist/zone-error` without
-     setting the flag, `default` will be used, and `BlackListStackFrames` will be available
+     setting the flag, `default` will be used, and `ZoneJsInternalStackFrames` will be available
      when `new Error()`, you can get a `error.stack`  which is `zone stack free`. But this
      will slow down `new Error()` a little bit.
 
-    2. disable: this will disable `BlackListZoneStackFrame` feature, and if you load
+    2. disable: this will disable `ZoneJsInternalStackFrames` feature, and if you load
      `zone.js/dist/zone-error`, you will only get a `wrapped Error` which can handle
       `Error inherit` issue.
 
-    3. lazy: this is a feature to let you be able to get `BlackListZoneStackFrame` feature,
+    3. lazy: this is a feature to let you be able to get `ZoneJsInternalStackFrames` feature,
      but not impact performance. But as a trade off, you can't get the `zone free stack
      frames` by access `error.stack`. You can only get it by access `error.zoneAwareStack`.
 
@@ -147,4 +148,4 @@ the following APIs should be patched, otherwise Angular may not work as expected
 2. timer
 3. on_property
 4. EventTarget
-5. XHR
\ No newline at end of file
+5. XHR
diff --git a/packages/zone.js/README.md b/packages/zone.js/README.md
index d356f4eabc88b..ed95778d06fcb 100644
--- a/packages/zone.js/README.md
+++ b/packages/zone.js/README.md
@@ -17,6 +17,38 @@ See the new API [here](./lib/zone.ts).
 
 Read up on [Zone Primer](https://docs.google.com/document/d/1F5Ug0jcrm031vhSMJEOgp1l-Is-Vf0UCNDY-LsQtAIY).
 
+# BREAKING CHANGES since Zone.js v0.11.1
+
+Prior to `v0.11.1`, Zone.js provided two distribution bundle formats in the `dist` folder.
+They were (1) `ES5` bundle distributed as `zone.js` and (2) `ES2015` bundle distributed as `zone-evergreen.js`.
+These bundles are used for Angular's differential-loading mechanism. 
+
+Prior to `v0.11.11` the following code
+
+```
+import 'zone.js';
+```
+would load the `ES5` bundle from `dist/zone.js`.
+
+Starting with `v0.11.1`, Zone.js follows the [Angular Package Format](https://docs.google.com/document/d/1CZC2rcpxffTDfRDs6p1cfbmKNLA6x5O-NtkJglDaBVs), so the folder structure of the Zone.js bundles is updated to match `Angular Package Format`.
+So the same code
+
+```
+import 'zone.js';
+```
+now loads the `ES2015` bundle instead.
+
+This is a breaking change for legacy browsers such as `IE11`.
+
+For backwards compatibility `zone.js` continues to distribute the same bundles under `dist`.
+To restore the old behavior change the `polyfills.ts` generated by `Angular CLI` to import like so:
+
+```
+import 'zone.js/dist/zone';
+```
+
+For details, please refer the [changelog](./CHANGELOG.md) and the [PR](https://github.com/angular/angular/pull/36540).
+
 ## What's a Zone?
 
 A Zone is an execution context that persists across async tasks.
diff --git a/packages/zone.js/STANDARD-APIS.md b/packages/zone.js/STANDARD-APIS.md
index ed5d9c6581105..81150e4e36638 100644
--- a/packages/zone.js/STANDARD-APIS.md
+++ b/packages/zone.js/STANDARD-APIS.md
@@ -1,11 +1,11 @@
 # Zone.js's support for standard apis
 
 Zone.js patched most standard APIs such as DOM event listeners, XMLHttpRequest in Browser, EventEmitter and fs API in Node.js so they can be in zone.
-  
-In this document, all patched API are listed. 
+
+In this document, all patched API are listed.
 
 For non-standard APIs, please see [NON-STANDARD-APIS.md](NON-STANDARD-APIS.md)
- 
+
 ## Patch Mechanisms
 
 There are several patch mechanisms
@@ -15,10 +15,10 @@ There are several patch mechanisms
   1. MacroTask
   2. MicroTask
   3. EventTask
-  
+
 Some APIs which should be treated as Tasks, but are currently still patched in the wrap way. These will be patched as Tasks soon.
- 
-## Browser 
+
+## Browser
 
 Web APIs
 
@@ -26,7 +26,7 @@ Web APIs
 | --- | --- | --- |
 | setTimeout/clearTimeout | MacroTask | app can get handlerId, interval, args, isPeriodic(false) through task.data |
 | setImmediate/clearImmediate | MacroTask | same with setTimeout |
-| setInterval/clearInterval | MacroTask | isPeriodic is true, so setInterval will not trigger onHasTask callback | 
+| setInterval/clearInterval | MacroTask | isPeriodic is true, so setInterval will not trigger onHasTask callback |
 | requestAnimationFrame/cancelAnimationFrame | MacroTask |  |
 | mozRequestAnimationFrame/mozCancelAnimationFrame | MacroTask |  |
 | webkitRequestAnimationFrame/webkitCancelAnimationFrame | MacroTask |  |
@@ -56,7 +56,7 @@ EventTarget
 from EventTarget will also be patched.
 - For browsers that do not support EventTarget, Zone.js will patch the following APIs in the IDL
  that inherit from EventTarget
- 
+
  |||||
  |---|---|---|---|
  |ApplicationCache|EventSource|FileReader|InputMethodContext|
@@ -94,8 +94,8 @@ The following 'on' properties, such as onclick, onreadystatechange, are patched
 | --- | --- | --- |
 | setTimeout/clearTimeout | MacroTask | app can get handlerId, interval, args, isPeriodic(false) through task.data |
 | setImmediate/clearImmediate | MacroTask | same with setTimeout |
-| setInterval/clearInterval | MacroTask | isPeriodic is true, so setInterval will not trigger onHasTask callback | 
-| process.nextTick | Microtask | isPeriodic is true, so setInterval will not trigger onHasTask callback | 
+| setInterval/clearInterval | MacroTask | isPeriodic is true, so setInterval will not trigger onHasTask callback |
+| process.nextTick | Microtask | isPeriodic is true, so setInterval will not trigger onHasTask callback |
 | Promise | MicroTask |  |
 | EventEmitter | EventTask | All APIs inherit EventEmitter are patched as EventTask  |
 | crypto | MacroTask |  |
@@ -104,9 +104,9 @@ The following 'on' properties, such as onclick, onreadystatechange, are patched
 EventEmitter, addEventListener, prependEventListener and 'on' will be patched once as EventTasks, and removeEventListener and
 removeAllListeners will remove those EventTasks
 
-## Electron 
+## Electron
 
-Zone.js does not patch the Electron API, although in Electron both browser APIs and node APIs are patched, so 
+Zone.js does not patch the Electron API, although in Electron both browser APIs and node APIs are patched, so
 if you want to include Zone.js in Electron, please use dist/zone-mix.js
 
 ## ZoneAwareError
@@ -117,7 +117,7 @@ This type of issue would happen when creating an error without `new`: `this` wou
 non-strict mode. It could cause some very difficult to detect issues.
 
 ```javascript
-  const error = Error(); 
+  const error = Error();
 ```
 
 ZoneAwareError makes sure that `this` is ZoneAwareError even without new.
@@ -127,10 +127,10 @@ ZoneAwareError makes sure that `this` is ZoneAwareError even without new.
 ZoneAwarePromise wraps the global Promise and makes it run in zones as a MicroTask.
 It also passes promise A+ tests.
 
-## BlackListEvents
+## UnpatchedEvents
 
-Sometimes we don't want some `event` to be patched by `zone.js`, we can blacklist events
-by following settings.
+Sometimes we don't want some `event` to be patched by `zone.js`, we can instruct zone.js to leave
+these `event` to be unpatched by following settings.
 
 ```javascript
     // disable on properties
@@ -144,5 +144,5 @@ by following settings.
     });
 
     // disable addEventListener
-    global['__zone_symbol__BLACK_LISTED_EVENTS'] = ['scroll'];
+    global['__zone_symbol__UNPATCHED_EVENTS'] = ['scroll'];
 ```
diff --git a/packages/zone.js/dist/BUILD.bazel b/packages/zone.js/dist/BUILD.bazel
index 1452b05a0e9b0..e88b3e201665c 100644
--- a/packages/zone.js/dist/BUILD.bazel
+++ b/packages/zone.js/dist/BUILD.bazel
@@ -1,80 +1,117 @@
 package(default_visibility = ["//visibility:public"])
 
+load("//packages/zone.js/dist:tools.bzl", "copy_es2015_to_dist", "copy_es5_to_dist")
+
+copy_es2015_to_dist()
+
+copy_es5_to_dist()
+
+genrule(
+    name = "zone_externs",
+    srcs = ["//packages/zone.js:zone_externs"],
+    outs = ["zone_externs.js"],
+    cmd = "cp $< $@",
+)
+
+genrule(
+    name = "zone_extensions_d_ts",
+    srcs = ["//packages/zone.js/lib:zone.api.extensions.ts"],
+    outs = ["zone.api.extensions.ts"],
+    cmd = "cp $< $@",
+)
+
+genrule(
+    name = "zone_configurations_d_ts",
+    srcs = ["//packages/zone.js/lib:zone.configurations.api.ts"],
+    outs = ["zone.configurations.api.ts"],
+    cmd = "cp $< $@",
+)
+
+genrule(
+    name = "zone_js_d_ts",
+    srcs = ["//packages/zone.js/lib:zone_d_ts"],
+    outs = ["zone.js.d.ts"],
+    cmd = "cp $< $@",
+)
+
 filegroup(
     name = "dist_bundle_group",
     srcs = [
-        "//packages/zone.js/dist:async-test.min/package.json",
-        "//packages/zone.js/dist:async-test/package.json",
-        "//packages/zone.js/dist:fake-async-test.min/package.json",
-        "//packages/zone.js/dist:fake-async-test/package.json",
-        "//packages/zone.js/dist:jasmine-patch.min/package.json",
-        "//packages/zone.js/dist:jasmine-patch/package.json",
-        "//packages/zone.js/dist:long-stack-trace-zone.min/package.json",
-        "//packages/zone.js/dist:long-stack-trace-zone/package.json",
-        "//packages/zone.js/dist:mocha-patch.min/package.json",
-        "//packages/zone.js/dist:mocha-patch/package.json",
-        "//packages/zone.js/dist:proxy.min/package.json",
-        "//packages/zone.js/dist:proxy/package.json",
-        "//packages/zone.js/dist:sync-test.min/package.json",
-        "//packages/zone.js/dist:sync-test/package.json",
-        "//packages/zone.js/dist:task-tracking.min/package.json",
-        "//packages/zone.js/dist:task-tracking/package.json",
-        "//packages/zone.js/dist:webapis-media-query.min/package.json",
-        "//packages/zone.js/dist:webapis-media-query/package.json",
-        "//packages/zone.js/dist:webapis-notification.min/package.json",
-        "//packages/zone.js/dist:webapis-notification/package.json",
-        "//packages/zone.js/dist:webapis-rtc-peer-connection.min/package.json",
-        "//packages/zone.js/dist:webapis-rtc-peer-connection/package.json",
-        "//packages/zone.js/dist:webapis-shadydom.min/package.json",
-        "//packages/zone.js/dist:webapis-shadydom/package.json",
-        "//packages/zone.js/dist:wtf.min/package.json",
-        "//packages/zone.js/dist:wtf/package.json",
-        "//packages/zone.js/dist:zone.min/package.json",
-        "//packages/zone.js/dist:zone-bluebird.min/package.json",
-        "//packages/zone.js/dist:zone-bluebird/package.json",
-        "//packages/zone.js/dist:zone-error.min/package.json",
-        "//packages/zone.js/dist:zone-error/package.json",
-        "//packages/zone.js/dist:zone-evergreen.min/package.json",
-        "//packages/zone.js/dist:zone-evergreen-testing-bundle.min/package.json",
-        "//packages/zone.js/dist:zone-evergreen-testing-bundle/package.json",
-        "//packages/zone.js/dist:zone-evergreen/package.json",
-        "//packages/zone.js/dist:zone-legacy.min/package.json",
-        "//packages/zone.js/dist:zone-legacy/package.json",
-        "//packages/zone.js/dist:zone-mix.min/package.json",
-        "//packages/zone.js/dist:zone-mix/package.json",
-        "//packages/zone.js/dist:zone-node.min/package.json",
-        "//packages/zone.js/dist:zone-node/package.json",
-        "//packages/zone.js/dist:zone-patch-canvas.min/package.json",
-        "//packages/zone.js/dist:zone-patch-canvas/package.json",
-        "//packages/zone.js/dist:zone-patch-cordova.min/package.json",
-        "//packages/zone.js/dist:zone-patch-cordova/package.json",
-        "//packages/zone.js/dist:zone-patch-electron.min/package.json",
-        "//packages/zone.js/dist:zone-patch-electron/package.json",
-        "//packages/zone.js/dist:zone-patch-fetch.min/package.json",
-        "//packages/zone.js/dist:zone-patch-fetch/package.json",
-        "//packages/zone.js/dist:zone-patch-jsonp.min/package.json",
-        "//packages/zone.js/dist:zone-patch-jsonp/package.json",
-        "//packages/zone.js/dist:zone-patch-message-port.min/package.json",
-        "//packages/zone.js/dist:zone-patch-message-port/package.json",
-        "//packages/zone.js/dist:zone-patch-promise-test.min/package.json",
-        "//packages/zone.js/dist:zone-patch-promise-test/package.json",
-        "//packages/zone.js/dist:zone-patch-resize-observer.min/package.json",
-        "//packages/zone.js/dist:zone-patch-resize-observer/package.json",
-        "//packages/zone.js/dist:zone-patch-rxjs.min/package.json",
-        "//packages/zone.js/dist:zone-patch-rxjs-fake-async.min/package.json",
-        "//packages/zone.js/dist:zone-patch-rxjs-fake-async/package.json",
-        "//packages/zone.js/dist:zone-patch-rxjs/package.json",
-        "//packages/zone.js/dist:zone-patch-socket-io.min/package.json",
-        "//packages/zone.js/dist:zone-patch-socket-io/package.json",
-        "//packages/zone.js/dist:zone-patch-user-media.min/package.json",
-        "//packages/zone.js/dist:zone-patch-user-media/package.json",
-        "//packages/zone.js/dist:zone-testing.min/package.json",
-        "//packages/zone.js/dist:zone-testing-bundle.min/package.json",
-        "//packages/zone.js/dist:zone-testing-bundle/package.json",
-        "//packages/zone.js/dist:zone-testing-node-bundle.min/package.json",
-        "//packages/zone.js/dist:zone-testing-node-bundle/package.json",
-        "//packages/zone.js/dist:zone-testing/package.json",
-        "//packages/zone.js/dist:zone/package.json",
-        "//packages/zone.js/dist:zone_externs/package.json",
+        ":async-test.js",
+        ":async-test.min.js",
+        ":fake-async-test.js",
+        ":fake-async-test.min.js",
+        ":jasmine-patch.js",
+        ":jasmine-patch.min.js",
+        ":long-stack-trace-zone.js",
+        ":long-stack-trace-zone.min.js",
+        ":mocha-patch.js",
+        ":mocha-patch.min.js",
+        ":proxy.js",
+        ":proxy.min.js",
+        ":sync-test.js",
+        ":sync-test.min.js",
+        ":task-tracking.js",
+        ":task-tracking.min.js",
+        ":webapis-media-query.js",
+        ":webapis-media-query.min.js",
+        ":webapis-notification.js",
+        ":webapis-notification.min.js",
+        ":webapis-rtc-peer-connection.js",
+        ":webapis-rtc-peer-connection.min.js",
+        ":webapis-shadydom.js",
+        ":webapis-shadydom.min.js",
+        ":wtf.js",
+        ":wtf.min.js",
+        ":zone.js",
+        ":zone.min.js",
+        ":zone-bluebird.js",
+        ":zone-bluebird.min.js",
+        ":zone-error.js",
+        ":zone-error.min.js",
+        ":zone-evergreen.js",
+        ":zone-evergreen.min.js",
+        ":zone-evergreen-testing-bundle.js",
+        ":zone-evergreen-testing-bundle.min.js",
+        ":zone-legacy.js",
+        ":zone-legacy.min.js",
+        ":zone-mix.js",
+        ":zone-mix.min.js",
+        ":zone-node.js",
+        ":zone-node.min.js",
+        ":zone-patch-canvas.js",
+        ":zone-patch-canvas.min.js",
+        ":zone-patch-cordova.js",
+        ":zone-patch-cordova.min.js",
+        ":zone-patch-electron.js",
+        ":zone-patch-electron.min.js",
+        ":zone-patch-fetch.js",
+        ":zone-patch-fetch.min.js",
+        ":zone-patch-jsonp.js",
+        ":zone-patch-jsonp.min.js",
+        ":zone-patch-message-port.js",
+        ":zone-patch-message-port.min.js",
+        ":zone-patch-promise-test.js",
+        ":zone-patch-promise-test.min.js",
+        ":zone-patch-resize-observer.js",
+        ":zone-patch-resize-observer.min.js",
+        ":zone-patch-rxjs.js",
+        ":zone-patch-rxjs.min.js",
+        ":zone-patch-rxjs-fake-async.js",
+        ":zone-patch-rxjs-fake-async.min.js",
+        ":zone-patch-socket-io.js",
+        ":zone-patch-socket-io.min.js",
+        ":zone-patch-user-media.js",
+        ":zone-patch-user-media.min.js",
+        ":zone-testing.js",
+        ":zone-testing.min.js",
+        ":zone-testing-bundle.js",
+        ":zone-testing-bundle.min.js",
+        ":zone-testing-node-bundle.js",
+        ":zone-testing-node-bundle.min.js",
+        ":zone_configurations_d_ts",
+        ":zone_extensions_d_ts",
+        ":zone_externs",
+        ":zone_js_d_ts",
     ],
 )
diff --git a/packages/zone.js/dist/async-test.min/package.json b/packages/zone.js/dist/async-test.min/package.json
deleted file mode 100644
index 99281391061b8..0000000000000
--- a/packages/zone.js/dist/async-test.min/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/async-test.min",
-  "main": "../../bundles/async-test.umd.min.js",
-  "fesm2015": "../../fesm2015/async-test.min.js",
-  "es2015": "../../fesm2015/async-test.min.js",
-  "module": "../../fesm2015/async-test.min.js"
-}
diff --git a/packages/zone.js/dist/async-test/package.json b/packages/zone.js/dist/async-test/package.json
deleted file mode 100644
index c6dc4c07a1e9b..0000000000000
--- a/packages/zone.js/dist/async-test/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/async-test",
-  "main": "../../bundles/async-test.umd.js",
-  "fesm2015": "../../fesm2015/async-test.js",
-  "es2015": "../../fesm2015/async-test.js",
-  "module": "../../fesm2015/async-test.js"
-}
diff --git a/packages/zone.js/dist/fake-async-test.min/package.json b/packages/zone.js/dist/fake-async-test.min/package.json
deleted file mode 100644
index df98ce6862113..0000000000000
--- a/packages/zone.js/dist/fake-async-test.min/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/fake-async-test.min",
-  "main": "../../bundles/fake-async-test.umd.min.js",
-  "fesm2015": "../../fesm2015/fake-async-test.min.js",
-  "es2015": "../../fesm2015/fake-async-test.min.js",
-  "module": "../../fesm2015/fake-async-test.min.js"
-}
diff --git a/packages/zone.js/dist/fake-async-test/package.json b/packages/zone.js/dist/fake-async-test/package.json
deleted file mode 100644
index feab6e986c11e..0000000000000
--- a/packages/zone.js/dist/fake-async-test/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/fake-async-test",
-  "main": "../../bundles/fake-async-test.umd.js",
-  "fesm2015": "../../fesm2015/fake-async-test.js",
-  "es2015": "../../fesm2015/fake-async-test.js",
-  "module": "../../fesm2015/fake-async-test.js"
-}
diff --git a/packages/zone.js/dist/jasmine-patch.min/package.json b/packages/zone.js/dist/jasmine-patch.min/package.json
deleted file mode 100644
index 2577835c8a2dd..0000000000000
--- a/packages/zone.js/dist/jasmine-patch.min/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/jasmine-patch.min",
-  "main": "../../bundles/jasmine-patch.umd.min.js",
-  "fesm2015": "../../fesm2015/jasmine-patch.min.js",
-  "es2015": "../../fesm2015/jasmine-patch.min.js",
-  "module": "../../fesm2015/jasmine-patch.min.js"
-}
diff --git a/packages/zone.js/dist/jasmine-patch/package.json b/packages/zone.js/dist/jasmine-patch/package.json
deleted file mode 100644
index 85a712b81232a..0000000000000
--- a/packages/zone.js/dist/jasmine-patch/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/jasmine-patch",
-  "main": "../../bundles/jasmine-patch.umd.js",
-  "fesm2015": "../../fesm2015/jasmine-patch.js",
-  "es2015": "../../fesm2015/jasmine-patch.js",
-  "module": "../../fesm2015/jasmine-patch.js"
-}
diff --git a/packages/zone.js/dist/long-stack-trace-zone.min/package.json b/packages/zone.js/dist/long-stack-trace-zone.min/package.json
deleted file mode 100644
index fbd117c105c43..0000000000000
--- a/packages/zone.js/dist/long-stack-trace-zone.min/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/long-stack-trace-zone.min",
-  "main": "../../bundles/long-stack-trace-zone.umd.min.js",
-  "fesm2015": "../../fesm2015/long-stack-trace-zone.min.js",
-  "es2015": "../../fesm2015/long-stack-trace-zone.min.js",
-  "module": "../../fesm2015/long-stack-trace-zone.min.js"
-}
diff --git a/packages/zone.js/dist/long-stack-trace-zone/package.json b/packages/zone.js/dist/long-stack-trace-zone/package.json
deleted file mode 100644
index e3038e1f71c78..0000000000000
--- a/packages/zone.js/dist/long-stack-trace-zone/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/long-stack-trace-zone",
-  "main": "../../bundles/long-stack-trace-zone.umd.js",
-  "fesm2015": "../../fesm2015/long-stack-trace-zone.js",
-  "es2015": "../../fesm2015/long-stack-trace-zone.js",
-  "module": "../../fesm2015/long-stack-trace-zone.js"
-}
diff --git a/packages/zone.js/dist/mocha-patch.min/package.json b/packages/zone.js/dist/mocha-patch.min/package.json
deleted file mode 100644
index 056fea4c86076..0000000000000
--- a/packages/zone.js/dist/mocha-patch.min/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/mocha-patch.min",
-  "main": "../../bundles/mocha-patch.umd.min.js",
-  "fesm2015": "../../fesm2015/mocha-patch.min.js",
-  "es2015": "../../fesm2015/mocha-patch.min.js",
-  "module": "../../fesm2015/mocha-patch.min.js"
-}
diff --git a/packages/zone.js/dist/mocha-patch/package.json b/packages/zone.js/dist/mocha-patch/package.json
deleted file mode 100644
index d88ff072282aa..0000000000000
--- a/packages/zone.js/dist/mocha-patch/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/mocha-patch",
-  "main": "../../bundles/mocha-patch.umd.js",
-  "fesm2015": "../../fesm2015/mocha-patch.js",
-  "es2015": "../../fesm2015/mocha-patch.js",
-  "module": "../../fesm2015/mocha-patch.js"
-}
diff --git a/packages/zone.js/dist/proxy.min/package.json b/packages/zone.js/dist/proxy.min/package.json
deleted file mode 100644
index 3c8b4eced0a89..0000000000000
--- a/packages/zone.js/dist/proxy.min/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/proxy.min",
-  "main": "../../bundles/proxy.umd.min.js",
-  "fesm2015": "../../fesm2015/proxy.min.js",
-  "es2015": "../../fesm2015/proxy.min.js",
-  "module": "../../fesm2015/proxy.min.js"
-}
diff --git a/packages/zone.js/dist/proxy/package.json b/packages/zone.js/dist/proxy/package.json
deleted file mode 100644
index 26c3b0921e4b3..0000000000000
--- a/packages/zone.js/dist/proxy/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/proxy",
-  "main": "../../bundles/proxy.umd.js",
-  "fesm2015": "../../fesm2015/proxy.js",
-  "es2015": "../../fesm2015/proxy.js",
-  "module": "../../fesm2015/proxy.js"
-}
diff --git a/packages/zone.js/dist/sync-test.min/package.json b/packages/zone.js/dist/sync-test.min/package.json
deleted file mode 100644
index 47a668f4e3380..0000000000000
--- a/packages/zone.js/dist/sync-test.min/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/sync-test.min",
-  "main": "../../bundles/sync-test.umd.min.js",
-  "fesm2015": "../../fesm2015/sync-test.min.js",
-  "es2015": "../../fesm2015/sync-test.min.js",
-  "module": "../../fesm2015/sync-test.min.js"
-}
diff --git a/packages/zone.js/dist/sync-test/package.json b/packages/zone.js/dist/sync-test/package.json
deleted file mode 100644
index 31c7a125f6fc5..0000000000000
--- a/packages/zone.js/dist/sync-test/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/sync-test",
-  "main": "../../bundles/sync-test.umd.js",
-  "fesm2015": "../../fesm2015/sync-test.js",
-  "es2015": "../../fesm2015/sync-test.js",
-  "module": "../../fesm2015/sync-test.js"
-}
diff --git a/packages/zone.js/dist/task-tracking.min/package.json b/packages/zone.js/dist/task-tracking.min/package.json
deleted file mode 100644
index d9247baf2bf76..0000000000000
--- a/packages/zone.js/dist/task-tracking.min/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/task-tracking.min",
-  "main": "../../bundles/task-tracking.umd.min.js",
-  "fesm2015": "../../fesm2015/task-tracking.min.js",
-  "es2015": "../../fesm2015/task-tracking.min.js",
-  "module": "../../fesm2015/task-tracking.min.js"
-}
diff --git a/packages/zone.js/dist/task-tracking/package.json b/packages/zone.js/dist/task-tracking/package.json
deleted file mode 100644
index dbf8ace6bf0dc..0000000000000
--- a/packages/zone.js/dist/task-tracking/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/task-tracking",
-  "main": "../../bundles/task-tracking.umd.js",
-  "fesm2015": "../../fesm2015/task-tracking.js",
-  "es2015": "../../fesm2015/task-tracking.js",
-  "module": "../../fesm2015/task-tracking.js"
-}
diff --git a/packages/zone.js/dist/tools.bzl b/packages/zone.js/dist/tools.bzl
new file mode 100644
index 0000000000000..6ac4af5fef845
--- /dev/null
+++ b/packages/zone.js/dist/tools.bzl
@@ -0,0 +1,71 @@
+ES5_BUNDLES = [
+    "zone",
+    "zone-mix",
+    "zone-node",
+    "zone-testing-node-bundle",
+    "async-test",
+    "fake-async-test",
+    "long-stack-trace-zone",
+    "proxy",
+    "zone-patch-rxjs-fake-async",
+    "sync-test",
+    "task-tracking",
+    "wtf",
+    "zone-error",
+    "zone-legacy",
+    "zone-bluebird",
+    "zone-patch-canvas",
+    "zone-patch-cordova",
+    "zone-patch-electron",
+    "zone-patch-fetch",
+    "jasmine-patch",
+    "zone-patch-jsonp",
+    "webapis-media-query",
+    "mocha-patch",
+    "webapis-notification",
+    "zone-patch-promise-test",
+    "zone-patch-resize-observer",
+    "webapis-rtc-peer-connection",
+    "zone-patch-rxjs",
+    "webapis-shadydom",
+    "zone-patch-socket-io",
+    "zone-patch-user-media",
+    "zone-patch-message-port",
+    "zone-testing",
+    "zone-testing-bundle",
+]
+
+ES2015_BUNDLES = {
+    "zone-evergreen": "//packages/zone.js/fesm2015:zone",
+    "zone-evergreen-testing-bundle": "//packages/zone.js/fesm2015:zone-testing-bundle",
+}
+
+def copy_es5_to_dist():
+    for b in ES5_BUNDLES:
+        native.genrule(
+            name = "zone_copy_" + b,
+            srcs = ["//packages/zone.js/bundles:" + b + ".umd.js"],
+            outs = [b + ".js"],
+            cmd = "cp $< $@",
+        )
+        native.genrule(
+            name = "zone_copy_min_" + b,
+            srcs = ["//packages/zone.js/bundles:" + b + ".umd.min.js"],
+            outs = [b + ".min.js"],
+            cmd = "cp $< $@",
+        )
+
+def copy_es2015_to_dist():
+    for b in ES2015_BUNDLES.items():
+        native.genrule(
+            name = "zone_copy_" + b[0],
+            srcs = [b[1] + ".js"],
+            outs = [b[0] + ".js"],
+            cmd = "cp $< $@",
+        )
+        native.genrule(
+            name = "zone_copy_min_" + b[0],
+            srcs = [b[1] + ".min.js"],
+            outs = [b[0] + ".min.js"],
+            cmd = "cp $< $@",
+        )
diff --git a/packages/zone.js/dist/webapis-media-query.min/package.json b/packages/zone.js/dist/webapis-media-query.min/package.json
deleted file mode 100644
index b512baa6633a1..0000000000000
--- a/packages/zone.js/dist/webapis-media-query.min/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/webapis-media-query.min",
-  "main": "../../bundles/webapis-media-query.umd.min.js",
-  "fesm2015": "../../fesm2015/webapis-media-query.min.js",
-  "es2015": "../../fesm2015/webapis-media-query.min.js",
-  "module": "../../fesm2015/webapis-media-query.min.js"
-}
diff --git a/packages/zone.js/dist/webapis-media-query/package.json b/packages/zone.js/dist/webapis-media-query/package.json
deleted file mode 100644
index 00383a1420763..0000000000000
--- a/packages/zone.js/dist/webapis-media-query/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/webapis-media-query",
-  "main": "../../bundles/webapis-media-query.umd.js",
-  "fesm2015": "../../fesm2015/webapis-media-query.js",
-  "es2015": "../../fesm2015/webapis-media-query.js",
-  "module": "../../fesm2015/webapis-media-query.js"
-}
diff --git a/packages/zone.js/dist/webapis-notification.min/package.json b/packages/zone.js/dist/webapis-notification.min/package.json
deleted file mode 100644
index 34b7a46fe39b4..0000000000000
--- a/packages/zone.js/dist/webapis-notification.min/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/webapis-notification.min",
-  "main": "../../bundles/webapis-notification.umd.min.js",
-  "fesm2015": "../../fesm2015/webapis-notification.min.js",
-  "es2015": "../../fesm2015/webapis-notification.min.js",
-  "module": "../../fesm2015/webapis-notification.min.js"
-}
diff --git a/packages/zone.js/dist/webapis-notification/package.json b/packages/zone.js/dist/webapis-notification/package.json
deleted file mode 100644
index 69f50f21927b4..0000000000000
--- a/packages/zone.js/dist/webapis-notification/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/webapis-notification",
-  "main": "../../bundles/webapis-notification.umd.js",
-  "fesm2015": "../../fesm2015/webapis-notification.js",
-  "es2015": "../../fesm2015/webapis-notification.js",
-  "module": "../../fesm2015/webapis-notification.js"
-}
diff --git a/packages/zone.js/dist/webapis-rtc-peer-connection.min/package.json b/packages/zone.js/dist/webapis-rtc-peer-connection.min/package.json
deleted file mode 100644
index 6cee513b3583f..0000000000000
--- a/packages/zone.js/dist/webapis-rtc-peer-connection.min/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/webapis-rtc-peer-connection.min",
-  "main": "../../bundles/webapis-rtc-peer-connection.umd.min.js",
-  "fesm2015": "../../fesm2015/webapis-rtc-peer-connection.min.js",
-  "es2015": "../../fesm2015/webapis-rtc-peer-connection.min.js",
-  "module": "../../fesm2015/webapis-rtc-peer-connection.min.js"
-}
diff --git a/packages/zone.js/dist/webapis-rtc-peer-connection/package.json b/packages/zone.js/dist/webapis-rtc-peer-connection/package.json
deleted file mode 100644
index 187857fc3f552..0000000000000
--- a/packages/zone.js/dist/webapis-rtc-peer-connection/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/webapis-rtc-peer-connection",
-  "main": "../../bundles/webapis-rtc-peer-connection.umd.js",
-  "fesm2015": "../../fesm2015/webapis-rtc-peer-connection.js",
-  "es2015": "../../fesm2015/webapis-rtc-peer-connection.js",
-  "module": "../../fesm2015/webapis-rtc-peer-connection.js"
-}
diff --git a/packages/zone.js/dist/webapis-shadydom.min/package.json b/packages/zone.js/dist/webapis-shadydom.min/package.json
deleted file mode 100644
index c0f63f629dea7..0000000000000
--- a/packages/zone.js/dist/webapis-shadydom.min/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/webapis-shadydom.min",
-  "main": "../../bundles/webapis-shadydom.umd.min.js",
-  "fesm2015": "../../fesm2015/webapis-shadydom.min.js",
-  "es2015": "../../fesm2015/webapis-shadydom.min.js",
-  "module": "../../fesm2015/webapis-shadydom.min.js"
-}
diff --git a/packages/zone.js/dist/webapis-shadydom/package.json b/packages/zone.js/dist/webapis-shadydom/package.json
deleted file mode 100644
index 094020cfb1a74..0000000000000
--- a/packages/zone.js/dist/webapis-shadydom/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/webapis-shadydom",
-  "main": "../../bundles/webapis-shadydom.umd.js",
-  "fesm2015": "../../fesm2015/webapis-shadydom.js",
-  "es2015": "../../fesm2015/webapis-shadydom.js",
-  "module": "../../fesm2015/webapis-shadydom.js"
-}
diff --git a/packages/zone.js/dist/wtf.min/package.json b/packages/zone.js/dist/wtf.min/package.json
deleted file mode 100644
index 0cd382df4b26a..0000000000000
--- a/packages/zone.js/dist/wtf.min/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/wtf.min",
-  "main": "../../bundles/wtf.umd.min.js",
-  "fesm2015": "../../fesm2015/wtf.min.js",
-  "es2015": "../../fesm2015/wtf.min.js",
-  "module": "../../fesm2015/wtf.min.js"
-}
diff --git a/packages/zone.js/dist/wtf/package.json b/packages/zone.js/dist/wtf/package.json
deleted file mode 100644
index 30a38fa85ff41..0000000000000
--- a/packages/zone.js/dist/wtf/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/wtf",
-  "main": "../../bundles/wtf.umd.js",
-  "fesm2015": "../../fesm2015/wtf.js",
-  "es2015": "../../fesm2015/wtf.js",
-  "module": "../../fesm2015/wtf.js"
-}
diff --git a/packages/zone.js/dist/zone-bluebird.min/package.json b/packages/zone.js/dist/zone-bluebird.min/package.json
deleted file mode 100644
index 4893934a86491..0000000000000
--- a/packages/zone.js/dist/zone-bluebird.min/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/zone-bluebird.min",
-  "main": "../../bundles/zone-bluebird.umd.min.js",
-  "fesm2015": "../../fesm2015/zone-bluebird.min.js",
-  "es2015": "../../fesm2015/zone-bluebird.min.js",
-  "module": "../../fesm2015/zone-bluebird.min.js"
-}
diff --git a/packages/zone.js/dist/zone-bluebird/package.json b/packages/zone.js/dist/zone-bluebird/package.json
deleted file mode 100644
index cbe50f384c555..0000000000000
--- a/packages/zone.js/dist/zone-bluebird/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/zone-bluebird",
-  "main": "../../bundles/zone-bluebird.umd.js",
-  "fesm2015": "../../fesm2015/zone-bluebird.js",
-  "es2015": "../../fesm2015/zone-bluebird.js",
-  "module": "../../fesm2015/zone-bluebird.js"
-}
diff --git a/packages/zone.js/dist/zone-error.min/package.json b/packages/zone.js/dist/zone-error.min/package.json
deleted file mode 100644
index 3ab27961e1456..0000000000000
--- a/packages/zone.js/dist/zone-error.min/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/zone-error.min",
-  "main": "../../bundles/zone-error.umd.min.js",
-  "fesm2015": "../../fesm2015/zone-error.min.js",
-  "es2015": "../../fesm2015/zone-error.min.js",
-  "module": "../../fesm2015/zone-error.min.js"
-}
diff --git a/packages/zone.js/dist/zone-error/package.json b/packages/zone.js/dist/zone-error/package.json
deleted file mode 100644
index c493ca1cee629..0000000000000
--- a/packages/zone.js/dist/zone-error/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/zone-error",
-  "main": "../../bundles/zone-error.umd.js",
-  "fesm2015": "../../fesm2015/zone-error.js",
-  "es2015": "../../fesm2015/zone-error.js",
-  "module": "../../fesm2015/zone-error.js"
-}
diff --git a/packages/zone.js/dist/zone-evergreen-testing-bundle.min/package.json b/packages/zone.js/dist/zone-evergreen-testing-bundle.min/package.json
deleted file mode 100644
index 8ace64a6465a2..0000000000000
--- a/packages/zone.js/dist/zone-evergreen-testing-bundle.min/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/zone-evergreen-testing-bundle.min",
-  "main": "../../fesm2015/zone-testing-bundle.min.js",
-  "fesm2015": "../../fesm2015/zone-testing-bundle.min.js",
-  "es2015": "../../fesm2015/zone-testing-bundle.min.js",
-  "module": "../../fesm2015/zone-testing-bundle.min.js"
-}
diff --git a/packages/zone.js/dist/zone-evergreen-testing-bundle/package.json b/packages/zone.js/dist/zone-evergreen-testing-bundle/package.json
deleted file mode 100644
index 816a921284180..0000000000000
--- a/packages/zone.js/dist/zone-evergreen-testing-bundle/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/zone-evergreen-testing-bundle",
-  "main": "../../fesm2015/zone-testing-bundle.js",
-  "fesm2015": "../../fesm2015/zone-testing-bundle.js",
-  "es2015": "../../fesm2015/zone-testing-bundle.js",
-  "module": "../../fesm2015/zone-testing-bundle.js"
-}
diff --git a/packages/zone.js/dist/zone-evergreen.min/package.json b/packages/zone.js/dist/zone-evergreen.min/package.json
deleted file mode 100644
index 11fe4968c8888..0000000000000
--- a/packages/zone.js/dist/zone-evergreen.min/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/zone-evergreen.min",
-  "main": "../../fesm2015/zone.min.js",
-  "fesm2015": "../../fesm2015/zone.min.js",
-  "es2015": "../../fesm2015/zone.min.js",
-  "module": "../../fesm2015/zone.min.js"
-}
diff --git a/packages/zone.js/dist/zone-evergreen/package.json b/packages/zone.js/dist/zone-evergreen/package.json
deleted file mode 100644
index 7b39adcc6bdf3..0000000000000
--- a/packages/zone.js/dist/zone-evergreen/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/zone-evergreen",
-  "main": "../../fesm2015/zone.js",
-  "fesm2015": "../../fesm2015/zone.js",
-  "es2015": "../../fesm2015/zone.js",
-  "module": "../../fesm2015/zone.js"
-}
diff --git a/packages/zone.js/dist/zone-legacy.min/package.json b/packages/zone.js/dist/zone-legacy.min/package.json
deleted file mode 100644
index f0f2739db93e9..0000000000000
--- a/packages/zone.js/dist/zone-legacy.min/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/zone-legacy.min",
-  "main": "../../bundles/zone-legacy.umd.min.js",
-  "fesm2015": "../../fesm2015/zone-legacy.min.js",
-  "es2015": "../../fesm2015/zone-legacy.min.js",
-  "module": "../../fesm2015/zone-legacy.min.js"
-}
diff --git a/packages/zone.js/dist/zone-legacy/package.json b/packages/zone.js/dist/zone-legacy/package.json
deleted file mode 100644
index b87125f159180..0000000000000
--- a/packages/zone.js/dist/zone-legacy/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/zone-legacy",
-  "main": "../../bundles/zone-legacy.umd.js",
-  "fesm2015": "../../fesm2015/zone-legacy.js",
-  "es2015": "../../fesm2015/zone-legacy.js",
-  "module": "../../fesm2015/zone-legacy.js"
-}
diff --git a/packages/zone.js/dist/zone-mix.min/package.json b/packages/zone.js/dist/zone-mix.min/package.json
deleted file mode 100644
index f9bcee10fd0ac..0000000000000
--- a/packages/zone.js/dist/zone-mix.min/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/zone-mix.min",
-  "main": "../../bundles/zone-mix.umd.min.js",
-  "fesm2015": "../../fesm2015/zone-mix.min.js",
-  "es2015": "../../fesm2015/zone-mix.min.js",
-  "module": "../../fesm2015/zone-mix.min.js"
-}
diff --git a/packages/zone.js/dist/zone-mix/package.json b/packages/zone.js/dist/zone-mix/package.json
deleted file mode 100644
index ba9b5db934ab3..0000000000000
--- a/packages/zone.js/dist/zone-mix/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/zone-mix",
-  "main": "../../bundles/zone-mix.umd.js",
-  "fesm2015": "../../fesm2015/zone-mix.js",
-  "es2015": "../../fesm2015/zone-mix.js",
-  "module": "../../fesm2015/zone-mix.js"
-}
diff --git a/packages/zone.js/dist/zone-node.min/package.json b/packages/zone.js/dist/zone-node.min/package.json
deleted file mode 100644
index ae9c89901dd42..0000000000000
--- a/packages/zone.js/dist/zone-node.min/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/zone-node.min",
-  "main": "../../bundles/zone-node.umd.min.js",
-  "fesm2015": "../../fesm2015/zone-node.min.js",
-  "es2015": "../../fesm2015/zone-node.min.js",
-  "module": "../../fesm2015/zone-node.min.js"
-}
diff --git a/packages/zone.js/dist/zone-node/package.json b/packages/zone.js/dist/zone-node/package.json
deleted file mode 100644
index 4636504304fda..0000000000000
--- a/packages/zone.js/dist/zone-node/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/zone-node",
-  "main": "../../bundles/zone-node.umd.js",
-  "fesm2015": "../../fesm2015/zone-node.js",
-  "es2015": "../../fesm2015/zone-node.js",
-  "module": "../../fesm2015/zone-node.js"
-}
diff --git a/packages/zone.js/dist/zone-patch-canvas.min/package.json b/packages/zone.js/dist/zone-patch-canvas.min/package.json
deleted file mode 100644
index 9b0501c8ec7a2..0000000000000
--- a/packages/zone.js/dist/zone-patch-canvas.min/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/zone-patch-canvas.min",
-  "main": "../../bundles/zone-patch-canvas.umd.min.js",
-  "fesm2015": "../../fesm2015/zone-patch-canvas.min.js",
-  "es2015": "../../fesm2015/zone-patch-canvas.min.js",
-  "module": "../../fesm2015/zone-patch-canvas.min.js"
-}
diff --git a/packages/zone.js/dist/zone-patch-canvas/package.json b/packages/zone.js/dist/zone-patch-canvas/package.json
deleted file mode 100644
index 5f95609908686..0000000000000
--- a/packages/zone.js/dist/zone-patch-canvas/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/zone-patch-canvas",
-  "main": "../../bundles/zone-patch-canvas.umd.js",
-  "fesm2015": "../../fesm2015/zone-patch-canvas.js",
-  "es2015": "../../fesm2015/zone-patch-canvas.js",
-  "module": "../../fesm2015/zone-patch-canvas.js"
-}
diff --git a/packages/zone.js/dist/zone-patch-cordova.min/package.json b/packages/zone.js/dist/zone-patch-cordova.min/package.json
deleted file mode 100644
index 0dbbf3aa6650e..0000000000000
--- a/packages/zone.js/dist/zone-patch-cordova.min/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/zone-patch-cordova.min",
-  "main": "../../bundles/zone-patch-cordova.umd.min.js",
-  "fesm2015": "../../fesm2015/zone-patch-cordova.min.js",
-  "es2015": "../../fesm2015/zone-patch-cordova.min.js",
-  "module": "../../fesm2015/zone-patch-cordova.min.js"
-}
diff --git a/packages/zone.js/dist/zone-patch-cordova/package.json b/packages/zone.js/dist/zone-patch-cordova/package.json
deleted file mode 100644
index c4303225fd1a7..0000000000000
--- a/packages/zone.js/dist/zone-patch-cordova/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/zone-patch-cordova",
-  "main": "../../bundles/zone-patch-cordova.umd.js",
-  "fesm2015": "../../fesm2015/zone-patch-cordova.js",
-  "es2015": "../../fesm2015/zone-patch-cordova.js",
-  "module": "../../fesm2015/zone-patch-cordova.js"
-}
diff --git a/packages/zone.js/dist/zone-patch-electron.min/package.json b/packages/zone.js/dist/zone-patch-electron.min/package.json
deleted file mode 100644
index c50d2f986b990..0000000000000
--- a/packages/zone.js/dist/zone-patch-electron.min/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/zone-patch-electron.min",
-  "main": "../../bundles/zone-patch-electron.umd.min.js",
-  "fesm2015": "../../fesm2015/zone-patch-electron.min.js",
-  "es2015": "../../fesm2015/zone-patch-electron.min.js",
-  "module": "../../fesm2015/zone-patch-electron.min.js"
-}
diff --git a/packages/zone.js/dist/zone-patch-electron/package.json b/packages/zone.js/dist/zone-patch-electron/package.json
deleted file mode 100644
index 157e823c00b1e..0000000000000
--- a/packages/zone.js/dist/zone-patch-electron/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/zone-patch-electron",
-  "main": "../../bundles/zone-patch-electron.umd.js",
-  "fesm2015": "../../fesm2015/zone-patch-electron.js",
-  "es2015": "../../fesm2015/zone-patch-electron.js",
-  "module": "../../fesm2015/zone-patch-electron.js"
-}
diff --git a/packages/zone.js/dist/zone-patch-fetch.min/package.json b/packages/zone.js/dist/zone-patch-fetch.min/package.json
deleted file mode 100644
index 5aa46814bba0b..0000000000000
--- a/packages/zone.js/dist/zone-patch-fetch.min/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/zone-patch-fetch.min",
-  "main": "../../bundles/zone-patch-fetch.umd.min.js",
-  "fesm2015": "../../fesm2015/zone-patch-fetch.min.js",
-  "es2015": "../../fesm2015/zone-patch-fetch.min.js",
-  "module": "../../fesm2015/zone-patch-fetch.min.js"
-}
diff --git a/packages/zone.js/dist/zone-patch-fetch/package.json b/packages/zone.js/dist/zone-patch-fetch/package.json
deleted file mode 100644
index 2b902bc5a1b39..0000000000000
--- a/packages/zone.js/dist/zone-patch-fetch/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/zone-patch-fetch",
-  "main": "../../bundles/zone-patch-fetch.umd.js",
-  "fesm2015": "../../fesm2015/zone-patch-fetch.js",
-  "es2015": "../../fesm2015/zone-patch-fetch.js",
-  "module": "../../fesm2015/zone-patch-fetch.js"
-}
diff --git a/packages/zone.js/dist/zone-patch-jsonp.min/package.json b/packages/zone.js/dist/zone-patch-jsonp.min/package.json
deleted file mode 100644
index 9e274dc71b0c0..0000000000000
--- a/packages/zone.js/dist/zone-patch-jsonp.min/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/zone-patch-jsonp.min",
-  "main": "../../bundles/zone-patch-jsonp.umd.min.js",
-  "fesm2015": "../../fesm2015/zone-patch-jsonp.min.js",
-  "es2015": "../../fesm2015/zone-patch-jsonp.min.js",
-  "module": "../../fesm2015/zone-patch-jsonp.min.js"
-}
diff --git a/packages/zone.js/dist/zone-patch-jsonp/package.json b/packages/zone.js/dist/zone-patch-jsonp/package.json
deleted file mode 100644
index 426a0da45b540..0000000000000
--- a/packages/zone.js/dist/zone-patch-jsonp/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/zone-patch-jsonp",
-  "main": "../../bundles/zone-patch-jsonp.umd.js",
-  "fesm2015": "../../fesm2015/zone-patch-jsonp.js",
-  "es2015": "../../fesm2015/zone-patch-jsonp.js",
-  "module": "../../fesm2015/zone-patch-jsonp.js"
-}
diff --git a/packages/zone.js/dist/zone-patch-message-port.min/package.json b/packages/zone.js/dist/zone-patch-message-port.min/package.json
deleted file mode 100644
index c1e4a3a2caa84..0000000000000
--- a/packages/zone.js/dist/zone-patch-message-port.min/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/zone-patch-message-port.min",
-  "main": "../../bundles/zone-patch-message-port.umd.min.js",
-  "fesm2015": "../../fesm2015/zone-patch-message-port.min.js",
-  "es2015": "../../fesm2015/zone-patch-message-port.min.js",
-  "module": "../../fesm2015/zone-patch-message-port.min.js"
-}
diff --git a/packages/zone.js/dist/zone-patch-message-port/package.json b/packages/zone.js/dist/zone-patch-message-port/package.json
deleted file mode 100644
index 3b3ce6317c3be..0000000000000
--- a/packages/zone.js/dist/zone-patch-message-port/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/zone-patch-message-port",
-  "main": "../../bundles/zone-patch-message-port.umd.js",
-  "fesm2015": "../../fesm2015/zone-patch-message-port.js",
-  "es2015": "../../fesm2015/zone-patch-message-port.js",
-  "module": "../../fesm2015/zone-patch-message-port.js"
-}
diff --git a/packages/zone.js/dist/zone-patch-promise-test.min/package.json b/packages/zone.js/dist/zone-patch-promise-test.min/package.json
deleted file mode 100644
index 30b94a2414e2a..0000000000000
--- a/packages/zone.js/dist/zone-patch-promise-test.min/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/zone-patch-promise-test.min",
-  "main": "../../bundles/zone-patch-promise-test.umd.min.js",
-  "fesm2015": "../../fesm2015/zone-patch-promise-test.min.js",
-  "es2015": "../../fesm2015/zone-patch-promise-test.min.js",
-  "module": "../../fesm2015/zone-patch-promise-test.min.js"
-}
diff --git a/packages/zone.js/dist/zone-patch-promise-test/package.json b/packages/zone.js/dist/zone-patch-promise-test/package.json
deleted file mode 100644
index 8b9bd469ee205..0000000000000
--- a/packages/zone.js/dist/zone-patch-promise-test/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/zone-patch-promise-test",
-  "main": "../../bundles/zone-patch-promise-test.umd.js",
-  "fesm2015": "../../fesm2015/zone-patch-promise-test.js",
-  "es2015": "../../fesm2015/zone-patch-promise-test.js",
-  "module": "../../fesm2015/zone-patch-promise-test.js"
-}
diff --git a/packages/zone.js/dist/zone-patch-resize-observer.min/package.json b/packages/zone.js/dist/zone-patch-resize-observer.min/package.json
deleted file mode 100644
index bc8b6a93890f3..0000000000000
--- a/packages/zone.js/dist/zone-patch-resize-observer.min/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/zone-patch-resize-observer.min",
-  "main": "../../bundles/zone-patch-resize-observer.umd.min.js",
-  "fesm2015": "../../fesm2015/zone-patch-resize-observer.min.js",
-  "es2015": "../../fesm2015/zone-patch-resize-observer.min.js",
-  "module": "../../fesm2015/zone-patch-resize-observer.min.js"
-}
diff --git a/packages/zone.js/dist/zone-patch-resize-observer/package.json b/packages/zone.js/dist/zone-patch-resize-observer/package.json
deleted file mode 100644
index dece1df10ae7e..0000000000000
--- a/packages/zone.js/dist/zone-patch-resize-observer/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/zone-patch-resize-observer",
-  "main": "../../bundles/zone-patch-resize-observer.umd.js",
-  "fesm2015": "../../fesm2015/zone-patch-resize-observer.js",
-  "es2015": "../../fesm2015/zone-patch-resize-observer.js",
-  "module": "../../fesm2015/zone-patch-resize-observer.js"
-}
diff --git a/packages/zone.js/dist/zone-patch-rxjs-fake-async.min/package.json b/packages/zone.js/dist/zone-patch-rxjs-fake-async.min/package.json
deleted file mode 100644
index e8e2c0f78d994..0000000000000
--- a/packages/zone.js/dist/zone-patch-rxjs-fake-async.min/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/zone-patch-rxjs-fake-async.min",
-  "main": "../../bundles/zone-patch-rxjs-fake-async.umd.min.js",
-  "fesm2015": "../../fesm2015/zone-patch-rxjs-fake-async.min.js",
-  "es2015": "../../fesm2015/zone-patch-rxjs-fake-async.min.js",
-  "module": "../../fesm2015/zone-patch-rxjs-fake-async.min.js"
-}
diff --git a/packages/zone.js/dist/zone-patch-rxjs-fake-async/package.json b/packages/zone.js/dist/zone-patch-rxjs-fake-async/package.json
deleted file mode 100644
index 5384663123a29..0000000000000
--- a/packages/zone.js/dist/zone-patch-rxjs-fake-async/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/zone-patch-rxjs-fake-async",
-  "main": "../../bundles/zone-patch-rxjs-fake-async.umd.js",
-  "fesm2015": "../../fesm2015/zone-patch-rxjs-fake-async.js",
-  "es2015": "../../fesm2015/zone-patch-rxjs-fake-async.js",
-  "module": "../../fesm2015/zone-patch-rxjs-fake-async.js"
-}
diff --git a/packages/zone.js/dist/zone-patch-rxjs.min/package.json b/packages/zone.js/dist/zone-patch-rxjs.min/package.json
deleted file mode 100644
index fefe72012f544..0000000000000
--- a/packages/zone.js/dist/zone-patch-rxjs.min/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/zone-patch-rxjs.min",
-  "main": "../../bundles/zone-patch-rxjs.umd.min.js",
-  "fesm2015": "../../fesm2015/zone-patch-rxjs.min.js",
-  "es2015": "../../fesm2015/zone-patch-rxjs.min.js",
-  "module": "../../fesm2015/zone-patch-rxjs.min.js"
-}
diff --git a/packages/zone.js/dist/zone-patch-rxjs/package.json b/packages/zone.js/dist/zone-patch-rxjs/package.json
deleted file mode 100644
index 4529cc020b71a..0000000000000
--- a/packages/zone.js/dist/zone-patch-rxjs/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/zone-patch-rxjs",
-  "main": "../../bundles/zone-patch-rxjs.umd.js",
-  "fesm2015": "../../fesm2015/zone-patch-rxjs.js",
-  "es2015": "../../fesm2015/zone-patch-rxjs.js",
-  "module": "../../fesm2015/zone-patch-rxjs.js"
-}
diff --git a/packages/zone.js/dist/zone-patch-socket-io.min/package.json b/packages/zone.js/dist/zone-patch-socket-io.min/package.json
deleted file mode 100644
index 811eb6422806e..0000000000000
--- a/packages/zone.js/dist/zone-patch-socket-io.min/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/zone-patch-socket-io.min",
-  "main": "../../bundles/zone-patch-socket-io.umd.min.js",
-  "fesm2015": "../../fesm2015/zone-patch-socket-io.min.js",
-  "es2015": "../../fesm2015/zone-patch-socket-io.min.js",
-  "module": "../../fesm2015/zone-patch-socket-io.min.js"
-}
diff --git a/packages/zone.js/dist/zone-patch-socket-io/package.json b/packages/zone.js/dist/zone-patch-socket-io/package.json
deleted file mode 100644
index aa65a90fc1fdd..0000000000000
--- a/packages/zone.js/dist/zone-patch-socket-io/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/zone-patch-socket-io",
-  "main": "../../bundles/zone-patch-socket-io.umd.js",
-  "fesm2015": "../../fesm2015/zone-patch-socket-io.js",
-  "es2015": "../../fesm2015/zone-patch-socket-io.js",
-  "module": "../../fesm2015/zone-patch-socket-io.js"
-}
diff --git a/packages/zone.js/dist/zone-patch-user-media.min/package.json b/packages/zone.js/dist/zone-patch-user-media.min/package.json
deleted file mode 100644
index 4df7663d243cc..0000000000000
--- a/packages/zone.js/dist/zone-patch-user-media.min/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/zone-patch-user-media.min",
-  "main": "../../bundles/zone-patch-user-media.umd.min.js",
-  "fesm2015": "../../fesm2015/zone-patch-user-media.min.js",
-  "es2015": "../../fesm2015/zone-patch-user-media.min.js",
-  "module": "../../fesm2015/zone-patch-user-media.min.js"
-}
diff --git a/packages/zone.js/dist/zone-patch-user-media/package.json b/packages/zone.js/dist/zone-patch-user-media/package.json
deleted file mode 100644
index a0a8849a9e131..0000000000000
--- a/packages/zone.js/dist/zone-patch-user-media/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/zone-patch-user-media",
-  "main": "../../bundles/zone-patch-user-media.umd.js",
-  "fesm2015": "../../fesm2015/zone-patch-user-media.js",
-  "es2015": "../../fesm2015/zone-patch-user-media.js",
-  "module": "../../fesm2015/zone-patch-user-media.js"
-}
diff --git a/packages/zone.js/dist/zone-testing-bundle.min/package.json b/packages/zone.js/dist/zone-testing-bundle.min/package.json
deleted file mode 100644
index 59357b7b80858..0000000000000
--- a/packages/zone.js/dist/zone-testing-bundle.min/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/zone-testing-bundle.min",
-  "main": "../../bundles/zone-testing-bundle.umd.min.js",
-  "fesm2015": "../../fesm2015/zone-testing-bundle.min.js",
-  "es2015": "../../fesm2015/zone-testing-bundle.min.js",
-  "module": "../../fesm2015/zone-testing-bundle.min.js"
-}
diff --git a/packages/zone.js/dist/zone-testing-bundle/package.json b/packages/zone.js/dist/zone-testing-bundle/package.json
deleted file mode 100644
index f466591796210..0000000000000
--- a/packages/zone.js/dist/zone-testing-bundle/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/zone-testing-bundle",
-  "main": "../../bundles/zone-testing-bundle.umd.js",
-  "fesm2015": "../../fesm2015/zone-testing-bundle.js",
-  "es2015": "../../fesm2015/zone-testing-bundle.js",
-  "module": "../../fesm2015/zone-testing-bundle.js"
-}
diff --git a/packages/zone.js/dist/zone-testing-node-bundle.min/package.json b/packages/zone.js/dist/zone-testing-node-bundle.min/package.json
deleted file mode 100644
index 585a93fb37d3b..0000000000000
--- a/packages/zone.js/dist/zone-testing-node-bundle.min/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/zone-testing-node-bundle.min",
-  "main": "../../bundles/zone-testing-node-bundle.umd.min.js",
-  "fesm2015": "../../fesm2015/zone-testing-node-bundle.min.js",
-  "es2015": "../../fesm2015/zone-testing-node-bundle.min.js",
-  "module": "../../fesm2015/zone-testing-node-bundle.min.js"
-}
diff --git a/packages/zone.js/dist/zone-testing-node-bundle/package.json b/packages/zone.js/dist/zone-testing-node-bundle/package.json
deleted file mode 100644
index a73e5566d6cdf..0000000000000
--- a/packages/zone.js/dist/zone-testing-node-bundle/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/zone-testing-node-bundle",
-  "main": "../../bundles/zone-testing-node-bundle.umd.js",
-  "fesm2015": "../../fesm2015/zone-testing-node-bundle.js",
-  "es2015": "../../fesm2015/zone-testing-node-bundle.js",
-  "module": "../../fesm2015/zone-testing-node-bundle.js"
-}
diff --git a/packages/zone.js/dist/zone-testing.min/package.json b/packages/zone.js/dist/zone-testing.min/package.json
deleted file mode 100644
index e07c6be6f38ad..0000000000000
--- a/packages/zone.js/dist/zone-testing.min/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/zone-testing.min",
-  "main": "../../bundles/zone-testing.umd.min.js",
-  "fesm2015": "../../fesm2015/zone-testing.min.js",
-  "es2015": "../../fesm2015/zone-testing.min.js",
-  "module": "../../fesm2015/zone-testing.min.js"
-}
diff --git a/packages/zone.js/dist/zone-testing/package.json b/packages/zone.js/dist/zone-testing/package.json
deleted file mode 100644
index dbed6c0b3e0db..0000000000000
--- a/packages/zone.js/dist/zone-testing/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/zone-testing",
-  "main": "../../bundles/zone-testing.umd.js",
-  "fesm2015": "../../fesm2015/zone-testing.js",
-  "es2015": "../../fesm2015/zone-testing.js",
-  "module": "../../fesm2015/zone-testing.js"
-}
diff --git a/packages/zone.js/dist/zone.min/package.json b/packages/zone.js/dist/zone.min/package.json
deleted file mode 100644
index 3adf65f73bcf0..0000000000000
--- a/packages/zone.js/dist/zone.min/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/zone.min",
-  "main": "../../bundles/zone.umd.min.js",
-  "fesm2015": "../../fesm2015/zone.min.js",
-  "es2015": "../../fesm2015/zone.min.js",
-  "module": "../../fesm2015/zone.min.js"
-}
diff --git a/packages/zone.js/dist/zone/package.json b/packages/zone.js/dist/zone/package.json
deleted file mode 100644
index 0fcd1c15f3d0d..0000000000000
--- a/packages/zone.js/dist/zone/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/zone",
-  "main": "../../bundles/zone.umd.js",
-  "fesm2015": "../../fesm2015/zone.js",
-  "es2015": "../../fesm2015/zone.js",
-  "module": "../../fesm2015/zone.js"
-}
diff --git a/packages/zone.js/dist/zone_externs/package.json b/packages/zone.js/dist/zone_externs/package.json
deleted file mode 100644
index 7da5b085b0f66..0000000000000
--- a/packages/zone.js/dist/zone_externs/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "zone.js/zone_externs",
-  "main": "../../zone_externs.js",
-  "fesm2015": "../../zone_externs.js",
-  "es2015": "../../zone_externs.js",
-  "module": "../../zone_externs.js"
-}
diff --git a/packages/zone.js/karma-build-sauce-selenium3-mocha.conf.js b/packages/zone.js/karma-build-sauce-selenium3-mocha.conf.js
index e348ef74f289e..61ae015d5d863 100644
--- a/packages/zone.js/karma-build-sauce-selenium3-mocha.conf.js
+++ b/packages/zone.js/karma-build-sauce-selenium3-mocha.conf.js
@@ -8,5 +8,5 @@
 
 module.exports = function(config) {
   require('./karma-dist-mocha.conf.js')(config);
-  require('./sauce-selenium3.conf')(config, ['SL_IE9']);
+  require('./sauce-selenium3.conf')(config);
 };
diff --git a/packages/zone.js/karma-dist-sauce-jasmine3.conf.js b/packages/zone.js/karma-dist-sauce-jasmine3.conf.js
index 2def1fd2cc344..15111c5b438ee 100644
--- a/packages/zone.js/karma-dist-sauce-jasmine3.conf.js
+++ b/packages/zone.js/karma-dist-sauce-jasmine3.conf.js
@@ -10,7 +10,6 @@ module.exports = function(config) {
   require('./karma-dist-jasmine.conf.js')(config);
   require('./sauce.conf')(config, [
     'SL_IOS9', 'SL_CHROME', 'SL_FIREFOX_54', 'SL_SAFARI8', 'SL_SAFARI9', 'SL_SAFARI10', 'SL_IOS8',
-    'SL_IOS9', 'SL_IOS10', 'SL_IE9', 'SL_IE10', 'SL_IE11', 'SL_MSEDGE15', 'SL_ANDROID4.4',
-    'SL_ANDROID5.1'
+    'SL_IOS9', 'SL_IOS10', 'SL_IE11', 'SL_MSEDGE15', 'SL_ANDROID4.4', 'SL_ANDROID5.1'
   ])
 };
diff --git a/packages/zone.js/lib/BUILD.bazel b/packages/zone.js/lib/BUILD.bazel
index e46bad5870087..66f49a1b5eb7c 100644
--- a/packages/zone.js/lib/BUILD.bazel
+++ b/packages/zone.js/lib/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@npm_bazel_typescript//:index.bzl", "ts_library")
+load("@npm//@bazel/typescript:index.bzl", "ts_library")
 
 package(default_visibility = ["//visibility:public"])
 
diff --git a/packages/zone.js/lib/browser/browser.ts b/packages/zone.js/lib/browser/browser.ts
index 3023e1941d852..bf6c4195280b9 100644
--- a/packages/zone.js/lib/browser/browser.ts
+++ b/packages/zone.js/lib/browser/browser.ts
@@ -149,8 +149,12 @@ Zone.__load_patch('XHR', (global: any, Zone: ZoneType) => {
             // check whether the xhr has registered onload listener
             // if that is the case, the task should invoke after all
             // onload listeners finish.
+            // Also if the request failed without response (status = 0), the load event handler
+            // will not be triggered, in that case, we should also invoke the placeholder callback
+            // to close the XMLHttpRequest::send macroTask.
+            // https://github.com/angular/angular/issues/38795
             const loadTasks = target[Zone.__symbol__('loadfalse')];
-            if (loadTasks && loadTasks.length > 0) {
+            if (target.status !== 0 && loadTasks && loadTasks.length > 0) {
               const oriInvoke = task.invoke;
               task.invoke = function() {
                 // need to load the tasks again, because in other
diff --git a/packages/zone.js/lib/browser/define-property.ts b/packages/zone.js/lib/browser/define-property.ts
index 08f937248fb3a..a053487aac41d 100644
--- a/packages/zone.js/lib/browser/define-property.ts
+++ b/packages/zone.js/lib/browser/define-property.ts
@@ -102,6 +102,20 @@ function _tryDefineProperty(obj: any, prop: string, desc: any, originalConfigura
       try {
         return _defineProperty(obj, prop, desc);
       } catch (error) {
+        let swallowError = false;
+        if (prop === 'createdCallback' || prop === 'attachedCallback' ||
+            prop === 'detachedCallback' || prop === 'attributeChangedCallback') {
+          // We only swallow the error in registerElement patch
+          // this is the work around since some applications
+          // fail if we throw the error
+          swallowError = true;
+        }
+        if (!swallowError) {
+          throw error;
+        }
+        // TODO: @JiaLiPassion, Some application such as `registerElement` patch
+        // still need to swallow the error, in the future after these applications
+        // are updated, the following logic can be removed.
         let descJson: string|null = null;
         try {
           descJson = JSON.stringify(desc);
diff --git a/packages/zone.js/lib/common/error-rewrite.ts b/packages/zone.js/lib/common/error-rewrite.ts
index 568c0d7683a16..8f51b571ce099 100644
--- a/packages/zone.js/lib/common/error-rewrite.ts
+++ b/packages/zone.js/lib/common/error-rewrite.ts
@@ -34,15 +34,15 @@ Zone.__load_patch('Error', (global: any, Zone: ZoneType, api: _ZonePrivate) => {
 
   const enum FrameType {
     /// Skip this frame when printing out stack
-    blackList,
+    zoneJsInternal,
     /// This frame marks zone transition
     transition
   }
 
-  const blacklistedStackFramesSymbol = api.symbol('blacklistedStackFrames');
+  const zoneJsInternalStackFramesSymbol = api.symbol('zoneJsInternalStackFrames');
   const NativeError = global[api.symbol('Error')] = global['Error'];
   // Store the frames which should be removed from the stack frames
-  const blackListedStackFrames: {[frame: string]: FrameType} = {};
+  const zoneJsInternalStackFrames: {[frame: string]: FrameType} = {};
   // We must find the frame where Error was created, otherwise we assume we don't understand stack
   let zoneAwareFrame1: string;
   let zoneAwareFrame2: string;
@@ -53,9 +53,10 @@ Zone.__load_patch('Error', (global: any, Zone: ZoneType, api: _ZonePrivate) => {
   global['Error'] = ZoneAwareError;
   const stackRewrite = 'stackRewrite';
 
-  type BlackListedStackFramesPolicy = 'default'|'disable'|'lazy';
-  const blackListedStackFramesPolicy: BlackListedStackFramesPolicy =
-      global['__Zone_Error_BlacklistedStackFrames_policy'] || 'default';
+  type ZoneJsInternalStackFramesPolicy = 'default'|'disable'|'lazy';
+  const zoneJsInternalStackFramesPolicy: ZoneJsInternalStackFramesPolicy =
+      global['__Zone_Error_BlacklistedStackFrames_policy'] ||
+      global['__Zone_Error_ZoneJsInternalStackFrames_policy'] || 'default';
 
   interface ZoneFrameName {
     zoneName: string;
@@ -88,8 +89,8 @@ Zone.__load_patch('Error', (global: any, Zone: ZoneType, api: _ZonePrivate) => {
     for (; i < frames.length && zoneFrame; i++) {
       let frame = frames[i];
       if (frame.trim()) {
-        switch (blackListedStackFrames[frame]) {
-          case FrameType.blackList:
+        switch (zoneJsInternalStackFrames[frame]) {
+          case FrameType.zoneJsInternal:
             frames.splice(i, 1);
             i--;
             break;
@@ -124,10 +125,10 @@ Zone.__load_patch('Error', (global: any, Zone: ZoneType, api: _ZonePrivate) => {
     // Process the stack trace and rewrite the frames.
     if ((ZoneAwareError as any)[stackRewrite] && originalStack) {
       let zoneFrame = api.currentZoneFrame();
-      if (blackListedStackFramesPolicy === 'lazy') {
+      if (zoneJsInternalStackFramesPolicy === 'lazy') {
         // don't handle stack trace now
         (error as any)[api.symbol('zoneFrameNames')] = buildZoneFrameNames(zoneFrame);
-      } else if (blackListedStackFramesPolicy === 'default') {
+      } else if (zoneJsInternalStackFramesPolicy === 'default') {
         try {
           error.stack = error.zoneAwareStack = buildZoneAwareStackFrames(originalStack, zoneFrame);
         } catch (e) {
@@ -156,14 +157,13 @@ Zone.__load_patch('Error', (global: any, Zone: ZoneType, api: _ZonePrivate) => {
 
   // Copy the prototype so that instanceof operator works as expected
   ZoneAwareError.prototype = NativeError.prototype;
-  (ZoneAwareError as any)[blacklistedStackFramesSymbol] = blackListedStackFrames;
+  (ZoneAwareError as any)[zoneJsInternalStackFramesSymbol] = zoneJsInternalStackFrames;
   (ZoneAwareError as any)[stackRewrite] = false;
 
   const zoneAwareStackSymbol = api.symbol('zoneAwareStack');
 
-  // try to define zoneAwareStack property when blackListed
-  // policy is delay
-  if (blackListedStackFramesPolicy === 'lazy') {
+  // try to define zoneAwareStack property when zoneJsInternal frames policy is delay
+  if (zoneJsInternalStackFramesPolicy === 'lazy') {
     Object.defineProperty(ZoneAwareError.prototype, 'zoneAwareStack', {
       configurable: true,
       enumerable: true,
@@ -253,12 +253,11 @@ Zone.__load_patch('Error', (global: any, Zone: ZoneType, api: _ZonePrivate) => {
     }
   });
 
-  if (blackListedStackFramesPolicy === 'disable') {
-    // don't need to run detectZone to populate
-    // blacklisted stack frames
+  if (zoneJsInternalStackFramesPolicy === 'disable') {
+    // don't need to run detectZone to populate zoneJs internal stack frames
     return;
   }
-  // Now we need to populate the `blacklistedStackFrames` as well as find the
+  // Now we need to populate the `zoneJsInternalStackFrames` as well as find the
   // run/runGuarded/runTask frames. This is done by creating a detect zone and then threading
   // the execution through all of the above methods so that we can look at the stack trace and
   // find the frames of interest.
@@ -296,7 +295,7 @@ Zone.__load_patch('Error', (global: any, Zone: ZoneType, api: _ZonePrivate) => {
                       frame.replace('ZoneAwareError', 'Error.ZoneAwareError');
                 }
               }
-              blackListedStackFrames[zoneAwareFrame2] = FrameType.blackList;
+              zoneJsInternalStackFrames[zoneAwareFrame2] = FrameType.zoneJsInternal;
             }
             if (fnName.indexOf('runGuarded') !== -1) {
               runGuardedFrame = true;
@@ -305,9 +304,9 @@ Zone.__load_patch('Error', (global: any, Zone: ZoneType, api: _ZonePrivate) => {
             } else if (fnName.indexOf('run') !== -1) {
               runFrame = true;
             } else {
-              frameType = FrameType.blackList;
+              frameType = FrameType.zoneJsInternal;
             }
-            blackListedStackFrames[frame] = frameType;
+            zoneJsInternalStackFrames[frame] = frameType;
             // Once we find all of the frames we can stop looking.
             if (runFrame && runGuardedFrame && runTaskFrame) {
               (ZoneAwareError as any)[stackRewrite] = true;
@@ -320,7 +319,7 @@ Zone.__load_patch('Error', (global: any, Zone: ZoneType, api: _ZonePrivate) => {
     }
   }) as Zone;
   // carefully constructor a stack frame which contains all of the frames of interest which
-  // need to be detected and blacklisted.
+  // need to be detected and marked as an internal zoneJs frame.
 
   const childDetectZone = detectZone.fork({
     name: 'child',
@@ -351,13 +350,13 @@ Zone.__load_patch('Error', (global: any, Zone: ZoneType, api: _ZonePrivate) => {
     childDetectZone.runGuarded(() => {
       const fakeTransitionTo = () => {};
       childDetectZone.scheduleEventTask(
-          blacklistedStackFramesSymbol,
+          zoneJsInternalStackFramesSymbol,
           () => {
             childDetectZone.scheduleMacroTask(
-                blacklistedStackFramesSymbol,
+                zoneJsInternalStackFramesSymbol,
                 () => {
                   childDetectZone.scheduleMicroTask(
-                      blacklistedStackFramesSymbol,
+                      zoneJsInternalStackFramesSymbol,
                       () => {
                         throw new Error();
                       },
@@ -367,7 +366,7 @@ Zone.__load_patch('Error', (global: any, Zone: ZoneType, api: _ZonePrivate) => {
                         t.invoke();
                       });
                   childDetectZone.scheduleMicroTask(
-                      blacklistedStackFramesSymbol,
+                      zoneJsInternalStackFramesSymbol,
                       () => {
                         throw Error();
                       },
diff --git a/packages/zone.js/lib/common/events.ts b/packages/zone.js/lib/common/events.ts
index e03783f7cd06f..7d70918eca8a7 100644
--- a/packages/zone.js/lib/common/events.ts
+++ b/packages/zone.js/lib/common/events.ts
@@ -351,7 +351,7 @@ export function patchEventTarget(
     const compare =
         (patchOptions && patchOptions.diff) ? patchOptions.diff : compareTaskCallbackVsDelegate;
 
-    const blackListedEvents: string[] = (Zone as any)[zoneSymbol('BLACK_LISTED_EVENTS')];
+    const unpatchedEvents: string[] = (Zone as any)[zoneSymbol('UNPATCHED_EVENTS')];
     const passiveEvents: string[] = _global[zoneSymbol('PASSIVE_EVENTS')];
 
     const makeAddListener = function(
@@ -391,10 +391,10 @@ export function patchEventTarget(
             passiveSupported && !!passiveEvents && passiveEvents.indexOf(eventName) !== -1;
         const options = buildEventListenerOptions(arguments[2], passive);
 
-        if (blackListedEvents) {
-          // check black list
-          for (let i = 0; i < blackListedEvents.length; i++) {
-            if (eventName === blackListedEvents[i]) {
+        if (unpatchedEvents) {
+          // check upatched list
+          for (let i = 0; i < unpatchedEvents.length; i++) {
+            if (eventName === unpatchedEvents[i]) {
               if (passive) {
                 return nativeListener.call(target, eventName, delegate, options);
               } else {
diff --git a/packages/zone.js/lib/common/promise.ts b/packages/zone.js/lib/common/promise.ts
index 6f4b59ff804fd..9103709ac2df9 100644
--- a/packages/zone.js/lib/common/promise.ts
+++ b/packages/zone.js/lib/common/promise.ts
@@ -1,5 +1,3 @@
-import {patchMethod} from './utils';
-
 /**
  * @license
  * Copyright Google LLC All Rights Reserved.
@@ -7,6 +5,8 @@ import {patchMethod} from './utils';
  * 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 {patchMethod} from './utils';
+
 Zone.__load_patch('ZoneAwarePromise', (global: any, Zone: ZoneType, api: _ZonePrivate) => {
   const ObjectGetOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
   const ObjectDefineProperty = Object.defineProperty;
@@ -48,6 +48,9 @@ Zone.__load_patch('ZoneAwarePromise', (global: any, Zone: ZoneType, api: _ZonePr
       const uncaughtPromiseError: UncaughtPromiseError = _uncaughtPromiseErrors.shift()!;
       try {
         uncaughtPromiseError.zone.runGuarded(() => {
+          if (uncaughtPromiseError.throwOriginal) {
+            throw uncaughtPromiseError.rejection;
+          }
           throw uncaughtPromiseError;
         });
       } catch (error) {
@@ -191,20 +194,20 @@ Zone.__load_patch('ZoneAwarePromise', (global: any, Zone: ZoneType, api: _ZonePr
         if (queue.length == 0 && state == REJECTED) {
           (promise as any)[symbolState] = REJECTED_NO_CATCH;
           let uncaughtPromiseError = value;
-          if (!isDisableWrappingUncaughtPromiseRejection) {
+          try {
+            // Here we throws a new Error to print more readable error log
+            // and if the value is not an error, zone.js builds an `Error`
+            // Object here to attach the stack information.
+            throw new Error(
+                'Uncaught (in promise): ' + readableObjectToString(value) +
+                (value && value.stack ? '\n' + value.stack : ''));
+          } catch (err) {
+            uncaughtPromiseError = err;
+          }
+          if (isDisableWrappingUncaughtPromiseRejection) {
             // If disable wrapping uncaught promise reject
-            // and the rejected value is an Error object,
             // use the value instead of wrapping it.
-            try {
-              // Here we throws a new Error to print more readable error log
-              // and if the value is not an error, zone.js builds an `Error`
-              // Object here to attach the stack information.
-              throw new Error(
-                  'Uncaught (in promise): ' + readableObjectToString(value) +
-                  (value && value.stack ? '\n' + value.stack : ''));
-            } catch (err) {
-              uncaughtPromiseError = err;
-            }
+            uncaughtPromiseError.throwOriginal = true;
           }
           uncaughtPromiseError.rejection = value;
           uncaughtPromiseError.promise = promise;
diff --git a/packages/zone.js/lib/common/to-string.ts b/packages/zone.js/lib/common/to-string.ts
index 3ae8d0e99d978..7722623c7a240 100644
--- a/packages/zone.js/lib/common/to-string.ts
+++ b/packages/zone.js/lib/common/to-string.ts
@@ -49,9 +49,10 @@ Zone.__load_patch('toString', (global: any) => {
   const originalObjectToString = Object.prototype.toString;
   const PROMISE_OBJECT_TO_STRING = '[object Promise]';
   Object.prototype.toString = function() {
-    if (this instanceof Promise) {
+    if (typeof Promise === 'function' && this instanceof Promise) {
       return PROMISE_OBJECT_TO_STRING;
     }
+
     return originalObjectToString.call(this);
   };
 });
diff --git a/packages/zone.js/lib/jasmine/jasmine.ts b/packages/zone.js/lib/jasmine/jasmine.ts
index 2ad1e3596ec5c..ff76d4a975312 100644
--- a/packages/zone.js/lib/jasmine/jasmine.ts
+++ b/packages/zone.js/lib/jasmine/jasmine.ts
@@ -127,7 +127,7 @@ Zone.__load_patch('jasmine', (global: any, Zone: ZoneType, api: _ZonePrivate) =>
           const fakeAsyncZoneSpec = Zone.current.get('FakeAsyncTestZoneSpec');
           if (fakeAsyncZoneSpec) {
             const dateTime = arguments.length > 0 ? arguments[0] : new Date();
-            return fakeAsyncZoneSpec.setCurrentRealTime.apply(
+            return fakeAsyncZoneSpec.setFakeBaseSystemTime.apply(
                 fakeAsyncZoneSpec,
                 dateTime && typeof dateTime.getTime === 'function' ? [dateTime.getTime()] :
                                                                      arguments);
diff --git a/packages/zone.js/lib/jest/jest.ts b/packages/zone.js/lib/jest/jest.ts
index 9aaa726e31a12..38fe1129d32f0 100644
--- a/packages/zone.js/lib/jest/jest.ts
+++ b/packages/zone.js/lib/jest/jest.ts
@@ -8,18 +8,13 @@
 
 'use strict';
 
-Zone.__load_patch('jest', (context: any, Zone: ZoneType) => {
+Zone.__load_patch('jest', (context: any, Zone: ZoneType, api: _ZonePrivate) => {
   if (typeof jest === 'undefined' || jest['__zone_patch__']) {
     return;
   }
 
   jest['__zone_patch__'] = true;
 
-
-  if (typeof Zone === 'undefined') {
-    throw new Error('Missing Zone.js');
-  }
-
   const ProxyZoneSpec = (Zone as any)['ProxyZoneSpec'];
   const SyncTestZoneSpec = (Zone as any)['SyncTestZoneSpec'];
 
@@ -29,7 +24,8 @@ Zone.__load_patch('jest', (context: any, Zone: ZoneType) => {
 
   const rootZone = Zone.current;
   const syncZone = rootZone.fork(new SyncTestZoneSpec('jest.describe'));
-  const proxyZone = rootZone.fork(new ProxyZoneSpec());
+  const proxyZoneSpec = new ProxyZoneSpec();
+  const proxyZone = rootZone.fork(proxyZoneSpec);
 
   function wrapDescribeFactoryInZone(originalJestFn: Function) {
     return function(this: unknown, ...tableArgs: any[]) {
@@ -65,11 +61,20 @@ Zone.__load_patch('jest', (context: any, Zone: ZoneType) => {
    * execute in a ProxyZone zone.
    * This will run in the `proxyZone`.
    */
-  function wrapTestInZone(testBody: Function): Function {
+  function wrapTestInZone(testBody: Function, isTestFunc = false): Function {
     if (typeof testBody !== 'function') {
       return testBody;
     }
     const wrappedFunc = function() {
+      if ((Zone as any)[api.symbol('useFakeTimersCalled')] === true && testBody &&
+          !(testBody as any).isFakeAsync) {
+        // jest.useFakeTimers is called, run into fakeAsyncTest automatically.
+        const fakeAsyncModule = (Zone as any)[Zone.__symbol__('fakeAsyncTest')];
+        if (fakeAsyncModule && typeof fakeAsyncModule.fakeAsync === 'function') {
+          testBody = fakeAsyncModule.fakeAsync(testBody);
+        }
+      }
+      proxyZoneSpec.isTestFunc = isTestFunc;
       return proxyZone.run(testBody, null, arguments as any);
     };
     // Update the length of wrappedFunc to be the same as the length of the testBody
@@ -102,7 +107,7 @@ Zone.__load_patch('jest', (context: any, Zone: ZoneType) => {
     }
     context[Zone.__symbol__(methodName)] = originalJestFn;
     context[methodName] = function(this: unknown, ...args: any[]) {
-      args[1] = wrapTestInZone(args[1]);
+      args[1] = wrapTestInZone(args[1], true);
       return originalJestFn.apply(this, args);
     };
     context[methodName].each = wrapTestFactoryInZone((originalJestFn as any).each);
@@ -125,4 +130,165 @@ Zone.__load_patch('jest', (context: any, Zone: ZoneType) => {
       return originalJestFn.apply(this, args);
     };
   });
+
+  (Zone as any).patchJestObject = function patchJestObject(Timer: any, isModern = false) {
+    // check whether currently the test is inside fakeAsync()
+    function isPatchingFakeTimer() {
+      const fakeAsyncZoneSpec = Zone.current.get('FakeAsyncTestZoneSpec');
+      return !!fakeAsyncZoneSpec;
+    }
+
+    // check whether the current function is inside `test/it` or other methods
+    // such as `describe/beforeEach`
+    function isInTestFunc() {
+      const proxyZoneSpec = Zone.current.get('ProxyZoneSpec');
+      return proxyZoneSpec && proxyZoneSpec.isTestFunc;
+    }
+
+    if (Timer[api.symbol('fakeTimers')]) {
+      return;
+    }
+
+    Timer[api.symbol('fakeTimers')] = true;
+    // patch jest fakeTimer internal method to make sure no console.warn print out
+    api.patchMethod(Timer, '_checkFakeTimers', delegate => {
+      return function(self: any, args: any[]) {
+        if (isPatchingFakeTimer()) {
+          return true;
+        } else {
+          return delegate.apply(self, args);
+        }
+      }
+    });
+
+    // patch useFakeTimers(), set useFakeTimersCalled flag, and make test auto run into fakeAsync
+    api.patchMethod(Timer, 'useFakeTimers', delegate => {
+      return function(self: any, args: any[]) {
+        (Zone as any)[api.symbol('useFakeTimersCalled')] = true;
+        if (isModern || isInTestFunc()) {
+          return delegate.apply(self, args);
+        }
+        return self;
+      }
+    });
+
+    // patch useRealTimers(), unset useFakeTimers flag
+    api.patchMethod(Timer, 'useRealTimers', delegate => {
+      return function(self: any, args: any[]) {
+        (Zone as any)[api.symbol('useFakeTimersCalled')] = false;
+        if (isModern || isInTestFunc()) {
+          return delegate.apply(self, args);
+        }
+        return self;
+      }
+    });
+
+    // patch setSystemTime(), call setCurrentRealTime() in the fakeAsyncTest
+    api.patchMethod(Timer, 'setSystemTime', delegate => {
+      return function(self: any, args: any[]) {
+        const fakeAsyncZoneSpec = Zone.current.get('FakeAsyncTestZoneSpec');
+        if (fakeAsyncZoneSpec && isPatchingFakeTimer()) {
+          fakeAsyncZoneSpec.setFakeBaseSystemTime(args[0]);
+        } else {
+          return delegate.apply(self, args);
+        }
+      }
+    });
+
+    // patch getSystemTime(), call getCurrentRealTime() in the fakeAsyncTest
+    api.patchMethod(Timer, 'getRealSystemTime', delegate => {
+      return function(self: any, args: any[]) {
+        const fakeAsyncZoneSpec = Zone.current.get('FakeAsyncTestZoneSpec');
+        if (fakeAsyncZoneSpec && isPatchingFakeTimer()) {
+          return fakeAsyncZoneSpec.getRealSystemTime();
+        } else {
+          return delegate.apply(self, args);
+        }
+      }
+    });
+
+    // patch runAllTicks(), run all microTasks inside fakeAsync
+    api.patchMethod(Timer, 'runAllTicks', delegate => {
+      return function(self: any, args: any[]) {
+        const fakeAsyncZoneSpec = Zone.current.get('FakeAsyncTestZoneSpec');
+        if (fakeAsyncZoneSpec) {
+          fakeAsyncZoneSpec.flushMicrotasks();
+        } else {
+          return delegate.apply(self, args);
+        }
+      }
+    });
+
+    // patch runAllTimers(), run all macroTasks inside fakeAsync
+    api.patchMethod(Timer, 'runAllTimers', delegate => {
+      return function(self: any, args: any[]) {
+        const fakeAsyncZoneSpec = Zone.current.get('FakeAsyncTestZoneSpec');
+        if (fakeAsyncZoneSpec) {
+          fakeAsyncZoneSpec.flush(100, true);
+        } else {
+          return delegate.apply(self, args);
+        }
+      }
+    });
+
+    // patch advanceTimersByTime(), call tick() in the fakeAsyncTest
+    api.patchMethod(Timer, 'advanceTimersByTime', delegate => {
+      return function(self: any, args: any[]) {
+        const fakeAsyncZoneSpec = Zone.current.get('FakeAsyncTestZoneSpec');
+        if (fakeAsyncZoneSpec) {
+          fakeAsyncZoneSpec.tick(args[0]);
+        } else {
+          return delegate.apply(self, args);
+        }
+      }
+    });
+
+    // patch runOnlyPendingTimers(), call flushOnlyPendingTimers() in the fakeAsyncTest
+    api.patchMethod(Timer, 'runOnlyPendingTimers', delegate => {
+      return function(self: any, args: any[]) {
+        const fakeAsyncZoneSpec = Zone.current.get('FakeAsyncTestZoneSpec');
+        if (fakeAsyncZoneSpec) {
+          fakeAsyncZoneSpec.flushOnlyPendingTimers();
+        } else {
+          return delegate.apply(self, args);
+        }
+      }
+    });
+
+    // patch advanceTimersToNextTimer(), call tickToNext() in the fakeAsyncTest
+    api.patchMethod(Timer, 'advanceTimersToNextTimer', delegate => {
+      return function(self: any, args: any[]) {
+        const fakeAsyncZoneSpec = Zone.current.get('FakeAsyncTestZoneSpec');
+        if (fakeAsyncZoneSpec) {
+          fakeAsyncZoneSpec.tickToNext(args[0]);
+        } else {
+          return delegate.apply(self, args);
+        }
+      }
+    });
+
+    // patch clearAllTimers(), call removeAllTimers() in the fakeAsyncTest
+    api.patchMethod(Timer, 'clearAllTimers', delegate => {
+      return function(self: any, args: any[]) {
+        const fakeAsyncZoneSpec = Zone.current.get('FakeAsyncTestZoneSpec');
+        if (fakeAsyncZoneSpec) {
+          fakeAsyncZoneSpec.removeAllTimers();
+        } else {
+          return delegate.apply(self, args);
+        }
+      }
+    });
+
+    // patch getTimerCount(), call getTimerCount() in the fakeAsyncTest
+    api.patchMethod(Timer, 'getTimerCount', delegate => {
+      return function(self: any, args: any[]) {
+        const fakeAsyncZoneSpec = Zone.current.get('FakeAsyncTestZoneSpec');
+        if (fakeAsyncZoneSpec) {
+          return fakeAsyncZoneSpec.getTimerCount();
+        } else {
+          return delegate.apply(self, args);
+        }
+      }
+    });
+  }
 });
diff --git a/packages/zone.js/lib/testing/fake-async.ts b/packages/zone.js/lib/testing/fake-async.ts
index c97af2401e2e5..29b22b5b5b317 100644
--- a/packages/zone.js/lib/testing/fake-async.ts
+++ b/packages/zone.js/lib/testing/fake-async.ts
@@ -52,7 +52,7 @@ Zone.__load_patch('fakeasync', (global: any, Zone: ZoneType, api: _ZonePrivate)
    */
   function fakeAsync(fn: Function): (...args: any[]) => any {
     // Not using an arrow function to preserve context passed from call site
-    return function(this: unknown, ...args: any[]) {
+    const fakeAsyncFn: any = function(this: unknown, ...args: any[]) {
       const proxyZoneSpec = ProxyZoneSpec.assertPresent();
       if (Zone.current.get('FakeAsyncTestZoneSpec')) {
         throw new Error('fakeAsync() calls can not be nested');
@@ -93,6 +93,8 @@ Zone.__load_patch('fakeasync', (global: any, Zone: ZoneType, api: _ZonePrivate)
         resetFakeAsyncZone();
       }
     };
+    (fakeAsyncFn as any).isFakeAsync = true;
+    return fakeAsyncFn;
   }
 
   function _getFakeAsyncZoneSpec(): any {
diff --git a/packages/zone.js/lib/zone-spec/fake-async-test.ts b/packages/zone.js/lib/zone-spec/fake-async-test.ts
index ba768c1372030..b7ef385c3076c 100644
--- a/packages/zone.js/lib/zone-spec/fake-async-test.ts
+++ b/packages/zone.js/lib/zone-spec/fake-async-test.ts
@@ -45,16 +45,15 @@ function FakeDate() {
   }
 }
 
-FakeDate.now =
-    function(this: unknown) {
+FakeDate.now = function(this: unknown) {
   const fakeAsyncTestZoneSpec = Zone.current.get('FakeAsyncTestZoneSpec');
   if (fakeAsyncTestZoneSpec) {
-    return fakeAsyncTestZoneSpec.getCurrentRealTime() + fakeAsyncTestZoneSpec.getCurrentTime();
+    return fakeAsyncTestZoneSpec.getFakeSystemTime();
   }
   return OriginalDate.now.apply(this, arguments);
-}
+};
 
-    FakeDate.UTC = OriginalDate.UTC;
+FakeDate.UTC = OriginalDate.UTC;
 FakeDate.parse = OriginalDate.parse;
 
 // keep a reference for zone patched timer function
@@ -72,24 +71,28 @@ class Scheduler {
   // Scheduler queue with the tuple of end time and callback function - sorted by end time.
   private _schedulerQueue: ScheduledFunction[] = [];
   // Current simulated time in millis.
-  private _currentTime: number = 0;
-  // Current real time in millis.
-  private _currentRealTime: number = OriginalDate.now();
+  private _currentTickTime: number = 0;
+  // Current fake system base time in millis.
+  private _currentFakeBaseSystemTime: number = OriginalDate.now();
   // track requeuePeriodicTimer
   private _currentTickRequeuePeriodicEntries: any[] = [];
 
   constructor() {}
 
-  getCurrentTime() {
-    return this._currentTime;
+  getCurrentTickTime() {
+    return this._currentTickTime;
+  }
+
+  getFakeSystemTime() {
+    return this._currentFakeBaseSystemTime + this._currentTickTime;
   }
 
-  getCurrentRealTime() {
-    return this._currentRealTime;
+  setFakeBaseSystemTime(fakeBaseSystemTime: number) {
+    this._currentFakeBaseSystemTime = fakeBaseSystemTime;
   }
 
-  setCurrentRealTime(realTime: number) {
-    this._currentRealTime = realTime;
+  getRealSystemTime() {
+    return OriginalDate.now();
   }
 
   scheduleFunction(cb: Function, delay: number, options?: {
@@ -110,7 +113,7 @@ class Scheduler {
       ...options
     };
     let currentId = options.id! < 0 ? Scheduler.nextId++ : options.id!;
-    let endTime = this._currentTime + delay;
+    let endTime = this._currentTickTime + delay;
 
     // Insert so that scheduler queue remains sorted by end time.
     let newEntry: ScheduledFunction = {
@@ -145,10 +148,31 @@ class Scheduler {
     }
   }
 
+  removeAll(): void {
+    this._schedulerQueue = [];
+  }
+
+  getTimerCount(): number {
+    return this._schedulerQueue.length;
+  }
+
+  tickToNext(step: number = 1, doTick?: (elapsed: number) => void, tickOptions?: {
+    processNewMacroTasksSynchronously: boolean
+  }) {
+    if (this._schedulerQueue.length < step) {
+      return;
+    }
+    // Find the last task currently queued in the scheduler queue and tick
+    // till that time.
+    const startTime = this._currentTickTime;
+    const targetTask = this._schedulerQueue[step - 1];
+    this.tick(targetTask.endTime - startTime, doTick, tickOptions);
+  }
+
   tick(millis: number = 0, doTick?: (elapsed: number) => void, tickOptions?: {
     processNewMacroTasksSynchronously: boolean
   }): void {
-    let finalTime = this._currentTime + millis;
+    let finalTime = this._currentTickTime + millis;
     let lastCurrentTime = 0;
     tickOptions = Object.assign({processNewMacroTasksSynchronously: true}, tickOptions);
     // we need to copy the schedulerQueue so nested timeout
@@ -177,13 +201,13 @@ class Scheduler {
             this._schedulerQueue.splice(idx, 1);
           }
         }
-        lastCurrentTime = this._currentTime;
-        this._currentTime = current.endTime;
+        lastCurrentTime = this._currentTickTime;
+        this._currentTickTime = current.endTime;
         if (doTick) {
-          doTick(this._currentTime - lastCurrentTime);
+          doTick(this._currentTickTime - lastCurrentTime);
         }
         let retval = current.func.apply(
-            global, current.isRequestAnimationFrame ? [this._currentTime] : current.args);
+            global, current.isRequestAnimationFrame ? [this._currentTickTime] : current.args);
         if (!retval) {
           // Uncaught exception in the current scheduled function. Stop processing the queue.
           break;
@@ -205,11 +229,23 @@ class Scheduler {
         }
       }
     }
-    lastCurrentTime = this._currentTime;
-    this._currentTime = finalTime;
+    lastCurrentTime = this._currentTickTime;
+    this._currentTickTime = finalTime;
     if (doTick) {
-      doTick(this._currentTime - lastCurrentTime);
+      doTick(this._currentTickTime - lastCurrentTime);
+    }
+  }
+
+  flushOnlyPendingTimers(doTick?: (elapsed: number) => void): number {
+    if (this._schedulerQueue.length === 0) {
+      return 0;
     }
+    // Find the last task currently queued in the scheduler queue and tick
+    // till that time.
+    const startTime = this._currentTickTime;
+    const lastTask = this._schedulerQueue[this._schedulerQueue.length - 1];
+    this.tick(lastTask.endTime - startTime, doTick, {processNewMacroTasksSynchronously: false});
+    return this._currentTickTime - startTime;
   }
 
   flush(limit = 20, flushPeriodic = false, doTick?: (elapsed: number) => void): number {
@@ -226,14 +262,14 @@ class Scheduler {
     }
     // Find the last task currently queued in the scheduler queue and tick
     // till that time.
-    const startTime = this._currentTime;
+    const startTime = this._currentTickTime;
     const lastTask = this._schedulerQueue[this._schedulerQueue.length - 1];
     this.tick(lastTask.endTime - startTime, doTick);
-    return this._currentTime - startTime;
+    return this._currentTickTime - startTime;
   }
 
   private flushNonPeriodic(limit: number, doTick?: (elapsed: number) => void): number {
-    const startTime = this._currentTime;
+    const startTime = this._currentTickTime;
     let lastCurrentTime = 0;
     let count = 0;
     while (this._schedulerQueue.length > 0) {
@@ -252,11 +288,11 @@ class Scheduler {
       }
 
       const current = this._schedulerQueue.shift()!;
-      lastCurrentTime = this._currentTime;
-      this._currentTime = current.endTime;
+      lastCurrentTime = this._currentTickTime;
+      this._currentTickTime = current.endTime;
       if (doTick) {
         // Update any secondary schedulers like Jasmine mock Date.
-        doTick(this._currentTime - lastCurrentTime);
+        doTick(this._currentTickTime - lastCurrentTime);
       }
       const retval = current.func.apply(global, current.args);
       if (!retval) {
@@ -264,7 +300,7 @@ class Scheduler {
         break;
       }
     }
-    return this._currentTime - startTime;
+    return this._currentTickTime - startTime;
   }
 }
 
@@ -389,16 +425,20 @@ class FakeAsyncTestZoneSpec implements ZoneSpec {
     throw error;
   }
 
-  getCurrentTime() {
-    return this._scheduler.getCurrentTime();
+  getCurrentTickTime() {
+    return this._scheduler.getCurrentTickTime();
+  }
+
+  getFakeSystemTime() {
+    return this._scheduler.getFakeSystemTime();
   }
 
-  getCurrentRealTime() {
-    return this._scheduler.getCurrentRealTime();
+  setFakeBaseSystemTime(realTime: number) {
+    this._scheduler.setFakeBaseSystemTime(realTime);
   }
 
-  setCurrentRealTime(realTime: number) {
-    this._scheduler.setCurrentRealTime(realTime);
+  getRealSystemTime() {
+    return this._scheduler.getRealSystemTime();
   }
 
   static patchDate() {
@@ -450,6 +490,20 @@ class FakeAsyncTestZoneSpec implements ZoneSpec {
     FakeAsyncTestZoneSpec.resetDate();
   }
 
+  tickToNext(steps: number = 1, doTick?: (elapsed: number) => void, tickOptions: {
+    processNewMacroTasksSynchronously: boolean
+  } = {processNewMacroTasksSynchronously: true}): void {
+    if (steps <= 0) {
+      return;
+    }
+    FakeAsyncTestZoneSpec.assertInZone();
+    this.flushMicrotasks();
+    this._scheduler.tickToNext(steps, doTick, tickOptions);
+    if (this._lastError !== null) {
+      this._resetLastErrorAndThrow();
+    }
+  }
+
   tick(millis: number = 0, doTick?: (elapsed: number) => void, tickOptions: {
     processNewMacroTasksSynchronously: boolean
   } = {processNewMacroTasksSynchronously: true}): void {
@@ -486,6 +540,27 @@ class FakeAsyncTestZoneSpec implements ZoneSpec {
     return elapsed;
   }
 
+  flushOnlyPendingTimers(doTick?: (elapsed: number) => void): number {
+    FakeAsyncTestZoneSpec.assertInZone();
+    this.flushMicrotasks();
+    const elapsed = this._scheduler.flushOnlyPendingTimers(doTick);
+    if (this._lastError !== null) {
+      this._resetLastErrorAndThrow();
+    }
+    return elapsed;
+  }
+
+  removeAllTimers() {
+    FakeAsyncTestZoneSpec.assertInZone();
+    this._scheduler.removeAll();
+    this.pendingPeriodicTimers = [];
+    this.pendingTimers = [];
+  }
+
+  getTimerCount() {
+    return this._scheduler.getTimerCount() + this._microtasks.length;
+  }
+
   // ZoneSpec implementation below.
 
   name: string;
diff --git a/packages/zone.js/lib/zone.ts b/packages/zone.js/lib/zone.ts
index 54c188b5a75b1..86b0949bf3a84 100644
--- a/packages/zone.js/lib/zone.ts
+++ b/packages/zone.js/lib/zone.ts
@@ -383,6 +383,7 @@ interface UncaughtPromiseError extends Error {
   task: Task;
   promise: Promise<any>;
   rejection: any;
+  throwOriginal?: boolean;
 }
 
 /**
diff --git a/packages/zone.js/package.json b/packages/zone.js/package.json
index de98a551e0c40..f0b4729427251 100644
--- a/packages/zone.js/package.json
+++ b/packages/zone.js/package.json
@@ -1,35 +1,28 @@
 {
   "name": "zone.js",
-  "version": "0.10.3",
+  "version": "0.11.2",
   "description": "Zones for JavaScript",
   "main": "./bundles/zone.umd.js",
   "module": "./fesm2015/zone.js",
   "es2015": "./fesm2015/zone.js",
   "fesm2015": "./fesm2015/zone.js",
-  "files": [
-    "./zone.js.d.ts",
-    "./zone.api.extensions.ts",
-    "./zone.configurations.api.ts"
-  ],
+  "typings": "./zone.d.ts",
   "dependencies": {
     "tslib": "^2.0.0"
   },
-  "directories": {
-    "lib": "lib",
-    "test": "test"
-  },
   "devDependencies": {
     "@types/node": "^10.9.4",
     "domino": "2.1.2",
-    "jest": "^25.1.0",
+    "jest": "^26.4",
     "mocha": "^3.1.2",
     "mock-require": "3.0.3",
     "promises-aplus-tests": "^2.1.2",
-    "typescript": "^3.8.3"
+    "typescript": "4.0.2"
   },
   "scripts": {
     "electrontest": "cd test/extra && node electron.js",
-    "jesttest": "jest --config ./test/jest/jest.config.js ./test/jest/jest.spec.js",
+    "jest:test": "jest --config ./test/jest/jest.config.js ./test/jest/jest.spec.js",
+    "jest:nodetest": "jest --config ./test/jest/jest.node.config.js ./test/jest/jest.spec.js",
     "promisetest": "tsc -p . && node ./test/promise/promise-test.js",
     "promisefinallytest": "tsc -p . && mocha ./test/promise/promise.finally.spec.js"
   },
@@ -38,8 +31,8 @@
     "url": "git://github.com/angular/angular.git",
     "directory": "packages/zone.js"
   },
-  "publishConfig":{
-    "registry":"https://wombat-dressing-room.appspot.com"
+  "publishConfig": {
+    "registry": "https://wombat-dressing-room.appspot.com"
   },
   "author": "Brian Ford",
   "license": "MIT",
diff --git a/packages/zone.js/sauce.conf.js b/packages/zone.js/sauce.conf.js
index 28bc132b860a0..f63b7597e682b 100644
--- a/packages/zone.js/sauce.conf.js
+++ b/packages/zone.js/sauce.conf.js
@@ -38,18 +38,6 @@ module.exports = function(config, ignoredLaunchers) {
     // 'SL_IOS9': {base: 'SauceLabs', browserName: 'iphone', platform: 'OS X 10.10', version:
     // '9.3'},
     'SL_IOS10': {base: 'SauceLabs', browserName: 'iphone', platform: 'OS X 10.10', version: '10.3'},
-    'SL_IE9': {
-      base: 'SauceLabs',
-      browserName: 'internet explorer',
-      platform: 'Windows 2008',
-      version: '9'
-    },
-    'SL_IE10': {
-      base: 'SauceLabs',
-      browserName: 'internet explorer',
-      platform: 'Windows 2012',
-      version: '10'
-    },
     'SL_IE11': {
       base: 'SauceLabs',
       browserName: 'internet explorer',
diff --git a/packages/zone.js/test/browser/XMLHttpRequest.spec.ts b/packages/zone.js/test/browser/XMLHttpRequest.spec.ts
index 3152c8dffea1a..da23b072ffad9 100644
--- a/packages/zone.js/test/browser/XMLHttpRequest.spec.ts
+++ b/packages/zone.js/test/browser/XMLHttpRequest.spec.ts
@@ -268,6 +268,30 @@ describe('XMLHttpRequest', function() {
        });
      });
 
+  it('should close xhr request if error happened when connect', function(done) {
+    const logs: boolean[] = [];
+    Zone.current
+        .fork({
+          name: 'xhr',
+          onHasTask:
+              (delegate: ZoneDelegate, curr: Zone, target: Zone, taskState: HasTaskState) => {
+                if (taskState.change === 'macroTask') {
+                  logs.push(taskState.macroTask);
+                }
+                return delegate.hasTask(target, taskState);
+              }
+        })
+        .run(function() {
+          const req = new XMLHttpRequest();
+          req.open('get', 'http://notexists.url', true);
+          req.send();
+          req.addEventListener('error', () => {
+            expect(logs).toEqual([true, false]);
+            done();
+          });
+        });
+  });
+
   it('should trigger readystatechange if xhr request trigger cors error', (done) => {
     const req = new XMLHttpRequest();
     let err: any = null;
diff --git a/packages/zone.js/test/browser/browser.spec.ts b/packages/zone.js/test/browser/browser.spec.ts
index c635cfbfb58ff..05f7ea4465158 100644
--- a/packages/zone.js/test/browser/browser.spec.ts
+++ b/packages/zone.js/test/browser/browser.spec.ts
@@ -315,11 +315,6 @@ describe('Zone', function() {
           // TODO: JiaLiPassion, need to find out why the test bundle is not `use strict`.
           xit('event handler with null context should use event.target',
               ifEnvSupports(canPatchOnProperty(Document.prototype, 'onmousedown'), function() {
-                const ieVer = getIEVersion();
-                if (ieVer && ieVer === 9) {
-                  // in ie9, this is window object even we call func.apply(undefined)
-                  return;
-                }
                 const logs: string[] = [];
                 const EventTarget = (window as any)['EventTarget'];
                 let oriAddEventListener = EventTarget && EventTarget.prototype ?
@@ -1154,10 +1149,10 @@ describe('Zone', function() {
         it('should not be passive with global variable defined with passive false option', () => {
           testPassive('touchstart', 'defaultPrevented', {passive: false});
         });
-        it('should be passive with global variable defined and also blacklisted', () => {
+        it('should be passive with global variable defined and also unpatched', () => {
           testPassive('scroll', 'default will run', undefined);
         });
-        it('should not be passive without global variable defined and also blacklisted', () => {
+        it('should not be passive without global variable defined and also unpatched', () => {
           testPassive('wheel', 'defaultPrevented', undefined);
         });
       });
@@ -1376,7 +1371,7 @@ describe('Zone', function() {
            let hookSpy2 = jasmine.createSpy('spy2');
            let hookSpy3 = jasmine.createSpy('spy3');
            let logs: string[] = [];
-           const isBlacklistedEvent = function(source: string) {
+           const isUnpatchedEvent = function(source: string) {
              return source.lastIndexOf('click') !== -1;
            };
            const zone1 = Zone.current.fork({
@@ -1385,7 +1380,7 @@ describe('Zone', function() {
                  parentZoneDelegate: ZoneDelegate, currentZone: Zone, targetZone: Zone, task: Task):
                  any => {
                    if ((task.type === 'eventTask' || task.type === 'macroTask') &&
-                       isBlacklistedEvent(task.source)) {
+                       isUnpatchedEvent(task.source)) {
                      task.cancelScheduleRequest();
 
                      return zone2.scheduleTask(task);
diff --git a/packages/zone.js/test/common/promise-disable-wrap-uncaught-promise-rejection.spec.ts b/packages/zone.js/test/common/promise-disable-wrap-uncaught-promise-rejection.spec.ts
index 2906b7d20e037..c6f88f265e751 100644
--- a/packages/zone.js/test/common/promise-disable-wrap-uncaught-promise-rejection.spec.ts
+++ b/packages/zone.js/test/common/promise-disable-wrap-uncaught-promise-rejection.spec.ts
@@ -42,9 +42,9 @@ describe('disable wrap uncaught promise rejection', () => {
     setTimeout((): any => null);
     setTimeout(() => {
       expect(promiseError).toBe(error);
-      expect((promiseError as any)['rejection']).toBe(error);
-      expect((promiseError as any)['zone']).toBe(zone);
-      expect((promiseError as any)['task']).toBe(task);
+      expect((promiseError as any)['rejection']).toBe(undefined);
+      expect((promiseError as any)['zone']).toBe(undefined);
+      expect((promiseError as any)['task']).toBe(undefined);
       done();
     });
   });
@@ -76,4 +76,27 @@ describe('disable wrap uncaught promise rejection', () => {
       done();
     });
   });
+
+  it('should print original information when a primitive value is used for rejection', (done) => {
+    let promiseError: number|null = null;
+    Zone.current
+        .fork({
+          name: 'promise-error',
+          onHandleError: (delegate: ZoneDelegate, current: Zone, target: Zone, error: any):
+              boolean => {
+                promiseError = error;
+                delegate.handleError(target, error);
+                return false;
+              }
+        })
+        .run(() => {
+          Promise.reject(42);
+          expect(promiseError).toBe(null);
+        });
+    setTimeout((): any => null);
+    setTimeout(() => {
+      expect(promiseError).toBe(42);
+      done();
+    });
+  });
 });
diff --git a/packages/zone.js/test/common/toString.spec.ts b/packages/zone.js/test/common/toString.spec.ts
index d959df23f1665..d1f0320726532 100644
--- a/packages/zone.js/test/common/toString.spec.ts
+++ b/packages/zone.js/test/common/toString.spec.ts
@@ -18,6 +18,18 @@ describe('global function patch', () => {
           .toEqual(Function.prototype.toString.call(g[zoneSymbol('setTimeout')]));
     });
 
+    it('should not throw error if Promise is not a function', () => {
+      const P = g.Promise;
+      try {
+        g.Promise = undefined;
+        expect(() => {
+          const a = {}.toString();
+        }).not.toThrow();
+      } finally {
+        g.Promise = P;
+      }
+    });
+
     it('MutationObserver toString should be the same with native version',
        ifEnvSupports('MutationObserver', () => {
          const nativeMutationObserver = g[zoneSymbol('MutationObserver')];
diff --git a/packages/zone.js/test/jest/jest-zone-patch-fake-timer.js b/packages/zone.js/test/jest/jest-zone-patch-fake-timer.js
new file mode 100644
index 0000000000000..e69790b542ac0
--- /dev/null
+++ b/packages/zone.js/test/jest/jest-zone-patch-fake-timer.js
@@ -0,0 +1,6 @@
+const exportFakeTimersToSandboxGlobal = function(jestEnv) {
+  jestEnv.global.legacyFakeTimers = jestEnv.fakeTimers;
+  jestEnv.global.modernFakeTimers = jestEnv.fakeTimersModern;
+};
+
+module.exports = exportFakeTimersToSandboxGlobal;
diff --git a/packages/zone.js/test/jest/jest-zone.js b/packages/zone.js/test/jest/jest-zone.js
index 0aac44f296877..55ec80c9f9d63 100644
--- a/packages/zone.js/test/jest/jest-zone.js
+++ b/packages/zone.js/test/jest/jest-zone.js
@@ -1,2 +1,9 @@
+const {legacyFakeTimers, modernFakeTimers} = global;
+
 require('../../../../dist/bin/packages/zone.js/npm_package/dist/zone');
 require('../../../../dist/bin/packages/zone.js/npm_package/dist/zone-testing');
+
+if (Zone && Zone.patchJestObject) {
+  Zone.patchJestObject(legacyFakeTimers);
+  Zone.patchJestObject(modernFakeTimers);
+}
diff --git a/packages/zone.js/test/jest/jest.config.js b/packages/zone.js/test/jest/jest.config.js
index c798061d3665d..265fc1e021d72 100644
--- a/packages/zone.js/test/jest/jest.config.js
+++ b/packages/zone.js/test/jest/jest.config.js
@@ -1,3 +1,4 @@
 module.exports = {
-  setupFilesAfterEnv: ['./jest-zone.js']
+  setupFilesAfterEnv: ['./jest-zone.js'],
+  testEnvironment: './zone-jsdom-environment.js'
 };
diff --git a/packages/zone.js/test/jest/jest.node.config.js b/packages/zone.js/test/jest/jest.node.config.js
new file mode 100644
index 0000000000000..f4ea114aaaba3
--- /dev/null
+++ b/packages/zone.js/test/jest/jest.node.config.js
@@ -0,0 +1,4 @@
+module.exports = {
+  setupFilesAfterEnv: ['./jest-zone.js'],
+  testEnvironment: './zone-node-environment.js'
+};
diff --git a/packages/zone.js/test/jest/jest.spec.js b/packages/zone.js/test/jest/jest.spec.js
index 35fa8df264eb6..77ebc6dbee4c3 100644
--- a/packages/zone.js/test/jest/jest.spec.js
+++ b/packages/zone.js/test/jest/jest.spec.js
@@ -100,3 +100,323 @@ test.each([[]])('test.each', () => {
 });
 
 test.todo('todo');
+
+function enableJestPatch() {
+  global[Zone.__symbol__('fakeAsyncDisablePatchingFakeTimer')] = true;
+}
+
+function disableJestPatch() {
+  global[Zone.__symbol__('fakeAsyncDisablePatchingFakeTimer')] = false;
+}
+const {resetFakeAsyncZone, flushMicrotasks, discardPeriodicTasks, tick, flush, fakeAsync} =
+    Zone[Zone.__symbol__('fakeAsyncTest')];
+
+describe('jest modern fakeTimers with zone.js fakeAsync', () => {
+  beforeEach(() => {
+    jest.useFakeTimers('modern');
+  });
+  afterEach(() => {
+    jest.useRealTimers();
+  });
+
+  test('should run into fakeAsync() automatically', () => {
+    const fakeAsyncZoneSpec = Zone.current.get('FakeAsyncTestZoneSpec');
+    expect(fakeAsyncZoneSpec).toBeTruthy();
+    expect(typeof fakeAsyncZoneSpec.tick).toEqual('function');
+  });
+
+  test('setSystemTime should set FakeDate.currentFakeTime', () => {
+    const fakeAsyncZoneSpec = Zone.current.get('FakeAsyncTestZoneSpec');
+    let d = fakeAsyncZoneSpec.getRealSystemTime();
+    jest.setSystemTime(d);
+    expect(Date.now()).toEqual(d);
+    for (let i = 0; i < 100000; i++) {
+    }
+    expect(fakeAsyncZoneSpec.getRealSystemTime()).not.toEqual(d);
+    d = fakeAsyncZoneSpec.getRealSystemTime();
+    let timeoutTriggered = false;
+    setTimeout(() => {
+      timeoutTriggered = true;
+    }, 100);
+    jest.setSystemTime(d);
+    tick(100);
+    expect(timeoutTriggered).toBe(true);
+    expect(Date.now()).toEqual(d + 100);
+  });
+
+  test('runAllTicks should run all microTasks', () => {
+    const logs = [];
+    Promise.resolve(1).then(v => logs.push(v));
+    expect(logs).toEqual([]);
+    jest.runAllTicks();
+    expect(logs).toEqual([1]);
+  });
+
+  test('runAllTimers should run all macroTasks', () => {
+    const logs = [];
+    Promise.resolve(1).then(v => logs.push(v));
+    setTimeout(() => {logs.push('timeout')});
+    const id = setInterval(() => {logs.push('interval')}, 100);
+    expect(logs).toEqual([]);
+    jest.runAllTimers();
+    expect(logs).toEqual([1, 'timeout', 'interval']);
+    clearInterval(id);
+  });
+
+  test('advanceTimersByTime should act as tick', () => {
+    const logs = [];
+    setTimeout(() => {logs.push('timeout')}, 100);
+    expect(logs).toEqual([]);
+    jest.advanceTimersByTime(100);
+    expect(logs).toEqual(['timeout']);
+  });
+
+  test('runOnlyPendingTimers should run all macroTasks and ignore new spawn macroTasks', () => {
+    const logs = [];
+    Promise.resolve(1).then(v => logs.push(v));
+    let nestedTimeoutId;
+    setTimeout(() => {
+      logs.push('timeout');
+      nestedTimeoutId = setTimeout(() => {logs.push('new timeout')});
+    });
+    expect(logs).toEqual([]);
+    jest.runOnlyPendingTimers();
+    expect(logs).toEqual([1, 'timeout']);
+    clearTimeout(nestedTimeoutId);
+  });
+
+  test('advanceTimersToNextTimer should trigger correctly', () => {
+    const logs = [];
+    setTimeout(() => {logs.push('timeout1')}, 100);
+    setTimeout(() => {logs.push('timeout11')}, 100);
+    setTimeout(() => {logs.push('timeout2')}, 200);
+    setTimeout(() => {logs.push('timeout3')}, 300);
+    expect(logs).toEqual([]);
+    jest.advanceTimersToNextTimer();
+    expect(logs).toEqual(['timeout1', 'timeout11']);
+    jest.advanceTimersToNextTimer(2);
+    expect(logs).toEqual(['timeout1', 'timeout11', 'timeout2', 'timeout3']);
+  });
+
+  test('clearAllTimers should clear all macroTasks', () => {
+    const logs = [];
+    setTimeout(() => {logs.push('timeout1')}, 100);
+    setTimeout(() => {logs.push('timeout2')}, 200);
+    setInterval(() => {logs.push('interval')}, 100);
+    expect(logs).toEqual([]);
+    jest.clearAllTimers();
+    jest.advanceTimersByTime(300);
+    expect(logs).toEqual([]);
+  });
+
+  test('getTimerCount should get the count of macroTasks correctly', () => {
+    const logs = [];
+    setTimeout(() => {logs.push('timeout1')}, 100);
+    setTimeout(() => {logs.push('timeout2')}, 200);
+    setInterval(() => {logs.push('interval')}, 100);
+    expect(logs).toEqual([]);
+    expect(jest.getTimerCount()).toEqual(3);
+    jest.clearAllTimers();
+  });
+});
+
+describe('jest legacy fakeTimers with zone.js fakeAsync', () => {
+  beforeEach(() => {
+    jest.useFakeTimers();
+  });
+  afterEach(() => {
+    jest.useRealTimers();
+  });
+
+  test('should run into fakeAsync() automatically', () => {
+    const fakeAsyncZoneSpec = Zone.current.get('FakeAsyncTestZoneSpec');
+    expect(fakeAsyncZoneSpec).toBeTruthy();
+    expect(typeof fakeAsyncZoneSpec.tick).toEqual('function');
+  });
+
+  test('setSystemTime should set FakeDate.currentRealTime', () => {
+    const d = Date.now();
+    expect(() => {jest.setSystemTime(d)}).toThrow();
+  });
+
+  test('runAllTicks should run all microTasks', () => {
+    const logs = [];
+    Promise.resolve(1).then(v => logs.push(v));
+    expect(logs).toEqual([]);
+    jest.runAllTicks();
+    expect(logs).toEqual([1]);
+  });
+
+  test('runAllTimers should run all macroTasks', () => {
+    const logs = [];
+    Promise.resolve(1).then(v => logs.push(v));
+    setTimeout(() => {logs.push('timeout')});
+    const id = setInterval(() => {logs.push('interval')}, 100);
+    expect(logs).toEqual([]);
+    jest.runAllTimers();
+    expect(logs).toEqual([1, 'timeout', 'interval']);
+    clearInterval(id);
+  });
+
+  test('advanceTimersByTime should act as tick', () => {
+    const logs = [];
+    setTimeout(() => {logs.push('timeout')}, 100);
+    expect(logs).toEqual([]);
+    jest.advanceTimersByTime(100);
+    expect(logs).toEqual(['timeout']);
+  });
+
+  test('runOnlyPendingTimers should run all macroTasks and ignore new spawn macroTasks', () => {
+    const logs = [];
+    Promise.resolve(1).then(v => logs.push(v));
+    let nestedTimeoutId;
+    setTimeout(() => {
+      logs.push('timeout');
+      nestedTimeoutId = setTimeout(() => {logs.push('new timeout')});
+    });
+    expect(logs).toEqual([]);
+    jest.runOnlyPendingTimers();
+    expect(logs).toEqual([1, 'timeout']);
+    clearTimeout(nestedTimeoutId);
+  });
+
+  test('advanceTimersToNextTimer should trigger correctly', () => {
+    const logs = [];
+    setTimeout(() => {logs.push('timeout1')}, 100);
+    setTimeout(() => {logs.push('timeout11')}, 100);
+    setTimeout(() => {logs.push('timeout2')}, 200);
+    setTimeout(() => {logs.push('timeout3')}, 300);
+    expect(logs).toEqual([]);
+    jest.advanceTimersToNextTimer();
+    expect(logs).toEqual(['timeout1', 'timeout11']);
+    jest.advanceTimersToNextTimer(2);
+    expect(logs).toEqual(['timeout1', 'timeout11', 'timeout2', 'timeout3']);
+  });
+
+  test('clearAllTimers should clear all macroTasks', () => {
+    const logs = [];
+    setTimeout(() => {logs.push('timeout1')}, 100);
+    setTimeout(() => {logs.push('timeout2')}, 200);
+    setInterval(() => {logs.push('interval')}, 100);
+    expect(logs).toEqual([]);
+    jest.clearAllTimers();
+    jest.advanceTimersByTime(300);
+    expect(logs).toEqual([]);
+  });
+
+  test('getTimerCount should get the count of macroTasks correctly', () => {
+    const logs = [];
+    setTimeout(() => {logs.push('timeout1')}, 100);
+    setTimeout(() => {logs.push('timeout2')}, 200);
+    setInterval(() => {logs.push('interval')}, 100);
+    expect(logs).toEqual([]);
+    expect(jest.getTimerCount()).toEqual(3);
+    jest.clearAllTimers();
+  });
+});
+
+describe('jest fakeTimers inside test should call native delegate', () => {
+  test('setSystemTime should set FakeDate.currentRealTime', () => {
+    let fakeAsyncZoneSpec = Zone.current.get('FakeAsyncTestZoneSpec');
+    expect(fakeAsyncZoneSpec).toBeFalsy();
+    jest.useFakeTimers('modern');
+    fakeAsyncZoneSpec = Zone.current.get('FakeAsyncTestZoneSpec');
+    expect(fakeAsyncZoneSpec).toBeFalsy();
+    const d = Date.now();
+    jest.setSystemTime(d);
+    for (let i = 0; i < 100000; i++) {
+    }
+    expect(jest.getRealSystemTime()).not.toEqual(d);
+    jest.useRealTimers();
+  });
+
+  test('runAllTicks should run all microTasks', () => {
+    jest.useFakeTimers();
+    const logs = [];
+    process.nextTick(() => {logs.push(1)});
+    expect(logs).toEqual([]);
+    jest.runAllTicks();
+    expect(logs).toEqual([1]);
+    jest.useRealTimers();
+  });
+
+  test('runAllTimers should run all macroTasks', () => {
+    jest.useFakeTimers();
+    const logs = [];
+    process.nextTick(() => {logs.push(1)});
+    setTimeout(() => {logs.push('timeout')});
+    const id = setInterval(() => {
+      logs.push('interval');
+      clearInterval(id);
+    }, 100);
+    expect(logs).toEqual([]);
+    jest.runAllTimers();
+    expect(logs).toEqual([1, 'timeout', 'interval']);
+    jest.useRealTimers();
+  });
+
+  test('advanceTimersByTime should act as tick', () => {
+    jest.useFakeTimers();
+    const logs = [];
+    setTimeout(() => {logs.push('timeout')}, 100);
+    expect(logs).toEqual([]);
+    jest.advanceTimersByTime(100);
+    expect(logs).toEqual(['timeout']);
+    jest.useRealTimers();
+  });
+
+  test('runOnlyPendingTimers should run all macroTasks and ignore new spawn macroTasks', () => {
+    jest.useFakeTimers();
+    const logs = [];
+    let nestedTimeoutId;
+    setTimeout(() => {
+      logs.push('timeout');
+      nestedTimeoutId = setTimeout(() => {logs.push('new timeout')});
+    });
+    expect(logs).toEqual([]);
+    jest.runOnlyPendingTimers();
+    expect(logs).toEqual(['timeout']);
+    clearTimeout(nestedTimeoutId);
+    jest.useRealTimers();
+  });
+
+  test('advanceTimersToNextTimer should trigger correctly', () => {
+    jest.useFakeTimers();
+    const logs = [];
+    setTimeout(() => {logs.push('timeout1')}, 100);
+    setTimeout(() => {logs.push('timeout11')}, 100);
+    setTimeout(() => {logs.push('timeout2')}, 200);
+    setTimeout(() => {logs.push('timeout3')}, 300);
+    expect(logs).toEqual([]);
+    jest.advanceTimersToNextTimer();
+    expect(logs).toEqual(['timeout1', 'timeout11']);
+    jest.advanceTimersToNextTimer(2);
+    expect(logs).toEqual(['timeout1', 'timeout11', 'timeout2', 'timeout3']);
+    jest.useRealTimers();
+  });
+
+  test('clearAllTimers should clear all macroTasks', () => {
+    jest.useFakeTimers();
+    const logs = [];
+    setTimeout(() => {logs.push('timeout1')}, 100);
+    setTimeout(() => {logs.push('timeout2')}, 200);
+    setInterval(() => {logs.push('interval')}, 100);
+    expect(logs).toEqual([]);
+    jest.clearAllTimers();
+    jest.advanceTimersByTime(300);
+    expect(logs).toEqual([]);
+    jest.useRealTimers();
+  });
+
+  test('getTimerCount should get the count of macroTasks correctly', () => {
+    jest.useFakeTimers();
+    const logs = [];
+    setTimeout(() => {logs.push('timeout1')}, 100);
+    setTimeout(() => {logs.push('timeout2')}, 200);
+    setInterval(() => {logs.push('interval')}, 100);
+    expect(logs).toEqual([]);
+    expect(jest.getTimerCount()).toEqual(3);
+    jest.clearAllTimers();
+    jest.useRealTimers();
+  });
+});
diff --git a/packages/zone.js/test/jest/zone-jsdom-environment.js b/packages/zone.js/test/jest/zone-jsdom-environment.js
new file mode 100644
index 0000000000000..9fcfb0f9977ee
--- /dev/null
+++ b/packages/zone.js/test/jest/zone-jsdom-environment.js
@@ -0,0 +1,23 @@
+const JsDOMEnvironment = require('jest-environment-jsdom');
+const exportFakeTimersToSandboxGlobal = require('./jest-zone-patch-fake-timer');
+
+class ZoneJsDOMEnvironment extends JsDOMEnvironment {
+  constructor(config) {
+    super(config);
+    exportFakeTimersToSandboxGlobal(this);
+  }
+
+  async setup() {
+    await super.setup();
+  }
+
+  async teardown() {
+    await super.teardown();
+  }
+
+  runScript(script) {
+    return super.runScript(script);
+  }
+}
+
+module.exports = ZoneJsDOMEnvironment;
diff --git a/packages/zone.js/test/jest/zone-node-environment.js b/packages/zone.js/test/jest/zone-node-environment.js
new file mode 100644
index 0000000000000..fd2c1e308173f
--- /dev/null
+++ b/packages/zone.js/test/jest/zone-node-environment.js
@@ -0,0 +1,23 @@
+const NodeEnvironment = require('jest-environment-node');
+const exportFakeTimersToSandboxGlobal = require('./jest-zone-patch-fake-timer');
+
+class ZoneNodeEnvironment extends NodeEnvironment {
+  constructor(config) {
+    super(config);
+    exportFakeTimersToSandboxGlobal(this);
+  }
+
+  async setup() {
+    await super.setup();
+  }
+
+  async teardown() {
+    await super.teardown();
+  }
+
+  runScript(script) {
+    return super.runScript(script);
+  }
+}
+
+module.exports = ZoneNodeEnvironment;
diff --git a/packages/zone.js/test/karma_test.bzl b/packages/zone.js/test/karma_test.bzl
index 64e331d73893e..5e0e5ed2a47ea 100644
--- a/packages/zone.js/test/karma_test.bzl
+++ b/packages/zone.js/test/karma_test.bzl
@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "rollup_bundle", "ts_library")
-load("@npm_bazel_karma//:index.bzl", "karma_web_test_suite")
+load("@npm//@bazel/karma:index.bzl", "karma_web_test_suite")
 
 def karma_test_prepare(name, env_srcs, env_deps, env_entry_point, test_srcs, test_deps, test_entry_point):
     ts_library(
diff --git a/packages/zone.js/test/main.ts b/packages/zone.js/test/main.ts
index abafa40fcd1e5..2a9f29a55d182 100644
--- a/packages/zone.js/test/main.ts
+++ b/packages/zone.js/test/main.ts
@@ -19,13 +19,13 @@ __karma__.loaded = function() {};
 let entryPoint = 'browser_entry_point';
 
 if (typeof __karma__ !== 'undefined') {
-  (window as any)['__Zone_Error_BlacklistedStackFrames_policy'] =
+  (window as any)['__Zone_Error_ZoneJsInternalStackFrames_policy'] =
       (__karma__ as any).config.errorpolicy;
   if ((__karma__ as any).config.entrypoint) {
     entryPoint = (__karma__ as any).config.entrypoint;
   }
 } else if (typeof process !== 'undefined') {
-  (window as any)['__Zone_Error_BlacklistedStackFrames_policy'] = process.env.errorpolicy;
+  (window as any)['__Zone_Error_ZoneJsInternalStackFrames_policy'] = process.env.errorpolicy;
   if (process.env.entrypoint) {
     entryPoint = process.env.entrypoint;
   }
diff --git a/packages/zone.js/test/node_error_disable_policy_entry_point.ts b/packages/zone.js/test/node_error_disable_policy_entry_point.ts
index e6f1e3028ef66..e11dfdd13ce4c 100644
--- a/packages/zone.js/test/node_error_disable_policy_entry_point.ts
+++ b/packages/zone.js/test/node_error_disable_policy_entry_point.ts
@@ -6,6 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-process.env['errorpolicy'] = (global as any)['__Zone_Error_BlacklistedStackFrames_policy'] =
+process.env['errorpolicy'] = (global as any)['__Zone_Error_ZoneJsInternalStackFrames_policy'] =
     'disable';
 import './node_error_entry_point';
diff --git a/packages/zone.js/test/node_error_entry_point.ts b/packages/zone.js/test/node_error_entry_point.ts
index 1f8b06484bda2..a3602d36b9caa 100644
--- a/packages/zone.js/test/node_error_entry_point.ts
+++ b/packages/zone.js/test/node_error_entry_point.ts
@@ -14,7 +14,7 @@ import '../lib/zone';
 import '../lib/common/promise';
 import '../lib/common/to-string';
 
-process.env['errorpolicy'] = (global as any)['__Zone_Error_BlacklistedStackFrames_policy'] =
+process.env['errorpolicy'] = (global as any)['__Zone_Error_ZoneJsInternalStackFrames_policy'] =
     'disable';
 // Setup test environment
 require('@bazel/jasmine').boot();
diff --git a/packages/zone.js/test/node_error_lazy_policy_entry_point.ts b/packages/zone.js/test/node_error_lazy_policy_entry_point.ts
index 524a628b5350b..acf37d60fa59c 100644
--- a/packages/zone.js/test/node_error_lazy_policy_entry_point.ts
+++ b/packages/zone.js/test/node_error_lazy_policy_entry_point.ts
@@ -6,5 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-process.env['errorpolicy'] = (global as any)['__Zone_Error_BlacklistedStackFrames_policy'] = 'lazy';
+process.env['errorpolicy'] = (global as any)['__Zone_Error_ZoneJsInternalStackFrames_policy'] =
+    'lazy';
 import './node_error_entry_point';
diff --git a/packages/zone.js/test/npm_package/npm_package.spec.ts b/packages/zone.js/test/npm_package/npm_package.spec.ts
index 03059156005dd..ebf76c6281c08 100644
--- a/packages/zone.js/test/npm_package/npm_package.spec.ts
+++ b/packages/zone.js/test/npm_package/npm_package.spec.ts
@@ -40,20 +40,18 @@ describe('Zone.js npm_package', () => {
     it('should contain module resolution mappings', () => {
       expect(shx.grep('"main":', packageJson)).toContain(`zone.umd.js`);
     });
+
+    it('should contain typings', () => {
+      expect(shx.grep('"typings":', packageJson)).toContain(`./zone.d.ts`);
+    });
   });
 
   describe('check npm_package root folder', () => {
     describe('typescript support', () => {
-      it('should have an zone.js.d.ts file', () => {
-        expect(shx.cat('zone.js.d.ts')).toContain('declare const');
-      });
-
-      it('should have an zone.api.extensions.ts file', () => {
-        expect(shx.cat('zone.api.extensions.ts')).toContain('EventTarget');
-      });
-
-      it('should have an zone.configurations.api.ts file', () => {
-        expect(shx.cat('zone.configurations.api.ts')).toContain('ZoneGlobalConfigurations');
+      it('should have an zone.d.ts file', () => {
+        expect(shx.cat('zone.d.ts')).toContain('declare const');
+        expect(shx.cat('zone.d.ts')).toContain('interface EventTarget');
+        expect(shx.cat('zone.d.ts')).toContain('ZoneGlobalConfigurations');
       });
     });
 
@@ -184,7 +182,7 @@ describe('Zone.js npm_package', () => {
       });
     });
 
-    describe('dist file list', () => {
+    describe('bundles file list', () => {
       it('should contain all files', () => {
         const expected = [
           'async-test.js',
@@ -279,114 +277,86 @@ describe('Zone.js npm_package', () => {
 
     describe('backward compatible check', () => {
       it('should contain all original folders in /dist', () => {
+        const list = shx.ls('./dist').stdout.split('\n').sort().slice(1);
         const expected = [
-          'async-test',
-          'async-test.min',
-          'fake-async-test',
-          'fake-async-test.min',
-          'jasmine-patch',
-          'jasmine-patch.min',
-          'long-stack-trace-zone',
-          'long-stack-trace-zone.min',
-          'mocha-patch',
-          'mocha-patch.min',
-          'proxy',
-          'proxy.min',
-          'sync-test',
-          'sync-test.min',
-          'task-tracking',
-          'task-tracking.min',
-          'webapis-media-query',
-          'webapis-media-query.min',
-          'webapis-notification',
-          'webapis-notification.min',
-          'webapis-rtc-peer-connection',
-          'webapis-rtc-peer-connection.min',
-          'webapis-shadydom',
-          'webapis-shadydom.min',
-          'wtf',
-          'wtf.min',
-          'zone-bluebird',
-          'zone-bluebird.min',
-          'zone-error',
-          'zone-error.min',
-          'zone-legacy',
-          'zone-legacy.min',
-          'zone-mix',
-          'zone-mix.min',
-          'zone-node',
-          'zone-node.min',
-          'zone-patch-canvas',
-          'zone-patch-canvas.min',
-          'zone-patch-cordova',
-          'zone-patch-cordova.min',
-          'zone-patch-electron',
-          'zone-patch-electron.min',
-          'zone-patch-fetch',
-          'zone-patch-fetch.min',
-          'zone-patch-jsonp',
-          'zone-patch-jsonp.min',
-          'zone-patch-message-port',
-          'zone-patch-message-port.min',
-          'zone-patch-promise-test',
-          'zone-patch-promise-test.min',
-          'zone-patch-resize-observer',
-          'zone-patch-resize-observer.min',
-          'zone-patch-rxjs-fake-async',
-          'zone-patch-rxjs-fake-async.min',
-          'zone-patch-rxjs',
-          'zone-patch-rxjs.min',
-          'zone-patch-socket-io',
-          'zone-patch-socket-io.min',
-          'zone-patch-user-media',
-          'zone-patch-user-media.min',
-          'zone-testing-bundle',
-          'zone-testing-bundle.min',
-          'zone-testing-node-bundle',
-          'zone-testing-node-bundle.min',
-          'zone-testing',
-          'zone-testing.min',
-          'zone',
-          'zone.min',
-          'zone_externs',
-          'zone-evergreen',
-          'zone-evergreen.min',
-          'zone-evergreen-testing-bundle',
-          'zone-evergreen-testing-bundle.min',
+          'async-test.js',
+          'async-test.min.js',
+          'fake-async-test.js',
+          'fake-async-test.min.js',
+          'jasmine-patch.js',
+          'jasmine-patch.min.js',
+          'long-stack-trace-zone.js',
+          'long-stack-trace-zone.min.js',
+          'mocha-patch.js',
+          'mocha-patch.min.js',
+          'proxy.js',
+          'proxy.min.js',
+          'sync-test.js',
+          'sync-test.min.js',
+          'task-tracking.js',
+          'task-tracking.min.js',
+          'webapis-media-query.js',
+          'webapis-media-query.min.js',
+          'webapis-notification.js',
+          'webapis-notification.min.js',
+          'webapis-rtc-peer-connection.js',
+          'webapis-rtc-peer-connection.min.js',
+          'webapis-shadydom.js',
+          'webapis-shadydom.min.js',
+          'wtf.js',
+          'wtf.min.js',
+          'zone_externs.js',
+          'zone-bluebird.js',
+          'zone-bluebird.min.js',
+          'zone-error.js',
+          'zone-error.min.js',
+          'zone-evergreen.js',
+          'zone-evergreen.min.js',
+          'zone-evergreen-testing-bundle.js',
+          'zone-evergreen-testing-bundle.min.js',
+          'zone-legacy.js',
+          'zone-legacy.min.js',
+          'zone-mix.js',
+          'zone-mix.min.js',
+          'zone-node.js',
+          'zone-node.min.js',
+          'zone-patch-canvas.js',
+          'zone-patch-canvas.min.js',
+          'zone-patch-cordova.js',
+          'zone-patch-cordova.min.js',
+          'zone-patch-electron.js',
+          'zone-patch-electron.min.js',
+          'zone-patch-fetch.js',
+          'zone-patch-fetch.min.js',
+          'zone-patch-jsonp.js',
+          'zone-patch-jsonp.min.js',
+          'zone-patch-message-port.js',
+          'zone-patch-message-port.min.js',
+          'zone-patch-promise-test.js',
+          'zone-patch-promise-test.min.js',
+          'zone-patch-resize-observer.js',
+          'zone-patch-resize-observer.min.js',
+          'zone-patch-rxjs-fake-async.js',
+          'zone-patch-rxjs-fake-async.min.js',
+          'zone-patch-rxjs.js',
+          'zone-patch-rxjs.min.js',
+          'zone-patch-socket-io.js',
+          'zone-patch-socket-io.min.js',
+          'zone-patch-user-media.js',
+          'zone-patch-user-media.min.js',
+          'zone-testing-bundle.js',
+          'zone-testing-bundle.min.js',
+          'zone-testing-node-bundle.js',
+          'zone-testing-node-bundle.min.js',
+          'zone-testing.js',
+          'zone-testing.min.js',
+          'zone.js',
+          'zone.js.d.ts',
+          'zone.api.extensions.ts',
+          'zone.configurations.api.ts',
+          'zone.min.js',
         ].sort();
-        checkInSubFolder('./dist', () => {
-          const list = shx.ls('./').stdout.split('\n').sort().slice(1);
-          expect(list.length).toBe(expected.length);
-          for (let i = 0; i < list.length; i++) {
-            expect(list[i]).toEqual(expected[i]);
-            const packageJson = shx.cat(`${list[i]}/package.json`);
-            if (list[i].indexOf('_externs') !== -1) {
-              expect(packageJson).toContain(`"name": "zone.js/${list[i]}"`);
-              expect(packageJson).toContain(`"main": "../../${list[i]}.js"`);
-              expect(packageJson).toContain(`"fesm2015": "../../${list[i]}.js"`);
-              expect(packageJson).toContain(`"es2015": "../../${list[i]}.js"`);
-              expect(packageJson).toContain(`"module": "../../${list[i]}.js"`);
-              continue;
-            }
-            if (list[i].indexOf('evergreen') === -1) {
-              const umdMinName = list[i].indexOf('.min') === -1 ?
-                  `${list[i]}.umd` :
-                  `${list[i].substring(0, list[i].indexOf('.min'))}.umd.min`;
-              expect(packageJson).toContain(`"name": "zone.js/${list[i]}"`);
-              expect(packageJson).toContain(`"main": "../../bundles/${umdMinName}.js"`);
-              expect(packageJson).toContain(`"fesm2015": "../../fesm2015/${list[i]}.js"`);
-              expect(packageJson).toContain(`"es2015": "../../fesm2015/${list[i]}.js"`);
-              expect(packageJson).toContain(`"module": "../../fesm2015/${list[i]}.js"`);
-            } else {
-              const removeEvergreen = list[i].replace('-evergreen', '');
-              expect(packageJson).toContain(`"name": "zone.js/${list[i]}"`);
-              expect(packageJson).toContain(`"main": "../../fesm2015/${removeEvergreen}.js"`);
-              expect(packageJson).toContain(`"fesm2015": "../../fesm2015/${removeEvergreen}.js"`);
-              expect(packageJson).toContain(`"es2015": "../../fesm2015/${removeEvergreen}.js"`);
-              expect(packageJson).toContain(`"module": "../../fesm2015/${removeEvergreen}.js"`);
-            }
-          }
-        });
+        expect(list).toEqual(expected);
       });
     });
   });
diff --git a/packages/zone.js/test/typings/.gitignore b/packages/zone.js/test/typings/.gitignore
new file mode 100644
index 0000000000000..01a5e93c1293f
--- /dev/null
+++ b/packages/zone.js/test/typings/.gitignore
@@ -0,0 +1,3 @@
+node_modules
+build
+*.log
diff --git a/packages/zone.js/test/typings/package.json b/packages/zone.js/test/typings/package.json
new file mode 100644
index 0000000000000..cb87d67ac1c70
--- /dev/null
+++ b/packages/zone.js/test/typings/package.json
@@ -0,0 +1,19 @@
+{
+  "name": "typings",
+  "version": "1.0.0",
+  "description": "typing test package to test zone.js.d.ts",
+  "scripts": {
+    "test": "tsc -p ."
+  },
+  "keywords": [],
+  "author": "",
+  "license": "MIT",
+  "dependencies": {
+    "@types/node": "12.11.1",
+    "domino": "^2.1.6",
+    "zone.js": "file:../../../../dist/bin/packages/zone.js/npm_package"
+  },
+  "devDependencies": {
+    "typescript": "~4.0.2"
+  }
+}
diff --git a/packages/zone.js/test/typings/tsconfig.json b/packages/zone.js/test/typings/tsconfig.json
new file mode 100644
index 0000000000000..bbca0533b0d20
--- /dev/null
+++ b/packages/zone.js/test/typings/tsconfig.json
@@ -0,0 +1,27 @@
+{
+  "compilerOptions": {
+    "forceConsistentCasingInFileNames": true,
+    "noImplicitReturns": true,
+    "noFallthroughCasesInSwitch": true,
+    "experimentalDecorators": true,
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "outDir": "./build",
+    "rootDir": ".",
+    "target": "es5",
+    "noEmitOnError": false,
+    "stripInternal": false,
+    "strict": true,
+    "lib": [
+      "es5",
+      "dom",
+      "es2015.collection",
+      "es2015.iterable",
+      "es2015.promise",
+    ],
+  },
+  "files": [
+    "./type.test.ts",
+    "./node_modules/zone.js/zone.d.ts"
+  ],
+}
diff --git a/packages/zone.js/test/typings/type.test.ts b/packages/zone.js/test/typings/type.test.ts
new file mode 100644
index 0000000000000..d013f40f0b4b5
--- /dev/null
+++ b/packages/zone.js/test/typings/type.test.ts
@@ -0,0 +1,18 @@
+import * as domino from 'domino';
+require('zone.js/bundles/zone.umd');
+
+// Zone public API should be included
+Zone.current.fork({name: 'testZone'}).run(() => {});
+
+// Zone extra APIs for EventTarget should be available
+const w = domino.createWindow('<h1>Hello zone.js</h1>');
+const h1 = w.document.querySelector('h1');
+const listener = () => {};
+h1!.addEventListener('click', listener);
+const clickListeners = h1!.eventListeners!('click');
+if (!clickListeners || clickListeners.length === 0 || clickListeners[0] !== listener) {
+  throw new Error('eventListeners not work!!!');
+}
+
+const globalZoneConfig = w as ZoneGlobalConfigurations;
+globalZoneConfig.__Zone_disable_EventEmitter = true;
diff --git a/packages/zone.js/test/webdriver/test.sauce.js b/packages/zone.js/test/webdriver/test.sauce.js
index d2d4de9f537f7..84fe2b39034f2 100644
--- a/packages/zone.js/test/webdriver/test.sauce.js
+++ b/packages/zone.js/test/webdriver/test.sauce.js
@@ -6,7 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-const webdriverio = require('webdriverio');
 const desiredCapabilities = {
   firefox52Win7: {browserName: 'firefox', platform: 'Windows 7', version: '52'},
   firefox53Win7: {browserName: 'firefox', platform: 'Windows 7', version: '53'},
@@ -20,18 +19,6 @@ const desiredCapabilities = {
   /*ios84: {browserName: 'iphone', platform: 'OS X 10.10', version: '8.4'},*/
   ios10: {browserName: 'iphone', platform: 'OS X 10.10', version: '10.3'},
   ios11: {browserName: 'iphone', platform: 'OS X 10.12', version: '11.2'},
-  /*
-  ie9: {
-    browserName: 'internet explorer',
-    platform: 'Windows 2008',
-    version: '9'
-  },*/
-  /*
-  ie10: {
-    browserName: 'internet explorer',
-    platform: 'Windows 2012',
-    version: '10'
-  },*/
   ie11: {browserName: 'internet explorer', platform: 'Windows 10', version: '11'},
   // andriod44: {browserName: 'android', platform: 'Linux', version: '4.4'},
   android51: {browserName: 'android', platform: 'Linux', version: '5.1'},
diff --git a/packages/zone.js/tools.bzl b/packages/zone.js/tools.bzl
index 3731c7dc18c5d..11058c72bbe63 100644
--- a/packages/zone.js/tools.bzl
+++ b/packages/zone.js/tools.bzl
@@ -31,7 +31,7 @@ def copy_dist(module_name, module_format, output_module_name, suffix, umd):
     native.genrule(
         name = module_name + "." + suffix_output + "dist",
         srcs = [
-            "//packages/zone.js:" + module_name + "-rollup." + suffix_output + module_format + "umd.js",
+            "//packages/zone.js:" + module_name + "-rollup." + suffix_output + module_format,
         ],
         outs = [
             output_module_name + "." + umd_output + suffix_output + "js",
@@ -69,9 +69,9 @@ def generate_rollup_bundle(bundles):
             )
 
 def generate_dist(bundles, output_format, umd):
-    module_format = ""
+    module_format = "esm.js"
     if output_format == "es5":
-        module_format = "es5"
+        module_format = "es5umd.js"
     for b in bundles:
         module_name = b[0]
         copy_dist(
diff --git a/packages/zone.js/yarn.lock b/packages/zone.js/yarn.lock
new file mode 100644
index 0000000000000..6dc784f5669cf
--- /dev/null
+++ b/packages/zone.js/yarn.lock
@@ -0,0 +1,4065 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a"
+  integrity sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==
+  dependencies:
+    "@babel/highlight" "^7.10.4"
+
+"@babel/core@^7.1.0", "@babel/core@^7.7.5":
+  version "7.11.6"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.11.6.tgz#3a9455dc7387ff1bac45770650bc13ba04a15651"
+  integrity sha512-Wpcv03AGnmkgm6uS6k8iwhIwTrcP0m17TL1n1sy7qD0qelDu4XNeW0dN0mHfa+Gei211yDaLoEe/VlbXQzM4Bg==
+  dependencies:
+    "@babel/code-frame" "^7.10.4"
+    "@babel/generator" "^7.11.6"
+    "@babel/helper-module-transforms" "^7.11.0"
+    "@babel/helpers" "^7.10.4"
+    "@babel/parser" "^7.11.5"
+    "@babel/template" "^7.10.4"
+    "@babel/traverse" "^7.11.5"
+    "@babel/types" "^7.11.5"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.1"
+    json5 "^2.1.2"
+    lodash "^4.17.19"
+    resolve "^1.3.2"
+    semver "^5.4.1"
+    source-map "^0.5.0"
+
+"@babel/generator@^7.11.5", "@babel/generator@^7.11.6":
+  version "7.11.6"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.11.6.tgz#b868900f81b163b4d464ea24545c61cbac4dc620"
+  integrity sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==
+  dependencies:
+    "@babel/types" "^7.11.5"
+    jsesc "^2.5.1"
+    source-map "^0.5.0"
+
+"@babel/helper-function-name@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz#d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a"
+  integrity sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==
+  dependencies:
+    "@babel/helper-get-function-arity" "^7.10.4"
+    "@babel/template" "^7.10.4"
+    "@babel/types" "^7.10.4"
+
+"@babel/helper-get-function-arity@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz#98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2"
+  integrity sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==
+  dependencies:
+    "@babel/types" "^7.10.4"
+
+"@babel/helper-member-expression-to-functions@^7.10.4":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz#ae69c83d84ee82f4b42f96e2a09410935a8f26df"
+  integrity sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==
+  dependencies:
+    "@babel/types" "^7.11.0"
+
+"@babel/helper-module-imports@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz#4c5c54be04bd31670a7382797d75b9fa2e5b5620"
+  integrity sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==
+  dependencies:
+    "@babel/types" "^7.10.4"
+
+"@babel/helper-module-transforms@^7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz#b16f250229e47211abdd84b34b64737c2ab2d359"
+  integrity sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==
+  dependencies:
+    "@babel/helper-module-imports" "^7.10.4"
+    "@babel/helper-replace-supers" "^7.10.4"
+    "@babel/helper-simple-access" "^7.10.4"
+    "@babel/helper-split-export-declaration" "^7.11.0"
+    "@babel/template" "^7.10.4"
+    "@babel/types" "^7.11.0"
+    lodash "^4.17.19"
+
+"@babel/helper-optimise-call-expression@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz#50dc96413d594f995a77905905b05893cd779673"
+  integrity sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==
+  dependencies:
+    "@babel/types" "^7.10.4"
+
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375"
+  integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==
+
+"@babel/helper-replace-supers@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz#d585cd9388ea06e6031e4cd44b6713cbead9e6cf"
+  integrity sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==
+  dependencies:
+    "@babel/helper-member-expression-to-functions" "^7.10.4"
+    "@babel/helper-optimise-call-expression" "^7.10.4"
+    "@babel/traverse" "^7.10.4"
+    "@babel/types" "^7.10.4"
+
+"@babel/helper-simple-access@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz#0f5ccda2945277a2a7a2d3a821e15395edcf3461"
+  integrity sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==
+  dependencies:
+    "@babel/template" "^7.10.4"
+    "@babel/types" "^7.10.4"
+
+"@babel/helper-split-export-declaration@^7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz#f8a491244acf6a676158ac42072911ba83ad099f"
+  integrity sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==
+  dependencies:
+    "@babel/types" "^7.11.0"
+
+"@babel/helper-validator-identifier@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2"
+  integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==
+
+"@babel/helpers@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.10.4.tgz#2abeb0d721aff7c0a97376b9e1f6f65d7a475044"
+  integrity sha512-L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA==
+  dependencies:
+    "@babel/template" "^7.10.4"
+    "@babel/traverse" "^7.10.4"
+    "@babel/types" "^7.10.4"
+
+"@babel/highlight@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143"
+  integrity sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.10.4"
+    chalk "^2.0.0"
+    js-tokens "^4.0.0"
+
+"@babel/parser@^7.1.0", "@babel/parser@^7.10.4", "@babel/parser@^7.11.5":
+  version "7.11.5"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.11.5.tgz#c7ff6303df71080ec7a4f5b8c003c58f1cf51037"
+  integrity sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==
+
+"@babel/plugin-syntax-async-generators@^7.8.4":
+  version "7.8.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
+  integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-bigint@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz#4c9a6f669f5d0cdf1b90a1671e9a146be5300cea"
+  integrity sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-class-properties@^7.8.3":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz#6644e6a0baa55a61f9e3231f6c9eeb6ee46c124c"
+  integrity sha512-GCSBF7iUle6rNugfURwNmCGG3Z/2+opxAMLs1nND4bhEG5PuxTIggDBoeYYSujAlLtsupzOHYJQgPS3pivwXIA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
+"@babel/plugin-syntax-import-meta@^7.8.3":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51"
+  integrity sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
+"@babel/plugin-syntax-json-strings@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
+  integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-logical-assignment-operators@^7.8.3":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
+  integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
+"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
+  integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-numeric-separator@^7.8.3":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"
+  integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
+"@babel/plugin-syntax-object-rest-spread@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
+  integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-optional-catch-binding@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
+  integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-optional-chaining@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a"
+  integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/template@^7.10.4", "@babel/template@^7.3.3":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz#3251996c4200ebc71d1a8fc405fba940f36ba278"
+  integrity sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==
+  dependencies:
+    "@babel/code-frame" "^7.10.4"
+    "@babel/parser" "^7.10.4"
+    "@babel/types" "^7.10.4"
+
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.11.5":
+  version "7.11.5"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.11.5.tgz#be777b93b518eb6d76ee2e1ea1d143daa11e61c3"
+  integrity sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==
+  dependencies:
+    "@babel/code-frame" "^7.10.4"
+    "@babel/generator" "^7.11.5"
+    "@babel/helper-function-name" "^7.10.4"
+    "@babel/helper-split-export-declaration" "^7.11.0"
+    "@babel/parser" "^7.11.5"
+    "@babel/types" "^7.11.5"
+    debug "^4.1.0"
+    globals "^11.1.0"
+    lodash "^4.17.19"
+
+"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.11.0", "@babel/types@^7.11.5", "@babel/types@^7.3.0", "@babel/types@^7.3.3":
+  version "7.11.5"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.11.5.tgz#d9de577d01252d77c6800cee039ee64faf75662d"
+  integrity sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.10.4"
+    lodash "^4.17.19"
+    to-fast-properties "^2.0.0"
+
+"@bcoe/v8-coverage@^0.2.3":
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
+  integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
+
+"@cnakazawa/watch@^1.0.3":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz#f864ae85004d0fcab6f50be9141c4da368d1656a"
+  integrity sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==
+  dependencies:
+    exec-sh "^0.3.2"
+    minimist "^1.2.0"
+
+"@istanbuljs/load-nyc-config@^1.0.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced"
+  integrity sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==
+  dependencies:
+    camelcase "^5.3.1"
+    find-up "^4.1.0"
+    get-package-type "^0.1.0"
+    js-yaml "^3.13.1"
+    resolve-from "^5.0.0"
+
+"@istanbuljs/schema@^0.1.2":
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd"
+  integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==
+
+"@jest/console@^26.3.0":
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/console/-/console-26.3.0.tgz#ed04063efb280c88ba87388b6f16427c0a85c856"
+  integrity sha512-/5Pn6sJev0nPUcAdpJHMVIsA8sKizL2ZkcKPE5+dJrCccks7tcM7c9wbgHudBJbxXLoTbqsHkG1Dofoem4F09w==
+  dependencies:
+    "@jest/types" "^26.3.0"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    jest-message-util "^26.3.0"
+    jest-util "^26.3.0"
+    slash "^3.0.0"
+
+"@jest/core@^26.4.2":
+  version "26.4.2"
+  resolved "https://registry.yarnpkg.com/@jest/core/-/core-26.4.2.tgz#85d0894f31ac29b5bab07aa86806d03dd3d33edc"
+  integrity sha512-sDva7YkeNprxJfepOctzS8cAk9TOekldh+5FhVuXS40+94SHbiicRO1VV2tSoRtgIo+POs/Cdyf8p76vPTd6dg==
+  dependencies:
+    "@jest/console" "^26.3.0"
+    "@jest/reporters" "^26.4.1"
+    "@jest/test-result" "^26.3.0"
+    "@jest/transform" "^26.3.0"
+    "@jest/types" "^26.3.0"
+    "@types/node" "*"
+    ansi-escapes "^4.2.1"
+    chalk "^4.0.0"
+    exit "^0.1.2"
+    graceful-fs "^4.2.4"
+    jest-changed-files "^26.3.0"
+    jest-config "^26.4.2"
+    jest-haste-map "^26.3.0"
+    jest-message-util "^26.3.0"
+    jest-regex-util "^26.0.0"
+    jest-resolve "^26.4.0"
+    jest-resolve-dependencies "^26.4.2"
+    jest-runner "^26.4.2"
+    jest-runtime "^26.4.2"
+    jest-snapshot "^26.4.2"
+    jest-util "^26.3.0"
+    jest-validate "^26.4.2"
+    jest-watcher "^26.3.0"
+    micromatch "^4.0.2"
+    p-each-series "^2.1.0"
+    rimraf "^3.0.0"
+    slash "^3.0.0"
+    strip-ansi "^6.0.0"
+
+"@jest/environment@^26.3.0":
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-26.3.0.tgz#e6953ab711ae3e44754a025f838bde1a7fd236a0"
+  integrity sha512-EW+MFEo0DGHahf83RAaiqQx688qpXgl99wdb8Fy67ybyzHwR1a58LHcO376xQJHfmoXTu89M09dH3J509cx2AA==
+  dependencies:
+    "@jest/fake-timers" "^26.3.0"
+    "@jest/types" "^26.3.0"
+    "@types/node" "*"
+    jest-mock "^26.3.0"
+
+"@jest/fake-timers@^26.3.0":
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.3.0.tgz#f515d4667a6770f60ae06ae050f4e001126c666a"
+  integrity sha512-ZL9ytUiRwVP8ujfRepffokBvD2KbxbqMhrXSBhSdAhISCw3gOkuntisiSFv+A6HN0n0fF4cxzICEKZENLmW+1A==
+  dependencies:
+    "@jest/types" "^26.3.0"
+    "@sinonjs/fake-timers" "^6.0.1"
+    "@types/node" "*"
+    jest-message-util "^26.3.0"
+    jest-mock "^26.3.0"
+    jest-util "^26.3.0"
+
+"@jest/globals@^26.4.2":
+  version "26.4.2"
+  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-26.4.2.tgz#73c2a862ac691d998889a241beb3dc9cada40d4a"
+  integrity sha512-Ot5ouAlehhHLRhc+sDz2/9bmNv9p5ZWZ9LE1pXGGTCXBasmi5jnYjlgYcYt03FBwLmZXCZ7GrL29c33/XRQiow==
+  dependencies:
+    "@jest/environment" "^26.3.0"
+    "@jest/types" "^26.3.0"
+    expect "^26.4.2"
+
+"@jest/reporters@^26.4.1":
+  version "26.4.1"
+  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-26.4.1.tgz#3b4d6faf28650f3965f8b97bc3d114077fb71795"
+  integrity sha512-aROTkCLU8++yiRGVxLsuDmZsQEKO6LprlrxtAuzvtpbIFl3eIjgIf3EUxDKgomkS25R9ZzwGEdB5weCcBZlrpQ==
+  dependencies:
+    "@bcoe/v8-coverage" "^0.2.3"
+    "@jest/console" "^26.3.0"
+    "@jest/test-result" "^26.3.0"
+    "@jest/transform" "^26.3.0"
+    "@jest/types" "^26.3.0"
+    chalk "^4.0.0"
+    collect-v8-coverage "^1.0.0"
+    exit "^0.1.2"
+    glob "^7.1.2"
+    graceful-fs "^4.2.4"
+    istanbul-lib-coverage "^3.0.0"
+    istanbul-lib-instrument "^4.0.3"
+    istanbul-lib-report "^3.0.0"
+    istanbul-lib-source-maps "^4.0.0"
+    istanbul-reports "^3.0.2"
+    jest-haste-map "^26.3.0"
+    jest-resolve "^26.4.0"
+    jest-util "^26.3.0"
+    jest-worker "^26.3.0"
+    slash "^3.0.0"
+    source-map "^0.6.0"
+    string-length "^4.0.1"
+    terminal-link "^2.0.0"
+    v8-to-istanbul "^5.0.1"
+  optionalDependencies:
+    node-notifier "^8.0.0"
+
+"@jest/source-map@^26.3.0":
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-26.3.0.tgz#0e646e519883c14c551f7b5ae4ff5f1bfe4fc3d9"
+  integrity sha512-hWX5IHmMDWe1kyrKl7IhFwqOuAreIwHhbe44+XH2ZRHjrKIh0LO5eLQ/vxHFeAfRwJapmxuqlGAEYLadDq6ZGQ==
+  dependencies:
+    callsites "^3.0.0"
+    graceful-fs "^4.2.4"
+    source-map "^0.6.0"
+
+"@jest/test-result@^26.3.0":
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.3.0.tgz#46cde01fa10c0aaeb7431bf71e4a20d885bc7fdb"
+  integrity sha512-a8rbLqzW/q7HWheFVMtghXV79Xk+GWwOK1FrtimpI5n1la2SY0qHri3/b0/1F0Ve0/yJmV8pEhxDfVwiUBGtgg==
+  dependencies:
+    "@jest/console" "^26.3.0"
+    "@jest/types" "^26.3.0"
+    "@types/istanbul-lib-coverage" "^2.0.0"
+    collect-v8-coverage "^1.0.0"
+
+"@jest/test-sequencer@^26.4.2":
+  version "26.4.2"
+  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.4.2.tgz#58a3760a61eec758a2ce6080201424580d97cbba"
+  integrity sha512-83DRD8N3M0tOhz9h0bn6Kl6dSp+US6DazuVF8J9m21WAp5x7CqSMaNycMP0aemC/SH/pDQQddbsfHRTBXVUgog==
+  dependencies:
+    "@jest/test-result" "^26.3.0"
+    graceful-fs "^4.2.4"
+    jest-haste-map "^26.3.0"
+    jest-runner "^26.4.2"
+    jest-runtime "^26.4.2"
+
+"@jest/transform@^26.3.0":
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-26.3.0.tgz#c393e0e01459da8a8bfc6d2a7c2ece1a13e8ba55"
+  integrity sha512-Isj6NB68QorGoFWvcOjlUhpkT56PqNIsXKR7XfvoDlCANn/IANlh8DrKAA2l2JKC3yWSMH5wS0GwuQM20w3b2A==
+  dependencies:
+    "@babel/core" "^7.1.0"
+    "@jest/types" "^26.3.0"
+    babel-plugin-istanbul "^6.0.0"
+    chalk "^4.0.0"
+    convert-source-map "^1.4.0"
+    fast-json-stable-stringify "^2.0.0"
+    graceful-fs "^4.2.4"
+    jest-haste-map "^26.3.0"
+    jest-regex-util "^26.0.0"
+    jest-util "^26.3.0"
+    micromatch "^4.0.2"
+    pirates "^4.0.1"
+    slash "^3.0.0"
+    source-map "^0.6.1"
+    write-file-atomic "^3.0.0"
+
+"@jest/types@^26.3.0":
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.3.0.tgz#97627bf4bdb72c55346eef98e3b3f7ddc4941f71"
+  integrity sha512-BDPG23U0qDeAvU4f99haztXwdAg3hz4El95LkAM+tHAqqhiVzRpEGHHU8EDxT/AnxOrA65YjLBwDahdJ9pTLJQ==
+  dependencies:
+    "@types/istanbul-lib-coverage" "^2.0.0"
+    "@types/istanbul-reports" "^3.0.0"
+    "@types/node" "*"
+    "@types/yargs" "^15.0.0"
+    chalk "^4.0.0"
+
+"@sinonjs/commons@^1.7.0":
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.1.tgz#e7df00f98a203324f6dc7cc606cad9d4a8ab2217"
+  integrity sha512-892K+kWUUi3cl+LlqEWIDrhvLgdL79tECi8JZUyq6IviKy/DNhuzCRlbHUjxK89f4ypPMMaFnFuR9Ie6DoIMsw==
+  dependencies:
+    type-detect "4.0.8"
+
+"@sinonjs/fake-timers@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz#293674fccb3262ac782c7aadfdeca86b10c75c40"
+  integrity sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==
+  dependencies:
+    "@sinonjs/commons" "^1.7.0"
+
+"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.7":
+  version "7.1.9"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.9.tgz#77e59d438522a6fb898fa43dc3455c6e72f3963d"
+  integrity sha512-sY2RsIJ5rpER1u3/aQ8OFSI7qGIy8o1NEEbgb2UaJcvOtXOMpd39ko723NBpjQFg9SIX7TXtjejZVGeIMLhoOw==
+  dependencies:
+    "@babel/parser" "^7.1.0"
+    "@babel/types" "^7.0.0"
+    "@types/babel__generator" "*"
+    "@types/babel__template" "*"
+    "@types/babel__traverse" "*"
+
+"@types/babel__generator@*":
+  version "7.6.1"
+  resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.1.tgz#4901767b397e8711aeb99df8d396d7ba7b7f0e04"
+  integrity sha512-bBKm+2VPJcMRVwNhxKu8W+5/zT7pwNEqeokFOmbvVSqGzFneNxYcEBro9Ac7/N9tlsaPYnZLK8J1LWKkMsLAew==
+  dependencies:
+    "@babel/types" "^7.0.0"
+
+"@types/babel__template@*":
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.0.2.tgz#4ff63d6b52eddac1de7b975a5223ed32ecea9307"
+  integrity sha512-/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg==
+  dependencies:
+    "@babel/parser" "^7.1.0"
+    "@babel/types" "^7.0.0"
+
+"@types/babel__traverse@*", "@types/babel__traverse@^7.0.6":
+  version "7.0.14"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.14.tgz#e99da8c075d4fb098c774ba65dabf7dc9954bd13"
+  integrity sha512-8w9szzKs14ZtBVuP6Wn7nMLRJ0D6dfB0VEBEyRgxrZ/Ln49aNMykrghM2FaNn4FJRzNppCSa0Rv9pBRM5Xc3wg==
+  dependencies:
+    "@babel/types" "^7.3.0"
+
+"@types/color-name@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
+  integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
+
+"@types/graceful-fs@^4.1.2":
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.3.tgz#039af35fe26bec35003e8d86d2ee9c586354348f"
+  integrity sha512-AiHRaEB50LQg0pZmm659vNBb9f4SJ0qrAnteuzhSeAUcJKxoYgEnprg/83kppCnc2zvtCKbdZry1a5pVY3lOTQ==
+  dependencies:
+    "@types/node" "*"
+
+"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#4ba8ddb720221f432e443bd5f9117fd22cfd4762"
+  integrity sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==
+
+"@types/istanbul-lib-report@*":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#c14c24f18ea8190c118ee7562b7ff99a36552686"
+  integrity sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==
+  dependencies:
+    "@types/istanbul-lib-coverage" "*"
+
+"@types/istanbul-reports@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz#508b13aa344fa4976234e75dddcc34925737d821"
+  integrity sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==
+  dependencies:
+    "@types/istanbul-lib-report" "*"
+
+"@types/node@*":
+  version "14.11.2"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.11.2.tgz#2de1ed6670439387da1c9f549a2ade2b0a799256"
+  integrity sha512-jiE3QIxJ8JLNcb1Ps6rDbysDhN4xa8DJJvuC9prr6w+1tIh+QAbYyNF3tyiZNLDBIuBCf4KEcV2UvQm/V60xfA==
+
+"@types/node@^10.9.4":
+  version "10.17.35"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.35.tgz#58058f29b870e6ae57b20e4f6e928f02b7129f56"
+  integrity sha512-gXx7jAWpMddu0f7a+L+txMplp3FnHl53OhQIF9puXKq3hDGY/GjH+MF04oWnV/adPSCrbtHumDCFwzq2VhltWA==
+
+"@types/normalize-package-data@^2.4.0":
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
+  integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==
+
+"@types/prettier@^2.0.0":
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.1.1.tgz#be148756d5480a84cde100324c03a86ae5739fb5"
+  integrity sha512-2zs+O+UkDsJ1Vcp667pd3f8xearMdopz/z54i99wtRDI5KLmngk7vlrYZD0ZjKHaROR03EznlBbVY9PfAEyJIQ==
+
+"@types/stack-utils@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
+  integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==
+
+"@types/yargs-parser@*":
+  version "15.0.0"
+  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d"
+  integrity sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==
+
+"@types/yargs@^15.0.0":
+  version "15.0.7"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.7.tgz#dad50a7a234a35ef9460737a56024287a3de1d2b"
+  integrity sha512-Gf4u3EjaPNcC9cTu4/j2oN14nSVhr8PQ+BvBcBQHAhDZfl0bVIiLgvnRXv/dn58XhTm9UXvBpvJpDlwV65QxOA==
+  dependencies:
+    "@types/yargs-parser" "*"
+
+abab@^2.0.3:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a"
+  integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==
+
+acorn-globals@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz#46cdd39f0f8ff08a876619b55f5ac8a6dc770b45"
+  integrity sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==
+  dependencies:
+    acorn "^7.1.1"
+    acorn-walk "^7.1.1"
+
+acorn-walk@^7.1.1:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
+  integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
+
+acorn@^7.1.1:
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.0.tgz#e1ad486e6c54501634c6c397c5c121daa383607c"
+  integrity sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==
+
+ajv@^6.12.3:
+  version "6.12.5"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.5.tgz#19b0e8bae8f476e5ba666300387775fb1a00a4da"
+  integrity sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
+ansi-escapes@^4.2.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61"
+  integrity sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==
+  dependencies:
+    type-fest "^0.11.0"
+
+ansi-regex@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
+  integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
+
+ansi-styles@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
+  dependencies:
+    color-convert "^1.9.0"
+
+ansi-styles@^4.0.0, ansi-styles@^4.1.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359"
+  integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==
+  dependencies:
+    "@types/color-name" "^1.1.1"
+    color-convert "^2.0.1"
+
+anymatch@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
+  integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==
+  dependencies:
+    micromatch "^3.1.4"
+    normalize-path "^2.1.1"
+
+anymatch@^3.0.3:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142"
+  integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==
+  dependencies:
+    normalize-path "^3.0.0"
+    picomatch "^2.0.4"
+
+argparse@^1.0.7:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
+  dependencies:
+    sprintf-js "~1.0.2"
+
+arr-diff@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
+  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
+
+arr-flatten@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
+
+arr-union@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
+  integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
+
+array-filter@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-1.0.0.tgz#baf79e62e6ef4c2a4c0b831232daffec251f9d83"
+  integrity sha1-uveeYubvTCpMC4MSMtr/7CUfnYM=
+
+array-unique@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
+  integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
+
+asn1@~0.2.3:
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
+  integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
+  dependencies:
+    safer-buffer "~2.1.0"
+
+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"
+  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
+
+assign-symbols@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
+  integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
+
+asynckit@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
+
+atob@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
+  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
+
+available-typed-arrays@^1.0.0, available-typed-arrays@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.2.tgz#6b098ca9d8039079ee3f77f7b783c4480ba513f5"
+  integrity sha512-XWX3OX8Onv97LMk/ftVyBibpGwY5a8SmuxZPzeOxqmuEqUCOM9ZE+uIaD1VNJ5QnvU2UQusvmKbuM1FR8QWGfQ==
+  dependencies:
+    array-filter "^1.0.0"
+
+aws-sign2@~0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
+
+aws4@^1.8.0:
+  version "1.10.1"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.10.1.tgz#e1e82e4f3e999e2cfd61b161280d16a111f86428"
+  integrity sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA==
+
+babel-jest@^26.3.0:
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.3.0.tgz#10d0ca4b529ca3e7d1417855ef7d7bd6fc0c3463"
+  integrity sha512-sxPnQGEyHAOPF8NcUsD0g7hDCnvLL2XyblRBcgrzTWBB/mAIpWow3n1bEL+VghnnZfreLhFSBsFluRoK2tRK4g==
+  dependencies:
+    "@jest/transform" "^26.3.0"
+    "@jest/types" "^26.3.0"
+    "@types/babel__core" "^7.1.7"
+    babel-plugin-istanbul "^6.0.0"
+    babel-preset-jest "^26.3.0"
+    chalk "^4.0.0"
+    graceful-fs "^4.2.4"
+    slash "^3.0.0"
+
+babel-plugin-istanbul@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz#e159ccdc9af95e0b570c75b4573b7c34d671d765"
+  integrity sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@istanbuljs/load-nyc-config" "^1.0.0"
+    "@istanbuljs/schema" "^0.1.2"
+    istanbul-lib-instrument "^4.0.0"
+    test-exclude "^6.0.0"
+
+babel-plugin-jest-hoist@^26.2.0:
+  version "26.2.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.2.0.tgz#bdd0011df0d3d513e5e95f76bd53b51147aca2dd"
+  integrity sha512-B/hVMRv8Nh1sQ1a3EY8I0n4Y1Wty3NrR5ebOyVT302op+DOAau+xNEImGMsUWOC3++ZlMooCytKz+NgN8aKGbA==
+  dependencies:
+    "@babel/template" "^7.3.3"
+    "@babel/types" "^7.3.3"
+    "@types/babel__core" "^7.0.0"
+    "@types/babel__traverse" "^7.0.6"
+
+babel-preset-current-node-syntax@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.3.tgz#b4b547acddbf963cba555ba9f9cbbb70bfd044da"
+  integrity sha512-uyexu1sVwcdFnyq9o8UQYsXwXflIh8LvrF5+cKrYam93ned1CStffB3+BEcsxGSgagoA3GEyjDqO4a/58hyPYQ==
+  dependencies:
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
+    "@babel/plugin-syntax-bigint" "^7.8.3"
+    "@babel/plugin-syntax-class-properties" "^7.8.3"
+    "@babel/plugin-syntax-import-meta" "^7.8.3"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.8.3"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
+    "@babel/plugin-syntax-numeric-separator" "^7.8.3"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
+
+babel-preset-jest@^26.3.0:
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-26.3.0.tgz#ed6344506225c065fd8a0b53e191986f74890776"
+  integrity sha512-5WPdf7nyYi2/eRxCbVrE1kKCWxgWY4RsPEbdJWFm7QsesFGqjdkyLeu1zRkwM1cxK6EPIlNd6d2AxLk7J+t4pw==
+  dependencies:
+    babel-plugin-jest-hoist "^26.2.0"
+    babel-preset-current-node-syntax "^0.1.3"
+
+balanced-match@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
+  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
+
+base@^0.11.1:
+  version "0.11.2"
+  resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
+  integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
+  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"
+
+bcrypt-pbkdf@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
+  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
+  dependencies:
+    tweetnacl "^0.14.3"
+
+brace-expansion@^1.1.7:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
+  dependencies:
+    balanced-match "^1.0.0"
+    concat-map "0.0.1"
+
+braces@^2.3.1:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
+  integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
+  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"
+
+braces@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  dependencies:
+    fill-range "^7.0.1"
+
+browser-process-hrtime@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
+  integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
+
+browser-stdout@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.0.tgz#f351d32969d32fa5d7a5567154263d928ae3bd1f"
+  integrity sha1-81HTKWnTL6XXpVZxVCY9korjvR8=
+
+bser@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05"
+  integrity sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==
+  dependencies:
+    node-int64 "^0.4.0"
+
+buffer-from@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
+  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
+
+cache-base@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
+  integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
+  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"
+
+callsites@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
+  integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
+
+camelcase@^5.0.0, camelcase@^5.3.1:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
+  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
+
+camelcase@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.0.0.tgz#5259f7c30e35e278f1bdc2a4d91230b37cad981e"
+  integrity sha512-8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w==
+
+capture-exit@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4"
+  integrity sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==
+  dependencies:
+    rsvp "^4.8.4"
+
+caseless@~0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
+
+chalk@^2.0.0:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
+  dependencies:
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
+
+chalk@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
+  integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
+char-regex@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf"
+  integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==
+
+ci-info@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
+  integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
+
+class-utils@^0.3.5:
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
+  integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
+  dependencies:
+    arr-union "^3.1.0"
+    define-property "^0.2.5"
+    isobject "^3.0.0"
+    static-extend "^0.1.1"
+
+cliui@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1"
+  integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.0"
+    wrap-ansi "^6.2.0"
+
+co@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
+  integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
+
+collect-v8-coverage@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59"
+  integrity sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==
+
+collection-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
+  integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
+  dependencies:
+    map-visit "^1.0.0"
+    object-visit "^1.0.0"
+
+color-convert@^1.9.0:
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
+  dependencies:
+    color-name "1.1.3"
+
+color-convert@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
+  dependencies:
+    color-name "~1.1.4"
+
+color-name@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
+
+color-name@~1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
+  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
+
+combined-stream@^1.0.6, combined-stream@~1.0.6:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
+  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
+  dependencies:
+    delayed-stream "~1.0.0"
+
+commander@0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-0.6.1.tgz#fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06"
+  integrity sha1-+mihT2qUXVTbvlDYzbMyDp47GgY=
+
+commander@2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.3.0.tgz#fd430e889832ec353b9acd1de217c11cb3eef873"
+  integrity sha1-/UMOiJgy7DU7ms0d4hfBHLPu+HM=
+
+commander@2.9.0:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
+  integrity sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=
+  dependencies:
+    graceful-readlink ">= 1.0.0"
+
+component-emitter@^1.2.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
+  integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
+
+concat-map@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
+
+convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
+  integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
+  dependencies:
+    safe-buffer "~5.1.1"
+
+copy-descriptor@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
+  integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
+
+core-util-is@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
+
+cross-spawn@^6.0.0:
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
+  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
+  dependencies:
+    nice-try "^1.0.4"
+    path-key "^2.0.1"
+    semver "^5.5.0"
+    shebang-command "^1.2.0"
+    which "^1.2.9"
+
+cross-spawn@^7.0.0:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
+  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+  dependencies:
+    path-key "^3.1.0"
+    shebang-command "^2.0.0"
+    which "^2.0.1"
+
+cssom@^0.4.4:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10"
+  integrity sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==
+
+cssom@~0.3.6:
+  version "0.3.8"
+  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"
+  integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==
+
+cssstyle@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz#ff665a0ddbdc31864b09647f34163443d90b0852"
+  integrity sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==
+  dependencies:
+    cssom "~0.3.6"
+
+dashdash@^1.12.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
+  dependencies:
+    assert-plus "^1.0.0"
+
+data-urls@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b"
+  integrity sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==
+  dependencies:
+    abab "^2.0.3"
+    whatwg-mimetype "^2.3.0"
+    whatwg-url "^8.0.0"
+
+debug@2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
+  integrity sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=
+  dependencies:
+    ms "0.7.1"
+
+debug@2.6.8:
+  version "2.6.8"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
+  integrity sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=
+  dependencies:
+    ms "2.0.0"
+
+debug@^2.2.0, debug@^2.3.3:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
+  dependencies:
+    ms "2.0.0"
+
+debug@^4.1.0, debug@^4.1.1:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz#7f150f93920e94c58f5574c2fd01a3110effe7f1"
+  integrity sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==
+  dependencies:
+    ms "2.1.2"
+
+decamelize@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
+
+decimal.js@^10.2.0:
+  version "10.2.0"
+  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.0.tgz#39466113a9e036111d02f82489b5fd6b0b5ed231"
+  integrity sha512-vDPw+rDgn3bZe1+F/pyEwb1oMG2XTlRVgAa6B4KccTEpYgF8w6eQllVbQcfIJnZyvzFtFpxnpGtx8dd7DJp/Rw==
+
+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"
+  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
+
+deep-is@~0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
+  integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
+
+deepmerge@^4.2.2:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
+  integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
+
+define-properties@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
+  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
+  dependencies:
+    object-keys "^1.0.12"
+
+define-property@^0.2.5:
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
+  integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
+  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"
+  integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
+  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"
+  integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
+  dependencies:
+    is-descriptor "^1.0.2"
+    isobject "^3.0.1"
+
+delayed-stream@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
+
+detect-newline@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
+  integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
+
+diff-sequences@^26.3.0:
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.3.0.tgz#62a59b1b29ab7fd27cef2a33ae52abe73042d0a2"
+  integrity sha512-5j5vdRcw3CNctePNYN0Wy2e/JbWT6cAYnXv5OuqPhDpyCGc0uLu2TK0zOCJWNB9kOIfYMSpIulRaDgIi4HJ6Ig==
+
+diff@1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-1.4.0.tgz#7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"
+  integrity sha1-fyjS657nsVqX79ic5j3P2qPMur8=
+
+diff@3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9"
+  integrity sha1-yc45Okt8vQsFinJck98pkCeGj/k=
+
+domexception@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304"
+  integrity sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==
+  dependencies:
+    webidl-conversions "^5.0.0"
+
+domino@2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/domino/-/domino-2.1.2.tgz#70e8367839ee8ad8bde3aeb4857cf3d93bd98b85"
+  integrity sha512-nzg76s4Smji9teyLwOnqqUCdFVOho+OQFqUwp+42Wo+SEZ1FGw7uhemv6OKk2qp8YIgnGB3jVt0sJWU96wbPgA==
+
+ecc-jsbn@~0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
+  integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
+  dependencies:
+    jsbn "~0.1.0"
+    safer-buffer "^2.1.0"
+
+emittery@^0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.7.1.tgz#c02375a927a40948c0345cc903072597f5270451"
+  integrity sha512-d34LN4L6h18Bzz9xpoku2nPwKxCPlPMr3EEKTkoEBi+1/+b0lcRkRJ1UVyyZaKNeqGR3swcGl6s390DNO4YVgQ==
+
+emoji-regex@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
+  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
+
+end-of-stream@^1.1.0:
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
+  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
+  dependencies:
+    once "^1.4.0"
+
+error-ex@^1.3.1:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
+  integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
+  dependencies:
+    is-arrayish "^0.2.1"
+
+es-abstract@^1.17.4, es-abstract@^1.17.5:
+  version "1.17.6"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.6.tgz#9142071707857b2cacc7b89ecb670316c3e2d52a"
+  integrity sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==
+  dependencies:
+    es-to-primitive "^1.2.1"
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.1"
+    is-callable "^1.2.0"
+    is-regex "^1.1.0"
+    object-inspect "^1.7.0"
+    object-keys "^1.1.1"
+    object.assign "^4.1.0"
+    string.prototype.trimend "^1.0.1"
+    string.prototype.trimstart "^1.0.1"
+
+es-abstract@^1.18.0-next.0:
+  version "1.18.0-next.0"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.0.tgz#b302834927e624d8e5837ed48224291f2c66e6fc"
+  integrity sha512-elZXTZXKn51hUBdJjSZGYRujuzilgXo8vSPQzjGYXLvSlGiCo8VO8ZGV3kjo9a0WNJJ57hENagwbtlRuHuzkcQ==
+  dependencies:
+    es-to-primitive "^1.2.1"
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.1"
+    is-callable "^1.2.0"
+    is-negative-zero "^2.0.0"
+    is-regex "^1.1.1"
+    object-inspect "^1.8.0"
+    object-keys "^1.1.1"
+    object.assign "^4.1.0"
+    string.prototype.trimend "^1.0.1"
+    string.prototype.trimstart "^1.0.1"
+
+es-to-primitive@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
+  integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
+  dependencies:
+    is-callable "^1.1.4"
+    is-date-object "^1.0.1"
+    is-symbol "^1.0.2"
+
+escape-string-regexp@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz#4dbc2fe674e71949caf3fb2695ce7f2dc1d9a8d1"
+  integrity sha1-Tbwv5nTnGUnK8/smlc5/LcHZqNE=
+
+escape-string-regexp@1.0.5, escape-string-regexp@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
+
+escape-string-regexp@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
+  integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
+
+escodegen@^1.14.1:
+  version "1.14.3"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503"
+  integrity sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==
+  dependencies:
+    esprima "^4.0.1"
+    estraverse "^4.2.0"
+    esutils "^2.0.2"
+    optionator "^0.8.1"
+  optionalDependencies:
+    source-map "~0.6.1"
+
+esprima@^4.0.0, esprima@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
+
+estraverse@^4.2.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
+  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
+
+esutils@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
+  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
+
+exec-sh@^0.3.2:
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.4.tgz#3a018ceb526cc6f6df2bb504b2bfe8e3a4934ec5"
+  integrity sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==
+
+execa@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
+  integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
+  dependencies:
+    cross-spawn "^6.0.0"
+    get-stream "^4.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
+
+execa@^4.0.0:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-4.0.3.tgz#0a34dabbad6d66100bd6f2c576c8669403f317f2"
+  integrity sha512-WFDXGHckXPWZX19t1kCsXzOpqX9LWYNqn4C+HqZlk/V0imTkzJZqf87ZBhvpHaftERYknpk0fjSylnXVlVgI0A==
+  dependencies:
+    cross-spawn "^7.0.0"
+    get-stream "^5.0.0"
+    human-signals "^1.1.1"
+    is-stream "^2.0.0"
+    merge-stream "^2.0.0"
+    npm-run-path "^4.0.0"
+    onetime "^5.1.0"
+    signal-exit "^3.0.2"
+    strip-final-newline "^2.0.0"
+
+exit@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
+  integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=
+
+expand-brackets@^2.1.4:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
+  integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
+  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"
+
+expect@^26.4.2:
+  version "26.4.2"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-26.4.2.tgz#36db120928a5a2d7d9736643032de32f24e1b2a1"
+  integrity sha512-IlJ3X52Z0lDHm7gjEp+m76uX46ldH5VpqmU0006vqDju/285twh7zaWMRhs67VpQhBwjjMchk+p5aA0VkERCAA==
+  dependencies:
+    "@jest/types" "^26.3.0"
+    ansi-styles "^4.0.0"
+    jest-get-type "^26.3.0"
+    jest-matcher-utils "^26.4.2"
+    jest-message-util "^26.3.0"
+    jest-regex-util "^26.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"
+  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
+  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"
+  integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
+  dependencies:
+    assign-symbols "^1.0.0"
+    is-extendable "^1.0.1"
+
+extend@~3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
+
+extglob@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
+  integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
+  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:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
+
+extsprintf@^1.2.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
+
+fast-deep-equal@^3.1.1:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
+  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
+
+fast-json-stable-stringify@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
+  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
+
+fast-levenshtein@~2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
+
+fb-watchman@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz#fc84fb39d2709cf3ff6d743706157bb5708a8a85"
+  integrity sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==
+  dependencies:
+    bser "2.1.1"
+
+fill-range@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
+  integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+    to-regex-range "^2.1.0"
+
+fill-range@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+  dependencies:
+    to-regex-range "^5.0.1"
+
+find-up@^4.0.0, find-up@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
+  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
+  dependencies:
+    locate-path "^5.0.0"
+    path-exists "^4.0.0"
+
+for-in@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
+
+foreach@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
+  integrity sha1-C+4AUBiusmDQo6865ljdATbsG5k=
+
+forever-agent@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
+
+form-data@~2.3.2:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
+  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.6"
+    mime-types "^2.1.12"
+
+formatio@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/formatio/-/formatio-1.1.1.tgz#5ed3ccd636551097383465d996199100e86161e9"
+  integrity sha1-XtPM1jZVEJc4NGXZlhmRAOhhYek=
+  dependencies:
+    samsam "~1.1"
+
+fragment-cache@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
+  integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
+  dependencies:
+    map-cache "^0.2.2"
+
+fs.realpath@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
+
+fsevents@^2.1.2:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e"
+  integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==
+
+function-bind@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
+
+gensync@^1.0.0-beta.1:
+  version "1.0.0-beta.1"
+  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269"
+  integrity sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==
+
+get-caller-file@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
+  integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
+
+get-caller-file@^2.0.1:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
+
+get-package-type@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
+  integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==
+
+get-stream@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
+  integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
+  dependencies:
+    pump "^3.0.0"
+
+get-stream@^5.0.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
+  integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==
+  dependencies:
+    pump "^3.0.0"
+
+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"
+  integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
+
+getpass@^0.1.1:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
+  dependencies:
+    assert-plus "^1.0.0"
+
+glob@3.2.11:
+  version "3.2.11"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-3.2.11.tgz#4a973f635b9190f715d10987d5c00fd2815ebe3d"
+  integrity sha1-Spc/Y1uRkPcV0QmH1cAP0oFevj0=
+  dependencies:
+    inherits "2"
+    minimatch "0.3"
+
+glob@7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
+  integrity sha1-gFIR3wT6rxxjo2ADBs31reULLsg=
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.2"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
+  version "7.1.6"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
+  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
+  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"
+
+globals@^11.1.0:
+  version "11.12.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
+  integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
+
+graceful-fs@^4.2.4:
+  version "4.2.4"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
+  integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
+
+"graceful-readlink@>= 1.0.0":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
+  integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=
+
+growl@1.9.2:
+  version "1.9.2"
+  resolved "https://registry.yarnpkg.com/growl/-/growl-1.9.2.tgz#0ea7743715db8d8de2c5ede1775e1b45ac85c02f"
+  integrity sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8=
+
+growly@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
+  integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=
+
+har-schema@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
+  integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
+
+har-validator@~5.1.3:
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
+  integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
+  dependencies:
+    ajv "^6.12.3"
+    har-schema "^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"
+  integrity sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=
+
+has-flag@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
+
+has-flag@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
+  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
+
+has-symbols@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
+  integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
+
+has-value@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
+  integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
+  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"
+  integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
+  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"
+  integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
+
+has-values@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
+  integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
+  dependencies:
+    is-number "^3.0.0"
+    kind-of "^4.0.0"
+
+has@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
+  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
+  dependencies:
+    function-bind "^1.1.1"
+
+he@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
+  integrity sha1-k0EP0hsAlzUVH4howvJx80J+I/0=
+
+hosted-git-info@^2.1.4:
+  version "2.8.8"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
+  integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
+
+html-encoding-sniffer@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz#42a6dc4fd33f00281176e8b23759ca4e4fa185f3"
+  integrity sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==
+  dependencies:
+    whatwg-encoding "^1.0.5"
+
+html-escaper@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
+  integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
+
+http-signature@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
+  dependencies:
+    assert-plus "^1.0.0"
+    jsprim "^1.2.2"
+    sshpk "^1.7.0"
+
+human-signals@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
+  integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
+
+iconv-lite@0.4.24:
+  version "0.4.24"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3"
+
+import-local@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.0.2.tgz#a8cfd0431d1de4a2199703d003e3e62364fa6db6"
+  integrity sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==
+  dependencies:
+    pkg-dir "^4.2.0"
+    resolve-cwd "^3.0.0"
+
+imurmurhash@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
+
+inflight@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
+  dependencies:
+    once "^1.3.0"
+    wrappy "1"
+
+inherits@2, inherits@^2.0.3:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
+
+ip-regex@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
+  integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=
+
+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"
+  integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
+  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"
+  integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
+  dependencies:
+    kind-of "^6.0.0"
+
+is-arguments@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz#3faf966c7cba0ff437fb31f6250082fcf0448cf3"
+  integrity sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==
+
+is-arrayish@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+  integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
+
+is-buffer@^1.1.5:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
+  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
+
+is-callable@^1.1.4, is-callable@^1.2.0:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9"
+  integrity sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==
+
+is-ci@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
+  integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==
+  dependencies:
+    ci-info "^2.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"
+  integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
+  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"
+  integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
+  dependencies:
+    kind-of "^6.0.0"
+
+is-date-object@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"
+  integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==
+
+is-descriptor@^0.1.0:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
+  integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
+  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"
+  integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
+  dependencies:
+    is-accessor-descriptor "^1.0.0"
+    is-data-descriptor "^1.0.0"
+    kind-of "^6.0.2"
+
+is-docker@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.1.tgz#4125a88e44e450d384e09047ede71adc2d144156"
+  integrity sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw==
+
+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"
+  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
+
+is-extendable@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
+  integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
+  dependencies:
+    is-plain-object "^2.0.4"
+
+is-fullwidth-code-point@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
+  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
+
+is-generator-fn@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118"
+  integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==
+
+is-generator-function@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.7.tgz#d2132e529bb0000a7f80794d4bdf5cd5e5813522"
+  integrity sha512-YZc5EwyO4f2kWCax7oegfuSr9mFz1ZvieNYBEjmukLxgXfBUbxAWGVF7GZf0zidYtoBl3WvC07YK0wT76a+Rtw==
+
+is-negative-zero@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.0.tgz#9553b121b0fac28869da9ed459e20c7543788461"
+  integrity sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=
+
+is-number@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+  integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
+  dependencies:
+    kind-of "^3.0.2"
+
+is-number@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
+  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
+
+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"
+  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
+  dependencies:
+    isobject "^3.0.1"
+
+is-potential-custom-element-name@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz#0c52e54bcca391bb2c494b21e8626d7336c6e397"
+  integrity sha1-DFLlS8yjkbssSUsh6GJtczbG45c=
+
+is-regex@^1.1.0, is-regex@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9"
+  integrity sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==
+  dependencies:
+    has-symbols "^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"
+  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
+
+is-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3"
+  integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==
+
+is-symbol@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937"
+  integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==
+  dependencies:
+    has-symbols "^1.0.1"
+
+is-typed-array@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.3.tgz#a4ff5a5e672e1a55f99c7f54e59597af5c1df04d"
+  integrity sha512-BSYUBOK/HJibQ30wWkWold5txYwMUXQct9YHAQJr8fSwvZoiglcqB0pd7vEN23+Tsi9IUEjztdOSzl4qLVYGTQ==
+  dependencies:
+    available-typed-arrays "^1.0.0"
+    es-abstract "^1.17.4"
+    foreach "^2.0.5"
+    has-symbols "^1.0.1"
+
+is-typedarray@^1.0.0, is-typedarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
+
+is-windows@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
+
+is-wsl@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
+  integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==
+  dependencies:
+    is-docker "^2.0.0"
+
+isarray@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
+
+isexe@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
+
+isobject@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
+  dependencies:
+    isarray "1.0.0"
+
+isobject@^3.0.0, isobject@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
+  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
+
+isstream@~0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
+
+istanbul-lib-coverage@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec"
+  integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==
+
+istanbul-lib-instrument@^4.0.0, istanbul-lib-instrument@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz#873c6fff897450118222774696a3f28902d77c1d"
+  integrity sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==
+  dependencies:
+    "@babel/core" "^7.7.5"
+    "@istanbuljs/schema" "^0.1.2"
+    istanbul-lib-coverage "^3.0.0"
+    semver "^6.3.0"
+
+istanbul-lib-report@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#7518fe52ea44de372f460a76b5ecda9ffb73d8a6"
+  integrity sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==
+  dependencies:
+    istanbul-lib-coverage "^3.0.0"
+    make-dir "^3.0.0"
+    supports-color "^7.1.0"
+
+istanbul-lib-source-maps@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz#75743ce6d96bb86dc7ee4352cf6366a23f0b1ad9"
+  integrity sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==
+  dependencies:
+    debug "^4.1.1"
+    istanbul-lib-coverage "^3.0.0"
+    source-map "^0.6.1"
+
+istanbul-reports@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.2.tgz#d593210e5000683750cb09fc0644e4b6e27fd53b"
+  integrity sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==
+  dependencies:
+    html-escaper "^2.0.0"
+    istanbul-lib-report "^3.0.0"
+
+jade@0.26.3:
+  version "0.26.3"
+  resolved "https://registry.yarnpkg.com/jade/-/jade-0.26.3.tgz#8f10d7977d8d79f2f6ff862a81b0513ccb25686c"
+  integrity sha1-jxDXl32NefL2/4YqgbBRPMslaGw=
+  dependencies:
+    commander "0.6.1"
+    mkdirp "0.3.0"
+
+jest-changed-files@^26.3.0:
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-26.3.0.tgz#68fb2a7eb125f50839dab1f5a17db3607fe195b1"
+  integrity sha512-1C4R4nijgPltX6fugKxM4oQ18zimS7LqQ+zTTY8lMCMFPrxqBFb7KJH0Z2fRQJvw2Slbaipsqq7s1mgX5Iot+g==
+  dependencies:
+    "@jest/types" "^26.3.0"
+    execa "^4.0.0"
+    throat "^5.0.0"
+
+jest-cli@^26.4.2:
+  version "26.4.2"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-26.4.2.tgz#24afc6e4dfc25cde4c7ec4226fb7db5f157c21da"
+  integrity sha512-zb+lGd/SfrPvoRSC/0LWdaWCnscXc1mGYW//NP4/tmBvRPT3VntZ2jtKUONsRi59zc5JqmsSajA9ewJKFYp8Cw==
+  dependencies:
+    "@jest/core" "^26.4.2"
+    "@jest/test-result" "^26.3.0"
+    "@jest/types" "^26.3.0"
+    chalk "^4.0.0"
+    exit "^0.1.2"
+    graceful-fs "^4.2.4"
+    import-local "^3.0.2"
+    is-ci "^2.0.0"
+    jest-config "^26.4.2"
+    jest-util "^26.3.0"
+    jest-validate "^26.4.2"
+    prompts "^2.0.1"
+    yargs "^15.3.1"
+
+jest-config@^26.4.2:
+  version "26.4.2"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-26.4.2.tgz#da0cbb7dc2c131ffe831f0f7f2a36256e6086558"
+  integrity sha512-QBf7YGLuToiM8PmTnJEdRxyYy3mHWLh24LJZKVdXZ2PNdizSe1B/E8bVm+HYcjbEzGuVXDv/di+EzdO/6Gq80A==
+  dependencies:
+    "@babel/core" "^7.1.0"
+    "@jest/test-sequencer" "^26.4.2"
+    "@jest/types" "^26.3.0"
+    babel-jest "^26.3.0"
+    chalk "^4.0.0"
+    deepmerge "^4.2.2"
+    glob "^7.1.1"
+    graceful-fs "^4.2.4"
+    jest-environment-jsdom "^26.3.0"
+    jest-environment-node "^26.3.0"
+    jest-get-type "^26.3.0"
+    jest-jasmine2 "^26.4.2"
+    jest-regex-util "^26.0.0"
+    jest-resolve "^26.4.0"
+    jest-util "^26.3.0"
+    jest-validate "^26.4.2"
+    micromatch "^4.0.2"
+    pretty-format "^26.4.2"
+
+jest-diff@^26.4.2:
+  version "26.4.2"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.4.2.tgz#a1b7b303bcc534aabdb3bd4a7caf594ac059f5aa"
+  integrity sha512-6T1XQY8U28WH0Z5rGpQ+VqZSZz8EN8rZcBtfvXaOkbwxIEeRre6qnuZQlbY1AJ4MKDxQF8EkrCvK+hL/VkyYLQ==
+  dependencies:
+    chalk "^4.0.0"
+    diff-sequences "^26.3.0"
+    jest-get-type "^26.3.0"
+    pretty-format "^26.4.2"
+
+jest-docblock@^26.0.0:
+  version "26.0.0"
+  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-26.0.0.tgz#3e2fa20899fc928cb13bd0ff68bd3711a36889b5"
+  integrity sha512-RDZ4Iz3QbtRWycd8bUEPxQsTlYazfYn/h5R65Fc6gOfwozFhoImx+affzky/FFBuqISPTqjXomoIGJVKBWoo0w==
+  dependencies:
+    detect-newline "^3.0.0"
+
+jest-each@^26.4.2:
+  version "26.4.2"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-26.4.2.tgz#bb14f7f4304f2bb2e2b81f783f989449b8b6ffae"
+  integrity sha512-p15rt8r8cUcRY0Mvo1fpkOGYm7iI8S6ySxgIdfh3oOIv+gHwrHTy5VWCGOecWUhDsit4Nz8avJWdT07WLpbwDA==
+  dependencies:
+    "@jest/types" "^26.3.0"
+    chalk "^4.0.0"
+    jest-get-type "^26.3.0"
+    jest-util "^26.3.0"
+    pretty-format "^26.4.2"
+
+jest-environment-jsdom@^26.3.0:
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.3.0.tgz#3b749ba0f3a78e92ba2c9ce519e16e5dd515220c"
+  integrity sha512-zra8He2btIMJkAzvLaiZ9QwEPGEetbxqmjEBQwhH3CA+Hhhu0jSiEJxnJMbX28TGUvPLxBt/zyaTLrOPF4yMJA==
+  dependencies:
+    "@jest/environment" "^26.3.0"
+    "@jest/fake-timers" "^26.3.0"
+    "@jest/types" "^26.3.0"
+    "@types/node" "*"
+    jest-mock "^26.3.0"
+    jest-util "^26.3.0"
+    jsdom "^16.2.2"
+
+jest-environment-node@^26.3.0:
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.3.0.tgz#56c6cfb506d1597f94ee8d717072bda7228df849"
+  integrity sha512-c9BvYoo+FGcMj5FunbBgtBnbR5qk3uky8PKyRVpSfe2/8+LrNQMiXX53z6q2kY+j15SkjQCOSL/6LHnCPLVHNw==
+  dependencies:
+    "@jest/environment" "^26.3.0"
+    "@jest/fake-timers" "^26.3.0"
+    "@jest/types" "^26.3.0"
+    "@types/node" "*"
+    jest-mock "^26.3.0"
+    jest-util "^26.3.0"
+
+jest-get-type@^26.3.0:
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz#e97dc3c3f53c2b406ca7afaed4493b1d099199e0"
+  integrity sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==
+
+jest-haste-map@^26.3.0:
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.3.0.tgz#c51a3b40100d53ab777bfdad382d2e7a00e5c726"
+  integrity sha512-DHWBpTJgJhLLGwE5Z1ZaqLTYqeODQIZpby0zMBsCU9iRFHYyhklYqP4EiG73j5dkbaAdSZhgB938mL51Q5LeZA==
+  dependencies:
+    "@jest/types" "^26.3.0"
+    "@types/graceful-fs" "^4.1.2"
+    "@types/node" "*"
+    anymatch "^3.0.3"
+    fb-watchman "^2.0.0"
+    graceful-fs "^4.2.4"
+    jest-regex-util "^26.0.0"
+    jest-serializer "^26.3.0"
+    jest-util "^26.3.0"
+    jest-worker "^26.3.0"
+    micromatch "^4.0.2"
+    sane "^4.0.3"
+    walker "^1.0.7"
+  optionalDependencies:
+    fsevents "^2.1.2"
+
+jest-jasmine2@^26.4.2:
+  version "26.4.2"
+  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.4.2.tgz#18a9d5bec30904267ac5e9797570932aec1e2257"
+  integrity sha512-z7H4EpCldHN1J8fNgsja58QftxBSL+JcwZmaXIvV9WKIM+x49F4GLHu/+BQh2kzRKHAgaN/E82od+8rTOBPyPA==
+  dependencies:
+    "@babel/traverse" "^7.1.0"
+    "@jest/environment" "^26.3.0"
+    "@jest/source-map" "^26.3.0"
+    "@jest/test-result" "^26.3.0"
+    "@jest/types" "^26.3.0"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    co "^4.6.0"
+    expect "^26.4.2"
+    is-generator-fn "^2.0.0"
+    jest-each "^26.4.2"
+    jest-matcher-utils "^26.4.2"
+    jest-message-util "^26.3.0"
+    jest-runtime "^26.4.2"
+    jest-snapshot "^26.4.2"
+    jest-util "^26.3.0"
+    pretty-format "^26.4.2"
+    throat "^5.0.0"
+
+jest-leak-detector@^26.4.2:
+  version "26.4.2"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.4.2.tgz#c73e2fa8757bf905f6f66fb9e0070b70fa0f573f"
+  integrity sha512-akzGcxwxtE+9ZJZRW+M2o+nTNnmQZxrHJxX/HjgDaU5+PLmY1qnQPnMjgADPGCRPhB+Yawe1iij0REe+k/aHoA==
+  dependencies:
+    jest-get-type "^26.3.0"
+    pretty-format "^26.4.2"
+
+jest-matcher-utils@^26.4.2:
+  version "26.4.2"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.4.2.tgz#fa81f3693f7cb67e5fc1537317525ef3b85f4b06"
+  integrity sha512-KcbNqWfWUG24R7tu9WcAOKKdiXiXCbMvQYT6iodZ9k1f7065k0keUOW6XpJMMvah+hTfqkhJhRXmA3r3zMAg0Q==
+  dependencies:
+    chalk "^4.0.0"
+    jest-diff "^26.4.2"
+    jest-get-type "^26.3.0"
+    pretty-format "^26.4.2"
+
+jest-message-util@^26.3.0:
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.3.0.tgz#3bdb538af27bb417f2d4d16557606fd082d5841a"
+  integrity sha512-xIavRYqr4/otGOiLxLZGj3ieMmjcNE73Ui+LdSW/Y790j5acqCsAdDiLIbzHCZMpN07JOENRWX5DcU+OQ+TjTA==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    "@jest/types" "^26.3.0"
+    "@types/stack-utils" "^1.0.1"
+    chalk "^4.0.0"
+    graceful-fs "^4.2.4"
+    micromatch "^4.0.2"
+    slash "^3.0.0"
+    stack-utils "^2.0.2"
+
+jest-mock@^26.3.0:
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.3.0.tgz#ee62207c3c5ebe5f35b760e1267fee19a1cfdeba"
+  integrity sha512-PeaRrg8Dc6mnS35gOo/CbZovoDPKAeB1FICZiuagAgGvbWdNNyjQjkOaGUa/3N3JtpQ/Mh9P4A2D4Fv51NnP8Q==
+  dependencies:
+    "@jest/types" "^26.3.0"
+    "@types/node" "*"
+
+jest-pnp-resolver@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c"
+  integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==
+
+jest-regex-util@^26.0.0:
+  version "26.0.0"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-26.0.0.tgz#d25e7184b36e39fd466c3bc41be0971e821fee28"
+  integrity sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==
+
+jest-resolve-dependencies@^26.4.2:
+  version "26.4.2"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-26.4.2.tgz#739bdb027c14befb2fe5aabbd03f7bab355f1dc5"
+  integrity sha512-ADHaOwqEcVc71uTfySzSowA/RdxUpCxhxa2FNLiin9vWLB1uLPad3we+JSSROq5+SrL9iYPdZZF8bdKM7XABTQ==
+  dependencies:
+    "@jest/types" "^26.3.0"
+    jest-regex-util "^26.0.0"
+    jest-snapshot "^26.4.2"
+
+jest-resolve@^26.4.0:
+  version "26.4.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.4.0.tgz#6dc0af7fb93e65b73fec0368ca2b76f3eb59a6d7"
+  integrity sha512-bn/JoZTEXRSlEx3+SfgZcJAVuTMOksYq9xe9O6s4Ekg84aKBObEaVXKOEilULRqviSLAYJldnoWV9c07kwtiCg==
+  dependencies:
+    "@jest/types" "^26.3.0"
+    chalk "^4.0.0"
+    graceful-fs "^4.2.4"
+    jest-pnp-resolver "^1.2.2"
+    jest-util "^26.3.0"
+    read-pkg-up "^7.0.1"
+    resolve "^1.17.0"
+    slash "^3.0.0"
+
+jest-runner@^26.4.2:
+  version "26.4.2"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.4.2.tgz#c3ec5482c8edd31973bd3935df5a449a45b5b853"
+  integrity sha512-FgjDHeVknDjw1gRAYaoUoShe1K3XUuFMkIaXbdhEys+1O4bEJS8Avmn4lBwoMfL8O5oFTdWYKcf3tEJyyYyk8g==
+  dependencies:
+    "@jest/console" "^26.3.0"
+    "@jest/environment" "^26.3.0"
+    "@jest/test-result" "^26.3.0"
+    "@jest/types" "^26.3.0"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    emittery "^0.7.1"
+    exit "^0.1.2"
+    graceful-fs "^4.2.4"
+    jest-config "^26.4.2"
+    jest-docblock "^26.0.0"
+    jest-haste-map "^26.3.0"
+    jest-leak-detector "^26.4.2"
+    jest-message-util "^26.3.0"
+    jest-resolve "^26.4.0"
+    jest-runtime "^26.4.2"
+    jest-util "^26.3.0"
+    jest-worker "^26.3.0"
+    source-map-support "^0.5.6"
+    throat "^5.0.0"
+
+jest-runtime@^26.4.2:
+  version "26.4.2"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.4.2.tgz#94ce17890353c92e4206580c73a8f0c024c33c42"
+  integrity sha512-4Pe7Uk5a80FnbHwSOk7ojNCJvz3Ks2CNQWT5Z7MJo4tX0jb3V/LThKvD9tKPNVNyeMH98J/nzGlcwc00R2dSHQ==
+  dependencies:
+    "@jest/console" "^26.3.0"
+    "@jest/environment" "^26.3.0"
+    "@jest/fake-timers" "^26.3.0"
+    "@jest/globals" "^26.4.2"
+    "@jest/source-map" "^26.3.0"
+    "@jest/test-result" "^26.3.0"
+    "@jest/transform" "^26.3.0"
+    "@jest/types" "^26.3.0"
+    "@types/yargs" "^15.0.0"
+    chalk "^4.0.0"
+    collect-v8-coverage "^1.0.0"
+    exit "^0.1.2"
+    glob "^7.1.3"
+    graceful-fs "^4.2.4"
+    jest-config "^26.4.2"
+    jest-haste-map "^26.3.0"
+    jest-message-util "^26.3.0"
+    jest-mock "^26.3.0"
+    jest-regex-util "^26.0.0"
+    jest-resolve "^26.4.0"
+    jest-snapshot "^26.4.2"
+    jest-util "^26.3.0"
+    jest-validate "^26.4.2"
+    slash "^3.0.0"
+    strip-bom "^4.0.0"
+    yargs "^15.3.1"
+
+jest-serializer@^26.3.0:
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.3.0.tgz#1c9d5e1b74d6e5f7e7f9627080fa205d976c33ef"
+  integrity sha512-IDRBQBLPlKa4flg77fqg0n/pH87tcRKwe8zxOVTWISxGpPHYkRZ1dXKyh04JOja7gppc60+soKVZ791mruVdow==
+  dependencies:
+    "@types/node" "*"
+    graceful-fs "^4.2.4"
+
+jest-snapshot@^26.4.2:
+  version "26.4.2"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.4.2.tgz#87d3ac2f2bd87ea8003602fbebd8fcb9e94104f6"
+  integrity sha512-N6Uub8FccKlf5SBFnL2Ri/xofbaA68Cc3MGjP/NuwgnsvWh+9hLIR/DhrxbSiKXMY9vUW5dI6EW1eHaDHqe9sg==
+  dependencies:
+    "@babel/types" "^7.0.0"
+    "@jest/types" "^26.3.0"
+    "@types/prettier" "^2.0.0"
+    chalk "^4.0.0"
+    expect "^26.4.2"
+    graceful-fs "^4.2.4"
+    jest-diff "^26.4.2"
+    jest-get-type "^26.3.0"
+    jest-haste-map "^26.3.0"
+    jest-matcher-utils "^26.4.2"
+    jest-message-util "^26.3.0"
+    jest-resolve "^26.4.0"
+    natural-compare "^1.4.0"
+    pretty-format "^26.4.2"
+    semver "^7.3.2"
+
+jest-util@^26.3.0:
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.3.0.tgz#a8974b191df30e2bf523ebbfdbaeb8efca535b3e"
+  integrity sha512-4zpn6bwV0+AMFN0IYhH/wnzIQzRaYVrz1A8sYnRnj4UXDXbOVtWmlaZkO9mipFqZ13okIfN87aDoJWB7VH6hcw==
+  dependencies:
+    "@jest/types" "^26.3.0"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    graceful-fs "^4.2.4"
+    is-ci "^2.0.0"
+    micromatch "^4.0.2"
+
+jest-validate@^26.4.2:
+  version "26.4.2"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.4.2.tgz#e871b0dfe97747133014dcf6445ee8018398f39c"
+  integrity sha512-blft+xDX7XXghfhY0mrsBCYhX365n8K5wNDC4XAcNKqqjEzsRUSXP44m6PL0QJEW2crxQFLLztVnJ4j7oPlQrQ==
+  dependencies:
+    "@jest/types" "^26.3.0"
+    camelcase "^6.0.0"
+    chalk "^4.0.0"
+    jest-get-type "^26.3.0"
+    leven "^3.1.0"
+    pretty-format "^26.4.2"
+
+jest-watcher@^26.3.0:
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-26.3.0.tgz#f8ef3068ddb8af160ef868400318dc4a898eed08"
+  integrity sha512-XnLdKmyCGJ3VoF6G/p5ohbJ04q/vv5aH9ENI+i6BL0uu9WWB6Z7Z2lhQQk0d2AVZcRGp1yW+/TsoToMhBFPRdQ==
+  dependencies:
+    "@jest/test-result" "^26.3.0"
+    "@jest/types" "^26.3.0"
+    "@types/node" "*"
+    ansi-escapes "^4.2.1"
+    chalk "^4.0.0"
+    jest-util "^26.3.0"
+    string-length "^4.0.1"
+
+jest-worker@^26.3.0:
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.3.0.tgz#7c8a97e4f4364b4f05ed8bca8ca0c24de091871f"
+  integrity sha512-Vmpn2F6IASefL+DVBhPzI2J9/GJUsqzomdeN+P+dK8/jKxbh8R3BtFnx3FIta7wYlPU62cpJMJQo4kuOowcMnw==
+  dependencies:
+    "@types/node" "*"
+    merge-stream "^2.0.0"
+    supports-color "^7.0.0"
+
+jest@^26.4:
+  version "26.4.2"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-26.4.2.tgz#7e8bfb348ec33f5459adeaffc1a25d5752d9d312"
+  integrity sha512-LLCjPrUh98Ik8CzW8LLVnSCfLaiY+wbK53U7VxnFSX7Q+kWC4noVeDvGWIFw0Amfq1lq2VfGm7YHWSLBV62MJw==
+  dependencies:
+    "@jest/core" "^26.4.2"
+    import-local "^3.0.2"
+    jest-cli "^26.4.2"
+
+js-tokens@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
+
+js-yaml@^3.13.1:
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz#a7a34170f26a21bb162424d8adacb4113a69e482"
+  integrity sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^4.0.0"
+
+jsbn@~0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
+
+jsdom@^16.2.2:
+  version "16.4.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.4.0.tgz#36005bde2d136f73eee1a830c6d45e55408edddb"
+  integrity sha512-lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w==
+  dependencies:
+    abab "^2.0.3"
+    acorn "^7.1.1"
+    acorn-globals "^6.0.0"
+    cssom "^0.4.4"
+    cssstyle "^2.2.0"
+    data-urls "^2.0.0"
+    decimal.js "^10.2.0"
+    domexception "^2.0.1"
+    escodegen "^1.14.1"
+    html-encoding-sniffer "^2.0.1"
+    is-potential-custom-element-name "^1.0.0"
+    nwsapi "^2.2.0"
+    parse5 "5.1.1"
+    request "^2.88.2"
+    request-promise-native "^1.0.8"
+    saxes "^5.0.0"
+    symbol-tree "^3.2.4"
+    tough-cookie "^3.0.1"
+    w3c-hr-time "^1.0.2"
+    w3c-xmlserializer "^2.0.0"
+    webidl-conversions "^6.1.0"
+    whatwg-encoding "^1.0.5"
+    whatwg-mimetype "^2.3.0"
+    whatwg-url "^8.0.0"
+    ws "^7.2.3"
+    xml-name-validator "^3.0.0"
+
+jsesc@^2.5.1:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
+  integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
+
+json-parse-even-better-errors@^2.3.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
+  integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
+
+json-schema-traverse@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
+  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
+
+json-schema@0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
+  integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
+
+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"
+  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
+
+json3@3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
+  integrity sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=
+
+json5@^2.1.2:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"
+  integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==
+  dependencies:
+    minimist "^1.2.5"
+
+jsprim@^1.2.2:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
+  integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
+  dependencies:
+    assert-plus "1.0.0"
+    extsprintf "1.3.0"
+    json-schema "0.2.3"
+    verror "1.10.0"
+
+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"
+  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
+  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"
+  integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
+  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"
+  integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
+
+kind-of@^6.0.0, kind-of@^6.0.2:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
+  integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
+
+kleur@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
+  integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
+
+leven@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
+  integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
+
+levn@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
+  dependencies:
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+
+lines-and-columns@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
+  integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=
+
+locate-path@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
+  integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
+  dependencies:
+    p-locate "^4.1.0"
+
+lodash._baseassign@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz#8c38a099500f215ad09e59f1722fd0c52bfe0a4e"
+  integrity sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=
+  dependencies:
+    lodash._basecopy "^3.0.0"
+    lodash.keys "^3.0.0"
+
+lodash._basecopy@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"
+  integrity sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=
+
+lodash._basecreate@^3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz#1bc661614daa7fc311b7d03bf16806a0213cf821"
+  integrity sha1-G8ZhYU2qf8MRt9A78WgGoCE8+CE=
+
+lodash._getnative@^3.0.0:
+  version "3.9.1"
+  resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
+  integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=
+
+lodash._isiterateecall@^3.0.0:
+  version "3.0.9"
+  resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c"
+  integrity sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=
+
+lodash.create@3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/lodash.create/-/lodash.create-3.1.1.tgz#d7f2849f0dbda7e04682bb8cd72ab022461debe7"
+  integrity sha1-1/KEnw29p+BGgruM1yqwIkYd6+c=
+  dependencies:
+    lodash._baseassign "^3.0.0"
+    lodash._basecreate "^3.0.0"
+    lodash._isiterateecall "^3.0.0"
+
+lodash.isarguments@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
+  integrity sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=
+
+lodash.isarray@^3.0.0:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
+  integrity sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=
+
+lodash.keys@^3.0.0:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
+  integrity sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=
+  dependencies:
+    lodash._getnative "^3.0.0"
+    lodash.isarguments "^3.0.0"
+    lodash.isarray "^3.0.0"
+
+lodash.sortby@^4.7.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
+  integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
+
+lodash@^4.17.19:
+  version "4.17.20"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
+  integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
+
+lolex@1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/lolex/-/lolex-1.3.2.tgz#7c3da62ffcb30f0f5a80a2566ca24e45d8a01f31"
+  integrity sha1-fD2mL/yzDw9agKJWbKJORdigHzE=
+
+lru-cache@2:
+  version "2.7.3"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952"
+  integrity sha1-bUUk6LlV+V1PW1iFHOId1y+06VI=
+
+make-dir@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
+  integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
+  dependencies:
+    semver "^6.0.0"
+
+makeerror@1.0.x:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
+  integrity sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=
+  dependencies:
+    tmpl "1.0.x"
+
+map-cache@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
+  integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
+
+map-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
+  integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
+  dependencies:
+    object-visit "^1.0.0"
+
+merge-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
+  integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
+
+micromatch@^3.1.4:
+  version "3.1.10"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
+  integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
+  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"
+
+micromatch@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
+  integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
+  dependencies:
+    braces "^3.0.1"
+    picomatch "^2.0.5"
+
+mime-db@1.44.0:
+  version "1.44.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"
+  integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==
+
+mime-types@^2.1.12, mime-types@~2.1.19:
+  version "2.1.27"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f"
+  integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==
+  dependencies:
+    mime-db "1.44.0"
+
+mimic-fn@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
+  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
+
+minimatch@0.3:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-0.3.0.tgz#275d8edaac4f1bb3326472089e7949c8394699dd"
+  integrity sha1-J12O2qxPG7MyZHIInnlJyDlGmd0=
+  dependencies:
+    lru-cache "2"
+    sigmund "~1.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"
+  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
+  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"
+  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
+
+minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
+  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+
+mixin-deep@^1.2.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
+  integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
+  dependencies:
+    for-in "^1.0.2"
+    is-extendable "^1.0.1"
+
+mkdirp@0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.3.0.tgz#1bbf5ab1ba827af23575143490426455f481fe1e"
+  integrity sha1-G79asbqCevI1dRQ0kEJkVfSB/h4=
+
+mkdirp@0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
+  dependencies:
+    minimist "0.0.8"
+
+mocha@^2.5.3:
+  version "2.5.3"
+  resolved "https://registry.yarnpkg.com/mocha/-/mocha-2.5.3.tgz#161be5bdeb496771eb9b35745050b622b5aefc58"
+  integrity sha1-FhvlvetJZ3HrmzV0UFC2IrWu/Fg=
+  dependencies:
+    commander "2.3.0"
+    debug "2.2.0"
+    diff "1.4.0"
+    escape-string-regexp "1.0.2"
+    glob "3.2.11"
+    growl "1.9.2"
+    jade "0.26.3"
+    mkdirp "0.5.1"
+    supports-color "1.2.0"
+    to-iso-string "0.0.2"
+
+mocha@^3.1.2:
+  version "3.5.3"
+  resolved "https://registry.yarnpkg.com/mocha/-/mocha-3.5.3.tgz#1e0480fe36d2da5858d1eb6acc38418b26eaa20d"
+  integrity sha512-/6na001MJWEtYxHOV1WLfsmR4YIynkUEhBwzsb+fk2qmQ3iqsi258l/Q2MWHJMImAcNpZ8DEdYAK72NHoIQ9Eg==
+  dependencies:
+    browser-stdout "1.3.0"
+    commander "2.9.0"
+    debug "2.6.8"
+    diff "3.2.0"
+    escape-string-regexp "1.0.5"
+    glob "7.1.1"
+    growl "1.9.2"
+    he "1.1.1"
+    json3 "3.3.2"
+    lodash.create "3.1.1"
+    mkdirp "0.5.1"
+    supports-color "3.1.2"
+
+mock-require@3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/mock-require/-/mock-require-3.0.3.tgz#ccd544d9eae81dd576b3f219f69ec867318a1946"
+  integrity sha512-lLzfLHcyc10MKQnNUCv7dMcoY/2Qxd6wJfbqCcVk3LDb8An4hF6ohk5AztrvgKhJCqj36uyzi/p5se+tvyD+Wg==
+  dependencies:
+    get-caller-file "^1.0.2"
+    normalize-path "^2.1.1"
+
+ms@0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
+  integrity sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=
+
+ms@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
+
+ms@2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+
+nanomatch@^1.2.9:
+  version "1.2.13"
+  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
+  integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
+  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"
+
+natural-compare@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
+  integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
+
+nice-try@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
+  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
+
+node-int64@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
+  integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=
+
+node-modules-regexp@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40"
+  integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=
+
+node-notifier@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.0.tgz#a7eee2d51da6d0f7ff5094bc7108c911240c1620"
+  integrity sha512-46z7DUmcjoYdaWyXouuFNNfUo6eFa94t23c53c+lG/9Cvauk4a98rAUp9672X5dxGdQmLpPzTxzu8f/OeEPaFA==
+  dependencies:
+    growly "^1.3.0"
+    is-wsl "^2.2.0"
+    semver "^7.3.2"
+    shellwords "^0.1.1"
+    uuid "^8.3.0"
+    which "^2.0.2"
+
+normalize-package-data@^2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
+  integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
+  dependencies:
+    hosted-git-info "^2.1.4"
+    resolve "^1.10.0"
+    semver "2 || 3 || 4 || 5"
+    validate-npm-package-license "^3.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"
+  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
+  dependencies:
+    remove-trailing-separator "^1.0.1"
+
+normalize-path@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
+  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
+
+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"
+  integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
+  dependencies:
+    path-key "^2.0.0"
+
+npm-run-path@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
+  integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
+  dependencies:
+    path-key "^3.0.0"
+
+nwsapi@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
+  integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==
+
+oauth-sign@~0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
+  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
+
+object-copy@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
+  integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
+  dependencies:
+    copy-descriptor "^0.1.0"
+    define-property "^0.2.5"
+    kind-of "^3.0.3"
+
+object-inspect@^1.7.0, object-inspect@^1.8.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz#df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0"
+  integrity sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==
+
+object-keys@^1.0.12, object-keys@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
+  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
+
+object-visit@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
+  integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
+  dependencies:
+    isobject "^3.0.0"
+
+object.assign@^4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.1.tgz#303867a666cdd41936ecdedfb1f8f3e32a478cdd"
+  integrity sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.18.0-next.0"
+    has-symbols "^1.0.1"
+    object-keys "^1.1.1"
+
+object.pick@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
+  integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
+  dependencies:
+    isobject "^3.0.1"
+
+once@^1.3.0, once@^1.3.1, once@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
+  dependencies:
+    wrappy "1"
+
+onetime@^5.1.0:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
+  integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
+  dependencies:
+    mimic-fn "^2.1.0"
+
+optionator@^0.8.1:
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
+  integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
+  dependencies:
+    deep-is "~0.1.3"
+    fast-levenshtein "~2.0.6"
+    levn "~0.3.0"
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+    word-wrap "~1.2.3"
+
+p-each-series@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.1.0.tgz#961c8dd3f195ea96c747e636b262b800a6b1af48"
+  integrity sha512-ZuRs1miPT4HrjFa+9fRfOFXxGJfORgelKV9f9nNOWw2gl6gVsRaVDOQP0+MI0G0wGKns1Yacsu0GjOFbTK0JFQ==
+
+p-finally@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
+  integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
+
+p-limit@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
+  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
+  dependencies:
+    p-try "^2.0.0"
+
+p-locate@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
+  integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
+  dependencies:
+    p-limit "^2.2.0"
+
+p-try@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
+  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
+
+parse-json@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.1.0.tgz#f96088cdf24a8faa9aea9a009f2d9d942c999646"
+  integrity sha512-+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    error-ex "^1.3.1"
+    json-parse-even-better-errors "^2.3.0"
+    lines-and-columns "^1.1.6"
+
+parse5@5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178"
+  integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==
+
+pascalcase@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
+  integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
+
+path-exists@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
+  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
+
+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"
+  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
+
+path-key@^2.0.0, path-key@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
+  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
+
+path-key@^3.0.0, path-key@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
+  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
+
+path-parse@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
+  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
+
+performance-now@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
+
+picomatch@^2.0.4, picomatch@^2.0.5:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
+  integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
+
+pirates@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87"
+  integrity sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==
+  dependencies:
+    node-modules-regexp "^1.0.0"
+
+pkg-dir@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
+  integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
+  dependencies:
+    find-up "^4.0.0"
+
+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"
+  integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
+
+prelude-ls@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
+  integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
+
+pretty-format@^26.4.2:
+  version "26.4.2"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.4.2.tgz#d081d032b398e801e2012af2df1214ef75a81237"
+  integrity sha512-zK6Gd8zDsEiVydOCGLkoBoZuqv8VTiHyAbKznXe/gaph/DAeZOmit9yMfgIz5adIgAMMs5XfoYSwAX3jcCO1tA==
+  dependencies:
+    "@jest/types" "^26.3.0"
+    ansi-regex "^5.0.0"
+    ansi-styles "^4.0.0"
+    react-is "^16.12.0"
+
+promises-aplus-tests@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/promises-aplus-tests/-/promises-aplus-tests-2.1.2.tgz#76b7c5638968720861969cfbcd8795afd274885c"
+  integrity sha1-drfFY4locghhlpz7zYeVr9J0iFw=
+  dependencies:
+    mocha "^2.5.3"
+    sinon "^1.10.3"
+    underscore "~1.8.3"
+
+prompts@^2.0.1:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.3.2.tgz#480572d89ecf39566d2bd3fe2c9fccb7c4c0b068"
+  integrity sha512-Q06uKs2CkNYVID0VqwfAl9mipo99zkBv/n2JtWY89Yxa3ZabWSrs0e2KTudKVa3peLUvYXMefDqIleLPVUBZMA==
+  dependencies:
+    kleur "^3.0.3"
+    sisteransi "^1.0.4"
+
+psl@^1.1.28:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
+  integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
+
+pump@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
+  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
+  dependencies:
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
+
+punycode@^2.1.0, punycode@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
+
+qs@~6.5.2:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
+  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
+
+react-is@^16.12.0:
+  version "16.13.1"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
+  integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
+
+read-pkg-up@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507"
+  integrity sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==
+  dependencies:
+    find-up "^4.1.0"
+    read-pkg "^5.2.0"
+    type-fest "^0.8.1"
+
+read-pkg@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc"
+  integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==
+  dependencies:
+    "@types/normalize-package-data" "^2.4.0"
+    normalize-package-data "^2.5.0"
+    parse-json "^5.0.0"
+    type-fest "^0.6.0"
+
+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"
+  integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
+  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"
+  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
+
+repeat-element@^1.1.2:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
+  integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
+
+repeat-string@^1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
+
+request-promise-core@1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz#3eedd4223208d419867b78ce815167d10593a22f"
+  integrity sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==
+  dependencies:
+    lodash "^4.17.19"
+
+request-promise-native@^1.0.8:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz#e407120526a5efdc9a39b28a5679bf47b9d9dc28"
+  integrity sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==
+  dependencies:
+    request-promise-core "1.1.4"
+    stealthy-require "^1.1.1"
+    tough-cookie "^2.3.3"
+
+request@^2.88.2:
+  version "2.88.2"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
+  integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.8.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.6"
+    extend "~3.0.2"
+    forever-agent "~0.6.1"
+    form-data "~2.3.2"
+    har-validator "~5.1.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.19"
+    oauth-sign "~0.9.0"
+    performance-now "^2.1.0"
+    qs "~6.5.2"
+    safe-buffer "^5.1.2"
+    tough-cookie "~2.5.0"
+    tunnel-agent "^0.6.0"
+    uuid "^3.3.2"
+
+require-directory@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
+
+require-main-filename@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
+  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
+
+resolve-cwd@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"
+  integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==
+  dependencies:
+    resolve-from "^5.0.0"
+
+resolve-from@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
+  integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
+
+resolve-url@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
+  integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
+
+resolve@^1.10.0, resolve@^1.17.0, resolve@^1.3.2:
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444"
+  integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==
+  dependencies:
+    path-parse "^1.0.6"
+
+ret@~0.1.10:
+  version "0.1.15"
+  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+  integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
+
+rimraf@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
+  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
+  dependencies:
+    glob "^7.1.3"
+
+rsvp@^4.8.4:
+  version "4.8.5"
+  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734"
+  integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==
+
+safe-buffer@^5.0.1, safe-buffer@^5.1.2:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
+
+safe-buffer@~5.1.1:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
+
+safe-regex@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+  integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
+  dependencies:
+    ret "~0.1.10"
+
+"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
+
+samsam@1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.1.2.tgz#bec11fdc83a9fda063401210e40176c3024d1567"
+  integrity sha1-vsEf3IOp/aBjQBIQ5AF2wwJNFWc=
+
+samsam@~1.1:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.1.3.tgz#9f5087419b4d091f232571e7fa52e90b0f552621"
+  integrity sha1-n1CHQZtNCR8jJXHn+lLpCw9VJiE=
+
+sane@^4.0.3:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/sane/-/sane-4.1.0.tgz#ed881fd922733a6c461bc189dc2b6c006f3ffded"
+  integrity sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==
+  dependencies:
+    "@cnakazawa/watch" "^1.0.3"
+    anymatch "^2.0.0"
+    capture-exit "^2.0.0"
+    exec-sh "^0.3.2"
+    execa "^1.0.0"
+    fb-watchman "^2.0.0"
+    micromatch "^3.1.4"
+    minimist "^1.1.1"
+    walker "~1.0.5"
+
+saxes@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d"
+  integrity sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==
+  dependencies:
+    xmlchars "^2.2.0"
+
+"semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
+  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+
+semver@^6.0.0, semver@^6.3.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
+  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+
+semver@^7.3.2:
+  version "7.3.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
+  integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
+
+set-blocking@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
+
+set-value@^2.0.0, set-value@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
+  integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-extendable "^0.1.1"
+    is-plain-object "^2.0.3"
+    split-string "^3.0.1"
+
+shebang-command@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
+  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
+  dependencies:
+    shebang-regex "^1.0.0"
+
+shebang-command@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
+  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
+  dependencies:
+    shebang-regex "^3.0.0"
+
+shebang-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
+  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
+
+shebang-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
+  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
+
+shellwords@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
+  integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==
+
+sigmund@~1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
+  integrity sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=
+
+signal-exit@^3.0.0, signal-exit@^3.0.2:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
+  integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
+
+sinon@^1.10.3:
+  version "1.17.7"
+  resolved "https://registry.yarnpkg.com/sinon/-/sinon-1.17.7.tgz#4542a4f49ba0c45c05eb2e9dd9d203e2b8efe0bf"
+  integrity sha1-RUKk9JugxFwF6y6d2dID4rjv4L8=
+  dependencies:
+    formatio "1.1.1"
+    lolex "1.3.2"
+    samsam "1.1.2"
+    util ">=0.10.3 <1"
+
+sisteransi@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed"
+  integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==
+
+slash@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
+  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
+
+snapdragon-node@^2.0.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
+  integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
+  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"
+  integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
+  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"
+  integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==
+  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"
+
+source-map-resolve@^0.5.0:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
+  integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==
+  dependencies:
+    atob "^2.1.2"
+    decode-uri-component "^0.2.0"
+    resolve-url "^0.2.1"
+    source-map-url "^0.4.0"
+    urix "^0.1.0"
+
+source-map-support@^0.5.6:
+  version "0.5.19"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
+  integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
+  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"
+  integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
+
+source-map@^0.5.0, source-map@^0.5.6:
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
+
+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"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
+
+source-map@^0.7.3:
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
+  integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
+
+spdx-correct@^3.0.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
+  integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==
+  dependencies:
+    spdx-expression-parse "^3.0.0"
+    spdx-license-ids "^3.0.0"
+
+spdx-exceptions@^2.1.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d"
+  integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==
+
+spdx-expression-parse@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
+  integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
+  dependencies:
+    spdx-exceptions "^2.1.0"
+    spdx-license-ids "^3.0.0"
+
+spdx-license-ids@^3.0.0:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz#c80757383c28abf7296744998cbc106ae8b854ce"
+  integrity sha512-+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw==
+
+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"
+  integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
+  dependencies:
+    extend-shallow "^3.0.0"
+
+sprintf-js@~1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
+
+sshpk@^1.7.0:
+  version "1.16.1"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
+  integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==
+  dependencies:
+    asn1 "~0.2.3"
+    assert-plus "^1.0.0"
+    bcrypt-pbkdf "^1.0.0"
+    dashdash "^1.12.0"
+    ecc-jsbn "~0.1.1"
+    getpass "^0.1.1"
+    jsbn "~0.1.0"
+    safer-buffer "^2.0.2"
+    tweetnacl "~0.14.0"
+
+stack-utils@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.2.tgz#5cf48b4557becb4638d0bc4f21d23f5d19586593"
+  integrity sha512-0H7QK2ECz3fyZMzQ8rH0j2ykpfbnd20BFtfg/SqVC2+sCTtcw0aDTGB7dk+de4U4uUeuz6nOtJcrkFFLG1B0Rg==
+  dependencies:
+    escape-string-regexp "^2.0.0"
+
+static-extend@^0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
+  integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
+  dependencies:
+    define-property "^0.2.5"
+    object-copy "^0.1.0"
+
+stealthy-require@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
+  integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=
+
+string-length@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.1.tgz#4a973bf31ef77c4edbceadd6af2611996985f8a1"
+  integrity sha512-PKyXUd0LK0ePjSOnWn34V2uD6acUWev9uy0Ft05k0E8xRW+SKcA0F7eMr7h5xlzfn+4O3N+55rduYyet3Jk+jw==
+  dependencies:
+    char-regex "^1.0.2"
+    strip-ansi "^6.0.0"
+
+string-width@^4.1.0, string-width@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5"
+  integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.0"
+
+string.prototype.trimend@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz#85812a6b847ac002270f5808146064c995fb6913"
+  integrity sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.5"
+
+string.prototype.trimstart@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz#14af6d9f34b053f7cfc89b72f8f2ee14b9039a54"
+  integrity sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.5"
+
+strip-ansi@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
+  integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
+  dependencies:
+    ansi-regex "^5.0.0"
+
+strip-bom@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878"
+  integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==
+
+strip-eof@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
+  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
+
+strip-final-newline@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
+  integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
+
+supports-color@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-1.2.0.tgz#ff1ed1e61169d06b3cf2d588e188b18d8847e17e"
+  integrity sha1-/x7R5hFp0Gs88tWI4YixjYhH4X4=
+
+supports-color@3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.1.2.tgz#72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"
+  integrity sha1-cqJiiU2dQIuVbKBf83su2KbiotU=
+  dependencies:
+    has-flag "^1.0.0"
+
+supports-color@^5.3.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
+  dependencies:
+    has-flag "^3.0.0"
+
+supports-color@^7.0.0, supports-color@^7.1.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
+  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
+  dependencies:
+    has-flag "^4.0.0"
+
+supports-hyperlinks@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz#f663df252af5f37c5d49bbd7eeefa9e0b9e59e47"
+  integrity sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA==
+  dependencies:
+    has-flag "^4.0.0"
+    supports-color "^7.0.0"
+
+symbol-tree@^3.2.4:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
+  integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
+
+terminal-link@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994"
+  integrity sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==
+  dependencies:
+    ansi-escapes "^4.2.1"
+    supports-hyperlinks "^2.0.0"
+
+test-exclude@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e"
+  integrity sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==
+  dependencies:
+    "@istanbuljs/schema" "^0.1.2"
+    glob "^7.1.4"
+    minimatch "^3.0.4"
+
+throat@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b"
+  integrity sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==
+
+tmpl@1.0.x:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
+  integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=
+
+to-fast-properties@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
+  integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
+
+to-iso-string@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/to-iso-string/-/to-iso-string-0.0.2.tgz#4dc19e664dfccbe25bd8db508b00c6da158255d1"
+  integrity sha1-TcGeZk38y+Jb2NtQiwDG2hWCVdE=
+
+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"
+  integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
+  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"
+  integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
+  dependencies:
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+
+to-regex-range@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
+  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
+  dependencies:
+    is-number "^7.0.0"
+
+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"
+  integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
+  dependencies:
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    regex-not "^1.0.2"
+    safe-regex "^1.1.0"
+
+tough-cookie@^2.3.3, tough-cookie@~2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
+  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
+  dependencies:
+    psl "^1.1.28"
+    punycode "^2.1.1"
+
+tough-cookie@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.1.tgz#9df4f57e739c26930a018184887f4adb7dca73b2"
+  integrity sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==
+  dependencies:
+    ip-regex "^2.1.0"
+    psl "^1.1.28"
+    punycode "^2.1.1"
+
+tr46@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.0.2.tgz#03273586def1595ae08fedb38d7733cee91d2479"
+  integrity sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg==
+  dependencies:
+    punycode "^2.1.1"
+
+tslib@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.1.tgz#410eb0d113e5b6356490eec749603725b021b43e"
+  integrity sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ==
+
+tunnel-agent@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
+  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"
+  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
+
+type-check@~0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+  integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
+  dependencies:
+    prelude-ls "~1.1.2"
+
+type-detect@4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
+  integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
+
+type-fest@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1"
+  integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==
+
+type-fest@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b"
+  integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==
+
+type-fest@^0.8.1:
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
+  integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
+
+typedarray-to-buffer@^3.1.5:
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
+  integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==
+  dependencies:
+    is-typedarray "^1.0.0"
+
+typescript@4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.2.tgz#7ea7c88777c723c681e33bf7988be5d008d05ac2"
+  integrity sha512-e4ERvRV2wb+rRZ/IQeb3jm2VxBsirQLpQhdxplZ2MEzGvDkkMmPglecnNDfSUBivMjP93vRbngYYDQqQ/78bcQ==
+
+underscore@~1.8.3:
+  version "1.8.3"
+  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"
+  integrity sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=
+
+union-value@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
+  integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==
+  dependencies:
+    arr-union "^3.1.0"
+    get-value "^2.0.6"
+    is-extendable "^0.1.1"
+    set-value "^2.0.1"
+
+unset-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
+  integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
+  dependencies:
+    has-value "^0.3.1"
+    isobject "^3.0.0"
+
+uri-js@^4.2.2:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.0.tgz#aa714261de793e8a82347a7bcc9ce74e86f28602"
+  integrity sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==
+  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"
+  integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
+
+use@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
+  integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
+
+"util@>=0.10.3 <1":
+  version "0.12.3"
+  resolved "https://registry.yarnpkg.com/util/-/util-0.12.3.tgz#971bb0292d2cc0c892dab7c6a5d37c2bec707888"
+  integrity sha512-I8XkoQwE+fPQEhy9v012V+TSdH2kp9ts29i20TaaDUXsg7x/onePbhFJUExBfv/2ay1ZOp/Vsm3nDlmnFGSAog==
+  dependencies:
+    inherits "^2.0.3"
+    is-arguments "^1.0.4"
+    is-generator-function "^1.0.7"
+    is-typed-array "^1.1.3"
+    safe-buffer "^5.1.2"
+    which-typed-array "^1.1.2"
+
+uuid@^3.3.2:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
+  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
+
+uuid@^8.3.0:
+  version "8.3.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.0.tgz#ab738085ca22dc9a8c92725e459b1d507df5d6ea"
+  integrity sha512-fX6Z5o4m6XsXBdli9g7DtWgAx+osMsRRZFKma1mIUsLCz6vRvv+pz5VNbyu9UEDzpMWulZfvpgb/cmDXVulYFQ==
+
+v8-to-istanbul@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-5.0.1.tgz#0608f5b49a481458625edb058488607f25498ba5"
+  integrity sha512-mbDNjuDajqYe3TXFk5qxcQy8L1msXNE37WTlLoqqpBfRsimbNcrlhQlDPntmECEcUvdC+AQ8CyMMf6EUx1r74Q==
+  dependencies:
+    "@types/istanbul-lib-coverage" "^2.0.1"
+    convert-source-map "^1.6.0"
+    source-map "^0.7.3"
+
+validate-npm-package-license@^3.0.1:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
+  integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
+  dependencies:
+    spdx-correct "^3.0.0"
+    spdx-expression-parse "^3.0.0"
+
+verror@1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+  integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
+  dependencies:
+    assert-plus "^1.0.0"
+    core-util-is "1.0.2"
+    extsprintf "^1.2.0"
+
+w3c-hr-time@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd"
+  integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==
+  dependencies:
+    browser-process-hrtime "^1.0.0"
+
+w3c-xmlserializer@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz#3e7104a05b75146cc60f564380b7f683acf1020a"
+  integrity sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==
+  dependencies:
+    xml-name-validator "^3.0.0"
+
+walker@^1.0.7, walker@~1.0.5:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"
+  integrity sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=
+  dependencies:
+    makeerror "1.0.x"
+
+webidl-conversions@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff"
+  integrity sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==
+
+webidl-conversions@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514"
+  integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==
+
+whatwg-encoding@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0"
+  integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==
+  dependencies:
+    iconv-lite "0.4.24"
+
+whatwg-mimetype@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
+  integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
+
+whatwg-url@^8.0.0:
+  version "8.2.2"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.2.2.tgz#85e7f9795108b53d554cec640b2e8aee2a0d4bfd"
+  integrity sha512-PcVnO6NiewhkmzV0qn7A+UZ9Xx4maNTI+O+TShmfE4pqjoCMwUMjkvoNhNHPTvgR7QH9Xt3R13iHuWy2sToFxQ==
+  dependencies:
+    lodash.sortby "^4.7.0"
+    tr46 "^2.0.2"
+    webidl-conversions "^6.1.0"
+
+which-module@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
+  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
+
+which-typed-array@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.2.tgz#e5f98e56bda93e3dac196b01d47c1156679c00b2"
+  integrity sha512-KT6okrd1tE6JdZAy3o2VhMoYPh3+J6EMZLyrxBQsZflI1QCZIxMrIYLkosd8Twf+YfknVIHmYQPgJt238p8dnQ==
+  dependencies:
+    available-typed-arrays "^1.0.2"
+    es-abstract "^1.17.5"
+    foreach "^2.0.5"
+    function-bind "^1.1.1"
+    has-symbols "^1.0.1"
+    is-typed-array "^1.1.3"
+
+which@^1.2.9:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
+  dependencies:
+    isexe "^2.0.0"
+
+which@^2.0.1, which@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
+  dependencies:
+    isexe "^2.0.0"
+
+word-wrap@~1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
+  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
+
+wrap-ansi@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
+  integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
+
+write-file-atomic@^3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"
+  integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==
+  dependencies:
+    imurmurhash "^0.1.4"
+    is-typedarray "^1.0.0"
+    signal-exit "^3.0.2"
+    typedarray-to-buffer "^3.1.5"
+
+ws@^7.2.3:
+  version "7.3.1"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.3.1.tgz#d0547bf67f7ce4f12a72dfe31262c68d7dc551c8"
+  integrity sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==
+
+xml-name-validator@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
+  integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==
+
+xmlchars@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
+  integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
+
+y18n@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
+  integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
+
+yargs-parser@^18.1.2:
+  version "18.1.3"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
+  integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
+  dependencies:
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
+
+yargs@^15.3.1:
+  version "15.4.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
+  integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==
+  dependencies:
+    cliui "^6.0.0"
+    decamelize "^1.2.0"
+    find-up "^4.1.0"
+    get-caller-file "^2.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^2.0.0"
+    set-blocking "^2.0.0"
+    string-width "^4.2.0"
+    which-module "^2.0.0"
+    y18n "^4.0.0"
+    yargs-parser "^18.1.2"
diff --git a/scripts/build/zone-js-builder.js b/scripts/build/zone-js-builder.js
index 0883d83a45a72..2b88ba0b599d2 100644
--- a/scripts/build/zone-js-builder.js
+++ b/scripts/build/zone-js-builder.js
@@ -9,7 +9,8 @@
 'use strict';
 
 const {resolve} = require('path');
-const {chmod, cp, mkdir, rm, test} = require('shelljs');
+const {chmod, cp, mkdir, mv, rm, test} = require('shelljs');
+const zonePackageJson = require('../../packages/zone.js/package.json');
 const {baseDir, bazelBin, bazelCmd, exec, scriptPath} = require('./package-builder');
 
 
@@ -45,10 +46,22 @@ function buildZoneJsPackage(destPath) {
   const buildOutputDir = `${bazelBin}/packages/zone.js/npm_package`;
   const distTargetDir = `${absDestPath}/zone.js`;
 
-  console.info(`# Copy artifacts to ${distTargetDir}`);
+  // Also create an archive so we can test the package itself.
+  // Currently, the `npm_package.pack` rule does not work on Windows, so run `npm pack` directly.
+  exec(`npm pack ${buildOutputDir}`);
+
+  console.info(`# Copy npm_package artifacts to ${distTargetDir}`);
   rm('-rf', distTargetDir);
   cp('-R', buildOutputDir, distTargetDir);
   chmod('-R', 'u+w', distTargetDir);
 
+  // Copy `zone.js.tgz` to `destPath`, so we can test
+  // the archive generated by the `npm_package.pack` rule.
+  const distArchiveTargetDir = `${absDestPath}/archive`;
+  console.info(`# Copy npm_package archive file to ${distArchiveTargetDir}`);
+  rm('-rf', distArchiveTargetDir);
+  mkdir('-p', distArchiveTargetDir);
+  mv(`${baseDir}/zone.js-${zonePackageJson.version}.tgz`, `${distArchiveTargetDir}/zone.js.tgz`);
+
   console.info('');
 }
diff --git a/scripts/puppeteer-chrome-versions.js b/scripts/puppeteer-chrome-versions.js
index 9918ebc13f3df..c1a69f58d4c55 100644
--- a/scripts/puppeteer-chrome-versions.js
+++ b/scripts/puppeteer-chrome-versions.js
@@ -13,6 +13,7 @@
 // "chromium_revision": "722234" but this does not map easily to the Chrome version
 // so we use this mapping here instead.
 module.exports = {
+  '5.1.0': '84.0.4147.0',
   '3.3.0': '83.0.4103.0',
   '3.2.0': '83.0.4103.0',
   '3.1.0': '83.0.4103.0',
diff --git a/scripts/release/post-check b/scripts/release/post-check
index 7fdcf415e9cb9..226b98c1da46a 100755
--- a/scripts/release/post-check
+++ b/scripts/release/post-check
@@ -7,7 +7,7 @@
 mkdir tmp
 cd tmp
 npm init -y
-npm install typescript@~3.8.3 rxjs@^6.5.3 zone.js@~0.10.3 @bazel/typescript@^1.0.0 rollup@^1.20.0 rollup-plugin-commonjs@^9.0.0 rollup-plugin-node-resolve@^4.2.0 rollup-plugin-sourcemaps@0.4.0 @angular/{animations,bazel,common,compiler,compiler-cli,core,elements,forms,language-service,localize,platform-browser,platform-browser-dynamic,platform-server,platform-webworker,platform-webworker-dynamic,router,service-worker,upgrade} --save
+npm install typescript@~3.8.3 rxjs@^6.5.3 zone.js@~0.10.3 @bazel/typescript@^1.0.0 rollup@^1.20.0 rollup-plugin-commonjs@^9.0.0 rollup-plugin-node-resolve@^4.2.0 rollup-plugin-sourcemaps@0.4.0 @angular/{animations,bazel,common,compiler,compiler-cli,core,elements,forms,language-service,localize,platform-browser,platform-browser-dynamic,platform-server,router,service-worker,upgrade} --save
 cd ..
 rm -rf tmp
 
diff --git a/scripts/release/post-check-next b/scripts/release/post-check-next
index 42b830965f980..a0cde053e8de1 100755
--- a/scripts/release/post-check-next
+++ b/scripts/release/post-check-next
@@ -7,7 +7,7 @@
 mkdir tmp
 cd tmp
 npm init -y
-npm install typescript@~3.8.3 rxjs@^6.5.3 zone.js@~0.10.3 @bazel/typescript@^1.0.0 rollup@^1.20.0 rollup-plugin-commonjs@^9.0.0 rollup-plugin-node-resolve@^4.2.0 rollup-plugin-sourcemaps@0.4.0 @angular/{animations,bazel,common,compiler,compiler-cli,core,elements,forms,language-service,localize,platform-browser,platform-browser-dynamic,platform-server,platform-webworker,platform-webworker-dynamic,router,service-worker,upgrade}@next --save
+npm install typescript@~3.8.3 rxjs@^6.5.3 zone.js@~0.10.3 @bazel/typescript@^1.0.0 rollup@^1.20.0 rollup-plugin-commonjs@^9.0.0 rollup-plugin-node-resolve@^4.2.0 rollup-plugin-sourcemaps@0.4.0 @angular/{animations,bazel,common,compiler,compiler-cli,core,elements,forms,language-service,localize,platform-browser,platform-browser-dynamic,platform-server,router,service-worker,upgrade}@next --save
 cd ..
 rm -rf tmp
 
diff --git a/test-main.js b/test-main.js
index 4321c864421e3..7cc5f3323d2eb 100644
--- a/test-main.js
+++ b/test-main.js
@@ -66,8 +66,6 @@ System.config({
     '@angular/platform-browser-dynamic': {main: 'index.js', defaultExtension: 'js'},
     '@angular/platform-server/testing': {main: 'index.js', defaultExtension: 'js'},
     '@angular/platform-server': {main: 'index.js', defaultExtension: 'js'},
-    '@angular/platform-webworker': {main: 'index.js', defaultExtension: 'js'},
-    '@angular/platform-webworker-dynamic': {main: 'index.js', defaultExtension: 'js'},
     '@angular/private/testing': {main: 'index.js', defaultExtension: 'js'},
     '@angular/elements': {main: 'index.js', defaultExtension: 'js'},
     'rxjs/ajax': {main: 'index.js', defaultExtension: 'js'},
diff --git a/third_party/shims_for_IE.js b/third_party/shims_for_IE.js
index d3bb40baf46bd..7aa8a9fc4fe4d 100644
--- a/third_party/shims_for_IE.js
+++ b/third_party/shims_for_IE.js
@@ -89,1324 +89,6 @@ if (!Object.hasOwnProperty('name')) {
 global.URLPolyfill = URLPolyfill;
 })(typeof self != 'undefined' ? self : global);
 
-//classList (IE9)
-/*! @license please refer to http://unlicense.org/ */
-/*! @author Eli Grey */
-/*! @source https://github.com/eligrey/classList.js */
-;if("document" in self&&!("classList" in document.createElement("_"))){(function(j){"use strict";if(!("Element" in j)){return}var a="classList",f="prototype",m=j.Element[f],b=Object,k=String[f].trim||function(){return this.replace(/^\s+|\s+$/g,"")},c=Array[f].indexOf||function(q){var p=0,o=this.length;for(;p<o;p++){if(p in this&&this[p]===q){return p}}return -1},n=function(o,p){this.name=o;this.code=DOMException[o];this.message=p},g=function(p,o){if(o===""){throw new n("SYNTAX_ERR","An invalid or illegal string was specified")}if(/\s/.test(o)){throw new n("INVALID_CHARACTER_ERR","String contains an invalid character")}return c.call(p,o)},d=function(s){var r=k.call(s.getAttribute("class")||""),q=r?r.split(/\s+/):[],p=0,o=q.length;for(;p<o;p++){this.push(q[p])}this._updateClassName=function(){s.setAttribute("class",this.toString())}},e=d[f]=[],i=function(){return new d(this)};n[f]=Error[f];e.item=function(o){return this[o]||null};e.contains=function(o){o+="";return g(this,o)!==-1};e.add=function(){var s=arguments,r=0,p=s.length,q,o=false;do{q=s[r]+"";if(g(this,q)===-1){this.push(q);o=true}}while(++r<p);if(o){this._updateClassName()}};e.remove=function(){var t=arguments,s=0,p=t.length,r,o=false;do{r=t[s]+"";var q=g(this,r);if(q!==-1){this.splice(q,1);o=true}}while(++s<p);if(o){this._updateClassName()}};e.toggle=function(p,q){p+="";var o=this.contains(p),r=o?q!==true&&"remove":q!==false&&"add";if(r){this[r](p)}return !o};e.toString=function(){return this.join(" ")};if(b.defineProperty){var l={get:i,enumerable:true,configurable:true};try{b.defineProperty(m,a,l)}catch(h){if(h.number===-2146823252){l.enumerable=false;b.defineProperty(m,a,l)}}}else{if(b[f].__defineGetter__){m.__defineGetter__(a,i)}}}(self))};
-
-//console mock (IE9)
-if (!window.console) window.console = {};
-if (!window.console.log) window.console.log = function () { };
-if (!window.console.error) window.console.error = function () { };
-if (!window.console.warn) window.console.warn = function () { };
-if (!window.console.assert) window.console.assert = function () { };
-
-//Typed Array (IE9)
-/*! @source https://github.com/inexorabletash/polyfill/blob/master/typedarray.js */
-/*
- Copyright (c) 2010, Linden Research, Inc.
- Copyright (c) 2014, Joshua Bell
-
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
- $/LicenseInfo$
- */
-
-// Original can be found at:
-//   https://bitbucket.org/lindenlab/llsd
-// Modifications by Joshua Bell inexorabletash@gmail.com
-//   https://github.com/inexorabletash/polyfill
-
-// ES3/ES5 implementation of the Krhonos Typed Array Specification
-//   Ref: http://www.khronos.org/registry/typedarray/specs/latest/
-//   Date: 2011-02-01
-//
-// Variations:
-//  * Allows typed_array.get/set() as alias for subscripts (typed_array[])
-//  * Gradually migrating structure from Khronos spec to ES2015 spec
-//
-// Caveats:
-//  * Beyond 10000 or so entries, polyfilled array accessors (ta[0],
-//    etc) become memory-prohibitive, so array creation will fail. Set
-//    self.TYPED_ARRAY_POLYFILL_NO_ARRAY_ACCESSORS=true to disable
-//    creation of accessors. Your code will need to use the
-//    non-standard get()/set() instead, and will need to add those to
-//    native arrays for interop.
-(function(global) {
-  'use strict';
-  var undefined = (void 0); // Paranoia
-
-  // Beyond this value, index getters/setters (i.e. array[0], array[1]) are so slow to
-  // create, and consume so much memory, that the browser appears frozen.
-  var MAX_ARRAY_LENGTH = 1e5;
-
-  // Approximations of internal ECMAScript conversion functions
-  function Type(v) {
-    switch(typeof v) {
-      case 'undefined': return 'undefined';
-      case 'boolean': return 'boolean';
-      case 'number': return 'number';
-      case 'string': return 'string';
-      default: return v === null ? 'null' : 'object';
-    }
-  }
-
-  // Class returns internal [[Class]] property, used to avoid cross-frame instanceof issues:
-  function Class(v) { return Object.prototype.toString.call(v).replace(/^\[object *|\]$/g, ''); }
-  function IsCallable(o) { return typeof o === 'function'; }
-  function ToObject(v) {
-    if (v === null || v === undefined) throw TypeError();
-    return Object(v);
-  }
-  function ToInt32(v) { return v >> 0; }
-  function ToUint32(v) { return v >>> 0; }
-
-  // Snapshot intrinsics
-  var LN2 = Math.LN2,
-    abs = Math.abs,
-    floor = Math.floor,
-    log = Math.log,
-    max = Math.max,
-    min = Math.min,
-    pow = Math.pow,
-    round = Math.round;
-
-  // emulate ES5 getter/setter API using legacy APIs
-  // http://blogs.msdn.com/b/ie/archive/2010/09/07/transitioning-existing-code-to-the-es5-getter-setter-apis.aspx
-  // (second clause tests for Object.defineProperty() in IE<9 that only supports extending DOM prototypes, but
-  // note that IE<9 does not support __defineGetter__ or __defineSetter__ so it just renders the method harmless)
-
-  (function() {
-    var orig = Object.defineProperty;
-    var dom_only = !(function(){try{return Object.defineProperty({},'x',{});}catch(_){return false;}}());
-
-    if (!orig || dom_only) {
-      Object.defineProperty = function (o, prop, desc) {
-        // In IE8 try built-in implementation for defining properties on DOM prototypes.
-        if (orig)
-          try { return orig(o, prop, desc); } catch (_) {}
-        if (o !== Object(o))
-          throw TypeError('Object.defineProperty called on non-object');
-        if (Object.prototype.__defineGetter__ && ('get' in desc))
-          Object.prototype.__defineGetter__.call(o, prop, desc.get);
-        if (Object.prototype.__defineSetter__ && ('set' in desc))
-          Object.prototype.__defineSetter__.call(o, prop, desc.set);
-        if ('value' in desc)
-          o[prop] = desc.value;
-        return o;
-      };
-    }
-  }());
-
-  // ES5: Make obj[index] an alias for obj._getter(index)/obj._setter(index, value)
-  // for index in 0 ... obj.length
-  function makeArrayAccessors(obj) {
-    if ('TYPED_ARRAY_POLYFILL_NO_ARRAY_ACCESSORS' in global)
-      return;
-
-    if (obj.length > MAX_ARRAY_LENGTH) throw RangeError('Array too large for polyfill');
-
-    function makeArrayAccessor(index) {
-      Object.defineProperty(obj, index, {
-        'get': function() { return obj._getter(index); },
-        'set': function(v) { obj._setter(index, v); },
-        enumerable: true,
-        configurable: false
-      });
-    }
-
-    var i;
-    for (i = 0; i < obj.length; i += 1) {
-      makeArrayAccessor(i);
-    }
-  }
-
-  // Internal conversion functions:
-  //    pack<Type>()   - take a number (interpreted as Type), output a byte array
-  //    unpack<Type>() - take a byte array, output a Type-like number
-
-  function as_signed(value, bits) { var s = 32 - bits; return (value << s) >> s; }
-  function as_unsigned(value, bits) { var s = 32 - bits; return (value << s) >>> s; }
-
-  function packI8(n) { return [n & 0xff]; }
-  function unpackI8(bytes) { return as_signed(bytes[0], 8); }
-
-  function packU8(n) { return [n & 0xff]; }
-  function unpackU8(bytes) { return as_unsigned(bytes[0], 8); }
-
-  function packU8Clamped(n) { n = round(Number(n)); return [n < 0 ? 0 : n > 0xff ? 0xff : n & 0xff]; }
-
-  function packI16(n) { return [n & 0xff, (n >> 8) & 0xff]; }
-  function unpackI16(bytes) { return as_signed(bytes[1] << 8 | bytes[0], 16); }
-
-  function packU16(n) { return [n & 0xff, (n >> 8) & 0xff]; }
-  function unpackU16(bytes) { return as_unsigned(bytes[1] << 8 | bytes[0], 16); }
-
-  function packI32(n) { return [n & 0xff, (n >> 8) & 0xff, (n >> 16) & 0xff, (n >> 24) & 0xff]; }
-  function unpackI32(bytes) { return as_signed(bytes[3] << 24 | bytes[2] << 16 | bytes[1] << 8 | bytes[0], 32); }
-
-  function packU32(n) { return [n & 0xff, (n >> 8) & 0xff, (n >> 16) & 0xff, (n >> 24) & 0xff]; }
-  function unpackU32(bytes) { return as_unsigned(bytes[3] << 24 | bytes[2] << 16 | bytes[1] << 8 | bytes[0], 32); }
-
-  function packIEEE754(v, ebits, fbits) {
-
-    var bias = (1 << (ebits - 1)) - 1;
-
-    function roundToEven(n) {
-      var w = floor(n), f = n - w;
-      if (f < 0.5)
-        return w;
-      if (f > 0.5)
-        return w + 1;
-      return w % 2 ? w + 1 : w;
-    }
-
-    // Compute sign, exponent, fraction
-    var s, e, f;
-    if (v !== v) {
-      // NaN
-      // http://dev.w3.org/2006/webapi/WebIDL/#es-type-mapping
-      e = (1 << ebits) - 1; f = pow(2, fbits - 1); s = 0;
-    } else if (v === Infinity || v === -Infinity) {
-      e = (1 << ebits) - 1; f = 0; s = (v < 0) ? 1 : 0;
-    } else if (v === 0) {
-      e = 0; f = 0; s = (1 / v === -Infinity) ? 1 : 0;
-    } else {
-      s = v < 0;
-      v = abs(v);
-
-      if (v >= pow(2, 1 - bias)) {
-        // Normalized
-        e = min(floor(log(v) / LN2), 1023);
-        var significand = v / pow(2, e);
-        if (significand < 1) {
-          e -= 1;
-          significand *= 2;
-        }
-        if (significand >= 2) {
-          e += 1;
-          significand /= 2;
-        }
-        var d = pow(2, fbits);
-        f = roundToEven(significand * d) - d;
-        e += bias;
-        if (f / d >= 1) {
-          e += 1;
-          f = 0;
-        }
-        if (e > 2 * bias) {
-          // Overflow
-          e = (1 << ebits) - 1;
-          f = 0;
-        }
-      } else {
-        // Denormalized
-        e = 0;
-        f = roundToEven(v / pow(2, 1 - bias - fbits));
-      }
-    }
-
-    // Pack sign, exponent, fraction
-    var bits = [], i;
-    for (i = fbits; i; i -= 1) { bits.push(f % 2 ? 1 : 0); f = floor(f / 2); }
-    for (i = ebits; i; i -= 1) { bits.push(e % 2 ? 1 : 0); e = floor(e / 2); }
-    bits.push(s ? 1 : 0);
-    bits.reverse();
-    var str = bits.join('');
-
-    // Bits to bytes
-    var bytes = [];
-    while (str.length) {
-      bytes.unshift(parseInt(str.substring(0, 8), 2));
-      str = str.substring(8);
-    }
-    return bytes;
-  }
-
-  function unpackIEEE754(bytes, ebits, fbits) {
-    // Bytes to bits
-    var bits = [], i, j, b, str,
-      bias, s, e, f;
-
-    for (i = 0; i < bytes.length; ++i) {
-      b = bytes[i];
-      for (j = 8; j; j -= 1) {
-        bits.push(b % 2 ? 1 : 0); b = b >> 1;
-      }
-    }
-    bits.reverse();
-    str = bits.join('');
-
-    // Unpack sign, exponent, fraction
-    bias = (1 << (ebits - 1)) - 1;
-    s = parseInt(str.substring(0, 1), 2) ? -1 : 1;
-    e = parseInt(str.substring(1, 1 + ebits), 2);
-    f = parseInt(str.substring(1 + ebits), 2);
-
-    // Produce number
-    if (e === (1 << ebits) - 1) {
-      return f !== 0 ? NaN : s * Infinity;
-    } else if (e > 0) {
-      // Normalized
-      return s * pow(2, e - bias) * (1 + f / pow(2, fbits));
-    } else if (f !== 0) {
-      // Denormalized
-      return s * pow(2, -(bias - 1)) * (f / pow(2, fbits));
-    } else {
-      return s < 0 ? -0 : 0;
-    }
-  }
-
-  function unpackF64(b) { return unpackIEEE754(b, 11, 52); }
-  function packF64(v) { return packIEEE754(v, 11, 52); }
-  function unpackF32(b) { return unpackIEEE754(b, 8, 23); }
-  function packF32(v) { return packIEEE754(v, 8, 23); }
-
-  //
-  // 3 The ArrayBuffer Type
-  //
-
-  (function() {
-
-    function ArrayBuffer(length) {
-      length = ToInt32(length);
-      if (length < 0) throw RangeError('ArrayBuffer size is not a small enough positive integer.');
-      Object.defineProperty(this, 'byteLength', {value: length});
-      Object.defineProperty(this, '_bytes', {value: Array(length)});
-
-      for (var i = 0; i < length; i += 1)
-        this._bytes[i] = 0;
-    }
-
-    global.ArrayBuffer = global.ArrayBuffer || ArrayBuffer;
-
-    //
-    // 5 The Typed Array View Types
-    //
-
-    function $TypedArray$() {
-
-      // %TypedArray% ( length )
-      if (!arguments.length || typeof arguments[0] !== 'object') {
-        return (function(length) {
-          length = ToInt32(length);
-          if (length < 0) throw RangeError('length is not a small enough positive integer.');
-          Object.defineProperty(this, 'length', {value: length});
-          Object.defineProperty(this, 'byteLength', {value: length * this.BYTES_PER_ELEMENT});
-          Object.defineProperty(this, 'buffer', {value: new ArrayBuffer(this.byteLength)});
-          Object.defineProperty(this, 'byteOffset', {value: 0});
-
-        }).apply(this, arguments);
-      }
-
-      // %TypedArray% ( typedArray )
-      if (arguments.length >= 1 &&
-        Type(arguments[0]) === 'object' &&
-        arguments[0] instanceof $TypedArray$) {
-        return (function(typedArray){
-          if (this.constructor !== typedArray.constructor) throw TypeError();
-
-          var byteLength = typedArray.length * this.BYTES_PER_ELEMENT;
-          Object.defineProperty(this, 'buffer', {value: new ArrayBuffer(byteLength)});
-          Object.defineProperty(this, 'byteLength', {value: byteLength});
-          Object.defineProperty(this, 'byteOffset', {value: 0});
-          Object.defineProperty(this, 'length', {value: typedArray.length});
-
-          for (var i = 0; i < this.length; i += 1)
-            this._setter(i, typedArray._getter(i));
-
-        }).apply(this, arguments);
-      }
-
-      // %TypedArray% ( array )
-      if (arguments.length >= 1 &&
-        Type(arguments[0]) === 'object' &&
-        !(arguments[0] instanceof $TypedArray$) &&
-        !(arguments[0] instanceof ArrayBuffer || Class(arguments[0]) === 'ArrayBuffer')) {
-        return (function(array) {
-
-          var byteLength = array.length * this.BYTES_PER_ELEMENT;
-          Object.defineProperty(this, 'buffer', {value: new ArrayBuffer(byteLength)});
-          Object.defineProperty(this, 'byteLength', {value: byteLength});
-          Object.defineProperty(this, 'byteOffset', {value: 0});
-          Object.defineProperty(this, 'length', {value: array.length});
-
-          for (var i = 0; i < this.length; i += 1) {
-            var s = array[i];
-            this._setter(i, Number(s));
-          }
-        }).apply(this, arguments);
-      }
-
-      // %TypedArray% ( buffer, byteOffset=0, length=undefined )
-      if (arguments.length >= 1 &&
-        Type(arguments[0]) === 'object' &&
-        (arguments[0] instanceof ArrayBuffer || Class(arguments[0]) === 'ArrayBuffer')) {
-        return (function(buffer, byteOffset, length) {
-
-          byteOffset = ToUint32(byteOffset);
-          if (byteOffset > buffer.byteLength)
-            throw RangeError('byteOffset out of range');
-
-          // The given byteOffset must be a multiple of the element
-          // size of the specific type, otherwise an exception is raised.
-          if (byteOffset % this.BYTES_PER_ELEMENT)
-            throw RangeError('buffer length minus the byteOffset is not a multiple of the element size.');
-
-          if (length === undefined) {
-            var byteLength = buffer.byteLength - byteOffset;
-            if (byteLength % this.BYTES_PER_ELEMENT)
-              throw RangeError('length of buffer minus byteOffset not a multiple of the element size');
-            length = byteLength / this.BYTES_PER_ELEMENT;
-
-          } else {
-            length = ToUint32(length);
-            byteLength = length * this.BYTES_PER_ELEMENT;
-          }
-
-          if ((byteOffset + byteLength) > buffer.byteLength)
-            throw RangeError('byteOffset and length reference an area beyond the end of the buffer');
-
-          Object.defineProperty(this, 'buffer', {value: buffer});
-          Object.defineProperty(this, 'byteLength', {value: byteLength});
-          Object.defineProperty(this, 'byteOffset', {value: byteOffset});
-          Object.defineProperty(this, 'length', {value: length});
-
-        }).apply(this, arguments);
-      }
-
-      // %TypedArray% ( all other argument combinations )
-      throw TypeError();
-    }
-
-    // Properties of the %TypedArray Instrinsic Object
-
-    // %TypedArray%.from ( source , mapfn=undefined, thisArg=undefined )
-    Object.defineProperty($TypedArray$, 'from', {value: function(iterable) {
-      return new this(iterable);
-    }});
-
-    // %TypedArray%.of ( ...items )
-    Object.defineProperty($TypedArray$, 'of', {value: function(/*...items*/) {
-      return new this(arguments);
-    }});
-
-    // %TypedArray%.prototype
-    var $TypedArrayPrototype$ = {};
-    $TypedArray$.prototype = $TypedArrayPrototype$;
-
-    // WebIDL: getter type (unsigned long index);
-    Object.defineProperty($TypedArray$.prototype, '_getter', {value: function(index) {
-      if (arguments.length < 1) throw SyntaxError('Not enough arguments');
-
-      index = ToUint32(index);
-      if (index >= this.length)
-        return undefined;
-
-      var bytes = [], i, o;
-      for (i = 0, o = this.byteOffset + index * this.BYTES_PER_ELEMENT;
-           i < this.BYTES_PER_ELEMENT;
-           i += 1, o += 1) {
-        bytes.push(this.buffer._bytes[o]);
-      }
-      return this._unpack(bytes);
-    }});
-
-    // NONSTANDARD: convenience alias for getter: type get(unsigned long index);
-    Object.defineProperty($TypedArray$.prototype, 'get', {value: $TypedArray$.prototype._getter});
-
-    // WebIDL: setter void (unsigned long index, type value);
-    Object.defineProperty($TypedArray$.prototype, '_setter', {value: function(index, value) {
-      if (arguments.length < 2) throw SyntaxError('Not enough arguments');
-
-      index = ToUint32(index);
-      if (index >= this.length)
-        return;
-
-      var bytes = this._pack(value), i, o;
-      for (i = 0, o = this.byteOffset + index * this.BYTES_PER_ELEMENT;
-           i < this.BYTES_PER_ELEMENT;
-           i += 1, o += 1) {
-        this.buffer._bytes[o] = bytes[i];
-      }
-    }});
-
-    // get %TypedArray%.prototype.buffer
-    // get %TypedArray%.prototype.byteLength
-    // get %TypedArray%.prototype.byteOffset
-    // -- applied directly to the object in the constructor
-
-    // %TypedArray%.prototype.constructor
-    Object.defineProperty($TypedArray$.prototype, 'constructor', {value: $TypedArray$});
-
-    // %TypedArray%.prototype.copyWithin (target, start, end = this.length )
-    Object.defineProperty($TypedArray$.prototype, 'copyWithin', {value: function(target, start) {
-      var end = arguments[2];
-
-      var o = ToObject(this);
-      var lenVal = o.length;
-      var len = ToUint32(lenVal);
-      len = max(len, 0);
-      var relativeTarget = ToInt32(target);
-      var to;
-      if (relativeTarget < 0)
-        to = max(len + relativeTarget, 0);
-      else
-        to = min(relativeTarget, len);
-      var relativeStart = ToInt32(start);
-      var from;
-      if (relativeStart < 0)
-        from = max(len + relativeStart, 0);
-      else
-        from = min(relativeStart, len);
-      var relativeEnd;
-      if (end === undefined)
-        relativeEnd = len;
-      else
-        relativeEnd = ToInt32(end);
-      var final;
-      if (relativeEnd < 0)
-        final = max(len + relativeEnd, 0);
-      else
-        final = min(relativeEnd, len);
-      var count = min(final - from, len - to);
-      var direction;
-      if (from < to && to < from + count) {
-        direction = -1;
-        from = from + count - 1;
-        to = to + count - 1;
-      } else {
-        direction = 1;
-      }
-      while (count > 0) {
-        o._setter(to, o._getter(from));
-        from = from + direction;
-        to = to + direction;
-        count = count - 1;
-      }
-      return o;
-    }});
-
-    // %TypedArray%.prototype.entries ( )
-    // -- defined in es6.js to shim browsers w/ native TypedArrays
-
-    // %TypedArray%.prototype.every ( callbackfn, thisArg = undefined )
-    Object.defineProperty($TypedArray$.prototype, 'every', {value: function(callbackfn) {
-      if (this === undefined || this === null) throw TypeError();
-      var t = Object(this);
-      var len = ToUint32(t.length);
-      if (!IsCallable(callbackfn)) throw TypeError();
-      var thisArg = arguments[1];
-      for (var i = 0; i < len; i++) {
-        if (!callbackfn.call(thisArg, t._getter(i), i, t))
-          return false;
-      }
-      return true;
-    }});
-
-    // %TypedArray%.prototype.fill (value, start = 0, end = this.length )
-    Object.defineProperty($TypedArray$.prototype, 'fill', {value: function(value) {
-      var start = arguments[1],
-        end = arguments[2];
-
-      var o = ToObject(this);
-      var lenVal = o.length;
-      var len = ToUint32(lenVal);
-      len = max(len, 0);
-      var relativeStart = ToInt32(start);
-      var k;
-      if (relativeStart < 0)
-        k = max((len + relativeStart), 0);
-      else
-        k = min(relativeStart, len);
-      var relativeEnd;
-      if (end === undefined)
-        relativeEnd = len;
-      else
-        relativeEnd = ToInt32(end);
-      var final;
-      if (relativeEnd < 0)
-        final = max((len + relativeEnd), 0);
-      else
-        final = min(relativeEnd, len);
-      while (k < final) {
-        o._setter(k, value);
-        k += 1;
-      }
-      return o;
-    }});
-
-    // %TypedArray%.prototype.filter ( callbackfn, thisArg = undefined )
-    Object.defineProperty($TypedArray$.prototype, 'filter', {value: function(callbackfn) {
-      if (this === undefined || this === null) throw TypeError();
-      var t = Object(this);
-      var len = ToUint32(t.length);
-      if (!IsCallable(callbackfn)) throw TypeError();
-      var res = [];
-      var thisp = arguments[1];
-      for (var i = 0; i < len; i++) {
-        var val = t._getter(i); // in case fun mutates this
-        if (callbackfn.call(thisp, val, i, t))
-          res.push(val);
-      }
-      return new this.constructor(res);
-    }});
-
-    // %TypedArray%.prototype.find (predicate, thisArg = undefined)
-    Object.defineProperty($TypedArray$.prototype, 'find', {value: function(predicate) {
-      var o = ToObject(this);
-      var lenValue = o.length;
-      var len = ToUint32(lenValue);
-      if (!IsCallable(predicate)) throw TypeError();
-      var t = arguments.length > 1 ? arguments[1] : undefined;
-      var k = 0;
-      while (k < len) {
-        var kValue = o._getter(k);
-        var testResult = predicate.call(t, kValue, k, o);
-        if (Boolean(testResult))
-          return kValue;
-        ++k;
-      }
-      return undefined;
-    }});
-
-    // %TypedArray%.prototype.findIndex ( predicate, thisArg = undefined )
-    Object.defineProperty($TypedArray$.prototype, 'findIndex', {value: function(predicate) {
-      var o = ToObject(this);
-      var lenValue = o.length;
-      var len = ToUint32(lenValue);
-      if (!IsCallable(predicate)) throw TypeError();
-      var t = arguments.length > 1 ? arguments[1] : undefined;
-      var k = 0;
-      while (k < len) {
-        var kValue = o._getter(k);
-        var testResult = predicate.call(t, kValue, k, o);
-        if (Boolean(testResult))
-          return k;
-        ++k;
-      }
-      return -1;
-    }});
-
-    // %TypedArray%.prototype.forEach ( callbackfn, thisArg = undefined )
-    Object.defineProperty($TypedArray$.prototype, 'forEach', {value: function(callbackfn) {
-      if (this === undefined || this === null) throw TypeError();
-      var t = Object(this);
-      var len = ToUint32(t.length);
-      if (!IsCallable(callbackfn)) throw TypeError();
-      var thisp = arguments[1];
-      for (var i = 0; i < len; i++)
-        callbackfn.call(thisp, t._getter(i), i, t);
-    }});
-
-    // %TypedArray%.prototype.indexOf (searchElement, fromIndex = 0 )
-    Object.defineProperty($TypedArray$.prototype, 'indexOf', {value: function(searchElement) {
-      if (this === undefined || this === null) throw TypeError();
-      var t = Object(this);
-      var len = ToUint32(t.length);
-      if (len === 0) return -1;
-      var n = 0;
-      if (arguments.length > 0) {
-        n = Number(arguments[1]);
-        if (n !== n) {
-          n = 0;
-        } else if (n !== 0 && n !== (1 / 0) && n !== -(1 / 0)) {
-          n = (n > 0 || -1) * floor(abs(n));
-        }
-      }
-      if (n >= len) return -1;
-      var k = n >= 0 ? n : max(len - abs(n), 0);
-      for (; k < len; k++) {
-        if (t._getter(k) === searchElement) {
-          return k;
-        }
-      }
-      return -1;
-    }});
-
-    // %TypedArray%.prototype.join ( separator )
-    Object.defineProperty($TypedArray$.prototype, 'join', {value: function(separator) {
-      if (this === undefined || this === null) throw TypeError();
-      var t = Object(this);
-      var len = ToUint32(t.length);
-      var tmp = Array(len);
-      for (var i = 0; i < len; ++i)
-        tmp[i] = t._getter(i);
-      return tmp.join(separator === undefined ? ',' : separator); // Hack for IE7
-    }});
-
-    // %TypedArray%.prototype.keys ( )
-    // -- defined in es6.js to shim browsers w/ native TypedArrays
-
-    // %TypedArray%.prototype.lastIndexOf ( searchElement, fromIndex = this.length-1 )
-    Object.defineProperty($TypedArray$.prototype, 'lastIndexOf', {value: function(searchElement) {
-      if (this === undefined || this === null) throw TypeError();
-      var t = Object(this);
-      var len = ToUint32(t.length);
-      if (len === 0) return -1;
-      var n = len;
-      if (arguments.length > 1) {
-        n = Number(arguments[1]);
-        if (n !== n) {
-          n = 0;
-        } else if (n !== 0 && n !== (1 / 0) && n !== -(1 / 0)) {
-          n = (n > 0 || -1) * floor(abs(n));
-        }
-      }
-      var k = n >= 0 ? min(n, len - 1) : len - abs(n);
-      for (; k >= 0; k--) {
-        if (t._getter(k) === searchElement)
-          return k;
-      }
-      return -1;
-    }});
-
-    // get %TypedArray%.prototype.length
-    // -- applied directly to the object in the constructor
-
-    // %TypedArray%.prototype.map ( callbackfn, thisArg = undefined )
-    Object.defineProperty($TypedArray$.prototype, 'map', {value: function(callbackfn) {
-      if (this === undefined || this === null) throw TypeError();
-      var t = Object(this);
-      var len = ToUint32(t.length);
-      if (!IsCallable(callbackfn)) throw TypeError();
-      var res = []; res.length = len;
-      var thisp = arguments[1];
-      for (var i = 0; i < len; i++)
-        res[i] = callbackfn.call(thisp, t._getter(i), i, t);
-      return new this.constructor(res);
-    }});
-
-    // %TypedArray%.prototype.reduce ( callbackfn [, initialValue] )
-    Object.defineProperty($TypedArray$.prototype, 'reduce', {value: function(callbackfn) {
-      if (this === undefined || this === null) throw TypeError();
-      var t = Object(this);
-      var len = ToUint32(t.length);
-      if (!IsCallable(callbackfn)) throw TypeError();
-      // no value to return if no initial value and an empty array
-      if (len === 0 && arguments.length === 1) throw TypeError();
-      var k = 0;
-      var accumulator;
-      if (arguments.length >= 2) {
-        accumulator = arguments[1];
-      } else {
-        accumulator = t._getter(k++);
-      }
-      while (k < len) {
-        accumulator = callbackfn.call(undefined, accumulator, t._getter(k), k, t);
-        k++;
-      }
-      return accumulator;
-    }});
-
-    // %TypedArray%.prototype.reduceRight ( callbackfn [, initialValue] )
-    Object.defineProperty($TypedArray$.prototype, 'reduceRight', {value: function(callbackfn) {
-      if (this === undefined || this === null) throw TypeError();
-      var t = Object(this);
-      var len = ToUint32(t.length);
-      if (!IsCallable(callbackfn)) throw TypeError();
-      // no value to return if no initial value, empty array
-      if (len === 0 && arguments.length === 1) throw TypeError();
-      var k = len - 1;
-      var accumulator;
-      if (arguments.length >= 2) {
-        accumulator = arguments[1];
-      } else {
-        accumulator = t._getter(k--);
-      }
-      while (k >= 0) {
-        accumulator = callbackfn.call(undefined, accumulator, t._getter(k), k, t);
-        k--;
-      }
-      return accumulator;
-    }});
-
-    // %TypedArray%.prototype.reverse ( )
-    Object.defineProperty($TypedArray$.prototype, 'reverse', {value: function() {
-      if (this === undefined || this === null) throw TypeError();
-      var t = Object(this);
-      var len = ToUint32(t.length);
-      var half = floor(len / 2);
-      for (var i = 0, j = len - 1; i < half; ++i, --j) {
-        var tmp = t._getter(i);
-        t._setter(i, t._getter(j));
-        t._setter(j, tmp);
-      }
-      return t;
-    }});
-
-    // %TypedArray%.prototype.set(array, offset = 0 )
-    // %TypedArray%.prototype.set(typedArray, offset = 0 )
-    // WebIDL: void set(TypedArray array, optional unsigned long offset);
-    // WebIDL: void set(sequence<type> array, optional unsigned long offset);
-    Object.defineProperty($TypedArray$.prototype, 'set', {value: function(index, value) {
-      if (arguments.length < 1) throw SyntaxError('Not enough arguments');
-      var array, sequence, offset, len,
-        i, s, d,
-        byteOffset, byteLength, tmp;
-
-      if (typeof arguments[0] === 'object' && arguments[0].constructor === this.constructor) {
-        // void set(TypedArray array, optional unsigned long offset);
-        array = arguments[0];
-        offset = ToUint32(arguments[1]);
-
-        if (offset + array.length > this.length) {
-          throw RangeError('Offset plus length of array is out of range');
-        }
-
-        byteOffset = this.byteOffset + offset * this.BYTES_PER_ELEMENT;
-        byteLength = array.length * this.BYTES_PER_ELEMENT;
-
-        if (array.buffer === this.buffer) {
-          tmp = [];
-          for (i = 0, s = array.byteOffset; i < byteLength; i += 1, s += 1) {
-            tmp[i] = array.buffer._bytes[s];
-          }
-          for (i = 0, d = byteOffset; i < byteLength; i += 1, d += 1) {
-            this.buffer._bytes[d] = tmp[i];
-          }
-        } else {
-          for (i = 0, s = array.byteOffset, d = byteOffset;
-               i < byteLength; i += 1, s += 1, d += 1) {
-            this.buffer._bytes[d] = array.buffer._bytes[s];
-          }
-        }
-      } else if (typeof arguments[0] === 'object' && typeof arguments[0].length !== 'undefined') {
-        // void set(sequence<type> array, optional unsigned long offset);
-        sequence = arguments[0];
-        len = ToUint32(sequence.length);
-        offset = ToUint32(arguments[1]);
-
-        if (offset + len > this.length) {
-          throw RangeError('Offset plus length of array is out of range');
-        }
-
-        for (i = 0; i < len; i += 1) {
-          s = sequence[i];
-          this._setter(offset + i, Number(s));
-        }
-      } else {
-        throw TypeError('Unexpected argument type(s)');
-      }
-    }});
-
-    // %TypedArray%.prototype.slice ( start, end )
-    Object.defineProperty($TypedArray$.prototype, 'slice', {value: function(start, end) {
-      var o = ToObject(this);
-      var lenVal = o.length;
-      var len = ToUint32(lenVal);
-      var relativeStart = ToInt32(start);
-      var k = (relativeStart < 0) ? max(len + relativeStart, 0) : min(relativeStart, len);
-      var relativeEnd = (end === undefined) ? len : ToInt32(end);
-      var final = (relativeEnd < 0) ? max(len + relativeEnd, 0) : min(relativeEnd, len);
-      var count = final - k;
-      var c = o.constructor;
-      var a = new c(count);
-      var n = 0;
-      while (k < final) {
-        var kValue = o._getter(k);
-        a._setter(n, kValue);
-        ++k;
-        ++n;
-      }
-      return a;
-    }});
-
-    // %TypedArray%.prototype.some ( callbackfn, thisArg = undefined )
-    Object.defineProperty($TypedArray$.prototype, 'some', {value: function(callbackfn) {
-      if (this === undefined || this === null) throw TypeError();
-      var t = Object(this);
-      var len = ToUint32(t.length);
-      if (!IsCallable(callbackfn)) throw TypeError();
-      var thisp = arguments[1];
-      for (var i = 0; i < len; i++) {
-        if (callbackfn.call(thisp, t._getter(i), i, t)) {
-          return true;
-        }
-      }
-      return false;
-    }});
-
-    // %TypedArray%.prototype.sort ( comparefn )
-    Object.defineProperty($TypedArray$.prototype, 'sort', {value: function(comparefn) {
-      if (this === undefined || this === null) throw TypeError();
-      var t = Object(this);
-      var len = ToUint32(t.length);
-      var tmp = Array(len);
-      for (var i = 0; i < len; ++i)
-        tmp[i] = t._getter(i);
-      if (comparefn) tmp.sort(comparefn); else tmp.sort(); // Hack for IE8/9
-      for (i = 0; i < len; ++i)
-        t._setter(i, tmp[i]);
-      return t;
-    }});
-
-    // %TypedArray%.prototype.subarray(begin = 0, end = this.length )
-    // WebIDL: TypedArray subarray(long begin, optional long end);
-    Object.defineProperty($TypedArray$.prototype, 'subarray', {value: function(start, end) {
-      function clamp(v, min, max) { return v < min ? min : v > max ? max : v; }
-
-      start = ToInt32(start);
-      end = ToInt32(end);
-
-      if (arguments.length < 1) { start = 0; }
-      if (arguments.length < 2) { end = this.length; }
-
-      if (start < 0) { start = this.length + start; }
-      if (end < 0) { end = this.length + end; }
-
-      start = clamp(start, 0, this.length);
-      end = clamp(end, 0, this.length);
-
-      var len = end - start;
-      if (len < 0) {
-        len = 0;
-      }
-
-      return new this.constructor(
-        this.buffer, this.byteOffset + start * this.BYTES_PER_ELEMENT, len);
-    }});
-
-    // %TypedArray%.prototype.toLocaleString ( )
-    // %TypedArray%.prototype.toString ( )
-    // %TypedArray%.prototype.values ( )
-    // %TypedArray%.prototype [ @@iterator ] ( )
-    // get %TypedArray%.prototype [ @@toStringTag ]
-    // -- defined in es6.js to shim browsers w/ native TypedArrays
-
-    function makeTypedArray(elementSize, pack, unpack) {
-      // Each TypedArray type requires a distinct constructor instance with
-      // identical logic, which this produces.
-      var TypedArray = function() {
-        Object.defineProperty(this, 'constructor', {value: TypedArray});
-        $TypedArray$.apply(this, arguments);
-        makeArrayAccessors(this);
-      };
-      if ('__proto__' in TypedArray) {
-        TypedArray.__proto__ = $TypedArray$;
-      } else {
-        TypedArray.from = $TypedArray$.from;
-        TypedArray.of = $TypedArray$.of;
-      }
-
-      TypedArray.BYTES_PER_ELEMENT = elementSize;
-
-      var TypedArrayPrototype = function() {};
-      TypedArrayPrototype.prototype = $TypedArrayPrototype$;
-
-      TypedArray.prototype = new TypedArrayPrototype();
-
-      Object.defineProperty(TypedArray.prototype, 'BYTES_PER_ELEMENT', {value: elementSize});
-      Object.defineProperty(TypedArray.prototype, '_pack', {value: pack});
-      Object.defineProperty(TypedArray.prototype, '_unpack', {value: unpack});
-
-      return TypedArray;
-    }
-
-    var Int8Array = makeTypedArray(1, packI8, unpackI8);
-    var Uint8Array = makeTypedArray(1, packU8, unpackU8);
-    var Uint8ClampedArray = makeTypedArray(1, packU8Clamped, unpackU8);
-    var Int16Array = makeTypedArray(2, packI16, unpackI16);
-    var Uint16Array = makeTypedArray(2, packU16, unpackU16);
-    var Int32Array = makeTypedArray(4, packI32, unpackI32);
-    var Uint32Array = makeTypedArray(4, packU32, unpackU32);
-    var Float32Array = makeTypedArray(4, packF32, unpackF32);
-    var Float64Array = makeTypedArray(8, packF64, unpackF64);
-
-    global.Int8Array = global.Int8Array || Int8Array;
-    global.Uint8Array = global.Uint8Array || Uint8Array;
-    global.Uint8ClampedArray = global.Uint8ClampedArray || Uint8ClampedArray;
-    global.Int16Array = global.Int16Array || Int16Array;
-    global.Uint16Array = global.Uint16Array || Uint16Array;
-    global.Int32Array = global.Int32Array || Int32Array;
-    global.Uint32Array = global.Uint32Array || Uint32Array;
-    global.Float32Array = global.Float32Array || Float32Array;
-    global.Float64Array = global.Float64Array || Float64Array;
-  }());
-
-  //
-  // 6 The DataView View Type
-  //
-
-  (function() {
-    function r(array, index) {
-      return IsCallable(array.get) ? array.get(index) : array[index];
-    }
-
-    var IS_BIG_ENDIAN = (function() {
-      var u16array = new Uint16Array([0x1234]),
-        u8array = new Uint8Array(u16array.buffer);
-      return r(u8array, 0) === 0x12;
-    }());
-
-    // DataView(buffer, byteOffset=0, byteLength=undefined)
-    // WebIDL: Constructor(ArrayBuffer buffer,
-    //                     optional unsigned long byteOffset,
-    //                     optional unsigned long byteLength)
-    function DataView(buffer, byteOffset, byteLength) {
-      if (!(buffer instanceof ArrayBuffer || Class(buffer) === 'ArrayBuffer')) throw TypeError();
-
-      byteOffset = ToUint32(byteOffset);
-      if (byteOffset > buffer.byteLength)
-        throw RangeError('byteOffset out of range');
-
-      if (byteLength === undefined)
-        byteLength = buffer.byteLength - byteOffset;
-      else
-        byteLength = ToUint32(byteLength);
-
-      if ((byteOffset + byteLength) > buffer.byteLength)
-        throw RangeError('byteOffset and length reference an area beyond the end of the buffer');
-
-      Object.defineProperty(this, 'buffer', {value: buffer});
-      Object.defineProperty(this, 'byteLength', {value: byteLength});
-      Object.defineProperty(this, 'byteOffset', {value: byteOffset});
-    };
-
-    // get DataView.prototype.buffer
-    // get DataView.prototype.byteLength
-    // get DataView.prototype.byteOffset
-    // -- applied directly to instances by the constructor
-
-    function makeGetter(arrayType) {
-      return function GetViewValue(byteOffset, littleEndian) {
-        byteOffset = ToUint32(byteOffset);
-
-        if (byteOffset + arrayType.BYTES_PER_ELEMENT > this.byteLength)
-          throw RangeError('Array index out of range');
-
-        byteOffset += this.byteOffset;
-
-        var uint8Array = new Uint8Array(this.buffer, byteOffset, arrayType.BYTES_PER_ELEMENT),
-          bytes = [];
-        for (var i = 0; i < arrayType.BYTES_PER_ELEMENT; i += 1)
-          bytes.push(r(uint8Array, i));
-
-        if (Boolean(littleEndian) === Boolean(IS_BIG_ENDIAN))
-          bytes.reverse();
-
-        return r(new arrayType(new Uint8Array(bytes).buffer), 0);
-      };
-    }
-
-    Object.defineProperty(DataView.prototype, 'getUint8', {value: makeGetter(Uint8Array)});
-    Object.defineProperty(DataView.prototype, 'getInt8', {value: makeGetter(Int8Array)});
-    Object.defineProperty(DataView.prototype, 'getUint16', {value: makeGetter(Uint16Array)});
-    Object.defineProperty(DataView.prototype, 'getInt16', {value: makeGetter(Int16Array)});
-    Object.defineProperty(DataView.prototype, 'getUint32', {value: makeGetter(Uint32Array)});
-    Object.defineProperty(DataView.prototype, 'getInt32', {value: makeGetter(Int32Array)});
-    Object.defineProperty(DataView.prototype, 'getFloat32', {value: makeGetter(Float32Array)});
-    Object.defineProperty(DataView.prototype, 'getFloat64', {value: makeGetter(Float64Array)});
-
-    function makeSetter(arrayType) {
-      return function SetViewValue(byteOffset, value, littleEndian) {
-        byteOffset = ToUint32(byteOffset);
-        if (byteOffset + arrayType.BYTES_PER_ELEMENT > this.byteLength)
-          throw RangeError('Array index out of range');
-
-        // Get bytes
-        var typeArray = new arrayType([value]),
-          byteArray = new Uint8Array(typeArray.buffer),
-          bytes = [], i, byteView;
-
-        for (i = 0; i < arrayType.BYTES_PER_ELEMENT; i += 1)
-          bytes.push(r(byteArray, i));
-
-        // Flip if necessary
-        if (Boolean(littleEndian) === Boolean(IS_BIG_ENDIAN))
-          bytes.reverse();
-
-        // Write them
-        byteView = new Uint8Array(this.buffer, byteOffset, arrayType.BYTES_PER_ELEMENT);
-        byteView.set(bytes);
-      };
-    }
-
-    Object.defineProperty(DataView.prototype, 'setUint8', {value: makeSetter(Uint8Array)});
-    Object.defineProperty(DataView.prototype, 'setInt8', {value: makeSetter(Int8Array)});
-    Object.defineProperty(DataView.prototype, 'setUint16', {value: makeSetter(Uint16Array)});
-    Object.defineProperty(DataView.prototype, 'setInt16', {value: makeSetter(Int16Array)});
-    Object.defineProperty(DataView.prototype, 'setUint32', {value: makeSetter(Uint32Array)});
-    Object.defineProperty(DataView.prototype, 'setInt32', {value: makeSetter(Int32Array)});
-    Object.defineProperty(DataView.prototype, 'setFloat32', {value: makeSetter(Float32Array)});
-    Object.defineProperty(DataView.prototype, 'setFloat64', {value: makeSetter(Float64Array)});
-
-    global.DataView = global.DataView || DataView;
-
-  }());
-
-}(self));
-
-//Blob (IE9)
-/*! @source http://purl.eligrey.com/github/Blob.js/blob/master/Blob.js */
-/* Blob.js
- * A Blob implementation.
- * 2014-07-24
- *
- * By Eli Grey, http://eligrey.com
- * By Devin Samarin, https://github.com/dsamarin
- * License: MIT
- *   See https://github.com/eligrey/Blob.js/blob/master/LICENSE.md
- */
-
-/*global self, unescape */
-/*jslint bitwise: true, regexp: true, confusion: true, es5: true, vars: true, white: true,
- plusplus: true */
-
-/*! @source http://purl.eligrey.com/github/Blob.js/blob/master/Blob.js */
-
-(function (view) {
-  "use strict";
-
-  view.URL = view.URL || view.webkitURL;
-
-  if (view.Blob && view.URL) {
-    try {
-      new Blob;
-      return;
-    } catch (e) {}
-  }
-
-  // Internally we use a BlobBuilder implementation to base Blob off of
-  // in order to support older browsers that only have BlobBuilder
-  var BlobBuilder = view.BlobBuilder || view.WebKitBlobBuilder || view.MozBlobBuilder || (function(view) {
-      var
-        get_class = function(object) {
-          return Object.prototype.toString.call(object).match(/^\[object\s(.*)\]$/)[1];
-        }
-        , FakeBlobBuilder = function BlobBuilder() {
-          this.data = [];
-        }
-        , FakeBlob = function Blob(data, type, encoding) {
-          this.data = data;
-          this.size = data.length;
-          this.type = type;
-          this.encoding = encoding;
-        }
-        , FBB_proto = FakeBlobBuilder.prototype
-        , FB_proto = FakeBlob.prototype
-        , FileReaderSync = view.FileReaderSync
-        , FileException = function(type) {
-          this.code = this[this.name = type];
-        }
-        , file_ex_codes = (
-          "NOT_FOUND_ERR SECURITY_ERR ABORT_ERR NOT_READABLE_ERR ENCODING_ERR "
-          + "NO_MODIFICATION_ALLOWED_ERR INVALID_STATE_ERR SYNTAX_ERR"
-        ).split(" ")
-        , file_ex_code = file_ex_codes.length
-        , real_URL = view.URL || view.webkitURL || view
-        , real_create_object_URL = real_URL.createObjectURL
-        , real_revoke_object_URL = real_URL.revokeObjectURL
-        , URL = real_URL
-        , btoa = view.btoa
-        , atob = view.atob
-
-        , ArrayBuffer = view.ArrayBuffer
-        , Uint8Array = view.Uint8Array
-
-        , origin = /^[\w-]+:\/*\[?[\w\.:-]+\]?(?::[0-9]+)?/
-        ;
-      FakeBlob.fake = FB_proto.fake = true;
-      while (file_ex_code--) {
-        FileException.prototype[file_ex_codes[file_ex_code]] = file_ex_code + 1;
-      }
-      // Polyfill URL
-      if (!real_URL.createObjectURL) {
-        URL = view.URL = function(uri) {
-          var
-            uri_info = document.createElementNS("http://www.w3.org/1999/xhtml", "a")
-            , uri_origin
-            ;
-          uri_info.href = uri;
-          if (!("origin" in uri_info)) {
-            if (uri_info.protocol.toLowerCase() === "data:") {
-              uri_info.origin = null;
-            } else {
-              uri_origin = uri.match(origin);
-              uri_info.origin = uri_origin && uri_origin[1];
-            }
-          }
-          return uri_info;
-        };
-      }
-      URL.createObjectURL = function(blob) {
-        var
-          type = blob.type
-          , data_URI_header
-          ;
-        if (type === null) {
-          type = "application/octet-stream";
-        }
-        if (blob instanceof FakeBlob) {
-          data_URI_header = "data:" + type;
-          if (blob.encoding === "base64") {
-            return data_URI_header + ";base64," + blob.data;
-          } else if (blob.encoding === "URI") {
-            return data_URI_header + "," + decodeURIComponent(blob.data);
-          } if (btoa) {
-            return data_URI_header + ";base64," + btoa(blob.data);
-          } else {
-            return data_URI_header + "," + encodeURIComponent(blob.data);
-          }
-        } else if (real_create_object_URL) {
-          return real_create_object_URL.call(real_URL, blob);
-        }
-      };
-      URL.revokeObjectURL = function(object_URL) {
-        if (object_URL.substring(0, 5) !== "data:" && real_revoke_object_URL) {
-          real_revoke_object_URL.call(real_URL, object_URL);
-        }
-      };
-      FBB_proto.append = function(data/*, endings*/) {
-        var bb = this.data;
-        // decode data to a binary string
-        if (Uint8Array && (data instanceof ArrayBuffer || data instanceof Uint8Array)) {
-          var
-            str = ""
-            , buf = new Uint8Array(data)
-            , i = 0
-            , buf_len = buf.length
-            ;
-          for (; i < buf_len; i++) {
-            str += String.fromCharCode(buf[i]);
-          }
-          bb.push(str);
-        } else if (get_class(data) === "Blob" || get_class(data) === "File") {
-          if (FileReaderSync) {
-            var fr = new FileReaderSync;
-            bb.push(fr.readAsBinaryString(data));
-          } else {
-            // async FileReader won't work as BlobBuilder is sync
-            throw new FileException("NOT_READABLE_ERR");
-          }
-        } else if (data instanceof FakeBlob) {
-          if (data.encoding === "base64" && atob) {
-            bb.push(atob(data.data));
-          } else if (data.encoding === "URI") {
-            bb.push(decodeURIComponent(data.data));
-          } else if (data.encoding === "raw") {
-            bb.push(data.data);
-          }
-        } else {
-          if (typeof data !== "string") {
-            data += ""; // convert unsupported types to strings
-          }
-          // decode UTF-16 to binary string
-          bb.push(unescape(encodeURIComponent(data)));
-        }
-      };
-      FBB_proto.getBlob = function(type) {
-        if (!arguments.length) {
-          type = null;
-        }
-        return new FakeBlob(this.data.join(""), type, "raw");
-      };
-      FBB_proto.toString = function() {
-        return "[object BlobBuilder]";
-      };
-      FB_proto.slice = function(start, end, type) {
-        var args = arguments.length;
-        if (args < 3) {
-          type = null;
-        }
-        return new FakeBlob(
-          this.data.slice(start, args > 1 ? end : this.data.length)
-          , type
-          , this.encoding
-        );
-      };
-      FB_proto.toString = function() {
-        return "[object Blob]";
-      };
-      FB_proto.close = function() {
-        this.size = 0;
-        delete this.data;
-      };
-      return FakeBlobBuilder;
-    }(view));
-
-  view.Blob = function(blobParts, options) {
-    var type = options ? (options.type || "") : "";
-    var builder = new BlobBuilder();
-    if (blobParts) {
-      for (var i = 0, len = blobParts.length; i < len; i++) {
-        if (Uint8Array && blobParts[i] instanceof Uint8Array) {
-          builder.append(blobParts[i].buffer);
-        }
-        else {
-          builder.append(blobParts[i]);
-        }
-      }
-    }
-    var blob = builder.getBlob(type);
-    if (!blob.slice && blob.webkitSlice) {
-      blob.slice = blob.webkitSlice;
-    }
-    return blob;
-  };
-
-  var getPrototypeOf = Object.getPrototypeOf || function(object) {
-      return object.__proto__;
-    };
-  view.Blob.prototype = getPrototypeOf(new view.Blob());
-}(typeof self !== "undefined" && self || typeof window !== "undefined" && window || this.content || this));
-
-//FormData (IE9)
-/*! @source https://github.com/francois2metz/html5-formdata/blob/master/formdata.js */
-/**
- * Emulate FormData for some browsers
- * MIT License
- * (c) 2010 François de Metz
- */
-(function(w) {
-  if (w.FormData)
-    return;
-  function FormData() {
-    this.fake = true;
-    this.boundary = "--------FormData" + Math.random();
-    this._fields = [];
-  }
-  FormData.prototype.append = function(key, value) {
-    this._fields.push([key, value]);
-  }
-  FormData.prototype.toString = function() {
-    var boundary = this.boundary;
-    var body = "";
-    this._fields.forEach(function(field) {
-      body += "--" + boundary + "\r\n";
-      // file upload
-      if (field[1].name) {
-        var file = field[1];
-        body += "Content-Disposition: form-data; name=\""+ field[0] +"\"; filename=\""+ file.name +"\"\r\n";
-        body += "Content-Type: "+ file.type +"\r\n\r\n";
-        body += file.getAsBinary() + "\r\n";
-      } else {
-        body += "Content-Disposition: form-data; name=\""+ field[0] +"\";\r\n\r\n";
-        body += field[1] + "\r\n";
-      }
-    });
-    body += "--" + boundary +"--";
-    return body;
-  }
-  w.FormData = FormData;
-})(window);
-
 // Intl (IE9, IE10, all Safari, all Android)
 /*! @source https://github.com/andyearnshaw/Intl.js */
 /*! @licence https://github.com/andyearnshaw/Intl.js/blob/master/LICENSE.txt */
diff --git a/tools/BUILD.bazel b/tools/BUILD.bazel
index 4d03ccc4ab141..30175c4e7d268 100644
--- a/tools/BUILD.bazel
+++ b/tools/BUILD.bazel
@@ -1,7 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("@npm_bazel_typescript//:index.bzl", "ts_config")
-load("//tools:defaults.bzl", "nodejs_binary")
+load("//tools:defaults.bzl", "nodejs_binary", "ts_config")
 
 exports_files([
     "tsconfig.json",
diff --git a/tools/defaults.bzl b/tools/defaults.bzl
index 0fbfb1296c191..b6c48bf316827 100644
--- a/tools/defaults.bzl
+++ b/tools/defaults.bzl
@@ -2,12 +2,12 @@
 
 load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar")
 load("@build_bazel_rules_nodejs//:index.bzl", _nodejs_binary = "nodejs_binary", _pkg_npm = "pkg_npm")
-load("@npm_bazel_jasmine//:index.bzl", _jasmine_node_test = "jasmine_node_test")
-load("@npm_bazel_karma//:index.bzl", _karma_web_test = "karma_web_test", _karma_web_test_suite = "karma_web_test_suite")
-load("@npm_bazel_rollup//:index.bzl", _rollup_bundle = "rollup_bundle")
-load("@npm_bazel_terser//:index.bzl", "terser_minified")
-load("@npm_bazel_typescript//:index.bzl", _ts_devserver = "ts_devserver", _ts_library = "ts_library")
-load("@npm_bazel_protractor//:index.bzl", _protractor_web_test_suite = "protractor_web_test_suite")
+load("@npm//@bazel/jasmine:index.bzl", _jasmine_node_test = "jasmine_node_test")
+load("@npm//@bazel/karma:index.bzl", _karma_web_test = "karma_web_test", _karma_web_test_suite = "karma_web_test_suite")
+load("@npm//@bazel/rollup:index.bzl", _rollup_bundle = "rollup_bundle")
+load("@npm//@bazel/terser:index.bzl", "terser_minified")
+load("@npm//@bazel/typescript:index.bzl", _ts_config = "ts_config", _ts_devserver = "ts_devserver", _ts_library = "ts_library")
+load("@npm//@bazel/protractor:index.bzl", _protractor_web_test_suite = "protractor_web_test_suite")
 load("@npm//typescript:index.bzl", "tsc")
 load("//packages/bazel:index.bzl", _ng_module = "ng_module", _ng_package = "ng_package")
 load("//dev-infra/benchmark/ng_rollup_bundle:ng_rollup_bundle.bzl", _ng_rollup_bundle = "ng_rollup_bundle")
@@ -41,8 +41,6 @@ ANGULAR_SCOPED_PACKAGES = ["@angular/%s" % p for p in [
     # Current plan for Angular v8 is to not include @angular/http in ng update
     # "http",
     "platform-server",
-    "platform-webworker",
-    "platform-webworker-dynamic",
     "upgrade",
     "router",
     "language-service",
@@ -95,6 +93,8 @@ def ts_devserver(**kwargs):
         **kwargs
     )
 
+ts_config = _ts_config
+
 def ts_library(name, tsconfig = None, testonly = False, deps = [], module_name = None, **kwargs):
     """Default values for ts_library"""
     deps = deps + ["@npm//tslib"]
@@ -170,12 +170,23 @@ def ng_package(name, readme_md = None, license_banner = None, deps = [], **kwarg
     ]
     visibility = kwargs.pop("visibility", None)
 
+    common_substitutions = dict(kwargs.pop("substitutions", {}), **PKG_GROUP_REPLACEMENTS)
+    substitutions = dict(common_substitutions, **{
+        "0.0.0-PLACEHOLDER": "0.0.0",
+    })
+    stamped_substitutions = dict(common_substitutions, **{
+        "0.0.0-PLACEHOLDER": "{BUILD_SCM_VERSION}",
+    })
+
     _ng_package(
         name = name,
         deps = deps,
         readme_md = readme_md,
         license_banner = license_banner,
-        substitutions = PKG_GROUP_REPLACEMENTS,
+        substitutions = select({
+            "//:stamp": stamped_substitutions,
+            "//conditions:default": substitutions,
+        }),
         ng_packager = _INTERNAL_NG_PACKAGE_PACKAGER,
         terser_config_file = _INTERNAL_NG_PACKAGE_DEFALUT_TERSER_CONFIG_FILE,
         rollup_config_tmpl = _INTERNAL_NG_PACKAGE_DEFAULT_ROLLUP_CONFIG_TMPL,
@@ -194,13 +205,24 @@ def ng_package(name, readme_md = None, license_banner = None, deps = [], **kwarg
         visibility = visibility,
     )
 
-def pkg_npm(name, substitutions = {}, **kwargs):
+def pkg_npm(name, **kwargs):
     """Default values for pkg_npm"""
     visibility = kwargs.pop("visibility", None)
 
+    common_substitutions = dict(kwargs.pop("substitutions", {}), **PKG_GROUP_REPLACEMENTS)
+    substitutions = dict(common_substitutions, **{
+        "0.0.0-PLACEHOLDER": "0.0.0",
+    })
+    stamped_substitutions = dict(common_substitutions, **{
+        "0.0.0-PLACEHOLDER": "{BUILD_SCM_VERSION}",
+    })
+
     _pkg_npm(
         name = name,
-        substitutions = dict(substitutions, **PKG_GROUP_REPLACEMENTS),
+        substitutions = select({
+            "//:stamp": stamped_substitutions,
+            "//conditions:default": substitutions,
+        }),
         visibility = visibility,
         **kwargs
     )
@@ -245,7 +267,10 @@ def karma_web_test_suite(name, **kwargs):
         runtime_deps = runtime_deps,
         bootstrap = bootstrap,
         deps = deps,
-        browsers = ["//dev-infra/browsers/firefox:firefox"],
+        browsers = [
+            "//dev-infra/browsers/chromium:chromium",
+            "//dev-infra/browsers/firefox:firefox",
+        ],
         data = data,
         tags = tags,
         **kwargs
@@ -375,6 +400,8 @@ def rollup_bundle(name, testonly = False, sourcemap = "true", **kwargs):
     es2015 iife                  : "%{name}.es2015.js"
     es2015 iife minified         : "%{name}.min.es2015.js"
     es2015 iife minified (debug) : "%{name}.min_debug.es2015.js"
+    esm                          : "%{name}.esm.js"
+    esm                          : "%{name}.min.esm.js"
     es5 iife                     : "%{name}.js"
     es5 iife minified            : "%{name}.min.js"
     es5 iife minified (debug)    : "%{name}.min_debug.js"
@@ -397,6 +424,11 @@ def rollup_bundle(name, testonly = False, sourcemap = "true", **kwargs):
         "sourcemap": False,
     }
 
+    # esm
+    _rollup_bundle(name = name + ".esm", testonly = testonly, format = "esm", sourcemap = sourcemap, **kwargs)
+    terser_minified(name = name + ".min.esm", testonly = testonly, src = name + ".esm", **common_terser_args)
+    native.filegroup(name = name + ".min.esm.js", testonly = testonly, srcs = [name + ".min.esm"])
+
     # es2015
     _rollup_bundle(name = name + ".es2015", testonly = testonly, format = "iife", sourcemap = sourcemap, **kwargs)
     terser_minified(name = name + ".min.es2015", testonly = testonly, src = name + ".es2015", **common_terser_args)
diff --git a/tools/gulp-tasks/cldr.js b/tools/gulp-tasks/cldr.js
index 531a9577fa66e..5d1ce7802f562 100644
--- a/tools/gulp-tasks/cldr.js
+++ b/tools/gulp-tasks/cldr.js
@@ -6,14 +6,29 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+const path = require('path');
 const fs = require('fs');
 
 module.exports = {
   extract: gulp => done => {
+    if (!fs.existsSync(path.join(__dirname, 'cldr/cldr-data'))) {
+      throw new Error(`You must run "gulp cldr:download" before you can extract the data`);
+    }
     const extract = require('./cldr/extract');
     return extract(gulp, done);
   },
 
+  download: gulp => done => {
+    const cldrDownloader = require('cldr-data-downloader');
+    const cldrDataFolder = path.join(__dirname, 'cldr/cldr-data');
+    if (fs.existsSync(cldrDataFolder)) {
+      fs.rmdirSync(cldrDataFolder, {recursive: true});
+    } else {
+      fs.mkdirSync(cldrDataFolder);
+    }
+    cldrDownloader(path.join(__dirname, 'cldr/cldr-urls.json'), cldrDataFolder, {}, done);
+  },
+
   closure: gulp => done => {
     const {RELATIVE_I18N_DATA_FOLDER} = require('./cldr/extract');
     // tslint:disable-next-line:no-console
diff --git a/tools/gulp-tasks/cldr/cldr-data.js b/tools/gulp-tasks/cldr/cldr-data.js
new file mode 100644
index 0000000000000..dc68ab210dd94
--- /dev/null
+++ b/tools/gulp-tasks/cldr/cldr-data.js
@@ -0,0 +1,86 @@
+// tslint:disable:file-header
+
+/**
+ * Npm module for Unicode CLDR JSON data
+ *
+ * @license
+ * Copyright 2013 Rafael Xavier de Souza
+ * Released under the MIT license
+ * https://github.com/rxaviers/cldr-data-npm/blob/master/LICENSE-MIT
+ */
+
+'use strict';
+
+const JSON_EXTENSION = /^(.*)\.json$/;
+
+const assert = require('assert');
+const _fs = require('fs');
+const _path = require('path');
+
+function argsToArray(arg) {
+  return [].slice.call(arg, 0);
+}
+
+function jsonFiles(dirName) {
+  const fileList = _fs.readdirSync(_path.join(__dirname, 'cldr-data', dirName));
+
+  return fileList.reduce(function(sum, file) {
+    if (JSON_EXTENSION.test(file)) {
+      return sum.concat(file.match(JSON_EXTENSION)[1]);
+    }
+  }, []);
+}
+
+function cldrData(path /*, ...*/) {
+  assert(
+      typeof path === 'string',
+      'must include path (e.g., "main/en/numbers" or "supplemental/likelySubtags")');
+
+  if (arguments.length > 1) {
+    return argsToArray(arguments).reduce(function(sum, path) {
+      sum.push(cldrData(path));
+      return sum;
+    }, []);
+  }
+  return require('./cldr-data/' + path);
+}
+
+function mainPathsFor(locales) {
+  return locales.reduce(function(sum, locale) {
+    const mainFiles = jsonFiles(_path.join('main', locale));
+    mainFiles.forEach(function(mainFile) {
+      sum.push(_path.join('main', locale, mainFile));
+    });
+    return sum;
+  }, []);
+}
+
+function supplementalPaths() {
+  const supplementalFiles = jsonFiles('supplemental');
+
+  return supplementalFiles.map(function(supplementalFile) {
+    return _path.join('supplemental', supplementalFile);
+  });
+}
+
+Object.defineProperty(cldrData, 'availableLocales', {
+  get: function() {
+    return cldrData('availableLocales').availableLocales;
+  }
+});
+
+cldrData.all = function() {
+  const paths = supplementalPaths().concat(mainPathsFor(this.availableLocales));
+  return cldrData.apply({}, paths);
+};
+
+cldrData.entireMainFor = function(locale /*, ...*/) {
+  assert(typeof locale === 'string', 'must include locale (e.g., "en")');
+  return cldrData.apply({}, mainPathsFor(argsToArray(arguments)));
+};
+
+cldrData.entireSupplemental = function() {
+  return cldrData.apply({}, supplementalPaths());
+};
+
+module.exports = cldrData;
diff --git a/tools/gulp-tasks/cldr/cldr-urls.json b/tools/gulp-tasks/cldr/cldr-urls.json
new file mode 100644
index 0000000000000..bec583e83ba08
--- /dev/null
+++ b/tools/gulp-tasks/cldr/cldr-urls.json
@@ -0,0 +1,22 @@
+{
+  "core": [
+    "https://github.com/unicode-cldr/cldr-core/archive/37.0.0.zip",
+    "https://github.com/unicode-cldr/cldr-segments-modern/archive/37.0.0.zip",
+    "https://github.com/unicode-cldr/cldr-dates-full/archive/37.0.0.zip",
+    "https://github.com/unicode-cldr/cldr-cal-buddhist-full/archive/37.0.0.zip",
+    "https://github.com/unicode-cldr/cldr-cal-chinese-full/archive/37.0.0.zip",
+    "https://github.com/unicode-cldr/cldr-cal-coptic-full/archive/37.0.0.zip",
+    "https://github.com/unicode-cldr/cldr-cal-dangi-full/archive/37.0.0.zip",
+    "https://github.com/unicode-cldr/cldr-cal-ethiopic-full/archive/37.0.0.zip",
+    "https://github.com/unicode-cldr/cldr-cal-hebrew-full/archive/37.0.0.zip",
+    "https://github.com/unicode-cldr/cldr-cal-indian-full/archive/37.0.0.zip",
+    "https://github.com/unicode-cldr/cldr-cal-islamic-full/archive/37.0.0.zip",
+    "https://github.com/unicode-cldr/cldr-cal-japanese-full/archive/37.0.0.zip",
+    "https://github.com/unicode-cldr/cldr-cal-persian-full/archive/37.0.0.zip",
+    "https://github.com/unicode-cldr/cldr-cal-roc-full/archive/37.0.0.zip",
+    "https://github.com/unicode-cldr/cldr-localenames-full/archive/37.0.0.zip",
+    "https://github.com/unicode-cldr/cldr-misc-full/archive/37.0.0.zip",
+    "https://github.com/unicode-cldr/cldr-numbers-full/archive/37.0.0.zip",
+    "https://github.com/unicode-cldr/cldr-units-full/archive/37.0.0.zip"
+  ]
+}
diff --git a/tools/gulp-tasks/cldr/extract.js b/tools/gulp-tasks/cldr/extract.js
index 73caa43c6cd27..aef0ac0001db3 100644
--- a/tools/gulp-tasks/cldr/extract.js
+++ b/tools/gulp-tasks/cldr/extract.js
@@ -46,7 +46,7 @@ const HEADER = `/**
 
 // tslint:disable:no-console
 module.exports = (gulp, done) => {
-  const cldrData = require('cldr-data');
+  const cldrData = require('./cldr-data');
   const LOCALES = cldrData.availableLocales;
 
   console.log(`Loading CLDR data...`);
diff --git a/tools/npm_integration_test/test_runner.js b/tools/npm_integration_test/test_runner.js
index 4f209f169129a..da99f9505a42d 100644
--- a/tools/npm_integration_test/test_runner.js
+++ b/tools/npm_integration_test/test_runner.js
@@ -188,8 +188,15 @@ class TestRunner {
           if (binary.startsWith('external/')) {
             binary = `../${binary.substring('external/'.length)}`;
           }
-          const runfilesBinary = runfiles.resolveWorkspaceRelative(binary);
-          binary = fs.existsSync(runfilesBinary) ? runfilesBinary : binary;
+          try {
+            // Attempt to resolve runfiles location if command is expected to
+            // be in runfiles. For example, $(rootpath @nodejs//:yarn_bin)
+            const runfilesBinary = runfiles.resolveWorkspaceRelative(binary);
+            binary = (runfilesBinary && fs.existsSync(runfilesBinary)) ? runfilesBinary : binary;
+          } catch (e) {
+            // If resolveWorkspaceRelative then command is likely a built-in
+            // such as 'mkdir' or 'rm'
+          }
           log(`running test command ${this.successful + 1} of ${this.config.commands.length}: '${
               binary} ${args.join(' ')}' in '${this.testRoot}'`);
           const spawnedProcess = spawnSync(binary, args, {cwd: this.testRoot, stdio: 'inherit'});
diff --git a/tools/symbol-extractor/index.bzl b/tools/symbol-extractor/index.bzl
index b9af3dd9ca139..d6e9104fda424 100644
--- a/tools/symbol-extractor/index.bzl
+++ b/tools/symbol-extractor/index.bzl
@@ -24,6 +24,7 @@ def js_expected_symbol_test(name, src, golden, data = [], **kwargs):
         name = name,
         data = all_data,
         entry_point = entry_point,
+        tags = kwargs.pop("tags", []) + ["symbol_extractor"],
         templated_args = ["$(rootpath %s)" % src, "$(rootpath %s)" % golden],
         configuration_env_vars = ["angular_ivy_enabled"],
         **kwargs
diff --git a/tools/symbol-extractor/run_all_symbols_extractor_tests.js b/tools/symbol-extractor/run_all_symbols_extractor_tests.js
new file mode 100644
index 0000000000000..dc53de825533d
--- /dev/null
+++ b/tools/symbol-extractor/run_all_symbols_extractor_tests.js
@@ -0,0 +1,68 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+// TODO(josephperrott): migrate golden testing to ng-dev toolset
+const {spawnSync} = require('child_process');
+const minimist = require('minimist');
+const path = require('path');
+
+// Remove all command line flags from the arguments.
+const argv = minimist(process.argv.slice(2));
+// The command the user would like to run, either 'accept' or 'test'
+const USER_COMMAND = argv._[0];
+// The shell command to query for all tests.
+// Bazel targets for testing goldens
+process.stdout.write('Gathering all symbol extractor targets');
+const ALL_TEST_TARGETS =
+    spawnSync(
+        'yarn',
+        [
+          '-s', 'bazel', 'query', '--output', 'label',
+          `kind(nodejs_test, ...) intersect attr("tags", "symbol_extractor", ...)`
+        ],
+        {encoding: 'utf8', shell: true, cwd: path.resolve(__dirname, '../..')})
+        .stdout.trim()
+        .split('\n')
+        .map(line => line.trim());
+process.stdout.clearLine();
+process.stdout.cursorTo(0);
+// Bazel targets for generating goldens
+const ALL_ACCEPT_TARGETS = ALL_TEST_TARGETS.map(test => `${test}.accept`);
+
+/** Run the provided bazel commands on each provided target individually. */
+function runBazelCommandOnTargets(command, targets, present) {
+  for (const target of targets) {
+    process.stdout.write(`${present}: ${target}`);
+    const commandResult =
+        spawnSync('yarn', ['-s', 'bazel', command, '--config=ivy', target], {encoding: 'utf8'});
+    process.stdout.clearLine();
+    process.stdout.cursorTo(0);
+    if (commandResult.status) {
+      console.error(`Failed ${command}: ${target}`);
+      console.group();
+      console.error(commandResult.stdout || commandResult.stderr);
+      console.groupEnd();
+    } else {
+      console.info(`Successful ${command}: ${target}`);
+    }
+  }
+}
+
+switch (USER_COMMAND) {
+  case 'accept':
+    runBazelCommandOnTargets('run', ALL_ACCEPT_TARGETS, 'Running');
+    break;
+  case 'test':
+    runBazelCommandOnTargets('test', ALL_TEST_TARGETS, 'Testing');
+    break;
+  default:
+    console.warn('Invalid command provided.');
+    console.warn();
+    console.warn(`Run this script with either "accept" and "test"`);
+    break;
+}
diff --git a/tools/ts-api-guardian/BUILD.bazel b/tools/ts-api-guardian/BUILD.bazel
index e27f2a55cfc51..34af12b2dc8b6 100644
--- a/tools/ts-api-guardian/BUILD.bazel
+++ b/tools/ts-api-guardian/BUILD.bazel
@@ -1,6 +1,6 @@
 # BEGIN-INTERNAL
 load("@build_bazel_rules_nodejs//:index.bzl", "pkg_npm")
-load("@npm_bazel_typescript//:index.bzl", "ts_library")
+load("@npm//@bazel/typescript:index.bzl", "ts_library")
 load("//tools:defaults.bzl", "jasmine_node_test")
 
 ts_library(
diff --git a/tools/ts-api-guardian/package.json b/tools/ts-api-guardian/package.json
index 9e9b6bf82d961..4df0b9840e5c7 100644
--- a/tools/ts-api-guardian/package.json
+++ b/tools/ts-api-guardian/package.json
@@ -33,7 +33,7 @@
     "chai": "^4.1.2",
     "jasmine": "^3.1.0",
     "source-map-support": "^0.5.9",
-    "typescript": "~3.9.5"
+    "typescript": "4.0.2"
   },
   "repository": {},
   "keywords": [
diff --git a/yarn.lock b/yarn.lock
index c234a1cc6eceb..b1cdef9e9368c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1643,48 +1643,51 @@
   resolved "https://registry.yarnpkg.com/@bazel/ibazel/-/ibazel-0.12.4.tgz#ddda7c8ead6e29dc8d637af446086a750f395218"
   integrity sha512-FzOy+esB/fXVDbAmL6Ce2yCEy+PESZih8GypKhi0B8XzoZHAAn3QNnQcMNwo9PrIfp3G1989nM/JQ1b8jwEinQ==
 
-"@bazel/jasmine@1.7.0":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@bazel/jasmine/-/jasmine-1.7.0.tgz#429df76e6628aa139176340434729cc091e371d7"
-  integrity sha512-LXq6nfBBEczjsDLwFW9kesGdewRrnFiAOZzXAAivCV3xtq516xK4QnVWA9tQGq+R1DnY50IaODpCJhh8PDezdg==
+"@bazel/jasmine@2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@bazel/jasmine/-/jasmine-2.2.0.tgz#78fc4171362113d993e2473b0168ee8c255e05c9"
+  integrity sha512-NmrgbHBSWUaBXT9rFqeC+bYYWfHtPphnfgchusy7LOQMs/aWVePEo9tsbggNBt1pf6NYv+Y/cHLgtlL/EdQ6Dg==
   dependencies:
-    jasmine "~3.5.0"
-    jasmine-core "~3.5.0"
+    c8 "~7.1.0"
     jasmine-reporters "~2.3.2"
-    v8-coverage "1.0.9"
 
-"@bazel/karma@1.7.0":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-1.7.0.tgz#ec7e97a2629f5af0b2abe9a99ae30363a34af97d"
-  integrity sha512-mGYVD9DldB3v/DjxJpS39X1vUD6M32Al96DMoilwW3TSAazcRWwUAC6HY9z5Wtyeqwxyk8BY1Mg1/berWpoTxg==
+"@bazel/karma@2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-2.2.0.tgz#9bf6f6f1aa5f12b25468b1cad5e4404138436600"
+  integrity sha512-qyVE7vZ/qaibmpmcRdjS0rlorLGR0zZtlUSImVVTcPTSXqt364fp8TWBWe7oOneJ1SOVyUmTOAzyE86ArxZ/AA==
   dependencies:
     tmp "0.1.0"
 
-"@bazel/protractor@1.7.0":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@bazel/protractor/-/protractor-1.7.0.tgz#1ced325a64d77bccca4bf881e62982d017d6b639"
-  integrity sha512-sLbejWwmwTupCS3JKdBeiZMUbylLpJxJdlrz8sZ9t4KV6YiFAXNOloCScrrdOkeiJz5QQZRG3p3rqHbIszUAwQ==
+"@bazel/protractor@2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@bazel/protractor/-/protractor-2.2.0.tgz#721b06507b84bf6d61d0e843e0af9939c6ad35a4"
+  integrity sha512-7dvAXxf/rGoi+S4+DWg8HNx3Co9s0kMg1xnBJ4T4nPF5wqSEoItkR6wsjkjQyocA2kIXan+HQcQvw4iIDMhGmg==
 
-"@bazel/rollup@1.7.0":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@bazel/rollup/-/rollup-1.7.0.tgz#5c0f0d51d2f3f14e78781a4b9e6a9ffba87f1579"
-  integrity sha512-Pp5aCJw3gwu77zn6/fQgZ39ArrWEI5O3dja5wKadBnfOQ66PImIEr+bf7JgROoWvACH1kGxaS423rq51fiuCsA==
+"@bazel/rollup@2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@bazel/rollup/-/rollup-2.2.0.tgz#15651d545114e08db056f10a1eeaa4e76fc4df56"
+  integrity sha512-N4SyrvFkdAVc24CqFNhDtrR6P3XJTdPGziCuF7QM/BGihnsGlxF6+Dt2n5BTLJnObiB1St8vtRwCtAY8faxYWQ==
 
-"@bazel/terser@1.7.0":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@bazel/terser/-/terser-1.7.0.tgz#c43e711e13b9a71c7abd3ade04fb4650d547ad01"
-  integrity sha512-u/UXk0WUinvkk1g5xxfqGieBz3r12Bj2y2m25lC5GjHBgCpGk7DyeGGi9H3QQNO1Wmpw51QSE9gaPzKzjUVGug==
+"@bazel/terser@2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@bazel/terser/-/terser-2.2.0.tgz#e0452f3d20e41d5e63048b3eea3280256172fd30"
+  integrity sha512-vukKS9ayJsW/eFFX6tG2Blem+NmEWbcYuCXxwgjL/uYiMCL/uowaTpcvVp9B+DsNSXhGyohOYwud0nBreSUFzg==
 
-"@bazel/typescript@1.7.0":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-1.7.0.tgz#8dc02b8a161f4fff3285186066b5f73666793452"
-  integrity sha512-M6JPXJZ+W6457QZfPHmGg/Mejnp7//YTnffGmnmeK9vDqybXeCCRWW1/iEOwopLJYQViBHfaoulde0VXelx9sA==
+"@bazel/typescript@2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-2.2.0.tgz#f2d3dce8715d574fe3146f19fdb8479abcc4d608"
+  integrity sha512-Thf8pXntBzE3EvJtyiTBNsfIf1QnYmGPQmUSGLcKUuuFoplUVYShMRHaxBoPZmYsnD/x+BFLgUKIzlXiEQpGqQ==
   dependencies:
     protobufjs "6.8.8"
     semver "5.6.0"
     source-map-support "0.5.9"
     tsutils "2.27.2"
 
+"@bcoe/v8-coverage@^0.2.3":
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
+  integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
+
 "@google-cloud/paginator@^2.0.0":
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/@google-cloud/paginator/-/paginator-2.0.3.tgz#c7987ad05d1c3ebcef554381be80e9e8da4e4882"
@@ -2198,14 +2201,24 @@
   resolved "https://registry.yarnpkg.com/@types/hammerjs/-/hammerjs-2.0.35.tgz#7b7c950c7d54593e23bffc8d2b4feba9866a7277"
   integrity sha512-4mUIMSZ2U4UOWq1b+iV7XUTE4w+Kr3x+Zb/Qz5ROO6BTZLw2c8/ftjq0aRgluguLs4KRuBnrOy/s389HVn1/zA==
 
-"@types/inquirer@^6.5.0":
-  version "6.5.0"
-  resolved "https://registry.yarnpkg.com/@types/inquirer/-/inquirer-6.5.0.tgz#b83b0bf30b88b8be7246d40e51d32fe9d10e09be"
-  integrity sha512-rjaYQ9b9y/VFGOpqBEXRavc3jh0a+e6evAbI31tMda8VlPaSy0AZJfXsvmIe3wklc7W6C3zCSfleuMXR7NOyXw==
+"@types/inquirer@^7.3.0":
+  version "7.3.0"
+  resolved "https://registry.yarnpkg.com/@types/inquirer/-/inquirer-7.3.0.tgz#a1233632ea6249f14eb481dae91138e747b85664"
+  integrity sha512-wcPs5jTrZYQBzzPlvUEzBcptzO4We2sijSvkBq8oAKRMJoH8PvrmP6QQnxLB5RScNUmRfujxA+ngxD4gk4xe7Q==
   dependencies:
     "@types/through" "*"
     rxjs "^6.4.0"
 
+"@types/is-windows@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@types/is-windows/-/is-windows-1.0.0.tgz#1011fa129d87091e2f6faf9042d6704cdf2e7be0"
+  integrity sha512-tJ1rq04tGKuIJoWIH0Gyuwv4RQ3+tIu7wQrC0MV47raQ44kIzXSSFKfrxFUOWVRvesoF7mrTqigXmqoZJsXwTg==
+
+"@types/istanbul-lib-coverage@^2.0.1":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#4ba8ddb720221f432e443bd5f9117fd22cfd4762"
+  integrity sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==
+
 "@types/jasmine-ajax@^3.3.1":
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/@types/jasmine-ajax/-/jasmine-ajax-3.3.1.tgz#69bc09babecc600cd80ba7e23f61937b0eea735c"
@@ -2243,6 +2256,13 @@
   resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.0.tgz#69a23a3ad29caf0097f06eda59b361ee2f0639f6"
   integrity sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY=
 
+"@types/multimatch@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@types/multimatch/-/multimatch-4.0.0.tgz#e14237ade6cba7b79fe3a1a5d4e9579613cee6b6"
+  integrity sha512-xS26gtqY5QASmfU/6jb5vj7F0D0SctgRGtwXsKSNng1knk/OewjISlkMwGonkMCbZCqSoW3s6nL0sAtTlzbL/g==
+  dependencies:
+    multimatch "*"
+
 "@types/node-fetch@^2.5.7":
   version "2.5.7"
   resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.7.tgz#20a2afffa882ab04d44ca786449a276f9f6bbf3c"
@@ -2347,15 +2367,24 @@
     "@types/source-list-map" "*"
     source-map "^0.6.1"
 
-"@types/yaml@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@types/yaml/-/yaml-1.2.0.tgz#4ed577fc4ebbd6b829b28734e56d10c9e6984e09"
-  integrity sha512-GW8b9qM+ebgW3/zjzPm0I1NxMvLaz/YKT9Ph6tTb+Fkeyzd9yLTvQ6ciQ2MorTRmb/qXmfjMerRpG4LviixaqQ==
+"@types/yaml@^1.9.7":
+  version "1.9.7"
+  resolved "https://registry.yarnpkg.com/@types/yaml/-/yaml-1.9.7.tgz#2331f36e0aac91311a63d33eb026c21687729679"
+  integrity sha512-8WMXRDD1D+wCohjfslHDgICd2JtMATZU8CkhH8LVJqcJs6dyYj5TGptzP8wApbmEullGBSsCEzzap73DQ1HJaA==
+  dependencies:
+    yaml "*"
+
+"@types/yargs-parser@*":
+  version "15.0.0"
+  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d"
+  integrity sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==
 
-"@types/yargs@^11.1.1":
-  version "11.1.5"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-11.1.5.tgz#8d71dfe4848ac5d714b75eca3df9cac75a4f8dac"
-  integrity sha512-1jmXgoIyzxQSm33lYgEXvegtkhloHbed2I0QGlTN66U2F9/ExqJWSCSmaWC0IB/g1tW+IYSp+tDhcZBYB1ZGog==
+"@types/yargs@^15.0.5":
+  version "15.0.5"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.5.tgz#947e9a6561483bdee9adffc983e91a6902af8b79"
+  integrity sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==
+  dependencies:
+    "@types/yargs-parser" "*"
 
 "@types/yauzl@^2.9.1":
   version "2.9.1"
@@ -2596,10 +2625,10 @@ adjust-sourcemap-loader@2.0.0:
     object-path "0.11.4"
     regex-parser "2.2.10"
 
-adm-zip@0.4.11:
-  version "0.4.11"
-  resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.11.tgz#2aa54c84c4b01a9d0fb89bb11982a51f13e3d62a"
-  integrity sha512-L8vcjDTCOIJk7wFvmlEUN7AsSb8T+2JrdP7KINBjzr24TJ5Mwj590sLu3BC7zNZowvJWa/JtPmD8eJCzdtDWjA==
+adm-zip@0.4.4:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.4.tgz#a61ed5ae6905c3aea58b3a657d25033091052736"
+  integrity sha1-ph7VrmkFw66lizplfSUDMJEFJzY=
 
 adm-zip@^0.4.9, adm-zip@~0.4.3, adm-zip@~0.4.x:
   version "0.4.14"
@@ -2685,16 +2714,6 @@ ajv@6.12.2, ajv@^6.12.2:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^5.1.0:
-  version "5.5.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
-  integrity sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=
-  dependencies:
-    co "^4.6.0"
-    fast-deep-equal "^1.0.0"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.3.0"
-
 alphanum-sort@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
@@ -2754,7 +2773,7 @@ ansi-colors@^3.0.0:
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
   integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==
 
-ansi-escapes@^3.1.0, ansi-escapes@^3.2.0:
+ansi-escapes@^3.0.0, ansi-escapes@^3.1.0, ansi-escapes@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
   integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
@@ -3163,7 +3182,7 @@ async@^1.3.0, async@^1.5.2, async@~1.5.2:
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
   integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
 
-async@^2.0.0, async@^2.1.2, async@^2.3.0, async@^2.6.2, async@^2.6.3:
+async@^2.0.0, async@^2.0.1, async@^2.1.2, async@^2.3.0, async@^2.6.2, async@^2.6.3:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
   integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
@@ -3220,7 +3239,7 @@ aws-sign2@~0.7.0:
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
   integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
 
-aws4@^1.2.1, aws4@^1.6.0, aws4@^1.8.0:
+aws4@^1.2.1, aws4@^1.8.0:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz#7e33d8f7d449b3f673cd72deb9abdc552dbe528e"
   integrity sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==
@@ -3529,7 +3548,7 @@ braces@^2.3.1, braces@^2.3.2:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
-braces@~3.0.2:
+braces@^3.0.2, braces@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
   integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
@@ -3765,6 +3784,25 @@ bytes@3.1.0:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
   integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
 
+c8@~7.1.0:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/c8/-/c8-7.1.2.tgz#3fd785e8d264175ceffe92c74607f5cfb12f018d"
+  integrity sha512-lCEwL9lbvWOQLxoLw8RF7PM8Cdj+rKxRp/PyWC9S8xASvYHRwXQ2gxzsNTgLhQM1Utc1YDAjzQYPQIxVEyelGg==
+  dependencies:
+    "@bcoe/v8-coverage" "^0.2.3"
+    "@istanbuljs/schema" "^0.1.2"
+    find-up "^4.0.0"
+    foreground-child "^2.0.0"
+    furi "^2.0.0"
+    istanbul-lib-coverage "^3.0.0"
+    istanbul-lib-report "^3.0.0"
+    istanbul-reports "^3.0.2"
+    rimraf "^3.0.0"
+    test-exclude "^6.0.0"
+    v8-to-istanbul "^4.1.2"
+    yargs "^15.0.0"
+    yargs-parser "^18.0.0"
+
 cacache@15.0.3, cacache@^15.0.0:
   version "15.0.3"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.0.3.tgz#2225c2d1dd8e872339950d6a39c051e0e9334392"
@@ -4020,6 +4058,14 @@ chalk@^3.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
+chalk@^4.0.0, chalk@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
+  integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
 char-spinner@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/char-spinner/-/char-spinner-1.0.1.tgz#e6ea67bd247e107112983b7ab0479ed362800081"
@@ -4062,7 +4108,7 @@ check-side-effects@0.0.21:
   optionalDependencies:
     fsevents "~2.1.2"
 
-chokidar@^2.0.3, chokidar@^2.1.8:
+chokidar@^2.1.8:
   version "2.1.8"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
   integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==
@@ -4162,27 +4208,20 @@ class-utils@^0.3.5:
     isobject "^3.0.0"
     static-extend "^0.1.1"
 
-cldr-data-downloader@0.3.x:
-  version "0.3.5"
-  resolved "https://registry.yarnpkg.com/cldr-data-downloader/-/cldr-data-downloader-0.3.5.tgz#f5445cb9d222bf7fa8426c62e0ae9d7d4897b243"
-  integrity sha512-uyIMa1K98DAp/PE7dYpq2COIrkWn681Atjng1GgEzeJzYb1jANtugtp9wre6+voE+qzVC8jtWv6E/xZ1GTJdlw==
+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"
+  integrity sha1-jQyYNG0WSGJS/cmvo2pGVC/kZS8=
   dependencies:
-    adm-zip "0.4.11"
+    adm-zip "0.4.4"
     mkdirp "0.5.0"
     nopt "3.0.x"
+    npmconf "2.0.9"
     progress "1.1.8"
     q "1.0.1"
-    request "~2.87.0"
+    request "~2.74.0"
     request-progress "0.3.1"
 
-cldr-data@36.0.0:
-  version "36.0.0"
-  resolved "https://registry.yarnpkg.com/cldr-data/-/cldr-data-36.0.0.tgz#55b3a50b187c28d59203182cb57e98141558c91b"
-  integrity sha512-F3n+9DUs41vhys8eF/hsCgkmYlgXMCiwaE75uGZjUbS/jkszBnLylXj7xW3bBlMU1d2IuAptpoNAb6lTCu/RSg==
-  dependencies:
-    cldr-data-downloader "0.3.x"
-    glob "5.x.x"
-
 cldr@4.10.0:
   version "4.10.0"
   resolved "https://registry.yarnpkg.com/cldr/-/cldr-4.10.0.tgz#5a72a693728eca491bc8ee027d60fa4dc750a24f"
@@ -4252,6 +4291,11 @@ cli-spinners@^2.0.0, cli-spinners@^2.2.0:
   resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.2.0.tgz#e8b988d9206c692302d8ee834e7a85c0144d8f77"
   integrity sha512-tgU3fKwzYjiLEQgPMD9Jt+JjHVL9kW93FiIMX/l7rivvOD4/LL0Mf7gda3+4U2KJBloybwgj5KEoQgGRioMiKQ==
 
+cli-spinners@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.4.0.tgz#c6256db216b878cfba4720e719cec7cf72685d7f"
+  integrity sha512-sJAofoarcm76ZGpuooaO0eDy8saEy+YoZBLjC4h8srt4jeBnkYeOgqxgsJQTpyt2LjI5PTfLJHSL+41Yu4fEJA==
+
 cli-table@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/cli-table/-/cli-table-0.3.1.tgz#f53b05266a8b1a0b934b3d0821e6e2dc5914ae23"
@@ -4264,14 +4308,10 @@ cli-width@^2.0.0:
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
   integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=
 
-cliui@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49"
-  integrity sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==
-  dependencies:
-    string-width "^2.1.1"
-    strip-ansi "^4.0.0"
-    wrap-ansi "^2.0.0"
+cli-width@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
+  integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==
 
 cliui@^5.0.0:
   version "5.0.0"
@@ -4339,11 +4379,6 @@ cloneable-readable@^1.0.0:
     process-nextick-args "^2.0.0"
     readable-stream "^2.3.5"
 
-co@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
-  integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
-
 coa@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/coa/-/coa-2.0.2.tgz#43f6c21151b4ef2bf57187db0d73de229e3e7ec3"
@@ -4353,11 +4388,6 @@ coa@^2.0.2:
     chalk "^2.4.1"
     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"
-  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
-
 collection-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
@@ -4470,7 +4500,7 @@ compare-semver@^1.0.0:
   dependencies:
     semver "^5.0.1"
 
-compare-versions@^3.5.1:
+compare-versions@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.6.0.tgz#1a5689913685e5a87637b8d3ffca75514ec41d62"
   integrity sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA==
@@ -4567,6 +4597,14 @@ concat-stream@^2.0.0:
     readable-stream "^3.0.2"
     typedarray "^0.0.6"
 
+config-chain@~1.1.8:
+  version "1.1.12"
+  resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz#0fde8d091200eb5e808caf25fe618c02f48e4efa"
+  integrity sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==
+  dependencies:
+    ini "^1.3.4"
+    proto-list "~1.2.1"
+
 configstore@^3.0.0:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.2.tgz#c6f25defaeef26df12dd33414b001fe81a543f8f"
@@ -4839,7 +4877,7 @@ conventional-commits-parser@^3.0.3, conventional-commits-parser@^3.0.8:
     through2 "^3.0.0"
     trim-off-newlines "^1.0.0"
 
-convert-source-map@1.7.0, convert-source-map@^1.1.0, convert-source-map@^1.5.1, convert-source-map@^1.7.0:
+convert-source-map@1.7.0, convert-source-map@^1.1.0, convert-source-map@^1.5.1, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
   integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
@@ -4914,7 +4952,7 @@ core-js@3.6.4:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.4.tgz#440a83536b458114b9cb2ac1580ba377dc470647"
   integrity sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==
 
-core-js@^2.2.0, core-js@^2.4.0, core-js@^2.4.1:
+core-js@^2.4.0, core-js@^2.4.1:
   version "2.6.11"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
   integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==
@@ -5018,7 +5056,7 @@ cross-env@^5.1.3:
   dependencies:
     cross-spawn "^6.0.5"
 
-cross-spawn@^4, cross-spawn@^4.0.0:
+cross-spawn@^4.0.0:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-4.0.2.tgz#7b9247621c23adfdd3856004a823cbe397424d41"
   integrity sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=
@@ -5046,6 +5084,15 @@ cross-spawn@^6.0.0, cross-spawn@^6.0.5:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
+cross-spawn@^7.0.0:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
+  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+  dependencies:
+    path-key "^3.1.0"
+    shebang-command "^2.0.0"
+    which "^2.0.1"
+
 cryptiles@2.x.x:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
@@ -5368,7 +5415,7 @@ decamelize-keys@^1.0.0:
     decamelize "^1.1.0"
     map-obj "^1.0.0"
 
-decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0:
+decamelize@^1.1.0, decamelize@^1.1.2, decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
@@ -5643,6 +5690,11 @@ detective-typescript@^5.1.1, detective-typescript@^5.7.0:
     node-source-walk "^4.2.0"
     typescript "^3.6.4"
 
+devtools-protocol@0.0.767361:
+  version "0.0.767361"
+  resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.767361.tgz#5977f2558b84f9df36f62501bdddb82f3ae7b66b"
+  integrity sha512-ziRTdhEVQ9jEwedaUaXZ7kl9w9TF/7A3SXQ0XuqrJB+hMS62POHZUWTbumDN2ehRTfvWqTPc2Jw4gUl/jggmHA==
+
 dezalgo@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456"
@@ -6333,7 +6385,7 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
-extend@3, extend@^3.0.0, extend@^3.0.1, extend@^3.0.2, extend@~3.0.0, extend@~3.0.1, extend@~3.0.2:
+extend@3, extend@^3.0.0, extend@^3.0.1, extend@^3.0.2, extend@~3.0.0, extend@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
@@ -6397,11 +6449,6 @@ fancy-log@^1.1.0, fancy-log@^1.3.2:
     parse-node-version "^1.0.0"
     time-stamp "^1.0.0"
 
-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"
-  integrity sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=
-
 fast-deep-equal@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4"
@@ -6787,13 +6834,13 @@ for-own@^1.0.0:
   dependencies:
     for-in "^1.0.1"
 
-foreground-child@^1.5.6:
-  version "1.5.6"
-  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-1.5.6.tgz#4fd71ad2dfde96789b980a5c0a295937cb2f5ce9"
-  integrity sha1-T9ca0t/elnibmApcCilZN8svXOk=
+foreground-child@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-2.0.0.tgz#71b32800c9f15aa8f2f83f4a6bd9bff35d861a53"
+  integrity sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==
   dependencies:
-    cross-spawn "^4"
-    signal-exit "^3.0.0"
+    cross-spawn "^7.0.0"
+    signal-exit "^3.0.2"
 
 forever-agent@~0.6.1:
   version "0.6.1"
@@ -6809,6 +6856,15 @@ form-data@^3.0.0:
     combined-stream "^1.0.8"
     mime-types "^2.1.12"
 
+form-data@~1.0.0-rc4:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-1.0.1.tgz#ae315db9a4907fa065502304a66d7733475ee37c"
+  integrity sha1-rjFduaSQf6BlUCMEpm13M0de43w=
+  dependencies:
+    async "^2.0.1"
+    combined-stream "^1.0.5"
+    mime-types "^2.1.11"
+
 form-data@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.0.0.tgz#6f0aebadcc5da16c13e1ecc11137d85f9b883b25"
@@ -6818,7 +6874,7 @@ form-data@~2.0.0:
     combined-stream "^1.0.5"
     mime-types "^2.1.11"
 
-form-data@~2.3.1, form-data@~2.3.2:
+form-data@~2.3.2:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
   integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
@@ -6995,6 +7051,14 @@ function-bind@^1.1.1:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
+furi@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/furi/-/furi-2.0.0.tgz#13d85826a1af21acc691da6254b3888fc39f0b4a"
+  integrity sha512-uKuNsaU0WVaK/vmvj23wW1bicOFfyqSsAIH71bRZx8kA4Xj+YCHin7CJKJJjkIsmxYaPFLk9ljmjEyB7xF7WvQ==
+  dependencies:
+    "@types/is-windows" "^1.0.0"
+    is-windows "^1.0.2"
+
 fx-runner@1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/fx-runner/-/fx-runner-1.0.5.tgz#713519aca7598a8319e03fa1110b89b97ef1063f"
@@ -7081,11 +7145,6 @@ get-amd-module-type@^3.0.0:
     ast-module-types "^2.3.2"
     node-source-walk "^4.0.0"
 
-get-caller-file@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
-  integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
-
 get-caller-file@^2.0.1:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
@@ -7245,17 +7304,6 @@ glob2base@^0.0.12:
   dependencies:
     find-index "^0.1.1"
 
-glob@5.x.x, glob@~5.0.0:
-  version "5.0.15"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
-  integrity sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=
-  dependencies:
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "2 || 3"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
 glob@7.1.2:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
@@ -7299,6 +7347,17 @@ glob@~3.1.21:
     inherits "1"
     minimatch "~0.2.11"
 
+glob@~5.0.0:
+  version "5.0.15"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
+  integrity sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=
+  dependencies:
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "2 || 3"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 global-dirs@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445"
@@ -7652,7 +7711,7 @@ handle-thing@^2.0.0:
   resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e"
   integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==
 
-handlebars@^4.0.3, handlebars@^4.4.0:
+handlebars@^4.4.0:
   version "4.7.5"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.5.tgz#3105d3f54038976bd54e5ae0c711c70d4ed040f8"
   integrity sha512-PiM2ZRLZ0X+CIRSX66u7tkQi3rzrlSHAuioMBI1XP8DsfDaXEA+sD7Iyyoz4QACFuhX5z+IimN+n3BFWvvgWrQ==
@@ -7678,14 +7737,6 @@ har-validator@~2.0.6:
     is-my-json-valid "^2.12.4"
     pinkie-promise "^2.0.0"
 
-har-validator@~5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
-  integrity sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=
-  dependencies:
-    ajv "^5.1.0"
-    har-schema "^2.0.0"
-
 har-validator@~5.1.3:
   version "5.1.3"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
@@ -7713,11 +7764,6 @@ has-cors@1.1.0:
   resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
   integrity sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=
 
-has-flag@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
-  integrity sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=
-
 has-flag@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
@@ -7894,6 +7940,11 @@ html-entities@^1.3.1:
   resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.3.1.tgz#fb9a1a4b5b14c5daba82d3e34c6ae4fe701a0e44"
   integrity sha512-rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA==
 
+html-escaper@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
+  integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
+
 http-cache-semantics@^4.0.4:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
@@ -8054,14 +8105,14 @@ humanize-ms@^1.2.1:
   dependencies:
     ms "^2.0.0"
 
-husky@^4.2.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-4.2.3.tgz#3b18d2ee5febe99e27f2983500202daffbc3151e"
-  integrity sha512-VxTsSTRwYveKXN4SaH1/FefRJYCtx+wx04sSVcOpD7N2zjoHxa+cEJ07Qg5NmV3HAK+IRKOyNVpi2YBIVccIfQ==
+husky@^4.2.5:
+  version "4.2.5"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-4.2.5.tgz#2b4f7622673a71579f901d9885ed448394b5fa36"
+  integrity sha512-SYZ95AjKcX7goYVZtVZF2i6XiZcHknw50iXvY7b0MiGoj5RwdgRQNEHdb+gPDPCXKlzwrybjFjkL6FOj8uRhZQ==
   dependencies:
-    chalk "^3.0.0"
+    chalk "^4.0.0"
     ci-info "^2.0.0"
-    compare-versions "^3.5.1"
+    compare-versions "^3.6.0"
     cosmiconfig "^6.0.0"
     find-versions "^3.2.0"
     opencollective-postinstall "^2.0.2"
@@ -8236,12 +8287,22 @@ inherits@2.0.3:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
-ini@1.3.5, ini@^1.3.2, ini@^1.3.4, ini@~1.3.0, ini@~1.3.3:
+ini@1.3.5, 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"
   integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
 
-inquirer@7.1.0, inquirer@^7.1.0:
+inquirer-autocomplete-prompt@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/inquirer-autocomplete-prompt/-/inquirer-autocomplete-prompt-1.0.2.tgz#3f2548f73dd12f0a541be055ea9c8c7aedeb42bf"
+  integrity sha512-vNmAhhrOQwPnUm4B9kz1UB7P98rVF1z8txnjp53r40N0PBCuqoRWqjg3Tl0yz0UkDg7rEUtZ2OZpNc7jnOU9Zw==
+  dependencies:
+    ansi-escapes "^3.0.0"
+    chalk "^2.0.0"
+    figures "^2.0.0"
+    run-async "^2.3.0"
+
+inquirer@7.1.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.1.0.tgz#1298a01859883e17c7264b82870ae1034f92dd29"
   integrity sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg==
@@ -8260,6 +8321,25 @@ inquirer@7.1.0, inquirer@^7.1.0:
     strip-ansi "^6.0.0"
     through "^2.3.6"
 
+inquirer@^7.3.3:
+  version "7.3.3"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz#04d176b2af04afc157a83fd7c100e98ee0aad003"
+  integrity sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==
+  dependencies:
+    ansi-escapes "^4.2.1"
+    chalk "^4.1.0"
+    cli-cursor "^3.1.0"
+    cli-width "^3.0.0"
+    external-editor "^3.0.3"
+    figures "^3.0.0"
+    lodash "^4.17.19"
+    mute-stream "0.0.8"
+    run-async "^2.4.0"
+    rxjs "^6.6.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+    through "^2.3.6"
+
 inquirer@~6.3.1:
   version "6.3.1"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.3.1.tgz#7a413b5e7950811013a3db491c61d1f3b776e8e7"
@@ -8299,11 +8379,6 @@ invariant@^2.2.2, invariant@^2.2.4:
   dependencies:
     loose-envify "^1.0.0"
 
-invert-kv@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
-  integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==
-
 ip-regex@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
@@ -8490,13 +8565,6 @@ is-finite@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.1.0.tgz#904135c77fb42c0641d6aa1bcdbc4daa8da082f3"
   integrity sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==
 
-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"
-  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
-  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"
@@ -8851,11 +8919,6 @@ isstream@0.1.x, isstream@~0.1.2:
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
   integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
 
-istanbul-lib-coverage@^1.2.0, istanbul-lib-coverage@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.1.tgz#ccf7edcd0a0bb9b8f729feeb0930470f9af664f0"
-  integrity sha512-PzITeunAgyGbtY1ibVIUiV679EFChHjoMNRibEIobvmrCRaIgwLxNucOSimtNWUhEib/oO7QY2imD75JVgCJWQ==
-
 istanbul-lib-coverage@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec"
@@ -8874,22 +8937,22 @@ istanbul-lib-instrument@^4.0.1:
     istanbul-lib-coverage "^3.0.0"
     semver "^6.3.0"
 
-istanbul-lib-report@^1.1.3:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.1.5.tgz#f2a657fc6282f96170aaf281eb30a458f7f4170c"
-  integrity sha512-UsYfRMoi6QO/doUshYNqcKJqVmFe9w51GZz8BS3WB0lYxAllQYklka2wP9+dGZeHYaWIdcXUx8JGdbqaoXRXzw==
+istanbul-lib-report@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#7518fe52ea44de372f460a76b5ecda9ffb73d8a6"
+  integrity sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==
   dependencies:
-    istanbul-lib-coverage "^1.2.1"
-    mkdirp "^0.5.1"
-    path-parse "^1.0.5"
-    supports-color "^3.1.2"
+    istanbul-lib-coverage "^3.0.0"
+    make-dir "^3.0.0"
+    supports-color "^7.1.0"
 
-istanbul-reports@^1.3.0:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.5.1.tgz#97e4dbf3b515e8c484caea15d6524eebd3ff4e1a"
-  integrity sha512-+cfoZ0UXzWjhAdzosCPP3AN8vvef8XDkWtTfgaN+7L3YTpNYITnCaEkceo5SEYy644VkHka/P1FvkWvrG/rrJw==
+istanbul-reports@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.2.tgz#d593210e5000683750cb09fc0644e4b6e27fd53b"
+  integrity sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==
   dependencies:
-    handlebars "^4.0.3"
+    html-escaper "^2.0.0"
+    istanbul-lib-report "^3.0.0"
 
 jasmine-ajax@^4.0.0:
   version "4.0.0"
@@ -8923,7 +8986,7 @@ jasmine@2.8.0:
     glob "^7.0.6"
     jasmine-core "~2.8.0"
 
-jasmine@^3.5.0, jasmine@~3.5.0:
+jasmine@^3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-3.5.0.tgz#7101eabfd043a1fc82ac24e0ab6ec56081357f9e"
   integrity sha512-DYypSryORqzsGoMazemIHUfMkXM7I7easFaxAvNM3Mr6Xz3Fy36TupTrAOxZWN8MVKEU5xECv22J4tUQf3uBzQ==
@@ -9099,11 +9162,6 @@ json-parse-helpfulerror@^1.0.3:
   dependencies:
     jju "^1.1.0"
 
-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"
-  integrity sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=
-
 json-schema-traverse@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
@@ -9331,18 +9389,17 @@ karma-sourcemap-loader@^0.3.7:
   dependencies:
     graceful-fs "^4.1.2"
 
-karma@~4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-4.1.0.tgz#d07387c9743a575b40faf73e8a3eb5421c2193e1"
-  integrity sha512-xckiDqyNi512U4dXGOOSyLKPwek6X/vUizSy2f3geYevbLj+UIdvNwbn7IwfUIL2g1GXEPWt/87qFD1fBbl/Uw==
+karma@~4.4.0:
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/karma/-/karma-4.4.1.tgz#6d9aaab037a31136dc074002620ee11e8c2e32ab"
+  integrity sha512-L5SIaXEYqzrh6b1wqYC42tNsFMx2PWuxky84pK9coK09MvmL7mxii3G3bZBh/0rvD27lqDd0le9jyhzvwif73A==
   dependencies:
     bluebird "^3.3.0"
     body-parser "^1.16.1"
-    braces "^2.3.2"
-    chokidar "^2.0.3"
+    braces "^3.0.2"
+    chokidar "^3.0.0"
     colors "^1.1.0"
     connect "^3.6.0"
-    core-js "^2.2.0"
     di "^0.0.1"
     dom-serialize "^2.2.0"
     flatted "^2.0.0"
@@ -9350,7 +9407,7 @@ karma@~4.1.0:
     graceful-fs "^4.1.2"
     http-proxy "^1.13.0"
     isbinaryfile "^3.0.0"
-    lodash "^4.17.11"
+    lodash "^4.17.14"
     log4js "^4.0.0"
     mime "^2.3.1"
     minimatch "^3.0.2"
@@ -9414,13 +9471,6 @@ lazystream@^1.0.0, lazystream@~1.0.0:
   dependencies:
     readable-stream "^2.0.5"
 
-lcid@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf"
-  integrity sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==
-  dependencies:
-    invert-kv "^2.0.0"
-
 less-loader@6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-6.1.0.tgz#59fd591df408ced89a40fce11a2aea449b005631"
@@ -9882,6 +9932,11 @@ lodash@^4.0.0, lodash@^4.14.0, lodash@^4.16.6, lodash@^4.17.10, lodash@^4.17.11,
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
 
+lodash@^4.17.19:
+  version "4.17.19"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
+  integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
+
 lodash@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-1.0.2.tgz#8f57560c83b59fc270bd3d561b690043430e2551"
@@ -9906,6 +9961,13 @@ log-symbols@^3.0.0:
   dependencies:
     chalk "^2.4.2"
 
+log-symbols@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.0.0.tgz#69b3cc46d20f448eccdb75ea1fa733d9e821c920"
+  integrity sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==
+  dependencies:
+    chalk "^4.0.0"
+
 log4js@^4.0.0:
   version "4.5.1"
   resolved "https://registry.yarnpkg.com/log4js/-/log4js-4.5.1.tgz#e543625e97d9e6f3e6e7c9fc196dd6ab2cae30b5"
@@ -10080,13 +10142,6 @@ make-iterator@^1.0.0:
   dependencies:
     kind-of "^6.0.2"
 
-map-age-cleaner@^0.1.1:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
-  integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==
-  dependencies:
-    p-defer "^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"
@@ -10168,15 +10223,6 @@ media-typer@0.3.0:
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
   integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
 
-mem@^4.0.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178"
-  integrity sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==
-  dependencies:
-    map-age-cleaner "^0.1.1"
-    mimic-fn "^2.0.0"
-    p-is-promise "^2.0.0"
-
 memoizeasync@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/memoizeasync/-/memoizeasync-1.1.0.tgz#9d7028a6f266deb733510bb7dbba5f51878c561e"
@@ -10337,7 +10383,7 @@ mimic-fn@^1.0.0:
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
   integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
 
-mimic-fn@^2.0.0, mimic-fn@^2.1.0:
+mimic-fn@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
@@ -10513,6 +10559,11 @@ mississippi@^3.0.0:
     stream-each "^1.1.0"
     through2 "^2.0.0"
 
+mitt@^2.0.1:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/mitt/-/mitt-2.1.0.tgz#f740577c23176c6205b121b2973514eade1b2230"
+  integrity sha512-ILj2TpLiysu2wkBbWjAmww7TkZb65aiQO+DkVdUTBpBXq+MHYiETENkKFMtsJZX1Lf4pe4QOrTSjIfUwN5lRdg==
+
 mixin-deep@^1.2.0:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
@@ -10660,7 +10711,7 @@ multicast-dns@^6.0.1:
     dns-packet "^1.3.1"
     thunky "^1.0.2"
 
-multimatch@^4.0.0:
+multimatch@*, multimatch@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-4.0.0.tgz#8c3c0f6e3e8449ada0af3dd29efb491a375191b3"
   integrity sha512-lDmx79y1z6i7RNx0ZGCPq1bzJ6ZoDDKbvh7jxr9SJcWLkShMzXrHbYVpTdnhNM5MXpDUxCQ4DgqVttVXlBgiBQ==
@@ -10852,7 +10903,7 @@ nodejs-websocket@^1.7.2:
   resolved "https://registry.yarnpkg.com/nodejs-websocket/-/nodejs-websocket-1.7.2.tgz#94abd1e248f57d4d1c663dec3831015c6dad98a6"
   integrity sha512-PFX6ypJcCNDs7obRellR0DGTebfUhw1SXGKe2zpB+Ng1DQJhdzbzx1ob+AvJCLzy2TJF4r8cCDqMQqei1CZdPQ==
 
-nopt@3.0.x, nopt@^3.0.1:
+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"
   integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k=
@@ -10985,6 +11036,21 @@ npm-run-path@^2.0.0:
   dependencies:
     path-key "^2.0.0"
 
+npmconf@2.0.9:
+  version "2.0.9"
+  resolved "https://registry.yarnpkg.com/npmconf/-/npmconf-2.0.9.tgz#5c87e5fb308104eceeca781e3d9115d216351ef2"
+  integrity sha1-XIfl+zCBBOzuyngePZEV0hY1HvI=
+  dependencies:
+    config-chain "~1.1.8"
+    inherits "~2.0.0"
+    ini "^1.2.0"
+    mkdirp "^0.5.0"
+    nopt "~3.0.1"
+    once "~1.3.0"
+    osenv "^0.1.0"
+    semver "2 || 3 || 4"
+    uid-number "0.0.5"
+
 nth-check@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"
@@ -11007,7 +11073,7 @@ number-is-nan@^1.0.0:
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
   integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
 
-oauth-sign@~0.8.1, oauth-sign@~0.8.2:
+oauth-sign@~0.8.1:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
   integrity sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=
@@ -11281,6 +11347,20 @@ ora@^3.4.0:
     strip-ansi "^5.2.0"
     wcwidth "^1.0.1"
 
+ora@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/ora/-/ora-5.0.0.tgz#4f0b34f2994877b49b452a707245ab1e9f6afccb"
+  integrity sha512-s26qdWqke2kjN/wC4dy+IQPBIMWBJlSU/0JZhk30ZDBLelW25rv66yutUWARMigpGPzcXHb+Nac5pNhN/WsARw==
+  dependencies:
+    chalk "^4.1.0"
+    cli-cursor "^3.1.0"
+    cli-spinners "^2.4.0"
+    is-interactive "^1.0.0"
+    log-symbols "^4.0.0"
+    mute-stream "0.0.8"
+    strip-ansi "^6.0.0"
+    wcwidth "^1.0.1"
+
 orchestrator@^0.3.0:
   version "0.3.8"
   resolved "https://registry.yarnpkg.com/orchestrator/-/orchestrator-0.3.8.tgz#14e7e9e2764f7315fbac184e506c7aa6df94ad7e"
@@ -11307,20 +11387,11 @@ os-browserify@^0.3.0:
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
   integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
 
-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"
   integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
 
-os-locale@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
-  integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==
-  dependencies:
-    execa "^1.0.0"
-    lcid "^2.0.0"
-    mem "^4.0.0"
-
 os-name@^3.0.0, os-name@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/os-name/-/os-name-3.1.0.tgz#dec19d966296e1cd62d701a5a66ee1ddeae70801"
@@ -11334,21 +11405,24 @@ os-shim@^0.1.2:
   resolved "https://registry.yarnpkg.com/os-shim/-/os-shim-0.1.3.tgz#6b62c3791cf7909ea35ed46e17658bb417cb3917"
   integrity sha1-a2LDeRz3kJ6jXtRuF2WLtBfLORc=
 
-os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
+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"
   integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
+osenv@^0.1.0:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
+  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
+  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"
   integrity sha1-8phS5w/X4l82DgE6jsRMgq7bVwg=
 
-p-defer@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
-  integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=
-
 p-defer@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-3.0.0.tgz#d1dceb4ee9b2b604b1d94ffec83760175d4e6f83"
@@ -11359,11 +11433,6 @@ p-finally@^1.0.0:
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
   integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
 
-p-is-promise@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e"
-  integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==
-
 p-limit@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
@@ -11642,6 +11711,11 @@ path-key@^2.0.0, path-key@^2.0.1:
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
   integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
 
+path-key@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
+  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
+
 path-parse@^1.0.5, path-parse@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
@@ -12338,6 +12412,11 @@ propagate@^2.0.0:
   resolved "https://registry.yarnpkg.com/propagate/-/propagate-2.0.1.tgz#40cdedab18085c792334e64f0ac17256d38f9a45"
   integrity sha512-vGrhOavPSTz4QVNuBNdcNXePNdNMaO1xj9yBeH1ScQPjk/rhg9sSlCXPhMkFuaNNW/syTvYqsnbIJxMBfRbbag==
 
+proto-list@~1.2.1:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
+  integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=
+
 protobufjs@6.8.8:
   version "6.8.8"
   resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.8.8.tgz#c8b4f1282fd7a90e6f5b109ed11c84af82908e7c"
@@ -12494,15 +12573,18 @@ punycode@^2.1.0, punycode@^2.1.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
-puppeteer@3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-3.3.0.tgz#95839af9fdc0aa4de7e5ee073a4c0adeb9e2d3d7"
-  integrity sha512-23zNqRltZ1PPoK28uRefWJ/zKb5Jhnzbbwbpcna2o5+QMn17F0khq5s1bdH3vPlyj+J36pubccR8wiNA/VE0Vw==
+puppeteer@5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-5.1.0.tgz#e7bae2caa6e3a13a622755e4c27689d9812c38ca"
+  integrity sha512-IZBFG8XcA+oHxYo5rEpJI/HQignUis2XPijPoFpNxla2O+WufonGsUsSqrhRXgBKOME5zNfhRdUY2LvxAiKlhw==
   dependencies:
     debug "^4.1.0"
+    devtools-protocol "0.0.767361"
     extract-zip "^2.0.0"
     https-proxy-agent "^4.0.0"
     mime "^2.0.3"
+    mitt "^2.0.1"
+    pkg-dir "^4.2.0"
     progress "^2.0.1"
     proxy-from-env "^1.0.0"
     rimraf "^3.0.2"
@@ -12550,7 +12632,7 @@ qs@~6.4.0:
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
   integrity sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=
 
-qs@~6.5.1, qs@~6.5.2:
+qs@~6.5.2:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
   integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
@@ -12683,14 +12765,6 @@ read-pkg-up@^3.0.0:
     find-up "^2.0.0"
     read-pkg "^3.0.0"
 
-read-pkg-up@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-4.0.0.tgz#1b221c6088ba7799601c808f91161c66e58f8978"
-  integrity sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==
-  dependencies:
-    find-up "^3.0.0"
-    read-pkg "^3.0.0"
-
 read-pkg@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
@@ -13025,42 +13099,38 @@ request@2.x, request@^2.79.0, request@^2.83.0, request@^2.87.0, request@^2.88.0:
     tunnel-agent "^0.6.0"
     uuid "^3.3.2"
 
-request@~2.87.0:
-  version "2.87.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.87.0.tgz#32f00235cd08d482b4d0d68db93a829c0ed5756e"
-  integrity sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==
+request@~2.74.0:
+  version "2.74.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.74.0.tgz#7693ca768bbb0ea5c8ce08c084a45efa05b892ab"
+  integrity sha1-dpPKdou7DqXIzgjAhKRe+gW4kqs=
   dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.6.0"
-    caseless "~0.12.0"
+    aws-sign2 "~0.6.0"
+    aws4 "^1.2.1"
+    bl "~1.1.2"
+    caseless "~0.11.0"
     combined-stream "~1.0.5"
-    extend "~3.0.1"
+    extend "~3.0.0"
     forever-agent "~0.6.1"
-    form-data "~2.3.1"
-    har-validator "~5.0.3"
-    http-signature "~1.2.0"
+    form-data "~1.0.0-rc4"
+    har-validator "~2.0.6"
+    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.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"
+    mime-types "~2.1.7"
+    node-uuid "~1.4.7"
+    oauth-sign "~0.8.1"
+    qs "~6.2.0"
+    stringstream "~0.0.4"
+    tough-cookie "~2.3.0"
+    tunnel-agent "~0.4.1"
 
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
   integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
 
-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"
-  integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=
-
 require-main-filename@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
@@ -13239,7 +13309,7 @@ rgba-regex@^1.0.0:
   resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3"
   integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=
 
-rimraf@2, rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.2, rimraf@^2.6.3, rimraf@^2.7.1:
+rimraf@2, rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.3, rimraf@^2.7.1:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
   integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
@@ -13373,6 +13443,11 @@ run-async@^2.2.0, run-async@^2.4.0:
   dependencies:
     is-promise "^2.1.0"
 
+run-async@^2.3.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
+  integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
+
 run-queue@^1.0.0, run-queue@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
@@ -13394,6 +13469,13 @@ rxjs@6.5.5:
   dependencies:
     tslib "^1.9.0"
 
+rxjs@^6.6.0:
+  version "6.6.2"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.2.tgz#8096a7ac03f2cc4fe5860ef6e572810d9e01c0d2"
+  integrity sha512-BHdBMVoWC2sL26w//BCu3YzKT4s2jip/WhwsGEDmeKYBhKDZeYezVUnHatYB7L85v5xs0BAQmg6BEYJEKxBabg==
+  dependencies:
+    tslib "^1.9.0"
+
 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"
@@ -13452,9 +13534,9 @@ sauce-connect-launcher@^1.2.4:
     lodash "^4.16.6"
     rimraf "^2.5.4"
 
-"sauce-connect@https://saucelabs.com/downloads/sc-4.5.1-linux.tar.gz":
+"sauce-connect@https://saucelabs.com/downloads/sc-4.6.2-linux.tar.gz":
   version "0.0.0"
-  resolved "https://saucelabs.com/downloads/sc-4.5.1-linux.tar.gz#5ca9328724c5ff16b12ea49e7a748d44f7305be5"
+  resolved "https://saucelabs.com/downloads/sc-4.6.2-linux.tar.gz#7b7f35433af9c3380758e048894d7b9aecf3754e"
 
 saucelabs@^1.5.0:
   version "1.5.0"
@@ -13567,6 +13649,11 @@ semver-regex@^2.0.0:
   resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-2.0.0.tgz#a93c2c5844539a770233379107b38c7b4ac9d338"
   integrity sha512-mUdIBBvdn0PLOeP3TEkMH7HHeUP3GjsXCwKarjv/kGmUFOYg1VqEemKhoQpWMu6X2I8kHeuVdGibLGkVK+/5Qw==
 
+"semver@2 || 3 || 4", semver@^4.1.0:
+  version "4.3.6"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
+  integrity sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=
+
 "semver@2 || 3 || 4 || 5", semver@^5.0.0, semver@^5.0.1, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.1:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
@@ -13597,11 +13684,6 @@ semver@7.3.2, semver@^7.0.0, semver@^7.1.1, semver@^7.1.3, semver@^7.3.2:
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
   integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
 
-semver@^4.1.0:
-  version "4.3.6"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
-  integrity sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=
-
 semver@^6.0.0, semver@^6.2.0, semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
@@ -13751,11 +13833,23 @@ shebang-command@^1.2.0:
   dependencies:
     shebang-regex "^1.0.0"
 
+shebang-command@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
+  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
+  dependencies:
+    shebang-regex "^3.0.0"
+
 shebang-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
   integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
 
+shebang-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
+  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
+
 shell-quote@1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.6.1.tgz#f4781949cce402697127430ea3b3c5476f481767"
@@ -14071,18 +14165,6 @@ spawn-sync@1.0.15:
     concat-stream "^1.4.7"
     os-shim "^0.1.2"
 
-spawn-wrap@^1.4.2:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/spawn-wrap/-/spawn-wrap-1.4.3.tgz#81b7670e170cca247d80bf5faf0cfb713bdcf848"
-  integrity sha512-IgB8md0QW/+tWqcavuFgKYR/qIRvJkRLPJDFaoXtLLUaVcCDK0+HeFTkmQHj3eprcYhc+gOl0aEA1w7qZlYezw==
-  dependencies:
-    foreground-child "^1.5.6"
-    mkdirp "^0.5.0"
-    os-homedir "^1.0.1"
-    rimraf "^2.6.2"
-    signal-exit "^3.0.2"
-    which "^1.3.0"
-
 spdx-correct@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4"
@@ -14307,15 +14389,6 @@ string-length@^1.0.0:
   dependencies:
     strip-ansi "^3.0.0"
 
-string-width@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
-  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
-  dependencies:
-    code-point-at "^1.0.0"
-    is-fullwidth-code-point "^1.0.0"
-    strip-ansi "^3.0.0"
-
 string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
@@ -14568,13 +14641,6 @@ supports-color@^2.0.0:
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
   integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
 
-supports-color@^3.1.2:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
-  integrity sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=
-  dependencies:
-    has-flag "^1.0.0"
-
 supports-color@^5.0.0, supports-color@^5.3.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
@@ -14784,15 +14850,14 @@ terser@^4.1.2, terser@^4.4.0:
     source-map "~0.6.1"
     source-map-support "~0.5.12"
 
-test-exclude@^5.2.2:
-  version "5.2.3"
-  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-5.2.3.tgz#c3d3e1e311eb7ee405e092dac10aefd09091eac0"
-  integrity sha512-M+oxtseCFO3EDtAaGH7iiej3CBkzXqFMbzqYAACdzKui4eZA+pq3tZEwChvOdNfa7xxy8BfbmgJSIr43cC/+2g==
+test-exclude@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e"
+  integrity sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==
   dependencies:
-    glob "^7.1.3"
+    "@istanbuljs/schema" "^0.1.2"
+    glob "^7.1.4"
     minimatch "^3.0.4"
-    read-pkg-up "^4.0.0"
-    require-main-filename "^2.0.0"
 
 text-extensions@^1.0.0:
   version "1.9.0"
@@ -14995,7 +15060,7 @@ touch@0.0.3:
   dependencies:
     nopt "~1.0.10"
 
-tough-cookie@~2.3.0, tough-cookie@~2.3.3:
+tough-cookie@~2.3.0:
   version "2.3.4"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
   integrity sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==
@@ -15100,6 +15165,11 @@ tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35"
   integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==
 
+tslib@^1.13.0:
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043"
+  integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==
+
 tslint-eslint-rules@5.4.0:
   version "5.4.0"
   resolved "https://registry.yarnpkg.com/tslint-eslint-rules/-/tslint-eslint-rules-5.4.0.tgz#e488cc9181bf193fe5cd7bfca213a7695f1737b5"
@@ -15114,10 +15184,10 @@ tslint-no-toplevel-property-access@0.0.2:
   resolved "https://registry.yarnpkg.com/tslint-no-toplevel-property-access/-/tslint-no-toplevel-property-access-0.0.2.tgz#c9b19bbd525ea7b8577e5ada601cc8625b4ed004"
   integrity sha512-Oc+UUurlGLBkgeUSGxMoTpRUpaXsjqzQCEAYrYQyuU8330fi5FKlye5n53y87EJ24AlfdoxMPV7DJfFOADapfg==
 
-tslint@6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/tslint/-/tslint-6.0.0.tgz#1c0148beac4779924216302f192cdaa153618310"
-  integrity sha512-9nLya8GBtlFmmFMW7oXXwoXS1NkrccqTqAtwXzdPV9e2mqSEvCki6iHL/Fbzi5oqbugshzgGPk7KBb2qNP1DSA==
+tslint@6.1.3:
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/tslint/-/tslint-6.1.3.tgz#5c23b2eccc32487d5523bd3a470e9aa31789d904"
+  integrity sha512-IbR4nkT96EQOvKE2PW/djGz8iGNeJ4rF2mBfiYaR/nvUWYKJhLwimoJKgjIFEIDibBtOevj7BqCRL4oHeWWUCg==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     builtin-modules "^1.1.1"
@@ -15127,10 +15197,10 @@ tslint@6.0.0:
     glob "^7.1.1"
     js-yaml "^3.13.1"
     minimatch "^3.0.4"
-    mkdirp "^0.5.1"
+    mkdirp "^0.5.3"
     resolve "^1.3.2"
     semver "^5.3.0"
-    tslib "^1.10.0"
+    tslib "^1.13.0"
     tsutils "^2.29.0"
 
 tslint@~5.1.0:
@@ -15263,10 +15333,10 @@ typescript@~3.7.2:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.5.tgz#0692e21f65fd4108b9330238aac11dd2e177a1ae"
   integrity sha512-/P5lkRXkWHNAbcJIiHPfRoKqyd7bsyCma1hZNUGfn20qm64T6ZBlrzprymeu918H+mB/0rIg2gGK/BXkhhYgBw==
 
-typescript@~3.9.5:
-  version "3.9.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.5.tgz#586f0dba300cde8be52dd1ac4f7e1009c1b13f36"
-  integrity sha512-hSAifV3k+i6lEoCJ2k6R2Z/rp/H3+8sdmcn5NrS3/3kE7+RyZXm9aqvxWqjEXHAd8b0pShatpcdMTvEdvAJltQ==
+typescript@~4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.2.tgz#7ea7c88777c723c681e33bf7988be5d008d05ac2"
+  integrity sha512-e4ERvRV2wb+rRZ/IQeb3jm2VxBsirQLpQhdxplZ2MEzGvDkkMmPglecnNDfSUBivMjP93vRbngYYDQqQ/78bcQ==
 
 uglify-js@^1.3.3:
   version "1.3.5"
@@ -15281,6 +15351,11 @@ uglify-js@^3.1.4:
     commander "~2.20.3"
     source-map "~0.6.1"
 
+uid-number@0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.5.tgz#5a3db23ef5dbd55b81fce0ec9a2ac6fccdebb81e"
+  integrity sha1-Wj2yPvXb1VuB/ODsmirG/M3ruB4=
+
 ultron@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c"
@@ -15623,34 +15698,19 @@ uuid@7.0.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.2.tgz#7ff5c203467e91f5e0d85cfcbaaf7d2ebbca9be6"
   integrity sha512-vy9V/+pKG+5ZTYKf+VcphF5Oc6EFiu3W8Nv3P3zIh0EqVI80ZxOzuPfe9EHjkFNvf8+xuTHVeei4Drydlx4zjw==
 
-uuid@^3.0.0, uuid@^3.1.0, uuid@^3.3.2, uuid@^3.4.0:
+uuid@^3.0.0, uuid@^3.3.2, uuid@^3.4.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
-v8-coverage@1.0.9:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/v8-coverage/-/v8-coverage-1.0.9.tgz#780889680c0fea0f587adf22e2b5f443b9434745"
-  integrity sha512-JolsCH1JDI2QULrxkAGZaovJPvg/Q0p20Uj0F5N8fPtYDtz38gNBRPQ/WVXlLLd3d8WHvKN96AfE4XFk4u0g2g==
+v8-to-istanbul@^4.1.2:
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-4.1.4.tgz#b97936f21c0e2d9996d4985e5c5156e9d4e49cd6"
+  integrity sha512-Rw6vJHj1mbdK8edjR7+zuJrpDtKIgNdAvTSAcpYfgMIw+u2dPDntD3dgN4XQFLU2/fvFQdzj+EeSGfd/jnY5fQ==
   dependencies:
-    debug "^3.1.0"
-    foreground-child "^1.5.6"
-    istanbul-lib-coverage "^1.2.0"
-    istanbul-lib-report "^1.1.3"
-    istanbul-reports "^1.3.0"
-    mkdirp "^0.5.1"
-    rimraf "^2.6.2"
-    signal-exit "^3.0.2"
-    spawn-wrap "^1.4.2"
-    test-exclude "^5.2.2"
-    uuid "^3.3.2"
-    v8-to-istanbul "1.2.0"
-    yargs "^11.0.0"
-
-v8-to-istanbul@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-1.2.0.tgz#f6a22ffb08b2202aaba8c2be497d1d41fe8fb4b6"
-  integrity sha512-rVSmjdEfJmOHN8GYCbg+XUhbzXZr7DzdaXIslB9DdcopGZEMsW5x5qIdxr/8DcW7msULHNnvs/xUY1TszvhKRw==
+    "@types/istanbul-lib-coverage" "^2.0.1"
+    convert-source-map "^1.6.0"
+    source-map "^0.7.3"
 
 v8flags@^2.0.2:
   version "2.1.1"
@@ -16037,14 +16097,14 @@ which@1.2.4:
     is-absolute "^0.1.7"
     isexe "^1.1.1"
 
-which@^1.2.1, which@^1.2.14, which@^1.2.9, which@^1.3.0:
+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"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
   dependencies:
     isexe "^2.0.0"
 
-which@^2.0.2:
+which@^2.0.1, which@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
   integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
@@ -16107,14 +16167,6 @@ worker-plugin@4.0.3:
   dependencies:
     loader-utils "^1.1.0"
 
-wrap-ansi@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
-  integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=
-  dependencies:
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-
 wrap-ansi@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
@@ -16246,11 +16298,6 @@ xpath@^0.0.27:
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
   integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
 
-y18n@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
-  integrity sha1-bRX7qITAhnnA136I53WegR4H+kE=
-
 y18n@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
@@ -16271,6 +16318,11 @@ yallist@^4.0.0:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
+yaml@*, yaml@^1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.0.tgz#3b593add944876077d4d683fee01081bd9fff31e"
+  integrity sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg==
+
 yaml@^1.7.2:
   version "1.8.3"
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.8.3.tgz#2f420fca58b68ce3a332d0ca64be1d191dd3f87a"
@@ -16301,56 +16353,14 @@ yargs-parser@^15.0.1:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^18.1.0:
-  version "18.1.2"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.2.tgz#2f482bea2136dbde0861683abea7756d30b504f1"
-  integrity sha512-hlIPNR3IzC1YuL1c2UwwDKpXlNFBqD1Fswwh1khz5+d8Cq/8yc/Mn0i+rQXduu8hcrFKvO7Eryk+09NecTQAAQ==
+yargs-parser@^18.0.0, yargs-parser@^18.1.1, yargs-parser@^18.1.2:
+  version "18.1.3"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
+  integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
   dependencies:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^9.0.2:
-  version "9.0.2"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-9.0.2.tgz#9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077"
-  integrity sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=
-  dependencies:
-    camelcase "^4.1.0"
-
-yargs@15.3.0:
-  version "15.3.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.3.0.tgz#403af6edc75b3ae04bf66c94202228ba119f0976"
-  integrity sha512-g/QCnmjgOl1YJjGsnUg2SatC7NUYEiLXJqxNOQU9qSpjzGtGXda9b+OKccr1kLTy8BN9yqEyqfq5lxlwdc13TA==
-  dependencies:
-    cliui "^6.0.0"
-    decamelize "^1.2.0"
-    find-up "^4.1.0"
-    get-caller-file "^2.0.1"
-    require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
-    set-blocking "^2.0.0"
-    string-width "^4.2.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^18.1.0"
-
-yargs@^11.0.0:
-  version "11.1.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.1.1.tgz#5052efe3446a4df5ed669c995886cc0f13702766"
-  integrity sha512-PRU7gJrJaXv3q3yQZ/+/X6KBswZiaQ+zOmdprZcouPYtQgvNU35i+68M4b1ZHLZtYFT5QObFLV+ZkmJYcwKdiw==
-  dependencies:
-    cliui "^4.0.0"
-    decamelize "^1.1.1"
-    find-up "^2.1.0"
-    get-caller-file "^1.0.1"
-    os-locale "^3.1.0"
-    require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
-    set-blocking "^2.0.0"
-    string-width "^2.0.0"
-    which-module "^2.0.0"
-    y18n "^3.2.1"
-    yargs-parser "^9.0.2"
-
 yargs@^13.3.2:
   version "13.3.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
@@ -16384,6 +16394,40 @@ yargs@^14.2.3:
     y18n "^4.0.0"
     yargs-parser "^15.0.1"
 
+yargs@^15.0.0:
+  version "15.3.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.3.1.tgz#9505b472763963e54afe60148ad27a330818e98b"
+  integrity sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==
+  dependencies:
+    cliui "^6.0.0"
+    decamelize "^1.2.0"
+    find-up "^4.1.0"
+    get-caller-file "^2.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^2.0.0"
+    set-blocking "^2.0.0"
+    string-width "^4.2.0"
+    which-module "^2.0.0"
+    y18n "^4.0.0"
+    yargs-parser "^18.1.1"
+
+yargs@^15.4.1:
+  version "15.4.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
+  integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==
+  dependencies:
+    cliui "^6.0.0"
+    decamelize "^1.2.0"
+    find-up "^4.1.0"
+    get-caller-file "^2.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^2.0.0"
+    set-blocking "^2.0.0"
+    string-width "^4.2.0"
+    which-module "^2.0.0"
+    y18n "^4.0.0"
+    yargs-parser "^18.1.2"
+
 yauzl@^2.10.0:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"