release: cut the v9.1.5 release

These tests were matching file-paths against what is retrieved from the
TS compiler. But the TS compiler paths have been canonicalised, so the
tests were brittle on case-insensitive file-systems.

PR Close #36968

.bazelrc

@@ -33,6 +33,11 @@ build --incompatible_strict_action_env
 run --incompatible_strict_action_env
 test --incompatible_strict_action_env
 
+# Do not build runfile trees by default. If an execution strategy relies on runfile
+# symlink teee, the tree is created on-demand. See: https://github.com/bazelbuild/bazel/issues/6627
+# and https://github.com/bazelbuild/bazel/commit/03246077f948f2790a83520e7dccc2625650e6df
+build --nobuild_runfile_links
+
 ###############################
 # Release support             #
 # Turn on these settings with #
@@ -42,7 +47,7 @@ test --incompatible_strict_action_env
 # 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="node ./tools/bazel_stamp_vars.js"
+build:release --workspace_status_command="yarn -s ng-dev release build-env-stamp"
 build:release --stamp
 
 ###############################

.circleci/config.yml

@@ -236,7 +236,7 @@ jobs:
               git config user.name "angular-ci"
               git config user.email "angular-ci"
               # Rebase PR on top of target branch.
-              node tools/rebase-pr.js angular/angular ${CIRCLE_PR_NUMBER}
+              node tools/rebase-pr.js
             else
               echo "This build is not over a PR, nothing to do."
             fi
@@ -272,13 +272,8 @@ jobs:
       - custom_attach_workspace
       - init_environment
 
-      - run: 'yarn bazel:format -mode=check ||
-              (echo "BUILD files not formatted. Please run ''yarn bazel:format''" ; exit 1)'
-      # Run the skylark linter to check our Bazel rules
-      - run: 'yarn bazel:lint ||
-              (echo -e "\n.bzl files have lint errors. Please run ''yarn bazel:lint-fix''"; exit 1)'
-
-      - run: yarn -s lint --branch $CI_GIT_BASE_REVISION
+      - run: yarn -s tslint
+      - run: yarn -s ng-dev format changed $CI_GIT_BASE_REVISION --check
       - run: yarn -s ts-circular-deps:check
       - run: yarn -s ng-dev pullapprove verify
       - run: yarn -s ng-dev commit-message validate-range --range $CI_COMMIT_RANGE
@@ -389,10 +384,6 @@ jobs:
       - custom_attach_workspace
       - init_environment
       - install_chrome_libs
-        # Compile dependencies to ivy
-        # Running `ngcc` here (instead of implicitly via `ng build`) allows us to take advantage of
-        # the parallel, async mode speed-up (~20-25s on CI).
-      - run: yarn --cwd aio ngcc --properties es2015
         # Build aio
       - run: yarn --cwd aio build --progress=false
         # Lint the code

.circleci/env.sh

@@ -5,87 +5,76 @@ readonly projectDir=$(realpath "$(dirname ${BASH_SOURCE[0]})/..")
 readonly envHelpersPath="$projectDir/.circleci/env-helpers.inc.sh";
 readonly bashEnvCachePath="$projectDir/.circleci/bash_env_cache";
 
-if [ -f $bashEnvCachePath ]; then
-  # Since a bash env cache is present, load this into the $BASH_ENV
-  cat "$bashEnvCachePath" >> $BASH_ENV;
-  echo "BASH environment loaded from cached value at $bashEnvCachePath";
-else
-  # Since no bash env cache is present, build out $BASH_ENV values.
-
-  # Load helpers and make them available everywhere (through `$BASH_ENV`).
-  source $envHelpersPath;
-  echo "source $envHelpersPath;" >> $BASH_ENV;
+# Load helpers and make them available everywhere (through `$BASH_ENV`).
+source $envHelpersPath;
+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 PROJECT_ROOT "$projectDir";
-  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";
-  setPublicVar CI_PULL_REQUEST "${CIRCLE_PR_NUMBER:-false}";
-  setPublicVar CI_REPO_NAME "$CIRCLE_PROJECT_REPONAME";
-  setPublicVar CI_REPO_OWNER "$CIRCLE_PROJECT_USERNAME";
-
-  # Store a PR's refs and shas so they don't need to be requested multiple times.
-  setPublicVar GITHUB_REFS_AND_SHAS $(node tools/utils/get-refs-and-shas-for-target.js ${CIRCLE_PR_NUMBER:-false} | awk '{ gsub(/"/,"\\\"") } 1');
+####################################################################################################
+# 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 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";
+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/')";
+####################################################################################################
+# 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/')";
 
 
-  ####################################################################################################
-  # Define SECRET environment variables for CircleCI.
-  ####################################################################################################
-  setSecretVar CI_SECRET_AIO_DEPLOY_FIREBASE_TOKEN "$AIO_DEPLOY_TOKEN";
-  setSecretVar CI_SECRET_PAYLOAD_FIREBASE_TOKEN "$ANGULAR_PAYLOAD_TOKEN";
+####################################################################################################
+# Define SECRET environment variables for CircleCI.
+####################################################################################################
+setSecretVar CI_SECRET_AIO_DEPLOY_FIREBASE_TOKEN "$AIO_DEPLOY_TOKEN";
+setSecretVar CI_SECRET_PAYLOAD_FIREBASE_TOKEN "$ANGULAR_PAYLOAD_TOKEN";
 
 
-  ####################################################################################################
-  # 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 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 "598db096e668aa7e9debd56eedfd127b7a55e371"
-  
-  # Save the created BASH_ENV into the bash env cache file.
-  cat "$BASH_ENV" >> $bashEnvCachePath;
-fi
+####################################################################################################
+# 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 "598db096e668aa7e9debd56eedfd127b7a55e371"
 
 
 ####################################################################################################

.dev-infra.json

@@ -1,7 +1,7 @@
 {
   "commitMessage": {
     "maxLength": 120,
-    "minBodyLength": 0,
+    "minBodyLength": 100,
     "types": [
       "build",
       "ci",
@@ -43,5 +43,30 @@
       "ve",
       "zone.js"
     ]
+  },
+  "format": {
+    "clang-format": {
+      "matchers": [
+        "dev-infra/**/*.{js,ts}",
+        "packages/**/*.{js,ts}",
+        "!packages/zone.js",
+        "!packages/common/locales/**/*.{js,ts}",
+        "!packages/common/src/i18n/available_locales.ts",
+        "!packages/common/src/i18n/currencies.ts",
+        "!packages/common/src/i18n/locale_en.ts",
+        "modules/benchmarks/**/*.{js,ts}",
+        "modules/playground/**/*.{js,ts}",
+        "tools/**/*.{js,ts}",
+        "!tools/gulp-tasks/cldr/extract.js",
+        "!tools/public_api_guard/**/*.d.ts",
+        "!tools/ts-api-guardian/test/fixtures/**",
+        "./*.{js,ts}",
+        "!**/node_modules/**",
+        "!**/dist/**",
+        "!**/built/**",
+        "!shims_for_IE.js"
+      ]
+    },
+    "buildifier": true
   }
-}
+}

.pullapprove.yml

@@ -189,7 +189,7 @@ groups:
       - *can-be-global-approved
       - *can-be-global-docs-approved
       - >
