ci: replace our pullapprove setup with GitHub CODEOWNERS

Summary of changes: - created .github/CODEOWNERS with docs and config similar to the one in .pullapprove.yml - updated docs - updated .github/angular-robot.yml to not expect pullapprove status - removed .pullapprove.yml The primary motivations behind this change are: - CODEOWNERS didn't exist when we introduced pullapprove - CODEOWNERS is a functionality tightly integrated with github which results in better DX - pullapprove v2 has been very unstable recently causing productivity loss - pullapprove v2 has been deprecated in favor of v3, which requires and migration
2018-12-22 00:23:17 -08:00
1274 changed files with 22161 additions and 169514 deletions
--- a/.bazelignore
+++ b/.bazelignore
@ -1,6 +1,4 @@
 node_modules
 dist
-aio/content
 aio/node_modules
 aio/tools/examples/shared/node_modules
-integration/bazel
--- a/.bazelrc
+++ b/.bazelrc
@ -1,3 +1,5 @@
+# Load any settings specific to the current user
+try-import .bazelrc.user
 ################################
 # Settings for Angular team members only
 ################################
@ -20,18 +22,12 @@ test:debug --test_arg=--node_options=--inspect-brk --test_output=streamed --test
 # Filesystem interactions     #
 ###############################

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

 # Performance: avoid stat'ing input files
 build --watchfs
@ -40,16 +36,6 @@ build --watchfs
 run --nolegacy_external_runfiles
 test --nolegacy_external_runfiles

-# Turn on --incompatible_strict_action_env which was on by default
-# in Bazel 0.21.0 but turned off again in 0.22.0. Follow
-# https://github.com/bazelbuild/bazel/issues/7026 for more details.
-# This flag is needed to so that the bazel cache is not invalidated
-# when running bazel via `yarn bazel`.
-# See https://github.com/angular/angular/issues/27514.
-build --incompatible_strict_action_env
-run --incompatible_strict_action_env
-test --incompatible_strict_action_env
-
 ###############################
 # Release support             #
 # Turn on these settings with #
@ -96,9 +82,7 @@ build --define=compile=legacy
 ###############################

 # Load default settings for Remote Build Execution
-# When updating, the URLs of bazel_toolchains in packages/bazel/package.bzl
-# may also need to be updated (see https://github.com/angular/angular/pull/27935)
-import %workspace%/third_party/github.com/bazelbuild/bazel-toolchains/bazelrc/bazel-0.21.0.bazelrc
+import %workspace%/third_party/github.com/bazelbuild/bazel-toolchains/bazelrc/bazel-0.20.0.bazelrc

 # Increase the default number of jobs by 50% because our build has lots of
 # parallelism
@ -115,7 +99,3 @@ build:remote --remote_instance_name=projects/internal-200822/instances/default_i
 # Do not accept remote cache.
 # We need to understand the security risks of using prior build artifacts.
 build:remote --remote_accept_cached=false
-
-# Load any settings specific to the current user. Needs to be last statement in this
-# config, as the user configuration should be able to overwrite flags from this file.
-try-import .bazelrc.user
--- a/.bowerrc
+++ b/.bowerrc
@ -0,0 +1,3 @@
+{
+  "directory" : "bower_components"
+}
--- a/.circleci/bazel.rc
+++ b/.circleci/bazel.rc
@ -2,10 +2,6 @@
 # We do this by copying this file to /etc/bazel.bazelrc at the start of the build.
 # See documentation in /docs/BAZEL.md

-# Save downloaded repositories in a location that can be cached by CircleCI. This helps us
-# speeding up the analysis time significantly with Bazel managed node dependencies on the CI.
-build --repository_cache=/home/circleci/bazel_repository_cache
-
 # Don't be spammy in the logs
 # TODO(gmagolan): Hide progress again once build performance improves
 # Presently, CircleCI can timeout during bazel test ... with the following
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@ -11,43 +11,16 @@
 # needed for jobs that run tests without Bazel. Bazel runs tests with browsers that will be
 # fetched by the Webtesting rules. Therefore for jobs that run tests with Bazel, we don't need a
 # docker image with browsers pre-installed.
-# **NOTE 1**: If you change the version of the `*-browsers` docker image, make sure the
-#             `CI_CHROMEDRIVER_VERSION_ARG` env var (in `.circleci/env.sh`) points to a ChromeDriver
-#             version that is compatible with the Chrome version in the image.
-# **NOTE 2**: If you change the version of the docker images, also change the `cache_key` suffix.
+# **NOTE**: If you change the version of the docker images, also change the `cache_key` suffix.
 var_1: &default_docker_image circleci/node:10.12
 var_2: &browsers_docker_image circleci/node:10.12-browsers
-# We don't want to include the current branch name in the cache key because that would prevent
-# PRs from being able to restore the cache since the branch names are always different for PRs.
-# The cache key should only consist of dynamic values that change whenever something in the
-# cache changes. For example:
-# 1) yarn lock file changes --> cached "node_modules" are different.
-# 2) bazel repository definitions change --> cached bazel repositories are different.
-# **NOTE 1 **: If you change the cache key prefix, also sync the restore_cache 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 v3-angular-node-10.12-{{ checksum "yarn.lock" }}-{{ checksum "WORKSPACE" }}-{{ checksum "packages/bazel/package.bzl" }}-{{ checksum "aio/yarn.lock" }}
+var_3: &cache_key v2-angular-{{ .Branch }}-{{ checksum "yarn.lock" }}-node-10.12

-# Initializes the CI environment by setting up common environment variables.
-var_4: &init_environment
+# Define common ENV vars
+var_4: &define_env_vars
  run:
-    name: Initializing environment (setting up variables, overwriting Yarn)
-    # Overwrite the yarn installed in the docker container with our own version.
-    command: |
-      ./.circleci/env.sh
-      ourYarn=$(realpath ./third_party/github.com/yarnpkg/yarn/releases/download/v1.13.0/bin/yarn.js)
-      sudo chmod a+x $ourYarn
-      sudo ln -fs $ourYarn /usr/local/bin/yarn
-      echo "Yarn version: $(yarn --version)"
-
-      # Add GitHub to known hosts.
-      mkdir -p ~/.ssh
-      echo 'github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==' >> ~/.ssh/known_hosts
-
-      # use git+ssh instead of https
-      git config --global url."ssh://git@github.com".insteadOf "https://github.com" || true
-      git config --global gc.auto 0 || true
-
+    name: Define environment variables
+    command: ./.circleci/env.sh

 var_5: &setup_bazel_remote_execution
  run:
@ -63,94 +36,33 @@ var_6: &job_defaults
  docker:
  - image: *default_docker_image

-# After checkout, rebase on top of target branch.
+# After checkout, rebase on top of master.
+# Similar to travis behavior, but not quite the same.
+# See https://discuss.circleci.com/t/1662
 var_7: &post_checkout
-  run:
-    name: Rebase PR on target branch
-    command: >
-      if [[ -n "${CIRCLE_PR_NUMBER}" ]]; then
-        # User is required for rebase.
-        git config user.name "angular-ci"
-        git config user.email "angular-ci"
-        # Rebase PR on top of target branch.
-        node tools/rebase-pr.js angular/angular ${CIRCLE_PR_NUMBER}
-      else
-        echo "This build is not over a PR, nothing to do."
-      fi
+  post: git pull --ff-only origin "refs/pull/${CI_PULL_REQUEST//*pull\//}/merge"

 var_8: &yarn_install
  run:
    name: Running Yarn install
-    command: |
-      # Yarn's requests sometimes take more than 10mins to complete.
-      # Print something to stdout, to prevent CircleCI from failing due to not output.
-      while true; do sleep 60; echo "[`date`] Keeping alive..."; done &
-      KEEP_ALIVE_PID=$!
-      yarn install --frozen-lockfile --non-interactive
-      kill $KEEP_ALIVE_PID
+    command: yarn install --frozen-lockfile --non-interactive

 var_9: &setup_circleci_bazel_config
  run:
    name: Setting up CircleCI bazel configuration
    command: sudo cp .circleci/bazel.rc /etc/bazel.bazelrc

-var_10: &restore_cache
-  restore_cache:
-    keys:
-      - *cache_key
-      # This fallback should be the cache_key without variables.
-      - v3-angular-node-10.12-
-
-# Branch filter that can be specified for jobs that should only run on publish branches
-# (e.g. master or the patch branch)
-var_12: &publish_branches_filter
-  branches:
-    only:
-      - master
-      # e.g. 7.0.x, 7.1.x, etc.
-      - /\d+\.\d+\.x/
-
-# Workspace initially persisted by the `install` job, and then enhanced by `test_aio` and
-# `build-npm-packages`.
-# https://circleci.com/docs/2.0/workflows/#using-workspaces-to-share-data-among-jobs
-# https://circleci.com/blog/deep-diving-into-circleci-workspaces/
-var_13: &attach_workspace
-  attach_workspace:
-    at: ~/
-
 version: 2
 jobs:
-  setup:
-    <<: *job_defaults
-    steps:
-      - checkout
-      - *post_checkout
-      # This cache is saved in the build-npm-packages so that Bazel cache is also included.
-      - *restore_cache
-      - *init_environment
-      - *yarn_install
-      - run: yarn --cwd aio install --frozen-lockfile --non-interactive
-      # Make the bazel directories and add a file to them if they don't exist already so that
-      # persist_to_workspace does not fail.
-      - run: |
-          if [ ! -d ~/bazel_repository_cache ]; then
-            mkdir ~/bazel_repository_cache
-            touch ~/bazel_repository_cache/MARKER
-          fi
-      # Persist any changes at this point to be reused by further jobs.
-      # **NOTE 1 **: Folders persisted here should be kept in sync with `var_13: &attach_workspace`.
-      # **NOTE 2 **: To add new content to the workspace, always persist on the same root.
-      - persist_to_workspace:
-          root: ~/
-          paths:
-            - ./ng
-            - ./bazel_repository_cache
-
  lint:
    <<: *job_defaults
    steps:
-      - *attach_workspace
-      - *init_environment
+      - checkout:
+          <<: *post_checkout
+      - restore_cache:
+          key: *cache_key
+      - *define_env_vars
+      - *yarn_install

      - run: 'yarn bazel:format -mode=check ||
              (echo "BUILD files not formatted. Please run ''yarn bazel:format''" ; exit 1)'
@ -158,15 +70,19 @@ jobs:
      - run: 'yarn bazel:lint ||
              (echo -e "\n.bzl files have lint errors. Please run ''yarn bazel:lint-fix''"; exit 1)'

-      - run: yarn gulp lint
+      - run: ./node_modules/.bin/gulp lint

  test:
    <<: *job_defaults
    resource_class: xlarge
    steps:
-      - *attach_workspace
-      - *init_environment
+      - checkout:
+          <<: *post_checkout
+      - restore_cache:
+          key: *cache_key
+      - *define_env_vars
      - *setup_circleci_bazel_config
+      - *yarn_install

      # Setup remote execution and run RBE-compatible tests.
      - *setup_bazel_remote_execution
@ -175,14 +91,24 @@ jobs:
      - run: sudo cp .circleci/bazel.rc /etc/bazel.bazelrc
      - run: yarn bazel test //... --build_tag_filters=-ivy-only,local --test_tag_filters=-ivy-only,local

+      - save_cache:
+          key: *cache_key
+          paths:
+            - "node_modules"
+            - "~/bazel_repository_cache"
+
  # Temporary job to test what will happen when we flip the Ivy flag to true
  test_ivy_aot:
    <<: *job_defaults
    resource_class: xlarge
    steps:
-      - *attach_workspace
-      - *init_environment
+      - checkout:
+          <<: *post_checkout
+      - restore_cache:
+          key: *cache_key
+      - *define_env_vars
      - *setup_circleci_bazel_config
+      - *yarn_install
      - *setup_bazel_remote_execution

        # We need to explicitly specify the --symlink_prefix option because otherwise we would
@ -215,8 +141,11 @@ jobs:
      # Needed because the AIO tests and the PWA score test depend on Chrome being available.
      - image: *browsers_docker_image
    steps:
-      - *attach_workspace
-      - *init_environment
+      - checkout:
+          <<: *post_checkout
+      - restore_cache:
+          key: *cache_key
+      - *define_env_vars
        # Build aio
      - run: yarn --cwd aio build --progress=false
        # Lint the code
@ -228,9 +157,9 @@ jobs:
        # (Run before unit and e2e tests, which destroy the `dist/` directory.)
      - run: yarn --cwd aio payload-size
        # Run unit tests
-      - run: yarn --cwd aio test --progress=false --watch=false
+      - run: yarn --cwd aio test --watch=false
        # Run e2e tests
-      - run: yarn --cwd aio e2e --configuration=ci
+      - run: yarn --cwd aio e2e
        # Run unit tests for Firebase redirects
      - run: yarn --cwd aio redirects-test

@ -240,8 +169,11 @@ jobs:
    # Needed because before deploying the deploy-production script runs the PWA score tests.
    - image: *browsers_docker_image
    steps:
-      - *attach_workspace
-      - *init_environment
+      - checkout:
+          <<: *post_checkout
+      - restore_cache:
+          key: *cache_key
+      - *define_env_vars
        # Deploy angular.io to production (if necessary)
      - run: setPublicVar CI_STABLE_BRANCH "$(npm info @angular/core dist-tags.latest | sed -r 's/^\s*([0-9]+\.[0-9]+)\.[0-9]+.*$/\1.x/')"
      - run: yarn --cwd aio deploy-production
@ -252,37 +184,33 @@ jobs:
      # Needed because the AIO tests and the PWA score test depend on Chrome being available.
      - image: *browsers_docker_image
    steps:
-      - *attach_workspace
-      - *init_environment
+      - checkout:
+          <<: *post_checkout
+      - restore_cache:
+          key: *cache_key
+      - attach_workspace:
+          at: dist
+      - *define_env_vars
        # Build aio (with local Angular packages)
      - run: yarn --cwd aio build-local --progress=false
        # Run PWA-score tests
        # (Run before unit and e2e tests, which destroy the `dist/` directory.)
      - run: yarn --cwd aio test-pwa-score-localhost $CI_AIO_MIN_PWA_SCORE
        # Run unit tests
-      - run: yarn --cwd aio test --progress=false --watch=false
+      - run: yarn --cwd aio test --watch=false
        # Run e2e tests
-      - run: yarn --cwd aio e2e --configuration=ci
-
-  test_aio_local_ivy:
-    <<: *job_defaults
-    steps:
-      - *attach_workspace
-      - *init_environment
-        # Rename the Ivy packages dist folder to "dist/packages-dist" as the AIO
-        # package installer picks up the locally built packages from that location.
-        # *Note*: We could also adjust the packages installer, but given we won't have
-        # two different folders of Angular distributions in the future, it's likely not
-        # worth the efforts to change the AIO packages installer.
-      - run: mv dist/packages-dist-ivy-aot dist/packages-dist
-        # Build aio with Ivy (using local Angular packages)
-      - run: yarn --cwd aio build-with-ivy --progress=false
+      - run: yarn --cwd aio e2e

  test_aio_tools:
    <<: *job_defaults
    steps:
-      - *attach_workspace
-      - *init_environment
+      - checkout:
+          <<: *post_checkout
+      - restore_cache:
+          key: *cache_key
+      - attach_workspace:
+          at: dist
+      - *define_env_vars
        # Install
      - run: yarn --cwd aio install --frozen-lockfile --non-interactive
      - run: yarn --cwd aio extract-cli-command-docs
@ -290,48 +218,45 @@ jobs:
      - run: yarn --cwd aio tools-test
      - run: ./aio/aio-builds-setup/scripts/test.sh

-  test_docs_examples:
+  test_docs_examples_0:
    <<: *job_defaults
    docker:
      # Needed because the example e2e tests depend on Chrome.
      - image: *browsers_docker_image
-    parallelism: 4
-    resource_class: xlarge
    steps:
-      - *attach_workspace
-      - *init_environment
+      - checkout:
+          <<: *post_checkout
+      - restore_cache:
+          key: *cache_key
+      - attach_workspace:
+          at: dist
+      - *define_env_vars
+        # Install root
+      - *yarn_install
        # Install aio
      - run: yarn --cwd aio install --frozen-lockfile --non-interactive
-        # Run examples tests. The "CIRCLE_NODE_INDEX" will be set if "parallelism" is enabled.
-        # Since the parallelism is set to "3", there will be three parallel CircleCI containers
-        # with either "0", "1" or "2" as node index. This can be passed to the "--shard" argument.
-      - run: yarn --cwd aio example-e2e --setup --local --cliSpecsConcurrency=5 --shard=${CIRCLE_NODE_INDEX}/${CIRCLE_NODE_TOTAL}
+        # Run examples tests
+      - run: yarn --cwd aio example-e2e --setup --local --shard=0/2

-  test_docs_examples_ivy:
+  test_docs_examples_1:
    <<: *job_defaults
    docker:
      # Needed because the example e2e tests depend on Chrome.
      - image: *browsers_docker_image
-    resource_class: xlarge
-    # We increase the parallelism here to five while the "test_docs_examples" job runs with
-    # a parallelism of four. This is necessary because this job also need to run NGCC which
-    # takes up more time and we don't want these jobs to impact the overall CI turnaround.
-    parallelism: 5
    steps:
-      - *attach_workspace
-      - *init_environment
+      - checkout:
+          <<: *post_checkout
+      - restore_cache:
+          key: *cache_key
+      - attach_workspace:
+          at: dist
+      - *define_env_vars
+        # Install root
+      - *yarn_install
        # Install aio
      - run: yarn --cwd aio install --frozen-lockfile --non-interactive
-        # Rename the Ivy packages dist folder to "dist/packages-dist" as the AIO
-        # package installer picks up the locally built packages from that location.
-        # *Note*: We could also adjust the packages installer, but given we won't have
-        # two different folders of Angular distributions in the future, we should keep
-        # the packages installer unchanged.
-      - run: mv dist/packages-dist-ivy-aot dist/packages-dist
-        # Run examples tests with ivy. The "CIRCLE_NODE_INDEX" will be set if "parallelism" is enabled.
-        # Since the parallelism is set to "3", there will be three parallel CircleCI containers
-        # with either "0", "1" or "2" as node index. This can be passed to the "--shard" argument.
-      - run: yarn --cwd aio example-e2e --setup --local --ivy --cliSpecsConcurrency=5 --shard=${CIRCLE_NODE_INDEX}/${CIRCLE_NODE_TOTAL}
+        # Run examples tests
+      - run: yarn --cwd aio example-e2e --setup --local --shard=1/2

  # This job should only be run on PR builds, where `CI_PULL_REQUEST` is not `false`.
  aio_preview:
@ -339,8 +264,12 @@ jobs:
    environment:
       AIO_SNAPSHOT_ARTIFACT_PATH: &aio_preview_artifact_path 'aio/tmp/snapshot.tgz'
    steps:
