release: cut the v9.1.1 release

PR Close #35969

.bazelrc

@@ -33,11 +33,6 @@ 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 #
@@ -47,7 +42,7 @@ build --nobuild_runfile_links
 # Releases should always be stamped with version control info
 # This command assumes node on the path and is a workaround for
 # https://github.com/bazelbuild/bazel/issues/4802
-build:release --workspace_status_command="yarn -s ng-dev release build-env-stamp"
+build:release --workspace_status_command="node ./tools/bazel_stamp_vars.js"
 build:release --stamp
 
 ###############################
@@ -136,6 +131,15 @@ build:remote --remote_executor=remotebuildexecution.googleapis.com
 # retry mechanism and we do not want to retry unnecessarily if Karma already tried multiple times.
 test:saucelabs --flaky_test_attempts=1
 
+###############################
+# NodeJS rules settings
+# These settings are required for rules_nodejs
+###############################
+
+# Turn on managed directories feature in Bazel
+# This allows us to avoid installing a second copy of node_modules
+common --experimental_allow_incremental_repository_updates
+
 ####################################################
 # User bazel configuration
 # NOTE: This needs to be the *last* entry in the config.

.bazelversion

@@ -1,3 +1,3 @@
-3.2.0
+2.1.1
 # [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,7 +12,7 @@ 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 the internal pw database
+- Find the angular-builds:token in http://valentine
 - 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

.circleci/bazel.linux.rc

@@ -19,12 +19,4 @@ 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 v7-angular-node-12-{{ checksum ".bazelversion" }}-{{ checksum "yarn.lock" }}-{{ checksum "WORKSPACE" }}-{{ checksum "packages/bazel/package.bzl" }}-{{ checksum "aio/yarn.lock" }}
+var_3: &cache_key v6-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 v7-angular-node-12-{{ checksum ".bazelversion" }}
+var_4: &cache_key_fallback v6-angular-node-12-{{ checksum ".bazelversion" }}
-var_3_win: &cache_key_win v7-angular-win-node-12-{{ checksum ".bazelversion" }}-{{ checksum "yarn.lock" }}-{{ checksum "WORKSPACE" }}-{{ checksum "packages/bazel/package.bzl" }}-{{ checksum "aio/yarn.lock" }}
+var_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_4_win: &cache_key_win_fallback v7-angular-win-node-12-{{ checksum ".bazelversion" }}
+var_4_win: &cache_key_win_fallback v6-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 v7-angular-components-f428c00465dfcf8a020237f22532480eedbd2cb6
+var_5: &components_repo_unit_tests_cache_key v6-angular-components-598db096e668aa7e9debd56eedfd127b7a55e371
-var_6: &components_repo_unit_tests_cache_key_fallback v7-angular-components-
+var_6: &components_repo_unit_tests_cache_key_fallback v6-angular-components-
 
 # Workspace initially persisted by the `setup` job, and then enhanced by `build-npm-packages` and
 # `build-ivy-npm-packages`.
@@ -67,6 +67,9 @@ 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:
@@ -117,7 +120,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 dependencies of chrome & needed for karma & protractor headless chrome tests.
+            # which are dependendies 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
@@ -160,7 +163,7 @@ commands:
     description: Sets up a domain that resolves to the local host.
     steps:
       - run:
-          name: Preparing environment for running tests on Sauce Labs.
+          name: Preparing environment for running tests on Saucelabs.
           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
@@ -172,13 +175,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 Sauce Labs tests where devices are not able to
+          # host. This domain is helpful in Saucelabs 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 individual windows job are high enough to discourage
+  # But startup and setup time for each invidual 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
@@ -233,7 +236,7 @@ jobs:
               git config user.name "angular-ci"
               git config user.email "angular-ci"
               # Rebase PR on top of target branch.
-              node tools/rebase-pr.js
+              node tools/rebase-pr.js angular/angular ${CIRCLE_PR_NUMBER}
             else
               echo "This build is not over a PR, nothing to do."
             fi
@@ -269,8 +272,13 @@ jobs:
       - custom_attach_workspace
       - init_environment
 
-      - run: yarn -s tslint
+      - run: 'yarn bazel:format -mode=check ||
-      - run: yarn -s ng-dev format changed $CI_GIT_BASE_REVISION --check
+              (echo "BUILD files not formatted. Please run ''yarn bazel:format''" ; exit 1)'
+      # Run the skylark linter to check our Bazel rules
+      - run: 'yarn bazel:lint ||
+              (echo -e "\n.bzl files have lint errors. Please run ''yarn bazel:lint-fix''"; exit 1)'
+
+      - run: yarn -s lint --branch $CI_GIT_BASE_REVISION
       - run: yarn -s ts-circular-deps:check
       - run: yarn -s ng-dev pullapprove verify
       - run: yarn -s ng-dev commit-message validate-range --range $CI_COMMIT_RANGE
@@ -381,6 +389,10 @@ 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
@@ -596,8 +608,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,76 +5,87 @@ readonly projectDir=$(realpath "$(dirname ${BASH_SOURCE[0]})/..")
 readonly envHelpersPath="$projectDir/.circleci/env-helpers.inc.sh";
 readonly bashEnvCachePath="$projectDir/.circleci/bash_env_cache";
 
-# Load helpers and make them available everywhere (through `$BASH_ENV`).
+if [ -f $bashEnvCachePath ]; then
-source $envHelpersPath;
+  # Since a bash env cache is present, load this into the $BASH_ENV
-echo "source $envHelpersPath;" >> $BASH_ENV;
+  cat "$bashEnvCachePath" >> $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 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";
+  # Store a PR's refs and shas so they don't need to be requested multiple times.
-setPublicVar CI_PR_USERNAME "$CIRCLE_PR_USERNAME";
+  setPublicVar GITHUB_REFS_AND_SHAS $(node tools/utils/get-refs-and-shas-for-target.js ${CIRCLE_PR_NUMBER:-false} | awk '{ gsub(/"/,"\\\"") } 1');
 
 
-####################################################################################################
+  ####################################################################################################
-# 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 "f428c00465dfcf8a020237f22532480eedbd2cb6"
+  setPublicVar COMPONENTS_REPO_COMMIT "598db096e668aa7e9debd56eedfd127b7a55e371"
+  
+  # Save the created BASH_ENV into the bash env cache file.
+  cat "$BASH_ENV" >> $bashEnvCachePath;
+fi
 
 
 ####################################################################################################

.circleci/trigger-webhook.js

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

.dev-infra.json

@@ -0,0 +1,47 @@
+{
+  "commitMessage": {
+    "maxLength": 120,
+    "minBodyLength": 0,
+    "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"
+    ]
+  }
+}

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

@@ -32,7 +32,7 @@ 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-ivy
+Please create and share minimal reproduction of the issue starting with this template: https://stackblitz.com/fork/angular-issue-repro2
 -->
 <!-- ✍️--> https://stackblitz.com/...
 

.github/angular-robot.yml

@@ -154,12 +154,6 @@ triage:
     -
       - "type: RFC / Discussion / question"
       - "comp: *"
-    -
-      - "type: confusing"
-      - "comp: *"
-    -
-      - "type: use-case"
-      - "comp: *"
 
 # options for the triage PR plugin
 triagePR:

.gitignore

@@ -42,6 +42,3 @@ yarn-error.log
 
 .notes.md
 baseline.json
-
-# Ignore .history for the xyz.local-history VSCode extension
-.history

.gitmessage

@@ -1,145 +0,0 @@
-<type>(<scope>): <summary>
-
-<Describe the motivation behind this change - explain WHY you are making this change. Wrap all lines
-at 100 characters.>
-
-Fixes #<issue number>
-
-# ────────────────────────────────────────── 100 chars ────────────────────────────────────────────┤
-
-
-# Example Commit Messages
-# =======================
-
-
-# ─── Example: Simple refactor ────────────────────────────────────────────────────────────────────┤
-# refactor(core): rename refreshDynamicEmbeddedViews to refreshEmbeddedViews
-#
-# Improve code readability. The original name no longer matches how the function is used.
-# ─────────────────────────────────────────────────────────────────────────────────────────────────┤
-
-
-# ─── Example: Simple docs change ─────────────────────────────────────────────────────────────────┤
-# docs: clarify the service limitation in providers.md guide
-#
-# Fixes #36332
-# ─────────────────────────────────────────────────────────────────────────────────────────────────┤
-
-
-# ─── Example: A bug fix ──────────────────────────────────────────────────────────────────────────┤
-# fix(ngcc): ensure lockfile is removed when `analyzeFn` fails
-#
-# Previously an error thrown in the `analyzeFn` would cause the ngcc process to exit immediately
-# without removing the lockfile, and potentially before the unlocker process had been successfully
-# spawned resulting in the lockfile being orphaned and left behind.
-#
-# Now we catch these errors and remove the lockfile as needed.
-# ─────────────────────────────────────────────────────────────────────────────────────────────────┤
-
-
-# ─── Example: Breaking change ────────────────────────────────────────────────────────────────────┤
-# feat(bazel): simplify ng_package by dropping esm5 and fesm5
-#
-# esm5 and fesm5 distributions are no longer needed and have been deprecated in the past.
-#
-# https://v9.angular.io/guide/deprecations#esm5-and-fesm5-code-formats-in-angular-npm-packages
-#
-# This commit modifies ng_package to no longer distribute these two formats in npm packages built by
-# ng_package (e.g. @angular/core).
-#
-# This commit intentionally doesn't fully clean up the ng_package rule to remove all traces of esm5
-# and fems5 build artifacts as that is a bigger cleanup and currently we are narrowing down the
-# scope of this change to the MVP needed for v10, which in this case is 'do not put esm5 and fesm5'
-# into the npm packages.
-#
-# More cleanup to follow: https://angular-team.atlassian.net/browse/FW-2143
-#
-# BREAKING CHANGE: esm5 and fesm5 format is no longer distributed in Angular's npm packages e.g.
-# @angular/core
-#
-# 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.
-#
-# 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.
-#
-#
-# Fixes #1234
-# ─────────────────────────────────────────────────────────────────────────────────────────────────┤
-
-
-
-# Angular Commit Message Format
-# =============================
-#
-# The full specification of the Angular Commit Message Format can be found at
-# https://github.com/angular/angular/blob/master/CONTRIBUTING.md#commit
-#
-# The following is an excerpt of the specification with the most commonly needed info.
-#
-# Each commit message consists of a *header*, a *body*, and a *footer*.
-#
-# <header>
-# <BLANK LINE>
-# <body>
-# <BLANK LINE>
-# <footer>
-#
-# The header is mandatory.
-#
-# The body is mandatory for all commits except for those of scope "docs". When the body is required
-# it must be at least 20 characters long.
-#
-# The footer is optional.
-#
-# Any line of the commit message cannot be longer than 100 characters.
-#
-#
-# Commit Message Header
-# ---------------------
-#
-# <type>(<scope>): <short summary>
-#   │       │             │
-#   │       │             └─⫸ Summary in present tense. Not capitalized. No period at the end.
-#   │       │
-#   │       └─⫸ Commit Scope: animations|bazel|benchpress|common|compiler|compiler-cli|core|
-#   │                          elements|forms|http|language-service|localize|platform-browser|
-#   │                          platform-browser-dynamic|platform-server|platform-webworker|
-#   │                          platform-webworker-dynamic|router|service-worker|upgrade|zone.js|
-#   │                          packaging|changelog|dev-infra|docs-infra|migrations|ngcc|ve
-#   │                          https://github.com/angular/angular/blob/master/CONTRIBUTING.md#scope
-#   │
-#   └─⫸ Commit Type: build|ci|docs|feat|fix|perf|refactor|style|test
-#                     https://github.com/angular/angular/blob/master/CONTRIBUTING.md#type
-#
-#
-# Commit Message Body
-# ---------------------
-#
-# Just as in the summary, use the imperative, present tense: "fix" not "fixed" nor "fixes".
-#
-# Explain the motivation for the change in the commit message body. This commit message should
-# explain WHY you are making the change. You can include a comparison of the previous behavior with
-# the new behavior in order to illustrate the impact of the change.
-#
-#
-# Commit Message Footer
-# ---------------------
-#
-# The footer can contain information about breaking changes and is also the place to reference
-# GitHub issues, Jira tickets, and other PRs that this commit closes or is related to.
-#
-# ```
-# BREAKING CHANGE: <breaking change summary>
-# <BLANK LINE>
-# <breaking change description + migration instructions>
-# <BLANK LINE>
-# <BLANK LINE>
-# Fixes #<issue number>
-# ```
-#
-# Breaking Change section should start with the phrase "BREAKING CHANGE: " followed by a summary of
-# the breaking change, a blank line, and a detailed description of the breaking change that also
-# includes migration instructions.
-#

.ng-dev/commit-message.ts

@@ -1,52 +0,0 @@
-import {CommitMessageConfig} from '../dev-infra/commit-message/config';
-
-/**
- * The configuration for `ng-dev commit-message` commands.
- */
-export const commitMessage: CommitMessageConfig = {
-  maxLineLength: 120,
-  minBodyLength: 20,
-  minBodyLengthTypeExcludes: ['docs'],
-  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',
-  ]
-};

.ng-dev/config.ts

@@ -1,11 +0,0 @@
-import {commitMessage} from './commit-message';
-import {format} from './format';
-import {github} from './github';
-import {merge} from './merge';
-
-module.exports = {
-  commitMessage,
-  format,
-  github,
-  merge,
-};

.ng-dev/format.ts

@@ -1,22 +0,0 @@
-import {FormatConfig} from '../dev-infra/format/config';
-
-/**
- * Configuration for the `ng-dev format` command.
- */
-export const format: FormatConfig = {
-  'clang-format': {
-    'matchers': [
-      '**/*.{js,ts}',
-      // TODO: burn down format failures and remove aio and integration exceptions.
-      '!aio/**',
-      '!integration/**',
-      // 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
-};

.ng-dev/gitconfig

@@ -1,15 +0,0 @@
-# The file is inert unless it's explicitly included into the local git config via:
-#
-# ```
-# git config --add include.path '../.ng-dev/gitconfig'
-# ```
-#
-# Calling that command will append the following into `.git/config` of the current git workspace
-# (i.e. $GIT_DIR, typically `angular/.git/config`):
-#
-# ```
-# [include]
-#     path = ../.ng-dev/gitconfig
-# ```
-[commit]
-  template = .gitmessage

.ng-dev/github.ts

@@ -1,11 +0,0 @@
-import {GithubConfig} from '../dev-infra/utils/config';
-
-/**
- * Github configuration for the `ng-dev` command. This repository is used as
- * remote for the merge script and other utilities like `ng-dev pr rebase`.
- */
-
-export const github: GithubConfig = {
-  owner: 'angular',
-  name: 'angular'
-};

.ng-dev/merge.ts

@@ -1,38 +0,0 @@
-import {MergeConfig} from '../dev-infra/pr/merge/config';
-
-/**
- * Configuration for the merge tool in `ng-dev`. This sets up the labels which
- * are respected by the merge script (e.g. the target labels).
- */
-export const merge = (): MergeConfig => {
-  // TODO: resume dynamically determining patch branch
-  const patch = '10.0.x';
-  return {
-    githubApiMerge: false,
-    claSignedLabel: 'cla: yes',
-    mergeReadyLabel: /^PR action: merge(-assistance)?/,
-    caretakerNoteLabel: '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'
-    },
-  };
-};

.pullapprove.yml

@@ -34,8 +34,41 @@
 ####################################################################################
 #  GitHub usernames
 ####################################################################################
-# See reviewer list under `required-minimum-review` group.  Team member names and
+#  aikidave - Dave Shevitz
-# usernames are managed there.
+#  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
+#  robwormald - Rob Wormald
+#  StephenFluin - Stephen Fluin
 
 
 ####################################################################################
@@ -47,8 +80,8 @@
 #  Used for approving minor changes, large-scale refactorings, and in emergency situations.
 #
 # IgorMinar
-# jelbourn
 # josephperrott
+# kara
 # mhevery
 #
 # =========================================================
@@ -67,35 +100,8 @@ version: 3
 # Meta field that goes unused by PullApprove to allow for defining aliases to be
 # used throughout the config.
 meta:
-  # The following groups have no file based conditions and will be initially `active` on all PRs
+  1: &can-be-global-approved "\"global-approvers\" not in groups.approved"
-  # - `global-approvers`
+  2: &can-be-global-docs-approved "\"global-docs-approvers\" not in groups.approved"
-  # - `global-docs-approvers`
-  # - `required-minimum-review`
-  #
-  # By checking the number of active/pending/rejected groups when these are excluded, we can determine
-  # if any other groups are matched.
-  #
-  # Note: Because all inactive groups start as pending, we are only checking pending and rejected active groups.
-  #
-  # Also note that the ordering of groups matters in this file. The only groups visible to the current
-  # one are those that appear above it.
-  no-groups-above-this-pending: &no-groups-above-this-pending
-    len(groups.active.pending.exclude("required-minimum-review").exclude("global-approvers").exclude("global-docs-approvers")) == 0
-  no-groups-above-this-rejected: &no-groups-above-this-rejected
-    len(groups.active.rejected.exclude("required-minimum-review").exclude("global-approvers").exclude("global-docs-approvers")) == 0
-  no-groups-above-this-active: &no-groups-above-this-active
-    len(groups.active.exclude("required-minimum-review").exclude("global-approvers").exclude("global-docs-approvers")) == 0
-
-  can-be-global-approved: &can-be-global-approved "\"global-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/
@@ -115,54 +121,6 @@ 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
-         - 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
   #
@@ -203,7 +161,6 @@ groups:
   #  Framework: Animations
   # =========================================================
   fw-animations:
-    <<: *defaults
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
@@ -221,21 +178,18 @@ groups:
           ])
     reviewers:
       users:
-        - crisbeto
+        - matsko
-        - IgorMinar
-        - jelbourn
 
 
   # =========================================================
   #  Framework: Compiler
   # =========================================================
   fw-compiler:
-    <<: *defaults
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
       - >
-        contains_any_globs(files.exclude('packages/compiler-cli/ngcc/**'), [
+        contains_any_globs(files, [
           'packages/compiler/**',
           'packages/examples/compiler/**',
           'packages/compiler-cli/**',
@@ -244,22 +198,29 @@ groups:
           'aio/content/guide/aot-metadata-errors.md',
           'aio/content/guide/template-typecheck.md '
           ])
+      - >
+        not contains_any_globs(files, [
+          'packages/compiler-cli/ngcc/**'
+          ])
     reviewers:
       users:
         - alxhub
         - AndrewKushnir
         - JoostK
+        - kara
 
 
   # =========================================================
   #  Framework: Compiler / ngcc
   # =========================================================
   fw-ngcc:
-    <<: *defaults
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
-      - files.include('packages/compiler-cli/ngcc/**')
+      - >
+        contains_any_globs(files, [
+          'packages/compiler-cli/ngcc/**'
+          ])
     reviewers:
       users:
         - alxhub
@@ -268,32 +229,15 @@ groups:
         - petebacondarwin
 
 
-  # =========================================================
-  #  Framework: Migrations
-  # =========================================================
-  fw-migrations:
-    <<: *defaults
-    conditions:
-      - *can-be-global-approved
-      - *can-be-global-docs-approved
-      - files.include("packages/core/schematics/**")
-    reviewers:
-      users:
-        - alxhub
-        - crisbeto
-        - devversion
-
-
   # =========================================================
   #  Framework: Core
   # =========================================================
   fw-core:
-    <<: *defaults
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
       - >
-        contains_any_globs(files.exclude("packages/core/schematics/**"), [
+        contains_any_globs(files, [
           'packages/core/**',
           'packages/examples/core/**',
           'packages/common/**',
@@ -362,38 +306,26 @@ groups:
           'aio/content/guide/ngmodule-vs-jsmodule.md',
           'aio/content/guide/module-types.md',
           'aio/content/guide/template-syntax.md',
-          'aio/content/guide/built-in-template-functions.md',
           'aio/content/examples/built-in-template-functions/**',
-          'aio/content/guide/event-binding.md',
           'aio/content/examples/event-binding/**',
-          'aio/content/guide/interpolation.md',
           'aio/content/examples/interpolation/**',
           'aio/content/examples/template-syntax/**',
           'aio/content/images/guide/template-syntax/**',
-          'aio/content/guide/binding-syntax.md',
           'aio/content/examples/binding-syntax/**',
-          'aio/content/guide/property-binding.md',
           'aio/content/examples/property-binding/**',
-          'aio/content/guide/attribute-binding.md',
           'aio/content/examples/attribute-binding/**',
-          'aio/content/guide/two-way-binding.md',
           'aio/content/examples/two-way-binding/**',
-          'aio/content/guide/built-in-directives.md',
           'aio/content/examples/built-in-directives/**',
           'aio/content/images/guide/built-in-directives/**',
-          'aio/content/guide/template-reference-variables.md',
           'aio/content/examples/template-reference-variables/**',
-          'aio/content/guide/inputs-outputs.md',
           'aio/content/examples/inputs-outputs/**',
           'aio/content/images/guide/inputs-outputs/**',
-          'aio/content/guide/template-expression-operators.md',
           'aio/content/examples/template-expression-operators/**',
           'aio/content/guide/pipes.md',
           'aio/content/examples/pipes/**',
           'aio/content/images/guide/pipes/**',
           'aio/content/guide/providers.md',
           'aio/content/examples/providers/**',
-          'aio/content/images/guide/providers/**',
           'aio/content/guide/singleton-services.md',
           'aio/content/guide/set-document-title.md',
           'aio/content/examples/set-document-title/**',
@@ -401,9 +333,7 @@ groups:
           'aio/content/guide/sharing-ngmodules.md',
           'aio/content/guide/structural-directives.md',
           'aio/content/examples/structural-directives/**',
-          'aio/content/guide/svg-in-templates.md',
           'aio/content/images/guide/structural-directives/**',
-          'aio/content/guide/template-statements.md',
           'aio/content/guide/user-input.md',
           'aio/content/examples/user-input/**',
           'aio/content/images/guide/user-input/**'
@@ -412,8 +342,7 @@ groups:
       users:
         - alxhub
         - AndrewKushnir
-        - atscott
+        - kara
-        - ~kara  # do not request reviews from Kara, but allow her to approve PRs
         - mhevery
         - pkozlowski-opensource
 
@@ -422,13 +351,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/**',
@@ -444,7 +373,6 @@ groups:
   #  Framework: Elements
   # =========================================================
   fw-elements:
-    <<: *defaults
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
@@ -465,7 +393,6 @@ groups:
   #  Framework: Forms
   # =========================================================
   fw-forms:
-    <<: *defaults
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
@@ -498,7 +425,6 @@ groups:
   #  Framework: i18n
   # =========================================================
   fw-i18n:
-    <<: *defaults
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
@@ -532,7 +458,6 @@ groups:
   #  Framework: Platform Server
   # =========================================================
   fw-platform-server:
-    <<: *defaults
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
@@ -552,7 +477,6 @@ groups:
   #  Framework: Router
   # =========================================================
   fw-router:
-    <<: *defaults
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
@@ -561,9 +485,6 @@ groups:
           'packages/router/**',
           'packages/examples/router/**',
           'aio/content/guide/router.md',
-          'aio/content/guide/router-tutorial.md',
-          'aio/content/guide/router-tutorial-toh.md',
-          'aio/content/examples/router-tutorial/**',
           'aio/content/examples/router/**',
           'aio/content/images/guide/router/**'
           ])
@@ -575,8 +496,7 @@ groups:
   # =========================================================
   #  Framework: Service Worker
   # =========================================================
-  fw-service-worker:
+  fw-server-worker:
-    <<: *defaults
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
@@ -604,7 +524,6 @@ groups:
   #  Framework: Upgrade
   # =========================================================
   fw-upgrade:
-    <<: *defaults
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
@@ -635,29 +554,20 @@ groups:
   #  Framework: Testing
   # =========================================================
   fw-testing:
-    <<: *defaults
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
       - >
-        contains_any_globs(files.exclude('packages/compiler-cli/**'), [
+        contains_any_globs(files, [
           '**/testing/**',
           'aio/content/guide/testing.md',
-          'aio/content/guide/test-debugging.md',
-          'aio/content/guide/testing-attribute-directives.md',
-          'aio/content/guide/testing-code-coverage.md',
-          'aio/content/guide/testing-components-basics.md',
-          'aio/content/guide/testing-components-scenarios.md',
-          'aio/content/guide/testing-pipes.md',
-          'aio/content/guide/testing-services.md',
-          'aio/content/guide/testing-utility-apis.md',
           'aio/content/examples/testing/**',
           'aio/content/images/guide/testing/**'
           ])
     reviewers:
       users:
-        - AndrewKushnir
         - IgorMinar
+        - kara
         - pkozlowski-opensource
 
 
@@ -665,7 +575,6 @@ groups:
   #  Framework: Benchmarks
   # =========================================================
   fw-benchmarks:
-    <<: *defaults
     conditions:
       - *can-be-global-approved
       - >
@@ -675,6 +584,7 @@ groups:
     reviewers:
       users:
         - IgorMinar
+        - kara
         - pkozlowski-opensource
 
 
@@ -682,7 +592,6 @@ groups:
   #  Framework: Playground
   # =========================================================
   fw-playground:
-    <<: *defaults
     conditions:
       - *can-be-global-approved
       - >
@@ -692,15 +601,13 @@ groups:
     reviewers:
       users:
         - IgorMinar
-        - jelbourn
+        - kara
-        - pkozlowski-opensource
 
 
   # =========================================================
   #  Framework: Security
   # =========================================================
   fw-security:
-    <<: *defaults
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
@@ -718,25 +625,18 @@ 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:
@@ -749,7 +649,6 @@ groups:
   #  Language Service
   # =========================================================
   language-service:
-    <<: *defaults
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
@@ -769,7 +668,6 @@ groups:
   #  zone.js
   # =========================================================
   zone-js:
-    <<: *defaults
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
@@ -788,7 +686,6 @@ groups:
   #  Benchpress
   # =========================================================
   benchpress:
-    <<: *defaults
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
@@ -799,14 +696,12 @@ groups:
     reviewers:
       users:
         - alxhub
-        - josephperrott
 
 
   # =========================================================
   #  Integration Tests
   # =========================================================
   integration-tests:
-    <<: *defaults
     conditions:
       - *can-be-global-approved
       - >
@@ -817,6 +712,7 @@ groups:
       users:
         - IgorMinar
         - josephperrott
+        - kara
         - mhevery
 
 
@@ -824,7 +720,6 @@ groups:
   #  Docs: Gettings Started & Tutorial
   # =========================================================
   docs-getting-started-and-tutorial:
-    <<: *defaults
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
@@ -857,7 +752,6 @@ groups:
   #  Docs: Marketing
   # =========================================================
   docs-marketing:
-    <<: *defaults
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
@@ -872,15 +766,14 @@ groups:
           ])
     reviewers:
       users:
-        - aikidave
         - IgorMinar
         - StephenFluin
 
+
   # =========================================================
   #  Docs: Observables
   # =========================================================
   docs-observables:
-    <<: *defaults
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
@@ -906,7 +799,6 @@ groups:
   #  Docs: Packaging, Tooling, Releasing
   # =========================================================
   docs-packaging-and-releasing:
-    <<: *defaults
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
@@ -926,47 +818,20 @@ 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-10.md',
+          'aio/content/guide/updating-to-version-9.md',
           'aio/content/guide/ivy-compatibility.md',
           'aio/content/guide/ivy-compatibility-examples.md'
           ])
     reviewers:
       users:
         - IgorMinar
-        - jelbourn
+        - kara
-
-
-  # =========================================================
-  #  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
@@ -983,12 +848,8 @@ 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/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:
@@ -1001,7 +862,6 @@ groups:
   #  Docs: CLI Libraries
   # =========================================================
   docs-libraries:
-    <<: *defaults
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
@@ -1022,7 +882,6 @@ groups:
   #  Docs: Schematics
   # =========================================================
   docs-schematics:
-    <<: *defaults
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
@@ -1045,7 +904,6 @@ groups:
   #  Docs-infra
   # =========================================================
   docs-infra:
-    <<: *defaults
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
@@ -1075,16 +933,14 @@ groups:
   #  Dev-infra
   # =========================================================
   dev-infra:
-    <<: *defaults
     conditions:
       - *can-be-global-approved
       - >
-        contains_any_globs(files.exclude("CHANGELOG.md").exclude("packages/compiler-cli/**/BUILD.bazel"), [
+        contains_any_globs(files, [
           '*',
           '.circleci/**',
           '.devcontainer/**',
           '.github/**',
-          '.ng-dev/**',
           '.vscode/**',
           '.yarn/**',
           'dev-infra/**',
@@ -1100,6 +956,8 @@ 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/**',
@@ -1107,10 +965,15 @@ 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/**',
@@ -1140,15 +1003,11 @@ groups:
   #  Public API
   # =========================================================
   public-api:
-    <<: *defaults
     conditions:
-      - *no-groups-above-this-pending
-      - *no-groups-above-this-rejected
       - *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',
@@ -1157,69 +1016,41 @@ groups:
           ])
     reviewers:
       users:
-        - AndrewKushnir
         - IgorMinar
-        - alxhub
-        - atscott
-        - jelbourn
-        - petebacondarwin
-        - pkozlowski-opensource
-    reviews:
-      request: 4 # Request reviews from four people
-      required: 3 # Require that three people approve
-      reviewed_for: required
 
 
   # ================================================
   #  Size tracking
   # ================================================
   size-tracking:
-    <<: *defaults
     conditions:
-      - *no-groups-above-this-pending
-      - *no-groups-above-this-rejected
       - *can-be-global-approved
       - >
         contains_any_globs(files, [
-          'goldens/size-tracking/**'
+          'aio/scripts/_payload-limits.json',
+          'integration/_payload-limits.json'
           ])
     reviewers:
       users:
-        - AndrewKushnir
         - IgorMinar
-        - alxhub
+        - kara
-        - atscott
-        - jelbourn
-        - petebacondarwin
-        - pkozlowski-opensource
-    reviews:
-      request: 4 # Request reviews from four people
-      required: 2 # Require that two people approve
-      reviewed_for: required
 
 
   # ================================================
   #  Circular dependencies
   # ================================================
   circular-dependencies:
-    <<: *defaults
     conditions:
-      - *no-groups-above-this-pending
-      - *no-groups-above-this-rejected
       - *can-be-global-approved
       - >
         contains_any_globs(files, [
-          'goldens/circular-deps/packages.json'
+          'goldens/packages-circular-deps.json'
         ])
     reviewers:
       users:
-        - AndrewKushnir
         - IgorMinar
-        - alxhub
+        - josephperrott
-        - atscott
+        - kara
-        - jelbourn
-        - petebacondarwin
-        - pkozlowski-opensource
 
 
 ####################################################################################
@@ -1230,7 +1061,6 @@ groups:
   #  Code Ownership
   # =========================================================
   code-ownership:
-    <<: *defaults
     conditions:
       - *can-be-global-approved
       - >
@@ -1239,43 +1069,19 @@ groups:
           ])
     reviewers:
       users:
-        - AndrewKushnir
         - IgorMinar
-        - alxhub
-        - atscott
-        - jelbourn
-        - josephperrott
-        - mhevery
 
 
   # ====================================================
   #  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:
-      - *no-groups-above-this-active
-      # When any of the `global-*` groups is approved, they cause other groups to deactivate.
-      # In those cases, the condition above would evaluate to `true` while in reality, only a global
-      # approval has been provided. To ensure we don't activate the fallback group in such cases,
-      # ensure that no explicit global approval has been provided.
       - *can-be-global-approved
-      - *can-be-global-docs-approved
+      # Groups which are found to have matching conditions are `active`
+      # according to PullApprove. If no groups are matched and considered
+      # active, we still want to have a review occur.
+      - len(groups.active) == 0
+    reviewers:
+      users:
+        - IgorMinar

.vscode/recommended-settings.json

@@ -26,7 +26,6 @@
     "**/bazel-out": true,
     "**/dist": true,
     "**/aio/src/generated": true,
-    ".history": true,
   },
   "git.ignoreLimitWarning": true,
 }

.yarn/releases/yarn-1.21.1.js

@@ -34805,8 +34805,6 @@ function hasMergeConflicts(str) {
 function parse(str, fileLoc) {
   const parser = new Parser(str, fileLoc);
   parser.next();
-
-  if (!fileLoc.endsWith(`.yml`)) {
   try {
     return parser.parse();
   } catch (error1) {
@@ -34818,16 +34816,6 @@ function parse(str, fileLoc) {
       throw error1;
     }
   }
-  } else {
-    const result = safeLoad(str, {
-      schema: FAILSAFE_SCHEMA
-    });
-    if (typeof result === 'object') {
-      return result;
-    } else {
-      return {};
-    }
-  }
 }
 
 /**
@@ -46678,7 +46666,7 @@ function mkdirfix (name, opts, cb) {
 /* 194 */
 /***/ (function(module, exports) {
 
-module.exports = {"name":"yarn","installationMethod":"unknown","version":"1.22.4","license":"BSD-2-Clause","preferGlobal":true,"description":"📦🐈 Fast, reliable, and secure dependency management.","dependencies":{"@zkochan/cmd-shim":"^3.1.0","babel-runtime":"^6.26.0","bytes":"^3.0.0","camelcase":"^4.0.0","chalk":"^2.1.0","cli-table3":"^0.4.0","commander":"^2.9.0","death":"^1.0.0","debug":"^3.0.0","deep-equal":"^1.0.1","detect-indent":"^5.0.0","dnscache":"^1.0.1","glob":"^7.1.1","gunzip-maybe":"^1.4.0","hash-for-dep":"^1.2.3","imports-loader":"^0.8.0","ini":"^1.3.4","inquirer":"^6.2.0","invariant":"^2.2.0","is-builtin-module":"^2.0.0","is-ci":"^1.0.10","is-webpack-bundle":"^1.0.0","js-yaml":"^3.13.1","leven":"^2.0.0","loud-rejection":"^1.2.0","micromatch":"^2.3.11","mkdirp":"^0.5.1","node-emoji":"^1.6.1","normalize-url":"^2.0.0","npm-logical-tree":"^1.2.1","object-path":"^0.11.2","proper-lockfile":"^2.0.0","puka":"^1.0.0","read":"^1.0.7","request":"^2.87.0","request-capture-har":"^1.2.2","rimraf":"^2.5.0","semver":"^5.1.0","ssri":"^5.3.0","strip-ansi":"^4.0.0","strip-bom":"^3.0.0","tar-fs":"^1.16.0","tar-stream":"^1.6.1","uuid":"^3.0.1","v8-compile-cache":"^2.0.0","validate-npm-package-license":"^3.0.4","yn":"^2.0.0"},"devDependencies":{"babel-core":"^6.26.0","babel-eslint":"^7.2.3","babel-loader":"^6.2.5","babel-plugin-array-includes":"^2.0.3","babel-plugin-inline-import":"^3.0.0","babel-plugin-transform-builtin-extend":"^1.1.2","babel-plugin-transform-inline-imports-commonjs":"^1.0.0","babel-plugin-transform-runtime":"^6.4.3","babel-preset-env":"^1.6.0","babel-preset-flow":"^6.23.0","babel-preset-stage-0":"^6.0.0","babylon":"^6.5.0","commitizen":"^2.9.6","cz-conventional-changelog":"^2.0.0","eslint":"^4.3.0","eslint-config-fb-strict":"^22.0.0","eslint-plugin-babel":"^5.0.0","eslint-plugin-flowtype":"^2.35.0","eslint-plugin-jasmine":"^2.6.2","eslint-plugin-jest":"^21.0.0","eslint-plugin-jsx-a11y":"^6.0.2","eslint-plugin-prefer-object-spread":"^1.2.1","eslint-plugin-prettier":"^2.1.2","eslint-plugin-react":"^7.1.0","eslint-plugin-relay":"^0.0.28","eslint-plugin-yarn-internal":"file:scripts/eslint-rules","execa":"^0.11.0","fancy-log":"^1.3.2","flow-bin":"^0.66.0","git-release-notes":"^3.0.0","gulp":"^4.0.0","gulp-babel":"^7.0.0","gulp-if":"^2.0.1","gulp-newer":"^1.0.0","gulp-plumber":"^1.0.1","gulp-sourcemaps":"^2.2.0","jest":"^22.4.4","jsinspect":"^0.12.6","minimatch":"^3.0.4","mock-stdin":"^0.3.0","prettier":"^1.5.2","string-replace-loader":"^2.1.1","temp":"^0.8.3","webpack":"^2.1.0-beta.25","yargs":"^6.3.0"},"resolutions":{"sshpk":"^1.14.2"},"engines":{"node":">=4.0.0"},"repository":"yarnpkg/yarn","bin":{"yarn":"./bin/yarn.js","yarnpkg":"./bin/yarn.js"},"scripts":{"build":"gulp build","build-bundle":"node ./scripts/build-webpack.js","build-chocolatey":"powershell ./scripts/build-chocolatey.ps1","build-deb":"./scripts/build-deb.sh","build-dist":"bash ./scripts/build-dist.sh","build-win-installer":"scripts\\build-windows-installer.bat","changelog":"git-release-notes $(git describe --tags --abbrev=0 $(git describe --tags --abbrev=0)^)..$(git describe --tags --abbrev=0) scripts/changelog.md","dupe-check":"yarn jsinspect ./src","lint":"eslint . && flow check","pkg-tests":"yarn --cwd packages/pkg-tests jest yarn.test.js","prettier":"eslint src __tests__ --fix","release-branch":"./scripts/release-branch.sh","test":"yarn lint && yarn test-only","test-only":"node --max_old_space_size=4096 node_modules/jest/bin/jest.js --verbose","test-only-debug":"node --inspect-brk --max_old_space_size=4096 node_modules/jest/bin/jest.js --runInBand --verbose","test-coverage":"node --max_old_space_size=4096 node_modules/jest/bin/jest.js --coverage --verbose","watch":"gulp watch","commit":"git-cz"},"jest":{"collectCoverageFrom":["src/**/*.js"],"testEnvironment":"node","modulePathIgnorePatterns":["__tests__/fixtures/","packages/pkg-tests/pkg-tests-fixtures","dist/"],"testPathIgnorePatterns":["__tests__/(fixtures|__mocks__)/","updates/","_(temp|mock|install|init|helpers).js$","packages/pkg-tests"]},"config":{"commitizen":{"path":"./node_modules/cz-conventional-changelog"}}}
+module.exports = {"name":"yarn","installationMethod":"unknown","version":"1.21.1","license":"BSD-2-Clause","preferGlobal":true,"description":"📦🐈 Fast, reliable, and secure dependency management.","dependencies":{"@zkochan/cmd-shim":"^3.1.0","babel-runtime":"^6.26.0","bytes":"^3.0.0","camelcase":"^4.0.0","chalk":"^2.1.0","cli-table3":"^0.4.0","commander":"^2.9.0","death":"^1.0.0","debug":"^3.0.0","deep-equal":"^1.0.1","detect-indent":"^5.0.0","dnscache":"^1.0.1","glob":"^7.1.1","gunzip-maybe":"^1.4.0","hash-for-dep":"^1.2.3","imports-loader":"^0.8.0","ini":"^1.3.4","inquirer":"^6.2.0","invariant":"^2.2.0","is-builtin-module":"^2.0.0","is-ci":"^1.0.10","is-webpack-bundle":"^1.0.0","js-yaml":"^3.13.1","leven":"^2.0.0","loud-rejection":"^1.2.0","micromatch":"^2.3.11","mkdirp":"^0.5.1","node-emoji":"^1.6.1","normalize-url":"^2.0.0","npm-logical-tree":"^1.2.1","object-path":"^0.11.2","proper-lockfile":"^2.0.0","puka":"^1.0.0","read":"^1.0.7","request":"^2.87.0","request-capture-har":"^1.2.2","rimraf":"^2.5.0","semver":"^5.1.0","ssri":"^5.3.0","strip-ansi":"^4.0.0","strip-bom":"^3.0.0","tar-fs":"^1.16.0","tar-stream":"^1.6.1","uuid":"^3.0.1","v8-compile-cache":"^2.0.0","validate-npm-package-license":"^3.0.4","yn":"^2.0.0"},"devDependencies":{"babel-core":"^6.26.0","babel-eslint":"^7.2.3","babel-loader":"^6.2.5","babel-plugin-array-includes":"^2.0.3","babel-plugin-inline-import":"^3.0.0","babel-plugin-transform-builtin-extend":"^1.1.2","babel-plugin-transform-inline-imports-commonjs":"^1.0.0","babel-plugin-transform-runtime":"^6.4.3","babel-preset-env":"^1.6.0","babel-preset-flow":"^6.23.0","babel-preset-stage-0":"^6.0.0","babylon":"^6.5.0","commitizen":"^2.9.6","cz-conventional-changelog":"^2.0.0","eslint":"^4.3.0","eslint-config-fb-strict":"^22.0.0","eslint-plugin-babel":"^5.0.0","eslint-plugin-flowtype":"^2.35.0","eslint-plugin-jasmine":"^2.6.2","eslint-plugin-jest":"^21.0.0","eslint-plugin-jsx-a11y":"^6.0.2","eslint-plugin-prefer-object-spread":"^1.2.1","eslint-plugin-prettier":"^2.1.2","eslint-plugin-react":"^7.1.0","eslint-plugin-relay":"^0.0.28","eslint-plugin-yarn-internal":"file:scripts/eslint-rules","execa":"^0.11.0","fancy-log":"^1.3.2","flow-bin":"^0.66.0","git-release-notes":"^3.0.0","gulp":"^4.0.0","gulp-babel":"^7.0.0","gulp-if":"^2.0.1","gulp-newer":"^1.0.0","gulp-plumber":"^1.0.1","gulp-sourcemaps":"^2.2.0","jest":"^22.4.4","jsinspect":"^0.12.6","minimatch":"^3.0.4","mock-stdin":"^0.3.0","prettier":"^1.5.2","string-replace-loader":"^2.1.1","temp":"^0.8.3","webpack":"^2.1.0-beta.25","yargs":"^6.3.0"},"resolutions":{"sshpk":"^1.14.2"},"engines":{"node":">=4.0.0"},"repository":"yarnpkg/yarn","bin":{"yarn":"./bin/yarn.js","yarnpkg":"./bin/yarn.js"},"scripts":{"build":"gulp build","build-bundle":"node ./scripts/build-webpack.js","build-chocolatey":"powershell ./scripts/build-chocolatey.ps1","build-deb":"./scripts/build-deb.sh","build-dist":"bash ./scripts/build-dist.sh","build-win-installer":"scripts\\build-windows-installer.bat","changelog":"git-release-notes $(git describe --tags --abbrev=0 $(git describe --tags --abbrev=0)^)..$(git describe --tags --abbrev=0) scripts/changelog.md","dupe-check":"yarn jsinspect ./src","lint":"eslint . && flow check","pkg-tests":"yarn --cwd packages/pkg-tests jest yarn.test.js","prettier":"eslint src __tests__ --fix","release-branch":"./scripts/release-branch.sh","test":"yarn lint && yarn test-only","test-only":"node --max_old_space_size=4096 node_modules/jest/bin/jest.js --verbose","test-only-debug":"node --inspect-brk --max_old_space_size=4096 node_modules/jest/bin/jest.js --runInBand --verbose","test-coverage":"node --max_old_space_size=4096 node_modules/jest/bin/jest.js --coverage --verbose","watch":"gulp watch","commit":"git-cz"},"jest":{"collectCoverageFrom":["src/**/*.js"],"testEnvironment":"node","modulePathIgnorePatterns":["__tests__/fixtures/","packages/pkg-tests/pkg-tests-fixtures","dist/"],"testPathIgnorePatterns":["__tests__/(fixtures|__mocks__)/","updates/","_(temp|mock|install|init|helpers).js$","packages/pkg-tests"]},"config":{"commitizen":{"path":"./node_modules/cz-conventional-changelog"}}}
 
 /***/ }),
 /* 195 */
@@ -69888,12 +69876,12 @@ function getRcConfigForFolder(cwd) {
 }
 
 function loadRcFile(fileText, filePath) {
-  var _parse = (0, (_lockfile || _load_lockfile()).parse)(fileText, filePath);
+  var _parse = (0, (_lockfile || _load_lockfile()).parse)(fileText, 'yarnrc');
 
   let values = _parse.object;
 
 
-  if (filePath.match(/\.yml$/) && typeof values.yarnPath === 'string') {
+  if (filePath.match(/\.yml$/)) {
     values = { 'yarn-path': values.yarnPath };
   }
 
@@ -74860,20 +74848,7 @@ let run = exports.run = (() => {
         } else {
           let suggestion;
 
-          for (var _iterator9 = scripts.keys(), _isArray9 = Array.isArray(_iterator9), _i9 = 0, _iterator9 = _isArray9 ? _iterator9 : _iterator9[Symbol.iterator]();;) {
+          for (const commandName in scripts) {
-            var _ref16;
-
-            if (_isArray9) {
-              if (_i9 >= _iterator9.length) break;
-              _ref16 = _iterator9[_i9++];
-            } else {
-              _i9 = _iterator9.next();
-              if (_i9.done) break;
-              _ref16 = _i9.value;
-            }
-
-            const commandName = _ref16;
-
             const steps = leven(commandName, action);
             if (steps < 2) {
               suggestion = commandName;
@@ -74958,19 +74933,19 @@ let run = exports.run = (() => {
 
       const printedCommands = new Map();
 
-      for (var _iterator10 = pkgCommands, _isArray10 = Array.isArray(_iterator10), _i10 = 0, _iterator10 = _isArray10 ? _iterator10 : _iterator10[Symbol.iterator]();;) {
+      for (var _iterator9 = pkgCommands, _isArray9 = Array.isArray(_iterator9), _i9 = 0, _iterator9 = _isArray9 ? _iterator9 : _iterator9[Symbol.iterator]();;) {
-        var _ref17;
+        var _ref16;
 
-        if (_isArray10) {
+        if (_isArray9) {
-          if (_i10 >= _iterator10.length) break;
+          if (_i9 >= _iterator9.length) break;
-          _ref17 = _iterator10[_i10++];
+          _ref16 = _iterator9[_i9++];
         } else {
-          _i10 = _iterator10.next();
+          _i9 = _iterator9.next();
-          if (_i10.done) break;
+          if (_i9.done) break;
-          _ref17 = _i10.value;
+          _ref16 = _i9.value;
         }
 
-        const pkgCommand = _ref17;
+        const pkgCommand = _ref16;
 
         const action = scripts.get(pkgCommand);
         invariant(action, 'Action must exists');
@@ -76101,11 +76076,6 @@ class TarballFetcher extends (_baseFetcher || _load_baseFetcher()).default {
       chown: false, // don't chown. just leave as it is
       map: header => {
         header.mtime = now;
-        if (header.linkname) {
-          const basePath = path.posix.dirname(path.join('/', header.name));
-          const jailPath = path.posix.join(basePath, header.linkname);
-          header.linkname = path.posix.relative('/', jailPath);
-        }
         return header;
       },
       fs: patchedFs
@@ -78439,11 +78409,6 @@ class RequestManager {
       rejectNext(err);
     };
 
-    const rejectWithoutUrl = function rejectWithoutUrl(err) {
-      err.message = err.message;
-      rejectNext(err);
-    };
-
     const queueForRetry = reason => {
       const attempts = params.retryAttempts || 0;
       if (attempts >= this.maxRetryAttempts - 1) {
@@ -78499,11 +78464,6 @@ class RequestManager {
           }
         }
 
-        if (res.statusCode === 401 && res.caseless && res.caseless.get('server') === 'GitHub.com') {
-          const message = `${res.body.message}. If using GITHUB_TOKEN in your env, check that it is valid.`;
-          rejectWithoutUrl(new Error(this.reporter.lang('unauthorizedResponse', res.caseless.get('server'), message)));
-        }
-
         if (res.statusCode === 401 && res.headers['www-authenticate']) {
           const authMethods = res.headers['www-authenticate'].split(/,\s*/).map(s => s.toLowerCase());
 
@@ -97006,14 +96966,12 @@ function _load_asyncToGenerator() {
 
 let run = exports.run = (() => {
   var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
-    const installVersion = flags[`2`] ? `berry` : flags.install;
+    if (flags.install) {
-
-    if (installVersion) {
       const lockfilePath = path.resolve(config.cwd, 'yarn.lock');
       if (!(yield (_fs || _load_fs()).exists(lockfilePath))) {
         yield (_fs || _load_fs()).writeFile(lockfilePath, '');
       }
-      yield (_child || _load_child()).spawn((_constants || _load_constants()).NODE_BIN_PATH, [process.argv[1], 'policies', 'set-version', installVersion], {
+      yield (_child || _load_child()).spawn((_constants || _load_constants()).NODE_BIN_PATH, [process.argv[1], 'policies', 'set-version', flags.install], {
         stdio: 'inherit',
         cwd: config.cwd
       });
@@ -97308,7 +97266,6 @@ function setFlags(commander) {
   commander.option('-y, --yes', 'use default options');
   commander.option('-p, --private', 'use default options and private true');
   commander.option('-i, --install <value>', 'install a specific Yarn release');
-  commander.option('-2', 'generates the project using Yarn 2');
 }
 
 function hasWrapper(commander, args) {
@@ -98297,7 +98254,6 @@ var _buildSubCommands = (0, (_buildSubCommands2 || _load_buildSubCommands()).def
 
       let bundleUrl;
       let bundleVersion;
-      let isV2 = false;
 
       if (range === 'nightly' || range === 'nightlies') {
         bundleUrl = 'https://nightly.yarnpkg.com/latest.js';
@@ -98305,18 +98261,10 @@ var _buildSubCommands = (0, (_buildSubCommands2 || _load_buildSubCommands()).def
       } else if (range === 'berry' || range === 'v2' || range === '2') {
         bundleUrl = 'https://github.com/yarnpkg/berry/raw/master/packages/berry-cli/bin/berry.js';
         bundleVersion = 'berry';
-        isV2 = true;
       } else {
-        let releases = [];
+        const releases = yield fetchReleases(config, {
-
-        try {
-          releases = yield fetchReleases(config, {
           includePrereleases: allowRc
         });
-        } catch (e) {
-          reporter.error(e.message);
-          return;
-        }
 
         const release = releases.find(function (release) {
           // $FlowFixMe
@@ -98337,6 +98285,7 @@ var _buildSubCommands = (0, (_buildSubCommands2 || _load_buildSubCommands()).def
       reporter.log(`Downloading ${chalk.green(bundleUrl)}...`);
 
       const bundle = yield fetchBundle(config, bundleUrl);
+      const rc = (0, (_rc || _load_rc()).getRcConfigForFolder)(config.lockfileFolder);
 
       const yarnPath = path.resolve(config.lockfileFolder, `.yarn/releases/yarn-${bundleVersion}.js`);
       reporter.log(`Saving it into ${chalk.magenta(yarnPath)}...`);
@@ -98344,22 +98293,10 @@ var _buildSubCommands = (0, (_buildSubCommands2 || _load_buildSubCommands()).def
       yield (_fs || _load_fs()).writeFile(yarnPath, bundle);
       yield (_fs || _load_fs()).chmod(yarnPath, 0o755);
 
-      const targetPath = path.relative(config.lockfileFolder, yarnPath).replace(/\\/g, '/');
-
-      if (isV2) {
-        const rcPath = `${config.lockfileFolder}/.yarnrc.yml`;
-        reporter.log(`Updating ${chalk.magenta(rcPath)}...`);
-
-        yield (_fs || _load_fs()).writeFilePreservingEol(rcPath, `yarnPath: ${JSON.stringify(targetPath)}\n`);
-      } else {
       const rcPath = `${config.lockfileFolder}/.yarnrc`;
       reporter.log(`Updating ${chalk.magenta(rcPath)}...`);
-
+      rc['yarn-path'] = path.relative(config.lockfileFolder, yarnPath);
-        const rc = (0, (_rc || _load_rc()).getRcConfigForFolder)(config.lockfileFolder);
-        rc['yarn-path'] = targetPath;
-
       yield (_fs || _load_fs()).writeFilePreservingEol(rcPath, `${(0, (_lockfile || _load_lockfile()).stringify)(rc)}\n`);
-      }
 
       reporter.log(`Done!`);
     })();
@@ -99682,11 +99619,11 @@ let run = exports.run = (() => {
       throw new (_errors || _load_errors()).MessageError(reporter.lang('workspaceRootNotFound', config.cwd));
     }
 
-    if (args.length < 1) {
+    if (flags.originalArgs < 1) {
       throw new (_errors || _load_errors()).MessageError(reporter.lang('workspaceMissingWorkspace'));
     }
 
-    if (args.length < 2) {
+    if (flags.originalArgs < 2) {
       throw new (_errors || _load_errors()).MessageError(reporter.lang('workspaceMissingCommand'));
     }
 
@@ -99695,7 +99632,7 @@ let run = exports.run = (() => {
 
     const workspaces = yield config.resolveWorkspaces(workspaceRootFolder, manifest);
 
-    var _ref2 = args || [];
+    var _ref2 = flags.originalArgs || [];
 
     const workspaceName = _ref2[0],
           rest = _ref2.slice(1);
@@ -99881,23 +99818,28 @@ let runScript = exports.runScript = (() => {
     const workspaces = yield config.resolveWorkspaces(workspaceRootFolder, manifest);
 
     try {
+      var _ref6 = flags.originalArgs || [];
+
+      const _ = _ref6[0],
+            rest = _ref6.slice(1);
+
       for (var _iterator4 = Object.keys(workspaces), _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
-        var _ref6;
+        var _ref7;
 
         if (_isArray4) {
           if (_i4 >= _iterator4.length) break;
-          _ref6 = _iterator4[_i4++];
+          _ref7 = _iterator4[_i4++];
         } else {
           _i4 = _iterator4.next();
           if (_i4.done) break;
-          _ref6 = _i4.value;
+          _ref7 = _i4.value;
         }
 
-        const workspaceName = _ref6;
+        const workspaceName = _ref7;
         const loc = workspaces[workspaceName].loc;
 
         reporter.log(`${os.EOL}> ${workspaceName}`);
-        yield (_child || _load_child()).spawn((_constants2 || _load_constants2()).NODE_BIN_PATH, [(_constants2 || _load_constants2()).YARN_BIN_PATH, 'run', ...args], {
+        yield (_child || _load_child()).spawn((_constants2 || _load_constants2()).NODE_BIN_PATH, [(_constants2 || _load_constants2()).YARN_BIN_PATH, ...rest], {
           stdio: 'inherit',
           cwd: loc
         });
@@ -100117,11 +100059,7 @@ let main = exports.main = (() => {
       commandName = 'install';
       isKnownCommand = true;
     }
-    if (commandName === 'set' && args[0] === 'version') {
+
-      commandName = 'policies';
-      args.splice(0, 1, 'set-version');
-      isKnownCommand = true;
-    }
     if (!isKnownCommand) {
       // if command is not recognized, then set default to `run`
       args.unshift(commandName);
@@ -100132,20 +100070,15 @@ let main = exports.main = (() => {
     let warnAboutRunDashDash = false;
     // we are using "yarn <script> -abc", "yarn run <script> -abc", or "yarn node -abc", we want -abc
     // to be script options, not yarn options
-
+    const PROXY_COMMANDS = new Set([`run`, `create`, `node`]);
-    // PROXY_COMMANDS is a map of command name to the number of preservedArgs
+    if (PROXY_COMMANDS.has(commandName)) {
-    const PROXY_COMMANDS = {
-      run: 1, // yarn run {command}
-      create: 1, // yarn create {project}
-      node: 0, // yarn node
-      workspaces: 1, // yarn workspaces {command}
-      workspace: 2 // yarn workspace {package} {command}
-    };
-    if (PROXY_COMMANDS.hasOwnProperty(commandName)) {
       if (endArgs.length === 0) {
-        // $FlowFixMe doesn't like that PROXY_COMMANDS doesn't have keys for all commands.
+        let preservedArgs = 0;
-        let preservedArgs = PROXY_COMMANDS[commandName];
+        // the "run" and "create" command take one argument that we want to parse as usual (the
-
+        // script/package name), hence the splice(1)
+        if (command === (_index3 || _load_index3()).default.run || command === (_index3 || _load_index3()).default.create) {
+          preservedArgs += 1;
+        }
         // If the --into option immediately follows the command (or the script name in the "run/create"
         // case), we parse them as regular options so that we can cd into them
         if (args[preservedArgs] === `--into`) {
@@ -100157,6 +100090,7 @@ let main = exports.main = (() => {
       }
     }
 
+    (_commander || _load_commander()).default.originalArgs = args;
     args = [...preCommandArgs, ...args];
 
     command.setFlags((_commander || _load_commander()).default);
@@ -100598,11 +100532,6 @@ let start = (() => {
       const opts = { stdio: 'inherit', env: Object.assign({}, process.env, { YARN_IGNORE_PATH: 1 }) };
       let exitCode = 0;
 
-      process.on(`SIGINT`, function () {
-        // We don't want SIGINT to kill our process; we want it to kill the
-        // innermost process, whose end will cause our own to exit.
-      });
-
       try {
         if (yarnPath.endsWith(`.js`)) {
           exitCode = yield (0, (_child || _load_child()).spawnp)(process.execPath, [yarnPath, ...argv], opts);
@@ -104994,7 +104923,6 @@ const messages = {
   errorExtractingTarball: 'Extracting tar content of $1 failed, the file appears to be corrupt: $0',
   updateInstalling: 'Installing $0...',
   hostedGitResolveError: 'Error connecting to repository. Please, check the url.',
-  unauthorizedResponse: 'Received a 401 from $0. $1',
 
   unknownFetcherFor: 'Unknown fetcher for $0',
 
@@ -106869,7 +106797,7 @@ const semver = __webpack_require__(22);
 const path = __webpack_require__(0);
 const url = __webpack_require__(24);
 
-const VALID_BIN_KEYS = /^(?!\.{0,2}$)[a-z0-9._-]+$/i;
+const VALID_BIN_KEYS = /^[a-z0-9_-]+$/i;
 
 const LICENSE_RENAMES = {
   'MIT/X11': 'MIT',
@@ -107732,11 +107660,7 @@ function parseRcPaths(paths, parser) {
     try {
       return parser((0, (_fs || _load_fs()).readFileSync)(path).toString(), path);
     } catch (error) {
-      if (error.code === 'ENOENT' || error.code === 'EISDIR') {
       return {};
-      } else {
-        throw error;
-      }
     }
   }));
 }

.yarnrc

@@ -2,4 +2,4 @@
 # yarn lockfile v1
 
 
-yarn-path ".yarn/releases/yarn-1.22.4.js"
+yarn-path ".yarn/releases/yarn-1.21.1.js"

BUILD.bazel

@@ -2,6 +2,7 @@ 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",
@@ -24,7 +25,7 @@ filegroup(
         "//packages/zone.js/dist:zone-testing.js",
         "//packages/zone.js/dist:task-tracking.js",
         "//:test-events.js",
-        "//:third_party/shims_for_IE.js",
+        "//:shims_for_IE.js",
         # Including systemjs because it defines `__eval`, which produces correct stack traces.
         "@npm//:node_modules/systemjs/dist/system.src.js",
         "@npm//:node_modules/reflect-metadata/Reflect.js",

CHANGELOG.md

@@ -1,576 +1,3 @@
-<a name="10.0.8"></a>
-## 10.0.8 (2020-08-04)
-
-
-### Bug Fixes
-
-* **compiler:** add PURE annotation to getInheritedFactory calls ([#38291](https://github.com/angular/angular/issues/38291)) ([03d8e31](https://github.com/angular/angular/commit/03d8e31))
-* **compiler:** update unparsable character reference entity error messages ([#38319](https://github.com/angular/angular/issues/38319)) ([cea4678](https://github.com/angular/angular/commit/cea4678)), closes [#26067](https://github.com/angular/angular/issues/26067)
-
-
-
-<a name="10.0.7"></a>
-## 10.0.7 (2020-07-30)
-
-
-### Bug Fixes
-
-* **compiler:** Metadata should not include methods on Object.prototype ([#38292](https://github.com/angular/angular/issues/38292)) ([879ff08](https://github.com/angular/angular/commit/879ff08))
-
-
-
-<a name="10.0.6"></a>
-## 10.0.6 (2020-07-28)
-
-
-### Bug Fixes
-
-* **compiler:** share identical stylesheets between components in the same file ([#38213](https://github.com/angular/angular/issues/38213)) ([264950b](https://github.com/angular/angular/commit/264950b)), closes [#38204](https://github.com/angular/angular/issues/38204)
-* **compiler-cli:** Add support for string literal class members ([#38226](https://github.com/angular/angular/issues/38226)) ([b1e7775](https://github.com/angular/angular/commit/b1e7775))
-* **core:** `Attribute` decorator `attributeName` is mandatory ([#38131](https://github.com/angular/angular/issues/38131)) ([1c4fcce](https://github.com/angular/angular/commit/1c4fcce)), closes [#32658](https://github.com/angular/angular/issues/32658)
-* **core:** unify the signature between ngZone and noopZone ([#37581](https://github.com/angular/angular/issues/37581)) ([d5264f5](https://github.com/angular/angular/commit/d5264f5))
-
-
-
-<a name="10.0.5"></a>
-## 10.0.5 (2020-07-22)
-
-
-### Bug Fixes
-
-* **compiler:** properly associate source spans for implicitly closed elements ([#38126](https://github.com/angular/angular/issues/38126)) ([e80278c](https://github.com/angular/angular/commit/e80278c)), closes [#36118](https://github.com/angular/angular/issues/36118)
-* **compiler-cli:** ensure file_system handles mixed Windows drives ([#38030](https://github.com/angular/angular/issues/38030)) ([dba4023](https://github.com/angular/angular/commit/dba4023)), closes [#36777](https://github.com/angular/angular/issues/36777)
-* **core:** Allow modification of lifecycle hooks any time before bootstrap ([#38119](https://github.com/angular/angular/issues/38119)) ([14b4718](https://github.com/angular/angular/commit/14b4718)), closes [#30497](https://github.com/angular/angular/issues/30497)
-* **core:** error due to integer overflow when there are too many host bindings ([#38014](https://github.com/angular/angular/issues/38014)) ([7b6e73c](https://github.com/angular/angular/commit/7b6e73c)), closes [#37876](https://github.com/angular/angular/issues/37876) [#37876](https://github.com/angular/angular/issues/37876)
-* **core:** incorrectly validating properties on ng-content and ng-container ([#37773](https://github.com/angular/angular/issues/37773)) ([17ddab9](https://github.com/angular/angular/commit/17ddab9))
-
-
-
-<a name="10.0.4"></a>
-## 10.0.4 (2020-07-15)
-
-
-### Bug Fixes
-
-* **bazel:** ng_module rule does not expose flat module information in Ivy ([#36971](https://github.com/angular/angular/issues/36971)) ([b76a2dc](https://github.com/angular/angular/commit/b76a2dc))
-* **compiler:** check more cases for pipe usage inside host bindings ([#37883](https://github.com/angular/angular/issues/37883)) ([a94383f](https://github.com/angular/angular/commit/a94383f)), closes [#34655](https://github.com/angular/angular/issues/34655) [#37610](https://github.com/angular/angular/issues/37610)
-* **language-service:** non-existent module format in package output ([#37778](https://github.com/angular/angular/issues/37778)) ([12f1773](https://github.com/angular/angular/commit/12f1773))
-* **language-service:** remove completion for string ([#37983](https://github.com/angular/angular/issues/37983)) ([387e838](https://github.com/angular/angular/commit/387e838))
-* **ngcc:** report a warning if ngcc tries to use a solution-style tsconfig ([#38003](https://github.com/angular/angular/issues/38003)) ([e3b8010](https://github.com/angular/angular/commit/e3b8010)), closes [#36386](https://github.com/angular/angular/issues/36386)
-* **service-worker:** correctly handle relative base href ([#37922](https://github.com/angular/angular/issues/37922)) ([b186db7](https://github.com/angular/angular/commit/b186db7)), closes [#25055](https://github.com/angular/angular/issues/25055) [#25055](https://github.com/angular/angular/issues/25055)
-* **service-worker:** correctly serve `ngsw/state` with a non-root SW scope ([#37922](https://github.com/angular/angular/issues/37922)) ([dc42c97](https://github.com/angular/angular/commit/dc42c97)), closes [#30505](https://github.com/angular/angular/issues/30505)
-
-
-### Features
-
-* **bazel:** provide LinkablePackageInfo from ng_module ([#37778](https://github.com/angular/angular/issues/37778)) ([6cd10a1](https://github.com/angular/angular/commit/6cd10a1)), closes [/github.com/bazelbuild/rules_nodejs/blob/9a5de3728b05bf1647bbb87ad99f54e626604705/internal/linker/link_node_modules.bzl#L144-L146](https://github.com//github.com/bazelbuild/rules_nodejs/blob/9a5de3728b05bf1647bbb87ad99f54e626604705/internal/linker/link_node_modules.bzl/issues/L144-L146)
-
-
-
-<a name="10.0.3"></a>
-## 10.0.3 (2020-07-08)
-
-
-### Bug Fixes
-
-* **core:** handle spaces after `select` and `plural` ICU keywords ([#37866](https://github.com/angular/angular/issues/37866)) ([790bb94](https://github.com/angular/angular/commit/790bb94))
-
-
-
-<a name="10.0.2"></a>
-## [10.0.2](https://github.com/angular/angular/compare/10.0.1...10.0.2) (2020-06-30)
-
-
-### Bug Fixes
-
-* **core:** determine required DOMParser feature availability ([#36578](https://github.com/angular/angular/issues/36578)) ([#37783](https://github.com/angular/angular/issues/37783)) ([12a71bc](https://github.com/angular/angular/commit/12a71bc))
-* **core:** do not trigger CSP alert/report in Firefox and Chrome ([#36578](https://github.com/angular/angular/issues/36578)) ([#37783](https://github.com/angular/angular/issues/37783)) ([b0b7248](https://github.com/angular/angular/commit/b0b7248)), closes [#25214](https://github.com/angular/angular/issues/25214)
-* **core:** don't consider inherited NG_ELEMENT_ID during DI ([#37574](https://github.com/angular/angular/issues/37574)) ([64b0ae9](https://github.com/angular/angular/commit/64b0ae9)), closes [#36235](https://github.com/angular/angular/issues/36235)
-* **core:** error when invoking callbacks registered via ViewRef.onDestroy ([#37543](https://github.com/angular/angular/issues/37543)) ([75b119e](https://github.com/angular/angular/commit/75b119e)), closes [#36213](https://github.com/angular/angular/issues/36213)
-* **core:** error when invoking callbacks registered via ViewRef.onDestroy ([#37543](https://github.com/angular/angular/issues/37543)) ([#37783](https://github.com/angular/angular/issues/37783)) ([df2cd37](https://github.com/angular/angular/commit/df2cd37)), closes [#36213](https://github.com/angular/angular/issues/36213)
-* **core:** fake_async_fallback should have the same logic with fake-async ([#37680](https://github.com/angular/angular/issues/37680)) ([7a91b23](https://github.com/angular/angular/commit/7a91b23))
-* **elements:** fire custom element output events during component initialization ([#37570](https://github.com/angular/angular/issues/37570)) ([89e16ed](https://github.com/angular/angular/commit/89e16ed)), 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:** incorrect autocomplete results on unknown symbol ([#37518](https://github.com/angular/angular/issues/37518)) ([7c0b25f](https://github.com/angular/angular/commit/7c0b25f))
-* **ngcc:** ensure lockfile is removed when analyzeFn fails ([#37739](https://github.com/angular/angular/issues/37739)) ([1a1f99a](https://github.com/angular/angular/commit/1a1f99a))
-* **ngcc:** prevent including JavaScript sources outside of the package ([#37596](https://github.com/angular/angular/issues/37596)) ([4b90b6a](https://github.com/angular/angular/commit/4b90b6a)), closes [#37508](https://github.com/angular/angular/issues/37508)
-
-
-### Performance Improvements
-
-* **compiler-cli:** fix memory leak in retained incremental state ([#37835](https://github.com/angular/angular/issues/37835)) ([57a518a](https://github.com/angular/angular/commit/57a518a))
-
-
-
-<a name="10.0.1"></a>
-## [10.0.1](https://github.com/angular/angular/compare/10.0.0...10.0.1) (2020-06-26)
-
-
-### Bug Fixes
-
-* **core:** cleanup DOM elements when root view is removed ([#37600](https://github.com/angular/angular/issues/37600)) ([64f2ffa](https://github.com/angular/angular/commit/64f2ffa)), closes [#36449](https://github.com/angular/angular/issues/36449)
-* **forms:** change error message ([#37643](https://github.com/angular/angular/issues/37643)) ([c5bc2e7](https://github.com/angular/angular/commit/c5bc2e7))
-* **forms:** correct usage of `selectedOptions` ([#37620](https://github.com/angular/angular/issues/37620)) ([dfb58c4](https://github.com/angular/angular/commit/dfb58c4)), closes [#37433](https://github.com/angular/angular/issues/37433)
-* **http:** avoid abort a request when fetch operation is completed ([#37367](https://github.com/angular/angular/issues/37367)) ([a5d5f67](https://github.com/angular/angular/commit/a5d5f67))
-* **language-service:** reinstate getExternalFiles() ([#37750](https://github.com/angular/angular/issues/37750)) ([ad6680f](https://github.com/angular/angular/commit/ad6680f))
-* **migrations:** do not incorrectly add todo for @Injectable or @Pipe ([#37732](https://github.com/angular/angular/issues/37732)) ([13020b9](https://github.com/angular/angular/commit/13020b9)), closes [#37726](https://github.com/angular/angular/issues/37726)
-* **router:** `RouterLinkActive` should run CD when setting `isActive` ([#21411](https://github.com/angular/angular/issues/21411)) ([a8ea817](https://github.com/angular/angular/commit/a8ea817)), closes [#15943](https://github.com/angular/angular/issues/15943) [#19934](https://github.com/angular/angular/issues/19934)
-* **router:** add null support for RouterLink directive ([#32616](https://github.com/angular/angular/issues/32616)) ([69948ce](https://github.com/angular/angular/commit/69948ce))
-* **router:** fix error when calling ParamMap.get function ([#31599](https://github.com/angular/angular/issues/31599)) ([3190ccf](https://github.com/angular/angular/commit/3190ccf))
-
-
-### Performance Improvements
-
-* **compiler-cli:** fix regressions in incremental program reuse ([#37690](https://github.com/angular/angular/issues/37690)) ([96b96fb](https://github.com/angular/angular/commit/96b96fb))
-
-
-
-<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)
-
-### 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/version-10-of-angular-now-available-78960babd41).
-
-
-### 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))
-* **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))
-* **compiler:** Propagate value span of ExpressionBinding to ParsedProperty ([#36133](https://github.com/angular/angular/issues/36133)) ([d714b95](https://github.com/angular/angular/commit/d714b95))
-* **compiler:** add dependency info and ng-content selectors to metadata ([#35695](https://github.com/angular/angular/issues/35695)) ([32ce8b1](https://github.com/angular/angular/commit/32ce8b1))
-* **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))
-* **core** make generic mandatory for ModuleWithProviders ([#36892](https://github.com/angular/angular/issues/36892)) ([20cc3ab](https://github.com/angular/angular/commit/20cc3ab))
-* **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)
-* **core:** undecorated-classes migration should handle derived abstract classes ([#35339](https://github.com/angular/angular/issues/35339)) ([c24ad56](https://github.com/angular/angular/commit/c24ad56))
-* **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))
-* **language-service:** Remove HTML entities autocompletion ([#37515](https://github.com/angular/angular/issues/37515)) ([67bd88b](https://github.com/angular/angular/commit/67bd88b))
-* **language-service:** TS references from template items ([#37437](https://github.com/angular/angular/issues/37437)) ([bf2cb6f](https://github.com/angular/angular/commit/bf2cb6f))
-* **language-service:** [ivy] Parse Angular compiler options ([#36922](https://github.com/angular/angular/issues/36922)) ([dbd0f8e](https://github.com/angular/angular/commit/dbd0f8e))
-* **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))
-* **localize:** support merging multiple translation files ([#36792](https://github.com/angular/angular/issues/36792)) ([72f534f](https://github.com/angular/angular/commit/72f534f))
-* **ngcc:** allow async locking timeouts to be configured ([#36838](https://github.com/angular/angular/issues/36838)) ([38f805c](https://github.com/angular/angular/commit/38f805c))
-* **ngcc:** implement a program-based entry-point finder ([#37075](https://github.com/angular/angular/issues/37075)) ([f3ccd29](https://github.com/angular/angular/commit/f3ccd29))
-* **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))
-* **ngcc:** support marking an in-progress task as unprocessed ([#36626](https://github.com/angular/angular/issues/36626)) ([4665c35](https://github.com/angular/angular/commit/4665c35))
-* **ngcc:** support reverting a file written by `FileWriter` ([#36626](https://github.com/angular/angular/issues/36626)) ([772ccf0](https://github.com/angular/angular/commit/772ccf0))
-* **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))
-* **router:** allow CanLoad guard to return UrlTree ([#36610](https://github.com/angular/angular/issues/36610)) ([00e6cb1](https://github.com/angular/angular/commit/00e6cb1)), closes [#26521](https://github.com/angular/angular/issues/26521) [#28306](https://github.com/angular/angular/issues/28306)
-* **service-worker:** include `CacheQueryOptions` options in ngsw-config ([#34663](https://github.com/angular/angular/issues/34663)) ([dc9f4b9](https://github.com/angular/angular/commit/dc9f4b9)), closes [#28443](https://github.com/angular/angular/issues/28443)
-* **service-worker:** support timeout in `registerWhenStable` SW registration strategy ([#35870](https://github.com/angular/angular/issues/35870)) ([00efacf](https://github.com/angular/angular/commit/00efacf)), closes [#34464](https://github.com/angular/angular/issues/34464)
-* **service-worker:** use `ignoreVary: true` when retrieving responses from cache ([#34663](https://github.com/angular/angular/issues/34663)) ([ee35e22](https://github.com/angular/angular/commit/ee35e22)), closes [#36638](https://github.com/angular/angular/issues/36638)
-* remove TypeScript 3.6 and 3.7 support ([#36329](https://github.com/angular/angular/issues/36329)) ([fbd281c](https://github.com/angular/angular/commit/fbd281c))
-* remove support for TypeScript 3.8 ([#37129](https://github.com/angular/angular/issues/37129)) ([6466fb2](https://github.com/angular/angular/commit/6466fb2))
-
-
-### 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))
-* **common:** `locales/global/*.js` are not ES5 compliant ([#36342](https://github.com/angular/angular/issues/36342)) ([078b0be](https://github.com/angular/angular/commit/078b0be)), closes [angular/angular-cli#16394](https://github.com/angular/angular-cli/issues/16394)
-* **common:** format day-periods that cross midnight ([#36611](https://github.com/angular/angular/issues/36611)) ([c6e5fc4](https://github.com/angular/angular/commit/c6e5fc4)), closes [#36566](https://github.com/angular/angular/issues/36566)
-* **common:** let `KeyValuePipe` accept type unions with `null` ([#36093](https://github.com/angular/angular/issues/36093)) ([d783519](https://github.com/angular/angular/commit/d783519)), closes [#35743](https://github.com/angular/angular/issues/35743)
-* **common:** prevent duplicate URL change notifications ([#37404](https://github.com/angular/angular/issues/37404)) ([fff424a](https://github.com/angular/angular/commit/fff424a))
-* **common:** prevent duplicate URL change notifications ([#37459](https://github.com/angular/angular/issues/37459)) ([0864726](https://github.com/angular/angular/commit/0864726))
-* **compiler-cli:** `isCaseSensitive()` returns correct value ([#36859](https://github.com/angular/angular/issues/36859)) ([fc4741f](https://github.com/angular/angular/commit/fc4741f))
-* **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))
-* **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:** 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)
-* **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:** 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)
-* **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 `getRootDirs()` handles case-sensitivity ([#36859](https://github.com/angular/angular/issues/36859)) ([3f3e9b7](https://github.com/angular/angular/commit/3f3e9b7))
-* **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:** pass real source spans where they are empty ([#31805](https://github.com/angular/angular/issues/31805)) ([e893c5a](https://github.com/angular/angular/commit/e893c5a))
-* **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))
-* **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))
-* **compiler:** avoid generating i18n attributes in plain form ([#36422](https://github.com/angular/angular/issues/36422)) ([88b0985](https://github.com/angular/angular/commit/88b0985))
-* **compiler:** avoid undefined expressions in holey array ([#36343](https://github.com/angular/angular/issues/36343)) ([5516802](https://github.com/angular/angular/commit/5516802))
-* **compiler:** handle type references to namespaced symbols correctly ([#36106](https://github.com/angular/angular/issues/36106)) ([4aa4e6f](https://github.com/angular/angular/commit/4aa4e6f)), closes [#36006](https://github.com/angular/angular/issues/36006)
-* **compiler:** normalize line endings in ICU expansions ([#36741](https://github.com/angular/angular/issues/36741)) ([70dd27f](https://github.com/angular/angular/commit/70dd27f)), closes [#36725](https://github.com/angular/angular/issues/36725)
-* **compiler:** record correct end of expression ([#34690](https://github.com/angular/angular/issues/34690)) ([df890d7](https://github.com/angular/angular/commit/df890d7)), closes [#33477](https://github.com/angular/angular/issues/33477)
-* **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:** resolve enum values in binary operations ([#36461](https://github.com/angular/angular/issues/36461)) ([64022f5](https://github.com/angular/angular/commit/64022f5)), closes [#35584](https://github.com/angular/angular/issues/35584)
-* **compiler:** switch to 'referencedFiles' for shim generation ([#36211](https://github.com/angular/angular/issues/36211)) ([4213e8d](https://github.com/angular/angular/commit/4213e8d))
-* **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:** 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:** Refresh transplanted views at insertion point only ([#35968](https://github.com/angular/angular/issues/35968)) ([1786586](https://github.com/angular/angular/commit/1786586)), closes [#35400](https://github.com/angular/angular/issues/35400) [#21324](https://github.com/angular/angular/issues/21324)
-* **core:** attempt to recover from user errors during creation ([#36381](https://github.com/angular/angular/issues/36381)) ([3d82aa7](https://github.com/angular/angular/commit/3d82aa7)), closes [#31221](https://github.com/angular/angular/issues/31221)
-* **core:** avoid migration error when non-existent symbol is imported ([#36367](https://github.com/angular/angular/issues/36367)) ([d43c306](https://github.com/angular/angular/commit/d43c306)), closes [#36346](https://github.com/angular/angular/issues/36346)
-* **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)
-* **core:** disable tsickle pass when producing APF packages ([#37221](https://github.com/angular/angular/issues/37221)) ([a1001f2](https://github.com/angular/angular/commit/a1001f2))
-* **core:** do not use unbound attributes as inputs to structural directives ([#36441](https://github.com/angular/angular/issues/36441)) ([acf6075](https://github.com/angular/angular/commit/acf6075))
-* **core:** handle empty translations correctly ([#36499](https://github.com/angular/angular/issues/36499)) ([b1f1d3f](https://github.com/angular/angular/commit/b1f1d3f)), closes [#36476](https://github.com/angular/angular/issues/36476)
-* **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:** handle synthetic props in Directive host bindings correctly ([#35568](https://github.com/angular/angular/issues/35568)) ([f27deea](https://github.com/angular/angular/commit/f27deea)), closes [#35501](https://github.com/angular/angular/issues/35501)
-* **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)
-* **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))
-* **core:** log error instead of warning for unknown properties and elements ([#36399](https://github.com/angular/angular/issues/36399)) ([9d9d46f](https://github.com/angular/angular/commit/9d9d46f)), closes [#35699](https://github.com/angular/angular/issues/35699)
-* **core:** missing-injectable migration should not migrate `@NgModule` classes ([#36369](https://github.com/angular/angular/issues/36369)) ([28995db](https://github.com/angular/angular/commit/28995db)), closes [#35700](https://github.com/angular/angular/issues/35700)
-* **core:** ngOnDestroy on multi providers called with incorrect context ([#35840](https://github.com/angular/angular/issues/35840)) ([95fc3d4](https://github.com/angular/angular/commit/95fc3d4)), closes [#35231](https://github.com/angular/angular/issues/35231)
-* **core:** pipes injecting viewProviders when used on a component host node ([#36512](https://github.com/angular/angular/issues/36512)) ([81d23b3](https://github.com/angular/angular/commit/81d23b3)), closes [#36146](https://github.com/angular/angular/issues/36146)
-* **core:** prevent unknown property check for AOT-compiled components ([#36072](https://github.com/angular/angular/issues/36072)) ([4a9f0be](https://github.com/angular/angular/commit/4a9f0be)), closes [#35945](https://github.com/angular/angular/issues/35945)
-* **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)
-* **core:** properly identify modules affected by overrides in TestBed ([#36649](https://github.com/angular/angular/issues/36649)) ([942b986](https://github.com/angular/angular/commit/942b986)), closes [#36619](https://github.com/angular/angular/issues/36619)
-* **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)
-* **core:** run `APP_INITIALIZER`s before accessing `LOCALE_ID` token in Ivy TestBed ([#36237](https://github.com/angular/angular/issues/36237)) ([1649743](https://github.com/angular/angular/commit/1649743)), closes [#36230](https://github.com/angular/angular/issues/36230)
-* **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)
-* **core:** undecorated-classes-with-decorated-fields migration does not decorate derived classes ([#35339](https://github.com/angular/angular/issues/35339)) ([32eafef](https://github.com/angular/angular/commit/32eafef)), closes [#34376](https://github.com/angular/angular/issues/34376)
-* **core:** undecorated-classes-with-decorated-fields migration should avoid error if base class has no value declaration ([#36543](https://github.com/angular/angular/issues/36543)) ([ca67748](https://github.com/angular/angular/commit/ca67748)), closes [#36522](https://github.com/angular/angular/issues/36522)
-* **core:** workaround Terser inlining bug ([#36200](https://github.com/angular/angular/issues/36200)) ([0ce8ad3](https://github.com/angular/angular/commit/0ce8ad3))
-* **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 [#30848](https://github.com/angular/angular/issues/30848)
-* **elements:** correctly handle setting inputs to `undefined` ([#36140](https://github.com/angular/angular/issues/36140)) ([9ba46d9](https://github.com/angular/angular/commit/9ba46d9))
-* **elements:** correctly set `SimpleChange#firstChange` for pre-existing inputs ([#36140](https://github.com/angular/angular/issues/36140)) ([b14ac96](https://github.com/angular/angular/commit/b14ac96)), closes [#36130](https://github.com/angular/angular/issues/36130)
-* **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))
-* **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 [#36141](https://github.com/angular/angular/issues/36141)
-* **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)
-* **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))
-* **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))
-* **language-service:** disable update the `[@angular](https://github.com/angular)/core` module ([#36783](https://github.com/angular/angular/issues/36783)) ([dd049ca](https://github.com/angular/angular/commit/dd049ca))
-* **language-service:** infer type of elements of array-like objects ([#36312](https://github.com/angular/angular/issues/36312)) ([fe2b692](https://github.com/angular/angular/commit/fe2b692)), closes [#36191](https://github.com/angular/angular/issues/36191)
-* **language-service:** properly evaluate types in comparable expressions ([#36529](https://github.com/angular/angular/issues/36529)) ([8be0972](https://github.com/angular/angular/commit/8be0972))
-* **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))
-* **language-service:** use the `HtmlAst` to get the span of HTML tag ([#36371](https://github.com/angular/angular/issues/36371)) ([81195a2](https://github.com/angular/angular/commit/81195a2))
-* **language-service:** wrong completions in conditional operator ([#37505](https://github.com/angular/angular/issues/37505)) ([32020f9](https://github.com/angular/angular/commit/32020f9))
-* **localize:** allow ICU expansion case to start with any character except `}` ([#36123](https://github.com/angular/angular/issues/36123)) ([fced8ee](https://github.com/angular/angular/commit/fced8ee)), closes [#31586](https://github.com/angular/angular/issues/31586)
-* **localize:** ensure `getLocation()` works ([#36853](https://github.com/angular/angular/issues/36853)) ([70b25a3](https://github.com/angular/angular/commit/70b25a3))
-* **localize:** include legacy ids when describing messages ([#36761](https://github.com/angular/angular/issues/36761)) ([47f9867](https://github.com/angular/angular/commit/47f9867))
-* **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:** add process title ([#36448](https://github.com/angular/angular/issues/36448)) ([76a8cd5](https://github.com/angular/angular/commit/76a8cd5)), closes [36414#issuecomment-609644282](https://github.com/angular/angular/issues/36414#issuecomment-609644282)
-* **ngcc:** allow ngcc configuration to match pre-release versions of packages ([#36370](https://github.com/angular/angular/issues/36370)) ([326240e](https://github.com/angular/angular/commit/326240e))
-* **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:** correctly detect external files from nested `node_modules/` ([#36559](https://github.com/angular/angular/issues/36559)) ([6ab43d7](https://github.com/angular/angular/commit/6ab43d7)), closes [#36526](https://github.com/angular/angular/issues/36526)
-* **ngcc:** correctly detect imported TypeScript helpers ([#36284](https://github.com/angular/angular/issues/36284)) ([ca25c95](https://github.com/angular/angular/commit/ca25c95)), closes [#36089](https://github.com/angular/angular/issues/36089)
-* **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 identify relative Windows-style import paths ([#36372](https://github.com/angular/angular/issues/36372)) ([aecf9de](https://github.com/angular/angular/commit/aecf9de))
-* **ngcc:** correctly identify the package path of secondary entry-points ([#36249](https://github.com/angular/angular/issues/36249)) ([995cd15](https://github.com/angular/angular/commit/995cd15)), closes [#35747](https://github.com/angular/angular/issues/35747)
-* **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))
-* **ngcc:** detect non-emitted, non-imported TypeScript helpers ([#36418](https://github.com/angular/angular/issues/36418)) ([5fa7b8b](https://github.com/angular/angular/commit/5fa7b8b))
-* **ngcc:** display output from the unlocker process on Windows ([#36569](https://github.com/angular/angular/issues/36569)) ([e041ac6](https://github.com/angular/angular/commit/e041ac6))
-* **ngcc:** display unlocker process output in sync mode ([#36637](https://github.com/angular/angular/issues/36637)) ([cabf997](https://github.com/angular/angular/commit/cabf997)), closes [/github.com/nodejs/node/issues/3596#issuecomment-250890218](https://github.com/nodejs/node/issues/3596#issuecomment-250890218)
-* **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:** do not run in parallel mode if there are less than 3 CPU cores ([#36626](https://github.com/angular/angular/issues/36626)) ([4c63241](https://github.com/angular/angular/commit/4c63241))
-* **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:** do not spawn more processes than intended in parallel mode ([#36280](https://github.com/angular/angular/issues/36280)) ([5cee709](https://github.com/angular/angular/commit/5cee709)), closes [#35719](https://github.com/angular/angular/issues/35719) [#36278](https://github.com/angular/angular/issues/36278)
-* **ngcc:** do not spawn unlocker processes on cluster workers ([#36569](https://github.com/angular/angular/issues/36569)) ([66effde](https://github.com/angular/angular/commit/66effde)), closes [#35861](https://github.com/angular/angular/issues/35861)
-* **ngcc:** do not use cached file-system ([#36687](https://github.com/angular/angular/issues/36687)) ([0c2ed4c](https://github.com/angular/angular/commit/0c2ed4c)), closes [/github.com/angular/angular-cli/issues/16860#issuecomment-614694269](https://github.com/angular/angular-cli/issues/16860#issuecomment-614694269)
-* **ngcc:** do not warn if `paths` mapping does not exist ([#36525](https://github.com/angular/angular/issues/36525)) ([717df13](https://github.com/angular/angular/commit/717df13)), closes [#36518](https://github.com/angular/angular/issues/36518)
-* **ngcc:** do not write entry-point manifest outside node_modules ([#36299](https://github.com/angular/angular/issues/36299)) ([c6dd900](https://github.com/angular/angular/commit/c6dd900)), closes [#36296](https://github.com/angular/angular/issues/36296)
-* **ngcc:** don't crash on cyclic source-map references ([#36452](https://github.com/angular/angular/issues/36452)) ([ee70a18](https://github.com/angular/angular/commit/ee70a18)), closes [#35727](https://github.com/angular/angular/issues/35727) [#35757](https://github.com/angular/angular/issues/35757)
-* **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:** 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)
-* **ngcc:** force ngcc to exit on error ([#36622](https://github.com/angular/angular/issues/36622)) ([663b768](https://github.com/angular/angular/commit/663b768)), closes [#36616](https://github.com/angular/angular/issues/36616)
-* **ngcc:** give up re-spawning crashed worker process after 3 attempts ([#36626](https://github.com/angular/angular/issues/36626)) ([793cb32](https://github.com/angular/angular/commit/793cb32))
-* **ngcc:** handle `ENOMEM` errors in worker processes ([#36626](https://github.com/angular/angular/issues/36626)) ([4779c4b](https://github.com/angular/angular/commit/4779c4b))
-* **ngcc:** handle bad path mappings when finding entry-points ([#36331](https://github.com/angular/angular/issues/36331)) ([cc4b813](https://github.com/angular/angular/commit/cc4b813)), closes [#36313](https://github.com/angular/angular/issues/36313) [#36283](https://github.com/angular/angular/issues/36283)
-* **ngcc:** handle entry-points within container folders ([#36305](https://github.com/angular/angular/issues/36305)) ([38ad1d9](https://github.com/angular/angular/commit/38ad1d9)), closes [#35756](https://github.com/angular/angular/issues/35756) [#36216](https://github.com/angular/angular/issues/36216)
-* **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)
-* **ngcc:** provide a unique exit code for timeouts ([#36838](https://github.com/angular/angular/issues/36838)) ([d805526](https://github.com/angular/angular/commit/d805526))
-* **ngcc:** recognize enum declarations emitted in JavaScript ([#36550](https://github.com/angular/angular/issues/36550)) ([89c5890](https://github.com/angular/angular/commit/89c5890)), closes [#35584](https://github.com/angular/angular/issues/35584)
-* **ngcc:** sniff `main` property for ESM5 format ([#36396](https://github.com/angular/angular/issues/36396)) ([2463548](https://github.com/angular/angular/commit/2463548)), closes [#35788](https://github.com/angular/angular/issues/35788)
-* **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)
-* **ngcc:** support TS 3.9 wrapped ES2015 classes ([#36884](https://github.com/angular/angular/issues/36884)) ([db4c59d](https://github.com/angular/angular/commit/db4c59d))
-* **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))
-* **ngcc:** support ignoring deep-imports via package config ([#36423](https://github.com/angular/angular/issues/36423)) ([f9fb833](https://github.com/angular/angular/commit/f9fb833)), closes [#35750](https://github.com/angular/angular/issues/35750)
-* **ngcc:** support recovering when a worker process crashes ([#36626](https://github.com/angular/angular/issues/36626)) ([966598c](https://github.com/angular/angular/commit/966598c)), closes [#36278](https://github.com/angular/angular/issues/36278)
-* **ngcc:** support simple `browser` property in entry-points ([#36396](https://github.com/angular/angular/issues/36396)) ([6b3aa60](https://github.com/angular/angular/commit/6b3aa60)), closes [#36062](https://github.com/angular/angular/issues/36062)
-* **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)
-* **ngcc:** use path-mappings from tsconfig in dependency resolution ([#36180](https://github.com/angular/angular/issues/36180)) ([380de1e](https://github.com/angular/angular/commit/380de1e)), closes [#36119](https://github.com/angular/angular/issues/36119)
-* **ngcc:** use preserve whitespaces from tsconfig if provided ([#36189](https://github.com/angular/angular/issues/36189)) ([b8e9a30](https://github.com/angular/angular/commit/b8e9a30)), closes [#35871](https://github.com/angular/angular/issues/35871)
-* **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)
-* **platform-server:** update `xhr2` dependency ([#36366](https://github.com/angular/angular/issues/36366)) ([b59bc0e](https://github.com/angular/angular/commit/b59bc0e)), closes [#36358](https://github.com/angular/angular/issues/36358)
-* **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)
-* **router:** allow UrlMatcher to return null ([#36402](https://github.com/angular/angular/issues/36402)) ([568e9df](https://github.com/angular/angular/commit/568e9df)), closes [#29824](https://github.com/angular/angular/issues/29824)
-* **router:** cancel navigation when at least one resolver completes with no "next" emission ([#24621](https://github.com/angular/angular/issues/24621)) ([d9c4840](https://github.com/angular/angular/commit/d9c4840)), closes [#24195](https://github.com/angular/angular/issues/24195)
-* **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) [#13586](https://github.com/angular/angular/issues/13586)
-* **router:** pass correct component to canDeactivate checks when using two or more sibling router-outlets ([#36302](https://github.com/angular/angular/issues/36302)) ([80e6c07](https://github.com/angular/angular/commit/80e6c07)), closes [#34614](https://github.com/angular/angular/issues/34614)
-* **router:** state data missing in routerLink ([#36462](https://github.com/angular/angular/issues/36462)) ([e0415db](https://github.com/angular/angular/commit/e0415db)), closes [#33173](https://github.com/angular/angular/issues/33173)
-* **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)
-* **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)
-* **service-worker:** by default register the SW after 30s even the app never stabilizes ([#35870](https://github.com/angular/angular/issues/35870)) ([29e8a64](https://github.com/angular/angular/commit/29e8a64)), closes [#34464](https://github.com/angular/angular/issues/34464)
-* **service-worker:** prevent SW registration strategies from affecting app stabilization ([#35870](https://github.com/angular/angular/issues/35870)) ([2d7c95f](https://github.com/angular/angular/commit/2d7c95f))
-* **upgrade:** update $locationShim to handle Location changes before initialization ([#36498](https://github.com/angular/angular/issues/36498)) ([0cc53fb](https://github.com/angular/angular/commit/0cc53fb)), closes [#36492](https://github.com/angular/angular/issues/36492)
-* add aikidave as reviewer for DOCS: Marketing ([#37014](https://github.com/angular/angular/issues/37014)) ([286fbf4](https://github.com/angular/angular/commit/286fbf4))
-
-
-### Code Refactoring
-
-* **common:** remove WrappedValue from AsyncPipe ([#36633](https://github.com/angular/angular/issues/36633)) ([49be32c](https://github.com/angular/angular/commit/49be32c)), closes [#29927](https://github.com/angular/angular/issues/29927)
-
-
-
-### 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))
-* **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)
-* **forms:** optimize internal method _anyControls in FormGroup ([#32534](https://github.com/angular/angular/issues/32534)) ([6c7467a](https://github.com/angular/angular/commit/6c7467a))
-* **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)
-* **ngcc:** only compute basePaths in TargetedEntryPointFinder when needed ([#36881](https://github.com/angular/angular/issues/36881)) ([ec6b9cc](https://github.com/angular/angular/commit/ec6b9cc)), closes [#36874](https://github.com/angular/angular/issues/36874)
-* **ngcc:** only load  if it is needed ([#36486](https://github.com/angular/angular/issues/36486)) ([3bedfda](https://github.com/angular/angular/commit/3bedfda))
-* **ngcc:** read dependencies from entry-point manifest ([#36486](https://github.com/angular/angular/issues/36486)) ([a185efb](https://github.com/angular/angular/commit/a185efb)), closes [#issuecomment-608401834](https://github.com/angular/angular#issuecomment-608401834)
-* **ngcc:** reduce the size of the entry-point manifest file ([#36486](https://github.com/angular/angular/issues/36486)) ([ec0ce60](https://github.com/angular/angular/commit/ec0ce60))
-* **ngcc:** speed up the `getBasePaths()` computation ([#36881](https://github.com/angular/angular/issues/36881)) ([e037840](https://github.com/angular/angular/commit/e037840))
-
-
-
-#### Dependency updates
-@angular/compiler-cli now requires:
-- TypeScript 3.9
-
-
-### BREAKING CHANGES
-
-* TypeScript 3.6, 3.7 and 3.8 are no longer supported, please update to TypeScript 3.9.
-* **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.
-
-* **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.
-
-* **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.
-
-* **core:** Warnings about unknown elements are now logged as errors. This won't break your app, but it may trip up tools that expect nothing to be logged via `console.error`.
-* **router:** Any resolver which return EMPTY will cancel navigation.
-If you want to allow the navigation to continue, you will need to update the resolvers to emit
-some value, (i.e. defaultIfEmpty(...), of(...), etc).
-* **service-worker:** Previously, [Vary](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Vary)
-headers would be taken into account when retrieving resources from the
-cache, completely preventing the retrieval of cached assets (due to
-ServiceWorker implementation details) and leading to unpredictable
-behavior due to inconsistent/buggy implementations in different
-browsers.
-
-Now, `Vary` headers are ignored when retrieving resources from the
-ServiceWorker caches, which can result in resources being retrieved even
-when their headers are different. If your application needs to
-differentiate its responses based on request headers, please make sure
-the Angular ServiceWorker is [configured](https://angular.io/guide/service-worker-config)
-to avoid caching the affected resources.
-* **common:** This change could result in ExpressionChangedAfterItHasBeenChecked errors that
-were not detected before. The error could previously have gone undetected
-because two WrappedValues are considered "equal" in all cases for the purposes
-of the check, even if their respective unwrapped values are not.
-
-Additionally, `[val]=(observable | async).someProperty` will no longer
-trigger change detection if the value of `someProperty` is identical to
-the value in the previous emit. If you need to force change detection,
-either update the binding to use an object whose reference changes or
-subscribe to the observable and call markForCheck as needed.
-
-* **common:** format day-periods that cross midnight
-
-    When formatting a time with the `b` or `B` format codes, the rendered
-    string was not correctly handling day periods that spanned midnight.
-    Instead the logic was falling back to the default case of `AM`.
-
-    Now the logic has been updated so that it matches times that are within
-    a day period that spans midnight, so it will now render the correct
-    output, such as `at night` in the case of English.
-
-    Applications that are using either `formatDate()` or `DatePipe` and any
-    of the `b` or `B` format codes will be affected by this change.
-
-* **router:** UrlMatcher's type now reflects that it could always return
-    null.
-
-    If you implemented your own Router or Recognizer class, please update it to
-    handle matcher returning null.
-
-
-
-<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/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/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="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="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="9.1.4"></a>
-## [9.1.4](https://github.com/angular/angular/compare/9.1.3...9.1.4) (2020-04-29)
-
-
-### Bug Fixes
-
-* **core:** attempt to recover from user errors during creation ([#36381](https://github.com/angular/angular/issues/36381)) ([d743331](https://github.com/angular/angular/commit/d743331)), closes [#31221](https://github.com/angular/angular/issues/31221)
-* **core:** handle synthetic props in Directive host bindings correctly ([#35568](https://github.com/angular/angular/issues/35568)) ([0f389fa](https://github.com/angular/angular/commit/0f389fa)), closes [#35501](https://github.com/angular/angular/issues/35501)
-* **language-service:** disable update the `[@angular](https://github.com/angular)/core` module ([#36783](https://github.com/angular/angular/issues/36783)) ([d3a77ea](https://github.com/angular/angular/commit/d3a77ea))
-* **localize:** include legacy ids when describing messages ([#36761](https://github.com/angular/angular/issues/36761)) ([aa94cd5](https://github.com/angular/angular/commit/aa94cd5))
-* **ngcc:** recognize enum declarations emitted in JavaScript ([#36550](https://github.com/angular/angular/issues/36550)) ([c440165](https://github.com/angular/angular/commit/c440165)), closes [#35584](https://github.com/angular/angular/issues/35584)
-
-
-<a name="9.1.3"></a>
-## [9.1.3](https://github.com/angular/angular/compare/9.1.2...9.1.3) (2020-04-22)
-
-
-### Bug Fixes
-
-* **compiler:** avoid generating i18n attributes in plain form ([#36422](https://github.com/angular/angular/issues/36422)) ([08b8b51](https://github.com/angular/angular/commit/08b8b51))
-* **core:** do not use unbound attributes as inputs to structural directives ([#36441](https://github.com/angular/angular/issues/36441)) ([c0ed57d](https://github.com/angular/angular/commit/c0ed57d))
-* **core:** handle empty translations correctly ([#36499](https://github.com/angular/angular/issues/36499)) ([a5ea100](https://github.com/angular/angular/commit/a5ea100)), closes [#36476](https://github.com/angular/angular/issues/36476)
-* **core:** missing-injectable migration should not migrate `@NgModule` classes ([#36369](https://github.com/angular/angular/issues/36369)) ([0bd50e2](https://github.com/angular/angular/commit/0bd50e2)), closes [#35700](https://github.com/angular/angular/issues/35700)
-* **core:** pipes injecting viewProviders when used on a component host node ([#36512](https://github.com/angular/angular/issues/36512)) ([5ae8473](https://github.com/angular/angular/commit/5ae8473)), closes [#36146](https://github.com/angular/angular/issues/36146)
-* **core:** prevent unknown property check for AOT-compiled components ([#36072](https://github.com/angular/angular/issues/36072)) ([fe1d9ba](https://github.com/angular/angular/commit/fe1d9ba)), closes [#35945](https://github.com/angular/angular/issues/35945)
-* **core:** properly identify modules affected by overrides in TestBed ([#36649](https://github.com/angular/angular/issues/36649)) ([9724169](https://github.com/angular/angular/commit/9724169)), closes [#36619](https://github.com/angular/angular/issues/36619)
-* **language-service:** properly evaluate types in comparable expressions ([#36529](https://github.com/angular/angular/issues/36529)) ([5bab498](https://github.com/angular/angular/commit/5bab498))
-* **ngcc:** display unlocker process output in sync mode ([#36637](https://github.com/angular/angular/issues/36637)) ([da159bd](https://github.com/angular/angular/commit/da159bd)), closes [/github.com/nodejs/node/issues/3596#issuecomment-250890218](https://github.com/nodejs/node/issues/3596#issuecomment-250890218)
-* **ngcc:** do not use cached file-system ([#36687](https://github.com/angular/angular/issues/36687)) ([18be33a](https://github.com/angular/angular/commit/18be33a)), closes [/github.com/angular/angular-cli/issues/16860#issuecomment-614694269](https://github.com/angular/angular-cli/issues/16860#issuecomment-614694269)
-
-
-
-<a name="9.1.2"></a>
-## [9.1.2](https://github.com/angular/angular/compare/9.1.1...9.1.2) (2020-04-15)
-
-
-### Bug Fixes
-
-* **compiler:** handle type references to namespaced symbols correctly ([#36106](https://github.com/angular/angular/issues/36106)) ([468cf69](https://github.com/angular/angular/commit/468cf69)), closes [#36006](https://github.com/angular/angular/issues/36006)
-* **core:** undecorated-classes-with-decorated-fields migration should avoid error if base class has no value declaration ([#36543](https://github.com/angular/angular/issues/36543)) ([3992341](https://github.com/angular/angular/commit/3992341)), closes [#36522](https://github.com/angular/angular/issues/36522)
-* **ngcc:** correctly detect external files from nested `node_modules/` ([#36559](https://github.com/angular/angular/issues/36559)) ([8c559ef](https://github.com/angular/angular/commit/8c559ef)), closes [#36526](https://github.com/angular/angular/issues/36526)
-* **ngcc:** display output from the unlocker process on Windows ([#36569](https://github.com/angular/angular/issues/36569)) ([12266b2](https://github.com/angular/angular/commit/12266b2))
-* **ngcc:** do not spawn unlocker processes on cluster workers ([#36569](https://github.com/angular/angular/issues/36569)) ([e385abc](https://github.com/angular/angular/commit/e385abc)), closes [#35861](https://github.com/angular/angular/issues/35861)
-* **ngcc:** do not warn if `paths` mapping does not exist ([#36525](https://github.com/angular/angular/issues/36525)) ([33eee43](https://github.com/angular/angular/commit/33eee43)), closes [#36518](https://github.com/angular/angular/issues/36518)
-* **ngcc:** force ngcc to exit on error ([#36622](https://github.com/angular/angular/issues/36622)) ([933cbfb](https://github.com/angular/angular/commit/933cbfb)), closes [#36616](https://github.com/angular/angular/issues/36616)
-* **router:** pass correct component to canDeactivate checks when using two or more sibling router-outlets ([#36302](https://github.com/angular/angular/issues/36302)) ([8e7f903](https://github.com/angular/angular/commit/8e7f903)), closes [#34614](https://github.com/angular/angular/issues/34614)
-* **upgrade:** update $locationShim to handle Location changes before initialization ([#36498](https://github.com/angular/angular/issues/36498)) ([a67afcc](https://github.com/angular/angular/commit/a67afcc)), closes [#36492](https://github.com/angular/angular/issues/36492)
-
-### Performance Improvements
-* **ngcc:** only load  if it is needed ([#36486](https://github.com/angular/angular/issues/36486)) ([e06512b](https://github.com/angular/angular/commit/e06512b))                                                                             * **ngcc:** read dependencies from entry-point manifest ([#36486](https://github.com/angular/angular/issues/36486)) ([918e628](https://github.com/angular/angular/commit/918e628)), closes [#issuecomment-608401834](https://github.com/angular/angular#issuecomment-608401834)
-* **ngcc:** reduce the size of the entry-point manifest file ([#36486](https://github.com/angular/angular/issues/36486)) ([603b094](https://github.com/angular/angular/commit/603b094))
-
-
 <a name="9.1.1"></a>
 ## [9.1.1](https://github.com/angular/angular/compare/9.1.0...9.1.1) (2020-04-07)
 
@@ -587,13 +14,13 @@ This release contains various API docs improvements.
 * **core:** undecorated-classes migration should handle derived abstract classes ([#35339](https://github.com/angular/angular/issues/35339)) ([a631b99](https://github.com/angular/angular/commit/a631b99))
 * **language-service:** infer type of elements of array-like objects ([#36312](https://github.com/angular/angular/issues/36312)) ([ff523c9](https://github.com/angular/angular/commit/ff523c9)), closes [#36191](https://github.com/angular/angular/issues/36191)
 * **language-service:** use the `HtmlAst` to get the span of HTML tag ([#36371](https://github.com/angular/angular/issues/36371)) ([ffa4e11](https://github.com/angular/angular/commit/ffa4e11))
-* **ngcc:** add process title ([#36448](https://github.com/angular/angular/issues/36448)) ([136596d](https://github.com/angular/angular/commit/136596d)), closes [36414#issuecomment-609644282](https://github.com/angular/angular/issues/36414#issuecomment-609644282)
+* **ngcc:** add process title ([#36448](https://github.com/angular/angular/issues/36448)) ([136596d](https://github.com/angular/angular/commit/136596d)), closes [/github.com/angular/angular/issues/36414#issuecomment-609644282](https://github.com//github.com/angular/angular/issues/36414/issues/issuecomment-609644282)
 * **ngcc:** allow ngcc configuration to match pre-release versions of packages ([#36370](https://github.com/angular/angular/issues/36370)) ([cb0a2a0](https://github.com/angular/angular/commit/cb0a2a0))
 * **ngcc:** correctly detect imported TypeScript helpers ([#36284](https://github.com/angular/angular/issues/36284)) ([879457c](https://github.com/angular/angular/commit/879457c)), closes [#36089](https://github.com/angular/angular/issues/36089)
 * **ngcc:** correctly identify relative Windows-style import paths ([#36372](https://github.com/angular/angular/issues/36372)) ([0daa488](https://github.com/angular/angular/commit/0daa488))
 * **ngcc:** correctly identify the package path of secondary entry-points ([#36249](https://github.com/angular/angular/issues/36249)) ([e53b686](https://github.com/angular/angular/commit/e53b686)), closes [#35747](https://github.com/angular/angular/issues/35747)
 * **ngcc:** detect non-emitted, non-imported TypeScript helpers ([#36418](https://github.com/angular/angular/issues/36418)) ([93b32d3](https://github.com/angular/angular/commit/93b32d3))
-* **ngcc:** do not spawn more processes than intended in parallel mode ([#36280](https://github.com/angular/angular/issues/36280)) ([6ea232e](https://github.com/angular/angular/commit/6ea232e)), closes [#35719](https://github.com/angular/angular/issues/35719) [#36278](https://github.com/angular/angular/issues/36278) [/github.com/angular/angular/blob/b8e9a30d3b6/packages/compiler-cli/ngcc/src/main.ts#L429](https://github.com/angular/angular/blob/b8e9a30d3b6/packages/compiler-cli/ngcc/src/main.ts/issues/L429) [/github.com/angular/angular/blob/b8e9a30d3b6/packages/compiler-cli/ngcc/src/execution/cluster/master.ts#L108](https://github.com/angular/angular/blob/b8e9a30d3b6/packages/compiler-cli/ngcc/src/execution/cluster/master.ts/issues/L108) [/github.com/angular/angular/blob/b8e9a30d3b6/packages/compiler-cli/ngcc/src/execution/cluster/master.ts#L110](https://github.com/angular/angular/blob/b8e9a30d3b6/packages/compiler-cli/ngcc/src/execution/cluster/master.ts/issues/L110) [/github.com/angular/angular/blob/b8e9a30d3b6/packages/compiler-cli/ngcc/src/execution/cluster/master.ts#L199](https://github.com/angular/angular/blob/b8e9a30d3b6/packages/compiler-cli/ngcc/src/execution/cluster/master.ts/issues/L199)
+* **ngcc:** do not spawn more processes than intended in parallel mode ([#36280](https://github.com/angular/angular/issues/36280)) ([6ea232e](https://github.com/angular/angular/commit/6ea232e)), closes [#35719](https://github.com/angular/angular/issues/35719) [#36278](https://github.com/angular/angular/issues/36278) [/github.com/angular/angular/blob/b8e9a30d3b6/packages/compiler-cli/ngcc/src/main.ts#L429](https://github.com//github.com/angular/angular/blob/b8e9a30d3b6/packages/compiler-cli/ngcc/src/main.ts/issues/L429) [/github.com/angular/angular/blob/b8e9a30d3b6/packages/compiler-cli/ngcc/src/execution/cluster/master.ts#L108](https://github.com//github.com/angular/angular/blob/b8e9a30d3b6/packages/compiler-cli/ngcc/src/execution/cluster/master.ts/issues/L108) [/github.com/angular/angular/blob/b8e9a30d3b6/packages/compiler-cli/ngcc/src/execution/cluster/master.ts#L110](https://github.com//github.com/angular/angular/blob/b8e9a30d3b6/packages/compiler-cli/ngcc/src/execution/cluster/master.ts/issues/L110) [/github.com/angular/angular/blob/b8e9a30d3b6/packages/compiler-cli/ngcc/src/execution/cluster/master.ts#L199](https://github.com//github.com/angular/angular/blob/b8e9a30d3b6/packages/compiler-cli/ngcc/src/execution/cluster/master.ts/issues/L199)
 * **ngcc:** do not write entry-point manifest outside node_modules ([#36299](https://github.com/angular/angular/issues/36299)) ([bb8744d](https://github.com/angular/angular/commit/bb8744d)), closes [#36296](https://github.com/angular/angular/issues/36296)
 * **ngcc:** don't crash on cyclic source-map references ([#36452](https://github.com/angular/angular/issues/36452)) ([56af303](https://github.com/angular/angular/commit/56af303)), closes [#35727](https://github.com/angular/angular/issues/35727) [#35757](https://github.com/angular/angular/issues/35757)
 * **ngcc:** handle bad path mappings when finding entry-points ([#36331](https://github.com/angular/angular/issues/36331)) ([7bb3588](https://github.com/angular/angular/commit/7bb3588)), closes [#36313](https://github.com/angular/angular/issues/36313) [#36283](https://github.com/angular/angular/issues/36283)
@@ -605,6 +32,7 @@ This release contains various API docs improvements.
 * **router:** state data missing in routerLink ([#36462](https://github.com/angular/angular/issues/36462)) ([0e7a89a](https://github.com/angular/angular/commit/0e7a89a)), closes [#33173](https://github.com/angular/angular/issues/33173)
 
 
+
 <a name="9.1.0"></a>
 # [9.1.0](https://github.com/angular/angular/compare/9.0.0...9.1.0) (2020-03-25)
 
@@ -763,7 +191,7 @@ To learn about the release highlights and our CLI-powered automated update workf
 * **ngcc:** use path-mappings from tsconfig in dependency resolution ([#36180](https://github.com/angular/angular/issues/36180)) ([6defe96](https://github.com/angular/angular/commit/6defe96)), closes [#36119](https://github.com/angular/angular/issues/36119)
 * **ngcc:** use preserve whitespaces from tsconfig if provided ([#36189](https://github.com/angular/angular/issues/36189)) ([aef4323](https://github.com/angular/angular/commit/aef4323)), closes [#35871](https://github.com/angular/angular/issues/35871)
 * **platform-browser:** add missing peerDependency on `[@angular](https://github.com/angular)/animations` ([#35949](https://github.com/angular/angular/issues/35949)) ([64d6f13](https://github.com/angular/angular/commit/64d6f13)), closes [#35888](https://github.com/angular/angular/issues/35888)
-* **router:** removed unused ApplicationRef dependency ([#35642](https://github.com/angular/angular/issues/35642)) ([c839c05](https://github.com/angular/angular/commit/c839c05)), closes [/github.com/angular/angular/commit/5a849829c42330d7e88e83e916e6e36380c97a97#diff-c0baae5e1df628e1a217e8dc38557](https://github.com/angular/angular/commit/5a849829c42330d7e88e83e916e6e36380c97a97/issues/diff-c0baae5e1df628e1a217e8dc38557)
+* **router:** removed unused ApplicationRef dependency ([#35642](https://github.com/angular/angular/issues/35642)) ([c839c05](https://github.com/angular/angular/commit/c839c05)), closes [/github.com/angular/angular/commit/5a849829c42330d7e88e83e916e6e36380c97a97#diff-c0baae5e1df628e1a217e8dc38557](https://github.com//github.com/angular/angular/commit/5a849829c42330d7e88e83e916e6e36380c97a97/issues/diff-c0baae5e1df628e1a217e8dc38557)
 * **router:** state data missing in routerLink ([#33203](https://github.com/angular/angular/issues/33203)) ([de67978](https://github.com/angular/angular/commit/de67978))
 * **service-worker:** treat 503 as offline ([#35595](https://github.com/angular/angular/issues/35595)) ([96cdf03](https://github.com/angular/angular/commit/96cdf03)), closes [#35571](https://github.com/angular/angular/issues/35571)
 * fix flaky test cases of passive events ([#35679](https://github.com/angular/angular/issues/35679)) ([8ef29b6](https://github.com/angular/angular/commit/8ef29b6))
@@ -898,7 +326,7 @@ To learn about the release highlights and our CLI-powered automated update workf
 * **ngcc:** correctly detect emitted TS helpers in ES5 ([#35191](https://github.com/angular/angular/issues/35191)) ([af4fe3a](https://github.com/angular/angular/commit/af4fe3a))
 * **ngcc:** correctly detect outer aliased class identifiers in ES5 ([#35527](https://github.com/angular/angular/issues/35527)) ([39bd9a7](https://github.com/angular/angular/commit/39bd9a7)), closes [#35399](https://github.com/angular/angular/issues/35399)
 * **ngcc:** handle imports in dts files when processing CommonJS ([#35191](https://github.com/angular/angular/issues/35191)) ([12e3db8](https://github.com/angular/angular/commit/12e3db8)), closes [#34356](https://github.com/angular/angular/issues/34356)
-* **router:** removed unused ApplicationRef dependency ([#35642](https://github.com/angular/angular/issues/35642)) ([2f140f5](https://github.com/angular/angular/commit/2f140f5)), closes [/github.com/angular/angular/commit/5a849829c42330d7e88e83e916e6e36380c97a97#diff-c0baae5e1df628e1a217e8dc38557](https://github.com/angular/angular/commit/5a849829c42330d7e88e83e916e6e36380c97a97/issues/diff-c0baae5e1df628e1a217e8dc38557)
+* **router:** removed unused ApplicationRef dependency ([#35642](https://github.com/angular/angular/issues/35642)) ([2f140f5](https://github.com/angular/angular/commit/2f140f5)), closes [/github.com/angular/angular/commit/5a849829c42330d7e88e83e916e6e36380c97a97#diff-c0baae5e1df628e1a217e8dc38557](https://github.com//github.com/angular/angular/commit/5a849829c42330d7e88e83e916e6e36380c97a97/issues/diff-c0baae5e1df628e1a217e8dc38557)
 * **service-worker:** treat 503 as offline ([#35595](https://github.com/angular/angular/issues/35595)) ([64a415b](https://github.com/angular/angular/commit/64a415b)), closes [#35571](https://github.com/angular/angular/issues/35571)
 
 
@@ -975,7 +403,7 @@ To learn about the release highlights and our CLI-powered automated update workf
 * **ivy:** support emitting a reference to interface declarations ([#34849](https://github.com/angular/angular/issues/34849)) ([ad9ec52](https://github.com/angular/angular/commit/ad9ec52)), closes [#34021](https://github.com/angular/angular/issues/34021) [#34837](https://github.com/angular/angular/issues/34837)
 * **ivy:** template type-check errors from TS should not use NG error codes ([#35146](https://github.com/angular/angular/issues/35146)) ([cf3071f](https://github.com/angular/angular/commit/cf3071f))
 * **ivy:** host-styling throws assert exception inside *ngFor ([#35133](https://github.com/angular/angular/issues/35133)) ([31e9873](https://github.com/angular/angular/commit/31e9873)), closes [#35118](https://github.com/angular/angular/issues/35118)
-* **ngcc:** correctly invalidate cache when moving/removing files/directories ([#35106](https://github.com/angular/angular/issues/35106)) ([22357d4](https://github.com/angular/angular/commit/22357d4)), closes [/github.com/angular/angular/blob/4d36b2f6e/packages/compiler-cli/ngcc/src/writing/cleaning/cleaning_strategies.ts#L54](https://github.com/angular/angular/blob/4d36b2f6e/packages/compiler-cli/ngcc/src/writing/cleaning/cleaning_strategies.ts/issues/L54) [/github.com/angular/angular/blob/4d36b2f6e/packages/compiler-cli/ngcc/src/writing/cleaning/cleaning_strategies.ts#L61](https://github.com/angular/angular/blob/4d36b2f6e/packages/compiler-cli/ngcc/src/writing/cleaning/cleaning_strategies.ts/issues/L61) [#35095](https://github.com/angular/angular/issues/35095)
+* **ngcc:** correctly invalidate cache when moving/removing files/directories ([#35106](https://github.com/angular/angular/issues/35106)) ([22357d4](https://github.com/angular/angular/commit/22357d4)), closes [/github.com/angular/angular/blob/4d36b2f6e/packages/compiler-cli/ngcc/src/writing/cleaning/cleaning_strategies.ts#L54](https://github.com//github.com/angular/angular/blob/4d36b2f6e/packages/compiler-cli/ngcc/src/writing/cleaning/cleaning_strategies.ts/issues/L54) [/github.com/angular/angular/blob/4d36b2f6e/packages/compiler-cli/ngcc/src/writing/cleaning/cleaning_strategies.ts#L61](https://github.com//github.com/angular/angular/blob/4d36b2f6e/packages/compiler-cli/ngcc/src/writing/cleaning/cleaning_strategies.ts/issues/L61) [#35095](https://github.com/angular/angular/issues/35095)
 * **ngcc:** do not lock if the target is not compiled by Angular ([#35057](https://github.com/angular/angular/issues/35057)) ([c30c518](https://github.com/angular/angular/commit/c30c518)), closes [#35000](https://github.com/angular/angular/issues/35000)
 * **compiler-cli:** add `sass` as a valid css preprocessor extension ([#35052](https://github.com/angular/angular/issues/35052)) ([7f96fbb](https://github.com/angular/angular/commit/7f96fbb))
 * should also allow subclass Promise without Symbol.species ([#34533](https://github.com/angular/angular/issues/34533)) ([0de632a](https://github.com/angular/angular/commit/0de632a))
@@ -985,10 +413,10 @@ To learn about the release highlights and our CLI-powered automated update workf
 * **ivy:** ensure `DebugNode`/`DebugElement` are tree-shakeable in Ivy ([#35003](https://github.com/angular/angular/issues/35003)) ([23c0147](https://github.com/angular/angular/commit/23c0147)), closes [#30130](https://github.com/angular/angular/issues/30130)
 * **ivy:** ensure multi providers in ModuleWithProviders are not duplicated ([#34914](https://github.com/angular/angular/issues/34914)) ([4975f89](https://github.com/angular/angular/commit/4975f89))
 * **ivy:** update ViewContainerRef to get the correct parentInjector ([#35013](https://github.com/angular/angular/issues/35013)) ([eaa4a5a](https://github.com/angular/angular/commit/eaa4a5a))
-* **language-service:** prune duplicate returned definitions ([#34995](https://github.com/angular/angular/issues/34995)) ([71f5417](https://github.com/angular/angular/commit/71f5417)), closes [/github.com/angular/angular/pull/34847#discussion_r371006680](https://github.com/angular/angular/pull/34847/issues/discussion_r371006680)
+* **language-service:** prune duplicate returned definitions ([#34995](https://github.com/angular/angular/issues/34995)) ([71f5417](https://github.com/angular/angular/commit/71f5417)), closes [/github.com/angular/angular/pull/34847#discussion_r371006680](https://github.com//github.com/angular/angular/pull/34847/issues/discussion_r371006680)
 * **language-service:** remove repeated symbol definitions for structural directive ([#34847](https://github.com/angular/angular/issues/34847)) ([35916d3](https://github.com/angular/angular/commit/35916d3))
 * **language-service:** warn, not error, on missing context members ([#35036](https://github.com/angular/angular/issues/35036)) ([0e76821](https://github.com/angular/angular/commit/0e76821))
-* **localize:** re-enable filename in code-frame error messages ([#34994](https://github.com/angular/angular/issues/34994)) ([c7c7b20](https://github.com/angular/angular/commit/c7c7b20)), closes [/github.com/angular/angular/pull/34974/files#r371034476](https://github.com/angular/angular/pull/34974/files/issues/r371034476)
+* **localize:** re-enable filename in code-frame error messages ([#34994](https://github.com/angular/angular/issues/34994)) ([c7c7b20](https://github.com/angular/angular/commit/c7c7b20)), closes [/github.com/angular/angular/pull/34974/files#r371034476](https://github.com//github.com/angular/angular/pull/34974/files/issues/r371034476)
 * **ngcc:** improve lockfile error message ([#35001](https://github.com/angular/angular/issues/35001)) ([1d31c81](https://github.com/angular/angular/commit/1d31c81)), closes [#35000](https://github.com/angular/angular/issues/35000)
 * **ivy:** correctly emit component when it's removed from its module ([#34912](https://github.com/angular/angular/issues/34912)) ([adc663e](https://github.com/angular/angular/commit/adc663e)), closes [#34813](https://github.com/angular/angular/issues/34813)
 * **ivy:** DebugNode.classes not working on SVG elements ([#34872](https://github.com/angular/angular/issues/34872)) ([7e8aac1](https://github.com/angular/angular/commit/7e8aac1)), closes [#34868](https://github.com/angular/angular/issues/34868)
@@ -1011,7 +439,7 @@ To learn about the release highlights and our CLI-powered automated update workf
 * **compiler-cli:** require node 10 as runtime engine ([#34722](https://github.com/angular/angular/issues/34722)) ([7b77b3d](https://github.com/angular/angular/commit/7b77b3d))
 * **language-service:** specific suggestions for template context diags ([#34751](https://github.com/angular/angular/issues/34751)) ([cc7fca4](https://github.com/angular/angular/commit/cc7fca4))
 * **language-service:** support multiple symbol definitions ([#34782](https://github.com/angular/angular/issues/34782)) ([2f2396c](https://github.com/angular/angular/commit/2f2396c))
-* **ngcc:** lock ngcc when processing ([#34722](https://github.com/angular/angular/issues/34722)) ([6dd51f1](https://github.com/angular/angular/commit/6dd51f1)), closes [32431#issuecomment-571825781](https://github.com/angular/angular/issues/32431#issuecomment-571825781)
+* **ngcc:** lock ngcc when processing ([#34722](https://github.com/angular/angular/issues/34722)) ([6dd51f1](https://github.com/angular/angular/commit/6dd51f1)), closes [/github.com/angular/angular/issues/32431#issuecomment-571825781](https://github.com//github.com/angular/angular/issues/32431/issues/issuecomment-571825781)
 * work around 'noImplicityAny' incompatibility due to ts3.7 update ([#34798](https://github.com/angular/angular/issues/34798)) ([251d548](https://github.com/angular/angular/commit/251d548))
 * **animations:** not waiting for child animations to finish when removing parent in Ivy ([#34702](https://github.com/angular/angular/issues/34702)) ([92c17fe](https://github.com/angular/angular/commit/92c17fe)), closes [#33597](https://github.com/angular/angular/issues/33597)
 * **common:** ensure diffing in ngStyle/ngClass correctly emits value changes ([#34307](https://github.com/angular/angular/issues/34307)) ([93a035f](https://github.com/angular/angular/commit/93a035f)), closes [#34336](https://github.com/angular/angular/issues/34336) [#34444](https://github.com/angular/angular/issues/34444)
@@ -1026,19 +454,19 @@ To learn about the release highlights and our CLI-powered automated update workf
 * **ivy:** ngClass not applying classes with trailing/leading spaces ([#34539](https://github.com/angular/angular/issues/34539)) ([98ed7c6](https://github.com/angular/angular/commit/98ed7c6)), closes [#34476](https://github.com/angular/angular/issues/34476)
 * **ivy:** Prevent errors when querying DebugElement roots that were outside angular context ([#34687](https://github.com/angular/angular/issues/34687)) ([f1cdb8f](https://github.com/angular/angular/commit/f1cdb8f))
 * **ivy:** properly bootstrap components with attribute selectors ([#34450](https://github.com/angular/angular/issues/34450)) ([2c0b9ea](https://github.com/angular/angular/commit/2c0b9ea)), closes [#34349](https://github.com/angular/angular/issues/34349)
-* **ivy:** warn instead of throwing for unknown elements ([#34524](https://github.com/angular/angular/issues/34524)) ([d9ae70e](https://github.com/angular/angular/commit/d9ae70e)), closes [/github.com/angular/angular/pull/33419#discussion_r339296216](https://github.com/angular/angular/pull/33419/issues/discussion_r339296216)
+* **ivy:** warn instead of throwing for unknown elements ([#34524](https://github.com/angular/angular/issues/34524)) ([d9ae70e](https://github.com/angular/angular/commit/d9ae70e)), closes [/github.com/angular/angular/pull/33419#discussion_r339296216](https://github.com//github.com/angular/angular/pull/33419/issues/discussion_r339296216)
 * **language-service:** apply suggested change. ([#34564](https://github.com/angular/angular/issues/34564)) ([b3af220](https://github.com/angular/angular/commit/b3af220))
 * **language-service:** break the hover/definitions for two-way binding ([#34564](https://github.com/angular/angular/issues/34564)) ([eb5c20c](https://github.com/angular/angular/commit/eb5c20c))
 * **language-service:** CRLF offset in inline template ([#34737](https://github.com/angular/angular/issues/34737)) ([80315b5](https://github.com/angular/angular/commit/80315b5))
 * **language-service:** do not use an i18n parser for templates ([#34531](https://github.com/angular/angular/issues/34531)) ([cb7dcb3](https://github.com/angular/angular/commit/cb7dcb3))
 * **language-service:** only visit directives ([#34564](https://github.com/angular/angular/issues/34564)) ([76d7aa7](https://github.com/angular/angular/commit/76d7aa7))
-* **ngcc:** avoid error due to circular dependency in `EsmDependencyHost` ([#34512](https://github.com/angular/angular/issues/34512)) ([7c3172a](https://github.com/angular/angular/commit/7c3172a)), closes [/github.com/angular/angular/blob/18d89c9c8/packages/compiler-cli/ngcc/src/utils.ts#L10](https://github.com/angular/angular/blob/18d89c9c8/packages/compiler-cli/ngcc/src/utils.ts/issues/L10) [/github.com/angular/angular/blob/18d89c9c8/packages/compiler-cli/ngcc/src/dependencies/esm_dependency_host.ts#L10](https://github.com/angular/angular/blob/18d89c9c8/packages/compiler-cli/ngcc/src/dependencies/esm_dependency_host.ts/issues/L10) [/github.com/angular/angular/blob/18d89c9c8/packages/compiler-cli/ngcc/src/dependencies/dependency_host.ts#L9](https://github.com/angular/angular/blob/18d89c9c8/packages/compiler-cli/ngcc/src/dependencies/dependency_host.ts/issues/L9)
+* **ngcc:** avoid error due to circular dependency in `EsmDependencyHost` ([#34512](https://github.com/angular/angular/issues/34512)) ([7c3172a](https://github.com/angular/angular/commit/7c3172a)), closes [/github.com/angular/angular/blob/18d89c9c8/packages/compiler-cli/ngcc/src/utils.ts#L10](https://github.com//github.com/angular/angular/blob/18d89c9c8/packages/compiler-cli/ngcc/src/utils.ts/issues/L10) [/github.com/angular/angular/blob/18d89c9c8/packages/compiler-cli/ngcc/src/dependencies/esm_dependency_host.ts#L10](https://github.com//github.com/angular/angular/blob/18d89c9c8/packages/compiler-cli/ngcc/src/dependencies/esm_dependency_host.ts/issues/L10) [/github.com/angular/angular/blob/18d89c9c8/packages/compiler-cli/ngcc/src/dependencies/dependency_host.ts#L9](https://github.com//github.com/angular/angular/blob/18d89c9c8/packages/compiler-cli/ngcc/src/dependencies/dependency_host.ts/issues/L9)
 * **ngcc:** correctly detect dependencies in CommonJS ([#34528](https://github.com/angular/angular/issues/34528)) ([ff02ddf](https://github.com/angular/angular/commit/ff02ddf))
 * **ngcc:** correctly handle inline exports in UMD ([#34512](https://github.com/angular/angular/issues/34512)) ([7bbfccf](https://github.com/angular/angular/commit/7bbfccf))
-* **ngcc:** don't crash if symbol has no declarations ([#34658](https://github.com/angular/angular/issues/34658)) ([4def99e](https://github.com/angular/angular/commit/4def99e)), closes [/github.com/angular/angular/blob/8d0de89e/packages/compiler-cli/src/ngtsc/reflection/src/typescript.ts#L309](https://github.com/angular/angular/blob/8d0de89e/packages/compiler-cli/src/ngtsc/reflection/src/typescript.ts/issues/L309) [#34560](https://github.com/angular/angular/issues/34560)
+* **ngcc:** don't crash if symbol has no declarations ([#34658](https://github.com/angular/angular/issues/34658)) ([4def99e](https://github.com/angular/angular/commit/4def99e)), closes [/github.com/angular/angular/blob/8d0de89e/packages/compiler-cli/src/ngtsc/reflection/src/typescript.ts#L309](https://github.com//github.com/angular/angular/blob/8d0de89e/packages/compiler-cli/src/ngtsc/reflection/src/typescript.ts/issues/L309) [#34560](https://github.com/angular/angular/issues/34560)
 * **ngcc:** handle UMD factories that do not use all params ([#34660](https://github.com/angular/angular/issues/34660)) ([83868be](https://github.com/angular/angular/commit/83868be)), closes [#34653](https://github.com/angular/angular/issues/34653)
 * **ngcc:** insert definitions after statement ([#34677](https://github.com/angular/angular/issues/34677)) ([f295240](https://github.com/angular/angular/commit/f295240)), closes [#34648](https://github.com/angular/angular/issues/34648)
-* **ngcc:** recognize re-exports with `require()` calls in UMD ([#34512](https://github.com/angular/angular/issues/34512)) ([79be354](https://github.com/angular/angular/commit/79be354)), closes [/github.com/angular/angular/pull/34254/files#r359515373](https://github.com/angular/angular/pull/34254/files/issues/r359515373)
+* **ngcc:** recognize re-exports with `require()` calls in UMD ([#34512](https://github.com/angular/angular/issues/34512)) ([79be354](https://github.com/angular/angular/commit/79be354)), closes [/github.com/angular/angular/pull/34254/files#r359515373](https://github.com//github.com/angular/angular/pull/34254/files/issues/r359515373)
 * **ngcc:** recognize re-exports with imported TS helpers in CommonJS and UMD ([#34527](https://github.com/angular/angular/issues/34527)) ([a88dc17](https://github.com/angular/angular/commit/a88dc17))
 * **common:** remove trailing whitespace for CurrencyPipe ([#34642](https://github.com/angular/angular/issues/34642)) ([c42b90b](https://github.com/angular/angular/commit/c42b90b)), closes [#34641](https://github.com/angular/angular/issues/34641)
 * **ivy:** append `advance` instructions before `i18nExp` ([#34436](https://github.com/angular/angular/issues/34436)) ([ba4c31c](https://github.com/angular/angular/commit/ba4c31c))
@@ -1085,7 +513,7 @@ To learn about the release highlights and our CLI-powered automated update workf
 * **ivy:** add flag to skip non-exported classes ([#33921](https://github.com/angular/angular/issues/33921)) ([#34340](https://github.com/angular/angular/issues/34340)) ([7ed984b](https://github.com/angular/angular/commit/7ed984b)), closes [#33724](https://github.com/angular/angular/issues/33724)
 * **ivy:** align TestBed.overrideProvider with what happens with providers in TestBed providers array ([#33769](https://github.com/angular/angular/issues/33769)) ([10a33ef](https://github.com/angular/angular/commit/10a33ef))
 * **ivy:** do not invoke change detection for destroyed views ([#34241](https://github.com/angular/angular/issues/34241)) ([24bbcaf](https://github.com/angular/angular/commit/24bbcaf))
-* **ivy:** handle SafeStyles in [style.prop] correctly ([#34286](https://github.com/angular/angular/issues/34286)) ([b0d5784](https://github.com/angular/angular/commit/b0d5784)), closes [/github.com/angular/angular/blob/master/packages/core/src/render3/styling/bindings.ts#L620](https://github.com/angular/angular/blob/master/packages/core/src/render3/styling/bindings.ts/issues/L620)
+* **ivy:** handle SafeStyles in [style.prop] correctly ([#34286](https://github.com/angular/angular/issues/34286)) ([b0d5784](https://github.com/angular/angular/commit/b0d5784)), closes [/github.com/angular/angular/blob/master/packages/core/src/render3/styling/bindings.ts#L620](https://github.com//github.com/angular/angular/blob/master/packages/core/src/render3/styling/bindings.ts/issues/L620)
 * **ivy:** inherit static coercion members from base classes ([#34296](https://github.com/angular/angular/issues/34296)) ([edfaab6](https://github.com/angular/angular/commit/edfaab6)), closes [#33830](https://github.com/angular/angular/issues/33830)
 * **ivy:** properly parenthesize ternary expressions when emitted ([#34221](https://github.com/angular/angular/issues/34221)) ([af36bc6](https://github.com/angular/angular/commit/af36bc6)), closes [#34087](https://github.com/angular/angular/issues/34087)
 * **ivy:** throw a better error when DI can't inject a ctor param ([#33739](https://github.com/angular/angular/issues/33739)) ([#34340](https://github.com/angular/angular/issues/34340)) ([676aca1](https://github.com/angular/angular/commit/676aca1)), closes [#33637](https://github.com/angular/angular/issues/33637)
@@ -1098,7 +526,7 @@ To learn about the release highlights and our CLI-powered automated update workf
 * **ngcc:** log Angular error codes correctly ([#34014](https://github.com/angular/angular/issues/34014)) ([3cd43c1](https://github.com/angular/angular/commit/3cd43c1))
 * **ngcc:** report diagnostics from migrations ([#34014](https://github.com/angular/angular/issues/34014)) ([599dcd0](https://github.com/angular/angular/commit/599dcd0))
 * **bazel:** don't rely on [@angular](https://github.com/angular)/core being as a depedency to install [@angular](https://github.com/angular)/bazel ([#34181](https://github.com/angular/angular/issues/34181)) ([716fc84](https://github.com/angular/angular/commit/716fc84)), closes [#34164](https://github.com/angular/angular/issues/34164)
-* **bazel:** reenable template type checking in ng_module ([#34144](https://github.com/angular/angular/issues/34144)) ([572e731](https://github.com/angular/angular/commit/572e731)), closes [/github.com/angular/angular/blob/168abc6d6f52713383411b14980e104c99bfeef5/packages/compiler-cli/src/ngtsc/program.ts#L430-L434](https://github.com/angular/angular/blob/168abc6d6f52713383411b14980e104c99bfeef5/packages/compiler-cli/src/ngtsc/program.ts/issues/L430-L434)
+* **bazel:** reenable template type checking in ng_module ([#34144](https://github.com/angular/angular/issues/34144)) ([572e731](https://github.com/angular/angular/commit/572e731)), closes [/github.com/angular/angular/blob/168abc6d6f52713383411b14980e104c99bfeef5/packages/compiler-cli/src/ngtsc/program.ts#L430-L434](https://github.com//github.com/angular/angular/blob/168abc6d6f52713383411b14980e104c99bfeef5/packages/compiler-cli/src/ngtsc/program.ts/issues/L430-L434)
 * **common:** reflect input type in NgForOf context ([#33997](https://github.com/angular/angular/issues/33997)) ([b640d38](https://github.com/angular/angular/commit/b640d38))
 * **common:** reflect input type in NgIf context ([#33997](https://github.com/angular/angular/issues/33997)) ([7504543](https://github.com/angular/angular/commit/7504543)), closes [#31556](https://github.com/angular/angular/issues/31556)
 * **compiler:** i18n - trim whitespace from i18n custom ids ([#34154](https://github.com/angular/angular/issues/34154)) ([64317c6](https://github.com/angular/angular/commit/64317c6)), closes [#34147](https://github.com/angular/angular/issues/34147)
@@ -1134,7 +562,7 @@ To learn about the release highlights and our CLI-powered automated update workf
 * **ivy:** support inserting a `viewRef` that is already present ([#34052](https://github.com/angular/angular/issues/34052)) ([978b500](https://github.com/angular/angular/commit/978b500)), closes [#33924](https://github.com/angular/angular/issues/33924)
 * **ivy:** take styles extracted from template into account in JIT mode ([#34017](https://github.com/angular/angular/issues/34017)) ([b659aa3](https://github.com/angular/angular/commit/b659aa3))
 * **ivy:** track changes across failed builds ([#33971](https://github.com/angular/angular/issues/33971)) ([1ffbde1](https://github.com/angular/angular/commit/1ffbde1)), closes [#32214](https://github.com/angular/angular/issues/32214)
-* **ivy:** wrap functions from "providers" in parentheses in Closure mode ([#33609](https://github.com/angular/angular/issues/33609)) ([fc6ad19](https://github.com/angular/angular/commit/fc6ad19)), closes [/github.com/angular/tsickle/blob/d7974262571c8a17d684e5ba07680e1b1993afdd/src/jsdoc_transformer.ts#L1021](https://github.com/angular/tsickle/blob/d7974262571c8a17d684e5ba07680e1b1993afdd/src/jsdoc_transformer.ts/issues/L1021)
+* **ivy:** wrap functions from "providers" in parentheses in Closure mode ([#33609](https://github.com/angular/angular/issues/33609)) ([fc6ad19](https://github.com/angular/angular/commit/fc6ad19)), closes [/github.com/angular/tsickle/blob/d7974262571c8a17d684e5ba07680e1b1993afdd/src/jsdoc_transformer.ts#L1021](https://github.com//github.com/angular/tsickle/blob/d7974262571c8a17d684e5ba07680e1b1993afdd/src/jsdoc_transformer.ts/issues/L1021)
 * **language-service:** determine index types accessed using dot notation ([#33884](https://github.com/angular/angular/issues/33884)) ([e8ec296](https://github.com/angular/angular/commit/e8ec296)), closes [#29811](https://github.com/angular/angular/issues/29811) [#29811](https://github.com/angular/angular/issues/29811)
 * **language-service:** fix error of array-index out of bounds exception ([#33928](https://github.com/angular/angular/issues/33928)) ([b05ce85](https://github.com/angular/angular/commit/b05ce85))
 * **language-service:** function.bind() should not be an error ([#34041](https://github.com/angular/angular/issues/34041)) ([#34046](https://github.com/angular/angular/issues/34046)) ([d22f3d6](https://github.com/angular/angular/commit/d22f3d6))
@@ -1142,7 +570,7 @@ To learn about the release highlights and our CLI-powered automated update workf
 * **ngcc:** do not output duplicate ɵprov properties ([#34085](https://github.com/angular/angular/issues/34085)) ([5a8d25d](https://github.com/angular/angular/commit/5a8d25d))
 * **ngcc:** render localized strings when in ES5 format ([#33857](https://github.com/angular/angular/issues/33857)) ([c6695fa](https://github.com/angular/angular/commit/c6695fa))
 * **ngcc:** render UMD global imports correctly ([#34012](https://github.com/angular/angular/issues/34012)) ([83989b8](https://github.com/angular/angular/commit/83989b8))
-* **ngcc:** report errors from `analyze` and `resolve` processing ([#33964](https://github.com/angular/angular/issues/33964)) ([ca5d772](https://github.com/angular/angular/commit/ca5d772)), closes [33685#issuecomment-557091719](https://github.com/angular/angular/issues/33685#issuecomment-557091719)
+* **ngcc:** report errors from `analyze` and `resolve` processing ([#33964](https://github.com/angular/angular/issues/33964)) ([ca5d772](https://github.com/angular/angular/commit/ca5d772)), closes [/github.com/angular/angular/issues/33685#issuecomment-557091719](https://github.com//github.com/angular/angular/issues/33685/issues/issuecomment-557091719)
 * **router:** make routerLinkActive work with query params which contain arrays ([#22666](https://github.com/angular/angular/issues/22666)) ([f1bf5b2](https://github.com/angular/angular/commit/f1bf5b2)), closes [#22223](https://github.com/angular/angular/issues/22223)
 * **service-worker:** allow creating post api requests after cache failure ([#33930](https://github.com/angular/angular/issues/33930)) ([63c9123](https://github.com/angular/angular/commit/63c9123)), closes [#33793](https://github.com/angular/angular/issues/33793)
 * **service-worker:** throw when using the unsupported `versionedFiles` option in config ([#33903](https://github.com/angular/angular/issues/33903)) ([250e6fd](https://github.com/angular/angular/commit/250e6fd))
@@ -1221,7 +649,7 @@ To learn about the release highlights and our CLI-powered automated update workf
 * **language-service:** Should not crash if expr ends unexpectedly ([#33524](https://github.com/angular/angular/issues/33524)) ([9ebac71](https://github.com/angular/angular/commit/9ebac71))
 * **ngcc:** handle new `__spreadArrays` tslib helper ([#33617](https://github.com/angular/angular/issues/33617)) ([d749dd3](https://github.com/angular/angular/commit/d749dd3)), closes [#33614](https://github.com/angular/angular/issues/33614)
 * **ngcc:** override `getInternalNameOfClass()` and `getAdjacentNameOfClass()` for ES5 ([#33533](https://github.com/angular/angular/issues/33533)) ([93a23b9](https://github.com/angular/angular/commit/93a23b9))
-* **ngcc:** render adjacent statements after static properties ([#33630](https://github.com/angular/angular/issues/33630)) ([fe12d0d](https://github.com/angular/angular/commit/fe12d0d)), closes [/github.com/angular/angular/pull/33337#issuecomment-545487737](https://github.com/angular/angular/pull/33337#issuecomment-545487737)
+* **ngcc:** render adjacent statements after static properties ([#33630](https://github.com/angular/angular/issues/33630)) ([fe12d0d](https://github.com/angular/angular/commit/fe12d0d)), closes [/github.com/angular/angular/pull/33337#issuecomment-545487737](https://github.com//github.com/angular/angular/pull/33337/issues/issuecomment-545487737)
 * **ngcc:** render new definitions using the inner name of the class ([#33533](https://github.com/angular/angular/issues/33533)) ([85298e3](https://github.com/angular/angular/commit/85298e3))
 * **service-worker:** ensure initialization before handling messages ([#32525](https://github.com/angular/angular/issues/32525)) ([72eba77](https://github.com/angular/angular/commit/72eba77)), closes [#25611](https://github.com/angular/angular/issues/25611)
 * **compiler:** i18n - ignore `alt-trans` tags in XLIFF 1.2 ([#33450](https://github.com/angular/angular/issues/33450)) ([936700a](https://github.com/angular/angular/commit/936700a)), closes [#33161](https://github.com/angular/angular/issues/33161)
@@ -1251,7 +679,7 @@ To learn about the release highlights and our CLI-powered automated update workf
 * **language-service:** Add directive selectors & banana-in-a-box to completions ([#33311](https://github.com/angular/angular/issues/33311)) ([49eec5d](https://github.com/angular/angular/commit/49eec5d))
 * **language-service:** Add global symbol for $any() ([#33245](https://github.com/angular/angular/issues/33245)) ([3f257e9](https://github.com/angular/angular/commit/3f257e9))
 * **language-service:** Preserve CRLF in templates for language-service ([#33241](https://github.com/angular/angular/issues/33241)) ([65a0d2b](https://github.com/angular/angular/commit/65a0d2b))
-* **ngcc:** do not fail when multiple workers try to create the same directory ([#33237](https://github.com/angular/angular/issues/33237)) ([8017229](https://github.com/angular/angular/commit/8017229)), closes [/github.com/angular/angular/pull/33049#issuecomment-540485703](https://github.com/angular/angular/pull/33049#issuecomment-540485703)
+* **ngcc:** do not fail when multiple workers try to create the same directory ([#33237](https://github.com/angular/angular/issues/33237)) ([8017229](https://github.com/angular/angular/commit/8017229)), closes [/github.com/angular/angular/pull/33049#issuecomment-540485703](https://github.com//github.com/angular/angular/pull/33049/issues/issuecomment-540485703)
 * **bazel:** Remove angular devkit and restore ngc postinstall ([#32946](https://github.com/angular/angular/issues/32946)) ([f036684](https://github.com/angular/angular/commit/f036684))
 * **common:** remove deprecated support for intl API ([#29250](https://github.com/angular/angular/issues/29250)) ([9e7668f](https://github.com/angular/angular/commit/9e7668f)), closes [#18284](https://github.com/angular/angular/issues/18284)
 * **compiler:** absolute source span for template attribute expressions ([#33189](https://github.com/angular/angular/issues/33189)) ([fd4fed1](https://github.com/angular/angular/commit/fd4fed1))
@@ -1265,7 +693,7 @@ To learn about the release highlights and our CLI-powered automated update workf
 * **ivy:** use ReflectionHost to check exports when writing an import ([#33192](https://github.com/angular/angular/issues/33192)) ([de44570](https://github.com/angular/angular/commit/de44570))
 * **language-service:** Increase project/script version in MockHost.reset() ([#33200](https://github.com/angular/angular/issues/33200)) ([43241a5](https://github.com/angular/angular/commit/43241a5))
 * **language-service:** reset MockHost after every spec instead of creating new LS ([#33200](https://github.com/angular/angular/issues/33200)) ([11bf767](https://github.com/angular/angular/commit/11bf767))
-* **ngcc:** avoid warning when reflecting on index signature member ([#33198](https://github.com/angular/angular/issues/33198)) ([78214e7](https://github.com/angular/angular/commit/78214e7)), closes [/github.com/angular/angular/blob/4659cc26e/packages/common/http/src/jsonp.ts#L39](https://github.com/angular/angular/blob/4659cc26e/packages/common/http/src/jsonp.ts/issues/L39)
+* **ngcc:** avoid warning when reflecting on index signature member ([#33198](https://github.com/angular/angular/issues/33198)) ([78214e7](https://github.com/angular/angular/commit/78214e7)), closes [/github.com/angular/angular/blob/4659cc26e/packages/common/http/src/jsonp.ts#L39](https://github.com//github.com/angular/angular/blob/4659cc26e/packages/common/http/src/jsonp.ts/issues/L39)
 * **ngcc:** better detection of end of decorator expression ([#33192](https://github.com/angular/angular/issues/33192)) ([5071083](https://github.com/angular/angular/commit/5071083))
 * **ngcc:** Esm5ReflectionHost.getDeclarationOfIdentifier should handle aliased inner declarations ([#33252](https://github.com/angular/angular/issues/33252)) ([bfd07b3](https://github.com/angular/angular/commit/bfd07b3))
 * **ngcc:** report the correct viaModule when reflecting over commonjs ([#33192](https://github.com/angular/angular/issues/33192)) ([afcff73](https://github.com/angular/angular/commit/afcff73))
@@ -1284,7 +712,7 @@ To learn about the release highlights and our CLI-powered automated update workf
 * google3 sync which requires type hints ([#33108](https://github.com/angular/angular/issues/33108)) ([0c69ec2](https://github.com/angular/angular/commit/0c69ec2))
 * **ngcc:** rename the executable from `ivy-ngcc` to `ngcc` ([#33140](https://github.com/angular/angular/issues/33140)) ([1a34fbc](https://github.com/angular/angular/commit/1a34fbc))
 * **service-worker:** continue serving api requests on cache failure ([#32996](https://github.com/angular/angular/issues/32996)) ([52483bf](https://github.com/angular/angular/commit/52483bf)), closes [#21412](https://github.com/angular/angular/issues/21412)
-* **common:** expand type for "ngForOf" input to work with strict null checks ([#31371](https://github.com/angular/angular/issues/31371)) ([c1bb886](https://github.com/angular/angular/commit/c1bb886)), closes [#16373](https://github.com/angular/components/pull/16373)
+* **common:** expand type for "ngForOf" input to work with strict null checks ([#31371](https://github.com/angular/angular/issues/31371)) ([c1bb886](https://github.com/angular/angular/commit/c1bb886)), closes [#16373](https://github.com//github.com/angular/components/pull/16373)
 * **core:** ngNoopZone should have the same signature with ngZone ([#32068](https://github.com/angular/angular/issues/32068)) ([3a53e2c](https://github.com/angular/angular/commit/3a53e2c)), closes [#32063](https://github.com/angular/angular/issues/32063)
 * **core:** set migration schematic versions to valid semver versions ([#32991](https://github.com/angular/angular/issues/32991)) ([0119f46](https://github.com/angular/angular/commit/0119f46))
 * **core:** update migration descriptions with links to AIO documentation ([#32991](https://github.com/angular/angular/issues/32991)) ([f8eca84](https://github.com/angular/angular/commit/f8eca84))
@@ -1308,7 +736,7 @@ To learn about the release highlights and our CLI-powered automated update workf
 * **language-service:** Turn on strict mode for test project ([#32783](https://github.com/angular/angular/issues/32783)) ([28358b6](https://github.com/angular/angular/commit/28358b6))
 * **ngcc:** ensure private exports are added for `ModuleWithProviders` ([#32902](https://github.com/angular/angular/issues/32902)) ([002a97d](https://github.com/angular/angular/commit/002a97d))
 * **ngcc:** handle presence of both `ctorParameters` and `__decorate` ([#32901](https://github.com/angular/angular/issues/32901)) ([747f0cf](https://github.com/angular/angular/commit/747f0cf))
-* **ngcc:** make the build-marker error more clear ([#32712](https://github.com/angular/angular/issues/32712)) ([0ea4875](https://github.com/angular/angular/commit/0ea4875)), closes [31354#issuecomment-532080537](https://github.com/angular/angular/issues/31354#issuecomment-532080537)
+* **ngcc:** make the build-marker error more clear ([#32712](https://github.com/angular/angular/issues/32712)) ([0ea4875](https://github.com/angular/angular/commit/0ea4875)), closes [/github.com/angular/angular/issues/31354#issuecomment-532080537](https://github.com//github.com/angular/angular/issues/31354/issues/issuecomment-532080537)
 * **upgrade:** fix AngularJsUrlCodec to support Safari ([#32959](https://github.com/angular/angular/issues/32959)) ([39e8ceb](https://github.com/angular/angular/commit/39e8ceb))
 * **ivy:** ensure `window.ng.getDebugNode` returns debug info for component elements ([#32780](https://github.com/angular/angular/issues/32780)) ([5651fa3](https://github.com/angular/angular/commit/5651fa3))
 * **ivy:** ensure multiple map-based bindings do not skip intermediate values ([#32774](https://github.com/angular/angular/issues/32774)) ([86fd571](https://github.com/angular/angular/commit/86fd571))
@@ -1417,7 +845,7 @@ To learn about the release highlights and our CLI-powered automated update workf
 * **ivy:** graceful evaluation of unknown or invalid expressions ([#33453](https://github.com/angular/angular/issues/33453)) ([ce30888](https://github.com/angular/angular/commit/ce30888))
 * **ivy:** implement unknown element detection in jit mode ([#33419](https://github.com/angular/angular/issues/33419)) ([c83f501](https://github.com/angular/angular/commit/c83f501))
 * add a flag in bootstrap to enable coalesce event change detection to improve performance ([#30533](https://github.com/angular/angular/issues/30533)) ([44623a1](https://github.com/angular/angular/commit/44623a1))
-* **bazel:** update [@bazel](https://github.com/bazel)/schematics to Bazel 1.0.0 ([#33476](https://github.com/angular/angular/issues/33476)) ([540d104](https://github.com/angular/angular/commit/540d104)), closes [/github.com/angular/angular/pull/33367#issuecomment-547643246](https://github.com/angular/angular/pull/33367#issuecomment-547643246)
+* **bazel:** update [@bazel](https://github.com/bazel)/schematics to Bazel 1.0.0 ([#33476](https://github.com/angular/angular/issues/33476)) ([540d104](https://github.com/angular/angular/commit/540d104)), closes [/github.com/angular/angular/pull/33367#issuecomment-547643246](https://github.com//github.com/angular/angular/pull/33367/issues/issuecomment-547643246)
 * **bazel:** update bazel-schematics to use Ivy and new rollup_bundle ([#33435](https://github.com/angular/angular/issues/33435)) ([bf913cc](https://github.com/angular/angular/commit/bf913cc))
 * **ivy:** i18n - support inlining of XTB formatted translation files ([#33444](https://github.com/angular/angular/issues/33444)) ([2c623fd](https://github.com/angular/angular/commit/2c623fd))
 * **language-service:** add support for text replacement ([#33091](https://github.com/angular/angular/issues/33091)) ([da4eb91](https://github.com/angular/angular/commit/da4eb91))
@@ -1459,7 +887,7 @@ To learn about the release highlights and our CLI-powered automated update workf
 * **ivy:** i18n - implement compile-time inlining ([#32881](https://github.com/angular/angular/issues/32881)) ([2cdb3a0](https://github.com/angular/angular/commit/2cdb3a0))
 * **ivy:** i18n - render legacy message ids in `$localize` if requested ([#32937](https://github.com/angular/angular/issues/32937)) ([bcbf3e4](https://github.com/angular/angular/commit/bcbf3e4))
 * **language-service:** module definitions on directive hover ([#32763](https://github.com/angular/angular/issues/32763)) ([0d186dd](https://github.com/angular/angular/commit/0d186dd)), closes [#32565](https://github.com/angular/angular/issues/32565)
-* **ngcc:** expose `--create-ivy-entry-points` option on ivy-ngcc ([#33049](https://github.com/angular/angular/issues/33049)) ([b2b917d](https://github.com/angular/angular/commit/b2b917d)), closes [/github.com/angular/angular/pull/32999#issuecomment-539937368](https://github.com/angular/angular/pull/32999#issuecomment-539937368)
+* **ngcc:** expose `--create-ivy-entry-points` option on ivy-ngcc ([#33049](https://github.com/angular/angular/issues/33049)) ([b2b917d](https://github.com/angular/angular/commit/b2b917d)), closes [/github.com/angular/angular/pull/32999#issuecomment-539937368](https://github.com//github.com/angular/angular/pull/32999/issues/issuecomment-539937368)
 * update rxjs peerDependencies minimum requirment to 6.5.3 ([#32812](https://github.com/angular/angular/issues/32812)) ([66658c4](https://github.com/angular/angular/commit/66658c4))
 * **ivy:** support ng-add in localize package ([#32791](https://github.com/angular/angular/issues/32791)) ([e41cbfb](https://github.com/angular/angular/commit/e41cbfb))
 * **language-service:** allow retreiving synchronized analyzed NgModules ([#32779](https://github.com/angular/angular/issues/32779)) ([98feee7](https://github.com/angular/angular/commit/98feee7))
@@ -1868,7 +1296,7 @@ This release contains various API docs improvements.
 
 * use the correct WTF array to iterate over ([#31208](https://github.com/angular/angular/issues/31208)) ([4aed480](https://github.com/angular/angular/commit/4aed480))
 * **compiler-cli:** Return original sourceFile instead of redirected sourceFile from getSourceFile ([#26036](https://github.com/angular/angular/issues/26036)) ([13dbb98](https://github.com/angular/angular/commit/13dbb98)), closes [#22524](https://github.com/angular/angular/issues/22524)
-* **core:** export provider interfaces that are part of the public API types ([#31377](https://github.com/angular/angular/issues/31377)) ([bebf089](https://github.com/angular/angular/commit/bebf089)), closes [/github.com/angular/angular/pull/31377#discussion_r299254408](https://github.com/angular/angular/pull/31377/issues/discussion_r299254408) [/github.com/angular/angular/blob/9e34670b2/packages/core/src/di/interface/provider.ts#L365-L366](https://github.com/angular/angular/blob/9e34670b2/packages/core/src/di/interface/provider.ts/issues/L365-L366) [/github.com/angular/angular/blob/9e34670b2/packages/core/src/di/interface/provider.ts#L283-L284](https://github.com/angular/angular/blob/9e34670b2/packages/core/src/di/interface/provider.ts/issues/L283-L284) [/github.com/angular/angular/blob/9e34670b2/packages/core/src/di/index.ts#L23](https://github.com/angular/angular/blob/9e34670b2/packages/core/src/di/index.ts/issues/L23)
+* **core:** export provider interfaces that are part of the public API types ([#31377](https://github.com/angular/angular/issues/31377)) ([bebf089](https://github.com/angular/angular/commit/bebf089)), closes [/github.com/angular/angular/pull/31377#discussion_r299254408](https://github.com//github.com/angular/angular/pull/31377/issues/discussion_r299254408) [/github.com/angular/angular/blob/9e34670b2/packages/core/src/di/interface/provider.ts#L365-L366](https://github.com//github.com/angular/angular/blob/9e34670b2/packages/core/src/di/interface/provider.ts/issues/L365-L366) [/github.com/angular/angular/blob/9e34670b2/packages/core/src/di/interface/provider.ts#L283-L284](https://github.com//github.com/angular/angular/blob/9e34670b2/packages/core/src/di/interface/provider.ts/issues/L283-L284) [/github.com/angular/angular/blob/9e34670b2/packages/core/src/di/index.ts#L23](https://github.com//github.com/angular/angular/blob/9e34670b2/packages/core/src/di/index.ts/issues/L23)
 
 
 <a name="8.1.1"></a>
@@ -1877,7 +1305,7 @@ This release contains various API docs improvements.
 
 ### Bug Fixes
 
-* **core:** export provider interfaces that are part of the public API types ([#31377](https://github.com/angular/angular/issues/31377)) ([bebf089](https://github.com/angular/angular/commit/bebf089)), closes [/github.com/angular/angular/pull/31377#discussion_r299254408](https://github.com/angular/angular/pull/31377/issues/discussion_r299254408) [/github.com/angular/angular/blob/9e34670b2/packages/core/src/di/interface/provider.ts#L365-L366](https://github.com/angular/angular/blob/9e34670b2/packages/core/src/di/interface/provider.ts/issues/L365-L366) [/github.com/angular/angular/blob/9e34670b2/packages/core/src/di/interface/provider.ts#L283-L284](https://github.com/angular/angular/blob/9e34670b2/packages/core/src/di/interface/provider.ts/issues/L283-L284) [/github.com/angular/angular/blob/9e34670b2/packages/core/src/di/index.ts#L23](https://github.com/angular/angular/blob/9e34670b2/packages/core/src/di/index.ts/issues/L23)
+* **core:** export provider interfaces that are part of the public API types ([#31377](https://github.com/angular/angular/issues/31377)) ([bebf089](https://github.com/angular/angular/commit/bebf089)), closes [/github.com/angular/angular/pull/31377#discussion_r299254408](https://github.com//github.com/angular/angular/pull/31377/issues/discussion_r299254408) [/github.com/angular/angular/blob/9e34670b2/packages/core/src/di/interface/provider.ts#L365-L366](https://github.com//github.com/angular/angular/blob/9e34670b2/packages/core/src/di/interface/provider.ts/issues/L365-L366) [/github.com/angular/angular/blob/9e34670b2/packages/core/src/di/interface/provider.ts#L283-L284](https://github.com//github.com/angular/angular/blob/9e34670b2/packages/core/src/di/interface/provider.ts/issues/L283-L284) [/github.com/angular/angular/blob/9e34670b2/packages/core/src/di/index.ts#L23](https://github.com//github.com/angular/angular/blob/9e34670b2/packages/core/src/di/index.ts/issues/L23)
 
 
 
@@ -1973,7 +1401,7 @@ This release contains various API docs improvements.
 * **bazel:** do not modify tsconfig.json ([#30984](https://github.com/angular/angular/issues/30984)) ([49307f0](https://github.com/angular/angular/commit/49307f0))
 * **bazel:** Load global stylesheet in dev and prod ([#30879](https://github.com/angular/angular/issues/30879)) ([5a7bcd1](https://github.com/angular/angular/commit/5a7bcd1))
 * **common:** expose the `HttpUploadProgressEvent` interface as public API ([#30852](https://github.com/angular/angular/issues/30852)) ([4e8614b](https://github.com/angular/angular/commit/4e8614b)), closes [#30814](https://github.com/angular/angular/issues/30814)
-* **core:** TypeScript related migrations should cater for BOM ([#30719](https://github.com/angular/angular/issues/30719)) ([26e3615](https://github.com/angular/angular/commit/26e3615)), closes [/github.com/angular/angular-cli/blob/master/packages/angular_devkit/schematics/src/tree/recorder.ts#L72](https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/schematics/src/tree/recorder.ts/issues/L72) [#30713](https://github.com/angular/angular/issues/30713)
+* **core:** TypeScript related migrations should cater for BOM ([#30719](https://github.com/angular/angular/issues/30719)) ([26e3615](https://github.com/angular/angular/commit/26e3615)), closes [/github.com/angular/angular-cli/blob/master/packages/angular_devkit/schematics/src/tree/recorder.ts#L72](https://github.com//github.com/angular/angular-cli/blob/master/packages/angular_devkit/schematics/src/tree/recorder.ts/issues/L72) [#30713](https://github.com/angular/angular/issues/30713)
 * **service-worker:** avoid uncaught rejection warning when registration fails ([#30876](https://github.com/angular/angular/issues/30876)) ([08c38a1](https://github.com/angular/angular/commit/08c38a1))
 
 
@@ -1984,7 +1412,7 @@ This release contains various API docs improvements.
 
 ### Bug Fixes
 
-* **core:** TypeScript related migrations should cater for BOM ([#30719](https://github.com/angular/angular/issues/30719)) ([80394ce](https://github.com/angular/angular/commit/80394ce)), closes [/github.com/angular/angular-cli/blob/master/packages/angular_devkit/schematics/src/tree/recorder.ts#L72](https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/schematics/src/tree/recorder.ts/issues/L72) [#30713](https://github.com/angular/angular/issues/30713)
+* **core:** TypeScript related migrations should cater for BOM ([#30719](https://github.com/angular/angular/issues/30719)) ([80394ce](https://github.com/angular/angular/commit/80394ce)), closes [/github.com/angular/angular-cli/blob/master/packages/angular_devkit/schematics/src/tree/recorder.ts#L72](https://github.com//github.com/angular/angular-cli/blob/master/packages/angular_devkit/schematics/src/tree/recorder.ts/issues/L72) [#30713](https://github.com/angular/angular/issues/30713)
 
 
 
@@ -2137,7 +1565,7 @@ To learn about the release highlights and our CLI-powered automated update workf
 * **common:** add upgrade sub-package to `ng_package` rule for @angular/common ([#30117](https://github.com/angular/angular/issues/30117)) ([6de4cbd](https://github.com/angular/angular/commit/6de4cbd)), closes [#30055](https://github.com/angular/angular/issues/30055) [#30116](https://github.com/angular/angular/issues/30116)
 * **common:** adjust `MockPlatformLocation` to set state to new object ([#30055](https://github.com/angular/angular/issues/30055)) ([825efa8](https://github.com/angular/angular/commit/825efa8))
 * **compiler:** Fix compiler crash due to isSkipSelf of null ([#30075](https://github.com/angular/angular/issues/30075)) ([28fd5ab](https://github.com/angular/angular/commit/28fd5ab))
-* **upgrade:** do not break if `onMicrotaskEmpty` emits while a `$digest` is in progress ([#29794](https://github.com/angular/angular/issues/29794)) ([0ddf2e7](https://github.com/angular/angular/commit/0ddf2e7)), closes [#24680](https://github.com/angular/angular/issues/24680) [/github.com/angular/angular/blob/78146c189/packages/core/src/util/ng_dev_mode.ts#L12](https://github.com/angular/angular/blob/78146c189/packages/core/src/util/ng_dev_mode.ts/issues/L12) [#24680](https://github.com/angular/angular/issues/24680)
+* **upgrade:** do not break if `onMicrotaskEmpty` emits while a `$digest` is in progress ([#29794](https://github.com/angular/angular/issues/29794)) ([0ddf2e7](https://github.com/angular/angular/commit/0ddf2e7)), closes [#24680](https://github.com/angular/angular/issues/24680) [/github.com/angular/angular/blob/78146c189/packages/core/src/util/ng_dev_mode.ts#L12](https://github.com//github.com/angular/angular/blob/78146c189/packages/core/src/util/ng_dev_mode.ts/issues/L12) [#24680](https://github.com/angular/angular/issues/24680)
 * **bazel:** do not typecheck core schematic files ([#29876](https://github.com/angular/angular/issues/29876)) ([2ba799d](https://github.com/angular/angular/commit/2ba799d))
 * **bazel:** restore `ng build --prod` ([#30005](https://github.com/angular/angular/issues/30005)) ([96a8289](https://github.com/angular/angular/commit/96a8289))
 * **common:** prevent repeated application of `HttpParams` mutations ([#29045](https://github.com/angular/angular/issues/29045)) ([8e8e89a](https://github.com/angular/angular/commit/8e8e89a)), closes [#20430](https://github.com/angular/angular/issues/20430)
@@ -2191,7 +1619,7 @@ To learn about the release highlights and our CLI-powered automated update workf
 * **platform-server:** update minimum domino version to latest released ([#28893](https://github.com/angular/angular/issues/28893)) ([79e2ca0](https://github.com/angular/angular/commit/79e2ca0))
 * **router:** removed obsolete TODO comment ([#29085](https://github.com/angular/angular/issues/29085)) ([72ecc45](https://github.com/angular/angular/commit/72ecc45))
 * **service-worker:** detect new version even if files are identical to an old one ([#26006](https://github.com/angular/angular/issues/26006)) ([586234b](https://github.com/angular/angular/commit/586234b)), closes [#24338](https://github.com/angular/angular/issues/24338)
-* **service-worker:** ignore passive mixed content requests ([#25994](https://github.com/angular/angular/issues/25994)) ([48214e2](https://github.com/angular/angular/commit/48214e2)), closes [23012#issuecomment-376430187](https://github.com/angular/angular/issues/23012#issuecomment-376430187) [#23012](https://github.com/angular/angular/issues/23012)
+* **service-worker:** ignore passive mixed content requests ([#25994](https://github.com/angular/angular/issues/25994)) ([48214e2](https://github.com/angular/angular/commit/48214e2)), closes [/github.com/angular/angular/issues/23012#issuecomment-376430187](https://github.com//github.com/angular/angular/issues/23012/issues/issuecomment-376430187) [#23012](https://github.com/angular/angular/issues/23012)
 * **bazel:** Pin browsers for schematics ([#28913](https://github.com/angular/angular/issues/28913)) ([1145bdb](https://github.com/angular/angular/commit/1145bdb))
 * **bazel:** rxjs_umd_modules should always be present ([#28881](https://github.com/angular/angular/issues/28881)) ([9ae14db](https://github.com/angular/angular/commit/9ae14db))
 * **compiler:** use correct variable in invalid function ([#28656](https://github.com/angular/angular/issues/28656)) ([f75acbd](https://github.com/angular/angular/commit/f75acbd))
@@ -2199,7 +1627,7 @@ To learn about the release highlights and our CLI-powered automated update workf
 * **language-service:** Fix completions for input/output with alias ([#28904](https://github.com/angular/angular/issues/28904)) ([ad4a9bf](https://github.com/angular/angular/commit/ad4a9bf)), closes [#27959](https://github.com/angular/angular/issues/27959)
 * **bazel:** Add postinstall step to generate summaries ([#28850](https://github.com/angular/angular/issues/28850)) ([96b597c](https://github.com/angular/angular/commit/96b597c))
 * **bazel:** Schematics should upgrade rxjs to 6.4.0 ([#28841](https://github.com/angular/angular/issues/28841)) ([2d80419](https://github.com/angular/angular/commit/2d80419))
-* **compiler-cli:** incorrect bundled metadata for static class member call expressions ([#28762](https://github.com/angular/angular/issues/28762)) ([4131715](https://github.com/angular/angular/commit/4131715)), closes [/github.com/angular/angular/blob/master/packages/core/src/change_detection/differs/keyvalue_differs.ts#L121](https://github.com/angular/angular/blob/master/packages/core/src/change_detection/differs/keyvalue_differs.ts/issues/L121) [#28741](https://github.com/angular/angular/issues/28741)
+* **compiler-cli:** incorrect bundled metadata for static class member call expressions ([#28762](https://github.com/angular/angular/issues/28762)) ([4131715](https://github.com/angular/angular/commit/4131715)), closes [/github.com/angular/angular/blob/master/packages/core/src/change_detection/differs/keyvalue_differs.ts#L121](https://github.com//github.com/angular/angular/blob/master/packages/core/src/change_detection/differs/keyvalue_differs.ts/issues/L121) [#28741](https://github.com/angular/angular/issues/28741)
 * **bazel:** Install angular repo before yarn_install ([#28670](https://github.com/angular/angular/issues/28670)) ([49fb8c3](https://github.com/angular/angular/commit/49fb8c3))
 * **bazel:** Turn on strict action env ([#28675](https://github.com/angular/angular/issues/28675)) ([2ea030c](https://github.com/angular/angular/commit/2ea030c))
 * **compiler:** ensure that event handlers have the correct source spans ([#28055](https://github.com/angular/angular/issues/28055)) ([cffd862](https://github.com/angular/angular/commit/cffd862))
@@ -2352,7 +1780,7 @@ For details on how to migrate, please refer to [the deprecations guide](https://
 
 ### Bug Fixes
 
-* **upgrade:** do not break if `onMicrotaskEmpty` emits while a `$digest` is in progress ([#29794](https://github.com/angular/angular/issues/29794)) ([#30107](https://github.com/angular/angular/issues/30107)) ([1084c19](https://github.com/angular/angular/commit/1084c19)), closes [#24680](https://github.com/angular/angular/issues/24680) [/github.com/angular/angular/blob/78146c189/packages/core/src/util/ng_dev_mode.ts#L12](https://github.com/angular/angular/blob/78146c189/packages/core/src/util/ng_dev_mode.ts/issues/L12) [#24680](https://github.com/angular/angular/issues/24680)
+* **upgrade:** do not break if `onMicrotaskEmpty` emits while a `$digest` is in progress ([#29794](https://github.com/angular/angular/issues/29794)) ([#30107](https://github.com/angular/angular/issues/30107)) ([1084c19](https://github.com/angular/angular/commit/1084c19)), closes [#24680](https://github.com/angular/angular/issues/24680) [/github.com/angular/angular/blob/78146c189/packages/core/src/util/ng_dev_mode.ts#L12](https://github.com//github.com/angular/angular/blob/78146c189/packages/core/src/util/ng_dev_mode.ts/issues/L12) [#24680](https://github.com/angular/angular/issues/24680)
 
 
 <a name="7.2.13"></a>
@@ -2406,7 +1834,7 @@ This release contains various API docs improvements.
 * **animations:** ensure `position` and `display` styles are handled outside of keyframes/web-animations ([#28911](https://github.com/angular/angular/issues/28911)) ([86981b3](https://github.com/angular/angular/commit/86981b3)), closes [#24923](https://github.com/angular/angular/issues/24923) [#25635](https://github.com/angular/angular/issues/25635)
 * **router:** removed obsolete TODO comment ([#29085](https://github.com/angular/angular/issues/29085)) ([2a25ac2](https://github.com/angular/angular/commit/2a25ac2))
 * **service-worker:** detect new version even if files are identical to an old one ([#26006](https://github.com/angular/angular/issues/26006)) ([5669333](https://github.com/angular/angular/commit/5669333)), closes [#24338](https://github.com/angular/angular/issues/24338)
-* **service-worker:** ignore passive mixed content requests ([#25994](https://github.com/angular/angular/issues/25994)) ([b598e88](https://github.com/angular/angular/commit/b598e88)), closes [23012#issuecomment-376430187](https://github.com/angular/angular/issues/23012#issuecomment-376430187) [#23012](https://github.com/angular/angular/issues/23012)
+* **service-worker:** ignore passive mixed content requests ([#25994](https://github.com/angular/angular/issues/25994)) ([b598e88](https://github.com/angular/angular/commit/b598e88)), closes [/github.com/angular/angular/issues/23012#issuecomment-376430187](https://github.com//github.com/angular/angular/issues/23012/issues/issuecomment-376430187) [#23012](https://github.com/angular/angular/issues/23012)
 
 
 <a name="7.2.7"></a>
@@ -2426,7 +1854,7 @@ This release contains various API docs improvements.
 
 ### Bug Fixes
 
-* **compiler-cli:** incorrect bundled metadata for static class member call expressions ([#28762](https://github.com/angular/angular/issues/28762)) ([ab69c31](https://github.com/angular/angular/commit/ab69c31)), closes [/github.com/angular/angular/blob/master/packages/core/src/change_detection/differs/keyvalue_differs.ts#L121](https://github.com/angular/angular/blob/master/packages/core/src/change_detection/differs/keyvalue_differs.ts/issues/L121) [#28741](https://github.com/angular/angular/issues/28741)
+* **compiler-cli:** incorrect bundled metadata for static class member call expressions ([#28762](https://github.com/angular/angular/issues/28762)) ([ab69c31](https://github.com/angular/angular/commit/ab69c31)), closes [/github.com/angular/angular/blob/master/packages/core/src/change_detection/differs/keyvalue_differs.ts#L121](https://github.com//github.com/angular/angular/blob/master/packages/core/src/change_detection/differs/keyvalue_differs.ts/issues/L121) [#28741](https://github.com/angular/angular/issues/28741)
 
 
 <a name="7.2.5"></a>
@@ -2569,7 +1997,7 @@ This release contains various API docs improvements.
 * **bazel:** emit full node stack traces when Angular compilation crashes ([#27678](https://github.com/angular/angular/issues/27678)) ([522919a](https://github.com/angular/angular/commit/522919a))
 * **bazel:** fix major/minor semver check between @angular/bazel npm packager version and angular bazel repo version ([#27635](https://github.com/angular/angular/issues/27635)) ([1cc08b4](https://github.com/angular/angular/commit/1cc08b4))
 * **bazel:** Load http_archive and rules_nodejs dependencies ([#27609](https://github.com/angular/angular/issues/27609)) ([8313ffc](https://github.com/angular/angular/commit/8313ffc))
-* **bazel:** ng_package writes unrelevant definitions to bazel out ([#27519](https://github.com/angular/angular/issues/27519)) ([44dfa60](https://github.com/angular/angular/commit/44dfa60)), closes [/github.com/angular/angular/blob/4f9374951d67c75f67a31c110bd61ab72563db7d/packages/bazel/src/ng_package/packager.ts#L105-L124](https://github.com/angular/angular/blob/4f9374951d67c75f67a31c110bd61ab72563db7d/packages/bazel/src/ng_package/packager.ts/issues/L105-L124)
+* **bazel:** ng_package writes unrelevant definitions to bazel out ([#27519](https://github.com/angular/angular/issues/27519)) ([44dfa60](https://github.com/angular/angular/commit/44dfa60)), closes [/github.com/angular/angular/blob/4f9374951d67c75f67a31c110bd61ab72563db7d/packages/bazel/src/ng_package/packager.ts#L105-L124](https://github.com//github.com/angular/angular/blob/4f9374951d67c75f67a31c110bd61ab72563db7d/packages/bazel/src/ng_package/packager.ts/issues/L105-L124)
 * **bazel:** Set module_name and enable ng test ([#27715](https://github.com/angular/angular/issues/27715)) ([85866de](https://github.com/angular/angular/commit/85866de))
 * **bazel:** fix TS errors in the `schematics/bazel-workspace` files ([#27600](https://github.com/angular/angular/issues/27600)) ([3290fc3](https://github.com/angular/angular/commit/3290fc3))
 * **bazel:** Read latest versions from latest-versions.ts & use semver check ([#27526](https://github.com/angular/angular/issues/27526)) ([30a3b49](https://github.com/angular/angular/commit/30a3b49))
@@ -2609,7 +2037,7 @@ This release contains various API docs improvements.
 * **bazel:** emit full node stack traces when Angular compilation crashes ([#27678](https://github.com/angular/angular/issues/27678)) ([0d8528b](https://github.com/angular/angular/commit/0d8528b))
 * **bazel:** fix major/minor semver check between @angular/bazel npm packager version and angular bazel repo version ([#27635](https://github.com/angular/angular/issues/27635)) ([3ed1e84](https://github.com/angular/angular/commit/3ed1e84))
 * **bazel:** Load http_archive and rules_nodejs dependencies ([#27609](https://github.com/angular/angular/issues/27609)) ([89ace1a](https://github.com/angular/angular/commit/89ace1a))
-* **bazel:** ng_package writes unrelevant definitions to bazel out ([#27519](https://github.com/angular/angular/issues/27519)) ([ef056c5](https://github.com/angular/angular/commit/ef056c5)), closes [/github.com/angular/angular/blob/4f9374951d67c75f67a31c110bd61ab72563db7d/packages/bazel/src/ng_package/packager.ts#L105-L124](https://github.com/angular/angular/blob/4f9374951d67c75f67a31c110bd61ab72563db7d/packages/bazel/src/ng_package/packager.ts/issues/L105-L124)
+* **bazel:** ng_package writes unrelevant definitions to bazel out ([#27519](https://github.com/angular/angular/issues/27519)) ([ef056c5](https://github.com/angular/angular/commit/ef056c5)), closes [/github.com/angular/angular/blob/4f9374951d67c75f67a31c110bd61ab72563db7d/packages/bazel/src/ng_package/packager.ts#L105-L124](https://github.com//github.com/angular/angular/blob/4f9374951d67c75f67a31c110bd61ab72563db7d/packages/bazel/src/ng_package/packager.ts/issues/L105-L124)
 * **bazel:** Read latest versions from latest-versions.ts & use semver check ([#27591](https://github.com/angular/angular/issues/27591)) ([93078e3](https://github.com/angular/angular/commit/93078e3))
 * **bazel:** Set module_name and enable ng test ([#27715](https://github.com/angular/angular/issues/27715)) ([183f278](https://github.com/angular/angular/commit/183f278))
 * **common:** KeyValuePipe should return empty array for empty objects ([#27258](https://github.com/angular/angular/issues/27258)) ([fa3af8b](https://github.com/angular/angular/commit/fa3af8b))
@@ -2638,7 +2066,7 @@ This release contains various API docs improvements.
 * **bazel:** ng_package not generating UMD bundles on windows ([#27200](https://github.com/angular/angular/issues/27200)) ([e476c38](https://github.com/angular/angular/commit/e476c38))
 * **bazel:** ng_package should correctly map to source maps in secondary entry-points ([#27313](https://github.com/angular/angular/issues/27313)) ([fc2c23e](https://github.com/angular/angular/commit/fc2c23e)), closes [#25510](https://github.com/angular/angular/issues/25510)
 * **compiler-cli:** flatModuleIndex files not generated on windows with multiple input files ([#27200](https://github.com/angular/angular/issues/27200)) ([8087b6b](https://github.com/angular/angular/commit/8087b6b))
-* **compiler-cli:** ngtsc shim files not being generated on case-insensitive platforms ([#27466](https://github.com/angular/angular/issues/27466)) ([84f2928](https://github.com/angular/angular/commit/84f2928)), closes [/github.com/Microsoft/TypeScript/blob/3e4c5c95abd515eb9713b881d27ab3a93cc00461/src/compiler/sys.ts#L681-L682](https://github.com/Microsoft/TypeScript/blob/3e4c5c95abd515eb9713b881d27ab3a93cc00461/src/compiler/sys.ts/issues/L681-L682)
+* **compiler-cli:** ngtsc shim files not being generated on case-insensitive platforms ([#27466](https://github.com/angular/angular/issues/27466)) ([84f2928](https://github.com/angular/angular/commit/84f2928)), closes [/github.com/Microsoft/TypeScript/blob/3e4c5c95abd515eb9713b881d27ab3a93cc00461/src/compiler/sys.ts#L681-L682](https://github.com//github.com/Microsoft/TypeScript/blob/3e4c5c95abd515eb9713b881d27ab3a93cc00461/src/compiler/sys.ts/issues/L681-L682)
 * **platform-server:** add @angular/http to the list of peerDependencies ([#27307](https://github.com/angular/angular/issues/27307)) ([236ac06](https://github.com/angular/angular/commit/236ac06)), closes [#26154](https://github.com/angular/angular/issues/26154)
 
 
@@ -2862,7 +2290,7 @@ To learn about the release highlights and our new CLI-powered update workflow fo
 * **compiler:** update compiler to flatten nested template fns ([#24943](https://github.com/angular/angular/issues/24943)) ([fe14f18](https://github.com/angular/angular/commit/fe14f18))
 * **compiler:** update compiler to generate new slot allocations ([#25607](https://github.com/angular/angular/issues/25607)) ([27e2039](https://github.com/angular/angular/commit/27e2039))
 * **core:** In Testability.whenStable update callback, pass more complete ([#25010](https://github.com/angular/angular/issues/25010)) ([16c03c0](https://github.com/angular/angular/commit/16c03c0))
-* **core:** add missing `peerDependency ` to `@angular/compiler` ([#26033](https://github.com/angular/angular/issues/26033)) ([549de1e](https://github.com/angular/angular/commit/549de1e)), closes [/github.com/angular/angular/commit/919f42fea1df4b9e38b7d688aef5f2de668e9d3e#diff-58563046c4439699f2e6a89187099a54](https://github.com/angular/angular/commit/919f42fea1df4b9e38b7d688aef5f2de668e9d3e/issues/diff-58563046c4439699f2e6a89187099a54)
+* **core:** add missing `peerDependency ` to `@angular/compiler` ([#26033](https://github.com/angular/angular/issues/26033)) ([549de1e](https://github.com/angular/angular/commit/549de1e)), closes [/github.com/angular/angular/commit/919f42fea1df4b9e38b7d688aef5f2de668e9d3e#diff-58563046c4439699f2e6a89187099a54](https://github.com//github.com/angular/angular/commit/919f42fea1df4b9e38b7d688aef5f2de668e9d3e/issues/diff-58563046c4439699f2e6a89187099a54)
 * **core:** allow null value for renderer setElement(…) ([#17065](https://github.com/angular/angular/issues/17065)) ([ff15043](https://github.com/angular/angular/commit/ff15043)), closes [#13686](https://github.com/angular/angular/issues/13686)
 * **core:** do not clear element content when using shadow dom ([#24861](https://github.com/angular/angular/issues/24861)) ([6e828bb](https://github.com/angular/angular/commit/6e828bb))
 * **core:** size regression with closure compiler ([#25531](https://github.com/angular/angular/issues/25531)) ([1f59f2f](https://github.com/angular/angular/commit/1f59f2f))

CONTRIBUTING.md

@@ -1,7 +1,7 @@
 # Contributing to Angular
 
-We would love for you to contribute to Angular and help make it even better than it is today!
+We would love for you to contribute to Angular and help make it even better than it is
-As a contributor, here are the guidelines we would like you to follow:
+today! As a contributor, here are the guidelines we would like you to follow:
 
  - [Code of Conduct](#coc)
  - [Question or Problem?](#question)
@@ -12,63 +12,50 @@ As a contributor, here are the guidelines we would like you to follow:
  - [Commit Message Guidelines](#commit)
  - [Signing the CLA](#cla)
 
-
 ## <a name="coc"></a> Code of Conduct
-
+Help us keep Angular open and inclusive. Please read and follow our [Code of Conduct][coc].
-Help us keep Angular open and inclusive.
-Please read and follow our [Code of Conduct][coc].
-
 
 ## <a name="question"></a> Got a Question or Problem?
 
-Do not open issues for general support questions as we want to keep GitHub issues for bug reports and feature requests.
+Do not open issues for general support questions as we want to keep GitHub issues for bug reports and feature requests. You've got much better chances of getting your question answered on [Stack Overflow](https://stackoverflow.com/questions/tagged/angular) where the questions should be tagged with tag `angular`.
-Instead, we recommend using [Stack Overflow](https://stackoverflow.com/questions/tagged/angular) to ask support-related questions. When creating a new question on Stack Overflow, make sure to add the `angular` tag.
 
 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.
 
 If you would like to chat about the question in real-time, you can reach out via [our gitter channel][gitter].
 
-
 ## <a name="issue"></a> Found a Bug?
-
+If you find a bug in the source code, you can help us by
-If you find a bug in the source code, you can help us by [submitting an issue](#submit-issue) to our [GitHub Repository][github].
+[submitting an issue](#submit-issue) to our [GitHub Repository][github]. Even better, you can
-Even better, you can [submit a Pull Request](#submit-pr) with a fix.
+[submit a Pull Request](#submit-pr) with a fix.
-
 
 ## <a name="feature"></a> Missing a Feature?
-You can *request* a new feature by [submitting an issue](#submit-issue) to our GitHub Repository.
+You can *request* a new feature by [submitting an issue](#submit-issue) to our GitHub
-If you would like to *implement* a new feature, please consider the size of the change in order to determine the right steps to proceed:
+Repository. If you would like to *implement* a new feature, please submit an issue with
-
+a proposal for your work first, to be sure that we can use it.
-* For a **Major Feature**, first open an issue and outline your proposal so that it can be discussed.
+Please consider what kind of change it is:
-  This process allows 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.
-
-  **Note**: Adding a new topic to the documentation, or significantly re-writing a topic, counts as a major feature.
 
+* 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.
 * **Small Features** can be crafted and directly [submitted as a Pull Request](#submit-pr).
 
-
 ## <a name="submit"></a> Submission Guidelines
 
-
 ### <a name="submit-issue"></a> Submitting an Issue
 
 Before you submit an issue, please search the issue tracker, maybe an issue for your problem already exists and the discussion might inform you of workarounds readily available.
 
-We want to fix all the issues as soon as possible, but before fixing a bug we need to reproduce and confirm it.
+We want to fix all the issues as soon as possible, but before fixing a bug we need to reproduce and confirm it. In order to reproduce bugs, we will systematically ask you to provide a minimal reproduction. Having a minimal reproducible scenario gives us a wealth of important information without going back & forth to you with additional questions.
-In order to reproduce bugs, we require that you provide a minimal reproduction.
-Having a minimal reproducible scenario gives us a wealth of important information without going back and forth to you with additional questions.
 
 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 require a minimal reproduction to save maintainers' time and ultimately be able to fix more bugs.
+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.
-Often, developers 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.
 
@@ -76,51 +63,42 @@ You can file new issues by selecting from our [new issue templates](https://gith
 
 
 ### <a name="submit-pr"></a> Submitting a Pull Request (PR)
-
 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.
+1. Search [GitHub](https://github.com/angular/angular/pulls) for an open or closed PR
-   You don't want to duplicate existing efforts.
+  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.
-2. 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.
-3. Please sign our [Contributor License Agreement (CLA)](#cla) before sending PRs.
+1. Fork the angular/angular repo.
-   We cannot accept code without a signed CLA.
+1. Make your changes in a new git branch:
-   Make sure you author all contributed Git commits with email address associated with your CLA signature.
-
-4. Fork the angular/angular repo.
-
-5. Make your changes in a new git branch:
 
      ```shell
      git checkout -b my-fix-branch master
      ```
 
-6. Create your patch, **including appropriate test cases**.
+1. Create your patch, **including appropriate test cases**.
-
+1. Follow our [Coding Rules](#rules).
-7. Follow our [Coding Rules](#rules).
+1. Run the full Angular test suite, as described in the [developer documentation][dev-doc],
-
+  and ensure that all tests pass.
-8. 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
-9. Commit your changes using a descriptive commit message that follows our [commit message conventions](#commit).
+  is necessary because release notes are automatically generated from these messages.
-   Adherence to these conventions is necessary because release notes are automatically generated from these messages.
 
      ```shell
      git commit -a
      ```
     Note: the optional commit `-a` command line option will automatically "add" and "rm" edited files.
 
-10. Push your branch to GitHub:
+1. Push your branch to GitHub:
 
     ```shell
     git push origin my-fix-branch
     ```
 
-11. In GitHub, send a pull request to `angular:master`.
+1. In GitHub, send a pull request to `angular:master`.
-
+* If we suggest changes then:
-   If we ask for changes via code reviews then:
-
   * Make the required updates.
   * Re-run the Angular test suites to ensure tests are still passing.
   * Rebase your branch and force push to your GitHub repository (this will update your Pull Request):
@@ -132,10 +110,10 @@ Before you submit your Pull Request (PR) consider the following guidelines:
 
 That's it! Thank you for your contribution!
 
-
 #### After your pull request is merged
 
-After your pull request is merged, you can safely delete your branch and pull the changes from the main (upstream) repository:
+After your pull request is merged, you can safely delete your branch and pull the changes
+from the main (upstream) repository:
 
 * Delete the remote branch on GitHub either through the GitHub web UI or your local shell as follows:
 
@@ -161,66 +139,55 @@ After your pull request is merged, you can safely delete your branch and pull th
     git pull --ff upstream master
     ```
 
-
 ## <a name="rules"></a> Coding Rules
 To ensure consistency throughout the source code, keep these rules in mind as you are working:
 
 * All features or bug fixes **must be tested** by one or more specs (unit-tests).
-* All public API methods **must be documented**.
+* All public API methods **must be documented**. (Details TBC).
-* We follow [Google's JavaScript Style Guide][js-style-guide], but wrap all code at **100 characters**.
+* We follow [Google's JavaScript Style Guide][js-style-guide], but wrap all code at
+  **100 characters**. An automated formatter is available, see
+  [DEVELOPER.md](docs/DEVELOPER.md#clang-format).
 
-   An automated formatter is available, see [DEVELOPER.md](docs/DEVELOPER.md#clang-format).
+## <a name="commit"></a> Commit Message Guidelines
 
+We have very precise rules over how our git commit messages can be formatted.  This leads to **more
+readable messages** that are easy to follow when looking through the **project history**.  But also,
+we use the git commit messages to **generate the Angular change log**.
 
-## <a name="commit"></a> Commit Message Format
+### Commit Message Format
-
+Each commit message consists of a **header**, a **body** and a **footer**.  The header has a special
-*This specification is inspired and supersedes the [AngularJS commit message format][commit-message-format].*
+format that includes a **type**, a **scope** and a **subject**:
-
-We have very precise rules over how our Git commit messages must be formatted.
-This format leads to **easier to read commit history**.
-
-Each commit message consists of a **header**, a **body**, and a **footer**.
-
 
 ```
-<header>
+<type>(<scope>): <subject>
 <BLANK LINE>
 <body>
 <BLANK LINE>
 <footer>
 ```
 
-The `header` is mandatory and must conform to the [Commit Message Header](#commit-header) format.
+The **header** is mandatory and the **scope** of the header is optional.
 
-The `body` is mandatory for all commits except for those of scope "docs".
+Any line of the commit message cannot be longer than 100 characters! This allows the message to be easier
-When the body is required it must be at least 20 characters long.
+to read on GitHub as well as in various git tools.
 
-The `footer` is optional.
+The footer should contain a [closing reference to an issue](https://help.github.com/articles/closing-issues-via-commit-messages/) if any.
 
-Any line of the commit message cannot be longer than 100 characters.
+Samples: (even more [samples](https://github.com/angular/angular/commits/master))
-
-
-#### <a href="commit-header"></a>Commit Message Header
 
 ```
-<type>(<scope>): <short summary>
+docs(changelog): update changelog to beta.5
-  │       │             │
+```
-  │       │             └─⫸ Summary in present tense. Not capitalized. No period at the end.
+```
-  │       │
+fix(release): need to depend on latest rxjs and zone.js
-  │       └─⫸ Commit Scope: animations|bazel|benchpress|common|compiler|compiler-cli|core|
+
-  │                          elements|forms|http|language-service|localize|platform-browser|
+The version in our package.json gets copied to the one we publish, and users need the latest of these.
-  │                          platform-browser-dynamic|platform-server|platform-webworker|
-  │                          platform-webworker-dynamic|router|service-worker|upgrade|zone.js|
-  │                          packaging|changelog|dev-infra|docs-infra|migrations|ngcc|ve
-  │
-  └─⫸ Commit Type: build|ci|docs|feat|fix|perf|refactor|style|test
 ```
 
-The `<type>` and `<summary>` fields are mandatory, the `(<scope>)` field is optional.
+### 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.
-
-##### Type
 
+### Type
 Must be one of the following:
 
 * **build**: Changes that affect the build system or external dependencies (example scopes: gulp, broccoli, npm)
@@ -233,95 +200,66 @@ Must be one of the following:
 * **style**: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc)
 * **test**: Adding missing tests or correcting existing tests
 
-
+### Scope
-##### Scope
 The scope should be the name of the npm package affected (as perceived by the person reading the changelog generated from commit messages).
 
 The following is the list of supported scopes:
 
-* `animations`
+* **animations**
-* `bazel`
+* **bazel**
-* `benchpress`
+* **benchpress**
-* `common`
+* **common**
-* `compiler`
+* **compiler**
-* `compiler-cli`
+* **compiler-cli**
-* `core`
+* **core**
-* `elements`
+* **elements**
-* `forms`
+* **forms**
-* `http`
+* **http**
-* `language-service`
+* **language-service**
-* `localize`
+* **localize**
-* `platform-browser`
+* **platform-browser**
-* `platform-browser-dynamic`
+* **platform-browser-dynamic**
-* `platform-server`
+* **platform-server**
-* `platform-webworker`
+* **platform-webworker**
-* `platform-webworker-dynamic`
+* **platform-webworker-dynamic**
-* `router`
+* **router**
-* `service-worker`
+* **service-worker**
-* `upgrade`
+* **upgrade**
-* `zone.js`
+* **zone.js**
 
 There are currently a few exceptions to the "use package name" rule:
 
-* `packaging`: used for changes that change the npm package layout in all of our packages, e.g. public path changes, package.json changes done to all packages, d.ts file/format changes, changes to bundles, etc.
+* **packaging**: used for changes that change the npm package layout in all of our packages, e.g.
+  public path changes, package.json changes done to all packages, d.ts file/format changes, changes
+  to bundles, etc.
+* **changelog**: used for updating the release notes in CHANGELOG.md
+* **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
+* **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
+  packages (e.g. `style: add missing semicolons`) and for docs changes that are not related to a
+  specific package (e.g. `docs: fix typo in tutorial`).
 
-* `changelog`: used for updating the release notes in CHANGELOG.md
+### Subject
-
+The subject contains a succinct description of the change:
-* `dev-infra`: used for dev-infra related changes within the directories /scripts, /tools and /dev-infra
-
-* `docs-infra`: used for docs-app (angular.io) related changes within the /aio directory of the repo
-
-* `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 packages (e.g. `style: add missing semicolons`) and for docs changes that are not related to a specific package (e.g. `docs: fix typo in tutorial`).
-
-
-##### Summary
-
-Use the summary field to provide a succinct description of the change:
 
 * use the imperative, present tense: "change" not "changed" nor "changes"
 * don't capitalize the first letter
 * no dot (.) at the end
 
+### Body
+Just as in the **subject**, use the imperative, present tense: "change" not "changed" nor "changes".
+The body should include the motivation for the change and contrast this with previous behavior.
 
-#### Commit Message Body
+### Footer
+The footer should contain any information about **Breaking Changes** and is also the place to
+reference GitHub issues that this commit **Closes**.
 
-Just as in the summary, use the imperative, present tense: "fix" not "fixed" nor "fixes".
+**Breaking Changes** should start with the word `BREAKING CHANGE:` with a space or two newlines. The rest of the commit message is then used for this.
-
-Explain the motivation for the change in the commit message body. This commit message should explain _why_ you are making the change.
-You can include a comparison of the previous behavior with the new behavior in order to illustrate the impact of the change.
-
-
-#### Commit Message Footer
-
-The footer can contain information about breaking changes and is also the place to reference GitHub issues, Jira tickets, and other PRs that this commit closes or is related to.
-
-```
-BREAKING CHANGE: <breaking change summary>
-<BLANK LINE>
-<breaking change description + migration instructions>
-<BLANK LINE>
-<BLANK LINE>
-Fixes #<issue number>
-```
-
-Breaking Change section should start with the phrase "BREAKING CHANGE: " followed by a summary of the breaking change, a blank line, and a detailed description of the breaking change that also includes migration instructions.
-
-
-### Revert commits
-
-If the commit reverts a previous commit, it should begin with `revert: `, followed by the header of the reverted commit.
-
-The content of the commit message body should contain:
-
-- information about the SHA of the commit being reverted in the following format: `This reverts commit <SHA>`,
-- a clear description of the reason for reverting the commit message.
 
+A detailed explanation can be found in this [document][commit-message-format].
 
 ## <a name="cla"></a> Signing the CLA
 
@@ -332,17 +270,18 @@ changes to be accepted, the CLA must be signed. It's a quick process, we promise
 * For corporations, we'll need you to
   [print, sign and one of scan+email, fax or mail the form][corporate-cla].
 
-If you have more than one GitHub accounts, or multiple email addresses associated with a single GitHub account, you must sign the CLA using the primary email address of the GitHub account used to author Git commits and send pull requests.
+<hr>
 
-The following documents can help you sort out issues with GitHub accounts and multiple email addresses:
+  If you have more than one Git identity, you must make sure that you sign the CLA using the primary email address associated with the ID that has been granted access to the Angular repository. Git identities can be associated with more than one email address, and only one is primary. Here are some links to help you sort out multiple Git identities and email addresses:
 
   * https://help.github.com/articles/setting-your-commit-email-address-in-git/
   * https://stackoverflow.com/questions/37245303/what-does-usera-committed-with-userb-13-days-ago-on-github-mean
   * 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.
 
-
+<hr>
 
 [angular-group]: https://groups.google.com/forum/#!forum/angular
 [coc]: https://github.com/angular/code-of-conduct/blob/master/CODE_OF_CONDUCT.md

WORKSPACE

@@ -8,8 +8,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 # Fetch rules_nodejs so we can install our npm dependencies
 http_archive(
     name = "build_bazel_rules_nodejs",
-    sha256 = "84abf7ac4234a70924628baa9a73a5a5cbad944c4358cf9abdb4aab29c9a5b77",
+    sha256 = "d0c4bb8b902c1658f42eb5563809c70a06e46015d64057d25560b0eb4bdc9007",
-    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/1.7.0/rules_nodejs-1.7.0.tar.gz"],
+    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/1.5.0/rules_nodejs-1.5.0.tar.gz"],
 )
 
 # Check the rules_nodejs version and download npm dependencies
@@ -17,7 +17,7 @@ http_archive(
 # assert on that.
 load("@build_bazel_rules_nodejs//:index.bzl", "check_rules_nodejs_version", "node_repositories", "yarn_install")
 
-check_rules_nodejs_version(minimum_version_string = "1.7.0")
+check_rules_nodejs_version(minimum_version_string = "1.5.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("//dev-infra/browsers:browser_repositories.bzl", "browser_repositories")
+load("//tools/browsers:browser_repositories.bzl", "browser_repositories")
 
 browser_repositories()
 
@@ -91,18 +91,17 @@ rbe_autoconfig(
     # Need to specify a base container digest in order to ensure that we can use the checked-in
     # platform configurations for the "ubuntu16_04" image. Otherwise the autoconfig rule would
     # need to pull the image and run it in order determine the toolchain configuration. See:
-    # https://github.com/bazelbuild/bazel-toolchains/blob/3.2.0/configs/ubuntu16_04_clang/versions.bzl
+    # https://github.com/bazelbuild/bazel-toolchains/blob/1.1.2/configs/ubuntu16_04_clang/versions.bzl
-    base_container_digest = "sha256:5e750dd878df9fcf4e185c6f52b9826090f6e532b097f286913a428290622332",
+    base_container_digest = "sha256:1ab40405810effefa0b2f45824d6d608634ccddbf06366760c341ef6fbead011",
     # Note that if you change the `digest`, you might also need to update the
     # `base_container_digest` to make sure marketplace.gcr.io/google/rbe-ubuntu16-04-webtest:<digest>
     # and marketplace.gcr.io/google/rbe-ubuntu16-04:<base_container_digest> have
     # the same Clang and JDK installed. Clang is needed because of the dependency on
     # @com_google_protobuf. Java is needed for the Bazel's test executor Java tool.
-    digest = "sha256:f743114235a43355bf8324e2ba0fa6a597236fe06f7bc99aaa9ac703631c306b",
+    digest = "sha256:0b8fa87db4b8e5366717a7164342a029d1348d2feea7ecc4b18c780bc2507059",
     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:buster
+FROM debian:stretch
 
 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_TRUSTED_PR_LABEL
+ARG TEST_AIO_TRUSTED_PR_LABEL="aio: preview"
 ARG      AIO_PREVIEW_SERVER_HOSTNAME=preview.localhost
-ARG TEST_AIO_PREVIEW_SERVER_HOSTNAME=$AIO_PREVIEW_SERVER_HOSTNAME
+ARG TEST_AIO_PREVIEW_SERVER_HOSTNAME=preview.localhost
 ARG      AIO_ARTIFACT_MAX_SIZE=26214400
 ARG TEST_AIO_ARTIFACT_MAX_SIZE=200
 ARG      AIO_PREVIEW_SERVER_PORT=3000
@@ -72,29 +72,24 @@ RUN mkdir /var/log/aio
 
 
 # Add extra package sources
-RUN apt-get update -y && apt-get install -y curl=7.64.0-4+deb10u1
+RUN apt-get update -y && apt-get install -y curl
-RUN curl --silent --show-error --location https://deb.nodesource.com/setup_12.x | bash -
+RUN curl --silent --show-error --location https://deb.nodesource.com/setup_10.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-134+deb10u1 \
+    cron=3.0pl1-128+deb9u1 \
-    dnsmasq=2.80-1 \
+    dnsmasq=2.76-5+deb9u2 \
-    nano=3.2-3 \
+    nano=2.7.4-1 \
-    nginx \
+    nginx=1.10.3-1+deb9u2 \
-    nodejs \
+    nodejs=10.15.3-1nodesource1 \
-    openssl \
+    openssl=1.1.0j-1~deb9u1 \
-    rsyslog=8.1901.0-1 \
+    rsyslog=8.24.0-1 \
-    vim=2:8.1.0875-5 \
+    yarn=1.15.2-1
-    yarn=1.22.4-1
+RUN yarn global add pm2@3.5.0
-RUN yarn global add pm2@4.4.0
 
 
 # Set up log rotation
@@ -167,7 +162,8 @@ 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/
-RUN yarn --cwd="$AIO_SCRIPTS_JS_DIR/" install --production --frozen-lockfile
+WORKDIR $AIO_SCRIPTS_JS_DIR/
+RUN yarn install --production --frozen-lockfile
 
 
 # Set up health check

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

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

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.ExecOptions = {}): Promise<CmdResult> {
+  public runCmd(cmd: string, opts: cp.ExecFileOptions = {}): 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.entries(this.portPerScheme).forEach(([scheme, port]) => suiteFactory(scheme, port));
+    Object.keys(this.portPerScheme).forEach(scheme => suiteFactory(scheme, this.portPerScheme[scheme]));
   }
 
   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', async () => {
+  it('should redirect HTTP to HTTPS', done => {
     const httpHost = `${AIO_NGINX_HOSTNAME}:${AIO_NGINX_PORT_HTTP}`;
     const httpsHost = `${AIO_NGINX_HOSTNAME}:${AIO_NGINX_PORT_HTTPS}`;
     const urlMap = {
@@ -24,15 +24,16 @@ describe(`nginx`, () => {
       [`http://foo.${httpHost}/`]: `https://foo.${httpsHost}/`,
     };
 
-    const verifyRedirection = async (fromUrl: string, toUrl: string) => {
+    const verifyRedirection = (httpUrl: string) => h.runCmd(`curl -i ${httpUrl}`).then(result => {
-      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: ${toUrl}`);
+      expect(headers).toContain(`Location: ${urlMap[httpUrl]}`);
-    };
+    });
 
-    await Promise.all(Object.entries(urlMap).map(urls => verifyRedirection(...urls)));
+    Promise.
+      all(Object.keys(urlMap).map(verifyRedirection)).
+      then(done);
   });
 
 
@@ -61,15 +62,15 @@ describe(`nginx`, () => {
         });
 
 
-        it('should return /index.html', async () => {
+        it('should return /index.html', done => {
           const origin = `${scheme}://pr${pr}-${shortSha9}.${host}`;
           const bodyRegex = new RegExp(`^PR: ${pr} | SHA: ${sha9} | File: /index\\.html$`);
 
-          await Promise.all([
+          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);
         });
 
 
@@ -89,11 +90,12 @@ describe(`nginx`, () => {
         });
 
 
-        it('should return /foo/bar.js', async () => {
+        it('should return /foo/bar.js', done => {
           const bodyRegex = new RegExp(`^PR: ${pr} | SHA: ${sha9} | File: /foo/bar\\.js$`);
 
-          await h.runCmd(`curl -iL ${scheme}://pr${pr}-${shortSha9}.${host}/foo/bar.js`).
+          h.runCmd(`curl -iL ${scheme}://pr${pr}-${shortSha9}.${host}/foo/bar.js`).
-            then(h.verifyResponse(200, bodyRegex));
+            then(h.verifyResponse(200, bodyRegex)).
+            then(done);
         });
 
 
@@ -109,46 +111,47 @@ describe(`nginx`, () => {
         });
 
 
-        it('should respond with 403 for directories', async () => {
+        it('should respond with 403 for directories', done => {
-          await Promise.all([
+          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', async () => {
+        it('should respond with 404 for unknown paths to files', done => {
-          await h.runCmd(`curl -iL ${scheme}://pr${pr}-${shortSha9}.${host}/foo/baz.css`).
+          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', async () => {
+        it('should rewrite to \'index.html\' for unknown paths that don\'t look like files', done => {
           const origin = `${scheme}://pr${pr}-${shortSha9}.${host}`;
           const bodyRegex = new RegExp(`^PR: ${pr} | SHA: ${sha9} | File: /index\\.html$`);
 
-          await Promise.all([
+          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', async () => {
+        it('should respond with 404 for unknown PRs/SHAs', done => {
           const otherPr = 54321;
           const otherShortSha = computeShortSha('8'.repeat(40));
 
-          await Promise.all([
+          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', async () => {
+        it('should respond with 404 if the subdomain format is wrong', done => {
-          await Promise.all([
+          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)),
@@ -157,25 +160,26 @@ 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', async () => {
+        it('should reject PRs with leading zeros', done => {
-          await h.runCmd(`curl -iL ${scheme}://pr0${pr}-${shortSha9}.${host}`).
+          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)', async () => {
+        it('should accept SHAs with leading zeros (but not trim the zeros)', done => {
           const bodyRegex9 = new RegExp(`^PR: ${pr} | SHA: ${sha9} | File: /index\\.html$`);
           const bodyRegex0 = new RegExp(`^PR: ${pr} | SHA: ${sha0} | File: /index\\.html$`);
 
-          await Promise.all([
+          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);
         });
 
       });
@@ -227,23 +231,23 @@ describe(`nginx`, () => {
 
     describe(`${host}/health-check`, () => {
 
-      it('should respond with 200', async () => {
+      it('should respond with 200', done => {
-        await Promise.all([
+        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', async () => {
+      it('should respond with 404 if the path does not match exactly', done => {
-        await Promise.all([
+        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);
       });
 
     });
@@ -287,28 +291,29 @@ describe(`nginx`, () => {
 
     describe(`${host}/circle-build`, () => {
 
-      it('should disallow non-POST requests', async () => {
+      it('should disallow non-POST requests', done => {
         const url = `${scheme}://${host}/circle-build`;
 
-        await Promise.all([
+        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', async () => {
+      it('should pass requests through to the preview server', done => {
-        await h.runCmd(`curl -iLX POST ${scheme}://${host}/circle-build`).
+        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', async () => {
+      it('should respond with 404 for unknown paths', done => {
         const cmdPrefix = `curl -iLX POST ${scheme}://${host}`;
 
-        await Promise.all([
+        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)),
@@ -317,7 +322,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);
       });
 
     });
@@ -327,33 +332,38 @@ describe(`nginx`, () => {
       const url = `${scheme}://${host}/pr-updated`;
 
 
-      it('should disallow non-POST requests', async () => {
+      it('should disallow non-POST requests', done => {
-        await Promise.all([
+        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', async () => {
+      it('should pass requests through to the preview server', done => {
-        await h.runCmd(`curl -iLX POST --header "Content-Type: application/json" ${url}`).
+        const cmdPrefix = `curl -iLX POST --header "Content-Type: application/json"`;
-          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', async () => {
+      it('should respond with 404 for unknown paths', done => {
         const cmdPrefix = `curl -iLX POST ${scheme}://${host}`;
 
-        await Promise.all([
+        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);
       });
 
     });
@@ -364,7 +374,7 @@ describe(`nginx`, () => {
       beforeEach(() => {
         ['index.html', 'foo.js', 'foo/index.html'].forEach(relFilePath => {
           const absFilePath = path.join(AIO_BUILDS_DIR, relFilePath);
-          h.writeFile(absFilePath, {content: `File: /${relFilePath}`});
+          return h.writeFile(absFilePath, {content: `File: /${relFilePath}`});
         });
       });
 

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

@@ -105,8 +105,8 @@ describe('preview-server', () => {
 
 
   describe(`${host}/circle-build`, () => {
-    const curl = makeCurl(`${host}/circle-build`);
 
+    const curl = makeCurl(`${host}/circle-build`);
 
     it('should disallow non-POST requests', async () => {
       const bodyRegex = /^Unknown resource/;
@@ -189,7 +189,8 @@ 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)).then(h.verifyResponse(201));
+      await curl(payload(BuildNums.TRUST_CHECK_ACTIVE_TRUSTED_USER))
+        .then(h.verifyResponse(201));
       expect({ prNum: PrNums.TRUST_CHECK_ACTIVE_TRUSTED_USER }).toExistAsABuild();
     });
 
@@ -198,7 +199,7 @@ describe('preview-server', () => {
       expect({ prNum: PrNums.TRUST_CHECK_UNTRUSTED, isPublic: false }).toExistAsABuild();
     });
 
-    [true, false].forEach(isPublic => {
+    [true].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';
@@ -363,23 +364,23 @@ describe('preview-server', () => {
 
   describe(`${host}/health-check`, () => {
 
-    it('should respond with 200', async () => {
+    it('should respond with 200', done => {
-      await Promise.all([
+      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', async () => {
+    it('should respond with 404 if the path does not match exactly', done => {
-      await Promise.all([
+      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);
     });
 
   });
@@ -425,18 +426,18 @@ describe('preview-server', () => {
     });
 
 
-    it('should respond with 404 for unknown paths', async () => {
+    it('should respond with 404 for unknown paths', done => {
       const mockPayload = JSON.stringify({number: 1}); // MockExternalApiFlags.TRUST_CHECK_ACTIVE_TRUSTED_USER });
       const cmdPrefix = `curl -iLX POST --data "${mockPayload}" ${host}`;
 
-      await Promise.all([
+      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);
     });
 
 
@@ -550,10 +551,10 @@ describe('preview-server', () => {
 
   describe(`${host}/*`, () => {
 
-    it('should respond with 404 for requests to unknown URLs', async () => {
+    it('should respond with 404 for requests to unknown URLs', done => {
       const bodyRegex = /^Unknown resource/;
 
-      await Promise.all([
+      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)),
@@ -561,7 +562,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,41 +14,42 @@
     "predev": "yarn build || true",
     "dev": "run-p ~~build-watch ~~test-watch",
     "lint": "tslint --project tsconfig.json",
-    "pretest": "run-s build lint",
+    "pretest": "yarn build",
     "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.19.0",
+    "body-parser": "^1.18.3",
-    "delete-empty": "^3.0.0",
+    "delete-empty": "^2.0.0",
-    "express": "^4.17.1",
+    "express": "^4.16.3",
-    "jasmine": "^3.5.0",
+    "jasmine": "^3.2.0",
-    "nock": "^12.0.3",
+    "nock": "^9.6.1",
-    "node-fetch": "^2.6.0",
+    "node-fetch": "^2.2.0",
-    "shelljs": "^0.8.4",
+    "shelljs": "^0.8.2",
-    "source-map-support": "^0.5.19",
+    "source-map-support": "^0.5.9",
-    "tar-stream": "^2.1.2",
+    "tar-stream": "^1.6.1",
-    "tslib": "^1.11.1"
+    "tslib": "^1.10.0"
   },
   "devDependencies": {
-    "@types/body-parser": "^1.19.0",
+    "@types/body-parser": "^1.17.0",
-    "@types/express": "^4.17.6",
+    "@types/express": "^4.16.0",
-    "@types/jasmine": "^3.5.10",
+    "@types/jasmine": "^2.8.8",
-    "@types/nock": "^11.1.0",
+    "@types/nock": "^9.3.0",
-    "@types/node": "^13.13.2",
+    "@types/node": "^10.9.2",
-    "@types/node-fetch": "^2.5.7",
+    "@types/node-fetch": "^2.1.2",
-    "@types/shelljs": "^0.8.7",
+    "@types/shelljs": "^0.8.0",
-    "@types/supertest": "^2.0.8",
+    "@types/supertest": "^2.0.5",
-    "nodemon": "^2.0.3",
+    "nodemon": "^1.18.3",
     "npm-run-all": "^4.1.5",
-    "supertest": "^4.0.2",
+    "supertest": "^3.1.0",
-    "tslint": "^6.1.1",
+    "tslint": "^5.11.0",
     "tslint-jasmine-noSkipOrFocus": "^1.0.9",
-    "typescript": "^3.8.3"
+    "typescript": "^3.0.1"
   }
 }

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

@@ -15,6 +15,7 @@ const EXISTING_DOWNLOADS = [
   '20-1234567-build.zip',
 ];
 const OPEN_PRS = [10, 40];
+const ANY_DATE = jasmine.any(String);
 
 // Tests
 describe('BuildCleaner', () => {
@@ -76,18 +77,22 @@ describe('BuildCleaner', () => {
     let cleanerRemoveUnnecessaryDownloadsSpy: jasmine.Spy;
 
     beforeEach(() => {
-      cleanerGetExistingBuildNumbersSpy = spyOn(cleaner, 'getExistingBuildNumbers').and.resolveTo(EXISTING_BUILDS);
+      cleanerGetExistingBuildNumbersSpy = spyOn(cleaner, 'getExistingBuildNumbers')
-      cleanerGetOpenPrNumbersSpy = spyOn(cleaner, 'getOpenPrNumbers').and.resolveTo(OPEN_PRS);
+        .and.callFake(() => Promise.resolve(EXISTING_BUILDS));
-      cleanerGetExistingDownloadsSpy = spyOn(cleaner, 'getExistingDownloads').and.resolveTo(EXISTING_DOWNLOADS);
+      cleanerGetOpenPrNumbersSpy = spyOn(cleaner, 'getOpenPrNumbers')
+        .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).toBeInstanceOf(Promise);
+      expect(promise).toEqual(jasmine.any(Promise));
 
       // Do not complete the test and release the spies synchronously, to avoid running the actual implementations.
       await promise;
@@ -125,32 +130,52 @@ describe('BuildCleaner', () => {
 
 
     it('should reject if \'getOpenPrNumbers()\' rejects', async () => {
-      cleanerGetOpenPrNumbersSpy.and.rejectWith('Test');
+      try {
-      await expectAsync(cleaner.cleanUp()).toBeRejectedWith('Test');
+        cleanerGetOpenPrNumbersSpy.and.callFake(() => Promise.reject('Test'));
+        await cleaner.cleanUp();
+      } catch (err) {
+        expect(err).toBe('Test');
+      }
     });
 
 
     it('should reject if \'getExistingBuildNumbers()\' rejects', async () => {
-      cleanerGetExistingBuildNumbersSpy.and.rejectWith('Test');
+      try {
-      await expectAsync(cleaner.cleanUp()).toBeRejectedWith('Test');
+        cleanerGetExistingBuildNumbersSpy.and.callFake(() => Promise.reject('Test'));
+        await cleaner.cleanUp();
+      } catch (err) {
+        expect(err).toBe('Test');
+      }
     });
 
 
     it('should reject if \'getExistingDownloads()\' rejects', async () => {
-      cleanerGetExistingDownloadsSpy.and.rejectWith('Test');
+      try {
-      await expectAsync(cleaner.cleanUp()).toBeRejectedWith('Test');
+        cleanerGetExistingDownloadsSpy.and.callFake(() => Promise.reject('Test'));
+        await cleaner.cleanUp();
+      } catch (err) {
+        expect(err).toBe('Test');
+      }
     });
 
 
     it('should reject if \'removeUnnecessaryBuilds()\' rejects', async () => {
-      cleanerRemoveUnnecessaryBuildsSpy.and.rejectWith('Test');
+      try {
-      await expectAsync(cleaner.cleanUp()).toBeRejectedWith('Test');
+        cleanerRemoveUnnecessaryBuildsSpy.and.callFake(() => Promise.reject('Test'));
+        await cleaner.cleanUp();
+      } catch (err) {
+        expect(err).toBe('Test');
+      }
     });
 
 
     it('should reject if \'removeUnnecessaryDownloads()\' rejects', async () => {
-      cleanerRemoveUnnecessaryDownloadsSpy.and.rejectWith('Test');
+      try {
-      await expectAsync(cleaner.cleanUp()).toBeRejectedWith('Test');
+        cleanerRemoveUnnecessaryDownloadsSpy.and.callFake(() => Promise.reject('Test'));
+        await cleaner.cleanUp();
+      } catch (err) {
+        expect(err).toBe('Test');
+      }
     });
 
   });
@@ -162,15 +187,13 @@ describe('BuildCleaner', () => {
     let promise: Promise<number[]>;
 
     beforeEach(() => {
-      fsReaddirSpy = spyOn(fs, 'readdir').and.callFake(
+      fsReaddirSpy = spyOn(fs, 'readdir').and.callFake((_: string, cb: typeof readdirCb) => readdirCb = cb);
-        ((_: string, cb: typeof readdirCb) => readdirCb = cb) as unknown as typeof fs.readdir,
-      );
       promise = cleaner.getExistingBuildNumbers();
     });
 
 
     it('should return a promise', () => {
-      expect(promise).toBeInstanceOf(Promise);
+      expect(promise).toEqual(jasmine.any(Promise));
     });
 
 
@@ -180,27 +203,43 @@ describe('BuildCleaner', () => {
     });
 
 
-    it('should reject if an error occurs while getting the files', async () => {
+    it('should reject if an error occurs while getting the files', done => {
+      promise.catch(err => {
+        expect(err).toBe('Test');
+        done();
+      });
+
       readdirCb('Test');
-      await expectAsync(promise).toBeRejectedWith('Test');
     });
 
 
-    it('should resolve with the returned files (as numbers)', async () => {
+    it('should resolve with the returned files (as numbers)', done => {
+      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', async () => {
+    it('should remove `HIDDEN_DIR_PREFIX` from the filenames', done => {
+      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', async () => {
+    it('should ignore files with non-numeric (or zero) names', done => {
+      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]);
     });
 
   });
@@ -220,7 +259,7 @@ describe('BuildCleaner', () => {
 
 
     it('should return a promise', () => {
-      expect(promise).toBeInstanceOf(Promise);
+      expect(promise).toEqual(jasmine.any(Promise));
     });
 
 
@@ -229,15 +268,31 @@ describe('BuildCleaner', () => {
     });
 
 
-    it('should reject if an error occurs while fetching PRs', async () => {
+    it('should reject if an error occurs while fetching PRs', done => {
+      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', async () => {
+    it('should resolve with the numbers of the fetched PRs', done => {
+      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}`);
+      });
     });
 
   });
@@ -249,15 +304,13 @@ describe('BuildCleaner', () => {
     let promise: Promise<string[]>;
 
     beforeEach(() => {
-      fsReaddirSpy = spyOn(fs, 'readdir').and.callFake(
+      fsReaddirSpy = spyOn(fs, 'readdir').and.callFake((_: string, cb: typeof readdirCb) => readdirCb = cb);
-        ((_: string, cb: typeof readdirCb) => readdirCb = cb) as unknown as typeof fs.readdir,
-      );
       promise = cleaner.getExistingDownloads();
     });
 
 
     it('should return a promise', () => {
-      expect(promise).toBeInstanceOf(Promise);
+      expect(promise).toEqual(jasmine.any(Promise));
     });
 
 
@@ -267,21 +320,33 @@ describe('BuildCleaner', () => {
     });
 
 
-    it('should reject if an error occurs while getting the files', async () => {
+    it('should reject if an error occurs while getting the files', done => {
+      promise.catch(err => {
+        expect(err).toBe('Test');
+        done();
+      });
+
       readdirCb('Test');
-      await expectAsync(promise).toBeRejectedWith('Test');
     });
 
 
-    it('should resolve with the returned file names', async () => {
+    it('should resolve with the returned file names', done => {
+      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', async () => {
+    it('should ignore files that do not match the artifactPath', done => {
+      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']);
     });
 
   });
@@ -299,7 +364,7 @@ describe('BuildCleaner', () => {
     });
 
 
-    it('should test if the directory exists (and return if it does not)', () => {
+    it('should test if the directory exists (and return if is does not)', () => {
       shellTestSpy.and.returnValue(false);
       cleaner.removeDir('/foo/bar');
 
@@ -316,19 +381,22 @@ 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.throwError('Test');
+      shellRmSpy.and.callFake(() => {
+        // tslint:disable-next-line: no-string-throw
+        throw 'Test';
+      });
+
       cleaner.removeDir('/foo/bar');
 
-      expect(loggerErrorSpy).toHaveBeenCalledWith('ERROR: Unable to remove \'/foo/bar\' due to:', new Error('Test'));
+      expect(loggerErrorSpy).toHaveBeenCalledWith('ERROR: Unable to remove \'/foo/bar\' due to:', 'Test');
     });
 
   });
@@ -381,7 +449,7 @@ describe('BuildCleaner', () => {
       expect(cleanerRemoveDirSpy).toHaveBeenCalledTimes(0);
       cleanerRemoveDirSpy.calls.reset();
 
-      cleaner.removeUnnecessaryBuilds([1, 2, 3, 4], []);
+      (cleaner as any).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,15 +45,25 @@ describe('CircleCIApi', () => {
       const errorMessage = 'Invalid request';
       const request = nock(BASE_URL).get(`/${buildNum}?circle-token=${TOKEN}`);
 
+      try {
         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);
-      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})`);
+      }
     });
   });
 
@@ -68,7 +78,8 @@ describe('CircleCIApi', () => {
         .get(`/${buildNum}/artifacts?circle-token=${TOKEN}`)
         .reply(200, [artifact0, artifact1, artifact2]);
 
-      await expectAsync(api.getBuildArtifactUrl(buildNum, 'some/path/1')).toBeResolvedTo('https://url/1');
+      const artifactUrl = await api.getBuildArtifactUrl(buildNum, 'some/path/1');
+      expect(artifactUrl).toEqual('https://url/1');
       request.done();
     });
 
@@ -79,15 +90,25 @@ describe('CircleCIApi', () => {
       const errorMessage = 'Invalid request';
       const request = nock(BASE_URL).get(`/${buildNum}/artifacts?circle-token=${TOKEN}`);
 
+      try {
         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);
-      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 () => {
@@ -100,9 +121,14 @@ describe('CircleCIApi', () => {
         .get(`/${buildNum}/artifacts?circle-token=${TOKEN}`)
         .reply(200, [artifact0, artifact1, artifact2]);
 
-      await expectAsync(api.getBuildArtifactUrl(buildNum, 'some/path/3')).toBeRejectedWithError(
+      try {
+        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()).toBeInstanceOf(Promise);
+      expect((api as any).getPaginated()).toEqual(jasmine.any(Promise));
     });
 
 
@@ -131,30 +131,45 @@ describe('GithubApi', () => {
     });
 
 
-    it('should reject if the request fails', async () => {
+    it('should reject if the request fails', done => {
-      const responsePromise = (api as any).getPaginated('/foo/bar');
+      (api as any).getPaginated('/foo/bar').catch((err: any) => {
+        expect(err).toBe('Test');
+        done();
+      });
+
       deferreds[0].reject('Test');
-
-      await expectAsync(responsePromise).toBeRejectedWith('Test');
     });
 
 
-    it('should resolve with the returned items', async () => {
+    it('should resolve with the returned items', done => {
       const items = [{id: 1}, {id: 2}];
-      const responsePromise = (api as any).getPaginated('/foo/bar');
-      deferreds[0].resolve(items);
 
-      await expectAsync(responsePromise).toBeResolvedTo(items);
+      (api as any).getPaginated('/foo/bar').then((data: any) => {
+        expect(data).toEqual(items);
+        done();
+      });
+
+      deferreds[0].resolve(items);
     });
 
 
-    it('should iteratively call \'get()\' to fetch all items', async () => {
+    it('should iteratively call \'get()\' to fetch all items', done => {
       // Create an array or 250 objects.
-      const allItems = new Array(250).fill(null).map((_, i) => ({id: i}));
+      const allItems = '.'.repeat(250).split('').map((_, i) => ({id: i}));
       const apiGetSpy = api.get as jasmine.Spy;
+
+      (api as any).getPaginated('/foo/bar', {baz: 'qux'}).then((data: any) => {
         const paramsForPage = (page: number) => ({baz: 'qux', page, per_page: 100});
 
-      const responsePromise = (api as any).getPaginated('/foo/bar', {baz: 'qux'});
+        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(() => {
@@ -163,13 +178,6 @@ 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)]);
     });
 
   });
@@ -209,8 +217,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()).toBeInstanceOf(Promise);
+      expect((api as any).request()).toEqual(jasmine.any(Promise));
     });
 
 
@@ -239,8 +247,9 @@ describe('GithubApi', () => {
       nock('https://api.github.com')
         .intercept('/path', 'method')
         .replyWithError('Test');
-
+      let message = 'Failed to reject error';
-      await expectAsync((api as any).request('method', '/path')).toBeRejectedWithError('Test');
+      await (api as any).request('method', '/path').catch((err: any) => message = err.message);
+      expect(message).toEqual('Test');
     });
 
 
@@ -254,69 +263,81 @@ describe('GithubApi', () => {
     });
 
 
-    it('should reject if response statusCode is <200', async () => {
+    it('should reject if response statusCode is <200', done => {
       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', async () => {
+    it('should reject if response statusCode is >=400', done => {
       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', async () => {
+    it('should include the response text in the rejection message', done => {
       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', async () => {
+    it('should resolve if returned statusCode is >=200 and <400', done => {
       const requestHandler = nock('https://api.github.com')
         .intercept('/path', 'method')
         .reply(200);
 
-      await expectAsync((api as any).request('method', '/path')).toBeResolved();
+      (api as any).request('method', '/path').then(done);
       requestHandler.done();
     });
 
 
-    it('should parse the response body into an object using \'JSON.parse\'', async () => {
+    it('should parse the response body into an object using \'JSON.parse\'', done => {
       const requestHandler = nock('https://api.github.com')
         .intercept('/path', 'method')
         .reply(300, '{"foo": "bar"}');
 
-      await expectAsync((api as any).request('method', '/path')).toBeResolvedTo({foo: 'bar'});
+      (api as any).request('method', '/path').then((data: any) => {
+        expect(data).toEqual({foo: 'bar'});
+        done();
+      });
       requestHandler.done();
     });
 
-    it('should reject if the response text is malformed JSON', async () => {
+    it('should reject if the response text is malformed JSON', done => {
       const requestHandler = nock('https://api.github.com')
         .intercept('/path', 'method')
         .reply(300, '}');
 
-      await expectAsync((api as any).request('method', '/path')).toBeRejectedWithError(SyntaxError);
+      (api as any).request('method', '/path').catch((err: any) => {
+        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, PullRequest} from '../../lib/common/github-pull-requests';
+import {GithubPullRequests} from '../../lib/common/github-pull-requests';
 
 // Tests
 describe('GithubPullRequests', () => {
@@ -47,21 +47,27 @@ describe('GithubPullRequests', () => {
 
 
     it('should make a POST request to Github with the correct pathname, params and data', () => {
-      githubApi.post.and.resolveTo();
+      githubApi.post.and.callFake(() => Promise.resolve());
       prs.addComment(42, 'body');
       expect(githubApi.post).toHaveBeenCalledWith('/repos/foo/bar/issues/42/comments', null, {body: 'body'});
     });
 
 
-    it('should reject if the request fails', async () => {
+    it('should reject if the request fails', done => {
-      githubApi.post.and.rejectWith('Test');
+      githubApi.post.and.callFake(() => Promise.reject('Test'));
-      await expectAsync(prs.addComment(42, 'body')).toBeRejectedWith('Test');
+      prs.addComment(42, 'body').catch(err => {
+        expect(err).toBe('Test');
+        done();
+      });
     });
 
 
-    it('should resolve with the data from the Github POST', async () => {
+    it('should resolve with the data from the Github POST', done => {
-      githubApi.post.and.resolveTo('Test');
+      githubApi.post.and.callFake(() => Promise.resolve('Test'));
-      await expectAsync(prs.addComment(42, 'body')).toBeResolvedTo('Test');
+      prs.addComment(42, 'body').then(data => {
+        expect(data).toBe('Test');
+        done();
+      });
     });
 
   });
@@ -81,11 +87,13 @@ describe('GithubPullRequests', () => {
     });
 
 
-    it('should resolve with the data returned from GitHub', async () => {
+    it('should resolve with the data returned from GitHub', done => {
       const expected: any = {number: 42};
-      githubApi.get.and.resolveTo(expected);
+      githubApi.get.and.callFake(() => Promise.resolve(expected));
-
+      prs.fetch(42).then(data => {
-      await expectAsync(prs.fetch(42)).toBeResolvedTo(expected);
+        expect(data).toEqual(expected);
+        done();
+      });
     });
 
   });
@@ -117,14 +125,9 @@ describe('GithubPullRequests', () => {
     });
 
 
-    it('should forward the value returned by \'getPaginated()\'', async () => {
+    it('should forward the value returned by \'getPaginated()\'', () => {
-      const mockPrs: PullRequest[] = [
+      githubApi.getPaginated.and.returnValue('Test');
-        {number: 1, user: {login: 'foo'}, labels: []},
+      expect(prs.fetchAll() as any).toBe('Test');
-        {number: 2, user: {login: 'bar'}, labels: []},
-      ];
-
-      githubApi.getPaginated.and.resolveTo(mockPrs);
-      expect(await prs.fetchAll()).toBe(mockPrs);
     });
 
   });
@@ -144,11 +147,13 @@ describe('GithubPullRequests', () => {
     });
 
 
-    it('should resolve with the data returned from GitHub', async () => {
+    it('should resolve with the data returned from GitHub', done => {
       const expected: any = [{sha: 'ABCDE', filename: 'a/b/c'}, {sha: '12345', filename: 'x/y/z'}];
-      githubApi.getPaginated.and.resolveTo(expected);
+      githubApi.getPaginated.and.callFake(() => Promise.resolve(expected));
-
+      prs.fetchFiles(42).then(data => {
-      await expectAsync(prs.fetchFiles(42)).toBeResolvedTo(expected);
+        expect(data).toEqual(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, Team} from '../../lib/common/github-teams';
+import {GithubTeams} from '../../lib/common/github-teams';
 
 // Tests
 describe('GithubTeams', () => {
@@ -16,7 +16,6 @@ describe('GithubTeams', () => {
       expect(() => new GithubTeams(githubApi, '')).
         toThrowError('Missing or empty required parameter \'githubOrg\'!');
     });
-
   });
 
 
@@ -34,14 +33,9 @@ describe('GithubTeams', () => {
     });
 
 
-    it('should forward the value returned by \'getPaginated()\'', async () => {
+    it('should forward the value returned by \'getPaginated()\'', () => {
-      const mockTeams: Team[] = [
+      githubApi.getPaginated.and.returnValue('Test');
-        {id: 1, slug: 'foo'},
+      expect(teams.fetchAll() as any).toBe('Test');
-        {id: 2, slug: 'bar'},
-      ];
-
-      githubApi.getPaginated.and.resolveTo(mockTeams);
-      expect(await teams.fetchAll()).toBe(mockTeams);
     });
 
   });
@@ -56,77 +50,100 @@ describe('GithubTeams', () => {
 
 
     it('should return a promise', () => {
-      githubApi.get.and.resolveTo();
+      githubApi.get.and.callFake(() => Promise.resolve());
       const promise = teams.isMemberById('user', [1]);
-      expect(promise).toBeInstanceOf(Promise);
+      expect(promise).toEqual(jasmine.any(Promise));
     });
 
 
-    it('should resolve with false if called with an empty array', async () => {
+    it('should resolve with false if called with an empty array', done => {
-      await expectAsync(teams.isMemberById('user', [])).toBeResolvedTo(false);
+      teams.isMemberById('user', []).then(isMember => {
+        expect(isMember).toBe(false);
         expect(githubApi.get).not.toHaveBeenCalled();
+        done();
+      });
     });
 
 
-    it('should call \'get()\' with the correct pathname', async () => {
+    it('should call \'get()\' with the correct pathname', done => {
-      githubApi.get.and.resolveTo();
+      githubApi.get.and.callFake(() => Promise.resolve());
-      await teams.isMemberById('user', [1]);
+      teams.isMemberById('user', [1]).then(() => {
-
         expect(githubApi.get).toHaveBeenCalledWith('/teams/1/memberships/user');
+        done();
+      });
     });
 
 
-    it('should resolve with false if \'get()\' rejects', async () => {
+    it('should resolve with false if \'get()\' rejects', done => {
-      githubApi.get.and.rejectWith(null);
+      githubApi.get.and.callFake(() => Promise.reject(null));
-
+      teams.isMemberById('user', [1]).then(isMember => {
-      await expectAsync(teams.isMemberById('user', [1])).toBeResolvedTo(false);
+        expect(isMember).toBe(false);
         expect(githubApi.get).toHaveBeenCalled();
+        done();
+      });
     });
 
 
-    it('should resolve with false if the membership is not active', async () => {
+    it('should resolve with false if the membership is not active', done => {
-      githubApi.get.and.resolveTo({state: 'pending'});
+      githubApi.get.and.callFake(() => Promise.resolve({state: 'pending'}));
-
+      teams.isMemberById('user', [1]).then(isMember => {
-      await expectAsync(teams.isMemberById('user', [1])).toBeResolvedTo(false);
+        expect(isMember).toBe(false);
         expect(githubApi.get).toHaveBeenCalled();
+        done();
+      });
     });
 
 
-    it('should resolve with true if the membership is active', async () => {
+    it('should resolve with true if the membership is active', done => {
-      githubApi.get.and.resolveTo({state: 'active'});
+      githubApi.get.and.callFake(() => Promise.resolve({state: 'active'}));
-      await expectAsync(teams.isMemberById('user', [1])).toBeResolvedTo(true);
+      teams.isMemberById('user', [1]).then(isMember => {
+        expect(isMember).toBe(true);
+        done();
+      });
     });
 
 
-    it('should sequentially call \'get()\' until an active membership is found', async () => {
+    it('should sequentially call \'get()\' until an active membership is found', done => {
-      githubApi.get.
+      const trainedResponses: {[pathname: string]: Promise<{state: string}>} = {
-        withArgs('/teams/1/memberships/user').and.resolveTo({state: 'pending'}).
+        '/teams/1/memberships/user': Promise.resolve({state: 'pending'}),
-        withArgs('/teams/2/memberships/user').and.rejectWith(null).
+        '/teams/2/memberships/user': Promise.reject(null),
-        withArgs('/teams/3/memberships/user').and.resolveTo({state: 'active'});
+        '/teams/3/memberships/user': Promise.resolve({state: 'active'}),
+      };
+      githubApi.get.and.callFake((pathname: string) => trainedResponses[pathname]);
 
-      await expectAsync(teams.isMemberById('user', [1, 2, 3, 4])).toBeResolvedTo(true);
+      teams.isMemberById('user', [1, 2, 3, 4]).then(isMember => {
+        expect(isMember).toBe(true);
 
         expect(githubApi.get).toHaveBeenCalledTimes(3);
         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(2)[0]).toBe('/teams/3/memberships/user');
+
+        done();
+      });
     });
 
 
-    it('should resolve with false if no active membership is found', async () => {
+    it('should resolve with false if no active membership is found', done => {
-      githubApi.get.
+      const trainedResponses: {[pathname: string]: Promise<{state: string}>} = {
-        withArgs('/teams/1/memberships/user').and.resolveTo({state: 'pending'}).
+        '/teams/1/memberships/user': Promise.resolve({state: 'pending'}),
-        withArgs('/teams/2/memberships/user').and.rejectWith(null).
+        '/teams/2/memberships/user':  Promise.reject(null),
-        withArgs('/teams/3/memberships/user').and.resolveTo({state: 'not active'}).
+        '/teams/3/memberships/user': Promise.resolve({state: 'not active'}),
-        withArgs('/teams/4/memberships/user').and.rejectWith(null);
+        '/teams/4/memberships/user':  Promise.reject(null),
+      };
+      githubApi.get.and.callFake((pathname: string) => trainedResponses[pathname]);
 
-      await expectAsync(teams.isMemberById('user', [1, 2, 3, 4])).toBeResolvedTo(false);
+      teams.isMemberById('user', [1, 2, 3, 4]).then(isMember => {
+        expect(isMember).toBe(false);
 
         expect(githubApi.get).toHaveBeenCalledTimes(4);
         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(2)[0]).toBe('/teams/3/memberships/user');
         expect(githubApi.get.calls.argsFor(3)[0]).toBe('/teams/4/memberships/user');
+
+        done();
+      });
     });
 
   });
@@ -140,13 +157,14 @@ describe('GithubTeams', () => {
     beforeEach(() => {
       teams = new GithubTeams(githubApi, 'foo');
 
-      teamsFetchAllSpy = spyOn(teams, 'fetchAll').and.resolveTo([{id: 1, slug: 'team1'}, {id: 2, slug: 'team2'}]);
+      const mockResponse = Promise.resolve([{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'])).toBeInstanceOf(Promise);
+      expect(teams.isMemberBySlug('user', ['team-slug'])).toEqual(jasmine.any(Promise));
     });
 
 
@@ -156,46 +174,55 @@ describe('GithubTeams', () => {
     });
 
 
-    it('should resolve with false if \'fetchAll()\' rejects', async () => {
+    it('should resolve with false if \'fetchAll()\' rejects', done => {
-      teamsFetchAllSpy.and.rejectWith(null);
+      teamsFetchAllSpy.and.callFake(() => Promise.reject(null));
-      await expectAsync(teams.isMemberBySlug('user', ['team-slug'])).toBeResolvedTo(false);
+      teams.isMemberBySlug('user', ['team-slug']).then(isMember => {
+        expect(isMember).toBe(false);
+        done();
+      });
     });
 
 
-    it('should call \'isMemberById()\' with the correct params if no team is found', async () => {
+    it('should call \'isMemberById()\' with the correct params if no team is found', done => {
-      await teams.isMemberBySlug('user', ['no-match']);
+      teams.isMemberBySlug('user', ['no-match']).then(() => {
         expect(teamsIsMemberByIdSpy).toHaveBeenCalledWith('user', []);
+        done();
+      });
     });
 
 
-    it('should call \'isMemberById()\' with the correct params if teams are found', async () => {
+    it('should call \'isMemberById()\' with the correct params if teams are found', done => {
-      await teams.isMemberBySlug('userA', ['team1']);
+      const spy = teamsIsMemberByIdSpy;
-      expect(teamsIsMemberByIdSpy).toHaveBeenCalledWith('userA', [1]);
 
-      await teams.isMemberBySlug('userB', ['team2']);
+      Promise.all([
-      expect(teamsIsMemberByIdSpy).toHaveBeenCalledWith('userB', [2]);
+        teams.isMemberBySlug('user', ['team1']).then(() => expect(spy).toHaveBeenCalledWith('user', [1])),
-
+        teams.isMemberBySlug('user', ['team2']).then(() => expect(spy).toHaveBeenCalledWith('user', [2])),
-      await teams.isMemberBySlug('userC', ['team1', 'team2']);
+        teams.isMemberBySlug('user', ['team1', 'team2']).then(() => expect(spy).toHaveBeenCalledWith('user', [1, 2])),
-      expect(teamsIsMemberByIdSpy).toHaveBeenCalledWith('userC', [1, 2]);
+      ]).then(done);
     });
 
 
-    it('should resolve with false if \'isMemberById()\' rejects', async () => {
+    it('should resolve with false if \'isMemberById()\' rejects', done => {
-      teamsIsMemberByIdSpy.and.rejectWith(null);
+      teamsIsMemberByIdSpy.and.callFake(() => Promise.reject(null));
-
+      teams.isMemberBySlug('user', ['team1']).then(isMember => {
-      await expectAsync(teams.isMemberBySlug('user', ['team1'])).toBeResolvedTo(false);
+        expect(isMember).toBe(false);
         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.resolveTo(false);
+      teamsIsMemberByIdSpy.and.callFake(() => Promise.resolve(true));
-      await expectAsync(teams.isMemberBySlug('userB', ['team1'])).toBeResolvedTo(false);
+      const isMember1 = await teams.isMemberBySlug('user', ['team1']);
-      expect(teamsIsMemberByIdSpy).toHaveBeenCalledWith('userB', [1]);
+      expect(isMember1).toBe(true);
+      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,8 +9,7 @@ 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 {customAsyncMatchers} from './jasmine-custom-async-matchers';
+import {expectToBePreviewServerError} from './helpers';
-
 
 // Tests
 describe('BuildCreator', () => {
@@ -25,7 +24,6 @@ describe('BuildCreator', () => {
   const publicShaDir = path.join(publicPrDir, shortSha);
   let bc: BuildCreator;
 
-  beforeEach(() => jasmine.addAsyncMatchers(customAsyncMatchers));
   beforeEach(() => bc = new BuildCreator(buildsDir));
 
 
@@ -37,8 +35,8 @@ describe('BuildCreator', () => {
 
 
     it('should extend EventEmitter', () => {
-      expect(bc).toBeInstanceOf(BuildCreator);
+      expect(bc).toEqual(jasmine.any(BuildCreator));
-      expect(bc).toBeInstanceOf(EventEmitter);
+      expect(bc).toEqual(jasmine.any(EventEmitter));
 
       expect(Object.getPrototypeOf(bc)).toBe(BuildCreator.prototype);
     });
@@ -69,43 +67,47 @@ describe('BuildCreator', () => {
       const shaDir = isPublic ? publicShaDir : hiddenShaDir;
 
 
-      it('should return a promise', async () => {
+      it('should return a promise', done => {
         const promise = bc.create(pr, sha, archive, isPublic);
-        expect(promise).toBeInstanceOf(Promise);
+        promise.then(done);   // Do not complete the test (and release the spies) synchronously
+                              // to avoid running the actual `extractArchive()`.
 
-        // Do not complete the test (and release the spies) synchronously to avoid running the actual
+        expect(promise).toEqual(jasmine.any(Promise));
-        // `extractArchive()`.
-        await promise;
       });
 
 
-      it('should update the PR\'s visibility first if necessary', async () => {
+      it('should update the PR\'s visibility first if necessary', done => {
-        await bc.create(pr, sha, archive, isPublic);
+        bcUpdatePrVisibilitySpy.and.callFake(() => expect(shellMkdirSpy).not.toHaveBeenCalled());
 
-        expect(bcUpdatePrVisibilitySpy).toHaveBeenCalledBefore(shellMkdirSpy);
+        bc.create(pr, sha, archive, isPublic).
+          then(() => {
             expect(bcUpdatePrVisibilitySpy).toHaveBeenCalledWith(pr, isPublic);
             expect(shellMkdirSpy).toHaveBeenCalled();
+          }).
+          then(done);
       });
 
 
-      it('should create the build directory (and any parent directories)', async () => {
+      it('should create the build directory (and any parent directories)', done => {
-        await bc.create(pr, sha, archive, isPublic);
+        bc.create(pr, sha, archive, isPublic).
-        expect(shellMkdirSpy).toHaveBeenCalledWith('-p', shaDir);
+          then(() => expect(shellMkdirSpy).toHaveBeenCalledWith('-p', shaDir)).
+          then(done);
       });
 
 
-      it('should extract the archive contents into the build directory', async () => {
+      it('should extract the archive contents into the build directory', done => {
-        await bc.create(pr, sha, archive, isPublic);
+        bc.create(pr, sha, archive, isPublic).
-        expect(bcExtractArchiveSpy).toHaveBeenCalledWith(archive, shaDir);
+          then(() => expect(bcExtractArchiveSpy).toHaveBeenCalledWith(archive, shaDir)).
+          then(done);
       });
 
 
-      it('should emit a CreatedBuildEvent on success', async () => {
+      it('should emit a CreatedBuildEvent on success', done => {
         let emitted = false;
 
         bcEmitSpy.and.callFake((type: string, evt: CreatedBuildEvent) => {
           expect(type).toBe(CreatedBuildEvent.type);
-          expect(evt).toBeInstanceOf(CreatedBuildEvent);
+          expect(evt).toEqual(jasmine.any(CreatedBuildEvent));
           expect(evt.pr).toBe(+pr);
           expect(evt.sha).toBe(shortSha);
           expect(evt.isPublic).toBe(isPublic);
@@ -113,108 +115,130 @@ describe('BuildCreator', () => {
           emitted = true;
         });
 
-        await bc.create(pr, sha, archive, isPublic);
+        bc.create(pr, sha, archive, isPublic).
-        expect(emitted).toBe(true);
+          then(() => expect(emitted).toBe(true)).
+          then(done);
       });
 
 
       describe('on error', () => {
+        let existsValues: {[dir: string]: boolean};
+
         beforeEach(() => {
-          bcExistsSpy.and.returnValue(false);
+          existsValues = {
+            [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', async () => {
+        it('should abort and skip further operations if changing the PR\'s visibility fails', done => {
           const mockError = new PreviewServerError(543, 'Test');
-          bcUpdatePrVisibilitySpy.and.rejectWith(mockError);
+          bcUpdatePrVisibilitySpy.and.callFake(() => Promise.reject(mockError));
 
-          await expectAsync(bc.create(pr, sha, archive, isPublic)).toBeRejectedWith(mockError);
+          bc.create(pr, sha, archive, isPublic).catch(err => {
+            expect(err).toBe(mockError);
 
             expect(bcExistsSpy).not.toHaveBeenCalled();
             expect(shellMkdirSpy).not.toHaveBeenCalled();
             expect(bcExtractArchiveSpy).not.toHaveBeenCalled();
             expect(bcEmitSpy).not.toHaveBeenCalled();
+
+            done();
+          });
         });
 
 
-        it('should abort and skip further operations if the build does already exist', async () => {
+        it('should abort and skip further operations if the build does already exist', done => {
-          bcExistsSpy.withArgs(shaDir).and.returnValue(true);
+          existsValues[shaDir] = true;
-
+          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(bcExtractArchiveSpy).not.toHaveBeenCalled();
             expect(bcEmitSpy).not.toHaveBeenCalled();
+            done();
+          });
         });
 
 
-        it('should detect existing build directory after visibility change', async () => {
+        it('should detect existing build directory after visibility change', done => {
-          bcUpdatePrVisibilitySpy.and.callFake(() => bcExistsSpy.and.returnValue(true));
+          bcUpdatePrVisibilitySpy.and.callFake(() => existsValues[prDir] = existsValues[shaDir] = true);
 
           expect(bcExistsSpy(prDir)).toBe(false);
           expect(bcExistsSpy(shaDir)).toBe(false);
 
-          await expectAsync(bc.create(pr, sha, archive, isPublic)).toBeRejectedWithPreviewServerError(
+          bc.create(pr, sha, archive, isPublic).catch(err => {
-              409, `Request to overwrite existing ${isPublic ? '' : 'non-'}public directory: ${shaDir}`);
+            const publicOrNot = isPublic ? 'public' : 'non-public';
-
+            expectToBePreviewServerError(err, 409, `Request to overwrite existing ${publicOrNot} directory: ${shaDir}`);
             expect(shellMkdirSpy).not.toHaveBeenCalled();
             expect(bcExtractArchiveSpy).not.toHaveBeenCalled();
             expect(bcEmitSpy).not.toHaveBeenCalled();
+            done();
+          });
         });
 
 
-        it('should abort and skip further operations if it fails to create the directories', async () => {
+        it('should abort and skip further operations if it fails to create the directories', done => {
           shellMkdirSpy.and.throwError('');
-
+          bc.create(pr, sha, archive, isPublic).catch(() => {
-          await expectAsync(bc.create(pr, sha, archive, isPublic)).toBeRejected();
-
             expect(shellMkdirSpy).toHaveBeenCalled();
             expect(bcExtractArchiveSpy).not.toHaveBeenCalled();
             expect(bcEmitSpy).not.toHaveBeenCalled();
+            done();
+          });
         });
 
 
-        it('should abort and skip further operations if it fails to extract the archive', async () => {
+        it('should abort and skip further operations if it fails to extract the archive', done => {
           bcExtractArchiveSpy.and.throwError('');
-
+          bc.create(pr, sha, archive, isPublic).catch(() => {
-          await expectAsync(bc.create(pr, sha, archive, isPublic)).toBeRejected();
-
             expect(shellMkdirSpy).toHaveBeenCalled();
             expect(bcExtractArchiveSpy).toHaveBeenCalled();
             expect(bcEmitSpy).not.toHaveBeenCalled();
+            done();
+          });
         });
 
 
-        it('should delete the PR directory (for new PR)', async () => {
+        it('should delete the PR directory (for new PR)', done => {
           bcExtractArchiveSpy.and.throwError('');
-
+          bc.create(pr, sha, archive, isPublic).catch(() => {
-          await expectAsync(bc.create(pr, sha, archive, isPublic)).toBeRejected();
             expect(shellRmSpy).toHaveBeenCalledWith('-rf', prDir);
+            done();
+          });
         });
 
 
-        it('should delete the SHA directory (for existing PR)', async () => {
+        it('should delete the SHA directory (for existing PR)', done => {
-          bcExistsSpy.withArgs(prDir).and.returnValue(true);
+          existsValues[prDir] = true;
           bcExtractArchiveSpy.and.throwError('');
 
-          await expectAsync(bc.create(pr, sha, archive, isPublic)).toBeRejected();
+          bc.create(pr, sha, archive, isPublic).catch(() => {
             expect(shellRmSpy).toHaveBeenCalledWith('-rf', shaDir);
+            done();
+          });
         });
 
 
-        it('should reject with an PreviewServerError', async () => {
+        it('should reject with an PreviewServerError', done => {
           // tslint:disable-next-line: no-string-throw
           shellMkdirSpy.and.callFake(() => { throw 'Test'; });
-
+          bc.create(pr, sha, archive, isPublic).catch(err => {
-          await expectAsync(bc.create(pr, sha, archive, isPublic)).toBeRejectedWithPreviewServerError(
+            expectToBePreviewServerError(err, 500, `Error while creating preview at: ${shaDir}\nTest`);
-              500, `Error while creating preview at: ${shaDir}\nTest`);
+            done();
+          });
         });
 
 
-        it('should pass PreviewServerError instances unmodified', async () => {
+        it('should pass PreviewServerError instances unmodified', done => {
           shellMkdirSpy.and.callFake(() => { throw new PreviewServerError(543, 'Test'); });
-          await expectAsync(bc.create(pr, sha, archive, isPublic)).toBeRejectedWithPreviewServerError(543, 'Test');
+          bc.create(pr, sha, archive, isPublic).catch(err => {
+            expectToBePreviewServerError(err, 543, 'Test');
+            done();
+          });
         });
 
       });
@@ -241,12 +265,12 @@ describe('BuildCreator', () => {
     });
 
 
-    it('should return a promise', async () => {
+    it('should return a promise', done => {
       const promise = bc.updatePrVisibility(pr, true);
-      expect(promise).toBeInstanceOf(Promise);
+      promise.then(done);   // Do not complete the test (and release the spies) synchronously
+                            // to avoid running the actual `extractArchive()`.
 
-      // Do not complete the test (and release the spies) synchronously to avoid running the actual `extractArchive()`.
+      expect(promise).toEqual(jasmine.any(Promise));
-      await promise;
     });
 
 
@@ -255,53 +279,58 @@ describe('BuildCreator', () => {
       const newPrDir = makePublic ? publicPrDir : hiddenPrDir;
 
 
-      it('should rename the directory', async () => {
+      it('should rename the directory', done => {
-        await bc.updatePrVisibility(pr, makePublic);
+        bc.updatePrVisibility(pr, makePublic).
-        expect(shellMvSpy).toHaveBeenCalledWith(oldPrDir, newPrDir);
+          then(() => expect(shellMvSpy).toHaveBeenCalledWith(oldPrDir, newPrDir)).
+          then(done);
       });
 
 
       describe('when the visibility is updated', () => {
 
-        it('should resolve to true', async () => {
+        it('should resolve to true', done => {
-          await expectAsync(bc.updatePrVisibility(pr, makePublic)).toBeResolvedTo(true);
+          bc.updatePrVisibility(pr, makePublic).
+            then(result => expect(result).toBe(true)).
+            then(done);
         });
 
 
-        it('should rename the directory', async () => {
+        it('should rename the directory', done => {
-          await bc.updatePrVisibility(pr, makePublic);
+          bc.updatePrVisibility(pr, makePublic).
-          expect(shellMvSpy).toHaveBeenCalledWith(oldPrDir, newPrDir);
+            then(() => expect(shellMvSpy).toHaveBeenCalledWith(oldPrDir, newPrDir)).
+            then(done);
         });
 
 
-        it('should emit a ChangedPrVisibilityEvent on success', async () => {
+        it('should emit a ChangedPrVisibilityEvent on success', done => {
           let emitted = false;
 
           bcEmitSpy.and.callFake((type: string, evt: ChangedPrVisibilityEvent) => {
             expect(type).toBe(ChangedPrVisibilityEvent.type);
-            expect(evt).toBeInstanceOf(ChangedPrVisibilityEvent);
+            expect(evt).toEqual(jasmine.any(ChangedPrVisibilityEvent));
             expect(evt.pr).toBe(+pr);
-            expect(evt.shas).toBeInstanceOf(Array);
+            expect(evt.shas).toEqual(jasmine.any(Array));
             expect(evt.isPublic).toBe(makePublic);
 
             emitted = true;
           });
 
-          await bc.updatePrVisibility(pr, makePublic);
+          bc.updatePrVisibility(pr, makePublic).
-          expect(emitted).toBe(true);
+            then(() => expect(emitted).toBe(true)).
+            then(done);
         });
 
 
-        it('should include all shas in the emitted event', async () => {
+        it('should include all shas in the emitted event', done => {
           const shas = ['foo', 'bar', 'baz'];
           let emitted = false;
 
-          bcListShasByDate.and.resolveTo(shas);
+          bcListShasByDate.and.callFake(() => Promise.resolve(shas));
           bcEmitSpy.and.callFake((type: string, evt: ChangedPrVisibilityEvent) => {
             expect(bcListShasByDate).toHaveBeenCalledWith(newPrDir);
 
             expect(type).toBe(ChangedPrVisibilityEvent.type);
-            expect(evt).toBeInstanceOf(ChangedPrVisibilityEvent);
+            expect(evt).toEqual(jasmine.any(ChangedPrVisibilityEvent));
             expect(evt.pr).toBe(+pr);
             expect(evt.shas).toBe(shas);
             expect(evt.isPublic).toBe(makePublic);
@@ -309,82 +338,94 @@ describe('BuildCreator', () => {
             emitted = true;
           });
 
-          await bc.updatePrVisibility(pr, makePublic);
+          bc.updatePrVisibility(pr, makePublic).
-          expect(emitted).toBe(true);
+            then(() => expect(emitted).toBe(true)).
+            then(done);
         });
 
       });
 
 
-      it('should do nothing if the visibility is already up-to-date', async () => {
+      it('should do nothing if the visibility is already up-to-date', done => {
         bcExistsSpy.and.callFake((dir: string) => dir === newPrDir);
-
+        bc.updatePrVisibility(pr, makePublic).
-        await expectAsync(bc.updatePrVisibility(pr, makePublic)).toBeResolvedTo(false);
+          then(result => {
-
+            expect(result).toBe(false);
             expect(shellMvSpy).not.toHaveBeenCalled();
             expect(bcListShasByDate).not.toHaveBeenCalled();
             expect(bcEmitSpy).not.toHaveBeenCalled();
+          }).
+          then(done);
       });
 
 
-      it('should do nothing if the PR directory does not exist', async () => {
+      it('should do nothing if the PR directory does not exist', done => {
         bcExistsSpy.and.returnValue(false);
-
+        bc.updatePrVisibility(pr, makePublic).
-        await expectAsync(bc.updatePrVisibility(pr, makePublic)).toBeResolvedTo(false);
+          then(result => {
-
+            expect(result).toBe(false);
             expect(shellMvSpy).not.toHaveBeenCalled();
             expect(bcListShasByDate).not.toHaveBeenCalled();
             expect(bcEmitSpy).not.toHaveBeenCalled();
+          }).
+          then(done);
       });
 
 
       describe('on error', () => {
 
-        it('should abort and skip further operations if both directories exist', async () => {
+        it('should abort and skip further operations if both directories exist', done => {
           bcExistsSpy.and.returnValue(true);
-
+          bc.updatePrVisibility(pr, makePublic).catch(err => {
-          await expectAsync(bc.updatePrVisibility(pr, makePublic)).toBeRejectedWithPreviewServerError(
+            expectToBePreviewServerError(err, 409,
-              409, `Request to move '${oldPrDir}' to existing directory '${newPrDir}'.`);
+              `Request to move '${oldPrDir}' to existing directory '${newPrDir}'.`);
-
             expect(shellMvSpy).not.toHaveBeenCalled();
             expect(bcListShasByDate).not.toHaveBeenCalled();
             expect(bcEmitSpy).not.toHaveBeenCalled();
+            done();
+          });
         });
 
 
-        it('should abort and skip further operations if it fails to rename the directory', async () => {
+        it('should abort and skip further operations if it fails to rename the directory', done => {
           shellMvSpy.and.throwError('');
-
+          bc.updatePrVisibility(pr, makePublic).catch(() => {
-          await expectAsync(bc.updatePrVisibility(pr, makePublic)).toBeRejected();
-
             expect(shellMvSpy).toHaveBeenCalled();
             expect(bcListShasByDate).not.toHaveBeenCalled();
             expect(bcEmitSpy).not.toHaveBeenCalled();
+            done();
+          });
         });
 
 
-        it('should abort and skip further operations if it fails to list the SHAs', async () => {
+        it('should abort and skip further operations if it fails to list the SHAs', done => {
           bcListShasByDate.and.throwError('');
-
+          bc.updatePrVisibility(pr, makePublic).catch(() => {
-          await expectAsync(bc.updatePrVisibility(pr, makePublic)).toBeRejected();
-
             expect(shellMvSpy).toHaveBeenCalled();
             expect(bcListShasByDate).toHaveBeenCalled();
             expect(bcEmitSpy).not.toHaveBeenCalled();
+            done();
+          });
         });
 
 
-        it('should reject with an PreviewServerError', async () => {
+        it('should reject with an PreviewServerError', done => {
           // tslint:disable-next-line: no-string-throw
           shellMvSpy.and.callFake(() => { throw 'Test'; });
-          await expectAsync(bc.updatePrVisibility(pr, makePublic)).toBeRejectedWithPreviewServerError(
+          bc.updatePrVisibility(pr, makePublic).catch(err => {
-              500, `Error while making PR ${pr} ${makePublic ? 'public' : 'hidden'}.\nTest`);
+            expectToBePreviewServerError(err, 500,
+                `Error while making PR ${pr} ${makePublic ? 'public' : 'hidden'}.\nTest`);
+            done();
+          });
         });
 
 
-        it('should pass PreviewServerError instances unmodified', async () => {
+        it('should pass PreviewServerError instances unmodified', done => {
           shellMvSpy.and.callFake(() => { throw new PreviewServerError(543, 'Test'); });
-          await expectAsync(bc.updatePrVisibility(pr, makePublic)).toBeRejectedWithPreviewServerError(543, 'Test');
+          bc.updatePrVisibility(pr, makePublic).catch(err => {
+            expectToBePreviewServerError(err, 543, 'Test');
+            done();
+          });
         });
 
       });
@@ -402,14 +443,12 @@ describe('BuildCreator', () => {
 
     beforeEach(() => {
       fsAccessCbs = [];
-      fsAccessSpy = spyOn(fs, 'access').and.callFake(
+      fsAccessSpy = spyOn(fs, 'access').and.callFake((_: string, cb: (v?: any) => void) => fsAccessCbs.push(cb));
-        ((_: 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')).toBeInstanceOf(Promise);
+      expect((bc as any).exists('foo')).toEqual(jasmine.any(Promise));
     });
 
 
@@ -419,29 +458,25 @@ describe('BuildCreator', () => {
     });
 
 
-    it('should resolve with \'true\' if \'fs.access()\' succeeds', async () => {
+    it('should resolve with \'true\' if \'fs.access()\' succeeds', done => {
-      const existsPromises = [
+      Promise.
-        (bc as any).exists('foo'),
+        all([(bc as any).exists('foo'), (bc as any).exists('bar')]).
-        (bc as any).exists('bar'),
+        then(results => expect(results).toEqual([true, true])).
-      ];
+        then(done);
 
       fsAccessCbs[0]();
       fsAccessCbs[1](null);
-
-      await expectAsync(Promise.all(existsPromises)).toBeResolvedTo([true, true]);
     });
 
 
-    it('should resolve with \'false\' if \'fs.access()\' errors', async () => {
+    it('should resolve with \'false\' if \'fs.access()\' errors', done => {
-      const existsPromises = [
+      Promise.
-        (bc as any).exists('foo'),
+        all([(bc as any).exists('foo'), (bc as any).exists('bar')]).
-        (bc as any).exists('bar'),
+        then(results => expect(results).toEqual([false, false])).
-      ];
+        then(done);
 
       fsAccessCbs[0]('Error');
       fsAccessCbs[1](new Error());
-
-      await expectAsync(Promise.all(existsPromises)).toBeResolvedTo([false, false]);
     });
 
   });
@@ -460,15 +495,12 @@ describe('BuildCreator', () => {
       consoleWarnSpy = spyOn(Logger.prototype, 'warn');
       shellChmodSpy = spyOn(shell, 'chmod');
       shellRmSpy = spyOn(shell, 'rm');
-      cpExecSpy = spyOn(cp, 'exec').and.callFake(
+      cpExecSpy = spyOn(cp, 'exec').and.callFake((_: string, cb: (...args: any[]) => void) => cpExecCbs.push(cb));
-        ((_: 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')).toBeInstanceOf(Promise);
+      expect((bc as any).extractArchive('foo', 'bar')).toEqual(jasmine.any(Promise));
     });
 
 
@@ -480,68 +512,78 @@ describe('BuildCreator', () => {
     });
 
 
-    it('should log (as a warning) any stderr output if extracting succeeded', async () => {
+    it('should log (as a warning) any stderr output if extracting succeeded', done => {
-      const extractPromise = (bc as any).extractArchive('foo', 'bar');
+      (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', async () => {
+    it('should make the build directory non-writable', done => {
-      const extractPromise = (bc as any).extractArchive('foo', 'bar');
+      (bc as any).extractArchive('foo', 'bar').
-      cpExecCbs[0]();
+        then(() => expect(shellChmodSpy).toHaveBeenCalledWith('-R', 'a-w', 'bar')).
+        then(done);
 
-      await expectAsync(extractPromise).toBeResolved();
+      cpExecCbs[0]();
-      expect(shellChmodSpy).toHaveBeenCalledWith('-R', 'a-w', 'bar');
     });
 
 
-    it('should delete the build artifact file on success', async () => {
+    it('should delete the build artifact file on success', done => {
-      const extractPromise = (bc as any).extractArchive('input/file', 'output/dir');
+      (bc as any).extractArchive('input/file', 'output/dir').
-      cpExecCbs[0]();
+        then(() => expect(shellRmSpy).toHaveBeenCalledWith('-f', 'input/file')).
+        then(done);
 
-      await expectAsync(extractPromise).toBeResolved();
+      cpExecCbs[0]();
-      expect(shellRmSpy).toHaveBeenCalledWith('-f', 'input/file');
     });
 
 
     describe('on error', () => {
 
-      it('should abort and skip further operations if it fails to extract the archive', async () => {
+      it('should abort and skip further operations if it fails to extract the archive', done => {
-        const extractPromise = (bc as any).extractArchive('foo', 'bar');
+        (bc as any).extractArchive('foo', 'bar').catch((err: any) => {
-        cpExecCbs[0]('Test');
-
-        await expectAsync(extractPromise).toBeRejectedWith('Test');
           expect(shellChmodSpy).not.toHaveBeenCalled();
           expect(shellRmSpy).not.toHaveBeenCalled();
+          expect(err).toBe('Test');
+          done();
+        });
+
+        cpExecCbs[0]('Test');
       });
 
 
-      it('should abort and skip further operations if it fails to make non-writable', async () => {
+      it('should abort and skip further operations if it fails to make non-writable', done => {
-        // tslint:disable-next-line: no-string-throw
+        (bc as any).extractArchive('foo', 'bar').catch((err: any) => {
-        shellChmodSpy.and.callFake(() => { throw 'Test'; });
-
-        const extractPromise = (bc as any).extractArchive('foo', 'bar');
-        cpExecCbs[0]();
-
-        await expectAsync(extractPromise).toBeRejectedWith('Test');
           expect(shellChmodSpy).toHaveBeenCalled();
           expect(shellRmSpy).not.toHaveBeenCalled();
+          expect(err).toBe('Test');
+          done();
+        });
+
+        shellChmodSpy.and.callFake(() => {
+          // tslint:disable-next-line: no-string-throw
+          throw 'Test';
+        });
+
+        cpExecCbs[0]();
       });
 
 
-      it('should abort and reject if it fails to remove the build artifact file', async () => {
+      it('should abort and reject if it fails to remove the build artifact file', done => {
-        // tslint:disable-next-line: no-string-throw
+        (bc as any).extractArchive('foo', 'bar').catch((err: any) => {
-        shellRmSpy.and.callFake(() => { throw 'Test'; });
-
-        const extractPromise = (bc as any).extractArchive('foo', 'bar');
-        cpExecCbs[0]();
-
-        await expectAsync(extractPromise).toBeRejectedWith('Test');
           expect(shellChmodSpy).toHaveBeenCalled();
           expect(shellRmSpy).toHaveBeenCalled();
+          expect(err).toBe('Test');
+          done();
+        });
+
+        shellRmSpy.and.callFake(() => {
+          // tslint:disable-next-line: no-string-throw
+          throw 'Test';
+        });
+
+        cpExecCbs[0]();
       });
 
     });
@@ -558,54 +600,62 @@ describe('BuildCreator', () => {
     });
 
     beforeEach(() => {
-      shellLsSpy = spyOn(shell, 'ls').and.returnValue([] as unknown as shell.ShellArray);
+      shellLsSpy = spyOn(shell, 'ls').and.returnValue([]);
     });
 
 
-    it('should return a promise', async () => {
+    it('should return a promise', done => {
       const promise = (bc as any).listShasByDate('input/dir');
-      expect(promise).toBeInstanceOf(Promise);
+      promise.then(done);   // Do not complete the test (and release the spies) synchronously
+                            // to avoid running the actual `ls()`.
 
-      // Do not complete the test (and release the spies) synchronously to avoid running the actual `ls()`.
+      expect(promise).toEqual(jasmine.any(Promise));
-      await promise;
     });
 
 
-    it('should `ls()` files with their metadata', async () => {
+    it('should `ls()` files with their metadata', done => {
-      await (bc as any).listShasByDate('input/dir');
+      (bc as any).listShasByDate('input/dir').
-      expect(shellLsSpy).toHaveBeenCalledWith('-l', 'input/dir');
+        then(() => expect(shellLsSpy).toHaveBeenCalledWith('-l', 'input/dir')).
+        then(done);
     });
 
 
-    it('should reject if listing files fails', async () => {
+    it('should reject if listing files fails', done => {
-      shellLsSpy.and.rejectWith('Test');
+      shellLsSpy.and.callFake(() => Promise.reject('Test'));
-      await expectAsync((bc as any).listShasByDate('input/dir')).toBeRejectedWith('Test');
+      (bc as any).listShasByDate('input/dir').catch((err: string) => {
+        expect(err).toBe('Test');
+        done();
+      });
     });
 
 
-    it('should return the filenames', async () => {
+    it('should return the filenames', done => {
-      shellLsSpy.and.resolveTo([
+      shellLsSpy.and.callFake(() => Promise.resolve([
         lsResult('foo', 100),
         lsResult('bar', 200),
         lsResult('baz', 300),
-      ]);
+      ]));
 
-      await expectAsync((bc as any).listShasByDate('input/dir')).toBeResolvedTo(['foo', 'bar', 'baz']);
+      (bc as any).listShasByDate('input/dir').
+        then((shas: string[]) => expect(shas).toEqual(['foo', 'bar', 'baz'])).
+        then(done);
     });
 
 
-    it('should sort by date', async () => {
+    it('should sort by date', done => {
-      shellLsSpy.and.resolveTo([
+      shellLsSpy.and.callFake(() => Promise.resolve([
         lsResult('foo', 300),
         lsResult('bar', 100),
         lsResult('baz', 200),
-      ]);
+      ]));
 
-      await expectAsync((bc as any).listShasByDate('input/dir')).toBeResolvedTo(['bar', 'baz', 'foo']);
+      (bc as any).listShasByDate('input/dir').
+        then((shas: string[]) => expect(shas).toEqual(['bar', 'baz', 'foo'])).
+        then(done);
     });
 
 
-    it('should not break with ShellJS\' custom `sort()` method', async () => {
+    it('should not break with ShellJS\' custom `sort()` method', done => {
       const mockArray = [
         lsResult('foo', 300),
         lsResult('bar', 100),
@@ -613,21 +663,26 @@ describe('BuildCreator', () => {
       ];
       mockArray.sort = jasmine.createSpy('sort');
 
-      shellLsSpy.and.resolveTo(mockArray);
+      shellLsSpy.and.callFake(() => Promise.resolve(mockArray));
-
+      (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']);
           expect(mockArray.sort).not.toHaveBeenCalled();
+        }).
+        then(done);
     });
 
 
-    it('should only include directories', async () => {
+    it('should only include directories', done => {
-      shellLsSpy.and.resolveTo([
+      shellLsSpy.and.callFake(() => Promise.resolve([
         lsResult('foo', 100),
         lsResult('bar', 200, false),
         lsResult('baz', 300),
-      ]);
+      ]));
 
-      await expectAsync((bc as any).listShasByDate('input/dir')).toBeResolvedTo(['foo', 'baz']);
+      (bc as any).listShasByDate('input/dir').
+        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.resolveTo(BUILD_INFO);
+    spyOn(api, 'getBuildInfo').and.callFake(() => Promise.resolve(BUILD_INFO));
-    getBuildArtifactUrlSpy = spyOn(api, 'getBuildArtifactUrl').and.resolveTo(BASE_URL + ARTIFACT_PATH);
+    getBuildArtifactUrlSpy = spyOn(api, 'getBuildArtifactUrl')
+      .and.callFake(() => Promise.resolve(BASE_URL + ARTIFACT_PATH));
 
     WRITEFILE_RESULT = undefined;
     writeFileSpy = spyOn(fs, 'writeFile').and.callFake(
-      ((_path: string, _buffer: Buffer, callback: fs.NoParamCallback) =>
+      (_path: string, _buffer: Buffer, callback: (err?: any) => {}) => callback(WRITEFILE_RESULT),
-        callback(WRITEFILE_RESULT)) as typeof fs.writeFile,
     );
 
     EXISTS_RESULT = false;
     existsSpy = spyOn(fs, 'exists').and.callFake(
-      ((_path, callback) => callback(EXISTS_RESULT)) as typeof fs.exists,
+      (_path: string, callback: (exists: boolean) => {}) => callback(EXISTS_RESULT),
     );
   });
 
@@ -56,7 +56,6 @@ 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'!`);
@@ -73,10 +72,14 @@ 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 {
-      await expectAsync(retriever.getGithubInfo(12345)).toBeRejectedWithError('No PR found in branch field: master');
+        BUILD_INFO.branch = 'master';
+        await retriever.getGithubInfo(12345);
+        throw new Error('Exception Expected');
+      } catch (error) {
+        expect(error.message).toEqual('No PR found in branch field: master');
+      }
     });
   });
 
@@ -107,10 +110,12 @@ 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 expectAsync(retriever.downloadBuildArtifact(12345, 777, 'COMMIT', ARTIFACT_PATH)).
+        await retriever.downloadBuildArtifact(12345, 777, 'COMMIT', ARTIFACT_PATH);
-        toBeRejectedWith(jasmine.objectContaining({status: 413}));
+        throw new Error('Exception Expected');
-
+      } catch (error) {
+        expect(error.status).toEqual(413);
+      }
       artifactRequest.done();
     });
 
@@ -139,39 +144,49 @@ describe('BuildRetriever', () => {
     });
 
     it('should fail if the CircleCI API fails',  async () => {
-      getBuildArtifactUrlSpy.and.rejectWith('getBuildArtifactUrl failed');
+      try {
-      await expectAsync(retriever.downloadBuildArtifact(12345, 777, 'COMMIT', ARTIFACT_PATH)).
+        getBuildArtifactUrlSpy.and.callFake(() => Promise.reject('getBuildArtifactUrl failed'));
-        toBeRejectedWithError('CircleCI artifact download failed (getBuildArtifactUrl failed)');
+        await retriever.downloadBuildArtifact(12345, 777, 'COMMIT', ARTIFACT_PATH);
+        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 () => {
       // create a new handler that errors
       const artifactRequest = nock(BASE_URL).get(ARTIFACT_PATH).replyWithError('Artifact Request Failed');
-
+      try {
-      await expectAsync(retriever.downloadBuildArtifact(12345, 777, 'COMMIT', ARTIFACT_PATH)).toBeRejectedWithError(
+        await retriever.downloadBuildArtifact(12345, 777, 'COMMIT', ARTIFACT_PATH);
-          'CircleCI artifact download failed ' +
+        throw new Error('Exception Expected');
+      } 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 () => {
       // create a new handler that errors
       const artifactRequest = nock(BASE_URL).get(ARTIFACT_PATH).reply(404, 'No such artifact');
-
+      try {
-      await expectAsync(retriever.downloadBuildArtifact(12345, 777, 'COMMIT', ARTIFACT_PATH)).
+        await retriever.downloadBuildArtifact(12345, 777, 'COMMIT', ARTIFACT_PATH);
-        toBeRejectedWithError('CircleCI artifact download failed (Error 404 - Not Found)');
+        throw new Error('Exception Expected');
-
+      } catch (error) {
+        expect(error.message).toEqual('CircleCI artifact download failed (Error 404 - Not Found)');
+      }
       artifactRequest.done();
     });
 
     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';
-
+        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,10 +51,7 @@ 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.resolveTo([
+      fetchFilesSpy.and.callFake(() => Promise.resolve([{filename: 'a/b/c'}, {filename: 'd/e/f'}]));
-        {filename: 'a/b/c', sha: 'a1'},
-        {filename: 'd/e/f', sha: 'b2'},
-      ]);
       expect(await bv.getSignificantFilesChanged(777, /^x/)).toEqual(false);
       expect(fetchFilesSpy).toHaveBeenCalledWith(777);
 
@@ -81,30 +78,37 @@ describe('BuildVerifier', () => {
         user: {login: 'username'},
       };
 
-      prsFetchSpy = spyOn(GithubPullRequests.prototype, 'fetch').and.resolveTo(mockPrInfo);
+      prsFetchSpy = spyOn(GithubPullRequests.prototype, 'fetch').
-      teamsIsMemberBySlugSpy = spyOn(GithubTeams.prototype, 'isMemberBySlug').and.resolveTo(true);
+        and.callFake(() => Promise.resolve(mockPrInfo));
+
+      teamsIsMemberBySlugSpy = spyOn(GithubTeams.prototype, 'isMemberBySlug').
+        and.callFake(() => Promise.resolve(true));
     });
 
 
-    it('should return a promise', async () => {
+    it('should return a promise', done => {
       const promise = bv.getPrIsTrusted(pr);
-      expect(promise).toBeInstanceOf(Promise);
+      promise.then(done);   // Do not complete the test (and release the spies) synchronously
+                            // to avoid running the actual `GithubTeams#isMemberBySlug()`.
 
-      // Do not complete the test (and release the spies) synchronously to avoid running the actual
+      expect(promise).toEqual(jasmine.any(Promise));
-      // `GithubTeams#isMemberBySlug()`.
-      await promise;
     });
 
 
-    it('should fetch the corresponding PR', async () => {
+    it('should fetch the corresponding PR', done => {
-      await bv.getPrIsTrusted(pr);
+      bv.getPrIsTrusted(pr).then(() => {
         expect(prsFetchSpy).toHaveBeenCalledWith(pr);
+        done();
+      });
     });
 
 
-    it('should fail if fetching the PR errors', async () => {
+    it('should fail if fetching the PR errors', done => {
-      prsFetchSpy.and.rejectWith('Test');
+      prsFetchSpy.and.callFake(() => Promise.reject('Test'));
-      await expectAsync(bv.getPrIsTrusted(pr)).toBeRejectedWith('Test');
+      bv.getPrIsTrusted(pr).catch(err => {
+        expect(err).toBe('Test');
+        done();
+      });
     });
 
 
@@ -113,14 +117,19 @@ describe('BuildVerifier', () => {
       beforeEach(() => mockPrInfo.labels.push({name: 'trusted: pr-label'}));
 
 
-      it('should resolve to true', async () => {
+      it('should resolve to true', done => {
-        await expectAsync(bv.getPrIsTrusted(pr)).toBeResolvedTo(true);
+        bv.getPrIsTrusted(pr).then(isTrusted => {
+          expect(isTrusted).toBe(true);
+          done();
+        });
       });
 
 
-      it('should not try to verify the author\'s membership status', async () => {
+      it('should not try to verify the author\'s membership status', done => {
-        await expectAsync(bv.getPrIsTrusted(pr));
+        bv.getPrIsTrusted(pr).then(() => {
           expect(teamsIsMemberBySlugSpy).not.toHaveBeenCalled();
+          done();
+        });
       });
 
     });
@@ -128,27 +137,40 @@ 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', async () => {
+      it('should verify the PR author\'s membership in the specified teams', done => {
-        await bv.getPrIsTrusted(pr);
+        bv.getPrIsTrusted(pr).then(() => {
           expect(teamsIsMemberBySlugSpy).toHaveBeenCalledWith('username', ['team1', 'team2']);
+          done();
+        });
       });
 
 
-      it('should fail if verifying membership errors', async () => {
+      it('should fail if verifying membership errors', done => {
-        teamsIsMemberBySlugSpy.and.rejectWith('Test');
+        teamsIsMemberBySlugSpy.and.callFake(() => Promise.reject('Test'));
-        await expectAsync(bv.getPrIsTrusted(pr)).toBeRejectedWith('Test');
+        bv.getPrIsTrusted(pr).catch(err => {
+          expect(err).toBe('Test');
+          done();
+        });
       });
 
 
-      it('should resolve to true if the PR\'s author is a member', async () => {
+      it('should resolve to true if the PR\'s author is a member', done => {
-        teamsIsMemberBySlugSpy.and.resolveTo(true);
+        teamsIsMemberBySlugSpy.and.callFake(() => Promise.resolve(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', async () => {
+      it('should resolve to false if the PR\'s author is not a member', done => {
-        teamsIsMemberBySlugSpy.and.resolveTo(false);
+        teamsIsMemberBySlugSpy.and.callFake(() => Promise.resolve(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

@@ -0,0 +1,11 @@
+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

@@ -1,5 +0,0 @@
-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

@@ -1,59 +0,0 @@
-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).toBeInstanceOf(PreviewServerError);
+    expect(err).toEqual(jasmine.any(PreviewServerError));
-    expect(err).toBeInstanceOf(Error);
+    expect(err).toEqual(jasmine.any(Error));
 
     expect(Object.getPrototypeOf(err)).toBe(PreviewServerError.prototype);
   });

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

@@ -1,4 +1,5 @@
 // Imports
+import * as express from 'express';
 import * as http from 'http';
 import * as supertest from 'supertest';
 import {CircleCiApi} from '../../lib/common/circle-ci-api';
@@ -133,7 +134,7 @@ describe('PreviewServerFactory', () => {
       const buildCreator = jasmine.any(BuildCreator);
       expect(usfCreateMiddlewareSpy).toHaveBeenCalledWith(buildRetriever, buildVerifier, buildCreator, defaultConfig);
 
-      const middleware = usfCreateMiddlewareSpy.calls.mostRecent().returnValue;
+      const middleware: express.Express = usfCreateMiddlewareSpy.calls.mostRecent().returnValue;
       expect(httpCreateServerSpy).toHaveBeenCalledWith(middleware);
     });
 
@@ -229,7 +230,7 @@ describe('PreviewServerFactory', () => {
 
       expect(prsAddCommentSpy).toHaveBeenCalledTimes(2);
       expect(prs).toBe(allCalls[1].object);
-      expect(prs).toBeInstanceOf(GithubPullRequests);
+      expect(prs).toEqual(jasmine.any(GithubPullRequests));
       expect(prs.repoSlug).toBe('organisation/repo');
     });
 
@@ -301,8 +302,9 @@ describe('PreviewServerFactory', () => {
       let bvGetSignificantFilesChangedSpy: jasmine.Spy;
 
       beforeEach(() => {
-        bvGetPrIsTrustedSpy = spyOn(buildVerifier, 'getPrIsTrusted').and.resolveTo(true);
+        bvGetPrIsTrustedSpy = spyOn(buildVerifier, 'getPrIsTrusted').and.returnValue(Promise.resolve(true));
-        bvGetSignificantFilesChangedSpy = spyOn(buildVerifier, 'getSignificantFilesChanged').and.resolveTo(true);
+        bvGetSignificantFilesChangedSpy = spyOn(buildVerifier, 'getSignificantFilesChanged').
+          and.returnValue(Promise.resolve(true));
       });
 
 
@@ -329,7 +331,7 @@ describe('PreviewServerFactory', () => {
 
 
       it('should respond appropriately if the PR did not touch any significant files', async () => {
-        bvGetSignificantFilesChangedSpy.and.resolveTo(false);
+        bvGetSignificantFilesChangedSpy.and.returnValue(Promise.resolve(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.`;
@@ -343,7 +345,7 @@ describe('PreviewServerFactory', () => {
 
 
       it('should respond appropriately if the PR is not automatically verifiable as "trusted"', async () => {
-        bvGetPrIsTrustedSpy.and.resolveTo(false);
+        bvGetPrIsTrustedSpy.and.returnValue(Promise.resolve(false));
 
         const expectedResponse = {canHavePublicPreview: false, reason: 'Not automatically verifiable as "trusted".'};
         const expectedLog =
@@ -370,7 +372,7 @@ describe('PreviewServerFactory', () => {
 
 
       it('should respond with error if `getSignificantFilesChanged()` fails', async () => {
-        bvGetSignificantFilesChangedSpy.and.rejectWith('getSignificantFilesChanged error');
+        bvGetSignificantFilesChangedSpy.and.callFake(() => Promise.reject('getSignificantFilesChanged error'));
 
         await agent.get(url).expect(500, 'getSignificantFilesChanged error');
         expect(loggerErrorSpy).toHaveBeenCalledWith('Previewability check error', 'getSignificantFilesChanged error');
@@ -378,10 +380,11 @@ describe('PreviewServerFactory', () => {
 
 
       it('should respond with error if `getPrIsTrusted()` fails', async () => {
-        bvGetPrIsTrustedSpy.and.throwError('getPrIsTrusted error');
+        const error = new Error('getPrIsTrusted error');
+        bvGetPrIsTrustedSpy.and.callFake(() => { throw error; });
 
         await agent.get(url).expect(500, 'getPrIsTrusted error');
-        expect(loggerErrorSpy).toHaveBeenCalledWith('Previewability check error', new Error('getPrIsTrusted error'));
+        expect(loggerErrorSpy).toHaveBeenCalledWith('Previewability check error', error);
       });
 
     });
@@ -494,7 +497,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.rejectWith('Test Error');
+        getGithubInfoSpy.and.callFake(() => Promise.reject('Test Error'));
         await agent.post(URL).send(BASIC_PAYLOAD).expect(500, 'Test Error');
         expect(getGithubInfoSpy).toHaveBeenCalledWith(BUILD_NUM);
         expect(downloadBuildArtifactSpy).not.toHaveBeenCalled();
@@ -515,7 +518,7 @@ describe('PreviewServerFactory', () => {
       });
 
       it('should fail if the artifact fetch request fails', async () => {
-        downloadBuildArtifactSpy.and.rejectWith('Test Error');
+        downloadBuildArtifactSpy.and.callFake(() => Promise.reject('Test Error'));
         await agent.post(URL).send(BASIC_PAYLOAD).expect(500, 'Test Error');
         expect(getGithubInfoSpy).toHaveBeenCalledWith(BUILD_NUM);
         expect(downloadBuildArtifactSpy).toHaveBeenCalled();
@@ -524,7 +527,7 @@ describe('PreviewServerFactory', () => {
       });
 
       it('should fail if verifying the PR fails', async () => {
-        getPrIsTrustedSpy.and.rejectWith('Test Error');
+        getPrIsTrustedSpy.and.callFake(() => Promise.reject('Test Error'));
         await agent.post(URL).send(BASIC_PAYLOAD).expect(500, 'Test Error');
         expect(getGithubInfoSpy).toHaveBeenCalledWith(BUILD_NUM);
         expect(downloadBuildArtifactSpy).toHaveBeenCalled();
@@ -533,7 +536,7 @@ describe('PreviewServerFactory', () => {
       });
 
       it('should fail if creating the preview build fails', async () => {
-        createBuildSpy.and.rejectWith('Test Error');
+        createBuildSpy.and.callFake(() => Promise.reject('Test Error'));
         await agent.post(URL).send(BASIC_PAYLOAD).expect(500, 'Test Error');
         expect(getGithubInfoSpy).toHaveBeenCalledWith(BUILD_NUM);
         expect(downloadBuildArtifactSpy).toHaveBeenCalled();
@@ -602,7 +605,7 @@ describe('PreviewServerFactory', () => {
 
 
       it('should propagate errors from BuildVerifier', async () => {
-        bvGetPrIsTrustedSpy.and.rejectWith('Test');
+        bvGetPrIsTrustedSpy.and.callFake(() => Promise.reject('Test'));
 
         await createRequest(+pr).expect(500, 'Test');
 
@@ -612,9 +615,7 @@ describe('PreviewServerFactory', () => {
 
 
       it('should call \'BuildCreator#updatePrVisibility()\' with the correct arguments', async () => {
-        bvGetPrIsTrustedSpy.
+        bvGetPrIsTrustedSpy.and.callFake((pr2: number) => Promise.resolve(pr2 === 42));
-          withArgs(24).and.resolveTo(false).
-          withArgs(42).and.resolveTo(true);
 
         await createRequest(24);
         expect(bcUpdatePrVisibilitySpy).toHaveBeenCalledWith(24, false);
@@ -625,7 +626,7 @@ describe('PreviewServerFactory', () => {
 
 
       it('should propagate errors from BuildCreator', async () => {
-        bcUpdatePrVisibilitySpy.and.rejectWith('Test');
+        bcUpdatePrVisibilitySpy.and.callFake(() => Promise.reject('Test'));
         await createRequest(+pr).expect(500, 'Test');
       });
 
@@ -633,9 +634,7 @@ describe('PreviewServerFactory', () => {
       describe('on success', () => {
 
         it('should respond with 200 (action: undefined)', async () => {
-          bvGetPrIsTrustedSpy.
+          bvGetPrIsTrustedSpy.and.returnValues(Promise.resolve(true), Promise.resolve(false));
-            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);
@@ -643,9 +642,7 @@ describe('PreviewServerFactory', () => {
 
 
         it('should respond with 200 (action: labeled)', async () => {
-          bvGetPrIsTrustedSpy.
+          bvGetPrIsTrustedSpy.and.returnValues(Promise.resolve(true), Promise.resolve(false));
-            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);
@@ -653,9 +650,7 @@ describe('PreviewServerFactory', () => {
 
 
         it('should respond with 200 (action: unlabeled)', async () => {
-          bvGetPrIsTrustedSpy.
+          bvGetPrIsTrustedSpy.and.returnValues(Promise.resolve(true), Promise.resolve(false));
-            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).toBeInstanceOf(PreviewServerError);
+        expect(error).toEqual(jasmine.any(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,32 +8,10 @@ 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
 }
 
 
@@ -50,16 +28,6 @@ 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 -m 0 -E lazy_itable_init=0,lazy_journal_init=0,discard /dev/disk/by-id/google-aio-builds`
+- `sudo mkfs.ext4 -F -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` \
+  echo UUID=`sudo blkid -s UUID -o value /dev/disk/by-id/google-aio-builds` \
-    /mnt/disks/aio-builds ext4 defaults,discard,nofail 0 2 | sudo tee -a /etc/fstab
+    /mnt/disks/aio-builds ext4 discard,defaults,nofail 0 2 | sudo tee -a /etc/fstab
   ```

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

@@ -1,11 +1,10 @@
 # VM setup - Create docker image
 
 
-## Install git, Node.js and yarn
+## Install node and yarn
-- `sudo apt-get update`
+- Install [nvm](https://github.com/creationix/nvm#installation).
-- `sudo apt-get install -y git`
+- Install node.js: `nvm install 8`
-- Install the latest stable version of [Node.js](https://nodejs.org/en/download).
+- Install yarn: `npm -g install yarn`
-- Install the latest stable version of [yarn](https://classic.yarnpkg.com/en/docs/install).
 
 
 ## Checkout repository
@@ -17,11 +16,7 @@
 - You can overwrite the default environment variables inside the image, by passing new values using
   `--build-arg`.
 
-**Note 1:** The script has to execute docker commands with `sudo`.
+**Note:** 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
@@ -31,7 +26,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,17 +3,24 @@
 
 ## Install docker
 
-Official installation instructions: https://docs.docker.com/engine/install
+_Debian (jessie):_
-Example:
+- `sudo apt-get update`
+- `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`
 
-_Debian (buster):_
+_Ubuntu (16.04):_
 - `sudo apt-get update`
-- `sudo apt-get install -y apt-transport-https ca-certificates curl gnupg-agent software-properties-common`
+- `sudo apt-get install -y curl git linux-image-extra-$(uname -r) linux-image-extra-virtual`
-- `curl -fsSL https://download.docker.com/linux/debian/gpg | sudo apt-key add -`
+- `sudo apt-get install -y apt-transport-https ca-certificates`
-- `sudo apt-key fingerprint 0EBFCD88`
+- `curl -fsSL https://yum.dockerproject.org/gpg | sudo apt-key add -`
-- `sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/debian $(lsb_release -cs) stable"`
+- `apt-key fingerprint 58118E89F3A912897C070ADBF76221572C52609D`
+- `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-ce docker-ce-cli containerd.io`
+- `sudo apt-get -y install docker-engine`
 
 
 ## 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 it works as expected. Finally, it will stop and remove
+it will create a new image and verify that is 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_SECRETS_DIR`
+- **$2**: `HOST_LOCALCERTS_DIR`
-- **$3**: `HOST_BUILDS_DIR`
+- **$3**: `HOST_SECRETS_DIR`
-- **$4**: `HOST_LOCALCERTS_DIR`
+- **$4**: `HOST_BUILDS_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,38 +25,28 @@ used for.
 
 **Note 1:** The script has to execute docker commands with `sudo`.
 
-**Note 2:**
+**Note 2:** Make sure the user that executes the script has access to update the repository
-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 30 minutes, update the preview server (if necessary) and
+cronjob entry would run the script every hour and update the preview server (assuming the user has
-log its output to `update-preview-server.log` (assuming the user has the necessary permissions):
+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/secrets /path/to/builds /path/to/localcerts /path/to/logs >> /path/to/update-preview-server.log 2>&1
+*/30 *  * * *   /path/to/update-preview-server.sh /path/to/repo /path/to/localcerts /path/to/secrets /path/to/builds /path/to/logs
 ```
-
-**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,14 +7,13 @@ echo -e "\n\n[`date`] - Updating the preview server..."
 
 # Input
 readonly HOST_REPO_DIR=$1
-readonly HOST_SECRETS_DIR=$2
+readonly HOST_LOCALCERTS_DIR=$2
-readonly HOST_BUILDS_DIR=$3
+readonly HOST_SECRETS_DIR=$3
-readonly HOST_LOCALCERTS_DIR=$4
+readonly HOST_BUILDS_DIR=$4
 readonly HOST_LOGS_DIR=$5
 
 # Constants
-readonly PROVISIONAL_TAG=provisional
+readonly PROVISIONAL_IMAGE_NAME=aio-builds:provisional
-readonly PROVISIONAL_IMAGE_NAME=aio-builds:$PROVISIONAL_TAG
 readonly LATEST_IMAGE_NAME=aio-builds:latest
 readonly CONTAINER_NAME=aio
 
@@ -31,7 +30,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 image ls | grep "$PROVISIONAL_TAG" >> /dev/fd/3 && echo "true" || echo "false")
+  readonly lastAttemptFailed=$(sudo docker rmi "$PROVISIONAL_IMAGE_NAME" >> /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
@@ -61,9 +60,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/angular.json

@@ -58,7 +58,7 @@
               }
             ],
             "styles": [
-              "src/styles/main.scss"
+              "src/styles.scss"
             ],
             "scripts": [],
             "budgets": [
@@ -158,7 +158,7 @@
               }
             ],
             "styles": [
-              "src/styles/main.scss"
+              "src/styles.scss"
             ],
             "scripts": []
           }

aio/content/cli/index.md

@@ -1,6 +1,6 @@
 # CLI Overview and Command Reference
 
-The Angular CLI is a command-line interface tool that you use to initialize, develop, scaffold, and maintain Angular applications directly from a command shell.
+The Angular CLI is a command-line interface tool that you use to initialize, develop, scaffold, and maintain Angular applications. You can use the tool directly in a command shell, or indirectly through an interactive UI such as [Angular Console](https://angularconsole.com).
 
 ## Installing Angular CLI
 
@@ -109,3 +109,9 @@ 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/.gitignore

@@ -18,7 +18,6 @@
 **/src/karma.conf.js
 **/.angular-cli.json
 **/.editorconfig
-**/.gitignore
 **/angular.json
 **/tsconfig.json
 **/bs-config.e2e.json
@@ -83,6 +82,9 @@ upgrade-phonecat-2-hybrid/aot/**/*
 # styleguide
 !styleguide/src/systemjs.custom.js
 
+# universal
+!universal/webpack.server.config.js
+
 # stackblitz
 *stackblitz.no-link.html
 

aio/content/examples/accessibility/e2e/src/app.e2e-spec.ts

@@ -1,3 +1,5 @@
+'use strict'; // necessary for es6 output in node
+
 import { browser, element, by } from 'protractor';
 
 describe('Accessibility example e2e tests', () => {
@@ -6,11 +8,11 @@ describe('Accessibility example e2e tests', () => {
     browser.get('');
   });
 
-  it('should display Accessibility Example', () => {
+  it('should display Accessibility Example', function () {
     expect(element(by.css('h1')).getText()).toEqual('Accessibility Example');
   });
 
-  it('should take a number and change progressbar width', () => {
+  it('should take a number and change progressbar width', function () {
     element(by.css('input')).sendKeys('16');
     expect(element(by.css('input')).getAttribute('value')).toEqual('016');
     expect(element(by.css('app-example-progressbar div')).getCssValue('width')).toBe('48px');

aio/content/examples/accessibility/src/app/progress-bar.component.ts

@@ -1,4 +1,3 @@
-// tslint:disable: no-host-metadata-property
 // #docregion progressbar-component
 import { Component, Input } from '@angular/core';
 

aio/content/examples/ajs-quick-reference/e2e/src/app.e2e-spec.ts

@@ -1,18 +1,20 @@
+'use strict'; // necessary for es6 output in node
+
 import { browser, element, by } from 'protractor';
 
-describe('AngularJS to Angular Quick Reference Tests', () => {
+describe('AngularJS to Angular Quick Reference Tests', function () {
 
-  beforeAll(() => {
+  beforeAll(function () {
     browser.get('');
   });
 
-  it('should display no poster images after bootstrap', () => {
+  it('should display no poster images after bootstrap', function () {
     testImagesAreDisplayed(false);
   });
 
-  it('should display proper movie data', () => {
+  it('should display proper movie data', function () {
     // We check only a few samples
-    const expectedSamples: any[] = [
+    let expectedSamples: any[] = [
       {row: 0, column: 0, element: 'img', attr: 'src', value: 'images/hero.png', contains: true},
       {row: 0, column: 2, value: 'Celeritas'},
       {row: 1, column: 3, matches: /Dec 1[678], 2015/}, // absorb timezone dif; we care about date format
@@ -23,17 +25,18 @@ describe('AngularJS to Angular Quick Reference Tests', () => {
     ];
 
     // Go through the samples
-    const movieRows = getMovieRows();
+    let movieRows = getMovieRows();
-    for (const sample of expectedSamples) {
+    for (let i = 0; i < expectedSamples.length; i++) {
-      const tableCell = movieRows.get(sample.row)
+      let sample = expectedSamples[i];
+      let tableCell = movieRows.get(sample.row)
         .all(by.tagName('td')).get(sample.column);
       // Check the cell or its nested element
-      const elementToCheck = sample.element
+      let elementToCheck = sample.element
         ? tableCell.element(by.tagName(sample.element))
         : tableCell;
 
       // Check element attribute or text
-      const valueToCheck = sample.attr
+      let valueToCheck = sample.attr
         ? elementToCheck.getAttribute(sample.attr)
         : elementToCheck.getText();
 
@@ -48,42 +51,42 @@ describe('AngularJS to Angular Quick Reference Tests', () => {
     }
   });
 
-  it('should display images after Show Poster', () => {
+  it('should display images after Show Poster', function () {
     testPosterButtonClick('Show Poster', true);
   });
 
-  it('should hide images after Hide Poster', () => {
+  it('should hide images after Hide Poster', function () {
     testPosterButtonClick('Hide Poster', false);
   });
 
-  it('should display no movie when no favorite hero is specified', () => {
+  it('should display no movie when no favorite hero is specified', function () {
     testFavoriteHero(null, 'Please enter your favorite hero.');
   });
 
-  it('should display no movie for Magneta', () => {
+  it('should display no movie for Magneta', function () {
     testFavoriteHero('Magneta', 'No movie, sorry!');
   });
 
-  it('should display a movie for Dr Nice', () => {
+  it('should display a movie for Dr Nice', function () {
     testFavoriteHero('Dr Nice', 'Excellent choice!');
   });
 
   function testImagesAreDisplayed(isDisplayed: boolean) {
-    const expectedMovieCount = 3;
+    let expectedMovieCount = 3;
 
-    const movieRows = getMovieRows();
+    let movieRows = getMovieRows();
     expect(movieRows.count()).toBe(expectedMovieCount);
     for (let i = 0; i < expectedMovieCount; i++) {
-      const movieImage = movieRows.get(i).element(by.css('td > img'));
+      let movieImage = movieRows.get(i).element(by.css('td > img'));
       expect(movieImage.isDisplayed()).toBe(isDisplayed);
     }
   }
 
   function testPosterButtonClick(expectedButtonText: string, isDisplayed: boolean) {
-    const posterButton = element(by.css('app-movie-list tr > th > button'));
+    let posterButton = element(by.css('app-movie-list tr > th > button'));
     expect(posterButton.getText()).toBe(expectedButtonText);
 
-    posterButton.click().then(() => {
+    posterButton.click().then(function () {
       testImagesAreDisplayed(isDisplayed);
     });
   }
@@ -93,12 +96,12 @@ describe('AngularJS to Angular Quick Reference Tests', () => {
   }
 
   function testFavoriteHero(heroName: string, expectedLabel: string) {
-    const movieListComp = element(by.tagName('app-movie-list'));
+    let movieListComp = element(by.tagName('app-movie-list'));
-    const heroInput = movieListComp.element(by.tagName('input'));
+    let heroInput = movieListComp.element(by.tagName('input'));
-    const favoriteHeroLabel = movieListComp.element(by.tagName('h3'));
+    let favoriteHeroLabel = movieListComp.element(by.tagName('h3'));
-    const resultLabel = movieListComp.element(by.css('span > p'));
+    let resultLabel = movieListComp.element(by.css('span > p'));
 
-    heroInput.clear().then(() => {
+    heroInput.clear().then(function () {
       heroInput.sendKeys(heroName || '');
       expect(resultLabel.getText()).toBe(expectedLabel);
       if (heroName) {

aio/content/examples/animations/e2e/src/app.e2e-spec.ts

@@ -1,3 +1,5 @@
+'use strict'; // necessary for es6 output in node
+
 import { browser, ExpectedConditions as EC } from 'protractor';
 import { logging } from 'selenium-webdriver';
 import * as openClose from './open-close.po';

aio/content/examples/animations/src/app/animations.ts

@@ -32,15 +32,15 @@ export const slideInAnimation =
 // #enddocregion style-view
 // #docregion query
       query(':enter', [
-        style({ left: '-100%' })
+        style({ left: '-100%'})
       ]),
       query(':leave', animateChild()),
       group([
         query(':leave', [
-          animate('300ms ease-out', style({ left: '100%' }))
+          animate('300ms ease-out', style({ left: '100%'}))
         ]),
         query(':enter', [
-          animate('300ms ease-out', style({ left: '0%' }))
+          animate('300ms ease-out', style({ left: '0%'}))
         ])
       ]),
       query(':enter', animateChild()),
@@ -56,15 +56,15 @@ export const slideInAnimation =
         })
       ]),
       query(':enter', [
-        style({ left: '-100%' })
+        style({ left: '-100%'})
       ]),
       query(':leave', animateChild()),
       group([
         query(':leave', [
-          animate('200ms ease-out', style({ left: '100%' }))
+          animate('200ms ease-out', style({ left: '100%'}))
         ]),
         query(':enter', [
-          animate('300ms ease-out', style({ left: '0%' }))
+          animate('300ms ease-out', style({ left: '0%'}))
         ])
       ]),
       query(':enter', animateChild()),

aio/content/examples/animations/src/app/app.component.html

@@ -17,7 +17,7 @@ Toggle All Animations <input type="checkbox" [checked]="!animationsDisabled" (cl
 </nav>
 
 <!-- #docregion route-animations-outlet -->
-<div [@routeAnimations]="prepareRoute(outlet)">
+<div [@routeAnimations]="prepareRoute(outlet)" >
   <router-outlet #outlet="outlet"></router-outlet>
 </div>
 <!-- #enddocregion route-animations-outlet -->

aio/content/examples/animations/src/app/app.component.ts

@@ -34,7 +34,7 @@ export class AppComponent {
 
 // #docregion prepare-router-outlet
   prepareRoute(outlet: RouterOutlet) {
-    return outlet && outlet.activatedRouteData && outlet.activatedRouteData.animation;
+    return outlet && outlet.activatedRouteData && outlet.activatedRouteData['animation'];
   }
 
 // #enddocregion prepare-router-outlet

aio/content/examples/animations/src/app/hero-list-page.component.ts

@@ -1,6 +1,4 @@
-// tslint:disable: variable-name
 // #docplaster
-// #docregion
 import { Component, HostBinding, OnInit } from '@angular/core';
 import { trigger, transition, animate, style, query, stagger } from '@angular/animations';
 import { HEROES } from './mock-heroes';
@@ -54,11 +52,13 @@ export class HeroListPageComponent implements OnInit {
   @HostBinding('@pageAnimations')
   public animatePage = true;
 
+  _heroes = [];
 // #docregion filter-animations
   heroTotal = -1;
 // #enddocregion filter-animations
-  get heroes() { return this._heroes; }
+  get heroes() {
-  private _heroes = [];
+    return this._heroes;
+  }
 
   ngOnInit() {
     this._heroes = HEROES;

aio/content/examples/animations/src/app/open-close.component.ts

@@ -8,7 +8,8 @@ import { trigger, transition, state, animate, style, AnimationEvent } from '@ang
 // #docregion trigger, trigger-wildcard1, trigger-transition
   animations: [
     trigger('openClose', [
-// #docregion state1
+// #enddocregion events1
+// #docregion state1, events1
       // ...
 // #enddocregion events1
       state('open', style({
@@ -33,7 +34,8 @@ import { trigger, transition, state, animate, style, AnimationEvent } from '@ang
       transition('closed => open', [
         animate('0.5s')
       ]),
-// #enddocregion transition2, trigger, component
+// #enddocregion trigger, component
+// #enddocregion transition2
 // #docregion trigger-wildcard1
       transition('* => closed', [
         animate('1s')
@@ -68,9 +70,7 @@ import { trigger, transition, state, animate, style, AnimationEvent } from '@ang
 })
 // #docregion events
 export class OpenCloseComponent {
-// #enddocregion events1, events, component
+// #enddocregion events1, events
-  @Input() logging = false;
-// #docregion component
   isOpen = true;
 
   toggle() {
@@ -78,8 +78,9 @@ export class OpenCloseComponent {
   }
 
 // #enddocregion component
+  @Input() logging = false;
 // #docregion events1, events
-  onAnimationEvent( event: AnimationEvent ) {
+  onAnimationEvent ( event: AnimationEvent ) {
 // #enddocregion events1, events
     if (!this.logging) {
       return;

aio/content/examples/architecture/e2e/src/app.e2e-spec.ts

@@ -1,3 +1,5 @@
+'use strict'; // necessary for es6 output in node
+
 import { protractor, browser, element, by, ElementFinder } from 'protractor';
 
 const nameSuffix = 'X';
@@ -19,7 +21,7 @@ describe('Architecture', () => {
   });
 
   it(`has h2 '${expectedH2}'`, () => {
-    const h2 = element.all(by.css('h2')).map((elt: any) => elt.getText());
+    let h2 = element.all(by.css('h2')).map((elt: any) => elt.getText());
     expect(h2).toEqual(expectedH2);
   });
 
@@ -32,42 +34,42 @@ function heroTests() {
   const targetHero: Hero = { id: 2, name: 'Dr Nice' };
 
   it('has the right number of heroes', () => {
-    const page = getPageElts();
+    let page = getPageElts();
     expect(page.heroes.count()).toEqual(3);
   });
 
-  it('has no hero details initially', () => {
+  it('has no hero details initially', function () {
-    const page = getPageElts();
+    let page = getPageElts();
     expect(page.heroDetail.isPresent()).toBeFalsy('no hero detail');
   });
 
   it('shows selected hero details', async () => {
     await element(by.cssContainingText('li', targetHero.name)).click();
-    const page = getPageElts();
+    let page = getPageElts();
-    const hero = await heroFromDetail(page.heroDetail);
+    let hero = await heroFromDetail(page.heroDetail);
     expect(hero.id).toEqual(targetHero.id);
     expect(hero.name).toEqual(targetHero.name);
   });
 
   it(`shows updated hero name in details`, async () => {
-    const input = element.all(by.css('input')).first();
+    let input = element.all(by.css('input')).first();
     input.sendKeys(nameSuffix);
-    const page = getPageElts();
+    let page = getPageElts();
-    const hero = await heroFromDetail(page.heroDetail);
+    let hero = await heroFromDetail(page.heroDetail);
-    const newName = targetHero.name + nameSuffix;
+    let newName = targetHero.name + nameSuffix;
     expect(hero.id).toEqual(targetHero.id);
     expect(hero.name).toEqual(newName);
   });
 }
 
 function salesTaxTests() {
-  it('has no sales tax initially', () => {
+  it('has no sales tax initially', function () {
-    const page = getPageElts();
+    let page = getPageElts();
     expect(page.salesTaxDetail.isPresent()).toBeFalsy('no sales tax info');
   });
 
-  it('shows sales tax', async () => {
+  it('shows sales tax', async function () {
-    const page = getPageElts();
+    let page = getPageElts();
     page.salesTaxAmountInput.sendKeys('10', protractor.Key.ENTER);
     expect(page.salesTaxDetail.getText()).toEqual('The sales tax is $1.00');
   });
@@ -86,11 +88,13 @@ function getPageElts() {
 
 async function heroFromDetail(detail: ElementFinder): Promise<Hero> {
   // Get hero id from the first <div>
-  const id = await detail.all(by.css('div')).first().getText();
+  // let _id = await detail.all(by.css('div')).first().getText();
+  let _id = await detail.all(by.css('div')).first().getText();
   // Get name from the h2
-  const name = await detail.element(by.css('h4')).getText();
+  // let _name = await detail.element(by.css('h4')).getText();
+  let _name = await detail.element(by.css('h4')).getText();
   return {
-    id: +id.substr(id.indexOf(' ') + 1),
+    id: +_id.substr(_id.indexOf(' ') + 1),
-    name: name.substr(0, name.lastIndexOf(' ')),
+    name: _name.substr(0, _name.lastIndexOf(' '))
   };
 }

aio/content/examples/architecture/src/app/backend.service.ts

@@ -18,7 +18,7 @@ export class BackendService {
       // TODO: get from the database
       return Promise.resolve<Hero[]>(HEROES);
     }
-    const err = new Error('Cannot get object of this type');
+    let err = new Error('Cannot get object of this type');
     this.logger.error(err);
     throw err;
   }

aio/content/examples/architecture/src/app/sales-tax.service.ts

@@ -7,7 +7,7 @@ export class SalesTaxService {
   constructor(private rateService: TaxRateService) { }
 
   getVAT(value: string | number) {
-    const amount = (typeof value === 'string') ?
+    let amount = (typeof value === 'string') ?
       parseFloat(value) : value;
     return (amount || 0) * this.rateService.getRate('VAT');
   }

aio/content/examples/attribute-binding/e2e/src/app.e2e-spec.ts

@@ -1,32 +1,34 @@
+'use strict'; // necessary for es6 output in node
+
 import { browser, element, by } from 'protractor';
 
-describe('Attribute binding example', () => {
+describe('Attribute binding example', function () {
 
-  beforeEach(() => {
+  beforeEach(function () {
     browser.get('');
   });
 
-  it('should display Property Binding with Angular', () => {
+  it('should display Property Binding with Angular', function () {
     expect(element(by.css('h1')).getText()).toEqual('Attribute, class, and style bindings');
   });
 
-  it('should display a table', () => {
+  it('should display a table', function() {
     expect(element.all(by.css('table')).isPresent()).toBe(true);
   });
 
-  it('should display an Aria button', () => {
+  it('should display an Aria button', function () {
     expect(element.all(by.css('button')).get(0).getText()).toBe('Go for it with Aria');
   });
 
-  it('should display a blue background on div', () => {
+  it('should display a blue background on div', function () {
     expect(element.all(by.css('div')).get(1).getCssValue('background-color')).toEqual('rgba(25, 118, 210, 1)');
   });
 
-  it('should display a blue div with a red border', () => {
+  it('should display a blue div with a red border', function () {
     expect(element.all(by.css('div')).get(1).getCssValue('border')).toEqual('2px solid rgb(212, 30, 46)');
   });
 
-  it('should display a div with many classes', () => {
+  it('should display a div with many classes', function () {
     expect(element.all(by.css('div')).get(1).getAttribute('class')).toContain('special');
     expect(element.all(by.css('div')).get(1).getAttribute('class')).toContain('clearance');
   });

aio/content/examples/attribute-binding/src/app/comp-with-host-binding.component.ts

@@ -1,16 +1,16 @@
-import { Component, HostBinding } from '@angular/core';
+import { Component } from '@angular/core';
 
 @Component({
   selector: 'comp-with-host-binding',
   template: 'I am a component!',
+  host: {
+    '[class.special]': 'isSpecial',
+    '[style.color]': 'color',
+    '[style.width]': 'width'
+  }
 })
 export class CompWithHostBindingComponent {
-  @HostBinding('class.special')
   isSpecial = false;
-
-  @HostBinding('style.color')
   color = 'green';
-
-  @HostBinding('style.width')
   width = '200px';
 }

aio/content/examples/attribute-directives/e2e/src/app.e2e-spec.ts

@@ -1,15 +1,17 @@
+'use strict'; // necessary for es6 output in node
+
 import { browser, element, by } from 'protractor';
 
 describe('Attribute directives', () => {
 
-  const title = 'My First Attribute Directive';
+  let _title = 'My First Attribute Directive';
 
   beforeAll(() => {
     browser.get('');
   });
 
-  it(`should display correct title: ${title}`, () => {
+  it(`should display correct title: ${_title}`, () => {
-    expect(element(by.css('h1')).getText()).toEqual(title);
+    expect(element(by.css('h1')).getText()).toEqual(_title);
   });
 
   it('should be able to select green highlight', () => {

aio/content/examples/binding-syntax/e2e/src/app.e2e-spec.ts

@@ -3,55 +3,57 @@ import { logging } from 'selenium-webdriver';
 
 describe('Binding syntax e2e tests', () => {
 
-  beforeEach(() => browser.get(''));
+  beforeEach(function () {
+    browser.get('');
+  });
 
 
     // helper function used to test what's logged to the console
     async function logChecker(button, contents) {
       const logs = await browser.manage().logs().get(logging.Type.BROWSER);
-    const messages = logs.filter(({ message }) => message.indexOf(contents) !== -1 ? true : false);
+      const message = logs.filter(({ message }) => message.indexOf(contents) !== -1 ? true : false);
-    expect(messages.length).toBeGreaterThan(0);
+      expect(message.length).toBeGreaterThan(0);
     }
 
 
-  it('should display Binding syntax', () => {
+  it('should display Binding syntax', function () {
     expect(element(by.css('h1')).getText()).toEqual('Binding syntax');
   });
 
-  it('should display Save button', () => {
+  it('should display Save button', function () {
     expect(element.all(by.css('button')).get(0).getText()).toBe('Save');
   });
 
-  it('should display HTML attributes and DOM properties', () => {
+  it('should display HTML attributes and DOM properties', function () {
     expect(element.all(by.css('h2')).get(1).getText()).toBe('HTML attributes and DOM properties');
   });
 
-  it('should display 1. Use the inspector...', () => {
+  it('should display 1. Use the inspector...', function () {
     expect(element.all(by.css('p')).get(0).getText()).toContain('1. Use the inspector');
   });
 
-  it('should display Disabled property vs. attribute', () => {
+  it('should display Disabled property vs. attribute', function () {
     expect(element.all(by.css('h3')).get(0).getText()).toBe('Disabled property vs. attribute');
   });
 
 
   it('should log a message including Sarah', async () => {
-    const attributeButton = element.all(by.css('button')).get(1);
+    let attributeButton = element.all(by.css('button')).get(1);
     await attributeButton.click();
     const contents = 'Sarah';
     logChecker(attributeButton, contents);
   });
 
   it('should log a message including Sarah for DOM property', async () => {
-    const DOMPropertyButton = element.all(by.css('button')).get(2);
+    let DOMPropertyButton = element.all(by.css('button')).get(2);
     await DOMPropertyButton.click();
     const contents = 'Sarah';
     logChecker(DOMPropertyButton, contents);
   });
 
   it('should log a message including Sally for DOM property', async () => {
-    const DOMPropertyButton = element.all(by.css('button')).get(2);
+    let DOMPropertyButton = element.all(by.css('button')).get(2);
-    const input = element(by.css('input'));
+    let input = element(by.css('input'));
     input.sendKeys('Sally');
     await DOMPropertyButton.click();
     const contents = 'Sally';
@@ -59,14 +61,14 @@ describe('Binding syntax e2e tests', () => {
   });
 
   it('should log a message that Test Button works', async () => {
-    const testButton = element.all(by.css('button')).get(3);
+    let testButton = element.all(by.css('button')).get(3);
     await testButton.click();
     const contents = 'Test';
     logChecker(testButton, contents);
   });
 
   it('should toggle Test Button disabled', async () => {
-    const toggleButton = element.all(by.css('button')).get(4);
+    let toggleButton = element.all(by.css('button')).get(4);
     await toggleButton.click();
     const contents = 'true';
     logChecker(toggleButton, contents);

aio/content/examples/binding-syntax/src/app/app.component.ts

@@ -26,7 +26,7 @@ export class AppComponent {
 
   toggleDisabled(): any {
 
-    const testButton = document.getElementById('testButton') as HTMLInputElement;
+    let testButton = <HTMLInputElement> document.getElementById('testButton');
     testButton.disabled = !testButton.disabled;
     console.warn(testButton.disabled);
   }

aio/content/examples/built-in-directives/e2e/src/app.e2e-spec.ts

@@ -1,19 +1,21 @@
+'use strict';
+
 import { browser, element, by } from 'protractor';
 
-describe('Built-in Directives', () => {
+describe('Built-in Directives', function () {
 
-  beforeAll(() => {
+  beforeAll(function () {
     browser.get('');
   });
 
-  it('should have title Built-in Directives', () => {
+  it('should have title Built-in Directives', function () {
-    const title = element.all(by.css('h1')).get(0);
+    let title = element.all(by.css('h1')).get(0);
     expect(title.getText()).toEqual('Built-in Directives');
   });
 
   it('should change first Teapot header', async () => {
-    const firstLabel = element.all(by.css('p')).get(0);
+    let firstLabel = element.all(by.css('p')).get(0);
-    const firstInput = element.all(by.css('input')).get(0);
+    let firstInput = element.all(by.css('input')).get(0);
 
     expect(firstLabel.getText()).toEqual('Current item name: Teapot');
     firstInput.sendKeys('abc');
@@ -21,49 +23,49 @@ describe('Built-in Directives', () => {
   });
 
 
-  it('should modify sentence when modified checkbox checked', () => {
+  it('should modify sentence when modified checkbox checked', function () {
-    const modifiedChkbxLabel = element.all(by.css('input[type="checkbox"]')).get(1);
+    let modifiedChkbxLabel = element.all(by.css('input[type="checkbox"]')).get(1);
-    const modifiedSentence = element.all(by.css('div')).get(1);
+    let modifiedSentence = element.all(by.css('div')).get(1);
 
     modifiedChkbxLabel.click();
     expect(modifiedSentence.getText()).toContain('modified');
   });
 
-  it('should modify sentence when normal checkbox checked', () => {
+  it('should modify sentence when normal checkbox checked', function () {
-    const normalChkbxLabel = element.all(by.css('input[type="checkbox"]')).get(4);
+    let normalChkbxLabel = element.all(by.css('input[type="checkbox"]')).get(4);
-    const normalSentence = element.all(by.css('div')).get(7);
+    let normalSentence = element.all(by.css('div')).get(7);
 
     normalChkbxLabel.click();
     expect(normalSentence.getText()).toContain('normal weight and, extra large');
   });
 
-  it('should toggle app-item-detail', () => {
+  it('should toggle app-item-detail', function () {
-    const toggleButton = element.all(by.css('button')).get(3);
+    let toggleButton = element.all(by.css('button')).get(3);
-    const toggledDiv = element.all(by.css('app-item-detail')).get(0);
+    let toggledDiv = element.all(by.css('app-item-detail')).get(0);
 
     toggleButton.click();
     expect(toggledDiv.isDisplayed()).toBe(true);
   });
 
-  it('should hide app-item-detail', () => {
+  it('should hide app-item-detail', function () {
-    const hiddenMessage = element.all(by.css('p')).get(11);
+    let hiddenMessage = element.all(by.css('p')).get(11);
-    const hiddenDiv = element.all(by.css('app-item-detail')).get(2);
+    let hiddenDiv = element.all(by.css('app-item-detail')).get(2);
 
     expect(hiddenMessage.getText()).toContain('in the DOM');
     expect(hiddenDiv.isDisplayed()).toBe(true);
   });
 
-  it('should have 10 lists each containing the string Teapot', () => {
+  it('should have 10 lists each containing the string Teapot', function () {
-    const listDiv = element.all(by.cssContainingText('.box', 'Teapot'));
+    let listDiv = element.all(by.cssContainingText('.box', 'Teapot'));
     expect(listDiv.count()).toBe(10);
   });
 
-  it('should switch case', () => {
+  it('should switch case', function () {
-    const tvRadioButton = element.all(by.css('input[type="radio"]')).get(3);
+    let tvRadioButton = element.all(by.css('input[type="radio"]')).get(3);
-    const tvDiv = element(by.css('app-lost-item'));
+    let tvDiv = element(by.css('app-lost-item'));
 
-    const fishbowlRadioButton = element.all(by.css('input[type="radio"]')).get(4);
+    let fishbowlRadioButton = element.all(by.css('input[type="radio"]')).get(4);
-    const fishbowlDiv = element(by.css('app-unknown-item'));
+    let fishbowlDiv = element(by.css('app-unknown-item'));
 
     tvRadioButton.click();
     expect(tvDiv.getText()).toContain('Television');

aio/content/examples/built-in-directives/src/app/app.component.ts

@@ -30,14 +30,6 @@ export class AppComponent implements OnInit {
   itemsWithTrackByCountReset = 0;
   itemIdIncrement = 1;
 
-  // #docregion setClasses
-  currentClasses: {};
-  // #enddocregion setClasses
-
-  // #docregion setStyles
-  currentStyles: {};
-  // #enddocregion setStyles
-
   ngOnInit() {
     this.resetItems();
     this.setCurrentClasses();
@@ -49,18 +41,20 @@ export class AppComponent implements OnInit {
     this.currentItem.name = name.toUpperCase();
   }
 
-  // #docregion setClasses
+// #docregion setClasses
+  currentClasses: {};
   setCurrentClasses() {
     // CSS classes: added/removed per current state of component properties
     this.currentClasses =  {
-      saveable: this.canSave,
+      'saveable': this.canSave,
-      modified: !this.isUnchanged,
+      'modified': !this.isUnchanged,
-      special:  this.isSpecial
+      'special':  this.isSpecial
     };
   }
   // #enddocregion setClasses
 
   // #docregion setStyles
+  currentStyles: {};
   setCurrentStyles() {
     // CSS styles: set per current state of component properties
     this.currentStyles = {
@@ -76,7 +70,11 @@ export class AppComponent implements OnInit {
   }
 
   giveNullCustomerValue() {
-    this.nullCustomer = 'Kelly';
+    !(this.nullCustomer = null) ? (this.nullCustomer = 'Kelly') : (this.nullCustomer = null);
+  }
+
+  resetNullItem() {
+    this.nullCustomer = null;
   }
 
   resetItems() {
@@ -86,7 +84,7 @@ export class AppComponent implements OnInit {
   }
 
   resetList() {
-    this.resetItems();
+    this.resetItems()
     this.itemsWithTrackByCountReset = 0;
     this.itemsNoTrackByCount = ++this.itemsNoTrackByCount;
   }
@@ -109,7 +107,7 @@ export class AppComponent implements OnInit {
   trackByItems(index: number, item: Item): number { return item.id; }
 // #enddocregion trackByItems
 
-  trackById(index: number, item: any): number { return item.id; }
+  trackById(index: number, item: any): number { return item['id']; }
 
 }
 

aio/content/examples/built-in-template-functions/e2e/src/app.e2e-spec.ts

@@ -1,17 +1,19 @@
+'use strict'; // necessary for es6 output in node
+
 import { browser, element, by } from 'protractor';
 
-describe('Built Template Functions Example', () => {
+describe('Built Template Functions Example', function () {
-  beforeAll(() => {
+  beforeAll(function () {
     browser.get('');
   });
 
-  it('should have title Built-in Template Functions', () => {
+  it('should have title Built-in Template Functions', function () {
-    const title = element.all(by.css('h1')).get(0);
+    let title = element.all(by.css('h1')).get(0);
     expect(title.getText()).toEqual('Built-in Template Functions');
   });
 
-  it('should display $any( ) in h2', () => {
+  it('should display $any( ) in h2', function () {
-    const header = element(by.css('h2'));
+    let header = element(by.css('h2'));
     expect(header.getText()).toContain('$any( )');
   });
 

aio/content/examples/component-interaction/e2e/src/app.e2e-spec.ts

@@ -1,85 +1,87 @@
+'use strict'; // necessary for es6 output in node
+
 import { browser, element, by } from 'protractor';
 
-describe('Component Communication Cookbook Tests', () => {
+describe('Component Communication Cookbook Tests', function () {
 
   // Note: '?e2e' which app can read to know it is running in protractor
   // e.g. `if (!/e2e/.test(location.search)) { ...`
-  beforeAll(() => {
+  beforeAll(function () {
     browser.get('?e2e');
   });
 
-  describe('Parent-to-child communication', () => {
+  describe('Parent-to-child communication', function() {
     // #docregion parent-to-child
     // ...
-    const heroNames = ['Dr IQ', 'Magneta', 'Bombasto'];
+    let _heroNames = ['Dr IQ', 'Magneta', 'Bombasto'];
-    const masterName = 'Master';
+    let _masterName = 'Master';
 
-    it('should pass properties to children properly', () => {
+    it('should pass properties to children properly', function () {
-      const parent = element.all(by.tagName('app-hero-parent')).get(0);
+      let parent = element.all(by.tagName('app-hero-parent')).get(0);
-      const heroes = parent.all(by.tagName('app-hero-child'));
+      let heroes = parent.all(by.tagName('app-hero-child'));
 
-      for (let i = 0; i < heroNames.length; i++) {
+      for (let i = 0; i < _heroNames.length; i++) {
-        const childTitle = heroes.get(i).element(by.tagName('h3')).getText();
+        let childTitle = heroes.get(i).element(by.tagName('h3')).getText();
-        const childDetail = heroes.get(i).element(by.tagName('p')).getText();
+        let childDetail = heroes.get(i).element(by.tagName('p')).getText();
-        expect(childTitle).toEqual(heroNames[i] + ' says:');
+        expect(childTitle).toEqual(_heroNames[i] + ' says:');
-        expect(childDetail).toContain(masterName);
+        expect(childDetail).toContain(_masterName);
       }
     });
     // ...
     // #enddocregion parent-to-child
   });
 
-  describe('Parent-to-child communication with setter', () => {
+  describe('Parent-to-child communication with setter', function() {
     // #docregion parent-to-child-setter
     // ...
-    it('should display trimmed, non-empty names', () => {
+    it('should display trimmed, non-empty names', function () {
-      const nonEmptyNameIndex = 0;
+      let _nonEmptyNameIndex = 0;
-      const nonEmptyName = '"Dr IQ"';
+      let _nonEmptyName = '"Dr IQ"';
-      const parent = element.all(by.tagName('app-name-parent')).get(0);
+      let parent = element.all(by.tagName('app-name-parent')).get(0);
-      const hero = parent.all(by.tagName('app-name-child')).get(nonEmptyNameIndex);
+      let hero = parent.all(by.tagName('app-name-child')).get(_nonEmptyNameIndex);
 
-      const displayName = hero.element(by.tagName('h3')).getText();
+      let displayName = hero.element(by.tagName('h3')).getText();
-      expect(displayName).toEqual(nonEmptyName);
+      expect(displayName).toEqual(_nonEmptyName);
     });
 
-    it('should replace empty name with default name', () => {
+    it('should replace empty name with default name', function () {
-      const emptyNameIndex = 1;
+      let _emptyNameIndex = 1;
-      const defaultName = '"<no name set>"';
+      let _defaultName = '"<no name set>"';
-      const parent = element.all(by.tagName('app-name-parent')).get(0);
+      let parent = element.all(by.tagName('app-name-parent')).get(0);
-      const hero = parent.all(by.tagName('app-name-child')).get(emptyNameIndex);
+      let hero = parent.all(by.tagName('app-name-child')).get(_emptyNameIndex);
 
-      const displayName = hero.element(by.tagName('h3')).getText();
+      let displayName = hero.element(by.tagName('h3')).getText();
-      expect(displayName).toEqual(defaultName);
+      expect(displayName).toEqual(_defaultName);
     });
     // ...
     // #enddocregion parent-to-child-setter
   });
 
-  describe('Parent-to-child communication with ngOnChanges', () => {
+  describe('Parent-to-child communication with ngOnChanges', function() {
     // #docregion parent-to-child-onchanges
     // ...
     // Test must all execute in this exact order
-    it('should set expected initial values', () => {
+    it('should set expected initial values', function () {
-      const actual = getActual();
+      let actual = getActual();
 
-      const initialLabel = 'Version 1.23';
+      let initialLabel = 'Version 1.23';
-      const initialLog = 'Initial value of major set to 1, Initial value of minor set to 23';
+      let initialLog = 'Initial value of major set to 1, Initial value of minor set to 23';
 
       expect(actual.label).toBe(initialLabel);
       expect(actual.count).toBe(1);
       expect(actual.logs.get(0).getText()).toBe(initialLog);
     });
 
-    it('should set expected values after clicking \'Minor\' twice', () => {
+    it('should set expected values after clicking \'Minor\' twice', function () {
-      const repoTag = element(by.tagName('app-version-parent'));
+      let repoTag = element(by.tagName('app-version-parent'));
-      const newMinorButton = repoTag.all(by.tagName('button')).get(0);
+      let newMinorButton = repoTag.all(by.tagName('button')).get(0);
 
-      newMinorButton.click().then(() => {
+      newMinorButton.click().then(function() {
-        newMinorButton.click().then(() => {
+        newMinorButton.click().then(function() {
-          const actual = getActual();
+          let actual = getActual();
 
-          const labelAfter2Minor = 'Version 1.25';
+          let labelAfter2Minor = 'Version 1.25';
-          const logAfter2Minor = 'minor changed from 24 to 25';
+          let logAfter2Minor = 'minor changed from 24 to 25';
 
           expect(actual.label).toBe(labelAfter2Minor);
           expect(actual.count).toBe(3);
@@ -88,15 +90,15 @@ describe('Component Communication Cookbook Tests', () => {
       });
     });
 
-    it('should set expected values after clicking \'Major\' once', () => {
+    it('should set expected values after clicking \'Major\' once', function () {
-      const repoTag = element(by.tagName('app-version-parent'));
+      let repoTag = element(by.tagName('app-version-parent'));
-      const newMajorButton = repoTag.all(by.tagName('button')).get(1);
+      let newMajorButton = repoTag.all(by.tagName('button')).get(1);
 
-      newMajorButton.click().then(() => {
+      newMajorButton.click().then(function() {
-        const actual = getActual();
+        let actual = getActual();
 
-        const labelAfterMajor = 'Version 2.0';
+        let labelAfterMajor = 'Version 2.0';
-        const logAfterMajor = 'major changed from 1 to 2, minor changed from 25 to 0';
+        let logAfterMajor = 'major changed from 1 to 2, minor changed from 25 to 0';
 
         expect(actual.label).toBe(labelAfterMajor);
         expect(actual.count).toBe(4);
@@ -105,14 +107,14 @@ describe('Component Communication Cookbook Tests', () => {
     });
 
     function getActual() {
-      const versionTag = element(by.tagName('app-version-child'));
+      let versionTag = element(by.tagName('app-version-child'));
-      const label = versionTag.element(by.tagName('h3')).getText();
+      let label = versionTag.element(by.tagName('h3')).getText();
-      const ul = versionTag.element((by.tagName('ul')));
+      let ul = versionTag.element((by.tagName('ul')));
-      const logs = ul.all(by.tagName('li'));
+      let logs = ul.all(by.tagName('li'));
 
       return {
-        label,
+        label: label,
-        logs,
+        logs: logs,
         count: logs.count()
       };
     }
@@ -121,30 +123,30 @@ describe('Component Communication Cookbook Tests', () => {
 
   });
 
-  describe('Child-to-parent communication', () => {
+  describe('Child-to-parent communication', function() {
     // #docregion child-to-parent
     // ...
-    it('should not emit the event initially', () => {
+    it('should not emit the event initially', function () {
-      const voteLabel = element(by.tagName('app-vote-taker'))
+      let voteLabel = element(by.tagName('app-vote-taker'))
         .element(by.tagName('h3')).getText();
       expect(voteLabel).toBe('Agree: 0, Disagree: 0');
     });
 
-    it('should process Agree vote', () => {
+    it('should process Agree vote', function () {
-      const agreeButton1 = element.all(by.tagName('app-voter')).get(0)
+      let agreeButton1 = element.all(by.tagName('app-voter')).get(0)
         .all(by.tagName('button')).get(0);
-      agreeButton1.click().then(() => {
+      agreeButton1.click().then(function() {
-        const voteLabel = element(by.tagName('app-vote-taker'))
+        let voteLabel = element(by.tagName('app-vote-taker'))
           .element(by.tagName('h3')).getText();
         expect(voteLabel).toBe('Agree: 1, Disagree: 0');
       });
     });
 
-    it('should process Disagree vote', () => {
+    it('should process Disagree vote', function () {
-      const agreeButton1 = element.all(by.tagName('app-voter')).get(1)
+      let agreeButton1 = element.all(by.tagName('app-voter')).get(1)
         .all(by.tagName('button')).get(1);
-      agreeButton1.click().then(() => {
+      agreeButton1.click().then(function() {
-        const voteLabel = element(by.tagName('app-vote-taker'))
+        let voteLabel = element(by.tagName('app-vote-taker'))
           .element(by.tagName('h3')).getText();
         expect(voteLabel).toBe('Agree: 1, Disagree: 1');
       });
@@ -155,31 +157,31 @@ describe('Component Communication Cookbook Tests', () => {
 
   // Can't run timer tests in protractor because
   // interaction w/ zones causes all tests to freeze & timeout.
-  xdescribe('Parent calls child via local var', () => {
+  xdescribe('Parent calls child via local var', function() {
     countDownTimerTests('countdown-parent-lv');
   });
 
-  xdescribe('Parent calls ViewChild', () => {
+  xdescribe('Parent calls ViewChild', function() {
     countDownTimerTests('countdown-parent-vc');
   });
 
   function countDownTimerTests(parentTag: string) {
     // #docregion countdown-timer-tests
     // ...
-    it('timer and parent seconds should match', () => {
+    it('timer and parent seconds should match', function () {
-      const parent = element(by.tagName(parentTag));
+      let parent = element(by.tagName(parentTag));
-      const message = parent.element(by.tagName('app-countdown-timer')).getText();
+      let message = parent.element(by.tagName('app-countdown-timer')).getText();
       browser.sleep(10); // give `seconds` a chance to catchup with `message`
-      const seconds = parent.element(by.className('seconds')).getText();
+      let seconds = parent.element(by.className('seconds')).getText();
       expect(message).toContain(seconds);
     });
 
-    it('should stop the countdown', () => {
+    it('should stop the countdown', function () {
-      const parent = element(by.tagName(parentTag));
+      let parent = element(by.tagName(parentTag));
-      const stopButton = parent.all(by.tagName('button')).get(1);
+      let stopButton = parent.all(by.tagName('button')).get(1);
 
-      stopButton.click().then(() => {
+      stopButton.click().then(function() {
-        const message = parent.element(by.tagName('app-countdown-timer')).getText();
+        let message = parent.element(by.tagName('app-countdown-timer')).getText();
         expect(message).toContain('Holding');
       });
     });
@@ -188,39 +190,39 @@ describe('Component Communication Cookbook Tests', () => {
   }
 
 
-  describe('Parent and children communicate via a service', () => {
+  describe('Parent and children communicate via a service', function() {
     // #docregion bidirectional-service
     // ...
-    it('should announce a mission', () => {
+    it('should announce a mission', function () {
-      const missionControl = element(by.tagName('app-mission-control'));
+      let missionControl = element(by.tagName('app-mission-control'));
-      const announceButton = missionControl.all(by.tagName('button')).get(0);
+      let announceButton = missionControl.all(by.tagName('button')).get(0);
-      announceButton.click().then(() => {
+      announceButton.click().then(function () {
-        const history = missionControl.all(by.tagName('li'));
+        let history = missionControl.all(by.tagName('li'));
         expect(history.count()).toBe(1);
         expect(history.get(0).getText()).toMatch(/Mission.* announced/);
       });
     });
 
-    it('should confirm the mission by Lovell', () => {
+    it('should confirm the mission by Lovell', function () {
       testConfirmMission(1, 2, 'Lovell');
     });
 
-    it('should confirm the mission by Haise', () => {
+    it('should confirm the mission by Haise', function () {
       testConfirmMission(3, 3, 'Haise');
     });
 
-    it('should confirm the mission by Swigert', () => {
+    it('should confirm the mission by Swigert', function () {
       testConfirmMission(2, 4, 'Swigert');
     });
 
     function testConfirmMission(buttonIndex: number, expectedLogCount: number, astronaut: string) {
-      const confirmedLog = ' confirmed the mission';
+      let _confirmedLog = ' confirmed the mission';
-      const missionControl = element(by.tagName('app-mission-control'));
+      let missionControl = element(by.tagName('app-mission-control'));
-      const confirmButton = missionControl.all(by.tagName('button')).get(buttonIndex);
+      let confirmButton = missionControl.all(by.tagName('button')).get(buttonIndex);
-      confirmButton.click().then(() => {
+      confirmButton.click().then(function () {
-        const history = missionControl.all(by.tagName('li'));
+        let history = missionControl.all(by.tagName('li'));
         expect(history.count()).toBe(expectedLogCount);
-        expect(history.get(expectedLogCount - 1).getText()).toBe(astronaut + confirmedLog);
+        expect(history.get(expectedLogCount - 1).getText()).toBe(astronaut + _confirmedLog);
       });
     }
     // ...

aio/content/examples/component-interaction/src/app/app.module.ts

@@ -15,7 +15,7 @@ import { VersionParentComponent } from './version-parent.component';
 import { VoterComponent } from './voter.component';
 import { VoteTakerComponent } from './votetaker.component';
 
-const directives: any[] = [
+let directives: any[] = [
     AppComponent,
     AstronautComponent,
     CountdownTimerComponent,
@@ -30,7 +30,7 @@ const directives: any[] = [
     VoteTakerComponent
   ];
 
-const schemas: any[] = [];
+let schemas: any[] = [];
 
 // Include Countdown examples
 // unless in e2e tests which they break.
@@ -49,6 +49,6 @@ if (!/e2e/.test(location.search)) {
   ],
   declarations: directives,
   bootstrap: [ AppComponent ],
-  schemas
+  schemas: schemas
 })
 export class AppModule { }

aio/content/examples/component-interaction/src/app/hero-child.component.ts

@@ -12,6 +12,6 @@ import { Hero } from './hero';
 })
 export class HeroChildComponent {
   @Input() hero: Hero;
-  @Input('master') masterName: string; // tslint:disable-line: no-input-rename
+  @Input('master') masterName: string;
 }
 // #enddocregion

aio/content/examples/component-interaction/src/app/missioncontrol.component.ts

@@ -34,7 +34,7 @@ export class MissionControlComponent {
   }
 
   announce() {
-    const mission = this.missions[this.nextMission++];
+    let mission = this.missions[this.nextMission++];
     this.missionService.announceMission(mission);
     this.history.push(`Mission "${mission}" announced`);
     if (this.nextMission >= this.missions.length) { this.nextMission = 0; }

aio/content/examples/component-interaction/src/app/name-child.component.ts

@@ -1,4 +1,3 @@
-// tslint:disable: variable-name
 // #docregion
 import { Component, Input } from '@angular/core';
 
@@ -7,11 +6,13 @@ import { Component, Input } from '@angular/core';
   template: '<h3>"{{name}}"</h3>'
 })
 export class NameChildComponent {
+  private _name = '';
+
   @Input()
-  get name(): string { return this._name; }
   set name(name: string) {
     this._name = (name && name.trim()) || '<no name set>';
   }
-  private _name = '';
+
+  get name(): string { return this._name; }
 }
 // #enddocregion

aio/content/examples/component-interaction/src/app/version-child.component.ts

@@ -18,14 +18,14 @@ export class VersionChildComponent implements OnChanges {
   changeLog: string[] = [];
 
   ngOnChanges(changes: {[propKey: string]: SimpleChange}) {
-    const log: string[] = [];
+    let log: string[] = [];
-    for (const propName in changes) {
+    for (let propName in changes) {
-      const changedProp = changes[propName];
+      let changedProp = changes[propName];
-      const to = JSON.stringify(changedProp.currentValue);
+      let to = JSON.stringify(changedProp.currentValue);
       if (changedProp.isFirstChange()) {
         log.push(`Initial value of ${propName} set to ${to}`);
       } else {
-        const from = JSON.stringify(changedProp.previousValue);
+        let from = JSON.stringify(changedProp.previousValue);
         log.push(`${propName} changed from ${from} to ${to}`);
       }
     }

aio/content/examples/component-styles/e2e/src/app.e2e-spec.ts

@@ -1,14 +1,16 @@
+'use strict'; // necessary for es6 output in node
+
 import { browser, element, by } from 'protractor';
 
-describe('Component Style Tests', () => {
+describe('Component Style Tests', function () {
 
-  beforeAll(() => {
+  beforeAll(function () {
     browser.get('');
   });
 
-  it('scopes component styles to component view', () => {
+  it('scopes component styles to component view', function() {
-    const componentH1 = element(by.css('app-root > h1'));
+    let componentH1 = element(by.css('app-root > h1'));
-    const externalH1 = element(by.css('body > h1'));
+    let externalH1 = element(by.css('body > h1'));
 
     // Note: sometimes webdriver returns the fontWeight as "normal",
     // other times as "400", both of which are equal in CSS terms.
@@ -17,49 +19,49 @@ describe('Component Style Tests', () => {
   });
 
 
-  it('allows styling :host element', () => {
+  it('allows styling :host element', function() {
-    const host = element(by.css('app-hero-details'));
+    let host = element(by.css('app-hero-details'));
 
     expect(host.getCssValue('borderWidth')).toEqual('1px');
   });
 
-  it('supports :host() in function form', () => {
+  it('supports :host() in function form', function() {
-    const host = element(by.css('app-hero-details'));
+    let host = element(by.css('app-hero-details'));
 
     host.element(by.buttonText('Activate')).click();
     expect(host.getCssValue('borderWidth')).toEqual('3px');
   });
 
-  it('allows conditional :host-context() styling', () => {
+  it('allows conditional :host-context() styling', function() {
-    const h2 = element(by.css('app-hero-details h2'));
+    let h2 = element(by.css('app-hero-details h2'));
 
     expect(h2.getCssValue('backgroundColor')).toEqual('rgba(238, 238, 255, 1)'); // #eeeeff
   });
 
-  it('styles both view and content children with /deep/', () => {
+  it('styles both view and content children with /deep/', function() {
-    const viewH3 = element(by.css('app-hero-team h3'));
+    let viewH3 = element(by.css('app-hero-team h3'));
-    const contentH3 = element(by.css('app-hero-controls h3'));
+    let contentH3 = element(by.css('app-hero-controls h3'));
 
     expect(viewH3.getCssValue('fontStyle')).toEqual('italic');
     expect(contentH3.getCssValue('fontStyle')).toEqual('italic');
   });
 
-  it('includes styles loaded with CSS @import', () => {
+  it('includes styles loaded with CSS @import', function() {
-    const host = element(by.css('app-hero-details'));
+    let host = element(by.css('app-hero-details'));
 
     expect(host.getCssValue('padding')).toEqual('10px');
   });
 
-  it('processes template inline styles', () => {
+  it('processes template inline styles', function() {
-    const button = element(by.css('app-hero-controls button'));
+    let button = element(by.css('app-hero-controls button'));
-    const externalButton = element(by.css('body > button'));
+    let externalButton = element(by.css('body > button'));
     expect(button.getCssValue('backgroundColor')).toEqual('rgba(255, 255, 255, 1)'); // #ffffff
     expect(externalButton.getCssValue('backgroundColor')).not.toEqual('rgba(255, 255, 255, 1)');
   });
 
-  it('processes template <link>s', () => {
+  it('processes template <link>s', function() {
-    const li = element(by.css('app-hero-team li:first-child'));
+    let li = element(by.css('app-hero-team li:first-child'));
-    const externalLi = element(by.css('body > ul li'));
+    let externalLi = element(by.css('body > ul li'));
 
     expect(li.getCssValue('listStyleType')).toEqual('square');
     expect(externalLi.getCssValue('listStyleType')).not.toEqual('square');

aio/content/examples/dependency-injection-in-action/e2e/src/app.e2e-spec.ts

@@ -1,74 +1,76 @@
+'use strict'; // necessary for es6 output in node
+
 import { browser, element, by } from 'protractor';
 
-describe('Dependency Injection Cookbook', () => {
+describe('Dependency Injection Cookbook', function () {
 
-    beforeAll(() => {
+    beforeAll(function () {
         browser.get('');
     });
 
-    it('should render Logged in User example', () => {
+    it('should render Logged in User example', function () {
-      const loggedInUser = element.all(by.xpath('//h3[text()="Logged in user"]')).get(0);
+      let loggedInUser = element.all(by.xpath('//h3[text()="Logged in user"]')).get(0);
       expect(loggedInUser).toBeDefined();
     });
 
-    it('"Bombasto" should be the logged in user', () => {
+    it('"Bombasto" should be the logged in user', function () {
-      const loggedInUser = element.all(by.xpath('//div[text()="Name: Bombasto"]')).get(0);
+      let loggedInUser = element.all(by.xpath('//div[text()="Name: Bombasto"]')).get(0);
       expect(loggedInUser).toBeDefined();
     });
 
-    it('should render sorted heroes', () => {
+    it('should render sorted heroes', function () {
-      const sortedHeroes = element.all(by.xpath('//h3[text()="Sorted Heroes" and position()=1]')).get(0);
+      let sortedHeroes = element.all(by.xpath('//h3[text()="Sorted Heroes" and position()=1]')).get(0);
       expect(sortedHeroes).toBeDefined();
     });
 
-    it('Dr Nice should be in sorted heroes', () => {
+    it('Dr Nice should be in sorted heroes', function () {
-      const sortedHero = element.all(by.xpath('//sorted-heroes/[text()="Dr Nice" and position()=2]')).get(0);
+      let sortedHero = element.all(by.xpath('//sorted-heroes/[text()="Dr Nice" and position()=2]')).get(0);
       expect(sortedHero).toBeDefined();
     });
 
-    it('RubberMan should be in sorted heroes', () => {
+    it('RubberMan should be in sorted heroes', function () {
-      const sortedHero = element.all(by.xpath('//sorted-heroes/[text()="RubberMan" and position()=3]')).get(0);
+      let sortedHero = element.all(by.xpath('//sorted-heroes/[text()="RubberMan" and position()=3]')).get(0);
       expect(sortedHero).toBeDefined();
     });
 
-    it('Magma should be in sorted heroes', () => {
+    it('Magma should be in sorted heroes', function () {
-      const sortedHero = element.all(by.xpath('//sorted-heroes/[text()="Magma"]')).get(0);
+      let sortedHero = element.all(by.xpath('//sorted-heroes/[text()="Magma"]')).get(0);
       expect(sortedHero).toBeDefined();
     });
 
-    it('should render Hero of the Month', () => {
+    it('should render Hero of the Month', function () {
-      const heroOfTheMonth = element.all(by.xpath('//h3[text()="Hero of the month"]')).get(0);
+      let heroOfTheMonth = element.all(by.xpath('//h3[text()="Hero of the month"]')).get(0);
       expect(heroOfTheMonth).toBeDefined();
     });
 
-    it('should render Hero Bios', () => {
+    it('should render Hero Bios', function () {
-      const heroBios = element.all(by.xpath('//h3[text()="Hero Bios"]')).get(0);
+      let heroBios = element.all(by.xpath('//h3[text()="Hero Bios"]')).get(0);
       expect(heroBios).toBeDefined();
     });
 
-    it('should render Magma\'s description in Hero Bios', () => {
+    it('should render Magma\'s description in Hero Bios', function () {
-      const magmaText =  element.all(by.xpath('//textarea[text()="Hero of all trades"]')).get(0);
+      let magmaText =  element.all(by.xpath('//textarea[text()="Hero of all trades"]')).get(0);
       expect(magmaText).toBeDefined();
     });
 
-    it('should render Magma\'s phone in Hero Bios and Contacts', () => {
+    it('should render Magma\'s phone in Hero Bios and Contacts', function () {
-      const magmaPhone =  element.all(by.xpath('//div[text()="Phone #: 555-555-5555"]')).get(0);
+      let magmaPhone =  element.all(by.xpath('//div[text()="Phone #: 555-555-5555"]')).get(0);
       expect(magmaPhone).toBeDefined();
     });
 
-    it('should render Hero-of-the-Month runner-ups', () => {
+    it('should render Hero-of-the-Month runner-ups', function () {
-      const runnersUp =  element(by.id('rups1')).getText();
+      let runnersUp =  element(by.id('rups1')).getText();
       expect(runnersUp).toContain('RubberMan, Dr Nice');
     });
 
-    it('should render DateLogger log entry in Hero-of-the-Month', () => {
+    it('should render DateLogger log entry in Hero-of-the-Month', function () {
-      const logs =  element.all(by.id('logs')).get(0).getText();
+      let logs =  element.all(by.id('logs')).get(0).getText();
       expect(logs).toContain('INFO: starting up at');
     });
 
-    it('should highlight Hero Bios and Contacts container when mouseover', () => {
+    it('should highlight Hero Bios and Contacts container when mouseover', function () {
-      const target = element(by.css('div[appHighlight="yellow"]'));
+      let target = element(by.css('div[appHighlight="yellow"]'));
-      const yellow = 'rgba(255, 255, 0, 1)';
+      let yellow = 'rgba(255, 255, 0, 1)';
 
       expect(target.getCssValue('background-color')).not.toEqual(yellow);
 
@@ -79,25 +81,25 @@ describe('Dependency Injection Cookbook', () => {
       browser.wait(() => target.getCssValue('background-color').then(c => c === yellow), 2000);
     });
 
-    describe('in Parent Finder', () => {
+    describe('in Parent Finder', function () {
-      const cathy1 = element(by.css('alex cathy'));
+      let cathy1 = element(by.css('alex cathy'));
-      const craig1 = element(by.css('alex craig'));
+      let craig1 = element(by.css('alex craig'));
-      const carol1 = element(by.css('alex carol p'));
+      let carol1 = element(by.css('alex carol p'));
-      const carol2 = element(by.css('barry carol p'));
+      let carol2 = element(by.css('barry carol p'));
 
-      it('"Cathy" should find "Alex" via the component class', () => {
+      it('"Cathy" should find "Alex" via the component class', function () {
         expect(cathy1.getText()).toContain('Found Alex via the component');
       });
 
-      it('"Craig" should not find "Alex" via the base class', () => {
+      it('"Craig" should not find "Alex" via the base class', function () {
         expect(craig1.getText()).toContain('Did not find Alex via the base');
       });
 
-      it('"Carol" within "Alex" should have "Alex" parent', () => {
+      it('"Carol" within "Alex" should have "Alex" parent', function () {
         expect(carol1.getText()).toContain('Alex');
       });
 
-      it('"Carol" within "Barry" should have "Barry" parent', () => {
+      it('"Carol" within "Barry" should have "Barry" parent', function () {
         expect(carol2.getText()).toContain('Barry');
       });
     });

aio/content/examples/dependency-injection-in-action/src/app/app.module.ts

@@ -42,11 +42,11 @@ const declarations = [
     ParentFinderComponent,
 ];
 
-const componentListA = [ AliceComponent, AlexComponent ];
+const a_components = [AliceComponent, AlexComponent ];
 
-const componentListB = [ BarryComponent, BethComponent, BobComponent ];
+const b_components = [ BarryComponent, BethComponent, BobComponent ];
 
-const componentListC = [
+const c_components = [
   CarolComponent, ChrisComponent, CraigComponent,
   CathyComponent
 ];
@@ -61,9 +61,9 @@ const componentListC = [
   ],
   declarations: [
     declarations,
-    componentListA,
+    a_components,
-    componentListB,
+    b_components,
-    componentListC,
+    c_components,
     StorageComponent,
   ],
   bootstrap: [ AppComponent ],

aio/content/examples/dependency-injection-in-action/src/app/hero-data.ts

@@ -3,7 +3,7 @@ import { Hero } from './hero';
 
 export class HeroData {
   createDb() {
-    const heroes = [
+    let heroes = [
       new Hero(1, 'Windstorm'),
       new Hero(2, 'Bombasto'),
       new Hero(3, 'Magneta'),

aio/content/examples/dependency-injection-in-action/src/app/parent-finder.component.ts

@@ -1,4 +1,5 @@
-// tslint:disable: component-selector space-before-function-paren
+/* tslint:disable:no-unused-variable component-selector-name one-line check-open-brace */
+/* tslint:disable:*/
 // #docplaster
 // #docregion
 import { Component, forwardRef, Optional, SkipSelf } from '@angular/core';
@@ -19,7 +20,8 @@ const DifferentParent = Parent;
 // The `parentType` defaults to `Parent` when omitting the second parameter.
 // #docregion provide-the-parent
 export function provideParent
-// #enddocregion provide-the-parent
+// #enddocregion provide-parent, provide-the-parent
+// #docregion provide-parent
   (component: any, parentType?: any) {
     return { provide: parentType || Parent, useExisting: forwardRef(() => component) };
   }

aio/content/examples/dependency-injection-in-action/src/app/runners-up.ts

@@ -22,5 +22,5 @@ export function runnersUpFactory(take: number) {
           .join(', ');
 // #docregion factory-synopsis
   };
-}
+};
 // #enddocregion factory-synopsis

aio/content/examples/dependency-injection-in-action/src/app/user-context.service.ts

@@ -24,7 +24,7 @@ export class UserContextService {
   // #enddocregion ctor, injectables
 
   loadUser(userId: number) {
-    const user = this.userService.getUserById(userId);
+    let user = this.userService.getUserById(userId);
     this.name = user.name;
     this.role = user.role;
 

aio/content/examples/dependency-injection/e2e/src/app.e2e-spec.ts

@@ -1,196 +1,202 @@
+'use strict'; // necessary for es6 output in node
+
 import { browser, element, by, ElementFinder } from 'protractor';
 
-describe('Dependency Injection Tests', () => {
+describe('Dependency Injection Tests', function () {
 
   let expectedMsg: string;
   let expectedMsgRx: RegExp;
 
-  beforeAll(() => {
+  beforeAll(function () {
     browser.get('');
   });
 
-  describe('Cars:', () => {
+  describe('Cars:', function() {
 
-    it('DI car displays as expected', () => {
+    it('DI car displays as expected', function () {
       expectedMsg = 'DI car with 4 cylinders and Flintstone tires.';
       expect(element(by.css('#di')).getText()).toEqual(expectedMsg);
     });
 
-    it('No DI car displays as expected', () => {
+    it('No DI car displays as expected', function () {
       expectedMsg = 'No DI car with 4 cylinders and Flintstone tires.';
       expect(element(by.css('#nodi')).getText()).toEqual(expectedMsg);
     });
 
-    it('Injector car displays as expected', () => {
+    it('Injector car displays as expected', function () {
       expectedMsg = 'Injector car with 4 cylinders and Flintstone tires.';
       expect(element(by.css('#injector')).getText()).toEqual(expectedMsg);
     });
 
-    it('Factory car displays as expected', () => {
+    it('Factory car displays as expected', function () {
       expectedMsg = 'Factory car with 4 cylinders and Flintstone tires.';
       expect(element(by.css('#factory')).getText()).toEqual(expectedMsg);
     });
 
-    it('Simple car displays as expected', () => {
+    it('Simple car displays as expected', function () {
       expectedMsg = 'Simple car with 4 cylinders and Flintstone tires.';
       expect(element(by.css('#simple')).getText()).toEqual(expectedMsg);
     });
 
-    it('Super car displays as expected', () => {
+    it('Super car displays as expected', function () {
       expectedMsg = 'Super car with 12 cylinders and Flintstone tires.';
       expect(element(by.css('#super')).getText()).toEqual(expectedMsg);
     });
 
-    it('Test car displays as expected', () => {
+    it('Test car displays as expected', function () {
       expectedMsg = 'Test car with 8 cylinders and YokoGoodStone tires.';
       expect(element(by.css('#test')).getText()).toEqual(expectedMsg);
     });
   });
 
-  describe('Other Injections:', () => {
+  describe('Other Injections:', function() {
-    it('DI car displays as expected', () => {
+    it('DI car displays as expected', function () {
       expectedMsg = 'DI car with 4 cylinders and Flintstone tires.';
       expect(element(by.css('#car')).getText()).toEqual(expectedMsg);
     });
 
-    it('Hero displays as expected', () => {
+    it('Hero displays as expected', function () {
       expectedMsg = 'Dr Nice';
       expect(element(by.css('#hero')).getText()).toEqual(expectedMsg);
     });
 
-    it('Optional injection displays as expected', () => {
+    it('Optional injection displays as expected', function () {
       expectedMsg = 'R.O.U.S.\'s? I don\'t think they exist!';
       expect(element(by.css('#rodent')).getText()).toEqual(expectedMsg);
     });
   });
 
-  describe('Tests:', () => {
+  describe('Tests:', function() {
 
-    it('Tests display as expected', () => {
+    it('Tests display as expected', function () {
       expectedMsgRx = /Tests passed/;
       expect(element(by.css('#tests')).getText()).toMatch(expectedMsgRx);
     });
 
   });
 
-  describe('Provider variations:', () => {
+  describe('Provider variations:', function() {
 
-    it('P1 (class) displays as expected', () => {
+    it('P1 (class) displays as expected', function () {
       expectedMsg = 'Hello from logger provided with Logger class';
       expect(element(by.css('#p1')).getText()).toEqual(expectedMsg);
     });
 
-    it('P3 (provide) displays as expected', () => {
+    it('P3 (provide) displays as expected', function () {
       expectedMsg = 'Hello from logger provided with useClass:Logger';
       expect(element(by.css('#p3')).getText()).toEqual(expectedMsg);
     });
 
-    it('P4 (useClass:BetterLogger) displays as expected', () => {
+    it('P4 (useClass:BetterLogger) displays as expected', function () {
       expectedMsg = 'Hello from logger provided with useClass:BetterLogger';
       expect(element(by.css('#p4')).getText()).toEqual(expectedMsg);
     });
 
-    it('P5 (useClass:EvenBetterLogger - dependency)  displays as expected', () => {
+    it('P5 (useClass:EvenBetterLogger - dependency)  displays as expected', function () {
       expectedMsg = 'Message to Bob: Hello from EvenBetterlogger';
       expect(element(by.css('#p5')).getText()).toEqual(expectedMsg);
     });
 
-    it('P6a (no alias) displays as expected', () => {
+    it('P6a (no alias) displays as expected', function () {
       expectedMsg = 'Hello OldLogger (but we want NewLogger)';
       expect(element(by.css('#p6a')).getText()).toEqual(expectedMsg);
     });
 
-    it('P6b (alias) displays as expected', () => {
+    it('P6b (alias) displays as expected', function () {
       expectedMsg = 'Hello from NewLogger (via aliased OldLogger)';
       expect(element(by.css('#p6b')).getText()).toEqual(expectedMsg);
     });
 
-    it('P7 (useValue) displays as expected', () => {
+    it('P7 (useValue) displays as expected', function () {
       expectedMsg = 'Silent logger says "Shhhhh!". Provided via "useValue"';
       expect(element(by.css('#p7')).getText()).toEqual(expectedMsg);
     });
 
-    it('P8 (useFactory) displays as expected', () => {
+    it('P8 (useFactory) displays as expected', function () {
       expectedMsg = 'Hero service injected successfully via heroServiceProvider';
       expect(element(by.css('#p8')).getText()).toEqual(expectedMsg);
     });
 
-    it('P9 (InjectionToken) displays as expected', () => {
+    it('P9 (InjectionToken) displays as expected', function () {
       expectedMsg = 'APP_CONFIG Application title is Dependency Injection';
       expect(element(by.css('#p9')).getText()).toEqual(expectedMsg);
     });
 
-    it('P10 (optional dependency) displays as expected', () => {
+    it('P10 (optional dependency) displays as expected', function () {
       expectedMsg = 'Optional logger was not available';
       expect(element(by.css('#p10')).getText()).toEqual(expectedMsg);
     });
   });
 
-  describe('User/Heroes:', () => {
+  describe('User/Heroes:', function() {
-    it('User is Bob - unauthorized', () => {
+    it('User is Bob - unauthorized', function () {
       expectedMsgRx = /Bob, is not authorized/;
       expect(element(by.css('#user')).getText()).toMatch(expectedMsgRx);
     });
 
-    it('should have button', () => {
+    it('should have button', function () {
       expect(element.all(by.cssContainingText('button', 'Next User'))
         .get(0).isDisplayed()).toBe(true, '\'Next User\' button should be displayed');
     });
 
-    it('unauthorized user should have multiple unauthorized heroes', () => {
+    it('unauthorized user should have multiple unauthorized heroes', function () {
-      const heroes = element.all(by.css('#unauthorized app-hero-list div'));
+      let heroes = element.all(by.css('#unauthorized app-hero-list div'));
       expect(heroes.count()).toBeGreaterThan(0);
     });
 
-    it('unauthorized user should have no secret heroes', () => {
+    it('unauthorized user should have no secret heroes', function () {
-      const heroes = element.all(by.css('#unauthorized app-hero-list div'));
+      let heroes = element.all(by.css('#unauthorized app-hero-list div'));
       expect(heroes.count()).toBeGreaterThan(0);
 
-      const filteredHeroes = heroes.filter((elem: ElementFinder, index: number) => {
+      let filteredHeroes = heroes.filter((elem: ElementFinder, index: number) => {
-        return elem.getText().then((text: string) => /secret/.test(text));
+        return elem.getText().then((text: string) => {
+          return /secret/.test(text);
+        });
       });
 
       expect(filteredHeroes.count()).toEqual(0);
     });
 
-    it('unauthorized user should have no authorized heroes listed', () => {
+    it('unauthorized user should have no authorized heroes listed', function () {
       expect(element.all(by.css('#authorized app-hero-list div')).count()).toEqual(0);
     });
 
-    describe('after button click', () => {
+    describe('after button click', function() {
 
-      beforeAll((done: any) => {
+      beforeAll(function (done: any) {
-        const buttonEle = element.all(by.cssContainingText('button', 'Next User')).get(0);
+        let buttonEle = element.all(by.cssContainingText('button', 'Next User')).get(0);
         buttonEle.click().then(done, done);
       });
 
-      it('User is Alice  - authorized', () => {
+      it('User is Alice  - authorized', function () {
         expectedMsgRx = /Alice, is authorized/;
         expect(element(by.css('#user')).getText()).toMatch(expectedMsgRx);
       });
 
-      it('authorized user should have multiple authorized heroes ', () => {
+      it('authorized user should have multiple authorized heroes ', function () {
-        const heroes = element.all(by.css('#authorized app-hero-list div'));
+        let heroes = element.all(by.css('#authorized app-hero-list div'));
         expect(heroes.count()).toBeGreaterThan(0);
       });
 
-      it('authorized user should have multiple authorized heroes with tree-shakeable HeroesService', () => {
+      it('authorized user should have multiple authorized heroes with tree-shakeable HeroesService', function () {
-        const heroes = element.all(by.css('#tspAuthorized app-hero-list div'));
+        let heroes = element.all(by.css('#tspAuthorized app-hero-list div'));
         expect(heroes.count()).toBeGreaterThan(0);
       });
 
-      it('authorized user should have secret heroes', () => {
+      it('authorized user should have secret heroes', function () {
-        const heroes = element.all(by.css('#authorized app-hero-list div'));
+        let heroes = element.all(by.css('#authorized app-hero-list div'));
         expect(heroes.count()).toBeGreaterThan(0);
 
-        const filteredHeroes = heroes.filter((elem: ElementFinder, index: number) => {
+        let filteredHeroes = heroes.filter(function(elem: ElementFinder, index: number) {
-         return elem.getText().then((text: string) => /secret/.test(text));
+         return elem.getText().then(function(text: string) {
+            return /secret/.test(text);
+          });
         });
 
         expect(filteredHeroes.count()).toBeGreaterThan(0);
       });
 
-      it('authorized user should have no unauthorized heroes listed', () => {
+      it('authorized user should have no unauthorized heroes listed', function () {
         expect(element.all(by.css('#unauthorized app-hero-list div')).count()).toEqual(0);
       });
     });

aio/content/examples/dependency-injection/src/app/car/car-creations.ts

@@ -7,7 +7,7 @@ import { Car, Engine, Tires } from './car';
 export function simpleCar() {
   // #docregion car-ctor-instantiation
   // Simple car with 4 cylinders and Flintstone tires.
-  const car = new Car(new Engine(), new Tires());
+  let car = new Car(new Engine(), new Tires());
   // #enddocregion car-ctor-instantiation
   car.description = 'Simple';
   return car;
@@ -16,31 +16,30 @@ export function simpleCar() {
 
 ///////// example 2 ////////////
 // #docregion car-ctor-instantiation-with-param
-class Engine2 {
+  class Engine2 {
     constructor(public cylinders: number) { }
-}
+  }
 // #enddocregion car-ctor-instantiation-with-param
-
 export function superCar() {
-  // #docregion car-ctor-instantiation-with-param
+// #docregion car-ctor-instantiation-with-param
   // Super car with 12 cylinders and Flintstone tires.
-  const bigCylinders = 12;
+  let bigCylinders = 12;
-  const car = new Car(new Engine2(bigCylinders), new Tires());
+  let car = new Car(new Engine2(bigCylinders), new Tires());
-  // #enddocregion car-ctor-instantiation-with-param
+// #enddocregion car-ctor-instantiation-with-param
   car.description = 'Super';
   return car;
 }
 
 /////////// example 3 //////////
-// #docregion car-ctor-instantiation-with-mocks
+  // #docregion car-ctor-instantiation-with-mocks
-class MockEngine extends Engine { cylinders = 8; }
+  class MockEngine extends Engine { cylinders = 8; }
-class MockTires  extends Tires  { make = 'YokoGoodStone'; }
+  class MockTires  extends Tires  { make = 'YokoGoodStone'; }
 
-// #enddocregion car-ctor-instantiation-with-mocks
+  // #enddocregion car-ctor-instantiation-with-mocks
 export function testCar() {
   // #docregion car-ctor-instantiation-with-mocks
   // Test car with 8 cylinders and YokoGoodStone tires.
-  const car = new Car(new MockEngine(), new MockTires());
+  let car = new Car(new MockEngine(), new MockTires());
   // #enddocregion car-ctor-instantiation-with-mocks
   car.description = 'Test';
   return car;

aio/content/examples/dependency-injection/src/app/car/car-factory.ts

@@ -4,7 +4,7 @@ import { Engine, Tires, Car } from './car';
 // BAD pattern!
 export class CarFactory {
   createCar() {
-    const car = new Car(this.createEngine(), this.createTires());
+    let car = new Car(this.createEngine(), this.createTires());
     car.description = 'Factory';
     return car;
   }

aio/content/examples/dependency-injection/src/app/car/car-injector.ts

@@ -26,14 +26,14 @@ export function useInjector() {
     ]
   });
   // #docregion injector-call
-  const car = injector.get(Car);
+  let car = injector.get(Car);
   // #enddocregion injector-call, injector-create-and-call
   car.description = 'Injector';
 
   injector = Injector.create({
     providers: [{ provide: Logger, deps: [] }]
   });
-  const logger = injector.get(Logger);
+  let logger = injector.get(Logger);
   logger.log('Injector car.drive() said: ' + car.drive());
   return car;
 }

aio/content/examples/dependency-injection/src/app/car/car.component.ts

@@ -27,9 +27,9 @@ import { useInjector } from './car-injector';
   providers: [Car, Engine, Tires]
 })
 export class CarComponent {
-  factoryCar  = (new CarFactory()).createCar();
+  factoryCar  = (new CarFactory).createCar();
   injectorCar = useInjector();
-  noDiCar     = new CarNoDi();
+  noDiCar     = new CarNoDi;
   simpleCar   = simpleCar();
   superCar    = superCar();
   testCar     = testCar();

aio/content/examples/dependency-injection/src/app/heroes/hero.service.provider.ts

@@ -5,7 +5,7 @@ import { Logger } from '../logger.service';
 import { UserService } from '../user.service';
 
 // #docregion factory
-const heroServiceFactory = (logger: Logger, userService: UserService) => {
+let heroServiceFactory = (logger: Logger, userService: UserService) => {
   return new HeroService(logger, userService.user.isAuthorized);
 };
 // #enddocregion factory

aio/content/examples/dependency-injection/src/app/heroes/hero.service.ts

@@ -17,7 +17,7 @@ export class HeroService {
     private isAuthorized: boolean) { }
 
   getHeroes() {
-    const auth = this.isAuthorized ? 'authorized ' : 'unauthorized';
+    let auth = this.isAuthorized ? 'authorized ' : 'unauthorized';
     this.logger.log(`Getting heroes for ${auth} user.`);
     return HEROES.filter(hero => this.isAuthorized || !hero.isSecret);
   }

aio/content/examples/dependency-injection/src/app/injector.component.ts

@@ -36,7 +36,7 @@ export class InjectorComponent implements OnInit {
   }
 
   get rodent() {
-    const rousDontExist = `R.O.U.S.'s? I don't think they exist!`;
+    let rousDontExist = `R.O.U.S.'s? I don't think they exist!`;
     return this.injector.get(ROUS, rousDontExist);
   }
 }

aio/content/examples/dependency-injection/src/app/providers.component.ts

@@ -18,7 +18,7 @@ const template = '{{log}}';
 
 @Component({
   selector: 'provider-1',
-  template,
+  template: template,
   // #docregion providers-1, providers-logger
   providers: [Logger]
   // #enddocregion providers-1, providers-logger
@@ -35,7 +35,7 @@ export class Provider1Component {
 
 @Component({
   selector: 'provider-3',
-  template,
+  template: template,
   providers:
     // #docregion providers-3
     [{ provide: Logger, useClass: Logger }]
@@ -54,7 +54,7 @@ export class BetterLogger extends Logger {}
 
 @Component({
   selector: 'provider-4',
-  template,
+  template: template,
   providers:
     // #docregion providers-4
     [{ provide: Logger, useClass: BetterLogger }]
@@ -76,7 +76,7 @@ export class EvenBetterLogger extends Logger {
   constructor(private userService: UserService) { super(); }
 
   log(message: string) {
-    const name = this.userService.user.name;
+    let name = this.userService.user.name;
     super.log(`Message to ${name}: ${message}`);
   }
 }
@@ -84,7 +84,7 @@ export class EvenBetterLogger extends Logger {
 
 @Component({
   selector: 'provider-5',
-  template,
+  template: template,
   providers:
     // #docregion providers-5
     [ UserService,
@@ -107,12 +107,12 @@ export class OldLogger {
   logs: string[] = [];
   log(message: string) {
     throw new Error('Should not call the old logger!');
-  }
+  };
 }
 
 @Component({
   selector: 'provider-6a',
-  template,
+  template: template,
   providers:
     // #docregion providers-6a
     [ NewLogger,
@@ -135,7 +135,7 @@ export class Provider6aComponent {
 
 @Component({
   selector: 'provider-6b',
-  template,
+  template: template,
   providers:
     // #docregion providers-6b
     [ NewLogger,
@@ -168,7 +168,7 @@ export const SilentLogger = {
 
 @Component({
   selector: 'provider-7',
-  template,
+  template: template,
   providers:
     // #docregion providers-7
     [{ provide: Logger, useValue: SilentLogger }]
@@ -186,7 +186,7 @@ export class Provider7Component {
 
 @Component({
   selector: 'provider-8',
-  template,
+  template: template,
   providers: [heroServiceProvider, Logger, UserService]
 })
 export class Provider8Component {
@@ -202,7 +202,7 @@ export class Provider8Component {
 
 @Component({
   selector: 'provider-9',
-  template,
+  template: template,
   /*
    // #docregion providers-9-interface
    // FAIL! Can't use interface as provider token
@@ -237,11 +237,11 @@ export class Provider9Component implements OnInit {
 import { Optional } from '@angular/core';
 // #enddocregion import-optional
 
-const someMessage = 'Hello from the injected logger';
+let some_message = 'Hello from the injected logger';
 
 @Component({
   selector: 'provider-10',
-  template,
+  template: template,
   providers: [{ provide: Logger, useValue: null }]
 })
 export class Provider10Component implements OnInit {
@@ -249,7 +249,7 @@ export class Provider10Component implements OnInit {
   // #docregion provider-10-ctor
   constructor(@Optional() private logger?: Logger) {
     if (this.logger) {
-      this.logger.log(someMessage);
+      this.logger.log(some_message);
     }
   }
   // #enddocregion provider-10-ctor