release: cut the v9.1.1 release

PR Close #35969

.bazelrc

@@ -33,11 +33,6 @@ build --incompatible_strict_action_env
 run --incompatible_strict_action_env
 test --incompatible_strict_action_env
 
-# Do not build runfile trees by default. If an execution strategy relies on runfile
-# symlink teee, the tree is created on-demand. See: https://github.com/bazelbuild/bazel/issues/6627
-# and https://github.com/bazelbuild/bazel/commit/03246077f948f2790a83520e7dccc2625650e6df
-build --nobuild_runfile_links
-
 ###############################
 # Release support             #
 # Turn on these settings with #
@@ -47,7 +42,7 @@ build --nobuild_runfile_links
 # Releases should always be stamped with version control info
 # This command assumes node on the path and is a workaround for
 # https://github.com/bazelbuild/bazel/issues/4802
-build:release --workspace_status_command="yarn -s ng-dev release build-env-stamp"
+build:release --workspace_status_command="node ./tools/bazel_stamp_vars.js"
 build:release --stamp
 
 ###############################

.circleci/README.md

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

.circleci/config.yml

@@ -22,18 +22,18 @@ version: 2.1
 # **NOTE 1 **: If you change the cache key prefix, also sync the cache_key_fallback to match.
 # **NOTE 2 **: Keep the static part of the cache key as prefix to enable correct fallbacks.
 # See https://circleci.com/docs/2.0/caching/#restoring-cache for how prefixes work in CircleCI.
-var_3: &cache_key v7-angular-node-12-{{ checksum ".bazelversion" }}-{{ checksum "yarn.lock" }}-{{ checksum "WORKSPACE" }}-{{ checksum "packages/bazel/package.bzl" }}-{{ checksum "aio/yarn.lock" }}
+var_3: &cache_key v6-angular-node-12-{{ checksum ".bazelversion" }}-{{ checksum "yarn.lock" }}-{{ checksum "WORKSPACE" }}-{{ checksum "packages/bazel/package.bzl" }}-{{ checksum "aio/yarn.lock" }}
 # We invalidate the cache if the Bazel version changes because otherwise the `bazelisk` cache
 # folder will contain all previously used versions and ultimately cause the cache restoring to
 # be slower due to its growing size.
-var_4: &cache_key_fallback v7-angular-node-12-{{ checksum ".bazelversion" }}
-var_3_win: &cache_key_win v7-angular-win-node-12-{{ checksum ".bazelversion" }}-{{ checksum "yarn.lock" }}-{{ checksum "WORKSPACE" }}-{{ checksum "packages/bazel/package.bzl" }}-{{ checksum "aio/yarn.lock" }}
-var_4_win: &cache_key_win_fallback v7-angular-win-node-12-{{ checksum ".bazelversion" }}
+var_4: &cache_key_fallback v6-angular-node-12-{{ checksum ".bazelversion" }}
+var_3_win: &cache_key_win v6-angular-win-node-12-{{ checksum ".bazelversion" }}-{{ checksum "yarn.lock" }}-{{ checksum "WORKSPACE" }}-{{ checksum "packages/bazel/package.bzl" }}-{{ checksum "aio/yarn.lock" }}
+var_4_win: &cache_key_win_fallback v6-angular-win-node-12-{{ checksum ".bazelversion" }}
 
 # Cache key for the `components-repo-unit-tests` job. **Note** when updating the SHA in the
 # cache keys also update the SHA for the "COMPONENTS_REPO_COMMIT" environment variable.
-var_5: &components_repo_unit_tests_cache_key v7-angular-components-189d98e8b01b33974328255f085de04251d61567
-var_6: &components_repo_unit_tests_cache_key_fallback v7-angular-components-
+var_5: &components_repo_unit_tests_cache_key v6-angular-components-598db096e668aa7e9debd56eedfd127b7a55e371
+var_6: &components_repo_unit_tests_cache_key_fallback v6-angular-components-
 
 # Workspace initially persisted by the `setup` job, and then enhanced by `build-npm-packages` and
 # `build-ivy-npm-packages`.
@@ -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
+              node tools/rebase-pr.js angular/angular ${CIRCLE_PR_NUMBER}
             else
               echo "This build is not over a PR, nothing to do."
             fi
@@ -272,8 +272,13 @@ jobs:
       - custom_attach_workspace
       - init_environment
 
-      - run: yarn -s tslint
-      - run: yarn -s ng-dev format changed $CI_GIT_BASE_REVISION --check
+      - 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 ts-circular-deps:check
       - run: yarn -s ng-dev pullapprove verify
       - run: yarn -s ng-dev commit-message validate-range --range $CI_COMMIT_RANGE
@@ -384,6 +389,10 @@ jobs:
       - custom_attach_workspace
       - init_environment
       - install_chrome_libs
+        # Compile dependencies to ivy
+        # Running `ngcc` here (instead of implicitly via `ng build`) allows us to take advantage of
+        # the parallel, async mode speed-up (~20-25s on CI).
+      - run: yarn --cwd aio ngcc --properties es2015
         # Build aio
       - run: yarn --cwd aio build --progress=false
         # Lint the code

.circleci/env.sh

@@ -5,76 +5,87 @@ readonly projectDir=$(realpath "$(dirname ${BASH_SOURCE[0]})/..")
 readonly envHelpersPath="$projectDir/.circleci/env-helpers.inc.sh";
 readonly bashEnvCachePath="$projectDir/.circleci/bash_env_cache";
 
-# Load helpers and make them available everywhere (through `$BASH_ENV`).
-source $envHelpersPath;
-echo "source $envHelpersPath;" >> $BASH_ENV;
+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;
 
 
-####################################################################################################
-# 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 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 "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 "189d98e8b01b33974328255f085de04251d61567"
+  ####################################################################################################
+  # 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
 
 
 ####################################################################################################

.dev-infra.json

@@ -0,0 +1,47 @@
+{
+  "commitMessage": {
+    "maxLength": 120,
+    "minBodyLength": 0,
+    "types": [
+      "build",
+      "ci",
+      "docs",
+      "feat",
+      "fix",
+      "perf",
+      "refactor",
+      "release",
+      "style",
+      "test"
+    ],
+    "scopes": [
+      "animations",
+      "bazel",
+      "benchpress",
+      "changelog",
+      "common",
+      "compiler",
+      "compiler-cli",
+      "core",
+      "dev-infra",
+      "docs-infra",
+      "elements",
+      "forms",
+      "http",
+      "language-service",
+      "localize",
+      "ngcc",
+      "packaging",
+      "platform-browser",
+      "platform-browser-dynamic",
+      "platform-server",
+      "platform-webworker",
+      "platform-webworker-dynamic",
+      "router",
+      "service-worker",
+      "upgrade",
+      "ve",
+      "zone.js"
+    ]
+  }
+}

.ng-dev/config.ts

@@ -1,123 +0,0 @@
-import {MergeConfig} from '../dev-infra/pr/merge/config';
-
-// The configuration for `ng-dev commit-message` commands.
-const commitMessage = {
-  'maxLength': 120,
-  'minBodyLength': 100,
-  'types': [
-    'build',
-    'ci',
-    'docs',
-    'feat',
-    'fix',
-    'perf',
-    'refactor',
-    'release',
-    'style',
-    'test',
-  ],
-  'scopes': [
-    'animations',
-    'bazel',
-    'benchpress',
-    'changelog',
-    'common',
-    'compiler',
-    'compiler-cli',
-    'core',
-    'dev-infra',
-    'docs-infra',
-    'elements',
-    'forms',
-    'http',
-    'language-service',
-    'localize',
-    'ngcc',
-    'packaging',
-    'platform-browser',
-    'platform-browser-dynamic',
-    'platform-server',
-    'platform-webworker',
-    'platform-webworker-dynamic',
-    'router',
-    'service-worker',
-    'upgrade',
-    've',
-    'zone.js',
-  ]
-};
-
-// The configuration for `ng-dev format` commands.
-const format = {
-  'clang-format': {
-    'matchers': [
-      'dev-infra/**/*.{js,ts}',
-      'packages/**/*.{js,ts}',
-      '!packages/zone.js',
-      '!packages/common/locales/**/*.{js,ts}',
-      '!packages/common/src/i18n/available_locales.ts',
-      '!packages/common/src/i18n/currencies.ts',
-      '!packages/common/src/i18n/locale_en.ts',
-      'modules/benchmarks/**/*.{js,ts}',
-      'modules/playground/**/*.{js,ts}',
-      'tools/**/*.{js,ts}',
-      '!tools/gulp-tasks/cldr/extract.js',
-      '!tools/public_api_guard/**/*.d.ts',
-      '!tools/ts-api-guardian/test/fixtures/**',
-      '*.{js,ts}',
-      '!**/node_modules/**',
-      '!**/dist/**',
-      '!**/built/**',
-      '!shims_for_IE.js',
-    ]
-  },
-  'buildifier': true
-};
-
-/** Github metadata information for `ng-dev` commands. */
-const github = {
-  owner: 'angular',
-  name: 'angular',
-};
-
-// Configuration for the `ng-dev pr merge` command. The command can be used
-// for merging upstream pull requests into branches based on a PR target label.
-const merge = () => {
-  // TODO: resume dynamically determining patch branch
-  const patch = '10.0.x';
-  const config: MergeConfig = {
-    githubApiMerge: false,
-    claSignedLabel: 'cla: yes',
-    mergeReadyLabel: /^PR action: merge(-assistance)?/,
-    commitMessageFixupLabel: 'commit message fixup',
-    labels: [
-      {
-        pattern: 'PR target: master-only',
-        branches: ['master'],
-      },
-      {
-        pattern: 'PR target: patch-only',
-        branches: [patch],
-      },
-      {
-        pattern: 'PR target: master & patch',
-        branches: ['master', patch],
-      },
-    ],
-    requiredBaseCommits: {
-      // PRs that target either `master` or the patch branch, need to be rebased
-      // on top of the latest commit message validation fix.
-      'master': '4341743b4a6d7e23c6f944aa9e34166b701369a1',
-      [patch]: '4341743b4a6d7e23c6f944aa9e34166b701369a1'
-    },
-  };
-  return config;
-};
-
-// Export function to build ng-dev configuration object.
-module.exports = {
-  commitMessage,
-  format,
-  github,
-  merge,
-};