-      - *attach_workspace
-      - *init_environment
+      - checkout:
+          <<: *post_checkout
+      - restore_cache:
+          key: *cache_key
+      - *define_env_vars
+      - *yarn_install
      - run: ./aio/scripts/build-artifacts.sh $AIO_SNAPSHOT_ARTIFACT_PATH $CI_PULL_REQUEST $CI_COMMIT
      - store_artifacts:
          path: *aio_preview_artifact_path
@ -356,64 +285,45 @@ jobs:
      # Needed because the test-preview script runs e2e tests and the PWA score test with Chrome.
      - image: *browsers_docker_image
    steps:
-      - *attach_workspace
-      - *init_environment
-      - run: yarn --cwd aio install --frozen-lockfile --non-interactive
+      - checkout:
+          <<: *post_checkout
+      - restore_cache:
+          key: *cache_key
+      - *define_env_vars
+      - run: yarn install --cwd aio --frozen-lockfile --non-interactive
      - run:
          name: Wait for preview and run tests
          command: node aio/scripts/test-preview.js $CI_PULL_REQUEST $CI_COMMIT $CI_AIO_MIN_PWA_SCORE

-
-  # The `build-npm-packages` tasks exist for backwards-compatibility with old scripts and
-  # tests that rely on the pre-Bazel `dist/packages-dist` output structure (build.sh).
-  # Having multiple jobs that independently build in this manner duplicates some work; we build
-  # the bazel packages more than once. Even though we have a remote cache, these jobs will
-  # typically run in parallel so up-to-date outputs will not be available at the time the build
+  # This job exists only for backwards-compatibility with old scripts and tests
+  # that rely on the pre-Bazel dist/packages-dist layout.
+  # It duplicates some work with the job above: we build the bazel packages
+  # twice. Even though we have a remote cache, these jobs will typically run in
+  # parallel so up-to-date outputs will not be available at the time the build
  # starts.
-
-  # Build the view engine npm packages. No new jobs should depend on this.
-  build-npm-packages:
+  # No new jobs should depend on this one.
+  build-packages-dist:
    <<: *job_defaults
    resource_class: xlarge
    steps:
-      - *attach_workspace
-      - *init_environment
+      - checkout:
+          <<: *post_checkout
+      - restore_cache:
+          key: *cache_key
+      - *define_env_vars
      - *setup_circleci_bazel_config
+      - *yarn_install
      - *setup_bazel_remote_execution

      - run: scripts/build-packages-dist.sh

      # Save the npm packages from //packages/... for other workflow jobs to read
+      # https://circleci.com/docs/2.0/workflows/#using-workspaces-to-share-data-among-jobs
      - persist_to_workspace:
-          root: ~/
+          root: dist
          paths:
-            - ng/dist/packages-dist
-
-      # Save dependencies and bazel repository cache to use on subsequent runs.
-      - save_cache:
-          key: *cache_key
-          paths:
-            - "node_modules"
-            - "aio/node_modules"
-            - "~/bazel_repository_cache"
-
-  # Build the ivy npm packages.
-  build-ivy-npm-packages:
-    <<: *job_defaults
-    resource_class: xlarge
-    steps:
-      - *attach_workspace
-      - *init_environment
-      - *setup_circleci_bazel_config
-      - *setup_bazel_remote_execution
-
-      - run: scripts/build-ivy-npm-packages.sh
-
-      # Save the npm packages from //packages/... for other workflow jobs to read
-      - persist_to_workspace:
-          root: ~/
-          paths:
-            - ng/dist/packages-dist-ivy-aot
+            - packages-dist
+            - packages-dist-ivy-aot

  # We run the integration tests outside of Bazel for now.
  # They are a separate workflow job so that they can be easily re-run.
@ -423,7 +333,6 @@ jobs:
  # See comments inside the integration/run_tests.sh script.
  integration_test:
    <<: *job_defaults
-    parallelism: 4
    docker:
      # Needed because the integration tests expect Chrome to be installed (e.g cli-hello-world)
      - image: *browsers_docker_image
@ -432,31 +341,35 @@ jobs:
    # on a 4G worker so we use a larger machine here too.
    resource_class: xlarge
    steps:
-      - *attach_workspace
-      - *init_environment
-      # Runs the integration tests in parallel across multiple CircleCI container instances. The
-      # amount of container nodes for this job is controlled by the "parallelism" option.
-      - run: ./integration/run_tests.sh ${CIRCLE_NODE_INDEX} ${CIRCLE_NODE_TOTAL}
+      - checkout:
+          <<: *post_checkout
+      - restore_cache:
+          key: *cache_key
+      - attach_workspace:
+          at: dist
+      - *define_env_vars
+      - run: ./integration/run_tests.sh

  # This job updates the content of repos like github.com/angular/core-builds
  # for every green build on angular/angular.
  publish_snapshot:
    <<: *job_defaults
    steps:
+      - checkout:
+          <<: *post_checkout
+      - *define_env_vars
      # See below - ideally this job should not trigger for non-upstream builds.
      # But since it does, we have to check this condition.
      - run:
          name: Skip this job for Pull Requests and Fork builds
-          # Note: Using `CIRCLE_*` env variables (instead of those defined in `env.sh` so that this
-          #       step can be run before `init_environment`.
-          command: >
-            if [[ -n "${CIRCLE_PR_NUMBER}" ]] ||
-                [[ "$CIRCLE_PROJECT_USERNAME" != "angular" ]] ||
-                [[ "$CIRCLE_PROJECT_REPONAME" != "angular" ]]; then
-              circleci step halt
-            fi
-      - *attach_workspace
-      - *init_environment
+          # Note, `|| true` on the end makes this step always exit 0
+          command: '[[
+              "$CI_PULL_REQUEST" != "false"
+              || "$CI_REPO_OWNER" != "angular"
+              || "$CI_REPO_NAME" != "angular"
+          ]] && circleci step halt || true'
+      - attach_workspace:
+          at: dist
      # CircleCI has a config setting to force SSH for all github connections
      # This is not compatible with our mechanism of using a Personal Access Token
      # Clear the global setting
@ -473,101 +386,44 @@ jobs:
      # which does not load the browser through the Bazel webtesting rules.
      - image: *browsers_docker_image
    steps:
-      - *attach_workspace
-      - *init_environment
+      - checkout:
+          <<: *post_checkout
+      - restore_cache:
+          key: *cache_key
+      - *define_env_vars
      - run:
          name: Run tests against the deployed apps
          command: ./aio/scripts/test-production.sh $CI_AIO_MIN_PWA_SCORE
      - run:
          name: Notify caretaker about failure
-          # `$SLACK_CARETAKER_WEBHOOK_URL` is a secret env var defined in CircleCI project settings.
-          # The URL comes from https://angular-team.slack.com/apps/A0F7VRE7N-circleci.
-          command: 'curl --request POST --header "Content-Type: application/json" --data "{\"text\":\":x: \`$CIRCLE_JOB\` job failed on build $CIRCLE_BUILD_NUM: $CIRCLE_BUILD_URL :scream:\"}" $SLACK_CARETAKER_WEBHOOK_URL'
+          command: 'curl --request POST --header "Content-Type: application/json" --data "{\"text\":\":x: \`$CIRCLE_JOB\` job failed on build $CIRCLE_BUILD_NUM: $CIRCLE_BUILD_URL :scream:\"}" $CI_SECRET_SLACK_CARETAKER_WEBHOOK_URL'
          when: on_fail

-  legacy-unit-tests-saucelabs:
-    <<: *job_defaults
-    # In order to avoid the bottleneck of having a slow host machine, we acquire a better
-    # container for this job. This is necessary because we launch a lot of browsers concurrently
-    # and therefore the tunnel and Karma need to process a lot of file requests and tests.
-    resource_class: xlarge
-    steps:
-      - *attach_workspace
-      - *init_environment
-      - run:
-          name: Preparing environment for running tests on Saucelabs.
-          command: |
-            setPublicVar KARMA_JS_BROWSERS $(node -e 'console.log(require("./browser-providers.conf").sauceAliases.CI_REQUIRED.join(","))')
-            setSecretVar SAUCE_ACCESS_KEY $(echo $SAUCE_ACCESS_KEY | rev)
-      - run:
-          name: Starting Saucelabs tunnel
-          command: ./scripts/saucelabs/start-tunnel.sh
-          background: true
-      - run: yarn tsc -p packages
-      - run: yarn tsc -p modules
-        # Waits for the Saucelabs tunnel to be ready. This ensures that we don't run tests
-        # too early without Saucelabs not being ready.
-      - run: ./scripts/saucelabs/wait-for-tunnel.sh
-      - run: yarn karma start ./karma-js.conf.js --single-run --browsers=${KARMA_JS_BROWSERS}
-      - run: ./scripts/saucelabs/stop-tunnel.sh
-
-  legacy-misc-tests:
-    <<: *job_defaults
-    steps:
-      - *attach_workspace
-      - *init_environment
-      - run: yarn gulp check-cycle
-      # TODO: disabled because the Bazel packages-dist does not seem to have map files for
-      # the ESM5/ES2015 output. See: https://github.com/angular/angular/issues/27966
-      # - run: yarn gulp source-map-test
-
 workflows:
  version: 2
  default_workflow:
    jobs:
-      - setup
-      - lint:
-          requires:
-          - setup
-      - test:
-          requires:
-          - setup
-      - test_ivy_aot:
-          requires:
-          - setup
-      - build-npm-packages:
-          requires:
-          - setup
-      - test_aio:
-          requires:
-          - setup
-      - legacy-unit-tests-saucelabs:
-          requires:
-          - setup
+      - lint
+      - test
+      - test_ivy_aot
+      - build-packages-dist
+      - test_aio
      - deploy_aio:
          requires:
            - test_aio
-      - legacy-misc-tests:
-          requires:
-            - build-npm-packages
      - test_aio_local:
          requires:
-            - build-npm-packages
-      # - test_aio_local_ivy:
-      #     requires:
-      #       - build-ivy-npm-packages
+            - build-packages-dist
      - test_aio_tools:
          requires:
-            - build-npm-packages
-      - test_docs_examples:
+            - build-packages-dist
+      - test_docs_examples_0:
          requires:
-            - build-npm-packages
-      # - test_docs_examples_ivy:
-      #     requires:
-      #       - build-ivy-npm-packages
+            - build-packages-dist
+      - test_docs_examples_1:
+          requires:
+            - build-packages-dist
      - aio_preview:
-          requires:
-            - setup
          # Only run on PR builds. (There can be no previews for non-PR builds.)
          filters:
            branches:
@ -577,7 +433,7 @@ workflows:
            - aio_preview
      - integration_test:
          requires:
-            - build-npm-packages
+            - build-packages-dist
      - publish_snapshot:
          # Note: no filters on this job because we want it to run for all upstream branches
          # We'd really like to filter out pull requests here, but not yet available:
@ -590,29 +446,19 @@ workflows:
            - integration_test
            # Only publish if `aio`/`docs` tests using the locally built Angular packages pass
            - test_aio_local
-            # - test_aio_local_ivy
-            - test_docs_examples
-            # - test_docs_examples_ivy
+            - test_docs_examples_0
+            - test_docs_examples_1
            # Get the artifacts to publish from the build-packages-dist job
            # since the publishing script expects the legacy outputs layout.
-            - build-npm-packages
-            - legacy-unit-tests-saucelabs
-            - legacy-misc-tests
+            - build-packages-dist

  aio_monitoring:
    jobs:
      - aio_monitoring
    triggers:
      - schedule:
-          # Runs AIO monitoring job at 00:00AM every day.
          cron: "0 0 * * *"
          filters:
            branches:
              only:
                - master
-
-# TODO:
-# - don't build the g3 branch
-# - verify that we are bootstrapping with the right yarn version coming from the docker image
-# - check local chrome version pulled from docker image
-# - remove /tools/ngcontainer
--- a/.circleci/env-helpers.inc.sh
+++ b/.circleci/env-helpers.inc.sh
@ -15,7 +15,7 @@
 #
 # Usage: `setPublicVar <name> <value>`
 function setPublicVar() {
-  setSecretVar $1 "$2";
+  setSecretVar $1 $2;
  echo "$1=$2";
 }

--- a/.circleci/env.sh
+++ b/.circleci/env.sh
@ -1,11 +1,7 @@
 #!/usr/bin/env bash

-# Variables
-readonly projectDir=$(realpath "$(dirname ${BASH_SOURCE[0]})/..")
-readonly envHelpersPath="$projectDir/.circleci/env-helpers.inc.sh";
-readonly getCommitRangePath="$projectDir/.circleci/get-commit-range.js";
-
 # Load helpers and make them available everywhere (through `$BASH_ENV`).
+readonly envHelpersPath="`dirname $0`/env-helpers.inc.sh";
 source $envHelpersPath;
 echo "source $envHelpersPath;" >> $BASH_ENV;

@ -13,22 +9,14 @@ echo "source $envHelpersPath;" >> $BASH_ENV;
 ####################################################################################################
 # Define PUBLIC environment variables for CircleCI.
 ####################################################################################################
-# See https://circleci.com/docs/2.0/env-vars/#built-in-environment-variables for more info.
-####################################################################################################
-setPublicVar PROJECT_ROOT "$projectDir";
+setPublicVar PROJECT_ROOT "$(pwd)";
 setPublicVar CI_AIO_MIN_PWA_SCORE "95";
 # This is the branch being built; e.g. `pull/12345` for PR builds.
 setPublicVar CI_BRANCH "$CIRCLE_BRANCH";
-# ChromeDriver version compatible with the Chrome version included in the docker image used in
-# `.circleci/config.yml`. See http://chromedriver.chromium.org/downloads for a list of versions.
-# This variable is intended to be passed as an arg to the `webdriver-manager update` command (e.g.
-# `"postinstall": "webdriver-manager update $CI_CHROMEDRIVER_VERSION_ARG"`).
-setPublicVar CI_CHROMEDRIVER_VERSION_ARG "--versions.chrome 2.45";
 setPublicVar CI_COMMIT "$CIRCLE_SHA1";
-# `CI_COMMIT_RANGE` will only be available when `CIRCLE_COMPARE_URL` is also available (or can be
-# retrieved via `get-compare-url.js`), i.e. on push builds (a.k.a. non-PR, non-scheduled builds and
-# rerun workflows of such builds). That is fine, since we only need it in push builds.
-setPublicVar CI_COMMIT_RANGE "`[[ ${CIRCLE_PR_NUMBER:-false} != false ]] && echo "" || node $getCommitRangePath "$CIRCLE_BUILD_NUM" "$CIRCLE_COMPARE_URL"`";
+# `CI_COMMIT_RANGE` will only be available when `CIRCLE_COMPARE_URL` is also available,
+# i.e. on push builds (a.k.a. non-PR builds). That is fine, since we only need it in push builds.
+setPublicVar CI_COMMIT_RANGE "$(sed -r 's|^.*/([0-9a-f]+\.\.\.[0-9a-f]+)$|\1|i' <<< ${CIRCLE_COMPARE_URL:-})";
 setPublicVar CI_PULL_REQUEST "${CIRCLE_PR_NUMBER:-false}";
 setPublicVar CI_REPO_NAME "$CIRCLE_PROJECT_REPONAME";
 setPublicVar CI_REPO_OWNER "$CIRCLE_PROJECT_USERNAME";
@ -39,28 +27,8 @@ setPublicVar CI_REPO_OWNER "$CIRCLE_PROJECT_USERNAME";
 ####################################################################################################
 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.