-        contains_any_globs(files, [
+        contains_any_globs(files.exclude('packages/compiler-cli/ngcc/**'), [
           'packages/compiler/**',
           'packages/examples/compiler/**',
           'packages/compiler-cli/**',
@@ -198,10 +198,6 @@ groups:
           'aio/content/guide/aot-metadata-errors.md',
           'aio/content/guide/template-typecheck.md '
           ])
-      - >
-        not contains_any_globs(files, [
-          'packages/compiler-cli/ngcc/**'
-          ])
     reviewers:
       users:
         - alxhub
@@ -217,10 +213,7 @@ groups:
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
-      - >
-        contains_any_globs(files, [
-          'packages/compiler-cli/ngcc/**'
-          ])
+      - files.include('packages/compiler-cli/ngcc/**')
     reviewers:
       users:
         - alxhub
@@ -229,6 +222,22 @@ groups:
         - petebacondarwin
 
 
+  # =========================================================
+  #  Framework: Migrations
+  # =========================================================
+  fw-migrations:
+    conditions:
+      - *can-be-global-approved
+      - *can-be-global-docs-approved
+      - files.include("packages/core/schematics/**")
+    reviewers:
+      users:
+        - alxhub
+        - crisbeto
+        - devversion
+        - kara
+
+
   # =========================================================
   #  Framework: Core
   # =========================================================
@@ -237,7 +246,7 @@ groups:
       - *can-be-global-approved
       - *can-be-global-docs-approved
       - >
-        contains_any_globs(files, [
+        contains_any_globs(files.exclude("packages/core/schematics/**"), [
           'packages/core/**',
           'packages/examples/core/**',
           'packages/common/**',
@@ -496,7 +505,7 @@ groups:
   # =========================================================
   #  Framework: Service Worker
   # =========================================================
-  fw-server-worker:
+  fw-service-worker:
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
@@ -566,6 +575,7 @@ groups:
           ])
     reviewers:
       users:
+        - AndrewKushnir
         - IgorMinar
         - kara
         - pkozlowski-opensource
@@ -848,7 +858,7 @@ groups:
           'aio/content/images/guide/deployment/**',
           'aio/content/guide/file-structure.md',
           'aio/content/guide/ivy.md',
-          'aio/content/guide/web-worker.md'
+          'aio/content/guide/web-worker.md',
           'aio/content/guide/workspace-config.md',
           ])
     reviewers:
@@ -1027,8 +1037,7 @@ groups:
       - *can-be-global-approved
       - >
         contains_any_globs(files, [
-          'aio/scripts/_payload-limits.json',
-          'integration/_payload-limits.json'
+          'goldens/size-tracking/**'
           ])
     reviewers:
       users:
@@ -1044,7 +1053,7 @@ groups:
       - *can-be-global-approved
       - >
         contains_any_globs(files, [
-          'goldens/packages-circular-deps.json'
+          'goldens/circular-deps/packages.json'
         ])
     reviewers:
       users:

CHANGELOG.md

@@ -1,3 +1,68 @@
+<a name="9.1.5"></a>
+## [9.1.5](https://github.com/angular/angular/compare/9.1.4...9.1.5) (2020-05-07)
+
+
+### Bug Fixes
+
+* **compiler-cli:** `isCaseSensitive()` returns correct value ([#36968](https://github.com/angular/angular/issues/36968)) ([4becc1b](https://github.com/angular/angular/commit/4becc1b))
+* **compiler-cli:** ensure `getRootDirs()` handles case-sensitivity ([#36968](https://github.com/angular/angular/issues/36968)) ([5bddeea](https://github.com/angular/angular/commit/5bddeea))
+* **compiler-cli:** ensure `MockFileSystem` handles case-sensitivity ([#36968](https://github.com/angular/angular/issues/36968)) ([b6c042d](https://github.com/angular/angular/commit/b6c042d))
+* **compiler-cli:** ensure LogicalFileSystem handles case-sensitivity ([#36968](https://github.com/angular/angular/issues/36968)) ([65337fb](https://github.com/angular/angular/commit/65337fb))
+* **compiler-cli:** fix case-sensitivity issues in NgtscCompilerHost ([#36968](https://github.com/angular/angular/issues/36968)) ([4abd603](https://github.com/angular/angular/commit/4abd603))
+* **compiler-cli:** normalize mock Windows file paths correctly ([#36968](https://github.com/angular/angular/issues/36968)) ([654868f](https://github.com/angular/angular/commit/654868f))
+* **compiler-cli:** use CompilerHost to ensure canonical file paths ([#36968](https://github.com/angular/angular/issues/36968)) ([7e9d5f5](https://github.com/angular/angular/commit/7e9d5f5))
+* **core:** handle pluralize functions that expect a number ([#36901](https://github.com/angular/angular/issues/36901)) ([e5317d5](https://github.com/angular/angular/commit/e5317d5)), closes [#36888](https://github.com/angular/angular/issues/36888)
+* **core:** properly get root nodes from embedded views with <ng-content> ([#36051](https://github.com/angular/angular/issues/36051)) ([a576852](https://github.com/angular/angular/commit/a576852)), closes [#35967](https://github.com/angular/angular/issues/35967)
+* **core:** Refresh transplanted views at insertion point only ([#35968](https://github.com/angular/angular/issues/35968)) ([c8c2272](https://github.com/angular/angular/commit/c8c2272)), closes [#35400](https://github.com/angular/angular/issues/35400) [#21324](https://github.com/angular/angular/issues/21324)
+* **localize:** ensure `getLocation()` works ([#36920](https://github.com/angular/angular/issues/36920)) ([701016d](https://github.com/angular/angular/commit/701016d))
+* **ngcc:** do not run in parallel mode if there are less than 3 CPU cores ([#36626](https://github.com/angular/angular/issues/36626)) ([3800455](https://github.com/angular/angular/commit/3800455))
+* **ngcc:** give up re-spawing crashed worker process after 3 attempts ([#36626](https://github.com/angular/angular/issues/36626)) ([1863733](https://github.com/angular/angular/commit/1863733))
+* **ngcc:** handle `ENOMEM` errors in worker processes ([#36626](https://github.com/angular/angular/issues/36626)) ([901b980](https://github.com/angular/angular/commit/901b980))
+* **ngcc:** support ModuleWithProviders functions that delegate ([#36948](https://github.com/angular/angular/issues/36948)) ([9d13ee0](https://github.com/angular/angular/commit/9d13ee0)), closes [#36892](https://github.com/angular/angular/issues/36892)
+* **ngcc:** support recovering when a worker process crashes ([#36626](https://github.com/angular/angular/issues/36626)) ([f30307a](https://github.com/angular/angular/commit/f30307a)), closes [#36278](https://github.com/angular/angular/issues/36278)
+* **ngcc:** partially support TS 3.9 wrapped ES2015 classes ([#36884](https://github.com/angular/angular/issues/36884)) ([ebb4733](https://github.com/angular/angular/commit/ebb4733))
+
+
+### Performance Improvements
+
+* **ngcc:** only compute basePaths in TargetedEntryPointFinder when needed ([#36881](https://github.com/angular/angular/issues/36881)) ([5ea51b2](https://github.com/angular/angular/commit/5ea51b2)), closes [#36874](https://github.com/angular/angular/issues/36874)
+* **ngcc:** speed up the `getBasePaths()` computation ([#36881](https://github.com/angular/angular/issues/36881)) ([b6d0e21](https://github.com/angular/angular/commit/b6d0e21))
+
+
+
+<a name="9.1.4"></a>
+## [9.1.4](https://github.com/angular/angular/compare/9.1.3...9.1.4) (2020-04-29)
+
+
+### Bug Fixes
+
+* **core:** attempt to recover from user errors during creation ([#36381](https://github.com/angular/angular/issues/36381)) ([d743331](https://github.com/angular/angular/commit/d743331)), closes [#31221](https://github.com/angular/angular/issues/31221)
+* **core:** handle synthetic props in Directive host bindings correctly ([#35568](https://github.com/angular/angular/issues/35568)) ([0f389fa](https://github.com/angular/angular/commit/0f389fa)), closes [#35501](https://github.com/angular/angular/issues/35501)
+* **language-service:** disable update the `[@angular](https://github.com/angular)/core` module ([#36783](https://github.com/angular/angular/issues/36783)) ([d3a77ea](https://github.com/angular/angular/commit/d3a77ea))
+* **localize:** include legacy ids when describing messages ([#36761](https://github.com/angular/angular/issues/36761)) ([aa94cd5](https://github.com/angular/angular/commit/aa94cd5))
+* **ngcc:** recognize enum declarations emitted in JavaScript ([#36550](https://github.com/angular/angular/issues/36550)) ([c440165](https://github.com/angular/angular/commit/c440165)), closes [#35584](https://github.com/angular/angular/issues/35584)
+
+
+
+<a name="9.1.3"></a>
+## [9.1.3](https://github.com/angular/angular/compare/9.1.2...9.1.3) (2020-04-22)
+
+
+### Bug Fixes
+
+* **compiler:** avoid generating i18n attributes in plain form ([#36422](https://github.com/angular/angular/issues/36422)) ([08b8b51](https://github.com/angular/angular/commit/08b8b51))
+* **core:** do not use unbound attributes as inputs to structural directives ([#36441](https://github.com/angular/angular/issues/36441)) ([c0ed57d](https://github.com/angular/angular/commit/c0ed57d))
+* **core:** handle empty translations correctly ([#36499](https://github.com/angular/angular/issues/36499)) ([a5ea100](https://github.com/angular/angular/commit/a5ea100)), closes [#36476](https://github.com/angular/angular/issues/36476)
+* **core:** missing-injectable migration should not migrate `@NgModule` classes ([#36369](https://github.com/angular/angular/issues/36369)) ([0bd50e2](https://github.com/angular/angular/commit/0bd50e2)), closes [#35700](https://github.com/angular/angular/issues/35700)
+* **core:** pipes injecting viewProviders when used on a component host node ([#36512](https://github.com/angular/angular/issues/36512)) ([5ae8473](https://github.com/angular/angular/commit/5ae8473)), closes [#36146](https://github.com/angular/angular/issues/36146)
+* **core:** prevent unknown property check for AOT-compiled components ([#36072](https://github.com/angular/angular/issues/36072)) ([fe1d9ba](https://github.com/angular/angular/commit/fe1d9ba)), closes [#35945](https://github.com/angular/angular/issues/35945)
+* **core:** properly identify modules affected by overrides in TestBed ([#36649](https://github.com/angular/angular/issues/36649)) ([9724169](https://github.com/angular/angular/commit/9724169)), closes [#36619](https://github.com/angular/angular/issues/36619)
+* **language-service:** properly evaluate types in comparable expressions ([#36529](https://github.com/angular/angular/issues/36529)) ([5bab498](https://github.com/angular/angular/commit/5bab498))
+* **ngcc:** display unlocker process output in sync mode ([#36637](https://github.com/angular/angular/issues/36637)) ([da159bd](https://github.com/angular/angular/commit/da159bd)), closes [/github.com/nodejs/node/issues/3596#issuecomment-250890218](https://github.com//github.com/nodejs/node/issues/3596/issues/issuecomment-250890218)
+* **ngcc:** do not use cached file-system ([#36687](https://github.com/angular/angular/issues/36687)) ([18be33a](https://github.com/angular/angular/commit/18be33a)), closes [/github.com/angular/angular-cli/issues/16860#issuecomment-614694269](https://github.com//github.com/angular/angular-cli/issues/16860/issues/issuecomment-614694269)
+
+
+
 <a name="9.1.2"></a>
 ## [9.1.2](https://github.com/angular/angular/compare/9.1.1...9.1.2) (2020-04-15)
 

aio/aio-builds-setup/dockerbuild/Dockerfile

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,10 +1,12 @@
 # VM setup - Create docker image
 
 
-## Install node and yarn
-- Install [nvm](https://github.com/creationix/nvm#installation).
-- Install node.js: `nvm install 8`
-- Install yarn: `npm -g install yarn`
+## Install git, Node.js and yarn
+- `sudo apt-get update`
+- `sudo apt-get install -y git`
+- Install [nvm](https://github.com/nvm-sh/nvm#installing-and-updating).
+- Install Node.js: `nvm install 12`
+- Install yarn: `npm install --global yarn`
 
 
 ## Checkout repository
@@ -26,7 +28,7 @@ The following commands would create a docker image from GitHub repo `foo/bar` to
 
 - `git clone https://github.com/foo/bar.git foobar`
 - Run:
-  ```
+  ```sh
   ./foobar/aio-builds-setup/scripts/create-image.sh foobar-builds \
     --build-arg AIO_REPO_SLUG=foo/bar \
     --build-arg AIO_DOMAIN_NAME=foobar-builds.io \

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

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

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

@@ -15,9 +15,9 @@ The script assumes that the preview server source code is in the repository's
 `aio/aio-builds-setup/` directory and expects the following inputs:
 
 - **$1**: `HOST_REPO_DIR`
-- **$2**: `HOST_LOCALCERTS_DIR`
-- **$3**: `HOST_SECRETS_DIR`
-- **$4**: `HOST_BUILDS_DIR`
+- **$2**: `HOST_SECRETS_DIR`
+- **$3**: `HOST_BUILDS_DIR`
+- **$4**: `HOST_LOCALCERTS_DIR`
 - **$5**: `HOST_LOGS_DIR`
 
 See [here](vm-setup--create-host-dirs-and-files.md) for more info on what each input directory is
@@ -31,22 +31,22 @@ used for.
 ## Run the script manually
 You may choose to manually run the script, when necessary. Example:
 
-```
+```sh
 update-preview-server.sh \
     /path/to/repo \
-    /path/to/localcerts \
     /path/to/secrets \
     /path/to/builds \
+    /path/to/localcerts \
     /path/to/logs
 ```
 
 
 ## Run the script automatically
 You may choose to automatically trigger the script, e.g. using a cronjob. For example, the following
-cronjob entry would run the script every hour and update the preview server (assuming the user has
-the necessary permissions):
+cronjob entry would run the script every 30 minutes, update the preview server (if necessary) and
+log its output to `update-preview-server.log` (assuming the user has the necessary permissions):
 
 ```
 # Periodically check for changes and update the preview server (if necessary)
-*/30 *  * * *   /path/to/update-preview-server.sh /path/to/repo /path/to/localcerts /path/to/secrets /path/to/builds /path/to/logs
+*/30 *  * * *   /path/to/update-preview-server.sh /path/to/repo /path/to/secrets /path/to/builds /path/to/localcerts /path/to/logs >> /path/to/update-preview-server.log 2>&1
 ```

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

@@ -7,9 +7,9 @@ echo -e "\n\n[`date`] - Updating the preview server..."
 
 # Input
 readonly HOST_REPO_DIR=$1
-readonly HOST_LOCALCERTS_DIR=$2
-readonly HOST_SECRETS_DIR=$3
-readonly HOST_BUILDS_DIR=$4
+readonly HOST_SECRETS_DIR=$2
+readonly HOST_BUILDS_DIR=$3
+readonly HOST_LOCALCERTS_DIR=$4
 readonly HOST_LOGS_DIR=$5
 
 # Constants
@@ -60,9 +60,9 @@ readonly CONTAINER_NAME=aio
       --publish 80:80 \
       --publish 443:443 \
       --restart unless-stopped \
-      --volume $HOST_LOCALCERTS_DIR:/etc/ssl/localcerts:ro \
       --volume $HOST_SECRETS_DIR:/aio-secrets:ro \
       --volume $HOST_BUILDS_DIR:/var/www/aio-builds \
+      --volume $HOST_LOCALCERTS_DIR:/etc/ssl/localcerts:ro \
       --volume $HOST_LOGS_DIR:/var/log/aio \
       "$LATEST_IMAGE_NAME"
 

aio/content/examples/.gitignore

@@ -82,9 +82,6 @@ upgrade-phonecat-2-hybrid/aot/**/*
 # styleguide
 !styleguide/src/systemjs.custom.js
 
-# universal
-!universal/webpack.server.config.js
-
 # stackblitz
 *stackblitz.no-link.html
 
@@ -97,4 +94,4 @@ upgrade-phonecat-3-final/rollup-config.js
 !upgrade-phonecat-*/**/karma-test-shim.js
 
 # schematics
-!schematics-for-libraries/projects/my-lib/package.json
+!schematics-for-libraries/projects/my-lib/package.json

aio/content/examples/router/src/app/app-routing.module.7.ts

@@ -0,0 +1,11 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router'; // CLI imports router
+
+const routes: Routes = []; // sets up routes constant where you define your routes
+
+// configures NgModule imports and exports
+@NgModule({
+  imports: [RouterModule.forRoot(routes)],
+  exports: [RouterModule]
+})
+export class AppRoutingModule { }

aio/content/examples/router/src/app/app-routing.module.8.ts

@@ -0,0 +1,26 @@
+// #docplaster
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router'; // CLI imports router
+
+// #docregion routes, routes-with-wildcard, redirect
+const routes: Routes = [
+  { path: 'first-component', component: FirstComponent },
+  { path: 'second-component', component: SecondComponent },
+  // #enddocregion routes
+  { path: '',   redirectTo: '/first-component', pathMatch: 'full' }, // redirect to `first-component`
+  { path: '**', component: FirstComponent },
+  // #enddocregion redirect
+  { path: '**', component: PageNotFoundComponent },  // Wildcard route for a 404 page
+  // #docregion routes
+  // #docregion redirect
+];
+// #enddocregion routes, routes-with-wildcard, redirect
+
+
+@NgModule({
+  imports: [RouterModule.forRoot(routes)],
+  exports: [RouterModule]
+})
+export class AppRoutingModule { }
+
+

aio/content/examples/router/src/app/app-routing.module.9.ts

@@ -0,0 +1,28 @@
+// #docplaster
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router'; // CLI imports router
+
+// #docregion child-routes
+const routes: Routes = [
+  { path: 'first-component',
+    component: FirstComponent, // this is the component with the <router-outlet> in the template
+    children: [
+      {
+        path: 'child-a', // child route path
+        component: ChildAComponent // child route component that the router renders
+      },
+      {
+        path: 'child-b',
+        component: ChildBComponent // another child route component that the router renders
+      }
+    ] },
+// #enddocregion child-routes
+
+
+@NgModule({
+  imports: [RouterModule.forRoot(routes)],
+  exports: [RouterModule]
+})
+export class AppRoutingModule { }
+
+

aio/content/examples/router/src/app/app.component.4.ts

@@ -0,0 +1,15 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-root',
+  templateUrl: 'app.component.html',
+  styleUrls: ['app.component.css']
+})
+export class AppComponent {
+// #docregion relative-to
+  goToItems() {
+    this.router.navigate(['items'], { relativeTo: this.route });
+  }
+// #enddocregion relative-to
+
+}

aio/content/examples/router/src/app/app.component.7.html

@@ -0,0 +1,10 @@
+<h1>Angular Router App</h1>
+<!-- This nav gives you links to click, which tells the router which route to use (defined in the routes constant in  AppRoutingModule) -->
+<nav>
+  <ul>
+    <li><a routerLink="/first-component" routerLinkActive="active">First Component</a></li>
+    <li><a routerLink="/second-component" routerLinkActive="active">Second Component</a></li>
+  </ul>
+</nav>
+<!-- The routed views render in the <router-outlet>-->
+<router-outlet></router-outlet>

aio/content/examples/router/src/app/app.component.8.html

@@ -0,0 +1,26 @@
+<!-- #docregion child-routes-->
+<h2>First Component</h2>
+
+<nav>
+  <ul>
+    <li><a routerLink="child-a">Child A</a></li>
+    <li><a routerLink="child-b">Child B</a></li>
+  </ul>
+</nav>
+
+<router-outlet></router-outlet>
+<!-- #enddocregion child-routes-->
+
+
+<!-- #docregion relative-route-->
+
+<h2>First Component</h2>
+
+<nav>
+  <ul>
+    <li><a routerLink="../second-component">Relative Route to second component</a></li>
+  </ul>
+</nav>
+<router-outlet></router-outlet>
+
+<!-- #enddocregion relative-route-->

aio/content/examples/router/src/app/app.module.8.ts

@@ -0,0 +1,17 @@
+import { BrowserModule } from '@angular/platform-browser';
+import { NgModule } from '@angular/core';
+import { AppRoutingModule } from './app-routing.module'; // CLI imports AppRoutingModule
+import { AppComponent } from './app.component';
+
+@NgModule({
+  declarations: [
+    AppComponent
+  ],
+  imports: [
+    BrowserModule,
+    AppRoutingModule // CLI adds AppRoutingModule to the AppModule's imports array
+  ],
+  providers: [],
+  bootstrap: [AppComponent]
+})
+export class AppModule { }

aio/content/examples/router/src/app/heroes/hero-detail/hero-detail.component.ts

@@ -2,7 +2,9 @@
 // #docregion
 import { switchMap } from 'rxjs/operators';
 import { Component, OnInit } from '@angular/core';
+// #docregion imports-route-info
 import { Router, ActivatedRoute, ParamMap } from '@angular/router';
+// #enddocregion imports-route-info
 import { Observable } from 'rxjs';
 
 import { HeroService }  from '../hero.service';
@@ -16,11 +18,16 @@ import { Hero } from '../hero';
 export class HeroDetailComponent implements OnInit {
   hero$: Observable<Hero>;
 
+  // #docregion activated-route
   constructor(
     private route: ActivatedRoute,
+  // #enddocregion activated-route
     private router: Router,
     private service: HeroService
+  // #docregion activated-route
   ) {}
+  // #enddocregion activated-route
+
 
   ngOnInit() {
     this.hero$ = this.route.paramMap.pipe(

aio/content/examples/toh-pt0/src/main.ts

@@ -8,4 +8,6 @@ if (environment.production) {
   enableProdMode();
 }
 
-platformBrowserDynamic().bootstrapModule(AppModule);
+platformBrowserDynamic().bootstrapModule(AppModule)
+  .catch(err => console.error(err));
+

aio/content/examples/toh-pt1/src/main.ts

@@ -9,5 +9,6 @@ if (environment.production) {
   enableProdMode();
 }
 
-platformBrowserDynamic().bootstrapModule(AppModule);
+platformBrowserDynamic().bootstrapModule(AppModule)
+  .catch(err => console.error(err));
 // #enddocregion

aio/content/examples/toh-pt2/src/main.ts

@@ -9,5 +9,6 @@ if (environment.production) {
   enableProdMode();
 }
 
-platformBrowserDynamic().bootstrapModule(AppModule);
+platformBrowserDynamic().bootstrapModule(AppModule)
+  .catch(err => console.error(err));
 // #enddocregion

aio/content/examples/toh-pt3/src/main.ts

@@ -9,5 +9,6 @@ if (environment.production) {
   enableProdMode();
 }
 
-platformBrowserDynamic().bootstrapModule(AppModule);
+platformBrowserDynamic().bootstrapModule(AppModule)
+  .catch(err => console.error(err));
 // #enddocregion

aio/content/examples/toh-pt4/src/main.ts

@@ -8,4 +8,5 @@ if (environment.production) {
   enableProdMode();
 }
 
-platformBrowserDynamic().bootstrapModule(AppModule);
+platformBrowserDynamic().bootstrapModule(AppModule)
+  .catch(err => console.error(err));

aio/content/examples/toh-pt5/src/app/hero-detail/hero-detail.component.css

@@ -19,7 +19,6 @@ button {
   padding: 5px 10px;
   border-radius: 4px;
   cursor: pointer;
-  cursor: hand;
 }
 button:hover {
   background-color: #cfd8dc;

aio/content/examples/toh-pt5/src/main.ts

@@ -8,4 +8,5 @@ if (environment.production) {
   enableProdMode();
 }
 
-platformBrowserDynamic().bootstrapModule(AppModule);
+platformBrowserDynamic().bootstrapModule(AppModule)
+  .catch(err => console.error(err));

aio/content/examples/toh-pt6/src/app/app.module.ts

@@ -1,5 +1,5 @@
 // #docplaster
-// #docregion, v1
+// #docregion , v1
 import { NgModule }       from '@angular/core';
 import { BrowserModule }  from '@angular/platform-browser';
 import { FormsModule }    from '@angular/forms';
@@ -59,6 +59,5 @@ import { MessagesComponent }    from './messages/messages.component';
 // #docregion import-httpclientmodule
 })
 // #enddocregion import-httpclientmodule
-
 export class AppModule { }
 // #enddocregion , v1

aio/content/examples/toh-pt6/src/app/hero-detail/hero-detail.component.css

@@ -18,7 +18,7 @@ button {
   border: none;
   padding: 5px 10px;
   border-radius: 4px;
-  cursor: pointer; cursor: hand;
+  cursor: pointer;
 }
 button:hover {
   background-color: #cfd8dc;

aio/content/examples/toh-pt6/src/app/hero-detail/hero-detail.component.ts

@@ -33,10 +33,10 @@ export class HeroDetailComponent implements OnInit {
     this.location.back();
   }
 
- // #docregion save
- save(): void {
+  // #docregion save
+  save(): void {
     this.heroService.updateHero(this.hero)
       .subscribe(() => this.goBack());
   }
-// #enddocregion save
+  // #enddocregion save
 }

aio/content/examples/toh-pt6/src/app/hero.service.ts

@@ -36,7 +36,7 @@ export class HeroService {
   // #docregion getHeroes, getHeroes-1
   /** GET heroes from the server */
   // #docregion getHeroes-2
-  getHeroes (): Observable<Hero[]> {
+  getHeroes(): Observable<Hero[]> {
     return this.http.get<Hero[]>(this.heroesUrl)
   // #enddocregion getHeroes-1
       .pipe(
@@ -98,7 +98,7 @@ export class HeroService {
 
   // #docregion addHero
   /** POST: add a new hero to the server */
-  addHero (hero: Hero): Observable<Hero> {
+  addHero(hero: Hero): Observable<Hero> {
     return this.http.post<Hero>(this.heroesUrl, hero, this.httpOptions).pipe(
       tap((newHero: Hero) => this.log(`added hero w/ id=${newHero.id}`)),
       catchError(this.handleError<Hero>('addHero'))
@@ -108,7 +108,7 @@ export class HeroService {
 
   // #docregion deleteHero
   /** DELETE: delete the hero from the server */
-  deleteHero (hero: Hero | number): Observable<Hero> {
+  deleteHero(hero: Hero | number): Observable<Hero> {
     const id = typeof hero === 'number' ? hero : hero.id;
     const url = `${this.heroesUrl}/${id}`;
 
@@ -121,7 +121,7 @@ export class HeroService {
 
   // #docregion updateHero
   /** PUT: update the hero on the server */
-  updateHero (hero: Hero): Observable<any> {
+  updateHero(hero: Hero): Observable<any> {
     return this.http.put(this.heroesUrl, hero, this.httpOptions).pipe(
       tap(_ => this.log(`updated hero id=${hero.id}`)),
       catchError(this.handleError<any>('updateHero'))
@@ -136,7 +136,7 @@ export class HeroService {
    * @param operation - name of the operation that failed
    * @param result - optional value to return as the observable result
    */
-  private handleError<T> (operation = 'operation', result?: T) {
+  private handleError<T>(operation = 'operation', result?: T) {
     return (error: any): Observable<T> => {
 
       // TODO: send the error to remote logging infrastructure

aio/content/examples/toh-pt6/src/app/heroes/heroes.component.css

@@ -30,7 +30,7 @@
 }
 
 .heroes a:hover {
-  color:#607D8B;
+  color: #607D8B;
 }
 
 .heroes .badge {
@@ -38,7 +38,7 @@
   font-size: small;
   color: white;
   padding: 0.8em 0.7em 0 0.7em;
-  background-color:#405061;
+  background-color: #405061;
   line-height: 1em;
   position: relative;
   left: -1px;

aio/content/examples/toh-pt6/src/app/in-memory-data.service.ts

@@ -1,7 +1,7 @@
 // #docregion , init
+import { Injectable } from '@angular/core';
 import { InMemoryDbService } from 'angular-in-memory-web-api';
 import { Hero } from './hero';
-import { Injectable } from '@angular/core';
 
 @Injectable({
   providedIn: 'root',

aio/content/examples/toh-pt6/src/main.ts

@@ -9,4 +9,5 @@ if (environment.production) {
   enableProdMode();
 }
 
-platformBrowserDynamic().bootstrapModule(AppModule);
+platformBrowserDynamic().bootstrapModule(AppModule)
+  .catch(err => console.error(err));

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

@@ -0,0 +1,300 @@
+import { browser, by, element, ElementArrayFinder, ElementFinder, logging } from 'protractor';
+
+class Hero {
+  id: number;
+  name: string;
+
+  // Factory methods
+
+  // Hero from string formatted as '<id> <name>'.
+  static fromString(s: string): Hero {
+    return {
+      id: +s.substr(0, s.indexOf(' ')),
+      name: s.substr(s.indexOf(' ') + 1),
+    };
+  }
+
+  // Hero from hero list <li> element.
+  static async fromLi(li: ElementFinder): Promise<Hero> {
+    const stringsFromA = await li.all(by.css('a')).getText();
+    const strings = stringsFromA[0].split(' ');
+    return { id: +strings[0], name: strings[1] };
+  }
+
+  // Hero id and name from the given detail element.
+  static async fromDetail(detail: ElementFinder): Promise<Hero> {
+    // Get hero id from the first <div>
+    const id = await detail.all(by.css('div')).first().getText();
+    // Get name from the h2
+    const name = await detail.element(by.css('h2')).getText();
+    return {
+      id: +id.substr(id.indexOf(' ') + 1),
+      name: name.substr(0, name.lastIndexOf(' '))
+    };
+  }
+}
+
+describe('Universal', () => {
+  const expectedH1 = 'Tour of Heroes';
+  const expectedTitle = `${expectedH1}`;
+  const targetHero = { id: 15, name: 'Magneta' };
+  const targetHeroDashboardIndex = 3;
+  const nameSuffix = 'X';
+  const newHeroName = targetHero.name + nameSuffix;
+
+  afterEach(async () => {
+    // Assert that there are no errors emitted from the browser
+    const logs = await browser.manage().logs().get(logging.Type.BROWSER);
+    const severeLogs = logs.filter(entry => entry.level === logging.Level.SEVERE);
+    expect(severeLogs).toEqual([]);
+  });
+
+  describe('Initial page', () => {
+    beforeAll(() => browser.get(''));
+
+    it(`has title '${expectedTitle}'`, () => {
+      expect(browser.getTitle()).toEqual(expectedTitle);
+    });
+
+    it(`has h1 '${expectedH1}'`, () => {
+        expectHeading(1, expectedH1);
+    });
+
+    const expectedViewNames = ['Dashboard', 'Heroes'];
+    it(`has views ${expectedViewNames}`, () => {
+      const viewNames = getPageElts().navElts.map((el: ElementFinder) => el.getText());
+      expect(viewNames).toEqual(expectedViewNames);
+    });
+
+    it('has dashboard as the active view', () => {
+      const page = getPageElts();
+      expect(page.appDashboard.isPresent()).toBeTruthy();
+    });
+  });
+
+  describe('Dashboard tests', () => {
+    beforeAll(() => browser.get(''));
+
+    it('has top heroes', () => {
+      const page = getPageElts();
+      expect(page.topHeroes.count()).toEqual(4);
+    });
+
+    it(`selects and routes to ${targetHero.name} details`, dashboardSelectTargetHero);
+
+    it(`updates hero name (${newHeroName}) in details view`, updateHeroNameInDetailView);
+
+    it(`cancels and shows ${targetHero.name} in Dashboard`, () => {
+      element(by.buttonText('go back')).click();
+      browser.waitForAngular(); // seems necessary to gets tests to pass for toh-pt6
+
+      const targetHeroElt = getPageElts().topHeroes.get(targetHeroDashboardIndex);
+      expect(targetHeroElt.getText()).toEqual(targetHero.name);
+    });
+
+    it(`selects and routes to ${targetHero.name} details`, dashboardSelectTargetHero);
+
+    it(`updates hero name (${newHeroName}) in details view`, updateHeroNameInDetailView);
+
+    it(`saves and shows ${newHeroName} in Dashboard`, () => {
+      element(by.buttonText('save')).click();
+      browser.waitForAngular(); // seems necessary to gets tests to pass for toh-pt6
+
+      const targetHeroElt = getPageElts().topHeroes.get(targetHeroDashboardIndex);
+      expect(targetHeroElt.getText()).toEqual(newHeroName);
+    });
+  });
+
+  describe('Heroes tests', () => {
+    beforeAll(() => browser.get(''));
+
+    it('can switch to Heroes view', () => {
+      getPageElts().appHeroesHref.click();
+      const page = getPageElts();
+      expect(page.appHeroes.isPresent()).toBeTruthy();
+      expect(page.allHeroes.count()).toEqual(10, 'number of heroes');
+    });
+
+    it('can route to hero details', async () => {
+      getHeroLiEltById(targetHero.id).click();
+
+      const page = getPageElts();
+      expect(page.heroDetail.isPresent()).toBeTruthy('shows hero detail');
+      const hero = await Hero.fromDetail(page.heroDetail);
+      expect(hero.id).toEqual(targetHero.id);
+      expect(hero.name).toEqual(targetHero.name.toUpperCase());
+    });
+
+    it(`updates hero name (${newHeroName}) in details view`, updateHeroNameInDetailView);
+
+    it(`shows ${newHeroName} in Heroes list`, () => {
+      element(by.buttonText('save')).click();
+      browser.waitForAngular();
+      const expectedText = `${targetHero.id} ${newHeroName}`;
+      expect(getHeroAEltById(targetHero.id).getText()).toEqual(expectedText);
+    });
+
+    it(`deletes ${newHeroName} from Heroes list`, async () => {
+      const heroesBefore = await toHeroArray(getPageElts().allHeroes);
+      const li = getHeroLiEltById(targetHero.id);
+      li.element(by.buttonText('x')).click();
+
+      const page = getPageElts();
+      expect(page.appHeroes.isPresent()).toBeTruthy();
+      expect(page.allHeroes.count()).toEqual(9, 'number of heroes');
+      const heroesAfter = await toHeroArray(page.allHeroes);
+      // console.log(await Hero.fromLi(page.allHeroes[0]));
+      const expectedHeroes =  heroesBefore.filter(h => h.name !== newHeroName);
+      expect(heroesAfter).toEqual(expectedHeroes);
+      // expect(page.selectedHeroSubview.isPresent()).toBeFalsy();
+    });
+
+    it(`adds back ${targetHero.name}`, async () => {
+      const updatedHeroName = 'Alice';
+      const heroesBefore = await toHeroArray(getPageElts().allHeroes);
+      const numHeroes = heroesBefore.length;
+
+      element(by.css('input')).sendKeys(updatedHeroName);
+      element(by.buttonText('add')).click();
+
+      const page = getPageElts();
+      const heroesAfter = await toHeroArray(page.allHeroes);
+      expect(heroesAfter.length).toEqual(numHeroes + 1, 'number of heroes');
+
+      expect(heroesAfter.slice(0, numHeroes)).toEqual(heroesBefore, 'Old heroes are still there');
+
+      const maxId = heroesBefore[heroesBefore.length - 1].id;
+      expect(heroesAfter[numHeroes]).toEqual({id: maxId + 1, name: updatedHeroName});
+    });
+
+    it('displays correctly styled buttons', async () => {
+      element.all(by.buttonText('x')).then(buttons => {
+        for (const button of buttons) {
+          // Inherited styles from styles.css
+          expect(button.getCssValue('font-family')).toBe('Arial');
+          expect(button.getCssValue('border')).toContain('none');
+          expect(button.getCssValue('padding')).toBe('5px 10px');
+          expect(button.getCssValue('border-radius')).toBe('4px');
+          // Styles defined in heroes.component.css
+          expect(button.getCssValue('left')).toBe('194px');
+          expect(button.getCssValue('top')).toBe('-32px');
+        }
+      });
+
+      const addButton = element(by.buttonText('add'));
+      // Inherited styles from styles.css
+      expect(addButton.getCssValue('font-family')).toBe('Arial');
+      expect(addButton.getCssValue('border')).toContain('none');
+      expect(addButton.getCssValue('padding')).toBe('5px 10px');
+      expect(addButton.getCssValue('border-radius')).toBe('4px');
+    });
+  });
+
+  describe('Progressive hero search', () => {
+    beforeAll(() => browser.get(''));
+
+    it(`searches for 'Ma'`, async () => {
+      getPageElts().searchBox.sendKeys('Ma');
+      browser.sleep(1000);
+
+      expect(getPageElts().searchResults.count()).toBe(4);
+    });
+
+    it(`continues search with 'g'`, async () => {
+      getPageElts().searchBox.sendKeys('g');
+      browser.sleep(1000);
+      expect(getPageElts().searchResults.count()).toBe(2);
+    });
+
+    it(`continues search with 'e' and gets ${targetHero.name}`, async () => {
+      getPageElts().searchBox.sendKeys('n');
+      browser.sleep(1000);
+      const page = getPageElts();
+      expect(page.searchResults.count()).toBe(1);
+      const hero = page.searchResults.get(0);
+      expect(hero.getText()).toEqual(targetHero.name);
+    });
+
+    it(`navigates to ${targetHero.name} details view`, async () => {
+      const hero = getPageElts().searchResults.get(0);
+      expect(hero.getText()).toEqual(targetHero.name);
+      hero.click();
+
+      const page = getPageElts();
+      expect(page.heroDetail.isPresent()).toBeTruthy('shows hero detail');
+      const hero2 = await Hero.fromDetail(page.heroDetail);
+      expect(hero2.id).toEqual(targetHero.id);
+      expect(hero2.name).toEqual(targetHero.name.toUpperCase());
+    });
+  });
+
+  // Helpers
+  function addToHeroName(text: string): Promise<void> {
+    return element(by.css('input')).sendKeys(text) as Promise<void>;
+  }
+
+  async function dashboardSelectTargetHero(): Promise<void> {
+    const targetHeroElt = getPageElts().topHeroes.get(targetHeroDashboardIndex);
+    expect(targetHeroElt.getText()).toEqual(targetHero.name);
+    targetHeroElt.click();
+    browser.waitForAngular(); // seems necessary to gets tests to pass for toh-pt6
+
+    const page = getPageElts();
+    expect(page.heroDetail.isPresent()).toBeTruthy('shows hero detail');
+    const hero = await Hero.fromDetail(page.heroDetail);
+    expect(hero.id).toEqual(targetHero.id);
+    expect(hero.name).toEqual(targetHero.name.toUpperCase());
+  }
+
+  function expectHeading(hLevel: number, expectedText: string): void {
+      const hTag = `h${hLevel}`;
+      const hText = element(by.css(hTag)).getText();
+      expect(hText).toEqual(expectedText, hTag);
+  }
+
+  function getHeroAEltById(id: number): ElementFinder {
+    const spanForId = element(by.cssContainingText('li span.badge', id.toString()));
+    return spanForId.element(by.xpath('..'));
+  }
+
+  function getHeroLiEltById(id: number): ElementFinder {
+    const spanForId = element(by.cssContainingText('li span.badge', id.toString()));
+    return spanForId.element(by.xpath('../..'));
+  }
+
+  function getPageElts() {
+    const navElts = element.all(by.css('app-root nav a'));
+
+    return {
+      navElts,
+
+      appDashboardHref: navElts.get(0),
+      appDashboard: element(by.css('app-root app-dashboard')),
+      topHeroes: element.all(by.css('app-root app-dashboard > div h4')),
+
+      appHeroesHref: navElts.get(1),
+      appHeroes: element(by.css('app-root app-heroes')),
+      allHeroes: element.all(by.css('app-root app-heroes li')),
+      selectedHeroSubview: element(by.css('app-root app-heroes > div:last-child')),
+
+      heroDetail: element(by.css('app-root app-hero-detail > div')),
+
+      searchBox: element(by.css('#search-box')),
+      searchResults: element.all(by.css('.search-result li'))
+    };
+  }
+
+  async function toHeroArray(allHeroes: ElementArrayFinder): Promise<Hero[]> {
+    return await allHeroes.map(Hero.fromLi);
+  }
+
+  async function updateHeroNameInDetailView(): Promise<void> {
+    // Assumes that the current view is the hero details view.
+    addToHeroName(nameSuffix);
+
+    const page = getPageElts();
+    const hero = await Hero.fromDetail(page.heroDetail);
+    expect(hero.id).toEqual(targetHero.id);
+    expect(hero.name).toEqual(newHeroName.toUpperCase());
+  }
+});

aio/content/examples/universal/example-config.json

@@ -1,3 +1,7 @@
 {
-  "projectType": "universal"
+  "projectType": "universal",
+  "e2e": [
+    {"cmd": "yarn", "args": ["e2e", "--prod", "--protractor-config=e2e/protractor-puppeteer.conf.js", "--no-webdriver-update", "--port={PORT}"]},
+    {"cmd": "yarn", "args": ["run", "build:ssr"]}
+  ]
 }

aio/content/examples/universal/server.ts

@@ -6,24 +6,28 @@ import { join } from 'path';
 
 import { AppServerModule } from './src/main.server';
 import { APP_BASE_HREF } from '@angular/common';
+import { existsSync } from 'fs';
 
 // The Express app is exported so that it can be used by serverless Functions.
 export function app() {
   const server = express();
-  const distFolder = join(process.cwd(), 'dist/express-engine-ivy/browser');
+  const distFolder = join(process.cwd(), 'dist/browser');
+  const indexHtml = existsSync(join(distFolder, 'index.original.html')) ? 'index.original.html' : 'index';
 
   // #docregion ngExpressEngine
+  // Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine)
   server.engine('html', ngExpressEngine({
     bootstrap: AppServerModule,
   }));
   // #enddocregion ngExpressEngine
+
   server.set('view engine', 'html');
   server.set('views', distFolder);
 
   // #docregion data-request
   // TODO: implement data requests securely
-  server.get('/api/*', (req, res) => {
-    res.status(404).send('data requests are not supported');
+  server.get('/api/**', (req, res) => {
+    res.status(404).send('data requests are not yet supported');
   });
   // #enddocregion data-request
 
@@ -37,7 +41,7 @@ export function app() {
   // #docregion navigation-request
   // All regular routes use the Universal engine
   server.get('*', (req, res) => {
-    res.render('index', { req, providers: [{ provide: APP_BASE_HREF, useValue: req.baseUrl }] });
+    res.render(indexHtml, { req, providers: [{ provide: APP_BASE_HREF, useValue: req.baseUrl }] });
   });
   // #enddocregion navigation-request
 
@@ -59,7 +63,8 @@ function run() {
 // The below code is to ensure that the server is run only when not requiring the bundle.
 declare const __non_webpack_require__: NodeRequire;
 const mainModule = __non_webpack_require__.main;
-if (mainModule && mainModule.filename === __filename) {
+const moduleFilename = mainModule && mainModule.filename || '';
+if (moduleFilename === __filename || moduleFilename.includes('iisnode')) {
   run();
 }
 

aio/content/examples/universal/src/app/app.component.css

@@ -1,7 +1,6 @@
 /* AppComponent's private CSS styles */
 h1 {
   font-size: 1.2em;
-  color: #999;
   margin-bottom: 0;
 }
 h2 {
@@ -18,7 +17,7 @@ nav a {
   border-radius: 4px;
 }
 nav a:visited, a:link {
-  color: #607D8B;
+  color: #334953;
 }
 nav a:hover {
   color: #039be5;

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

@@ -14,8 +14,6 @@ import { DashboardComponent }   from './dashboard/dashboard.component';
 import { HeroDetailComponent }  from './hero-detail/hero-detail.component';
 import { HeroesComponent }      from './heroes/heroes.component';
 import { HeroSearchComponent }  from './hero-search/hero-search.component';
-import { HeroService }          from './hero.service';
-import { MessageService }       from './message.service';
 import { MessagesComponent }    from './messages/messages.component';
 
 // #docregion platform-detection
@@ -32,6 +30,10 @@ import { isPlatformBrowser } from '@angular/common';
     FormsModule,
     AppRoutingModule,
     HttpClientModule,
+
+    // The HttpClientInMemoryWebApiModule module intercepts HTTP requests
+    // and returns simulated server responses.
+    // Remove it when a real server is ready to receive requests.
     HttpClientInMemoryWebApiModule.forRoot(
       InMemoryDataService, { dataEncapsulation: false }
     )
@@ -44,7 +46,6 @@ import { isPlatformBrowser } from '@angular/common';
     MessagesComponent,
     HeroSearchComponent
   ],
-  providers: [ HeroService, MessageService ],
   bootstrap: [ AppComponent ]
 })
 export class AppModule {

aio/content/examples/universal/src/app/app.server.module.ts

@@ -1,6 +1,5 @@
 import { NgModule } from '@angular/core';
 import { ServerModule } from '@angular/platform-server';
-import { ModuleMapLoaderModule } from '@nguniversal/module-map-ngfactory-loader';
 
 import { AppModule } from './app.module';
 import { AppComponent } from './app.component';
@@ -9,11 +8,10 @@ import { AppComponent } from './app.component';
   imports: [
     AppModule,
     ServerModule,
-    ModuleMapLoaderModule
   ],
   providers: [
-    // Add universal-only providers here
+    // Add server-only providers here.
   ],
-  bootstrap: [ AppComponent ],
+  bootstrap: [AppComponent],
 })
 export class AppServerModule {}

aio/content/examples/universal/src/app/dashboard/dashboard.component.css

@@ -34,7 +34,7 @@ h4 {
   color: #eee;
   max-height: 120px;
   min-width: 120px;
-  background-color: #607D8B;
+  background-color: #3f525c;
   border-radius: 2px;
 }
 .module:hover {

aio/content/examples/universal/src/app/dashboard/dashboard.component.html

@@ -8,4 +8,4 @@
   </a>
 </div>
 
-<hero-search></hero-search>
+<app-hero-search></app-hero-search>

aio/content/examples/universal/src/app/dashboard/dashboard.component.ts

@@ -18,6 +18,6 @@ export class DashboardComponent implements OnInit {
 
   getHeroes(): void {
     this.heroService.getHeroes()
-    .subscribe(heroes => this.heroes = heroes.slice(1, 5));
+      .subscribe(heroes => this.heroes = heroes.slice(1, 5));
   }
 }

aio/content/examples/universal/src/app/hero-detail/hero-detail.component.css

@@ -19,7 +19,6 @@ button {
   padding: 5px 10px;
   border-radius: 4px;
   cursor: pointer;
-  cursor: hand;
 }
 button:hover {
   background-color: #cfd8dc;

aio/content/examples/universal/src/app/hero-detail/hero-detail.component.html

@@ -1,5 +1,5 @@
 <div *ngIf="hero">
-  <h2>{{ hero.name | uppercase }} Details</h2>
+  <h2>{{hero.name | uppercase}} Details</h2>
   <div><span>id: </span>{{hero.id}}</div>
   <div>
     <label>name:

aio/content/examples/universal/src/app/hero-detail/hero-detail.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, Input } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { Location } from '@angular/common';
 
@@ -11,7 +11,7 @@ import { HeroService }  from '../hero.service';
   styleUrls: [ './hero-detail.component.css' ]
 })
 export class HeroDetailComponent implements OnInit {
-  hero: Hero;
+  @Input() hero: Hero;
 
   constructor(
     private route: ActivatedRoute,
@@ -33,7 +33,7 @@ export class HeroDetailComponent implements OnInit {
     this.location.back();
   }
 
- save(): void {
+  save(): void {
     this.heroService.updateHero(this.hero)
       .subscribe(() => this.goBack());
   }

aio/content/examples/universal/src/app/hero-search/hero-search.component.html

@@ -1,10 +1,10 @@
 <div id="search-component">
-  <h4>Hero Search</h4>
+  <h4><label for="search-box">Hero Search</label></h4>
 
   <input #searchBox id="search-box" (input)="search(searchBox.value)" />
 
   <ul class="search-result">
-    <li *ngFor="let hero of heroes | async" >
+    <li *ngFor="let hero of heroes$ | async" >
       <a routerLink="/detail/{{hero.id}}">
         {{hero.name}}
       </a>

aio/content/examples/universal/src/app/hero-search/hero-search.component.ts

@@ -10,12 +10,12 @@ import { Hero } from '../hero';
 import { HeroService } from '../hero.service';
 
 @Component({
-  selector: 'hero-search',
+  selector: 'app-hero-search',
   templateUrl: './hero-search.component.html',
   styleUrls: [ './hero-search.component.css' ]
 })
 export class HeroSearchComponent implements OnInit {
-  heroes: Observable<Hero[]>;
+  heroes$: Observable<Hero[]>;
   private searchTerms = new Subject<string>();
 
   constructor(private heroService: HeroService) {}
@@ -26,7 +26,7 @@ export class HeroSearchComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    this.heroes = this.searchTerms.pipe(
+    this.heroes$ = this.searchTerms.pipe(
       // wait 300ms after each keystroke before considering the term
       debounceTime(300),
 

aio/content/examples/universal/src/app/hero.service.ts

@@ -1,6 +1,5 @@
-import { Injectable, Inject, Optional } from '@angular/core';
-import { APP_BASE_HREF } from '@angular/common';
-import { HttpClient, HttpHeaders }from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { HttpClient, HttpHeaders } from '@angular/common/http';
 
 import { Observable, of } from 'rxjs';
 import { catchError, map, tap } from 'rxjs/operators';
@@ -8,30 +7,26 @@ import { catchError, map, tap } from 'rxjs/operators';
 import { Hero } from './hero';
 import { MessageService } from './message.service';
 
-const httpOptions = {
-  headers: new HttpHeaders({ 'Content-Type': 'application/json' })
-};
 
-@Injectable()
+@Injectable({ providedIn: 'root' })
 export class HeroService {
 
   private heroesUrl = 'api/heroes';  // URL to web api
 
-  // #docregion ctor
+  httpOptions = {
+    headers: new HttpHeaders({ 'Content-Type': 'application/json' })
+  };
+
   constructor(
     private http: HttpClient,
-    private messageService: MessageService,
-    @Optional() @Inject(APP_BASE_HREF) origin?: string) {
-      this.heroesUrl = `${origin}${this.heroesUrl}`;
-    }
-  // #enddocregion ctor
+    private messageService: MessageService) { }
 
   /** GET heroes from the server */
-  getHeroes (): Observable<Hero[]> {
+  getHeroes(): Observable<Hero[]> {
     return this.http.get<Hero[]>(this.heroesUrl)
       .pipe(
-        tap(heroes => this.log('fetched heroes')),
-        catchError(this.handleError('getHeroes', []))
+        tap(_ => this.log('fetched heroes')),
+        catchError(this.handleError<Hero[]>('getHeroes', []))
       );
   }
 
@@ -65,7 +60,9 @@ export class HeroService {
       return of([]);
     }
     return this.http.get<Hero[]>(`${this.heroesUrl}/?name=${term}`).pipe(
-      tap(_ => this.log(`found heroes matching "${term}"`)),
+      tap(x => x.length ?
+         this.log(`found heroes matching "${term}"`) :
+         this.log(`no heroes matching "${term}"`)),
       catchError(this.handleError<Hero[]>('searchHeroes', []))
     );
   }
@@ -73,29 +70,27 @@ export class HeroService {
   //////// Save methods //////////
 
   /** POST: add a new hero to the server */
-  addHero (name: string): Observable<Hero> {
-    const hero = { name };
-
-    return this.http.post<Hero>(this.heroesUrl, hero, httpOptions).pipe(
-      tap((hero: Hero) => this.log(`added hero w/ id=${hero.id}`)),
+  addHero(hero: Hero): Observable<Hero> {
+    return this.http.post<Hero>(this.heroesUrl, hero, this.httpOptions).pipe(
+      tap((newHero: Hero) => this.log(`added hero w/ id=${newHero.id}`)),
       catchError(this.handleError<Hero>('addHero'))
     );
   }
 
   /** DELETE: delete the hero from the server */
-  deleteHero (hero: Hero | number): Observable<Hero> {
+  deleteHero(hero: Hero | number): Observable<Hero> {
     const id = typeof hero === 'number' ? hero : hero.id;
     const url = `${this.heroesUrl}/${id}`;
 
-    return this.http.delete<Hero>(url, httpOptions).pipe(
+    return this.http.delete<Hero>(url, this.httpOptions).pipe(
       tap(_ => this.log(`deleted hero id=${id}`)),
       catchError(this.handleError<Hero>('deleteHero'))
     );
   }
 
   /** PUT: update the hero on the server */
-  updateHero (hero: Hero): Observable<any> {
-    return this.http.put(this.heroesUrl, hero, httpOptions).pipe(
+  updateHero(hero: Hero): Observable<any> {
+    return this.http.put(this.heroesUrl, hero, this.httpOptions).pipe(
       tap(_ => this.log(`updated hero id=${hero.id}`)),
       catchError(this.handleError<any>('updateHero'))
     );
@@ -107,7 +102,7 @@ export class HeroService {
    * @param operation - name of the operation that failed
    * @param result - optional value to return as the observable result
    */
-  private handleError<T> (operation = 'operation', result?: T) {
+  private handleError<T>(operation = 'operation', result?: T) {
     return (error: any): Observable<T> => {
 
       // TODO: send the error to remote logging infrastructure

aio/content/examples/universal/src/app/heroes/heroes.component.css

@@ -22,7 +22,7 @@
 }
 
 .heroes a {
-  color: #888;
+  color: #333;
   text-decoration: none;
   position: relative;
   display: block;
@@ -30,7 +30,7 @@
 }
 
 .heroes a:hover {
-  color:#607D8B;
+  color: #607D8B;
 }
 
 .heroes .badge {
@@ -38,7 +38,7 @@
   font-size: small;
   color: white;
   padding: 0.8em 0.7em 0 0.7em;
-  background-color: #607D8B;
+  background-color: #405061;
   line-height: 1em;
   position: relative;
   left: -1px;
@@ -50,7 +50,7 @@
   border-radius: 4px 0 0 4px;
 }
 
-.button {
+button {
   background-color: #eee;
   border: none;
   padding: 5px 10px;

aio/content/examples/universal/src/app/heroes/heroes.component.html

@@ -16,6 +16,6 @@
       <span class="badge">{{hero.id}}</span> {{hero.name}}
     </a>
     <button class="delete" title="delete hero"
-    (click)="delete(hero);$event.stopPropagation()">x</button>
+      (click)="delete(hero)">x</button>
   </li>
 </ul>

aio/content/examples/universal/src/app/heroes/heroes.component.ts

@@ -25,17 +25,15 @@ export class HeroesComponent implements OnInit {
   add(name: string): void {
     name = name.trim();
     if (!name) { return; }
-    this.heroService.addHero(name)
+    this.heroService.addHero({ name } as Hero)
       .subscribe(hero => {
         this.heroes.push(hero);
       });
   }
 
   delete(hero: Hero): void {
-    this.heroService.deleteHero(hero)
-        .subscribe(() => {
-          this.heroes = this.heroes.filter(h => h !== hero);
-        });
+    this.heroes = this.heroes.filter(h => h !== hero);
+    this.heroService.deleteHero(hero).subscribe();
   }
 
 }

aio/content/examples/universal/src/app/in-memory-data.service.ts

@@ -1,5 +1,10 @@
+import { Injectable } from '@angular/core';
 import { InMemoryDbService } from 'angular-in-memory-web-api';
+import { Hero } from './hero';
 
+@Injectable({
+  providedIn: 'root',
+})
 export class InMemoryDataService implements InMemoryDbService {
   createDb() {
     const heroes = [
@@ -16,4 +21,13 @@ export class InMemoryDataService implements InMemoryDbService {
     ];
     return {heroes};
   }
+
+  // Overrides the genId method to ensure that a hero always has an id.
+  // If the heroes array is empty,
+  // the method below returns the initial number (11).
+  // if the heroes array is not empty, the method below returns the highest
+  // hero id + 1.
+  genId(heroes: Hero[]): number {
+    return heroes.length > 0 ? Math.max(...heroes.map(hero => hero.id)) + 1 : 11;
+  }
 }

aio/content/examples/universal/src/app/message.service.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 
-@Injectable()
+@Injectable({ providedIn: 'root' })
 export class MessageService {
   messages: string[] = [];
 

aio/content/examples/universal/src/app/messages/messages.component.css

@@ -30,6 +30,6 @@ button:disabled {
   cursor: auto;
 }
 button.clear {
-  color: #888;
+  color: #333;
   margin-bottom: 12px;
 }

aio/content/examples/universal/src/main.ts

@@ -8,4 +8,7 @@ if (environment.production) {
   enableProdMode();
 }
 
-platformBrowserDynamic().bootstrapModule(AppModule);
+document.addEventListener('DOMContentLoaded', () => {
+  platformBrowserDynamic().bootstrapModule(AppModule)
+    .catch(err => console.error(err));
+});

aio/content/examples/universal/webpack.server.config.js

@@ -1,32 +0,0 @@
-const path = require('path');
-const webpack = require('webpack');
-
-module.exports = {
-  entry: { server: './server.ts' },
-  resolve: { extensions: ['.js', '.ts'] },
-  target: 'node',
-  mode: 'none',
-  // this makes sure we include node_modules and other 3rd party libraries
-  externals: [/node_modules/],
-  output: {
-    path: path.join(__dirname, 'dist'),
-    filename: '[name].js'
-  },
-  module: {
-    rules: [{ test: /\.ts$/, loader: 'ts-loader' }]
-  },
-  plugins: [
-    // Temporary Fix for issue: https://github.com/angular/angular/issues/11580
-    // for 'WARNING Critical dependency: the request of a dependency is an expression'
-    new webpack.ContextReplacementPlugin(
-      /(.+)?angular(\\|\/)core(.+)?/,
-      path.join(__dirname, 'src'), // location of your src
-      {} // a map of your routes
-    ),
-    new webpack.ContextReplacementPlugin(
-      /(.+)?express(\\|\/)(.+)?/,
-      path.join(__dirname, 'src'),
-      {}
-    )
-  ]
-};

aio/content/guide/accessibility.md

@@ -10,6 +10,12 @@ For an in-depth introduction to issues and techniques for designing accessible a
 This page discusses best practices for designing Angular applications that
 work well for all users, including those who rely on assistive technologies.
 
+<div class="alert is-helpful">
+
+  For the sample app that this page describes, see the <live-example></live-example>.
+
+</div>
+
 ## Accessibility attributes
 
 Building accessible web experience often involves setting [ARIA attributes](https://developers.google.com/web/fundamentals/accessibility/semantics-aria)
@@ -92,8 +98,6 @@ The following example shows how to make a simple progress bar accessible by usin
    <code-example path="accessibility/src/app/app.component.html" header="src/app/app.component.html" region="template"></code-example>
 
 
-To see the progress bar in a working example app, refer to the <live-example></live-example>.
-
 ## Routing and focus management
 
 Tracking and controlling [focus](https://developers.google.com/web/fundamentals/accessibility/focus/) in a UI is an important consideration in designing for accessibility.

aio/content/guide/ajs-quick-reference.md

@@ -415,8 +415,8 @@ The following are some of the key AngularJS built-in directives and their equiva
       <code-example hideCopy path="ajs-quick-reference/src/app/app.component.html" region="router-link"></code-example>
 
 
-      For more information on routing, see the [RouterLink binding](guide/router#router-link)
-      section of the [Routing & Navigation](guide/router) page.
+      For more information on routing, see [Defining a basic route](guide/router#basic-route)
+      in the [Routing & Navigation](guide/router) page.
 
     </td>
 

aio/content/guide/architecture-components.md

@@ -1,7 +1,7 @@
 # Introduction to components and templates
 
-A *component* controls a patch of screen called a *view*.
-For example, individual components define and control each of the following views from the [Tutorial](tutorial):
+A *component* controls a patch of screen called a [*view*](guide/glossary#view "Definition of view").
+For example, individual components define and control each of the following views from the [Tour of Heroes tutorial](tutorial):
 
 * The app root with the navigation links.
 * The list of heroes.

aio/content/guide/architecture.md

@@ -19,12 +19,17 @@ Both components and services are simply classes, with *decorators* that mark the
 
 An app's components typically define many views, arranged hierarchically. Angular provides the `Router` service to help you define navigation paths among views. The router provides sophisticated in-browser navigational capabilities.
 
-<div class="alert is-helpful>
+<div class="alert is-helpful">
 
   See the [Angular Glossary](guide/glossary) for basic definitions of important Angular terms and usage.
 
 </div>
 
+<div class="alert is-helpful">
+
+  For the sample app that this page describes, see the <live-example></live-example>.
+</div>
+
 ## Modules
 
 Angular *NgModules* differ from and complement JavaScript (ES2015) modules. An NgModule declares a compilation context for a set of components that is dedicated to an application domain, a workflow, or a closely related set of capabilities. An NgModule can associate its components with related code, such as services, to form functional units.
@@ -148,10 +153,5 @@ Each of these subjects is introduced in more detail in the following pages.
 
 * [Introduction to services and dependency injection](guide/architecture-services)
 
-<div class="alert is-helpful">
-
-   Note that the code referenced on these pages is available as a <live-example></live-example>.
-</div>
-
 When you're familiar with these fundamental building blocks, you can explore them in more detail in the documentation. To learn about more tools and techniques that are available to help you build and deploy Angular applications, see [Next steps: tools and techniques](guide/architecture-next-steps).
 </div>

aio/content/guide/browser-support.md

@@ -303,7 +303,7 @@ Some features of Angular may require additional polyfills.
     <td>
 
       [Router](guide/router) when using
-      [hash-based routing](guide/router#appendix-locationstrategy-and-browser-url-styles)
+      [hash-based routing](guide/router#location-strategy)
     </td>
 
     <td>

aio/content/guide/build.md

@@ -311,11 +311,11 @@ To use CSS grid with IE10/11, you must explicitly enable it using the `autoplace
 To do this, add the following to the top of the global styles file (or within a specific css selector scope):
 
 ```
-/* autoprefixer grid: autoplace /
+/* autoprefixer grid: autoplace */
 ```
 or
 ```
-/ autoprefixer grid: no-autoplace */
+/* autoprefixer grid: no-autoplace */
 ```
 
 For more information, see [Autoprefixer documentation](https://autoprefixer.github.io/).

aio/content/guide/deployment.md

@@ -321,7 +321,7 @@ absolutely must be present when the app starts.
 
 Configure the Angular Router to defer loading of all other modules (and their associated code), either by
 [waiting until the app has launched](guide/router#preloading  "Preloading")
-or by [_lazy loading_](guide/router#asynchronous-routing "Lazy loading")
+or by [_lazy loading_](guide/router#lazy-loading "Lazy loading")
 them on demand.
 
 <div class="callout is-helpful">

aio/content/guide/deprecations.md

@@ -318,6 +318,7 @@ const routes: Routes = [{
 
 
 {@a activatedroute-props}
+
 ### ActivatedRoute params and queryParams properties
 
 [ActivatedRoute](api/router/ActivatedRoute) contains two [properties](api/router/ActivatedRoute#properties) that are less capable than their replacements and may be deprecated in a future Angular version.
@@ -327,7 +328,7 @@ const routes: Routes = [{
 | `params` | `paramMap` |
 | `queryParams` | `queryParamMap` |
 
-For more information see the [Router guide](guide/router#activated-route).
+For more information see the [Getting route information](guide/router#activated-route) section of the [Router guide](guide/router).
 
 
 {@a reflect-metadata}

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

@@ -1010,21 +1010,21 @@ Callouts use the same _urgency levels_ that alerts do.
 <div class="callout is-critical">
 <header>A critical point</header>
 
-**Pitchfork hoodie semiotics**, roof party pop-up _paleo_ messenger messenger bag cred Carles tousled Truffaut yr. Semiotics viral freegan VHS, Shoreditch disrupt McSweeney's. Intelligentsia kale chips Vice four dollar toast, Schlitz crucifix
+**Pitchfork hoodie semiotics**, roof party pop-up _paleo_ messenger messenger bag cred Carles tousled Truffaut yr. Semiotics viral freegan VHS, Shoreditch disrupt McSweeney's. Intelligentsia kale chips Vice four dollar toast
 
 </div>
 
 <div class="callout is-important">
 <header>An important point</header>
 
-**Pitchfork hoodie semiotics**, roof party pop-up _paleo_ messenger bag cred Carles tousled Truffaut yr. Semiotics viral freegan VHS, Shoreditch disrupt McSweeney's. Intelligentsia kale chips Vice four dollar toast, Schlitz crucifix
+**Pitchfork hoodie semiotics**, roof party pop-up _paleo_ messenger bag cred Carles tousled Truffaut yr. Semiotics viral freegan VHS, Shoreditch disrupt McSweeney's. Intelligentsia kale chips Vice four dollar toast
 
 </div>
 
 <div class="callout is-helpful">
 <header>A helpful or informational point</header>
 
-**Pitchfork hoodie semiotics**, roof party pop-up _paleo_ messenger bag cred Carles tousled Truffaut yr. Semiotics viral freegan VHS, Shoreditch disrupt McSweeney's. Intelligentsia kale chips Vice four dollar toast, Schlitz crucifix
+**Pitchfork hoodie semiotics**, roof party pop-up _paleo_ messenger bag cred Carles tousled Truffaut yr. Semiotics viral freegan VHS, Shoreditch disrupt McSweeney's. Intelligentsia kale chips Vice four dollar toast
 
 </div>
 
@@ -1033,7 +1033,7 @@ Here is the markup for the first of these callouts.
 <div class="callout is-critical">
 <header>A critical point</header>
 
-**Pitchfork hoodie semiotics**, roof party pop-up _paleo_ messenger bag cred Carles tousled Truffaut yr. Semiotics viral freegan VHS, Shoreditch disrupt McSweeney's. Intelligentsia kale chips Vice four dollar toast, Schlitz crucifix
+**Pitchfork hoodie semiotics**, roof party pop-up _paleo_ messenger bag cred Carles tousled Truffaut yr. Semiotics viral freegan VHS, Shoreditch disrupt McSweeney's. Intelligentsia kale chips Vice four dollar toast
 
 </div>
 ```

aio/content/guide/releases.md

@@ -103,9 +103,8 @@ Version | Status | Released     | Active Ends  | LTS Ends
 ------- | ------ | ------------ | ------------ | ------------
 ^9.0.0  | Active | Feb 06, 2020 | Aug 06, 2020 | Aug 06, 2021
 ^8.0.0  | LTS    | May 28, 2019 | Nov 28, 2019 | Nov 28, 2020
-^7.0.0  | LTS    | Oct 18, 2018 | Apr 18, 2019 | Apr 18, 2020
 
-Angular versions ^4.0.0, ^5.0.0 and ^6.0.0 are no longer under support.
+Angular versions ^4.0.0, ^5.0.0, ^6.0.0 and ^7.0.0 are no longer under support.
 
 {@a deprecation}
 ## Deprecation practices

aio/content/guide/setup-local.md

@@ -6,10 +6,9 @@ It includes information about prerequisites, installing the CLI, creating an ini
 
 
 <div class="callout is-helpful">
-<header>Learning Angular</header>
-
-If you are new to Angular, see [Getting Started](start). Getting Started helps you quickly learn the essentials of Angular, in the context of building a basic online store app. It leverages the [StackBlitz](https://stackblitz.com/) online development environment, so you don't need to set up your local environment until you're ready.
+<header>Try Angular without local setup</header>
 
+If you are new to Angular, you might want to start with [Try it now!](start), which introduces the essentials of Angular in the context of a ready-made basic online store app that you can examine and modify. This standalone tutorial takes advantage of the interactive [StackBlitz](https://stackblitz.com/) environment for online development. You don't need to set up your local environment until you're ready.
 
 </div>
 
@@ -119,18 +118,10 @@ You will see:
 
 ## Next steps
 
+* For a more thorough introduction to the fundamental concepts and terminology of Angular single-page app architecture and design principles, read the [Angular Concepts](guide/architecture) section.
 
-* If you are new to Angular, see the [Getting Started](start) tutorial. Getting Started helps you quickly learn the essentials of Angular, in the context of building a basic online store app.
-
-  <div class="alert is-helpful">
-
-  Getting Started assumes the [StackBlitz](https://stackblitz.com/) online development environment.
-  To learn how to export an app from StackBlitz to your local environment, skip ahead to the [Deployment](start/start-deployment "Getting Started: Deployment") section.
-
-  </div>
-
+* Work through the [Tour of Heroes Tutorial](tutorial), a complete hands-on exercise that introduces you to the app development process using the Angular CLI and walks through important subsystems.
 
 * To learn more about using the Angular CLI, see the [CLI Overview](cli "CLI Overview"). In addition to creating the initial workspace and app scaffolding, you can use the CLI to generate Angular code such as components and services. The CLI supports the full development cycle, including building, testing, bundling, and deployment.
 
-
 * For more information about the Angular files generated by `ng new`, see [Workspace and Project File Structure](guide/file-structure).

aio/content/guide/testing.md

@@ -1958,7 +1958,7 @@ for the `id` to change during its lifetime.
 
 <div class="alert is-helpful">
 
-The [Router](guide/router#route-parameters) guide covers `ActivatedRoute.paramMap` in more detail.
+The [ActivatedRoute in action](guide/router#activated-route-in-action) section of the [Router](guide/router) guide covers `ActivatedRoute.paramMap` in more detail.
 
 </div>
 

aio/content/guide/universal.md

@@ -15,7 +15,7 @@ The CLI schematic `@nguniversal/express-engine` performs the required steps, as
 
 <div class="alert is-helpful">
 
-  **Note:** [Download the finished sample code](generated/zips/universal/universal.zip),
+  **Note:** <live-example downloadOnly>Download the finished sample code</live-example>,
   which runs in a [Node.js® Express](https://expressjs.com/) server.
 
 </div>
@@ -27,7 +27,7 @@ The [Tour of Heroes tutorial](tutorial) is the foundation for this walkthrough.
 
 In this example, the Angular CLI compiles and bundles the Universal version of the app with the
 [Ahead-of-Time (AOT) compiler](guide/aot-compiler).
-A Node Express web server compiles HTML pages with Universal based on client requests.
+A Node.js Express web server compiles HTML pages with Universal based on client requests.
 
 To create the server-side app module, `app.server.module.ts`, run the following CLI command.
 
@@ -62,10 +62,10 @@ The files marked with `*` are new and not in the original tutorial sample.
 To start rendering your app with Universal on your local system, use the following command.
 
 <code-example language="bash">
-npm run build:ssr && npm run serve:ssr
+npm run dev:ssr
 </code-example>
 
-Open a browser and navigate to http://localhost:4000/.
+Open a browser and navigate to http://localhost:4200/.
 You should see the familiar Tour of Heroes dashboard page.
 
 Navigation via `routerLinks` works correctly because they use the native anchor (`<a>`) tags.
@@ -158,13 +158,12 @@ The sample web server for this guide is based on the popular [Express](https://e
 Universal applications use the Angular `platform-server` package (as opposed to `platform-browser`), which provides
 server implementations of the DOM, `XMLHttpRequest`, and other low-level features that don't rely on a browser.
 
-The server ([Node Express](https://expressjs.com/) in this guide's example)
+The server ([Node.js Express](https://expressjs.com/) in this guide's example)
 passes client requests for application pages to the NgUniversal `ngExpressEngine`. Under the hood, this
 calls Universal's `renderModule()` function, while providing caching and other helpful utilities.
 
 The `renderModule()` function takes as inputs a *template* HTML page (usually `index.html`),
-an Angular *module* containing components,
-and a *route* that determines which components to display.
+an Angular *module* containing components, and a *route* that determines which components to display.
 The route comes from the client's request to the server.
 
 Each request results in the appropriate view for the requested route.
@@ -188,71 +187,6 @@ Similarly, without mouse or keyboard events, a server-side app can't rely on a u
 The app must determine what to render based solely on the incoming client request.
 This is a good argument for making the app [routable](guide/router).
 
-{@a http-urls}
-### Using absolute URLs for server requests
-
-The tutorial's `HeroService` and `HeroSearchService` delegate to the Angular `HttpClient` module to fetch application data.
-These services send requests to _relative_ URLs such as `api/heroes`.
-In a Universal app, HTTP URLs must be _absolute_ (for example, `https://my-server.com/api/heroes`).
-This means you need to change your services to make requests with absolute URLs when running on the server and with relative
-URLs when running in the browser.
-
-One solution is to provide the full URL to your application on the server, and write an interceptor that can retrieve this
-value and prepend it to the request URL. If you're using the `ngExpressEngine`, as shown in the example in this guide, half
-the work is already done. We'll assume this is the case, but it's trivial to provide the same functionality.
-
-Start by creating an [HttpInterceptor](api/common/http/HttpInterceptor).
-
-<code-example language="typescript" header="universal-interceptor.ts">
-
-import {Injectable, Inject, Optional} from '@angular/core';
-import {HttpInterceptor, HttpHandler, HttpRequest, HttpHeaders} from '@angular/common/http';
-import {Request} from 'express';
-import {REQUEST} from '@nguniversal/express-engine/tokens';
-
-@Injectable()
-export class UniversalInterceptor implements HttpInterceptor {
-
-  constructor(@Optional() @Inject(REQUEST) protected request?: Request) {}
-
-  intercept(req: HttpRequest<any>, next: HttpHandler) {
-    let serverReq: HttpRequest<any> = req;
-    if (this.request) {
-      let newUrl = `${this.request.protocol}://${this.request.get('host')}`;
-      if (!req.url.startsWith('/')) {
-        newUrl += '/';
-      }
-      newUrl += req.url;
-      serverReq = req.clone({url: newUrl});
-    }
-    return next.handle(serverReq);
-  }
-}
-
-</code-example>
-
-Next, provide the interceptor in the providers for the server `AppModule`.
-
-<code-example language="typescript" header="app.server.module.ts">
-
-import {HTTP_INTERCEPTORS} from '@angular/common/http';
-import {UniversalInterceptor} from './universal-interceptor';
-
-@NgModule({
-  ...
-  providers: [{
-    provide: HTTP_INTERCEPTORS,
-    useClass: UniversalInterceptor,
-    multi: true
-  }],
-})
-export class AppServerModule {}
-
-</code-example>
-
-Now, on every HTTP request made on the server, this interceptor will fire and replace the request URL with the absolute
-URL provided in the Express `Request` object.
-
 {@a universal-engine}
 ### Universal template engine
 
@@ -262,16 +196,10 @@ The important bit in the `server.ts` file is the `ngExpressEngine()` function.
 </code-example>
 
 The `ngExpressEngine()` function is a wrapper around Universal's `renderModule()` function which turns a client's
-requests into server-rendered HTML pages.
+requests into server-rendered HTML pages. It accepts an object with the following properties:
 
-* The first parameter is `AppServerModule`.
-It's the bridge between the Universal server-side renderer and the Angular application.
-
-* The second parameter, `extraProviders`, is optional. It lets you specify dependency providers that apply only when
-running on this server.
-You can do this when your app needs information that can only be determined by the currently running server instance.
-One example could be the running server's *origin*, which could be used to [calculate absolute HTTP URLs](#http-urls) if
-not using the `Request` token as shown above.
+* `bootstrap`: The root `NgModule` or `NgModule` factory to use for bootstraping the app when rendering on the server. For the example app, it is `AppServerModule`. It's the bridge between the Universal server-side renderer and the Angular application.
+* `extraProviders`: This is optional and lets you specify dependency providers that apply only when rendering the app on the server. You can do this when your app needs information that can only be determined by the currently running server instance.
 
 The `ngExpressEngine()` function returns a `Promise` callback that resolves to the rendered page.
 It's up to the engine to decide what to do with that page.
@@ -287,7 +215,7 @@ which then forwards it to the client in the HTTP response.
 
 ### Filtering request URLs
 
-NOTE: the basic behavior described below is handled automatically when using the NgUniversal Express schematic, this
+NOTE: The basic behavior described below is handled automatically when using the NgUniversal Express schematic. This
 is helpful when trying to understand the underlying behavior or replicate it without using the schematic.
 
 The web server must distinguish _app page requests_ from other kinds of requests.
@@ -307,8 +235,8 @@ Because we use routing, we can easily recognize the three types of requests and
 1. **App navigation**: request URL with no file extension.
 1. **Static asset**: all other requests.
 
-A Node Express server is a pipeline of middleware that filters and processes requests one after the other.
-You configure the Node Express server pipeline with calls to `app.get()` like this one for data requests.
+A Node.js Express server is a pipeline of middleware that filters and processes requests one after the other.
+You configure the Node.js Express server pipeline with calls to `server.get()` like this one for data requests.
 
 <code-example path="universal/server.ts" header="server.ts (data URL)" region="data-request"></code-example>
 
@@ -328,13 +256,32 @@ The following code filters for request URLs with no extensions and treats them a
 
 ### Serving static files safely
 
-A single `app.use()` treats all other URLs as requests for static assets
+A single `server.use()` treats all other URLs as requests for static assets
 such as JavaScript, image, and style files.
 
 To ensure that clients can only download the files that they are permitted to see, put all client-facing asset files in
 the `/dist` folder and only honor requests for files from the `/dist` folder.
 
-The following Node Express code routes all remaining requests to `/dist`, and returns a `404 - NOT FOUND` error if the
+The following Node.js Express code routes all remaining requests to `/dist`, and returns a `404 - NOT FOUND` error if the
 file isn't found.
 
 <code-example path="universal/server.ts" header="server.ts (static files)" region="static"></code-example>
+
+### Using absolute URLs for HTTP (data) requests on the server
+
+The tutorial's `HeroService` and `HeroSearchService` delegate to the Angular `HttpClient` module to fetch application data.
+These services send requests to _relative_ URLs such as `api/heroes`.
+In a server-side rendered app, HTTP URLs must be _absolute_ (for example, `https://my-server.com/api/heroes`).
+This means that the URLs must be somehow converted to absolute when running on the server and be left relative when running in the browser.
+
+If you are using one of the `@nguniversal/*-engine` packages (such as `@nguniversal/express-engine`), this is taken care for you automatically.
+You don't need to do anything to make relative URLs work on the server.
+
+If, for some reason, you are not using an `@nguniversal/*-engine` package, you may need to handle it yourself.
+
+The recommended solution is to pass the full request URL to the `options` argument of [renderModule()](api/platform-server/renderModule) or [renderModuleFactory()](api/platform-server/renderModuleFactory) (depending on what you use to render `AppServerModule` on the server).
+This option is the least intrusive as it does not require any changes to the app.
+Here, "request URL" refers to the URL of the request as a response to which the app is being rendered on the server.
+For example, if the client requested `https://my-server.com/dashboard` and you are rendering the app on the server to respond to that request, `options.url` should be set to `https://my-server.com/dashboard`.
+
+Now, on every HTTP request made as part of rendering the app on the server, Angular can correctly resolve the request URL to an absolute URL, using the provided `options.url`.

aio/content/marketing/contributors.json

@@ -44,15 +44,6 @@
     "groups": ["Angular"],
     "lead": "juleskremer"
   },
-  "robwormald": {
-    "name": "Rob Wormald",
-    "picture": "rob-wormald.jpg",
-    "twitter": "robwormald",
-    "website": "http://github.com/robwormald",
-    "bio": "Rob is a Developer Advocate on the Angular team at Google. He's the Angular team's resident reactive programming geek and founded the Reactive Extensions for Angular project, ngrx.",
-    "groups": ["Angular"],
-    "lead": "stephenfluin"
-  },
   "alexeagle": {
     "name": "Alex Eagle",
     "picture": "alex-eagle.jpg",
@@ -667,6 +658,13 @@
     "groups": ["Angular"],
     "lead": "dennispbrown"
   },
+  "rockument69": {
+    "name": "Tony Bove",
+    "picture": "rockument69.jpg",
+    "bio": "Tony is a technical writer with Expert Support. His lifelong passions are helping people use technology, writing fiction, and playing music. When he's not working or playing the harmonica with friends in a bluegrass band, he's swimming and snorkeling on a Kauai beach and playing ball with his Irish Wolfhound. He's worked at home for decades before it became a thing.",
+    "groups": ["Angular"],
+    "lead": "aikidave"
+  },
   "kapunahelewong": {
     "name": "Kapunahele Wong",
     "picture": "kapunahele.jpg",
@@ -835,5 +833,12 @@
     "bio": "Manu heads technical program management for Angular at Google. Manu keeps the big picture in focus and works with cross-functional teams to plan, execute and usher programs through the entire lifecycle.",
     "groups": ["Angular"],
     "lead": "juleskremer"
+  },
+  "anneiyw": {
+    "name": "Annie Wang",
+    "picture": "annieyw.jpg",
+    "bio": "Annie is an engineering resident on the Angular Components team at Google. She is passionate about the intersection between design and technology and enjoys drawing in her free time.",
+    "groups": ["Angular"],
+    "lead": "jelbourn"
   }
 }