.pullapprove.yml

@@ -189,7 +189,7 @@ groups:
       - *can-be-global-approved
       - *can-be-global-docs-approved
       - >
-        contains_any_globs(files.exclude('packages/compiler-cli/ngcc/**'), [
+        contains_any_globs(files, [
           'packages/compiler/**',
           'packages/examples/compiler/**',
           'packages/compiler-cli/**',
@@ -198,6 +198,10 @@ 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
@@ -213,7 +217,10 @@ groups:
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
-      - files.include('packages/compiler-cli/ngcc/**')
+      - >
+        contains_any_globs(files, [
+          'packages/compiler-cli/ngcc/**'
+          ])
     reviewers:
       users:
         - alxhub
@@ -222,22 +229,6 @@ 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
   # =========================================================
@@ -246,7 +237,7 @@ groups:
       - *can-be-global-approved
       - *can-be-global-docs-approved
       - >
-        contains_any_globs(files.exclude("packages/core/schematics/**"), [
+        contains_any_globs(files, [
           'packages/core/**',
           'packages/examples/core/**',
           'packages/common/**',
@@ -351,7 +342,6 @@ groups:
       users:
         - alxhub
         - AndrewKushnir
-        - atscott
         - kara
         - mhevery
         - pkozlowski-opensource
@@ -367,6 +357,7 @@ groups:
       - >
         contains_any_globs(files, [
           'packages/common/http/**',
+          'packages/http/**',
           'packages/examples/http/**',
           'aio/content/guide/http.md',
           'aio/content/examples/http/**',
@@ -494,8 +485,6 @@ groups:
           'packages/router/**',
           'packages/examples/router/**',
           'aio/content/guide/router.md',
-          'aio/content/guide/router-tutorial.md',
-          'aio/content/examples/router-tutorial/**',
           'aio/content/examples/router/**',
           'aio/content/images/guide/router/**'
           ])
@@ -507,7 +496,7 @@ groups:
   # =========================================================
   #  Framework: Service Worker
   # =========================================================
-  fw-service-worker:
+  fw-server-worker:
     conditions:
       - *can-be-global-approved
       - *can-be-global-docs-approved
@@ -569,7 +558,7 @@ groups:
       - *can-be-global-approved
       - *can-be-global-docs-approved
       - >
-        contains_any_globs(files.exclude('packages/compiler-cli/**'), [
+        contains_any_globs(files, [
           '**/testing/**',
           'aio/content/guide/testing.md',
           'aio/content/examples/testing/**',
@@ -577,7 +566,6 @@ groups:
           ])
     reviewers:
       users:
-        - AndrewKushnir
         - IgorMinar
         - kara
         - pkozlowski-opensource
@@ -648,6 +636,7 @@ groups:
       - >
         contains_any_globs(files, [
           'packages/bazel/**',
+          'aio/content/guide/bazel.md'
           ])
     reviewers:
       users:
@@ -777,10 +766,10 @@ groups:
           ])
     reviewers:
       users:
-        - aikidave
         - IgorMinar
         - StephenFluin
 
+
   # =========================================================
   #  Docs: Observables
   # =========================================================
@@ -859,7 +848,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:
@@ -947,12 +936,11 @@ groups:
     conditions:
       - *can-be-global-approved
       - >
-        contains_any_globs(files.exclude("CHANGELOG.md"), [
+        contains_any_globs(files, [
           '*',
           '.circleci/**',
           '.devcontainer/**',
           '.github/**',
-          '.ng-dev/**',
           '.vscode/**',
           '.yarn/**',
           'dev-infra/**',
@@ -1020,7 +1008,6 @@ groups:
       - >
         contains_any_globs(files, [
           'goldens/public-api/**',
-          'CHANGELOG.md',
           'docs/NAMING.md',
           'aio/content/guide/glossary.md',
           'aio/content/guide/styleguide.md',
@@ -1030,7 +1017,6 @@ groups:
     reviewers:
       users:
         - IgorMinar
-        - kara
 
 
   # ================================================
@@ -1041,7 +1027,8 @@ groups:
       - *can-be-global-approved
       - >
         contains_any_globs(files, [
-          'goldens/size-tracking/**'
+          'aio/scripts/_payload-limits.json',
+          'integration/_payload-limits.json'
           ])
     reviewers:
       users:
@@ -1057,7 +1044,7 @@ groups:
       - *can-be-global-approved
       - >
         contains_any_globs(files, [
-          'goldens/circular-deps/packages.json'
+          'goldens/packages-circular-deps.json'
         ])
     reviewers:
       users:

.yarn/releases/yarn-1.21.1.js

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

.yarnrc

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

CHANGELOG.md

@@ -1,551 +1,3 @@
-<a name="10.0.0-rc.2"></a>
-# [10.0.0-rc.2](https://github.com/angular/angular/compare/10.0.0-rc.0...10.0.0-rc.2) (2020-06-01)
-
-
-### Bug Fixes
-
-* **core:** reenable decorator downleveling for Angular npm packages ([#37317](https://github.com/angular/angular/issues/37317)) ([d16a7f3](https://github.com/angular/angular/commit/d16a7f3)), closes [#37221](https://github.com/angular/angular/issues/37221) [#37221](https://github.com/angular/angular/issues/37221)
-
-
-Note: the 10.0.0-rc.1 release on npm accidentally glitched-out midway, so we cut 10.0.0-rc.2 instead. oops :-)
-
-<a name="10.0.0-rc.0"></a>
-# [10.0.0-rc.0](https://github.com/angular/angular/compare/10.0.0-next.9...10.0.0-rc.0) (2020-05-21)
-
-### Bug Fixes
-
-* **core:** disable tsickle pass when producing APF packages ([#37221](https://github.com/angular/angular/issues/37221)) ([a1001f2](https://github.com/angular/angular/commit/a1001f2))
-* **elements:** capture input properties set before upgrading the element ([#36114](https://github.com/angular/angular/issues/36114)) ([2fc5ae5](https://github.com/angular/angular/commit/2fc5ae5)), closes [#30848](https://github.com/angular/angular/issues/30848) [#31416](https://github.com/angular/angular/issues/31416)
-* **elements:** correctly handle getting/setting properties before connecting the element ([#36114](https://github.com/angular/angular/issues/36114)) ([327980b](https://github.com/angular/angular/commit/327980b)), closes [/github.com/angular/angular/pull/31416/files#r300326698](https://github.com//github.com/angular/angular/pull/31416/files/issues/r300326698)
-* **elements:** do not break when the constructor of an Angular Element is not called ([#36114](https://github.com/angular/angular/issues/36114)) ([89b44d1](https://github.com/angular/angular/commit/89b44d1))
-* **ngcc:** identifier ModuleWithProviders functions in IIFE wrapped classes ([#37206](https://github.com/angular/angular/issues/37206)) ([97e1399](https://github.com/angular/angular/commit/97e1399)), closes [#37189](https://github.com/angular/angular/issues/37189)
-
-
-### BREAKING CHANGES
-
-* **core:** Angular npm packages no longer contain jsdoc comments
-to support Closure Compiler's advanced optimizations
-
-The support for Closure Compiler in Angular packages has been
-experimental and broken for quite some time.
-
-As of TS3.9, Closure is unusable with the JavaScript emit. Please follow
-https://github.com/microsoft/TypeScript/issues/38374 for more
-information and updates.
-
-If you used Closure Compiler with Angular in the past, you will likely
-be better off consuming Angular packages built from sources directly 
-rather than consuming the version we publish on npm,
-which is primarily optimized for Webpack/Rollup + Terser build pipeline.
-
-As a temporary workaround, you might consider using your current build
-pipeline with Closure flag `--compilation_level=SIMPLE`. This flag 
-will ensure that your build pipeline produces buildable and
-runnable artifacts, at the cost of increased payload size due to
-advanced optimizations being disabled.
-
-If you were affected by this change, please help us understand your
-needs by leaving a comment on https://github.com/angular/angular/issues/37234.
-
-
-
-<a name="9.1.9"></a>
-## [9.1.9](https://github.com/angular/angular/compare/9.1.8...9.1.9) (2020-05-20)
-
-This release contains a re-submit of the following 3 commits with fixes for TS 3.8.
-
-### Bug Fixes
-
-* **elements:** capture input properties set before upgrading the element ([#36114](https://github.com/angular/angular/issues/36114)) ([#37226](https://github.com/angular/angular/issues/37226)) ([a33cb2d](https://github.com/angular/angular/commit/a33cb2d)), closes [#30848](https://github.com/angular/angular/issues/30848) [#31416](https://github.com/angular/angular/issues/31416)
-* **elements:** correctly handle getting/setting properties before connecting the element ([#36114](https://github.com/angular/angular/issues/36114)) ([#37226](https://github.com/angular/angular/issues/37226)) ([6ac0042](https://github.com/angular/angular/commit/6ac0042)), closes [/github.com/angular/angular/pull/31416/files#r300326698](https://github.com//github.com/angular/angular/pull/31416/files/issues/r300326698)
-* **elements:** do not break when the constructor of an Angular Element is not called ([#36114](https://github.com/angular/angular/issues/36114)) ([#37226](https://github.com/angular/angular/issues/37226)) ([1465372](https://github.com/angular/angular/commit/1465372))
-
-
-
-<a name="9.1.8"></a>
-## [9.1.8](https://github.com/angular/angular/compare/9.1.6...9.1.8) (2020-05-20)
-
-
-### Bug Fixes
-
-* **core:** Host classes should not be fed back into `@Input` ([#35889](https://github.com/angular/angular/issues/35889)) ([f872b69](https://github.com/angular/angular/commit/f872b69)), closes [#35383](https://github.com/angular/angular/issues/35383)
-* **core:** inheritance delegate ctor regex updated to work on minified code ([#36962](https://github.com/angular/angular/issues/36962)) ([e3d3395](https://github.com/angular/angular/commit/e3d3395))
-* **elements:** capture input properties set before upgrading the element ([#36114](https://github.com/angular/angular/issues/36114)) ([1c8f179](https://github.com/angular/angular/commit/1c8f179)), closes [#30848](https://github.com/angular/angular/issues/30848) [#31416](https://github.com/angular/angular/issues/31416)
-* **elements:** correctly handle getting/setting properties before connecting the element ([#36114](https://github.com/angular/angular/issues/36114)) ([363f14c](https://github.com/angular/angular/commit/363f14c)), closes [/github.com/angular/angular/pull/31416/files#r300326698](https://github.com//github.com/angular/angular/pull/31416/files/issues/r300326698)
-* **elements:** do not break when the constructor of an Angular Element is not called ([#36114](https://github.com/angular/angular/issues/36114)) ([87b9f08](https://github.com/angular/angular/commit/87b9f08))
-* **router:** update type for routerLink to include null and undefined ([#37018](https://github.com/angular/angular/issues/37018)) ([7de7871](https://github.com/angular/angular/commit/7de7871)), closes [#13380](https://github.com/angular/angular/issues/13380) [#36544](https://github.com/angular/angular/issues/36544)
-
-
-<a name="10.0.0-next.9"></a>
-# [10.0.0-next.9](https://github.com/angular/angular/compare/10.0.0-next.8...10.0.0-next.9) (2020-05-19)
-
-
-### Bug Fixes
-
-* **compiler-cli:** ensure LogicalFileSystem maintains case in paths ([#37008](https://github.com/angular/angular/issues/37008)) ([3dfc770](https://github.com/angular/angular/commit/3dfc770)), closes [#36992](https://github.com/angular/angular/issues/36992) [#36993](https://github.com/angular/angular/issues/36993) [#37000](https://github.com/angular/angular/issues/37000)
-* **router:** update type for routerLink to include null and undefined ([#37018](https://github.com/angular/angular/issues/37018)) ([ef9f8df](https://github.com/angular/angular/commit/ef9f8df)), closes [#13380](https://github.com/angular/angular/issues/13380) [#36544](https://github.com/angular/angular/issues/36544)
-
-
-
-<a name="10.0.0-next.8"></a>
-# [10.0.0-next.8](https://github.com/angular/angular/compare/10.0.0-next.7...10.0.0-next.8) (2020-05-18)
-
-
-### Bug Fixes
-
-* **compiler-cli:** compute the correct target output for `$localize` messages ([#36989](https://github.com/angular/angular/issues/36989)) ([4e1b5e4](https://github.com/angular/angular/commit/4e1b5e4))
-* **core:** Host classes should not be fed back into `@Input` ([#35889](https://github.com/angular/angular/issues/35889)) ([cda2530](https://github.com/angular/angular/commit/cda2530)), closes [#35383](https://github.com/angular/angular/issues/35383)
-* **core:** inheritance delegate ctor regex updated to work on minified code ([#36962](https://github.com/angular/angular/issues/36962)) ([ea971f7](https://github.com/angular/angular/commit/ea971f7))
-* **language-service:** use empty statement as parent of type node ([#36989](https://github.com/angular/angular/issues/36989)) ([a32cbed](https://github.com/angular/angular/commit/a32cbed))
-* **ngcc:** `viaModule` should be `null` for local imports ([#36989](https://github.com/angular/angular/issues/36989)) ([d268d2a](https://github.com/angular/angular/commit/d268d2a))
-* **ngcc:** ensure reflection hosts can handle TS 3.9 IIFE wrapped classes ([#36989](https://github.com/angular/angular/issues/36989)) ([d7440c4](https://github.com/angular/angular/commit/d7440c4))
-* **ngcc:** ensure rendering formatters work with IIFE wrapped classes ([#36989](https://github.com/angular/angular/issues/36989)) ([c8ee390](https://github.com/angular/angular/commit/c8ee390))
-* **ngcc:** support `defineProperty()` re-exports in CommonJS and UMD ([#36989](https://github.com/angular/angular/issues/36989)) ([91092f6](https://github.com/angular/angular/commit/91092f6))
-
-
-### Features
-
-* remove support for TypeScript 3.8 ([#37129](https://github.com/angular/angular/issues/37129)) ([6466fb2](https://github.com/angular/angular/commit/6466fb2))
-* **platform-server:** use absolute URLs from Location for HTTP ([#37071](https://github.com/angular/angular/issues/37071)) ([9edea0b](https://github.com/angular/angular/commit/9edea0b))
-
-
-### BREAKING CHANGES
-
-* TypeScript 3.8 is no longer supported, please update to TypeScript 3.9.
-
-
-
-<a name="10.0.0-next.7"></a>
-# [10.0.0-next.7](https://github.com/angular/angular/compare/10.0.0-next.6...10.0.0-next.7) (2020-05-13)
-
-
-### Bug Fixes
-
-* **core:** correct "development mode" console message ([#36571](https://github.com/angular/angular/issues/36571)) ([8d8e419](https://github.com/angular/angular/commit/8d8e419)), closes [#36570](https://github.com/angular/angular/issues/36570)
-* add aikidave as reviewer for DOCS: Marketing ([#37014](https://github.com/angular/angular/issues/37014)) ([286fbf4](https://github.com/angular/angular/commit/286fbf4))
-
-
-### Features
-
-* **compiler:** add name spans for property reads and method calls ([#36826](https://github.com/angular/angular/issues/36826)) ([eb34aa5](https://github.com/angular/angular/commit/eb34aa5))
-* **language-service:** [ivy] wrap ngtsc to handle typecheck files ([#36930](https://github.com/angular/angular/issues/36930)) ([1142c37](https://github.com/angular/angular/commit/1142c37))
-* **core** make generic mandatory for ModuleWithProviders ([#36892](https://github.com/angular/angular/issues/36892)) ([20cc3ab](https://github.com/angular/angular/commit/20cc3ab))
-
-### BREAKING CHANGES
-
-* **core:** make generic mandatory for ModuleWithProviders 
-
-A generic type parameter has always been required for the `ModuleWithProviders` pattern to work with Ivy, but prior to this commit, View Engine allowed the generic type to be omitted (though support was officially deprecated).
-If you're using `ModuleWithProviders` without a generic type in your application code, a v10 migration will update your code for you. 
-
-However, if you are using View Engine and also depending on a library that omits the generic type, you will now get a build time error similar to:
-
-```
-error TS2314: Generic type 'ModuleWithProviders<T>' requires 1 type argument(s).
-```
- 
-In this case, ngcc won't help you (because it's Ivy-only) and the migration only covers application code.
-You should contact the library author to fix their library to provide a type parameter when they use this class.
-
-As a workaround, we suggest setting `skipLibChecks` to false in your tsconfig or updating your app to use Ivy.
-
-
-<a name="9.1.7"></a>
-## [9.1.7](https://github.com/angular/angular/compare/9.1.6...9.1.7) (2020-05-13)
-
-This release contains various API docs improvements.
-
-
-<a name="9.1.6"></a>
-## [9.1.6](https://github.com/angular/angular/compare/9.1.5...9.1.6) (2020-05-08)
-
-### Bug Fixes
-
-* **compiler-cli**: Revert "fix(compiler-cli): fix case-sensitivity issues in NgtscCompilerHost (#36968)" (#37003)
-
-
-
-<a name="10.0.0-next.6"></a>
-# [10.0.0-next.6](https://github.com/angular/angular/compare/10.0.0-next.5...10.0.0-next.6) (2020-05-07)
-
-
-### Bug Fixes
-
-* **bazel:** ng_package rule should update "package.json" of ts_library targets ([#36944](https://github.com/angular/angular/issues/36944)) ([d5293d2](https://github.com/angular/angular/commit/d5293d2))
-* **compiler:** remove outdated and invalid warning for unresolved DI parameters ([#36985](https://github.com/angular/angular/issues/36985)) ([d0280a0](https://github.com/angular/angular/commit/d0280a0))
-* **compiler:** switch to 'referencedFiles' for shim generation ([#36211](https://github.com/angular/angular/issues/36211)) ([4213e8d](https://github.com/angular/angular/commit/4213e8d))
-* **compiler-cli:** `isCaseSensitive()` returns correct value ([#36859](https://github.com/angular/angular/issues/36859)) ([fc4741f](https://github.com/angular/angular/commit/fc4741f))
-* **compiler-cli:** don't try to tag non-ts files as shims ([#36987](https://github.com/angular/angular/issues/36987)) ([42d1091](https://github.com/angular/angular/commit/42d1091))
-* **compiler-cli:** ensure `getRootDirs()` handles case-sensitivity ([#36859](https://github.com/angular/angular/issues/36859)) ([3f3e9b7](https://github.com/angular/angular/commit/3f3e9b7))
-* **compiler-cli:** ensure `MockFileSystem` handles case-sensitivity ([#36859](https://github.com/angular/angular/issues/36859)) ([26eacd4](https://github.com/angular/angular/commit/26eacd4))
-* **compiler-cli:** ensure LogicalFileSystem handles case-sensitivity ([#36859](https://github.com/angular/angular/issues/36859)) ([53a8459](https://github.com/angular/angular/commit/53a8459))
-* **compiler-cli:** fix bug tracking indirect NgModule dependencies ([#36211](https://github.com/angular/angular/issues/36211)) ([bab90a7](https://github.com/angular/angular/commit/bab90a7))
-* **compiler-cli:** fix case-sensitivity issues in NgtscCompilerHost ([#36859](https://github.com/angular/angular/issues/36859)) ([0ec0ff3](https://github.com/angular/angular/commit/0ec0ff3))
-* **compiler-cli:** normalize mock Windows file paths correctly ([#36859](https://github.com/angular/angular/issues/36859)) ([b682bd1](https://github.com/angular/angular/commit/b682bd1))
-* **compiler-cli:** use CompilerHost to ensure canonical file paths ([#36859](https://github.com/angular/angular/issues/36859)) ([a10c126](https://github.com/angular/angular/commit/a10c126))
-* **core:** handle pluralize functions that expect a number ([#36901](https://github.com/angular/angular/issues/36901)) ([2ff4b35](https://github.com/angular/angular/commit/2ff4b35)), closes [#36888](https://github.com/angular/angular/issues/36888)
-* **core:** properly get root nodes from embedded views with <ng-content> ([#36051](https://github.com/angular/angular/issues/36051)) ([e30e132](https://github.com/angular/angular/commit/e30e132)), closes [#35967](https://github.com/angular/angular/issues/35967)
-* **forms:** handle numeric values properly in the validator ([#36157](https://github.com/angular/angular/issues/36157)) ([88a235d](https://github.com/angular/angular/commit/88a235d)), closes [#35591](https://github.com/angular/angular/issues/35591)
-* **forms:** number input fires valueChanges twice ([#36087](https://github.com/angular/angular/issues/36087)) ([97d6d90](https://github.com/angular/angular/commit/97d6d90)), closes [#12540](https://github.com/angular/angular/issues/12540)
-* **localize:** ensure `getLocation()` works ([#36853](https://github.com/angular/angular/issues/36853)) ([70b25a3](https://github.com/angular/angular/commit/70b25a3))
-* **ngcc:** support ModuleWithProviders functions that delegate ([#36948](https://github.com/angular/angular/issues/36948)) ([fafa50d](https://github.com/angular/angular/commit/fafa50d)), closes [#36892](https://github.com/angular/angular/issues/36892)
-
-
-### Features
-
-
-* **bazel:** simplify ng_package by dropping esm5 and fesm5 ([#36944](https://github.com/angular/angular/issues/36944)) ([9dbb30f](https://github.com/angular/angular/commit/9dbb30f))
-* **compiler-cli:** report error if undecorated class with Angular features is discovered ([#36921](https://github.com/angular/angular/issues/36921)) ([4c92cf4](https://github.com/angular/angular/commit/4c92cf4))
-* **core:** undecorated-classes-with-decorated-fields migration should handle classes with lifecycle hooks ([#36921](https://github.com/angular/angular/issues/36921)) ([c6ecdc9](https://github.com/angular/angular/commit/c6ecdc9))
-* **ngcc:** support for new APF where `module` points to esm2015 output ([#36944](https://github.com/angular/angular/issues/36944)) ([c98a4d6](https://github.com/angular/angular/commit/c98a4d6))
-* **language-service:** [ivy] Parse Angular compiler options ([#36922](https://github.com/angular/angular/issues/36922)) ([dbd0f8e](https://github.com/angular/angular/commit/dbd0f8e))
-* remove TypeScript 3.6 and 3.7 support ([#36329](https://github.com/angular/angular/issues/36329)) ([fbd281c](https://github.com/angular/angular/commit/fbd281c))
-
-
-### Performance Improvements
-
-* **compiler-cli:** perform template type-checking incrementally ([#36211](https://github.com/angular/angular/issues/36211)) ([ecffc35](https://github.com/angular/angular/commit/ecffc35))
-* **compiler-cli:** split Ivy template type-checking into multiple files ([#36211](https://github.com/angular/angular/issues/36211)) ([b861e9c](https://github.com/angular/angular/commit/b861e9c))
-
-
-### BREAKING CHANGES
-
-* TypeScript versions 3.6 and 3.7 are no longer supported, please update to TypeScript 3.8
-
-* **forms:** Number inputs no longer listen to the `change` event.
-
-Tests which trigger `change` events need to be updated to trigger `input` events instead.
-
-The `change` event was in place to support IE9, as we found that `input` events were not fired with backspace or cut actions. If you need to maintain IE9 support, you will need to add a change event listener to number inputs and call the `onChange` method of `NumberValueAccessor` manually.
-
-Lastly, old versions of WebDriver would synthetically trigger the `change` event on `WebElement.clear` and `WebElement.sendKeys`. If you are using an old version of WebDriver, you may need to update tests to ensure `input` events are triggered. For example, you could use `element.sendKeys(Keys.chord(Keys.CONTROL, "a"), Keys.BACK_SPACE);` in place of `element.clear()`.
-* **forms:** The `minLength` and `maxLength` validators now verify that the form control's value has a
-numeric `length` property, and only validate for length if that's the case.
-
-Previously, falsey values without the length property (such as `0` or
-`false` values) were triggering validation errors. If your code relies on
-the old behavior, you can include other validators such as [min][1] or
-[requiredTrue][2] to the list of validators for a particular field.
-
-[1]: https://angular.io/api/forms/Validators#min
-[2]: https://angular.io/api/forms/Validators#requiredTrue
-* **bazel:** esm5 and fesm5 format is no longer distributed in
-Angular's npm packages e.g. @angular/core
-
-If you are not using Angular CLI to build your application or library,
-and you need to be able to build es5 artifacts, then you will need to
-downlevel the distributed Angular code to es5 on your own.
-
-Angular CLI will automatically downlevel the code to es5 if differential
-loading is enabled in the Angular project, so no action is required from
-Angular CLI users.
-
-
-<a name="9.1.5"></a>
-## [9.1.5](https://github.com/angular/angular/compare/9.1.4...9.1.5) (2020-05-07)
-
-
-### Bug Fixes
-
-* **compiler-cli:** `isCaseSensitive()` returns correct value ([#36968](https://github.com/angular/angular/issues/36968)) ([4becc1b](https://github.com/angular/angular/commit/4becc1b))
-* **compiler-cli:** ensure `getRootDirs()` handles case-sensitivity ([#36968](https://github.com/angular/angular/issues/36968)) ([5bddeea](https://github.com/angular/angular/commit/5bddeea))
-* **compiler-cli:** ensure `MockFileSystem` handles case-sensitivity ([#36968](https://github.com/angular/angular/issues/36968)) ([b6c042d](https://github.com/angular/angular/commit/b6c042d))
-* **compiler-cli:** ensure LogicalFileSystem handles case-sensitivity ([#36968](https://github.com/angular/angular/issues/36968)) ([65337fb](https://github.com/angular/angular/commit/65337fb))
-* **compiler-cli:** fix case-sensitivity issues in NgtscCompilerHost ([#36968](https://github.com/angular/angular/issues/36968)) ([4abd603](https://github.com/angular/angular/commit/4abd603))
-* **compiler-cli:** normalize mock Windows file paths correctly ([#36968](https://github.com/angular/angular/issues/36968)) ([654868f](https://github.com/angular/angular/commit/654868f))
-* **compiler-cli:** use CompilerHost to ensure canonical file paths ([#36968](https://github.com/angular/angular/issues/36968)) ([7e9d5f5](https://github.com/angular/angular/commit/7e9d5f5))
-* **core:** handle pluralize functions that expect a number ([#36901](https://github.com/angular/angular/issues/36901)) ([e5317d5](https://github.com/angular/angular/commit/e5317d5)), closes [#36888](https://github.com/angular/angular/issues/36888)
-* **core:** properly get root nodes from embedded views with <ng-content> ([#36051](https://github.com/angular/angular/issues/36051)) ([a576852](https://github.com/angular/angular/commit/a576852)), closes [#35967](https://github.com/angular/angular/issues/35967)
-* **core:** Refresh transplanted views at insertion point only ([#35968](https://github.com/angular/angular/issues/35968)) ([c8c2272](https://github.com/angular/angular/commit/c8c2272)), closes [#35400](https://github.com/angular/angular/issues/35400) [#21324](https://github.com/angular/angular/issues/21324)
-* **localize:** ensure `getLocation()` works ([#36920](https://github.com/angular/angular/issues/36920)) ([701016d](https://github.com/angular/angular/commit/701016d))
-* **ngcc:** do not run in parallel mode if there are less than 3 CPU cores ([#36626](https://github.com/angular/angular/issues/36626)) ([3800455](https://github.com/angular/angular/commit/3800455))
-* **ngcc:** give up re-spawing crashed worker process after 3 attempts ([#36626](https://github.com/angular/angular/issues/36626)) ([1863733](https://github.com/angular/angular/commit/1863733))
-* **ngcc:** handle `ENOMEM` errors in worker processes ([#36626](https://github.com/angular/angular/issues/36626)) ([901b980](https://github.com/angular/angular/commit/901b980))
-* **ngcc:** support ModuleWithProviders functions that delegate ([#36948](https://github.com/angular/angular/issues/36948)) ([9d13ee0](https://github.com/angular/angular/commit/9d13ee0)), closes [#36892](https://github.com/angular/angular/issues/36892)
-* **ngcc:** support recovering when a worker process crashes ([#36626](https://github.com/angular/angular/issues/36626)) ([f30307a](https://github.com/angular/angular/commit/f30307a)), closes [#36278](https://github.com/angular/angular/issues/36278)
-* **ngcc:** partially support TS 3.9 wrapped ES2015 classes ([#36884](https://github.com/angular/angular/issues/36884)) ([ebb4733](https://github.com/angular/angular/commit/ebb4733))
-
-
-### Performance Improvements
-
-* **ngcc:** only compute basePaths in TargetedEntryPointFinder when needed ([#36881](https://github.com/angular/angular/issues/36881)) ([5ea51b2](https://github.com/angular/angular/commit/5ea51b2)), closes [#36874](https://github.com/angular/angular/issues/36874)
-* **ngcc:** speed up the `getBasePaths()` computation ([#36881](https://github.com/angular/angular/issues/36881)) ([b6d0e21](https://github.com/angular/angular/commit/b6d0e21))
-
-
-
-<a name="10.0.0-next.5"></a>
-# [10.0.0-next.5](https://github.com/angular/angular/compare/10.0.0-next.4...10.0.0-next.5) (2020-05-04)
-
-
-### Bug Fixes
-
-* **core:** log error instead of warning for unknown properties and elements ([#36399](https://github.com/angular/angular/issues/36399)) ([9d9d46f](https://github.com/angular/angular/commit/9d9d46f)), closes [#35699](https://github.com/angular/angular/issues/35699)
-* **core:** Refresh transplanted views at insertion point only ([#35968](https://github.com/angular/angular/issues/35968)) ([1786586](https://github.com/angular/angular/commit/1786586)), closes [#35400](https://github.com/angular/angular/issues/35400) [#21324](https://github.com/angular/angular/issues/21324)
-* **ngcc:** do not run in parallel mode if there are less than 3 CPU cores ([#36626](https://github.com/angular/angular/issues/36626)) ([4c63241](https://github.com/angular/angular/commit/4c63241))
-* **ngcc:** give up re-spawning crashed worker process after 3 attempts ([#36626](https://github.com/angular/angular/issues/36626)) ([793cb32](https://github.com/angular/angular/commit/793cb32))
-* **ngcc:** handle `ENOMEM` errors in worker processes ([#36626](https://github.com/angular/angular/issues/36626)) ([4779c4b](https://github.com/angular/angular/commit/4779c4b))
-* **ngcc:** provide a unique exit code for timeouts ([#36838](https://github.com/angular/angular/issues/36838)) ([d805526](https://github.com/angular/angular/commit/d805526))
-* **ngcc:** support recovering when a worker process crashes ([#36626](https://github.com/angular/angular/issues/36626)) ([966598c](https://github.com/angular/angular/commit/966598c)), closes [#36278](https://github.com/angular/angular/issues/36278)
-* **ngcc:** support TS 3.9 wrapped ES2015 classes ([#36884](https://github.com/angular/angular/issues/36884)) ([db4c59d](https://github.com/angular/angular/commit/db4c59d))
-* **router:** cancel navigation when at least one resolver completes with no "next" emission ([#24621](https://github.com/angular/angular/issues/24621)) ([d9c4840](https://github.com/angular/angular/commit/d9c4840)), closes [#24195](https://github.com/angular/angular/issues/24195)
-
-
-### Code Refactoring
-
-* **common:** remove WrappedValue from AsyncPipe ([#36633](https://github.com/angular/angular/issues/36633)) ([49be32c](https://github.com/angular/angular/commit/49be32c)), closes [#29927](https://github.com/angular/angular/issues/29927)
-
-
-### Features
-
-* **localize:** support merging multiple translation files ([#36792](https://github.com/angular/angular/issues/36792)) ([72f534f](https://github.com/angular/angular/commit/72f534f))
-* **ngcc:** allow async locking timeouts to be configured ([#36838](https://github.com/angular/angular/issues/36838)) ([38f805c](https://github.com/angular/angular/commit/38f805c))
-* **ngcc:** support marking an in-progress task as unprocessed ([#36626](https://github.com/angular/angular/issues/36626)) ([4665c35](https://github.com/angular/angular/commit/4665c35))
-* **ngcc:** support reverting a file written by `FileWriter` ([#36626](https://github.com/angular/angular/issues/36626)) ([772ccf0](https://github.com/angular/angular/commit/772ccf0))
-* **service-worker:** include `CacheQueryOptions` options in ngsw-config ([#34663](https://github.com/angular/angular/issues/34663)) ([dc9f4b9](https://github.com/angular/angular/commit/dc9f4b9)), closes [#28443](https://github.com/angular/angular/issues/28443)
-* **service-worker:** use `ignoreVary: true` when retrieving responses from cache ([#34663](https://github.com/angular/angular/issues/34663)) ([ee35e22](https://github.com/angular/angular/commit/ee35e22)), closes [#36638](https://github.com/angular/angular/issues/36638)
-
-
-### Performance Improvements
-
-* **ngcc:** only compute basePaths in TargetedEntryPointFinder when needed ([#36881](https://github.com/angular/angular/issues/36881)) ([ec6b9cc](https://github.com/angular/angular/commit/ec6b9cc)), closes [#36874](https://github.com/angular/angular/issues/36874)
-* **ngcc:** speed up the `getBasePaths()` computation ([#36881](https://github.com/angular/angular/issues/36881)) ([e037840](https://github.com/angular/angular/commit/e037840))
-
-
-### BREAKING CHANGES
-
-* **core:** Warnings about unknown elements are now logged as errors. This won't break your app, but it may trip up tools that expect nothing to be logged via `console.error`.
-* **router:** Any resolver which return EMPTY will cancel navigation.
-If you want to allow the navigation to continue, you will need to update the resolvers to emit
-some value, (i.e. defaultIfEmpty(...), of(...), etc).
-* **service-worker:** Previously, [Vary](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Vary)
-headers would be taken into account when retrieving resources from the
-cache, completely preventing the retrieval of cached assets (due to
-ServiceWorker implementation details) and leading to unpredictable
-behavior due to inconsistent/buggy implementations in different
-browsers.
-
-Now, `Vary` headers are ignored when retrieving resources from the
-ServiceWorker caches, which can result in resources being retrieved even
-when their headers are different. If your application needs to
-differentiate its responses based on request headers, please make sure
-the Angular ServiceWorker is [configured](https://angular.io/guide/service-worker-config)
-to avoid caching the affected resources.
-* **common:** This change could result in ExpressionChangedAfterItHasBeenChecked errors that
-were not detected before. The error could previously have gone undetected
-because two WrappedValues are considered "equal" in all cases for the purposes
-of the check, even if their respective unwrapped values are not.
-
-Additionally, `[val]=(observable | async).someProperty` will no longer
-trigger change detection if the value of `someProperty` is identical to
-the value in the previous emit. If you need to force change detection,
-either update the binding to use an object whose reference changes or
-subscribe to the observable and call markForCheck as needed.
-
-
-
-<a name="10.0.0-next.4"></a>
-# [10.0.0-next.4](https://github.com/angular/angular/compare/10.0.0-next.3...10.0.0-next.4) (2020-04-29)
-
-
-### Bug Fixes
-
-* **compiler:** normalize line endings in ICU expansions ([#36741](https://github.com/angular/angular/issues/36741)) ([70dd27f](https://github.com/angular/angular/commit/70dd27f)), closes [#36725](https://github.com/angular/angular/issues/36725)
-* **core:** attempt to recover from user errors during creation ([#36381](https://github.com/angular/angular/issues/36381)) ([3d82aa7](https://github.com/angular/angular/commit/3d82aa7)), closes [#31221](https://github.com/angular/angular/issues/31221)
-* **core:** handle synthetic props in Directive host bindings correctly ([#35568](https://github.com/angular/angular/issues/35568)) ([f27deea](https://github.com/angular/angular/commit/f27deea)), closes [#35501](https://github.com/angular/angular/issues/35501)
-* **language-service:** disable update the `[@angular](https://github.com/angular)/core` module ([#36783](https://github.com/angular/angular/issues/36783)) ([dd049ca](https://github.com/angular/angular/commit/dd049ca))
-* **localize:** include legacy ids when describing messages ([#36761](https://github.com/angular/angular/issues/36761)) ([47f9867](https://github.com/angular/angular/commit/47f9867))
-* **ngcc:** recognize enum declarations emitted in JavaScript ([#36550](https://github.com/angular/angular/issues/36550)) ([89c5890](https://github.com/angular/angular/commit/89c5890)), closes [#35584](https://github.com/angular/angular/issues/35584)
-
-
-### Features
-
-* **router:** allow CanLoad guard to return UrlTree ([#36610](https://github.com/angular/angular/issues/36610)) ([00e6cb1](https://github.com/angular/angular/commit/00e6cb1)), closes [#26521](https://github.com/angular/angular/issues/26521) [#28306](https://github.com/angular/angular/issues/28306)
-
-
-
-<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="10.0.0-next.3"></a>
-# [10.0.0-next.3](https://github.com/angular/angular/compare/10.0.0-next.2...10.0.0-next.3) (2020-04-22)
-
-
-### Bug Fixes
-
-* **common:** format day-periods that cross midnight ([#36611](https://github.com/angular/angular/issues/36611)) ([c6e5fc4](https://github.com/angular/angular/commit/c6e5fc4)), closes [#36566](https://github.com/angular/angular/issues/36566)
-* **compiler:** avoid generating i18n attributes in plain form ([#36422](https://github.com/angular/angular/issues/36422)) ([88b0985](https://github.com/angular/angular/commit/88b0985))
-* **core:** do not use unbound attributes as inputs to structural directives ([#36441](https://github.com/angular/angular/issues/36441)) ([acf6075](https://github.com/angular/angular/commit/acf6075))
-* **core:** handle empty translations correctly ([#36499](https://github.com/angular/angular/issues/36499)) ([b1f1d3f](https://github.com/angular/angular/commit/b1f1d3f)), closes [#36476](https://github.com/angular/angular/issues/36476)
-* **core:** missing-injectable migration should not migrate `@NgModule` classes ([#36369](https://github.com/angular/angular/issues/36369)) ([28995db](https://github.com/angular/angular/commit/28995db)), closes [#35700](https://github.com/angular/angular/issues/35700)
-* **core:** pipes injecting viewProviders when used on a component host node ([#36512](https://github.com/angular/angular/issues/36512)) ([81d23b3](https://github.com/angular/angular/commit/81d23b3)), closes [#36146](https://github.com/angular/angular/issues/36146)
-* **core:** prevent unknown property check for AOT-compiled components ([#36072](https://github.com/angular/angular/issues/36072)) ([4a9f0be](https://github.com/angular/angular/commit/4a9f0be)), closes [#35945](https://github.com/angular/angular/issues/35945)
-* **core:** properly identify modules affected by overrides in TestBed ([#36649](https://github.com/angular/angular/issues/36649)) ([942b986](https://github.com/angular/angular/commit/942b986)), closes [#36619](https://github.com/angular/angular/issues/36619)
-* **language-service:** properly evaluate types in comparable expressions ([#36529](https://github.com/angular/angular/issues/36529)) ([8be0972](https://github.com/angular/angular/commit/8be0972))
-* **ngcc:** display unlocker process output in sync mode ([#36637](https://github.com/angular/angular/issues/36637)) ([cabf997](https://github.com/angular/angular/commit/cabf997)), closes [/github.com/nodejs/node/issues/3596#issuecomment-250890218](https://github.com//github.com/nodejs/node/issues/3596/issues/issuecomment-250890218)
-* **ngcc:** do not use cached file-system ([#36687](https://github.com/angular/angular/issues/36687)) ([0c2ed4c](https://github.com/angular/angular/commit/0c2ed4c)), closes [/github.com/angular/angular-cli/issues/16860#issuecomment-614694269](https://github.com//github.com/angular/angular-cli/issues/16860/issues/issuecomment-614694269)
-
-
-### BREAKING CHANGES
-
-* **common:** format day-periods that cross midnight
-
-    When formatting a time with the `b` or `B` format codes, the rendered
-    string was not correctly handling day periods that spanned midnight.
-    Instead the logic was falling back to the default case of `AM`.
-
-    Now the logic has been updated so that it matches times that are within
-    a day period that spans midnight, so it will now render the correct
-    output, such as `at night` in the case of English.
-
-    Applications that are using either `formatDate()` or `DatePipe` and any
-    of the `b` or `B` format codes will be affected by this change.
-
-
-
-<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="10.0.0-next.2"></a>
-# [10.0.0-next.2](https://github.com/angular/angular/compare/10.0.0-next.1...10.0.0-next.2) (2020-04-15)
-
-
-### Bug Fixes
-
-* **common:** `locales/global/*.js` are not ES5 compliant ([#36342](https://github.com/angular/angular/issues/36342)) ([078b0be](https://github.com/angular/angular/commit/078b0be)), closes [angular/angular-cli#16394](https://github.com/angular/angular-cli/issues/16394)
-* **compiler:** handle type references to namespaced symbols correctly ([#36106](https://github.com/angular/angular/issues/36106)) ([4aa4e6f](https://github.com/angular/angular/commit/4aa4e6f)), closes [#36006](https://github.com/angular/angular/issues/36006)
-* **core:** undecorated-classes-with-decorated-fields migration should avoid error if base class has no value declaration ([#36543](https://github.com/angular/angular/issues/36543)) ([ca67748](https://github.com/angular/angular/commit/ca67748)), closes [#36522](https://github.com/angular/angular/issues/36522)
-* **ngcc:** correctly detect external files from nested `node_modules/` ([#36559](https://github.com/angular/angular/issues/36559)) ([6ab43d7](https://github.com/angular/angular/commit/6ab43d7)), closes [#36526](https://github.com/angular/angular/issues/36526)
-* **ngcc:** display output from the unlocker process on Windows ([#36569](https://github.com/angular/angular/issues/36569)) ([e041ac6](https://github.com/angular/angular/commit/e041ac6))
-* **ngcc:** do not spawn unlocker processes on cluster workers ([#36569](https://github.com/angular/angular/issues/36569)) ([66effde](https://github.com/angular/angular/commit/66effde)), closes [#35861](https://github.com/angular/angular/issues/35861)
-* **ngcc:** do not warn if `paths` mapping does not exist ([#36525](https://github.com/angular/angular/issues/36525)) ([717df13](https://github.com/angular/angular/commit/717df13)), closes [#36518](https://github.com/angular/angular/issues/36518)
-* **ngcc:** force ngcc to exit on error ([#36622](https://github.com/angular/angular/issues/36622)) ([663b768](https://github.com/angular/angular/commit/663b768)), closes [#36616](https://github.com/angular/angular/issues/36616)
-* **router:** pass correct component to canDeactivate checks when using two or more sibling router-outlets ([#36302](https://github.com/angular/angular/issues/36302)) ([80e6c07](https://github.com/angular/angular/commit/80e6c07)), closes [#34614](https://github.com/angular/angular/issues/34614)
-* **upgrade:** update $locationShim to handle Location changes before initialization ([#36498](https://github.com/angular/angular/issues/36498)) ([0cc53fb](https://github.com/angular/angular/commit/0cc53fb)), closes [#36492](https://github.com/angular/angular/issues/36492)
-
-
-### Performance Improvements
-
-* **ngcc:** only load  if it is needed ([#36486](https://github.com/angular/angular/issues/36486)) ([3bedfda](https://github.com/angular/angular/commit/3bedfda))
-* **ngcc:** read dependencies from entry-point manifest ([#36486](https://github.com/angular/angular/issues/36486)) ([a185efb](https://github.com/angular/angular/commit/a185efb)), closes [#issuecomment-608401834](https://github.com/angular/angular/issues/issuecomment-608401834)
-* **ngcc:** reduce the size of the entry-point manifest file ([#36486](https://github.com/angular/angular/issues/36486)) ([ec0ce60](https://github.com/angular/angular/commit/ec0ce60))
-
-
-
-<a name="9.1.2"></a>
-## [9.1.2](https://github.com/angular/angular/compare/9.1.1...9.1.2) (2020-04-15)
-
-
-### Bug Fixes
-
-* **compiler:** handle type references to namespaced symbols correctly ([#36106](https://github.com/angular/angular/issues/36106)) ([468cf69](https://github.com/angular/angular/commit/468cf69)), closes [#36006](https://github.com/angular/angular/issues/36006)
-* **core:** undecorated-classes-with-decorated-fields migration should avoid error if base class has no value declaration ([#36543](https://github.com/angular/angular/issues/36543)) ([3992341](https://github.com/angular/angular/commit/3992341)), closes [#36522](https://github.com/angular/angular/issues/36522)
-* **ngcc:** correctly detect external files from nested `node_modules/` ([#36559](https://github.com/angular/angular/issues/36559)) ([8c559ef](https://github.com/angular/angular/commit/8c559ef)), closes [#36526](https://github.com/angular/angular/issues/36526)
-* **ngcc:** display output from the unlocker process on Windows ([#36569](https://github.com/angular/angular/issues/36569)) ([12266b2](https://github.com/angular/angular/commit/12266b2))
-* **ngcc:** do not spawn unlocker processes on cluster workers ([#36569](https://github.com/angular/angular/issues/36569)) ([e385abc](https://github.com/angular/angular/commit/e385abc)), closes [#35861](https://github.com/angular/angular/issues/35861)
-* **ngcc:** do not warn if `paths` mapping does not exist ([#36525](https://github.com/angular/angular/issues/36525)) ([33eee43](https://github.com/angular/angular/commit/33eee43)), closes [#36518](https://github.com/angular/angular/issues/36518)
-* **ngcc:** force ngcc to exit on error ([#36622](https://github.com/angular/angular/issues/36622)) ([933cbfb](https://github.com/angular/angular/commit/933cbfb)), closes [#36616](https://github.com/angular/angular/issues/36616)
-* **router:** pass correct component to canDeactivate checks when using two or more sibling router-outlets ([#36302](https://github.com/angular/angular/issues/36302)) ([8e7f903](https://github.com/angular/angular/commit/8e7f903)), closes [#34614](https://github.com/angular/angular/issues/34614)
-* **upgrade:** update $locationShim to handle Location changes before initialization ([#36498](https://github.com/angular/angular/issues/36498)) ([a67afcc](https://github.com/angular/angular/commit/a67afcc)), closes [#36492](https://github.com/angular/angular/issues/36492)
-
-### Performance Improvements
-* **ngcc:** only load  if it is needed ([#36486](https://github.com/angular/angular/issues/36486)) ([e06512b](https://github.com/angular/angular/commit/e06512b))                                                                             * **ngcc:** read dependencies from entry-point manifest ([#36486](https://github.com/angular/angular/issues/36486)) ([918e628](https://github.com/angular/angular/commit/918e628)), closes [#issuecomment-608401834](https://github.com/angular/angular/issues/issuecomment-608401834)
-* **ngcc:** reduce the size of the entry-point manifest file ([#36486](https://github.com/angular/angular/issues/36486)) ([603b094](https://github.com/angular/angular/commit/603b094))
-
-
-<a name="10.0.0-next.1"></a>
-# [10.0.0-next.1](https://github.com/angular/angular/compare/10.0.0-next.0...10.0.0-next.1) (2020-04-08)
-
-This release contains various API docs improvements.
-
-<a name="10.0.0-next.0"></a>
-# [10.0.0-next.0](https://github.com/angular/angular/compare/9.1.0-rc.0...10.0.0-next.0) (2020-04-08)
-
-
-### Bug Fixes
-
-* **common:** let `KeyValuePipe` accept type unions with `null` ([#36093](https://github.com/angular/angular/issues/36093)) ([d783519](https://github.com/angular/angular/commit/d783519)), closes [#35743](https://github.com/angular/angular/issues/35743)
-* **compiler:** avoid undefined expressions in holey array ([#36343](https://github.com/angular/angular/issues/36343)) ([5516802](https://github.com/angular/angular/commit/5516802))
-* **compiler:** record correct end of expression ([#34690](https://github.com/angular/angular/issues/34690)) ([df890d7](https://github.com/angular/angular/commit/df890d7)), closes [#33477](https://github.com/angular/angular/issues/33477)
-* **compiler:** resolve enum values in binary operations ([#36461](https://github.com/angular/angular/issues/36461)) ([64022f5](https://github.com/angular/angular/commit/64022f5)), closes [#35584](https://github.com/angular/angular/issues/35584)
-* **compiler-cli:** pass real source spans where they are empty ([#31805](https://github.com/angular/angular/issues/31805)) ([e893c5a](https://github.com/angular/angular/commit/e893c5a))
-* **core:** avoid migration error when non-existent symbol is imported ([#36367](https://github.com/angular/angular/issues/36367)) ([d43c306](https://github.com/angular/angular/commit/d43c306)), closes [#36346](https://github.com/angular/angular/issues/36346)
-* **core:** ngOnDestroy on multi providers called with incorrect context ([#35840](https://github.com/angular/angular/issues/35840)) ([95fc3d4](https://github.com/angular/angular/commit/95fc3d4)), closes [#35231](https://github.com/angular/angular/issues/35231)
-* **core:** run `APP_INITIALIZER`s before accessing `LOCALE_ID` token in Ivy TestBed ([#36237](https://github.com/angular/angular/issues/36237)) ([1649743](https://github.com/angular/angular/commit/1649743)), closes [#36230](https://github.com/angular/angular/issues/36230)
-* **core:** undecorated-classes-with-decorated-fields migration does not decorate derived classes ([#35339](https://github.com/angular/angular/issues/35339)) ([32eafef](https://github.com/angular/angular/commit/32eafef)), closes [#34376](https://github.com/angular/angular/issues/34376)
-* **core:** workaround Terser inlining bug ([#36200](https://github.com/angular/angular/issues/36200)) ([0ce8ad3](https://github.com/angular/angular/commit/0ce8ad3))
-* **elements:** correctly handle setting inputs to `undefined` ([#36140](https://github.com/angular/angular/issues/36140)) ([9ba46d9](https://github.com/angular/angular/commit/9ba46d9))
-* **elements:** correctly set `SimpleChange#firstChange` for pre-existing inputs ([#36140](https://github.com/angular/angular/issues/36140)) ([b14ac96](https://github.com/angular/angular/commit/b14ac96)), closes [#36130](https://github.com/angular/angular/issues/36130)
-* **language-service:** infer type of elements of array-like objects ([#36312](https://github.com/angular/angular/issues/36312)) ([fe2b692](https://github.com/angular/angular/commit/fe2b692)), closes [#36191](https://github.com/angular/angular/issues/36191)
-* **language-service:** use the `HtmlAst` to get the span of HTML tag ([#36371](https://github.com/angular/angular/issues/36371)) ([81195a2](https://github.com/angular/angular/commit/81195a2))
-* **localize:** allow ICU expansion case to start with any character except `}` ([#36123](https://github.com/angular/angular/issues/36123)) ([fced8ee](https://github.com/angular/angular/commit/fced8ee)), closes [#31586](https://github.com/angular/angular/issues/31586)
-* **ngcc:** add process title ([#36448](https://github.com/angular/angular/issues/36448)) ([76a8cd5](https://github.com/angular/angular/commit/76a8cd5)), closes [/github.com/angular/angular/issues/36414#issuecomment-609644282](https://github.com//github.com/angular/angular/issues/36414/issues/issuecomment-609644282)
-* **ngcc:** allow ngcc configuration to match pre-release versions of packages ([#36370](https://github.com/angular/angular/issues/36370)) ([326240e](https://github.com/angular/angular/commit/326240e))
-* **ngcc:** correctly detect imported TypeScript helpers ([#36284](https://github.com/angular/angular/issues/36284)) ([ca25c95](https://github.com/angular/angular/commit/ca25c95)), closes [#36089](https://github.com/angular/angular/issues/36089)
-* **ngcc:** correctly identify relative Windows-style import paths ([#36372](https://github.com/angular/angular/issues/36372)) ([aecf9de](https://github.com/angular/angular/commit/aecf9de))
-* **ngcc:** correctly identify the package path of secondary entry-points ([#36249](https://github.com/angular/angular/issues/36249)) ([995cd15](https://github.com/angular/angular/commit/995cd15)), closes [#35747](https://github.com/angular/angular/issues/35747)
-* **ngcc:** detect non-emitted, non-imported TypeScript helpers ([#36418](https://github.com/angular/angular/issues/36418)) ([5fa7b8b](https://github.com/angular/angular/commit/5fa7b8b))
-* **ngcc:** do not spawn more processes than intended in parallel mode ([#36280](https://github.com/angular/angular/issues/36280)) ([5cee709](https://github.com/angular/angular/commit/5cee709)), closes [#35719](https://github.com/angular/angular/issues/35719) [#36278](https://github.com/angular/angular/issues/36278) [/github.com/angular/angular/blob/b8e9a30d3b6/packages/compiler-cli/ngcc/src/main.ts#L429](https://github.com//github.com/angular/angular/blob/b8e9a30d3b6/packages/compiler-cli/ngcc/src/main.ts/issues/L429) [/github.com/angular/angular/blob/b8e9a30d3b6/packages/compiler-cli/ngcc/src/execution/cluster/master.ts#L108](https://github.com//github.com/angular/angular/blob/b8e9a30d3b6/packages/compiler-cli/ngcc/src/execution/cluster/master.ts/issues/L108) [/github.com/angular/angular/blob/b8e9a30d3b6/packages/compiler-cli/ngcc/src/execution/cluster/master.ts#L110](https://github.com//github.com/angular/angular/blob/b8e9a30d3b6/packages/compiler-cli/ngcc/src/execution/cluster/master.ts/issues/L110) [/github.com/angular/angular/blob/b8e9a30d3b6/packages/compiler-cli/ngcc/src/execution/cluster/master.ts#L199](https://github.com//github.com/angular/angular/blob/b8e9a30d3b6/packages/compiler-cli/ngcc/src/execution/cluster/master.ts/issues/L199)
-* **ngcc:** do not write entry-point manifest outside node_modules ([#36299](https://github.com/angular/angular/issues/36299)) ([c6dd900](https://github.com/angular/angular/commit/c6dd900)), closes [#36296](https://github.com/angular/angular/issues/36296)
-* **ngcc:** don't crash on cyclic source-map references ([#36452](https://github.com/angular/angular/issues/36452)) ([ee70a18](https://github.com/angular/angular/commit/ee70a18)), closes [#35727](https://github.com/angular/angular/issues/35727) [#35757](https://github.com/angular/angular/issues/35757)
-* **ngcc:** handle bad path mappings when finding entry-points ([#36331](https://github.com/angular/angular/issues/36331)) ([cc4b813](https://github.com/angular/angular/commit/cc4b813)), closes [#36313](https://github.com/angular/angular/issues/36313) [#36283](https://github.com/angular/angular/issues/36283)
-* **ngcc:** handle entry-points within container folders ([#36305](https://github.com/angular/angular/issues/36305)) ([38ad1d9](https://github.com/angular/angular/commit/38ad1d9)), closes [#35756](https://github.com/angular/angular/issues/35756) [#36216](https://github.com/angular/angular/issues/36216)
-* **ngcc:** sniff `main` property for ESM5 format ([#36396](https://github.com/angular/angular/issues/36396)) ([2463548](https://github.com/angular/angular/commit/2463548)), closes [#35788](https://github.com/angular/angular/issues/35788)
-* **ngcc:** support ignoring deep-imports via package config ([#36423](https://github.com/angular/angular/issues/36423)) ([f9fb833](https://github.com/angular/angular/commit/f9fb833)), closes [#35750](https://github.com/angular/angular/issues/35750)
-* **ngcc:** support simple `browser` property in entry-points ([#36396](https://github.com/angular/angular/issues/36396)) ([6b3aa60](https://github.com/angular/angular/commit/6b3aa60)), closes [#36062](https://github.com/angular/angular/issues/36062)
-* **ngcc:** use path-mappings from tsconfig in dependency resolution ([#36180](https://github.com/angular/angular/issues/36180)) ([380de1e](https://github.com/angular/angular/commit/380de1e)), closes [#36119](https://github.com/angular/angular/issues/36119)
-* **ngcc:** use preserve whitespaces from tsconfig if provided ([#36189](https://github.com/angular/angular/issues/36189)) ([b8e9a30](https://github.com/angular/angular/commit/b8e9a30)), closes [#35871](https://github.com/angular/angular/issues/35871)
-* **platform-server:** update `xhr2` dependency ([#36366](https://github.com/angular/angular/issues/36366)) ([b59bc0e](https://github.com/angular/angular/commit/b59bc0e)), closes [#36358](https://github.com/angular/angular/issues/36358)
-* **router:** allow UrlMatcher to return null ([#36402](https://github.com/angular/angular/issues/36402)) ([568e9df](https://github.com/angular/angular/commit/568e9df)), closes [#29824](https://github.com/angular/angular/issues/29824)
-* **router:** state data missing in routerLink ([#36462](https://github.com/angular/angular/issues/36462)) ([e0415db](https://github.com/angular/angular/commit/e0415db)), closes [#33173](https://github.com/angular/angular/issues/33173)
-* **service-worker:** by default register the SW after 30s even the app never stabilizes ([#35870](https://github.com/angular/angular/issues/35870)) ([29e8a64](https://github.com/angular/angular/commit/29e8a64)), closes [#34464](https://github.com/angular/angular/issues/34464)
-* **service-worker:** prevent SW registration strategies from affecting app stabilization ([#35870](https://github.com/angular/angular/issues/35870)) ([2d7c95f](https://github.com/angular/angular/commit/2d7c95f))
-
-
-### Features
-
-* **compiler:** add dependency info and ng-content selectors to metadata ([#35695](https://github.com/angular/angular/issues/35695)) ([32ce8b1](https://github.com/angular/angular/commit/32ce8b1))
-* **compiler:** Propagate value span of ExpressionBinding to ParsedProperty ([#36133](https://github.com/angular/angular/issues/36133)) ([d714b95](https://github.com/angular/angular/commit/d714b95))
-* **core:** undecorated-classes migration should handle derived abstract classes ([#35339](https://github.com/angular/angular/issues/35339)) ([c24ad56](https://github.com/angular/angular/commit/c24ad56))
-* **service-worker:** support timeout in `registerWhenStable` SW registration strategy ([#35870](https://github.com/angular/angular/issues/35870)) ([00efacf](https://github.com/angular/angular/commit/00efacf)), closes [#34464](https://github.com/angular/angular/issues/34464)
-
-
-### BREAKING CHANGES
-
-* **router:** UrlMatcher's type now reflects that it could always return
-    null.
-
-    If you implemented your own Router or Recognizer class, please update it to
-    handle matcher returning null.
-
-
-
 <a name="9.1.1"></a>
 ## [9.1.1](https://github.com/angular/angular/compare/9.1.0...9.1.1) (2020-04-07)
 
@@ -580,6 +32,7 @@ This release contains various API docs improvements.
 * **router:** state data missing in routerLink ([#36462](https://github.com/angular/angular/issues/36462)) ([0e7a89a](https://github.com/angular/angular/commit/0e7a89a)), closes [#33173](https://github.com/angular/angular/issues/33173)
 
 
+
 <a name="9.1.0"></a>
 # [9.1.0](https://github.com/angular/angular/compare/9.0.0...9.1.0) (2020-03-25)
 

WORKSPACE

@@ -8,8 +8,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 # Fetch rules_nodejs so we can install our npm dependencies
 http_archive(
     name = "build_bazel_rules_nodejs",
-    sha256 = "f9e7b9f42ae202cc2d2ce6d698ccb49a9f7f7ea572a78fd451696d03ef2ee116",
-    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/1.6.0/rules_nodejs-1.6.0.tar.gz"],
+    sha256 = "d0c4bb8b902c1658f42eb5563809c70a06e46015d64057d25560b0eb4bdc9007",
+    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/1.5.0/rules_nodejs-1.5.0.tar.gz"],
 )
 
 # Check the rules_nodejs version and download npm dependencies
@@ -17,7 +17,7 @@ http_archive(
 # assert on that.
 load("@build_bazel_rules_nodejs//:index.bzl", "check_rules_nodejs_version", "node_repositories", "yarn_install")
 
-check_rules_nodejs_version(minimum_version_string = "1.6.0")
+check_rules_nodejs_version(minimum_version_string = "1.5.0")
 
 # Setup the Node.js toolchain
 node_repositories(

aio/aio-builds-setup/dockerbuild/Dockerfile

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

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

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

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

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

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

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

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

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

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

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

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

@@ -14,41 +14,42 @@
     "predev": "yarn build || true",
     "dev": "run-p ~~build-watch ~~test-watch",
     "lint": "tslint --project tsconfig.json",
-    "pretest": "run-s build lint",
+    "pretest": "yarn build",
     "test": "yarn ~~test-only",
     "pretest-watch": "yarn pretest",
     "test-watch": "yarn ~~test-watch",
     "~~build": "tsc",
     "~~build-watch": "yarn ~~build --watch",
+    "pre~~test-only": "yarn lint",
     "~~test-only": "node dist/test",
     "~~test-watch": "nodemon --delay 1 --exec \"yarn ~~test-only\" --watch dist"
   },
   "dependencies": {
-    "body-parser": "^1.19.0",
-    "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"
+    "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"
   },
   "devDependencies": {
-    "@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",
+    "@types/body-parser": "^1.17.0",
+    "@types/express": "^4.16.0",
+    "@types/jasmine": "^2.8.8",
+    "@types/nock": "^9.3.0",
+    "@types/node": "^10.9.2",
+    "@types/node-fetch": "^2.1.2",
+    "@types/shelljs": "^0.8.0",
+    "@types/supertest": "^2.0.5",
+    "nodemon": "^1.18.3",
     "npm-run-all": "^4.1.5",
-    "supertest": "^4.0.2",
-    "tslint": "^6.1.1",
+    "supertest": "^3.1.0",
+    "tslint": "^5.11.0",
     "tslint-jasmine-noSkipOrFocus": "^1.0.9",
-    "typescript": "^3.8.3"
+    "typescript": "^3.0.1"
   }
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -3,17 +3,24 @@
 
 ## Install docker
 
-Official installation instructions: https://docs.docker.com/engine/install
-Example:
+_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`
 
-_Debian (buster):_
+_Ubuntu (16.04):_
 - `sudo apt-get update`
-- `sudo apt-get install -y apt-transport-https ca-certificates curl gnupg-agent software-properties-common`
-- `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 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 update`
-- `sudo apt-get -y install docker-ce docker-ce-cli containerd.io`
+- `sudo apt-get -y install docker-engine`
 
 
 ## Start the docker

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

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

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

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

aio/content/cli/index.md

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

aio/content/examples/.gitignore

@@ -82,6 +82,9 @@ upgrade-phonecat-2-hybrid/aot/**/*
 # styleguide
 !styleguide/src/systemjs.custom.js
 
+# universal
+!universal/webpack.server.config.js
+
 # stackblitz
 *stackblitz.no-link.html
 
@@ -94,4 +97,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/lifecycle-hooks/src/app/peek-a-boo.component.ts

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

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

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

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

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

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

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

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

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

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

@@ -1,10 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'app-root',
-  templateUrl: './app.component.html',
-  styleUrls: ['./app.component.css']
-})
-export class AppComponent {
-  title = 'angular-router-sample';
-}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,13 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-  <meta charset="utf-8">
-  <title>Angular Router Sample</title>
-  <base href="/">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="icon" type="image/x-icon" href="favicon.ico">
-</head>
-<body>
-  <app-root></app-root>
-</body>
-</html>

aio/content/examples/router-tutorial/src/main.ts

@@ -1,12 +0,0 @@
-import { enableProdMode } from '@angular/core';
-import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
-
-import { AppModule } from './app/app.module';
-import { environment } from './environments/environment';
-
-if (environment.production) {
-  enableProdMode();
-}
-
-platformBrowserDynamic().bootstrapModule(AppModule)
-  .catch(err => console.error(err));

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

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

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

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

@@ -1,26 +0,0 @@
-// #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

@@ -1,28 +0,0 @@
-// #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

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

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

@@ -1,26 +0,0 @@
-<!-- #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

@@ -1,17 +0,0 @@
-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/auth/auth.guard.2.ts

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

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

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

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

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

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

@@ -2,9 +2,7 @@
 // #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';
@@ -18,16 +16,11 @@ 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,6 +8,4 @@ if (environment.production) {
   enableProdMode();
 }
 
-platformBrowserDynamic().bootstrapModule(AppModule)
-  .catch(err => console.error(err));
-
+platformBrowserDynamic().bootstrapModule(AppModule);

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

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

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

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

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

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

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

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

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

@@ -19,6 +19,7 @@ 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,5 +8,4 @@ if (environment.production) {
   enableProdMode();
 }
 
-platformBrowserDynamic().bootstrapModule(AppModule)
-  .catch(err => console.error(err));
+platformBrowserDynamic().bootstrapModule(AppModule);

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,5 +59,6 @@ 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: pointer; cursor: hand;
 }
 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,5 +9,4 @@ if (environment.production) {
   enableProdMode();
 }
 
-platformBrowserDynamic().bootstrapModule(AppModule)
-  .catch(err => console.error(err));
+platformBrowserDynamic().bootstrapModule(AppModule);

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

@@ -1,300 +0,0 @@
-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,7 +1,3 @@
 {
-  "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"]}
-  ]
+  "projectType": "universal"
 }

aio/content/examples/universal/server.ts

@@ -6,28 +6,24 @@ 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/browser');
-  const indexHtml = existsSync(join(distFolder, 'index.original.html')) ? 'index.original.html' : 'index';
+  const distFolder = join(process.cwd(), 'dist/express-engine-ivy/browser');
 
   // #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 yet supported');
+  server.get('/api/*', (req, res) => {
+    res.status(404).send('data requests are not supported');
   });
   // #enddocregion data-request
 
@@ -41,7 +37,7 @@ export function app() {
   // #docregion navigation-request
   // All regular routes use the Universal engine
   server.get('*', (req, res) => {
-    res.render(indexHtml, { req, providers: [{ provide: APP_BASE_HREF, useValue: req.baseUrl }] });
+    res.render('index', { req, providers: [{ provide: APP_BASE_HREF, useValue: req.baseUrl }] });
   });
   // #enddocregion navigation-request
 
@@ -63,8 +59,7 @@ 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;
-const moduleFilename = mainModule && mainModule.filename || '';
-if (moduleFilename === __filename || moduleFilename.includes('iisnode')) {
+if (mainModule && mainModule.filename === __filename) {
   run();
 }
 

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

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

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

@@ -14,6 +14,8 @@ 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
@@ -30,10 +32,6 @@ 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 }
     )
@@ -46,6 +44,7 @@ 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,5 +1,6 @@
 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';
@@ -8,10 +9,11 @@ import { AppComponent } from './app.component';
   imports: [
     AppModule,
     ServerModule,
+    ModuleMapLoaderModule
   ],
   providers: [
-    // Add server-only providers here.
+    // Add universal-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: #3f525c;
+  background-color: #607D8B;
   border-radius: 2px;
 }
 .module:hover {

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

@@ -8,4 +8,4 @@
   </a>
 </div>
 
-<app-hero-search></app-hero-search>
+<hero-search></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,6 +19,7 @@ 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, Input } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { Location } from '@angular/common';
 
@@ -11,7 +11,7 @@ import { HeroService }  from '../hero.service';
   styleUrls: [ './hero-detail.component.css' ]
 })
 export class HeroDetailComponent implements OnInit {
-  @Input() hero: Hero;
+  hero: Hero;
 
   constructor(
     private route: ActivatedRoute,
@@ -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><label for="search-box">Hero Search</label></h4>
+  <h4>Hero Search</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>