-####################################################################################################
-# In order to have a meaningful SauceLabs badge on the repo page,
-# the angular2-ci account is used only when pushing commits to master;
-# in all other cases, the regular angular-ci account is used.
-if [ "${CI_PULL_REQUEST}" = "false" ] && [ "${CI_REPO_OWNER}" = "angular" ] && [ "${CI_BRANCH}" = "master" ]; then
-  setPublicVar SAUCE_USERNAME "angular2-ci";
-  setSecretVar SAUCE_ACCESS_KEY "693ebc16208a-0b5b-1614-8d66-a2662f4e";
-else
-  setPublicVar SAUCE_USERNAME "angular-ci";
-  setSecretVar SAUCE_ACCESS_KEY "9b988f434ff8-fbca-8aa4-4ae3-35442987";
-fi
-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-${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
+# Defined in https://angular-team.slack.com/apps/A0F7VRE7N-circleci.
+setSecretVar CI_SECRET_SLACK_CARETAKER_WEBHOOK_URL "$SLACK_CARETAKER_WEBHOOK_URL";


 # Source `$BASH_ENV` to make the variables available immediately.
--- a/.circleci/get-commit-range.js
+++ b/.circleci/get-commit-range.js
@ -1,159 +0,0 @@
-#!/usr/bin/env node
-
-/**
- * **Usage:**
- * ```
- * node get-commit-range <build-number> [<compare-url> [<circle-token>]]
- * ```
- *
- * Returns the value of the `CIRCLE_COMPARE_URL` environment variable (if defined) or, if this is
- * not a PR build (i.e. `CIRCLE_PR_NUMBER` is not defined), retrieves the equivalent of
- * `CIRCLE_COMPARE_URL` for jobs that are part of a rerun workflow.
- *
- * **Context:**
- * CircleCI sets the `CIRCLE_COMPARE_URL` environment variable (from which we can extract the commit
- * range) on push builds (a.k.a. non-PR, non-scheduled builds). Yet, when a workflow is rerun
- * (either from the beginning or from failed jobs) - e.g. when a job flakes - CircleCI does not set
- * the `CIRCLE_COMPARE_URL`.
- *
- * **Implementation details:**
- * This script relies on the fact that all rerun workflows share the same CircleCI workspace and the
- * (undocumented) fact that the workspace ID happens to be the same as the workflow ID that first
- * created it.
- *
- * For example, for a job on push build workflow, the CircleCI API will return data that look like:
- * ```js
- * {
- *   compare: 'THE_COMPARE_URL_WE_ARE_LOOKING_FOR',
- *   //...
- *   previous: {
- *     // ...
- *     build_num: 12345,
- *   },
- *   //...
- *   workflows: {
- *     //...
- *     workflow_id: 'SOME_ID_A',
- *     workspace_id: 'SOME_ID_A',  // Same as `workflow_id`.
- *   }
- * }
- * ```
- *
- * If the workflow is rerun, the data for jobs on the new workflow will look like:
- * ```js
- * {
- *   compare: null,  // ¯\_(ツ)_/¯
- *   //...
- *   previous: {
- *     // ...
- *     build_num: 23456,
- *   },
- *   //...
- *   workflows: {
- *     //...
- *     workflow_id: 'SOME_ID_B',
- *     workspace_id: 'SOME_ID_A',  // Different from current `workflow_id`.
- *                                 // Same as original `workflow_id`. \o/
- *   }
- * }
- * ```
- *
- * This script uses the `previous.build_num` (which points to the previous build number on the same
- * branch) to traverse the jobs backwards, until it finds a job from the original workflow. Such a
- * job (if found) should also contain the compare URL.
- *
- * **NOTE 1:**
- * This is only useful on workflows which are created by rerunning a workflow for which
- * `CIRCLE_COMPARE_URL` was defined.
- *
- * **NOTE 2:**
- * The `circleToken` will be used for CircleCI API requests if provided, but it is not needed for
- * accessing the read-only endpoints that we need (as long as the current project is FOSS and the
- * corresponding setting is turned on in "Advanced Settings" in the project dashboard).
- *
- * ---
- * Inspired by https://circleci.com/orbs/registry/orb/iynere/compare-url
- * (source code: https://github.com/iynere/compare-url-orb).
- *
- * We are not using the `compare-url` orb for the following reasons:
- * 1. (By looking at the code) it would only work if the rerun workflow is the latest workflow on
- *    the branch (which is not guaranteed to be true).
- * 2. It is less efficient (e.g. makes unnecessary CircleCI API requests for builds on different
- *    branches, installs extra dependencies, persists files to the workspace (as a means of passing
- *    the result to the calling job), etc.).
- * 3. It is slightly more complicated to setup and consume than our own script.
- * 4. Its implementation is more complicated than needed for our usecase (e.g. handles different git
- *    providers, handles newly created branches, etc.).
- */
-
-// Imports
-const {get: httpsGet} = require('https');
-
-// Constants
-const API_URL_BASE = 'https://circleci.com/api/v1.1/project/github/angular/angular';
-const COMPARE_URL_RE = /^.*\/([0-9a-f]+\.\.\.[0-9a-f]+)$/i;
-
-// Run
-_main(process.argv.slice(2));
-
-// Helpers
-async function _main([buildNumber, compareUrl = '', circleToken = '']) {
-  try {
-    if (!buildNumber || isNaN(buildNumber)) {
-      throw new Error(
-          'Missing or invalid arguments.\n' +
-          'Expected: buildNumber (number), compareUrl? (string), circleToken? (string)');
-    }
-
-    if (!compareUrl) {
-      compareUrl = await getCompareUrl(buildNumber, circleToken);
-    }
-
-    const commitRangeMatch = COMPARE_URL_RE.exec(compareUrl)
-    const commitRange = commitRangeMatch ? commitRangeMatch[1] : '';
-
-    console.log(commitRange);
-  } catch (err) {
-    console.error(err);
-    process.exit(1);
-  }
-}
-
-function getBuildInfo(buildNumber, circleToken) {
-  console.error(`BUILD ${buildNumber}`);
-  const url = `${API_URL_BASE}/${buildNumber}?circle-token=${circleToken}`;
-  return getJson(url);
-}
-
-async function getCompareUrl(buildNumber, circleToken) {
-  let info = await getBuildInfo(buildNumber, circleToken);
-  const targetWorkflowId = info.workflows.workspace_id;
-
-  while (info.workflows.workflow_id !== targetWorkflowId) {
-    info = await getBuildInfo(info.previous.build_num, circleToken);
-  }
-
-  return info.compare || '';
-}
-
-function getJson(url) {
-  return new Promise((resolve, reject) => {
-    const opts = {headers: {Accept: 'application/json'}};
-    const onResponse = res => {
-      const statusCode = res.statusCode || -1;
-      const isSuccess = (200 <= statusCode) && (statusCode <= 400);
-      let responseText = '';
-
-      res.
-        on('error', reject).
-        on('data', d => responseText += d).
-        on('end', () => isSuccess ?
-          resolve(JSON.parse(responseText)) :
-          reject(`Error getting '${url}' (status ${statusCode}):\n${responseText}`));
-    };
-
-    httpsGet(url, opts, onResponse).
-      on('error', reject).
-      end();
-  });
-}
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@ -16,7 +16,7 @@
 #
 #  - we trust that people do the right thing and not approve changes they don't feel confident reviewing
 #  - we use github teams so that we funnel code reviews to the most appropriate reviewer, this is why the team structure is fine-grained
-#  - we enforce that only approved PRs get merged to ensure that unreviewed code doesn't get accidentally merged
+#  - we enforce that only approved PRs get merged to ensure that unreviewed code doesn't get accidentaly merged
 #  - we delegate approval rights as much as possible so that we can scale better
 #  - each group must have at least one person, but several people are preferable to avoid a single point of failure issues
 #  - most file groups have one or two global approvers groups as fallbacks:
@ -28,7 +28,7 @@
 #
 #  - This configuration works in conjunction with the protected branch settings that require all changes to be made via pull requests with at least one approval.
 #  - This approval can come from an appropriate codeowner, or any repo collaborator (person with write access) if the PR is authored by a codeowner.
-#  - Each codeowners team must have write access to the repo, otherwise their reviews won't count.
+#  - Each codeowners team must have write access to the repo, otherwise their reviewes won't count.
 #
 #  In the case of emergency, the repo administrators which include angular-caretaker can bypass this requirement.

@ -39,14 +39,12 @@
 #  (just to make this file easier to understand)
 # ================================================

-#  alan-agius4 - Alan Agius
 #  alexeagle - Alex Eagle
 #  alxhub - Alex Rickabaugh
 #  AndrewKushnir - Andrew Kushnir
 #  andrewseguin - Andrew Seguin
 #  benlesh - Ben Lesh
 #  brandonroberts - Brandon Roberts
-#  devversion - Paul Gschwendtner
 #  filipesilva - Filipe Silva
 #  gkalpak - George Kalpakas
 #  hansl - Hans Larsen
@ -56,7 +54,6 @@
 #  kara - Kara Erickson
 #  kyliau - Keen Yee Liau
 #  matsko - Matias Niemelä
-#  mgechev - Minko Gechev
 #  mhevery - Misko Hevery
 #  ocombe - Olivier Combe
 #  petebacondarwin - Pete Bacon Darwin
@ -88,7 +85,6 @@
 #   - IgorMinar
 #   - kara
 #   - mhevery
-#   - alexeagle


 # ===========================================================
@ -97,7 +93,6 @@
 #  Used for approving minor documentation-only changes that don't require engineering review.
 #  (secret team to avoid review requests, it also doesn't inherit from @angular/framework because nested teams can't be secret)
 #
-#   - brandonroberts
 #   - gkalpak
 #   - jenniferfell
 #   - petebacondarwin
@ -117,7 +112,6 @@
 #   - alexeagle
 #   - kyliau
 #   - IgorMinar
-#   - mgechev


 # ===========================================================
@ -127,7 +121,6 @@
 #   - alexeagle
 #   - filipesilva
 #   - hansl
-#   - mgechev


 # ===========================================================
@ -265,7 +258,6 @@
 #  @angular/docs-infra
 # ===========================================================
 #
-#   - brandonroberts
 #   - gkalpak
 #   - IgorMinar
 #   - petebacondarwin
@ -296,17 +288,6 @@
 #   - IgorMinar


-# ===========================================================
-#  @angular/tools-docs-libraries
-# ===========================================================
-#
-#   - alan-agius4
-#   - alexeagle
-#   - hansl
-#   - IgorMinar
-#   - mgechev
-
-
 # ===========================================================
 #  @angular/fw-docs-marketing
 # ===========================================================
@ -327,9 +308,6 @@
 # ===========================================================
 #
 #   - alexeagle
-#   - devversion
-#   - filipesilva
-#   - gkalpak
 #   - IgorMinar


@ -364,19 +342,10 @@

 /packages/animations/**                                         @angular/fw-animations @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
 /packages/platform-browser/animations/**                        @angular/fw-animations @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
-
 /aio/content/guide/animations.md                                @angular/fw-animations @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
 /aio/content/examples/animations/**                             @angular/fw-animations @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
 /aio/content/images/guide/animations/**                         @angular/fw-animations @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes

-/aio/content/guide/complex-animation-sequences.md               @angular/fw-animations @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
-
-/aio/content/guide/reusable-animations.md                       @angular/fw-animations @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
-
-/aio/content/guide/route-animations.md                          @angular/fw-animations @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
-
-/aio/content/guide/transition-and-triggers.md                   @angular/fw-animations @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
-


 # ================================================
@ -407,13 +376,12 @@


 # ================================================
-#  Framework/cli integration
+#  @angular/compiler-cli/ngtools
 #
 #  a rule to control API changes between @angular/compiler-cli and @angular/cli
 # ================================================

 /packages/compiler-cli/src/ngtools/**                           @angular/tools-cli @angular/framework-global-approvers
-/aio/content/guide/ivy.md                                       @angular/tools-cli @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes



@ -423,7 +391,6 @@
 #  @angular/platform-browser
 #  @angular/platform-browser-dynamic
 #  @angular/platform-webworker
-#  @angular/platform-webworker-dynamic
 # ================================================

 /packages/core/**                                               @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
@ -431,15 +398,6 @@
 /packages/platform-browser/**                                   @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
 /packages/platform-browser-dynamic/**                           @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
 /packages/platform-webworker/**                                 @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
-/packages/platform-webworker-dynamic/**                         @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
-
-/aio/content/guide/architecture-components.md                   @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
-/aio/content/guide/architecture-modules.md                      @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
-/aio/content/guide/architecture-next-steps.md                   @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
-/aio/content/guide/architecture-services.md                     @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
-/aio/content/guide/architecture.md                              @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
-/aio/content/examples/architecture/**                           @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
-/aio/content/images/guide/architecture/**                       @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes

 /aio/content/guide/attribute-directives.md                      @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
 /aio/content/examples/attribute-directives/**                   @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
@ -448,8 +406,6 @@
 /aio/content/guide/bootstrapping.md                             @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
 /aio/content/examples/bootstrapping/**                          @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes

-/aio/content/guide/cheatsheet.md                                @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
-
 /aio/content/guide/component-interaction.md                     @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
 /aio/content/examples/component-interaction/**                  @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
 /aio/content/images/guide/component-interaction/**              @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
@ -465,13 +421,7 @@
 /aio/content/examples/dependency-injection-in-action/**         @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
 /aio/content/images/guide/dependency-injection-in-action/**     @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes

-/aio/content/guide/dependency-injection-navtree.md              @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
-
-/aio/content/guide/dependency-injection-providers.md            @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
-
-/aio/content/guide/displaying-data.md                           @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
-/aio/content/examples/displaying-data/**                        @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
-/aio/content/images/guide/displaying-data/**                    @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/guide/dependency-injection-pattern.md              @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes

 /aio/content/guide/dynamic-component-loader.md                  @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
 /aio/content/examples/dynamic-component-loader/**               @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
@ -498,9 +448,12 @@
 /aio/content/images/guide/lifecycle-hooks/**                    @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes

 /aio/content/examples/ngcontainer/**                            @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/images/guide/ngcontainer/**                        @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes

 /aio/content/guide/ngmodules.md                                 @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
 /aio/content/examples/ngmodules/**                              @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/examples/ngmodule/**                               @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/images/guide/ngmodule/**                           @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes

 /aio/content/guide/ngmodule-api.md                              @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes

@ -512,8 +465,6 @@
 /aio/content/guide/module-types.md                              @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes

 /aio/content/guide/template-syntax.md                           @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
-/aio/content/examples/event-binding/**                          @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
-/aio/content/examples/interpolation/**                          @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
 /aio/content/examples/template-syntax/**                        @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
 /aio/content/images/guide/template-syntax/**                    @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes

@ -536,15 +487,10 @@
 /aio/content/examples/structural-directives/**                  @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
 /aio/content/images/guide/structural-directives/**              @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes

-/aio/content/guide/user-input.md                                @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
-/aio/content/examples/user-input/**                             @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
-/aio/content/images/guide/user-input/**                         @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
-


 # ================================================
 #  @angular/common/http
-#  @angular/http
 # ================================================

 /packages/common/http/**                                        @angular/fw-http @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
@ -565,7 +511,6 @@
 /aio/content/guide/elements.md                                  @angular/fw-elements @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes


-
 # ================================================
 #  @angular/forms
 # ================================================
@ -696,7 +641,6 @@ testing/**                                                      @angular/fw-test
 /packages/platform-browser/src/security/**                      @angular/fw-security
 /aio/content/guide/security.md                                  @angular/fw-security @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
 /aio/content/examples/security/**                               @angular/fw-security @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
-/aio/content/images/guide/security/**                           @angular/fw-security @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes



@ -727,14 +671,6 @@ testing/**                                                      @angular/fw-test
 /aio/tests/**                                                   @angular/docs-infra @angular/framework-global-approvers
 /aio/tools/**                                                   @angular/docs-infra @angular/framework-global-approvers

-# Hidden docs
-/aio/content/guide/change-log.md                                @angular/docs-infra @angular/framework-global-approvers
-/aio/content/guide/docs-style-guide.md                          @angular/docs-infra @angular/framework-global-approvers
-/aio/content/examples/docs-style-guide/**                       @angular/docs-infra @angular/framework-global-approvers
-/aio/content/images/guide/docs-style-guide/**                   @angular/docs-infra @angular/framework-global-approvers
-/aio/content/guide/visual-studio-2015.md                        @angular/docs-infra @angular/framework-global-approvers
-/aio/content/examples/visual-studio-2015/**                     @angular/docs-infra @angular/framework-global-approvers
-


 # ================================================
@ -742,17 +678,7 @@ testing/**                                                      @angular/fw-test
 # ================================================

 /aio/content/guide/quickstart.md                                @angular/fw-docs-intro @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
-/aio/content/examples/cli-quickstart/**                         @angular/fw-docs-intro @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
-/aio/content/images/guide/cli-quickstart/**                     @angular/fw-docs-intro @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
 /aio/content/tutorial/**                                        @angular/fw-docs-intro @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
-/aio/content/images/guide/toh/**                                @angular/fw-docs-intro @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
-/aio/content/examples/toh-pt0/**                                @angular/fw-docs-intro @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
-/aio/content/examples/toh-pt1/**                                @angular/fw-docs-intro @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
-/aio/content/examples/toh-pt2/**                                @angular/fw-docs-intro @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
-/aio/content/examples/toh-pt3/**                                @angular/fw-docs-intro @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
-/aio/content/examples/toh-pt4/**                                @angular/fw-docs-intro @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
-/aio/content/examples/toh-pt5/**                                @angular/fw-docs-intro @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
-/aio/content/examples/toh-pt6/**                                @angular/fw-docs-intro @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes



@ -760,15 +686,17 @@ testing/**                                                      @angular/fw-test
 #  Docs: observables
 # ================================================

-/aio/content/guide/observables.md                               @angular/fw-docs-observables @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
 /aio/content/examples/observables/**                            @angular/fw-docs-observables @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/images/guide/observables/**                        @angular/fw-docs-observables @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/guide/observables.md                               @angular/fw-docs-observables @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
 /aio/content/guide/comparing-observables.md                     @angular/fw-docs-observables @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
-/aio/content/guide/observables-in-angular.md                    @angular/fw-docs-observables @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
 /aio/content/examples/observables-in-angular/**                 @angular/fw-docs-observables @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
-/aio/content/guide/practical-observable-usage.md                @angular/fw-docs-observables @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/images/guide/observables-in-angular/**             @angular/fw-docs-observables @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/guide/observables-in-angular.md                    @angular/fw-docs-observables @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
 /aio/content/examples/practical-observable-usage/**             @angular/fw-docs-observables @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
-/aio/content/guide/rx-library.md                                @angular/fw-docs-observables @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/guide/practical-observable-usage.md                @angular/fw-docs-observables @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
 /aio/content/examples/rx-library/**                             @angular/fw-docs-observables @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/guide/rx-library.md                                @angular/fw-docs-observables @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes



@ -779,26 +707,12 @@ testing/**                                                      @angular/fw-test
 /aio/content/guide/npm-packages.md                              @angular/fw-docs-packaging @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
 /aio/content/guide/browser-support.md                           @angular/fw-docs-packaging @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
 /aio/content/guide/typescript-configuration.md                  @angular/fw-docs-packaging @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
-/aio/content/examples/quickstart/**                             @angular/fw-docs-packaging @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/guide/setup-systemjs-anatomy.md                    @angular/fw-docs-packaging @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
 /aio/content/guide/setup.md                                     @angular/fw-docs-packaging @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
 /aio/content/examples/setup/**                                  @angular/fw-docs-packaging @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
-/aio/content/guide/build.md                                     @angular/fw-docs-packaging @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
-/aio/content/images/guide/build/**                              @angular/fw-docs-packaging @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
 /aio/content/guide/deployment.md                                @angular/fw-docs-packaging @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
-/aio/content/guide/file-structure.md                            @angular/fw-docs-packaging @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
 /aio/content/guide/releases.md                                  @angular/fw-docs-packaging @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
 /aio/content/guide/updating.md                                  @angular/fw-docs-packaging @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
-/aio/content/guide/workspace-config.md                          @angular/fw-docs-packaging @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
-
-
-
-# ================================================
-#  Docs: libraries
-# ================================================
-
-/aio/content/guide/creating-libraries.md                        @angular/tools-docs-libraries @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
-/aio/content/guide/libraries.md                                 @angular/tools-docs-libraries @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
-/aio/content/guide/using-libraries.md                           @angular/tools-docs-libraries @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes



@ -807,13 +721,20 @@ testing/**                                                      @angular/fw-test
 # ================================================

 /aio/content/marketing/**                                       @angular/fw-docs-marketing @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
-/aio/content/images/bios/**                                     @angular/fw-docs-marketing @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
 /aio/content/images/marketing/**                                @angular/fw-docs-marketing @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
 /aio/content/navigation.json                                    @angular/fw-docs-marketing @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
 /aio/content/license.md                                         @angular/fw-docs-marketing @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes



+# ================================================
+#  Public API
+# ================================================
+
+/tools/public_api_guard/**                                      @angular/fw-public-api
+
+
+
 # ================================================
 #  Build & CI Owners
 # ================================================
@ -821,11 +742,8 @@ testing/**                                                      @angular/fw-test
 /*                                                              @angular/fw-dev-infra
 /.buildkite/**                                                  @angular/fw-dev-infra
 /.circleci/**                                                   @angular/fw-dev-infra
-/.codefresh/**                                                  @angular/fw-dev-infra
 /.github/**                                                     @angular/fw-dev-infra
-/.vscode/**                                                     @angular/fw-dev-infra
 /docs/BAZEL.md                                                  @angular/fw-dev-infra
-/packages/*                                                     @angular/fw-dev-infra
 /scripts/**                                                     @angular/fw-dev-infra
 /third_party/**                                                 @angular/fw-dev-infra
 /tools/**                                                       @angular/fw-dev-infra
@ -833,18 +751,6 @@ testing/**                                                      @angular/fw-test



-# ================================================
-#  Public API
-# ================================================
-
-/tools/public_api_guard/**                                      @angular/fw-public-api
-/aio/content/guide/glossary.md                                  @angular/fw-public-api
-/aio/content/guide/styleguide.md                                @angular/fw-public-api
-/aio/content/examples/styleguide/**                             @angular/fw-public-api
-/aio/content/images/guide/styleguide/**                         @angular/fw-public-api
-
-
-
 # ================================================
 #  CODEOWNERS Owners owners ...
 # ================================================
--- a/.github/ISSUE_TEMPLATE/1-bug-report.md
+++ b/.github/ISSUE_TEMPLATE/1-bug-report.md
@ -37,9 +37,7 @@ Please create and share minimal reproduction of the issue starting with this tem
 <!-- ✍️--> https://stackblitz.com/...

 <!--
-If StackBlitz is not suitable for reproduction of your issue, please create a minimal GitHub repository with the reproduction of the issue.
-A good way to make a minimal reproduction is to create a new app via `ng new repro-app` and add the minimum possible code to show the problem. 
-Share the link to the repo below along with step-by-step instructions to reproduce the problem, as well as expected and actual behavior.
+If StackBlitz is not suitable for reproduction of your issue, please create a minimal GitHub repository with the reproduction of the issue. Share the link to the repo below along with step-by-step instructions to reproduce the problem, as well as expected and actual behavior.

 Issues that don't have enough info and can't be reproduced will be closed.

--- a/.github/angular-robot.yml
+++ b/.github/angular-robot.yml
@ -56,9 +56,9 @@ merge:
      - "**/.gitkeep"
      - "**/yarn.lock"
      - "**/package.json"
-      - "**/third_party/**"
      - "**/tsconfig-build.json"
      - "**/tsconfig.json"
+      - "**/rollup.config.js"
      - "**/BUILD.bazel"
      - "**/*.md"
      - "packages/**/integrationtest/**"
@ -101,13 +101,9 @@ merge:

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

  # the comment that will be added when the merge label is added despite failing checks, leave empty or set to false to disable
  # {{MERGE_LABEL}} will be replaced by the value of the mergeLabel option
--- a/.gitignore
+++ b/.gitignore
@ -1,7 +1,7 @@
 .DS_STORE

 /dist/
-/bazel-out/
+/bazel-*
 /integration/bazel/bazel-*
 e2e_test.*
 node_modules
@ -13,9 +13,9 @@ pubspec.lock
 .c9
 .idea/
 .settings/
-.vscode/launch.json
 *.swo
 modules/.settings
+.vscode
 modules/.vscode

 # Don't check in secret files
--- a/.travis.yml
+++ b/.travis.yml
@ -0,0 +1,66 @@
+language: node_js
+sudo: false
+dist: trusty
+node_js:
+  - '10.9.0'
+
+addons:
+#  firefox: "38.0"
+  apt:
+    sources:
+      # needed to install g++ that is used by npms's native modules
+      - ubuntu-toolchain-r-test
+    packages:
+      # needed to install g++ that is used by npms's native modules
+      - g++-4.8
+
+branches:
+  except:
+    - g3
+
+cache:
+  yarn: true
+  directories:
+     - ./node_modules
+     - ./.chrome/chromium
+     - ./aio/node_modules
+
+env:
+  global:
+    # GITHUB_TOKEN_ANGULAR=<github token, a personal access token of the angular-builds account, account access in valentine>
+    # This is needed for the e2e Travis matrix task to publish packages to github for continuous packages delivery.
+    - secure: "aCdHveZuY8AT4Jr1JoJB4LxZsnGWRe/KseZh1YXYe5UtufFCtTVHvUcLn0j2aLBF0KpdyS+hWf0i4np9jthKu2xPKriefoPgCMpisYeC0MFkwbmv+XlgkUbgkgVZMGiVyX7DCYXVahxIoOUjVMEDCbNiHTIrfEuyq24U3ok2tHc="
+  matrix:
+    # Order: a slower build first, so that we don't occupy an idle travis worker waiting for others to complete.
+    - CI_MODE=e2e
+    - CI_MODE=js
+    - CI_MODE=saucelabs_required
+    # deactivated, see #19768
+    # - CI_MODE=browserstack_required
+
+    # We disable these optional jobs because those acquire tunnel and browser instances which
+    # could lead to rate limit excess while those are failing most of the time and nobody pays
+    # attention anyway.
+    # - CI_MODE=saucelabs_optional
+    # - CI_MODE=browserstack_optional
+
+matrix:
+  fast_finish: true
+  allow_failures:
+    - env: "CI_MODE=saucelabs_optional"
+    - env: "CI_MODE=browserstack_optional"
+
+before_install:
+  # source the env.sh script so that the exported variables are available to other scripts later on
+  - source ./scripts/ci/env.sh print
+
+install:
+  - ./scripts/ci/install.sh
+
+script:
+  - ./scripts/ci/build.sh
+  - ./scripts/ci/test.sh
+  - ./scripts/ci/angular.sh
+  # all the scripts under this line will not quickly abort in case ${TRAVIS_TEST_RESULT} is 1 (job failure)
+  - ./scripts/ci/cleanup.sh
+  - ./scripts/ci/print-logs.sh
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@ -1,12 +0,0 @@
-{
-  // See http://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
-  // Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
-
-  // List of extensions which should be recommended for users of this workspace.
-  "recommendations": [
-    "devondcarew.bazel-code",
-    "gkalpak.aio-docs-utils",
-    "ms-vscode.vscode-typescript-tslint-plugin",
-    "xaver.clang-format",
-  ],
-}
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -1,27 +0,0 @@
-{
-  "[javascript]": {
-    "editor.formatOnSave": true,
-  },
-  "[typescript]": {
-    "editor.formatOnSave": true,
-  },
-  // Please install https://marketplace.visualstudio.com/items?itemName=xaver.clang-format to take advantage of `clang-format` in VSCode.
-  // (See https://clang.llvm.org/docs/ClangFormat.html for more info `clang-format`.)
-  "clang-format.executable": "${workspaceRoot}/node_modules/.bin/clang-format",
-  "files.watcherExclude": {
-    "**/.git/objects/**": true,
-    "**/.git/subtree-cache/**": true,
-    "**/node_modules/**": true,
-    "**/bazel-out/**": true,
-    "**/dist/**": true,
-    "**/aio/src/generated/**": true,
-  },
-  "search.exclude": {
-    "**/node_modules": true,
-    "**/bower_components": true,
-    "**/bazel-out": true,
-    "**/dist": true,
-    "**/aio/src/generated": true,
-  },
-  "git.ignoreLimitWarning": true,
-}
--- a/BUILD.bazel
+++ b/BUILD.bazel
@ -1,5 +1,7 @@
 package(default_visibility = ["//visibility:public"])

+load("@build_bazel_rules_nodejs//:defs.bzl", "node_modules_filegroup")
+
 exports_files([
    "tsconfig.json",
    "LICENSE",
@ -10,10 +12,10 @@ filegroup(
    name = "web_test_bootstrap_scripts",
    # do not sort
    srcs = [
-        "@npm//node_modules/reflect-metadata:Reflect.js",
-        "@npm//node_modules/zone.js:dist/zone.js",
-        "@npm//node_modules/zone.js:dist/zone-testing.js",
-        "@npm//node_modules/zone.js:dist/task-tracking.js",
+        "@ngdeps//node_modules/reflect-metadata:Reflect.js",
+        "@ngdeps//node_modules/zone.js:dist/zone.js",
+        "@ngdeps//node_modules/zone.js:dist/zone-testing.js",
+        "@ngdeps//node_modules/zone.js:dist/task-tracking.js",
        "//:test-events.js",
    ],
 )
@ -23,14 +25,32 @@ filegroup(
    srcs = [
        # We also declare the unminfied AngularJS files since these can be used for
        # local debugging (e.g. see: packages/upgrade/test/common/test_helpers.ts)
-        "@npm//node_modules/angular:angular.js",
-        "@npm//node_modules/angular:angular.min.js",
-        "@npm//node_modules/angular-1.5:angular.js",
-        "@npm//node_modules/angular-1.5:angular.min.js",
-        "@npm//node_modules/angular-1.6:angular.js",
-        "@npm//node_modules/angular-1.6:angular.min.js",
-        "@npm//node_modules/angular-mocks:angular-mocks.js",
-        "@npm//node_modules/angular-mocks-1.5:angular-mocks.js",
-        "@npm//node_modules/angular-mocks-1.6:angular-mocks.js",
+        "@ngdeps//node_modules/angular:angular.js",
+        "@ngdeps//node_modules/angular:angular.min.js",
+        "@ngdeps//node_modules/angular-1.5:angular.js",
+        "@ngdeps//node_modules/angular-1.5:angular.min.js",
+        "@ngdeps//node_modules/angular-1.6:angular.js",
+        "@ngdeps//node_modules/angular-1.6:angular.min.js",
+        "@ngdeps//node_modules/angular-mocks:angular-mocks.js",
+        "@ngdeps//node_modules/angular-mocks-1.5:angular-mocks.js",
+        "@ngdeps//node_modules/angular-mocks-1.6:angular-mocks.js",
    ],
 )
+
+load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary")
+
+# A nodejs_binary for @angular/bazel/ngc-wrapped to use by default in
+# ng_module that depends on @npm//@angular/bazel instead of the
+# output of the //packages/bazel/src/ngc-wrapped ts_library rule. This
+# default is for downstream users that depend on the @angular/bazel npm
+# package. The generated @npm//@angular/bazel/ngc-wrapped target
+# does not work because it does not have the node `--expose-gc` flag
+# set which is required to support the call to `global.gc()`.
+nodejs_binary(
+    name = "@angular/bazel/ngc-wrapped",
+    configuration_env_vars = ["compile"],
+    data = ["@npm//@angular/bazel"],
+    entry_point = "@angular/bazel/src/ngc-wrapped/index.js",
+    install_source_map_support = False,
+    templated_args = ["--node_options=--expose-gc"],
+)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,195 +1,27 @@
-<a name="7.2.10"></a>
-## [7.2.10](https://github.com/angular/angular/compare/7.2.9...7.2.10) (2019-03-20)
-
-
-### Bug Fixes
-
-* **compiler-cli:** incorrect metadata bundle for multiple unnamed re-exports ([#29360](https://github.com/angular/angular/issues/29360)) ([cf8d934](https://github.com/angular/angular/commit/cf8d934)), closes [/github.com/angular/material2/blob/master/tools/package-tools/build-release.ts#L78-L85](https://github.com//github.com/angular/material2/blob/master/tools/package-tools/build-release.ts/issues/L78-L85)
-
-
-
-<a name="7.2.9"></a>
-## [7.2.9](https://github.com/angular/angular/compare/7.2.8...7.2.9) (2019-03-12)
-
-This release contains various API docs improvements.
-
-<a name="7.2.8"></a>
-## [7.2.8](https://github.com/angular/angular/compare/7.2.7...7.2.8) (2019-03-06)
-
-
-### Bug Fixes
-
-* **animations:** ensure `position` and `display` styles are handled outside of keyframes/web-animations ([#28911](https://github.com/angular/angular/issues/28911)) ([86981b3](https://github.com/angular/angular/commit/86981b3)), closes [#24923](https://github.com/angular/angular/issues/24923) [#25635](https://github.com/angular/angular/issues/25635)
-* **router:** removed obsolete TODO comment ([#29085](https://github.com/angular/angular/issues/29085)) ([2a25ac2](https://github.com/angular/angular/commit/2a25ac2))
-* **service-worker:** detect new version even if files are identical to an old one ([#26006](https://github.com/angular/angular/issues/26006)) ([5669333](https://github.com/angular/angular/commit/5669333)), closes [#24338](https://github.com/angular/angular/issues/24338)
-* **service-worker:** ignore passive mixed content requests ([#25994](https://github.com/angular/angular/issues/25994)) ([b598e88](https://github.com/angular/angular/commit/b598e88)), closes [/github.com/angular/angular/issues/23012#issuecomment-376430187](https://github.com//github.com/angular/angular/issues/23012/issues/issuecomment-376430187) [#23012](https://github.com/angular/angular/issues/23012)
-
-
-
-<a name="7.2.7"></a>
-## [7.2.7](https://github.com/angular/angular/compare/7.2.6...7.2.7) (2019-02-27)
-
-
-### Bug Fixes
-
-* **bazel:** pin browser repositories using [@npm](https://github.com/npm)_bazel_karma//:browser_repositories.bzl in bazel schematics ([#28896](https://github.com/angular/angular/issues/28896)) ([b686449](https://github.com/angular/angular/commit/b686449))
-* **core:** traverse and sanitize content of unsafe elements ([#28804](https://github.com/angular/angular/issues/28804)) ([fdcf877](https://github.com/angular/angular/commit/fdcf877)), closes [#25879](https://github.com/angular/angular/issues/25879) [#25879](https://github.com/angular/angular/issues/25879) [#26007](https://github.com/angular/angular/issues/26007) [#28427](https://github.com/angular/angular/issues/28427)
-* **language-service:** Fix completions for input/output with alias ([#28904](https://github.com/angular/angular/issues/28904)) ([d0018e6](https://github.com/angular/angular/commit/d0018e6)), closes [#27959](https://github.com/angular/angular/issues/27959)
-
-
-
-<a name="7.2.6"></a>
-## [7.2.6](https://github.com/angular/angular/compare/7.2.5...7.2.6) (2019-02-20)
-
-
-### Bug Fixes
-
-* **compiler-cli:** incorrect bundled metadata for static class member call expressions ([#28762](https://github.com/angular/angular/issues/28762)) ([ab69c31](https://github.com/angular/angular/commit/ab69c31)), closes [/github.com/angular/angular/blob/master/packages/core/src/change_detection/differs/keyvalue_differs.ts#L121](https://github.com//github.com/angular/angular/blob/master/packages/core/src/change_detection/differs/keyvalue_differs.ts/issues/L121) [#28741](https://github.com/angular/angular/issues/28741)
-
-
-
-<a name="7.2.5"></a>
-## [7.2.5](https://github.com/angular/angular/compare/7.2.4...7.2.5) (2019-02-15)
-
-
-### Bug Fixes
-
-* **compiler-cli:** diagnostics should respect "newLine" compiler option ([#28550](https://github.com/angular/angular/issues/28550)) ([ce750e6](https://github.com/angular/angular/commit/ce750e6))
-* **router:** redirect to root url when returned as UrlTree from guard ([#28271](https://github.com/angular/angular/issues/28271)) ([1e58a21](https://github.com/angular/angular/commit/1e58a21)), closes [#27845](https://github.com/angular/angular/issues/27845)
-* **router:** set href when routerLink is used on an 'area' element ([#28441](https://github.com/angular/angular/issues/28441)) ([d491a20](https://github.com/angular/angular/commit/d491a20)), closes [#28401](https://github.com/angular/angular/issues/28401)
-
-
-
-<a name="7.2.4"></a>
-## [7.2.4](https://github.com/angular/angular/compare/7.2.3...7.2.4) (2019-02-06)
-
-
-### Bug Fixes
-
-* **bazel:** Bazel builder resolves with require.resolve() ([#28478](https://github.com/angular/angular/issues/28478)) ([d85d396](https://github.com/angular/angular/commit/d85d396))
-* **bazel:** fix integration test for bazel-schematics ([#28460](https://github.com/angular/angular/issues/28460)) ([449da8c](https://github.com/angular/angular/commit/449da8c))
-
-
-### Performance Improvements
-
-* pngcrush all pngs ([#28479](https://github.com/angular/angular/issues/28479)) ([1a25144](https://github.com/angular/angular/commit/1a25144)), closes [#18243](https://github.com/angular/angular/issues/18243)
-
-
-
-<a name="7.2.3"></a>
-## [7.2.3](https://github.com/angular/angular/compare/7.2.2...7.2.3) (2019-01-30)
-
-
-### Bug Fixes
-
-* **bazel:** add [@npm](https://github.com/npm)//tslib dep to e2e ts_library target in bazel-workspace schematic ([#28358](https://github.com/angular/angular/issues/28358)) ([8cee56e](https://github.com/angular/angular/commit/8cee56e))
-* **bazel:** Bazel-workspace schematics should run in ScopedTree ([#28349](https://github.com/angular/angular/issues/28349)) ([260ac20](https://github.com/angular/angular/commit/260ac20))
-* **bazel:** Builder should invoke local bazel/iblaze ([#28303](https://github.com/angular/angular/issues/28303)) ([12b8a6e](https://github.com/angular/angular/commit/12b8a6e))
-* **bazel:** ng-new should run yarn install ([#28381](https://github.com/angular/angular/issues/28381)) ([a9d46e4](https://github.com/angular/angular/commit/a9d46e4))
-
-
-### Performance Improvements
-
-* yarn version upgrade ([#28360](https://github.com/angular/angular/issues/28360)) ([cc1b2a5](https://github.com/angular/angular/commit/cc1b2a5))
-
-
-
-<a name="7.2.2"></a>
-## [7.2.2](https://github.com/angular/angular/compare/7.2.1...7.2.2) (2019-01-22)
-
-
-### Bug Fixes
-
-* **bazel:** Fix integration test after v8 bump ([#28194](https://github.com/angular/angular/issues/28194)) ([7b772e9](https://github.com/angular/angular/commit/7b772e9)), closes [#28142](https://github.com/angular/angular/issues/28142)
-* **router:** `skipLocationChange` with named outlets ([#28301](https://github.com/angular/angular/issues/28301)) ([32737a6](https://github.com/angular/angular/commit/32737a6)), closes [#27680](https://github.com/angular/angular/issues/27680) [#28200](https://github.com/angular/angular/issues/28200)
-
-
-### Features
-
-* **bazel:** Add support for SASS ([#28167](https://github.com/angular/angular/issues/28167)) ([a4d9192](https://github.com/angular/angular/commit/a4d9192))
-* **compiler-cli:** resolve generated Sass/Less files to .css inputs ([#28166](https://github.com/angular/angular/issues/28166)) ([4c00059](https://github.com/angular/angular/commit/4c00059))
-
-
-
-<a name="7.2.1"></a>
-## [7.2.1](https://github.com/angular/angular/compare/7.2.0...7.2.1) (2019-01-16)
-
-
-### Bug Fixes
-
-* **bazel:** Add [@bazel](https://github.com/bazel)/bazel to dev deps ([#28032](https://github.com/angular/angular/issues/28032)) ([21093b9](https://github.com/angular/angular/commit/21093b9))
-* **bazel:** Add /bazel-out to .gitignore ([#27874](https://github.com/angular/angular/issues/27874)) ([e4fc8ba](https://github.com/angular/angular/commit/e4fc8ba))
-* **bazel:** Add ibazel to deps of Bazel project ([#28090](https://github.com/angular/angular/issues/28090)) ([28d34b6](https://github.com/angular/angular/commit/28d34b6))
-* **bazel:** Bazel schematics should add router package ([#28141](https://github.com/angular/angular/issues/28141)) ([02a852a](https://github.com/angular/angular/commit/02a852a))
-* **bazel:** flat module misses AMD module name on windows ([#27839](https://github.com/angular/angular/issues/27839)) ([c3d8e28](https://github.com/angular/angular/commit/c3d8e28))
-* **bazel:** incorrectly always uses ngc-wrapped from "npm" workspace ([#28137](https://github.com/angular/angular/issues/28137)) ([ca3965a](https://github.com/angular/angular/commit/ca3965a))
-* **bazel:** ng_package creates invalid typings reexport on windows ([#27829](https://github.com/angular/angular/issues/27829)) ([6b394f6](https://github.com/angular/angular/commit/6b394f6))
-* **bazel:** packager not properly removing amd directives on windows ([#27829](https://github.com/angular/angular/issues/27829)) ([fad4145](https://github.com/angular/angular/commit/fad4145))
-* **bazel:** protractor rule does not run spec files with underscore ([#28022](https://github.com/angular/angular/issues/28022)) ([f05c5f8](https://github.com/angular/angular/commit/f05c5f8))
-* **bazel:** protractor utils cannot start server on windows ([#27915](https://github.com/angular/angular/issues/27915)) ([0be8487](https://github.com/angular/angular/commit/0be8487))
-* **bazel:** replay compilation uses wrong compiler for building esm5 ([#28053](https://github.com/angular/angular/issues/28053)) ([fbbdaaa](https://github.com/angular/angular/commit/fbbdaaa))
-* **router:** ensure URL is updated after second redirect with UrlUpdateStrategy="eager" ([#27680](https://github.com/angular/angular/issues/27680)) ([6ae7aee](https://github.com/angular/angular/commit/6ae7aee)), closes [#27116](https://github.com/angular/angular/issues/27116)
-* **service-worker:** navigation urls backwards compatibility ([#27244](https://github.com/angular/angular/issues/27244)) ([585e871](https://github.com/angular/angular/commit/585e871))
-
-
-### Performance Improvements
-
-* **platform-server:** use shared `DomElementSchemaRegistry` instance ([#28150](https://github.com/angular/angular/issues/28150)) ([#28151](https://github.com/angular/angular/issues/28151)) ([6851581](https://github.com/angular/angular/commit/6851581))
-
-
-
-<a name="7.2.0"></a>
-# [7.2.0](https://github.com/angular/angular/compare/7.1.4...7.2.0) (2019-01-07)
-
-7.2.0 release also contains all the fixes released in 7.1.4.
-
-### Features
-
-* add support for typescript 3.2 ([#27536](https://github.com/angular/angular/issues/27536)) ([17e702b](https://github.com/angular/angular/commit/17e702b))
-* **bazel:** ng-new schematics with Bazel ([#27277](https://github.com/angular/angular/issues/27277)) ([06d4a0c](https://github.com/angular/angular/commit/06d4a0c))
-* **forms:** match getError and hasError to get method signature ([#20211](https://github.com/angular/angular/issues/20211)) ([1b0b36d](https://github.com/angular/angular/commit/1b0b36d))
-* **router:** add predicate function  mode for runGuardsAndResolvers ([#27682](https://github.com/angular/angular/issues/27682)) ([12c3176](https://github.com/angular/angular/commit/12c3176)), closes [#26861](https://github.com/angular/angular/issues/26861) [#18253](https://github.com/angular/angular/issues/18253) [#27464](https://github.com/angular/angular/issues/27464)
-* **router:** add a Navigation type available during navigation ([#27198](https://github.com/angular/angular/issues/27198)) ([d40af0c](https://github.com/angular/angular/commit/d40af0c))
-* **router:** add pathParamsOrQueryParamsChange mode for runGuardsAndResolvers ([#27464](https://github.com/angular/angular/issues/27464)) ([d70a7f3](https://github.com/angular/angular/commit/d70a7f3)), closes [#26861](https://github.com/angular/angular/issues/26861) [#18253](https://github.com/angular/angular/issues/18253)
-* **router:** allow passing `state` to routerLink directives ([#27198](https://github.com/angular/angular/issues/27198)) ([73f6ed9](https://github.com/angular/angular/commit/73f6ed9)), closes [#24617](https://github.com/angular/angular/issues/24617)
-* **router:** allow passing state to `NavigationExtras` ([#27198](https://github.com/angular/angular/issues/27198)) ([67f4a5d](https://github.com/angular/angular/commit/67f4a5d))
-* **router:** restore whole object when navigating back to a page managed by Angular router ([#27198](https://github.com/angular/angular/issues/27198)) ([2684249](https://github.com/angular/angular/commit/2684249))
+<a name="7.2.0-rc.0"></a>
+# [7.2.0-rc.0](https://github.com/angular/angular/compare/7.2.0-beta.2...7.2.0-rc.0) (2018-12-18)


 ### Bug Fixes

 * **animations:** do not truncate decimals for delay ([#24455](https://github.com/angular/angular/issues/24455)) ([f1c9d6a](https://github.com/angular/angular/commit/f1c9d6a))
 * **animations:** mark actual descendant node as disabled ([#26180](https://github.com/angular/angular/issues/26180)) ([df123e0](https://github.com/angular/angular/commit/df123e0))
-* **bazel:** unable to launch protractor test on windows ([#27850](https://github.com/angular/angular/issues/27850)) ([1e6c9be](https://github.com/angular/angular/commit/1e6c9be))
 * **bazel:** devserver entry_module should have underscore name ([#27719](https://github.com/angular/angular/issues/27719)) ([f57916c](https://github.com/angular/angular/commit/f57916c))
 * **bazel:** emit full node stack traces when Angular compilation crashes ([#27678](https://github.com/angular/angular/issues/27678)) ([522919a](https://github.com/angular/angular/commit/522919a))
 * **bazel:** fix major/minor semver check between [@angular](https://github.com/angular)/bazel npm packager version and angular bazel repo version ([#27635](https://github.com/angular/angular/issues/27635)) ([1cc08b4](https://github.com/angular/angular/commit/1cc08b4))
 * **bazel:** Load http_archive and rules_nodejs dependencies ([#27609](https://github.com/angular/angular/issues/27609)) ([8313ffc](https://github.com/angular/angular/commit/8313ffc))
 * **bazel:** ng_package writes unrelevant definitions to bazel out ([#27519](https://github.com/angular/angular/issues/27519)) ([44dfa60](https://github.com/angular/angular/commit/44dfa60)), closes [/github.com/angular/angular/blob/4f9374951d67c75f67a31c110bd61ab72563db7d/packages/bazel/src/ng_package/packager.ts#L105-L124](https://github.com//github.com/angular/angular/blob/4f9374951d67c75f67a31c110bd61ab72563db7d/packages/bazel/src/ng_package/packager.ts/issues/L105-L124)
 * **bazel:** Set module_name and enable ng test ([#27715](https://github.com/angular/angular/issues/27715)) ([85866de](https://github.com/angular/angular/commit/85866de))
-* **bazel:** fix TS errors in the `schematics/bazel-workspace` files ([#27600](https://github.com/angular/angular/issues/27600)) ([3290fc3](https://github.com/angular/angular/commit/3290fc3))
-* **bazel:** Read latest versions from latest-versions.ts & use semver check ([#27526](https://github.com/angular/angular/issues/27526)) ([30a3b49](https://github.com/angular/angular/commit/30a3b49))
-* **bazel:** tsickle dependency not working with typescript 3.1.x ([#27402](https://github.com/angular/angular/issues/27402)) ([f034114](https://github.com/angular/angular/commit/f034114))
-* **bazel:** do not throw error when writing tsickle externs ([#27200](https://github.com/angular/angular/issues/27200)) ([20a2bae](https://github.com/angular/angular/commit/20a2bae))
-* **bazel:** do not throw if ts compile action does not create esm5 outputs ([#27401](https://github.com/angular/angular/issues/27401)) ([c61a8b7](https://github.com/angular/angular/commit/c61a8b7))
-* **bazel:** ng_package cannot be run multiple times without clean ([#27200](https://github.com/angular/angular/issues/27200)) ([4f93749](https://github.com/angular/angular/commit/4f93749))
-* **bazel:** ng_package not generating UMD bundles on windows ([#27200](https://github.com/angular/angular/issues/27200)) ([7d59880](https://github.com/angular/angular/commit/7d59880))
-* **bazel:** ng_package should correctly map to source maps in secondary entry-points ([#27313](https://github.com/angular/angular/issues/27313)) ([eb17502](https://github.com/angular/angular/commit/eb17502)), closes [#25510](https://github.com/angular/angular/issues/25510)
-* **bazel:** Respect existing angular installation ([#27495](https://github.com/angular/angular/issues/27495)) ([4da739a](https://github.com/angular/angular/commit/4da739a))
 * **common:** KeyValuePipe should return empty array for empty objects ([#27258](https://github.com/angular/angular/issues/27258)) ([b39efdd](https://github.com/angular/angular/commit/b39efdd))
-* **common:** expose request url in network error ([#27143](https://github.com/angular/angular/issues/27143)) ([1db53da](https://github.com/angular/angular/commit/1db53da)), closes [#27029](https://github.com/angular/angular/issues/27029)
 * **compiler-cli:** create LiteralLikeNode for String and Number literal ([#27536](https://github.com/angular/angular/issues/27536)) ([2c9b6c0](https://github.com/angular/angular/commit/2c9b6c0))
-* **compiler-cli:** flatModuleIndex files not generated on windows with multiple input files ([#27200](https://github.com/angular/angular/issues/27200)) ([d3c08e7](https://github.com/angular/angular/commit/d3c08e7))
-* **core:** export a value for InjectFlags ([#27279](https://github.com/angular/angular/issues/27279)) ([23b06af](https://github.com/angular/angular/commit/23b06af)), closes [#27251](https://github.com/angular/angular/issues/27251)
-* **core:** More precise return type for `InjectableDecorator` ([#27360](https://github.com/angular/angular/issues/27360)) ([4b9948c](https://github.com/angular/angular/commit/4b9948c)), closes [#26942](https://github.com/angular/angular/issues/26942)
-* **forms:** typed argument for FormBuilder group ([#26985](https://github.com/angular/angular/issues/26985)) ([b0c7561](https://github.com/angular/angular/commit/b0c7561))
-* **platform-server:** add [@angular](https://github.com/angular)/http to the list of peerDependencies ([#27307](https://github.com/angular/angular/issues/27307)) ([32c5be9](https://github.com/angular/angular/commit/32c5be9)), closes [#26154](https://github.com/angular/angular/issues/26154)
 * **router:** ensure URL is updated after second redirect with UrlUpdateStrategy="eager" ([#27523](https://github.com/angular/angular/issues/27523)) ([ad26cd6](https://github.com/angular/angular/commit/ad26cd6)), closes [#27116](https://github.com/angular/angular/issues/27116)
-* **router:** update URL after redirects when urlHandlingStrategy='eager' ([#27356](https://github.com/angular/angular/issues/27356)) ([11a8bd8](https://github.com/angular/angular/commit/11a8bd8)), closes [#27076](https://github.com/angular/angular/issues/27076)
-* **upgrade:** allow nesting components from different downgraded modules ([#27217](https://github.com/angular/angular/issues/27217)) ([bc0ee01](https://github.com/angular/angular/commit/bc0ee01))
-* **upgrade:** correctly handle nested downgraded components with `downgradeModule()` ([#27217](https://github.com/angular/angular/issues/27217)) ([326b464](https://github.com/angular/angular/commit/326b464)), closes [#22581](https://github.com/angular/angular/issues/22581) [#22869](https://github.com/angular/angular/issues/22869) [#27083](https://github.com/angular/angular/issues/27083)
 * **upgrade:** upgrade Directive facade should not return different instance from constructor ([#27660](https://github.com/angular/angular/issues/27660)) ([c986d3d](https://github.com/angular/angular/commit/c986d3d))
-* **upgrade:** don't rely upon the runtime to resolve forward refs ([#27132](https://github.com/angular/angular/issues/27132)) ([a4462c2](https://github.com/angular/angular/commit/a4462c2))
+
+
+### Features
+
+* add support for typescript 3.2 ([#27536](https://github.com/angular/angular/issues/27536)) ([17e702b](https://github.com/angular/angular/commit/17e702b))
+* **router:** add predicate function  mode for runGuardsAndResolvers ([#27682](https://github.com/angular/angular/issues/27682)) ([12c3176](https://github.com/angular/angular/commit/12c3176)), closes [#26861](https://github.com/angular/angular/issues/26861) [#18253](https://github.com/angular/angular/issues/18253) [#27464](https://github.com/angular/angular/issues/27464)



@ -212,6 +44,19 @@ This release contains various API docs improvements.



+<a name="7.2.0-beta.2"></a>
+# [7.2.0-beta.2](https://github.com/angular/angular/compare/7.2.0-beta.1...7.2.0-beta.2) (2018-12-11)
+
+
+### Bug Fixes
+
+* **bazel:** fix TS errors in the `schematics/bazel-workspace` files ([#27600](https://github.com/angular/angular/issues/27600)) ([3290fc3](https://github.com/angular/angular/commit/3290fc3))
+* **bazel:** Read latest versions from latest-versions.ts & use semver check ([#27526](https://github.com/angular/angular/issues/27526)) ([30a3b49](https://github.com/angular/angular/commit/30a3b49))
+* **bazel:** tsickle dependency not working with typescript 3.1.x ([#27402](https://github.com/angular/angular/issues/27402)) ([f034114](https://github.com/angular/angular/commit/f034114))
+* **forms:** typed argument for FormBuilder group ([#26985](https://github.com/angular/angular/issues/26985)) ([b0c7561](https://github.com/angular/angular/commit/b0c7561))
+
+
+
 <a name="7.1.3"></a>
 ## [7.1.3](https://github.com/angular/angular/compare/7.1.2...7.1.3) (2018-12-11)

@ -238,6 +83,47 @@ This release contains various API docs improvements.
 * **platform-server:** add [@angular](https://github.com/angular)/http to the list of peerDependencies ([#27307](https://github.com/angular/angular/issues/27307)) ([236ac06](https://github.com/angular/angular/commit/236ac06)), closes [#26154](https://github.com/angular/angular/issues/26154)


+<a name="7.2.0-beta.1"></a>
+# [7.2.0-beta.1](https://github.com/angular/angular/compare/7.1.0...7.2.0-beta.1) (2018-12-06)
+
+
+### Bug Fixes
+
+* **bazel:** do not throw error when writing tsickle externs ([#27200](https://github.com/angular/angular/issues/27200)) ([20a2bae](https://github.com/angular/angular/commit/20a2bae))
+* **bazel:** do not throw if ts compile action does not create esm5 outputs ([#27401](https://github.com/angular/angular/issues/27401)) ([c61a8b7](https://github.com/angular/angular/commit/c61a8b7))
+* **bazel:** ng_package cannot be run multiple times without clean ([#27200](https://github.com/angular/angular/issues/27200)) ([4f93749](https://github.com/angular/angular/commit/4f93749))
+* **bazel:** ng_package not generating UMD bundles on windows ([#27200](https://github.com/angular/angular/issues/27200)) ([7d59880](https://github.com/angular/angular/commit/7d59880))
+* **bazel:** ng_package should correctly map to source maps in secondary entry-points ([#27313](https://github.com/angular/angular/issues/27313)) ([eb17502](https://github.com/angular/angular/commit/eb17502)), closes [#25510](https://github.com/angular/angular/issues/25510)
+* **bazel:** Respect existing angular installation ([#27495](https://github.com/angular/angular/issues/27495)) ([4da739a](https://github.com/angular/angular/commit/4da739a))
+* **common:** expose request url in network error ([#27143](https://github.com/angular/angular/issues/27143)) ([1db53da](https://github.com/angular/angular/commit/1db53da)), closes [#27029](https://github.com/angular/angular/issues/27029)
+* **compiler-cli:** flatModuleIndex files not generated on windows with multiple input files ([#27200](https://github.com/angular/angular/issues/27200)) ([d3c08e7](https://github.com/angular/angular/commit/d3c08e7))
+* **core:** export a value for InjectFlags ([#27279](https://github.com/angular/angular/issues/27279)) ([23b06af](https://github.com/angular/angular/commit/23b06af)), closes [#27251](https://github.com/angular/angular/issues/27251)
+* **core:** More precise return type for `InjectableDecorator` ([#27360](https://github.com/angular/angular/issues/27360)) ([4b9948c](https://github.com/angular/angular/commit/4b9948c)), closes [#26942](https://github.com/angular/angular/issues/26942)
+* **forms:** apply unicode flag to pattern attribute when supported ([#20819](https://github.com/angular/angular/issues/20819)) ([3c34b8b](https://github.com/angular/angular/commit/3c34b8b))
+* **platform-server:** add [@angular](https://github.com/angular)/http to the list of peerDependencies ([#27307](https://github.com/angular/angular/issues/27307)) ([32c5be9](https://github.com/angular/angular/commit/32c5be9)), closes [#26154](https://github.com/angular/angular/issues/26154)
+* **router:** update URL after redirects when urlHandlingStrategy='eager' ([#27356](https://github.com/angular/angular/issues/27356)) ([11a8bd8](https://github.com/angular/angular/commit/11a8bd8)), closes [#27076](https://github.com/angular/angular/issues/27076)
+* **upgrade:** don't rely upon the runtime to resolve forward refs ([#27132](https://github.com/angular/angular/issues/27132)) ([a4462c2](https://github.com/angular/angular/commit/a4462c2))
+
+
+### Features
+
+* **bazel:** ng-new schematics with Bazel ([#27277](https://github.com/angular/angular/issues/27277)) ([06d4a0c](https://github.com/angular/angular/commit/06d4a0c))
+* **router:** add a Navigation type available during navigation ([#27198](https://github.com/angular/angular/issues/27198)) ([d40af0c](https://github.com/angular/angular/commit/d40af0c))
+* **router:** add pathParamsOrQueryParamsChange mode for runGuardsAndResolvers ([#27464](https://github.com/angular/angular/issues/27464)) ([d70a7f3](https://github.com/angular/angular/commit/d70a7f3)), closes [#26861](https://github.com/angular/angular/issues/26861) [#18253](https://github.com/angular/angular/issues/18253)
+* **router:** allow passing `state` to routerLink directives ([#27198](https://github.com/angular/angular/issues/27198)) ([73f6ed9](https://github.com/angular/angular/commit/73f6ed9)), closes [#24617](https://github.com/angular/angular/issues/24617)
+* **router:** allow passing state to `NavigationExtras` ([#27198](https://github.com/angular/angular/issues/27198)) ([67f4a5d](https://github.com/angular/angular/commit/67f4a5d))
+* **router:** restore whole  object when navigating back to a page managed by Angular router ([#27198](https://github.com/angular/angular/issues/27198)) ([2684249](https://github.com/angular/angular/commit/2684249))
+
+<a name="7.2.0-beta.0"></a>
+# [7.2.0-beta.0](https://github.com/angular/angular/compare/7.1.0...7.2.0-beta.0) (2018-11-28)
+
+
+### Bug Fixes
+
+* **common:** expose request url in network error ([#27143](https://github.com/angular/angular/issues/27143)) ([1db53da](https://github.com/angular/angular/commit/1db53da)), closes [#27029](https://github.com/angular/angular/issues/27029)
+* **upgrade:** don't rely upon the runtime to resolve forward refs ([#27132](https://github.com/angular/angular/issues/27132)) ([a4462c2](https://github.com/angular/angular/commit/a4462c2))
+
+

 <a name="7.1.1"></a>
 ## [7.1.1](https://github.com/angular/angular/compare/7.1.0...7.1.1) (2018-11-28)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -191,7 +191,7 @@ If the commit reverts a previous commit, it should begin with `revert: `, follow
 Must be one of the following:

 * **build**: Changes that affect the build system or external dependencies (example scopes: gulp, broccoli, npm)
-* **ci**: Changes to our CI configuration files and scripts (example scopes: Circle, BrowserStack, SauceLabs)
+* **ci**: Changes to our CI configuration files and scripts (example scopes: Travis, Circle, BrowserStack, SauceLabs)
 * **docs**: Documentation only changes
 * **feat**: A new feature
 * **fix**: A bug fix
--- a/2
+++ b/2
@ -1,6 +1,6 @@
 The MIT License

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

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/README.md
+++ b/README.md
@ -1,3 +1,4 @@
+[![Build Status](https://travis-ci.org/angular/angular.svg?branch=master)](https://travis-ci.org/angular/angular)
 [![CircleCI](https://circleci.com/gh/angular/angular/tree/master.svg?style=shield)](https://circleci.com/gh/angular/angular/tree/master)
 [![BrowserStack Status](https://www.browserstack.com/automate/badge.svg?badge_key=LzF3RzBVVGt6VWE2S0hHaC9uYllOZz09LS1BVjNTclBKV0x4eVRlcjA4QVY1M0N3PT0=--eb4ce8c8dc2c1c5b2b5352d473ee12a73ac20e06)](https://www.browserstack.com/automate/public-build/LzF3RzBVVGt6VWE2S0hHaC9uYllOZz09LS1BVjNTclBKV0x4eVRlcjA4QVY1M0N3PT0=--eb4ce8c8dc2c1c5b2b5352d473ee12a73ac20e06)
 [![Join the chat at https://gitter.im/angular/angular](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/angular/angular?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
--- a/130
+++ b/130
@ -1,6 +1,17 @@
 workspace(name = "angular")

 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+load(
+    "//packages/bazel:package.bzl",
+    "rules_angular_dependencies",
+    "rules_angular_dev_dependencies",
+)
+
+http_archive(
+    name = "io_bazel_rules_go",
+    sha256 = "b7a62250a3a73277ade0ce306d22f122365b513f5402222403e507f2f997d421",
+    url = "https://github.com/bazelbuild/rules_go/releases/download/0.16.3/rules_go-0.16.3.tar.gz",
+)

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

-# Fetch rules_nodejs so we can install our npm dependencies
+# Angular Bazel users will call this function
+rules_angular_dependencies()
+
+# Install transitive deps of rules_nodejs
+load("@build_bazel_rules_nodejs//:package.bzl", "rules_nodejs_dependencies")
+
+rules_nodejs_dependencies()
+
+# These are the dependencies only for us
+rules_angular_dev_dependencies()
+
+# Install transitive deps of rules_typescript
+load("@build_bazel_rules_typescript//:package.bzl", "rules_typescript_dependencies")
+
+rules_typescript_dependencies()
+
+#
+# Point Bazel to WORKSPACEs that live in subdirectories
+#
 http_archive(
-    name = "build_bazel_rules_nodejs",
-    sha256 = "5c86b055c57e15bf32d9009a15bcd6d8e190c41b1ff2fb18037b75e0012e4e7c",
-    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.26.0/rules_nodejs-0.26.0.tar.gz"],
+    name = "rxjs",
+    sha256 = "72b0b4e517f43358f554c125e40e39f67688cd2738a8998b4a266981ed32f403",
+    strip_prefix = "package/src",
+    url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz",
 )

-# Check the bazel version and download npm dependencies
-load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories", "yarn_install")
-load("@build_bazel_rules_nodejs//:package.bzl", "check_rules_nodejs_version")
+# Point to the integration test workspace just so that Bazel doesn't descend into it
+# when expanding the //... pattern
+local_repository(
+    name = "bazel_integration_test",
+    path = "integration/bazel",
+)

-# Bazel version must be at least v0.21.0 because:
-#   - 0.21.0 Using --incompatible_strict_action_env flag fixes cache when running `yarn bazel`
-#            (see https://github.com/angular/angular/issues/27514#issuecomment-451438271)
-check_bazel_version(
-    message = """
+#
+# Load and install our dependencies downloaded above.
+#
+load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories", "yarn_install")
+
+check_bazel_version("0.20.0", """
 You no longer need to install Bazel on your machine.
 Angular has a dependency on the @bazel/bazel package which supplies it.
 Try running `yarn bazel` instead.
    (If you did run that, check that you've got a fresh `yarn install`)

-""",
-    minimum_bazel_version = "0.21.0",
-)
+""")

-# The NodeJS rules version must be at least v0.15.3 because:
-#   - 0.15.2 Re-introduced the prod_only attribute on yarn_install
-#   - 0.15.3 Includes a fix for the `jasmine_node_test` rule ignoring target tags
-#   - 0.16.8 Supports npm installed bazel workspaces
-#   - 0.26.0 Fix for data files in yarn_install and npm_install
-check_rules_nodejs_version("0.26.0")
-
-# Setup the Node.js toolchain
 node_repositories(
    node_version = "10.9.0",
    package_json = ["//:package.json"],
@ -52,63 +76,41 @@ node_repositories(
    yarn_version = "1.12.1",
 )

-yarn_install(
+local_repository(
    name = "npm",
-    data = [
-        "//:tools/npm/@angular_bazel/index.js",
-        "//:tools/npm/@angular_bazel/package.json",
-        "//:tools/postinstall-patches.js",
-        "//:tools/yarn/check-yarn.js",
-    ],
-    package_json = "//:package.json",
-    # Don't install devDependencies, they are large and not used under Bazel
-    prod_only = True,
-    yarn_lock = "//:yarn.lock",
+    path = "tools/npm_workspace",
 )

-yarn_install(
-    name = "ts-api-guardian_deps",
-    package_json = "@angular//tools/ts-api-guardian:package.json",
-    yarn_lock = "@angular//tools/ts-api-guardian:yarn.lock",
-)
+load("@io_bazel_rules_go//go:def.bzl", "go_register_toolchains", "go_rules_dependencies")

-# Install all bazel dependencies of the @npm npm packages
-load("@npm//:install_bazel_dependencies.bzl", "install_bazel_dependencies")
+go_rules_dependencies()

-install_bazel_dependencies()
+go_register_toolchains()

-# Load angular dependencies
-load("//packages/bazel:package.bzl", "rules_angular_dev_dependencies")
-
-rules_angular_dev_dependencies()
-
-# Load karma dependencies
-load("@npm_bazel_karma//:package.bzl", "rules_karma_dependencies")
-
-rules_karma_dependencies()
-
-# Setup the rules_webtesting toolchain
-load("@io_bazel_rules_webtesting//web:repositories.bzl", "web_test_repositories")
+load("@io_bazel_rules_webtesting//web:repositories.bzl", "browser_repositories", "web_test_repositories")

 web_test_repositories()

-# Temporary work-around for https://github.com/angular/angular/issues/28681
-# TODO(gregmagolan): go back to @io_bazel_rules_webtesting browser_repositories
-load("@npm_bazel_karma//:browser_repositories.bzl", "browser_repositories")
+browser_repositories(
+    chromium = True,
+    firefox = True,
+)

-browser_repositories()
-
-# Setup the rules_typescript tooolchain
-load("@npm_bazel_typescript//:index.bzl", "ts_setup_workspace")
+load("@build_bazel_rules_typescript//:defs.bzl", "ts_setup_workspace")

 ts_setup_workspace()

-# Setup the rules_sass toolchain
+load("@angular//:index.bzl", "ng_setup_workspace")
+
+ng_setup_workspace()
+
+##################################
+# Skylark documentation generation
+
 load("@io_bazel_rules_sass//sass:sass_repositories.bzl", "sass_repositories")

 sass_repositories()

-# Setup the skydoc toolchain
 load("@io_bazel_skydoc//skylark:skylark.bzl", "skydoc_repositories")

 skydoc_repositories()
--- a/aio/.gitignore
+++ b/aio/.gitignore
@ -26,13 +26,11 @@
 !.vscode/extensions.json

 # misc
-/.firebase/
 /.sass-cache
 /connect.lock
 /coverage
 /libpeerconnection.log
 debug.log
-firebase-debug.log
 npm-debug.log
 testem.log
 /typings
--- a/aio/aio-builds-setup/dockerbuild/Dockerfile
+++ b/aio/aio-builds-setup/dockerbuild/Dockerfile
@ -26,8 +26,8 @@ ARG      AIO_GITHUB_ORGANIZATION=angular
 ARG TEST_AIO_GITHUB_ORGANIZATION=test-org
 ARG      AIO_GITHUB_REPO=angular
 ARG TEST_AIO_GITHUB_REPO=test-repo
-ARG      AIO_GITHUB_TEAM_SLUGS=aio-auto-previews,aio-contributors
-ARG TEST_AIO_GITHUB_TEAM_SLUGS=test-team-1,test-team-2
+ARG      AIO_GITHUB_TEAM_SLUGS=team,aio-contributors
+ARG TEST_AIO_GITHUB_TEAM_SLUGS=team,aio-contributors
 ARG      AIO_NGINX_HOSTNAME=$AIO_DOMAIN_NAME
 ARG TEST_AIO_NGINX_HOSTNAME=$TEST_AIO_DOMAIN_NAME
 ARG      AIO_NGINX_PORT_HTTP=80
--- a/aio/angular.json
+++ b/aio/angular.json
@ -104,9 +104,6 @@
            },
            "archive": {
              "browserTarget": "site:build:archive"
-            },
-            "ci": {
-              "progress": false
            }
          }
        },
@ -169,11 +166,6 @@
          "options": {
            "protractorConfig": "tests/e2e/protractor.conf.js",
            "devServerTarget": "site:serve"
-          },
-          "configurations": {
-            "ci": {
-              "devServerTarget": "site:serve:ci"
-            }
          }
        },
        "lint": {
--- a/aio/content/examples/.gitignore
+++ b/aio/content/examples/.gitignore
@ -57,9 +57,7 @@ dist/

 # aot
 **/*.ngsummary.json
-upgrade-module/tsconfig-aot.json
 !rollup-config.js
-upgrade-module/rollup-config.js
 aot-compiler/**/*.d.ts
 aot-compiler/**/*.factory.d.ts
 upgrade-phonecat-2-hybrid/aot/**/*
@ -86,9 +84,5 @@ upgrade-phonecat-2-hybrid/aot/**/*
 *stackblitz.no-link.html

 # ngUpgrade testing
-upgrade-phonecat-1-typescript/tsconfig-aot.json
-upgrade-phonecat-1-typescript/rollup-config.js
-upgrade-phonecat-3-final/tsconfig-aot.json
-upgrade-phonecat-3-final/rollup-config.js
 !upgrade-phonecat-*/**/karma.conf.js
 !upgrade-phonecat-*/**/karma-test-shim.js
--- a/aio/content/examples/ajs-quick-reference/src/app/app.component.ts
+++ b/aio/content/examples/ajs-quick-reference/src/app/app.component.ts
@ -20,7 +20,7 @@ export class AppComponent {
  movies: IMovie[] = [];
  showImage = true;
  title = 'AngularJS to Angular Quick Ref Cookbook';
-  toggleImage(event?: UIEvent) {
+  toggleImage(event: UIEvent) {
    this.showImage = !this.showImage;
    this.eventType = (event && event.type) || 'not provided';
  }
--- a/aio/content/examples/ajs-quick-reference/src/app/date.pipe.ts
+++ b/aio/content/examples/ajs-quick-reference/src/app/date.pipe.ts
@ -0,0 +1,14 @@
+import { Injectable, Pipe, PipeTransform } from '@angular/core';
+import { DatePipe } from '@angular/common';
+
+@Injectable()
+// #docregion date-pipe
+@Pipe({name: 'date', pure: true})
+export class StringSafeDatePipe extends DatePipe implements PipeTransform {
+ transform(value: any, format: string): string {
+   value = typeof value === 'string' ?
+           Date.parse(value) : value;
+   return super.transform(value, format);
+ }
+}
+// #enddocregion date-pipe
--- a/aio/content/examples/animations/src/app/app.module.ts
+++ b/aio/content/examples/animations/src/app/app.module.ts
@ -19,7 +19,6 @@ import { HeroListAutoCalcPageComponent } from './hero-list-auto-page.component';
 import { HeroListAutoComponent } from './hero-list-auto.component';
 import { HomeComponent } from './home.component';
 import { AboutComponent } from './about.component';
-import { InsertRemoveComponent } from './insert-remove.component';


@NgModule({
@ -57,7 +56,6 @@ import { InsertRemoveComponent } from './insert-remove.component';
    HeroListAutoCalcPageComponent,
    HeroListAutoComponent,
    HomeComponent,
-    InsertRemoveComponent,
    AboutComponent
  ],
  bootstrap: [AppComponent]
--- a/aio/content/examples/attribute-directives/src/app/app.component.1.html
+++ b/aio/content/examples/attribute-directives/src/app/app.component.1.html
@ -2,7 +2,7 @@
 <h1>My First Attribute Directive</h1>
 <!-- #docregion applied -->
 <p appHighlight>Highlight me!</p>
-<!-- #enddocregion applied  -->
+<!-- #enddocregion applied,  -->

 <!-- #docregion color-1 -->
 <p appHighlight highlightColor="yellow">Highlighted in yellow</p>
@ -11,4 +11,4 @@

 <!-- #docregion color-2 -->
 <p appHighlight [highlightColor]="color">Highlighted with parent component's color</p>
-<!-- #enddocregion color-2 -->
+<!-- #enddocregion color-2 -->
--- a/aio/content/examples/attribute-directives/src/app/app.component.avoid.html
+++ b/aio/content/examples/attribute-directives/src/app/app.component.avoid.html
@ -1,3 +0,0 @@
-<!-- #docregion unsupported -->
-<p app:Highlight>This is invalid</p>
-<!-- #enddocregion unsupported  -->
--- a/aio/content/examples/built-in-template-functions/e2e/src/app.e2e-spec.ts
+++ b/aio/content/examples/built-in-template-functions/e2e/src/app.e2e-spec.ts
@ -1,20 +0,0 @@
-'use strict'; // necessary for es6 output in node
-
-import { browser, element, by } from 'protractor';
-
-describe('Built Template Functions Example', function () {
-  beforeAll(function () {
-    browser.get('');
-  });
-
-  it('should have title Built-in Template Functions', function () {
-    let title = element.all(by.css('h1')).get(0);
-    expect(title.getText()).toEqual('Built-in Template Functions');
-  });
-
-  it('should display $any( ) in h2', function () {
-    let header = element(by.css('h2'));
-    expect(header.getText()).toContain('$any( )');
-  });
-
-});
--- a/aio/content/examples/built-in-template-functions/src/app/app.component.html
+++ b/aio/content/examples/built-in-template-functions/src/app/app.component.html
@ -1,15 +0,0 @@
-<h1>{{title}}</h1>
-
-<h2><code>$any( )</code> type cast function and an undeclared member</h2>
-
-<p>There is no such member as <code>bestByDate</code> in the following two examples, so nothing renders:</p>
-<!-- #docregion any-type-cast-function-1 -->
-<p>The item's undeclared best by date is: {{$any(item).bestByDate}}</p>
-<!-- #enddocregion any-type-cast-function-1 -->
-
-<h2>using <code>this</code></h2>
-<!-- #docregion any-type-cast-function-2 -->
-<p>The item's undeclared best by date is: {{$any(this).bestByDate}}</p>
-<!-- #enddocregion any-type-cast-function-2 -->
-
-
--- a/aio/content/examples/built-in-template-functions/src/app/app.component.spec.ts
+++ b/aio/content/examples/built-in-template-functions/src/app/app.component.spec.ts
@ -1,16 +0,0 @@
-import { TestBed, async } from '@angular/core/testing';
-import { AppComponent } from './app.component';
-describe('AppComponent', () => {
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [
-        AppComponent
-      ],
-    }).compileComponents();
-  }));
-  it('should create the app', async(() => {
-    const fixture = TestBed.createComponent(AppComponent);
-    const app = fixture.debugElement.componentInstance;
-    expect(app).toBeTruthy();
-  }));
-});
--- a/aio/content/examples/built-in-template-functions/src/app/app.component.ts
+++ b/aio/content/examples/built-in-template-functions/src/app/app.component.ts
@ -1,16 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'app-root',
-  templateUrl: './app.component.html',
-  styleUrls: ['./app.component.css']
-})
-export class AppComponent {
-  title = 'Built-in Template Functions';
-
-  item = {
-    name : 'Telephone',
-    origin : 'Sweden',
-    price: 98
-  };
-}
--- a/aio/content/examples/built-in-template-functions/src/app/app.module.ts
+++ b/aio/content/examples/built-in-template-functions/src/app/app.module.ts
@ -1,18 +0,0 @@
-import { BrowserModule } from '@angular/platform-browser';
-import { NgModule } from '@angular/core';
-
-
-import { AppComponent } from './app.component';
-
-
-@NgModule({
-  declarations: [
-    AppComponent
-  ],
-  imports: [
-    BrowserModule
-  ],
-  providers: [],
-  bootstrap: [AppComponent]
-})
-export class AppModule { }
--- a/aio/content/examples/built-in-template-functions/src/index.html
+++ b/aio/content/examples/built-in-template-functions/src/index.html
@ -1,14 +0,0 @@
-<!doctype html>
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>Built-in Template Functions Example</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>Loading...</app-root>
-</body>
-</html>
--- a/aio/content/examples/built-in-template-functions/stackblitz.json
+++ b/aio/content/examples/built-in-template-functions/stackblitz.json
@ -1,10 +0,0 @@
-{
-  "description": "Built-in Template Functions",
-  "files": [
-    "!**/*.d.ts",
-    "!**/*.js",
-    "!**/*.[1,2].*"
-  ],
-  "file": "src/app/app.component.ts",
-  "tags": ["Built-in Template Functions"]
-}
--- a/aio/content/examples/component-interaction/example-config.json
+++ b/aio/content/examples/component-interaction/example-config.json
@ -1,12 +0,0 @@
-{
-  "e2e": [
-    {
-      "cmd": "yarn",
-      "args": [
-        "e2e",
-        "--no-webdriver-update",
-        "--port={PORT}"
-      ]
-    }
-  ]
-}
--- a/aio/content/examples/dependency-injection-in-action/src/app/parent-finder.component.ts
+++ b/aio/content/examples/dependency-injection-in-action/src/app/parent-finder.component.ts
@ -19,20 +19,20 @@ const DifferentParent = Parent;
 // #enddocregion provide-the-parent
 // The `parentType` defaults to `Parent` when omitting the second parameter.
 // #docregion provide-the-parent
-export function provideParent
+const provideParent =
 // #enddocregion provide-parent, provide-the-parent
 // #docregion provide-parent
-  (component: any, parentType?: any) {
+  (component: any, parentType?: any) => {
    return { provide: parentType || Parent, useExisting: forwardRef(() => component) };
-  }
+  };
 // #enddocregion provide-parent

 // Simpler syntax version that always provides the component in the name of `Parent`.
-export function provideTheParent
+const provideTheParent =
 // #docregion provide-the-parent
-  (component: any) {
+  (component: any) => {
    return { provide: Parent, useExisting: forwardRef(() => component) };
-  }
+  };
 // #enddocregion provide-the-parent


--- a/aio/content/examples/dependency-injection/example-config.json
+++ b/aio/content/examples/dependency-injection/example-config.json
@ -1,12 +0,0 @@
-{
-  "e2e": [
-    {
-      "cmd": "yarn",
-      "args": [
-        "e2e",
-        "--no-webdriver-update",
-        "--port={PORT}"
-      ]
-    }
-  ]
-}
--- a/aio/content/examples/displaying-data/src/app/app-ctor.component.1.ts
+++ b/aio/content/examples/displaying-data/src/app/app-ctor.component.1.ts
--- a/aio/content/examples/event-binding/e2e/src/app.e2e-spec.ts
+++ b/aio/content/examples/event-binding/e2e/src/app.e2e-spec.ts
@ -1,71 +0,0 @@
-'use strict'; // necessary for es6 output in node
-
-import { browser, element, by, protractor } from 'protractor';
-
-describe('Event binding example', function () {
-
-  beforeEach(function () {
-    browser.get('');
-  });
-
-  let saveButton = element.all(by.css('button')).get(0);
-  let onSaveButton = element.all(by.css('button')).get(1);
-  let myClick = element.all(by.css('button')).get(2);
-  let deleteButton = element.all(by.css('button')).get(3);
-  let saveNoProp = element.all(by.css('button')).get(4);
-  let saveProp = element.all(by.css('button')).get(5);
-
-
-  it('should display Event Binding with Angular', function () {
-    expect(element(by.css('h1')).getText()).toEqual('Event Binding');
-  });
-
-  it('should display 6 buttons', function() {
-    expect(saveButton.getText()).toBe('Save');
-    expect(onSaveButton.getText()).toBe('on-click Save');
-    expect(myClick.getText()).toBe('click with myClick');
-    expect(deleteButton.getText()).toBe('Delete');
-    expect(saveNoProp.getText()).toBe('Save, no propagation');
-    expect(saveProp.getText()).toBe('Save with propagation');
-  });
-
-  it('should support user input', function () {
-    let input = element(by.css('input'));
-    let bindingResult = element.all(by.css('h4')).get(1);
-    expect(bindingResult.getText()).toEqual('Result: teapot');
-    input.sendKeys('abc');
-    expect(bindingResult.getText()).toEqual('Result: teapotabc');
-  });
-
-  it('should hide the item img', async () => {
-    let deleteButton = element.all(by.css('button')).get(3);
-    await deleteButton.click();
-    browser.switchTo().alert().accept();
-    expect(element.all(by.css('img')).get(0).getCssValue('display')).toEqual('none');
-  });
-
-  it('should show two alerts', async () => {
-    let parentDiv = element.all(by.css('.parent-div'));
-    let childDiv = element.all(by.css('div > div')).get(1);
-    await parentDiv.click();
-    browser.switchTo().alert().accept();
-    expect(childDiv.getText()).toEqual('Click me too! (child)');
-    await childDiv.click();
-    expect(browser.switchTo().alert().getText()).toEqual('Click me. Event target class is child-div');
-    browser.switchTo().alert().accept();
-  });
-
-  it('should show 1 alert from Save, no prop, button', async () => {
-    await saveNoProp.click();
-    expect(browser.switchTo().alert().getText()).toEqual('Saved. Event target is Save, no propagation');
-    browser.switchTo().alert().accept();
-  });
-
-  it('should show 2 alerts from Save w/prop button', async () => {
-    await saveProp.click();
-    expect(browser.switchTo().alert().getText()).toEqual('Saved.');
-    browser.switchTo().alert().accept();
-    expect(browser.switchTo().alert().getText()).toEqual('Saved.');
-    browser.switchTo().alert().accept();
-  });
-});
--- a/aio/content/examples/event-binding/src/app/app.component.css
+++ b/aio/content/examples/event-binding/src/app/app.component.css
@ -1,25 +0,0 @@
-.group {
-  background-color: #dae8f9;
-  padding: 1rem;
-  margin: 1rem 0;
-}
-
-.parent-div {
-  background-color: #bdd1f7;
-  border: solid 1px rgb(25, 118, 210);
-  padding: 1rem;
-}
-
-.parent-div:hover {
-  background-color: #8fb4f9;
-}
-
-.child-div {
-  margin-top: 1rem;
-  background-color: #fff;
-  padding: 1rem;
-}
-
-.child-div:hover {
-  background-color: #eee;
-}
--- a/aio/content/examples/event-binding/src/app/app.component.html
+++ b/aio/content/examples/event-binding/src/app/app.component.html
@ -1,53 +0,0 @@
-<h1 id="event-binding">Event Binding</h1>
-
-<div class="group">
-  <h3>Target event</h3>
-  <!-- #docregion event-binding-1 -->
-  <button (click)="onSave($event)">Save</button>
-  <!-- #enddocregion event-binding-1 -->
-
-  <!-- #docregion event-binding-2 -->
-  <button on-click="onSave($event)">on-click Save</button>
-  <!-- #enddocregion event-binding-2 -->
-
-  <!-- #docregion custom-directive -->
-  <h4>myClick is an event on the custom ClickDirective:</h4>
-  <button (myClick)="clickMessage=$event" clickable>click with myClick</button>
-  {{clickMessage}}
-  <!-- #enddocregion custom-directive -->
-
-</div>
-
-<div class="group">
-  <h3>$event and event handling statements</h3>
-  <h4>Result: {{currentItem.name}}</h4>
-
-  <!-- #docregion event-binding-3-->
-  <input [value]="currentItem.name"
-         (input)="currentItem.name=$event.target.value" >
-  without NgModel
-  <!-- #enddocregion event-binding-3-->
-</div>
-
-<div class="group">
-  <h3>Binding to a nested component</h3>
-  <h4>Custom events with EventEmitter</h4>
-  <!-- #docregion event-binding-to-component -->
-  <app-item-detail (deleteRequest)="deleteItem($event)" [item]="currentItem"></app-item-detail>
-    <!-- #enddocregion event-binding-to-component -->
-
-
-  <h4>Click to see event target class:</h4>
-<div class="parent-div" (click)="onClickMe($event)" clickable>Click me (parent)
-  <div class="child-div">Click me too! (child) </div>
-</div>
-
-<h3>Saves only once:</h3>
-<div (click)="onSave()" clickable>
-  <button (click)="onSave($event)">Save, no propagation</button>
-</div>
-
-<h3>Saves twice:</h3>
-<div (click)="onSave()" clickable>
-  <button (click)="onSave()">Save with propagation</button>
-</div>
--- a/aio/content/examples/event-binding/src/app/app.component.spec.ts
+++ b/aio/content/examples/event-binding/src/app/app.component.spec.ts
@ -1,27 +0,0 @@
-import { TestBed, async } from '@angular/core/testing';
-import { AppComponent } from './app.component';
-describe('AppComponent', () => {
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [
-        AppComponent
-      ],
-    }).compileComponents();
-  }));
-  it('should create the app', async(() => {
-    const fixture = TestBed.createComponent(AppComponent);
-    const app = fixture.debugElement.componentInstance;
-    expect(app).toBeTruthy();
-  }));
-  it(`should have as title 'Featured product:'`, async(() => {
-    const fixture = TestBed.createComponent(AppComponent);
-    const app = fixture.debugElement.componentInstance;
-    expect(app.title).toEqual('Featured product:');
-  }));
-  it('should render title in a p tag', async(() => {
-    const fixture = TestBed.createComponent(AppComponent);
-    fixture.detectChanges();
-    const compiled = fixture.debugElement.nativeElement;
-    expect(compiled.querySelector('p').textContent).toContain('Featured product:');
-  }));
-});
--- a/aio/content/examples/event-binding/src/app/app.component.ts
+++ b/aio/content/examples/event-binding/src/app/app.component.ts
@ -1,29 +0,0 @@
-import { Component } from '@angular/core';
-import { Item } from './item';
-
-@Component({
-  selector: 'app-root',
-  templateUrl: './app.component.html',
-  styleUrls: ['./app.component.css']
-})
-export class AppComponent {
-
-  currentItem = { name: 'teapot'} ;
-  clickMessage = '';
-
-  onSave(event?: KeyboardEvent) {
-    const evtMsg = event ? ' Event target is ' + (<HTMLElement>event.target).textContent : '';
-    alert('Saved.' + evtMsg);
-    if (event) { event.stopPropagation(); }
-  }
-
-  deleteItem(item?: Item) {
-    alert(`Delete the ${item}.`);
-  }
-
-  onClickMe(event?: KeyboardEvent) {
-    const evtMsg = event ? ' Event target class is ' + (<HTMLElement>event.target).className  : '';
-    alert('Click me.' + evtMsg);
-  }
-
-}
--- a/aio/content/examples/event-binding/src/app/app.module.ts
+++ b/aio/content/examples/event-binding/src/app/app.module.ts
@ -1,22 +0,0 @@
-import { BrowserModule } from '@angular/platform-browser';
-import { NgModule } from '@angular/core';
-
-
-import { AppComponent } from './app.component';
-import { ItemDetailComponent } from './item-detail/item-detail.component';
-import { ClickDirective } from './click.directive';
-
-
-@NgModule({
-  declarations: [
-    AppComponent,
-    ItemDetailComponent,
-    ClickDirective
-  ],
-  imports: [
-    BrowserModule
-  ],
-  providers: [],
-  bootstrap: [AppComponent]
-})
-export class AppModule { }
--- a/aio/content/examples/event-binding/src/app/click.directive.ts
+++ b/aio/content/examples/event-binding/src/app/click.directive.ts
@ -1,18 +0,0 @@
-/* tslint:disable use-output-property-decorator directive-class-suffix */
-import { Directive, ElementRef, EventEmitter, Output } from '@angular/core';
-
-@Directive({selector: '[myClick]'})
-export class ClickDirective {
-  @Output('myClick') clicks = new EventEmitter<string>(); //  @Output(alias) propertyName = ...
-
-  toggle = false;
-
-  constructor(el: ElementRef) {
-    el.nativeElement
-      .addEventListener('click', (event: Event) => {
-        this.toggle = !this.toggle;
-        this.clicks.emit(this.toggle ? 'Click!' : '');
-      });
-  }
-}
-
--- a/aio/content/examples/event-binding/src/app/item-detail/item-detail.component.css
+++ b/aio/content/examples/event-binding/src/app/item-detail/item-detail.component.css
@ -1,11 +0,0 @@
-.detail {
-  border: 1px solid rgb(25, 118, 210);
-  padding: 1rem;
-  margin: 1rem 0;
-}
-
-img {
-  max-width: 100px;
-  display: block;
-  padding: 1rem 0;
-}
--- a/aio/content/examples/event-binding/src/app/item-detail/item-detail.component.html
+++ b/aio/content/examples/event-binding/src/app/item-detail/item-detail.component.html
@ -1,9 +0,0 @@
-<div class="detail">
-  <p>This is the ItemDetailComponent</p>
-  <!-- #docregion line-through -->
-  <img src="{{itemImageUrl}}" [style.display]="displayNone">
-  <span [style.text-decoration]="lineThrough">{{ item.name }}
-  </span>
-  <button (click)="delete()">Delete</button>
-  <!-- #enddocregion line-through -->
-</div>
--- a/aio/content/examples/event-binding/src/app/item-detail/item-detail.component.spec.ts
+++ b/aio/content/examples/event-binding/src/app/item-detail/item-detail.component.spec.ts
@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ItemDetailComponent } from './item-detail.component';
-
-describe('ItemDetailComponent', () => {
-  let component: ItemDetailComponent;
-  let fixture: ComponentFixture<ItemDetailComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ ItemDetailComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ItemDetailComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
--- a/aio/content/examples/event-binding/src/app/item-detail/item-detail.component.ts
+++ b/aio/content/examples/event-binding/src/app/item-detail/item-detail.component.ts
@ -1,30 +0,0 @@
-/* tslint:disable use-input-property-decorator use-output-property-decorator */
-import { Component, EventEmitter, Input, Output } from '@angular/core';
-
-import { Item } from '../item';
-
-@Component({
-  selector: 'app-item-detail',
-  styleUrls: ['./item-detail.component.css'],
-  templateUrl: './item-detail.component.html'
-})
-export class ItemDetailComponent {
-
-  @Input() item;
-  itemImageUrl = 'assets/teapot.svg';
-  lineThrough = '';
-  displayNone = '';
-  @Input() prefix = '';
-
-  // #docregion deleteRequest
-  // This component makes a request but it can't actually delete a hero.
-  @Output() deleteRequest = new EventEmitter<Item>();
-
-  delete() {
-    this.deleteRequest.emit(this.item.name);
-    this.displayNone = this.displayNone ? '' : 'none';
-    this.lineThrough = this.lineThrough ? '' : 'line-through';
-  }
-  // #enddocregion deleteRequest
-
-}
--- a/aio/content/examples/event-binding/src/app/item.ts
+++ b/aio/content/examples/event-binding/src/app/item.ts
@ -1,4 +0,0 @@
-export class Item {
-  name: '';
-}
-
--- a/aio/content/examples/event-binding/src/assets/teapot.svg
+++ b/aio/content/examples/event-binding/src/assets/teapot.svg
--- a/aio/content/examples/event-binding/src/main.ts
+++ b/aio/content/examples/event-binding/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.log(err));
--- a/aio/content/examples/event-binding/stackblitz.json
+++ b/aio/content/examples/event-binding/stackblitz.json
@ -1,10 +0,0 @@
-{
-  "description": "Event Binding",
-  "files": [
-    "!**/*.d.ts",
-    "!**/*.js",
-    "!**/*.[1,2].*"
-  ],
-  "file": "src/app/app.component.ts",
-  "tags": ["Event Binding"]
-}
--- a/aio/content/examples/http/e2e/src/app.e2e-spec.ts
+++ b/aio/content/examples/http/e2e/src/app.e2e-spec.ts
@ -28,7 +28,10 @@ let checkLogForMessage = (message: string) => {
  expect(page.logList.getText()).toContain(message);
 };

-describe('Http Tests', function() {
+// TODO(i): temorarily disable these tests because angular-in-memory-web-api is not compatible with rxjs v6 yet
+//          and we don't have the backwards compatibility package yet.
+//          Reenable after rxjs v6 compatibility package is out or angular-in-memory-web-api is compatible with rxjs v6
+xdescribe('Http Tests', function() {
  beforeEach(() => {
    browser.get('');
  });
--- a/aio/content/examples/i18n/example-config.json
+++ b/aio/content/examples/i18n/example-config.json
@ -1,13 +1,3 @@
 {
-  "projectType": "i18n",
-  "e2e": [
-    {
-      "cmd": "yarn",
-      "args": [
-        "e2e",
-        "--no-webdriver-update",
-        "--port={PORT}"
-      ]
-    }
-  ]
-}
+  "projectType": "i18n"
+}
--- a/aio/content/examples/interpolation/e2e/src/app.e2e-spec.ts
+++ b/aio/content/examples/interpolation/e2e/src/app.e2e-spec.ts
@ -1,47 +0,0 @@
-import { browser, element, by } from 'protractor';
-
-describe('Interpolation e2e tests', () => {
-
-  beforeEach(function () {
-    browser.get('');
-  });
-
-  it('should display Interpolation and Template Expressions', function () {
-    expect(element(by.css('h1')).getText()).toEqual('Interpolation and Template Expressions');
-  });
-
-  it('should display Current customer: Maria', function () {
-    expect(element.all(by.css('h3')).get(0).getText()).toBe(`Current customer: Maria`);
-  });
-
-  it('should display The sum of 1 + 1 is not 4.', function () {
-    expect(element.all(by.css('p:last-child')).get(0).getText()).toBe(`The sum of 1 + 1 is not 4.`);
-  });
-
-  it('should display Expression Context', function () {
-    expect(element.all(by.css('h2')).get(1).getText()).toBe(`Expression Context`);
-  });
-
-  it('should display a list of customers', function () {
-    expect(element.all(by.css('li')).get(0).getText()).toBe(`Maria`);
-  });
-
-  it('should display two pictures', function() {
-    let pottedPlant = element.all(by.css('img')).get(0);
-    let lamp = element.all(by.css('img')).get(1);
-
-    expect(pottedPlant.getAttribute('src')).toContain('pottedPlant');
-    expect(pottedPlant.isDisplayed()).toBe(true);
-
-    expect(lamp.getAttribute('src')).toContain('lamp');
-    expect(lamp.isDisplayed()).toBe(true);
-  });
-
-  it('should support user input', function () {
-    let input = element(by.css('input'));
-    let label = element(by.css('label'));
-    expect(label.getText()).toEqual('Type something:');
-    input.sendKeys('abc');
-    expect(label.getText()).toEqual('Type something: abc');
-  });
-});
--- a/aio/content/examples/interpolation/src/app/app.component.css
+++ b/aio/content/examples/interpolation/src/app/app.component.css
--- a/aio/content/examples/interpolation/src/app/app.component.html
+++ b/aio/content/examples/interpolation/src/app/app.component.html
@ -1,60 +0,0 @@
-
-<div>
-  <h1>Interpolation and Template Expressions</h1>
-  <hr />
-
-  <div>
-    <h2>Interpolation</h2>
-    <!-- #docregion interpolation-example1 -->
-    <h3>Current customer: {{ currentCustomer }}</h3>
-    <!-- #enddocregion interpolation-example1 -->
-
-    <!-- #docregion component-property -->
-    <p>{{title}}</p>
-    <div><img src="{{itemImageUrl}}"></div>
-    <!-- #enddocregion component-property -->
-
-    <h3>Evaluating template expressions </h3>
-    <h4>Simple evaluation (to a string):</h4>
-    <!-- #docregion convert-string -->
-    <!-- "The sum of 1 + 1 is 2" -->
-    <p>The sum of 1 + 1 is {{1 + 1}}.</p>
-    <!-- #enddocregion convert-string -->
-
-    <h4>Evaluates using a method (also evaluates to a string):</h4>
-    <!-- #docregion invoke-method -->
-    <!-- "The sum of 1 + 1 is not 4" -->
-    <p>The sum of 1 + 1 is not {{1 + 1 + getVal()}}.</p>
-    <!-- #enddocregion invoke-method -->
-  </div>
-
-  <hr />
-<h2>Expression Context</h2>
-
-<div>
-  <h3>Component context, properties of app.component.ts:</h3>
-  <!-- #docregion component-context -->
-  <h4>{{recommended}}</h4>
-  <img [src]="itemImageUrl2">
-  <!-- #enddocregion component-context -->
-</div>
-
-<div>
-  <h4>Template context, template input variables (let customer):</h4>
-  <!-- #docregion template-input-variable -->
-  <ul>
-    <li *ngFor="let customer of customers">{{customer.name}}</li>
-  </ul>
-  <!-- #enddocregion template-input-variable -->
-</div>
-
-<div (keyup)="0">
-  <h4>Template context: template reference variables (#customerInput):</h4>
-  <!-- #docregion template-reference-variable -->
-  <label>Type something:
-    <input #customerInput>{{customerInput.value}}
-  </label>
-  <!-- #enddocregion template-reference-variable -->
-</div>
-
-</div>
--- a/aio/content/examples/interpolation/src/app/app.component.spec.ts
+++ b/aio/content/examples/interpolation/src/app/app.component.spec.ts
@ -1,16 +0,0 @@
-import { TestBed, async } from '@angular/core/testing';
-import { AppComponent } from './app.component';
-describe('AppComponent', () => {
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [
-        AppComponent
-      ],
-    }).compileComponents();
-  }));
-  it('should create the app', async(() => {
-    const fixture = TestBed.createComponent(AppComponent);
-    const app = fixture.debugElement.componentInstance;
-    expect(app).toBeTruthy();
-  }));
-});
--- a/aio/content/examples/interpolation/src/app/app.component.ts
+++ b/aio/content/examples/interpolation/src/app/app.component.ts
@ -1,25 +0,0 @@
-import { Component } from '@angular/core';
-
-import { CUSTOMERS } from './customers';
-
-@Component({
-  selector: 'app-root',
-  templateUrl: './app.component.html',
-  styleUrls: ['./app.component.css']
-})
-export class AppComponent {
-  customers = CUSTOMERS;
-
-  currentCustomer = 'Maria';
-  title = 'Featured product:';
-  itemImageUrl = '../assets/pottedPlant.png';
-
-  recommended = 'You might also like:';
-  itemImageUrl2 = '../assets/lamp.png';
-
-
-
-  getVal(): number { return 2; }
-
-
-}
--- a/aio/content/examples/interpolation/src/app/app.module.ts
+++ b/aio/content/examples/interpolation/src/app/app.module.ts
@ -1,18 +0,0 @@
-import { BrowserModule } from '@angular/platform-browser';
-import { NgModule } from '@angular/core';
-
-
-import { AppComponent } from './app.component';
-
-
-@NgModule({
-  declarations: [
-    AppComponent
-  ],
-  imports: [
-    BrowserModule
-  ],
-  providers: [],
-  bootstrap: [AppComponent]
-})
-export class AppModule { }
--- a/aio/content/examples/interpolation/src/app/customer.ts
+++ b/aio/content/examples/interpolation/src/app/customer.ts
@ -1,3 +0,0 @@
-export class Customer {
-  name: string;
-}
--- a/aio/content/examples/interpolation/src/app/customers.ts
+++ b/aio/content/examples/interpolation/src/app/customers.ts
@ -1,9 +0,0 @@
-import { Customer } from './customer';
-
-export const CUSTOMERS: Customer[] = [
-  { name: 'Maria' },
-  { name: 'Oliver' },
-  { name: 'Walter' },
-  { name: 'Lakshmi' },
-  { name: 'Yasha' }
-];
--- a/aio/content/examples/interpolation/src/assets/lamp.png
+++ b/aio/content/examples/interpolation/src/assets/lamp.png
--- a/aio/content/examples/interpolation/src/assets/potted-plant.png
+++ b/aio/content/examples/interpolation/src/assets/potted-plant.png
--- a/aio/content/examples/interpolation/src/main.ts
+++ b/aio/content/examples/interpolation/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.log(err));
--- a/aio/content/examples/interpolation/stackblitz.json
+++ b/aio/content/examples/interpolation/stackblitz.json
@ -1,10 +0,0 @@
-{
-  "description": "Interpolation",
-  "files": [
-    "!**/*.d.ts",
-    "!**/*.js",
-    "!**/*.[1,2].*"
-  ],
-  "file": "src/app/app.component.ts",
-  "tags": ["interpolation"]
-}
--- a/aio/content/examples/ngmodule-faq/src/app/app.module.3.ts
+++ b/aio/content/examples/ngmodule-faq/src/app/app.module.3.ts
@ -13,8 +13,8 @@ import { AppComponent }       from './app.component';
 // #enddocregion
 */
 // #docregion
-import { HighlightDirective } from './highlight.directive.1';
-import { TitleComponent }     from './title.component.1';
+import { HighlightDirective } from './highlight.directive';
+import { TitleComponent }     from './title.component';
 import { UserService }        from './user.service';

 /* Routing Module */
--- a/aio/content/examples/ngmodule-faq/src/app/contact/awesome.pipe.ts
+++ b/aio/content/examples/ngmodule-faq/src/app/contact/awesome.pipe.ts
@ -0,0 +1,10 @@
+// #docregion
+import { Pipe, PipeTransform } from '@angular/core';
+
+@Pipe({ name: 'awesome' })
+/** Precede the input string with the word "Awesome " */
+export class AwesomePipe implements PipeTransform {
+  transform(phrase: string) {
+    return phrase ? 'Awesome ' + phrase : '';
+  }
+}
--- a/aio/content/examples/ngmodule-faq/src/app/contact/contact-highlight.directive.ts
+++ b/aio/content/examples/ngmodule-faq/src/app/contact/contact-highlight.directive.ts
@ -0,0 +1,20 @@
+// #docplaster
+// Same directive name and selector as
+// HighlightDirective in parent AppModule
+// It selects for both input boxes and  'highlight' attr
+// and it highlights in blue instead of gold
+
+// #docregion
+import { Directive, ElementRef } from '@angular/core';
+
+// Highlight the host element or any InputElement in blue
+@Directive({ selector: '[highlight], input' })
+export class ContactHighlightDirective {
+  constructor(el: ElementRef) {
+    el.nativeElement.style.backgroundColor = 'powderblue';
+    // #enddocregion
+    console.log(`* Contact highlight called for ${el.nativeElement.tagName}`);
+    // #docregion
+  }
+}
+// #enddocregion
--- a/aio/content/examples/ngmodule-faq/src/app/hero/highlight.directive.ts
+++ b/aio/content/examples/ngmodule-faq/src/app/hero/highlight.directive.ts
@ -0,0 +1,14 @@
+// #docregion
+import { Directive, ElementRef } from '@angular/core';
+
+// Same directive name and selector as
+// HighlightDirective in parent AppRootModule
+// It selects for both input boxes and  'highlight' attr
+// and it highlights in beige instead of yellow
+@Directive({ selector: '[highlight]' })
+export class HighlightDirective {
+    constructor(el: ElementRef) {
+       el.nativeElement.style.backgroundColor = 'beige';
+       console.log(`* Hero highlight called for ${el.nativeElement.tagName}`);
+    }
+}
--- a/aio/content/examples/ngmodule-faq/src/app/highlight.directive.1.ts
+++ b/aio/content/examples/ngmodule-faq/src/app/highlight.directive.1.ts
--- a/aio/content/examples/ngmodule-faq/src/app/title.component.1.html
+++ b/aio/content/examples/ngmodule-faq/src/app/title.component.1.html
--- a/aio/content/examples/ngmodule-faq/src/app/title.component.1.ts
+++ b/aio/content/examples/ngmodule-faq/src/app/title.component.1.ts
@ -8,7 +8,7 @@ import { UserService } from './user.service';

@Component({
  selector: 'app-title',
-  templateUrl: './title.component.1.html'
+  templateUrl: './title.component.html'
 })
 export class TitleComponent {
  title = 'Angular Modules';
--- a/aio/content/examples/ngmodules/src/app/items/items.service.ts
+++ b/aio/content/examples/ngmodules/src/app/items/items.service.ts
@ -16,7 +16,7 @@ const ITEMS: Item[] = [

 const FETCH_LATENCY = 500;

-/** Simulate a data service that retrieves items from a server */
+/** Simulate a data service that retrieves crises from a server */
@Injectable()
 export class ItemService implements OnDestroy {

--- a/aio/content/examples/observables-in-angular/src/main.ts
+++ b/aio/content/examples/observables-in-angular/src/main.ts
@ -61,7 +61,7 @@ export class Routable1Component implements OnInit {
  navStart: Observable<NavigationStart>;

  constructor(private router: Router) {
-    // Create a new Observable that publishes only the NavigationStart event
+    // Create a new Observable the publishes only the NavigationStart event
    this.navStart = router.events.pipe(
      filter(evt => evt instanceof NavigationStart)
    ) as Observable<NavigationStart>;
--- a/aio/content/examples/practical-observable-usage/src/backoff.ts
+++ b/aio/content/examples/practical-observable-usage/src/backoff.ts
@ -5,9 +5,10 @@ import { retryWhen, map, mergeMap } from 'rxjs/operators';

 function backoff(maxTries, ms) {
 return pipe(
-   retryWhen(attempts => zip(range(1, maxTries), attempts)
+   retryWhen(attempts => range(1, maxTries)
     .pipe(
-       map(([i]) => i * i),
+       zip(attempts, (i) => i),
+       map(i => i * i),
       mergeMap(i =>  timer(i * ms))
     )
   )
--- a/aio/content/examples/quickstart/bs-config.1.json
+++ b/aio/content/examples/quickstart/bs-config.1.json
@ -0,0 +1,8 @@
+{
+  "server": {
+    "baseDir": "src",
+    "routes": {
+      "/node_modules": "node_modules"
+    }
+  }
+}
--- a/aio/content/examples/setup/e2e/src/app.e2e-spec.ts
+++ b/aio/content/examples/setup/e2e/src/app.e2e-spec.ts
--- a/aio/content/examples/built-in-template-functions/example-config.json
+++ b/aio/content/examples/built-in-template-functions/example-config.json
--- a/aio/content/examples/quickstart/src/app/app.component.ts
+++ b/aio/content/examples/quickstart/src/app/app.component.ts
@ -0,0 +1,8 @@
+// #docregion
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'my-app',
+  template: `<h1>Hello {{name}}</h1>`
+})
+export class AppComponent { name = 'Angular'; }
--- a/aio/content/examples/quickstart/src/app/app.module.ts
+++ b/aio/content/examples/quickstart/src/app/app.module.ts
@ -0,0 +1,11 @@
+// #docregion
+import { NgModule }      from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+import { AppComponent }  from './app.component';
+
+@NgModule({
+  imports:      [ BrowserModule ],
+  declarations: [ AppComponent ],
+  bootstrap:    [ AppComponent ]
+})
+export class AppModule { }
--- a/aio/content/examples/quickstart/src/index.html
+++ b/aio/content/examples/quickstart/src/index.html
@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Angular Quickstart</title>
+    <base href="/">
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <style>
+      body {color:#369;font-family: Arial,Helvetica,sans-serif;}
+    </style>
+
+    <!-- Polyfills -->
+    <!-- #docregion polyfills -->
+    <script src="node_modules/core-js/client/shim.min.js"></script>
+    <!-- #enddocregion polyfills -->
+
+    <script src="node_modules/zone.js/dist/zone.js"></script>
+    <script src="node_modules/systemjs/dist/system.src.js"></script>
+    <script src="systemjs.config.js"></script>
+    <script>
+      System.import('main.js').catch(function(err){ console.error(err); });
+    </script>
+  </head>
+
+  <body>
+    <!-- #docregion my-app-->
+    <my-app>Loading AppComponent content here ...</my-app>
+    <!-- #enddocregion my-app-->
+  </body>
+
+</html>
--- a/aio/content/examples/built-in-template-functions/src/main.ts
+++ b/aio/content/examples/built-in-template-functions/src/main.ts
@ -1,11 +1,5 @@
-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);
--- a/aio/content/examples/quickstart/src/tsconfig.1.json
+++ b/aio/content/examples/quickstart/src/tsconfig.1.json
@ -0,0 +1,13 @@
+{
+  "compilerOptions": {
+    "target": "es5",
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "sourceMap": true,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "lib": [ "es2015", "dom" ],
+    "noImplicitAny": true,
+    "suppressImplicitAnyIndexErrors": true
+  }
+}
--- a/aio/content/examples/quickstart/stackblitz.json
+++ b/aio/content/examples/quickstart/stackblitz.json
@ -0,0 +1,11 @@
+{
+  "description": "QuickStart",
+  "files": [
+    "src/app/app.component.ts",
+    "src/app/app.module.ts",
+    "src/main.ts",
+    "src/index.html"
+  ],
+  "file": "src/app/app.component.ts",
+  "tags": ["quickstart"]
+}
--- a/aio/content/examples/router/e2e/src/app.e2e-spec.ts
+++ b/aio/content/examples/router/e2e/src/app.e2e-spec.ts
@ -31,7 +31,6 @@ describe('Router', () => {
      heroDetailTitle: heroDetail.element(by.xpath('*[2]')),

      adminHref: hrefEles.get(2),
-      adminPage: element(by.css('app-root > div > app-admin')),
      adminPreloadList: element.all(by.css('app-root > div > app-admin > app-admin-dashboard > ul > li')),

      loginHref: hrefEles.get(3),
@ -139,31 +138,6 @@ describe('Router', () => {
    expect(page.secondaryOutlet.count()).toBe(1, 'secondary outlet');
  });

-  it('should redirect with secondary route', async () => {
-    const page = getPageStruct();
-
-    // go to login page and login
-    await browser.get('');
-    await page.loginHref.click();
-    await page.loginButton.click();
-
-    // open secondary outlet
-    await page.contactHref.click();
-
-    // go to login page and logout
-    await page.loginHref.click();
-    await page.loginButton.click();
-
-    // attempt to go to admin page, redirects to login with secondary outlet open
-    await page.adminHref.click();
-
-    // login, get redirected back to admin with outlet still open
-    await page.loginButton.click();
-
-    expect(await page.adminPage.isDisplayed()).toBeTruthy();
-    expect(page.secondaryOutlet.count()).toBeTruthy();
-  });
-
  async function crisisCenterEdit(index: number, save: boolean) {
    const page = getPageStruct();
    await page.crisisHref.click();
--- a/aio/content/examples/router/src/app/auth/login/login.component.1.ts
+++ b/aio/content/examples/router/src/app/auth/login/login.component.1.ts
@ -27,10 +27,10 @@ export class LoginComponent {
      if (this.authService.isLoggedIn) {
        // Get the redirect URL from our auth service
        // If no redirect has been set, use the default
-        let redirect = this.authService.redirectUrl ? this.router.parseUrl(this.authService.redirectUrl) : '/admin';
+        let redirect = this.authService.redirectUrl ? this.authService.redirectUrl : '/crisis-center/admin';

        // Redirect the user
-        this.router.navigateByUrl(redirect);
+        this.router.navigate([redirect]);
      }
    });
  }
--- a/aio/content/examples/router/src/app/auth/login/login.component.ts
+++ b/aio/content/examples/router/src/app/auth/login/login.component.ts
@ -28,7 +28,7 @@ export class LoginComponent {
      if (this.authService.isLoggedIn) {
        // Get the redirect URL from our auth service
        // If no redirect has been set, use the default
-        let redirect = this.authService.redirectUrl ? this.router.parseUrl(this.authService.redirectUrl) : '/admin';
+        let redirect = this.authService.redirectUrl ? this.authService.redirectUrl : '/admin';

        // #docregion preserve
        // Set our navigation extras object
@ -39,7 +39,7 @@ export class LoginComponent {
        };

        // Redirect the user
-        this.router.navigateByUrl(redirect, navigationExtras);
+        this.router.navigate([redirect], navigationExtras);
        // #enddocregion preserve
      }
    });
--- a/aio/content/examples/router/src/app/crisis-list/crisis-list.component.1.css
+++ b/aio/content/examples/router/src/app/crisis-list/crisis-list.component.1.css
--- a/aio/content/examples/built-in-template-functions/src/app/app.component.css
+++ b/aio/content/examples/built-in-template-functions/src/app/app.component.css
--- a/aio/content/examples/router/src/app/crisis-list/crisis-list.component.1.html
+++ b/aio/content/examples/router/src/app/crisis-list/crisis-list.component.1.html
--- a/aio/content/examples/router/src/app/crisis-list/crisis-list.component.1.ts
+++ b/aio/content/examples/router/src/app/crisis-list/crisis-list.component.1.ts
@ -4,7 +4,7 @@ import { Component } from '@angular/core';

@Component({
  selector: 'app-crisis-list',
-  templateUrl: './crisis-list.component.1.html',
-  styleUrls: ['./crisis-list.component.1.css']
+  templateUrl: './crisis-list.component.html',
+  styleUrls: ['./crisis-list.component.css']
 })
 export class CrisisListComponent { }
--- a/aio/content/examples/router/src/app/hero-list/hero-list.component.1.css
+++ b/aio/content/examples/router/src/app/hero-list/hero-list.component.1.css
--- a/aio/content/examples/router/src/app/hero-list/hero-list.component.css
+++ b/aio/content/examples/router/src/app/hero-list/hero-list.component.css
--- a/aio/content/examples/router/src/app/hero-list/hero-list.component.1.html
+++ b/aio/content/examples/router/src/app/hero-list/hero-list.component.1.html
--- a/aio/content/examples/router/src/app/hero-list/hero-list.component.1.ts
+++ b/aio/content/examples/router/src/app/hero-list/hero-list.component.1.ts
@ -4,7 +4,7 @@ import { Component } from '@angular/core';

@Component({
  selector: 'app-hero-list',
-  templateUrl: './hero-list.component.1.html',
-  styleUrls: ['./hero-list.component.1.css']
+  templateUrl: './hero-list.component.html',
+  styleUrls: ['./hero-list.component.css']
 })
 export class HeroListComponent { }
--- a/Show More
+++ b/Show More