release: cut the v10.0.0 release

Mostly just adding links to the migrations that were missing, adding the migrations into the navbar,
as well as correcting the @angular/bazel removal in the update guide.

I also added a commented out preamble for the release notes.

PR Close #37705

.bazelrc

@@ -33,6 +33,11 @@ build --incompatible_strict_action_env
 run --incompatible_strict_action_env
 test --incompatible_strict_action_env
 
+# Do not build runfile trees by default. If an execution strategy relies on runfile
+# symlink teee, the tree is created on-demand. See: https://github.com/bazelbuild/bazel/issues/6627
+# and https://github.com/bazelbuild/bazel/commit/03246077f948f2790a83520e7dccc2625650e6df
+build --nobuild_runfile_links
+
 ###############################
 # Release support             #
 # Turn on these settings with #

.bazelversion

@@ -1,3 +1,3 @@
-2.1.1
+3.2.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

.circleci/README.md

@@ -12,8 +12,8 @@ We use this as a symmetric AES encryption key to encrypt tokens like
 a GitHub token that enables publishing snapshots.
 
 To create the github_token file, we take this approach:
-- Find the angular-builds:token in http://valentine
+- Find the angular-builds:token in the internal pw database
 - Go inside the CircleCI default docker image so you use the same version of openssl as we will at runtime: `docker run --rm -it circleci/node:10.12`
 - echo "https://[token]:@github.com" > credentials
 - openssl aes-256-cbc -e -in credentials -out .circleci/github_token -k $KEY
-- If needed, base64-encode the result so you can copy-paste it out of docker: `base64 github_token`
+- If needed, base64-encode the result so you can copy-paste it out of docker: `base64 github_token`

.circleci/bazel.linux.rc

@@ -19,4 +19,12 @@ build --local_ram_resources=14336
 
 # All build executed remotely should be done using our RBE configuration.
 build:remote --google_default_credentials
+
+# Upload to GCP's Build Status viewer to allow for us to have better viewing of execution/build
+# logs. This is only done on CI as the BES (GCP's Build Status viewer) API requires credentials
+# from service accounts, rather than end user accounts.
+build:remote --bes_backend=buildeventservice.googleapis.com
+build:remote --bes_timeout=30s
+build:remote --bes_results_url="https://source.cloud.google.com/results/invocations/"
+
 build --config=remote

.circleci/config.yml

@@ -22,18 +22,18 @@ version: 2.1
 # **NOTE 1 **: If you change the cache key prefix, also sync the cache_key_fallback to match.
 # **NOTE 2 **: Keep the static part of the cache key as prefix to enable correct fallbacks.
 # See https://circleci.com/docs/2.0/caching/#restoring-cache for how prefixes work in CircleCI.
-var_3: &cache_key v6-angular-node-12-{{ checksum ".bazelversion" }}-{{ checksum "yarn.lock" }}-{{ checksum "WORKSPACE" }}-{{ checksum "packages/bazel/package.bzl" }}-{{ checksum "aio/yarn.lock" }}
+var_3: &cache_key v7-angular-node-12-{{ checksum ".bazelversion" }}-{{ checksum "yarn.lock" }}-{{ checksum "WORKSPACE" }}-{{ checksum "packages/bazel/package.bzl" }}-{{ checksum "aio/yarn.lock" }}
 # We invalidate the cache if the Bazel version changes because otherwise the `bazelisk` cache
 # 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 v6-angular-node-12-{{ checksum ".bazelversion" }}
+var_4: &cache_key_fallback v7-angular-node-12-{{ checksum ".bazelversion" }}
-var_3_win: &cache_key_win v6-angular-win-node-12-{{ checksum ".bazelversion" }}-{{ checksum "yarn.lock" }}-{{ checksum "WORKSPACE" }}-{{ checksum "packages/bazel/package.bzl" }}-{{ checksum "aio/yarn.lock" }}
+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 v6-angular-win-node-12-{{ checksum ".bazelversion" }}
+var_4_win: &cache_key_win_fallback v7-angular-win-node-12-{{ checksum ".bazelversion" }}
 
 # Cache key for the `components-repo-unit-tests` job. **Note** when updating the SHA in the
 # cache keys also update the SHA for the "COMPONENTS_REPO_COMMIT" environment variable.
-var_5: &components_repo_unit_tests_cache_key v6-angular-components-598db096e668aa7e9debd56eedfd127b7a55e371
+var_5: &components_repo_unit_tests_cache_key v7-angular-components-189d98e8b01b33974328255f085de04251d61567
-var_6: &components_repo_unit_tests_cache_key_fallback v6-angular-components-
+var_6: &components_repo_unit_tests_cache_key_fallback v7-angular-components-
 
 # Workspace initially persisted by the `setup` job, and then enhanced by `build-npm-packages` and
 # `build-ivy-npm-packages`.
@@ -67,9 +67,6 @@ var_10: &only_on_master
 # **NOTE 1**: Pin to exact images using an ID (SHA). See https://circleci.com/docs/2.0/circleci-images/#using-a-docker-image-id-to-pin-an-image-to-a-fixed-version.
 #             (Using the tag in not necessary when pinning by ID, but include it anyway for documentation purposes.)
 # **NOTE 2**: If you change the version of the docker images, also change the `cache_key` suffix.
-# **NOTE 3**: If you change the version of the `*-browsers` docker image, make sure the
-#             `--versions.chrome` arg in `integration/bazel-schematics/test.sh` specifies a
-#             ChromeDriver version that is compatible with the Chrome version in the image.
 executors:
   default-executor:
     parameters:
@@ -120,7 +117,7 @@ commands:
             sudo apt-get update
             # Install GTK+ graphical user interface (libgtk-3-0), advanced linux sound architecture (libasound2)
             # and network security service libraries (libnss3) & X11 Screen Saver extension library (libssx1)
-            # which are dependendies of chrome & needed for karma & protractor headless chrome tests.
+            # which are dependencies of chrome & needed for karma & protractor headless chrome tests.
             # This is a very small install which takes around 7s in comparing to using the full
             # circleci/node:x.x.x-browsers image.
             sudo apt-get -y install libgtk-3-0 libasound2 libnss3 libxss1
@@ -163,7 +160,7 @@ commands:
     description: Sets up a domain that resolves to the local host.
     steps:
       - run:
-          name: Preparing environment for running tests on Saucelabs.
+          name: Preparing environment for running tests on Sauce Labs.
           command: |
             # For SauceLabs jobs, we set up a domain which resolves to the machine which launched
             # the tunnel. We do this because devices are sometimes not able to properly resolve
@@ -175,13 +172,13 @@ commands:
             setSecretVar SAUCE_ACCESS_KEY $(echo $SAUCE_ACCESS_KEY | rev)
       - run:
           # Sets up a local domain in the machine's host file that resolves to the local
-          # host. This domain is helpful in Saucelabs tests where devices are not able to
+          # host. This domain is helpful in Sauce Labs tests where devices are not able to
           # properly resolve `localhost` or `127.0.0.1` through the sauce-connect tunnel.
           name: Setting up alias domain for local host.
           command: echo "127.0.0.1 $SAUCE_LOCALHOST_ALIAS_DOMAIN" | sudo tee -a /etc/hosts
 
   # Normally this would be an individual job instead of a command.
-  # But startup and setup time for each invidual windows job are high enough to discourage
+  # But startup and setup time for each individual windows job are high enough to discourage
   # many small jobs, so instead we use a command for setup unless the gain becomes significant.
   setup_win:
     description: Setup windows node environment
@@ -384,10 +381,6 @@ jobs:
       - custom_attach_workspace
       - init_environment
       - install_chrome_libs
-        # Compile dependencies to ivy
-        # Running `ngcc` here (instead of implicitly via `ng build`) allows us to take advantage of
-        # the parallel, async mode speed-up (~20-25s on CI).
-      - run: yarn --cwd aio ngcc --properties es2015
         # Build aio
       - run: yarn --cwd aio build --progress=false
         # Lint the code
@@ -603,8 +596,8 @@ jobs:
       - run:
           name: Decrypt github credentials
           # We need ensure that the same default digest is used for encoding and decoding with
-          # openssl. Openssl versions might have different default digests which can cause
+          # OpenSSL. OpenSSL versions might have different default digests which can cause
-          # decryption failures based on the installed openssl version. https://stackoverflow.com/a/39641378/4317734
+          # decryption failures based on the installed OpenSSL version. https://stackoverflow.com/a/39641378/4317734
           command: 'openssl aes-256-cbc -d -in .circleci/github_token -md md5 -k "${KEY}" -out ~/.git_credentials'
       - run: ./scripts/ci/publish-build-artifacts.sh
 

.circleci/env.sh

@@ -5,87 +5,76 @@ readonly projectDir=$(realpath "$(dirname ${BASH_SOURCE[0]})/..")
 readonly envHelpersPath="$projectDir/.circleci/env-helpers.inc.sh";
 readonly bashEnvCachePath="$projectDir/.circleci/bash_env_cache";
 
-if [ -f $bashEnvCachePath ]; then
+# Load helpers and make them available everywhere (through `$BASH_ENV`).
-  # Since a bash env cache is present, load this into the $BASH_ENV
+source $envHelpersPath;
-  cat "$bashEnvCachePath" >> $BASH_ENV;
+echo "source $envHelpersPath;" >> $BASH_ENV;
-  echo "BASH environment loaded from cached value at $bashEnvCachePath";
-else
-  # Since no bash env cache is present, build out $BASH_ENV values.
-
-  # Load helpers and make them available everywhere (through `$BASH_ENV`).
-  source $envHelpersPath;
-  echo "source $envHelpersPath;" >> $BASH_ENV;
 
 
-  ####################################################################################################
+####################################################################################################
-  # Define PUBLIC environment variables for CircleCI.
+# Define PUBLIC environment variables for CircleCI.
-  ####################################################################################################
+####################################################################################################
-  # See https://circleci.com/docs/2.0/env-vars/#built-in-environment-variables for more info.
+# See https://circleci.com/docs/2.0/env-vars/#built-in-environment-variables for more info.
-  ####################################################################################################
+####################################################################################################
-  setPublicVar CI "$CI"
+setPublicVar CI "$CI"
-  setPublicVar PROJECT_ROOT "$projectDir";
+setPublicVar PROJECT_ROOT "$projectDir";
-  setPublicVar CI_AIO_MIN_PWA_SCORE "95";
+setPublicVar CI_AIO_MIN_PWA_SCORE "95";
-  # This is the branch being built; e.g. `pull/12345` for PR builds.
+# This is the branch being built; e.g. `pull/12345` for PR builds.
-  setPublicVar CI_BRANCH "$CIRCLE_BRANCH";
+setPublicVar CI_BRANCH "$CIRCLE_BRANCH";
-  setPublicVar CI_BUILD_URL "$CIRCLE_BUILD_URL";
+setPublicVar CI_BUILD_URL "$CIRCLE_BUILD_URL";
-  setPublicVar CI_COMMIT "$CIRCLE_SHA1";
+setPublicVar CI_COMMIT "$CIRCLE_SHA1";
-  # `CI_COMMIT_RANGE` is only used on push builds (a.k.a. non-PR, non-scheduled builds and rerun
+# `CI_COMMIT_RANGE` is only used on push builds (a.k.a. non-PR, non-scheduled builds and rerun
-  # workflows of such builds).
+# workflows of such builds).
-  setPublicVar CI_GIT_BASE_REVISION "${CIRCLE_GIT_BASE_REVISION}";
+setPublicVar CI_GIT_BASE_REVISION "${CIRCLE_GIT_BASE_REVISION}";
-  setPublicVar CI_GIT_REVISION "${CIRCLE_GIT_REVISION}";
+setPublicVar CI_GIT_REVISION "${CIRCLE_GIT_REVISION}";
-  setPublicVar CI_COMMIT_RANGE "$CIRCLE_GIT_BASE_REVISION..$CIRCLE_GIT_REVISION";
+setPublicVar CI_COMMIT_RANGE "$CIRCLE_GIT_BASE_REVISION..$CIRCLE_GIT_REVISION";
-  setPublicVar CI_PULL_REQUEST "${CIRCLE_PR_NUMBER:-false}";
+setPublicVar CI_PULL_REQUEST "${CIRCLE_PR_NUMBER:-false}";
-  setPublicVar CI_REPO_NAME "$CIRCLE_PROJECT_REPONAME";
+setPublicVar CI_REPO_NAME "$CIRCLE_PROJECT_REPONAME";
-  setPublicVar CI_REPO_OWNER "$CIRCLE_PROJECT_USERNAME";
+setPublicVar CI_REPO_OWNER "$CIRCLE_PROJECT_USERNAME";
-  setPublicVar CI_PR_REPONAME "$CIRCLE_PR_REPONAME";
+setPublicVar CI_PR_REPONAME "$CIRCLE_PR_REPONAME";
-  setPublicVar CI_PR_USERNAME "$CIRCLE_PR_USERNAME";
+setPublicVar CI_PR_USERNAME "$CIRCLE_PR_USERNAME";
 
 
-  ####################################################################################################
+####################################################################################################
-  # Define "lazy" PUBLIC environment variables for CircleCI.
+# Define "lazy" PUBLIC environment variables for CircleCI.
-  # (I.e. functions to set an environment variable when called.)
+# (I.e. functions to set an environment variable when called.)
-  ####################################################################################################
+####################################################################################################
-  createPublicVarSetter CI_STABLE_BRANCH "\$(npm info @angular/core dist-tags.latest | sed -r 's/^\\s*([0-9]+\\.[0-9]+)\\.[0-9]+.*$/\\1.x/')";
+createPublicVarSetter CI_STABLE_BRANCH "\$(npm info @angular/core dist-tags.latest | sed -r 's/^\\s*([0-9]+\\.[0-9]+)\\.[0-9]+.*$/\\1.x/')";
 
 
-  ####################################################################################################
+####################################################################################################
-  # Define SECRET environment variables for CircleCI.
+# Define SECRET environment variables for CircleCI.
-  ####################################################################################################
+####################################################################################################
-  setSecretVar CI_SECRET_AIO_DEPLOY_FIREBASE_TOKEN "$AIO_DEPLOY_TOKEN";
+setSecretVar CI_SECRET_AIO_DEPLOY_FIREBASE_TOKEN "$AIO_DEPLOY_TOKEN";
-  setSecretVar CI_SECRET_PAYLOAD_FIREBASE_TOKEN "$ANGULAR_PAYLOAD_TOKEN";
+setSecretVar CI_SECRET_PAYLOAD_FIREBASE_TOKEN "$ANGULAR_PAYLOAD_TOKEN";
 
 
-  ####################################################################################################
+####################################################################################################
-  # Define SauceLabs environment variables for CircleCI.
+# Define SauceLabs environment variables for CircleCI.
-  ####################################################################################################
+####################################################################################################
-  setPublicVar SAUCE_USERNAME "angular-framework";
+setPublicVar SAUCE_USERNAME "angular-framework";
-  setSecretVar SAUCE_ACCESS_KEY "0c731274ed5f-cbc9-16f4-021a-9835e39f";
+setSecretVar SAUCE_ACCESS_KEY "0c731274ed5f-cbc9-16f4-021a-9835e39f";
-  # TODO(josephperrott): Remove environment variables once all saucelabs tests are via bazel method.
+# TODO(josephperrott): Remove environment variables once all saucelabs tests are via bazel method.
-  setPublicVar SAUCE_LOG_FILE /tmp/angular/sauce-connect.log
+setPublicVar SAUCE_LOG_FILE /tmp/angular/sauce-connect.log
-  setPublicVar SAUCE_READY_FILE /tmp/angular/sauce-connect-ready-file.lock
+setPublicVar SAUCE_READY_FILE /tmp/angular/sauce-connect-ready-file.lock
-  setPublicVar SAUCE_PID_FILE /tmp/angular/sauce-connect-pid-file.lock
+setPublicVar SAUCE_PID_FILE /tmp/angular/sauce-connect-pid-file.lock
-  setPublicVar SAUCE_TUNNEL_IDENTIFIER "angular-framework-${CIRCLE_BUILD_NUM}-${CIRCLE_NODE_INDEX}"
+setPublicVar SAUCE_TUNNEL_IDENTIFIER "angular-framework-${CIRCLE_BUILD_NUM}-${CIRCLE_NODE_INDEX}"
-  # Amount of seconds we wait for sauceconnect to establish a tunnel instance. In order to not
+# Amount of seconds we wait for sauceconnect to establish a tunnel instance. In order to not
-  # acquire CircleCI instances for too long if sauceconnect failed, we need a connect timeout.
+# acquire CircleCI instances for too long if sauceconnect failed, we need a connect timeout.
-  setPublicVar SAUCE_READY_FILE_TIMEOUT 120
+setPublicVar SAUCE_READY_FILE_TIMEOUT 120
 
 
-  ####################################################################################################
+####################################################################################################
-  # Define environment variables for the `angular/components` repo unit tests job.
+# Define environment variables for the `angular/components` repo unit tests job.
-  ####################################################################################################
+####################################################################################################
-  # We specifically use a directory within "/tmp" here because we want the cloned repo to be
+# We specifically use a directory within "/tmp" here because we want the cloned repo to be
-  # completely isolated from angular/angular in order to avoid any bad interactions between
+# completely isolated from angular/angular in order to avoid any bad interactions between
-  # their separate build setups. **NOTE**: When updating the temporary directory, also update
+# their separate build setups. **NOTE**: When updating the temporary directory, also update
-  # the `save_cache` path configuration in `config.yml`
+# the `save_cache` path configuration in `config.yml`
-  setPublicVar COMPONENTS_REPO_TMP_DIR "/tmp/angular-components-repo"
+setPublicVar COMPONENTS_REPO_TMP_DIR "/tmp/angular-components-repo"
-  setPublicVar COMPONENTS_REPO_URL "https://github.com/angular/components.git"
+setPublicVar COMPONENTS_REPO_URL "https://github.com/angular/components.git"
-  setPublicVar COMPONENTS_REPO_BRANCH "master"
+setPublicVar COMPONENTS_REPO_BRANCH "master"
-  # **NOTE**: When updating the commit SHA, also update the cache key in the CircleCI `config.yml`.
+# **NOTE**: When updating the commit SHA, also update the cache key in the CircleCI `config.yml`.
-  setPublicVar COMPONENTS_REPO_COMMIT "598db096e668aa7e9debd56eedfd127b7a55e371"
+setPublicVar COMPONENTS_REPO_COMMIT "189d98e8b01b33974328255f085de04251d61567"
-
-  # Save the created BASH_ENV into the bash env cache file.
-  cat "$BASH_ENV" >> $bashEnvCachePath;
-fi
 
 
 ####################################################################################################

.circleci/trigger-webhook.js

@@ -60,14 +60,15 @@ if (require.resolve === module) {
 
 // Helpers
 function _main(args) {
-  triggerWebhook(...args).
+  triggerWebhook(...args)
-    then(({statusCode, responseText}) => (200 <= statusCode && statusCode < 400) ?
+      .then(
-      console.log(`Status: ${statusCode}\n${responseText}`) :
+          ({statusCode, responseText}) => (200 <= statusCode && statusCode < 400) ?
-      Promise.reject(new Error(`Request failed (status: ${statusCode}): ${responseText}`))).
+              console.log(`Status: ${statusCode}\n${responseText}`) :
-    catch(err => {
+              Promise.reject(new Error(`Request failed (status: ${statusCode}): ${responseText}`)))
-      console.error(err);
+      .catch(err => {
-      process.exit(1);
+        console.error(err);
-    });
+        process.exit(1);
+      });
 }
 
 function postJson(url, data) {
@@ -77,15 +78,12 @@ function postJson(url, data) {
       const statusCode = res.statusCode || -1;
       let responseText = '';
 
-      res.
+      res.on('error', reject)
-        on('error', reject).
+          .on('data', d => responseText += d)
-        on('data', d => responseText += d).
+          .on('end', () => resolve({statusCode, responseText}));
-        on('end', () => resolve({statusCode, responseText}));
     };
 
-    request(url, opts, onResponse).
+    request(url, opts, onResponse).on('error', reject).end(JSON.stringify(data));
-      on('error', reject).
-      end(JSON.stringify(data));
   });
 }
 

.dev-infra.json

@@ -1,72 +0,0 @@
-{
-  "commitMessage": {
-    "maxLength": 120,
-    "minBodyLength": 100,
-    "types": [
-      "build",
-      "ci",
-      "docs",
-      "feat",
-      "fix",
-      "perf",
-      "refactor",
-      "release",
-      "style",
-      "test"
-    ],
-    "scopes": [
-      "animations",
-      "bazel",
-      "benchpress",
-      "changelog",
-      "common",
-      "compiler",
-      "compiler-cli",
-      "core",
-      "dev-infra",
-      "docs-infra",
-      "elements",
-      "forms",
-      "http",
-      "language-service",
-      "localize",
-      "ngcc",
-      "packaging",
-      "platform-browser",
-      "platform-browser-dynamic",
-      "platform-server",
-      "platform-webworker",
-      "platform-webworker-dynamic",
-      "router",
-      "service-worker",
-      "upgrade",
-      "ve",
-      "zone.js"
-    ]
-  },
-  "format": {
-    "clang-format": {
-      "matchers": [
-        "dev-infra/**/*.{js,ts}",
-        "packages/**/*.{js,ts}",
-        "!packages/zone.js",
-        "!packages/common/locales/**/*.{js,ts}",
-        "!packages/common/src/i18n/available_locales.ts",
-        "!packages/common/src/i18n/currencies.ts",
-        "!packages/common/src/i18n/locale_en.ts",
-        "modules/benchmarks/**/*.{js,ts}",
-        "modules/playground/**/*.{js,ts}",
-        "tools/**/*.{js,ts}",
-        "!tools/gulp-tasks/cldr/extract.js",
-        "!tools/public_api_guard/**/*.d.ts",
-        "!tools/ts-api-guardian/test/fixtures/**",
-        "./*.{js,ts}",
-        "!**/node_modules/**",
-        "!**/dist/**",
-        "!**/built/**",
-        "!shims_for_IE.js"
-      ]
-    },
-    "buildifier": true
-  }
-}

.github/ISSUE_TEMPLATE/1-bug-report.md

@@ -32,13 +32,13 @@ Existing issues often contain information about workarounds, resolution, or prog
 
 ## 🔬 Minimal Reproduction
 <!--
-Please create and share minimal reproduction of the issue starting with this template: https://stackblitz.com/fork/angular-issue-repro2
+Please create and share minimal reproduction of the issue starting with this template: https://stackblitz.com/fork/angular-ivy
 -->
 <!-- ✍️--> https://stackblitz.com/...
 
 <!--
 If StackBlitz is not suitable for reproduction of your issue, please create a minimal GitHub repository with the reproduction of the issue.
-A good way to make a minimal reproduction is to create a new app via `ng new repro-app` and add the minimum possible code to show the problem. 
+A good way to make a minimal reproduction is to create a new app via `ng new repro-app` and add the minimum possible code to show the problem.
 Share the link to the repo below along with step-by-step instructions to reproduce the problem, as well as expected and actual behavior.
 
 Issues that don't have enough info and can't be reproduced will be closed.

.ng-dev/config.ts

@@ -0,0 +1,119 @@
+import {MergeConfig} from '../dev-infra/pr/merge/config';
+
+// The configuration for `ng-dev commit-message` commands.
+const commitMessage = {
+  'maxLength': 120,
+  'minBodyLength': 100,
+  'types': [
+    'build',
+    'ci',
+    'docs',
+    'feat',
+    'fix',
+    'perf',
+    'refactor',
+    'release',
+    'style',
+    'test',
+  ],
+  'scopes': [
+    'animations',
+    'bazel',
+    'benchpress',
+    'changelog',
+    'common',
+    'compiler',
+    'compiler-cli',
+    'core',
+    'dev-infra',
+    'docs-infra',
+    'elements',
+    'forms',
+    'http',
+    'language-service',
+    'localize',
+    'migrations',
+    'ngcc',
+    'packaging',
+    'platform-browser',
+    'platform-browser-dynamic',
+    'platform-server',
+    'platform-webworker',
+    'platform-webworker-dynamic',
+    'router',
+    'service-worker',
+    'upgrade',
+    've',
+    'zone.js',
+  ]
+};
+
+// The configuration for `ng-dev format` commands.
+const format = {
+  'clang-format': {
+    'matchers': [
+      '**/*.{js,ts}',
+      // TODO: burn down format failures and remove aio and integration exceptions.
+      '!aio/**',
+      '!integration/**',
+      // TODO: remove this exclusion as part of IE deprecation.
+      '!shims_for_IE.js',
+      // Both third_party and .yarn are directories containing copied code which should
+      // not be modified.
+      '!third_party/**',
+      '!.yarn/**',
+      // Do not format d.ts files as they are generated
+      '!**/*.d.ts',
+    ]
+  },
+  'buildifier': true
+};
+
+/** Github metadata information for `ng-dev` commands. */
+const github = {
+  owner: 'angular',
+  name: 'angular',
+};
+
+// Configuration for the `ng-dev pr merge` command. The command can be used
+// for merging upstream pull requests into branches based on a PR target label.
+const merge = () => {
+  // TODO: resume dynamically determining patch branch
+  const patch = '10.0.x';
+  const config: MergeConfig = {
+    githubApiMerge: false,
+    claSignedLabel: 'cla: yes',
+    mergeReadyLabel: /^PR 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],
+      },
+    ],
+    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'
+    },
+  };
+  return config;
+};
+
+// Export function to build ng-dev configuration object.
+module.exports = {
+  commitMessage,
+  format,
+  github,
+  merge,
+};

.pullapprove.yml

@@ -34,41 +34,8 @@
 ####################################################################################
 #  GitHub usernames
 ####################################################################################
-#  aikidave - Dave Shevitz
+# See reviewer list under `required-minimum-review` group.  Team member names and
-#  alan-agius4 - Alan Agius
+# usernames are managed there.
-#  alxhub - Alex Rickabaugh
-#  AndrewKushnir - Andrew Kushnir
-#  andrewseguin - Andrew Seguin
-#  atscott - Andrew Scott
-#  ayazhafiz - Ayaz Hafiz
-#  clydin - Charles Lyding
-#  crisbeto - Kristiyan Kostadinov
-#  dennispbrown - Denny Brown
-#  devversion - Paul Gschwendtner
-#  dgp1130 - Doug Parker
-#  filipesilva - Filipe Silva
-#  gkalpak - Georgios Kalpakas
-#  gregmagolan - Greg Magolan
-#  IgorMinar - Igor Minar
-#  jbogarthyde - Judy Bogart
-#  jelbourn - Jeremy Elbourn
-#  JiaLiPassion - Jia Li
-#  JoostK - Joost Koehoorn
-#  josephperrott - Joey Perrott
-#  juleskremer - Jules Kremer
-#  kapunahelewong - Kapunahele Wong
-#  kara - Kara Erickson
-#  kyliau - Keen Yee Liau
-#  manughub - Manu Murthy
-#  matsko - Matias Niemela
-#  mgechev - Minko Gechev
-#  mhevery - Miško Hevery
-#  michaelprentice - Michael Prentice
-#  mmalerba - Miles Malerba
-#  petebacondarwin - Pete Bacon Darwin
-#  pkozlowski-opensource - Pawel Kozlowski
-#  robwormald - Rob Wormald
-#  StephenFluin - Stephen Fluin
 
 
 ####################################################################################
@@ -80,8 +47,8 @@
 #  Used for approving minor changes, large-scale refactorings, and in emergency situations.
 #
 # IgorMinar
+# jelbourn
 # josephperrott
-# kara
 # mhevery
 #
 # =========================================================
@@ -100,8 +67,16 @@ version: 3
 # Meta field that goes unused by PullApprove to allow for defining aliases to be
 # used throughout the config.
 meta:
-  1: &can-be-global-approved "\"global-approvers\" not in groups.approved"
+  can-be-global-approved: &can-be-global-approved "\"global-approvers\" not in groups.approved"
-  2: &can-be-global-docs-approved "\"global-docs-approvers\" not in groups.approved"
+  can-be-global-docs-approved: &can-be-global-docs-approved "\"global-docs-approvers\" not in groups.approved"
+  defaults: &defaults
+    reviews:
+      # Authors provide their approval implicitly, this approval allows for a reviewer
+      # from a group not to need a review specifically for an area of the repository
+      # they own.  This is coupled with the `required-minimum-review` group which requires
+      # that all PRs are reviewed by at least one team member who is not the author of
+      # the PR.
+      author_value: 1
 
 # turn on 'draft' support
 # https://docs.pullapprove.com/config/github-api-version/
@@ -121,6 +96,55 @@ pullapprove_conditions:
 
 
 groups:
+  # =========================================================
+  # Require review on all PRs
+  #
+  # All PRs require at least one review.  This rule will not
+  # request any reviewers, however will require that at least
+  # one review is provided before the group is satisfied.
+  # =========================================================
+  required-minimum-review:
+    reviews:
+      request: 0 # Do not request any reviews from the reviewer group
+      required: 1 # Require that all PRs have approval from at least one of the users in the group
+      author_value: 0 # The author of the PR cannot provide an approval for themself
+    reviewers:
+      users:
+         - aikidave                # Dave Shevitz
+         - alan-agius4             # Alan Agius
+         - alxhub                  # Alex Rickabaugh
+         - AndrewKushnir           # Andrew Kushnir
+         - andrewseguin            # Andrew Seguin
+         - atscott                 # Andrew Scott
+         - ayazhafiz               # Ayaz Hafiz
+         - clydin                  # Charles Lyding
+         - crisbeto                # Kristiyan Kostadinov
+         - dennispbrown            # Denny Brown
+         - devversion              # Paul Gschwendtner
+         - dgp1130                 # Doug Parker
+         - filipesilva             # Filipe Silva
+         - gkalpak                 # Georgios Kalpakas
+         - gregmagolan             # Greg Magolan
+         - IgorMinar               # Igor Minar
+         - jbogarthyde             # Judy Bogart
+         - jelbourn                # Jeremy Elbourn
+         - JiaLiPassion            # Jia Li
+         - JoostK                  # Joost Koehoorn
+         - josephperrott           # Joey Perrott
+         - juleskremer             # Jules Kremer
+         - kapunahelewong          # Kapunahele Wong
+         - kara                    # Kara Erickson
+         - kyliau                  # Keen Yee Liau
+         - manughub                # Manu Murthy
+         - matsko                  # Matias Niemela
+         - mgechev                 # Minko Gechev
+         - mhevery                 # Miško Hevery
+         - michaelprentice         # Michael Prentice
+         - mmalerba                # Miles Malerba
+         - petebacondarwin         # Pete Bacon Darwin
+         - pkozlowski-opensource   # Pawel Kozlowski
+         - StephenFluin            # Stephen Fluin
+
   # =========================================================
   #  Global Approvers
   #
@@ -161,6 +185,7 @@ groups:
   #  Framework: Animations
   # =========================================================
   fw-animations:
+    <<: *defaults
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
@@ -185,6 +210,7 @@ groups:
   #  Framework: Compiler
   # =========================================================
   fw-compiler:
+    <<: *defaults
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
@@ -203,13 +229,13 @@ groups:
         - alxhub
         - AndrewKushnir
         - JoostK
-        - kara
 
 
   # =========================================================
   #  Framework: Compiler / ngcc
   # =========================================================
   fw-ngcc:
+    <<: *defaults
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
@@ -226,6 +252,7 @@ groups:
   #  Framework: Migrations
   # =========================================================
   fw-migrations:
+    <<: *defaults
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
@@ -235,13 +262,13 @@ groups:
         - alxhub
         - crisbeto
         - devversion
-        - kara
 
 
   # =========================================================
   #  Framework: Core
   # =========================================================
   fw-core:
+    <<: *defaults
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
@@ -351,7 +378,8 @@ groups:
       users:
         - alxhub
         - AndrewKushnir
-        - kara
+        - atscott
+        - ~kara  # do not request reviews from Kara, but allow her to approve PRs
         - mhevery
         - pkozlowski-opensource
 
@@ -360,13 +388,13 @@ groups:
   #  Framework: Http
   # =========================================================
   fw-http:
+    <<: *defaults
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
       - >
         contains_any_globs(files, [
           'packages/common/http/**',
-          'packages/http/**',
           'packages/examples/http/**',
           'aio/content/guide/http.md',
           'aio/content/examples/http/**',
@@ -382,6 +410,7 @@ groups:
   #  Framework: Elements
   # =========================================================
   fw-elements:
+    <<: *defaults
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
@@ -402,6 +431,7 @@ groups:
   #  Framework: Forms
   # =========================================================
   fw-forms:
+    <<: *defaults
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
@@ -434,6 +464,7 @@ groups:
   #  Framework: i18n
   # =========================================================
   fw-i18n:
+    <<: *defaults
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
@@ -467,6 +498,7 @@ groups:
   #  Framework: Platform Server
   # =========================================================
   fw-platform-server:
+    <<: *defaults
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
@@ -486,6 +518,7 @@ groups:
   #  Framework: Router
   # =========================================================
   fw-router:
+    <<: *defaults
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
@@ -494,6 +527,8 @@ groups:
           'packages/router/**',
           'packages/examples/router/**',
           'aio/content/guide/router.md',
+          'aio/content/guide/router-tutorial.md',
+          'aio/content/examples/router-tutorial/**',
           'aio/content/examples/router/**',
           'aio/content/images/guide/router/**'
           ])
@@ -505,7 +540,8 @@ groups:
   # =========================================================
   #  Framework: Service Worker
   # =========================================================
-  fw-server-worker:
+  fw-service-worker:
+    <<: *defaults
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
@@ -533,6 +569,7 @@ groups:
   #  Framework: Upgrade
   # =========================================================
   fw-upgrade:
+    <<: *defaults
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
@@ -563,11 +600,12 @@ groups:
   #  Framework: Testing
   # =========================================================
   fw-testing:
+    <<: *defaults
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
       - >
-        contains_any_globs(files, [
+        contains_any_globs(files.exclude('packages/compiler-cli/**'), [
           '**/testing/**',
           'aio/content/guide/testing.md',
           'aio/content/examples/testing/**',
@@ -577,7 +615,6 @@ groups:
       users:
         - AndrewKushnir
         - IgorMinar
-        - kara
         - pkozlowski-opensource
 
 
@@ -585,6 +622,7 @@ groups:
   #  Framework: Benchmarks
   # =========================================================
   fw-benchmarks:
+    <<: *defaults
     conditions:
       - *can-be-global-approved
       - >
@@ -594,7 +632,6 @@ groups:
     reviewers:
       users:
         - IgorMinar
-        - kara
         - pkozlowski-opensource
 
 
@@ -602,6 +639,7 @@ groups:
   #  Framework: Playground
   # =========================================================
   fw-playground:
+    <<: *defaults
     conditions:
       - *can-be-global-approved
       - >
@@ -611,13 +649,15 @@ groups:
     reviewers:
       users:
         - IgorMinar
-        - kara
+        - jelbourn
+        - pkozlowski-opensource
 
 
   # =========================================================
   #  Framework: Security
   # =========================================================
   fw-security:
+    <<: *defaults
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
@@ -635,18 +675,25 @@ groups:
       users:
         - IgorMinar
         - mhevery
+        - jelbourn
+        - pkozlowski-opensource
+    reviews:
+      request: -1   # request reviews from everyone
+      required: 2   # require at least 2 approvals
+      reviewed_for: required
+
 
   # =========================================================
   #  Bazel
   # =========================================================
   bazel:
+    <<: *defaults
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
       - >
         contains_any_globs(files, [
           'packages/bazel/**',
-          'aio/content/guide/bazel.md'
           ])
     reviewers:
       users:
@@ -659,6 +706,7 @@ groups:
   #  Language Service
   # =========================================================
   language-service:
+    <<: *defaults
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
@@ -678,6 +726,7 @@ groups:
   #  zone.js
   # =========================================================
   zone-js:
+    <<: *defaults
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
@@ -696,6 +745,7 @@ groups:
   #  Benchpress
   # =========================================================
   benchpress:
+    <<: *defaults
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
@@ -706,12 +756,14 @@ groups:
     reviewers:
       users:
         - alxhub
+        - josephperrott
 
 
   # =========================================================
   #  Integration Tests
   # =========================================================
   integration-tests:
+    <<: *defaults
     conditions:
       - *can-be-global-approved
       - >
@@ -722,7 +774,6 @@ groups:
       users:
         - IgorMinar
         - josephperrott
-        - kara
         - mhevery
 
 
@@ -730,6 +781,7 @@ groups:
   #  Docs: Gettings Started & Tutorial
   # =========================================================
   docs-getting-started-and-tutorial:
+    <<: *defaults
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
@@ -762,6 +814,7 @@ groups:
   #  Docs: Marketing
   # =========================================================
   docs-marketing:
+    <<: *defaults
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
@@ -776,14 +829,15 @@ groups:
           ])
     reviewers:
       users:
+        - aikidave
         - IgorMinar
         - StephenFluin
 
-
   # =========================================================
   #  Docs: Observables
   # =========================================================
   docs-observables:
+    <<: *defaults
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
@@ -809,6 +863,7 @@ groups:
   #  Docs: Packaging, Tooling, Releasing
   # =========================================================
   docs-packaging-and-releasing:
+    <<: *defaults
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
@@ -828,20 +883,47 @@ groups:
           'aio/content/guide/migration-localize.md',
           'aio/content/guide/migration-module-with-providers.md',
           'aio/content/guide/static-query-migration.md',
-          'aio/content/guide/updating-to-version-9.md',
+          'aio/content/guide/updating-to-version-10.md',
           'aio/content/guide/ivy-compatibility.md',
           'aio/content/guide/ivy-compatibility-examples.md'
           ])
     reviewers:
       users:
         - IgorMinar
-        - kara
+        - jelbourn
+
+
+  # =========================================================
+  #  Tooling: Compiler API shared with Angular CLI
+  #
+  #  Changing this API might break Angular CLI, so we require
+  #  the CLI team to approve changes here.
+  # =========================================================
+  tooling-cli-shared-api:
+    conditions:
+      - *can-be-global-approved
+      - *can-be-global-docs-approved
+      - >
+        contains_any_globs(files, [
+          'packages/compiler-cli/src/tooling.ts'
+        ])
+    reviewers:
+      users:
+        - alan-agius4
+        - clydin
+        - kyliau
+        - IgorMinar
+    reviews:
+      request: -1   # request reviews from everyone
+      required: 2   # require at least 2 approvals
+      reviewed_for: required
 
 
   # =========================================================
   #  Docs: CLI
   # =========================================================
   docs-cli:
+    <<: *defaults
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
@@ -858,8 +940,12 @@ groups:
           'aio/content/images/guide/deployment/**',
           'aio/content/guide/file-structure.md',
           'aio/content/guide/ivy.md',
+          'aio/content/guide/strict-mode.md',
           'aio/content/guide/web-worker.md',
           'aio/content/guide/workspace-config.md',
+          'aio/content/guide/migration-solution-style-tsconfig.md',
+          'aio/content/guide/migration-update-module-and-target-compiler-options.md',
+          'aio/content/guide/migration-update-libraries-tslib.md',
           ])
     reviewers:
       users:
@@ -872,6 +958,7 @@ groups:
   #  Docs: CLI Libraries
   # =========================================================
   docs-libraries:
+    <<: *defaults
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
@@ -892,6 +979,7 @@ groups:
   #  Docs: Schematics
   # =========================================================
   docs-schematics:
+    <<: *defaults
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
@@ -914,6 +1002,7 @@ groups:
   #  Docs-infra
   # =========================================================
   docs-infra:
+    <<: *defaults
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
@@ -943,14 +1032,16 @@ groups:
   #  Dev-infra
   # =========================================================
   dev-infra:
+    <<: *defaults
     conditions:
       - *can-be-global-approved
       - >
-        contains_any_globs(files, [
+        contains_any_globs(files.exclude("CHANGELOG.md"), [
           '*',
           '.circleci/**',
           '.devcontainer/**',
           '.github/**',
+          '.ng-dev/**',
           '.vscode/**',
           '.yarn/**',
           'dev-infra/**',
@@ -966,8 +1057,6 @@ groups:
           'docs/TOOLS.md',
           'docs/TRIAGE_AND_LABELS.md',
           'goldens/*',
-          'modules/e2e_util/e2e_util.ts',
-          'modules/e2e_util/perf_util.ts',
           'modules/*',
           'packages/*',
           'packages/examples/test-utils/**',
@@ -975,15 +1064,10 @@ groups:
           'packages/examples/*',
           'scripts/**',
           'third_party/**',
-          'tools/brotli-cli/**',
-          'tools/browsers/**',
           'tools/build/**',
           'tools/circular_dependency_test/**',
           'tools/contributing-stats/**',
-          'tools/components/**',
           'tools/gulp-tasks/**',
-          'tools/ng_rollup_bundle/**',
-          'tools/ngcontainer/**',
           'tools/npm/**',
           'tools/npm_integration_test/**',
           'tools/rxjs/**',
@@ -1013,11 +1097,13 @@ groups:
   #  Public API
   # =========================================================
   public-api:
+    <<: *defaults
     conditions:
       - *can-be-global-approved
       - >
         contains_any_globs(files, [
           'goldens/public-api/**',
+          'CHANGELOG.md',
           'docs/NAMING.md',
           'aio/content/guide/glossary.md',
           'aio/content/guide/styleguide.md',
@@ -1026,13 +1112,21 @@ groups:
           ])
     reviewers:
       users:
+        - alxhub
         - IgorMinar
+        - jelbourn
+        - pkozlowski-opensource
+    reviews:
+      request: -1   # request reviews from everyone
+      required: 3   # require at least 3 approvals
+      reviewed_for: required
 
 
   # ================================================
   #  Size tracking
   # ================================================
   size-tracking:
+    <<: *defaults
     conditions:
       - *can-be-global-approved
       - >
@@ -1041,14 +1135,21 @@ groups:
           ])
     reviewers:
       users:
+        - alxhub
         - IgorMinar
-        - kara
+        - jelbourn
+        - pkozlowski-opensource
+    reviews:
+      request: -1   # request reviews from everyone
+      required: 2   # require at least 2 approvals
+      reviewed_for: required
 
 
   # ================================================
   #  Circular dependencies
   # ================================================
   circular-dependencies:
+    <<: *defaults
     conditions:
       - *can-be-global-approved
       - >
@@ -1058,8 +1159,9 @@ groups:
     reviewers:
       users:
         - IgorMinar
+        - jelbourn
         - josephperrott
-        - kara
+        - pkozlowski-opensource
 
 
 ####################################################################################
@@ -1070,6 +1172,7 @@ groups:
   #  Code Ownership
   # =========================================================
   code-ownership:
+    <<: *defaults
     conditions:
       - *can-be-global-approved
       - >
@@ -1085,12 +1188,33 @@ groups:
   #  Catch all for if no groups match the code change
   # ====================================================
   fallback:
+    <<: *defaults
+    # A group is considered to be `active` for a PR if at least one of group's
+    # conditions matches the PR.
+    #
+    # The PullApprove CI check should fail if a PR has no `active` groups, as
+    # this indicates the PR is modifying a file that has no owner.
+    #
+    # This is enforced through the pullapprove verification check done
+    # as part of the CircleCI lint job.  Failures in this lint job should be
+    # fixed as part of the PR.  This can be done by updating the
+    # `.pullapprove.yml` file cover the unmatched path.
+    # The pullapprove verification script is part of the ng-dev tool and can be
+    # run locally with the command: `yarn -s ng-dev pullapprove verify`
+    #
+    # For cases in which the verification check fails to ensure coverage, this
+    # group will be active.  The expectation is that this should be remedied
+    # before merging the PR as described above.  In an emergency situation
+    # `global-approvers` can still approve PRs that match this `fallback` rule,
+    # but that should be an exception and not an expectation.
     conditions:
       - *can-be-global-approved
-      # Groups which are found to have matching conditions are `active`
+      # The following groups have no conditions and will be `active` on all PRs
-      # according to PullApprove. If no groups are matched and considered
+      # - `global-approvers`
-      # active, we still want to have a review occur.
+      # - `global-docs-approvers`
-      - len(groups.active) == 0
+      #
-    reviewers:
+      # Since this means the minimum number of active groups a PR can have is 2, this
-      users:
+      # `fallback` group should be matched anytime the number of active groups is at or
-        - IgorMinar
+      # below this minimum.  This work as a protection to ensure that pullapprove does
+      # not incidently mark a PR as passing without meeting the review criteria.
+      - len(groups.active) <= 2

BUILD.bazel

@@ -2,7 +2,6 @@ package(default_visibility = ["//visibility:public"])
 
 exports_files([
     "LICENSE",
-    "protractor-perf.conf.js",
     "karma-js.conf.js",
     "browser-providers.conf.js",
     "scripts/ci/track-payload-size.sh",

CHANGELOG.md

@@ -1,3 +1,398 @@
+<a name="10.0.0"></a>
+# [10.0.0](https://github.com/angular/angular/compare/10.0.0-rc.6...10.0.0) (2020-06-24)
+
+
+### Performance Improvements
+
+* **forms:** optimize internal method _anyControls in FormGroup ([#32534](https://github.com/angular/angular/issues/32534)) ([6c7467a](https://github.com/angular/angular/commit/6c7467a))
+
+
+
+<!--
+<a name="10.0.0"></a>
+# [10.0.0](https://github.com/angular/angular/compare/10.0.0-next.0...10.0.0) (2020-06-24)
+
+
+### Release Highlights & Update instructions
+To learn about the release highlights and our CLI-powered automated update workflow for your projects please check out the [v10 release announcement](https://blog.angular.io/TODO).
+
+
+#### Dependency updates
+@angular/compiler-cli now requires:
+- TypeScript 3.9
+
+TODO: concat all the 10.0.0-next.* & -rc.* release notes, and group them by area/package just like in https://github.com/angular/angular/blob/master/CHANGELOG.md#900-2020-02-06 but consider listing features before bugfixes because people care about feature in major releases more than about bug fixes.
+-->
+
+
+<a name="10.0.0-rc.6"></a>
+# [10.0.0-rc.6](https://github.com/angular/angular/compare/10.0.0-rc.5...10.0.0-rc.6) (2020-06-15)
+
+
+### Bug Fixes
+
+* **compiler:** unable to resolve destructuring variable declarations ([#37497](https://github.com/angular/angular/issues/37497)) ([df10597](https://github.com/angular/angular/commit/df10597)), closes [#36917](https://github.com/angular/angular/issues/36917)
+* **core:** should fake a top event task when coalescing events to prevent draining microTaskQueue too early. ([#36841](https://github.com/angular/angular/issues/36841)) ([9b8eb42](https://github.com/angular/angular/commit/9b8eb42)), closes [#36839](https://github.com/angular/angular/issues/36839)
+* **language-service:** wrong completions in conditional operator ([#37505](https://github.com/angular/angular/issues/37505)) ([32020f9](https://github.com/angular/angular/commit/32020f9))
+* **ngcc:** correctly get config for packages in nested `node_modules/` ([#37040](https://github.com/angular/angular/issues/37040)) ([9ade1c3](https://github.com/angular/angular/commit/9ade1c3))
+* **ngcc:** correctly get config for sub-entry-points when primary entry-point is ignored ([#37040](https://github.com/angular/angular/issues/37040)) ([bf57776](https://github.com/angular/angular/commit/bf57776))
+* **ngcc:** correctly retrieve a package's version from its `package.json` ([#37040](https://github.com/angular/angular/issues/37040)) ([11c0402](https://github.com/angular/angular/commit/11c0402))
+* **router:** fix navigation ignoring logic to compare to the browser url ([#37408](https://github.com/angular/angular/issues/37408)) ([5db2e79](https://github.com/angular/angular/commit/5db2e79)), closes [#16710](https://github.com/angular/angular/issues/16710) [/github.com/angular/angular/issues/16710#issuecomment-634869739](https://github.com//github.com/angular/angular/issues/16710/issues/issuecomment-634869739) [#13586](https://github.com/angular/angular/issues/13586)
+
+
+### Features
+
+* **bazel:** expose explicit mapping from closure to devmode files ([#36262](https://github.com/angular/angular/issues/36262)) ([ba796bb](https://github.com/angular/angular/commit/ba796bb))
+
+
+
+<a name="10.0.0-rc.5"></a>
+# [10.0.0-rc.5](https://github.com/angular/angular/compare/10.0.0-rc.4...10.0.0-rc.5) (2020-06-11)
+
+
+### Bug Fixes
+
+* **ngcc:** do not scan import expressions in d.ts files ([#37503](https://github.com/angular/angular/issues/37503)) ([8248307](https://github.com/angular/angular/commit/8248307))
+* **ngcc:** use annotateForClosureCompiler option ([#36652](https://github.com/angular/angular/issues/36652)) ([eca8d11](https://github.com/angular/angular/commit/eca8d11)), closes [#36618](https://github.com/angular/angular/issues/36618)
+
+
+### Features
+
+* **language-service:** Remove HTML entities autocompletion ([#37515](https://github.com/angular/angular/issues/37515)) ([67bd88b](https://github.com/angular/angular/commit/67bd88b))
+
+
+
+<a name="10.0.0-rc.4"></a>
+# [10.0.0-rc.4](https://github.com/angular/angular/compare/10.0.0-rc.3...10.0.0-rc.4) (2020-06-10)
+
+
+### Bug Fixes
+
+* **common:** prevent duplicate URL change notifications ([#37459](https://github.com/angular/angular/issues/37459)) ([0864726](https://github.com/angular/angular/commit/0864726))
+* **compiler-cli:** downlevel angular decorators to static properties ([#37382](https://github.com/angular/angular/issues/37382)) ([323651b](https://github.com/angular/angular/commit/323651b)), closes [#30586](https://github.com/angular/angular/issues/30586) [#30106](https://github.com/angular/angular/issues/30106) [#30586](https://github.com/angular/angular/issues/30586) [#30141](https://github.com/angular/angular/issues/30141)
+* **language-service:** Improve signature selection by finding exact match ([#37494](https://github.com/angular/angular/issues/37494)) ([e97a2d4](https://github.com/angular/angular/commit/e97a2d4))
+* **platform-server:** correctly handle absolute relative URLs ([#37341](https://github.com/angular/angular/issues/37341)) ([420d1c3](https://github.com/angular/angular/commit/420d1c3)), closes [#37314](https://github.com/angular/angular/issues/37314)
+* **router:** Fix relative link generation from empty path components ([#37446](https://github.com/angular/angular/issues/37446)) ([585e3f6](https://github.com/angular/angular/commit/585e3f6)), closes [#26243](https://github.com/angular/angular/issues/26243) [#13011](https://github.com/angular/angular/issues/13011) [#35687](https://github.com/angular/angular/issues/35687)
+
+
+### Features
+
+* **language-service:** TS references from template items ([#37437](https://github.com/angular/angular/issues/37437)) ([bf2cb6f](https://github.com/angular/angular/commit/bf2cb6f))
+
+
+### Performance Improvements
+
+* **core:** avoid pulling in jit-specific code in aot bundles ([#37372](https://github.com/angular/angular/issues/37372)) ([#37514](https://github.com/angular/angular/issues/37514)) ([6114cd2](https://github.com/angular/angular/commit/6114cd2)), closes [#29083](https://github.com/angular/angular/issues/29083)
+
+
+
+<a name="10.0.0-rc.3"></a>
+# [10.0.0-rc.3](https://github.com/angular/angular/compare/10.0.0-rc.2...10.0.0-rc.3) (2020-06-08)
+
+
+### Bug Fixes
+
+* **common:** prevent duplicate URL change notifications ([#37404](https://github.com/angular/angular/issues/37404)) ([fff424a](https://github.com/angular/angular/commit/fff424a))
+* **compiler-cli:** use ModuleWithProviders type if static eval fails ([#37126](https://github.com/angular/angular/issues/37126)) ([305b5a3](https://github.com/angular/angular/commit/305b5a3))
+* **core:** infinite loop if injectable using inheritance has a custom decorator ([#37022](https://github.com/angular/angular/issues/37022)) ([bc54936](https://github.com/angular/angular/commit/bc54936)), closes [#35733](https://github.com/angular/angular/issues/35733)
+* **elements:** fire custom element output events during component initialization ([#36161](https://github.com/angular/angular/issues/36161)) ([e9bff5f](https://github.com/angular/angular/commit/e9bff5f)), closes [/github.com/angular/angular/blob/c0143cb2abdd172de1b95fd1d2c4cfc738640e28/packages/elements/src/create-custom-element.ts#L167-L170](https://github.com//github.com/angular/angular/blob/c0143cb2abdd172de1b95fd1d2c4cfc738640e28/packages/elements/src/create-custom-element.ts/issues/L167-L170) [/github.com/angular/angular/blob/c0143cb2abdd172de1b95fd1d2c4cfc738640e28/packages/elements/src/create-custom-element.ts#L164](https://github.com//github.com/angular/angular/blob/c0143cb2abdd172de1b95fd1d2c4cfc738640e28/packages/elements/src/create-custom-element.ts/issues/L164) [/github.com/angular/angular/blob/c0143cb2abdd172de1b95fd1d2c4cfc738640e28/packages/elements/src/component-factory-strategy.ts#L158](https://github.com//github.com/angular/angular/blob/c0143cb2abdd172de1b95fd1d2c4cfc738640e28/packages/elements/src/component-factory-strategy.ts/issues/L158) [#36141](https://github.com/angular/angular/issues/36141)
+* **language-service:** Recover from error in analyzing Ng Modules ([#37108](https://github.com/angular/angular/issues/37108)) ([2c1f35e](https://github.com/angular/angular/commit/2c1f35e))
+* **ngcc:** capture dynamic import expressions as well as declarations ([#37075](https://github.com/angular/angular/issues/37075)) ([5c0bdae](https://github.com/angular/angular/commit/5c0bdae))
+* **ngcc:** do not inline source-maps for non-inline typings source-maps ([#37363](https://github.com/angular/angular/issues/37363)) ([b4e26b5](https://github.com/angular/angular/commit/b4e26b5)), closes [#37324](https://github.com/angular/angular/issues/37324)
+* **ngcc:** ensure that more dependencies are found by `EsmDependencyHost` ([#37075](https://github.com/angular/angular/issues/37075)) ([c6872c0](https://github.com/angular/angular/commit/c6872c0))
+* **ngcc:** find decorated constructor params on IIFE wrapped classes ([#37436](https://github.com/angular/angular/issues/37436)) ([2cb3b66](https://github.com/angular/angular/commit/2cb3b66)), closes [#37330](https://github.com/angular/angular/issues/37330)
+* **service-worker:** Don't stay locked in EXISTING_CLIENTS_ONLY if corrupted data ([#37453](https://github.com/angular/angular/issues/37453)) ([6f93847](https://github.com/angular/angular/commit/6f93847)), closes [#31109](https://github.com/angular/angular/issues/31109) [#31865](https://github.com/angular/angular/issues/31865) [/github.com/angular/angular/blob/3569fdf/packages/service-worker/worker/src/driver.ts#L559-L563](https://github.com//github.com/angular/angular/blob/3569fdf/packages/service-worker/worker/src/driver.ts/issues/L559-L563) [/github.com/angular/angular/blob/3569fdf/packages/service-worker/worker/src/driver.ts#L505-L519](https://github.com//github.com/angular/angular/blob/3569fdf/packages/service-worker/worker/src/driver.ts/issues/L505-L519)
+
+
+### Features
+
+* **ngcc:** implement a program-based entry-point finder ([#37075](https://github.com/angular/angular/issues/37075)) ([f3ccd29](https://github.com/angular/angular/commit/f3ccd29))
+
+
+### Performance Improvements
+
+* **ngcc:** allow immediately reporting a stale lock file ([#37250](https://github.com/angular/angular/issues/37250)) ([930d204](https://github.com/angular/angular/commit/930d204))
+* **ngcc:** cache parsed tsconfig between runs ([#37417](https://github.com/angular/angular/issues/37417)) ([f9daa13](https://github.com/angular/angular/commit/f9daa13)), closes [#36882](https://github.com/angular/angular/issues/36882)
+
+
+<a name="10.0.0-rc.2"></a>
+# [10.0.0-rc.2](https://github.com/angular/angular/compare/10.0.0-rc.0...10.0.0-rc.2) (2020-06-01)
+
+
+### Bug Fixes
+
+* **core:** reenable decorator downleveling for Angular npm packages ([#37317](https://github.com/angular/angular/issues/37317)) ([d16a7f3](https://github.com/angular/angular/commit/d16a7f3)), closes [#37221](https://github.com/angular/angular/issues/37221) [#37221](https://github.com/angular/angular/issues/37221)
+
+
+Note: the 10.0.0-rc.1 release on npm accidentally glitched-out midway, so we cut 10.0.0-rc.2 instead. oops :-)
+
+<a name="10.0.0-rc.0"></a>
+# [10.0.0-rc.0](https://github.com/angular/angular/compare/10.0.0-next.9...10.0.0-rc.0) (2020-05-21)
+
+### Bug Fixes
+
+* **core:** disable tsickle pass when producing APF packages ([#37221](https://github.com/angular/angular/issues/37221)) ([a1001f2](https://github.com/angular/angular/commit/a1001f2))
+* **elements:** capture input properties set before upgrading the element ([#36114](https://github.com/angular/angular/issues/36114)) ([2fc5ae5](https://github.com/angular/angular/commit/2fc5ae5)), closes [#30848](https://github.com/angular/angular/issues/30848) [#31416](https://github.com/angular/angular/issues/31416)
+* **elements:** correctly handle getting/setting properties before connecting the element ([#36114](https://github.com/angular/angular/issues/36114)) ([327980b](https://github.com/angular/angular/commit/327980b)), closes [/github.com/angular/angular/pull/31416/files#r300326698](https://github.com//github.com/angular/angular/pull/31416/files/issues/r300326698)
+* **elements:** do not break when the constructor of an Angular Element is not called ([#36114](https://github.com/angular/angular/issues/36114)) ([89b44d1](https://github.com/angular/angular/commit/89b44d1))
+* **ngcc:** identifier ModuleWithProviders functions in IIFE wrapped classes ([#37206](https://github.com/angular/angular/issues/37206)) ([97e1399](https://github.com/angular/angular/commit/97e1399)), closes [#37189](https://github.com/angular/angular/issues/37189)
+
+
+### BREAKING CHANGES
+
+* **core:** Angular npm packages no longer contain jsdoc comments
+to support Closure Compiler's advanced optimizations
+
+The support for Closure Compiler in Angular packages has been
+experimental and broken for quite some time.
+
+As of TS3.9, Closure is unusable with the JavaScript emit. Please follow
+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 
+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 
+will ensure that your build pipeline produces buildable and
+runnable artifacts, at the cost of increased payload size due to
+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.
+
+
+
+<a name="9.1.9"></a>
+## [9.1.9](https://github.com/angular/angular/compare/9.1.8...9.1.9) (2020-05-20)
+
+This release contains a re-submit of the following 3 commits with fixes for TS 3.8.
+
+### Bug Fixes
+
+* **elements:** capture input properties set before upgrading the element ([#36114](https://github.com/angular/angular/issues/36114)) ([#37226](https://github.com/angular/angular/issues/37226)) ([a33cb2d](https://github.com/angular/angular/commit/a33cb2d)), closes [#30848](https://github.com/angular/angular/issues/30848) [#31416](https://github.com/angular/angular/issues/31416)
+* **elements:** correctly handle getting/setting properties before connecting the element ([#36114](https://github.com/angular/angular/issues/36114)) ([#37226](https://github.com/angular/angular/issues/37226)) ([6ac0042](https://github.com/angular/angular/commit/6ac0042)), closes [/github.com/angular/angular/pull/31416/files#r300326698](https://github.com//github.com/angular/angular/pull/31416/files/issues/r300326698)
+* **elements:** do not break when the constructor of an Angular Element is not called ([#36114](https://github.com/angular/angular/issues/36114)) ([#37226](https://github.com/angular/angular/issues/37226)) ([1465372](https://github.com/angular/angular/commit/1465372))
+
+
+
+<a name="9.1.8"></a>
+## [9.1.8](https://github.com/angular/angular/compare/9.1.6...9.1.8) (2020-05-20)
+
+
+### Bug Fixes
+
+* **core:** Host classes should not be fed back into `@Input` ([#35889](https://github.com/angular/angular/issues/35889)) ([f872b69](https://github.com/angular/angular/commit/f872b69)), closes [#35383](https://github.com/angular/angular/issues/35383)
+* **core:** inheritance delegate ctor regex updated to work on minified code ([#36962](https://github.com/angular/angular/issues/36962)) ([e3d3395](https://github.com/angular/angular/commit/e3d3395))
+* **elements:** capture input properties set before upgrading the element ([#36114](https://github.com/angular/angular/issues/36114)) ([1c8f179](https://github.com/angular/angular/commit/1c8f179)), closes [#30848](https://github.com/angular/angular/issues/30848) [#31416](https://github.com/angular/angular/issues/31416)
+* **elements:** correctly handle getting/setting properties before connecting the element ([#36114](https://github.com/angular/angular/issues/36114)) ([363f14c](https://github.com/angular/angular/commit/363f14c)), closes [/github.com/angular/angular/pull/31416/files#r300326698](https://github.com//github.com/angular/angular/pull/31416/files/issues/r300326698)
+* **elements:** do not break when the constructor of an Angular Element is not called ([#36114](https://github.com/angular/angular/issues/36114)) ([87b9f08](https://github.com/angular/angular/commit/87b9f08))
+* **router:** update type for routerLink to include null and undefined ([#37018](https://github.com/angular/angular/issues/37018)) ([7de7871](https://github.com/angular/angular/commit/7de7871)), closes [#13380](https://github.com/angular/angular/issues/13380) [#36544](https://github.com/angular/angular/issues/36544)
+
+
+<a name="10.0.0-next.9"></a>
+# [10.0.0-next.9](https://github.com/angular/angular/compare/10.0.0-next.8...10.0.0-next.9) (2020-05-19)
+
+
+### Bug Fixes
+
+* **compiler-cli:** ensure LogicalFileSystem maintains case in paths ([#37008](https://github.com/angular/angular/issues/37008)) ([3dfc770](https://github.com/angular/angular/commit/3dfc770)), closes [#36992](https://github.com/angular/angular/issues/36992) [#36993](https://github.com/angular/angular/issues/36993) [#37000](https://github.com/angular/angular/issues/37000)
+* **router:** update type for routerLink to include null and undefined ([#37018](https://github.com/angular/angular/issues/37018)) ([ef9f8df](https://github.com/angular/angular/commit/ef9f8df)), closes [#13380](https://github.com/angular/angular/issues/13380) [#36544](https://github.com/angular/angular/issues/36544)
+
+
+### Features
+
+* **core** update to tslib 2.0 and move to direct dependencies ([#37198](https://github.com/angular/angular/pull/37198)), closes [#37188](https://github.com/angular/angular/issues/37188)
+
+<a name="10.0.0-next.8"></a>
+# [10.0.0-next.8](https://github.com/angular/angular/compare/10.0.0-next.7...10.0.0-next.8) (2020-05-18)
+
+
+### Bug Fixes
+
+* **compiler-cli:** compute the correct target output for `$localize` messages ([#36989](https://github.com/angular/angular/issues/36989)) ([4e1b5e4](https://github.com/angular/angular/commit/4e1b5e4))
+* **core:** Host classes should not be fed back into `@Input` ([#35889](https://github.com/angular/angular/issues/35889)) ([cda2530](https://github.com/angular/angular/commit/cda2530)), closes [#35383](https://github.com/angular/angular/issues/35383)
+* **core:** inheritance delegate ctor regex updated to work on minified code ([#36962](https://github.com/angular/angular/issues/36962)) ([ea971f7](https://github.com/angular/angular/commit/ea971f7))
+* **language-service:** use empty statement as parent of type node ([#36989](https://github.com/angular/angular/issues/36989)) ([a32cbed](https://github.com/angular/angular/commit/a32cbed))
+* **ngcc:** `viaModule` should be `null` for local imports ([#36989](https://github.com/angular/angular/issues/36989)) ([d268d2a](https://github.com/angular/angular/commit/d268d2a))
+* **ngcc:** ensure reflection hosts can handle TS 3.9 IIFE wrapped classes ([#36989](https://github.com/angular/angular/issues/36989)) ([d7440c4](https://github.com/angular/angular/commit/d7440c4))
+* **ngcc:** ensure rendering formatters work with IIFE wrapped classes ([#36989](https://github.com/angular/angular/issues/36989)) ([c8ee390](https://github.com/angular/angular/commit/c8ee390))
+* **ngcc:** support `defineProperty()` re-exports in CommonJS and UMD ([#36989](https://github.com/angular/angular/issues/36989)) ([91092f6](https://github.com/angular/angular/commit/91092f6))
+
+
+### Features
+
+* remove support for TypeScript 3.8 ([#37129](https://github.com/angular/angular/issues/37129)) ([6466fb2](https://github.com/angular/angular/commit/6466fb2))
+* **platform-server:** use absolute URLs from Location for HTTP ([#37071](https://github.com/angular/angular/issues/37071)) ([9edea0b](https://github.com/angular/angular/commit/9edea0b))
+
+
+### BREAKING CHANGES
+
+* TypeScript 3.8 is no longer supported, please update to TypeScript 3.9.
+
+
+
+<a name="10.0.0-next.7"></a>
+# [10.0.0-next.7](https://github.com/angular/angular/compare/10.0.0-next.6...10.0.0-next.7) (2020-05-13)
+
+
+### Bug Fixes
+
+* **core:** correct "development mode" console message ([#36571](https://github.com/angular/angular/issues/36571)) ([8d8e419](https://github.com/angular/angular/commit/8d8e419)), closes [#36570](https://github.com/angular/angular/issues/36570)
+* add aikidave as reviewer for DOCS: Marketing ([#37014](https://github.com/angular/angular/issues/37014)) ([286fbf4](https://github.com/angular/angular/commit/286fbf4))
+
+
+### Features
+
+* **compiler:** add name spans for property reads and method calls ([#36826](https://github.com/angular/angular/issues/36826)) ([eb34aa5](https://github.com/angular/angular/commit/eb34aa5))
+* **language-service:** [ivy] wrap ngtsc to handle typecheck files ([#36930](https://github.com/angular/angular/issues/36930)) ([1142c37](https://github.com/angular/angular/commit/1142c37))
+* **core** make generic mandatory for ModuleWithProviders ([#36892](https://github.com/angular/angular/issues/36892)) ([20cc3ab](https://github.com/angular/angular/commit/20cc3ab))
+
+### BREAKING CHANGES
+
+* **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. 
+
+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.
+
+As a workaround, we suggest setting `skipLibChecks` to false in your tsconfig or updating your app to use Ivy.
+
+
+<a name="9.1.7"></a>
+## [9.1.7](https://github.com/angular/angular/compare/9.1.6...9.1.7) (2020-05-13)
+
+This release contains various API docs improvements.
+
+
+<a name="9.1.6"></a>
+## [9.1.6](https://github.com/angular/angular/compare/9.1.5...9.1.6) (2020-05-08)
+
+### Bug Fixes
+
+* **compiler-cli**: Revert "fix(compiler-cli): fix case-sensitivity issues in NgtscCompilerHost (#36968)" (#37003)
+
+
+
+<a name="10.0.0-next.6"></a>
+# [10.0.0-next.6](https://github.com/angular/angular/compare/10.0.0-next.5...10.0.0-next.6) (2020-05-07)
+
+
+### Bug Fixes
+
+* **bazel:** ng_package rule should update "package.json" of ts_library targets ([#36944](https://github.com/angular/angular/issues/36944)) ([d5293d2](https://github.com/angular/angular/commit/d5293d2))
+* **compiler:** remove outdated and invalid warning for unresolved DI parameters ([#36985](https://github.com/angular/angular/issues/36985)) ([d0280a0](https://github.com/angular/angular/commit/d0280a0))
+* **compiler:** switch to 'referencedFiles' for shim generation ([#36211](https://github.com/angular/angular/issues/36211)) ([4213e8d](https://github.com/angular/angular/commit/4213e8d))
+* **compiler-cli:** `isCaseSensitive()` returns correct value ([#36859](https://github.com/angular/angular/issues/36859)) ([fc4741f](https://github.com/angular/angular/commit/fc4741f))
+* **compiler-cli:** don't try to tag non-ts files as shims ([#36987](https://github.com/angular/angular/issues/36987)) ([42d1091](https://github.com/angular/angular/commit/42d1091))
+* **compiler-cli:** ensure `getRootDirs()` handles case-sensitivity ([#36859](https://github.com/angular/angular/issues/36859)) ([3f3e9b7](https://github.com/angular/angular/commit/3f3e9b7))
+* **compiler-cli:** ensure `MockFileSystem` handles case-sensitivity ([#36859](https://github.com/angular/angular/issues/36859)) ([26eacd4](https://github.com/angular/angular/commit/26eacd4))
+* **compiler-cli:** ensure LogicalFileSystem handles case-sensitivity ([#36859](https://github.com/angular/angular/issues/36859)) ([53a8459](https://github.com/angular/angular/commit/53a8459))
+* **compiler-cli:** fix bug tracking indirect NgModule dependencies ([#36211](https://github.com/angular/angular/issues/36211)) ([bab90a7](https://github.com/angular/angular/commit/bab90a7))
+* **compiler-cli:** fix case-sensitivity issues in NgtscCompilerHost ([#36859](https://github.com/angular/angular/issues/36859)) ([0ec0ff3](https://github.com/angular/angular/commit/0ec0ff3))
+* **compiler-cli:** normalize mock Windows file paths correctly ([#36859](https://github.com/angular/angular/issues/36859)) ([b682bd1](https://github.com/angular/angular/commit/b682bd1))
+* **compiler-cli:** use CompilerHost to ensure canonical file paths ([#36859](https://github.com/angular/angular/issues/36859)) ([a10c126](https://github.com/angular/angular/commit/a10c126))
+* **core:** handle pluralize functions that expect a number ([#36901](https://github.com/angular/angular/issues/36901)) ([2ff4b35](https://github.com/angular/angular/commit/2ff4b35)), closes [#36888](https://github.com/angular/angular/issues/36888)
+* **core:** properly get root nodes from embedded views with <ng-content> ([#36051](https://github.com/angular/angular/issues/36051)) ([e30e132](https://github.com/angular/angular/commit/e30e132)), closes [#35967](https://github.com/angular/angular/issues/35967)
+* **forms:** handle numeric values properly in the validator ([#36157](https://github.com/angular/angular/issues/36157)) ([88a235d](https://github.com/angular/angular/commit/88a235d)), closes [#35591](https://github.com/angular/angular/issues/35591)
+* **forms:** number input fires valueChanges twice ([#36087](https://github.com/angular/angular/issues/36087)) ([97d6d90](https://github.com/angular/angular/commit/97d6d90)), closes [#12540](https://github.com/angular/angular/issues/12540)
+* **localize:** ensure `getLocation()` works ([#36853](https://github.com/angular/angular/issues/36853)) ([70b25a3](https://github.com/angular/angular/commit/70b25a3))
+* **ngcc:** support ModuleWithProviders functions that delegate ([#36948](https://github.com/angular/angular/issues/36948)) ([fafa50d](https://github.com/angular/angular/commit/fafa50d)), closes [#36892](https://github.com/angular/angular/issues/36892)
+
+
+### Features
+
+
+* **bazel:** simplify ng_package by dropping esm5 and fesm5 ([#36944](https://github.com/angular/angular/issues/36944)) ([9dbb30f](https://github.com/angular/angular/commit/9dbb30f))
+* **compiler-cli:** report error if undecorated class with Angular features is discovered ([#36921](https://github.com/angular/angular/issues/36921)) ([4c92cf4](https://github.com/angular/angular/commit/4c92cf4))
+* **core:** undecorated-classes-with-decorated-fields migration should handle classes with lifecycle hooks ([#36921](https://github.com/angular/angular/issues/36921)) ([c6ecdc9](https://github.com/angular/angular/commit/c6ecdc9))
+* **ngcc:** support for new APF where `module` points to esm2015 output ([#36944](https://github.com/angular/angular/issues/36944)) ([c98a4d6](https://github.com/angular/angular/commit/c98a4d6))
+* **language-service:** [ivy] Parse Angular compiler options ([#36922](https://github.com/angular/angular/issues/36922)) ([dbd0f8e](https://github.com/angular/angular/commit/dbd0f8e))
+* remove TypeScript 3.6 and 3.7 support ([#36329](https://github.com/angular/angular/issues/36329)) ([fbd281c](https://github.com/angular/angular/commit/fbd281c))
+
+
+### Performance Improvements
+
+* **compiler-cli:** perform template type-checking incrementally ([#36211](https://github.com/angular/angular/issues/36211)) ([ecffc35](https://github.com/angular/angular/commit/ecffc35))
+* **compiler-cli:** split Ivy template type-checking into multiple files ([#36211](https://github.com/angular/angular/issues/36211)) ([b861e9c](https://github.com/angular/angular/commit/b861e9c))
+
+
+### BREAKING CHANGES
+
+* TypeScript versions 3.6 and 3.7 are no longer supported, please update to TypeScript 3.8
+
+* **forms:** Number inputs no longer listen to the `change` event.
+
+Tests which trigger `change` events need to be updated to trigger `input` events instead.
+
+The `change` event was in place to support IE9, as we found that `input` events were not fired with backspace or cut actions. If you need to maintain IE9 support, you will need to add a change event listener to number inputs and call the `onChange` method of `NumberValueAccessor` manually.
+
+Lastly, old versions of WebDriver would synthetically trigger the `change` event on `WebElement.clear` and `WebElement.sendKeys`. If you are using an old version of WebDriver, you may need to update tests to ensure `input` events are triggered. For example, you could use `element.sendKeys(Keys.chord(Keys.CONTROL, "a"), Keys.BACK_SPACE);` in place of `element.clear()`.
+* **forms:** The `minLength` and `maxLength` validators now verify that the form control's value has a
+numeric `length` property, and only validate for length if that's the case.
+
+Previously, falsey values without the length property (such as `0` or
+`false` values) were triggering validation errors. If your code relies on
+the old behavior, you can include other validators such as [min][1] or
+[requiredTrue][2] to the list of validators for a particular field.
+
+[1]: https://angular.io/api/forms/Validators#min
+[2]: https://angular.io/api/forms/Validators#requiredTrue
+* **bazel:** esm5 and fesm5 format is no longer distributed in
+Angular's npm packages e.g. @angular/core
+
+If you are not using Angular CLI to build your application or library,
+and you need to be able to build es5 artifacts, then you will need to
+downlevel the distributed Angular code to es5 on your own.
+
+Angular CLI will automatically downlevel the code to es5 if differential
+loading is enabled in the Angular project, so no action is required from
+Angular CLI users.
+
+
+<a name="9.1.5"></a>
+## [9.1.5](https://github.com/angular/angular/compare/9.1.4...9.1.5) (2020-05-07)
+
+
+### Bug Fixes
+
+* **compiler-cli:** `isCaseSensitive()` returns correct value ([#36968](https://github.com/angular/angular/issues/36968)) ([4becc1b](https://github.com/angular/angular/commit/4becc1b))
+* **compiler-cli:** ensure `getRootDirs()` handles case-sensitivity ([#36968](https://github.com/angular/angular/issues/36968)) ([5bddeea](https://github.com/angular/angular/commit/5bddeea))
+* **compiler-cli:** ensure `MockFileSystem` handles case-sensitivity ([#36968](https://github.com/angular/angular/issues/36968)) ([b6c042d](https://github.com/angular/angular/commit/b6c042d))
+* **compiler-cli:** ensure LogicalFileSystem handles case-sensitivity ([#36968](https://github.com/angular/angular/issues/36968)) ([65337fb](https://github.com/angular/angular/commit/65337fb))
+* **compiler-cli:** fix case-sensitivity issues in NgtscCompilerHost ([#36968](https://github.com/angular/angular/issues/36968)) ([4abd603](https://github.com/angular/angular/commit/4abd603))
+* **compiler-cli:** normalize mock Windows file paths correctly ([#36968](https://github.com/angular/angular/issues/36968)) ([654868f](https://github.com/angular/angular/commit/654868f))
+* **compiler-cli:** use CompilerHost to ensure canonical file paths ([#36968](https://github.com/angular/angular/issues/36968)) ([7e9d5f5](https://github.com/angular/angular/commit/7e9d5f5))
+* **core:** handle pluralize functions that expect a number ([#36901](https://github.com/angular/angular/issues/36901)) ([e5317d5](https://github.com/angular/angular/commit/e5317d5)), closes [#36888](https://github.com/angular/angular/issues/36888)
+* **core:** properly get root nodes from embedded views with <ng-content> ([#36051](https://github.com/angular/angular/issues/36051)) ([a576852](https://github.com/angular/angular/commit/a576852)), closes [#35967](https://github.com/angular/angular/issues/35967)
+* **core:** Refresh transplanted views at insertion point only ([#35968](https://github.com/angular/angular/issues/35968)) ([c8c2272](https://github.com/angular/angular/commit/c8c2272)), closes [#35400](https://github.com/angular/angular/issues/35400) [#21324](https://github.com/angular/angular/issues/21324)
+* **localize:** ensure `getLocation()` works ([#36920](https://github.com/angular/angular/issues/36920)) ([701016d](https://github.com/angular/angular/commit/701016d))
+* **ngcc:** do not run in parallel mode if there are less than 3 CPU cores ([#36626](https://github.com/angular/angular/issues/36626)) ([3800455](https://github.com/angular/angular/commit/3800455))
+* **ngcc:** give up re-spawing crashed worker process after 3 attempts ([#36626](https://github.com/angular/angular/issues/36626)) ([1863733](https://github.com/angular/angular/commit/1863733))
+* **ngcc:** handle `ENOMEM` errors in worker processes ([#36626](https://github.com/angular/angular/issues/36626)) ([901b980](https://github.com/angular/angular/commit/901b980))
+* **ngcc:** support ModuleWithProviders functions that delegate ([#36948](https://github.com/angular/angular/issues/36948)) ([9d13ee0](https://github.com/angular/angular/commit/9d13ee0)), closes [#36892](https://github.com/angular/angular/issues/36892)
+* **ngcc:** support recovering when a worker process crashes ([#36626](https://github.com/angular/angular/issues/36626)) ([f30307a](https://github.com/angular/angular/commit/f30307a)), closes [#36278](https://github.com/angular/angular/issues/36278)
+* **ngcc:** partially support TS 3.9 wrapped ES2015 classes ([#36884](https://github.com/angular/angular/issues/36884)) ([ebb4733](https://github.com/angular/angular/commit/ebb4733))
+
+
+### Performance Improvements
+
+* **ngcc:** only compute basePaths in TargetedEntryPointFinder when needed ([#36881](https://github.com/angular/angular/issues/36881)) ([5ea51b2](https://github.com/angular/angular/commit/5ea51b2)), closes [#36874](https://github.com/angular/angular/issues/36874)
+* **ngcc:** speed up the `getBasePaths()` computation ([#36881](https://github.com/angular/angular/issues/36881)) ([b6d0e21](https://github.com/angular/angular/commit/b6d0e21))
+
+
+
 <a name="10.0.0-next.5"></a>
 # [10.0.0-next.5](https://github.com/angular/angular/compare/10.0.0-next.4...10.0.0-next.5) (2020-05-04)
 

CONTRIBUTING.md

@@ -22,7 +22,7 @@ Do not open issues for general support questions as we want to keep GitHub issue
 Stack Overflow is a much better place to ask questions since:
 
 - there are thousands of people willing to help on Stack Overflow
-- questions and answers stay available for public viewing so your question / answer might help someone else
+- questions and answers stay available for public viewing so your question/answer might help someone else
 - Stack Overflow's voting system assures that the best answers are prominently visible.
 
 To save your and our time, we will systematically close all issues that are requests for general support and redirect people to Stack Overflow.
@@ -42,7 +42,9 @@ Please consider what kind of change it is:
 
 * For a **Major Feature**, first open an issue and outline your proposal so that it can be
 discussed. This will also allow us to better coordinate our efforts, prevent duplication of work,
-and help you to craft the change so that it is successfully accepted into the project.
+and help you to craft the change so that it is successfully accepted into the project. **Note**:
+Adding a new topic to the documentation, or significantly re-writing a topic, counts as a major
+feature.
 * **Small Features** can be crafted and directly [submitted as a Pull Request](#submit-pr).
 
 ## <a name="submit"></a> Submission Guidelines
@@ -55,7 +57,7 @@ We want to fix all the issues as soon as possible, but before fixing a bug we ne
 
 A minimal reproduction allows us to quickly confirm a bug (or point out a coding problem) as well as confirm that we are fixing the right problem.
 
-We will be insisting on a minimal reproduction scenario in order to save maintainers time and ultimately be able to fix more bugs. Interestingly, from our experience, users often find coding problems themselves while preparing a minimal reproduction. We understand that sometimes it might be hard to extract essential bits of code from a larger codebase but we really need to isolate the problem before we can fix it.
+We will be insisting on a minimal reproduction scenario in order to save maintainers' time and ultimately be able to fix more bugs. Interestingly, from our experience, users often find coding problems themselves while preparing a minimal reproduction. We understand that sometimes it might be hard to extract essential bits of code from a larger codebase but we really need to isolate the problem before we can fix it.
 
 Unfortunately, we are not able to investigate / fix bugs without a minimal reproduction, so if we don't hear back from you, we are going to close an issue that doesn't have enough info to be reproduced.
 
@@ -68,7 +70,7 @@ Before you submit your Pull Request (PR) consider the following guidelines:
 1. Search [GitHub](https://github.com/angular/angular/pulls) for an open or closed PR
   that relates to your submission. You don't want to duplicate effort.
 1. Be sure that an issue describes the problem you're fixing, or documents the design for the feature you'd like to add.
-  Discussing the design up front helps to ensure that we're ready to accept your work.
+  Discussing the design upfront helps to ensure that we're ready to accept your work.
 1. Please sign our [Contributor License Agreement (CLA)](#cla) before sending PRs.
   We cannot accept code without this. Make sure you sign with the primary email address of the Git identity that has been granted access to the Angular repository.
 1. Fork the angular/angular repo.
@@ -83,8 +85,7 @@ Before you submit your Pull Request (PR) consider the following guidelines:
 1. Run the full Angular test suite, as described in the [developer documentation][dev-doc],
   and ensure that all tests pass.
 1. Commit your changes using a descriptive commit message that follows our
-  [commit message conventions](#commit). Adherence to these conventions
+  [commit message conventions](#commit). Adherence to these conventions is necessary because release notes are automatically generated from these messages.
-  is necessary because release notes are automatically generated from these messages.
 
      ```shell
      git commit -a
@@ -179,13 +180,13 @@ Samples: (even more [samples](https://github.com/angular/angular/commits/master)
 docs(changelog): update changelog to beta.5
 ```
 ```
-fix(release): need to depend on latest rxjs and zone.js
+fix(release): need to depend on the latest rxjs and zone.js
 
 The version in our package.json gets copied to the one we publish, and users need the latest of these.
 ```
 
 ### Revert
-If the commit reverts a previous commit, it should begin with `revert: `, followed by the header of the reverted commit. In the body it should say: `This reverts commit <hash>.`, where the hash is the SHA of the commit being reverted.
+If the commit reverts a previous commit, it should begin with `revert: `, followed by the header of the reverted commit. In the body, it should say: `This reverts commit <hash>.`, where the hash is the SHA of the commit being reverted.
 
 ### Type
 Must be one of the following:
@@ -236,6 +237,7 @@ There are currently a few exceptions to the "use package name" rule:
 * **docs-infra**: used for docs-app (angular.io) related changes within the /aio directory of the
   repo
 * **dev-infra**: used for dev-infra related changes within the directories /scripts, /tools and /dev-infra
+* **migrations**: used for changes to the `ng update` migrations.
 * **ngcc**: used for changes to the [Angular Compatibility Compiler](./packages/compiler-cli/ngcc/README.md)
 * **ve**: used for changes specific to ViewEngine (legacy compiler/renderer).
 * none/empty string: useful for `style`, `test` and `refactor` changes that are done across all
@@ -279,7 +281,7 @@ changes to be accepted, the CLA must be signed. It's a quick process, we promise
   * https://help.github.com/articles/about-commit-email-addresses/
   * https://help.github.com/articles/blocking-command-line-pushes-that-expose-your-personal-email-address/
 
-  Note that if you have more than one Git identity, it is important to verify that you are logged in with the same ID with which you signed the CLA, before you commit changes. If not, your PR will fail the CLA check.
+  Note that if you have more than one Git identity, it is important to verify that you are logged in with the same ID with which you signed the CLA before you commit changes. If not, your PR will fail the CLA check.
 
 <hr>
 

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 = "f9e7b9f42ae202cc2d2ce6d698ccb49a9f7f7ea572a78fd451696d03ef2ee116",
+    sha256 = "84abf7ac4234a70924628baa9a73a5a5cbad944c4358cf9abdb4aab29c9a5b77",
-    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/1.6.0/rules_nodejs-1.6.0.tar.gz"],
+    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/1.7.0/rules_nodejs-1.7.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.6.0")
+check_rules_nodejs_version(minimum_version_string = "1.7.0")
 
 # Setup the Node.js toolchain
 node_repositories(
@@ -64,7 +64,7 @@ load("@io_bazel_rules_webtesting//web:repositories.bzl", "web_test_repositories"
 
 web_test_repositories()
 
-load("//tools/browsers:browser_repositories.bzl", "browser_repositories")
+load("//dev-infra/browsers:browser_repositories.bzl", "browser_repositories")
 
 browser_repositories()
 
@@ -91,17 +91,18 @@ 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/1.1.2/configs/ubuntu16_04_clang/versions.bzl
+    # https://github.com/bazelbuild/bazel-toolchains/blob/3.2.0/configs/ubuntu16_04_clang/versions.bzl
-    base_container_digest = "sha256:1ab40405810effefa0b2f45824d6d608634ccddbf06366760c341ef6fbead011",
+    base_container_digest = "sha256:5e750dd878df9fcf4e185c6f52b9826090f6e532b097f286913a428290622332",
     # 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:0b8fa87db4b8e5366717a7164342a029d1348d2feea7ecc4b18c780bc2507059",
+    digest = "sha256:f743114235a43355bf8324e2ba0fa6a597236fe06f7bc99aaa9ac703631c306b",
     env = clang_env(),
     registry = "marketplace.gcr.io",
     # We can't use the default "ubuntu16_04" RBE image provided by the autoconfig because we need
     # a specific Linux kernel that comes with "libx11" in order to run headless browser tests.
     repository = "google/rbe-ubuntu16-04-webtest",
+    use_checked_in_confs = "Force",
 )

aio/aio-builds-setup/dockerbuild/Dockerfile

@@ -1,5 +1,5 @@
 # Image metadata and config
-FROM debian:stretch
+FROM debian:buster
 
 LABEL name="angular.io PR preview" \
       description="This image implements the PR preview functionality for angular.io." \
@@ -37,9 +37,9 @@ ARG TEST_AIO_NGINX_PORT_HTTPS=4433
 ARG      AIO_SIGNIFICANT_FILES_PATTERN='^(?:aio|packages)/(?!.*[._]spec\\.[jt]s$)'
 ARG TEST_AIO_SIGNIFICANT_FILES_PATTERN=$AIO_SIGNIFICANT_FILES_PATTERN
 ARG      AIO_TRUSTED_PR_LABEL="aio: preview"
-ARG TEST_AIO_TRUSTED_PR_LABEL="aio: preview"
+ARG TEST_AIO_TRUSTED_PR_LABEL=$AIO_TRUSTED_PR_LABEL
 ARG      AIO_PREVIEW_SERVER_HOSTNAME=preview.localhost
-ARG TEST_AIO_PREVIEW_SERVER_HOSTNAME=preview.localhost
+ARG TEST_AIO_PREVIEW_SERVER_HOSTNAME=$AIO_PREVIEW_SERVER_HOSTNAME
 ARG      AIO_ARTIFACT_MAX_SIZE=26214400
 ARG TEST_AIO_ARTIFACT_MAX_SIZE=200
 ARG      AIO_PREVIEW_SERVER_PORT=3000
@@ -72,24 +72,29 @@ RUN mkdir /var/log/aio
 
 
 # Add extra package sources
-RUN apt-get update -y && apt-get install -y curl
+RUN apt-get update -y && apt-get install -y curl=7.64.0-4+deb10u1
-RUN curl --silent --show-error --location https://deb.nodesource.com/setup_10.x | bash -
+RUN curl --silent --show-error --location https://deb.nodesource.com/setup_12.x | bash -
 RUN curl --silent --show-error https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
 RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
-RUN echo "deb http://ftp.debian.org/debian stretch-backports main" | tee /etc/apt/sources.list.d/backports.list
 
 
 # Install packages
+# NOTE: Some packages (such as `nginx`, `nodejs`, `openssl`) make older versions unavailable on the
+#       repositories, so we cannot pin to specific versions for these packages :(
+#       See for example:
+#       - https://github.com/nodesource/distributions/issues/33
+#       - https://askubuntu.com/questions/715104/how-can-i-downgrade-openssl-via-apt-get
 RUN apt-get update -y && apt-get install -y \
-    cron=3.0pl1-128+deb9u1 \
+    cron=3.0pl1-134+deb10u1 \
-    dnsmasq=2.76-5+deb9u2 \
+    dnsmasq=2.80-1 \
-    nano=2.7.4-1 \
+    nano=3.2-3 \
-    nginx=1.10.3-1+deb9u2 \
+    nginx \
-    nodejs=10.15.3-1nodesource1 \
+    nodejs \
-    openssl=1.1.0j-1~deb9u1 \
+    openssl \
-    rsyslog=8.24.0-1 \
+    rsyslog=8.1901.0-1 \
-    yarn=1.15.2-1
+    vim=2:8.1.0875-5 \
-RUN yarn global add pm2@3.5.0
+    yarn=1.22.4-1
+RUN yarn global add pm2@4.4.0
 
 
 # Set up log rotation
@@ -162,8 +167,7 @@ RUN find $AIO_SCRIPTS_SH_DIR -maxdepth 1 -type f -printf "%P\n" \
 
 # Set up the Node.js scripts
 COPY scripts-js/ $AIO_SCRIPTS_JS_DIR/
-WORKDIR $AIO_SCRIPTS_JS_DIR/
+RUN yarn --cwd="$AIO_SCRIPTS_JS_DIR/" install --production --frozen-lockfile
-RUN yarn install --production --frozen-lockfile
 
 
 # Set up health check

aio/aio-builds-setup/dockerbuild/scripts-js/lib/clean-up/build-cleaner.ts

@@ -35,6 +35,7 @@ export class BuildCleaner {
       ]);
     } catch (error) {
       this.logger.error('ERROR:', error);
+      throw error;
     }
   }
 

aio/aio-builds-setup/dockerbuild/scripts-js/lib/preview-server/utils.ts

@@ -1,5 +1,4 @@
 import * as express from 'express';
-import {promisify} from 'util';
 import {PreviewServerError} from './preview-error';
 
 /**
@@ -13,7 +12,7 @@ export async function respondWithError(res: express.Response, err: any): Promise
   }
 
   res.status(err.status);
-  await promisify(res.end.bind(res))(err.message);
+  return new Promise(resolve => res.end(err.message, resolve));
 }
 
 /**

aio/aio-builds-setup/dockerbuild/scripts-js/lib/verify-setup/helper.ts

@@ -93,7 +93,7 @@ class Helper {
     return fs.readFileSync(absFilePath, 'utf8');
   }
 
-  public runCmd(cmd: string, opts: cp.ExecFileOptions = {}): Promise<CmdResult> {
+  public runCmd(cmd: string, opts: cp.ExecOptions = {}): Promise<CmdResult> {
     return new Promise(resolve => {
       const proc = cp.exec(cmd, opts, (err, stdout, stderr) => resolve({success: !err, err, stdout, stderr}));
       this.createCleanUpFn(() => proc.kill());
@@ -101,7 +101,7 @@ class Helper {
   }
 
   public runForAllSupportedSchemes(suiteFactory: TestSuiteFactory): void {
-    Object.keys(this.portPerScheme).forEach(scheme => suiteFactory(scheme, this.portPerScheme[scheme]));
+    Object.entries(this.portPerScheme).forEach(([scheme, port]) => suiteFactory(scheme, port));
   }
 
   public verifyResponse(status: number, regex: string | RegExp = /^/): VerifyCmdResultFn {

aio/aio-builds-setup/dockerbuild/scripts-js/lib/verify-setup/nginx.e2e.ts

@@ -15,7 +15,7 @@ describe(`nginx`, () => {
   afterEach(() => h.cleanUp());
 
 
-  it('should redirect HTTP to HTTPS', done => {
+  it('should redirect HTTP to HTTPS', async () => {
     const httpHost = `${AIO_NGINX_HOSTNAME}:${AIO_NGINX_PORT_HTTP}`;
     const httpsHost = `${AIO_NGINX_HOSTNAME}:${AIO_NGINX_PORT_HTTPS}`;
     const urlMap = {
@@ -24,16 +24,15 @@ describe(`nginx`, () => {
       [`http://foo.${httpHost}/`]: `https://foo.${httpsHost}/`,
     };
 
-    const verifyRedirection = (httpUrl: string) => h.runCmd(`curl -i ${httpUrl}`).then(result => {
+    const verifyRedirection = async (fromUrl: string, toUrl: string) => {
+      const result = await h.runCmd(`curl -i ${fromUrl}`);
       h.verifyResponse(307)(result);
 
       const headers = result.stdout.split(/(?:\r?\n){2,}/)[0];
-      expect(headers).toContain(`Location: ${urlMap[httpUrl]}`);
+      expect(headers).toContain(`Location: ${toUrl}`);
-    });
+    };
 
-    Promise.
+    await Promise.all(Object.entries(urlMap).map(urls => verifyRedirection(...urls)));
-      all(Object.keys(urlMap).map(verifyRedirection)).
-      then(done);
   });
 
 
@@ -62,15 +61,15 @@ describe(`nginx`, () => {
         });
 
 
-        it('should return /index.html', done => {
+        it('should return /index.html', async () => {
           const origin = `${scheme}://pr${pr}-${shortSha9}.${host}`;
           const bodyRegex = new RegExp(`^PR: ${pr} | SHA: ${sha9} | File: /index\\.html$`);
 
-          Promise.all([
+          await Promise.all([
             h.runCmd(`curl -iL ${origin}/index.html`).then(h.verifyResponse(200, bodyRegex)),
             h.runCmd(`curl -iL ${origin}/`).then(h.verifyResponse(200, bodyRegex)),
             h.runCmd(`curl -iL ${origin}`).then(h.verifyResponse(200, bodyRegex)),
-          ]).then(done);
+          ]);
         });
 
 
@@ -90,12 +89,11 @@ describe(`nginx`, () => {
         });
 
 
-        it('should return /foo/bar.js', done => {
+        it('should return /foo/bar.js', async () => {
           const bodyRegex = new RegExp(`^PR: ${pr} | SHA: ${sha9} | File: /foo/bar\\.js$`);
 
-          h.runCmd(`curl -iL ${scheme}://pr${pr}-${shortSha9}.${host}/foo/bar.js`).
+          await h.runCmd(`curl -iL ${scheme}://pr${pr}-${shortSha9}.${host}/foo/bar.js`).
-            then(h.verifyResponse(200, bodyRegex)).
+            then(h.verifyResponse(200, bodyRegex));
-            then(done);
         });
 
 
@@ -111,47 +109,46 @@ describe(`nginx`, () => {
         });
 
 
-        it('should respond with 403 for directories', done => {
+        it('should respond with 403 for directories', async () => {
-          Promise.all([
+          await Promise.all([
             h.runCmd(`curl -iL ${scheme}://pr${pr}-${shortSha9}.${host}/foo/`).then(h.verifyResponse(403)),
             h.runCmd(`curl -iL ${scheme}://pr${pr}-${shortSha9}.${host}/foo`).then(h.verifyResponse(403)),
-          ]).then(done);
+          ]);
         });
 
 
-        it('should respond with 404 for unknown paths to files', done => {
+        it('should respond with 404 for unknown paths to files', async () => {
-          h.runCmd(`curl -iL ${scheme}://pr${pr}-${shortSha9}.${host}/foo/baz.css`).
+          await h.runCmd(`curl -iL ${scheme}://pr${pr}-${shortSha9}.${host}/foo/baz.css`).
-            then(h.verifyResponse(404)).
+            then(h.verifyResponse(404));
-            then(done);
         });
 
 
-        it('should rewrite to \'index.html\' for unknown paths that don\'t look like files', done => {
+        it('should rewrite to \'index.html\' for unknown paths that don\'t look like files', async () => {
           const origin = `${scheme}://pr${pr}-${shortSha9}.${host}`;
           const bodyRegex = new RegExp(`^PR: ${pr} | SHA: ${sha9} | File: /index\\.html$`);
 
-          Promise.all([
+          await Promise.all([
             h.runCmd(`curl -iL ${origin}/foo/baz`).then(h.verifyResponse(200, bodyRegex)),
             h.runCmd(`curl -iL ${origin}/foo/baz/`).then(h.verifyResponse(200, bodyRegex)),
-          ]).then(done);
+          ]);
         });
 
 
-        it('should respond with 404 for unknown PRs/SHAs', done => {
+        it('should respond with 404 for unknown PRs/SHAs', async () => {
           const otherPr = 54321;
           const otherShortSha = computeShortSha('8'.repeat(40));
 
-          Promise.all([
+          await Promise.all([
             h.runCmd(`curl -iL ${scheme}://pr${pr}9-${shortSha9}.${host}`).then(h.verifyResponse(404)),
             h.runCmd(`curl -iL ${scheme}://pr${otherPr}-${shortSha9}.${host}`).then(h.verifyResponse(404)),
             h.runCmd(`curl -iL ${scheme}://pr${pr}-${shortSha9}9.${host}`).then(h.verifyResponse(404)),
             h.runCmd(`curl -iL ${scheme}://pr${pr}-${otherShortSha}.${host}`).then(h.verifyResponse(404)),
-          ]).then(done);
+          ]);
         });
 
 
-        it('should respond with 404 if the subdomain format is wrong', done => {
+        it('should respond with 404 if the subdomain format is wrong', async () => {
-          Promise.all([
+          await Promise.all([
             h.runCmd(`curl -iL ${scheme}://xpr${pr}-${shortSha9}.${host}`).then(h.verifyResponse(404)),
             h.runCmd(`curl -iL ${scheme}://prx${pr}-${shortSha9}.${host}`).then(h.verifyResponse(404)),
             h.runCmd(`curl -iL ${scheme}://xx${pr}-${shortSha9}.${host}`).then(h.verifyResponse(404)),
@@ -160,26 +157,25 @@ describe(`nginx`, () => {
             h.runCmd(`curl -iL ${scheme}://${pr}-${shortSha9}.${host}`).then(h.verifyResponse(404)),
             h.runCmd(`curl -iL ${scheme}://pr${pr}${shortSha9}.${host}`).then(h.verifyResponse(404)),
             h.runCmd(`curl -iL ${scheme}://pr${pr}_${shortSha9}.${host}`).then(h.verifyResponse(404)),
-          ]).then(done);
+          ]);
         });
 
 
-        it('should reject PRs with leading zeros', done => {
+        it('should reject PRs with leading zeros', async () => {
-          h.runCmd(`curl -iL ${scheme}://pr0${pr}-${shortSha9}.${host}`).
+          await h.runCmd(`curl -iL ${scheme}://pr0${pr}-${shortSha9}.${host}`).
-            then(h.verifyResponse(404)).
+            then(h.verifyResponse(404));
-            then(done);
         });
 
 
-        it('should accept SHAs with leading zeros (but not trim the zeros)', done => {
+        it('should accept SHAs with leading zeros (but not trim the zeros)', async () => {
           const bodyRegex9 = new RegExp(`^PR: ${pr} | SHA: ${sha9} | File: /index\\.html$`);
           const bodyRegex0 = new RegExp(`^PR: ${pr} | SHA: ${sha0} | File: /index\\.html$`);
 
-          Promise.all([
+          await Promise.all([
             h.runCmd(`curl -iL ${scheme}://pr${pr}-0${shortSha9}.${host}`).then(h.verifyResponse(404)),
             h.runCmd(`curl -iL ${scheme}://pr${pr}-${shortSha9}.${host}`).then(h.verifyResponse(200, bodyRegex9)),
             h.runCmd(`curl -iL ${scheme}://pr${pr}-${shortSha0}.${host}`).then(h.verifyResponse(200, bodyRegex0)),
-          ]).then(done);
+          ]);
         });
 
       });
@@ -231,23 +227,23 @@ describe(`nginx`, () => {
 
     describe(`${host}/health-check`, () => {
 
-      it('should respond with 200', done => {
+      it('should respond with 200', async () => {
-        Promise.all([
+        await Promise.all([
           h.runCmd(`curl -iL ${scheme}://${host}/health-check`).then(h.verifyResponse(200)),
           h.runCmd(`curl -iL ${scheme}://${host}/health-check/`).then(h.verifyResponse(200)),
-        ]).then(done);
+        ]);
       });
 
 
-      it('should respond with 404 if the path does not match exactly', done => {
+      it('should respond with 404 if the path does not match exactly', async () => {
-        Promise.all([
+        await Promise.all([
           h.runCmd(`curl -iL ${scheme}://${host}/health-check/foo`).then(h.verifyResponse(404)),
           h.runCmd(`curl -iL ${scheme}://${host}/health-check-foo`).then(h.verifyResponse(404)),
           h.runCmd(`curl -iL ${scheme}://${host}/health-checknfoo`).then(h.verifyResponse(404)),
           h.runCmd(`curl -iL ${scheme}://${host}/foo/health-check`).then(h.verifyResponse(404)),
           h.runCmd(`curl -iL ${scheme}://${host}/foo-health-check`).then(h.verifyResponse(404)),
           h.runCmd(`curl -iL ${scheme}://${host}/foonhealth-check`).then(h.verifyResponse(404)),
-        ]).then(done);
+        ]);
       });
 
     });
@@ -291,29 +287,28 @@ describe(`nginx`, () => {
 
     describe(`${host}/circle-build`, () => {
 
-      it('should disallow non-POST requests', done => {
+      it('should disallow non-POST requests', async () => {
         const url = `${scheme}://${host}/circle-build`;
 
-        Promise.all([
+        await Promise.all([
           h.runCmd(`curl -iLX GET ${url}`).then(h.verifyResponse(405)),
           h.runCmd(`curl -iLX PUT ${url}`).then(h.verifyResponse(405)),
           h.runCmd(`curl -iLX PATCH ${url}`).then(h.verifyResponse(405)),
           h.runCmd(`curl -iLX DELETE ${url}`).then(h.verifyResponse(405)),
-        ]).then(done);
+        ]);
       });
 
 
-      it('should pass requests through to the preview server', done => {
+      it('should pass requests through to the preview server', async () => {
-        h.runCmd(`curl -iLX POST ${scheme}://${host}/circle-build`).
+        await h.runCmd(`curl -iLX POST ${scheme}://${host}/circle-build`).
-          then(h.verifyResponse(400, /Incorrect body content. Expected JSON/)).
+          then(h.verifyResponse(400, /Incorrect body content. Expected JSON/));
-          then(done);
       });
 
 
-      it('should respond with 404 for unknown paths', done => {
+      it('should respond with 404 for unknown paths', async () => {
         const cmdPrefix = `curl -iLX POST ${scheme}://${host}`;
 
-        Promise.all([
+        await Promise.all([
           h.runCmd(`${cmdPrefix}/foo/circle-build/`).then(h.verifyResponse(404)),
           h.runCmd(`${cmdPrefix}/foo-circle-build/`).then(h.verifyResponse(404)),
           h.runCmd(`${cmdPrefix}/fooncircle-build/`).then(h.verifyResponse(404)),
@@ -322,7 +317,7 @@ describe(`nginx`, () => {
           h.runCmd(`${cmdPrefix}/circle-buildnfoo/`).then(h.verifyResponse(404)),
           h.runCmd(`${cmdPrefix}/circle-build/pr`).then(h.verifyResponse(404)),
           h.runCmd(`${cmdPrefix}/circle-build/42`).then(h.verifyResponse(404)),
-        ]).then(done);
+        ]);
       });
 
     });
@@ -332,38 +327,33 @@ describe(`nginx`, () => {
       const url = `${scheme}://${host}/pr-updated`;
 
 
-      it('should disallow non-POST requests', done => {
+      it('should disallow non-POST requests', async () => {
-        Promise.all([
+        await Promise.all([
           h.runCmd(`curl -iLX GET ${url}`).then(h.verifyResponse(405)),
           h.runCmd(`curl -iLX PUT ${url}`).then(h.verifyResponse(405)),
           h.runCmd(`curl -iLX PATCH ${url}`).then(h.verifyResponse(405)),
           h.runCmd(`curl -iLX DELETE ${url}`).then(h.verifyResponse(405)),
-        ]).then(done);
+        ]);
       });
 
 
-      it('should pass requests through to the preview server', done => {
+      it('should pass requests through to the preview server', async () => {
-        const cmdPrefix = `curl -iLX POST --header "Content-Type: application/json"`;
+        await h.runCmd(`curl -iLX POST --header "Content-Type: application/json" ${url}`).
-
+          then(h.verifyResponse(400, /Missing or empty 'number' field/));
-        const cmd1 = `${cmdPrefix} ${url}`;
-
-        Promise.all([
-          h.runCmd(cmd1).then(h.verifyResponse(400, /Missing or empty 'number' field/)),
-        ]).then(done);
       });
 
 
-      it('should respond with 404 for unknown paths', done => {
+      it('should respond with 404 for unknown paths', async () => {
         const cmdPrefix = `curl -iLX POST ${scheme}://${host}`;
 
-        Promise.all([
+        await Promise.all([
           h.runCmd(`${cmdPrefix}/foo/pr-updated`).then(h.verifyResponse(404)),
           h.runCmd(`${cmdPrefix}/foo-pr-updated`).then(h.verifyResponse(404)),
           h.runCmd(`${cmdPrefix}/foonpr-updated`).then(h.verifyResponse(404)),
           h.runCmd(`${cmdPrefix}/pr-updated/foo`).then(h.verifyResponse(404)),
           h.runCmd(`${cmdPrefix}/pr-updated-foo`).then(h.verifyResponse(404)),
           h.runCmd(`${cmdPrefix}/pr-updatednfoo`).then(h.verifyResponse(404)),
-        ]).then(done);
+        ]);
       });
 
     });
@@ -374,7 +364,7 @@ describe(`nginx`, () => {
       beforeEach(() => {
         ['index.html', 'foo.js', 'foo/index.html'].forEach(relFilePath => {
           const absFilePath = path.join(AIO_BUILDS_DIR, relFilePath);
-          return h.writeFile(absFilePath, {content: `File: /${relFilePath}`});
+          h.writeFile(absFilePath, {content: `File: /${relFilePath}`});
         });
       });
 

aio/aio-builds-setup/dockerbuild/scripts-js/lib/verify-setup/preview-server.e2e.ts

@@ -105,9 +105,9 @@ describe('preview-server', () => {
 
 
   describe(`${host}/circle-build`, () => {
-
     const curl = makeCurl(`${host}/circle-build`);
 
+
     it('should disallow non-POST requests', async () => {
       const bodyRegex = /^Unknown resource/;
 
@@ -189,8 +189,7 @@ describe('preview-server', () => {
     });
 
     it('should respond with 201 if a new public build is created', async () => {
-      await curl(payload(BuildNums.TRUST_CHECK_ACTIVE_TRUSTED_USER))
+      await curl(payload(BuildNums.TRUST_CHECK_ACTIVE_TRUSTED_USER)).then(h.verifyResponse(201));
-        .then(h.verifyResponse(201));
       expect({ prNum: PrNums.TRUST_CHECK_ACTIVE_TRUSTED_USER }).toExistAsABuild();
     });
 
@@ -199,7 +198,7 @@ describe('preview-server', () => {
       expect({ prNum: PrNums.TRUST_CHECK_UNTRUSTED, isPublic: false }).toExistAsABuild();
     });
 
-    [true].forEach(isPublic => {
+    [true, false].forEach(isPublic => {
       const build = isPublic ? BuildNums.TRUST_CHECK_ACTIVE_TRUSTED_USER : BuildNums.TRUST_CHECK_UNTRUSTED;
       const prNum = isPublic ? PrNums.TRUST_CHECK_ACTIVE_TRUSTED_USER : PrNums.TRUST_CHECK_UNTRUSTED;
       const label = isPublic ? 'public' : 'non-public';
@@ -364,23 +363,23 @@ describe('preview-server', () => {
 
   describe(`${host}/health-check`, () => {
 
-    it('should respond with 200', done => {
+    it('should respond with 200', async () => {
-      Promise.all([
+      await Promise.all([
         h.runCmd(`curl -iL ${host}/health-check`).then(h.verifyResponse(200)),
         h.runCmd(`curl -iL ${host}/health-check/`).then(h.verifyResponse(200)),
-      ]).then(done);
+      ]);
     });
 
 
-    it('should respond with 404 if the path does not match exactly', done => {
+    it('should respond with 404 if the path does not match exactly', async () => {
-      Promise.all([
+      await Promise.all([
         h.runCmd(`curl -iL ${host}/health-check/foo`).then(h.verifyResponse(404)),
         h.runCmd(`curl -iL ${host}/health-check-foo`).then(h.verifyResponse(404)),
         h.runCmd(`curl -iL ${host}/health-checknfoo`).then(h.verifyResponse(404)),
         h.runCmd(`curl -iL ${host}/foo/health-check`).then(h.verifyResponse(404)),
         h.runCmd(`curl -iL ${host}/foo-health-check`).then(h.verifyResponse(404)),
         h.runCmd(`curl -iL ${host}/foonhealth-check`).then(h.verifyResponse(404)),
-      ]).then(done);
+      ]);
     });
 
   });
@@ -426,18 +425,18 @@ describe('preview-server', () => {
     });
 
 
-    it('should respond with 404 for unknown paths', done => {
+    it('should respond with 404 for unknown paths', async () => {
       const mockPayload = JSON.stringify({number: 1}); // MockExternalApiFlags.TRUST_CHECK_ACTIVE_TRUSTED_USER });
       const cmdPrefix = `curl -iLX POST --data "${mockPayload}" ${host}`;
 
-      Promise.all([
+      await Promise.all([
         h.runCmd(`${cmdPrefix}/foo/pr-updated`).then(h.verifyResponse(404)),
         h.runCmd(`${cmdPrefix}/foo-pr-updated`).then(h.verifyResponse(404)),
         h.runCmd(`${cmdPrefix}/foonpr-updated`).then(h.verifyResponse(404)),
         h.runCmd(`${cmdPrefix}/pr-updated/foo`).then(h.verifyResponse(404)),
         h.runCmd(`${cmdPrefix}/pr-updated-foo`).then(h.verifyResponse(404)),
         h.runCmd(`${cmdPrefix}/pr-updatednfoo`).then(h.verifyResponse(404)),
-      ]).then(done);
+      ]);
     });
 
 
@@ -551,10 +550,10 @@ describe('preview-server', () => {
 
   describe(`${host}/*`, () => {
 
-    it('should respond with 404 for requests to unknown URLs', done => {
+    it('should respond with 404 for requests to unknown URLs', async () => {
       const bodyRegex = /^Unknown resource/;
 
-      Promise.all([
+      await Promise.all([
         h.runCmd(`curl -iL ${host}/index.html`).then(h.verifyResponse(404, bodyRegex)),
         h.runCmd(`curl -iL ${host}/`).then(h.verifyResponse(404, bodyRegex)),
         h.runCmd(`curl -iL ${host}`).then(h.verifyResponse(404, bodyRegex)),
@@ -562,7 +561,7 @@ describe('preview-server', () => {
         h.runCmd(`curl -iLX POST ${host}`).then(h.verifyResponse(404, bodyRegex)),
         h.runCmd(`curl -iLX PATCH ${host}`).then(h.verifyResponse(404, bodyRegex)),
         h.runCmd(`curl -iLX DELETE ${host}`).then(h.verifyResponse(404, bodyRegex)),
-      ]).then(done);
+      ]);
     });
 
   });

aio/aio-builds-setup/dockerbuild/scripts-js/package.json

@@ -14,42 +14,41 @@
     "predev": "yarn build || true",
     "dev": "run-p ~~build-watch ~~test-watch",
     "lint": "tslint --project tsconfig.json",
-    "pretest": "yarn build",
+    "pretest": "run-s build lint",
     "test": "yarn ~~test-only",
     "pretest-watch": "yarn pretest",
     "test-watch": "yarn ~~test-watch",
     "~~build": "tsc",
     "~~build-watch": "yarn ~~build --watch",
-    "pre~~test-only": "yarn lint",
     "~~test-only": "node dist/test",
     "~~test-watch": "nodemon --delay 1 --exec \"yarn ~~test-only\" --watch dist"
   },
   "dependencies": {
-    "body-parser": "^1.18.3",
+    "body-parser": "^1.19.0",
-    "delete-empty": "^2.0.0",
+    "delete-empty": "^3.0.0",
-    "express": "^4.16.3",
+    "express": "^4.17.1",
-    "jasmine": "^3.2.0",
+    "jasmine": "^3.5.0",
-    "nock": "^9.6.1",
+    "nock": "^12.0.3",
-    "node-fetch": "^2.2.0",
+    "node-fetch": "^2.6.0",
-    "shelljs": "^0.8.2",
+    "shelljs": "^0.8.4",
-    "source-map-support": "^0.5.9",
+    "source-map-support": "^0.5.19",
-    "tar-stream": "^1.6.1",
+    "tar-stream": "^2.1.2",
-    "tslib": "^1.10.0"
+    "tslib": "^1.11.1"
   },
   "devDependencies": {
-    "@types/body-parser": "^1.17.0",
+    "@types/body-parser": "^1.19.0",
-    "@types/express": "^4.16.0",
+    "@types/express": "^4.17.6",
-    "@types/jasmine": "^2.8.8",
+    "@types/jasmine": "^3.5.10",
-    "@types/nock": "^9.3.0",
+    "@types/nock": "^11.1.0",
-    "@types/node": "^10.9.2",
+    "@types/node": "^13.13.2",
-    "@types/node-fetch": "^2.1.2",
+    "@types/node-fetch": "^2.5.7",
-    "@types/shelljs": "^0.8.0",
+    "@types/shelljs": "^0.8.7",
-    "@types/supertest": "^2.0.5",
+    "@types/supertest": "^2.0.8",
-    "nodemon": "^1.18.3",
+    "nodemon": "^2.0.3",
     "npm-run-all": "^4.1.5",
-    "supertest": "^3.1.0",
+    "supertest": "^4.0.2",
-    "tslint": "^5.11.0",
+    "tslint": "^6.1.1",
     "tslint-jasmine-noSkipOrFocus": "^1.0.9",
-    "typescript": "^3.0.1"
+    "typescript": "^3.8.3"
   }
 }

aio/aio-builds-setup/dockerbuild/scripts-js/test/clean-up/build-cleaner.spec.ts

@@ -15,7 +15,6 @@ const EXISTING_DOWNLOADS = [
   '20-1234567-build.zip',
 ];
 const OPEN_PRS = [10, 40];
-const ANY_DATE = jasmine.any(String);
 
 // Tests
 describe('BuildCleaner', () => {
@@ -77,22 +76,18 @@ describe('BuildCleaner', () => {
     let cleanerRemoveUnnecessaryDownloadsSpy: jasmine.Spy;
 
     beforeEach(() => {
-      cleanerGetExistingBuildNumbersSpy = spyOn(cleaner, 'getExistingBuildNumbers')
+      cleanerGetExistingBuildNumbersSpy = spyOn(cleaner, 'getExistingBuildNumbers').and.resolveTo(EXISTING_BUILDS);
-        .and.callFake(() => Promise.resolve(EXISTING_BUILDS));
+      cleanerGetOpenPrNumbersSpy = spyOn(cleaner, 'getOpenPrNumbers').and.resolveTo(OPEN_PRS);
-      cleanerGetOpenPrNumbersSpy = spyOn(cleaner, 'getOpenPrNumbers')
+      cleanerGetExistingDownloadsSpy = spyOn(cleaner, 'getExistingDownloads').and.resolveTo(EXISTING_DOWNLOADS);
-        .and.callFake(() => Promise.resolve(OPEN_PRS));
-      cleanerGetExistingDownloadsSpy = spyOn(cleaner, 'getExistingDownloads')
-        .and.callFake(() => Promise.resolve(EXISTING_DOWNLOADS));
 
       cleanerRemoveUnnecessaryBuildsSpy = spyOn(cleaner, 'removeUnnecessaryBuilds');
       cleanerRemoveUnnecessaryDownloadsSpy = spyOn(cleaner, 'removeUnnecessaryDownloads');
-
     });
 
 
     it('should return a promise', async () => {
       const promise = cleaner.cleanUp();
-      expect(promise).toEqual(jasmine.any(Promise));
+      expect(promise).toBeInstanceOf(Promise);
 
       // Do not complete the test and release the spies synchronously, to avoid running the actual implementations.
       await promise;
@@ -130,52 +125,32 @@ describe('BuildCleaner', () => {
 
 
     it('should reject if \'getOpenPrNumbers()\' rejects', async () => {
-      try {
+      cleanerGetOpenPrNumbersSpy.and.rejectWith('Test');
-        cleanerGetOpenPrNumbersSpy.and.callFake(() => Promise.reject('Test'));
+      await expectAsync(cleaner.cleanUp()).toBeRejectedWith('Test');
-        await cleaner.cleanUp();
-      } catch (err) {
-        expect(err).toBe('Test');
-      }
     });
 
 
     it('should reject if \'getExistingBuildNumbers()\' rejects', async () => {
-      try {
+      cleanerGetExistingBuildNumbersSpy.and.rejectWith('Test');
-        cleanerGetExistingBuildNumbersSpy.and.callFake(() => Promise.reject('Test'));
+      await expectAsync(cleaner.cleanUp()).toBeRejectedWith('Test');
-        await cleaner.cleanUp();
-      } catch (err) {
-        expect(err).toBe('Test');
-      }
     });
 
 
     it('should reject if \'getExistingDownloads()\' rejects', async () => {
-      try {
+      cleanerGetExistingDownloadsSpy.and.rejectWith('Test');
-        cleanerGetExistingDownloadsSpy.and.callFake(() => Promise.reject('Test'));
+      await expectAsync(cleaner.cleanUp()).toBeRejectedWith('Test');
-        await cleaner.cleanUp();
-      } catch (err) {
-        expect(err).toBe('Test');
-      }
     });
 
 
     it('should reject if \'removeUnnecessaryBuilds()\' rejects', async () => {
-      try {
+      cleanerRemoveUnnecessaryBuildsSpy.and.rejectWith('Test');
-        cleanerRemoveUnnecessaryBuildsSpy.and.callFake(() => Promise.reject('Test'));
+      await expectAsync(cleaner.cleanUp()).toBeRejectedWith('Test');
-        await cleaner.cleanUp();
-      } catch (err) {
-        expect(err).toBe('Test');
-      }
     });
 
 
     it('should reject if \'removeUnnecessaryDownloads()\' rejects', async () => {
-      try {
+      cleanerRemoveUnnecessaryDownloadsSpy.and.rejectWith('Test');
-        cleanerRemoveUnnecessaryDownloadsSpy.and.callFake(() => Promise.reject('Test'));
+      await expectAsync(cleaner.cleanUp()).toBeRejectedWith('Test');
-        await cleaner.cleanUp();
-      } catch (err) {
-        expect(err).toBe('Test');
-      }
     });
 
   });
@@ -187,13 +162,15 @@ describe('BuildCleaner', () => {
     let promise: Promise<number[]>;
 
     beforeEach(() => {
-      fsReaddirSpy = spyOn(fs, 'readdir').and.callFake((_: string, cb: typeof readdirCb) => readdirCb = cb);
+      fsReaddirSpy = spyOn(fs, 'readdir').and.callFake(
+        ((_: string, cb: typeof readdirCb) => readdirCb = cb) as unknown as typeof fs.readdir,
+      );
       promise = cleaner.getExistingBuildNumbers();
     });
 
 
     it('should return a promise', () => {
-      expect(promise).toEqual(jasmine.any(Promise));
+      expect(promise).toBeInstanceOf(Promise);
     });
 
 
@@ -203,43 +180,27 @@ describe('BuildCleaner', () => {
     });
 
 
-    it('should reject if an error occurs while getting the files', done => {
+    it('should reject if an error occurs while getting the files', async () => {
-      promise.catch(err => {
-        expect(err).toBe('Test');
-        done();
-      });
-
       readdirCb('Test');
+      await expectAsync(promise).toBeRejectedWith('Test');
     });
 
 
-    it('should resolve with the returned files (as numbers)', done => {
+    it('should resolve with the returned files (as numbers)', async () => {
-      promise.then(result => {
-        expect(result).toEqual([12, 34, 56]);
-        done();
-      });
-
       readdirCb(null, ['12', '34', '56']);
+      await expectAsync(promise).toBeResolvedTo([12, 34, 56]);
     });
 
 
-    it('should remove `HIDDEN_DIR_PREFIX` from the filenames', done => {
+    it('should remove `HIDDEN_DIR_PREFIX` from the filenames', async () => {
-      promise.then(result => {
-        expect(result).toEqual([12, 34, 56]);
-        done();
-      });
-
       readdirCb(null, [`${HIDDEN_DIR_PREFIX}12`, '34', `${HIDDEN_DIR_PREFIX}56`]);
+      await expectAsync(promise).toBeResolvedTo([12, 34, 56]);
     });
 
 
-    it('should ignore files with non-numeric (or zero) names', done => {
+    it('should ignore files with non-numeric (or zero) names', async () => {
-      promise.then(result => {
-        expect(result).toEqual([12, 34, 56]);
-        done();
-      });
-
       readdirCb(null, ['12', 'foo', '34', 'bar', '56', '000']);
+      await expectAsync(promise).toBeResolvedTo([12, 34, 56]);
     });
 
   });
@@ -259,7 +220,7 @@ describe('BuildCleaner', () => {
 
 
     it('should return a promise', () => {
-      expect(promise).toEqual(jasmine.any(Promise));
+      expect(promise).toBeInstanceOf(Promise);
     });
 
 
@@ -268,31 +229,15 @@ describe('BuildCleaner', () => {
     });
 
 
-    it('should reject if an error occurs while fetching PRs', done => {
+    it('should reject if an error occurs while fetching PRs', async () => {
-      promise.catch(err => {
-        expect(err).toBe('Test');
-        done();
-      });
-
       prDeferred.reject('Test');
+      await expectAsync(promise).toBeRejectedWith('Test');
     });
 
 
-    it('should resolve with the numbers of the fetched PRs', done => {
+    it('should resolve with the numbers of the fetched PRs', async () => {
-      promise.then(prNumbers => {
-        expect(prNumbers).toEqual([1, 2, 3]);
-        done();
-      });
-
       prDeferred.resolve([{id: 0, number: 1}, {id: 1, number: 2}, {id: 2, number: 3}]);
-    });
+      await expectAsync(promise).toBeResolvedTo([1, 2, 3]);
-
-
-    it('should log the number of open PRs', () => {
-      promise.then(prNumbers => {
-        expect(loggerLogSpy).toHaveBeenCalledWith(
-          ANY_DATE, 'BuildCleaner:        ', `Open pull requests: ${prNumbers}`);
-      });
     });
 
   });
@@ -304,13 +249,15 @@ describe('BuildCleaner', () => {
     let promise: Promise<string[]>;
 
     beforeEach(() => {
-      fsReaddirSpy = spyOn(fs, 'readdir').and.callFake((_: string, cb: typeof readdirCb) => readdirCb = cb);
+      fsReaddirSpy = spyOn(fs, 'readdir').and.callFake(
+        ((_: string, cb: typeof readdirCb) => readdirCb = cb) as unknown as typeof fs.readdir,
+      );
       promise = cleaner.getExistingDownloads();
     });
 
 
     it('should return a promise', () => {
-      expect(promise).toEqual(jasmine.any(Promise));
+      expect(promise).toBeInstanceOf(Promise);
     });
 
 
@@ -320,33 +267,21 @@ describe('BuildCleaner', () => {
     });
 
 
-    it('should reject if an error occurs while getting the files', done => {
+    it('should reject if an error occurs while getting the files', async () => {
-      promise.catch(err => {
-        expect(err).toBe('Test');
-        done();
-      });
-
       readdirCb('Test');
+      await expectAsync(promise).toBeRejectedWith('Test');
     });
 
 
-    it('should resolve with the returned file names', done => {
+    it('should resolve with the returned file names', async () => {
-      promise.then(result => {
-        expect(result).toEqual(EXISTING_DOWNLOADS);
-        done();
-      });
-
       readdirCb(null, EXISTING_DOWNLOADS);
+      await expectAsync(promise).toBeResolvedTo(EXISTING_DOWNLOADS);
     });
 
 
-    it('should ignore files that do not match the artifactPath', done => {
+    it('should ignore files that do not match the artifactPath', async () => {
-      promise.then(result => {
-        expect(result).toEqual(['10-ABCDEF-build.zip', '30-FFFFFFF-build.zip']);
-        done();
-      });
-
       readdirCb(null, ['10-ABCDEF-build.zip', '20-AAAAAAA-otherfile.zip', '30-FFFFFFF-build.zip']);
+      await expectAsync(promise).toBeResolvedTo(['10-ABCDEF-build.zip', '30-FFFFFFF-build.zip']);
     });
 
   });
@@ -364,7 +299,7 @@ describe('BuildCleaner', () => {
     });
 
 
-    it('should test if the directory exists (and return if is does not)', () => {
+    it('should test if the directory exists (and return if it does not)', () => {
       shellTestSpy.and.returnValue(false);
       cleaner.removeDir('/foo/bar');
 
@@ -381,22 +316,19 @@ describe('BuildCleaner', () => {
 
 
     it('should make the directory and its content writable before removing', () => {
-      shellRmSpy.and.callFake(() => expect(shellChmodSpy).toHaveBeenCalledWith('-R', 'a+w', '/foo/bar'));
       cleaner.removeDir('/foo/bar');
 
+      expect(shellChmodSpy).toHaveBeenCalledBefore(shellRmSpy);
+      expect(shellChmodSpy).toHaveBeenCalledWith('-R', 'a+w', '/foo/bar');
       expect(shellRmSpy).toHaveBeenCalled();
     });
 
 
     it('should catch errors and log them', () => {
-      shellRmSpy.and.callFake(() => {
+      shellRmSpy.and.throwError('Test');
-        // tslint:disable-next-line: no-string-throw
-        throw 'Test';
-      });
-
       cleaner.removeDir('/foo/bar');
 
-      expect(loggerErrorSpy).toHaveBeenCalledWith('ERROR: Unable to remove \'/foo/bar\' due to:', 'Test');
+      expect(loggerErrorSpy).toHaveBeenCalledWith('ERROR: Unable to remove \'/foo/bar\' due to:', new Error('Test'));
     });
 
   });
@@ -449,7 +381,7 @@ describe('BuildCleaner', () => {
       expect(cleanerRemoveDirSpy).toHaveBeenCalledTimes(0);
       cleanerRemoveDirSpy.calls.reset();
 
-      (cleaner as any).removeUnnecessaryBuilds([1, 2, 3, 4], []);
+      cleaner.removeUnnecessaryBuilds([1, 2, 3, 4], []);
       expect(cleanerRemoveDirSpy).toHaveBeenCalledTimes(8);
       expect(cleanerRemoveDirSpy).toHaveBeenCalledWith(normalize('/foo/bar/1'));
       expect(cleanerRemoveDirSpy).toHaveBeenCalledWith(normalize('/foo/bar/2'));

aio/aio-builds-setup/dockerbuild/scripts-js/test/common/circleci-api.spec.ts

@@ -45,25 +45,15 @@ describe('CircleCIApi', () => {
       const errorMessage = 'Invalid request';
       const request = nock(BASE_URL).get(`/${buildNum}?circle-token=${TOKEN}`);
 
-      try {
+      request.replyWithError(errorMessage);
-        request.replyWithError(errorMessage);
+      await expectAsync(api.getBuildInfo(buildNum)).toBeRejectedWithError(
-        await api.getBuildInfo(buildNum);
-        throw new Error('Exception Expected');
-      } catch (err) {
-        expect(err.message).toEqual(
           `CircleCI build info request failed ` +
           `(request to ${BASE_URL}/${buildNum}?circle-token=${TOKEN} failed, reason: ${errorMessage})`);
-      }
 
-      try {
+      request.reply(404, errorMessage);
-        request.reply(404, errorMessage);
+      await expectAsync(api.getBuildInfo(buildNum)).toBeRejectedWithError(
-        await api.getBuildInfo(buildNum);
-        throw new Error('Exception Expected');
-      } catch (err) {
-        expect(err.message).toEqual(
           `CircleCI build info request failed ` +
           `(request to ${BASE_URL}/${buildNum}?circle-token=${TOKEN} failed, reason: ${errorMessage})`);
-      }
     });
   });
 
@@ -78,8 +68,7 @@ describe('CircleCIApi', () => {
         .get(`/${buildNum}/artifacts?circle-token=${TOKEN}`)
         .reply(200, [artifact0, artifact1, artifact2]);
 
-      const artifactUrl = await api.getBuildArtifactUrl(buildNum, 'some/path/1');
+      await expectAsync(api.getBuildArtifactUrl(buildNum, 'some/path/1')).toBeResolvedTo('https://url/1');
-      expect(artifactUrl).toEqual('https://url/1');
       request.done();
     });
 
@@ -90,25 +79,15 @@ describe('CircleCIApi', () => {
       const errorMessage = 'Invalid request';
       const request = nock(BASE_URL).get(`/${buildNum}/artifacts?circle-token=${TOKEN}`);
 
-      try {
+      request.replyWithError(errorMessage);
-        request.replyWithError(errorMessage);
+      await expectAsync(api.getBuildArtifactUrl(buildNum, 'some/path/1')).toBeRejectedWithError(
-        await api.getBuildArtifactUrl(buildNum, 'some/path/1');
-        throw new Error('Exception Expected');
-      } catch (err) {
-        expect(err.message).toEqual(
           `CircleCI artifact URL request failed ` +
           `(request to ${BASE_URL}/${buildNum}/artifacts?circle-token=${TOKEN} failed, reason: ${errorMessage})`);
-      }
 
-      try {
+      request.reply(404, errorMessage);
-        request.reply(404, errorMessage);
+      await expectAsync(api.getBuildArtifactUrl(buildNum, 'some/path/1')).toBeRejectedWithError(
-        await api.getBuildArtifactUrl(buildNum, 'some/path/1');
-        throw new Error('Exception Expected');
-      } catch (err) {
-        expect(err.message).toEqual(
           `CircleCI artifact URL request failed ` +
           `(request to ${BASE_URL}/${buildNum}/artifacts?circle-token=${TOKEN} failed, reason: ${errorMessage})`);
-      }
     });
 
     it('should throw an error if the response does not contain the specified artifact', async () => {
@@ -121,14 +100,9 @@ describe('CircleCIApi', () => {
         .get(`/${buildNum}/artifacts?circle-token=${TOKEN}`)
         .reply(200, [artifact0, artifact1, artifact2]);
 
-      try {
+      await expectAsync(api.getBuildArtifactUrl(buildNum, 'some/path/3')).toBeRejectedWithError(
-        await api.getBuildArtifactUrl(buildNum, 'some/path/3');
-        throw new Error('Exception Expected');
-      } catch (err) {
-        expect(err.message).toEqual(
           `CircleCI artifact URL request failed ` +
           `(Missing artifact (some/path/3) for CircleCI build: ${buildNum})`);
-      }
     });
   });
 });

aio/aio-builds-setup/dockerbuild/scripts-js/test/common/github-api.spec.ts

@@ -118,7 +118,7 @@ describe('GithubApi', () => {
 
 
     it('should return a promise', () => {
-      expect((api as any).getPaginated()).toEqual(jasmine.any(Promise));
+      expect((api as any).getPaginated()).toBeInstanceOf(Promise);
     });
 
 
@@ -131,45 +131,30 @@ describe('GithubApi', () => {
     });
 
 
-    it('should reject if the request fails', done => {
+    it('should reject if the request fails', async () => {
-      (api as any).getPaginated('/foo/bar').catch((err: any) => {
+      const responsePromise = (api as any).getPaginated('/foo/bar');
-        expect(err).toBe('Test');
-        done();
-      });
-
       deferreds[0].reject('Test');
+
+      await expectAsync(responsePromise).toBeRejectedWith('Test');
     });
 
 
-    it('should resolve with the returned items', done => {
+    it('should resolve with the returned items', async () => {
       const items = [{id: 1}, {id: 2}];
-
+      const responsePromise = (api as any).getPaginated('/foo/bar');
-      (api as any).getPaginated('/foo/bar').then((data: any) => {
-        expect(data).toEqual(items);
-        done();
-      });
-
       deferreds[0].resolve(items);
+
+      await expectAsync(responsePromise).toBeResolvedTo(items);
     });
 
 
-    it('should iteratively call \'get()\' to fetch all items', done => {
+    it('should iteratively call \'get()\' to fetch all items', async () => {
       // Create an array or 250 objects.
-      const allItems = '.'.repeat(250).split('').map((_, i) => ({id: i}));
+      const allItems = new Array(250).fill(null).map((_, i) => ({id: i}));
       const apiGetSpy = api.get as jasmine.Spy;
+      const paramsForPage = (page: number) => ({baz: 'qux', page, per_page: 100});
 
-      (api as any).getPaginated('/foo/bar', {baz: 'qux'}).then((data: any) => {
+      const responsePromise = (api as any).getPaginated('/foo/bar', {baz: 'qux'});
-        const paramsForPage = (page: number) => ({baz: 'qux', page, per_page: 100});
-
-        expect(apiGetSpy).toHaveBeenCalledTimes(3);
-        expect(apiGetSpy.calls.argsFor(0)).toEqual(['/foo/bar', paramsForPage(1)]);
-        expect(apiGetSpy.calls.argsFor(1)).toEqual(['/foo/bar', paramsForPage(2)]);
-        expect(apiGetSpy.calls.argsFor(2)).toEqual(['/foo/bar', paramsForPage(3)]);
-
-        expect(data).toEqual(allItems);
-
-        done();
-      });
 
       deferreds[0].resolve(allItems.slice(0, 100));
       setTimeout(() => {
@@ -178,6 +163,13 @@ describe('GithubApi', () => {
           deferreds[2].resolve(allItems.slice(200));
         }, 0);
       }, 0);
+
+      await expectAsync(responsePromise).toBeResolvedTo(allItems);
+
+      expect(apiGetSpy).toHaveBeenCalledTimes(3);
+      expect(apiGetSpy.calls.argsFor(0)).toEqual(['/foo/bar', paramsForPage(1)]);
+      expect(apiGetSpy.calls.argsFor(1)).toEqual(['/foo/bar', paramsForPage(2)]);
+      expect(apiGetSpy.calls.argsFor(2)).toEqual(['/foo/bar', paramsForPage(3)]);
     });
 
   });
@@ -217,8 +209,8 @@ describe('GithubApi', () => {
 
   describe('request()', () => {
     it('should return a promise', () => {
-      nock('https://api.github.com').get('').reply(200);
+      nock('https://api.github.com').get('/').reply(200);
-      expect((api as any).request()).toEqual(jasmine.any(Promise));
+      expect((api as any).request()).toBeInstanceOf(Promise);
     });
 
 
@@ -247,9 +239,8 @@ describe('GithubApi', () => {
       nock('https://api.github.com')
         .intercept('/path', 'method')
         .replyWithError('Test');
-      let message = 'Failed to reject error';
+
-      await (api as any).request('method', '/path').catch((err: any) => message = err.message);
+      await expectAsync((api as any).request('method', '/path')).toBeRejectedWithError('Test');
-      expect(message).toEqual('Test');
     });
 
 
@@ -263,81 +254,69 @@ describe('GithubApi', () => {
     });
 
 
-    it('should reject if response statusCode is <200', done => {
+    it('should reject if response statusCode is <200', async () => {
       const requestHandler = nock('https://api.github.com')
         .intercept('/path', 'method')
         .reply(199);
+      const responsePromise = (api as any).request('method', '/path');
+
+      await expectAsync(responsePromise).toBeRejectedWith(jasmine.stringMatching('failed'));
+      await expectAsync(responsePromise).toBeRejectedWith(jasmine.stringMatching('status: 199'));
 
-      (api as any).request('method', '/path')
-        .catch((err: string) => {
-          expect(err).toContain('failed');
-          expect(err).toContain('status: 199');
-          done();
-        });
       requestHandler.done();
     });
 
 
-    it('should reject if response statusCode is >=400', done => {
+    it('should reject if response statusCode is >=400', async () => {
       const requestHandler = nock('https://api.github.com')
         .intercept('/path', 'method')
         .reply(400);
+      const responsePromise = (api as any).request('method', '/path');
+
+      await expectAsync(responsePromise).toBeRejectedWith(jasmine.stringMatching('failed'));
+      await expectAsync(responsePromise).toBeRejectedWith(jasmine.stringMatching('status: 400'));
 
-      (api as any).request('method', '/path')
-        .catch((err: string) => {
-          expect(err).toContain('failed');
-          expect(err).toContain('status: 400');
-          done();
-        });
       requestHandler.done();
     });
 
 
-    it('should include the response text in the rejection message', done => {
+    it('should include the response text in the rejection message', async () => {
       const requestHandler = nock('https://api.github.com')
         .intercept('/path', 'method')
         .reply(500, 'Test');
+      const responsePromise = (api as any).request('method', '/path');
+
+      await expectAsync(responsePromise).toBeRejectedWith(jasmine.stringMatching('Test'));
 
-      (api as any).request('method', '/path')
-        .catch((err: string) => {
-          expect(err).toContain('Test');
-          done();
-        });
       requestHandler.done();
      });
 
 
-    it('should resolve if returned statusCode is >=200 and <400', done => {
+    it('should resolve if returned statusCode is >=200 and <400', async () => {
       const requestHandler = nock('https://api.github.com')
         .intercept('/path', 'method')
         .reply(200);
 
-      (api as any).request('method', '/path').then(done);
+      await expectAsync((api as any).request('method', '/path')).toBeResolved();
       requestHandler.done();
     });
 
 
-    it('should parse the response body into an object using \'JSON.parse\'', done => {
+    it('should parse the response body into an object using \'JSON.parse\'', async () => {
       const requestHandler = nock('https://api.github.com')
         .intercept('/path', 'method')
         .reply(300, '{"foo": "bar"}');
 
-      (api as any).request('method', '/path').then((data: any) => {
+      await expectAsync((api as any).request('method', '/path')).toBeResolvedTo({foo: 'bar'});
-        expect(data).toEqual({foo: 'bar'});
-        done();
-      });
       requestHandler.done();
     });
 
-    it('should reject if the response text is malformed JSON', done => {
+    it('should reject if the response text is malformed JSON', async () => {
       const requestHandler = nock('https://api.github.com')
         .intercept('/path', 'method')
         .reply(300, '}');
 
-      (api as any).request('method', '/path').catch((err: any) => {
+      await expectAsync((api as any).request('method', '/path')).toBeRejectedWithError(SyntaxError);
-        expect(err).toEqual(jasmine.any(SyntaxError));
-        done();
-      });
       requestHandler.done();
     });
 

aio/aio-builds-setup/dockerbuild/scripts-js/test/common/github-pull-requests.spec.ts

@@ -1,6 +1,6 @@
 // Imports
 import {GithubApi} from '../../lib/common/github-api';
-import {GithubPullRequests} from '../../lib/common/github-pull-requests';
+import {GithubPullRequests, PullRequest} from '../../lib/common/github-pull-requests';
 
 // Tests
 describe('GithubPullRequests', () => {
@@ -47,27 +47,21 @@ describe('GithubPullRequests', () => {
 
 
     it('should make a POST request to Github with the correct pathname, params and data', () => {
-      githubApi.post.and.callFake(() => Promise.resolve());
+      githubApi.post.and.resolveTo();
       prs.addComment(42, 'body');
       expect(githubApi.post).toHaveBeenCalledWith('/repos/foo/bar/issues/42/comments', null, {body: 'body'});
     });
 
 
-    it('should reject if the request fails', done => {
+    it('should reject if the request fails', async () => {
-      githubApi.post.and.callFake(() => Promise.reject('Test'));
+      githubApi.post.and.rejectWith('Test');
-      prs.addComment(42, 'body').catch(err => {
+      await expectAsync(prs.addComment(42, 'body')).toBeRejectedWith('Test');
-        expect(err).toBe('Test');
-        done();
-      });
     });
 
 
-    it('should resolve with the data from the Github POST', done => {
+    it('should resolve with the data from the Github POST', async () => {
-      githubApi.post.and.callFake(() => Promise.resolve('Test'));
+      githubApi.post.and.resolveTo('Test');
-      prs.addComment(42, 'body').then(data => {
+      await expectAsync(prs.addComment(42, 'body')).toBeResolvedTo('Test');
-        expect(data).toBe('Test');
-        done();
-      });
     });
 
   });
@@ -87,13 +81,11 @@ describe('GithubPullRequests', () => {
     });
 
 
-    it('should resolve with the data returned from GitHub', done => {
+    it('should resolve with the data returned from GitHub', async () => {
       const expected: any = {number: 42};
-      githubApi.get.and.callFake(() => Promise.resolve(expected));
+      githubApi.get.and.resolveTo(expected);
-      prs.fetch(42).then(data => {
+
-        expect(data).toEqual(expected);
+      await expectAsync(prs.fetch(42)).toBeResolvedTo(expected);
-        done();
-      });
     });
 
   });
@@ -125,9 +117,14 @@ describe('GithubPullRequests', () => {
     });
 
 
-    it('should forward the value returned by \'getPaginated()\'', () => {
+    it('should forward the value returned by \'getPaginated()\'', async () => {
-      githubApi.getPaginated.and.returnValue('Test');
+      const mockPrs: PullRequest[] = [
-      expect(prs.fetchAll() as any).toBe('Test');
+        {number: 1, user: {login: 'foo'}, labels: []},
+        {number: 2, user: {login: 'bar'}, labels: []},
+      ];
+
+      githubApi.getPaginated.and.resolveTo(mockPrs);
+      expect(await prs.fetchAll()).toBe(mockPrs);
     });
 
   });
@@ -147,13 +144,11 @@ describe('GithubPullRequests', () => {
     });
 
 
-    it('should resolve with the data returned from GitHub', done => {
+    it('should resolve with the data returned from GitHub', async () => {
       const expected: any = [{sha: 'ABCDE', filename: 'a/b/c'}, {sha: '12345', filename: 'x/y/z'}];
-      githubApi.getPaginated.and.callFake(() => Promise.resolve(expected));
+      githubApi.getPaginated.and.resolveTo(expected);
-      prs.fetchFiles(42).then(data => {
+
-        expect(data).toEqual(expected);
+      await expectAsync(prs.fetchFiles(42)).toBeResolvedTo(expected);
-        done();
-      });
     });
 
   });

aio/aio-builds-setup/dockerbuild/scripts-js/test/common/github-teams.spec.ts

@@ -1,5 +1,5 @@
 import {GithubApi} from '../../lib/common/github-api';
-import {GithubTeams} from '../../lib/common/github-teams';
+import {GithubTeams, Team} from '../../lib/common/github-teams';
 
 // Tests
 describe('GithubTeams', () => {
@@ -16,6 +16,7 @@ describe('GithubTeams', () => {
       expect(() => new GithubTeams(githubApi, '')).
         toThrowError('Missing or empty required parameter \'githubOrg\'!');
     });
+
   });
 
 
@@ -33,9 +34,14 @@ describe('GithubTeams', () => {
     });
 
 
-    it('should forward the value returned by \'getPaginated()\'', () => {
+    it('should forward the value returned by \'getPaginated()\'', async () => {
-      githubApi.getPaginated.and.returnValue('Test');
+      const mockTeams: Team[] = [
-      expect(teams.fetchAll() as any).toBe('Test');
+        {id: 1, slug: 'foo'},
+        {id: 2, slug: 'bar'},
+      ];
+
+      githubApi.getPaginated.and.resolveTo(mockTeams);
+      expect(await teams.fetchAll()).toBe(mockTeams);
     });
 
   });
@@ -50,100 +56,77 @@ describe('GithubTeams', () => {
 
 
     it('should return a promise', () => {
-      githubApi.get.and.callFake(() => Promise.resolve());
+      githubApi.get.and.resolveTo();
       const promise = teams.isMemberById('user', [1]);
-      expect(promise).toEqual(jasmine.any(Promise));
+      expect(promise).toBeInstanceOf(Promise);
     });
 
 
-    it('should resolve with false if called with an empty array', done => {
+    it('should resolve with false if called with an empty array', async () => {
-      teams.isMemberById('user', []).then(isMember => {
+      await expectAsync(teams.isMemberById('user', [])).toBeResolvedTo(false);
-        expect(isMember).toBe(false);
+      expect(githubApi.get).not.toHaveBeenCalled();
-        expect(githubApi.get).not.toHaveBeenCalled();
-        done();
-      });
     });
 
 
-    it('should call \'get()\' with the correct pathname', done => {
+    it('should call \'get()\' with the correct pathname', async () => {
-      githubApi.get.and.callFake(() => Promise.resolve());
+      githubApi.get.and.resolveTo();
-      teams.isMemberById('user', [1]).then(() => {
+      await teams.isMemberById('user', [1]);
-        expect(githubApi.get).toHaveBeenCalledWith('/teams/1/memberships/user');
+
-        done();
+      expect(githubApi.get).toHaveBeenCalledWith('/teams/1/memberships/user');
-      });
     });
 
 
-    it('should resolve with false if \'get()\' rejects', done => {
+    it('should resolve with false if \'get()\' rejects', async () => {
-      githubApi.get.and.callFake(() => Promise.reject(null));
+      githubApi.get.and.rejectWith(null);
-      teams.isMemberById('user', [1]).then(isMember => {
+
-        expect(isMember).toBe(false);
+      await expectAsync(teams.isMemberById('user', [1])).toBeResolvedTo(false);
-        expect(githubApi.get).toHaveBeenCalled();
+      expect(githubApi.get).toHaveBeenCalled();
-        done();
-      });
     });
 
 
-    it('should resolve with false if the membership is not active', done => {
+    it('should resolve with false if the membership is not active', async () => {
-      githubApi.get.and.callFake(() => Promise.resolve({state: 'pending'}));
+      githubApi.get.and.resolveTo({state: 'pending'});
-      teams.isMemberById('user', [1]).then(isMember => {
+
-        expect(isMember).toBe(false);
+      await expectAsync(teams.isMemberById('user', [1])).toBeResolvedTo(false);
-        expect(githubApi.get).toHaveBeenCalled();
+      expect(githubApi.get).toHaveBeenCalled();
-        done();
-      });
     });
 
 
-    it('should resolve with true if the membership is active', done => {
+    it('should resolve with true if the membership is active', async () => {
-      githubApi.get.and.callFake(() => Promise.resolve({state: 'active'}));
+      githubApi.get.and.resolveTo({state: 'active'});
-      teams.isMemberById('user', [1]).then(isMember => {
+      await expectAsync(teams.isMemberById('user', [1])).toBeResolvedTo(true);
-        expect(isMember).toBe(true);
-        done();
-      });
     });
 
 
-    it('should sequentially call \'get()\' until an active membership is found', done => {
+    it('should sequentially call \'get()\' until an active membership is found', async () => {
-      const trainedResponses: {[pathname: string]: Promise<{state: string}>} = {
+      githubApi.get.
-        '/teams/1/memberships/user': Promise.resolve({state: 'pending'}),
+        withArgs('/teams/1/memberships/user').and.resolveTo({state: 'pending'}).
-        '/teams/2/memberships/user': Promise.reject(null),
+        withArgs('/teams/2/memberships/user').and.rejectWith(null).
-        '/teams/3/memberships/user': Promise.resolve({state: 'active'}),
+        withArgs('/teams/3/memberships/user').and.resolveTo({state: 'active'});
-      };
-      githubApi.get.and.callFake((pathname: string) => trainedResponses[pathname]);
 
-      teams.isMemberById('user', [1, 2, 3, 4]).then(isMember => {
+      await expectAsync(teams.isMemberById('user', [1, 2, 3, 4])).toBeResolvedTo(true);
-        expect(isMember).toBe(true);
 
-        expect(githubApi.get).toHaveBeenCalledTimes(3);
+      expect(githubApi.get).toHaveBeenCalledTimes(3);
-        expect(githubApi.get.calls.argsFor(0)[0]).toBe('/teams/1/memberships/user');
+      expect(githubApi.get.calls.argsFor(0)[0]).toBe('/teams/1/memberships/user');
-        expect(githubApi.get.calls.argsFor(1)[0]).toBe('/teams/2/memberships/user');
+      expect(githubApi.get.calls.argsFor(1)[0]).toBe('/teams/2/memberships/user');
-        expect(githubApi.get.calls.argsFor(2)[0]).toBe('/teams/3/memberships/user');
+      expect(githubApi.get.calls.argsFor(2)[0]).toBe('/teams/3/memberships/user');
-
-        done();
-      });
     });
 
 
-    it('should resolve with false if no active membership is found', done => {
+    it('should resolve with false if no active membership is found', async () => {
-      const trainedResponses: {[pathname: string]: Promise<{state: string}>} = {
+      githubApi.get.
-        '/teams/1/memberships/user': Promise.resolve({state: 'pending'}),
+        withArgs('/teams/1/memberships/user').and.resolveTo({state: 'pending'}).
-        '/teams/2/memberships/user':  Promise.reject(null),
+        withArgs('/teams/2/memberships/user').and.rejectWith(null).
-        '/teams/3/memberships/user': Promise.resolve({state: 'not active'}),
+        withArgs('/teams/3/memberships/user').and.resolveTo({state: 'not active'}).
-        '/teams/4/memberships/user':  Promise.reject(null),
+        withArgs('/teams/4/memberships/user').and.rejectWith(null);
-      };
-      githubApi.get.and.callFake((pathname: string) => trainedResponses[pathname]);
 
-      teams.isMemberById('user', [1, 2, 3, 4]).then(isMember => {
+      await expectAsync(teams.isMemberById('user', [1, 2, 3, 4])).toBeResolvedTo(false);
-        expect(isMember).toBe(false);
 
-        expect(githubApi.get).toHaveBeenCalledTimes(4);
+      expect(githubApi.get).toHaveBeenCalledTimes(4);
-        expect(githubApi.get.calls.argsFor(0)[0]).toBe('/teams/1/memberships/user');
+      expect(githubApi.get.calls.argsFor(0)[0]).toBe('/teams/1/memberships/user');
-        expect(githubApi.get.calls.argsFor(1)[0]).toBe('/teams/2/memberships/user');
+      expect(githubApi.get.calls.argsFor(1)[0]).toBe('/teams/2/memberships/user');
-        expect(githubApi.get.calls.argsFor(2)[0]).toBe('/teams/3/memberships/user');
+      expect(githubApi.get.calls.argsFor(2)[0]).toBe('/teams/3/memberships/user');
-        expect(githubApi.get.calls.argsFor(3)[0]).toBe('/teams/4/memberships/user');
+      expect(githubApi.get.calls.argsFor(3)[0]).toBe('/teams/4/memberships/user');
-
-        done();
-      });
     });
 
   });
@@ -157,14 +140,13 @@ describe('GithubTeams', () => {
     beforeEach(() => {
       teams = new GithubTeams(githubApi, 'foo');
 
-      const mockResponse = Promise.resolve([{id: 1, slug: 'team1'}, {id: 2, slug: 'team2'}]);
+      teamsFetchAllSpy = spyOn(teams, 'fetchAll').and.resolveTo([{id: 1, slug: 'team1'}, {id: 2, slug: 'team2'}]);
-      teamsFetchAllSpy = spyOn(teams, 'fetchAll').and.returnValue(mockResponse);
       teamsIsMemberByIdSpy = spyOn(teams, 'isMemberById');
     });
 
 
     it('should return a promise', () => {
-      expect(teams.isMemberBySlug('user', ['team-slug'])).toEqual(jasmine.any(Promise));
+      expect(teams.isMemberBySlug('user', ['team-slug'])).toBeInstanceOf(Promise);
     });
 
 
@@ -174,55 +156,46 @@ describe('GithubTeams', () => {
     });
 
 
-    it('should resolve with false if \'fetchAll()\' rejects', done => {
+    it('should resolve with false if \'fetchAll()\' rejects', async () => {
-      teamsFetchAllSpy.and.callFake(() => Promise.reject(null));
+      teamsFetchAllSpy.and.rejectWith(null);
-      teams.isMemberBySlug('user', ['team-slug']).then(isMember => {
+      await expectAsync(teams.isMemberBySlug('user', ['team-slug'])).toBeResolvedTo(false);
-        expect(isMember).toBe(false);
-        done();
-      });
     });
 
 
-    it('should call \'isMemberById()\' with the correct params if no team is found', done => {
+    it('should call \'isMemberById()\' with the correct params if no team is found', async () => {
-      teams.isMemberBySlug('user', ['no-match']).then(() => {
+      await teams.isMemberBySlug('user', ['no-match']);
-        expect(teamsIsMemberByIdSpy).toHaveBeenCalledWith('user', []);
+      expect(teamsIsMemberByIdSpy).toHaveBeenCalledWith('user', []);
-        done();
-      });
     });
 
 
-    it('should call \'isMemberById()\' with the correct params if teams are found', done => {
+    it('should call \'isMemberById()\' with the correct params if teams are found', async () => {
-      const spy = teamsIsMemberByIdSpy;
+      await teams.isMemberBySlug('userA', ['team1']);
+      expect(teamsIsMemberByIdSpy).toHaveBeenCalledWith('userA', [1]);
 
-      Promise.all([
+      await teams.isMemberBySlug('userB', ['team2']);
-        teams.isMemberBySlug('user', ['team1']).then(() => expect(spy).toHaveBeenCalledWith('user', [1])),
+      expect(teamsIsMemberByIdSpy).toHaveBeenCalledWith('userB', [2]);
-        teams.isMemberBySlug('user', ['team2']).then(() => expect(spy).toHaveBeenCalledWith('user', [2])),
+
-        teams.isMemberBySlug('user', ['team1', 'team2']).then(() => expect(spy).toHaveBeenCalledWith('user', [1, 2])),
+      await teams.isMemberBySlug('userC', ['team1', 'team2']);
-      ]).then(done);
+      expect(teamsIsMemberByIdSpy).toHaveBeenCalledWith('userC', [1, 2]);
     });
 
 
-    it('should resolve with false if \'isMemberById()\' rejects', done => {
+    it('should resolve with false if \'isMemberById()\' rejects', async () => {
-      teamsIsMemberByIdSpy.and.callFake(() => Promise.reject(null));
+      teamsIsMemberByIdSpy.and.rejectWith(null);
-      teams.isMemberBySlug('user', ['team1']).then(isMember => {
+
-        expect(isMember).toBe(false);
+      await expectAsync(teams.isMemberBySlug('user', ['team1'])).toBeResolvedTo(false);
-        expect(teamsIsMemberByIdSpy).toHaveBeenCalled();
+      expect(teamsIsMemberByIdSpy).toHaveBeenCalled();
-        done();
-      });
     });
 
 
     it('should resolve with the value \'isMemberById()\' resolves with', async () => {
+      teamsIsMemberByIdSpy.and.resolveTo(true);
+      await expectAsync(teams.isMemberBySlug('userA', ['team1'])).toBeResolvedTo(true);
+      expect(teamsIsMemberByIdSpy).toHaveBeenCalledWith('userA', [1]);
 
-      teamsIsMemberByIdSpy.and.callFake(() => Promise.resolve(true));
+      teamsIsMemberByIdSpy.and.resolveTo(false);
-      const isMember1 = await teams.isMemberBySlug('user', ['team1']);
+      await expectAsync(teams.isMemberBySlug('userB', ['team1'])).toBeResolvedTo(false);
-      expect(isMember1).toBe(true);
+      expect(teamsIsMemberByIdSpy).toHaveBeenCalledWith('userB', [1]);
-      expect(teamsIsMemberByIdSpy).toHaveBeenCalledWith('user', [1]);
-
-      teamsIsMemberByIdSpy.and.callFake(() => Promise.resolve(false));
-      const isMember2 = await teams.isMemberBySlug('user', ['team1']);
-      expect(isMember2).toBe(false);
-      expect(teamsIsMemberByIdSpy).toHaveBeenCalledWith('user', [1]);
     });
 
   });

aio/aio-builds-setup/dockerbuild/scripts-js/test/preview-server/build-creator.spec.ts

@@ -9,7 +9,8 @@ import {Logger} from '../../lib/common/utils';
 import {BuildCreator} from '../../lib/preview-server/build-creator';
 import {ChangedPrVisibilityEvent, CreatedBuildEvent} from '../../lib/preview-server/build-events';
 import {PreviewServerError} from '../../lib/preview-server/preview-error';
-import {expectToBePreviewServerError} from './helpers';
+import {customAsyncMatchers} from './jasmine-custom-async-matchers';
+
 
 // Tests
 describe('BuildCreator', () => {
@@ -24,6 +25,7 @@ describe('BuildCreator', () => {
   const publicShaDir = path.join(publicPrDir, shortSha);
   let bc: BuildCreator;
 
+  beforeEach(() => jasmine.addAsyncMatchers(customAsyncMatchers));
   beforeEach(() => bc = new BuildCreator(buildsDir));
 
 
@@ -35,8 +37,8 @@ describe('BuildCreator', () => {
 
 
     it('should extend EventEmitter', () => {
-      expect(bc).toEqual(jasmine.any(BuildCreator));
+      expect(bc).toBeInstanceOf(BuildCreator);
-      expect(bc).toEqual(jasmine.any(EventEmitter));
+      expect(bc).toBeInstanceOf(EventEmitter);
 
       expect(Object.getPrototypeOf(bc)).toBe(BuildCreator.prototype);
     });
@@ -67,47 +69,43 @@ describe('BuildCreator', () => {
       const shaDir = isPublic ? publicShaDir : hiddenShaDir;
 
 
-      it('should return a promise', done => {
+      it('should return a promise', async () => {
         const promise = bc.create(pr, sha, archive, isPublic);
-        promise.then(done);   // Do not complete the test (and release the spies) synchronously
+        expect(promise).toBeInstanceOf(Promise);
-                              // to avoid running the actual `extractArchive()`.
 
-        expect(promise).toEqual(jasmine.any(Promise));
+        // Do not complete the test (and release the spies) synchronously to avoid running the actual
+        // `extractArchive()`.
+        await promise;
       });
 
 
-      it('should update the PR\'s visibility first if necessary', done => {
+      it('should update the PR\'s visibility first if necessary', async () => {
-        bcUpdatePrVisibilitySpy.and.callFake(() => expect(shellMkdirSpy).not.toHaveBeenCalled());
+        await bc.create(pr, sha, archive, isPublic);
 
-        bc.create(pr, sha, archive, isPublic).
+        expect(bcUpdatePrVisibilitySpy).toHaveBeenCalledBefore(shellMkdirSpy);
-          then(() => {
+        expect(bcUpdatePrVisibilitySpy).toHaveBeenCalledWith(pr, isPublic);
-            expect(bcUpdatePrVisibilitySpy).toHaveBeenCalledWith(pr, isPublic);
+        expect(shellMkdirSpy).toHaveBeenCalled();
-            expect(shellMkdirSpy).toHaveBeenCalled();
-          }).
-          then(done);
       });
 
 
-      it('should create the build directory (and any parent directories)', done => {
+      it('should create the build directory (and any parent directories)', async () => {
-        bc.create(pr, sha, archive, isPublic).
+        await bc.create(pr, sha, archive, isPublic);
-          then(() => expect(shellMkdirSpy).toHaveBeenCalledWith('-p', shaDir)).
+        expect(shellMkdirSpy).toHaveBeenCalledWith('-p', shaDir);
-          then(done);
       });
 
 
-      it('should extract the archive contents into the build directory', done => {
+      it('should extract the archive contents into the build directory', async () => {
-        bc.create(pr, sha, archive, isPublic).
+        await bc.create(pr, sha, archive, isPublic);
-          then(() => expect(bcExtractArchiveSpy).toHaveBeenCalledWith(archive, shaDir)).
+        expect(bcExtractArchiveSpy).toHaveBeenCalledWith(archive, shaDir);
-          then(done);
       });
 
 
-      it('should emit a CreatedBuildEvent on success', done => {
+      it('should emit a CreatedBuildEvent on success', async () => {
         let emitted = false;
 
         bcEmitSpy.and.callFake((type: string, evt: CreatedBuildEvent) => {
           expect(type).toBe(CreatedBuildEvent.type);
-          expect(evt).toEqual(jasmine.any(CreatedBuildEvent));
+          expect(evt).toBeInstanceOf(CreatedBuildEvent);
           expect(evt.pr).toBe(+pr);
           expect(evt.sha).toBe(shortSha);
           expect(evt.isPublic).toBe(isPublic);
@@ -115,130 +113,108 @@ describe('BuildCreator', () => {
           emitted = true;
         });
 
-        bc.create(pr, sha, archive, isPublic).
+        await bc.create(pr, sha, archive, isPublic);
-          then(() => expect(emitted).toBe(true)).
+        expect(emitted).toBe(true);
-          then(done);
       });
 
 
       describe('on error', () => {
-        let existsValues: {[dir: string]: boolean};
-
         beforeEach(() => {
-          existsValues = {
+          bcExistsSpy.and.returnValue(false);
-            [prDir]: false,
-            [shaDir]: false,
-          };
-
-          bcExistsSpy.and.callFake((dir: string) => existsValues[dir]);
         });
 
 
-        it('should abort and skip further operations if changing the PR\'s visibility fails', done => {
+        it('should abort and skip further operations if changing the PR\'s visibility fails', async () => {
           const mockError = new PreviewServerError(543, 'Test');
-          bcUpdatePrVisibilitySpy.and.callFake(() => Promise.reject(mockError));
+          bcUpdatePrVisibilitySpy.and.rejectWith(mockError);
 
-          bc.create(pr, sha, archive, isPublic).catch(err => {
+          await expectAsync(bc.create(pr, sha, archive, isPublic)).toBeRejectedWith(mockError);
-            expect(err).toBe(mockError);
 
-            expect(bcExistsSpy).not.toHaveBeenCalled();
+          expect(bcExistsSpy).not.toHaveBeenCalled();
-            expect(shellMkdirSpy).not.toHaveBeenCalled();
+          expect(shellMkdirSpy).not.toHaveBeenCalled();
-            expect(bcExtractArchiveSpy).not.toHaveBeenCalled();
+          expect(bcExtractArchiveSpy).not.toHaveBeenCalled();
-            expect(bcEmitSpy).not.toHaveBeenCalled();
+          expect(bcEmitSpy).not.toHaveBeenCalled();
-
-            done();
-          });
         });
 
 
-        it('should abort and skip further operations if the build does already exist', done => {
+        it('should abort and skip further operations if the build does already exist', async () => {
-          existsValues[shaDir] = true;
+          bcExistsSpy.withArgs(shaDir).and.returnValue(true);
-          bc.create(pr, sha, archive, isPublic).catch(err => {
+
-            const publicOrNot = isPublic ? 'public' : 'non-public';
+          await expectAsync(bc.create(pr, sha, archive, isPublic)).toBeRejectedWithPreviewServerError(
-            expectToBePreviewServerError(err, 409, `Request to overwrite existing ${publicOrNot} directory: ${shaDir}`);
+              409, `Request to overwrite existing ${isPublic ? '' : 'non-'}public directory: ${shaDir}`);
-            expect(shellMkdirSpy).not.toHaveBeenCalled();
+
-            expect(bcExtractArchiveSpy).not.toHaveBeenCalled();
+          expect(shellMkdirSpy).not.toHaveBeenCalled();
-            expect(bcEmitSpy).not.toHaveBeenCalled();
+          expect(bcExtractArchiveSpy).not.toHaveBeenCalled();
-            done();
+          expect(bcEmitSpy).not.toHaveBeenCalled();
-          });
         });
 
 
-        it('should detect existing build directory after visibility change', done => {
+        it('should detect existing build directory after visibility change', async () => {
-          bcUpdatePrVisibilitySpy.and.callFake(() => existsValues[prDir] = existsValues[shaDir] = true);
+          bcUpdatePrVisibilitySpy.and.callFake(() => bcExistsSpy.and.returnValue(true));
 
           expect(bcExistsSpy(prDir)).toBe(false);
           expect(bcExistsSpy(shaDir)).toBe(false);
 
-          bc.create(pr, sha, archive, isPublic).catch(err => {
+          await expectAsync(bc.create(pr, sha, archive, isPublic)).toBeRejectedWithPreviewServerError(
-            const publicOrNot = isPublic ? 'public' : 'non-public';
+              409, `Request to overwrite existing ${isPublic ? '' : 'non-'}public directory: ${shaDir}`);
-            expectToBePreviewServerError(err, 409, `Request to overwrite existing ${publicOrNot} directory: ${shaDir}`);
+
-            expect(shellMkdirSpy).not.toHaveBeenCalled();
+          expect(shellMkdirSpy).not.toHaveBeenCalled();
-            expect(bcExtractArchiveSpy).not.toHaveBeenCalled();
+          expect(bcExtractArchiveSpy).not.toHaveBeenCalled();
-            expect(bcEmitSpy).not.toHaveBeenCalled();
+          expect(bcEmitSpy).not.toHaveBeenCalled();
-            done();
-          });
         });
 
 
-        it('should abort and skip further operations if it fails to create the directories', done => {
+        it('should abort and skip further operations if it fails to create the directories', async () => {
           shellMkdirSpy.and.throwError('');
-          bc.create(pr, sha, archive, isPublic).catch(() => {
+
-            expect(shellMkdirSpy).toHaveBeenCalled();
+          await expectAsync(bc.create(pr, sha, archive, isPublic)).toBeRejected();
-            expect(bcExtractArchiveSpy).not.toHaveBeenCalled();
+
-            expect(bcEmitSpy).not.toHaveBeenCalled();
+          expect(shellMkdirSpy).toHaveBeenCalled();
-            done();
+          expect(bcExtractArchiveSpy).not.toHaveBeenCalled();
-          });
+          expect(bcEmitSpy).not.toHaveBeenCalled();
         });
 
 
-        it('should abort and skip further operations if it fails to extract the archive', done => {
+        it('should abort and skip further operations if it fails to extract the archive', async () => {
-          bcExtractArchiveSpy.and.throwError('');
-          bc.create(pr, sha, archive, isPublic).catch(() => {
-            expect(shellMkdirSpy).toHaveBeenCalled();
-            expect(bcExtractArchiveSpy).toHaveBeenCalled();
-            expect(bcEmitSpy).not.toHaveBeenCalled();
-            done();
-          });
-        });
-
-
-        it('should delete the PR directory (for new PR)', done => {
-          bcExtractArchiveSpy.and.throwError('');
-          bc.create(pr, sha, archive, isPublic).catch(() => {
-            expect(shellRmSpy).toHaveBeenCalledWith('-rf', prDir);
-            done();
-          });
-        });
-
-
-        it('should delete the SHA directory (for existing PR)', done => {
-          existsValues[prDir] = true;
           bcExtractArchiveSpy.and.throwError('');
 
-          bc.create(pr, sha, archive, isPublic).catch(() => {
+          await expectAsync(bc.create(pr, sha, archive, isPublic)).toBeRejected();
-            expect(shellRmSpy).toHaveBeenCalledWith('-rf', shaDir);
+
-            done();
+          expect(shellMkdirSpy).toHaveBeenCalled();
-          });
+          expect(bcExtractArchiveSpy).toHaveBeenCalled();
+          expect(bcEmitSpy).not.toHaveBeenCalled();
         });
 
 
-        it('should reject with an PreviewServerError', done => {
+        it('should delete the PR directory (for new PR)', async () => {
+          bcExtractArchiveSpy.and.throwError('');
+
+          await expectAsync(bc.create(pr, sha, archive, isPublic)).toBeRejected();
+          expect(shellRmSpy).toHaveBeenCalledWith('-rf', prDir);
+        });
+
+
+        it('should delete the SHA directory (for existing PR)', async () => {
+          bcExistsSpy.withArgs(prDir).and.returnValue(true);
+          bcExtractArchiveSpy.and.throwError('');
+
+          await expectAsync(bc.create(pr, sha, archive, isPublic)).toBeRejected();
+          expect(shellRmSpy).toHaveBeenCalledWith('-rf', shaDir);
+        });
+
+
+        it('should reject with an PreviewServerError', async () => {
           // tslint:disable-next-line: no-string-throw
           shellMkdirSpy.and.callFake(() => { throw 'Test'; });
-          bc.create(pr, sha, archive, isPublic).catch(err => {
+
-            expectToBePreviewServerError(err, 500, `Error while creating preview at: ${shaDir}\nTest`);
+          await expectAsync(bc.create(pr, sha, archive, isPublic)).toBeRejectedWithPreviewServerError(
-            done();
+              500, `Error while creating preview at: ${shaDir}\nTest`);
-          });
         });
 
 
-        it('should pass PreviewServerError instances unmodified', done => {
+        it('should pass PreviewServerError instances unmodified', async () => {
           shellMkdirSpy.and.callFake(() => { throw new PreviewServerError(543, 'Test'); });
-          bc.create(pr, sha, archive, isPublic).catch(err => {
+          await expectAsync(bc.create(pr, sha, archive, isPublic)).toBeRejectedWithPreviewServerError(543, 'Test');
-            expectToBePreviewServerError(err, 543, 'Test');
-            done();
-          });
         });
 
       });
@@ -265,12 +241,12 @@ describe('BuildCreator', () => {
     });
 
 
-    it('should return a promise', done => {
+    it('should return a promise', async () => {
       const promise = bc.updatePrVisibility(pr, true);
-      promise.then(done);   // Do not complete the test (and release the spies) synchronously
+      expect(promise).toBeInstanceOf(Promise);
-                            // to avoid running the actual `extractArchive()`.
 
-      expect(promise).toEqual(jasmine.any(Promise));
+      // Do not complete the test (and release the spies) synchronously to avoid running the actual `extractArchive()`.
+      await promise;
     });
 
 
@@ -279,58 +255,53 @@ describe('BuildCreator', () => {
       const newPrDir = makePublic ? publicPrDir : hiddenPrDir;
 
 
-      it('should rename the directory', done => {
+      it('should rename the directory', async () => {
-        bc.updatePrVisibility(pr, makePublic).
+        await bc.updatePrVisibility(pr, makePublic);
-          then(() => expect(shellMvSpy).toHaveBeenCalledWith(oldPrDir, newPrDir)).
+        expect(shellMvSpy).toHaveBeenCalledWith(oldPrDir, newPrDir);
-          then(done);
       });
 
 
       describe('when the visibility is updated', () => {
 
-        it('should resolve to true', done => {
+        it('should resolve to true', async () => {
-          bc.updatePrVisibility(pr, makePublic).
+          await expectAsync(bc.updatePrVisibility(pr, makePublic)).toBeResolvedTo(true);
-            then(result => expect(result).toBe(true)).
-            then(done);
         });
 
 
-        it('should rename the directory', done => {
+        it('should rename the directory', async () => {
-          bc.updatePrVisibility(pr, makePublic).
+          await bc.updatePrVisibility(pr, makePublic);
-            then(() => expect(shellMvSpy).toHaveBeenCalledWith(oldPrDir, newPrDir)).
+          expect(shellMvSpy).toHaveBeenCalledWith(oldPrDir, newPrDir);
-            then(done);
         });
 
 
-        it('should emit a ChangedPrVisibilityEvent on success', done => {
+        it('should emit a ChangedPrVisibilityEvent on success', async () => {
           let emitted = false;
 
           bcEmitSpy.and.callFake((type: string, evt: ChangedPrVisibilityEvent) => {
             expect(type).toBe(ChangedPrVisibilityEvent.type);
-            expect(evt).toEqual(jasmine.any(ChangedPrVisibilityEvent));
+            expect(evt).toBeInstanceOf(ChangedPrVisibilityEvent);
             expect(evt.pr).toBe(+pr);
-            expect(evt.shas).toEqual(jasmine.any(Array));
+            expect(evt.shas).toBeInstanceOf(Array);
             expect(evt.isPublic).toBe(makePublic);
 
             emitted = true;
           });
 
-          bc.updatePrVisibility(pr, makePublic).
+          await bc.updatePrVisibility(pr, makePublic);
-            then(() => expect(emitted).toBe(true)).
+          expect(emitted).toBe(true);
-            then(done);
         });
 
 
-        it('should include all shas in the emitted event', done => {
+        it('should include all shas in the emitted event', async () => {
           const shas = ['foo', 'bar', 'baz'];
           let emitted = false;
 
-          bcListShasByDate.and.callFake(() => Promise.resolve(shas));
+          bcListShasByDate.and.resolveTo(shas);
           bcEmitSpy.and.callFake((type: string, evt: ChangedPrVisibilityEvent) => {
             expect(bcListShasByDate).toHaveBeenCalledWith(newPrDir);
 
             expect(type).toBe(ChangedPrVisibilityEvent.type);
-            expect(evt).toEqual(jasmine.any(ChangedPrVisibilityEvent));
+            expect(evt).toBeInstanceOf(ChangedPrVisibilityEvent);
             expect(evt.pr).toBe(+pr);
             expect(evt.shas).toBe(shas);
             expect(evt.isPublic).toBe(makePublic);
@@ -338,94 +309,82 @@ describe('BuildCreator', () => {
             emitted = true;
           });
 
-          bc.updatePrVisibility(pr, makePublic).
+          await bc.updatePrVisibility(pr, makePublic);
-            then(() => expect(emitted).toBe(true)).
+          expect(emitted).toBe(true);
-            then(done);
         });
 
       });
 
 
-      it('should do nothing if the visibility is already up-to-date', done => {
+      it('should do nothing if the visibility is already up-to-date', async () => {
         bcExistsSpy.and.callFake((dir: string) => dir === newPrDir);
-        bc.updatePrVisibility(pr, makePublic).
+
-          then(result => {
+        await expectAsync(bc.updatePrVisibility(pr, makePublic)).toBeResolvedTo(false);
-            expect(result).toBe(false);
+
-            expect(shellMvSpy).not.toHaveBeenCalled();
+        expect(shellMvSpy).not.toHaveBeenCalled();
-            expect(bcListShasByDate).not.toHaveBeenCalled();
+        expect(bcListShasByDate).not.toHaveBeenCalled();
-            expect(bcEmitSpy).not.toHaveBeenCalled();
+        expect(bcEmitSpy).not.toHaveBeenCalled();
-          }).
-          then(done);
       });
 
 
-      it('should do nothing if the PR directory does not exist', done => {
+      it('should do nothing if the PR directory does not exist', async () => {
         bcExistsSpy.and.returnValue(false);
-        bc.updatePrVisibility(pr, makePublic).
+
-          then(result => {
+        await expectAsync(bc.updatePrVisibility(pr, makePublic)).toBeResolvedTo(false);
-            expect(result).toBe(false);
+
-            expect(shellMvSpy).not.toHaveBeenCalled();
+        expect(shellMvSpy).not.toHaveBeenCalled();
-            expect(bcListShasByDate).not.toHaveBeenCalled();
+        expect(bcListShasByDate).not.toHaveBeenCalled();
-            expect(bcEmitSpy).not.toHaveBeenCalled();
+        expect(bcEmitSpy).not.toHaveBeenCalled();
-          }).
-          then(done);
       });
 
 
       describe('on error', () => {
 
-        it('should abort and skip further operations if both directories exist', done => {
+        it('should abort and skip further operations if both directories exist', async () => {
           bcExistsSpy.and.returnValue(true);
-          bc.updatePrVisibility(pr, makePublic).catch(err => {
+
-            expectToBePreviewServerError(err, 409,
+          await expectAsync(bc.updatePrVisibility(pr, makePublic)).toBeRejectedWithPreviewServerError(
-              `Request to move '${oldPrDir}' to existing directory '${newPrDir}'.`);
+              409, `Request to move '${oldPrDir}' to existing directory '${newPrDir}'.`);
-            expect(shellMvSpy).not.toHaveBeenCalled();
+
-            expect(bcListShasByDate).not.toHaveBeenCalled();
+          expect(shellMvSpy).not.toHaveBeenCalled();
-            expect(bcEmitSpy).not.toHaveBeenCalled();
+          expect(bcListShasByDate).not.toHaveBeenCalled();
-            done();
+          expect(bcEmitSpy).not.toHaveBeenCalled();
-          });
         });
 
 
-        it('should abort and skip further operations if it fails to rename the directory', done => {
+        it('should abort and skip further operations if it fails to rename the directory', async () => {
           shellMvSpy.and.throwError('');
-          bc.updatePrVisibility(pr, makePublic).catch(() => {
+
-            expect(shellMvSpy).toHaveBeenCalled();
+          await expectAsync(bc.updatePrVisibility(pr, makePublic)).toBeRejected();
-            expect(bcListShasByDate).not.toHaveBeenCalled();
+
-            expect(bcEmitSpy).not.toHaveBeenCalled();
+          expect(shellMvSpy).toHaveBeenCalled();
-            done();
+          expect(bcListShasByDate).not.toHaveBeenCalled();
-          });
+          expect(bcEmitSpy).not.toHaveBeenCalled();
         });
 
 
-        it('should abort and skip further operations if it fails to list the SHAs', done => {
+        it('should abort and skip further operations if it fails to list the SHAs', async () => {
           bcListShasByDate.and.throwError('');
-          bc.updatePrVisibility(pr, makePublic).catch(() => {
+
-            expect(shellMvSpy).toHaveBeenCalled();
+          await expectAsync(bc.updatePrVisibility(pr, makePublic)).toBeRejected();
-            expect(bcListShasByDate).toHaveBeenCalled();
+
-            expect(bcEmitSpy).not.toHaveBeenCalled();
+          expect(shellMvSpy).toHaveBeenCalled();
-            done();
+          expect(bcListShasByDate).toHaveBeenCalled();
-          });
+          expect(bcEmitSpy).not.toHaveBeenCalled();
         });
 
 
-        it('should reject with an PreviewServerError', done => {
+        it('should reject with an PreviewServerError', async () => {
           // tslint:disable-next-line: no-string-throw
           shellMvSpy.and.callFake(() => { throw 'Test'; });
-          bc.updatePrVisibility(pr, makePublic).catch(err => {
+          await expectAsync(bc.updatePrVisibility(pr, makePublic)).toBeRejectedWithPreviewServerError(
-            expectToBePreviewServerError(err, 500,
+              500, `Error while making PR ${pr} ${makePublic ? 'public' : 'hidden'}.\nTest`);
-                `Error while making PR ${pr} ${makePublic ? 'public' : 'hidden'}.\nTest`);
-            done();
-          });
         });
 
 
-        it('should pass PreviewServerError instances unmodified', done => {
+        it('should pass PreviewServerError instances unmodified', async () => {
           shellMvSpy.and.callFake(() => { throw new PreviewServerError(543, 'Test'); });
-          bc.updatePrVisibility(pr, makePublic).catch(err => {
+          await expectAsync(bc.updatePrVisibility(pr, makePublic)).toBeRejectedWithPreviewServerError(543, 'Test');
-            expectToBePreviewServerError(err, 543, 'Test');
-            done();
-          });
         });
 
       });
@@ -443,12 +402,14 @@ describe('BuildCreator', () => {
 
     beforeEach(() => {
       fsAccessCbs = [];
-      fsAccessSpy = spyOn(fs, 'access').and.callFake((_: string, cb: (v?: any) => void) => fsAccessCbs.push(cb));
+      fsAccessSpy = spyOn(fs, 'access').and.callFake(
+        ((_: string, cb: (v?: any) => void) => fsAccessCbs.push(cb)) as unknown as typeof fs.access,
+      );
     });
 
 
     it('should return a promise', () => {
-      expect((bc as any).exists('foo')).toEqual(jasmine.any(Promise));
+      expect((bc as any).exists('foo')).toBeInstanceOf(Promise);
     });
 
 
@@ -458,25 +419,29 @@ describe('BuildCreator', () => {
     });
 
 
-    it('should resolve with \'true\' if \'fs.access()\' succeeds', done => {
+    it('should resolve with \'true\' if \'fs.access()\' succeeds', async () => {
-      Promise.
+      const existsPromises = [
-        all([(bc as any).exists('foo'), (bc as any).exists('bar')]).
+        (bc as any).exists('foo'),
-        then(results => expect(results).toEqual([true, true])).
+        (bc as any).exists('bar'),
-        then(done);
+      ];
 
       fsAccessCbs[0]();
       fsAccessCbs[1](null);
+
+      await expectAsync(Promise.all(existsPromises)).toBeResolvedTo([true, true]);
     });
 
 
-    it('should resolve with \'false\' if \'fs.access()\' errors', done => {
+    it('should resolve with \'false\' if \'fs.access()\' errors', async () => {
-      Promise.
+      const existsPromises = [
-        all([(bc as any).exists('foo'), (bc as any).exists('bar')]).
+        (bc as any).exists('foo'),
-        then(results => expect(results).toEqual([false, false])).
+        (bc as any).exists('bar'),
-        then(done);
+      ];
 
       fsAccessCbs[0]('Error');
       fsAccessCbs[1](new Error());
+
+      await expectAsync(Promise.all(existsPromises)).toBeResolvedTo([false, false]);
     });
 
   });
@@ -495,12 +460,15 @@ describe('BuildCreator', () => {
       consoleWarnSpy = spyOn(Logger.prototype, 'warn');
       shellChmodSpy = spyOn(shell, 'chmod');
       shellRmSpy = spyOn(shell, 'rm');
-      cpExecSpy = spyOn(cp, 'exec').and.callFake((_: string, cb: (...args: any[]) => void) => cpExecCbs.push(cb));
+      cpExecSpy = spyOn(cp, 'exec').and.callFake(
+        ((_: string, cb: (...args: any[]) => void) =>
+          cpExecCbs.push(cb)) as unknown as typeof cp.exec,
+      );
     });
 
 
     it('should return a promise', () => {
-      expect((bc as any).extractArchive('foo', 'bar')).toEqual(jasmine.any(Promise));
+      expect((bc as any).extractArchive('foo', 'bar')).toBeInstanceOf(Promise);
     });
 
 
@@ -512,78 +480,68 @@ describe('BuildCreator', () => {
     });
 
 
-    it('should log (as a warning) any stderr output if extracting succeeded', done => {
+    it('should log (as a warning) any stderr output if extracting succeeded', async () => {
-      (bc as any).extractArchive('foo', 'bar').
+      const extractPromise = (bc as any).extractArchive('foo', 'bar');
-        then(() => expect(consoleWarnSpy).toHaveBeenCalledWith('This is stderr')).
-        then(done);
-
       cpExecCbs[0](null, 'This is stdout', 'This is stderr');
+
+      await expectAsync(extractPromise).toBeResolved();
+      expect(consoleWarnSpy).toHaveBeenCalledWith('This is stderr');
     });
 
 
-    it('should make the build directory non-writable', done => {
+    it('should make the build directory non-writable', async () => {
-      (bc as any).extractArchive('foo', 'bar').
+      const extractPromise = (bc as any).extractArchive('foo', 'bar');
-        then(() => expect(shellChmodSpy).toHaveBeenCalledWith('-R', 'a-w', 'bar')).
-        then(done);
-
       cpExecCbs[0]();
+
+      await expectAsync(extractPromise).toBeResolved();
+      expect(shellChmodSpy).toHaveBeenCalledWith('-R', 'a-w', 'bar');
     });
 
 
-    it('should delete the build artifact file on success', done => {
+    it('should delete the build artifact file on success', async () => {
-      (bc as any).extractArchive('input/file', 'output/dir').
+      const extractPromise = (bc as any).extractArchive('input/file', 'output/dir');
-        then(() => expect(shellRmSpy).toHaveBeenCalledWith('-f', 'input/file')).
-        then(done);
-
       cpExecCbs[0]();
+
+      await expectAsync(extractPromise).toBeResolved();
+      expect(shellRmSpy).toHaveBeenCalledWith('-f', 'input/file');
     });
 
 
     describe('on error', () => {
 
-      it('should abort and skip further operations if it fails to extract the archive', done => {
+      it('should abort and skip further operations if it fails to extract the archive', async () => {
-        (bc as any).extractArchive('foo', 'bar').catch((err: any) => {
+        const extractPromise = (bc as any).extractArchive('foo', 'bar');
-          expect(shellChmodSpy).not.toHaveBeenCalled();
-          expect(shellRmSpy).not.toHaveBeenCalled();
-          expect(err).toBe('Test');
-          done();
-        });
-
         cpExecCbs[0]('Test');
+
+        await expectAsync(extractPromise).toBeRejectedWith('Test');
+        expect(shellChmodSpy).not.toHaveBeenCalled();
+        expect(shellRmSpy).not.toHaveBeenCalled();
       });
 
 
-      it('should abort and skip further operations if it fails to make non-writable', done => {
+      it('should abort and skip further operations if it fails to make non-writable', async () => {
-        (bc as any).extractArchive('foo', 'bar').catch((err: any) => {
+        // tslint:disable-next-line: no-string-throw
-          expect(shellChmodSpy).toHaveBeenCalled();
+        shellChmodSpy.and.callFake(() => { throw 'Test'; });
-          expect(shellRmSpy).not.toHaveBeenCalled();
-          expect(err).toBe('Test');
-          done();
-        });
-
-        shellChmodSpy.and.callFake(() => {
-          // tslint:disable-next-line: no-string-throw
-          throw 'Test';
-        });
 
+        const extractPromise = (bc as any).extractArchive('foo', 'bar');
         cpExecCbs[0]();
+
+        await expectAsync(extractPromise).toBeRejectedWith('Test');
+        expect(shellChmodSpy).toHaveBeenCalled();
+        expect(shellRmSpy).not.toHaveBeenCalled();
       });
 
 
-      it('should abort and reject if it fails to remove the build artifact file', done => {
+      it('should abort and reject if it fails to remove the build artifact file', async () => {
-        (bc as any).extractArchive('foo', 'bar').catch((err: any) => {
+        // tslint:disable-next-line: no-string-throw
-          expect(shellChmodSpy).toHaveBeenCalled();
+        shellRmSpy.and.callFake(() => { throw 'Test'; });
-          expect(shellRmSpy).toHaveBeenCalled();
-          expect(err).toBe('Test');
-          done();
-        });
-
-        shellRmSpy.and.callFake(() => {
-          // tslint:disable-next-line: no-string-throw
-          throw 'Test';
-        });
 
+        const extractPromise = (bc as any).extractArchive('foo', 'bar');
         cpExecCbs[0]();
+
+        await expectAsync(extractPromise).toBeRejectedWith('Test');
+        expect(shellChmodSpy).toHaveBeenCalled();
+        expect(shellRmSpy).toHaveBeenCalled();
       });
 
     });
@@ -600,62 +558,54 @@ describe('BuildCreator', () => {
     });
 
     beforeEach(() => {
-      shellLsSpy = spyOn(shell, 'ls').and.returnValue([]);
+      shellLsSpy = spyOn(shell, 'ls').and.returnValue([] as unknown as shell.ShellArray);
     });
 
 
-    it('should return a promise', done => {
+    it('should return a promise', async () => {
       const promise = (bc as any).listShasByDate('input/dir');
-      promise.then(done);   // Do not complete the test (and release the spies) synchronously
+      expect(promise).toBeInstanceOf(Promise);
-                            // to avoid running the actual `ls()`.
 
-      expect(promise).toEqual(jasmine.any(Promise));
+      // Do not complete the test (and release the spies) synchronously to avoid running the actual `ls()`.
+      await promise;
     });
 
 
-    it('should `ls()` files with their metadata', done => {
+    it('should `ls()` files with their metadata', async () => {
-      (bc as any).listShasByDate('input/dir').
+      await (bc as any).listShasByDate('input/dir');
-        then(() => expect(shellLsSpy).toHaveBeenCalledWith('-l', 'input/dir')).
+      expect(shellLsSpy).toHaveBeenCalledWith('-l', 'input/dir');
-        then(done);
     });
 
 
-    it('should reject if listing files fails', done => {
+    it('should reject if listing files fails', async () => {
-      shellLsSpy.and.callFake(() => Promise.reject('Test'));
+      shellLsSpy.and.rejectWith('Test');
-      (bc as any).listShasByDate('input/dir').catch((err: string) => {
+      await expectAsync((bc as any).listShasByDate('input/dir')).toBeRejectedWith('Test');
-        expect(err).toBe('Test');
-        done();
-      });
     });
 
 
-    it('should return the filenames', done => {
+    it('should return the filenames', async () => {
-      shellLsSpy.and.callFake(() => Promise.resolve([
+      shellLsSpy.and.resolveTo([
         lsResult('foo', 100),
         lsResult('bar', 200),
         lsResult('baz', 300),
-      ]));
+      ]);
 
-      (bc as any).listShasByDate('input/dir').
+      await expectAsync((bc as any).listShasByDate('input/dir')).toBeResolvedTo(['foo', 'bar', 'baz']);
-        then((shas: string[]) => expect(shas).toEqual(['foo', 'bar', 'baz'])).
-        then(done);
     });
 
 
-    it('should sort by date', done => {
+    it('should sort by date', async () => {
-      shellLsSpy.and.callFake(() => Promise.resolve([
+      shellLsSpy.and.resolveTo([
         lsResult('foo', 300),
         lsResult('bar', 100),
         lsResult('baz', 200),
-      ]));
+      ]);
 
-      (bc as any).listShasByDate('input/dir').
+      await expectAsync((bc as any).listShasByDate('input/dir')).toBeResolvedTo(['bar', 'baz', 'foo']);
-        then((shas: string[]) => expect(shas).toEqual(['bar', 'baz', 'foo'])).
-        then(done);
     });
 
 
-    it('should not break with ShellJS\' custom `sort()` method', done => {
+    it('should not break with ShellJS\' custom `sort()` method', async () => {
       const mockArray = [
         lsResult('foo', 300),
         lsResult('bar', 100),
@@ -663,26 +613,21 @@ describe('BuildCreator', () => {
       ];
       mockArray.sort = jasmine.createSpy('sort');
 
-      shellLsSpy.and.callFake(() => Promise.resolve(mockArray));
+      shellLsSpy.and.resolveTo(mockArray);
-      (bc as any).listShasByDate('input/dir').
+
-        then((shas: string[]) => {
+      await expectAsync((bc as any).listShasByDate('input/dir')).toBeResolvedTo(['bar', 'baz', 'foo']);
-          expect(shas).toEqual(['bar', 'baz', 'foo']);
+      expect(mockArray.sort).not.toHaveBeenCalled();
-          expect(mockArray.sort).not.toHaveBeenCalled();
-        }).
-        then(done);
     });
 
 
-    it('should only include directories', done => {
+    it('should only include directories', async () => {
-      shellLsSpy.and.callFake(() => Promise.resolve([
+      shellLsSpy.and.resolveTo([
         lsResult('foo', 100),
         lsResult('bar', 200, false),
         lsResult('baz', 300),
-      ]));
+      ]);
 
-      (bc as any).listShasByDate('input/dir').
+      await expectAsync((bc as any).listShasByDate('input/dir')).toBeResolvedTo(['foo', 'baz']);
-        then((shas: string[]) => expect(shas).toEqual(['foo', 'baz'])).
-        then(done);
     });
 
   });

aio/aio-builds-setup/dockerbuild/scripts-js/test/preview-server/build-retriever.spec.ts

@@ -32,18 +32,18 @@ describe('BuildRetriever', () => {
     };
 
     api = new CircleCiApi('ORG', 'REPO', 'TOKEN');
-    spyOn(api, 'getBuildInfo').and.callFake(() => Promise.resolve(BUILD_INFO));
+    spyOn(api, 'getBuildInfo').and.resolveTo(BUILD_INFO);
-    getBuildArtifactUrlSpy = spyOn(api, 'getBuildArtifactUrl')
+    getBuildArtifactUrlSpy = spyOn(api, 'getBuildArtifactUrl').and.resolveTo(BASE_URL + ARTIFACT_PATH);
-      .and.callFake(() => Promise.resolve(BASE_URL + ARTIFACT_PATH));
 
     WRITEFILE_RESULT = undefined;
     writeFileSpy = spyOn(fs, 'writeFile').and.callFake(
-      (_path: string, _buffer: Buffer, callback: (err?: any) => {}) => callback(WRITEFILE_RESULT),
+      ((_path: string, _buffer: Buffer, callback: fs.NoParamCallback) =>
+        callback(WRITEFILE_RESULT)) as typeof fs.writeFile,
     );
 
     EXISTS_RESULT = false;
     existsSpy = spyOn(fs, 'exists').and.callFake(
-      (_path: string, callback: (exists: boolean) => {}) => callback(EXISTS_RESULT),
+      ((_path, callback) => callback(EXISTS_RESULT)) as typeof fs.exists,
     );
   });
 
@@ -56,6 +56,7 @@ describe('BuildRetriever', () => {
       expect(() => new BuildRetriever(api, -1, DOWNLOAD_DIR))
         .toThrowError(`Invalid parameter "downloadSizeLimit" should be a number greater than 0.`);
     });
+
     it('should fail if the "downloadDir" is missing', () => {
       expect(() => new BuildRetriever(api, MAX_DOWNLOAD_SIZE, ''))
         .toThrowError(`Missing or empty required parameter 'downloadDir'!`);
@@ -72,14 +73,10 @@ describe('BuildRetriever', () => {
     });
 
     it('should error if it is not possible to extract the PR number from the branch', async () => {
+      BUILD_INFO.branch = 'master';
       const retriever = new BuildRetriever(api, MAX_DOWNLOAD_SIZE, DOWNLOAD_DIR);
-      try {
+
-        BUILD_INFO.branch = 'master';
+      await expectAsync(retriever.getGithubInfo(12345)).toBeRejectedWithError('No PR found in branch field: master');
-        await retriever.getGithubInfo(12345);
-        throw new Error('Exception Expected');
-      } catch (error) {
-        expect(error.message).toEqual('No PR found in branch field: master');
-      }
     });
   });
 
@@ -110,12 +107,10 @@ describe('BuildRetriever', () => {
     it('should fail if the artifact is too large', async () => {
       const artifactRequest = nock(BASE_URL).get(ARTIFACT_PATH).reply(200, ARTIFACT_CONTENTS);
       retriever = new BuildRetriever(api, 10, DOWNLOAD_DIR);
-      try {
+
-        await retriever.downloadBuildArtifact(12345, 777, 'COMMIT', ARTIFACT_PATH);
+      await expectAsync(retriever.downloadBuildArtifact(12345, 777, 'COMMIT', ARTIFACT_PATH)).
-        throw new Error('Exception Expected');
+        toBeRejectedWith(jasmine.objectContaining({status: 413}));
-      } catch (error) {
+
-        expect(error.status).toEqual(413);
-      }
       artifactRequest.done();
     });
 
@@ -143,50 +138,40 @@ describe('BuildRetriever', () => {
       artifactRequest.done();
     });
 
-    it('should fail if the CircleCI API fails',  async () => {
+    it('should fail if the CircleCI API fails', async () => {
-      try {
+      getBuildArtifactUrlSpy.and.rejectWith('getBuildArtifactUrl failed');
-        getBuildArtifactUrlSpy.and.callFake(() => Promise.reject('getBuildArtifactUrl failed'));
+      await expectAsync(retriever.downloadBuildArtifact(12345, 777, 'COMMIT', ARTIFACT_PATH)).
-        await retriever.downloadBuildArtifact(12345, 777, 'COMMIT', ARTIFACT_PATH);
+        toBeRejectedWithError('CircleCI artifact download failed (getBuildArtifactUrl failed)');
-        throw new Error('Exception Expected');
-      } catch (error) {
-        expect(error.message).toEqual('CircleCI artifact download failed (getBuildArtifactUrl failed)');
-      }
     });
 
-    it('should fail if the URL fetch errors',  async () => {
+    it('should fail if the URL fetch errors', async () => {
       // create a new handler that errors
       const artifactRequest = nock(BASE_URL).get(ARTIFACT_PATH).replyWithError('Artifact Request Failed');
-      try {
+
-        await retriever.downloadBuildArtifact(12345, 777, 'COMMIT', ARTIFACT_PATH);
+      await expectAsync(retriever.downloadBuildArtifact(12345, 777, 'COMMIT', ARTIFACT_PATH)).toBeRejectedWithError(
-        throw new Error('Exception Expected');
+          'CircleCI artifact download failed ' +
-      } catch (error) {
-        expect(error.message).toEqual('CircleCI artifact download failed ' +
           '(request to http://test.com/some/path/build.zip failed, reason: Artifact Request Failed)');
-      }
+
       artifactRequest.done();
     });
 
-    it('should fail if the URL fetch 404s',  async () => {
+    it('should fail if the URL fetch 404s', async () => {
       // create a new handler that errors
       const artifactRequest = nock(BASE_URL).get(ARTIFACT_PATH).reply(404, 'No such artifact');
-      try {
+
-        await retriever.downloadBuildArtifact(12345, 777, 'COMMIT', ARTIFACT_PATH);
+      await expectAsync(retriever.downloadBuildArtifact(12345, 777, 'COMMIT', ARTIFACT_PATH)).
-        throw new Error('Exception Expected');
+        toBeRejectedWithError('CircleCI artifact download failed (Error 404 - Not Found)');
-      } catch (error) {
+
-        expect(error.message).toEqual('CircleCI artifact download failed (Error 404 - Not Found)');
-      }
       artifactRequest.done();
     });
 
-    it('should fail if file write fails',  async () => {
+    it('should fail if file write fails', async () => {
       const artifactRequest = nock(BASE_URL).get(ARTIFACT_PATH).reply(200, ARTIFACT_CONTENTS);
-      try {
+      WRITEFILE_RESULT = 'Test Error';
-        WRITEFILE_RESULT = 'Test Error';
+
-        await retriever.downloadBuildArtifact(12345, 777, 'COMMIT', ARTIFACT_PATH);
+      await expectAsync(retriever.downloadBuildArtifact(12345, 777, 'COMMIT', ARTIFACT_PATH)).
-        throw new Error('Exception Expected');
+        toBeRejectedWithError('CircleCI artifact download failed (Test Error)');
-      } catch (error) {
+
-        expect(error.message).toEqual('CircleCI artifact download failed (Test Error)');
-      }
       artifactRequest.done();
     });
   });

aio/aio-builds-setup/dockerbuild/scripts-js/test/preview-server/build-verifier.spec.ts

@@ -51,7 +51,10 @@ describe('BuildVerifier', () => {
   describe('getSignificantFilesChanged', () => {
     it('should return false if none of the fetched files match the given pattern', async () => {
       const fetchFilesSpy = spyOn(prs, 'fetchFiles');
-      fetchFilesSpy.and.callFake(() => Promise.resolve([{filename: 'a/b/c'}, {filename: 'd/e/f'}]));
+      fetchFilesSpy.and.resolveTo([
+        {filename: 'a/b/c', sha: 'a1'},
+        {filename: 'd/e/f', sha: 'b2'},
+      ]);
       expect(await bv.getSignificantFilesChanged(777, /^x/)).toEqual(false);
       expect(fetchFilesSpy).toHaveBeenCalledWith(777);
 
@@ -78,37 +81,30 @@ describe('BuildVerifier', () => {
         user: {login: 'username'},
       };
 
-      prsFetchSpy = spyOn(GithubPullRequests.prototype, 'fetch').
+      prsFetchSpy = spyOn(GithubPullRequests.prototype, 'fetch').and.resolveTo(mockPrInfo);
-        and.callFake(() => Promise.resolve(mockPrInfo));
+      teamsIsMemberBySlugSpy = spyOn(GithubTeams.prototype, 'isMemberBySlug').and.resolveTo(true);
-
-      teamsIsMemberBySlugSpy = spyOn(GithubTeams.prototype, 'isMemberBySlug').
-        and.callFake(() => Promise.resolve(true));
     });
 
 
-    it('should return a promise', done => {
+    it('should return a promise', async () => {
       const promise = bv.getPrIsTrusted(pr);
-      promise.then(done);   // Do not complete the test (and release the spies) synchronously
+      expect(promise).toBeInstanceOf(Promise);
-                            // to avoid running the actual `GithubTeams#isMemberBySlug()`.
 
-      expect(promise).toEqual(jasmine.any(Promise));
+      // Do not complete the test (and release the spies) synchronously to avoid running the actual
+      // `GithubTeams#isMemberBySlug()`.
+      await promise;
     });
 
 
-    it('should fetch the corresponding PR', done => {
+    it('should fetch the corresponding PR', async () => {
-      bv.getPrIsTrusted(pr).then(() => {
+      await bv.getPrIsTrusted(pr);
-        expect(prsFetchSpy).toHaveBeenCalledWith(pr);
+      expect(prsFetchSpy).toHaveBeenCalledWith(pr);
-        done();
-      });
     });
 
 
-    it('should fail if fetching the PR errors', done => {
+    it('should fail if fetching the PR errors', async () => {
-      prsFetchSpy.and.callFake(() => Promise.reject('Test'));
+      prsFetchSpy.and.rejectWith('Test');
-      bv.getPrIsTrusted(pr).catch(err => {
+      await expectAsync(bv.getPrIsTrusted(pr)).toBeRejectedWith('Test');
-        expect(err).toBe('Test');
-        done();
-      });
     });
 
 
@@ -117,19 +113,14 @@ describe('BuildVerifier', () => {
       beforeEach(() => mockPrInfo.labels.push({name: 'trusted: pr-label'}));
 
 
-      it('should resolve to true', done => {
+      it('should resolve to true', async () => {
-        bv.getPrIsTrusted(pr).then(isTrusted => {
+        await expectAsync(bv.getPrIsTrusted(pr)).toBeResolvedTo(true);
-          expect(isTrusted).toBe(true);
-          done();
-        });
       });
 
 
-      it('should not try to verify the author\'s membership status', done => {
+      it('should not try to verify the author\'s membership status', async () => {
-        bv.getPrIsTrusted(pr).then(() => {
+        await expectAsync(bv.getPrIsTrusted(pr));
-          expect(teamsIsMemberBySlugSpy).not.toHaveBeenCalled();
+        expect(teamsIsMemberBySlugSpy).not.toHaveBeenCalled();
-          done();
-        });
       });
 
     });
@@ -137,40 +128,27 @@ describe('BuildVerifier', () => {
 
     describe('when the PR does not have the "trusted PR" label', () => {
 
-      it('should verify the PR author\'s membership in the specified teams', done => {
+      it('should verify the PR author\'s membership in the specified teams', async () => {
-        bv.getPrIsTrusted(pr).then(() => {
+        await bv.getPrIsTrusted(pr);
-          expect(teamsIsMemberBySlugSpy).toHaveBeenCalledWith('username', ['team1', 'team2']);
+        expect(teamsIsMemberBySlugSpy).toHaveBeenCalledWith('username', ['team1', 'team2']);
-          done();
-        });
       });
 
 
-      it('should fail if verifying membership errors', done => {
+      it('should fail if verifying membership errors', async () => {
-        teamsIsMemberBySlugSpy.and.callFake(() => Promise.reject('Test'));
+        teamsIsMemberBySlugSpy.and.rejectWith('Test');
-        bv.getPrIsTrusted(pr).catch(err => {
+        await expectAsync(bv.getPrIsTrusted(pr)).toBeRejectedWith('Test');
-          expect(err).toBe('Test');
-          done();
-        });
       });
 
 
-      it('should resolve to true if the PR\'s author is a member', done => {
+      it('should resolve to true if the PR\'s author is a member', async () => {
-        teamsIsMemberBySlugSpy.and.callFake(() => Promise.resolve(true));
+        teamsIsMemberBySlugSpy.and.resolveTo(true);
-
+        await expectAsync(bv.getPrIsTrusted(pr)).toBeResolvedTo(true);
-        bv.getPrIsTrusted(pr).then(isTrusted => {
-          expect(isTrusted).toBe(true);
-          done();
-        });
       });
 
 
-      it('should resolve to false if the PR\'s author is not a member', done => {
+      it('should resolve to false if the PR\'s author is not a member', async () => {
-        teamsIsMemberBySlugSpy.and.callFake(() => Promise.resolve(false));
+        teamsIsMemberBySlugSpy.and.resolveTo(false);
-
+        await expectAsync(bv.getPrIsTrusted(pr)).toBeResolvedTo(false);
-        bv.getPrIsTrusted(pr).then(isTrusted => {
-          expect(isTrusted).toBe(false);
-          done();
-        });
       });
 
     });

aio/aio-builds-setup/dockerbuild/scripts-js/test/preview-server/helpers.ts

@@ -1,11 +0,0 @@
-import {PreviewServerError} from '../../lib/preview-server/preview-error';
-
-export const expectToBePreviewServerError = (actual: PreviewServerError, status?: number, message?: string) => {
-  expect(actual).toEqual(jasmine.any(PreviewServerError));
-  if (status != null) {
-    expect(actual.status).toBe(status);
-  }
-  if (message != null) {
-    expect(actual.message).toBe(message);
-  }
-};

aio/aio-builds-setup/dockerbuild/scripts-js/test/preview-server/jasmine-custom-async-matchers-types.d.ts

@@ -0,0 +1,5 @@
+declare module jasmine {
+  interface AsyncMatchers {
+    toBeRejectedWithPreviewServerError(status: number, message?: string | RegExp): Promise<void>;
+  }
+}

aio/aio-builds-setup/dockerbuild/scripts-js/test/preview-server/jasmine-custom-async-matchers.ts

@@ -0,0 +1,59 @@
+import {PreviewServerError} from '../../lib/preview-server/preview-error';
+
+
+// Matchers
+const toBeRejectedWithPreviewServerError: jasmine.CustomAsyncMatcherFactory = () => {
+  return {
+    async compare(actualPromise: Promise<never>, expectedStatus: number, expectedMessage?: string | RegExp) {
+      if (!(actualPromise instanceof Promise)) {
+        throw new Error(`Expected '${toBeRejectedWithPreviewServerError.name}()' to be called on a promise.`);
+      }
+
+      try {
+        await actualPromise;
+
+        return {
+          pass: false,
+          message: `Expected a promise to be rejected with a '${PreviewServerError.name}', but it was resolved.`,
+        };
+      } catch (actualError) {
+        const actualPrintValue = stringify(actualError);
+        const expectedPrintValue =
+            stringify(new PreviewServerError(expectedStatus, expectedMessage && `${expectedMessage}`));
+
+        const pass = errorMatches(actualError, expectedStatus, expectedMessage);
+        const message =
+            `Expected a promise ${pass ? 'not ' : ''}to be rejected with ${expectedPrintValue}, but is was` +
+            `${pass ? '' : ` rejected with ${actualPrintValue}`}.`;
+
+        return {pass, message};
+      }
+    },
+  };
+
+  // Helpers
+  function errorMatches(actualErr: unknown, expectedStatus: number, expectedMsg?: string | RegExp): boolean {
+    if (!(actualErr instanceof PreviewServerError)) return false;
+    if (actualErr.status !== expectedStatus) return false;
+    return messageMatches(actualErr.message, expectedMsg);
+  }
+
+  function messageMatches(actualMsg: string, expectedMsg?: string | RegExp): boolean {
+    if (typeof expectedMsg === 'undefined') return true;
+    if (typeof expectedMsg === 'string') return actualMsg === expectedMsg;
+    return expectedMsg.test(actualMsg);
+  }
+
+  function stringify(value: unknown): string {
+    if (value instanceof PreviewServerError) {
+      return `${PreviewServerError.name}(${value.status}${value.message ? `, ${value.message}` : ''})`;
+    }
+
+    return jasmine.pp(value);
+  }
+};
+
+// Exports
+export const customAsyncMatchers: jasmine.CustomAsyncMatcherFactories = {
+  toBeRejectedWithPreviewServerError,
+};

aio/aio-builds-setup/dockerbuild/scripts-js/test/preview-server/preview-error.spec.ts

@@ -9,8 +9,8 @@ describe('PreviewServerError', () => {
 
 
   it('should extend Error', () => {
-    expect(err).toEqual(jasmine.any(PreviewServerError));
+    expect(err).toBeInstanceOf(PreviewServerError);
-    expect(err).toEqual(jasmine.any(Error));
+    expect(err).toBeInstanceOf(Error);
 
     expect(Object.getPrototypeOf(err)).toBe(PreviewServerError.prototype);
   });

aio/aio-builds-setup/dockerbuild/scripts-js/test/preview-server/preview-server-factory.spec.ts

@@ -1,5 +1,4 @@
 // Imports
-import * as express from 'express';
 import * as http from 'http';
 import * as supertest from 'supertest';
 import {CircleCiApi} from '../../lib/common/circle-ci-api';
@@ -134,7 +133,7 @@ describe('PreviewServerFactory', () => {
       const buildCreator = jasmine.any(BuildCreator);
       expect(usfCreateMiddlewareSpy).toHaveBeenCalledWith(buildRetriever, buildVerifier, buildCreator, defaultConfig);
 
-      const middleware: express.Express = usfCreateMiddlewareSpy.calls.mostRecent().returnValue;
+      const middleware = usfCreateMiddlewareSpy.calls.mostRecent().returnValue;
       expect(httpCreateServerSpy).toHaveBeenCalledWith(middleware);
     });
 
@@ -230,7 +229,7 @@ describe('PreviewServerFactory', () => {
 
       expect(prsAddCommentSpy).toHaveBeenCalledTimes(2);
       expect(prs).toBe(allCalls[1].object);
-      expect(prs).toEqual(jasmine.any(GithubPullRequests));
+      expect(prs).toBeInstanceOf(GithubPullRequests);
       expect(prs.repoSlug).toBe('organisation/repo');
     });
 
@@ -302,9 +301,8 @@ describe('PreviewServerFactory', () => {
       let bvGetSignificantFilesChangedSpy: jasmine.Spy;
 
       beforeEach(() => {
-        bvGetPrIsTrustedSpy = spyOn(buildVerifier, 'getPrIsTrusted').and.returnValue(Promise.resolve(true));
+        bvGetPrIsTrustedSpy = spyOn(buildVerifier, 'getPrIsTrusted').and.resolveTo(true);
-        bvGetSignificantFilesChangedSpy = spyOn(buildVerifier, 'getSignificantFilesChanged').
+        bvGetSignificantFilesChangedSpy = spyOn(buildVerifier, 'getSignificantFilesChanged').and.resolveTo(true);
-          and.returnValue(Promise.resolve(true));
       });
 
 
@@ -331,7 +329,7 @@ describe('PreviewServerFactory', () => {
 
 
       it('should respond appropriately if the PR did not touch any significant files', async () => {
-        bvGetSignificantFilesChangedSpy.and.returnValue(Promise.resolve(false));
+        bvGetSignificantFilesChangedSpy.and.resolveTo(false);
 
         const expectedResponse = {canHavePublicPreview: false, reason: 'No significant files touched.'};
         const expectedLog = `PR:${pr} - Cannot have a public preview, because it did not touch any significant files.`;
@@ -345,7 +343,7 @@ describe('PreviewServerFactory', () => {
 
 
       it('should respond appropriately if the PR is not automatically verifiable as "trusted"', async () => {
-        bvGetPrIsTrustedSpy.and.returnValue(Promise.resolve(false));
+        bvGetPrIsTrustedSpy.and.resolveTo(false);
 
         const expectedResponse = {canHavePublicPreview: false, reason: 'Not automatically verifiable as "trusted".'};
         const expectedLog =
@@ -372,7 +370,7 @@ describe('PreviewServerFactory', () => {
 
 
       it('should respond with error if `getSignificantFilesChanged()` fails', async () => {
-        bvGetSignificantFilesChangedSpy.and.callFake(() => Promise.reject('getSignificantFilesChanged error'));
+        bvGetSignificantFilesChangedSpy.and.rejectWith('getSignificantFilesChanged error');
 
         await agent.get(url).expect(500, 'getSignificantFilesChanged error');
         expect(loggerErrorSpy).toHaveBeenCalledWith('Previewability check error', 'getSignificantFilesChanged error');
@@ -380,11 +378,10 @@ describe('PreviewServerFactory', () => {
 
 
       it('should respond with error if `getPrIsTrusted()` fails', async () => {
-        const error = new Error('getPrIsTrusted error');
+        bvGetPrIsTrustedSpy.and.throwError('getPrIsTrusted error');
-        bvGetPrIsTrustedSpy.and.callFake(() => { throw error; });
 
         await agent.get(url).expect(500, 'getPrIsTrusted error');
-        expect(loggerErrorSpy).toHaveBeenCalledWith('Previewability check error', error);
+        expect(loggerErrorSpy).toHaveBeenCalledWith('Previewability check error', new Error('getPrIsTrusted error'));
       });
 
     });
@@ -497,7 +494,7 @@ describe('PreviewServerFactory', () => {
         // Note it is important to put the `reject` into `and.callFake`;
         // If you just `and.returnValue` the rejected promise
         // then you get an "unhandled rejection" message in the console.
-        getGithubInfoSpy.and.callFake(() => Promise.reject('Test Error'));
+        getGithubInfoSpy.and.rejectWith('Test Error');
         await agent.post(URL).send(BASIC_PAYLOAD).expect(500, 'Test Error');
         expect(getGithubInfoSpy).toHaveBeenCalledWith(BUILD_NUM);
         expect(downloadBuildArtifactSpy).not.toHaveBeenCalled();
@@ -518,7 +515,7 @@ describe('PreviewServerFactory', () => {
       });
 
       it('should fail if the artifact fetch request fails', async () => {
-        downloadBuildArtifactSpy.and.callFake(() => Promise.reject('Test Error'));
+        downloadBuildArtifactSpy.and.rejectWith('Test Error');
         await agent.post(URL).send(BASIC_PAYLOAD).expect(500, 'Test Error');
         expect(getGithubInfoSpy).toHaveBeenCalledWith(BUILD_NUM);
         expect(downloadBuildArtifactSpy).toHaveBeenCalled();
@@ -527,7 +524,7 @@ describe('PreviewServerFactory', () => {
       });
 
       it('should fail if verifying the PR fails', async () => {
-        getPrIsTrustedSpy.and.callFake(() => Promise.reject('Test Error'));
+        getPrIsTrustedSpy.and.rejectWith('Test Error');
         await agent.post(URL).send(BASIC_PAYLOAD).expect(500, 'Test Error');
         expect(getGithubInfoSpy).toHaveBeenCalledWith(BUILD_NUM);
         expect(downloadBuildArtifactSpy).toHaveBeenCalled();
@@ -536,7 +533,7 @@ describe('PreviewServerFactory', () => {
       });
 
       it('should fail if creating the preview build fails', async () => {
-        createBuildSpy.and.callFake(() => Promise.reject('Test Error'));
+        createBuildSpy.and.rejectWith('Test Error');
         await agent.post(URL).send(BASIC_PAYLOAD).expect(500, 'Test Error');
         expect(getGithubInfoSpy).toHaveBeenCalledWith(BUILD_NUM);
         expect(downloadBuildArtifactSpy).toHaveBeenCalled();
@@ -605,7 +602,7 @@ describe('PreviewServerFactory', () => {
 
 
       it('should propagate errors from BuildVerifier', async () => {
-        bvGetPrIsTrustedSpy.and.callFake(() => Promise.reject('Test'));
+        bvGetPrIsTrustedSpy.and.rejectWith('Test');
 
         await createRequest(+pr).expect(500, 'Test');
 
@@ -615,7 +612,9 @@ describe('PreviewServerFactory', () => {
 
 
       it('should call \'BuildCreator#updatePrVisibility()\' with the correct arguments', async () => {
-        bvGetPrIsTrustedSpy.and.callFake((pr2: number) => Promise.resolve(pr2 === 42));
+        bvGetPrIsTrustedSpy.
+          withArgs(24).and.resolveTo(false).
+          withArgs(42).and.resolveTo(true);
 
         await createRequest(24);
         expect(bcUpdatePrVisibilitySpy).toHaveBeenCalledWith(24, false);
@@ -626,7 +625,7 @@ describe('PreviewServerFactory', () => {
 
 
       it('should propagate errors from BuildCreator', async () => {
-        bcUpdatePrVisibilitySpy.and.callFake(() => Promise.reject('Test'));
+        bcUpdatePrVisibilitySpy.and.rejectWith('Test');
         await createRequest(+pr).expect(500, 'Test');
       });
 
@@ -634,7 +633,9 @@ describe('PreviewServerFactory', () => {
       describe('on success', () => {
 
         it('should respond with 200 (action: undefined)', async () => {
-          bvGetPrIsTrustedSpy.and.returnValues(Promise.resolve(true), Promise.resolve(false));
+          bvGetPrIsTrustedSpy.
+            withArgs(2).and.resolveTo(false).
+            withArgs(4).and.resolveTo(true);
 
           const reqs = [4, 2].map(num => createRequest(num).expect(200, http.STATUS_CODES[200]));
           await Promise.all(reqs);
@@ -642,7 +643,9 @@ describe('PreviewServerFactory', () => {
 
 
         it('should respond with 200 (action: labeled)', async () => {
-          bvGetPrIsTrustedSpy.and.returnValues(Promise.resolve(true), Promise.resolve(false));
+          bvGetPrIsTrustedSpy.
+            withArgs(2).and.resolveTo(false).
+            withArgs(4).and.resolveTo(true);
 
           const reqs = [4, 2].map(num => createRequest(num, 'labeled').expect(200, http.STATUS_CODES[200]));
           await Promise.all(reqs);
@@ -650,7 +653,9 @@ describe('PreviewServerFactory', () => {
 
 
         it('should respond with 200 (action: unlabeled)', async () => {
-          bvGetPrIsTrustedSpy.and.returnValues(Promise.resolve(true), Promise.resolve(false));
+          bvGetPrIsTrustedSpy.
+            withArgs(2).and.resolveTo(false).
+            withArgs(4).and.resolveTo(true);
 
           const reqs = [4, 2].map(num => createRequest(num, 'unlabeled').expect(200, http.STATUS_CODES[200]));
           await Promise.all(reqs);

aio/aio-builds-setup/dockerbuild/scripts-js/test/preview-server/utils.spec.ts

@@ -39,7 +39,7 @@ describe('preview-server/utils', () => {
         throwRequestError(505, 'ERROR MESSAGE', request);
       } catch (error) {
         caught = true;
-        expect(error).toEqual(jasmine.any(PreviewServerError));
+        expect(error).toBeInstanceOf(PreviewServerError);
         expect(error.status).toEqual(505);
         expect(error.message).toEqual(`ERROR MESSAGE in request: POST some.domain.com/path "The request body"`);
       }

aio/aio-builds-setup/dockerbuild/scripts-sh/health-check.sh

@@ -8,10 +8,32 @@ exitCode=0
 
 
 # Helpers
+function checkCert {
+  local certPath=$1
+
+  if [[ ! -f "$certPath" ]]; then
+    echo "Certificate '$certPath' does not exist. Skipping expiration check..."
+    return
+  fi
+
+  openssl x509 -checkend 0 -in "$certPath" -noout > /dev/null
+  reportStatus "Certificate '$certPath'"
+
+  if [[ $? -ne 0 ]]; then
+    echo "  [WARN]"
+    echo "  If you did not provide the certificate explicitly, try running the"
+    echo "  'docker build' command again with the '--no-cache' option to generate"
+    echo "  a new self-signed certificate."
+  fi
+}
+
 function reportStatus {
   local lastExitCode=$?
+
   echo "$1: $([[ $lastExitCode -eq 0 ]] && echo OK || echo NOT OK)"
   [[ $lastExitCode -eq 0 ]] || exitCode=1
+
+  return $lastExitCode
 }
 
 
@@ -28,6 +50,16 @@ for s in ${services[@]}; do
 done
 
 
+# Check SSL/TLS certificates expiration
+certs=(
+  "$AIO_LOCALCERTS_DIR/$AIO_DOMAIN_NAME.crt"
+  "$TEST_AIO_LOCALCERTS_DIR/$TEST_AIO_DOMAIN_NAME.crt"
+)
+for c in ${certs[@]}; do
+  checkCert $c
+done
+
+
 # Check servers
 origins=(
   http://$AIO_PREVIEW_SERVER_HOSTNAME:$AIO_PREVIEW_SERVER_PORT

aio/aio-builds-setup/docs/vm-setup--attach-persistent-disk.md

@@ -3,7 +3,7 @@
 
 ## Create `aio-builds` persistent disk (if not already exists)
 - Follow instructions [here](https://cloud.google.com/compute/docs/disks/add-persistent-disk#create_disk).
-- `sudo mkfs.ext4 -F -E lazy_itable_init=0,lazy_journal_init=0,discard /dev/disk/by-id/google-aio-builds`
+- `sudo mkfs.ext4 -m 0 -E lazy_itable_init=0,lazy_journal_init=0,discard /dev/disk/by-id/google-aio-builds`
 
 
 ## Mount disk
@@ -14,7 +14,7 @@
 
 ## Mount disk on boot
 - Run:
-  ```
+  ```sh
   echo UUID=`sudo blkid -s UUID -o value /dev/disk/by-id/google-aio-builds` \
-    /mnt/disks/aio-builds ext4 discard,defaults,nofail 0 2 | sudo tee -a /etc/fstab
+    /mnt/disks/aio-builds ext4 defaults,discard,nofail 0 2 | sudo tee -a /etc/fstab
   ```

aio/aio-builds-setup/docs/vm-setup--create-docker-image.md

@@ -1,10 +1,11 @@
 # VM setup - Create docker image
 
 
-## Install node and yarn
+## Install git, Node.js and yarn
-- Install [nvm](https://github.com/creationix/nvm#installation).
+- `sudo apt-get update`
-- Install node.js: `nvm install 8`
+- `sudo apt-get install -y git`
-- Install yarn: `npm -g install yarn`
+- Install the latest stable version of [Node.js](https://nodejs.org/en/download).
+- Install the latest stable version of [yarn](https://classic.yarnpkg.com/en/docs/install).
 
 
 ## Checkout repository
@@ -16,7 +17,11 @@
 - You can overwrite the default environment variables inside the image, by passing new values using
   `--build-arg`.
 
-**Note:** The script has to execute docker commands with `sudo`.
+**Note 1:** The script has to execute docker commands with `sudo`.
+
+**Note 2:**
+The script has to execute `yarn` commands, so make sure `yarn` is on the `PATH` when invoking the
+script.
 
 
 ## Example
@@ -26,7 +31,7 @@ The following commands would create a docker image from GitHub repo `foo/bar` to
 
 - `git clone https://github.com/foo/bar.git foobar`
 - Run:
-  ```
+  ```sh
   ./foobar/aio-builds-setup/scripts/create-image.sh foobar-builds \
     --build-arg AIO_REPO_SLUG=foo/bar \
     --build-arg AIO_DOMAIN_NAME=foobar-builds.io \

aio/aio-builds-setup/docs/vm-setup--set-up-docker.md

@@ -3,24 +3,17 @@
 
 ## Install docker
 
-_Debian (jessie):_
+Official installation instructions: https://docs.docker.com/engine/install
-- `sudo apt-get update`
+Example:
-- `sudo apt-get install -y apt-transport-https ca-certificates curl git software-properties-common`
-- `curl -fsSL https://apt.dockerproject.org/gpg | sudo apt-key add -`
-- `apt-key fingerprint 58118E89F3A912897C070ADBF76221572C52609D`
-- `sudo add-apt-repository "deb https://apt.dockerproject.org/repo/ debian-$(lsb_release -cs) main"`
-- `sudo apt-get update`
-- `sudo apt-get -y install docker-engine`
 
-_Ubuntu (16.04):_
+_Debian (buster):_
 - `sudo apt-get update`
-- `sudo apt-get install -y curl git linux-image-extra-$(uname -r) linux-image-extra-virtual`
+- `sudo apt-get install -y apt-transport-https ca-certificates curl gnupg-agent software-properties-common`
-- `sudo apt-get install -y apt-transport-https ca-certificates`
+- `curl -fsSL https://download.docker.com/linux/debian/gpg | sudo apt-key add -`
-- `curl -fsSL https://yum.dockerproject.org/gpg | sudo apt-key add -`
+- `sudo apt-key fingerprint 0EBFCD88`
-- `apt-key fingerprint 58118E89F3A912897C070ADBF76221572C52609D`
+- `sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/debian $(lsb_release -cs) stable"`
-- `sudo add-apt-repository "deb https://apt.dockerproject.org/repo/ ubuntu-$(lsb_release -cs) main"`
 - `sudo apt-get update`
-- `sudo apt-get -y install docker-engine`
+- `sudo apt-get -y install docker-ce docker-ce-cli containerd.io`
 
 
 ## Start the docker

aio/aio-builds-setup/docs/vm-setup--update-docker-container.md

@@ -8,16 +8,16 @@ VM host to update the preview server based on changes in the source code.
 
 The script will pull the latest changes from the origin's master branch and examine if there have
 been any changes in files inside the preview server source code directory (see below). If there are,
-it will create a new image and verify that is works as expected. Finally, it will stop and remove
+it will create a new image and verify that it works as expected. Finally, it will stop and remove
 the old docker container and image, create a new container based on the new image and start it.
 
 The script assumes that the preview server source code is in the repository's
 `aio/aio-builds-setup/` directory and expects the following inputs:
 
 - **$1**: `HOST_REPO_DIR`
-- **$2**: `HOST_LOCALCERTS_DIR`
+- **$2**: `HOST_SECRETS_DIR`
-- **$3**: `HOST_SECRETS_DIR`
+- **$3**: `HOST_BUILDS_DIR`
-- **$4**: `HOST_BUILDS_DIR`
+- **$4**: `HOST_LOCALCERTS_DIR`
 - **$5**: `HOST_LOGS_DIR`
 
 See [here](vm-setup--create-host-dirs-and-files.md) for more info on what each input directory is
@@ -25,28 +25,38 @@ used for.
 
 **Note 1:** The script has to execute docker commands with `sudo`.
 
-**Note 2:** Make sure the user that executes the script has access to update the repository
+**Note 2:**
+The script has to execute `yarn` commands, so make sure `yarn` is on the `PATH` when invoking the
+script.
+
+**Note 3:** Make sure the user that executes the script has access to update the repository.
 
 
 ## Run the script manually
 You may choose to manually run the script, when necessary. Example:
 
-```
+```sh
 update-preview-server.sh \
     /path/to/repo \
-    /path/to/localcerts \
     /path/to/secrets \
     /path/to/builds \
+    /path/to/localcerts \
     /path/to/logs
 ```
 
 
 ## Run the script automatically
 You may choose to automatically trigger the script, e.g. using a cronjob. For example, the following
-cronjob entry would run the script every hour and update the preview server (assuming the user has
+cronjob entry would run the script every 30 minutes, update the preview server (if necessary) and
-the necessary permissions):
+log its output to `update-preview-server.log` (assuming the user has the necessary permissions):
 
 ```
 # Periodically check for changes and update the preview server (if necessary)
-*/30 *  * * *   /path/to/update-preview-server.sh /path/to/repo /path/to/localcerts /path/to/secrets /path/to/builds /path/to/logs
+*/30 *  * * *   /path/to/update-preview-server.sh /path/to/repo /path/to/secrets /path/to/builds /path/to/localcerts /path/to/logs >> /path/to/update-preview-server.log 2>&1
 ```
+
+**Note:**
+Keep in mind that cron jobs run in non-interactive, non-login shells. This means that the execution
+context might be different compared to when running the same commands from an interactive, login
+shell. For example, `.bashrc` files are normally _not_ sourced automatically in cron jobs. See
+[here](http://www.gnu.org/software/bash/manual/html_node/Bash-Startup-Files.html) for more info.

aio/aio-builds-setup/scripts/update-preview-server.sh

@@ -7,13 +7,14 @@ echo -e "\n\n[`date`] - Updating the preview server..."
 
 # Input
 readonly HOST_REPO_DIR=$1
-readonly HOST_LOCALCERTS_DIR=$2
+readonly HOST_SECRETS_DIR=$2
-readonly HOST_SECRETS_DIR=$3
+readonly HOST_BUILDS_DIR=$3
-readonly HOST_BUILDS_DIR=$4
+readonly HOST_LOCALCERTS_DIR=$4
 readonly HOST_LOGS_DIR=$5
 
 # Constants
-readonly PROVISIONAL_IMAGE_NAME=aio-builds:provisional
+readonly PROVISIONAL_TAG=provisional
+readonly PROVISIONAL_IMAGE_NAME=aio-builds:$PROVISIONAL_TAG
 readonly LATEST_IMAGE_NAME=aio-builds:latest
 readonly CONTAINER_NAME=aio
 
@@ -30,7 +31,7 @@ readonly CONTAINER_NAME=aio
   # Do not update the server unless files inside `aio-builds-setup/` have changed
   # or the last attempt failed (identified by the provisional image still being around).
   readonly relevantChangedFilesCount=$(git diff --name-only $lastDeployedCommit...HEAD | grep -P "^aio/aio-builds-setup/" | wc -l)
-  readonly lastAttemptFailed=$(sudo docker rmi "$PROVISIONAL_IMAGE_NAME" >> /dev/fd/3 && echo "true" || echo "false")
+  readonly lastAttemptFailed=$(sudo docker image ls | grep "$PROVISIONAL_TAG" >> /dev/fd/3 && echo "true" || echo "false")
   if [[ $relevantChangedFilesCount -eq 0 ]] && [[ "$lastAttemptFailed" != "true" ]]; then
     echo "Skipping update because no relevant files have been touched."
     exit 0
@@ -60,9 +61,9 @@ readonly CONTAINER_NAME=aio
       --publish 80:80 \
       --publish 443:443 \
       --restart unless-stopped \
-      --volume $HOST_LOCALCERTS_DIR:/etc/ssl/localcerts:ro \
       --volume $HOST_SECRETS_DIR:/aio-secrets:ro \
       --volume $HOST_BUILDS_DIR:/var/www/aio-builds \
+      --volume $HOST_LOCALCERTS_DIR:/etc/ssl/localcerts:ro \
       --volume $HOST_LOGS_DIR:/var/log/aio \
       "$LATEST_IMAGE_NAME"
 

aio/content/cli/index.md

@@ -109,9 +109,3 @@ Options that specify files can be given as absolute paths, or as paths relative
 The [ng generate](cli/generate) and  [ng add](cli/add) commands take as an argument the artifact or library to be generated or added to the current project.
 In addition to any general options, each artifact or library defines its own options in a *schematic*.
 Schematic options are supplied to the command in the same format as immediate command options.
-
-
-### Building with Bazel
-
-Optionally, you can configure the Angular CLI to use [Bazel](https://docs.bazel.build) as the build tool. For more information, see [Building with Bazel](guide/bazel).
-

aio/content/examples/forms/src/app/app.module.ts

@@ -3,7 +3,7 @@ import { NgModule }      from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { FormsModule }   from '@angular/forms';
 
-import { AppComponent }  from './app.component';
+import { AppComponent }      from './app.component';
 import { HeroFormComponent } from './hero-form/hero-form.component';
 
 @NgModule({

aio/content/examples/forms/src/app/hero-form/hero-form.component.html

@@ -200,13 +200,4 @@
            (ngModelChange)="model.name = $event">
     TODO: remove this: {{model.name}}
   <!-- #enddocregion ngModel-3-->
-  <hr>
-  <!-- #docregion ngModelName-2 -->
-       <input type="text" class="form-control" id="name"
-         required
-         [(ngModel)]="model.name" name="name"
-         #spy>
-       <br>TODO: remove this: {{spy.className}}
-  <!-- #enddocregion ngModelName-2 -->
-
 </div>

aio/content/examples/forms/src/app/hero-form/hero-form.component.ts

@@ -2,7 +2,7 @@
 // #docregion , v1, final
 import { Component } from '@angular/core';
 
-import { Hero }    from '../hero';
+import { Hero } from '../hero';
 
 @Component({
   selector: 'app-hero-form',

aio/content/examples/http/src/app/http-interceptors/caching-interceptor.ts

@@ -13,13 +13,13 @@ import { searchUrl } from '../package-search/package-search.service';
 
 
 /**
- * If request is cachable (e.g., package search) and
+ * If request is cacheable (e.g., package search) and
  * response is in cache return the cached response as observable.
  * If has 'x-refresh' header that is true,
  * then also re-run the package search, using response from next(),
  * returning an observable that emits the cached response first.
  *
- * If not in cache or not cachable,
+ * If not in cache or not cacheable,
  * pass request through to next()
  */
 // #docregion v1
@@ -28,8 +28,8 @@ export class CachingInterceptor implements HttpInterceptor {
   constructor(private cache: RequestCache) {}
 
   intercept(req: HttpRequest<any>, next: HttpHandler) {
-    // continue if not cachable.
+    // continue if not cacheable.
-    if (!isCachable(req)) { return next.handle(req); }
+    if (!isCacheable(req)) { return next.handle(req); }
 
     const cachedResponse = this.cache.get(req);
     // #enddocregion v1
@@ -51,11 +51,11 @@ export class CachingInterceptor implements HttpInterceptor {
 // #enddocregion v1
 
 
-/** Is this request cachable? */
+/** Is this request cacheable? */
-function isCachable(req: HttpRequest<any>) {
+function isCacheable(req: HttpRequest<any>) {
-  // Only GET requests are cachable
+  // Only GET requests are cacheable
   return req.method === 'GET' &&
-    // Only npm package search is cachable in this app
+    // Only npm package search is cacheable in this app
     -1 < req.url.indexOf(searchUrl);
 }
 

aio/content/examples/i18n/stackblitz.json

@@ -0,0 +1,10 @@
+{
+    "description": "i18n",
+    "files":[
+      "!**/*.d.ts",
+      "!**/*.js",
+      "!**/*.[0-9].*"
+    ],
+    "file": "src/app/app.component.ts", 
+    "tags": ["Angular", "i18n", "internationalization"]
+}

aio/content/examples/lifecycle-hooks/src/app/peek-a-boo.component.ts

@@ -3,6 +3,7 @@ import {
   AfterContentInit,
   AfterViewChecked,
   AfterViewInit,
+  Directive,
   DoCheck,
   OnChanges,
   OnDestroy,
@@ -15,7 +16,8 @@ import { LoggerService }    from './logger.service';
 let nextId = 1;
 
 // #docregion ngOnInit
-export class PeekABoo implements OnInit {
+@Directive()
+export class PeekABooDirective implements OnInit {
   constructor(private logger: LoggerService) { }
 
   // implement OnInit's `ngOnInit` method
@@ -34,7 +36,7 @@ export class PeekABoo implements OnInit {
 })
 // Don't HAVE to mention the Lifecycle Hook interfaces
 // unless we want typing and tool support.
-export class PeekABooComponent extends PeekABoo implements
+export class PeekABooComponent extends PeekABooDirective implements
              OnChanges, OnInit, DoCheck,
              AfterContentInit, AfterContentChecked,
              AfterViewInit, AfterViewChecked,

aio/content/examples/ngmodules/src/app/greeting/greeting.module.ts

@@ -23,7 +23,7 @@ export class GreetingModule {
   // #enddocregion ctor
 
   // #docregion for-root
-  static forRoot(config: UserServiceConfig): ModuleWithProviders {
+  static forRoot(config: UserServiceConfig): ModuleWithProviders<GreetingModule> {
     return {
       ngModule: GreetingModule,
       providers: [

aio/content/examples/router-tutorial/e2e/src/app.e2e-spec.ts

@@ -0,0 +1,42 @@
+import { browser, element, by } from 'protractor';
+
+describe('Router basic tutorial e2e tests', () => {
+
+  beforeEach(() => {
+    browser.get('');
+  });
+
+  it('should display Angular Router Sample', () => {
+    expect(element(by.css('h1')).getText()).toBe('Angular Router Sample');
+  });
+
+  it('should display Crisis Center button', () => {
+    expect(element.all(by.css('a')).get(0).getText()).toBe('Crisis Center');
+  });
+
+  it('should display Heroes button', () => {
+    expect(element.all(by.css('a')).get(1).getText()).toBe('Heroes');
+  });
+
+  it('should display HEROES', () => {
+    expect(element(by.css('h3')).getText()).toBe('HEROES');
+  });
+
+  it('should change to display crisis list component', async () => {
+    const crisisButton = element.all(by.css('a')).get(0);
+    await crisisButton.click();
+    expect(element(by.css('h3')).getText()).toBe('CRISIS CENTER');
+  });
+
+  it('should change to display heroes component', async () => {
+    const heroesButton = element.all(by.css('a')).get(1);
+    await heroesButton.click();
+    expect(element(by.css('h3')).getText()).toBe('HEROES');
+  });
+
+  it('should use wildcard route', async () => {
+    browser.get('/fake-page');
+    expect(browser.getCurrentUrl()).toContain('fake-page');
+    expect(element(by.css('h2')).getText()).toBe('Page Not Found');
+  });
+});

aio/content/examples/router-tutorial/src/app/app.component.css

@@ -0,0 +1,34 @@
+.button {
+    box-shadow: inset 0px 1px 0px 0px #ffffff;
+    background: linear-gradient(to bottom, #ffffff 5%, #f6f6f6 100%);
+    background-color: #ffffff;
+    border-radius: 6px;
+    border: 1px solid #dcdcdc;
+    display: inline-block;
+    cursor: pointer;
+    color: #666666;
+    font-family: Arial;
+    font-size: 15px;
+    font-weight: bold;
+    padding: 6px 24px;
+    text-decoration: none;
+    text-shadow: 0px 1px 0px #ffffff;
+    outline: 0;
+}
+.activebutton {
+    box-shadow: inset 0px 1px 0px 0px #dcecfb;
+    background: linear-gradient(to bottom, #bddbfa 5%, #80b5ea 100%);
+    background-color: #bddbfa;
+    border-radius: 6px;
+    border: 1px solid #84bbf3;
+    display: inline-block;
+    cursor: pointer;
+    color: #ffffff;
+    font-family: Arial;
+    font-size: 15px;
+    font-weight: bold;
+    padding: 6px 24px;
+    text-decoration: none;
+    text-shadow: 0px 1px 0px #528ecc;
+    outline: 0;
+}

aio/content/examples/router-tutorial/src/app/app.component.html

@@ -0,0 +1,31 @@
+<!-- #docplaster -->
+<!-- #docregion setup -->
+<h1>Angular Router Sample</h1>
+<!-- #enddocregion setup-->
+<!-- #docregion routeractivelink -->
+<nav>
+  <a class="button" routerLink="/crisis-list" routerLinkActive="activebutton">Crisis Center</a> |
+  <a class="button" routerLink="/heroes-list" routerLinkActive="activebutton">Heroes</a>
+</nav>
+<!-- #enddocregion routeractivelink-->
+<!-- #docregion router-outlet -->
+<router-outlet></router-outlet>
+<!-- #enddocregion router-outlet -->
+
+<div style="display: none;">
+<!-- This HTML represents the initial state for the tutorial. It is not intended to appear in the app. -->
+<!-- #docregion setup, components -->
+<app-crisis-list></app-crisis-list>
+<app-heroes-list></app-heroes-list>
+<!-- #enddocregion setup, components -->
+
+<!-- This HTML snippet is for when the user first adds the routerlink navigation. -->
+<!-- #docregion nav -->
+<nav>
+  <a class="button" routerLink="/crisis-list">Crisis Center</a> |
+  <a class="button" routerLink="/heroes-list">Heroes</a>
+</nav>
+<!-- #enddocregion nav-->
+
+
+</div>

aio/content/examples/router-tutorial/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 = 'angular-router-sample';
+}

aio/content/examples/router-tutorial/src/app/app.module.ts

@@ -0,0 +1,38 @@
+// #docplaster
+import { BrowserModule } from '@angular/platform-browser';
+import { NgModule } from '@angular/core';
+// #docregion router-import
+import { RouterModule } from '@angular/router';
+// #enddocregion router-import
+import { AppComponent } from './app.component';
+import { CrisisListComponent } from './crisis-list/crisis-list.component';
+import { HeroesListComponent } from './heroes-list/heroes-list.component';
+import { PageNotFoundComponent } from './page-not-found/page-not-found.component';
+
+@NgModule({
+  declarations: [
+    AppComponent,
+    CrisisListComponent,
+    HeroesListComponent,
+    PageNotFoundComponent
+  ],
+  // #docplaster
+  // #docregion import-basic, import-redirect, import-wildcard
+  imports: [
+    BrowserModule,
+    RouterModule.forRoot([
+      {path: 'crisis-list', component: CrisisListComponent},
+      {path: 'heroes-list', component: HeroesListComponent},
+  // #enddocregion import-basic
+      {path: '', redirectTo: '/heroes-list', pathMatch: 'full'},
+  // #enddocregion import-redirect
+      {path: '**', component: PageNotFoundComponent}
+  // #enddocregion import-wildcard
+  // #docregion import-basic, import-redirect, import-wildcard
+    ]),
+  ],
+  // #enddocregion import-basic, import-redirect, import-wildcard
+  providers: [],
+  bootstrap: [AppComponent]
+})
+export class AppModule { }

aio/content/examples/router-tutorial/src/app/crisis-list/crisis-list.component.html

@@ -0,0 +1,2 @@
+<h3>CRISIS CENTER</h3>
+<p>Get your crisis here</p>

aio/content/examples/router-tutorial/src/app/crisis-list/crisis-list.component.ts

@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-crisis-list',
+  templateUrl: './crisis-list.component.html',
+  styleUrls: ['./crisis-list.component.css']
+})
+export class CrisisListComponent {
+
+}

aio/content/examples/router-tutorial/src/app/heroes-list/heroes-list.component.html

@@ -0,0 +1,2 @@
+<h3>HEROES</h3>
+<p>Get your heroes here</p>

aio/content/examples/router-tutorial/src/app/heroes-list/heroes-list.component.ts

@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-heroes-list',
+  templateUrl: './heroes-list.component.html',
+  styleUrls: ['./heroes-list.component.css']
+})
+export class HeroesListComponent {
+
+}

aio/content/examples/router-tutorial/src/app/page-not-found/page-not-found.component.html

@@ -0,0 +1,2 @@
+<h2>Page Not Found</h2>
+<p>We couldn't find that page! Not even with x-ray vision.</p>

aio/content/examples/router-tutorial/src/app/page-not-found/page-not-found.component.ts

@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-page-not-found',
+  templateUrl: './page-not-found.component.html',
+  styleUrls: ['./page-not-found.component.css']
+})
+export class PageNotFoundComponent {
+
+}

aio/content/examples/router-tutorial/src/index.html

@@ -0,0 +1,13 @@
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>Angular Router Sample</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>

aio/content/examples/router-tutorial/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));

aio/content/examples/router-tutorial/stackblitz.json

@@ -0,0 +1,9 @@
+{
+  "description": "Router",
+  "files":[
+    "!**/*.d.ts",
+    "!**/*.js",
+    "!**/*.[0-9].*"
+  ],
+  "tags": ["router-tutorial"]
+}

aio/content/examples/router/src/app/auth/auth.guard.2.ts

@@ -1,6 +1,6 @@
 // #docregion
 import { Injectable } from '@angular/core';
-import { CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot, Router } from '@angular/router';
+import { CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot, Router, UrlTree } from '@angular/router';
 
 import { AuthService }      from './auth.service';
 
@@ -12,21 +12,20 @@ export class AuthGuard implements CanActivate {
 
   canActivate(
     next: ActivatedRouteSnapshot,
-    state: RouterStateSnapshot): boolean {
+    state: RouterStateSnapshot): true|UrlTree {
     let url: string = state.url;
 
     return this.checkLogin(url);
   }
 
-  checkLogin(url: string): boolean {
+  checkLogin(url: string): true|UrlTree {
     if (this.authService.isLoggedIn) { return true; }
 
     // Store the attempted URL for redirecting
     this.authService.redirectUrl = url;
 
-    // Navigate to the login page with extras
+    // Redirect to the login page
-    this.router.navigate(['/login']);
+    return this.router.parseUrl('/login');
-    return false;
   }
 }
 // #enddocregion

aio/content/examples/router/src/app/auth/auth.guard.3.ts

@@ -4,7 +4,8 @@ import {
   CanActivate, Router,
   ActivatedRouteSnapshot,
   RouterStateSnapshot,
-  CanActivateChild
+  CanActivateChild,
+  UrlTree
 }                           from '@angular/router';
 import { AuthService }      from './auth.service';
 
@@ -16,7 +17,7 @@ export class AuthGuard implements CanActivate, CanActivateChild {
 
   canActivate(
     route: ActivatedRouteSnapshot,
-    state: RouterStateSnapshot): boolean {
+    state: RouterStateSnapshot): true|UrlTree {
     let url: string = state.url;
 
     return this.checkLogin(url);
@@ -24,20 +25,19 @@ export class AuthGuard implements CanActivate, CanActivateChild {
 
   canActivateChild(
     route: ActivatedRouteSnapshot,
-    state: RouterStateSnapshot): boolean {
+    state: RouterStateSnapshot): true|UrlTree {
     return this.canActivate(route, state);
   }
 
 // #enddocregion can-activate-child
-  checkLogin(url: string): boolean {
+  checkLogin(url: string): true|UrlTree {
     if (this.authService.isLoggedIn) { return true; }
 
     // Store the attempted URL for redirecting
     this.authService.redirectUrl = url;
 
-    // Navigate to the login page
+    // Redirect to the login page
-    this.router.navigate(['/login']);
+    return this.router.parseUrl('/login');
-    return false;
   }
 // #docregion can-activate-child
 }

aio/content/examples/router/src/app/auth/auth.guard.4.ts

@@ -6,7 +6,8 @@ import {
   ActivatedRouteSnapshot,
   RouterStateSnapshot,
   CanActivateChild,
-  NavigationExtras
+  NavigationExtras,
+  UrlTree
 }                           from '@angular/router';
 import { AuthService }      from './auth.service';
 
@@ -16,17 +17,17 @@ import { AuthService }      from './auth.service';
 export class AuthGuard implements CanActivate, CanActivateChild {
   constructor(private authService: AuthService, private router: Router) {}
 
-  canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean {
+  canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): true|UrlTree {
     let url: string = state.url;
 
     return this.checkLogin(url);
   }
 
-  canActivateChild(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean {
+  canActivateChild(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): true|UrlTree {
     return this.canActivate(route, state);
   }
 
-  checkLogin(url: string): boolean {
+  checkLogin(url: string): true|UrlTree {
     if (this.authService.isLoggedIn) { return true; }
 
     // Store the attempted URL for redirecting
@@ -42,8 +43,7 @@ export class AuthGuard implements CanActivate, CanActivateChild {
       fragment: 'anchor'
     };
 
-    // Navigate to the login page with extras
+    // Redirect to the login page with extras
-    this.router.navigate(['/login'], navigationExtras);
+    return this.router.createUrlTree(['/login'], navigationExtras);
-    return false;
   }
 }

aio/content/examples/upgrade-phonecat-2-hybrid/rollup-config.js

@@ -1,7 +1,7 @@
 // #docregion
 import nodeResolve from 'rollup-plugin-node-resolve'
 import commonjs from 'rollup-plugin-commonjs';
-import uglify from 'rollup-plugin-uglify'
+import {terser} from 'rollup-plugin-terser'
 
 //paths are relative to the execution path
 export default {
@@ -17,6 +17,6 @@ export default {
     commonjs({
       include: ['node_modules/rxjs/**']
     }),
-    uglify()
+    terser()
   ]
 }

aio/content/guide/accessibility.md

@@ -23,7 +23,7 @@ to provide semantic meaning where it might otherwise be missing.
 Use [attribute binding](guide/template-syntax#attribute-binding) template syntax to control the values of accessibility-related attributes.
 
 When binding to ARIA attributes in Angular, you must use the `attr.` prefix, as the ARIA
-specification depends specifically on HTML attributes rather than properties on DOM elements.
+specification depends specifically on HTML attributes rather than properties of DOM elements.
 
 ```html
 <!-- Use attr. when binding to an ARIA attribute -->
@@ -44,7 +44,7 @@ NOTE:
 
    By convention, HTML attributes use lowercase names (`tabindex`), while properties use camelCase names (`tabIndex`).
 
-   See the [Template Syntax](https://angular.io/guide/template-syntax#html-attribute-vs-dom-property) guide for more background on the difference between attributes and properties.
+   See the [Template Syntax](guide/template-syntax#html-attribute-vs-dom-property) guide for more background on the difference between attributes and properties.
 
 </div>
 

aio/content/guide/angular-compiler-options.md

@@ -1,6 +1,6 @@
 # Angular compiler options
 
-When you use [AOT compilation](guide/aot-compiler), you can control how your application is compiled by specifying *template* compiler options in the `tsconfig.json` [TypeScript configuration file](guide/typescript-configuration).
+When you use [AOT compilation](guide/aot-compiler), you can control how your application is compiled by specifying *template* compiler options in the [TypeScript configuration file](guide/typescript-configuration).
 
 The template options object, `angularCompilerOptions`, is a sibling to the `compilerOptions` object that supplies standard options to the TypeScript compiler.
 
@@ -21,11 +21,11 @@ The template options object, `angularCompilerOptions`, is a sibling to the `comp
 {@a tsconfig-extends}
 ## Configuration inheritance with extends
 
-Like the TypeScript compiler, The Angular AOT compiler also supports `extends` in the `angularCompilerOptions` section of the TypeScript configuration file, `tsconfig.json`.
+Like the TypeScript compiler, The Angular AOT compiler also supports `extends` in the `angularCompilerOptions` section of the TypeScript configuration file.
 The `extends` property is at the top level, parallel to `compilerOptions` and `angularCompilerOptions`.
 
 A TypeScript configuration can inherit settings from another file using the `extends` property.
-The configuration options from the base file are loaded first, then overridden by those in the inheriting `tsconfig` file.
+The configuration options from the base file are loaded first, then overridden by those in the inheriting configuration file.
 
 For example:
 

aio/content/guide/aot-compiler.md

@@ -8,7 +8,7 @@ This guide explains how to specify metadata and apply available compiler options
 
 <div class="alert is-helpful">
 
-  <a href="https://www.youtube.com/watch?v=kW9cJsvcsGo">Watch compiler author Tobias Bosch explain the Angular compiler</a> at AngularConnect 2016.
+  <a href="https://www.youtube.com/watch?v=anphffaCZrQ">Watch Alex Rickabaugh explain the Angular compiler</a> at AngularConnect 2019.
 
 </div>
 
@@ -43,33 +43,13 @@ Here are some reasons you might want to use AOT.
 
 Angular offers two ways to compile your application:
 
-* **_Just-in-Time_ (JIT)**, which compiles your app in the browser at runtime.
+* **_Just-in-Time_ (JIT)**, which compiles your app in the browser at runtime. This was the default until Angular 8.
-* **_Ahead-of-Time_ (AOT)**, which compiles your app at build time.
+* **_Ahead-of-Time_ (AOT)**, which compiles your app and libraries at build time. This is the default since Angular 9.
 
-JIT compilation is the default when you run the [`ng build`](cli/build) (build only) or [`ng serve`](cli/serve)  (build and serve locally) CLI commands:
+When you run the [`ng build`](cli/build) (build only) or [`ng serve`](cli/serve) (build and serve locally) CLI commands, the type of compilation (JIT or AOT) depends on the value of the `aot` property in your build configuration specified in `angular.json`. By default, `aot` is set to `true` for new CLI apps.
-
-<code-example language="sh" class="code-shell">
-  ng build
-  ng serve
-</code-example>
-
-{@a compile}
-
-For AOT compilation, include the `--aot` option with the `ng build` or `ng serve` command:
-
-<code-example language="sh" class="code-shell">
-  ng build --aot
-  ng serve --aot
-</code-example>
-
-<div class="alert is-helpful">
-
-The `ng build` command with the `--prod` meta-flag (`ng build --prod`) compiles with AOT by default.
 
 See the [CLI command reference](cli) and [Building and serving Angular apps](guide/build) for more information.
 
-</div>
-
 ## How AOT works
 
 The Angular AOT compiler extracts **metadata** to interpret the parts of the application that Angular is supposed to manage.
@@ -125,7 +105,7 @@ For help in understanding and resolving these problems, see [AOT Metadata Errors
 
 ### Configuring AOT compilation
 
-You can provide options in the `tsconfig.json` [TypeScript configuration file](guide/typescript-configuration) that control the compilation process. See [Angular compiler options](guide/angular-compiler-options) for a complete list of available options.
+You can provide options in the [TypeScript configuration file](guide/typescript-configuration) that controls the compilation process. See [Angular compiler options](guide/angular-compiler-options) for a complete list of available options.
 
 ## Phase 1: Code analysis
 
@@ -231,7 +211,7 @@ The compiler later reports the error if it needs that piece of metadata to gener
 
 <div class="alert is-helpful">
 
- If you want `ngc` to report syntax errors immediately rather than produce a `.metadata.json` file with errors, set the `strictMetadataEmit` option in the TypeScript configuration file, `tsconfig.json`.
+ If you want `ngc` to report syntax errors immediately rather than produce a `.metadata.json` file with errors, set the `strictMetadataEmit` option in the TypeScript configuration file.
 
 ```
   "angularCompilerOptions": {
@@ -562,12 +542,13 @@ It does not, however, rewrite the `.d.ts` file, so TypeScript doesn't recognize
 
 
 {@a binding-expression-validation}
+
 ## Phase 3: Template type checking
 
 One of the Angular compiler's most helpful features is the ability to type-check expressions within templates, and catch any errors before they cause crashes at runtime.
 In the template type-checking phase, the Angular template compiler uses the TypeScript compiler to validate the binding expressions in templates.
 
-Enable this phase explicitly by adding the compiler option `"fullTemplateTypeCheck"` in the `"angularCompilerOptions"` of the project's `tsconfig.json`
+Enable this phase explicitly by adding the compiler option `"fullTemplateTypeCheck"` in the `"angularCompilerOptions"` of the project's TypeScript configuration file
 (see [Angular Compiler Options](guide/angular-compiler-options)).
 
 <div class="alert is-helpful">
@@ -579,7 +560,7 @@ As a result, templates that previously compiled under View Engine can fail type
 This stricter type checking is not enabled by default in version 9, but can be enabled by setting the `strictTemplates` configuration option.
 We do expect to make strict type checking the default in the future.
 
-<!-- For more information about type-checking options, and about improvements to template type checking in version 9 and above, see [Template type checking](guide/template-type-checking). -->
+For more information about type-checking options, and about improvements to template type checking in version 9 and above, see [Template type checking](guide/template-typecheck).
 
 </div>
 
@@ -638,16 +619,7 @@ For example, to avoid `Object is possibly 'undefined'` error in the template abo
 
 Using `*ngIf` allows the TypeScript compiler to infer that the `person` used in the binding expression will never be `undefined`.
 
-#### Custom `ngIf` like directives
+For more information about input type narrowing, see [Input setter coercion](guide/template-typecheck#input-setter-coercion) and [Improving template type checking for custom directives](guide/structural-directives#directive-type-checks).
-
-Directives that behave like `*ngIf` can declare that they want the same treatment by including a static member marker that is a signal to the template compiler to treat them like `*ngIf`. This static member for `*ngIf` is:
-
-```typescript
-    public static ngIfUseIfTypeGuard: void;
-```
-
-This declares that the input property `ngIf` of the `NgIf` directive should be treated as a guard to the use of its template, implying that the template will only be instantiated if the `ngIf` input property is true.
-
 
 ### Non-null type assertion operator
 

aio/content/guide/architecture-next-steps.md

@@ -52,7 +52,7 @@ For some platforms and applications, you might also want to use the PWA (Progres
 
 ## Support for the development cycle
 
-The **Development Workflow** section describes the tools and processes you use to compile, test, and  and deploy Angular applications.
+The **Development Workflow** section describes the tools and processes you use to compile, test, and deploy Angular applications.
 
 * [CLI Command Reference](cli): The Angular CLI is a command-line tool that you use to create projects, generate application and library code, and perform a variety of ongoing development tasks such as testing, bundling, and deployment.
 

aio/content/guide/architecture.md

@@ -11,7 +11,7 @@ The basic building blocks are *NgModules*, which provide a compilation context f
 
 * Components use *services*, which provide specific functionality not directly related to views. Service providers can be *injected* into components as *dependencies*, making your code modular, reusable, and efficient.
 
-Both components and services are simply classes, with *decorators* that mark their type and provide metadata that tells Angular how to use them.
+Modules, components and services are classes that use *decorators*. These decorators mark their type and provide metadata that tells Angular how to use them.
 
 * The metadata for a component class associates it with a *template* that defines a view. A template combines ordinary HTML with Angular *directives* and *binding markup* that allow Angular to modify the HTML before rendering it for display.
 

aio/content/guide/bazel.md

@@ -1,122 +0,0 @@
-# Building with Bazel
-
-This guide explains how to build and test Angular apps with Bazel.
-
-
-<div class="alert is-helpful">
-
-This guide assumes you are already familiar with developing and building Angular applications using the [CLI](cli).
-
-It describes features which are part of Angular Labs, and are not considered a stable, supported API.
-
-</div>
-
-## Using Bazel with the Angular CLI
-
-The `@angular/bazel` package provides a builder that allows Angular CLI to use Bazel as the build tool.
-
-To opt-in an existing application, run
-
-```sh
-ng add @angular/bazel
-```
-
-To use Bazel in a new application, first install `@angular/bazel` globally
-
-```sh
-npm install -g @angular/bazel
-```
-
-then create the new application with
-
-```sh
-ng new --collection=@angular/bazel
-```
-
-Now when you use Angular CLI build commands such as `ng build` and `ng serve`,
-Bazel is used behind the scenes.
-Outputs from Bazel appear in the `dist/bin` folder.
-
-> The command-line output includes extra logging from Bazel.
-> We plan to reduce this in the future.
-
-### Removing Bazel
-
-If you need to opt-out from using Bazel, you can restore the backup files:
-
-- `/angular.json.bak` replaces `/angular.json`
-
-## Advanced configuration
-
-<div class="alert is-helpful">
-
-Editing the Bazel configuration may prevent you opting out of Bazel.
-Custom behaviors driven by Bazel won't be available in other Builders.
-
-This section assumes you are familiar with [Bazel](https://docs.bazel.build).
-
-</div>
-
-You can manually adjust the Bazel configuration to:
-
-* customize the build steps
-* parallellize the build for scale and incrementality
-
-Create the initial Bazel configuration files by running the following command:
-
-```sh
-ng build --leaveBazelFilesOnDisk
-```
-
-Now you'll find new files in the Angular workspace:
-
-* `/WORKSPACE` tells Bazel how to download external dependencies.
-* `/BUILD.bazel` and `/src/BUILD.bazel` tell Bazel about your source code.
-
-You can find a full-featured example with custom Bazel configurations at https://github.com/bazelbuild/rules_nodejs/tree/master/examples/angular.
-
-Documentation for using Bazel for frontend projects is linked from https://docs.bazel.build/versions/master/bazel-and-javascript.html.
-
-
-
-## Running Bazel directly
-
-In some cases you'll want to bypass the Angular CLI builder, and run the Bazel CLI directly.
-The Bazel tool is managed by the `@bazel/bazelisk` package (similar to how Node.js can be managed by `nvm`).
-You can install it globally to get the `bazelisk` command in your path, or use `$(npm bin)/bazelisk` in place of bazelisk below.
-
-The common commands in Bazel are:
-
-* `bazelisk build [targets]`: Compile the default output artifacts of the given targets.
-* `bazelisk test [targets]`: For whichever `*_test` targets are found in the patterns, run the tests.
-* `bazelisk run [target]`: Compile the program represented by target, and then run it.
-
-To repeat the command any time the inputs change (watch mode), replace `bazelisk` with `ibazel` in these commands.
-
-The output locations are printed in the output.
-
-Full documentation for the Bazel CLI is at https://docs.bazel.build/versions/master/command-line-reference.html.
-
-
-## Querying the build graph
-
-Because Bazel constructs a graph out of your targets, you can find lots of useful information.
-
-Using the graphviz optional dependency, you'll have a program `dot`, which you can use with `bazel query`:
-
-```bash
-$ bazel query --output=graph ... | dot -Tpng > graph.png
-```
-
-See https://docs.bazel.build/versions/master/query-how-to.html for more details on `bazel query`.
-
-
-## Customizing `BUILD.bazel` files
-
-"Rules" are like plugins for Bazel. Many rule sets are available. This guide documents the ones maintained by the Angular team at Google.
-
-Rules are used in `BUILD.bazel` files, which are markers for the packages in your workspace. Each `BUILD.bazel` file declares a separate package to Bazel, though you can have more coarse-grained distributions so that the packages you publish (for example, to `npm`) can be made up of many Bazel packages.
-
-In the `BUILD.bazel` file, each rule must first be imported, using the `load` statement. Then the rule is called with some attributes, and the result of calling the rule is that you've declared to Bazel how it can derive some outputs given some inputs and dependencies. Then later, when you run a `bazel` command line, Bazel loads all the rules you've declared to determine an absolute ordering of what needs to be run. Note that only the rules needed to produce the requested output will actually be executed.
-
-A list of common rules for frontend development is documented in the README at https://github.com/bazelbuild/rules_nodejs/.

aio/content/guide/browser-support.md

@@ -34,7 +34,7 @@ Angular supports most recent browsers. This includes the following specific vers
     </td>
 
     <td>
-      latest
+      latest and extended support release (ESR)
     </td>
   </tr>
 
@@ -53,16 +53,18 @@ Angular supports most recent browsers. This includes the following specific vers
       IE
     </td>
     <td>
-      11, 10, 9 ("compatibility view" mode not supported)
+      <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
+      IE Mobile*
     </td>
     <td>
       11
+      <div>*deprecated in v10, see the {@link guide/deprecations#ie-9-10-and-mobile deprecations guide}.</div>
     </td>
   </tr>
  <tr>

aio/content/guide/build.md

@@ -262,6 +262,33 @@ Each budget entry is a JSON object with the following properties:
 
  </table>
 
+{@a commonjs }
+## Configuring CommonJS dependencies
+
+<div class="alert is-important">
+
+It is recommended that you avoid depending on CommonJS modules in your Angular applications.
+Depending on CommonJS modules can prevent bundlers and minifiers from optimizing your application, which results in larger bundle sizes.
+Instead, it is recommended that you use [ECMAScript modules](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/import) in your entire application.
+For more information, see [How CommonJS is making your bundles larger](https://web.dev/commonjs-larger-bundles/).
+
+</div>
+
+The Angular CLI outputs warnings if it detects that your browser application depends on CommonJS modules.
+To disable these warnings, you can add the CommonJS module name to `allowedCommonJsDependencies` option in the `build` options located in `angular.json` file.
+
+<code-example lang="json">
+"build": {
+  "builder": "@angular-devkit/build-angular:browser",
+  "options": {
+     "allowedCommonJsDependencies": [
+        "lodash"
+     ]
+     ...
+   }
+   ...
+},
+</code-example>
 
 {@a browser-compat}
 

aio/content/guide/creating-libraries.md

@@ -109,7 +109,9 @@ To learn more, see [Schematics Overview](guide/schematics) and [Schematics for
 
 ## Publishing your library
 
-Use the Angular CLI and the npm package manager to build and publish your library as an npm package. It is not recommended to publish Ivy libraries to NPM repositories. Before publishing a library to NPM, build it using the `--prod` flag which will use the older compiler and runtime known as View Engine instead of Ivy.
+Use the Angular CLI and the npm package manager to build and publish your library as an npm package. 
+
+Before publishing a library to NPM, build it using the `--prod` flag which will use the older compiler and runtime known as View Engine instead of Ivy.
 
 <code-example language="bash">
 ng build my-lib --prod
@@ -119,6 +121,14 @@ npm publish
 
 If you've never published a package in npm before, you must create a user account. Read more in [Publishing npm Packages](https://docs.npmjs.com/getting-started/publishing-npm-packages).
 
+<div class="alert is-important">
+
+For now, it is not recommended to publish Ivy libraries to NPM because Ivy generated code is not backward compatible with View Engine, so apps using View Engine will not be able to consume them. Furthermore, the internal Ivy instructions are not yet stable, which can potentially break consumers using a different Angular version from the one used to build the library.
+
+When a published library is used in an Ivy app, the Angular CLI will automatically convert it to Ivy using a tool known as the Angular compatibility compiler (`ngcc`). Thus, by publishing your libraries using the View Engine compiler ensures that they can be transparently consumed by both View Engine and Ivy apps.
+
+</div>
+
 {@a lib-assets}
 
 ## Managing assets in a library

aio/content/guide/deployment.md

@@ -55,7 +55,7 @@ This method is for development and testing only, and is not a supported or secur
 
 ### Automatic deployment with the CLI
 
-The Angular CLI command `ng deploy` (introduced in version 8.3.0) executes the `deploy` [CLI builder](https://angular.io/guide/cli-builder) associated with your project. A number of third-party builders implement deployment capabilities to different platforms. You can add any of them to your project by running `ng add [package name]`.
+The Angular CLI command `ng deploy` (introduced in version 8.3.0) executes the `deploy` [CLI builder](guide/cli-builder) associated with your project. A number of third-party builders implement deployment capabilities to different platforms. You can add any of them to your project by running `ng add [package name]`.
 
 When you add a package with deployment capability, it'll automatically update your workspace configuration (`angular.json` file) with a `deploy` section for the selected project. You can then use the `ng deploy` command to deploy that project.
 
@@ -304,7 +304,7 @@ In addition to build optimizations, Angular also has a runtime production mode.
 
 <code-example format="nocode">
 
-  Angular is running in the development mode. Call enableProdMode() to enable the production mode.
+  Angular is running in development mode. Call enableProdMode() to enable production mode.
 
 </code-example>
 
@@ -469,7 +469,7 @@ The following configurations determine your requirements.
 
 * TypeScript configuration
 
-   In the TypeScript configuration file, `tsconfig.json`, the "target" option in the `compilerOptions` section determines the ECMAScript target version that the code is compiled to.
+   In the TypeScript configuration file, the "target" option in the `compilerOptions` section determines the ECMAScript target version that the code is compiled to.
    Modern browsers support ES2015 natively, while ES5 is more commonly used to support legacy browsers.
 
 <div class="alert is-helpful">

aio/content/guide/deprecations.md

@@ -35,24 +35,24 @@ v9 - v12
 
 | Area                          | API or Feature                                                                | May be removed in |
 | ----------------------------- | ---------------------------------------------------------------------------   | ----------------- |
-| `@angular/common`             | [`ReflectiveInjector`](#reflectiveinjector)                                   | <!--v8--> v10 |
+| `@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--> v10 |
+| `@angular/core`               | [`CollectionChangeRecord`](#core)                                             | <!--v7--> v11 |
-| `@angular/core`               | [`DefaultIterableDiffer`](#core)                                              | <!--v7--> v10 |
+| `@angular/core`               | [`DefaultIterableDiffer`](#core)                                              | <!--v7--> v11 |
-| `@angular/core`               | [`ReflectiveKey`](#core)                                                      | <!--v8--> v10 |
+| `@angular/core`               | [`ReflectiveKey`](#core)                                                      | <!--v8--> v11 |
-| `@angular/core`               | [`RenderComponentType`](#core)                                                | <!--v7--> v10 |
+| `@angular/core`               | [`RenderComponentType`](#core)                                                | <!--v7--> v11 |
-| `@angular/core`               | [`ViewEncapsulation.Native`](#core)                                           | <!--v6--> v10 |
+| `@angular/core`               | [`ViewEncapsulation.Native`](#core)                                           | <!--v6--> v11 |
-| `@angular/core`               | [`ModuleWithProviders` without a generic](#moduleWithProviders)               | <!--v9--> v10 |
+| `@angular/core`               | [`WrappedValue`](#core)                                                       | <!--v10--> v12 |
-| `@angular/core`               | [Undecorated base classes that use Angular features](#undecorated-base-classes) | <!--v9--> v10 |
+| `@angular/forms`              | [`ngModel` with reactive forms](#ngmodel-reactive)                            | <!--v6--> v11 |
-| `@angular/forms`              | [`ngModel` with reactive forms](#ngmodel-reactive)                            | <!--v6--> v10 |
+| `@angular/router`             | [`preserveQueryParams`](#router)                                              | <!--v7--> v11 |
-| `@angular/router`             | [`preserveQueryParams`](#router)                                              | <!--v7--> v10 |
+| `@angular/upgrade`            | [`@angular/upgrade`](#upgrade)                                                | <!--v8--> v11 |
-| `@angular/upgrade`            | [`@angular/upgrade`](#upgrade)                                                | <!--v8--> v10 |
+| `@angular/upgrade`            | [`getAngularLib`](#upgrade-static)                                            | <!--v8--> v11 |
-| `@angular/upgrade`            | [`getAngularLib`](#upgrade-static)                                            | <!--v8--> v10 |
+| `@angular/upgrade`            | [`setAngularLib`](#upgrade-static)                                            | <!--v8--> v11 |
-| `@angular/upgrade`            | [`setAngularLib`](#upgrade-static)                                            | <!--v8--> v10 |
+| `@angular/platform-webworker` | [All entry points](api/platform-webworker)                                    | <!--v8--> v11 |
-| `@angular/platform-webworker` | [All entry points](api/platform-webworker)                                    | <!--v8--> v10 |
+| template syntax               | [`<template`>](#template-tag)                                                 | <!--v7--> v11 |
-| template syntax               | [`<template`>](#template-tag)                                                 | <!--v7--> v10 |
+| polyfills                     | [reflect-metadata](#reflect-metadata)                                         | <!--v8--> v11 |
-| polyfills                     | [reflect-metadata](#reflect-metadata)                                         | <!--v8--> v10 |
+| npm package format            | [`esm5` and `fesm5` entry-points in @angular/* npm packages](guide/deprecations#esm5-fesm5) | <!-- v9 --> v11 |
-| npm package format            | [`esm5` and `fesm5` entry-points in @angular/* npm packages](guide/deprecations#esm5-fesm5) | <!-- v9 --> v10 |
 | `@angular/core`               | [`defineInjectable`](#core)                                                   | <!--v8--> v11 |
 | `@angular/core`               | [`entryComponents`](api/core/NgModule#entryComponents)                        | <!--v9--> v11 |
 | `@angular/core`               | [`ANALYZE_FOR_ENTRY_COMPONENTS`](api/core/ANALYZE_FOR_ENTRY_COMPONENTS)       | <!--v9--> v11 |
@@ -60,6 +60,7 @@ v9 - v12
 | `@angular/core/testing`       | [`TestBed.get`](#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 |
 
 
 
@@ -96,9 +97,7 @@ Tip: In the [API reference section](api) of this doc site, deprecated APIs are i
 | [`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) |
-| `ModuleWithProviders` without a generic |  `ModuleWithProviders` with a generic             | v9 | See [`ModuleWithProviders` section](#moduleWithProviders) |
+| [`WrappedValue`](api/core/WrappedValue) | none | v10 | See [removing `WrappedValue`](#wrapped-value) |
-| Undecorated base classes that use Angular features | Base classes with `@Directive()` decorator that use Angular features | v9 | See [undecorated base classes section](#undecorated-base-classes) |
-
 
 
 
@@ -162,7 +161,11 @@ Tip: In the [API reference section](api) of this doc site, deprecated APIs are i
 
 This section lists all of the currently-deprecated features, which includes template syntax, configuration options, and any other deprecations not listed in the [Deprecated APIs](#deprecated-apis) section above. It also includes deprecated API usage scenarios or API combinations, to augment the information above.
 
+{@a bazelbuilder}
+### Bazel builder and schematics
 
+Bazel builder and schematics were introduced in Angular Labs to let users try out Bazel without having to manage Bazel version and BUILD files.
+This feature has been deprecated. For more information, please refer to the [migration doc](https://github.com/angular/angular/blob/master/packages/bazel/src/schematics/README.md).
 
 {@a wtf}
 ### Web Tracing Framework integration
@@ -376,60 +379,6 @@ However, in practice, Angular simply ignores two-way bindings to template variab
 <option *ngFor="let optionName of options" [value]="optionName"></option>
 ```
 
-{@a undecorated-base-classes}
-### Undecorated base classes using Angular features
-
-As of version 9, it's deprecated to have an undecorated base class that:
-
-- uses Angular features
-- is extended by a directive or component
-
-Angular lifecycle hooks or any of the following Angular field decorators are considered Angular features:
-
-- `@Input()`
-- `@Output()`
-- `@HostBinding()`
-- `@HostListener()`
-- `@ViewChild()` / `@ViewChildren()`
-- `@ContentChild()` / `@ContentChildren()`
-
-For example, the following case is deprecated because the base class uses `@Input()` and does not have a class-level decorator:
-
-```ts
-class Base {
-  @Input()
-  foo: string;
-}
-
-@Directive(...)
-class Dir extends Base {
-  ngOnChanges(): void {
-    // notified when bindings to [foo] are updated
-  }
-}
-```
-
-In a future version of Angular, this code will start to throw an error.
-To fix this example, add a selectorless `@Directive()` decorator to the base class:
-
-```ts
-@Directive()
-class Base {
-  @Input()
-  foo: string;
-}
-
-@Directive(...)
-class Dir extends Base {
-  ngOnChanges(): void {
-    // notified when bindings to [foo] are updated
-  }
-}
-```
-
-In version 9, the CLI has an automated migration that will update your code for you when `ng update` is run.
-See [the dedicated migration guide](guide/migration-undecorated-classes) for more information about the change and more examples.
-
 
 
 {@a binding-to-innertext}
@@ -514,13 +463,104 @@ 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` 
+
+The purpose of `WrappedValue` is to allow the same object instance to be treated as different for the purposes of change detection.
+It is commonly used with the `async` pipe in the case where the `Observable` produces the same instance of the value.
+
+Given that this use case is relatively rare and special handling impacts application performance, we have deprecated it in v10.
+No replacement is planned for this deprecation.
+
+If you rely on the behavior that the same object instance should cause change detection, you have two options:
+- Clone the resulting value so that it has a new identity.
+- Explicitly call [`ChangeDetectorRef.detectChanges()`](api/core/ChangeDetectorRef#detectchanges) to force the update. 
+
+{@a deprecated-cli-flags}
+## Deprecated CLI APIs and Options
+
+This section contains a complete list all of the currently deprecated CLI flags.
+
+### @angular-devkit/build-angular
+
+| API/Option                      | May be removed in | Notes                                                                           |
+| ------------------------------- | ----------------- |-------------------------------------------------------------------------------- |
+| `i18nFile`                      | <!--v9--> v11     | Specified in the project locale configuration in version 9 and later.           |
+| `i18nFormat`                    | <!--v9--> v11     | Format is now automatically detected.                                           |
+| `i18nLocale`                    | <!--v9--> v11     | New [localization option](/guide/i18n#localize-config) in version 9 and later.  |
+| `lazyModules`                   | <!--v9--> v11     | Used with deprecated SystemJsNgModuleLoader.                                    |
+| `rebaseRootRelativeCssUrls`     | <!--v8--> v11     | Intended only to assist with specific migration issues.                         |
+| `scripts[].lazy`                | <!--v8--> v11     | Renamed to `scripts[].inject`.                                                  |
+| `styles[].lazy`                 | <!--v8--> v11     | Renamed to `styles[].inject`.                                                   |
+| `i18nFormat`                    | <!--v9--> v11     | Renamed to `format` to simplify the user experience.                            |
+| `i18nLocale`                    | <!--v9--> v11     | Redundant with project’s source locale.                                         |
+| `scripts[].lazy`                | <!--v8--> v11     | Renamed to `scripts[].inject`.                                                  |
+| `styles[].lazy`                 | <!--v8--> v11     | Renamed to `styles[].inject`.                                                   |
+| `i18nFile`                      | <!--v9--> v11     | Specified in the project locale configuration in version 9 and later.           |
+| `i18nFormat`                    | <!--v9--> v11     | Format is now automatically detected.                                           |
+| `i18nLocale`                    | <!--v9--> v11     | New [localization option](/guide/i18n#localize-config) in version 9 and later.  |
+| `lazyModules`                   | <!--v9--> v11     | Used with deprecated SystemJsNgModuleLoader.                                    |
+
+### @angular-devkit/core
+
+| API/Option                      | May be removed in | Notes                                                                           |
+| ------------------------------- | ----------------- |-------------------------------------------------------------------------------- |
+| `ModuleNotFoundException`       | <!--v8--> v10     | Not used within projects. Used with Tooling API only. Not Yarn PnP compatible and not used in the Angular CLI. Use Node.js [require.resolve](https://nodejs.org/api/modules.html#modules_require_resolve_request_options).|
+| `resolve`                       | <!--v8--> v10     | Not used within projects. Used with Tooling API only. Not Yarn PnP compatible and not used in the Angular CLI. Use Node.js [require.resolve](https://nodejs.org/api/modules.html#modules_require_resolve_request_options).|
+| `setResolveHook`                | <!--v8--> v10     | Not used within projects. Used with Tooling API only. Not Yarn PnP compatible and not used in the Angular CLI. Use Node.js [require.resolve](https://nodejs.org/api/modules.html#modules_require_resolve_request_options).|
+| `ResolveOptions`                | <!--v8--> v10     | Not used within projects. Used with Tooling API only. Not Yarn PnP compatible and not used in the Angular CLI. Use Node.js [require.resolve](https://nodejs.org/api/modules.html#modules_require_resolve_request_options).|
+| `terminal`                      | <!--v8--> v10     | Unused implementation of terminal codes (color).                                |
+| `isObservable`                  | <!--v8--> v10     | Not used within projects. Used with Tooling API only. Use `isObservable` function from the `rxjs` package.|
+
+### @ngtools/webpack
+
+| API/Option                      | May be removed in | Notes                                                                           |
+| ------------------------------- | ----------------- |-------------------------------------------------------------------------------- |
+| `discoverLazyRoutes`            | <!--v9--> TBD     | Used with deprecated SystemJsNgModuleLoader.                                    |
+| `additionalLazyModules`         | <!--v9--> TBD     | Used with deprecated SystemJsNgModuleLoader.                                    |
+| `additionalLazyModuleResources` | <!--v9--> TBD     | Used with deprecated SystemJsNgModuleLoader.                                    |
+
+### @schematics/angular
+
+| API/Option                      | May be removed in | Notes                                                                           |
+| ------------------------------- | ----------------- |-------------------------------------------------------------------------------- |
+| `entryComponent`                | <!--v9--> TBD     | No longer needed with Ivy.                                                      |
+
+{@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 |
+| `@angular/core`  | Style Sanitization | no action needed | See [style sanitization API removal](#style-sanitization) 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 esm5-fesm5}
 ### `esm5` and `fesm5` code formats in @angular/* npm packages
 
 As of Angular v8, the CLI primarily consumes the `fesm2015` variant of the code distributed via `@angular/*` npm packages.
 This renders the `esm5` and `fesm5` distributions obsolete and unnecessary, adding bloat to the package size and slowing down npm installations.
 
-The future removal of this distribution will have no impact on CLI users, unless they modified their build configuration to explicitly consume these code distributions.
+This removal has no impact on CLI users, unless they modified their build configuration to explicitly consume these code distributions.
 
 Any application still relying on the `esm5` and `fesm5` as the input to its build system will need to ensure that the build pipeline is capable of accepting JavaScript code conforming to ECMAScript 2015 (ES2015) language specification.
 
@@ -528,7 +568,7 @@ Note that this change doesn't make existing libraries distributed in this format
 The CLI will fall back and consume libraries in less desirable formats if others are not available.
 However, we do recommend that libraries ship their code in ES2015 format in order to make builds faster and build output smaller.
 
-In practical terms, the `package.json` of all `@angular` packages will change in the following way:
+In practical terms, the `package.json` of all `@angular` packages has changed in the following way:
 
 **Before**:
 ```
@@ -562,92 +602,18 @@ In practical terms, the `package.json` of all `@angular` packages will change 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 9.0.0*:
+The following APIs have been removed starting with version 10.0.0*:
 
 | Package          | API            | Replacement | Notes |
 | ---------------- | -------------- | ----------- | ----- |
-| `@angular/core`  | [`Renderer`](https://v8.angular.io/api/core/Renderer) | [`Renderer2`](https://angular.io/api/core/Renderer2) | [Migration guide](guide/migration-renderer) |
+| `@angular/core`  | Undecorated base classes that use Angular features | Add Angular decorator | See [migration guide](guide/migration-undecorated-classes) for more info |
-| `@angular/core`  | [`RootRenderer`](https://v8.angular.io/api/core/RootRenderer) | [`RendererFactory2`](https://angular.io/api/core/RendererFactory2) | none |
+| `@angular/core`  | `ModuleWithProviders` without a generic             | `ModuleWithProviders` with a generic | See [migration guide](guide/migration-module-with-providers) for more info |
-| `@angular/core`  | [`RenderComponentType`](https://v8.angular.io/api/core/RenderComponentType) | [`RendererType2`](https://angular.io/api/core/RendererType2) | none |
-| `@angular/core`  | [`WtfScopeFn`](https://v8.angular.io/api/core/WtfScopeFn) | none | v8 | See [Web Tracing Framework](#wtf) |
-| `@angular/core`  | [`wtfCreateScope`](https://v8.angular.io/api/core/wtfCreateScope) | none | v8 | See [Web Tracing Framework](#wtf) |
-| `@angular/core`  | [`wtfStartTimeRange`](https://v8.angular.io/api/core/wtfStartTimeRange) | none | v8 | See [Web Tracing Framework](#wtf) |
-| `@angular/core`  | [`wtfEndTimeRange`](https://v8.angular.io/api/core/wtfEndTimeRange) | none | v8 | See [Web Tracing Framework](#wtf) |
-| `@angular/core`  | [`wtfLeave`](https://v8.angular.io/api/core/wtfLeave) | none | v8 | See [Web Tracing Framework](#wtf) |
-| `@angular/common` | `DeprecatedI18NPipesModule` | [`CommonModule`](api/common/CommonModule#pipes) | none |
-| `@angular/common` | `DeprecatedCurrencyPipe` | [`CurrencyPipe`](api/common/CurrencyPipe) | none |
-| `@angular/common` | `DeprecatedDatePipe`     | [`DatePipe`](api/common/DatePipe) | none |
-| `@angular/common` | `DeprecatedDecimalPipe` | [`DecimalPipe`](api/common/DecimalPipe) | none |
-| `@angular/common` | `DeprecatedPercentPipe` | [`PercentPipe`](api/common/PercentPipe) | none |
-| `@angular/forms` | [`NgFormSelectorWarning`](https://v8.angular.io/api/forms/NgFormSelectorWarning) | none | none |
-| `@angular/forms` | `ngForm` element selector | `ng-form` element selector | none |
-| `@angular/service-worker` | `versionedFiles` | `files` | In the service worker configuration file `ngsw-config.json`, replace `versionedFiles` with `files`. See [Service Worker Configuration](guide/service-worker-config#assetgroups). |
 
-*To see APIs removed in version 8, check out this guide on the [version 8 docs site](https://v8.angular.io/guide/deprecations#removed).
+*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}
-<!-- The following anchor is used by redirects from the removed API pages. Do not change or remove. -->
+### Style Sanitization for `[style]` and `[style.prop]` bindings
-{@a http}
+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.
-### @angular/http
-
-<!--
-Deprecation announced in version 5
-https://blog.angular.io/version-5-0-0-of-angular-now-available-37e414935ced)
--->
-
-
-The entire [`@angular/http`](http://v7.angular.io/api/http) package has been removed. Use [`@angular/common/http`](api/common/http) instead.
-
-The new API is a smaller, easier, and more powerful way to make HTTP requests in Angular.
-The new API simplifies the default ergonomics: There is no need to map by invoking the `.json()` method.
-It also supports typed return values and interceptors.
-
-To update your apps:
-* Replace `HttpModule` with [`HttpClientModule`](api/common/http/HttpClientModule) (from [`@angular/common/http`](api/common/http)) in each of your modules.
-* Replace the `Http` service with the [`HttpClient`](api/common/http/HttpClient) service.
-* Remove any `map(res => res.json())` calls. They are no longer needed.
-
-For more information about using `@angular/common/http`, see the [HttpClient guide](guide/http "HTTP Client guide").
-
-
-| `@angular/http` | Closest replacement in `@angular/common/http` |
-| ------------- | ------------------------------------------- |
-| `BaseRequestOptions` |  [`HttpRequest`](/api/common/http/HttpRequest) |
-| `BaseResponseOptions` | [`HttpResponse`](/api/common/http/HttpResponse) |
-| `BrowserXhr` |  |
-| `Connection` | [`HttpBackend`](/api/common/http/HttpBackend) |
-| `ConnectionBackend` | [`HttpBackend`](/api/common/http/HttpBackend) |
-| `CookieXSRFStrategy` | [`HttpClientXsrfModule`](/api/common/http/HttpClientXsrfModule) |
-| `Headers` | [`HttpHeaders`](/api/common/http/HttpHeaders) |
-| `Http` | [`HttpClient`](/api/common/http/HttpClient) |
-| `HttpModule` | [`HttpClientModule`](/api/common/http/HttpClientModule) |
-| `Jsonp` | [`HttpClient`](/api/common/http/HttpClient) |
-| `JSONPBackend` | [`JsonpClientBackend`](/api/common/http/JsonpClientBackend) |
-| `JSONPConnection` | [`JsonpClientBackend`](/api/common/http/JsonpClientBackend) |
-| `JsonpModule` | [`HttpClientJsonpModule`](/api/common/http/HttpClientJsonpModule) |
-| `QueryEncoder` | [`HttpUrlEncodingCodec`](/api/common/http/HttpUrlEncodingCodec) |
-| `ReadyState` | [`HttpBackend`](/api/common/http/HttpBackend) |
-| `Request` | [`HttpRequest`](/api/common/http/HttpRequest) |
-| `RequestMethod` | [`HttpClient`](/api/common/http/HttpClient) |
-| `RequestOptions` | [`HttpRequest`](/api/common/http/HttpRequest) |
-| `RequestOptionsArgs` | [`HttpRequest`](/api/common/http/HttpRequest) |
-| `Response` | [`HttpResponse`](/api/common/http/HttpResponse) |
-| `ResponseContentType` | [`HttpClient`](/api/common/http/HttpClient) |
-| `ResponseOptions` | [`HttpResponse`](/api/common/http/HttpResponse) |
-| `ResponseOptionsArgs` | [`HttpResponse`](/api/common/http/HttpResponse) |
-| `ResponseType` | [`HttpClient`](/api/common/http/HttpClient) |
-| `URLSearchParams` | [`HttpParams`](/api/common/http/HttpParams) |
-| `XHRBackend` | [`HttpXhrBackend`](/api/common/http/HttpXhrBackend) |
-| `XHRConnection` | [`HttpXhrBackend`](/api/common/http/HttpXhrBackend) |
-| `XSRFStrategy` | [`HttpClientXsrfModule`](/api/common/http/HttpClientXsrfModule) |
-
-
-| `@angular/http/testing` | Closest replacement in `@angular/common/http/testing` |
-| --------------------- | ------------------------------------------- |
-| `MockBackend` | [`HttpTestingController`](/api/common/http/testing/HttpTestingController) |
-| `MockConnection` | [`HttpTestingController`](/api/common/http/testing/HttpTestingController) |

aio/content/guide/docs-style-guide.md

@@ -931,7 +931,7 @@ If you do, be sure to set the `id` attribute - not the `name` attribute! The doc
 
 </div>
 
-## Alerts and Calllouts
+## Alerts and Callouts
 
 Alerts and callouts present warnings, extra detail or references to other pages. They can also be used to provide commentary that _enriches_ the reader's understanding of the content being presented.
 

aio/content/guide/dynamic-form.md

@@ -1,42 +1,53 @@
-# Dynamic forms
+# Building dynamic forms
 
-{@a top}
+Many forms, such as questionaires, can be very similar to one another in format and intent.
+To make it faster and easier to generate different versions of such a form,
+you can create a *dynamic form template* based on metadata that describes the business object model.
+You can then use the template to generate new forms automatically, according to changes in the data model.
 
-Building handcrafted forms can be costly and time-consuming,
+The technique is particularly useful when you have a type of form whose content must
-especially if you need a great number of them, they're similar to each other, and they change frequently
+change frequently to meet rapidly changing business and regulatory requirements.
-to meet rapidly changing business and regulatory requirements.
+A typical use case is a questionaire. You might need to get input from users in different contexts.
+The format and style of the forms a user sees should remain constant, while the actual questions you need to ask vary with the context.
 
-It may be more economical to create the forms dynamically, based on
+In this tutorial you will build a dynamic form that presents a basic questionaire.
-metadata that describes the business object model.
+You will build an online application for heroes seeking employment.
+The agency is constantly tinkering with the application process, but by using the dynamic form
+you can create the new forms on the fly without changing the application code.
 
-This cookbook shows you how to use `formGroup` to dynamically
+The tutorial walks you through the following steps.
-render a simple form with different control types and validation.
-It's a primitive start.
-It might evolve to support a much richer variety of questions, more graceful rendering, and superior user experience.
-All such greatness has humble beginnings.
 
-The example in this cookbook is a dynamic form to build an
+1. Enable reactive forms for a project.
-online application experience for heroes seeking employment.
+2. Establish a data model to represent form controls.
-The agency is constantly tinkering with the application process.
+3. Populate the model with sample data.
-You can create the forms on the fly *without changing the application code*.
+4. Develop a component to create form controls dynamically.
-{@a toc}
+
+The form you create uses input validation and styling to improve the user experience.
+It has a Submit button that is only enabled when all user input is valid, and flags invalid input with color coding and error messages.
+
+The basic version can evolve to support a richer variety of questions, more graceful rendering, and superior user experience.
+
+<div class="alert is-helpful">
 
 See the <live-example name="dynamic-form"></live-example>.
 
-{@a bootstrap}
+</div>
 
-## Bootstrap
+## Prerequisites
 
-Start by creating an `NgModule` called `AppModule`.
+Before doing this tutorial, you should have a basic understanding to the following.
 
-This cookbook uses [reactive forms](guide/reactive-forms).
+* [TypeScript](https://www.typescriptlang.org/docs/home.html "The TypeScript language") and HTML5 programming.
 
-Reactive forms belongs to a different `NgModule` called `ReactiveFormsModule`,
+* Fundamental concepts of [Angular app design](guide/architecture "Introduction to Angular app-design concepts").
-so in order to access any reactive forms directives, you have to import
-`ReactiveFormsModule` from the `@angular/forms` library.
 
-Bootstrap the `AppModule` in `main.ts`.
+* Basic knowledge of [reactive forms](guide/reactive-forms "Reactive forms guide").
 
+## Enable reactive forms for your project
+
+Dynamic forms are based on reactive forms. To give the application access reactive forms directives, the [root module](guide/bootstrapping "Learn about bootstrapping an app from the root module.") imports `ReactiveFormsModule` from the `@angular/forms` library.
+
+The following code from the example shows the setup in the root module.
 
 <code-tabs>
 
@@ -50,79 +61,56 @@ Bootstrap the `AppModule` in `main.ts`.
 
 </code-tabs>
 
-
 {@a object-model}
 
-## Question model
+## Create a form object model
 
-The next step is to define an object model that can describe all scenarios needed by the form functionality.
+A dynamic form requires an object model that can describe all scenarios needed by the form functionality.
-The hero application process involves a form with a lot of questions.
+The example hero-application form is a set of questions&mdash;that is, each control in the form must ask a question and accept an answer.
-The _question_ is the most fundamental object in the model.
 
-The following `QuestionBase` is a fundamental question class.
+The data model for this type of form must represent a question.
+The example includes the `DynamicFormQuestionComponent`, which defines a  question as the fundamental object in the model.
 
+The following `QuestionBase` is a base class for a set of controls that can represent the question and its answer in the form.
 
 <code-example path="dynamic-form/src/app/question-base.ts" header="src/app/question-base.ts">
 
 </code-example>
 
+### Define control classes
 
+From this base, the example derives two new classes, `TextboxQuestion` and `DropdownQuestion`,
+that represent different control types.
+When you create the form template in the next step, you will instantiate these specific question types in order to render the appropriate controls dynamically.
 
-From this base you can derive two new classes in `TextboxQuestion` and `DropdownQuestion`
+* The `TextboxQuestion` control type presents a question and allows users to enter input.
-that represent textbox and dropdown questions.
-The idea is that the form will be bound to specific question types and render the
-appropriate controls dynamically.
 
-`TextboxQuestion` supports multiple HTML5 types such as text, email, and url
+   <code-example path="dynamic-form/src/app/question-textbox.ts" header="src/app/question-textbox.ts"></code-example>
-via the `type` property.
 
+   The `TextboxQuestion` control type will be represented in a form template using an `<input>` element.
+   The `type` attribute of the element will be defined based on the `type` field specified in the `options` argument (for example `text`, `email`, `url`).
 
-<code-example path="dynamic-form/src/app/question-textbox.ts" header="src/app/question-textbox.ts"></code-example>
+* The `DropdownQuestion` control presents a list of choices in a select box.
 
+   <code-example path="dynamic-form/src/app/question-dropdown.ts" header="src/app/question-dropdown.ts"></code-example>
 
+### Compose form groups
 
-`DropdownQuestion` presents a list of choices in a select box.
+A dynamic form uses a service to create grouped sets of input controls, based on the form model.
-
+The following `QuestionControlService` collects a set of `FormGroup` instances that consume the metadata from the question model. You can specify default values and validation rules.
-
-<code-example path="dynamic-form/src/app/question-dropdown.ts" header="src/app/question-dropdown.ts"></code-example>
-
-
-
-Next is `QuestionControlService`, a simple service for transforming the questions to a `FormGroup`.
-In a nutshell, the form group consumes the metadata from the question model and
-allows you to specify default values and validation rules.
-
 
 <code-example path="dynamic-form/src/app/question-control.service.ts" header="src/app/question-control.service.ts"></code-example>
 
 {@a form-component}
 
-## Question form components
+## Compose dynamic form contents
-Now that you have defined the complete model you are ready
-to create components to represent the dynamic form.
 
+The dynamic form itself will be represented by a container component, which you will add in a later step.
+Each question is represented in the form component's template by an `<app-question>` tag, which matches an instance of `DynamicFormQuestionComponent`.
 
-`DynamicFormComponent` is the entry point and the main container for the form.
+The `DynamicFormQuestionComponent` is responsible for rendering the details of an individual question based on values in the data-bound question object.
-
+The form relies on a [`[formGroup]` directive](api/forms/FormGroupDirective "API reference") to connect the template HTML to the underlying control objects.
-<code-tabs>
+The `DynamicFormQuestionComponent` creates form groups and populates them with controls defined in the question model, specifying display and validation rules.
-
-  <code-pane header="dynamic-form.component.html" path="dynamic-form/src/app/dynamic-form.component.html">
-
-  </code-pane>
-
-  <code-pane header="dynamic-form.component.ts" path="dynamic-form/src/app/dynamic-form.component.ts">
-
-  </code-pane>
-
-</code-tabs>
-
-
-
-It presents a list of questions, each bound to a `<app-question>` component element.
-The `<app-question>` tag matches the `DynamicFormQuestionComponent`,
-the component responsible for rendering the details of each _individual_
-question based on values in the data-bound question object.
-
 
 <code-tabs>
 
@@ -136,70 +124,88 @@ question based on values in the data-bound question object.
 
 </code-tabs>
 
-
+The goal of the `DynamicFormQuestionComponent` is to present question types defined in your model.
-
-Notice this component can present any type of question in your model.
 You only have two types of questions at this point but you can imagine many more.
-The `ngSwitch` determines which type of question to display.
+The `ngSwitch` statement in the template determines which type of question to display.
+The switch uses directives with the [`formControlName`](api/forms/FormControlName "FormControlName directive API reference") and [`formGroup`](api/forms/FormGroupDirective "FormGroupDirective API reference") selectors. Both directives are defined in `ReactiveFormsModule`.
 
-In both components you're relying on Angular's **formGroup** to connect the template HTML to the
-underlying control objects, populated from the question model with display and validation rules.
-
-`formControlName` and `formGroup` are directives defined in
-`ReactiveFormsModule`. The templates can access these directives
-directly since you imported `ReactiveFormsModule` from `AppModule`.
 {@a questionnaire-data}
 
-## Questionnaire data
+### Supply data
 
-`DynamicFormComponent` expects the list of questions in the form of an array bound to `@Input() questions`.
+Another service is needed to supply a specific set of questions from which to build an individual form.
+For this exercise you will create the `QuestionService` to supply this array of questions from the hard-coded sample data.
+In a real-world app, the service might fetch data from a backend system.
+The key point, however, is that you control the hero job-application questions entirely through the objects returned from `QuestionService`.
+To maintain the questionnaire as requirements change, you only need to add, update, and remove objects from the `questions` array.
 
- The set of questions you've defined for the job application is returned from the `QuestionService`.
- In a real app you'd retrieve these questions from storage.
-
- The key point is that you control the hero job application questions
- entirely through the objects returned from `QuestionService`.
- Questionnaire maintenance is a simple matter of adding, updating,
- and removing objects from the `questions` array.
 
+The `QuestionService` supplies a set of questions in the form of an array bound to `@Input()` questions.
 
 <code-example path="dynamic-form/src/app/question.service.ts" header="src/app/question.service.ts">
 
 </code-example>
 
 
+{@a dynamic-template}
 
-Finally, display an instance of the form in the `AppComponent` shell.
+## Create a dynamic form template
 
+The `DynamicFormComponent` component is the entry point and the main container for the form, which is represented using the `<app-dynamic-form>` in a template.
+
+The `DynamicFormComponent` component presents a list of questions by binding each one to an `<app-question>` element that matches the `DynamicFormQuestionComponent`.
+
+<code-tabs>
+
+  <code-pane header="dynamic-form.component.html" path="dynamic-form/src/app/dynamic-form.component.html">
+
+  </code-pane>
+
+  <code-pane header="dynamic-form.component.ts" path="dynamic-form/src/app/dynamic-form.component.ts">
+
+  </code-pane>
+
+</code-tabs>
+
+### Display the form
+
+To display an instance of the dynamic form, the `AppComponent` shell template passes the `questions` array returned by the `QuestionService` to the form container component, `<app-dynamic-form>`.
 
 <code-example path="dynamic-form/src/app/app.component.ts" header="app.component.ts">
 
 </code-example>
 
-{@a dynamic-template}
+The example provides a model for a job application for heroes, but there are
-
+no references to any specific hero question other than the objects returned by `QuestionService`.
-## Dynamic Template
+This separation of model and data allows you to repurpose the components for any type of survey
-Although in this example you're modelling a job application for heroes, there are
-no references to any specific hero question
-outside the objects returned by `QuestionService`.
-
-This is very important since it allows you to repurpose the components for any type of survey
 as long as it's compatible with the *question* object model.
-The key is the dynamic data binding of metadata used to render the form
+
+### Ensuring valid data
+
+The form template uses dynamic data binding of metadata to render the form
 without making any hardcoded assumptions about specific questions.
-In addition to control metadata, you are also adding validation dynamically.
+It adds both control metadata and validation criteria dynamically.
 
-The *Save* button is disabled until the form is in a valid state.
+To ensure valid input, the *Save* button is disabled until the form is in a valid state.
 When the form is valid, you can click *Save* and the app renders the current form values as JSON.
-This proves that any user input is bound back to the data model.
-Saving and retrieving the data is an exercise for another time.
 
-
+The following figure shows the final form.
-The final form looks like this:
 
 <div class="lightbox">
   <img src="generated/images/guide/dynamic-form/dynamic-form.png" alt="Dynamic-Form">
 </div>
 
+## Next steps
 
-[Back to top](guide/dynamic-form#top)
+* **Different types of forms and control collection**
+
+   This tutorial shows how to build a a questionaire, which is just one kind of dynamic form.
+   The example uses `FormGroup` to collect a set of controls.
+   For an example of a different type of dynamic form, see the section [Creating dynamic forms](guide/reactive-forms#creating-dynamic-forms "Create dynamic forms with arrays") in the Reactive Forms guide.
+   That example also shows how to use `FormArray` instead of `FormGroup` to collect a set of controls.
+
+* **Validating user input**
+
+   The section [Validating form input](guide/reactive-forms#validating-form-input "Basic input validation") introduces the basics of how input validation works in reactive forms.
+
+   The [Form validation guide](guide/form-validation "Form validation guide") covers the topic in more depth.

aio/content/guide/elements.md

@@ -117,7 +117,7 @@ The recently-developed [custom elements](https://developer.mozilla.org/en-US/doc
 </tr>
 </table>
 
-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 `tsconfig.json`. 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.
+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 --name=*your_project_name*`.
 - For more information about polyfills, see [polyfill documentation](https://www.webcomponents.org/polyfills).

aio/content/guide/file-structure.md

@@ -40,7 +40,8 @@ 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`         | Default [TypeScript](https://www.typescriptlang.org/) configuration for projects in the workspace. |
+| `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.|
 | `tslint.json`           | Default [TSLint](https://palantir.github.io/tslint/) configuration for projects in the workspace. |
 
 
@@ -72,11 +73,17 @@ Files at the top level of `src/` support testing and running your application. S
 | `environments/`        | Contains build configuration options for particular target environments. By default there is an unnamed standard development environment and a production ("prod") environment. You can define additional target environment configurations. |
 | `favicon.ico`          | An icon to use for this application in the bookmark bar. |
 | `index.html`           | The main HTML page that is served when someone visits your site. The CLI automatically adds all JavaScript and CSS files when building your app, so you typically don't need to add any `<script>` or` <link>` tags here manually. |
-| `main.ts`              | The main entry point for your application. Compiles the application with the [JIT compiler](https://angular.io/guide/glossary#jit) and bootstraps the application's root module (AppModule) to run in the browser. You can also use the [AOT compiler](https://angular.io/guide/aot-compiler) without changing any code by appending the `--aot` flag to the CLI `build` and `serve` commands. |
+| `main.ts`              | The main entry point for your application. Compiles the application with the [JIT compiler](guide/glossary#jit) and bootstraps the application's root module (AppModule) to run in the browser. You can also use the [AOT compiler](guide/aot-compiler) without changing any code by appending the `--aot` flag to the CLI `build` and `serve` commands. |
 | `polyfills.ts`         | Provides polyfill scripts for browser support. |
 | `styles.sass`          | Lists CSS files that supply styles for a project. The extension reflects the style preprocessor you have configured for the project. |
 | `test.ts`              | The main entry point for your unit tests, with some Angular-specific configuration. You don't typically need to edit this file. |
 
+<div class="alert is-helpful">
+
+If you create an application using Angular's strict mode, you will also have an additional `package.json` file in the `src/app` directory. For more information, see [Strict mode](/guide/strict-mode).
+
+</div>
+
 {@a app-src}
 
 Inside the `src/` folder, the `app/` folder contains your project's logic and data.
@@ -89,13 +96,14 @@ 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.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.base.json`, and project-specific [TSLint](https://palantir.github.io/tslint/) configuration files inherit from the workspace-wide `tslint.json`.
 
 | APPLICATION-SPECIFIC CONFIG FILES    | PURPOSE |
 | :--------------------- | :------------------------------------------|
@@ -165,7 +173,7 @@ my-workspace/
 
 ## Library project files
 
-When you generate a library using the CLI (with a command such as `ng generate library my-lib`), the generated files go into the projects/ folder of the workspace. For more information about creating your own libraries, see  [Creating Libraries](https://angular.io/guide/creating-libraries).
+When you generate a library using the CLI (with a command such as `ng generate library my-lib`), the generated files go into the projects/ folder of the workspace. For more information about creating your own libraries, see  [Creating Libraries](guide/creating-libraries).
 
 Libraries (unlike applications and their associated e2e projects) have their own `package.json` configuration files.
 

aio/content/guide/form-validation.md

@@ -1,132 +1,131 @@
-# Form validation
+# Validating form input
 
-Improve overall data quality by validating user input for accuracy and completeness.
+You can improve overall data quality by validating user input for accuracy and completeness.
+This page shows how to validate user input from the UI and display useful validation messages,
+in both reactive and template-driven forms.
 
-This page shows how to validate user input in the UI and display useful validation messages
+**Prerequisites**
-using both reactive and template-driven forms. It assumes some basic knowledge of the two
+
-forms modules.
+Before reading about form validation, you should have a basic understanding of the following.
+
+* [TypeScript](https://www.typescriptlang.org/docs/home.html "The TypeScript language") and HTML5  programming.
+
+* Fundamental concepts of [Angular app design](guide/architecture "Introduction to Angular app-design concepts").
+
+* The [two types of forms that Angular supports](guide/forms-overview "Introduction to Angular forms").
+
+* Basics of either [Template-driven Forms](guide/forms "Template-driven forms guide") or [Reactive Forms](guide/reactive-forms "Reactive forms guide").
 
 <div class="alert is-helpful">
 
-  For the sample app that this page describes, see the <live-example></live-example>.
+Get the complete example code for the reactive and template-driven forms used here to illustrate form validation.
+Run the <live-example></live-example>.
 
 </div>
 
-<div class="alert is-helpful">
+{@a template-driven-validation}
 
-If you're new to forms, start by reviewing the [Forms](guide/forms) and
+##  Validating input in template-driven forms
-[Reactive Forms](guide/reactive-forms) guides.
-
-</div>
-
-
-## Template-driven validation
 
 To add validation to a template-driven form, you add the same validation attributes as you
 would with [native HTML form validation](https://developer.mozilla.org/en-US/docs/Web/Guide/HTML/HTML5/Constraint_validation).
 Angular uses directives to match these attributes with validator functions in the framework.
 
 Every time the value of a form control changes, Angular runs validation and generates
-either a list of validation errors, which results in an INVALID status, or null, which results in a VALID status.
+either a list of validation errors that results in an INVALID status, or null, which results in a VALID status.
 
 You can then inspect the control's state by exporting `ngModel` to a local template variable.
 The following example exports `NgModel` into a variable called `name`:
 
 <code-example path="form-validation/src/app/template/hero-form-template.component.html" region="name-with-error-msg" header="template/hero-form-template.component.html (name)"></code-example>
 
-
+Notice the following features illustrated by the example.
-Note the following:
 
 * The `<input>` element carries the HTML validation attributes: `required` and `minlength`. It
 also carries a custom validator directive, `forbiddenName`. For more
-information, see [Custom validators](guide/form-validation#custom-validators) section.
+information, see the [Custom validators](#custom-validators) section.
 
 * `#name="ngModel"` exports `NgModel` into a local variable called `name`. `NgModel` mirrors many of the properties of its underlying
 `FormControl` instance, so you can use this in the template to check for control states such as `valid` and `dirty`. For a full list of control properties, see the [AbstractControl](api/forms/AbstractControl)
 API reference.
 
-* The `*ngIf` on the `<div>` element reveals a set of nested message `divs`
+   * The `*ngIf` on the `<div>` element reveals a set of nested message `divs`
 but only if the `name` is invalid and the control is either `dirty` or `touched`.
 
-* Each nested `<div>` can present a custom message for one of the possible validation errors.
+   * Each nested `<div>` can present a custom message for one of the possible validation errors.
 There are messages for `required`, `minlength`, and `forbiddenName`.
 
+{@a dirty-or-touched}
 
 <div class="alert is-helpful">
 
+To prevent the validator from displaying errors before the user has a chance to edit the form, you should check for either the `dirty` or `touched` states in a control.
 
-
+* When the user changes the value in the watched field, the control is marked as "dirty".
-#### Why check _dirty_ and _touched_?
+* When the user blurs the form control element, the control is marked as "touched".
-
-You may not want your application to display errors before the user has a chance to edit the form.
-The checks for `dirty` and `touched` prevent errors from showing until the user
-does one of two things: changes the value,
-turning the control dirty; or blurs the form control element, setting the control to touched.
 
 </div>
 
-## Reactive form validation
+{@a reactive-form-validation}
 
-In a reactive form, the source of truth is the component class. Instead of adding validators through attributes in the template, you add validator functions directly to the form control model in the component class. Angular then calls these functions whenever the value of the control changes.
+## Validating input in reactive forms
+
+In a reactive form, the source of truth is the component class.
+Instead of adding validators through attributes in the template, you add validator functions directly to the form control model in the component class.
+Angular then calls these functions whenever the value of the control changes.
 
 ### Validator functions
 
-There are two types of validator functions: sync validators and async validators.
+Validator functions can be either synchronous or asynchronous.
 
-* **Sync validators**: functions that take a control instance and immediately return either a set of validation errors or `null`. You can pass these in as the second argument when you instantiate a `FormControl`.
+* **Sync validators**: Synchronous functions that take a control instance and immediately return either a set of validation errors or `null`. You can pass these in as the second argument when you instantiate a `FormControl`.
 
-* **Async validators**: functions that take a control instance and return a Promise
+* **Async validators**: Asynchronous functions that take a control instance and return a Promise
 or Observable that later emits a set of validation errors or `null`. You can
 pass these in as the third argument when you instantiate a `FormControl`.
 
-Note: for performance reasons, Angular only runs async validators if all sync validators pass. Each must complete before errors are set.
+For performance reasons, Angular only runs async validators if all sync validators pass. Each must complete before errors are set.
 
-### Built-in validators
+### Built-in validator functions
 
-You can choose to [write your own validator functions](guide/form-validation#custom-validators), or you can use some of
+You can choose to [write your own validator functions](#custom-validators), or you can use some of Angular's built-in validators.
-Angular's built-in validators.
 
-The same built-in validators that are available as attributes in template-driven forms, such as `required` and `minlength`, are all available to use as functions from the `Validators` class. For a full list of built-in validators, see the [Validators](api/forms/Validators) API reference.
+The same built-in validators that are available as attributes in template-driven forms, such as `required` and `minlength`, are all available to use as functions from the `Validators` class.
+For a full list of built-in validators, see the [Validators](api/forms/Validators) API reference.
 
 To update the hero form to be a reactive form, you can use some of the same
-built-in validators&mdash;this time, in function form. See below:
+built-in validators&mdash;this time, in function form, as in the following example.
 
 {@a reactive-component-class}
 
 <code-example path="form-validation/src/app/reactive/hero-form-reactive.component.1.ts" region="form-group" header="reactive/hero-form-reactive.component.ts (validator functions)"></code-example>
 
-Note that:
+In this example, the `name` control sets up two built-in validators&mdash;`Validators.required` and `Validators.minLength(4)`&mdash;and one custom validator, `forbiddenNameValidator`. (For more details see [custom validators](#custom-validators) below.)
 
-* The name control sets up two built-in validators&mdash;`Validators.required` and `Validators.minLength(4)`&mdash;and one custom validator, `forbiddenNameValidator`. For more details see the [Custom validators](guide/form-validation#custom-validators) section in this guide.
+All of these validators are synchronous, so they are passed as the second argument. Notice that you can support multiple validators by passing the functions in as an array.
-* As these validators are all sync validators, you pass them in as the second argument.
-* Support multiple validators by passing the functions in as an array.
-* This example adds a few getter methods. In a reactive form, you can always access any form control through the `get` method on its parent group, but sometimes it's useful to define getters as shorthands
-for the template.
 
+This example also adds a few getter methods. In a reactive form, you can always access any form control through the `get` method on its parent group, but sometimes it's useful to define getters as shorthand for the template.
 
-If you look at the template for the name input again, it is fairly similar to the template-driven example.
+If you look at the template for the `name` input again, it is fairly similar to the template-driven example.
 
 <code-example path="form-validation/src/app/reactive/hero-form-reactive.component.html" region="name-with-error-msg" header="reactive/hero-form-reactive.component.html (name with error msg)"></code-example>
 
-Key takeaways:
+This form differs from the template-driven version in that it no longer exports any directives. Instead, it uses the `name` getter defined in  the component class.
 
- * The form no longer exports any directives, and instead uses the `name` getter defined in
+Notice that the `required` attribute is still present in the template. Although it's not necessary for validation, it should be retained to for accessibility purposes.
- the component class.
- * The `required` attribute is still present. While it's not necessary for validation purposes,
- you may want to keep it in your template for CSS styling or accessibility reasons.
 
+{@a custom-validators}
 
-## Custom validators
+## Defining custom validators
 
-Since the built-in validators won't always match the exact use case of your application, sometimes you'll want to create a custom validator.
+The built-in validators don't always match the exact use case of your application, so you sometimes need to create a custom validator.
 
-Consider the `forbiddenNameValidator` function from previous
+Consider the `forbiddenNameValidator` function from previous [reactive-form examples](#reactive-component-class).
-[examples](guide/form-validation#reactive-component-class) in
+Here's what the definition of that function looks like.
-this guide. Here's what the definition of that function looks like:
 
 <code-example path="form-validation/src/app/shared/forbidden-name.directive.ts" region="custom-validator" header="shared/forbidden-name.directive.ts (forbiddenNameValidator)"></code-example>
 
-The function is actually a factory that takes a regular expression to detect a _specific_ forbidden name and returns a validator function.
+The function is a factory that takes a regular expression to detect a _specific_ forbidden name and returns a validator function.
 
 In this sample, the forbidden name is "bob", so the validator will reject any hero name containing "bob".
 Elsewhere it could reject "alice" or any name that the configuring regular expression matches.
@@ -137,55 +136,57 @@ null if the control value is valid _or_ a validation error object.
 The validation error object typically has a property whose name is the validation key, `'forbiddenName'`,
 and whose value is an arbitrary dictionary of values that you could insert into an error message, `{name}`.
 
-Custom async validators are similar to sync validators, but they must instead return a Promise or Observable
+Custom async validators are similar to sync validators, but they must instead return a Promise or observable that later emits null or a validation error object.
-that later emits null or a validation error object. In the case of an Observable, the Observable must complete,
+In the case of an observable, the observable must complete, at which point the form uses the last value emitted for validation.
-at which point the form uses the last value emitted for validation.
 
-### Adding to reactive forms
+{@a adding-to-reactive-forms}
 
-In reactive forms, custom validators are fairly simple to add. All you have to do is pass the function directly
+### Adding custom validators to reactive forms
-to the `FormControl`.
+
+In reactive forms, add a custom validator by passing the function directly to the `FormControl`.
 
 <code-example path="form-validation/src/app/reactive/hero-form-reactive.component.1.ts" region="custom-validator" header="reactive/hero-form-reactive.component.ts (validator functions)"></code-example>
 
-### Adding to template-driven forms
+{@a adding-to-template-driven-forms}
 
-In template-driven forms, you don't have direct access to the `FormControl` instance, so you can't pass the
+### Adding custom validators to template-driven forms
-validator in like you can for reactive forms. Instead, you need to add a directive to the template.
 
-The corresponding `ForbiddenValidatorDirective` serves as a wrapper around the `forbiddenNameValidator`.
+In template-driven forms, add a directive to the template, where the directive wraps the validator function.
+For example, the corresponding `ForbiddenValidatorDirective` serves as a wrapper around the `forbiddenNameValidator`.
 
-Angular recognizes the directive's role in the validation process because the directive registers itself
+Angular recognizes the directive's role in the validation process because the directive registers itself with the `NG_VALIDATORS` provider, as shown in the following example.
-with the `NG_VALIDATORS` provider, a provider with an extensible collection of validators.
+`NG_VALIDATORS` is a predefined provider with an extensible collection of validators.
 
 <code-example path="form-validation/src/app/shared/forbidden-name.directive.ts" region="directive-providers" header="shared/forbidden-name.directive.ts (providers)"></code-example>
 
 The directive class then implements the `Validator` interface, so that it can easily integrate
-with Angular forms. Here is the rest of the directive to help you get an idea of how it all
+with Angular forms.
-comes together:
+Here is the rest of the directive to help you get an idea of how it all
+comes together.
 
 <code-example path="form-validation/src/app/shared/forbidden-name.directive.ts" region="directive" header="shared/forbidden-name.directive.ts (directive)">
 </code-example>
 
-Once the `ForbiddenValidatorDirective` is ready, you can simply add its selector, `appForbiddenName`, to any input element to activate it. For example:
+Once the `ForbiddenValidatorDirective` is ready, you can add its selector, `appForbiddenName`, to any input element to activate it.
+For example:
 
 <code-example path="form-validation/src/app/template/hero-form-template.component.html" region="name-input" header="template/hero-form-template.component.html (forbidden-name-input)"></code-example>
 
 
 <div class="alert is-helpful">
 
-You may have noticed that the custom validation directive is instantiated with `useExisting`
+Notice that the custom validation directive is instantiated with `useExisting` rather than `useClass`. The registered validator must be _this instance_ of
-rather than `useClass`. The registered validator must be _this instance_ of
 the `ForbiddenValidatorDirective`&mdash;the instance in the form with
-its `forbiddenName` property bound to “bob". If you were to replace
+its `forbiddenName` property bound to “bob".
-`useExisting` with `useClass`, then you’d be registering a new class instance, one that
+
-doesn’t have a `forbiddenName`.
+If you were to replace `useExisting` with `useClass`, then you’d be registering a new class instance, one that doesn’t have a `forbiddenName`.
 
 </div>
 
 ## Control status CSS classes
 
-Like in AngularJS, Angular automatically mirrors many control properties onto the form control element as CSS classes. You can use these classes to style form control elements according to the state of the form. The following classes are currently supported:
+Angular automatically mirrors many control properties onto the form control element as CSS classes. You can use these classes to style form control elements according to the state of the form.
+The following classes are currently supported.
 
 * `.ng-valid`
 * `.ng-invalid`
@@ -195,25 +196,27 @@ Like in AngularJS, Angular automatically mirrors many control properties onto th
 * `.ng-untouched`
 * `.ng-touched`
 
-The hero form uses the `.ng-valid` and `.ng-invalid` classes to
+In the following example, the hero form uses the `.ng-valid` and `.ng-invalid` classes to
 set the color of each form control's border.
 
 <code-example path="form-validation/src/assets/forms.css" header="forms.css (status classes)">
 
 </code-example>
 
-## Cross field validation
+## Cross-field validation
-This section shows how to perform cross field validation. It assumes some basic knowledge of creating custom validators.
 
-<div class="alert is-helpful">
+A cross-field validator is a [custom validator](#custom-validators "Read about custom validators") that compares the values of different fields in a form and accepts or rejects them in combination.
+For example, you might have a form that offers mutually incompatible options, so that if the user can choose A or B, but not both.
+Some field values might also depend on others; a user might be allowed to choose B only if A is also chosen.
 
-If you haven't created custom validators before, start by reviewing the [custom validators section](guide/form-validation#custom-validators).
+The following cross validation examples show how to do the following:
 
-</div>
+* Validate reactive or template-based form input based on the values of two sibling controls,
+* Show a descriptive error message after the user interacted with the form and the validation failed.
 
-In the following section, we will make sure that our heroes do not reveal their true identities by filling out the Hero Form. We will do that by validating that the hero names and alter egos do not match.
+The examples use cross-validation to ensure that heroes do not reveal their true identities by filling out the Hero Form. The validators do this by checking that the hero names and alter egos do not match.
 
-### Adding to reactive forms
+### Adding cross-validation to reactive forms
 
 The form has the following structure:
 
@@ -225,7 +228,9 @@ const heroForm = new FormGroup({
 });
 ```
 
-Notice that the name and alterEgo are sibling controls. To evaluate both controls in a single custom validator, we should perform the validation in a common ancestor control: the `FormGroup`. That way, we can query the `FormGroup` for the child controls which will allow us to compare their values.
+Notice that the `name` and `alterEgo` are sibling controls.
+To evaluate both controls in a single custom validator, you must perform the validation in a common ancestor control: the `FormGroup`.
+You query the `FormGroup` for its child controls so that you can compare their values.
 
 To add a validator to the `FormGroup`, pass the new validator in as the second argument on creation.
 
@@ -237,74 +242,73 @@ const heroForm = new FormGroup({
 }, { validators: identityRevealedValidator });
 ```
 
-The validator code is as follows:
+The validator code is as follows.
 
 <code-example path="form-validation/src/app/shared/identity-revealed.directive.ts" region="cross-validation-validator" header="shared/identity-revealed.directive.ts"></code-example>
 
-The identity validator implements the `ValidatorFn` interface. It takes an Angular control object as an argument and returns either null if the form is valid, or `ValidationErrors` otherwise.
+The `identity` validator implements the `ValidatorFn` interface. It takes an Angular control object as an argument and returns either null if the form is valid, or `ValidationErrors` otherwise.
 
-First we retrieve the child controls by calling the `FormGroup`'s [get](api/forms/AbstractControl#get) method. Then we simply compare the values of the `name` and `alterEgo` controls.
+The validator retrieves the child controls by calling the `FormGroup`'s [get](api/forms/AbstractControl#get) method, then compares the values of the `name` and `alterEgo` controls.
 
-If the values do not match, the hero's identity remains secret, and we can safely return null. Otherwise, the hero's identity is revealed and we must mark the form as invalid by returning an error object.
+If the values do not match, the hero's identity remains secret, both are valid, and the validator returns null.
+If they do match, the hero's identity is revealed and the validator must mark the form as invalid by returning an error object.
+
+To provide better user experience, the template shows an appropriate error message when the form is invalid.
 
-Next, to provide better user experience, we show an appropriate error message when the form is invalid.
 <code-example path="form-validation/src/app/reactive/hero-form-reactive.component.html" region="cross-validation-error-message" header="reactive/hero-form-template.component.html"></code-example>
 
-Note that we check if:
+This `*ngIf` displays the error if the `FormGroup` has the cross validation error returned by the `identityRevealed` validator, but only if the user has finished [interacting with the form](#dirty-or-touched).
-- the `FormGroup` has the cross validation error returned by the `identityRevealed` validator,
-- the user is yet to [interact](guide/form-validation#why-check-dirty-and-touched) with the form.
 
-### Adding to template driven forms
+### Adding cross-validation to template-driven forms
-First we must create a directive that will wrap the validator function. We provide it as the validator using the `NG_VALIDATORS` token. If you are not sure why, or you do not fully understand the syntax, revisit the previous [section](guide/form-validation#adding-to-template-driven-forms).
+
+For a template-driven form, you must create a directive to wrap the validator function.
+You provide that directive as the validator using the [`NG_VALIDATORS` token](#adding-to-template-driven-forms "Read about providing validators"), as shown in the following example.
 
 <code-example path="form-validation/src/app/shared/identity-revealed.directive.ts" region="cross-validation-directive" header="shared/identity-revealed.directive.ts"></code-example>
 
-Next, we have to add the directive to the html template. Since the validator must be registered at the highest level in the form, we put the directive on the `form` tag.
+You must add the new directive to the HTML template.
+Because the validator must be registered at the highest level in the form, the following template puts the directive on the `form` tag.
+
 <code-example path="form-validation/src/app/template/hero-form-template.component.html" region="cross-validation-register-validator" header="template/hero-form-template.component.html"></code-example>
 
 To provide better user experience, we show an appropriate error message when the form is invalid.
+
 <code-example path="form-validation/src/app/template/hero-form-template.component.html" region="cross-validation-error-message" header="template/hero-form-template.component.html"></code-example>
 
-Note that we check if:
+This is the same in both template-driven and reactive forms.
-- the form has the cross validation error returned by the `identityRevealed` validator,
-- the user is yet to [interact](guide/form-validation#why-check-dirty-and-touched) with the form.
 
-This completes the cross validation example. We managed to:
+## Creating asynchronous validators
-- validate the form based on the values of two sibling controls,
-- show a descriptive error message after the user interacted with the form and the validation failed.
 
-## Async Validation
+Asynchronous validators implement the `AsyncValidatorFn` and `AsyncValidator` interfaces.
-This section shows how to create asynchronous validators. It assumes some basic knowledge of creating [custom validators](guide/form-validation#custom-validators).
+These are very similar to their synchronous counterparts, with the following differences.
 
-### The Basics
+* The `validate()` functions must return a Promise or an observable,
-Just like synchronous validators have the `ValidatorFn` and `Validator` interfaces, asynchronous validators have their own counterparts: `AsyncValidatorFn` and `AsyncValidator`.
+* The observable returned must be finite, meaning it must complete at some point.
+To convert an infinite observable into a finite one, pipe the observable through a filtering operator such as `first`, `last`, `take`, or `takeUntil`.
 
-They are very similar with the only difference being:
+Asynchronous validation happens after the synchronous validation, and is performed only if the synchronous validation is successful.
+This check allows forms to avoid potentially expensive async validation processes (such as an HTTP request) if the more basic validation methods have already found invalid input.
 
-* They must return a Promise or an Observable,
+After asynchronous validation begins, the form control enters a `pending` state. You can inspect the control's `pending` property and use it to give visual feedback about the ongoing validation operation.
-* The observable returned must be finite, meaning it must complete at some point. To convert an infinite observable into a finite one, pipe the observable through a filtering operator such as `first`, `last`, `take`, or `takeUntil`.
 
-It is important to note that the asynchronous validation happens after the synchronous validation, and is performed only if the synchronous validation is successful. This check allows forms to avoid potentially expensive async validation processes such as an HTTP request if more basic validation methods fail.
+A common UI pattern is to show a spinner while the async validation is being performed. The following example shows how to achieve this in a template-driven form.
-
-After asynchronous validation begins, the form control enters a `pending` state. You can inspect the control's `pending` property and use it to give visual feedback about the ongoing validation.
-
-A common UI pattern is to show a spinner while the async validation is being performed. The following example presents how to achieve this with template-driven forms:
 
 ```html
 <input [(ngModel)]="name" #model="ngModel" appSomeAsyncValidator>
 <app-spinner *ngIf="model.pending"></app-spinner>
 ```
 
-### Implementing Custom Async Validator
+### Implementing a custom async validator
-In the following section, validation is performed asynchronously to ensure that our heroes pick an alter ego that is not already taken. New heroes are constantly enlisting and old heroes are leaving the service. That means that we do not have the list of available alter egos ahead of time.
 
-To validate the potential alter ego, we need to consult a central database of all currently enlisted heroes. The process is asynchronous, so we need a special validator for that.
+In the following example, an async validator ensures that heroes pick an alter ego that is not already taken.
+New heroes are constantly enlisting and old heroes are leaving the service, so the list of available alter egos cannot be retrieved ahead of time.
+To validate the potential alter ego entry, the validator must initiate an asynchronous operation to consult a central database of all currently enlisted heroes.
 
-Let's start by creating the validator class.
+The following code create the validator class, `UniqueAlterEgoValidator`, which implements the `AsyncValidator` interface.
 
 <code-example path="form-validation/src/app/shared/alter-ego.directive.ts" region="async-validator"></code-example>
 
-As you can see, the `UniqueAlterEgoValidator` class implements the `AsyncValidator` interface. In the constructor, we inject the `HeroesService` that has the following interface:
+The constructor injects the `HeroesService`, which defines the following interface.
 
 ```typescript
 interface HeroesService {
@@ -312,29 +316,37 @@ interface HeroesService {
 }
 ```
 
-In a real world application, the `HeroesService` is responsible for making an HTTP request to the hero database to check if the alter ego is available. From the validator's point of view, the actual implementation of the service is not important, so we can just code against the `HeroesService` interface.
+In a real world application, the `HeroesService` would be responsible for making an HTTP request to the hero database to check if the alter ego is available.
+From the validator's point of view, the actual implementation of the service is not important, so the example can just code against the `HeroesService` interface.
 
-As the validation begins, the `UniqueAlterEgoValidator` delegates to the `HeroesService` `isAlterEgoTaken()` method with the current control value. At this point the control is marked as `pending` and remains in this state until the observable chain returned from the `validate()` method completes.
+As the validation begins, the `UniqueAlterEgoValidator` delegates to the `HeroesService` `isAlterEgoTaken()` method with the current control value.
+At this point the control is marked as `pending` and remains in this state until the observable chain returned from the `validate()` method completes.
 
-The `isAlterEgoTaken()` method dispatches an HTTP request that checks if the alter ego is available, and returns `Observable<boolean>` as the result. We pipe the response through the `map` operator and transform it into a validation result. As always, we return `null` if the form is valid, and `ValidationErrors` if it is not. We make sure to handle any potential errors with the `catchError` operator.
+The `isAlterEgoTaken()` method dispatches an HTTP request that checks if the alter ego is available, and returns `Observable<boolean>` as the result.
+The `validate()` method pipes the response through the `map` operator and transforms it into a validation result.
 
-Here we decided that `isAlterEgoTaken()` error is treated as a successful validation, because failure to make a validation request does not necessarily mean that the alter ego is invalid. You could handle the error differently and return the `ValidationError` object instead.
+The method then, like any validator, returns `null` if the form is valid, and `ValidationErrors` if it is not.
+This validator handles any potential errors with the `catchError` operator.
+In this case, the validator treats the `isAlterEgoTaken()` error as a successful validation, because failure to make a validation request does not necessarily mean that the alter ego is invalid.
+You could handle the error differently and return the `ValidationError` object instead.
 
-After some time passes, the observable chain completes and the async validation is done. The `pending` flag is set to `false`, and the form validity is updated.
+After some time passes, the observable chain completes and the asynchronous validation is done.
+The `pending` flag is set to `false`, and the form validity is updated.
 
-### Note on performance
+### Optimizing performance of async validators
 
-By default, all validators are run after every form value change. With synchronous validators, this will not likely have a noticeable impact on application performance. However, it's common for async validators to perform some kind of HTTP request to validate the control. Dispatching an HTTP request after every keystroke could put a strain on the backend API, and should be avoided if possible.
+By default, all validators run after every form value change. With synchronous validators, this does not normally have a noticeable impact on application performance.
+Async validators, however, commonly perform some kind of HTTP request to validate the control. Dispatching an HTTP request after every keystroke could put a strain on the backend API, and should be avoided if possible.
 
-We can delay updating the form validity by changing the `updateOn` property from `change` (default) to `submit` or `blur`.
+You can delay updating the form validity by changing the `updateOn` property from `change` (default) to `submit` or `blur`.
 
-With template-driven forms:
+With template-driven forms, set the property in the template.
 
 ```html
 <input [(ngModel)]="name" [ngModelOptions]="{updateOn: 'blur'}">
 ```
 
-With reactive forms:
+With reactive forms, set the property in the `FormControl` instance.
 
 ```typescript
 new FormControl('', {updateOn: 'blur'});

aio/content/guide/forms-overview.md

@@ -4,22 +4,27 @@ Handling user input with forms is the cornerstone of many common applications. A
 
 Angular provides two different approaches to handling user input through forms: reactive and template-driven. Both capture user input events from the view, validate the user input, create a form model and data model to update, and provide a way to track changes.
 
-Reactive and template-driven forms process and manage form data differently. Each offers different advantages.
-
-**In general:**
-
-* **Reactive forms** are more robust: they're more scalable, reusable, and testable. If forms are a key part of your application, or you're already using reactive patterns for building your application, use reactive forms.
-* **Template-driven forms** are useful for adding a simple form to an app, such as an email list signup form. They're easy to add to an app, but they don't scale as well as reactive forms. If you have very basic form requirements and logic that can be managed solely in the template, use template-driven forms.
-
 This guide provides information to help you decide which type of form works best for your situation. It introduces the common building blocks used by both approaches. It also summarizes the key differences between the two approaches, and demonstrates those differences in the context of setup, data flow, and testing.
 
-<div class="alert is-helpful">
+## Prerequisites
 
-**Note:** For complete information about each kind of form, see [Reactive Forms](guide/reactive-forms) and [Template-driven Forms](guide/forms).
+This guide assumes that you have a basic understanding of the following.
 
-</div>
+* [TypeScript](https://www.typescriptlang.org/docs/home.html "The TypeScript language") and HTML5 programming.
 
-## Key differences
+* Angular app-design fundamentals, as described in [Angular Concepts](guide/architecture "Introduction to Angular concepts.").
+
+* The basics of [Angular template syntax](guide/architecture-components#template-syntax "Template syntax intro").
+
+## Choosing an approach
+
+Reactive forms and template-driven forms process and manage form data differently. Each approach offers different advantages.
+
+* **Reactive forms** provide direct, explicit access to the underlying forms object model. Compared to template-driven forms, they are more robust: they're more scalable, reusable, and testable. If forms are a key part of your application, or you're already using reactive patterns for building your application, use reactive forms.
+
+* **Template-driven forms** rely on directives in the template to create and manipulate the underlying object model. They are useful for adding a simple form to an app, such as an email list signup form. They're easy to add to an app, but they don't scale as well as reactive forms. If you have very basic form requirements and logic that can be managed solely in the template, template-driven forms could be a good fit.
+
+### Key differences
 
 The table below summarizes the key differences between reactive and template-driven forms.
 
@@ -30,17 +35,33 @@ The table below summarizes the key differences between reactive and template-dri
 
 ||Reactive|Template-driven|
 |--- |--- |--- |
-|Setup (form model)|More explicit, created in component class|Less explicit, created by directives|
+|[Setup of form model](#setup) | Explicit, created in component class | Implicit, created by directives |
-|Data model|Structured|Unstructured|
+|[Data model](#data-flow-in-forms) | Structured and immutable | Unstructured and mutable |
-|Predictability|Synchronous|Asynchronous|
+|Predictability | Synchronous | Asynchronous |
-|Form validation|Functions|Directives|
+|[Form validation](#validation) | Functions | Directives |
-|Mutability|Immutable|Mutable|
-|Scalability|Low-level API access|Abstraction on top of APIs|
 
-## Common foundation
+### Scalability
 
-Both reactive and template-driven forms share underlying building blocks.
+If forms are a central part of your application, scalability is very important. Being able to reuse form models across components is critical.
 
+Reactive forms are more scalable than template-driven forms. They provide direct access to the underlying form API, and synchronous access to the form data model, making creating large-scale forms easier.
+Reactive forms require less setup for testing, and testing does not require deep understanding of change detection to properly test form updates and validation.
+
+Template-driven forms focus on simple scenarios and are not as reusable.
+They abstract away the underlying form API, and provide only asynchronous access to the form data model.
+The abstraction of template-driven forms also affects testing.
+Tests are deeply reliant on manual change detection execution to run properly, and require more setup.
+
+{@a setup}
+
+## Setting up the form model
+
+Both reactive and template-driven forms track value changes between the form input elements that users interact with and the form data in your component model.
+The two approaches share underlying building blocks, but differ in how you create and manage the common form-control instances.
+
+### Common form foundation classes
+
+Both reactive and template-driven forms are built on the following base classes.
 
 * `FormControl` tracks the value and validation status of an individual form control.
 
@@ -50,59 +71,59 @@ Both reactive and template-driven forms share underlying building blocks.
 
 * `ControlValueAccessor` creates a bridge between Angular `FormControl` instances and native DOM elements.
 
-See the [Form model setup](#setup-the-form-model) section below for an introduction to how these control instances are created and managed with reactive and template-driven forms. Further details are provided in the [data flow section](#data-flow-in-forms) of this guide.
-
 {@a setup-the-form-model}
 
-## Form model setup
-
-Reactive and template-driven forms both use a form model to track value changes between Angular forms and form input elements. The examples below show how the form model is defined and created.
-
 ### Setup in reactive forms
 
-Here's a component with an input field for a single control implemented using reactive forms.
+With reactive forms, you define the form model directly in the component class.
+The `[formControl]` directive links the explicitly created `FormControl` instance to a specific form element in the view, using an internal value accessor.
+
+The following component implements an input field for a single control, using reactive forms. In this example, the form model is the `FormControl` instance.
 
 <code-example path="forms-overview/src/app/reactive/favorite-color/favorite-color.component.ts">
 </code-example>
 
-The source of truth provides the value and status of the form element at a given point in time. In reactive forms, the form model is the source of truth. In the example above, the form model is the `FormControl` instance.
+Figure 1 shows how, in reactive forms, the form model is the source of truth; it provides the value and status of the form element at any given point in time, through the `[formControl]` directive on the input element.
+
+**Figure 1.** *Direct access to forms model in a reactive form.*
 
 <div class="lightbox">
   <img src="generated/images/guide/forms-overview/key-diff-reactive-forms.png" alt="Reactive forms key differences">
 </div>
 
-With reactive forms, the form model is explicitly defined in the component class. The reactive form directive (in this case, `FormControlDirective`) then links the existing `FormControl` instance to a specific form element in the view using a value accessor (`ControlValueAccessor` instance).
-
 ### Setup in template-driven forms
 
-Here's the same component with an input field for a single control implemented using template-driven forms.
+In template-driven forms, the form model is implicit, rather than explicit. The directive `NgModel` creates and manages a `FormControl` instance for a given form element.
+
+The following component implements the same input field for a single control, using template-driven forms.
 
 <code-example path="forms-overview/src/app/template/favorite-color/favorite-color.component.ts">
 </code-example>
 
-In template-driven forms, the source of truth is the template.
+In a template-driven form the source of truth is the template. You do not have direct programmatic access to the `FormControl` instance, as shown in Figure 2.
+
+**Figure 2.** *Indirect access to forms model in a template-driven form.*
 
 <div class="lightbox">
   <img src="generated/images/guide/forms-overview/key-diff-td-forms.png" alt="Template-driven forms key differences">
 </div>
 
-The abstraction of the form model promotes simplicity over structure. The template-driven form directive `NgModel` is responsible for creating and managing the `FormControl` instance for a given form element. It's less explicit, but you no longer have direct control over the form model.
-
 {@a data-flow-in-forms}
 
 ## Data flow in forms
 
-When building forms in Angular, it's important to understand how the framework handles data flowing from the user or from programmatic changes. Reactive and template-driven forms follow two different strategies when handling form input. The data flow examples below begin with the favorite color input field example from above, and then show how changes to favorite color are handled in reactive forms compared to template-driven forms.
+When an application contains a form, Angular must keep the view in sync with the component model and the component model in sync with the view.
+As users change values and make selections through the view, the new values must be reflected in the data model.
+Similarly, when the program logic changes values in the data model, those values must be reflected in the view.
+
+Reactive and template-driven forms differ in how they handle data flowing from the user or from programmatic changes.
+The following diagrams illustrate both kinds of data flow for each type of form, using the a favorite-color input field defined above.
 
 ### Data flow in reactive forms
 
-As described above, in reactive forms each form element in the view is directly linked to a form model (`FormControl` instance). Updates from the view to the model and from the model to the view are synchronous and aren't dependent on the UI rendered. The diagrams below use the same favorite color example to demonstrate how data flows when an input field's value is changed from the view and then from the model.
+In reactive forms each form element in the view is directly linked to the form model (a `FormControl` instance). Updates from the view to the model and from the model to the view are synchronous and do not depend on how the UI is rendered.
 
-<div class="lightbox">
+The view-to-model diagram shows how data flows when an input field's value is changed from the view through the following steps.
-  <img src="generated/images/guide/forms-overview/dataflow-reactive-forms-vtm.png" alt="Reactive forms data flow - view to model" width="100%">
-</div>
-
-The steps below outline the data flow from view to model.
 
 1. The user types a value into the input element, in this case the favorite color *Blue*.
 1. The form input element emits an "input" event with the latest value.
@@ -111,25 +132,25 @@ The steps below outline the data flow from view to model.
 1. Any subscribers to the `valueChanges` observable receive the new value.
 
 <div class="lightbox">
-  <img src="generated/images/guide/forms-overview/dataflow-reactive-forms-mtv.png" alt="Reactive forms data flow - model to view" width="100%">
+  <img src="generated/images/guide/forms-overview/dataflow-reactive-forms-vtm.png" alt="Reactive forms data flow - view to model">
 </div>
 
-The steps below outline the data flow from model to view.
+The model-to-view diagram shows how a programmatic change to the model is propagated to the view through the following steps.
 
 1. The user calls the `favoriteColorControl.setValue()` method, which updates the `FormControl` value.
 1. The `FormControl` instance emits the new value through the `valueChanges` observable.
 1. Any subscribers to the `valueChanges` observable receive the new value.
 1. The control value accessor on the form input element updates the element with the new value.
 
-### Data flow in template-driven forms
-
-In template-driven forms, each form element is linked to a directive that manages the form model internally. The diagrams below use the same favorite color example to demonstrate how data flows when an input field's value is changed from the view and then from the model.
-
 <div class="lightbox">
-  <img src="generated/images/guide/forms-overview/dataflow-td-forms-vtm.png" alt="Template-driven forms data flow - view to model" width="100%">
+  <img src="generated/images/guide/forms-overview/dataflow-reactive-forms-mtv.png" alt="Reactive forms data flow - model to view">
 </div>
 
-The steps below outline the data flow from view to model when the input value changes from *Red* to *Blue*.
+### Data flow in template-driven forms
+
+In template-driven forms, each form element is linked to a directive that manages the form model internally.
+
+The view-to-model diagram shows how data flows when an input field's value is changed from the view through the following steps.
 
 1. The user types *Blue* into the input element.
 1. The input element emits an "input" event with the value *Blue*.
@@ -141,10 +162,10 @@ The steps below outline the data flow from view to model when the input value ch
 is updated to the value emitted by the `ngModelChange` event (*Blue*).
 
 <div class="lightbox">
-  <img src="generated/images/guide/forms-overview/dataflow-td-forms-mtv.png" alt="Template-driven forms data flow - model to view" width="100%">
+  <img src="generated/images/guide/forms-overview/dataflow-td-forms-vtm.png" alt="Template-driven forms data flow - view to model" width="100%">
 </div>
 
-The steps below outline the data flow from model to view when the `favoriteColor` changes from *Blue* to *Red*.
+The model-to-view diagram shows how data flows from model to view when the `favoriteColor` changes from *Blue* to *Red*, through the following steps
 
 1. The `favoriteColor` value is updated in the component.
 1. Change detection begins.
@@ -156,6 +177,30 @@ The steps below outline the data flow from model to view when the `favoriteColor
 1. Any subscribers to the `valueChanges` observable receive the new value.
 1. The control value accessor updates the form input element in the view with the latest `favoriteColor` value.
 
+<div class="lightbox">
+  <img src="generated/images/guide/forms-overview/dataflow-td-forms-mtv.png" alt="Template-driven forms data flow - model to view" width="100%">
+</div>
+
+### Mutability of the data model
+
+The change-tracking method plays a role in the efficiency of your application.
+
+* **Reactive forms** keep the data model pure by providing it as an immutable data structure.
+Each time a change is triggered on the data model, the `FormControl` instance returns a new data model rather than updating the existing data model.
+This gives you the ability to track unique changes to the data model through the control's observable.
+Change detection is more efficient because it only needs to update on unique changes.
+Because data updates follow reactive patterns, you can integrate with observable operators to transform data.
+
+* **Template-driven** forms rely on mutability with two-way data binding to update the data model in the component as changes are made in the template.
+Because there are no unique changes to track on the data model when using two-way data binding, change detection is less efficient at determining when updates are required.
+
+The difference is demonstrated in the previous examples that use the favorite-color input element.
+
+* With reactive forms, the **`FormControl` instance** always returns a new value when the control's value is updated.
+
+* With template-driven forms, the **favorite color property** is always modified to its new value.
+
+{@a validation}
 ## Form validation
 
 Validation is an integral part of managing any set of forms. Whether you're checking for required fields or querying an external API for an existing username, Angular provides a set of built-in validators as well as the ability to create custom validators.
@@ -167,36 +212,37 @@ For more information, see [Form Validation](guide/form-validation).
 
 ## Testing
 
-Testing plays a large part in complex applications and a simpler testing strategy is useful when validating that your forms function correctly. Reactive forms and template-driven forms have different levels of reliance on rendering the UI to perform assertions based on form control and form field changes. The following examples demonstrate the process of testing forms with reactive and template-driven forms.
+Testing plays a large part in complex applications. A simpler testing strategy is useful when validating that your forms function correctly.
+Reactive forms and template-driven forms have different levels of reliance on rendering the UI to perform assertions based on form control and form field changes.
+The following examples demonstrate the process of testing forms with reactive and template-driven forms.
 
 ### Testing reactive forms
 
-Reactive forms provide a relatively easy testing strategy because they provide synchronous access to the form and data models, and they can be tested without rendering the UI. In these tests, status and data are queried and manipulated through the control without interacting with the change detection cycle.
+Reactive forms provide a relatively easy testing strategy because they provide synchronous access to the form and data models, and they can be tested without rendering the UI.
+In these tests, status and data are queried and manipulated through the control without interacting with the change detection cycle.
 
-The following tests use the favorite color components mentioned earlier to verify the data flows from view to model and model to view for a reactive form.
+The following tests use the favorite-color components from previous examples to verify the view-to-model and model-to-view data flows for a reactive form.
 
-The following test verifies the data flow from view to model.
+**Verifying view-to-model data flow**
 
-<code-example path="forms-overview/src/app/reactive/favorite-color/favorite-color.component.spec.ts" region="view-to-model" header="Favorite color test - view to model">
+The first example performs the following steps to verify the view-to-model data flow.
-</code-example>
-
-Here are the steps performed in the view to model test.
 
 1. Query the view for the form input element, and create a custom "input" event for the test.
 1. Set the new value for the input to *Red*, and dispatch the "input" event on the form input element.
 1. Assert that the component's `favoriteColorControl` value matches the value from the input.
 
-The following test verifies the data flow from model to view.
+<code-example path="forms-overview/src/app/reactive/favorite-color/favorite-color.component.spec.ts" region="view-to-model" header="Favorite color test - view to model">
-
-<code-example path="forms-overview/src/app/reactive/favorite-color/favorite-color.component.spec.ts" region="model-to-view" header="Favorite color test - model to view">
 </code-example>
 
-Here are the steps performed in the model to view test.
+The next example performs the following steps to verify the model-to-view data flow.
 
 1. Use the `favoriteColorControl`, a `FormControl` instance, to set the new value.
 1. Query the view for the form input element.
 1. Assert that the new value set on the control matches the value in the input.
 
+<code-example path="forms-overview/src/app/reactive/favorite-color/favorite-color.component.spec.ts" region="model-to-view" header="Favorite color test - model to view">
+</code-example>
+
 ### Testing template-driven forms
 
 Writing tests with template-driven forms requires a detailed knowledge of the change detection process and an understanding of how directives run on each cycle to ensure that elements are queried, tested, or changed at the correct time.
@@ -228,46 +274,17 @@ Here are the steps performed in the model to view test.
 1. Query the view for the form input element.
 1. Assert that the input value matches the value of the `favoriteColor` property in the component instance.
 
-## Mutability
-
-The change tracking method plays a role in the efficiency of your application.
-
-
-* **Reactive forms** keep the data model pure by providing it as an immutable data structure. Each time a change is triggered on the data model, the `FormControl` instance returns a new data model rather than updating the existing data model. This gives you the ability to track unique changes to the data model through the control's observable. This provides one way for change detection to be more efficient because it only needs to update on unique changes. It also follows reactive patterns that integrate with observable operators to transform data.
-
-* **Template-driven** forms rely on mutability with two-way data binding to update the data model in the component as changes are made in the template. Because there are no unique changes to track on the data model when using two-way data binding, change detection is less efficient at determining when updates are required.
-
-The difference is demonstrated in the examples above using the **favorite color** input element.
-
-
-* With reactive forms, the **`FormControl` instance** always returns a new value when the control's value is updated.
-
-* With template-driven forms, the **favorite color property** is always modified to its new value.
-
-## Scalability
-
-If forms are a central part of your application, scalability is very important. Being able to reuse form models across components is critical.
-
-
-* **Reactive forms** provide access to low-level APIs and synchronous access to the form model, making creating large-scale forms easier.
-
-* **Template-driven** forms focus on simple scenarios, are not as reusable, abstract away the low-level APIs, and provide asynchronous access to the form model. The abstraction with template-driven forms also surfaces in testing, where testing reactive forms requires less setup and no dependence on the change detection cycle when updating and validating the form and data models during testing.
-
-## Final thoughts
-
-Choosing a strategy begins with understanding the strengths and weaknesses of the options presented. Low-level API and form model access, predictability, mutability, straightforward validation and testing strategies, and scalability are all important considerations in choosing the infrastructure you use to build your forms in Angular. Template-driven forms are similar to patterns in AngularJS, but they have limitations given the criteria of many modern, large-scale Angular apps. Reactive forms minimize these limitations. Reactive forms integrate with reactive patterns already present in other areas of the Angular architecture, and complement those requirements well.
 
 ## Next steps
 
-
-
 To learn more about reactive forms, see the following guides:
 
-* [Reactive Forms](guide/reactive-forms)
+* [Reactive forms](guide/reactive-forms)
-* [Form Validation](guide/form-validation#reactive-form-validation)
+* [Form validation](guide/form-validation#reactive-form-validation)
-* [Dynamic Forms](guide/dynamic-form)
+* [Dynamic forms](guide/dynamic-form)
 
 To learn more about template-driven forms, see the following guides:
 
-* [Template-driven Forms](guide/forms#template-driven-forms)
+* [Building a template-driven form](guide/forms) tutorial
-* [Form Validation](guide/form-validation#template-driven-validation)
+* [Form validation](guide/form-validation#template-driven-validation)
+* `NgForm` directive API reference

aio/content/guide/forms.md

@@ -1,389 +1,234 @@
-# Template-driven forms
+# Building a template-driven form
-
-Forms are the mainstay of business applications.
-You use forms to log in, submit a help request, place an order, book a flight,
-schedule a meeting, and perform countless other data-entry tasks.
-
-In developing a form, it's important to create a data-entry experience that guides the
-user efficiently and effectively through the workflow.
-
-<div class="alert is-helpful">
-
-  For the sample app that this page describes, see the <live-example></live-example>.
-
-</div>
-
-## Introduction to Template-driven forms
-
-Developing forms requires design skills (which are out of scope for this page), as well as framework support for
-*two-way data binding, change tracking, validation, and error handling*,
-which you'll learn about on this page.
-
-This page shows you how to build a simple form from scratch. Along the way you'll learn how to:
-
-* Build an Angular form with a component and template.
-* Use `ngModel` to create two-way data bindings for reading and writing input-control values.
-* Track state changes and the validity of form controls.
-* Provide visual feedback using special CSS classes that track the state of the controls.
-* Display validation errors to users and enable/disable form controls.
-* Share information across HTML elements using template reference variables.
 
 {@a template-driven}
 
-You can build forms by writing templates in the Angular [template syntax](guide/template-syntax) with
+This tutorial shows you how to create a template-driven form whose control elements are bound to data properties, with input validation to maintain data integrity and styling to improve the user experience.
-the form-specific directives and techniques described in this page.
+
+Template-driven forms use [two-way data binding](guide/architecture-components#data-binding "Intro to 2-way data binding") to update the data model in the component as changes are made in the template and vice versa.
 
 <div class="alert is-helpful">
 
-  You can also use a reactive (or model-driven) approach to build forms.
+Angular supports two design approaches for interactive forms. You can build forms by writing templates using Angular [template syntax and directives](guide/glossary#template "Definition of template terms") with the form-specific directives and techniques described in this tutorial, or you can use a reactive (or model-driven) approach to build forms.
-  However, this page focuses on template-driven forms.
+
+Template-driven forms are suitable for small or simple forms, while reactive forms are more scalable and suitable for complex forms.
+For a comparison of the two approaches, see [Introduction to Forms](guide/forms-overview "Overview of Angular forms.")
 
 </div>
 
-You can build almost any form with an Angular template&mdash;login forms, contact forms, and pretty much any business form.
+You can build almost any kind of form with an Angular template&mdash;login forms, contact forms, and pretty much any business form.
-You can lay out the controls creatively, bind them to data, specify validation rules and display validation errors,
+You can lay out the controls creatively and bind them to the data in your object model.
+You can specify validation rules and display validation errors,
 conditionally enable or disable specific controls, trigger built-in visual feedback, and much more.
 
-Angular makes the process easy by handling many of the repetitive, boilerplate tasks you'd
+This tutorial shows you how to build a form from scratch, using a simplified sample form like the one from the [Tour of Heroes tutorial](tutorial "Tour of Heroes") to illustrate the techniques.
-otherwise wrestle with yourself.
 
-You'll learn to build a template-driven form that looks like this:
+<div class="alert is-helpful">
+
+  Run or download the example app: <live-example></live-example>.
+
+</div>
+
+## Objectives
+
+This tutorial teaches you how to do the following:
+
+* Build an Angular form with a component and template.
+* Use `ngModel` to create two-way data bindings for reading and writing input-control values.
+* Provide visual feedback using special CSS classes that track the state of the controls.
+* Display validation errors to users and enable or disable form controls based on the form status.
+* Share information across HTML elements using [template reference variables](guide/template-syntax#template-reference-variables-var).
+
+## Prerequisites
+
+Before going further into template-driven forms, you should have a basic understanding of the following.
+
+* TypeScript and HTML5 programming.
+* Angular app-design fundamentals, as described in [Angular Concepts](guide/architecture "Introduction to Angular concepts.").
+* The basics of [Angular template syntax](guide/template-syntax "Template syntax guide").
+* The form-design concepts that are presented in [Introduction to Forms](guide/forms-overview "Overview of Angular forms.").
+
+{@a intro}
+
+## Build a template-driven form
+
+Template-driven forms rely on directives defined in the `FormsModule`.
+
+* The `NgModel` directive reconciles value changes in the attached form element with changes in the data model, allowing you to respond to user input with input validation and error handling.
+
+* The `NgForm` directive creates a top-level `FormGroup` instance and binds it to a `<form>` element to track aggregated form value and validation status.
+As soon as you import `FormsModule`, this directive becomes active by default on all `<form>` tags. You don't need to add a special selector.
+
+* The `NgModelGroup` directive creates and binds a `FormGroup` instance to a DOM element.
+
+### The sample application
+
+The sample form in this guide is used by the *Hero Employment Agency* to maintain personal information about heroes.
+Every hero needs a job. This form helps the agency match the right hero with the right crisis.
 
 <div class="lightbox">
   <img src="generated/images/guide/forms/hero-form-1.png" alt="Clean Form">
 </div>
 
-The *Hero Employment Agency* uses this form to maintain personal information about heroes.
+The form highlights some design features that make it easier to use. For instance, the two required fields have a green bar on the left to make them easy to spot. These fields have initial values, so the form is valid and the **Submit** button is enabled.
-Every hero needs a job. It's the company mission to match the right hero with the right crisis.
 
-Two of the three fields on this form are required. Required fields have a green bar on the left to make them easy to spot.
+As you work with this form, you will learn how to include validation logic, how to customize the presentation with standard CSS, and how to handle error conditions to ensure valid input.
-
+If the user deletes the hero name, for example, the form becomes invalid. The app detects the changed status, and displays a validation error in an attention-grabbing style.
-If you delete the hero name, the form displays a validation error in an attention-grabbing style:
+In addition, the **Submit** button is disabled, and the "required" bar to the left of the input control changes from green to red.
 
 <div class="lightbox">
   <img src="generated/images/guide/forms/hero-form-2.png" alt="Invalid, Name Required">
 </div>
 
-Note that the *Submit* button is disabled, and the "required" bar to the left of the input control changes from green to red.
+### Step overview
 
-<div class="alert is-helpful">
+In the course of this tutorial, you bind a sample form to data and handle user input using the following steps.
 
-  You can customize the colors and location of the "required" bar with standard CSS.
+1. Build the basic form.
+   * Define a sample data model.
+   * Include required infrastructure such as the `FormsModule`.
+2. Bind form controls to data properties using the `ngModel` directive and two-way data-binding syntax.
+   * Examine how `ngModel` reports control states using CSS classes.
+   * Name controls to make them accessible to `ngModel`.
+3. Track input validity and control status using `ngModel`.
+   * Add custom CSS to provide visual feedback on the status.
+   * Show and hide validation-error messages.
+4. Respond to a native HTML button-click event by adding to the model data.
+5. Handle form submission using the [`ngSubmit`(api/forms/NgForm#properties)] output property of the form.
+   * Disable the **Submit** button until the form is valid.
+   * After submit, swap out the finished form for different content on the page.
 
-</div>
+{@a step1}
 
-You'll build this form in small steps:
+## Build the form
 
-1. Create the `Hero` model class.
+You can recreate the sample application from the code provided here, or you can examine or download the <live-example></live-example>.
-1. Create the component that controls the form.
-1. Create a template with the initial form layout.
-1. Bind data properties to each form control using the `ngModel` two-way data-binding syntax.
-1. Add a `name` attribute to each form-input control.
-1. Add custom CSS to provide visual feedback.
-1. Show and hide validation-error messages.
-1. Handle form submission with *ngSubmit*.
-1. Disable the form’s *Submit* button until the form is valid.
 
-## Setup
+1. The provided sample application creates the `Hero` class which defines the data model reflected in the form.
 
-Create a new project named <code>angular-forms</code>:
+   <code-example path="forms/src/app/hero.ts" header="src/app/hero.ts"></code-example>
 
-<code-example language="sh" class="code-shell">
+2. The form layout and details are defined in the `HeroFormComponent` class.
 
-  ng new angular-forms
+   <code-example path="forms/src/app/hero-form/hero-form.component.ts" header="src/app/hero-form/hero-form.component.ts (v1)" region="v1"></code-example>
 
-</code-example>
+   The component's `selector` value of "app-hero-form" means you can drop this form in a parent
+template using the `<app-hero-form>` tag.
 
-## Create the Hero model class
+3. The following code creates a new hero instance, so that the initial form can show an example hero.
 
-As users enter form data, you'll capture their changes and update an instance of a model.
+   <code-example path="forms/src/app/hero-form/hero-form.component.ts" region="SkyDog"></code-example>
-You can't lay out the form until you know what the model looks like.
 
-A model can be as simple as a "property bag" that holds facts about a thing of application importance.
+   This demo uses dummy data for `model` and `powers`. In a real app, you would inject a data service to get and save real data, or expose these properties as inputs and outputs.
-That describes well the `Hero` class with its three required fields (`id`, `name`, `power`)
-and one optional field (`alterEgo`).
 
-Using the Angular CLI command [`ng generate class`](cli/generate), generate a new class named `Hero`:
+4. The application enables the Forms feature and registers the created form component.
 
-<code-example language="sh" class="code-shell">
+   <code-example path="forms/src/app/app.module.ts" header="src/app/app.module.ts"></code-example>
 
-  ng generate class Hero
+5. The form is displayed in the application layout defined by the root component's template.
 
-</code-example>
+   <code-example path="forms/src/app/app.component.html" header="src/app/app.component.html"></code-example>
 
-With this content:
+   The initial template defines the layout for a form with two form groups and a submit button.
+   The form groups correspond to two properties of the Hero data model, name and alterEgo. Each group has a label and a box for user input.
 
-<code-example path="forms/src/app/hero.ts" header="src/app/hero.ts"></code-example>
+   * The **Name** `<input>` control element has the HTML5 `required` attribute.
+   * The **Alter Ego** `<input>` control element does not because `alterEgo` is optional.
 
-It's an anemic model with few requirements and no behavior. Perfect for the demo.
+   The **Submit** button has some classes on it for styling.
+   At this point, the form  layout is all plain HTML5, with no bindings or directives.
 
-The TypeScript compiler generates a public field for each `public` constructor parameter and
+6. The sample form uses some style classes from [Twitter Bootstrap](http://getbootstrap.com/css/): `container`, `form-group`, `form-control`, and `btn`.
-automatically assigns the parameter’s value to that field when you create heroes.
+   To use these styles, the app's style sheet imports the library.
 
-The `alterEgo` is optional, so the constructor lets you omit it; note the question mark (?) in `alterEgo?`.
+   <code-example path="forms/src/styles.1.css" header="src/styles.css"></code-example>
 
-You can create a new hero like this:
+7. The form makes the hero applicant choose one superpower from a fixed list of agency-approved powers.
+   The predefined list of `powers` is part of the data model, maintained internally in `HeroFormComponent`.
+   The Angular [NgForOf directive](api/common/NgForOf "API reference") iterates over the data values to populate the `<select>` element.
 
-<code-example path="forms/src/app/hero-form/hero-form.component.ts" region="SkyDog"></code-example>
+   <code-example path="forms/src/app/hero-form/hero-form.component.html" header="src/app/hero-form/hero-form.component.html (powers)" region="powers"></code-example>
 
-## Create a form component
+If you run the app right now, you see the list of powers in the selection control. The input elements are not yet bound to data values or events, so they are still blank and have no behavior.
-
-An Angular form has two parts: an HTML-based _template_ and a component _class_
-to handle data and user interactions programmatically.
-Begin with the class because it states, in brief, what the hero editor can do.
-
-Using the Angular CLI command [`ng generate component`](cli/generate), generate a new component named `HeroForm`:
-
-<code-example language="sh" class="code-shell">
-
-  ng generate component HeroForm
-
-</code-example>
-
-With this content:
-
-<code-example path="forms/src/app/hero-form/hero-form.component.ts" header="src/app/hero-form/hero-form.component.ts (v1)" region="v1"></code-example>
-
-There’s nothing special about this component, nothing form-specific,
-nothing to distinguish it from any component you've written before.
-
-Understanding this component requires only the Angular concepts covered in previous pages.
-
-* The code imports the Angular core library and the `Hero` model you just created.
-* The `@Component` selector value of "app-hero-form" means you can drop this form in a parent
-template with a `<app-hero-form>` tag.
-* The `templateUrl` property points to a separate file for the template HTML.
-* You defined dummy data for `model` and `powers`, as befits a demo.
-
-Down the road, you can inject a data service to get and save real data
-or perhaps expose these properties as inputs and outputs
-(see [Input and output properties](guide/template-syntax#inputs-outputs) on the
-[Template Syntax](guide/template-syntax) page) for binding to a
-parent component. This is not a concern now and these future changes won't affect the form.
-
-* You added a `diagnostic` property to return a JSON representation of the model.
-It'll help you see what you're doing during development; you've left yourself a cleanup note to discard it later.
-
-## Revise *app.module.ts*
-
-`app.module.ts` defines the application's root module. In it you identify the external modules you'll use in the application
-and declare the components that belong to this module, such as the `HeroFormComponent`.
-
-Because template-driven forms are in their own module, you need to add the `FormsModule` to the array of
-`imports` for the application module before you can use forms.
-
-Update it with the following:
-
-<code-example path="forms/src/app/app.module.ts" header="src/app/app.module.ts"></code-example>
-
-<div class="alert is-helpful">
-
-  There are two changes:
-
-  1. You import `FormsModule`.
-
-  1. You add the `FormsModule` to the list of `imports` defined in the `@NgModule` decorator. This gives the application
-  access to all of the template-driven forms features, including `ngModel`.
-
-</div>
-
-<div class="alert is-important">
-
-  If a component, directive, or pipe belongs to a module in the `imports` array, ​_don't_​ re-declare it in the `declarations` array.
-  If you wrote it and it should belong to this module, ​_do_​ declare it in the `declarations` array.
-
-</div>
-
-## Revise *app.component.html*
-
-`AppComponent` is the application's root component. It will host the new `HeroFormComponent`.
-
-Replace the contents of its template with the following:
-
-<code-example path="forms/src/app/app.component.html" header="src/app/app.component.html"></code-example>
-
-<div class="alert is-helpful">
-
-  There are only two changes.
-  The `template` is simply the new element tag identified by the component's `selector` property.
-  This displays the hero form when the application component is loaded.
-  Don't forget to remove the `name` field from the class body as well.
-
-</div>
-
-## Create an initial HTML form template
-
-Update the template file with the following contents:
-
-<code-example path="forms/src/app/hero-form/hero-form.component.html" region="start" header="src/app/hero-form/hero-form.component.html"></code-example>
-
-The language is simply HTML5. You're presenting two of the `Hero` fields, `name` and `alterEgo`, and
-opening them up for user input in input boxes.
-
-The *Name* `<input>` control has the HTML5 `required` attribute;
-the *Alter Ego* `<input>` control does not because `alterEgo` is optional.
-
-You added a *Submit* button at the bottom with some classes on it for styling.
-
-*You're not using Angular yet*. There are no bindings or extra directives, just layout.
-
-<div class="alert is-helpful">
-
-  In template driven forms, if you've imported `FormsModule`, you don't have to do anything
-  to the `<form>` tag in order to make use of `FormsModule`. Continue on to see how this works.
-
-</div>
-
-The `container`, `form-group`, `form-control`, and `btn` classes
-come from [Twitter Bootstrap](http://getbootstrap.com/css/). These classes are purely cosmetic.
-Bootstrap gives the form a little style.
-
-<div class="callout is-important">
-
-  <header>
-    Angular forms don't require a style library
-  </header>
-
-  Angular makes no use of the `container`, `form-group`, `form-control`, and `btn` classes or
-  the styles of any external library. Angular apps can use any CSS library or none at all.
-
-</div>
-
-To add the stylesheet, open `styles.css` and add the following import line at the top:
-
-<code-example path="forms/src/styles.1.css" header="src/styles.css"></code-example>
-
-## Add powers with _*ngFor_
-
-The hero must choose one superpower from a fixed list of agency-approved powers.
-You maintain that list internally (in `HeroFormComponent`).
-
-You'll add a `select` to the
-form and bind the options to the `powers` list using `ngFor`,
-a technique seen previously in the [Displaying Data](guide/displaying-data) page.
-
-Add the following HTML *immediately below* the *Alter Ego* group:
-
-<code-example path="forms/src/app/hero-form/hero-form.component.html" header="src/app/hero-form/hero-form.component.html (powers)" region="powers"></code-example>
-
-This code repeats the `<option>` tag for each power in the list of powers.
-The `pow` template input variable is a different power in each iteration;
-you display its name using the interpolation syntax.
-
-{@a ngModel}
-
-## Two-way data binding with _ngModel_
-
-Running the app right now would be disappointing.
 
 <div class="lightbox">
   <img src="generated/images/guide/forms/hero-form-3.png" alt="Early form with no binding">
 </div>
 
+{@a ngModel}
 
-You don't see hero data because you're not binding to the `Hero` yet.
+## Bind input controls to data properties
-You know how to do that from earlier pages.
-[Displaying Data](guide/displaying-data) teaches property binding.
-[User Input](guide/user-input) shows how to listen for DOM events with an
-event binding and how to update a component property with the displayed value.
 
-Now you need to display, listen, and extract at the same time.
+The next step is to bind the input controls to the corresponding `Hero` properties with two-way data binding, so that they respond to user input by updating the data model, and also respond to programmatic changes in the data by updating the display.
 
-You could use the techniques you already know, but
+The `ngModel` directive declared in the `FormsModule` lets you bind controls in your template-driven form to properties in your data model.
-instead you'll use the new `[(ngModel)]` syntax, which
+When you include the directive using the  syntax for two-way data binding, `[(ngModel)]`, Angular can track the value and user interaction of the control and keep the view synced with the model.
-makes binding the form to the model easy.
 
-Find the `<input>` tag for *Name* and update it like this:
+1. Edit the template file `hero-form.component.html`.
+
+2. Find the `<input>` tag next to the **Name** label.
+
+3. Add the `ngModel` directive, using two-way data binding syntax `[(ngModel)]="..."`.
 
 <code-example path="forms/src/app/hero-form/hero-form.component.html" header="src/app/hero-form/hero-form.component.html (excerpt)" region="ngModelName-1"></code-example>
 
 <div class="alert is-helpful">
 
-  You added a diagnostic interpolation after the input tag
+This example has a temporary diagnostic interpolation after each input tag, `{{model.name}}`, to show the current data value of the corresponding property.
-  so you can see what you're doing.
+The note reminds you to remove the diagnostic lines when you have finished observing the two-way data binding at work.
-  You left yourself a note to throw it away when you're done.
 
 </div>
 
-Focus on the binding syntax: `[(ngModel)]="..."`.
+{@a ngForm}
 
-You need one more addition to display the data. Declare
+### Access the overall form status
-a template variable for the form. Update the `<form>` tag with
-`#heroForm="ngForm"` as follows:
 
-<code-example path="forms/src/app/hero-form/hero-form.component.html" header="src/app/hero-form/hero-form.component.html (excerpt)" region="template-variable"></code-example>
+When you imported the `FormsModule` in your component, Angular automatically created and attached an [NgForm](api/forms/NgForm "API reference for NgForm") directive to the `<form>` tag in the template (because `NgForm` has the selector `form` that matches `<form>` elements).
 
-The variable `heroForm` is now a reference to the `NgForm` directive that governs the form as a whole.
+To get access to the `NgForm` and the overall form status, declare a [template reference variable](guide/template-syntax#template-reference-variables-var).
 
-<div class="alert is-helpful">
+1. Edit the template file `hero-form.component.html`.
 
-  {@a ngForm}
+2. Update the `<form>` tag with a template reference variable, `#heroForm`, and set its value as follows.
 
-  ### The _NgForm_ directive
+   <code-example path="forms/src/app/hero-form/hero-form.component.html" header="src/app/hero-form/hero-form.component.html (excerpt)" region="template-variable"></code-example>
 
-  What `NgForm` directive?
+   The `heroForm` template variable  is now a reference to the `NgForm` directive instance that governs the form as a whole.
-  You didn't add an [NgForm](api/forms/NgForm) directive.
 
-  Angular did. Angular automatically creates and attaches an `NgForm` directive to the `<form>` tag.
+3. Run the app.
 
-  The `NgForm` directive supplements the `form` element with additional features.
+4. Start typing in the **Name** input box.
-  It holds the controls you created for the elements with an `ngModel` directive
-  and `name` attribute, and monitors their properties, including their validity.
-  It also has its own `valid` property which is true only *if every contained
-  control* is valid.
 
-</div>
+  As you add and delete characters, you can see them appear and disappear from the data model.
+  For example:
 
-If you ran the app now and started typing in the *Name* input box,
+   <div class="lightbox">
-adding and deleting characters, you'd see them appear and disappear
+     <img src="generated/images/guide/forms/ng-model-in-action.png" alt="ngModel in action">
-from the interpolated text.
+   </div>
-At some point it might look like this:
 
-<div class="lightbox">
+  The diagnostic line that shows interpolated values demonstrates that values are really flowing from the input box to the model and back again.
-  <img src="generated/images/guide/forms/ng-model-in-action.png" alt="ngModel in action">
-</div>
 
-The diagnostic is evidence that values really are flowing from the input box to the model and
+### Naming control elements
-back again.
 
-<div class="alert is-helpful">
+When you use `[(ngModel)]` on an element, you must define a `name` attribute for that element.
+Angular uses the assigned name to register the element with the `NgForm` directive attached to the parent `<form>` element.
 
-  That's *two-way data binding*.
+The example added a `name` attribute to the `<input>` element and set it to "name",
-  For more information, see
+which makes sense for the hero's name.
-  [Two-way binding with NgModel](guide/template-syntax#ngModel) on the
+Any unique value will do, but using a descriptive name is helpful.
-  the [Template Syntax](guide/template-syntax) page.
 
-</div>
+1. Add similar `[(ngModel)]` bindings and `name` attributes to **Alter Ego** and **Hero Power**.
 
-Notice that you also added a `name` attribute to the `<input>` tag and set it to "name",
+2. You can now remove the diagnostic messages that show interpolated values.
-which makes sense for the hero's name. Any unique value will do, but using a descriptive name is helpful.
-Defining a `name` attribute is a requirement when using `[(ngModel)]` in combination with a form.
 
-<div class="alert is-helpful">
+3. To confirm that two-way data binding works for the entire hero model, add a new binding at the top to the component's `diagnostic` property.
 
-  Internally, Angular creates `FormControl` instances and
+After these revisions, the form template should look like the following:
-  registers them with an `NgForm` directive that Angular attached to the `<form>` tag.
-  Each `FormControl` is registered under the name you assigned to the `name` attribute.
-  Read more in the previous section, [The NgForm directive](guide/forms#ngForm).
-
-</div>
-
-Add similar `[(ngModel)]` bindings and `name` attributes to *Alter Ego* and *Hero Power*.
-You'll ditch the input box binding message
-and add a new binding (at the top) to the component's `diagnostic` property.
-Then you can confirm that two-way data binding works *for the entire hero model*.
-
-After revision, the core of the form should look like this:
 
 <code-example path="forms/src/app/hero-form/hero-form.component.html" header="src/app/hero-form/hero-form.component.html (excerpt)" region="ngModel-2"></code-example>
 
-<div class="alert is-helpful">
+* Notice that each `<input>` element has an `id` property. This is used by the `<label>` element's `for` attribute to match the label to its input control. This is a [standard HTML feature](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/label).
 
-  * Each input element has an `id` property that is used by the `label` element's `for` attribute
+* Each `<input>` element also has the required `name` property that Angular uses to register the control with the form.
-  to match the label to its input control.
-  * Each input element has a `name` property that is required by Angular forms to register the control with the form.
-
-</div>
 
 If you run the app now and change every hero model property, the form might display like this:
 
@@ -391,18 +236,15 @@ If you run the app now and change every hero model property, the form might disp
   <img src="generated/images/guide/forms/ng-model-in-action-2.png" alt="ngModel in action">
 </div>
 
-The diagnostic near the top of the form
+The diagnostic near the top of the form confirms that all of your changes are reflected in the model.
-confirms that all of your changes are reflected in the model.
 
-*Delete* the `{{diagnostic}}` binding at the top as it has served its purpose.
+4. When you have observed the effects, you can delete the `{{diagnostic}}` binding.
 
-## Track control state and validity with _ngModel_
+## Track control states
 
-Using `ngModel` in a form gives you more than just two-way data binding. It also tells
+The `NgModel` directive on a control tracks the state of that control.
-you if the user touched the control, if the value changed, or if the value became invalid.
+It tells you if the user touched the control, if the value changed, or if the value became invalid.
-
+Angular sets special CSS classes on the control element to reflect the state, as shown in the following table.
-The *NgModel* directive doesn't just track state; it updates the control with special Angular CSS classes that reflect the state.
-You can leverage those class names to change the appearance of the control.
 
 <table>
 
@@ -472,38 +314,32 @@ You can leverage those class names to change the appearance of the control.
 
 </table>
 
-Temporarily add a [template reference variable](guide/template-syntax#ref-vars) named `spy`
+You use these CSS classes to define the styles for your control based on its status.
-to the _Name_ `<input>` tag and use it to display the input's CSS classes.
 
-<code-example path="forms/src/app/hero-form/hero-form.component.html" header="src/app/hero-form/hero-form.component.html (excerpt)" region="ngModelName-2"></code-example>
+### Observe control states
 
-Now run the app and look at the _Name_ input box.
+To see how the classes are added and removed by the framework, open the browser's developer tools and inspect the `<input>` element that represents the hero name.
-Follow these steps *precisely*:
 
-1. Look but don't touch.
+1. Using your browser's developer tools, find the  `<input>` element that corresponds to the **Name** input box.
-1. Click inside the name box, then click outside it.
+   You can see that the element has multiple CSS classes in addition to "form-control".
-1. Add slashes to the end of the name.
-1. Erase the name.
 
-The actions and effects are as follows:
+2. When you first bring it up, the classes indicate that it has a valid value, that the value has not been changed since initialization or reset, and that the control has not been visited since initialization or reset.
 
-<div class="lightbox">
+   ```
-  <img src="generated/images/guide/forms/control-state-transitions-anim.gif" alt="Control State Transition">
+   <input ... class="form-control ng-untouched ng-pristine ng-valid" ...>
-</div>
+   ```
 
-You should see the following transitions and class names:
+3. Take the following actions on the **Name** `<input>` box, and observe which classes appear.
+   * Look but don't touch. The classes indicate that it is untouched, pristine, and valid.
+   * Click inside the name box, then click outside it. The control has now been visited, and the element has the `ng-touched` class instead of the `ng-untouched` class.
+   * Add slashes to the end of the name. It is now touched and dirty.
+   * Erase the name. This makes the value invalid, so the `ng-invalid` class replaces the `ng-valid` class.
 
-<div class="lightbox">
+### Create visual feedback for states
-  <img src="generated/images/guide/forms/ng-control-class-changes.png" alt="Control state transitions">
-</div>
 
-The `ng-valid`/`ng-invalid` pair is the most interesting, because you want to send a
+The `ng-valid`/`ng-invalid` pair is particularly interesting, because you want to send a
-strong visual signal when the values are invalid. You also want to mark required fields.
+strong visual signal when the values are invalid.
-To create such visual feedback, add definitions for the `ng-*` CSS classes.
+You also want to mark required fields.
-
-*Delete* the `#spy` template reference variable and the `TODO` as they have served their purpose.
-
-## Add custom CSS for visual feedback
 
 You can mark required fields and invalid data at the same time with a colored bar
 on the left of the input box:
@@ -512,20 +348,25 @@ on the left of the input box:
   <img src="generated/images/guide/forms/validity-required-indicator.png" alt="Invalid Form">
 </div>
 
-You achieve this effect by adding these class definitions to a new `forms.css` file
+To change the appearance in this way, take the following steps.
-that you add to the project as a sibling to `index.html`:
 
-<code-example path="forms/src/assets/forms.css" header="src/assets/forms.css"></code-example>
+1. Add definitions for the `ng-*` CSS classes.
 
-Update the `<head>` of `index.html` to include this style sheet:
+2. Add these class definitions to a new `forms.css` file.
 
-<code-example path="forms/src/index.html" header="src/index.html (styles)" region="styles"></code-example>
+3. Add the new file to the project as a sibling to `index.html`:
 
-## Show and hide validation error messages
+   <code-example path="forms/src/assets/forms.css" header="src/assets/forms.css"></code-example>
 
-You can improve the form. The _Name_ input box is required and clearing it turns the bar red.
+4. In the `index.html` file, update the `<head>` tag to include the new style sheet.
-That says something is wrong but the user doesn't know *what* is wrong or what to do about it.
+
-Leverage the control's state to reveal a helpful message.
+   <code-example path="forms/src/index.html" header="src/index.html (styles)" region="styles"></code-example>
+
+### Show and hide validation error messages
+
+The **Name** input box is required and clearing it turns the bar red.
+That indicates that something is wrong, but the user doesn't know what is wrong or what to do about it.
+You can provide a helpful message by checking for and responding to the control's state.
 
 When the user deletes the name, the form should look like this:
 
@@ -533,166 +374,135 @@ When the user deletes the name, the form should look like this:
   <img src="generated/images/guide/forms/name-required-error.png" alt="Name required">
 </div>
 
-To achieve this effect, extend the `<input>` tag with the following:
+The **Hero Power** select box is also required, but it doesn't need this kind of error handling because the selection box already constrains the selection to valid values.
 
-* A [template reference variable](guide/template-syntax#ref-vars).
+To define and show an error message when appropriate, take the following steps.
-* The "*is required*" message in a nearby `<div>`, which you'll display only if the control is invalid.
 
-Here's an example of an error message added to the _name_ input box:
+1. Extend the `<input>` tag with a template reference variable that you can use to access the input box's Angular control from within the template. In the example, the variable is `#name="ngModel"`.
 
-<code-example path="forms/src/app/hero-form/hero-form.component.html" header="src/app/hero-form/hero-form.component.html (excerpt)" region="name-with-error-msg"></code-example>
+   <div class="alert is-helpful">
 
-You need a template reference variable to access the input box's Angular control from within the template.
+     The template reference variable (`#name`) is set to `"ngModel"` because that is the value of the [`NgModel.exportAs`](api/core/Directive#exportAs) property. This property tells Angular how to link a reference variable to a directive.
-Here you created a variable called `name` and gave it the value "ngModel".
 
-<div class="alert is-helpful">
+   </div>
 
-  Why "ngModel"?
+2. Add a `<div>` that contains a suitable error message.
-  A directive's [exportAs](api/core/Directive) property
+3. Show or hide the error message by binding properties of the `name`
-  tells Angular how to link the reference variable to the directive.
-  You set `name` to `ngModel` because the `ngModel` directive's `exportAs` property happens to be "ngModel".
-
-</div>
-
-You control visibility of the name error message by binding properties of the `name`
 control to the message `<div>` element's `hidden` property.
 
-<code-example path="forms/src/app/hero-form/hero-form.component.html" header="src/app/hero-form/hero-form.component.html (hidden-error-msg)" region="hidden-error-msg"></code-example>
+   <code-example path="forms/src/app/hero-form/hero-form.component.html" header="src/app/hero-form/hero-form.component.html (hidden-error-msg)" region="hidden-error-msg"></code-example>
 
-In this example, you hide the message when the control is valid or pristine;
+4. Add a conditional error message to the _name_ input box, as in the following example.
-"pristine" means the user hasn't changed the value since it was displayed in this form.
 
-This user experience is the developer's choice. Some developers want the message to display at all times.
+   <code-example path="forms/src/app/hero-form/hero-form.component.html" header="src/app/hero-form/hero-form.component.html (excerpt)" region="name-with-error-msg"></code-example>
+
+<div class="callout is-helpful">
+
+<header>Illustrating the "pristine" state</header>
+
+In this example, you hide the message when the control is either valid or *pristine*.
+Pristine means the user hasn't changed the value since it was displayed in this form.
 If you ignore the `pristine` state, you would hide the message only when the value is valid.
 If you arrive in this component with a new (blank) hero or an invalid hero,
 you'll see the error message immediately, before you've done anything.
 
-Some developers want the message to display only when the user makes an invalid change.
+You might want the message to display only when the user makes an invalid change.
-Hiding the message while the control is "pristine" achieves that goal.
+Hiding the message while the control is in the `pristine` state achieves that goal.
-You'll see the significance of this choice when you add a new hero to the form.
+You'll see the significance of this choice when you add a new hero to the form in the next step.
 
-The hero *Alter Ego* is optional so you can leave that be.
+</div>
 
-Hero *Power* selection is required.
+## Add a new hero
-You can add the same kind of error handling to the `<select>` if you want,
-but it's not imperative because the selection box already constrains the
-power to valid values.
 
-Now you'll add a new hero in this form.
+This exercise shows how you can respond to a native HTML button-click event by adding to the model data.
-Place a *New Hero* button at the bottom of the form and bind its click event to a `newHero` component method.
+To let form users add a new hero, you will add a **New Hero** button that responds to a click event.
 
-<code-example path="forms/src/app/hero-form/hero-form.component.html" region="new-hero-button-no-reset" header="src/app/hero-form/hero-form.component.html (New Hero button)"></code-example>
+1. In the template, place a "New Hero" `<button>` element at the bottom of the form.
+2. In the component file, add the hero-creation method to the hero data model.
 
-<code-example path="forms/src/app/hero-form/hero-form.component.ts" region="new-hero" header="src/app/hero-form/hero-form.component.ts (New Hero method)"></code-example>
+   <code-example path="forms/src/app/hero-form/hero-form.component.ts" region="new-hero" header="src/app/hero-form/hero-form.component.ts (New Hero method)"></code-example>
 
-Run the application again, click the *New Hero* button, and the form clears.
+3. Bind the button's click event to a hero-creation method, `newHero()`.
-The *required* bars to the left of the input box are red, indicating invalid `name` and `power` properties.
-That's understandable as these are required fields.
-The error messages are hidden because the form is pristine; you haven't changed anything yet.
 
-Enter a name and click *New Hero* again.
+   <code-example path="forms/src/app/hero-form/hero-form.component.html" region="new-hero-button-no-reset" header="src/app/hero-form/hero-form.component.html (New Hero button)"></code-example>
-The app displays a _Name is required_ error message.
-You don't want error messages when you create a new (empty) hero.
-Why are you getting one now?
 
-Inspecting the element in the browser tools reveals that the *name* input box is _no longer pristine_.
+4. Run the application again and click the **New Hero** button.
-The form remembers that you entered a name before clicking *New Hero*.
-Replacing the hero object *did not restore the pristine state* of the form controls.
 
-You have to clear all of the flags imperatively, which you can do
+   The form clears, and the *required* bars to the left of the input box are red, indicating invalid `name` and `power` properties.
-by calling the form's `reset()` method after calling the `newHero()` method.
+   Notice that the error messages are hidden. This is because the form is pristine; you haven't changed anything yet.
 
-<code-example path="forms/src/app/hero-form/hero-form.component.html" region="new-hero-button-form-reset" header="src/app/hero-form/hero-form.component.html (Reset the form)"></code-example>
+5. Enter a name and click **New Hero** again.
 
-Now clicking "New Hero" resets both the form and its control flags.
+   Now the app displays a _Name is required_ error message, because the input box is no longer pristine.
+   The form remembers that you entered a name before clicking **New Hero**.
+
+6. To restore the pristine state of the form controls, clear all of the flags imperatively by calling the form's `reset()` method after calling the `newHero()` method.
+
+   <code-example path="forms/src/app/hero-form/hero-form.component.html" region="new-hero-button-form-reset" header="src/app/hero-form/hero-form.component.html (Reset the form)"></code-example>
+
+   Now clicking **New Hero** resets both the form and its control flags.
+
+<div class="alert is-helpful">
+
+See the [User Input](guide/user-input) guide for more information about listening for DOM events with an event binding and updating a corresponding component property.
+
+</div>
 
 ## Submit the form with _ngSubmit_
 
 The user should be able to submit this form after filling it in.
-The *Submit* button at the bottom of the form
+The **Submit** button at the bottom of the form does nothing on its own, but it does
-does nothing on its own, but it will
+trigger a form-submit event because of its type (`type="submit"`).
-trigger a form submit because of its type (`type="submit"`).
+To respond to this event, take the following steps.
 
-A "form submit" is useless at the moment.
+1. Bind the form's [`ngSubmit`](api/forms/NgForm#properties) event property to the hero-form component's `onSubmit()` method.
-To make it useful, bind the form's `ngSubmit` event property
-to the hero form component's `onSubmit()` method:
 
-<code-example path="forms/src/app/hero-form/hero-form.component.html" header="src/app/hero-form/hero-form.component.html (ngSubmit)" region="ngSubmit"></code-example>
+   <code-example path="forms/src/app/hero-form/hero-form.component.html" header="src/app/hero-form/hero-form.component.html (ngSubmit)" region="ngSubmit"></code-example>
 
-You'd already defined a template reference variable,
+2. Use the template reference variable, `#heroForm` to access the form that contains the **Submit** button and create an event binding.
-`#heroForm`, and initialized it with the value "ngForm".
+You will bind the form property that indicates its overall validity to the **Submit** button's `disabled` property.
-Now, use that variable to access the form with the Submit button.
 
+   <code-example path="forms/src/app/hero-form/hero-form.component.html" header="src/app/hero-form/hero-form.component.html (submit-button)" region="submit-button"></code-example>
 
-You'll bind the form's overall validity via
+3. Run the application now. Notice that the button is enabled&mdash;although
-the `heroForm` variable to the button's `disabled` property
-using an event binding. Here's the code:
-
-<code-example path="forms/src/app/hero-form/hero-form.component.html" header="src/app/hero-form/hero-form.component.html (submit-button)" region="submit-button"></code-example>
-
-If you run the application now, you find that the button is enabled&mdash;although
 it doesn't do anything useful yet.
 
-Now if you delete the Name, you violate the "required" rule, which
+4. Delete the **Name** value. This violates the "required" rule, so it displays the error message&emdash;and notice that it also disables the **Submit** button.
-is duly noted in the error message.
-The *Submit* button is also disabled.
 
-Not impressed?  Think about it for a moment. What would you have to do to
-wire the button's enable/disabled state to the form's validity without Angular's help?
 
-For you, it was as simple as this:
+   You didn't have to explicitly wire the button's enabled state to the form's validity.
+   The `FormsModule` did this automatically when you defined a template reference variable on the enhanced form element, then referred to that variable in the button control.
 
-1. Define a template reference variable on the (enhanced) form element.
+### Respond to form submission
-2. Refer to that variable in a button many lines away.
 
-## Toggle two form regions (extra credit)
+To show a response to form submission, you can hide the data entry area and display something else in its place.
 
-Submitting the form isn't terribly dramatic at the moment.
+1. Wrap the entire form in a `<div>` and bind
-
-<div class="alert is-helpful">
-
-  An unsurprising observation for a demo. To be honest,
-  jazzing it up won't teach you anything new about forms.
-  But this is an opportunity to exercise some of your newly won
-  binding skills.
-  If you aren't interested, skip to this page's conclusion.
-
-</div>
-
-For a more strikingly visual effect,
-hide the data entry area and display something else.
-
-Wrap the form in a `<div>` and bind
 its `hidden` property to the `HeroFormComponent.submitted` property.
 
-<code-example path="forms/src/app/hero-form/hero-form.component.html" header="src/app/hero-form/hero-form.component.html (excerpt)" region="edit-div"></code-example>
+   <code-example path="forms/src/app/hero-form/hero-form.component.html" header="src/app/hero-form/hero-form.component.html (excerpt)" region="edit-div"></code-example>
 
-The main form is visible from the start because the
+   * The main form is visible from the start because the `submitted` property is false until you submit the form, as this fragment from the `HeroFormComponent` shows:
-`submitted` property is false until you submit the form,
-as this fragment from the `HeroFormComponent` shows:
 
-<code-example path="forms/src/app/hero-form/hero-form.component.ts" header="src/app/hero-form/hero-form.component.ts (submitted)" region="submitted"></code-example>
+      <code-example path="forms/src/app/hero-form/hero-form.component.ts" header="src/app/hero-form/hero-form.component.ts (submitted)" region="submitted"></code-example>
 
-When you click the *Submit* button, the `submitted` flag becomes true and the form disappears
+   * When you click the **Submit** button, the `submitted` flag becomes true and the form disappears.
-as planned.
 
-Now the app needs to show something else while the form is in the submitted state.
+2. To show something else while the form is in the submitted state, add the following HTML below the new `<div>` wrapper.
-Add the following HTML below the `<div>` wrapper you just wrote:
 
-<code-example path="forms/src/app/hero-form/hero-form.component.html" header="src/app/hero-form/hero-form.component.html (excerpt)" region="submitted"></code-example>
+   <code-example path="forms/src/app/hero-form/hero-form.component.html" header="src/app/hero-form/hero-form.component.html (excerpt)" region="submitted"></code-example>
 
-There's the hero again, displayed read-only with interpolation bindings.
+   This `<div>`, which shows a read-only hero with interpolation bindings, appears only while the component is in the submitted state.
-This `<div>` appears only while the component is in the submitted state.
 
-The HTML includes an *Edit* button whose click event is bound to an expression
+   The alternative display includes an *Edit* button whose click event is bound to an expression
 that clears the `submitted` flag.
 
-When you click the *Edit* button, this block disappears and the editable form reappears.
+3. Click the *Edit* button to switch the display back to the editable form.
 
 ## Summary
 
 The Angular form discussed in this page takes advantage of the following
-framework features to provide support for data modification, validation, and more:
+framework features to provide support for data modification, validation, and more.
 
 * An Angular HTML form template.
 * A form component class with a `@Component` decorator.
@@ -700,8 +510,8 @@ framework features to provide support for data modification, validation, and mor
 * Template-reference variables such as `#heroForm` and `#name`.
 * `[(ngModel)]` syntax for two-way data binding.
 * The use of `name` attributes for validation and form-element change tracking.
-* The reference variable’s `valid` property on input controls to check if a control is valid and show/hide error messages.
+* The reference variable’s `valid` property on input controls to check if a control is valid and show or hide error messages.
-* Controlling the *Submit* button's enabled state by binding to `NgForm` validity.
+* Controlling the **Submit** button's enabled state by binding to `NgForm` validity.
 * Custom CSS classes that provide visual feedback to users about invalid controls.
 
 Here’s the code for the final version of the application:
@@ -741,4 +551,3 @@ Here’s the code for the final version of the application:
   </code-pane>
 
 </code-tabs>
-

aio/content/guide/glossary.md

@@ -214,6 +214,13 @@ Read more about component classes, templates, and views in [Introduction to Angu
 
 See  [workspace configuration](#cli-config)
 
+{@a content-projection}
+
+## content projection
+
+A way to insert DOM content from outside a component into the component's view in a designated spot.
+
+For more information, see [Responding to changes in content](guide/lifecycle-hooks#content-projection).
 
 {@a custom-element}
 
@@ -594,7 +601,7 @@ Compare to [NgModule](#ngmodule).
 ## ngcc
 
 Angular compatibility compiler.
-If you build your app using [Ivy](#ivy), but it depends on libraries have not been compiled with Ivy, the CLI uses `ngcc` to automatically update the dependent libraries to use Ivy.
+If you build your app using [Ivy](#ivy), but it depends on libraries that have not been compiled with Ivy, the CLI uses `ngcc` to automatically update the dependent libraries to use Ivy.
 
 
 {@a ngmodule}
@@ -943,9 +950,26 @@ Many code editors and IDEs support TypeScript either natively or with plug-ins.
 TypeScript is the preferred language for Angular development.
 Read more about TypeScript at [typescriptlang.org](http://www.typescriptlang.org/).
 
+## TypeScript configuration file
+
+A file specifies the root files and the compiler options required to compile a TypeScript project. For more information, see [TypeScript configuration](/guide/typescript-configuration).
+
 
 {@a U}
 
+{@a unidirectional-data-flow}
+
+## unidirectional data flow
+
+A data flow model where the component tree is always checked for changes in one direction (parent to child), which prevents cycles in the change detection graph.
+
+In practice, this means that data in Angular flows downward during change detection.
+A parent component can easily change values in its child components because the parent is checked first.
+A failure could occur, however, if a child component tries to change a value in its parent during change detection (inverting the expected data flow), because the parent component has already been rendered.
+In development mode, Angular throws the `ExpressionChangedAfterItHasBeenCheckedError` error if your app attempts to do this, rather than silently failing to render the new value.
+
+To avoid this error, a [lifecycle hook](guide/lifecycle-hooks) method that seeks to make such a change should trigger a new change detection run. The new run follows the same direction as before, but succeeds in picking up the new value.
+
 {@a universal}
 
 ## Universal
@@ -968,7 +992,7 @@ Angular renders a view under the control of one or more [directives](#directive)
 A [component](#component) class and its associated [template](#template) define a view.
 A view is specifically represented by a `ViewRef` instance associated with a component.
 A view that belongs immediately to a component is called a *host view*.
-Views are typically collected into [view hierarchies](#view-tree). 
+Views are typically collected into [view hierarchies](#view-tree).
 
 Properties of elements in a view can change dynamically, in response to user actions;
 the structure (number and order) of elements in a view can't.

aio/content/guide/http.md

@@ -1,6 +1,6 @@
 # Communicating with backend services using HTTP
 
-Most front-end applications need to communicate with a server over the HTTP protocol, in order to download or upload data and accesss other back-end services.
+Most front-end applications need to communicate with a server over the HTTP protocol, in order to download or upload data and access other back-end services.
 Angular provides a simplified client HTTP API for Angular applications, the `HttpClient` service class in `@angular/common/http`.
 
 The HTTP client service offers the following major features.
@@ -63,7 +63,7 @@ Look at the `AppModule` _imports_ to see how it is configured.
 ## Requesting data from a server
 
 Use the [`HTTPClient.get()`](api/common/http/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 when the response is received.
+The asynchronous method sends an HTTP request, and returns an Observable that emits the requested data when the response is received.
 The return type varies based on the `observe` and `responseType` values that you pass to the call.
 
 The `get()` method takes two arguments; the endpoint URL from which to fetch, and an *options* object that you can use to configure the request.
@@ -805,16 +805,16 @@ The `CachingInterceptor` in the following example demonstrates this approach.
   header="app/http-interceptors/caching-interceptor.ts)">
 </code-example>
 
-* The `isCachable()` function determines if the request is cachable.
+* The `isCacheable()` function determines if the request is cacheable.
-In this sample, only GET requests to the npm package search api are cachable.
+In this sample, only GET requests to the npm package search api are cacheable.
 
-* If the request is not cachable, the interceptor simply forwards the request
+* If the request is not cacheable, the interceptor simply forwards the request
 to the next handler in the chain.
 
-* If a cachable request is found in the cache, the interceptor returns an `of()` _observable_ with
+* If a cacheable request is found in the cache, the interceptor returns an `of()` _observable_ with
 the cached response, by-passing the `next` handler (and all other interceptors downstream).
 
-* If a cachable request is not in cache, the code calls `sendRequest()`.
+* If a cacheable request is not in cache, the code calls `sendRequest()`.
 This function creates a [request clone](#immutability) without headers, because the npm API forbids them.
 The function then forwards the clone of the request to `next.handle()` which ultimately calls the server and returns the server's response.
 

aio/content/guide/ivy-compatibility.md

@@ -2,20 +2,20 @@
 
 The Angular team has worked hard to ensure Ivy is as backwards-compatible with the previous rendering engine ("View Engine") as possible.
 However, in rare cases, minor changes were necessary to ensure that the Angular's behavior was predictable and consistent, correcting issues in the View Engine implementation.
-In order to smooth the transition, we have provided [automated migrations](guide/updating-to-version-9#migrations) wherever possible so your application and library code is migrated automatically by the CLI.
+In order to smooth the transition, we have provided [automated migrations](guide/updating-to-version-10#migrations) wherever possible so your application and library code is migrated automatically by the CLI.
 That said, some applications will likely need to apply some manual updates.
 
 {@a debugging}
 ## How to debug errors with Ivy
 
-In version 9, [a few deprecated APIs have been removed](guide/updating-to-version-9#removals) and there are a [few breaking changes](guide/updating-to-version-9#breaking-changes) unrelated to Ivy.
+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.json` and re-start your app.
+To do so, temporarily [turn off Ivy](guide/ivy#opting-out-of-angular-ivy) in your `tsconfig.base.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 9 guide](guide/updating-to-version-9). If you've opted into any of the stricter type-checking settings that are new with v9, you may also want to check out the [template type-checking guide](guide/template-typecheck).
+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.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.base.json` and review the list of expected changes below.
 
 {@a payload-size-debugging}
 ### Payload size debugging

aio/content/guide/lazy-loading-ngmodules.md

@@ -1,19 +1,61 @@
 # Lazy-loading feature modules
 
-## High level view
-
 By default, NgModules are eagerly loaded, which means that as soon as the app loads, so do all the NgModules, whether or not they are immediately necessary. For large apps with lots of routes, consider lazy loading—a design pattern that loads NgModules as needed. Lazy loading helps keep initial
 bundle sizes smaller, which in turn helps decrease load times.
 
+<div class="alert is-helpful">
+
 For the final sample app with two lazy-loaded modules that this page describes, see the
 <live-example></live-example>.
 
+</div>
+
+{@a lazy-loading}
+
+## Lazy loading basics
+
+This section introduces the basic procedure for configuring a lazy-loaded route.
+For a step-by-step example, see the [step-by-step setup](#step-by-step) section on this page.
+
+To lazy load Angular modules, use `loadchildren` (instead of `component`) in your `AppRoutingModule` `routes` configuration as follows.
+
+<code-example header="AppRoutingModule (excerpt)">
+
+const routes: Routes = [
+  {
+    path: 'items',
+    loadChildren: () => import('./items/items.module').then(m => m.ItemsModule)
+  }
+];
+
+</code-example>
+
+In the lazy-loaded module's routing module, add a route for the component.
+
+<code-example header="Routing module for lazy loaded module (excerpt)">
+
+const routes: Routes = [
+  {
+    path: '',
+    component: ItemsComponent
+  }
+];
+
+</code-example>
+
+Also be sure to remove the `ItemsModule` from the `AppModule`.
+For step-by-step instructions on lazy loading modules, continue with the following sections of this page.
+
+{@a step-by-step}
+
+## Step-by-step setup
+
 There are two main steps to setting up a lazy-loaded feature module:
 
 1. Create the feature module with the CLI, using the `--route` flag.
 1. Configure the routes.
 
-## Set up an app
+### Set up an app
 
 If you don’t already have an app, you can follow the steps below to
 create one with the CLI. If you already have an app, skip to
@@ -36,7 +78,7 @@ See [Keeping Up to Date](guide/updating).
 
 </div>
 
-## Create a feature module with routing
+### Create a feature module with routing
 
 Next, you’ll need a feature module with a component to route to.
 To make one, enter the following command in the terminal, where `customers` is the name of the feature module. The path for loading the `customers` feature modules is also `customers` because it is specified with the `--route` option:
@@ -59,7 +101,7 @@ Instead, it adds the declared route, `customers` to the `routes` array declared
 Notice that the lazy-loading syntax uses `loadChildren` followed by a function that uses the browser's built-in `import('...')` syntax for dynamic imports.
 The import path is the relative path to the module.
 
-### Add another feature module
+#### Add another feature module
 
 Use the same command to create a second lazy-loaded feature module with routing, along with its stub component.
 
@@ -76,16 +118,14 @@ The `orders` route, specified with the `--route` option, is added to the `routes
   region="routes-customers-orders">
 </code-example>
 
-## Set up the UI
+### Set up the UI
 
 Though you can type the URL into the address bar, a navigation UI is easier for the user and more common.
 Replace the default placeholder markup in `app.component.html` with a custom nav
 so you can easily navigate to your modules in the browser:
 
-
 <code-example path="lazy-loading-ngmodules/src/app/app.component.html" header="app.component.html" region="app-component-template" header="src/app/app.component.html"></code-example>
 
-
 To see your app in the browser so far, enter the following command in the terminal window:
 
 <code-example language="bash">
@@ -102,7 +142,7 @@ These buttons work, because the CLI automatically added the routes to the featur
 
 {@a config-routes}
 
-## Imports and route configuration
+### Imports and route configuration
 
 The CLI automatically added each feature module to the routes map at the application level.
 Finish this off by adding the default route. In the `app-routing.module.ts` file, update the `routes` array with the following:
@@ -134,7 +174,7 @@ The other feature module's routing module is configured similarly.
 
 <code-example path="lazy-loading-ngmodules/src/app/orders/orders-routing.module.ts" id="orders-routing.module.ts" region="orders-routing-module-detail" header="src/app/orders/orders-routing.module.ts (excerpt)"></code-example>
 
-## Confirm it’s working
+### Verify lazy loading
 
 You can check to see that a module is indeed being lazy loaded with the Chrome developer tools. In Chrome, open the dev tools by pressing `Cmd+Option+i` on a Mac or `Ctrl+Shift+j` on a PC and go to the Network Tab.
 
@@ -175,6 +215,105 @@ The `forRoot()` method takes care of the *global* injector configuration for the
 The `forChild()` method has no injector configuration. It uses directives such as `RouterOutlet` and `RouterLink`.
 For more information, see the [`forRoot()` pattern](guide/singleton-services#forRoot) section of the [Singleton Services](guide/singleton-services) guide.
 
+{@a preloading}
+
+## Preloading
+
+Preloading improves UX by loading parts of your app in the background.
+You can preload modules or component data.
+
+### Preloading modules
+
+Preloading modules improves UX by loading parts of your app in the background so users don't have to wait for the elements to download when they activate a route.
+
+To enable preloading of all lazy loaded modules, import the `PreloadAllModules` token from the Angular `router`.
+
+<code-example header="AppRoutingModule (excerpt)">
+
+import { PreloadAllModules } from '@angular/router';
+
+</code-example>
+
+Still in the `AppRoutingModule`, specify your preloading strategy in `forRoot()`.
+
+<code-example header="AppRoutingModule (excerpt)">
+
+RouterModule.forRoot(
+  appRoutes,
+  {
+    preloadingStrategy: PreloadAllModules
+  }
+)
+
+</code-example>
+
+### Preloading component data
+
+To preload component data, you can use a `resolver`.
+Resolvers improve UX by blocking the page load until all necessary data is available to fully display the page.
+
+#### Resolvers
+
+Create a resolver service.
+With the CLI, the command to generate a service is as follows:
+
+
+<code-example language="none" class="code-shell">
+  ng generate service <service-name>
+</code-example>
+
+In your service, import the following router members, implement `Resolve`, and inject the `Router` service:
+
+<code-example header="Resolver service (excerpt)">
+
+import { Resolve } from '@angular/router';
+
+...
+
+export class CrisisDetailResolverService implements Resolve<> {
+  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<> {
+    // your logic goes here
+  }
+}
+
+</code-example>
+
+Import this resolver into your module's routing module.
+
+<code-example header="Feature module's routing module (excerpt)">
+
+import { YourResolverService }    from './your-resolver.service';
+
+</code-example>
+
+Add a `resolve` object to the component's `route` configuration.
+
+<code-example header="Feature module's routing module (excerpt)">
+{
+  path: '/your-path',
+  component: YourComponent,
+  resolve: {
+    crisis: YourResolverService
+  }
+}
+</code-example>
+
+
+In the component, use an `Observable` to get the data from the `ActivatedRoute`.
+
+
+<code-example header="Component (excerpt)">
+ngOnInit() {
+  this.route.data
+    .subscribe((your-parameters) => {
+      // your data-specific code goes here
+    });
+}
+</code-example>
+
+For more information with a working example, see the [routing tutorial section on preloading](guide/router#preloading-background-loading-of-feature-areas).
+
+
 <hr>
 
 ## More on NgModules and routing

aio/content/guide/lifecycle-hooks.md

@@ -1,45 +1,49 @@
-# Lifecycle hooks
+# Hooking into the component lifecycle
 
-A component has a lifecycle managed by Angular.
+A component instance has a lifecycle that starts when Angular instantiates the component class and renders the component view along with its child views.
+The lifecycle continues with change detection, as Angular checks to see when data-bound properties change, and updates both the view and the component instance as needed.
+The lifecycle ends when Angular destroys the component instance and removes its rendered template from the DOM.
+Directives have a similar lifecycle, as Angular creates, updates, and destroys instances in the course of execution.
 
-Angular creates and renders components along with their children, checks when their data-bound properties change, and destroys them before removing them from the DOM.
+Your application can use [lifecycle hook methods](guide/glossary#lifecycle-hook "Definition of lifecycle hook") to tap into key events in the lifecycle of a component or directive in order to initialize new instances, initiate change detection when needed, respond to updates during change detection, and clean up before deletion of instances.
 
-Angular offers **lifecycle hooks**
+## Prerequisites
-that provide visibility into these key life moments and the ability to act when they occur.
 
-A directive has the same set of lifecycle hooks.
+Before working with lifecycle hooks, you should have a basic understanding of the following:
+
+* [TypeScript programming](https://www.typescriptlang.org/).
+* Angular app-design fundamentals, as described in [Angular Concepts](guide/architecture "Introduction to fundamental app-design concepts").
 
 {@a hooks-overview}
 
-## Component lifecycle hooks overview
+## Responding to lifecycle events
 
-Directive and component instances have a lifecycle
+You can respond to events in the lifecycle of a component or directive by implementing one or more of the *lifecycle hook* interfaces in the Angular `core` library.
-as Angular creates, updates, and destroys them.
+The hooks give you the opportunity to act on a component or directive instance at the appropriate moment, as Angular creates, updates, or destroys that instance.
-Developers can tap into key moments in that lifecycle by implementing
-one or more of the *lifecycle hook* interfaces in the Angular `core` library.
 
-Each interface has a single hook method whose name is the interface name prefixed with `ng`.
+Each interface defines the prototype for a single hook method, whose name is the interface name prefixed with `ng`.
-For example, the `OnInit` interface has a hook method named `ngOnInit()`
+For example, the `OnInit` interface has a hook method named `ngOnInit()`. If you implement this method in your component or directive class, Angular calls it shortly after checking the input properties for that component or directive for the first time.
-that Angular calls shortly after creating the component:
 
 <code-example path="lifecycle-hooks/src/app/peek-a-boo.component.ts" region="ngOnInit" header="peek-a-boo.component.ts (excerpt)"></code-example>
 
-No directive or component will implement all of the lifecycle hooks.
+You don't have to implement all (or any) of the lifecycle hooks, just the ones you need.
-Angular only calls a directive/component hook method *if it is defined*.
 
 {@a hooks-purpose-timing}
 
-## Lifecycle sequence
+### Lifecycle event sequence
 
-*After* creating a component/directive by calling its constructor, Angular
+After your application instantiates a component or directive by calling its constructor, Angular calls the hook methods you have implemented at the appropriate point in the lifecycle of that instance.
-calls the lifecycle hook methods in the following sequence at specific moments:
+
+Angular executes hook methods in the following sequence. You can use them to perform the following kinds of operations.
 
 <table width="100%">
   <col width="20%"></col>
-  <col width="80%"></col>
+  <col width="60%"></col>
+  <col width="20%"></col>
   <tr>
-    <th>Hook</th>
+    <th>Hook method</th>
-    <th>Purpose and Timing</th>
+    <th>Purpose</th>
+    <th>Timing</th>
   </tr>
   <tr style='vertical-align:top'>
     <td>
@@ -47,9 +51,15 @@ calls the lifecycle hook methods in the following sequence at specific moments:
     </td>
     <td>
 
-      Respond when Angular (re)sets data-bound input properties.
+      Respond when Angular sets or resets data-bound input properties.
       The method receives a `SimpleChanges` object of current and previous property values.
 
+      Note that this happens very frequently, so any operation you perform here impacts performance significantly.
+      See details in [Using change detection hooks](#onchanges) in this document.
+
+    </td>
+    <td>
+
       Called before `ngOnInit()` and whenever one or more data-bound input properties change.
 
     </td>
@@ -60,10 +70,14 @@ calls the lifecycle hook methods in the following sequence at specific moments:
     </td>
     <td>
 
-      Initialize the directive/component after Angular first displays the data-bound properties
+      Initialize the directive or component after Angular first displays the data-bound properties
-      and sets the directive/component's input properties.
+      and sets the directive or component's input properties.
+      See details in [Initializing a component or directive](#oninit) in this document.
 
-      Called _once_, after the _first_ `ngOnChanges()`.
+    </td>
+    <td>
+
+      Called once, after the first `ngOnChanges()`.
 
     </td>
   </tr>
@@ -74,8 +88,12 @@ calls the lifecycle hook methods in the following sequence at specific moments:
     <td>
 
       Detect and act upon changes that Angular can't or won't detect on its own.
+      See details and example in [Defining custom change detection](#docheck) in this document.
 
-      Called during every change detection run, immediately after `ngOnChanges()` and `ngOnInit()`.
+    </td>
+    <td>
+
+    Called immediately after `ngOnChanges()` on every change detection run, and immediately after `ngOnInit()` on the first run.
 
     </td>
   </tr>
@@ -85,7 +103,13 @@ calls the lifecycle hook methods in the following sequence at specific moments:
     </td>
     <td>
 
-      Respond after Angular projects external content into the component's view / the view that a directive is in.
+      Respond after Angular projects external content into the component's view, or into the view that a directive is in.
+
+      See details and example in [Responding to changes in content](#aftercontent) in this document.
+
+
+    </td>
+    <td>
 
       Called _once_ after the first `ngDoCheck()`.
 
@@ -97,9 +121,15 @@ calls the lifecycle hook methods in the following sequence at specific moments:
     </td>
     <td>
 
-      Respond after Angular checks the content projected into the directive/component.
+      Respond after Angular checks the content projected into the directive or component.
 
-      Called after the `ngAfterContentInit()` and every subsequent `ngDoCheck()`.
+      See details and example in [Responding to projected content changes](#aftercontent) in this document.
+
+    </td>
+
+    <td>
+
+      Called after `ngAfterContentInit()` and every subsequent `ngDoCheck()`.
 
     </td>
   </tr>
@@ -109,10 +139,15 @@ calls the lifecycle hook methods in the following sequence at specific moments:
     </td>
     <td>
 
-      Respond after Angular initializes the component's views and child views / the view that a directive is in.
+      Respond after Angular initializes the component's views and child views, or the view that contains the directive.
+
+      See details and example in [Responding to view changes](#afterview) in this document.
+
+    </td>
+
+    <td>
 
       Called _once_ after the first `ngAfterContentChecked()`.
-
     </td>
   </tr>
   <tr style='vertical-align:top'>
@@ -121,7 +156,11 @@ calls the lifecycle hook methods in the following sequence at specific moments:
     </td>
     <td>
 
-      Respond after Angular checks the component's views and child views / the view that a directive is in.
+      Respond after Angular checks the component's views and child views, or the view that contains the directive.
+
+    </td>
+
+    <td>
 
       Called after the `ngAfterViewInit()` and every subsequent `ngAfterContentChecked()`.
 
@@ -133,53 +172,32 @@ calls the lifecycle hook methods in the following sequence at specific moments:
     </td>
     <td>
 
-      Cleanup just before Angular destroys the directive/component.
+      Cleanup just before Angular destroys the directive or component.
       Unsubscribe Observables and detach event handlers to avoid memory leaks.
+      See details in [Cleaning up on instance destruction](#ondestroy) in this document.
 
-      Called _just before_ Angular destroys the directive/component.
+    </td>
+
+    <td>
+
+      Called immediately before Angular destroys the directive or component.
 
     </td>
   </tr>
 </table>
 
-{@a interface-optional}
-
-## Interfaces are optional (technically)
-
-The interfaces are optional for JavaScript and Typescript developers from a purely technical perspective.
-The JavaScript language doesn't have interfaces.
-Angular can't see TypeScript interfaces at runtime because they disappear from the transpiled JavaScript.
-
-Fortunately, they aren't necessary.
-You don't have to add the lifecycle hook interfaces to directives and components to benefit from the hooks themselves.
-
-Angular instead inspects directive and component classes and calls the hook methods *if they are defined*.
-Angular finds and calls methods like `ngOnInit()`, with or without the interfaces.
-
-Nonetheless, it's good practice to add interfaces to TypeScript directive classes
-in order to benefit from strong typing and editor tooling.
-
-{@a other-lifecycle-hooks}
-
-## Other Angular lifecycle hooks
-
-Other Angular sub-systems may have their own lifecycle hooks apart from these component hooks.
-
-3rd party libraries might implement their hooks as well in order to give developers more
-control over how these libraries are used.
-
 {@a the-sample}
 
-## Lifecycle examples
+### Lifecycle example set
 
 The <live-example></live-example>
-demonstrates the lifecycle hooks in action through a series of exercises
+demonstrates the use of lifecycle hooks through a series of exercises
 presented as components under the control of the root `AppComponent`.
-
+In each case a *parent* component serves as a test rig for
-They follow a common pattern: a *parent* component serves as a test rig for
 a *child* component that illustrates one or more of the lifecycle hook methods.
 
-Here's a brief description of each exercise:
+The following table lists the exercises with brief descriptions.
+The sample code is also used to illustrate specific tasks in the following sections.
 
 <table width="100%">
   <col width="20%"></col>
@@ -205,12 +223,9 @@ Here's a brief description of each exercise:
     </td>
     <td>
 
-      Directives have lifecycle hooks too.
+      Shows how you can use lifecycle hooks with a custom directive.
-      A `SpyDirective` can log when the element it spies upon is
+      The `SpyDirective` implements the `ngOnInit()` and `ngOnDestroy()` hooks,
-      created or destroyed using the `ngOnInit` and `ngOnDestroy` hooks.
+      and uses them to watch and report when an element goes in or out of the current view.
-
-      This example applies the `SpyDirective` to a `<div>` in an `ngFor` *hero* repeater
-      managed by the parent `SpyComponent`.
 
     </td>
   </tr>
@@ -220,9 +235,9 @@ Here's a brief description of each exercise:
     </td>
     <td>
 
-      See how Angular calls the `ngOnChanges()` hook with a `changes` object
+      Demonstrates how Angular calls the `ngOnChanges()` hook
-      every time one of the component input properties changes.
+      every time one of the component input properties changes,
-      Shows how to interpret the `changes` object.
+      and shows how to interpret the `changes` object passed to the hook method.
 
     </td>
   </tr>
@@ -232,8 +247,8 @@ Here's a brief description of each exercise:
     </td>
     <td>
 
-      Implements an `ngDoCheck()` method with custom change detection.
+      Implements the `ngDoCheck()` method with custom change detection.
-      See how often Angular calls this hook and watch it post changes to a log.
+      Watch the hook post changes to a log to see how often Angular calls this hook.
 
     </td>
   </tr>
@@ -243,8 +258,8 @@ Here's a brief description of each exercise:
     </td>
     <td>
 
-      Shows what Angular means by a *view*.
+      Shows what Angular means by a [view](guide/glossary#view "Definition of view.").
-      Demonstrates the `ngAfterViewInit` and `ngAfterViewChecked` hooks.
+      Demonstrates the `ngAfterViewInit()` and `ngAfterViewChecked()` hooks.
 
     </td>
   </tr>
@@ -256,40 +271,87 @@ Here's a brief description of each exercise:
 
       Shows how to project external content into a component and
       how to distinguish projected content from a component's view children.
-      Demonstrates the `ngAfterContentInit` and `ngAfterContentChecked` hooks.
+      Demonstrates the `ngAfterContentInit()` and `ngAfterContentChecked()` hooks.
 
     </td>
   </tr>
   <tr style='vertical-align:top'>
     <td>
-      Counter
+       <a href="#counter">Counter</a>
     </td>
     <td>
 
-      Demonstrates a combination of a component and a directive
+      Demonstrates a combination of a component and a directive, each with its own hooks.
-      each with its own hooks.
-
-      In this example, a `CounterComponent` logs a change (via `ngOnChanges`)
-      every time the parent component increments its input counter property.
-      Meanwhile, the `SpyDirective` from the previous example is applied
-      to the `CounterComponent` log where it watches log entries being created and destroyed.
 
     </td>
   </tr>
 </table>
 
-The remainder of this page discusses selected exercises in further detail.
+
+{@a oninit}
+
+## Initializing a component or directive
+
+Use the `ngOnInit()` method to perform the following initialization tasks.
+
+* Perform complex initializations outside of the constructor.
+  Components should be cheap and safe to construct.
+  You should not, for example, fetch data in a component constructor.
+  You shouldn't worry that a new component will try to contact a remote server when
+  created under test or before you decide to display it.
+
+  An `ngOnInit()` is a good place for a component to fetch its initial data.
+  For an example, see the [Tour of Heroes tutorial](tutorial/toh-pt4#oninit).
+
+  <div class="alert is-helpful">
+
+  In [Flaw: Constructor does Real Work](http://misko.hevery.com/code-reviewers-guide/flaw-constructor-does-real-work/), Misko Hevery, Angular team lead, explains why you should avoid complex constructor logic.
+
+  </div>
+
+* Set up the component after Angular sets the input properties.
+  Constructors should do no more than set the initial local variables to simple values.
+
+  Keep in mind that a directive's data-bound input properties are not set until _after construction_.
+  If you need to initialize the directive based on those properties, set them when `ngOnInit()` runs.
+
+  <div class="alert is-helpful">
+
+     The `ngOnChanges()` method is your first opportunity to access those properties.
+     Angular calls `ngOnChanges()` before `ngOnInit()`, but also many times after that.
+     It only calls `ngOnInit()` once.
+
+  </div>
+
+{@a ondestroy}
+
+## Cleaning up on instance destruction
+
+Put cleanup logic in `ngOnDestroy()`, the logic that must run before Angular destroys the directive.
+
+This is the place to free resources that won't be garbage-collected automatically.
+You risk memory leaks if you neglect to do so.
+
+* Unsubscribe from Observables and DOM events.
+* Stop interval timers.
+* Unregister all callbacks that the directive registered with global or application services.
+
+The `ngOnDestroy()` method is also the time to notify another part of the application that the component is going away.
+
+
+## General examples
+
+The following examples demonstrate the call sequence and relative frequency of the various lifecycle events, and how the hooks can be used separately or together for components and directives.
 
 {@a peek-a-boo}
 
-## Peek-a-boo: all hooks
+### Sequence and frequency of all lifecycle events
 
-The `PeekABooComponent` demonstrates all of the hooks in one component.
+To show how Angular calls the hooks in the expected order, the `PeekABooComponent` demonstrates all of the hooks in one component.
 
-You would rarely, if ever, implement all of the interfaces like this.
+In practice you would rarely, if ever, implement all of the interfaces the way this demo does.
-The peek-a-boo exists to show how Angular calls the hooks in the expected order.
 
-This snapshot reflects the state of the log after the user clicked the *Create...* button and then the *Destroy...* button.
+The following snapshot reflects the state of the log after the user clicked the *Create...* button and then the *Destroy...* button.
 
 <div class="lightbox">
   <img src="generated/images/guide/lifecycle-hooks/peek-a-boo.png" alt="Peek-a-boo">
@@ -301,52 +363,42 @@ The sequence of log messages follows the prescribed hook calling order:
 
 <div class="alert is-helpful">
 
-  The constructor isn't an Angular hook *per se*.
+  Notice that the log confirms that input properties (the `name` property in this case) have no assigned values at construction.
-  The log confirms that input properties (the `name` property in this case) have no assigned values at construction.
+  The input properties are available to the `onInit()` method for further initialization.
 
 </div>
 
-Had the user clicked the *Update Hero* button, the log would show another `OnChanges` and two more triplets of
+Had the user clicked the *Update Hero* button, the log would show another `OnChanges` and two more triplets of `DoCheck`, `AfterContentChecked` and `AfterViewChecked`.
-`DoCheck`, `AfterContentChecked` and `AfterViewChecked`.
+Notice that these three hooks fire *often*, so it is important to keep their logic as lean as possible.
-Clearly these three hooks fire *often*. Keep the logic in these hooks as lean as possible!
-
-The next examples focus on hook details.
-
 
 {@a spy}
 
-## Spying *OnInit* and *OnDestroy*
+### Use directives to watch the DOM
 
-Go undercover with these two spy hooks to discover when an element is initialized or destroyed.
+The `Spy` example demonstrates how you can use hook method for directives as well as components.
+The `SpyDirective` implements two hooks, `ngOnInit()` and `ngOnDestroy()`, in order to discover when a watched element is in the current view.
 
-This is the perfect infiltration job for a directive.
+This template applies the `SpyDirective` to a `<div>` in the `ngFor` *hero* repeater managed by the parent `SpyComponent`.
-The heroes will never know they're being watched.
 
-<div class="alert is-helpful">
+The example does not perform any initialization or clean-up.
+It just tracks the appearance and disappearance of an element in the view by recording when the directive itself is instantiated and destroyed.
 
-  Kidding aside, pay attention to two key points:
+A spy directive like this can provide insight into a DOM object that you cannot change directly.
+You can't touch the implementation of a native `<div>`, or modify a third party component.
+You can, however watch these elements with a directive.
 
-  1. Angular calls hook methods for *directives* as well as components.<br><br>
+The directive defines `ngOnInit()` and `ngOnDestroy()` hooks
-
-  2. A spy directive can provide insight into a DOM object that you cannot change directly.
-  Obviously you can't touch the implementation of a native `<div>`.
-  You can't modify a third party component either.
-  But you can watch both with a directive.
-
-</div>
-
-The sneaky spy directive is simple, consisting almost entirely of `ngOnInit()` and `ngOnDestroy()` hooks
 that log messages to the parent via an injected `LoggerService`.
 
 <code-example path="lifecycle-hooks/src/app/spy.directive.ts" region="spy-directive" header="src/app/spy.directive.ts"></code-example>
 
-You can apply the spy to any native or component element and it'll be initialized and destroyed
+You can apply the spy to any native or component element, and see that it is initialized and destroyed
 at the same time as that element.
 Here it is attached to the repeated hero `<div>`:
 
 <code-example path="lifecycle-hooks/src/app/spy.component.html" region="template" header="src/app/spy.component.html"></code-example>
 
-Each spy's birth and death marks the birth and death of the attached hero `<div>`
+Each spy's creation and destruction marks the appearance and disappearance of the attached hero `<div>`
 with an entry in the *Hook Log* as seen here:
 
 <div class="lightbox">
@@ -359,70 +411,20 @@ The *Reset* button clears the `heroes` list.
 Angular removes all hero `<div>` elements from the DOM and destroys their spy directives at the same time.
 The spy's `ngOnDestroy()` method reports its last moments.
 
-The `ngOnInit()` and `ngOnDestroy()` methods have more vital roles to play in real applications.
+{@a counter}
 
-{@a oninit}
+### Use component and directive hooks together
 
-### _OnInit()_
+In this example, a `CounterComponent` uses the `ngOnChanges()` method to log a change every time the parent component increments its input `counter` property.
 
-Use `ngOnInit()` for two main reasons:
+This example applies the `SpyDirective` from the previous example to the `CounterComponent` log, in order to watch the creation and destruction of log entries.
-
-1. To perform complex initializations shortly after construction.
-1. To set up the component after Angular sets the input properties.
-
-Experienced developers agree that components should be cheap and safe to construct.
-
-<div class="alert is-helpful">
-
-  Misko Hevery, Angular team lead,
-  [explains why](http://misko.hevery.com/code-reviewers-guide/flaw-constructor-does-real-work/)
-  you should avoid complex constructor logic.
-
-</div>
-
-Don't fetch data in a component constructor.
-You shouldn't worry that a new component will try to contact a remote server when
-created under test or before you decide to display it.
-Constructors should do no more than set the initial local variables to simple values.
-
-An `ngOnInit()` is a good place for a component to fetch its initial data. The
-[Tour of Heroes Tutorial](tutorial/toh-pt4#oninit) guide shows how.
-
-
-Remember also that a directive's data-bound input properties are not set until _after construction_.
-That's a problem if you need to initialize the directive based on those properties.
-They'll have been set when `ngOnInit()` runs.
-
-<div class="alert is-helpful">
-
-  The `ngOnChanges()` method is your first opportunity to access those properties.
-  Angular calls `ngOnChanges()` before `ngOnInit()` and many times after that.
-  It only calls `ngOnInit()` once.
-
-</div>
-
-You can count on Angular to call the `ngOnInit()` method _soon_ after creating the component.
-That's where the heavy initialization logic belongs.
-
-{@a ondestroy}
-
-### _OnDestroy()_
-
-Put cleanup logic in `ngOnDestroy()`, the logic that *must* run before Angular destroys the directive.
-
-This is the time to notify another part of the application that the component is going away.
-
-This is the place to free resources that won't be garbage collected automatically.
-Unsubscribe from Observables and DOM events. Stop interval timers.
-Unregister all callbacks that this directive registered with global or application services.
-You risk memory leaks if you neglect to do so.
 
 {@a onchanges}
 
-## _OnChanges()_
+## Using change detection hooks
 
-Angular calls its `ngOnChanges()` method whenever it detects changes to ***input properties*** of the component (or directive).
+Angular calls the `ngOnChanges()` method of a component or directive whenever it detects changes to the  ***input properties***.
-This example monitors the `OnChanges` hook.
+The *onChanges* example demonstrates this by monitoring the `OnChanges()` hook.
 
 <code-example path="lifecycle-hooks/src/app/on-changes.component.ts" region="ng-on-changes" header="on-changes.component.ts (excerpt)"></code-example>
 
@@ -434,7 +436,7 @@ The example component, `OnChangesComponent`, has two input properties: `hero` an
 
 <code-example path="lifecycle-hooks/src/app/on-changes.component.ts" region="inputs" header="src/app/on-changes.component.ts"></code-example>
 
-The host `OnChangesParentComponent` binds to them like this:
+The host `OnChangesParentComponent` binds to them as follows.
 
 <code-example path="lifecycle-hooks/src/app/on-changes-parent.component.html" region="on-changes" header="src/app/on-changes-parent.component.html"></code-example>
 
@@ -445,51 +447,20 @@ Here's the sample in action as the user makes changes.
 </div>
 
 The log entries appear as the string value of the *power* property changes.
-But the `ngOnChanges` does not catch changes to `hero.name`
+Notice, however, that the `ngOnChanges()` method does not catch changes to `hero.name`.
-That's surprising at first.
+This is because Angular calls the hook only when the value of the input property changes.
+In this case, `hero` is the input property, and the value of the `hero` property is the *reference to the hero object*.
+The object reference did not change when the value of its own `name` property changed.
 
-Angular only calls the hook when the value of the input property changes.
-The value of the `hero` property is the *reference to the hero object*.
-Angular doesn't care that the hero's own `name` property changed.
-The hero object *reference* didn't change so, from Angular's perspective, there is no change to report!
-
-{@a docheck}
-
-## _DoCheck()_
-
-Use the `DoCheck` hook to detect and act upon changes that Angular doesn't catch on its own.
-
-<div class="alert is-helpful">
-
-  Use this method to detect a change that Angular overlooked.
-
-</div>
-
-The *DoCheck* sample extends the *OnChanges* sample with the following `ngDoCheck()` hook:
-
-<code-example path="lifecycle-hooks/src/app/do-check.component.ts" region="ng-do-check" header="DoCheckComponent (ngDoCheck)"></code-example>
-
-This code inspects certain _values of interest_, capturing and comparing their current state against previous values.
-It writes a special message to the log when there are no substantive changes to the `hero` or the `power`
-so you can see how often `DoCheck` is called. The results are illuminating:
-
-<div class="lightbox">
-  <img src='generated/images/guide/lifecycle-hooks/do-check-anim.gif' alt="DoCheck">
-</div>
-
-While the `ngDoCheck()` hook can detect when the hero's `name` has changed, it has a frightful cost.
-This hook is called with enormous frequency&mdash;after _every_
-change detection cycle no matter where the change occurred.
-It's called over twenty times in this example before the user can do anything.
-
-Most of these initial checks are triggered by Angular's first rendering of *unrelated data elsewhere on the page*.
-Mere mousing into another `<input>` triggers a call.
-Relatively few calls reveal actual changes to pertinent data.
-Clearly our implementation must be very lightweight or the user experience suffers.
 
 {@a afterview}
 
-## AfterView
+### Responding to view changes
+
+As Angular traverses the [view hierarchy](guide/glossary#view-hierarchy "Definition of view hierarchy definition") during change detection, it needs to be sure that a change in a child does not attempt to cause a change in its own parent. Such a change would not be rendered properly, because of how [unidirectional data flow](guide/glossary#unidirectional-data-flow "Definition") works.
+
+If you need to make a change that inverts the expected data flow, you must trigger a new change detection cycle to allow that change to be rendered.
+The examples illustrate how to make such changes safely.
 
 The *AfterView* sample explores the `AfterViewInit()` and `AfterViewChecked()` hooks that Angular calls
 *after* it creates a component's child views.
@@ -506,47 +477,46 @@ The following hooks take action based on changing values *within the child view*
 which can only be reached by querying for the child view via the property decorated with
 [@ViewChild](api/core/ViewChild).
 
-
 <code-example path="lifecycle-hooks/src/app/after-view.component.ts" region="hooks" header="AfterViewComponent (class excerpts)"></code-example>
 
 {@a wait-a-tick}
 
-### Abide by the unidirectional data flow rule
+#### Wait before updating the view
-The `doSomething()` method updates the screen when the hero name exceeds 10 characters.
+
+In this example, the `doSomething()` method updates the screen when the hero name exceeds 10 characters, but waits a tick before updating `comment`.
 
 <code-example path="lifecycle-hooks/src/app/after-view.component.ts" region="do-something" header="AfterViewComponent (doSomething)"></code-example>
 
-Why does the `doSomething()` method wait a tick before updating `comment`?
+Both the `AfterViewInit()` and `AfterViewChecked()` hooks fire after the component's view has been composed.
+If you modify the code so that the hook updates the component's data-bound `comment` property immediately, you can see that Angular throws an error.
 
-Angular's unidirectional data flow rule forbids updates to the view *after* it has been composed.
+The `LoggerService.tick_then()` statement postpones the log update
-Both of these hooks fire _after_ the component's view has been composed.
+for one turn of the browser's JavaScript cycle, which triggers a new change-detection cycle.
 
-Angular throws an error if the hook updates the component's data-bound `comment` property immediately (try it!).
+#### Write lean hook methods to avoid performance problems
-The `LoggerService.tick_then()` postpones the log update
-for one turn of the browser's JavaScript cycle and that's just long enough.
 
-Here's *AfterView* in action:
+When you run the *AfterView* sample, notice how frequently Angular calls `AfterViewChecked()`$emdash;often when there are no changes of interest.
+Be very careful about how much logic or computation you put into one of these methods.
 
 <div class="lightbox">
+
   <img src='generated/images/guide/lifecycle-hooks/after-view-anim.gif' alt="AfterView">
+
 </div>
 
-Notice that Angular frequently calls `AfterViewChecked()`, often when there are no changes of interest.
-Write lean hook methods to avoid performance problems.
 
 {@a aftercontent}
-
+{@a aftercontent-hooks}
-## AfterContent
-
-The *AfterContent* sample explores the `AfterContentInit()` and `AfterContentChecked()` hooks that Angular calls
-*after* Angular projects external content into the component.
-
 {@a content-projection}
 
-### Content projection
+### Responding to projected content changes
 
 *Content projection* is a way to import HTML content from outside the component and insert that content
 into the component's template in a designated spot.
+You can identify content projection in a template by looking for the following constructs.
+
+  * HTML between component element tags.
+  * The presence of `<ng-content>` tags in the component's template.
 
 <div class="alert is-helpful">
 
@@ -554,9 +524,12 @@ into the component's template in a designated spot.
 
 </div>
 
-Consider this variation on the [previous _AfterView_](guide/lifecycle-hooks#afterview) example.
+The *AfterContent* sample explores the `AfterContentInit()` and `AfterContentChecked()` hooks that Angular calls *after* Angular projects external content into the component.
+
+Consider this variation on the [previous _AfterView_](#afterview) example.
 This time, instead of including the child view within the template, it imports the content from
-the `AfterContentComponent`'s parent. Here's the parent's template:
+the `AfterContentComponent`'s parent.
+The following is the parent's template.
 
 <code-example path="lifecycle-hooks/src/app/after-content.component.ts" region="parent-template" header="AfterContentParentComponent (template excerpt)"></code-example>
 
@@ -564,7 +537,7 @@ Notice that the `<app-child>` tag is tucked between the `<after-content>` tags.
 Never put content between a component's element tags *unless you intend to project that content
 into the component*.
 
-Now look at the component's template:
+Now look at the component's template.
 
 <code-example path="lifecycle-hooks/src/app/after-content.component.ts" region="template" header="AfterContentComponent (template)"></code-example>
 
@@ -576,18 +549,8 @@ In this case, the projected content is the `<app-child>` from the parent.
   <img src='generated/images/guide/lifecycle-hooks/projected-child-view.png' alt="Projected Content">
 </div>
 
-<div class="alert is-helpful">
 
-  The telltale signs of *content projection* are twofold:
+#### Using AfterContent hooks
-
-  * HTML between component element tags.
-  * The presence of `<ng-content>` tags in the component's template.
-
-</div>
-
-{@a aftercontent-hooks}
-
-### AfterContent hooks
 
 *AfterContent* hooks are similar to the *AfterView* hooks.
 The key difference is in the child component.
@@ -606,11 +569,44 @@ which can only be reached by querying for them via the property decorated with
 
 {@a no-unidirectional-flow-worries}
 
-### No unidirectional flow worries with _AfterContent_
+<div class="alert is-helpful>
 
-This component's `doSomething()` method update's the component's data-bound `comment` property immediately.
+<header>No need to wait for content updates</header>
-There's no [need to wait](guide/lifecycle-hooks#wait-a-tick).
 
-Recall that Angular calls both *AfterContent* hooks before calling either of the *AfterView* hooks.
+This component's `doSomething()` method updates the component's data-bound `comment` property immediately.
+There's no need to [delay the update to ensure proper rendering](#wait-a-tick "Delaying updates").
+
+Angular calls both *AfterContent* hooks before calling either of the *AfterView* hooks.
 Angular completes composition of the projected content *before* finishing the composition of this component's view.
-There is a small window between the `AfterContent...` and `AfterView...` hooks to modify the host view.
+There is a small window between the `AfterContent...` and `AfterView...` hooks that allows you to modify the host view.
+
+</div>
+
+{@a docheck}
+
+## Defining custom change detection
+
+To monitor changes that occur where `ngOnChanges()` won't catch them, you can implement your own change check, as shown in the *DoCheck* example.
+This example shows how you can use the `ngDoCheck()` hook to detect and act upon changes that Angular doesn't catch on its own.
+
+The *DoCheck* sample extends the *OnChanges* sample with the following `ngDoCheck()` hook:
+
+<code-example path="lifecycle-hooks/src/app/do-check.component.ts" region="ng-do-check" header="DoCheckComponent (ngDoCheck)"></code-example>
+
+This code inspects certain _values of interest_, capturing and comparing their current state against previous values.
+It writes a special message to the log when there are no substantive changes to the `hero` or the `power` so you can see how often `DoCheck()` is called.
+The results are illuminating.
+
+<div class="lightbox">
+  <img src='generated/images/guide/lifecycle-hooks/do-check-anim.gif' alt="DoCheck">
+</div>
+
+While the `ngDoCheck()` hook can detect when the hero's `name` has changed, it is very expensive.
+This hook is called with enormous frequency&mdash;after _every_
+change detection cycle no matter where the change occurred.
+It's called over twenty times in this example before the user can do anything.
+
+Most of these initial checks are triggered by Angular's first rendering of *unrelated data elsewhere on the page*.
+Just moving the cursor into another `<input>` triggers a call.
+Relatively few calls reveal actual changes to pertinent data.
+If you use this hook, your implementation must be extremely lightweight or the user experience suffers.

aio/content/guide/migration-dynamic-flag.md

@@ -53,11 +53,11 @@ With dynamic queries (`static: false`), the query resolves after either `ngAfter
 The result will be updated for changes to your view, such as changes to `ngIf` and `ngFor` blocks.
 
 For more information, see the following entries in the
-[Static Query Migration Guide](https://angular.io/guide/static-query-migration):
+[Static Query Migration Guide](guide/static-query-migration):
 
-* [How do I choose which `static` flag value to use: `true` or `false`?](https://angular.io/guide/static-query-migration#how-do-i-choose-which-static-flag-value-to-use-true-or-false)
+* [How do I choose which `static` flag value to use: `true` or `false`?](guide/static-query-migration#how-do-i-choose-which-static-flag-value-to-use-true-or-false)
 
-* [Is there a case where I should use `{static: true}`?](https://angular.io/guide/static-query-migration#is-there-a-case-where-i-should-use-static-true)
+* [Is there a case where I should use `{static: true}`?](guide/static-query-migration#is-there-a-case-where-i-should-use-static-true)
 
 </div>
 

aio/content/guide/migration-solution-style-tsconfig.md

@@ -0,0 +1,54 @@
+# 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.