release: cut the v7.0.2 release

build: remove problematic yarn prefix for running bazel
fix(core): Remove static dependency from @angular/core to @angular/compiler (#26734 ) (#26879 )
2026-09-14 13:54:52 +08:00 · 2018-10-31 16:05:54 -07:00 · 2018-10-31 16:03:29 -07:00 · 2018-10-31 13:14:01 -07:00 · 2018-10-31 12:50:28 -04:00 · 2018-10-31 12:50:28 -04:00
9755 changed files with 334075 additions and 911261 deletions
@@ -1,94 +1,3 @@
-# Bazel does not yet support wildcards or other .gitignore semantics for
-# .bazelignore. Two issues for this feature request are outstanding:
-# https://github.com/bazelbuild/bazel/issues/7093
-# https://github.com/bazelbuild/bazel/issues/8106
-.git
 node_modules
 dist
-aio/content
 aio/node_modules
-aio/tools/examples/shared/node_modules
-packages/bazel/node_modules
-integration/bazel/bazel-bazel
-integration/bazel/bazel-bin
-integration/bazel/bazel-out
-integration/bazel/bazel-testlogs
-integration/bazel-schematics/demo
-# All integration test node_modules folders
-integration/bazel/node_modules
-integration/bazel-schematics/node_modules
-integration/cli-elements-universal/node_modules
-integration/cli-hello-world/node_modules
-integration/cli-hello-world-ivy-compat/node_modules
-integration/cli-hello-world-ivy-i18n/node_modules
-integration/cli-hello-world-ivy-minimal/node_modules
-integration/cli-hello-world-lazy/node_modules
-integration/dynamic-compiler/node_modules
-integration/hello_world__closure/node_modules
-integration/hello_world__systemjs_umd/node_modules
-integration/i18n/node_modules
-integration/injectable-def/node_modules
-integration/ivy-i18n/node_modules
-integration/ng_elements/node_modules
-integration/ng_elements_schematics/node_modules
-integration/ng_update/node_modules
-integration/ng_update_migrations/node_modules
-integration/ngcc/node_modules
-integration/platform-server/node_modules
-integration/service-worker-schema/node_modules
-integration/side-effects/node_modules
-integration/terser/node_modules
-integration/typings_test_ts36/node_modules
-integration/typings_test_ts37/node_modules
-# All integration test .yarn_local_cache folders
-integration/bazel/.yarn_local_cache
-integration/bazel-schematics/.yarn_local_cache
-integration/cli-elements-universal/.yarn_local_cache
-integration/cli-hello-world/.yarn_local_cache
-integration/cli-hello-world-ivy-compat/.yarn_local_cache
-integration/cli-hello-world-ivy-i18n/.yarn_local_cache
-integration/cli-hello-world-ivy-minimal/.yarn_local_cache
-integration/cli-hello-world-lazy/.yarn_local_cache
-integration/dynamic-compiler/.yarn_local_cache
-integration/hello_world__closure/.yarn_local_cache
-integration/hello_world__systemjs_umd/.yarn_local_cache
-integration/i18n/.yarn_local_cache
-integration/injectable-def/.yarn_local_cache
-integration/ivy-i18n/.yarn_local_cache
-integration/ng_elements/.yarn_local_cache
-integration/ng_elements_schematics/.yarn_local_cache
-integration/ng_update/.yarn_local_cache
-integration/ng_update_migrations/.yarn_local_cache
-integration/ngcc/.yarn_local_cache
-integration/platform-server/.yarn_local_cache
-integration/service-worker-schema/.yarn_local_cache
-integration/side-effects/.yarn_local_cache
-integration/terser/.yarn_local_cache
-integration/typings_test_ts36/.yarn_local_cache
-integration/typings_test_ts37/.yarn_local_cache
-# All integration test NPM_PACKAGE_MANIFEST.json folders
-integration/bazel/NPM_PACKAGE_MANIFEST.json
-integration/bazel-schematics/NPM_PACKAGE_MANIFEST.json
-integration/cli-elements-universal/NPM_PACKAGE_MANIFEST.json
-integration/cli-hello-world/NPM_PACKAGE_MANIFEST.json
-integration/cli-hello-world-ivy-compat/NPM_PACKAGE_MANIFEST.json
-integration/cli-hello-world-ivy-i18n/NPM_PACKAGE_MANIFEST.json
-integration/cli-hello-world-ivy-minimal/NPM_PACKAGE_MANIFEST.json
-integration/cli-hello-world-lazy/NPM_PACKAGE_MANIFEST.json
-integration/dynamic-compiler/NPM_PACKAGE_MANIFEST.json
-integration/hello_world__closure/NPM_PACKAGE_MANIFEST.json
-integration/hello_world__systemjs_umd/NPM_PACKAGE_MANIFEST.json
-integration/i18n/NPM_PACKAGE_MANIFEST.json
-integration/injectable-def/NPM_PACKAGE_MANIFEST.json
-integration/ivy-i18n/NPM_PACKAGE_MANIFEST.json
-integration/ng_elements/NPM_PACKAGE_MANIFEST.json
-integration/ng_elements_schematics/NPM_PACKAGE_MANIFEST.json
-integration/ng_update/NPM_PACKAGE_MANIFEST.json
-integration/ng_update_migrations/NPM_PACKAGE_MANIFEST.json
-integration/ngcc/NPM_PACKAGE_MANIFEST.json
-integration/platform-server/NPM_PACKAGE_MANIFEST.json
-integration/service-worker-schema/NPM_PACKAGE_MANIFEST.json
-integration/side-effects/NPM_PACKAGE_MANIFEST.json
-integration/terser/NPM_PACKAGE_MANIFEST.json
-integration/typings_test_ts36/NPM_PACKAGE_MANIFEST.json
-integration/typings_test_ts37/NPM_PACKAGE_MANIFEST.json
@@ -1,3 +1,12 @@
+###############################
+# Typescript / Angular / Sass #
+###############################
+
+# Make compilation fast, by keeping a few copies of the compilers
+# running as daemons, and cache SourceFile AST's to reduce parse time.
+build --strategy=TypeScriptCompile=worker
+build --strategy=AngularTemplateCompile=worker
+
 # Enable debugging tests with --config=debug
 test:debug --test_arg=--node_options=--inspect-brk --test_output=streamed --test_strategy=exclusive --test_timeout=9999 --nocache_test_results

@@ -5,54 +14,22 @@ test:debug --test_arg=--node_options=--inspect-brk --test_output=streamed --test
 # Filesystem interactions     #
 ###############################

-# Create symlinks in the project:
-# - dist/bin for outputs
-# - dist/testlogs, dist/genfiles
-# - bazel-out
-# NB: bazel-out should be excluded from the editor configuration.
-# The checked-in /.vscode/settings.json does this for VSCode.
-# Other editors may require manual config to ignore this directory.
-# In the past, we say a problem where VSCode traversed a massive tree, opening file handles and
+# Don't create symlinks like bazel-out in the project.
+# These cause VSCode to traverse a massive tree, opening file handles and
 # eventually a surprising failure with auto-discovery of the C++ toolchain in
 # MacOS High Sierra.
 # See https://github.com/bazelbuild/bazel/issues/4603
-build --symlink_prefix=dist/
+build --symlink_prefix=/

-# Turn off legacy external runfiles
-build --nolegacy_external_runfiles
-run --nolegacy_external_runfiles
-test --nolegacy_external_runfiles
-
-# Turn on --incompatible_strict_action_env which was on by default
-# in Bazel 0.21.0 but turned off again in 0.22.0. Follow
-# https://github.com/bazelbuild/bazel/issues/7026 for more details.
-# This flag is needed to so that the bazel cache is not invalidated
-# when running bazel via `yarn bazel`.
-# See https://github.com/angular/angular/issues/27514.
-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
+# Performance: avoid stat'ing input files
+build --watchfs

 ###############################
 # Release support             #
-# Turn on these settings with #
-#  --config=release           #
 ###############################

 # 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 --mode=release"
-build:release --stamp
-
-# Snapshots should also be stamped with version control information.
-build:snapshot --workspace_status_command="yarn -s ng-dev release build-env-stamp --mode=snapshot"
-build:snapshot --stamp
+build --workspace_status_command=./tools/bazel_stamp_vars.sh

 ###############################
 # Output                      #
@@ -65,89 +42,21 @@ query --output=label_kind
 # By default, failing tests don't print any output, it goes to the log file
 test --test_output=errors

+# Show which actions are run under workers,
+# and print all the actions running in parallel.
+# Helps to demonstrate that bazel uses all the cores on the machine.
+build --experimental_ui
+test --experimental_ui
+
 ################################
 # Settings for CircleCI        #
 ################################

-# Bazel flags for CircleCI are in /.circleci/bazel.linux.rc and /.circleci/bazel.windows.rc
-
-##################################
-# Settings for integration tests #
-##################################
-
-# Trick bazel into treating BUILD files under integration/bazel as being regular files
-# This lets us glob() up all the files inside this integration test to make them inputs to tests
-# (Note, we cannot use common --deleted_packages because the bazel version command doesn't support it)
-build --deleted_packages=integration/bazel,integration/bazel/src,integration/bazel/src/hello-world,integration/bazel/test,integration/bazel/tools,integration/bazel/test/e2e
-query --deleted_packages=integration/bazel,integration/bazel/src,integration/bazel/src/hello-world,integration/bazel/test,integration/bazel/tools,integration/bazel/test/e2e
+# Bazel flags for CircleCI are in /.circleci/bazel.rc

 ################################
 # Temporary Settings for Ivy   #
 ################################
-# To determine if the compiler used should be Ivy instead of ViewEngine, one can use `--config=ivy`
-# on any bazel target. This is a temporary flag until codebase is permanently switched to Ivy.
-build --define=angular_ivy_enabled=False
-
-build:view-engine --define=angular_ivy_enabled=False
-build:ivy --define=angular_ivy_enabled=True
-
-##################################
-# Remote Build Execution support #
-# Turn on these settings with    #
-#  --config=remote               #
-##################################
-
-# The following --define=EXECUTOR=remote will be able to be removed
-# once https://github.com/bazelbuild/bazel/issues/7254 is fixed
-build:remote --define=EXECUTOR=remote
-
-# Set a higher timeout value, just in case.
-build:remote --remote_timeout=600
-
-# Increase the default number of jobs by 50% because our build has lots of
-# parallelism
-build:remote --jobs=150
-build:remote --google_default_credentials
-
-# Force remote exeuctions to consider the entire run as linux
-build:remote --cpu=k8
-build:remote --host_cpu=k8
-
-# Toolchain and platform related flags
-build:remote --crosstool_top=@npm//@angular/dev-infra-private/bazel/remote-execution/cpp:cc_toolchain_suite
-build:remote --extra_toolchains=@npm//@angular/dev-infra-private/bazel/remote-execution/cpp:cc_toolchain
-build:remote --extra_execution_platforms=@npm//@angular/dev-infra-private/bazel/remote-execution:platform
-build:remote --host_platform=@npm//@angular/dev-infra-private/bazel/remote-execution:platform
-build:remote --platforms=@npm//@angular/dev-infra-private/bazel/remote-execution:platform
-
-# Remote instance and caching
-build:remote --remote_instance_name=projects/internal-200822/instances/primary_instance
-build:remote --project_id=internal-200822
-build:remote --remote_cache=remotebuildexecution.googleapis.com
-build:remote --remote_executor=remotebuildexecution.googleapis.com
-
-##################################
-# Saucelabs tests settings       #
-# Turn on these settings with    #
-#  --config=saucelabs            #
-##################################
-
-# For saucelabs tests we don't want to enable flaky test attempts. Karma has its own integrated
-# retry mechanism and we do not want to retry unnecessarily if Karma already tried multiple times.
-test:saucelabs --flaky_test_attempts=1
-
-################
-# Flag Aliases #
-################
-
-# --ng_perf will ask the Ivy compiler to produce performance results for each build.
-build --flag_alias=ng_perf=//packages/compiler-cli:ng_perf
-
-####################################################
-# User bazel configuration
-# NOTE: This needs to be the *last* entry in the config.
-####################################################
-
-# Load any settings which are specific to the current user. Needs to be *last* statement
-# in this config, as the user configuration should be able to overwrite flags from this file.
-try-import .bazelrc.user
+# to determine if the compiler used should be Ivy or ViewEngine one can use `--define=compile=local` on
+# any bazel target. This is a temporary flag until codebase is permanently switched to Ivy.
+build --define=compile=legacy
@@ -1 +0,0 @@
-4.0.0
@@ -0,0 +1,3 @@
+{
+  "directory" : "bower_components"
+}
@@ -12,8 +12,8 @@ We use this as a symmetric AES encryption key to encrypt tokens like
 a GitHub token that enables publishing snapshots.

 To create the github_token file, we take this approach:
- Find the angular-builds:token in 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
- If needed, base64-encode the result so you can copy-paste it out of docker: `base64 github_token`
+- If needed, base64-encode the result so you can copy-paste it out of docker: `base64 github_token`
@@ -1,15 +0,0 @@
-# Settings in this file should be OS agnostic. Use the bazel.<OS>.rc files for OS specific settings.
-
-# Don't be spammy in the logs
-build --noshow_progress
-
-# Print all the options that apply to the build.
-# This helps us diagnose which options override others
-# (e.g. /etc/bazel.bazelrc vs. tools/bazel.rc)
-build --announce_rc
-
-# Retry in the event of flakes, eg. https://circleci.com/gh/angular/angular/31309
-test --flaky_test_attempts=2
-
-# More details on failures
-build --verbose_failures=true
@@ -1,23 +0,0 @@
-# These options are enabled when running on CI
-# We do this by copying this file to /etc/bazel.bazelrc at the start of the build.
-# See documentation in /docs/BAZEL.md
-
-# Import config items common to both Linux and Windows setups.
-# https://docs.bazel.build/versions/master/guide.html#bazelrc-syntax-and-semantics
-try-import %workspace%/.circleci/bazel.common.rc
-
-# Save downloaded repositories in a location that can be cached by CircleCI. This helps us
-# speeding up the analysis time significantly with Bazel managed node dependencies on the CI.
-build --repository_cache=/home/circleci/bazel_repository_cache
-
-# Workaround https://github.com/bazelbuild/bazel/issues/3645
-# Bazel doesn't calculate the memory ceiling correctly when running under Docker.
-# Limit Bazel to consuming resources that fit in CircleCI "xlarge" class
-# https://circleci.com/docs/2.0/configuration-reference/#resource_class
-build --local_cpu_resources=20
-build --local_ram_resources=32768
-
-# All build executed remotely should be done using our RBE configuration.
-build:remote --google_default_credentials
-
-build --config=remote
@@ -0,0 +1,33 @@
+# These options are enabled when running on CI
+# We do this by copying this file to /etc/bazel.bazelrc at the start of the build.
+# See remote cache documentation in /docs/BAZEL.md
+
+# Don't be spammy in the logs
+# TODO(gmagolan): Hide progress again once build performance improves
+# Presently, CircleCI can timeout during bazel test ... with the following
+# error: Too long with no output (exceeded 10m0s)
+# build --noshow_progress
+
+# Don't run manual tests
+test --test_tag_filters=-manual
+
+# Print all the options that apply to the build.
+# This helps us diagnose which options override others
+# (e.g. /etc/bazel.bazelrc vs. tools/bazel.rc)
+build --announce_rc
+
+# Create dist/bin symlink to $(bazel info bazel-bin)
+# We use this when uploading artifacts after the build finishes
+build --symlink_prefix=dist/
+
+# Workaround https://github.com/bazelbuild/bazel/issues/3645
+# Bazel doesn't calculate the memory ceiling correctly when running under Docker.
+# Limit Bazel to consuming resources that fit in CircleCI "xlarge" class
+# https://circleci.com/docs/2.0/configuration-reference/#resource_class
+build --local_resources=14336,8.0,1.0
+
+# Retry in the event of flakes, eg. https://circleci.com/gh/angular/angular/31309
+test --flaky_test_attempts=2
+
+# More details on failures
+build --verbose_failures=true
@@ -1,17 +0,0 @@
-# These options are enabled when running on CI
-# We do this by copying this file to $env:ProgramData\bazel.bazelrc at the start of the build.
-# See documentation in /docs/BAZEL.md
-
-# Import config items common to both Linux and Windows setups.
-# https://docs.bazel.build/versions/master/guide.html#bazelrc-syntax-and-semantics
-try-import %workspace%/.circleci/bazel.common.rc
-
-# Manually set the local resources used in windows CI runs
-build --local_ram_resources=120000
-build --local_cpu_resources=32
-
-# All windows jobs run on master and should use http caching
-build --remote_http_cache=https://storage.googleapis.com/angular-team-cache
-build --remote_accept_cached=true
-build --remote_upload_local_results=true
-build --google_default_credentials
@@ -15,7 +15,7 @@
 #
 # Usage: `setPublicVar <name> <value>`
 function setPublicVar() {
-  setSecretVar $1 "$2";
+  setSecretVar $1 $2;
  echo "$1=$2";
 }

@@ -36,38 +36,3 @@ function setSecretVar() {
  # Restore original shell options.
  eval "$originalShellOptions";
 }
-
-
-# Create a function to set an environment variable, when called.
-#
-# Use this function for creating setter for public environment variables that require expensive or
-# time-consuming computaions and may not be needed. When needed, you can call this function to set
-# the environment variable (which will be available through `$BASH_ENV` from that point onwards).
-#
-# Arguments:
-# - `<name>`: The name of the environment variable. The generated setter function will be
-#   `setPublicVar_<name>`.
-# - `<code>`: The code to run to compute the value for the variable. Since this code should be
-#   executed lazily, it must be properly escaped. For example:
-#   ```sh
-#   # DO NOT do this:
-#   createPublicVarSetter MY_VAR "$(whoami)";  # `whoami` will be evaluated eagerly
-#
-#   # DO this isntead:
-#   createPublicVarSetter MY_VAR "\$(whoami)";  # `whoami` will NOT be evaluated eagerly
-#   ```
-#
-# Usage: `createPublicVarSetter <name> <code>`
-#
-# Example:
-# ```sh
-# createPublicVarSetter MY_VAR 'echo "FOO"';
-# echo $MY_VAR;  # Not defined
-#
-# setPublicVar_MY_VAR;
-# source $BASH_ENV;
-# echo $MY_VAR;  # FOO
-# ```
-function createPublicVarSetter() {
-  echo "setPublicVar_$1() { setPublicVar $1 \"$2\"; }" >> $BASH_ENV;
-}
@@ -1,11 +1,7 @@
 #!/usr/bin/env bash

-# Variables
-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`).
+readonly envHelpersPath="`dirname $0`/env-helpers.inc.sh";
 source $envHelpersPath;
 echo "source $envHelpersPath;" >> $BASH_ENV;

@@ -13,32 +9,17 @@ echo "source $envHelpersPath;" >> $BASH_ENV;
 ####################################################################################################
 # Define PUBLIC environment variables for CircleCI.
 ####################################################################################################
-# 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 "$(pwd)";
 setPublicVar CI_AIO_MIN_PWA_SCORE "95";
 # This is the branch being built; e.g. `pull/12345` for PR builds.
 setPublicVar CI_BRANCH "$CIRCLE_BRANCH";
-setPublicVar CI_BUILD_URL "$CIRCLE_BUILD_URL";
 setPublicVar CI_COMMIT "$CIRCLE_SHA1";
-# `CI_COMMIT_RANGE` is only used on push builds (a.k.a. non-PR, non-scheduled builds and rerun
-# workflows of such builds).
-setPublicVar CI_GIT_BASE_REVISION "${CIRCLE_GIT_BASE_REVISION}";
-setPublicVar CI_GIT_REVISION "${CIRCLE_GIT_REVISION}";
-setPublicVar CI_COMMIT_RANGE "$CIRCLE_GIT_BASE_REVISION..$CIRCLE_GIT_REVISION";
+# `CI_COMMIT_RANGE` will only be available when `CIRCLE_COMPARE_URL` is also available,
+# i.e. on push builds (a.k.a. non-PR builds). That is fine, since we only need it in push builds.
+setPublicVar CI_COMMIT_RANGE "$(sed -r 's|^.*/([0-9a-f]+\.\.\.[0-9a-f]+)$|\1|i' <<< ${CIRCLE_COMPARE_URL:-})";
 setPublicVar CI_PULL_REQUEST "${CIRCLE_PR_NUMBER:-false}";
 setPublicVar CI_REPO_NAME "$CIRCLE_PROJECT_REPONAME";
 setPublicVar CI_REPO_OWNER "$CIRCLE_PROJECT_USERNAME";
-setPublicVar CI_PR_REPONAME "$CIRCLE_PR_REPONAME";
-setPublicVar CI_PR_USERNAME "$CIRCLE_PR_USERNAME";
-
-
-####################################################################################################
-# Define "lazy" PUBLIC environment variables for CircleCI.
-# (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/')";


 ####################################################################################################
@@ -46,68 +27,9 @@ createPublicVarSetter CI_STABLE_BRANCH "\$(npm info @angular/core dist-tags.late
 ####################################################################################################
 setSecretVar CI_SECRET_AIO_DEPLOY_FIREBASE_TOKEN "$AIO_DEPLOY_TOKEN";
 setSecretVar CI_SECRET_PAYLOAD_FIREBASE_TOKEN "$ANGULAR_PAYLOAD_TOKEN";
+# Defined in https://angular-team.slack.com/apps/A0F7VRE7N-circleci.
+setSecretVar CI_SECRET_SLACK_CARETAKER_WEBHOOK_URL "$SLACK_CARETAKER_WEBHOOK_URL";


-####################################################################################################
-# Define SauceLabs environment variables for CircleCI.
-####################################################################################################
-setPublicVar SAUCE_USERNAME "angular-framework";
-setSecretVar SAUCE_ACCESS_KEY "0c731274ed5f-cbc9-16f4-021a-9835e39f";
-# TODO(josephperrott): Remove environment variables once all saucelabs tests are via bazel method.
-setPublicVar SAUCE_LOG_FILE /tmp/angular/sauce-connect.log
-setPublicVar SAUCE_READY_FILE /tmp/angular/sauce-connect-ready-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}"
-# 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.
-setPublicVar SAUCE_READY_FILE_TIMEOUT 120
-
-
-####################################################################################################
-# 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
-# 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
-# the `save_cache` path configuration in `config.yml`
-setPublicVar COMPONENTS_REPO_TMP_DIR "/tmp/angular-components-repo"
-setPublicVar COMPONENTS_REPO_URL "https://github.com/angular/components.git"
-setPublicVar COMPONENTS_REPO_BRANCH "master"
-# **NOTE**: When updating the commit SHA, also update the cache key in the CircleCI `config.yml`.
-setPublicVar COMPONENTS_REPO_COMMIT "d090617912da8e70aa336aa5b4d804b1b535402e"
-
-
-####################################################################################################
-# Decrypt GCP Credentials and store them as the Google default credentials.
-####################################################################################################
-mkdir -p "$HOME/.config/gcloud";
-openssl aes-256-cbc -d -in "${projectDir}/.circleci/gcp_token" \
-        -md md5 -k "$CIRCLE_PROJECT_REPONAME" -out "$HOME/.config/gcloud/application_default_credentials.json"
-####################################################################################################
-# Set bazel configuration for CircleCI runs.
-####################################################################################################
-cp "${projectDir}/.circleci/bazel.linux.rc" "$HOME/.bazelrc";
-
-####################################################################################################
-# Create shell script in /tmp for Bazel actions to access CI envs without
-# busting the cache. Used by payload-size.sh script in integration tests.
-####################################################################################################
-readonly bazelVarEnv="/tmp/bazel-ci-env.sh"
-echo "# Setup by /.circle/env.sh" > $bazelVarEnv
-echo "export PROJECT_ROOT=\"${PROJECT_ROOT}\";" >> $bazelVarEnv
-echo "export CI_BRANCH=\"${CI_BRANCH}\";" >> $bazelVarEnv
-echo "export CI_BUILD_URL=\"${CI_BUILD_URL}\";" >> $bazelVarEnv
-echo "export CI_COMMIT=\"${CI_COMMIT}\";" >> $bazelVarEnv
-echo "export CI_COMMIT_RANGE=\"${CI_COMMIT_RANGE}\";" >> $bazelVarEnv
-echo "export CI_PULL_REQUEST=\"${CI_PULL_REQUEST}\";" >> $bazelVarEnv
-echo "export CI_REPO_NAME=\"${CI_REPO_NAME}\";" >> $bazelVarEnv
-echo "export CI_REPO_OWNER=\"${CI_REPO_OWNER}\";" >> $bazelVarEnv
-echo "export CI_SECRET_PAYLOAD_FIREBASE_TOKEN=\"${CI_SECRET_PAYLOAD_FIREBASE_TOKEN}\";" >> $bazelVarEnv
-
-####################################################################################################
-####################################################################################################
-##                  Source `$BASH_ENV` to make the variables available immediately.               ##
-##                  ***NOTE: This must remain the last action in this script***               ##
-####################################################################################################
-####################################################################################################
+# Source `$BASH_ENV` to make the variables available immediately.
 source $BASH_ENV;
@@ -0,0 +1,77 @@
+# These options are enabled when running on CI with Remote Build Execution.
+
+################################################################
+# Toolchain related flags for remote build execution.          #
+################################################################
+# Remote Build Execution requires a strong hash function, such as SHA256.
+startup --host_jvm_args=-Dbazel.DigestFunction=SHA256
+
+# Depending on how many machines are in the remote execution instance, setting
+# this higher can make builds faster by allowing more jobs to run in parallel.
+# Setting it too high can result in jobs that timeout, however, while waiting
+# for a remote machine to execute them.
+build --jobs=150
+
+# Set several flags related to specifying the platform, toolchain and java
+# properties.
+# These flags are duplicated rather than imported from (for example)
+# %workspace%/configs/ubuntu16_04_clang/1.0/toolchain.bazelrc to make this
+# bazelrc a standalone file that can be copied more easily.
+# These flags should only be used as is for the rbe-ubuntu16-04 container
+# and need to be adapted to work with other toolchain containers.
+build --host_javabase=@bazel_toolchains//configs/ubuntu16_04_clang/1.0:jdk8
+build --javabase=@bazel_toolchains//configs/ubuntu16_04_clang/1.0:jdk8
+build --host_java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8
+build --java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8
+build --crosstool_top=@bazel_toolchains//configs/ubuntu16_04_clang/1.0/bazel_0.15.0/default:toolchain
+build --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
+# Platform flags:
+# The toolchain container used for execution is defined in the target indicated
+# by "extra_execution_platforms", "host_platform" and "platforms".
+# If you are using your own toolchain container, you need to create a platform
+# target with "constraint_values" that allow for the toolchain specified with
+# "extra_toolchains" to be selected (given constraints defined in
+# "exec_compatible_with").
+# More about platforms: https://docs.bazel.build/versions/master/platforms.html
+build --extra_toolchains=@bazel_toolchains//configs/ubuntu16_04_clang/1.0/bazel_0.15.0/cpp:cc-toolchain-clang-x86_64-default
+build --extra_execution_platforms=//tools:rbe_ubuntu1604-angular
+build --host_platform=//tools:rbe_ubuntu1604-angular
+build --platforms=//tools:rbe_ubuntu1604-angular
+
+# Set various strategies so that all actions execute remotely. Mixing remote
+# and local execution will lead to errors unless the toolchain and remote
+# machine exactly match the host machine.
+build --spawn_strategy=remote
+build --strategy=Javac=remote
+build --strategy=Closure=remote
+build --genrule_strategy=remote
+build --define=EXECUTOR=remote
+
+# Enable the remote cache so action results can be shared across machines,
+# developers, and workspaces.
+build --remote_cache=remotebuildexecution.googleapis.com
+
+# Enable remote execution so actions are performed on the remote systems.
+build --remote_executor=remotebuildexecution.googleapis.com
+
+# Remote instance.
+build --remote_instance_name=projects/internal-200822/instances/default_instance
+
+# Enable encryption.
+build --tls_enabled=true
+
+# Enforce stricter environment rules, which eliminates some non-hermetic
+# behavior and therefore improves both the remote cache hit rate and the
+# correctness and repeatability of the build.
+build --experimental_strict_action_env=true
+
+# Set a higher timeout value, just in case.
+build --remote_timeout=3600
+
+# Enable authentication. This will pick up application default credentials by
+# default. You can use --auth_credentials=some_file.json to use a service
+# account credential instead.
+build --auth_enabled=true
+
+# Do not accept remote cache.
+build --remote_accept_cached=false
@@ -1,207 +0,0 @@
-/**
- * @license
- * Copyright Google LLC All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-/**
- * Rebases the current branch on top of the GitHub PR target branch.
- *
- * **Context:**
- * Since a GitHub PR is not necessarily up to date with its target branch, it is useful to rebase
- * prior to testing it on CI to ensure more up to date test results.
- *
- * **NOTE:**
- * This script cannot use external dependencies or be compiled because it needs to run before the
- * environment is setup.
- * Use only features supported by the NodeJS versions used in the environment.
- */
-// tslint:disable:no-console
-const {execSync} = require('child_process');
-
-
-/** A regex to select a ref that matches our semver refs. */
-const semverRegex = /^(\d+)\.(\d+)\.x$/;
-
-// Run
-_main().catch(err => {
-  console.log('Failed to rebase on top of target branch.\n');
-  console.error(err);
-  process.exitCode = 1;
-});
-
-// Helpers
-async function _main() {
-  const refs = await getRefsAndShasForChange();
-
-  // Log known refs and shas
-  console.log(`--------------------------------`);
-  console.log(`    Target Branch:                   ${refs.base.ref}`);
-  console.log(`    Latest Commit for Target Branch: ${refs.target.latestSha}`);
-  console.log(`    Latest Commit for PR:            ${refs.base.latestSha}`);
-  console.log(`    First Common Ancestor SHA:       ${refs.commonAncestorSha}`);
-  console.log(`--------------------------------`);
-  console.log();
-
-  // Get the count of commits between the latest commit from origin and the common ancestor SHA.
-  const commitCount =
-      exec(`git rev-list --count origin/${refs.base.ref}...${refs.commonAncestorSha}`);
-  console.log(`Checking ${commitCount} commits for changes in the CircleCI config file.`);
-
-  // Check if the files changed between the latest commit from origin and the common ancestor SHA
-  // includes the CircleCI config.
-  const circleCIConfigChanged = exec(`git diff --name-only origin/${refs.base.ref} ${
-      refs.commonAncestorSha} -- .circleci/config.yml`);
-
-  if (!!circleCIConfigChanged) {
-    throw Error(`
-        CircleCI config on ${refs.base.ref} has been modified since commit
-        ${refs.commonAncestorSha.slice(0, 7)}, which this PR is based on.
-
-        Please rebase the PR on ${refs.base.ref} after fetching from upstream.
-
-        Rebase instructions for PR Author, please run the following commands:
-
-          git fetch upstream ${refs.base.ref};
-          git checkout ${refs.target.ref};
-          git rebase upstream/${refs.base.ref};
-          git push --force-with-lease;
-        `);
-  } else {
-    console.log('No change found in the CircleCI config file, continuing.');
-  }
-  console.log();
-
-  // Rebase the PR.
-  exec(`git rebase origin/${refs.base.ref}`);
-  console.log(`Rebased current branch onto ${refs.base.ref}.`);
-}
-
-
-
-/**
- * Sort a list of fullpath refs into a list and then provide the first entry.
- *
- * The sort order will first find master ref, and then any semver ref, followed
- * by the rest of the refs in the order provided.
- *
- * Branches are sorted in this order as work is primarily done on master, and
- * otherwise on a semver branch. If neither of those were to match, the most
- * likely correct branch will be the first one encountered in the list.
- */
-function getRefFromBranchList(gitOutput) {
-  const branches = gitOutput.split('\n').map(b => b.split('/').slice(1).join('/').trim());
-  return branches.sort((a, b) => {
-    if (a === 'master') {
-      return -1;
-    }
-    if (b === 'master') {
-      return 1;
-    }
-    const aIsSemver = semverRegex.test(a);
-    const bIsSemver = semverRegex.test(b);
-    if (aIsSemver && bIsSemver) {
-      const [, aMajor, aMinor] = a.match(semverRegex);
-      const [, bMajor, bMinor] = b.match(semverRegex);
-      return parseInt(bMajor, 10) - parseInt(aMajor, 10) ||
-          parseInt(aMinor, 10) - parseInt(bMinor, 10) || 0;
-    }
-    if (aIsSemver) {
-      return -1;
-    }
-    if (bIsSemver) {
-      return 1;
-    }
-    return 0;
-  })[0];
-}
-
-/**
- * Get the full sha of the ref provided.
- *
- * example: 1bc0c1a6c01ede7168f22fa9b3508ba51f1f464e
- */
-function getShaFromRef(ref) {
-  return exec(`git rev-parse ${ref}`);
-}
-
-/**
- * Get the list of branches which contain the provided sha, sorted in descending order
- * by committerdate.
- *
- * example:
- *   upstream/master
- *   upstream/9.0.x
- *   upstream/test
- *   upstream/1.1.x
- */
-function getBranchListForSha(sha, remote) {
-  return exec(`git branch -r '${remote}/*' --sort=-committerdate --contains ${sha}`);
-}
-
-/** Get the common ancestor sha of the two provided shas. */
-function getCommonAncestorSha(sha1, sha2) {
-  return exec(`git merge-base ${sha1} ${sha2}`);
-}
-
-/**
- * Adds the remote to git, if it doesn't already exist. Returns a boolean indicating
- * whether the remote was added by the command.
- */
-function addAndFetchRemote(owner, name) {
-  const remoteName = `${owner}_${name}`;
-  exec(`git remote add ${remoteName} https://github.com/${owner}/${name}.git`, true);
-  exec(`git fetch ${remoteName}`);
-  return remoteName;
-}
-
-
-/** Get the ref and latest shas for the provided sha on a specific remote. */
-function getRefAndShas(sha, owner, name) {
-  const remoteName = addAndFetchRemote(owner, name);
-
-  // Get the ref on the remote for the sha provided.
-  const branches = getBranchListForSha(sha, remoteName);
-  const ref = getRefFromBranchList(branches);
-
-  // Get the latest sha on the discovered remote ref.
-  const latestSha = getShaFromRef(`${remoteName}/${ref}`);
-
-  return {remote: remoteName, ref, latestSha, sha};
-}
-
-
-/** Gets the refs and shas for the base and target of the current environment. */
-function getRefsAndShasForChange() {
-  const base = getRefAndShas(
-      process.env['CI_GIT_BASE_REVISION'], process.env['CI_REPO_OWNER'],
-      process.env['CI_REPO_NAME']);
-  const target = getRefAndShas(
-      process.env['CI_GIT_REVISION'], process.env['CI_PR_USERNAME'], process.env['CI_PR_REPONAME']);
-  const commonAncestorSha = getCommonAncestorSha(base.sha, target.sha);
-  return {
-    base,
-    target,
-    commonAncestorSha,
-  };
-}
-
-
-/**
- * Synchronously executes the command.
- *
- * Return the trimmed stdout as a string, with an added attribute of the exit code.
- */
-function exec(command, ignoreError = false) {
-  try {
-    return execSync(command, {stdio: 'pipe'}).toString().trim();
-  } catch (err) {
-    if (ignoreError) {
-      return '';
-    }
-
-    throw err;
-  }
-}
@@ -1,105 +0,0 @@
-#!/usr/bin/env node
-
-/**
- * Usage (cli):
- * ```
- * node create-preview <build-number> <job-name> <webhook-url>
- * ```
- *
- * Usage (JS):
- * ```js
- * require('./trigger-webhook').
- *   triggerWebhook(buildNumber, jobName, webhookUrl).
- *   then(...);
- * ```
- *
- * Triggers a notification webhook with CircleCI specific info.
- *
- * It can be used for notifying external servers and trigger operations based on CircleCI job status
- * (e.g. triggering the creation of a preview based on previously stored build atrifacts).
- *
- * The body of the sent payload is of the form:
- * ```json
- * {
- *   "payload": {
- *     "build_num": ${buildNumber}
- *     "build_parameters": {
- *       "CIRCLE_JOB": "${jobName}"
- *     }
- *   }
- * }
- * ```
- *
- * When used from JS, it returns a promise which resolves to an object of the form:
- * ```json
- * {
- *   "statucCode": ${statusCode},
- *   "responseText": "${responseText}"
- * }
- * ```
- *
- * NOTE:
- * - When used from the cli, the command will exit with an error code if the response's status code
- *   is outside the [200, 400) range.
- * - When used from JS, the returned promise will be resolved, even if the response's status code is
- *   outside the [200, 400) range. It is up to the caller to decide how this should be handled.
- */
-
-// Imports
-const {request} = require('https');
-
-// Exports
-module.exports = {
-  triggerWebhook,
-};
-
-// Run
-if (require.resolve === module) {
-  _main(process.argv.slice(2));
-}
-
-// Helpers
-function _main(args) {
-  triggerWebhook(...args)
-      .then(
-          ({statusCode, responseText}) => (200 <= statusCode && statusCode < 400) ?
-              console.log(`Status: ${statusCode}\n${responseText}`) :
-              Promise.reject(new Error(`Request failed (status: ${statusCode}): ${responseText}`)))
-      .catch(err => {
-        console.error(err);
-        process.exit(1);
-      });
-}
-
-function postJson(url, data) {
-  return new Promise((resolve, reject) => {
-    const opts = {method: 'post', headers: {'Content-Type': 'application/json'}};
-    const onResponse = res => {
-      const statusCode = res.statusCode || -1;
-      let responseText = '';
-
-      res.on('error', reject)
-          .on('data', d => responseText += d)
-          .on('end', () => resolve({statusCode, responseText}));
-    };
-
-    request(url, opts, onResponse).on('error', reject).end(JSON.stringify(data));
-  });
-}
-
-async function triggerWebhook(buildNumber, jobName, webhookUrl) {
-  if (!buildNumber || !jobName || !webhookUrl || isNaN(buildNumber)) {
-    throw new Error(
-        'Missing or invalid arguments.\n' +
-        'Expected: buildNumber (number), jobName (string), webhookUrl (string)');
-  }
-
-  const data = {
-    payload: {
-      build_num: +buildNumber,
-      build_parameters: {CIRCLE_JOB: jobName},
-    },
-  };
-
-  return postJson(webhookUrl, data);
-}
@@ -1,57 +0,0 @@
-# Install Bazel pre-reqs on Windows
-# https://docs.bazel.build/versions/master/install-windows.html
-# https://docs.bazel.build/versions/master/windows.html
-# Install MSYS2 and packages
-choco install msys2 --version 20200903.0.0 --no-progress --package-parameters "/NoUpdate"
-C:\tools\msys64\usr\bin\bash.exe -l -c "pacman --needed --noconfirm -S zip unzip patch diffutils"
-
-# Add PATH modifications to the Powershell profile. This is the win equivalent of .bash_profile.
-# https://docs.microsoft.com/en-us/previous-versions//bb613488(v=vs.85)
-new-item -path $profile -itemtype file -force
-# Paths for nodejs, npm, yarn, and msys2. Use single quotes to prevent interpolation.
-# Add before the original path to use msys2 instead of the installed gitbash.
-Add-Content $profile '$Env:path = "${Env:ProgramFiles}\nodejs\;C:\Users\circleci\AppData\Roaming\npm\;${Env:ProgramFiles(x86)}\Yarn\bin\;C:\Users\circleci\AppData\Local\Yarn\bin\;C:\tools\msys64\usr\bin\;" + $Env:path'
-# Environment variables for Bazel
-Add-Content $profile '$Env:BAZEL_SH = "C:\tools\msys64\usr\bin\bash.exe"'
-
-# Get the bazelisk version devdep and store it in a global var for use in the circleci job.
-$bazeliskVersion = & ${Env:ProgramFiles}\nodejs\node.exe -e "console.log(require('./package.json').devDependencies['@bazel/bazelisk'])"
-# This is a tricky situation: we want $bazeliskVersion to be evaluated but not $Env:BAZELISK_VERSION.
-# Formatting works https://stackoverflow.com/questions/32127583/expand-variable-inside-single-quotes
-$bazeliskVersionGlobalVar = '$Env:BAZELISK_VERSION = "{0}"' -f $bazeliskVersion
-Add-Content $profile $bazeliskVersionGlobalVar
-
-# Remove the CircleCI checkout SSH override, because it breaks cloning repositories through Bazel.
-# See https://circleci.com/gh/angular/angular/401454 for an example.
-# TODO: is this really needed? Maybe there's a better way. It doesn't happen on Linux or on Codefresh.
-git config --global --unset url.ssh://git@github.com.insteadOf
-
-
-####################################################################################################
-# Decrypt GCP Credentials and store them as the Google default credentials.
-####################################################################################################
-mkdir ${env:APPDATA}\gcloud
-openssl aes-256-cbc -d -in .circleci\gcp_token -md md5 -out "$env:APPDATA\gcloud\application_default_credentials.json" -k "$env:CIRCLE_PROJECT_REPONAME"
-
-####################################################################################################
-# Set bazel configuration for CircleCI runs.
-####################################################################################################
-copy .circleci\bazel.windows.rc ${Env:USERPROFILE}\.bazelrc
-
-####################################################################################################
-# Install specific version of node.
-####################################################################################################
-nvm install 14.16.1
-nvm use 14.16.1
-
-# These Bazel prereqs aren't needed because the CircleCI image already includes them.
-# choco install yarn --version 1.16.0 --no-progress
-# choco install vcredist2015 --version 14.0.24215.20170201
-
-# We don't need VS Build Tools for the tested bazel targets.
-# If it's needed again, uncomment these lines.
-# VS Build Tools are needed for Bazel C++ targets (like com_google_protobuf)
-# choco install visualstudio2019buildtools --version 16.1.2.0 --no-progress --package-parameters "--add Microsoft.VisualStudio.Workload.VCTools --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --add Microsoft.Component.VC.Runtime.UCRTSDK --add Microsoft.VisualStudio.Component.Windows10SDK.17763"
-# Add-Content $profile '$Env:BAZEL_VC = "${Env:ProgramFiles(x86)}\Microsoft Visual Studio\2019\BuildTools\VC\"'
-# Python is needed for Bazel Python targets
-# choco install python --version 3.5.1 --no-progress
@@ -1,31 +0,0 @@
-# VSCode Remote Development - Developing inside a Container
-
-This folder contains configuration files that can be used to opt into working on this repository in a [Docker container](https://www.docker.com/resources/what-container) via [VSCode](https://code.visualstudio.com/)'s Remote Development feature (see below).
-
-Info on remote development and developing inside a container with VSCode:
- [VSCode: Remote Development](https://code.visualstudio.com/docs/remote/remote-overview)
- [VSCode: Developing inside a Container](https://code.visualstudio.com/docs/remote/containers)
- [VSCode: Remote Development FAQ](https://code.visualstudio.com/docs/remote/faq)
-
-
-## Usage
-
-_Prerequisite: [Install Docker](https://docs.docker.com/install) on your local environment._
-
-To get started, read and follow the instuctions in [Developing inside a Container](https://code.visualstudio.com/docs/remote/containers). The [.devcontainer/](.) directory contains pre-configured `devcontainer.json` and `Dockerfile` files, which you can use to set up remote development with a docker container.
-
-In a nutshell, you need to:
- Install the [Remote - Containers](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers) extension.
- Copy [recommended-Dockerfile](./recommended-Dockerfile) to `Dockerfile` (and optionally tweak to suit your needs).
- Copy [recommended-devcontainer.json](./recommended-devcontainer.json) to `devcontainer.json` (and optionally tweak to suit your needs).
- Open VSCode and bring up the [Command Palette](https://code.visualstudio.com/docs/getstarted/userinterface#_command-palette).
- Type `Remote-Containers: Open Folder in Container` and choose your local clone of [angular/angular](https://github.com/angular/angular).
-
-The `.devcontainer/devcontainer.json` and `.devcontainer/Dockerfile` files are ignored by git, so you can have your own local versions. We may occasionally update the template files ([recommended-devcontainer.json](./recommended-devcontainer.json), [recommended-Dockerfile](./recommended-Dockerfile)), in which case you will need to manually update your local copies (if desired).
-
-
-## Updating `recommended-devcontainer.json` and `recommended-Dockerfile`
-
-You can update and commit the recommended config files (which people use as basis for their local configs), if you find that something is broken, out-of-date or can be improved.
-
-Please, keep in mind that any changes you make will potentially be used by many people on different environments. Try to keep these config files cross-platform compatible and free of personal preferences.
@@ -1,24 +0,0 @@
-# Image metadata and config.
-# Ideally, the Node.js version should match what we use on CI.
-# See `executors > default-executor` in `.circleci/config.yml`.
-FROM circleci/node:14-browsers
-
-
-LABEL name="Angular dev environment" \
-      description="This image can be used to create a dev environment for building Angular." \
-      vendor="angular" \
-      version="1.0"
-
-EXPOSE 4000 4200 4433 5000 8080 9876
-
-
-# Switch to `root` (CircleCI images use `circleci` as the user).
-USER root
-
-
-# Configure `Node.js`/`npm`.
-RUN npm config --global set user root
-
-
-# Go! (And keep going.)
-CMD ["tail", "--follow", "/dev/null"]
@@ -1,16 +0,0 @@
-// Reference: https://code.visualstudio.com/docs/remote/containers#_devcontainerjson-reference
-{
-  "name": "Angular dev container",
-  "dockerFile": "Dockerfile",
-  "appPort": [4000, 4200, 4433, 5000, 8080, 9876],
-  "postCreateCommand": "yarn install",
-  "extensions": [
-    "devondcarew.bazel-code",
-    "gkalpak.aio-docs-utils",
-    "ms-vscode.vscode-typescript-tslint-plugin",
-    "xaver.clang-format",
-    // The following extensions are useful when working on angular.io (i.e. inside the `aio/` directory).
-    //"angular.ng-template",
-    //"dbaeumer.vscode-eslint",
-  ],
-}
@@ -1,4 +1,4 @@
-# https://editorconfig.org
+# http://editorconfig.org

 root = true

@@ -1,6 +1,59 @@
-Please help us process issues more efficiently by filing an
-issue using one of the following templates:
+<!--
+PLEASE HELP US PROCESS GITHUB ISSUES FASTER BY PROVIDING THE FOLLOWING INFORMATION.

-https://github.com/angular/angular/issues/new/choose
+ISSUES MISSING IMPORTANT INFORMATION MAY BE CLOSED WITHOUT INVESTIGATION.
+-->

-Thank you!
+## I'm submitting a...
+<!-- Check one of the following options with "x" -->
+<pre><code>
+[ ] Regression (a behavior that used to work and stopped working in a new release)
+[ ] Bug report  <!-- Please search GitHub for a similar issue or PR before submitting -->
+[ ] Performance issue
+[ ] Feature request
+[ ] Documentation issue or request
+[ ] Support request => Please do not submit support request here, instead see https://github.com/angular/angular/blob/master/CONTRIBUTING.md#question
+[ ] Other... Please describe:
+</code></pre>
+
+## Current behavior
+<!-- Describe how the issue manifests. -->
+
+
+## Expected behavior
+<!-- Describe what the desired behavior would be. -->
+
+
+## Minimal reproduction of the problem with instructions
+<!--
+For bug reports please provide the *STEPS TO REPRODUCE* and if possible a *MINIMAL DEMO* of the problem via
+https://stackblitz.com or similar (you can use this template as a starting point: https://stackblitz.com/fork/angular-gitter).
+-->
+
+## What is the motivation / use case for changing the behavior?
+<!-- Describe the motivation or the concrete use case. -->
+
+
+## Environment
+
+<pre><code>
+Angular version: X.Y.Z
+<!-- Check whether this is still an issue in the most recent Angular version -->
+
+Browser:
+- [ ] Chrome (desktop) version XX
+- [ ] Chrome (Android) version XX
+- [ ] Chrome (iOS) version XX
+- [ ] Firefox version XX
+- [ ] Safari (desktop) version XX
+- [ ] Safari (iOS) version XX
+- [ ] IE version XX
+- [ ] Edge version XX
+ 
+For Tooling issues:
+- Node version: XX  <!-- run `node --version` -->
+- Platform:  <!-- Mac, Linux, Windows -->
+
+Others:
+<!-- Anything else relevant?  Operating system version, IDE, package manager, HTTP server, ... -->
+</code></pre>
@@ -1,84 +0,0 @@
-name: Bug Report
-description: Report a bug in the Angular Framework
-
-body:
-  - type: dropdown
-    id: affected-packages
-    attributes:
-      label: Which @angular/* package(s) are the source of the bug?
-      options:
-        - animations
-        - bazel
-        - common
-        - compiler-cli
-        - compiler
-        - elements
-        - forms
-        - language-service
-        - localize
-        - platform-browser-dynamic
-        - platform-browser
-        - platform-server
-        - router
-        - service-worker
-        - upgrade
-        - Don't known / other
-      multiple: true
-    validations:
-      required: true
-
-  - type: dropdown
-    id: is-regression
-    attributes:
-      label: Is this a regression?
-      options:
-        - 'Yes'
-        - 'No'
-    validations:
-      required: true
-
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-    validations:
-      required: true
-
-  - type: input
-    id: reproduction
-    attributes:
-      label: Please provide a link to a minimal reproduction of the bug
-
-  - type: textarea
-    id: exception-or-error
-    attributes:
-      label: Please provide the exception or error you saw
-      render: true
-
-  - type: textarea
-    id: environment
-    attributes:
-      label: Please provide the environment you discovered this bug in
-      render: true
-      placeholder: |
-        Angular CLI: 12.0.5
-        Node: 14.17.0
-        Package Manager: yarn 1.22.10
-        OS: linux x64
-
-        Angular: 12.0.5
-        ... animations, cli, common, compiler, compiler-cli, core, forms
-        ... platform-browser, platform-browser-dynamic, router
-
-        Package                         Version
-        ---------------------------------------------------------
-        @angular-devkit/architect       0.1200.5
-        @angular-devkit/build-angular   12.0.5
-        @angular-devkit/core            12.0.5
-        rxjs                            6.6.7
-        typescript                      4.2.4
-
-  - type: textarea
-    id: other
-    attributes:
-      label: Anything else?
@@ -1,46 +0,0 @@
-name: 'Feature Request'
-description: Suggest a feature for Angular Framework
-
-body:
-  - type: dropdown
-    id: affected-packages
-    attributes:
-      label: Which @angular/* package(s) are relevant/releated to the feature request?
-      options:
-        - animations
-        - bazel
-        - common
-        - compiler-cli
-        - compiler
-        - elements
-        - forms
-        - language-service
-        - localize
-        - platform-browser-dynamic
-        - platform-browser
-        - platform-server
-        - router
-        - service-worker
-        - upgrade
-      multiple: true
-
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-    validations:
-      required: true
-
-  - type: textarea
-    id: proposed-solution
-    attributes:
-      label: Proposed solution
-    validations:
-      required: true
-
-  - type: textarea
-    id: alternatives-considered
-    attributes:
-      label: Alternatives considered
-    validations:
-      required: true
@@ -1,42 +0,0 @@
-name: 'Docs or angular.io Bug Report'
-description: Report an issue in Angular's documentation or angular.io application
-
-body:
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-    validations:
-      required: true
-
-  - type: input
-    id: affected-url
-    attributes:
-      label: What is the affected URL?
-
-  - type: textarea
-    id: reproduction-steps
-    attributes:
-      label: Please provide the steps to reproduce the issue
-
-  - type: textarea
-    id: expected-vs-actual-behavior
-    attributes:
-      label: Please provide the expected behavior vs the actual behavior you encountered
-
-  - type: textarea
-    id: screenshot
-    attributes:
-      label: Please provide a screenshot if possible
-
-  - type: textarea
-    id: exception-or-error
-    attributes:
-      label: Please provide the exception or error you saw
-      render: true
-
-  - type: textarea
-    id: browser-info
-    attributes:
-      label: Is this a browser-specific issue? If so, please specify the device, browser, and version.
-      render: true
@@ -1,6 +0,0 @@
---
-name: Security Issue Disclosure
-about: Report a security issue in Angular Framework, Material, or CLI
---
-
-Please read https://angular.io/guide/security#report-issues on how to disclose security related issues.
@@ -1,11 +0,0 @@
---
-name: "Support Request"
-about: Questions and requests for support
---
-
-Please do not file questions or support requests on the GitHub issues tracker.
-
-You can get your questions answered using other communication channels. Please see:
-https://github.com/angular/angular/blob/master/CONTRIBUTING.md#question
-
-Thank you!
@@ -1,8 +0,0 @@
---
-name: "Angular CLI"
-about: Issues and feature requests for Angular CLI
---
-
-Please file any Angular CLI issues at: https://github.com/angular/angular-cli/issues/new
-
-For the time being, we keep Angular CLI issues in a separate repository.
@@ -1,8 +0,0 @@
---
-name: "Angular Components"
-about: Issues and feature requests for Angular Components
---
-
-Please file any Angular Components issues at: https://github.com/angular/components/issues/new
-
-For the time being, we keep Angular Components issues in a separate repository.
@@ -4,7 +4,7 @@
 size:
  disabled: false
  maxSizeIncrease: 2000
-  circleCiStatusName: 'ci/circleci: test_ivy_aot'
+  circleCiStatusName: "ci/circleci: test"

 # options for the merge plugin
 merge:
@@ -13,117 +13,91 @@ merge:
    # set to true to disable
    disabled: false
    # the name of the status
-    context: 'ci/angular: merge status'
+    context: "ci/angular: merge status"
    # text to show when all checks pass
-    successText: 'All checks passed!'
+    successText: "All checks passed!"
    # text to show when some checks are failing
-    failureText: 'The following checks are failing:'
+    failureText: "The following checks are failing:"

  # the g3 status will be added to your pull requests if they include files that match the patterns
  g3Status:
    # set to true to disable
    disabled: false
    # the name of the status
-    context: 'google3'
+    context: "google3"
    # text to show when the status is pending, {{PRNumber}} will be replaced by the PR number
-    pendingDesc: 'Googler: run g3sync presubmit {{PRNumber}}'
+    pendingDesc: "Googler: run g3sync presubmit {{PRNumber}}"
    # text to show when the status is success
-    successDesc: 'Does not affect google3'
+    successDesc: "Does not affect google3"
    # link to use for the details
-    url: 'http://go/angular/g3sync'
+    url: "http://go/angular-g3sync"
    # list of patterns to check for the files changed by the PR
    # this list must be manually kept in sync with google3/third_party/javascript/angular2/copy.bara.sky
    include:
-      - 'LICENSE'
-      - 'modules/benchmarks/**'
-      - 'modules/system.d.ts'
-      - 'packages/**'
+      - "LICENSE"
+      - "modules/**"
+      - "packages/**"
    # list of patterns to ignore for the files changed by the PR
    exclude:
-      - 'packages/*'
-      - 'packages/bazel/*'
-      - 'packages/bazel/src/api-extractor/**'
-      - 'packages/bazel/src/builders/**'
-      - 'packages/bazel/src/ng_package/**'
-      - 'packages/bazel/src/protractor/**'
-      - 'packages/bazel/src/schematics/**'
-      - 'packages/compiler-cli/src/ngcc/**'
-      - 'packages/compiler-cli/linker/**'
-      - 'packages/compiler-cli/ngcc/**'
-      - 'packages/compiler-cli/src/ngtsc/sourcemaps/**'
-      - 'packages/docs/**'
-      - 'packages/elements/schematics/**'
-      - 'packages/examples/**'
-      - 'packages/language-service/**'
-      - 'packages/localize/**'
-      - 'packages/private/**'
-      - 'packages/service-worker/**'
-      - 'packages/common/locales/**'
-      - 'packages/http/**'
-      - '**/.gitignore'
-      - '**/.gitkeep'
-      - '**/yarn.lock'
-      - '**/package.json'
-      - '**/third_party/**'
-      - '**/tsconfig-build.json'
-      - '**/tsconfig.json'
-      - '**/rollup.config.js'
-      - '**/BUILD.bazel'
-      - '**/*.md'
-      - 'packages/**/integrationtest/**'
-      - 'packages/**/test/**'
-      - 'packages/zone.js/*'
-      - 'packages/zone.js/dist/**'
-      - 'packages/zone.js/doc/**'
-      - 'packages/zone.js/example/**'
-      - 'packages/zone.js/scripts/**'
+      - "packages/bazel/*.bzl"
+      - "packages/language-service/**"
+      - "**/.gitignore"
+      - "**/.gitkeep"
+      - "**/package.json"
+      - "**/tsconfig-build.json"
+      - "**/tsconfig.json"
+      - "**/rollup.config.js"
+      - "**/BUILD.bazel"
+      - "packages/**/integrationtest/**"
+      - "packages/**/test/**"

  # comment that will be added to a PR when there is a conflict, leave empty or set to false to disable
-  mergeConflictComment: "Hi @{{PRAuthor}}! This PR has merge conflicts due to recent upstream merges.\nPlease help to unblock it by resolving these conflicts. Thanks!"
+  mergeConflictComment: "Hi @{{PRAuthor}}! This PR has merge conflicts due to recent upstream merges.
+\nPlease help to unblock it by resolving these conflicts. Thanks!"

  # label to monitor
-  mergeLabel: 'action: merge'
-
-  # adding any of these labels will also add the merge label
-  mergeLinkedLabels:
-    - 'action: merge-assistance'
+  mergeLabel: "PR action: merge"

  # list of checks that will determine if the merge label can be added
  checks:
+
    # require that the PR has reviews from all requested reviewers
    #
    # This enables us to request reviews from both eng and tech writers, or multiple eng folks, and prevents accidental merges.
-    # Rather than merging PRs with pending reviews, if all approvals are obtained and additional reviews are not needed, any pending reviewers should be removed via GitHub UI (this also leaves an audit trail behind these decisions).
+    # Rather than merging PRs with pending reviews, if all PullApprove requirements are satisfied and additional reviews are not needed pending reviewers should be removed via GitHub UI (this also leaves an audit trail behind these decisions).
    requireReviews: true,

    # whether the PR shouldn't have a conflict with the base branch
    noConflict: true
-    # list of labels that a PR needs to have, checked with a regexp (e.g. "target:" will work for the label "target: master")
+    # list of labels that a PR needs to have, checked with a regexp (e.g. "PR target:" will work for the label "PR target: master")
    requiredLabels:
-      - 'target: *'
-      - 'cla: yes'
+      - "PR target: *"
+      - "cla: yes"

    # list of labels that a PR shouldn't have, checked after the required labels with a regexp
    forbiddenLabels:
-      - 'target: TBD'
-      - 'action: cleanup'
-      - 'action: review'
-      - 'state: blocked'
-      - 'cla: no'
+      - "PR target: TBD"
+      - "PR action: cleanup"
+      - "PR action: review"
+      - "PR state: blocked"
+      - "cla: no"

    # list of PR statuses that need to be successful
    requiredStatuses:
-      - 'ci/circleci: build'
-      - 'ci/circleci: lint'
-      - 'ci/angular: size'
-      - 'cla/google'
-      - 'google3'
-      - 'pullapprove'
+      - "continuous-integration/travis-ci/pr"
+      - "code-review/pullapprove"
+      - "ci/circleci: build"
+      - "ci/circleci: lint"

  # the comment that will be added when the merge label is added despite failing checks, leave empty or set to false to disable
  # {{MERGE_LABEL}} will be replaced by the value of the mergeLabel option
  # {{PLACEHOLDER}} will be replaced by the list of failing checks
-  mergeRemovedComment: "I see that you just added the `{{MERGE_LABEL}}` label, but the following checks are still failing:\n{{PLACEHOLDER}}\n\n**If you want your PR to be merged, it has to pass all the CI checks.**\n\nIf you can't get the PR to a green state due to flakes or broken master, please try rebasing to master and/or restarting the CI job. If that fails and you believe that the issue is not due to your change, please contact the caretaker and ask for help."
+  mergeRemovedComment: "I see that you just added the `{{MERGE_LABEL}}` label, but the following checks are still failing:
+\n{{PLACEHOLDER}}
+\n
+\n**If you want your PR to be merged, it has to pass all the CI checks.**
+\n
+\nIf you can't get the PR to a green state due to flakes or broken master, please try rebasing to master and/or restarting the CI job. If that fails and you believe that the issue is not due to your change, please contact the caretaker and ask for help."

 # options for the triage plugin
 triage:
@@ -133,29 +107,24 @@ triage:
  defaultMilestone: 82,
  # arrays of labels that determine if an issue has been triaged by the caretaker
  l1TriageLabels:
-    - - 'comp: *'
+    -
+      - "comp: *"
  # arrays of labels that determine if an issue has been fully triaged
  l2TriageLabels:
-    - - 'P0'
-      - 'comp: *'
-    - - 'P1'
-      - 'comp: *'
-    - - 'P2'
-      - 'comp: *'
-    - - 'P3'
-      - 'comp: *'
-    - - 'P4'
-      - 'comp: *'
-    - - 'P5'
-      - 'comp: *'
-    - - 'feature'
-      - 'comp: *'
-    - - 'discussion'
-      - 'comp: *'
-    - - 'needs clarification'
-      - 'comp: *'
-    - - 'needs reproduction'
-      - 'comp: *'
+    -
+      - "type: bug/fix"
+      - "severity*"
+      - "freq*"
+      - "comp: *"
+    -
+      - "type: feature"
+      - "comp: *"
+    -
+      - "type: refactor"
+      - "comp: *"
+    -
+      - "type: RFC / Discussion / question"
+      - "comp: *"

 # options for the triage PR plugin
 triagePR:
@@ -167,14 +136,12 @@ triagePR:
  defaultMilestone: 82,
  # arrays of labels that determine if a PR has been triaged by the caretaker
  l1TriageLabels:
-    - - 'comp: *'
+    -
+      - "comp: *"
  # arrays of labels that determine if a PR has been fully triaged
  l2TriageLabels:
-    - - 'comp: *'
-
-# options for rerunning CI
-rerunCircleCI:
-  # set to true to disable
-  disabled: false
-  # the label which when added triggers a rerun of the default CircleCI workflow
-  triggerRerunLabel: 'action: rerun CI at HEAD'
+    -
+      - "type: *"
+      - "effort*"
+      - "risk*"
+      - "comp: *"
@@ -1,14 +0,0 @@
-name: DevInfra
-
-on:
-  pull_request_target:
-    types: [opened, synchronize, reopened]
-
-jobs:
-  breaking-changes-label:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: angular/dev-infra/github-actions/breaking-changes-label@861dc90572784e714aeaa9dfb20ceebeb57cdb07
-        with:
-          angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}
@@ -1,15 +0,0 @@
-name: Feature request triage bot
-
-on:
-  schedule:
-    # Run at 14:00 every day
-    - cron: '0 14 * * *'
-
-jobs:
-  feature_triage:
-    if: github.repository == 'angular/angular'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: angular/dev-infra/github-actions/feature-request@f83903fe1ac848407ef81465f66588e5accb6537
-        with:
-          angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}
@@ -1,15 +0,0 @@
-name: Lock closed inactive issues
-
-on:
-  schedule:
-    # Run at 16:00 every day
-    - cron: '0 16 * * *'
-
-jobs:
-  lock_closed:
-    if: github.repository == 'angular/angular'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: angular/dev-infra/github-actions/lock-closed@7679cff885633cd33bf5ac7922a5304e8971a5a6
-        with:
-          lock-bot-key: ${{ secrets.LOCK_BOT_PRIVATE_KEY }}
@@ -1,29 +1,21 @@
 .DS_STORE

 /dist/
-/bazel-out
-/integration/bazel/bazel-*
-*.log
+bazel-*
+e2e_test.*
 node_modules
+bower_components
+tools/gulp-tasks/cldr/cldr-data/

 # Include when developing application packages.
 pubspec.lock
 .c9
 .idea/
-.devcontainer/*
-!.devcontainer/README.md
-!.devcontainer/recommended-devcontainer.json
-!.devcontainer/recommended-Dockerfile
 .settings/
-.vscode/launch.json
-.vscode/settings.json
-.vscode/tasks.json
 *.swo
-*.swp
 modules/.settings
+.vscode
 modules/.vscode
-.vimrc
-.nvimrc

 # Don't check in secret files
 *secret.js
@@ -37,18 +29,3 @@ yarn-error.log

 # rollup-test output
 /modules/rollup-test/dist/
-
-# User specific bazel settings
-.bazelrc.user
-
-# User specific ng-dev settings
-.ng-dev.user*
-
-.notes.md
-baseline.json
-
-# Ignore .history for the xyz.local-history VSCode extension
-.history
-
-# Husky
-.husky/_
@@ -1,144 +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|router|service-worker|
-#   │                          upgrade|zone.js|packaging|changelog|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.
-#
@@ -1,11 +0,0 @@
-#!/bin/sh
-. "$(dirname $0)/_/husky.sh"
-
-set +e
-
-yarn -s ng-dev commit-message pre-commit-validate --file $1 2>/dev/null
-if [ $? -ne 0 ]; then
-  echo "WARNING: failed to run commit message validation (ng-dev commit-mesage pre-commit-validate)"
-fi
-
-exit 0;
@@ -1,11 +0,0 @@
-#!/bin/sh
-. "$(dirname $0)/_/husky.sh"
-
-set +e
-yarn -s ng-dev format staged 2>/dev/null
-if [ $? -ne 0 ]; then
-  echo "WARNING: failed to run file formatting (ng-dev format staged)"
-fi
-
-
-exit 0;
@@ -1,11 +0,0 @@
-#!/bin/sh
-. "$(dirname $0)/_/husky.sh"
-
-set +e
-
-yarn -s ng-dev commit-message restore-commit-message-draft $1 $2 2>/dev/null
-if [ $? -ne 0 ]; then
-  echo "WARNING: failed to attempt to restore commit message draft (ng-dev commit-message restore-commit-message-draft)"
-fi
-
-exit 0;
@@ -1,20 +0,0 @@
-import {CaretakerConfig} from '@angular/dev-infra-private/ng-dev/caretaker/config';
-
-/** The configuration for `ng-dev caretaker` commands. */
-export const caretaker: CaretakerConfig = {
-  githubQueries: [
-    {
-      name: 'Merge Queue',
-      query: `is:pr is:open status:success label:"action: merge"`,
-    },
-    {
-      name: 'Merge Assistance Queue',
-      query: `is:pr is:open label:"action: merge-assistance"`,
-    },
-    {
-      name: 'Initial Triage Queue',
-      query: `is:open no:milestone`,
-    }
-  ],
-  caretakerGroup: 'angular-caretaker',
-};
@@ -1,40 +0,0 @@
-import {CommitMessageConfig} from '@angular/dev-infra-private/ng-dev/commit-message/config';
-
-/**
- * The configuration for `ng-dev commit-message` commands.
- */
-export const commitMessage: CommitMessageConfig = {
-  maxLineLength: Infinity,
-  minBodyLength: 20,
-  minBodyLengthTypeExcludes: ['docs'],
-  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',
-  ]
-};
@@ -1,15 +0,0 @@
-import {caretaker} from './caretaker';
-import {commitMessage} from './commit-message';
-import {format} from './format';
-import {github} from './github';
-import {merge} from './merge';
-import {release} from './release';
-
-module.exports = {
-  commitMessage,
-  format,
-  github,
-  merge,
-  caretaker,
-  release,
-};
@@ -1,37 +0,0 @@
-import {FormatConfig} from '@angular/dev-infra-private/ng-dev/format/config';
-
-/**
- * Configuration for the `ng-dev format` command.
- */
-export const format: FormatConfig = {
-  'prettier': {
-    'matchers': [
-      '**/*.{yaml,yml}',
-    ]
-  },
-  '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',
-      // Do not format generated ng-dev script
-      '!dev-infra/ng-dev.js',
-      '!dev-infra/build-worker.js',
-      // Do not format compliance test-cases since they must match generated code
-      '!packages/compiler-cli/test/compliance/test_cases/**/*.js',
-      // Do not format the locale files which are checked-in for Google3, but generated using
-      // the `generate-locales-tool` from `packages/common/locales`.
-      '!packages/core/src/i18n/locale_en.ts',
-      '!packages/common/locales/closure-locale.ts',
-      '!packages/common/src/i18n/currencies.ts',
-    ]
-  },
-  'buildifier': true
-};
@@ -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
@@ -1,11 +0,0 @@
-import {GithubConfig} from '@angular/dev-infra-private/ng-dev/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',
-  mainBranchName: 'master',
-};
@@ -1,33 +0,0 @@
-import {DevInfraMergeConfig} from '@angular/dev-infra-private/ng-dev/pr/merge/config';
-import {getDefaultTargetLabelConfiguration} from '@angular/dev-infra-private/ng-dev/pr/merge/defaults';
-import {github} from './github';
-import {release} from './release';
-
-/**
- * Configuration for the merge tool in `ng-dev`. This sets up the labels which
- * are respected by the merge script (e.g. the target labels).
- */
-export const merge: DevInfraMergeConfig['merge'] = async api => {
-  return {
-    githubApiMerge: false,
-    claSignedLabel: 'cla: yes',
-    mergeReadyLabel: /^action: merge(-assistance)?/,
-    caretakerNoteLabel: /^(action: merge-assistance)|(PullApprove: disable)/,
-    commitMessageFixupLabel: 'commit message fixup',
-    breakingChangeLabel: 'flag: breaking change',
-    // We can pick any of the NPM packages as we are in a monorepo where all packages are
-    // published together with the same version and branching.
-    labels: await getDefaultTargetLabelConfiguration(api, github, release),
-    requiredBaseCommits: {
-      // PRs that target either `master` or the patch branch, need to be rebased
-      // on top of the latest commit message validation fix.
-      // These SHAs are the commits that update the required license text in the header.
-      'master': '5aeb9a4124922d8ac08eb73b8f322905a32b0b3a',
-      '10.0.x': '27b95ba64a5d99757f4042073fd1860e20e3ed24',
-    },
-    // `dev-infra` and `docs-infra` are not affecting the public NPM packages. Similarly,
-    // the `bazel` package is not considered part of the public API so that features
-    // can land in patch branches.
-    targetLabelExemptScopes: ['dev-infra', 'docs-infra', 'bazel']
-  };
-};
@@ -1,35 +0,0 @@
-import {ReleaseConfig} from '@angular/dev-infra-private/ng-dev/release/config';
-import {join} from 'path';
-
-/** Configuration for the `ng-dev release` command. */
-export const release: ReleaseConfig = {
-  publishRegistry: 'https://wombat-dressing-room.appspot.com',
-  npmPackages: [
-    '@angular/animations',
-    '@angular/bazel',
-    '@angular/common',
-    '@angular/compiler',
-    '@angular/compiler-cli',
-    '@angular/core',
-    '@angular/elements',
-    '@angular/forms',
-    '@angular/language-service',
-    '@angular/localize',
-    '@angular/platform-browser',
-    '@angular/platform-browser-dynamic',
-    '@angular/platform-server',
-    '@angular/router',
-    '@angular/service-worker',
-    '@angular/upgrade',
-  ],
-  buildPackages: async (stampForRelease: boolean) => {
-    // The buildTargetPackages function is loaded at runtime as the loading the script causes an
-    // invocation of bazel.
-    const {buildTargetPackages} = require(join(__dirname, '../scripts/build/package-builder'));
-    return buildTargetPackages('dist/release-output', false, 'Release', stampForRelease);
-  },
-  releaseNotes: {
-    hiddenScopes: ['aio', 'dev-infra', 'docs-infra', 'zone.js'],
-  },
-  releasePrLabels: ['comp: build & ci', 'action: merge', 'PullApprove: disable'],
-};
@@ -1 +0,0 @@
-engine-strict = true
@@ -1 +1 @@
-14.16.1
+10.9.0
@@ -1,9 +0,0 @@
-{
-  "printWidth": 100,
-  "tabWidth": 2,
-  "tabs": false,
-  "singleQuote": true,
-  "semicolon": true,
-  "quoteProps": "preserve",
-  "bracketSpacing": false
-}
@@ -0,0 +1,62 @@
+language: node_js
+sudo: false
+dist: trusty
+node_js:
+  - '10.9.0'
+
+addons:
+#  firefox: "38.0"
+  apt:
+    sources:
+      # needed to install g++ that is used by npms's native modules
+      - ubuntu-toolchain-r-test
+    packages:
+      # needed to install g++ that is used by npms's native modules
+      - g++-4.8
+
+branches:
+  except:
+    - g3
+
+cache:
+  yarn: true
+  directories:
+     - ./node_modules
+     - ./.chrome/chromium
+     - ./aio/node_modules
+
+env:
+  global:
+    # GITHUB_TOKEN_ANGULAR=<github token, a personal access token of the angular-builds account, account access in valentine>
+    # This is needed for the e2e Travis matrix task to publish packages to github for continuous packages delivery.
+    - secure: "aCdHveZuY8AT4Jr1JoJB4LxZsnGWRe/KseZh1YXYe5UtufFCtTVHvUcLn0j2aLBF0KpdyS+hWf0i4np9jthKu2xPKriefoPgCMpisYeC0MFkwbmv+XlgkUbgkgVZMGiVyX7DCYXVahxIoOUjVMEDCbNiHTIrfEuyq24U3ok2tHc="
+  matrix:
+    # Order: a slower build first, so that we don't occupy an idle travis worker waiting for others to complete.
+    - CI_MODE=e2e
+    - CI_MODE=js
+    - CI_MODE=saucelabs_required
+    # deactivated, see #19768
+    # - CI_MODE=browserstack_required
+    - CI_MODE=saucelabs_optional
+    - CI_MODE=browserstack_optional
+
+matrix:
+  fast_finish: true
+  allow_failures:
+    - env: "CI_MODE=saucelabs_optional"
+    - env: "CI_MODE=browserstack_optional"
+
+before_install:
+  # source the env.sh script so that the exported variables are available to other scripts later on
+  - source ./scripts/ci/env.sh print
+
+install:
+  - ./scripts/ci/install.sh
+
+script:
+  - ./scripts/ci/build.sh
+  - ./scripts/ci/test.sh
+  - ./scripts/ci/angular.sh
+  # all the scripts under this line will not quickly abort in case ${TRAVIS_TEST_RESULT} is 1 (job failure)
+  - ./scripts/ci/cleanup.sh
+  - ./scripts/ci/print-logs.sh
@@ -1,25 +0,0 @@
-# VSCode Configuration
-
-This folder contains opt-in [Workspace Settings](https://code.visualstudio.com/docs/getstarted/settings), [Tasks](https://code.visualstudio.com/docs/editor/tasks), [Launch Configurations](https://code.visualstudio.com/Docs/editor/debugging#_launch-configurations) and [Extension Recommendations](https://code.visualstudio.com/docs/editor/extension-gallery#_workspace-recommended-extensions) that the Angular team recommends using when working on this repository.
-
-## Usage
-
-To use the recommended configurations follow the steps below:
-
- install the recommneded extensions in `.vscode/extensions.json`
- copy (or link) `.vscode/recommended-settings.json` to `.vscode/settings.json`
- copy (or link) `.vscode/recommended-launch.json` to `.vscode/launch.json`
- copy (or link) `.vscode/recommended-tasks.json` to `.vscode/tasks.json`
- restart the editor
-
-If you already have your custom workspace settings you should instead manually merge the file contents.
-
-This isn't an automatic process so you will need to repeat it when settings are updated.
-
-To see the recommended extensions select "Extensions: Show Recommended Extensions" in the [Command Palette](https://code.visualstudio.com/docs/getstarted/userinterface#_command-palette).
-
-## Editing `.vscode/recommended-*.json` files
-
-If you wish to add extra configuration items please keep in mind any modifications you make here will be used by many users.
-
-Try to keep these settings/configuations to things that help facilitate the development process and avoid altering the user workflow whenever possible.
@@ -1,15 +0,0 @@
-{
-  // See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
-  // Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
-
-  // List of extensions which should be recommended for users of this workspace.
-  "recommendations": [
-    "devondcarew.bazel-code",
-    "gkalpak.aio-docs-utils",
-    "ms-vscode.vscode-typescript-tslint-plugin",
-    "xaver.clang-format",
-    // The following extensions are useful when working on angular.io (i.e. inside the `aio/` directory).
-    //"angular.ng-template",
-    //"dbaeumer.vscode-eslint",
-  ],
-}
@@ -1,90 +0,0 @@
-{
-  // Use IntelliSense to learn about possible attributes.
-  // Hover to view descriptions of existing attributes.
-  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "name": "Attach to bazel test ... --config=debug",
-      "type": "node",
-      "request": "attach",
-      "port": 9229,
-      "address": "localhost",
-      "restart": false,
-      "sourceMaps": true,
-      "localRoot": "${workspaceRoot}",
-      "remoteRoot": "${workspaceRoot}",
-      "stopOnEntry": false,
-      "timeout": 600000,
-      "outFiles": ["${workspaceFolder}/bazel-out/**/angular/**/*.js"],
-    },
-    {
-      "name": "Attach to bazel test ... --config=debug (no source maps)",
-      "type": "node",
-      "request": "attach",
-      "port": 9229,
-      "address": "localhost",
-      "restart": false,
-      "sourceMaps": false,
-      "localRoot": "${workspaceRoot}",
-      "remoteRoot": "${workspaceRoot}",
-      "stopOnEntry": false,
-      "timeout": 600000,
-      "outFiles": ["${workspaceFolder}/bazel-out/**/angular/**/*.js"],
-    },
-    {
-      "name": "IVY:packages/core/test/acceptance",
-      "type": "node",
-      "request": "launch",
-      "program": "${workspaceFolder}/node_modules/.bin/bazelisk",
-      "args": [
-        "test",
-        "--config=ivy",
-        "packages/core/test/acceptance",
-        "--config=debug"
-      ],
-      "port": 9229,
-      "address": "localhost",
-      "restart": true,
-      "sourceMaps": true,
-      "timeout": 600000,
-      "outFiles": ["${workspaceFolder}/bazel-out/**/angular/**/*.js"],
-    },
-    {
-      "name": "IVY:packages/core/test/render3",
-      "type": "node",
-      "request": "launch",
-      "program": "${workspaceFolder}/node_modules/.bin/bazelisk",
-      "args": [
-        "test",
-        "--config=ivy",
-        "packages/core/test/render3",
-        "--config=debug"
-      ],
-      "port": 9229,
-      "address": "localhost",
-      "restart": true,
-      "sourceMaps": true,
-      "timeout": 600000,
-      "outFiles": ["${workspaceFolder}/bazel-out/**/angular/**/*.js"],
-    },
-    {
-      "name": "IVY:packages/core/test",
-      "type": "node",
-      "request": "launch",
-      "program": "${workspaceFolder}/node_modules/.bin/bazelisk",
-      "args": [
-        "test",
-        "--config=ivy",
-        "packages/core/test",
-        "--config=debug"
-      ],
-      "port": 9229,
-      "address": "localhost",
-      "restart": true,
-      "sourceMaps": true,
-      "timeout": 600000,
-      "outFiles": ["${workspaceFolder}/bazel-out/**/angular/**/*.js"],
-    },
-  ]
-}
@@ -1,32 +0,0 @@
-{
-  // Format js and ts files on save with `clang-format.executable`
-  // If `clang-format.executable` is not being used, these two settings should be removed otherwise it will break existing formatting.
-  // You can instead run `yarn gulp format` to manually format your code.
-  "[javascript]": {
-    "editor.formatOnSave": true,
-  },
-  "[typescript]": {
-    "editor.formatOnSave": true,
-  },
-  // Please install https://marketplace.visualstudio.com/items?itemName=xaver.clang-format to take advantage of `clang-format` in VSCode.
-  // (See https://clang.llvm.org/docs/ClangFormat.html for more info `clang-format`.)
-  "clang-format.executable": "${workspaceRoot}/node_modules/.bin/clang-format",
-  // Exclude third party modules and build artifacts from the editor watchers/searches.
-  "files.watcherExclude": {
-    "**/.git/objects/**": true,
-    "**/.git/subtree-cache/**": true,
-    "**/node_modules/**": true,
-    "**/bazel-out/**": true,
-    "**/dist/**": true,
-    "**/aio/src/generated/**": true,
-  },
-  "search.exclude": {
-    "**/node_modules": true,
-    "**/bower_components": true,
-    "**/bazel-out": true,
-    "**/dist": true,
-    "**/aio/src/generated": true,
-    ".history": true,
-  },
-  "git.ignoreLimitWarning": true,
-}
@@ -1,113 +0,0 @@
-{
-  // See https://go.microsoft.com/fwlink/?LinkId=733558
-  // for the documentation about the tasks.json format
-  "version": "2.0.0",
-  "tasks": [
-    {
-      "label": "IVY:packages/core/test/...",
-      "type": "shell",
-      "command": "${workspaceFolder}/node_modules/.bin/bazelisk",
-      "args": [
-        "test",
-        "--config=ivy",
-        "packages/core/test",
-        "packages/core/test/acceptance",
-        "packages/core/test/render3",
-      ],
-      "group": "test",
-      "presentation": {
-        "reveal": "always",
-        "panel": "dedicated",
-      },
-    },
-    {
-      "label": "VE:packages/core/test/...",
-      "type": "shell",
-      "command": "${workspaceFolder}/node_modules/.bin/bazelisk",
-      "args": [
-        "test",
-        "packages/core/test",
-        "packages/core/test/acceptance",
-        "packages/core/test/render3",
-      ],
-      "group": "test",
-      "presentation": {
-        "reveal": "always",
-        "panel": "dedicated",
-      },
-    },
-    {
-      "label": "IVY:packages/core/test/acceptance",
-      "type": "shell",
-      "command": "${workspaceFolder}/node_modules/.bin/bazelisk",
-      "args": [
-        "test",
-        "--config=ivy",
-        "packages/core/test/acceptance",
-      ],
-      "group": "test",
-      "presentation": {
-        "reveal": "always",
-        "panel": "dedicated",
-      },
-    },
-    {
-      "label": "VE:packages/core/test/acceptance",
-      "type": "shell",
-      "command": "${workspaceFolder}/node_modules/.bin/bazelisk",
-      "args": [
-        "test",
-        "packages/core/test/acceptance",
-      ],
-      "group": "test",
-      "presentation": {
-        "reveal": "always",
-        "panel": "dedicated",
-      },
-    },
-    {
-      "label": "IVY:packages/core/test",
-      "type": "shell",
-      "command": "${workspaceFolder}/node_modules/.bin/bazelisk",
-      "args": [
-        "test",
-        "--config=ivy",
-        "packages/core/test",
-      ],
-      "group": "test",
-      "presentation": {
-        "reveal": "always",
-        "panel": "dedicated",
-      },
-    },
-    {
-      "label": "VE:packages/core/test",
-      "type": "shell",
-      "command": "${workspaceFolder}/node_modules/.bin/bazelisk",
-      "args": [
-        "test",
-        "packages/core/test",
-      ],
-      "group": "test",
-      "presentation": {
-        "reveal": "always",
-        "panel": "dedicated",
-      },
-    },
-    {
-      "label": "IVY:packages/core/test/render3",
-      "type": "shell",
-      "command": "${workspaceFolder}/node_modules/.bin/bazelisk",
-      "args": [
-        "test",
-        "--config=ivy",
-        "packages/core/test/render3",
-      ],
-      "group": "test",
-      "presentation": {
-        "reveal": "always",
-        "panel": "dedicated",
-      },
-    },
-  ],
-}
@@ -1,13 +0,0 @@
-# Yarn Vendoring
-We utilize Yarn's `yarn-path` configuration in a shared `.yarnrc` file to enforce
-everyone using the same version of Yarn.  Yarn checks the `.yarnrc` file to
-determine if yarn should delegate the command to a vendored version at the
-provided path.
-
-## How to update
-To update to the latest version of Yarn as our vendored version:
- Run this command
-```sh
-yarn policies set-version latest
-```
- Remove the previous version
@@ -1,5 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-yarn-path ".yarn/releases/yarn-1.22.10.cjs"
@@ -1,58 +1,51 @@
 package(default_visibility = ["//visibility:public"])

-exports_files([
-    "LICENSE",
-    "karma-js.conf.js",
-    "browser-providers.conf.js",
-    "scripts/ci/track-payload-size.sh",
-    "scripts/ci/payload-size.sh",
-    "scripts/ci/payload-size.js",
-    "package.json",
-])
+load("@build_bazel_rules_nodejs//:defs.bzl", "node_modules_filegroup")

-alias(
-    name = "tsconfig.json",
-    actual = "//packages:tsconfig-build.json",
-)
+exports_files([
+    "tsconfig.json",
+    "LICENSE",
+    "protractor-perf.conf.js",
+])

 filegroup(
    name = "web_test_bootstrap_scripts",
    # do not sort
    srcs = [
-        "@npm//:node_modules/core-js-bundle/index.js",
-        "//packages/zone.js/bundles:zone.umd.js",
-        "//packages/zone.js/bundles:zone-testing.umd.js",
-        "//packages/zone.js/bundles:task-tracking.umd.js",
+        "@ngdeps//node_modules/reflect-metadata:Reflect.js",
+        "@ngdeps//node_modules/zone.js:dist/zone.js",
+        "@ngdeps//node_modules/zone.js:dist/zone-testing.js",
+        "@ngdeps//node_modules/zone.js:dist/task-tracking.js",
        "//:test-events.js",
-        "//:third_party/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",
    ],
 )

 filegroup(
    name = "angularjs_scripts",
    srcs = [
-        # We also declare the unminified AngularJS files since these can be used for
-        # local debugging (e.g. see: packages/upgrade/test/common/test_helpers.ts)
-        "@npm//:node_modules/angular-1.5/angular.js",
-        "@npm//:node_modules/angular-1.5/angular.min.js",
-        "@npm//:node_modules/angular-1.6/angular.js",
-        "@npm//:node_modules/angular-1.6/angular.min.js",
-        "@npm//:node_modules/angular-1.7/angular.js",
-        "@npm//:node_modules/angular-1.7/angular.min.js",
-        "@npm//:node_modules/angular-mocks-1.5/angular-mocks.js",
-        "@npm//:node_modules/angular-mocks-1.6/angular-mocks.js",
-        "@npm//:node_modules/angular-mocks-1.7/angular-mocks.js",
-        "@npm//:node_modules/angular-mocks-1.8/angular-mocks.js",
-        "@npm//:node_modules/angular-1.8/angular.js",
-        "@npm//:node_modules/angular-1.8/angular.min.js",
+        "@ngdeps//node_modules/angular:angular.js",
+        "@ngdeps//node_modules/angular-1.5:angular.js",
+        "@ngdeps//node_modules/angular-1.6:angular.js",
+        "@ngdeps//node_modules/angular-mocks:angular-mocks.js",
+        "@ngdeps//node_modules/angular-mocks-1.5:angular-mocks.js",
+        "@ngdeps//node_modules/angular-mocks-1.6:angular-mocks.js",
    ],
 )

-# Detect if the build is running under --stamp
-config_setting(
-    name = "stamp",
-    values = {"stamp": "true"},
+load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary")
+
+# A nodejs_binary for @angular/bazel/ngc-wrapped to use by default in
+# ng_module that depends on @npm//@angular/bazel instead of the
+# output of the //packages/bazel/src/ngc-wrapped ts_library rule. This
+# default is for downstream users that depend on the @angular/bazel npm
+# package. The generated @npm//@angular/bazel/ngc-wrapped target
+# does not work because it does not have the node `--expose-gc` flag
+# set which is required to support the call to `global.gc()`.
+nodejs_binary(
+    name = "@angular/bazel/ngc-wrapped",
+    configuration_env_vars = ["compile"],
+    data = ["@npm//@angular/bazel"],
+    entry_point = "@angular/bazel/src/ngc-wrapped/index.js",
+    install_source_map_support = False,
+    templated_args = ["--node_options=--expose-gc"],
 )
@@ -3,7 +3,7 @@

 As contributors and maintainers of the Angular project, we pledge to respect everyone who contributes by posting issues, updating documentation, submitting pull requests, providing feedback in comments, and any other activities.

-Communication through any of Angular's channels (GitHub, Discord, Gitter, IRC, mailing lists, Twitter, etc.) must be constructive and never resort to personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
+Communication through any of Angular's channels (GitHub, Gitter, IRC, mailing lists, Google+, Twitter, etc.) must be constructive and never resort to personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.

 We promise to extend courtesy and respect to everyone involved in this project regardless of gender, gender identity, sexual orientation, disability, age, race, ethnicity, religion, or level of experience. We expect anyone contributing to the Angular project to do the same.

@@ -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!
-As a contributor, here are the guidelines we would like you to follow:
+We would love for you to contribute to Angular and help make it even better than it is
+today! As a contributor, here are the guidelines we would like you to follow:

 - [Code of Conduct](#coc)
 - [Question or Problem?](#question)
@@ -12,168 +12,112 @@ 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.
-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.
+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`.

 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 Discord server][discord].
-
+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 [submitting an issue](#submit-issue) to our [GitHub Repository][github].
-Even better, you can [submit a Pull Request](#submit-pr) with a fix.
-
+If you find a bug in the source code, you can help us by
+[submitting an issue](#submit-issue) to our [GitHub Repository][github]. Even better, you can
+[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.
-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:
-
-* For a **Major Feature**, first open an issue and outline your proposal so that it can be discussed.
-  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.
+You can *request* a new feature by [submitting an issue](#submit-issue) to our GitHub
+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.
+Please consider what kind of change it is:

+* For a **Major Feature**, first open an issue and outline your proposal so that it can be
+discussed. This will also allow us to better coordinate our efforts, prevent duplication of work,
+and help you to craft the change so that it is successfully accepted into the project.
 * **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.
-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.
+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 scenario using http://plnkr.co. Having a live, reproducible scenario gives us a wealth of important information without going back & forth to you with additional questions like:

-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.
+- version of Angular used
+- 3rd-party libraries and their versions
+- and most importantly - a use-case that fails

-We require a minimal reproduction to save maintainers' time and ultimately be able to fix more bugs.
-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.
+A minimal reproduce scenario using http://plnkr.co/ allows us to quickly confirm a bug (or point out coding problem) as well as confirm that we are fixing the right problem. If plunker is not a suitable way to demonstrate the problem (for example for issues related to our npm packaging), please create a standalone git repository demonstrating the problem.

-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.
+We will be insisting on a minimal reproduce 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 plunk. We understand that sometimes it might be hard to extract essentials bits of code from a larger code-base but we really need to isolate the problem before we can fix it.

-You can file new issues by selecting from our [new issue templates](https://github.com/angular/angular/issues/new/choose) and filling out the issue template.
+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.
+
+You can file new issues by filling out our [new issue form](https://github.com/angular/angular/issues/new).


 ### <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.
-   You don't want to duplicate existing efforts.
-
-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 upfront helps to ensure that we're ready to accept your work.
-
-3. Please sign our [Contributor License Agreement (CLA)](#cla) before sending PRs.
-   We cannot accept code without a signed CLA.
-   Make sure you author all contributed Git commits with email address associated with your CLA signature.
-
-4. [Fork](https://docs.github.com/en/github/getting-started-with-github/fork-a-repo) the angular/angular repo.
-
-5. In your forked repository, make your changes in a new git branch:
+1. Search [GitHub](https://github.com/angular/angular/pulls) for an open or closed PR
+  that relates to your submission. You don't want to duplicate effort.
+1. Be sure that an issue describes the problem you're fixing, or documents the design for the feature you'd like to add.
+  Discussing the design up front helps to ensure that we're ready to accept your work.
+1. Please sign our [Contributor License Agreement (CLA)](#cla) before sending PRs.
+  We cannot accept code without this. Make sure you sign with the primary email address of the Git identity that has been granted access to the Angular repository.
+1. Fork the angular/angular repo.
+1. Make your changes in a new git branch:

     ```shell
     git checkout -b my-fix-branch master
     ```

-6. Create your patch, **including appropriate test cases**.
-
-7. Follow our [Coding Rules](#rules).
-
-8. Run the full Angular test suite, as described in the [developer documentation][dev-doc], and ensure that all tests pass.
-
-9. Commit your changes using a descriptive commit message that follows our [commit message conventions](#commit).
-   Adherence to these conventions is necessary because release notes are automatically generated from these messages.
+1. Create your patch, **including appropriate test cases**.
+1. 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.
+1. Commit your changes using a descriptive commit message that follows our
+  [commit message conventions](#commit). Adherence to these conventions
+  is necessary because release notes are automatically generated from these messages.

     ```shell
-     git commit --all
+     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`.
-
-### Reviewing a Pull Request
-
-The Angular team reserves the right not to accept pull requests from community members who haven't been good citizens of the community. Such behavior includes not following the [Angular code of conduct](https://github.com/angular/code-of-conduct) and applies within or outside of Angular managed channels.
-
-#### Addressing review feedback
-
-If we ask for changes via code reviews then:
-
-1. Make the required updates to the code.
-
-2. Re-run the Angular test suites to ensure tests are still passing.
-
-3. Create a fixup commit and push to your GitHub repository (this will update your Pull Request):
+1. In GitHub, send a pull request to `angular:master`.
+* If we suggest changes 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):

    ```shell
-    git commit --all --fixup HEAD
-    git push
+    git rebase master -i
+    git push -f
    ```

-    For more info on working with fixup commits see [here](docs/FIXUP_COMMITS.md).
-
 That's it! Thank you for your contribution!

-
-##### Updating the commit message
-
-A reviewer might often suggest changes to a commit message (for example, to add more context for a change or adhere to our [commit message guidelines](#commit)).
-In order to update the commit message of the last commit on your branch:
-
-1. Check out your branch:
-
-    ```shell
-    git checkout my-fix-branch
-    ```
-
-2. Amend the last commit and modify the commit message:
-
-    ```shell
-    git commit --amend
-    ```
-
-3. Push to your GitHub repository:
-
-    ```shell
-    git push --force-with-lease
-    ```
-
-> NOTE:<br />
-> If you need to update the commit message of an earlier commit, you can use `git rebase` in interactive mode.
-> See the [git docs](https://git-scm.com/docs/git-rebase#_interactive_mode) for more details.
-
-
 #### 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:

@@ -199,195 +143,154 @@ 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**.
-* We follow [Google's JavaScript Style Guide][js-style-guide], but wrap all code at **100 characters**.
+* 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**. 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
-
-*This specification is inspired by and supersedes the [AngularJS commit message format][commit-message-format].*
-
-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**.
-
+### Commit Message Format
+Each commit message consists of a **header**, a **body** and a **footer**.  The header has a special
+format that includes a **type**, a **scope** and a **subject**:

 ```
-<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 type "docs".
-When the body is present it must be at least 20 characters long and must conform to the [Commit Message Body](#commit-body) format.
+Any line of the commit message cannot be longer 100 characters! This allows the message to be easier
+to read on GitHub as well as in various git tools.

-The `footer` is optional. The [Commit Message Footer](#commit-footer) format describes what the footer is used for and the structure it must have.
+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.
-
-
-#### <a name="commit-header"></a>Commit Message Header
+Samples: (even more [samples](https://github.com/angular/angular/commits/master))

 ```
-<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|router|service-worker|
-  │                          upgrade|zone.js|packaging|changelog|docs-infra|migrations|ngcc|ve
-  │
-  └─⫸ Commit Type: build|ci|docs|feat|fix|perf|refactor|test
+docs(changelog): update changelog to beta.5
+```
+```
+fix(release): need to depend on latest rxjs and zone.js
+
+The version in our package.json gets copied to the one we publish, and users need the latest of these.
 ```

-The `<type>` and `<summary>` fields are mandatory, the `(<scope>)` field is optional.
-
-
-##### Type
+### 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
 Must be one of the following:

 * **build**: Changes that affect the build system or external dependencies (example scopes: gulp, broccoli, npm)
-* **ci**: Changes to our CI configuration files and scripts (example scopes: Circle, BrowserStack, SauceLabs)
+* **ci**: Changes to our CI configuration files and scripts (example scopes: Travis, Circle, BrowserStack, SauceLabs)
 * **docs**: Documentation only changes
 * **feat**: A new feature
 * **fix**: A bug fix
 * **perf**: A code change that improves performance
 * **refactor**: A code change that neither fixes a bug nor adds a feature
+* **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
-The scope should be the name of the npm package affected (as perceived by the person reading the changelog generated from commit messages).
+### 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`
-* `bazel`
-* `benchpress`
-* `common`
-* `compiler`
-* `compiler-cli`
-* `core`
-* `elements`
-* `forms`
-* `http`
-* `language-service`
-* `localize`
-* `platform-browser`
-* `platform-browser-dynamic`
-* `platform-server`
-* `router`
-* `service-worker`
-* `upgrade`
-* `zone.js`
+* **animations**
+* **common**
+* **compiler**
+* **compiler-cli**
+* **core**
+* **elements**
+* **forms**
+* **http**
+* **language-service**
+* **platform-browser**
+* **platform-browser-dynamic**
+* **platform-server**
+* **platform-webworker**
+* **platform-webworker-dynamic**
+* **router**
+* **service-worker**
+* **upgrade**

 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
+* 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
-
-* `dev-infra`: used for dev-infra related changes within the directories /scripts and /tools
-
-* `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 `test` and `refactor` changes that are done across all packages (e.g. `test: add missing unit tests`) 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:
+### Subject
+The subject contains 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.

-#### <a name="commit-body"></a>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".
-
-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.
-
-
-#### <a name="commit-footer"></a>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.
+**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.

+A detailed explanation can be found in this [document][commit-message-format].

 ## <a name="cla"></a> Signing the CLA

 Please sign our Contributor License Agreement (CLA) before sending pull requests. For any code
 changes to be accepted, the CLA must be signed. It's a quick process, we promise!

-* For individuals, we have a [simple click-through form][individual-cla].
-* For corporations, we'll need you to
+* For individuals we have a [simple click-through form][individual-cla].
+* 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
 [commit-message-format]: https://docs.google.com/document/d/1QrDFcIiPjSLDn3EL15IJygNPiHORgU1_OOAqWjiDU5Y/edit#
-[corporate-cla]: https://cla.developers.google.com/about/google-corporate
+[corporate-cla]: http://code.google.com/legal/corporate-cla-v1.0.html
 [dev-doc]: https://github.com/angular/angular/blob/master/docs/DEVELOPER.md
 [github]: https://github.com/angular/angular
-[discord]: https://discord.gg/angular
-[individual-cla]: https://cla.developers.google.com/about/google-individual
+[gitter]: https://gitter.im/angular/angular
+[individual-cla]: http://code.google.com/legal/individual-cla-v1.0.html
 [js-style-guide]: https://google.github.io/styleguide/jsguide.html
-[jsfiddle]: https://jsfiddle.net/
-[plunker]: https://plnkr.co/edit
-[runnable]: https://runnable.com/
-[stackoverflow]: https://stackoverflow.com/questions/tagged/angular
+[jsfiddle]: http://jsfiddle.net
+[plunker]: http://plnkr.co/edit
+[runnable]: http://runnable.com
+[stackoverflow]: http://stackoverflow.com/questions/tagged/angular
@@ -1,6 +1,6 @@
 The MIT License

-Copyright (c) 2010-2021 Google LLC. https://angular.io/license
+Copyright (c) 2014-2018 Google, Inc. http://angular.io

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -1,159 +1,29 @@
-<h1 align="center">Angular - The modern web developer's platform.</h1>
+[![Build Status](https://travis-ci.org/angular/angular.svg?branch=master)](https://travis-ci.org/angular/angular)
+[![CircleCI](https://circleci.com/gh/angular/angular/tree/master.svg?style=shield)](https://circleci.com/gh/angular/angular/tree/master)
+[![BrowserStack Status](https://www.browserstack.com/automate/badge.svg?badge_key=LzF3RzBVVGt6VWE2S0hHaC9uYllOZz09LS1BVjNTclBKV0x4eVRlcjA4QVY1M0N3PT0=--eb4ce8c8dc2c1c5b2b5352d473ee12a73ac20e06)](https://www.browserstack.com/automate/public-build/LzF3RzBVVGt6VWE2S0hHaC9uYllOZz09LS1BVjNTclBKV0x4eVRlcjA4QVY1M0N3PT0=--eb4ce8c8dc2c1c5b2b5352d473ee12a73ac20e06)
+[![Join the chat at https://gitter.im/angular/angular](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/angular/angular?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![npm version](https://badge.fury.io/js/%40angular%2Fcore.svg)](https://www.npmjs.com/@angular/core)

-<p align="center">
-  <img src="aio/src/assets/images/logos/angular/angular.png" alt="angular-logo" width="120px" height="120px"/>
-  <br>
-  <i>Angular is a development platform for building mobile and desktop web applications
-    <br> using Typescript/JavaScript and other languages.</i>
-  <br>
-</p>

-<p align="center">
-  <a href="https://www.angular.io"><strong>www.angular.io</strong></a>
-  <br>
-</p>
+# Angular

-<p align="center">
-  <a href="CONTRIBUTING.md">Contributing Guidelines</a>
-  ·
-  <a href="https://github.com/angular/angular/issues">Submit an Issue</a>
-  ·
-  <a href="https://blog.angular.io/">Blog</a>
-  <br>
-  <br>
-</p>
-
-<p align="center">
-  <a href="https://circleci.com/gh/angular/workflows/angular/tree/master">
-    <img src="https://img.shields.io/circleci/build/github/angular/angular/master.svg?logo=circleci&logoColor=fff&label=CircleCI" alt="CI status" />
-  </a>&nbsp;
-  <a href="https://www.npmjs.com/@angular/core">
-    <img src="https://img.shields.io/npm/v/@angular/core.svg?logo=npm&logoColor=fff&label=NPM+package&color=limegreen" alt="Angular on npm" />
-  </a>&nbsp;
-  <a href="https://discord.gg/angular">
-    <img src="https://img.shields.io/discord/463752820026376202.svg?logo=discord&logoColor=fff&label=Discord&color=7389d8" alt="Discord conversation" />
-  </a>
-</p>
-
-<hr>
-
-## Documentation
-
-Get started with Angular, learn the fundamentals and explore advanced topics on our documentation website.
-
- [Getting Started][quickstart]
- [Architecture][architecture]
- [Components and Templates][componentstemplates]
- [Forms][forms]
- [API][api]
-
-### Advanced
-
- [Angular Elements][angularelements]
- [Server Side Rendering][ssr]
- [Schematics][schematics]
- [Lazy Loading][lazyloading]
-
-## Development Setup
-
-### Prerequisites
-
- Install [Node.js] which includes [Node Package Manager][npm]
-
-### Setting Up a Project
-
-Install the Angular CLI globally:
-
-```
-npm install -g @angular/cli
-```
-
-Create workspace:
-
-```
-ng new [PROJECT NAME]
-```
-
-Run the application:
-
-```
-cd [PROJECT NAME]
-ng serve
-```
-
-Angular is cross-platform, fast, scalable, has incredible tooling, and is loved by millions.
+Angular is a development platform for building mobile and desktop web applications using Typescript/JavaScript and other languages.

 ## Quickstart

 [Get started in 5 minutes][quickstart].

-## Ecosystem
-
-<p>
-  <img src="/docs/images/angular-ecosystem-logos.png" alt="angular ecosystem logos" width="500px" height="auto">
-</p>
-
- [Angular Command Line (CLI)][cli]
- [Angular Material][angularmaterial]
-
 ## Changelog

-[Learn about the latest improvements][changelog].
+[Learn about the latest improvements][changelog]. 

-## Upgrading
+## Want to help?

-Check out our [upgrade guide](https://update.angular.io/) to find out the best way to upgrade your project.
+Want to file a bug, contribute some code, or improve documentation? Excellent! Read up on our
+guidelines for [contributing][contributing] and then check out one of our issues in the [hotlist: community-help](https://github.com/angular/angular/labels/hotlist%3A%20community-help).

-## Contributing
-
-### Contributing Guidelines
-
-Read through our [contributing guidelines][contributing] to learn about our submission process, coding rules and more.
-
-### Want to Help?
-
-Want to file a bug, contribute some code, or improve documentation? Excellent! Read up on our guidelines for [contributing][contributing] and then check out one of our issues labeled as <kbd>[help wanted](https://github.com/angular/angular/labels/help%20wanted)</kbd> or <kbd>[good first issue](https://github.com/angular/angular/labels/good%20first%20issue)</kbd>.
-
-### Code of Conduct
-
-Help us keep Angular open and inclusive. Please read and follow our [Code of Conduct][codeofconduct].
-
-## Community
-
-Join the conversation and help the community.
-
- [Twitter][twitter]
- [Discord][discord]
- [Gitter][gitter]
- [YouTube][youtube]
- [StackOverflow][stackoverflow]
- Find a Local [Meetup][meetup]
-
-[![Love Angular badge](https://img.shields.io/badge/angular-love-blue?logo=angular&angular=love)](https://www.github.com/angular/angular)
-
-**Love Angular? Give our repo a star :star: :arrow_up:.**
-
-[contributing]: CONTRIBUTING.md
-[quickstart]: https://angular.io/start
-[changelog]: CHANGELOG.md
+[browserstack]: https://www.browserstack.com/automate/public-build/LzF3RzBVVGt6VWE2S0hHaC9uYllOZz09LS1BVjNTclBKV0x4eVRlcjA4QVY1M0N3PT0=--eb4ce8c8dc2c1c5b2b5352d473ee12a73ac20e06
+[contributing]: https://github.com/angular/angular/blob/master/CONTRIBUTING.md
+[quickstart]: https://angular.io/guide/quickstart
+[changelog]: https://github.com/angular/angular/blob/master/CHANGELOG.md
 [ng]: https://angular.io
-[documentation]: https://angular.io/docs
-[angularmaterial]: https://material.angular.io/
-[cli]: https://cli.angular.io/
-[architecture]: https://angular.io/guide/architecture
-[componentstemplates]: https://angular.io/guide/displaying-data
-[forms]: https://angular.io/guide/forms-overview
-[api]: https://angular.io/api
-[angularelements]: https://angular.io/guide/elements
-[ssr]: https://angular.io/guide/universal
-[schematics]: https://angular.io/guide/schematics
-[lazyloading]: https://angular.io/guide/lazy-loading-ngmodules
-[node.js]: https://nodejs.org/
-[npm]: https://www.npmjs.com/get-npm
-[codeofconduct]: CODE_OF_CONDUCT.md
-[twitter]: https://www.twitter.com/angular
-[discord]: https://discord.gg/angular
-[gitter]: https://gitter.im/angular/angular
-[stackoverflow]: https://stackoverflow.com/questions/tagged/angular
-[youtube]: https://youtube.com/angular
-[meetup]: https://www.meetup.com/find/?keywords=angular"
@@ -1,64 +1,97 @@
-workspace(
-    name = "angular",
-    managed_directories = {"@npm": ["node_modules"]},
+workspace(name = "angular")
+
+load(
+    "//packages/bazel:package.bzl",
+    "rules_angular_dependencies",
+    "rules_angular_dev_dependencies",
 )

-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+# Uncomment for local bazel rules development
+#local_repository(
+#    name = "build_bazel_rules_nodejs",
+#    path = "../rules_nodejs",
+#)
+#local_repository(
+#    name = "build_bazel_rules_typescript",
+#    path = "../rules_typescript",
+#)

-# Fetch rules_nodejs so we can install our npm dependencies
+# Angular Bazel users will call this function
+rules_angular_dependencies()
+# These are the dependencies only for us
+rules_angular_dev_dependencies()
+
+#
+# Point Bazel to WORKSPACEs that live in subdirectories
+#
 http_archive(
-    name = "build_bazel_rules_nodejs",
-    sha256 = "4681ca88d512d57196d064d1441549080d8d17d119174a1229d1717a16a4a489",
-    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/4.0.0-beta.1/rules_nodejs-4.0.0-beta.1.tar.gz"],
+    name = "rxjs",
+    url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz",
+    strip_prefix = "package/src",
+    sha256 = "72b0b4e517f43358f554c125e40e39f67688cd2738a8998b4a266981ed32f403",
 )

-# Check the rules_nodejs version and download npm dependencies
-# Note: bazel (version 2 and after) will check the .bazelversion file so we don't need to
-# assert on that.
-load("@build_bazel_rules_nodejs//:index.bzl", "check_rules_nodejs_version", "node_repositories", "yarn_install")
+# Point to the integration test workspace just so that Bazel doesn't descend into it
+# when expanding the //... pattern
+local_repository(
+    name = "bazel_integration_test",
+    path = "integration/bazel",
+)

-check_rules_nodejs_version(minimum_version_string = "2.2.0")
+#
+# Load and install our dependencies downloaded above.
+#
+load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories", "yarn_install")
+
+check_bazel_version("0.18.0", """
+If you are on a Mac and using Homebrew, there is a breaking change to the installation in Bazel 0.16
+See https://blog.bazel.build/2018/08/22/bazel-homebrew.html
+
+""")

-# Setup the Node.js toolchain
 node_repositories(
-    node_version = "14.16.1",
+    node_version = "10.9.0",
    package_json = ["//:package.json"],
+    preserve_symlinks = True,
+    yarn_version = "1.9.2",
 )

-load("//integration:angular_integration_test.bzl", "npm_package_archives")
-
 yarn_install(
    name = "npm",
-    manual_build_file_contents = npm_package_archives(),
-    package_json = "//:package.json",
-    yarn_lock = "//:yarn.lock",
+    package_json = "//tools:npm/package.json",
+    yarn_lock = "//tools:npm/yarn.lock",
 )

-# Load protractor dependencies
-load("@npm//@bazel/protractor:package.bzl", "npm_bazel_protractor_dependencies")
+load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_toolchains")

-npm_bazel_protractor_dependencies()
+go_rules_dependencies()

-# Setup the rules_webtesting toolchain
-load("@io_bazel_rules_webtesting//web:repositories.bzl", "web_test_repositories")
+go_register_toolchains()
+
+load("@io_bazel_rules_webtesting//web:repositories.bzl", "browser_repositories", "web_test_repositories")

 web_test_repositories()

-load("@npm//@angular/dev-infra-private/bazel/browsers:browser_repositories.bzl", "browser_repositories")
-
-browser_repositories()
-
-load("//packages/common/locales/generate-locales-tool:cldr-data.bzl", "cldr_data_repository")
-
-cldr_data_repository(
-    name = "cldr_data",
-    # Since we use the Github archives for CLDR 37, we need to specify a path
-    # to the available locales. This wouldn't be needed with CLDR 39 as that
-    # comes with an official JSON archive not containing a version suffix.
-    available_locales_path = "cldr-core-37.0.0/availableLocales.json",
-    urls = {
-        "https://github.com/unicode-cldr/cldr-core/archive/37.0.0.zip": "32b5c49c3874aa342b90412c207b42e7aefb2435295891fb714c34ce58b3c706",
-        "https://github.com/unicode-cldr/cldr-dates-full/archive/37.0.0.zip": "e1c410dd8ad7d75df4a5393efaf5d28f0d56c0fa126c5d66e171a3f21a988a1e",
-        "https://github.com/unicode-cldr/cldr-numbers-full/archive/37.0.0.zip": "a921b90cf7f436e63fbdd55880f96e39a203acd9e174b0ceafa20a02c242a12e",
-    },
+browser_repositories(
+    chromium = True,
+    firefox = True,
 )
+
+load("@build_bazel_rules_typescript//:defs.bzl", "ts_setup_workspace")
+
+ts_setup_workspace()
+
+load("@angular//:index.bzl", "ng_setup_workspace")
+
+ng_setup_workspace()
+
+##################################
+# Skylark documentation generation
+
+load("@io_bazel_rules_sass//sass:sass_repositories.bzl", "sass_repositories")
+
+sass_repositories()
+
+load("@io_bazel_skydoc//skylark:skylark.bzl", "skydoc_repositories")
+
+skydoc_repositories()
@@ -1,12 +0,0 @@
-# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
-# For additional information regarding the format and rule options, please see:
-# https://github.com/browserslist/browserslist#queries
-
-# Googlebot uses an older version of Chrome
-# For additional information see: https://developers.google.com/search/docs/guides/rendering
-
-> 0.5%
-last 2 major versions
-Firefox ESR
-not dead
-IE 11
@@ -1,91 +0,0 @@
-{
-  "root": true,
-  "overrides": [
-    {
-      "files": [
-        "*.ts"
-      ],
-      "parserOptions": {
-        "project": [
-          "tsconfig.json",
-          "tests/e2e/tsconfig.json"
-        ],
-        "createDefaultProgram": true
-      },
-      "extends": [
-        "plugin:@angular-eslint/ng-cli-compat",
-        "plugin:@angular-eslint/ng-cli-compat--formatting-add-on",
-        "plugin:@angular-eslint/template/process-inline-templates"
-      ],
-      "rules": {
-        "@typescript-eslint/ban-types": "error",
-        "@angular-eslint/component-selector": [
-          "error",
-          {
-            "type": "element",
-            "prefix": "aio",
-            "style": "kebab-case"
-          }
-        ],
-        "@angular-eslint/directive-selector": [
-          "error",
-          {
-            "type": "attribute",
-            "prefix": "aio",
-            "style": "camelCase"
-          }
-        ],
-        "dot-notation": "error",
-        "indent": "off",
-        "@typescript-eslint/member-delimiter-style": ["error", {
-          "singleline": {
-            "delimiter": "comma",
-            "requireLast": false
-          }
-        }],
-        "@typescript-eslint/member-ordering": "off",
-        "@typescript-eslint/naming-convention": "off",
-        "no-console": ["error", {"allow": ["log", "warn", "error"]}],
-        "no-empty-function": "off",
-        "no-restricted-syntax": [
-          "error",
-          {
-            "selector": "CallExpression[callee.name=/^(fdescribe|fit)$/]",
-            "message": "Don't keep jasmine focus methods."
-          }
-        ],
-        "no-shadow": "off",
-        "@typescript-eslint/no-shadow": ["error"],
-        "no-tabs": "error",
-        "no-underscore-dangle": "off",
-        "no-unused-expressions": "error",
-        "no-use-before-define": "off",
-        "prefer-arrow/prefer-arrow-functions": "off",
-        "quotes": "off",
-        "@typescript-eslint/quotes": ["error", "single", {"avoidEscape": true}],
-        "semi": "error"
-      }
-    },
-    {
-      "files": [
-        "*.html"
-      ],
-      "extends": [
-        "plugin:@angular-eslint/template/recommended"
-      ],
-      "rules": {
-        "@angular-eslint/template/accessibility-alt-text": "error",
-        "@angular-eslint/template/accessibility-elements-content": "error",
-        "@angular-eslint/template/accessibility-label-has-associated-control": "error",
-        "@angular-eslint/template/accessibility-table-scope": "error",
-        "@angular-eslint/template/accessibility-valid-aria": "error",
-        "@angular-eslint/template/click-events-have-key-events": "error",
-        "@angular-eslint/template/eqeqeq": "off",
-        "@angular-eslint/template/mouse-events-have-key-events": "error",
-        "@angular-eslint/template/no-autofocus": "error",
-        "@angular-eslint/template/no-distracting-elements": "error",
-        "@angular-eslint/template/no-positive-tabindex": "error"
-      }
-    }
-  ]
-}
@@ -1,4 +1,4 @@
-# See https://help.github.com/ignore-files/ for more about ignoring files.
+# See http://help.github.com/ignore-files/ for more about ignoring files.

 # compiled output
 /dist
@@ -26,13 +26,11 @@
 !.vscode/extensions.json

 # misc
-/.firebase/
 /.sass-cache
 /connect.lock
 /coverage
 /libpeerconnection.log
 debug.log
-firebase-debug.log
 npm-debug.log
 testem.log
 /typings
@@ -46,3 +44,6 @@ protractor-results*.txt
 # System Files
 .DS_Store
 Thumbs.db
+
+# copied dependencies
+src/assets/js/lunr*
@@ -1 +0,0 @@
-engine-strict = true
@@ -6,7 +6,6 @@ Everything in this folder is part of the documentation project. This includes
 * the dgeni configuration for converting source files to rendered files that can be viewed in the web site.
 * the tooling for setting up examples for development; and generating live-example and zip files from the examples.

-<a name="developer-tasks"></a>
 ## Developer tasks

 We use [Yarn](https://yarnpkg.com) to manage the dependencies and to run build tasks.
@@ -15,10 +14,11 @@ Here are the most important tasks you might need to use:

 * `yarn` - install all the dependencies.
 * `yarn setup` - install all the dependencies, boilerplate, stackblitz, zips and run dgeni on the docs.
-* `yarn setup-local` - same as `setup`, but build the Angular packages from the source code and use these locally built versions (instead of the ones fetched from npm) for aio and docs examples boilerplate.
+* `yarn setup-local` - same as `setup`, but use the locally built Angular packages for aio and docs examples boilerplate.

 * `yarn build` - create a production build of the application (after installing dependencies, boilerplate, etc).
 * `yarn build-local` - same as `build`, but use `setup-local` instead of `setup`.
+
 * `yarn start` - run a development web server that watches the files; then builds the doc-viewer and reloads the page, as necessary.
 * `yarn serve-and-sync` - run both the `docs-watch` and `start` in the same console.
 * `yarn lint` - check that the doc-viewer code follows our style rules.
@@ -31,28 +31,28 @@ Here are the most important tasks you might need to use:
 * `yarn docs-lint` - check that the doc gen code follows our style rules.
 * `yarn docs-test` - run the unit tests for the doc generation code.

-* `yarn boilerplate:add` - generate all the boilerplate code for the examples, so that they can be run locally.
+* `yarn boilerplate:add` - generate all the boilerplate code for the examples, so that they can be run locally. Add the option `--local` to use your local version of Angular contained in the "dist" folder.
 * `yarn boilerplate:remove` - remove all the boilerplate code that was added via `yarn boilerplate:add`.
-* `yarn create-example` - create a new example directory containing initial source files.
-
 * `yarn generate-stackblitz` - generate the stackblitz files that are used by the `live-example` tags in the docs.
 * `yarn generate-zips` - generate the zip files from the examples. Zip available via the `live-example` tags in the docs.

-* `yarn example-e2e` - run all e2e tests for examples. Available options:
-  - `--setup`: generate boilerplate, force webdriver update & other setup, then run tests.
-  - `--local`: run e2e tests with the local version of Angular contained in the "dist" folder.
-               _Requires `--setup` in order to take effect._
-  - `--filter=foo`: limit e2e tests to those containing the word "foo".
+* `yarn example-e2e` - run all e2e tests for examples
+  - `yarn example-e2e --setup` - force webdriver update & other setup, then run tests
+  - `yarn example-e2e --filter=foo` - limit e2e tests to those containing the word "foo"
+  - `yarn example-e2e --setup --local` - run e2e tests with the local version of Angular contained in the "dist" folder

-> **Note for Windows users**
->
-> Setting up the examples involves creating some [symbolic links](https://en.wikipedia.org/wiki/Symbolic_link) (see [here](./tools/examples/README.md#symlinked-node_modules) for details). On Windows, this requires to either have [Developer Mode enabled](https://blogs.windows.com/windowsdeveloper/2016/12/02/symlinks-windows-10) (supported on Windows 10 or newer) or run the setup commands as administrator.
->
-> The affected commands are:
-> - `yarn setup` / `yarn setup-*`
-> - `yarn build` / `yarn build-*`
-> - `yarn boilerplate:add`
-> - `yarn example-e2e --setup`
+* `yarn build-ie-polyfills` - generates a js file of polyfills that can be loaded in Internet Explorer.
+
+## Developing on Windows
+The `packages/` directory may contain Linux-specific symlinks, which are not recognized by Windows.
+These unresolved links cause the docs generation process to fail because it cannot locate certain files.
+
+> Hint: The following steps require administration rights or [Windows Developer Mode](https://docs.microsoft.com/en-us/windows/uwp/get-started/enable-your-device-for-development) enabled!
+
+To fix this problem, run `scripts/windows/create-symlinks.sh`. This command creates temporary files where the symlinks used to be. Make sure not to commit those files with your documentation changes.
+When you are done making and testing your documentation changes, you can restore the original symlinks and delete the temporary files by running `scripts/windows/remove-symlinks.sh`. 
+
+It's necessary to remove the temporary files, because otherwise they're displayed as local changes in your git working copy and certain operations are blocked.

 ## Using ServiceWorker locally

@@ -101,7 +101,7 @@ You also want to see those changes displayed properly in the doc viewer
 with a quick, edit/view cycle time.

 For this purpose, use the `yarn docs-watch` task, which watches for changes to source files and only
-re-processes the files necessary to generate the docs that are related to the file that has changed.
+re-processes the the files necessary to generate the docs that are related to the file that has changed.
 Since this task takes shortcuts, it is much faster (often less than 1 second) but it won't produce full
 fidelity content. For example, links to other docs and code examples may not render correctly. This is
 most particularly noticed in links to other docs and in the embedded examples, which may not always render
@@ -1,5 +1,5 @@
 # Image metadata and config
-FROM debian:buster
+FROM debian:jessie

 LABEL name="angular.io PR preview" \
      description="This image implements the PR preview functionality for angular.io." \
@@ -26,8 +26,8 @@ ARG      AIO_GITHUB_ORGANIZATION=angular
 ARG TEST_AIO_GITHUB_ORGANIZATION=test-org
 ARG      AIO_GITHUB_REPO=angular
 ARG TEST_AIO_GITHUB_REPO=test-repo
-ARG      AIO_GITHUB_TEAM_SLUGS=aio-auto-previews,aio-contributors
-ARG TEST_AIO_GITHUB_TEAM_SLUGS=test-team-1,test-team-2
+ARG      AIO_GITHUB_TEAM_SLUGS=team,aio-contributors
+ARG TEST_AIO_GITHUB_TEAM_SLUGS=team,aio-contributors
 ARG      AIO_NGINX_HOSTNAME=$AIO_DOMAIN_NAME
 ARG TEST_AIO_NGINX_HOSTNAME=$TEST_AIO_DOMAIN_NAME
 ARG      AIO_NGINX_PORT_HTTP=80
@@ -37,10 +37,10 @@ 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      AIO_ARTIFACT_MAX_SIZE=26214400
+ARG TEST_AIO_PREVIEW_SERVER_HOSTNAME=preview.localhost
+ARG      AIO_ARTIFACT_MAX_SIZE=20971520
 ARG TEST_AIO_ARTIFACT_MAX_SIZE=200
 ARG      AIO_PREVIEW_SERVER_PORT=3000
 ARG TEST_AIO_PREVIEW_SERVER_PORT=3001
@@ -72,29 +72,25 @@ 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 curl --silent --show-error --location https://deb.nodesource.com/setup_12.x | bash -
+RUN apt-get update -y && apt-get install -y curl
+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 jessie-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 \
-    dnsmasq=2.80-1 \
-    nano=3.2-3 \
-    nginx \
+    chkconfig \
+    cron \
+    dnsmasq \
+    nano \
    nodejs \
    openssl \
-    rsyslog=8.1901.0-1 \
-    vim=2:8.1.0875-5 \
-    yarn=1.22.4-1
-RUN yarn global add pm2@4.4.0
+    rsyslog \
+    yarn
+RUN apt-get install -t jessie-backports -y nginx
+RUN yarn global add pm2@2


 # Set up log rotation
@@ -155,7 +151,8 @@ RUN sed -i "s|{{\$AIO_PREVIEW_SERVER_PORT}}|$TEST_AIO_PREVIEW_SERVER_PORT|g" /et


 # Set up pm2
-RUN pm2 startup --user root > /dev/null
+RUN pm2 startup systemv -u root > /dev/null
+RUN chkconfig pm2-root on


 # Set up the shell scripts
@@ -167,7 +164,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
@@ -35,7 +35,6 @@ export class BuildCleaner {
      ]);
    } catch (error) {
      this.logger.error('ERROR:', error);
-      throw error;
    }
  }

@@ -57,7 +57,7 @@ export class GithubTeams {
  /**
   * Check whether the given username is a member of the teams specified by the team slugs.
   * @param username The username to check for in the teams.
-   * @param teamSlugs A collection of slugs that represent the teams to check for the username.
+   * @param teamSlugs A collection of slugs that represent the teams to check for the the username.
   * @returns a Promise that resolves to `true` if the usernane is a member of at least one of the specified teams.
   */
  public async isMemberBySlug(username: string, teamSlugs: string[]): Promise<boolean> {
@@ -7,7 +7,7 @@ import {CircleCiApi} from '../common/circle-ci-api';
 import {GithubApi} from '../common/github-api';
 import {GithubPullRequests} from '../common/github-pull-requests';
 import {GithubTeams} from '../common/github-teams';
-import {assert, assertNotMissingOrEmpty, computeShortSha, Logger} from '../common/utils';
+import {assert, assertNotMissingOrEmpty, Logger} from '../common/utils';
 import {BuildCreator} from './build-creator';
 import {ChangedPrVisibilityEvent, CreatedBuildEvent} from './build-events';
 import {BuildRetriever} from './build-retriever';
@@ -144,10 +144,7 @@ export class PreviewServerFactory {
        const artifactPath = await buildRetriever.downloadBuildArtifact(buildNum, pr, sha, cfg.buildArtifactPath);
        const isPublic = await buildVerifier.getPrIsTrusted(pr);
        await buildCreator.create(pr, sha, artifactPath, isPublic);
-
        res.sendStatus(isPublic ? 201 : 202);
-        logger.log(`PR:${pr}, SHA:${computeShortSha(sha)}, Build:${buildNum} - ` +
-                   `Successfully created ${isPublic ? 'public' : 'non-public'} preview.`);
      } catch (err) {
        logger.error('CircleCI webhook error', err);
        respondWithError(res, err);
@@ -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);
 }

 /**
@@ -1,6 +1,7 @@
 // Imports
 import * as cp from 'child_process';
 import * as fs from 'fs';
+import * as http from 'http';
 import * as path from 'path';
 import * as shell from 'shelljs';
 import {AIO_DOWNLOADS_DIR, HIDDEN_DIR_PREFIX} from '../common/constants';
@@ -93,7 +94,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,10 +102,21 @@ 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 {
+  public verifyResponse(status: number | [number, string], regex: string | RegExp = /^/): VerifyCmdResultFn {
+    let statusCode: number;
+    let statusText: string;
+
+    if (Array.isArray(status)) {
+      statusCode = status[0];
+      statusText = status[1];
+    } else {
+      statusCode = status;
+      statusText = http.STATUS_CODES[statusCode] || 'UNKNOWN_STATUS_CODE';
+    }
+
    return (result: CmdResult) => {
      const [headers, body] = result.stdout.
        split(/(?:\r?\n){2,}/).
@@ -119,7 +131,7 @@ class Helper {
      }

      expect(result.success).toBe(true);
-      expect(headers).toMatch(new RegExp(`HTTP/(?:1\\.1|2) ${status} `));
+      expect(headers).toContain(`${statusCode} ${statusText}`);
      expect(body).toMatch(regex);
    };
  }
@@ -16,6 +16,13 @@ import {BuildNums, PrNums, SHA} from './constants';

 const logger = new Logger('mock-external-apis');

+const log = (...args: any[]) => {
+  // Filter out non-matching URL checks
+  if (!/^matching.+: false$/.test(args[0])) {
+    logger.log(...args);
+  }
+};
+
 const AIO_CIRCLE_CI_TOKEN = getEnvVar('AIO_CIRCLE_CI_TOKEN');
 const AIO_GITHUB_TOKEN = getEnvVar('AIO_GITHUB_TOKEN');

@@ -84,8 +91,8 @@ const createArchive = (buildNum: number, prNum: number, sha: string) => {
 };

 // Create request scopes
-const circleCiApi = nock(CIRCLE_CI_API_HOST).persist();
-const githubApi = nock(GITHUB_API_HOST).persist().matchHeader('Authorization', `token ${AIO_GITHUB_TOKEN}`);
+const circleCiApi = nock(CIRCLE_CI_API_HOST).log(log).persist();
+const githubApi = nock(GITHUB_API_HOST).log(log).persist().matchHeader('Authorization', `token ${AIO_GITHUB_TOKEN}`);

 //////////////////////////////

@@ -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 result = await h.runCmd(`curl -i ${fromUrl}`);
+    const verifyRedirection = (httpUrl: string) => h.runCmd(`curl -i ${httpUrl}`).then(result => {
      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`).
-            then(h.verifyResponse(200, bodyRegex));
+          h.runCmd(`curl -iL ${scheme}://pr${pr}-${shortSha9}.${host}/foo/bar.js`).
+            then(h.verifyResponse(200, bodyRegex)).
+            then(done);
        });


@@ -109,46 +111,47 @@ describe(`nginx`, () => {
        });


-        it('should respond with 403 for directories', async () => {
-          await Promise.all([
+        it('should respond with 403 for directories', done => {
+          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 () => {
-          await h.runCmd(`curl -iL ${scheme}://pr${pr}-${shortSha9}.${host}/foo/baz.css`).
-            then(h.verifyResponse(404));
+        it('should respond with 404 for unknown paths to files', done => {
+          h.runCmd(`curl -iL ${scheme}://pr${pr}-${shortSha9}.${host}/foo/baz.css`).
+            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 () => {
-          await Promise.all([
+        it('should respond with 404 if the subdomain format is wrong', done => {
+          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 () => {
-          await h.runCmd(`curl -iL ${scheme}://pr0${pr}-${shortSha9}.${host}`).
-            then(h.verifyResponse(404));
+        it('should reject PRs with leading zeros', done => {
+          h.runCmd(`curl -iL ${scheme}://pr0${pr}-${shortSha9}.${host}`).
+            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 () => {
-        await Promise.all([
+      it('should respond with 200', done => {
+        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 () => {
-        await Promise.all([
+      it('should respond with 404 if the path does not match exactly', done => {
+        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);
      });

    });
@@ -255,10 +259,10 @@ describe(`nginx`, () => {

      it('should disallow non-GET requests', async () => {
        await Promise.all([
-          h.runCmd(`curl -iLX POST ${baseUrl}/42`).then(h.verifyResponse(405)),
-          h.runCmd(`curl -iLX PUT ${baseUrl}/42`).then(h.verifyResponse(405)),
-          h.runCmd(`curl -iLX PATCH ${baseUrl}/42`).then(h.verifyResponse(405)),
-          h.runCmd(`curl -iLX DELETE ${baseUrl}/42`).then(h.verifyResponse(405)),
+          h.runCmd(`curl -iLX POST ${baseUrl}/42`).then(h.verifyResponse([405, 'Not Allowed'])),
+          h.runCmd(`curl -iLX PUT ${baseUrl}/42`).then(h.verifyResponse([405, 'Not Allowed'])),
+          h.runCmd(`curl -iLX PATCH ${baseUrl}/42`).then(h.verifyResponse([405, 'Not Allowed'])),
+          h.runCmd(`curl -iLX DELETE ${baseUrl}/42`).then(h.verifyResponse([405, 'Not Allowed'])),
        ]);
      });

@@ -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([
-          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)),
-        ]);
+        Promise.all([
+          h.runCmd(`curl -iLX GET ${url}`).then(h.verifyResponse([405, 'Not Allowed'])),
+          h.runCmd(`curl -iLX PUT ${url}`).then(h.verifyResponse([405, 'Not Allowed'])),
+          h.runCmd(`curl -iLX PATCH ${url}`).then(h.verifyResponse([405, 'Not Allowed'])),
+          h.runCmd(`curl -iLX DELETE ${url}`).then(h.verifyResponse([405, 'Not Allowed'])),
+        ]).then(done);
      });


-      it('should pass requests through to the preview server', async () => {
-        await h.runCmd(`curl -iLX POST ${scheme}://${host}/circle-build`).
-          then(h.verifyResponse(400, /Incorrect body content. Expected JSON/));
+      it('should pass requests through to the preview server', done => {
+        h.runCmd(`curl -iLX POST ${scheme}://${host}/circle-build`).
+          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 () => {
-        await Promise.all([
-          h.runCmd(`curl -iLX GET ${url}`).then(h.verifyResponse(405)),
-          h.runCmd(`curl -iLX PUT ${url}`).then(h.verifyResponse(405)),
-          h.runCmd(`curl -iLX PATCH ${url}`).then(h.verifyResponse(405)),
-          h.runCmd(`curl -iLX DELETE ${url}`).then(h.verifyResponse(405)),
-        ]);
+      it('should disallow non-POST requests', done => {
+        Promise.all([
+          h.runCmd(`curl -iLX GET ${url}`).then(h.verifyResponse([405, 'Not Allowed'])),
+          h.runCmd(`curl -iLX PUT ${url}`).then(h.verifyResponse([405, 'Not Allowed'])),
+          h.runCmd(`curl -iLX PATCH ${url}`).then(h.verifyResponse([405, 'Not Allowed'])),
+          h.runCmd(`curl -iLX DELETE ${url}`).then(h.verifyResponse([405, 'Not Allowed'])),
+        ]).then(done);
      });


-      it('should pass requests through to the preview server', async () => {
-        await h.runCmd(`curl -iLX POST --header "Content-Type: application/json" ${url}`).
-          then(h.verifyResponse(400, /Missing or empty 'number' field/));
+      it('should pass requests through to the preview server', done => {
+        const cmdPrefix = `curl -iLX POST --header "Content-Type: application/json"`;
+
+        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}`});
        });
      });

@@ -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 () => {
-      await Promise.all([
+    it('should respond with 200', done => {
+      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 () => {
-      await Promise.all([
+    it('should respond with 404 if the path does not match exactly', done => {
+      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);
    });

  });
@@ -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",
-    "delete-empty": "^3.0.0",
-    "express": "^4.17.1",
-    "jasmine": "^3.6.1",
-    "nock": "^13.0.4",
-    "node-fetch": "^2.6.1",
-    "shelljs": "^0.8.4",
-    "source-map-support": "^0.5.19",
-    "tar-stream": "^2.1.3",
-    "tslib": "^2.2.0"
+    "body-parser": "^1.18.3",
+    "delete-empty": "^2.0.0",
+    "express": "^4.16.3",
+    "jasmine": "^3.2.0",
+    "nock": "^9.6.1",
+    "node-fetch": "^2.2.0",
+    "shelljs": "^0.8.2",
+    "source-map-support": "^0.5.9",
+    "tar-stream": "^1.6.1",
+    "tslib": "^1.9.3"
  },
  "devDependencies": {
-    "@types/body-parser": "^1.19.0",
-    "@types/express": "^4.17.8",
-    "@types/jasmine": "^3.5.14",
-    "@types/nock": "^11.1.0",
-    "@types/node": "^14.6.4",
-    "@types/node-fetch": "^2.5.7",
-    "@types/shelljs": "^0.8.8",
-    "@types/supertest": "^2.0.10",
-    "nodemon": "^2.0.4",
-    "npm-run-all": "^4.1.5",
-    "supertest": "^4.0.2",
-    "tslint": "^6.1.3",
+    "@types/body-parser": "^1.17.0",
+    "@types/express": "^4.16.0",
+    "@types/jasmine": "^2.8.8",
+    "@types/nock": "^9.3.0",
+    "@types/node": "^10.9.2",
+    "@types/node-fetch": "^2.1.2",
+    "@types/shelljs": "^0.8.0",
+    "@types/supertest": "^2.0.5",
+    "nodemon": "^1.18.3",
+    "npm-run-all": "^4.1.3",
+    "supertest": "^3.1.0",
+    "tslint": "^5.11.0",
    "tslint-jasmine-noSkipOrFocus": "^1.0.9",
-    "typescript": "~4.3.4"
+    "typescript": "^3.0.1"
  }
 }
@@ -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);
-      cleanerGetOpenPrNumbersSpy = spyOn(cleaner, 'getOpenPrNumbers').and.resolveTo(OPEN_PRS);
-      cleanerGetExistingDownloadsSpy = spyOn(cleaner, 'getExistingDownloads').and.resolveTo(EXISTING_DOWNLOADS);
+      cleanerGetExistingBuildNumbersSpy = spyOn(cleaner, 'getExistingBuildNumbers')
+        .and.callFake(() => Promise.resolve(EXISTING_BUILDS));
+      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');
-      await expectAsync(cleaner.cleanUp()).toBeRejectedWith('Test');
+      try {
+        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');
-      await expectAsync(cleaner.cleanUp()).toBeRejectedWith('Test');
+      try {
+        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');
-      await expectAsync(cleaner.cleanUp()).toBeRejectedWith('Test');
+      try {
+        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');
-      await expectAsync(cleaner.cleanUp()).toBeRejectedWith('Test');
+      try {
+        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');
-      await expectAsync(cleaner.cleanUp()).toBeRejectedWith('Test');
+      try {
+        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(
-        ((_: string, cb: typeof readdirCb) => readdirCb = cb) as unknown as typeof fs.readdir,
-      );
+      fsReaddirSpy = spyOn(fs, 'readdir').and.callFake((_: string, cb: typeof readdirCb) => readdirCb = cb);
      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(
-        ((_: string, cb: typeof readdirCb) => readdirCb = cb) as unknown as typeof fs.readdir,
-      );
+      fsReaddirSpy = spyOn(fs, 'readdir').and.callFake((_: string, cb: typeof readdirCb) => readdirCb = cb);
      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'));
@@ -45,15 +45,25 @@ describe('CircleCIApi', () => {
      const errorMessage = 'Invalid request';
      const request = nock(BASE_URL).get(`/${buildNum}?circle-token=${TOKEN}`);

-      request.replyWithError(errorMessage);
-      await expectAsync(api.getBuildInfo(buildNum)).toBeRejectedWithError(
+      try {
+        request.replyWithError(errorMessage);
+        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})`);
+      }

-      request.reply(404, errorMessage);
-      await expectAsync(api.getBuildInfo(buildNum)).toBeRejectedWithError(
+      try {
+        request.reply(404, errorMessage);
+        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}`);

-      request.replyWithError(errorMessage);
-      await expectAsync(api.getBuildArtifactUrl(buildNum, 'some/path/1')).toBeRejectedWithError(
+      try {
+        request.replyWithError(errorMessage);
+        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})`);
+      }

-      request.reply(404, errorMessage);
-      await expectAsync(api.getBuildArtifactUrl(buildNum, 'some/path/1')).toBeRejectedWithError(
+      try {
+        request.reply(404, errorMessage);
+        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})`);
+      }
    });
  });
 });
@@ -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 () => {
-      const responsePromise = (api as any).getPaginated('/foo/bar');
+    it('should reject if the request fails', done => {
+      (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;
-      const paramsForPage = (page: number) => ({baz: 'qux', page, per_page: 100});

-      const responsePromise = (api as any).getPaginated('/foo/bar', {baz: 'qux'});
+      (api as any).getPaginated('/foo/bar', {baz: 'qux'}).then((data: any) => {
+        const paramsForPage = (page: number) => ({baz: 'qux', page, per_page: 100});
+
+        expect(apiGetSpy).toHaveBeenCalledTimes(3);
+        expect(apiGetSpy.calls.argsFor(0)).toEqual(['/foo/bar', paramsForPage(1)]);
+        expect(apiGetSpy.calls.argsFor(1)).toEqual(['/foo/bar', paramsForPage(2)]);
+        expect(apiGetSpy.calls.argsFor(2)).toEqual(['/foo/bar', paramsForPage(3)]);
+
+        expect(data).toEqual(allItems);
+
+        done();
+      });

      deferreds[0].resolve(allItems.slice(0, 100));
      setTimeout(() => {
@@ -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,29 +217,28 @@ describe('GithubApi', () => {

  describe('request()', () => {
    it('should return a promise', () => {
-      nock('https://api.github.com').get('/').reply(200);
-      expect((api as any).request()).toBeInstanceOf(Promise);
+      nock('https://api.github.com').get('').reply(200);
+      expect((api as any).request()).toEqual(jasmine.any(Promise));
    });


-    it('should call \'https.request()\' with the correct options', async () => {
+    it('should call \'https.request()\' with the correct options', () => {
      const requestHandler = nock('https://api.github.com')
        .intercept('/path', 'method')
        .reply(200);

-      await (api as any).request('method', '/path');
+      (api as any).request('method', '/path');
      requestHandler.done();
    });


-    it('should add the \'Authorization\' header containing the \'githubToken\'', async () => {
+    it('should add the \'Authorization\' header containing the \'githubToken\'', () => {
      const requestHandler = nock('https://api.github.com')
        .intercept('/path', 'method', undefined, {
          reqheaders: {Authorization: 'token 12345'},
        })
        .reply(200);
-
-      await (api as any).request('method', '/path');
+      (api as any).request('method', '/path');
      requestHandler.done();
    });

@@ -240,85 +247,97 @@ describe('GithubApi', () => {
      nock('https://api.github.com')
        .intercept('/path', 'method')
        .replyWithError('Test');
-
-      await expectAsync((api as any).request('method', '/path')).toBeRejectedWithError('Test');
+      let message = 'Failed to reject error';
+      await (api as any).request('method', '/path').catch((err: any) => message = err.message);
+      expect(message).toEqual('Test');
    });


-    it('should \'JSON.stringify\' and send the data along with the request', async () => {
+    it('should \'JSON.stringify\' and send the data along with the request', () => {
      const data = {key: 'value'};
      const requestHandler = nock('https://api.github.com')
        .intercept('/path', 'method', JSON.stringify(data))
        .reply(200);
-
-      await (api as any).request('method', '/path', data);
+      (api as any).request('method', '/path', data);
      requestHandler.done();
    });


-    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();
    });

@@ -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 () => {
-      githubApi.post.and.rejectWith('Test');
-      await expectAsync(prs.addComment(42, 'body')).toBeRejectedWith('Test');
+    it('should reject if the request fails', done => {
+      githubApi.post.and.callFake(() => Promise.reject('Test'));
+      prs.addComment(42, 'body').catch(err => {
+        expect(err).toBe('Test');
+        done();
+      });
    });


-    it('should resolve with the data from the Github POST', async () => {
-      githubApi.post.and.resolveTo('Test');
-      await expectAsync(prs.addComment(42, 'body')).toBeResolvedTo('Test');
+    it('should resolve with the data from the Github POST', done => {
+      githubApi.post.and.callFake(() => Promise.resolve('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);
-
-      await expectAsync(prs.fetch(42)).toBeResolvedTo(expected);
+      githubApi.get.and.callFake(() => Promise.resolve(expected));
+      prs.fetch(42).then(data => {
+        expect(data).toEqual(expected);
+        done();
+      });
    });

  });
@@ -117,14 +125,9 @@ describe('GithubPullRequests', () => {
    });


-    it('should forward the value returned by \'getPaginated()\'', async () => {
-      const mockPrs: PullRequest[] = [
-        {number: 1, user: {login: 'foo'}, labels: []},
-        {number: 2, user: {login: 'bar'}, labels: []},
-      ];
-
-      githubApi.getPaginated.and.resolveTo(mockPrs);
-      expect(await prs.fetchAll()).toBe(mockPrs);
+    it('should forward the value returned by \'getPaginated()\'', () => {
+      githubApi.getPaginated.and.returnValue('Test');
+      expect(prs.fetchAll() as any).toBe('Test');
    });

  });
@@ -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);
-
-      await expectAsync(prs.fetchFiles(42)).toBeResolvedTo(expected);
+      githubApi.getPaginated.and.callFake(() => Promise.resolve(expected));
+      prs.fetchFiles(42).then(data => {
+        expect(data).toEqual(expected);
+        done();
+      });
    });

  });
@@ -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 () => {
-      const mockTeams: Team[] = [
-        {id: 1, slug: 'foo'},
-        {id: 2, slug: 'bar'},
-      ];
-
-      githubApi.getPaginated.and.resolveTo(mockTeams);
-      expect(await teams.fetchAll()).toBe(mockTeams);
+    it('should forward the value returned by \'getPaginated()\'', () => {
+      githubApi.getPaginated.and.returnValue('Test');
+      expect(teams.fetchAll() as any).toBe('Test');
    });

  });
@@ -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 () => {
-      await expectAsync(teams.isMemberById('user', [])).toBeResolvedTo(false);
-      expect(githubApi.get).not.toHaveBeenCalled();
+    it('should resolve with false if called with an empty array', done => {
+      teams.isMemberById('user', []).then(isMember => {
+        expect(isMember).toBe(false);
+        expect(githubApi.get).not.toHaveBeenCalled();
+        done();
+      });
    });


-    it('should call \'get()\' with the correct pathname', async () => {
-      githubApi.get.and.resolveTo();
-      await teams.isMemberById('user', [1]);
-
-      expect(githubApi.get).toHaveBeenCalledWith('/teams/1/memberships/user');
+    it('should call \'get()\' with the correct pathname', done => {
+      githubApi.get.and.callFake(() => Promise.resolve());
+      teams.isMemberById('user', [1]).then(() => {
+        expect(githubApi.get).toHaveBeenCalledWith('/teams/1/memberships/user');
+        done();
+      });
    });


-    it('should resolve with false if \'get()\' rejects', async () => {
-      githubApi.get.and.rejectWith(null);
-
-      await expectAsync(teams.isMemberById('user', [1])).toBeResolvedTo(false);
-      expect(githubApi.get).toHaveBeenCalled();
+    it('should resolve with false if \'get()\' rejects', done => {
+      githubApi.get.and.callFake(() => Promise.reject(null));
+      teams.isMemberById('user', [1]).then(isMember => {
+        expect(isMember).toBe(false);
+        expect(githubApi.get).toHaveBeenCalled();
+        done();
+      });
    });


-    it('should resolve with false if the membership is not active', async () => {
-      githubApi.get.and.resolveTo({state: 'pending'});
-
-      await expectAsync(teams.isMemberById('user', [1])).toBeResolvedTo(false);
-      expect(githubApi.get).toHaveBeenCalled();
+    it('should resolve with false if the membership is not active', done => {
+      githubApi.get.and.callFake(() => Promise.resolve({state: 'pending'}));
+      teams.isMemberById('user', [1]).then(isMember => {
+        expect(isMember).toBe(false);
+        expect(githubApi.get).toHaveBeenCalled();
+        done();
+      });
    });


-    it('should resolve with true if the membership is active', async () => {
-      githubApi.get.and.resolveTo({state: 'active'});
-      await expectAsync(teams.isMemberById('user', [1])).toBeResolvedTo(true);
+    it('should resolve with true if the membership is active', done => {
+      githubApi.get.and.callFake(() => Promise.resolve({state: 'active'}));
+      teams.isMemberById('user', [1]).then(isMember => {
+        expect(isMember).toBe(true);
+        done();
+      });
    });


-    it('should sequentially call \'get()\' until an active membership is found', async () => {
-      githubApi.get.
-        withArgs('/teams/1/memberships/user').and.resolveTo({state: 'pending'}).
-        withArgs('/teams/2/memberships/user').and.rejectWith(null).
-        withArgs('/teams/3/memberships/user').and.resolveTo({state: 'active'});
+    it('should sequentially call \'get()\' until an active membership is found', done => {
+      const trainedResponses: {[pathname: string]: Promise<{state: string}>} = {
+        '/teams/1/memberships/user': Promise.resolve({state: 'pending'}),
+        '/teams/2/memberships/user': Promise.reject(null),
+        '/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');
+        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 () => {
-      githubApi.get.
-        withArgs('/teams/1/memberships/user').and.resolveTo({state: 'pending'}).
-        withArgs('/teams/2/memberships/user').and.rejectWith(null).
-        withArgs('/teams/3/memberships/user').and.resolveTo({state: 'not active'}).
-        withArgs('/teams/4/memberships/user').and.rejectWith(null);
+    it('should resolve with false if no active membership is found', done => {
+      const trainedResponses: {[pathname: string]: Promise<{state: string}>} = {
+        '/teams/1/memberships/user': Promise.resolve({state: 'pending'}),
+        '/teams/2/memberships/user':  Promise.reject(null),
+        '/teams/3/memberships/user': Promise.resolve({state: 'not active'}),
+        '/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');
+        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 () => {
-      teamsFetchAllSpy.and.rejectWith(null);
-      await expectAsync(teams.isMemberBySlug('user', ['team-slug'])).toBeResolvedTo(false);
+    it('should resolve with false if \'fetchAll()\' rejects', done => {
+      teamsFetchAllSpy.and.callFake(() => Promise.reject(null));
+      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 () => {
-      await teams.isMemberBySlug('user', ['no-match']);
-      expect(teamsIsMemberByIdSpy).toHaveBeenCalledWith('user', []);
+    it('should call \'isMemberById()\' with the correct params if no team is found', done => {
+      teams.isMemberBySlug('user', ['no-match']).then(() => {
+        expect(teamsIsMemberByIdSpy).toHaveBeenCalledWith('user', []);
+        done();
+      });
    });


-    it('should call \'isMemberById()\' with the correct params if teams are found', async () => {
-      await teams.isMemberBySlug('userA', ['team1']);
-      expect(teamsIsMemberByIdSpy).toHaveBeenCalledWith('userA', [1]);
+    it('should call \'isMemberById()\' with the correct params if teams are found', done => {
+      const spy = teamsIsMemberByIdSpy;

-      await teams.isMemberBySlug('userB', ['team2']);
-      expect(teamsIsMemberByIdSpy).toHaveBeenCalledWith('userB', [2]);
-
-      await teams.isMemberBySlug('userC', ['team1', 'team2']);
-      expect(teamsIsMemberByIdSpy).toHaveBeenCalledWith('userC', [1, 2]);
+      Promise.all([
+        teams.isMemberBySlug('user', ['team1']).then(() => expect(spy).toHaveBeenCalledWith('user', [1])),
+        teams.isMemberBySlug('user', ['team2']).then(() => expect(spy).toHaveBeenCalledWith('user', [2])),
+        teams.isMemberBySlug('user', ['team1', 'team2']).then(() => expect(spy).toHaveBeenCalledWith('user', [1, 2])),
+      ]).then(done);
    });


-    it('should resolve with false if \'isMemberById()\' rejects', async () => {
-      teamsIsMemberByIdSpy.and.rejectWith(null);
-
-      await expectAsync(teams.isMemberBySlug('user', ['team1'])).toBeResolvedTo(false);
-      expect(teamsIsMemberByIdSpy).toHaveBeenCalled();
+    it('should resolve with false if \'isMemberById()\' rejects', done => {
+      teamsIsMemberByIdSpy.and.callFake(() => Promise.reject(null));
+      teams.isMemberBySlug('user', ['team1']).then(isMember => {
+        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);
-      await expectAsync(teams.isMemberBySlug('userB', ['team1'])).toBeResolvedTo(false);
-      expect(teamsIsMemberByIdSpy).toHaveBeenCalledWith('userB', [1]);
+      teamsIsMemberByIdSpy.and.callFake(() => Promise.resolve(true));
+      const isMember1 = await teams.isMemberBySlug('user', ['team1']);
+      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]);
    });

  });
@@ -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).toBeInstanceOf(EventEmitter);
+      expect(bc).toEqual(jasmine.any(BuildCreator));
+      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
-        // `extractArchive()`.
-        await promise;
+        expect(promise).toEqual(jasmine.any(Promise));
      });


-      it('should update the PR\'s visibility first if necessary', async () => {
-        await bc.create(pr, sha, archive, isPublic);
+      it('should update the PR\'s visibility first if necessary', done => {
+        bcUpdatePrVisibilitySpy.and.callFake(() => expect(shellMkdirSpy).not.toHaveBeenCalled());

-        expect(bcUpdatePrVisibilitySpy).toHaveBeenCalledBefore(shellMkdirSpy);
-        expect(bcUpdatePrVisibilitySpy).toHaveBeenCalledWith(pr, isPublic);
-        expect(shellMkdirSpy).toHaveBeenCalled();
+        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 () => {
-        await bc.create(pr, sha, archive, isPublic);
-        expect(shellMkdirSpy).toHaveBeenCalledWith('-p', shaDir);
+      it('should create the build directory (and any parent directories)', done => {
+        bc.create(pr, sha, archive, isPublic).
+          then(() => expect(shellMkdirSpy).toHaveBeenCalledWith('-p', shaDir)).
+          then(done);
      });


-      it('should extract the archive contents into the build directory', async () => {
-        await bc.create(pr, sha, archive, isPublic);
-        expect(bcExtractArchiveSpy).toHaveBeenCalledWith(archive, shaDir);
+      it('should extract the archive contents into the build directory', done => {
+        bc.create(pr, sha, archive, isPublic).
+          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);
-        expect(emitted).toBe(true);
+        bc.create(pr, sha, archive, isPublic).
+          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();
+            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 () => {
-          bcExistsSpy.withArgs(shaDir).and.returnValue(true);
-
-          await expectAsync(bc.create(pr, sha, archive, isPublic)).toBeRejectedWithPreviewServerError(
-              409, `Request to overwrite existing ${isPublic ? '' : 'non-'}public directory: ${shaDir}`);
-
-          expect(shellMkdirSpy).not.toHaveBeenCalled();
-          expect(bcExtractArchiveSpy).not.toHaveBeenCalled();
-          expect(bcEmitSpy).not.toHaveBeenCalled();
+        it('should abort and skip further operations if the build does already exist', done => {
+          existsValues[shaDir] = true;
+          bc.create(pr, sha, archive, isPublic).catch(err => {
+            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 detect existing build directory after visibility change', async () => {
-          bcUpdatePrVisibilitySpy.and.callFake(() => bcExistsSpy.and.returnValue(true));
+        it('should detect existing build directory after visibility change', done => {
+          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(
-              409, `Request to overwrite existing ${isPublic ? '' : 'non-'}public directory: ${shaDir}`);
-
-          expect(shellMkdirSpy).not.toHaveBeenCalled();
-          expect(bcExtractArchiveSpy).not.toHaveBeenCalled();
-          expect(bcEmitSpy).not.toHaveBeenCalled();
+          bc.create(pr, sha, archive, isPublic).catch(err => {
+            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('');
-
-          await expectAsync(bc.create(pr, sha, archive, isPublic)).toBeRejected();
-
-          expect(shellMkdirSpy).toHaveBeenCalled();
-          expect(bcExtractArchiveSpy).not.toHaveBeenCalled();
-          expect(bcEmitSpy).not.toHaveBeenCalled();
+          bc.create(pr, sha, archive, isPublic).catch(() => {
+            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(() => {
+            expect(shellMkdirSpy).toHaveBeenCalled();
+            expect(bcExtractArchiveSpy).toHaveBeenCalled();
+            expect(bcEmitSpy).not.toHaveBeenCalled();
+            done();
+          });
+        });
+
+
+        it('should delete the PR directory (for new PR)', done => {
+          bcExtractArchiveSpy.and.throwError('');
+          bc.create(pr, sha, archive, isPublic).catch(() => {
+            expect(shellRmSpy).toHaveBeenCalledWith('-rf', prDir);
+            done();
+          });
+        });
+
+
+        it('should delete the SHA directory (for existing PR)', done => {
+          existsValues[prDir] = true;
          bcExtractArchiveSpy.and.throwError('');

-          await expectAsync(bc.create(pr, sha, archive, isPublic)).toBeRejected();
-
-          expect(shellMkdirSpy).toHaveBeenCalled();
-          expect(bcExtractArchiveSpy).toHaveBeenCalled();
-          expect(bcEmitSpy).not.toHaveBeenCalled();
+          bc.create(pr, sha, archive, isPublic).catch(() => {
+            expect(shellRmSpy).toHaveBeenCalledWith('-rf', shaDir);
+            done();
+          });
        });


-        it('should delete the PR directory (for new PR)', async () => {
-          bcExtractArchiveSpy.and.throwError('');
-
-          await expectAsync(bc.create(pr, sha, archive, isPublic)).toBeRejected();
-          expect(shellRmSpy).toHaveBeenCalledWith('-rf', prDir);
-        });
-
-
-        it('should delete the SHA directory (for existing PR)', async () => {
-          bcExistsSpy.withArgs(prDir).and.returnValue(true);
-          bcExtractArchiveSpy.and.throwError('');
-
-          await expectAsync(bc.create(pr, sha, archive, isPublic)).toBeRejected();
-          expect(shellRmSpy).toHaveBeenCalledWith('-rf', shaDir);
-        });
-
-
-        it('should reject with an PreviewServerError', async () => {
+        it('should reject with an PreviewServerError', done => {
          // tslint:disable-next-line: no-string-throw
          shellMkdirSpy.and.callFake(() => { throw 'Test'; });
-
-          await expectAsync(bc.create(pr, sha, archive, isPublic)).toBeRejectedWithPreviewServerError(
-              500, `Error while creating preview at: ${shaDir}\nTest`);
+          bc.create(pr, sha, archive, isPublic).catch(err => {
+            expectToBePreviewServerError(err, 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()`.
-      await promise;
+      expect(promise).toEqual(jasmine.any(Promise));
    });


@@ -255,53 +279,58 @@ describe('BuildCreator', () => {
      const newPrDir = makePublic ? publicPrDir : hiddenPrDir;


-      it('should rename the directory', async () => {
-        await bc.updatePrVisibility(pr, makePublic);
-        expect(shellMvSpy).toHaveBeenCalledWith(oldPrDir, newPrDir);
+      it('should rename the directory', done => {
+        bc.updatePrVisibility(pr, makePublic).
+          then(() => expect(shellMvSpy).toHaveBeenCalledWith(oldPrDir, newPrDir)).
+          then(done);
      });


      describe('when the visibility is updated', () => {

-        it('should resolve to true', async () => {
-          await expectAsync(bc.updatePrVisibility(pr, makePublic)).toBeResolvedTo(true);
+        it('should resolve to true', done => {
+          bc.updatePrVisibility(pr, makePublic).
+            then(result => expect(result).toBe(true)).
+            then(done);
        });


-        it('should rename the directory', async () => {
-          await bc.updatePrVisibility(pr, makePublic);
-          expect(shellMvSpy).toHaveBeenCalledWith(oldPrDir, newPrDir);
+        it('should rename the directory', done => {
+          bc.updatePrVisibility(pr, makePublic).
+            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);
-          expect(emitted).toBe(true);
+          bc.updatePrVisibility(pr, makePublic).
+            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);
-          expect(emitted).toBe(true);
+          bc.updatePrVisibility(pr, makePublic).
+            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);
-
-        await expectAsync(bc.updatePrVisibility(pr, makePublic)).toBeResolvedTo(false);
-
-        expect(shellMvSpy).not.toHaveBeenCalled();
-        expect(bcListShasByDate).not.toHaveBeenCalled();
-        expect(bcEmitSpy).not.toHaveBeenCalled();
+        bc.updatePrVisibility(pr, makePublic).
+          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);
-
-        await expectAsync(bc.updatePrVisibility(pr, makePublic)).toBeResolvedTo(false);
-
-        expect(shellMvSpy).not.toHaveBeenCalled();
-        expect(bcListShasByDate).not.toHaveBeenCalled();
-        expect(bcEmitSpy).not.toHaveBeenCalled();
+        bc.updatePrVisibility(pr, makePublic).
+          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);
-
-          await expectAsync(bc.updatePrVisibility(pr, makePublic)).toBeRejectedWithPreviewServerError(
-              409, `Request to move '${oldPrDir}' to existing directory '${newPrDir}'.`);
-
-          expect(shellMvSpy).not.toHaveBeenCalled();
-          expect(bcListShasByDate).not.toHaveBeenCalled();
-          expect(bcEmitSpy).not.toHaveBeenCalled();
+          bc.updatePrVisibility(pr, makePublic).catch(err => {
+            expectToBePreviewServerError(err, 409,
+              `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('');
-
-          await expectAsync(bc.updatePrVisibility(pr, makePublic)).toBeRejected();
-
-          expect(shellMvSpy).toHaveBeenCalled();
-          expect(bcListShasByDate).not.toHaveBeenCalled();
-          expect(bcEmitSpy).not.toHaveBeenCalled();
+          bc.updatePrVisibility(pr, makePublic).catch(() => {
+            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('');
-
-          await expectAsync(bc.updatePrVisibility(pr, makePublic)).toBeRejected();
-
-          expect(shellMvSpy).toHaveBeenCalled();
-          expect(bcListShasByDate).toHaveBeenCalled();
-          expect(bcEmitSpy).not.toHaveBeenCalled();
+          bc.updatePrVisibility(pr, makePublic).catch(() => {
+            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(
-              500, `Error while making PR ${pr} ${makePublic ? 'public' : 'hidden'}.\nTest`);
+          bc.updatePrVisibility(pr, makePublic).catch(err => {
+            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(
-        ((_: string, cb: (v?: any) => void) => fsAccessCbs.push(cb)) as unknown as typeof fs.access,
-      );
+      fsAccessSpy = spyOn(fs, 'access').and.callFake((_: string, cb: (v?: any) => void) => fsAccessCbs.push(cb));
    });


    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 () => {
-      const existsPromises = [
-        (bc as any).exists('foo'),
-        (bc as any).exists('bar'),
-      ];
+    it('should resolve with \'true\' if \'fs.access()\' succeeds', done => {
+      Promise.
+        all([(bc as any).exists('foo'), (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 () => {
-      const existsPromises = [
-        (bc as any).exists('foo'),
-        (bc as any).exists('bar'),
-      ];
+    it('should resolve with \'false\' if \'fs.access()\' errors', done => {
+      Promise.
+        all([(bc as any).exists('foo'), (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(
-        ((_: string, cb: (...args: any[]) => void) =>
-          cpExecCbs.push(cb)) as unknown as typeof cp.exec,
-      );
+      cpExecSpy = spyOn(cp, 'exec').and.callFake((_: string, cb: (...args: any[]) => void) => cpExecCbs.push(cb));
    });


    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 () => {
-      const extractPromise = (bc as any).extractArchive('foo', 'bar');
+    it('should log (as a warning) any stderr output if extracting succeeded', done => {
+      (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 () => {
-      const extractPromise = (bc as any).extractArchive('foo', 'bar');
-      cpExecCbs[0]();
+    it('should make the build directory non-writable', done => {
+      (bc as any).extractArchive('foo', 'bar').
+        then(() => expect(shellChmodSpy).toHaveBeenCalledWith('-R', 'a-w', 'bar')).
+        then(done);

-      await expectAsync(extractPromise).toBeResolved();
-      expect(shellChmodSpy).toHaveBeenCalledWith('-R', 'a-w', 'bar');
+      cpExecCbs[0]();
    });


-    it('should delete the build artifact file on success', async () => {
-      const extractPromise = (bc as any).extractArchive('input/file', 'output/dir');
-      cpExecCbs[0]();
+    it('should delete the build artifact file on success', done => {
+      (bc as any).extractArchive('input/file', 'output/dir').
+        then(() => expect(shellRmSpy).toHaveBeenCalledWith('-f', 'input/file')).
+        then(done);

-      await expectAsync(extractPromise).toBeResolved();
-      expect(shellRmSpy).toHaveBeenCalledWith('-f', 'input/file');
+      cpExecCbs[0]();
    });


    describe('on error', () => {

-      it('should abort and skip further operations if it fails to extract the archive', async () => {
-        const extractPromise = (bc as any).extractArchive('foo', 'bar');
+      it('should abort and skip further operations if it fails to extract the archive', done => {
+        (bc as any).extractArchive('foo', 'bar').catch((err: any) => {
+          expect(shellChmodSpy).not.toHaveBeenCalled();
+          expect(shellRmSpy).not.toHaveBeenCalled();
+          expect(err).toBe('Test');
+          done();
+        });
+
        cpExecCbs[0]('Test');
-
-        await expectAsync(extractPromise).toBeRejectedWith('Test');
-        expect(shellChmodSpy).not.toHaveBeenCalled();
-        expect(shellRmSpy).not.toHaveBeenCalled();
      });


-      it('should abort and skip further operations if it fails to make non-writable', async () => {
-        // tslint:disable-next-line: no-string-throw
-        shellChmodSpy.and.callFake(() => { throw 'Test'; });
+      it('should abort and skip further operations if it fails to make non-writable', done => {
+        (bc as any).extractArchive('foo', 'bar').catch((err: any) => {
+          expect(shellChmodSpy).toHaveBeenCalled();
+          expect(shellRmSpy).not.toHaveBeenCalled();
+          expect(err).toBe('Test');
+          done();
+        });
+
+        shellChmodSpy.and.callFake(() => {
+          // tslint:disable-next-line: no-string-throw
+          throw 'Test';
+        });

-        const extractPromise = (bc as any).extractArchive('foo', 'bar');
        cpExecCbs[0]();
-
-        await expectAsync(extractPromise).toBeRejectedWith('Test');
-        expect(shellChmodSpy).toHaveBeenCalled();
-        expect(shellRmSpy).not.toHaveBeenCalled();
      });


-      it('should abort and reject if it fails to remove the build artifact file', async () => {
-        // tslint:disable-next-line: no-string-throw
-        shellRmSpy.and.callFake(() => { throw 'Test'; });
+      it('should abort and reject if it fails to remove the build artifact file', done => {
+        (bc as any).extractArchive('foo', 'bar').catch((err: any) => {
+          expect(shellChmodSpy).toHaveBeenCalled();
+          expect(shellRmSpy).toHaveBeenCalled();
+          expect(err).toBe('Test');
+          done();
+        });
+
+        shellRmSpy.and.callFake(() => {
+          // tslint:disable-next-line: no-string-throw
+          throw 'Test';
+        });

-        const extractPromise = (bc as any).extractArchive('foo', 'bar');
        cpExecCbs[0]();
-
-        await expectAsync(extractPromise).toBeRejectedWith('Test');
-        expect(shellChmodSpy).toHaveBeenCalled();
-        expect(shellRmSpy).toHaveBeenCalled();
      });

    });
@@ -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()`.
-      await promise;
+      expect(promise).toEqual(jasmine.any(Promise));
    });


-    it('should `ls()` files with their metadata', async () => {
-      await (bc as any).listShasByDate('input/dir');
-      expect(shellLsSpy).toHaveBeenCalledWith('-l', 'input/dir');
+    it('should `ls()` files with their metadata', done => {
+      (bc as any).listShasByDate('input/dir').
+        then(() => expect(shellLsSpy).toHaveBeenCalledWith('-l', 'input/dir')).
+        then(done);
    });


-    it('should reject if listing files fails', async () => {
-      shellLsSpy.and.rejectWith('Test');
-      await expectAsync((bc as any).listShasByDate('input/dir')).toBeRejectedWith('Test');
+    it('should reject if listing files fails', done => {
+      shellLsSpy.and.callFake(() => Promise.reject('Test'));
+      (bc as any).listShasByDate('input/dir').catch((err: string) => {
+        expect(err).toBe('Test');
+        done();
+      });
    });


-    it('should return the filenames', async () => {
-      shellLsSpy.and.resolveTo([
+    it('should return the filenames', done => {
+      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 () => {
-      shellLsSpy.and.resolveTo([
+    it('should sort by date', done => {
+      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);
-
-      await expectAsync((bc as any).listShasByDate('input/dir')).toBeResolvedTo(['bar', 'baz', 'foo']);
-      expect(mockArray.sort).not.toHaveBeenCalled();
+      shellLsSpy.and.callFake(() => Promise.resolve(mockArray));
+      (bc as any).listShasByDate('input/dir').
+        then((shas: string[]) => {
+          expect(shas).toEqual(['bar', 'baz', 'foo']);
+          expect(mockArray.sort).not.toHaveBeenCalled();
+        }).
+        then(done);
    });


-    it('should only include directories', async () => {
-      shellLsSpy.and.resolveTo([
+    it('should only include directories', done => {
+      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);
    });

  });
@@ -32,18 +32,18 @@ describe('BuildRetriever', () => {
    };

    api = new CircleCiApi('ORG', 'REPO', 'TOKEN');
-    spyOn(api, 'getBuildInfo').and.resolveTo(BUILD_INFO);
-    getBuildArtifactUrlSpy = spyOn(api, 'getBuildArtifactUrl').and.resolveTo(BASE_URL + ARTIFACT_PATH);
+    spyOn(api, 'getBuildInfo').and.callFake(() => Promise.resolve(BUILD_INFO));
+    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) =>
-        callback(WRITEFILE_RESULT)) as typeof fs.writeFile,
+      (_path: string, _buffer: Buffer, callback: (err?: any) => {}) => callback(WRITEFILE_RESULT),
    );

    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);
-
-      await expectAsync(retriever.getGithubInfo(12345)).toBeRejectedWithError('No PR found in branch field: master');
+      try {
+        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);
-
-      await expectAsync(retriever.downloadBuildArtifact(12345, 777, 'COMMIT', ARTIFACT_PATH)).
-        toBeRejectedWith(jasmine.objectContaining({status: 413}));
-
+      try {
+        await retriever.downloadBuildArtifact(12345, 777, 'COMMIT', ARTIFACT_PATH);
+        throw new Error('Exception Expected');
+      } catch (error) {
+        expect(error.status).toEqual(413);
+      }
      artifactRequest.done();
    });

@@ -138,40 +143,50 @@ describe('BuildRetriever', () => {
      artifactRequest.done();
    });

-    it('should fail if the CircleCI API fails', async () => {
-      getBuildArtifactUrlSpy.and.rejectWith('getBuildArtifactUrl failed');
-      await expectAsync(retriever.downloadBuildArtifact(12345, 777, 'COMMIT', ARTIFACT_PATH)).
-        toBeRejectedWithError('CircleCI artifact download failed (getBuildArtifactUrl failed)');
+    it('should fail if the CircleCI API fails',  async () => {
+      try {
+        getBuildArtifactUrlSpy.and.callFake(() => Promise.reject('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 () => {
+    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');
-
-      await expectAsync(retriever.downloadBuildArtifact(12345, 777, 'COMMIT', ARTIFACT_PATH)).toBeRejectedWithError(
-          'CircleCI artifact download failed ' +
+      try {
+        await retriever.downloadBuildArtifact(12345, 777, 'COMMIT', ARTIFACT_PATH);
+        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 () => {
+    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');
-
-      await expectAsync(retriever.downloadBuildArtifact(12345, 777, 'COMMIT', ARTIFACT_PATH)).
-        toBeRejectedWithError('CircleCI artifact download failed (Error 404 - Not Found)');
-
+      try {
+        await retriever.downloadBuildArtifact(12345, 777, 'COMMIT', ARTIFACT_PATH);
+        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 () => {
+    it('should fail if file write fails',  async () => {
      const artifactRequest = nock(BASE_URL).get(ARTIFACT_PATH).reply(200, ARTIFACT_CONTENTS);
-      WRITEFILE_RESULT = 'Test Error';
-
-      await expectAsync(retriever.downloadBuildArtifact(12345, 777, 'COMMIT', ARTIFACT_PATH)).
-        toBeRejectedWithError('CircleCI artifact download failed (Test Error)');
-
+      try {
+        WRITEFILE_RESULT = 'Test Error';
+        await retriever.downloadBuildArtifact(12345, 777, 'COMMIT', ARTIFACT_PATH);
+        throw new Error('Exception Expected');
+      } catch (error) {
+        expect(error.message).toEqual('CircleCI artifact download failed (Test Error)');
+      }
      artifactRequest.done();
    });
  });
@@ -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([
-        {filename: 'a/b/c', sha: 'a1'},
-        {filename: 'd/e/f', sha: 'b2'},
-      ]);
+      fetchFilesSpy.and.callFake(() => Promise.resolve([{filename: 'a/b/c'}, {filename: 'd/e/f'}]));
      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);
-      teamsIsMemberBySlugSpy = spyOn(GithubTeams.prototype, 'isMemberBySlug').and.resolveTo(true);
+      prsFetchSpy = spyOn(GithubPullRequests.prototype, 'fetch').
+        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
-      // `GithubTeams#isMemberBySlug()`.
-      await promise;
+      expect(promise).toEqual(jasmine.any(Promise));
    });


-    it('should fetch the corresponding PR', async () => {
-      await bv.getPrIsTrusted(pr);
-      expect(prsFetchSpy).toHaveBeenCalledWith(pr);
+    it('should fetch the corresponding PR', done => {
+      bv.getPrIsTrusted(pr).then(() => {
+        expect(prsFetchSpy).toHaveBeenCalledWith(pr);
+        done();
+      });
    });


-    it('should fail if fetching the PR errors', async () => {
-      prsFetchSpy.and.rejectWith('Test');
-      await expectAsync(bv.getPrIsTrusted(pr)).toBeRejectedWith('Test');
+    it('should fail if fetching the PR errors', done => {
+      prsFetchSpy.and.callFake(() => Promise.reject('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 () => {
-        await expectAsync(bv.getPrIsTrusted(pr)).toBeResolvedTo(true);
+      it('should resolve to true', done => {
+        bv.getPrIsTrusted(pr).then(isTrusted => {
+          expect(isTrusted).toBe(true);
+          done();
+        });
      });


-      it('should not try to verify the author\'s membership status', async () => {
-        await expectAsync(bv.getPrIsTrusted(pr));
-        expect(teamsIsMemberBySlugSpy).not.toHaveBeenCalled();
+      it('should not try to verify the author\'s membership status', done => {
+        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 () => {
-        await bv.getPrIsTrusted(pr);
-        expect(teamsIsMemberBySlugSpy).toHaveBeenCalledWith('username', ['team1', 'team2']);
+      it('should verify the PR author\'s membership in the specified teams', done => {
+        bv.getPrIsTrusted(pr).then(() => {
+          expect(teamsIsMemberBySlugSpy).toHaveBeenCalledWith('username', ['team1', 'team2']);
+          done();
+        });
      });


-      it('should fail if verifying membership errors', async () => {
-        teamsIsMemberBySlugSpy.and.rejectWith('Test');
-        await expectAsync(bv.getPrIsTrusted(pr)).toBeRejectedWith('Test');
+      it('should fail if verifying membership errors', done => {
+        teamsIsMemberBySlugSpy.and.callFake(() => Promise.reject('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 () => {
-        teamsIsMemberBySlugSpy.and.resolveTo(true);
-        await expectAsync(bv.getPrIsTrusted(pr)).toBeResolvedTo(true);
+      it('should resolve to true if the PR\'s author is a member', done => {
+        teamsIsMemberBySlugSpy.and.callFake(() => Promise.resolve(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 () => {
-        teamsIsMemberBySlugSpy.and.resolveTo(false);
-        await expectAsync(bv.getPrIsTrusted(pr)).toBeResolvedTo(false);
+      it('should resolve to false if the PR\'s author is not a member', done => {
+        teamsIsMemberBySlugSpy.and.callFake(() => Promise.resolve(false));
+
+        bv.getPrIsTrusted(pr).then(isTrusted => {
+          expect(isTrusted).toBe(false);
+          done();
+        });
      });

    });
@@ -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);
+  }
+};
@@ -1,5 +0,0 @@
-declare module jasmine {
-  interface AsyncMatchers {
-    toBeRejectedWithPreviewServerError(status: number, message?: string | RegExp): Promise<void>;
-  }
-}
@@ -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,
-};
@@ -9,8 +9,8 @@ describe('PreviewServerError', () => {


  it('should extend Error', () => {
-    expect(err).toBeInstanceOf(PreviewServerError);
-    expect(err).toBeInstanceOf(Error);
+    expect(err).toEqual(jasmine.any(PreviewServerError));
+    expect(err).toEqual(jasmine.any(Error));

    expect(Object.getPrototypeOf(err)).toBe(PreviewServerError.prototype);
  });
@@ -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);
-        bvGetSignificantFilesChangedSpy = spyOn(buildVerifier, 'getSignificantFilesChanged').and.resolveTo(true);
+        bvGetPrIsTrustedSpy = spyOn(buildVerifier, 'getPrIsTrusted').and.returnValue(Promise.resolve(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.
-          withArgs(24).and.resolveTo(false).
-          withArgs(42).and.resolveTo(true);
+        bvGetPrIsTrustedSpy.and.callFake((pr2: number) => Promise.resolve(pr2 === 42));

        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.
-            withArgs(2).and.resolveTo(false).
-            withArgs(4).and.resolveTo(true);
+          bvGetPrIsTrustedSpy.and.returnValues(Promise.resolve(true), Promise.resolve(false));

          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.
-            withArgs(2).and.resolveTo(false).
-            withArgs(4).and.resolveTo(true);
+          bvGetPrIsTrustedSpy.and.returnValues(Promise.resolve(true), Promise.resolve(false));

          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.
-            withArgs(2).and.resolveTo(false).
-            withArgs(4).and.resolveTo(true);
+          bvGetPrIsTrustedSpy.and.returnValues(Promise.resolve(true), Promise.resolve(false));

          const reqs = [4, 2].map(num => createRequest(num, 'unlabeled').expect(200, http.STATUS_CODES[200]));
          await Promise.all(reqs);
@@ -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"`);
      }
@@ -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
@@ -22,7 +22,7 @@ you don't need to specify values for those.
  The domain name of the server.

 - `AIO_GITHUB_ORGANIZATION`:
-  The GitHub organization whose teams are trusted for accepting build artifacts.
+  The GitHub organization whose teams are whitelisted for accepting build artifacts.
  See also `AIO_GITHUB_TEAM_SLUGS`.

 - `AIO_GITHUB_REPO`:
@@ -6,4 +6,4 @@ TODO (gkalpak): Add docs. Mention:
  Relevant files: `aio/aio-builds-setup/scripts/test.sh`
 - Deploying from CI.
  Relevant files: `.circleci/config.yml`, `scripts/ci/deploy.sh`, `aio/scripts/build-artifacts.sh`,
-  `aio/scripts/deploy-to-firebase.js`
+  `aio/scripts/deploy-to-firebase.sh`
@@ -69,7 +69,7 @@ More info on the possible HTTP status codes and their meaning can be found


 ### Updating PR visibility
- nginx receives a notification that a PR has been updated and passes it through to the
+- nginx receives a natification that a PR has been updated and passes it through to the
  preview-server. This could, for example, be sent by a GitHub webhook every time a PR's labels
  change.
  E.g.: `ngbuilds.io/pr-updated` (payload: `{"number":<PR>,"action":"labeled"}`)
--- a/Show More
+++ b/Show More
@@ -1 +1 @@
 .16.1
 .9.0